Merge branch 'main' into main

Fluid/Ast/MemberExpression.cs

@@ -50,7 +50,7 @@ public override ValueTask<FluidValue> EvaluateAsync(TemplateContext context)
                         return context.Undefined.Invoke(initial.Identifier);
                     }
 
-                    return new ValueTask<FluidValue>(value);
+                    return value;
                 }
 
                 start = 0;

Fluid/TemplateContext.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 using System.Runtime.CompilerServices;
-using Fluid.Values;
+using System.Text.Json;
 
 namespace Fluid
 {
@@ -60,6 +60,7 @@
             Now = options.Now;
             MaxSteps = options.MaxSteps;
             ModelNamesComparer = modelNamesComparer;
+            JsonSerializerOptions = options.JsonSerializerOptions;
         }
 
         /// <summary>
@@ -116,6 +117,11 @@
         /// </summary>
         public TimeZoneInfo TimeZone { get; set; } = TemplateOptions.Default.TimeZone;
 
+        /// <summary>
+        /// Gets or sets the <see cref="JsonSerializerOptions"/> used by the <c>json</c> filter.
+        /// </summary>
+        public JsonSerializerOptions JsonSerializerOptions { get; set; } = TemplateOptions.Default.JsonSerializerOptions;
+
         /// <summary>
         /// Increments the number of statements the current template is processing.
         /// </summary>
@@ -150,7 +156,7 @@
         /// Gets or sets a model object that is used to resolve properties in a template. This object is used if local and
         /// global scopes are unsuccessful.
         /// </summary>
         public FluidValue Model { get; }
 
         /// <summary>
         /// Whether the direct properties of the Model can be accessed without being registered. Default is <code>true</code>.
@@ -230,7 +236,7 @@
         /// Gets a value from the context.
         /// </summary>
         /// <param name="name">The name of the value.</param>
         public FluidValue GetValue(string name)
         {
             return LocalScope.GetValue(name);
         }
@@ -241,7 +247,7 @@
         /// <param name="name">The name of the value.</param>
         /// <param name="value">The value to set.</param>
         /// <returns></returns>
         public TemplateContext SetValue(string name, FluidValue value)
         {
             LocalScope.SetValue(name, value);
             return this;
@@ -280,7 +286,7 @@
             return context.SetValue(name, FluidValue.Create(value, context.Options));
         }
 
         public static TemplateContext SetValue(this TemplateContext context, string name, Func<FluidValue> factory)
         {
             return context.SetValue(name, new FactoryValue(factory));
         }

Fluid/TemplateOptions.cs

@@ -3,6 +3,9 @@
 using Fluid.Filters;
 using Fluid.Values;
 using Microsoft.Extensions.FileProviders;
+using System.Globalization;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 
 namespace Fluid
 {
@@ -112,7 +115,20 @@
         /// <summary>
         /// Gets or sets the <see cref="JavaScriptEncoder" /> instance used by the <c>json</c> filter.
         /// </summary>
-        public JavaScriptEncoder JavaScriptEncoder { get; set; } = DefaultJavaScriptEncoder;
+        [Obsolete("Use JsonSerializerOptions.Encoder instead. This property will be removed in a future version.")]
+        public JavaScriptEncoder JavaScriptEncoder
+        {
+            get => JsonSerializerOptions.Encoder;
+            set => JsonSerializerOptions.Encoder = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="JsonSerializerOptions"/> used by the <c>json</c> filter.
+        /// </summary>
+        public JsonSerializerOptions JsonSerializerOptions { get; set; } = new JsonSerializerOptions
+        {
+            Encoder = DefaultJavaScriptEncoder
+        };
 
         /// <summary>
         /// Gets or sets the default trimming rules.

Fluid/Values/ObjectValueBase.cs

@@ -65,7 +65,7 @@ public override ValueTask<FluidValue> GetValueAsync(string name, TemplateContext
 
                     if (directValue != null)
                     {
-                        return new ValueTask<FluidValue>(Create(directValue, context.Options));
+                        return FluidValue.Create(directValue, context.Options);
                     }
                 }
 
@@ -87,7 +87,7 @@ public override ValueTask<FluidValue> GetValueAsync(string name, TemplateContext
                 return context.Undefined.Invoke(name);
             }
 
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return NilValue.Instance;
 
 
             static async ValueTask<FluidValue> Awaited(