Add LinqExpressionOptions for string comparison control

Author: pwelter34

src/LoreSoft.Blazor.Controls/Extensions/QueryExtensions.cs

@@ -64,8 +64,9 @@ public static IQueryable<T> Sort<T>(this IQueryable<T> query, IEnumerable<DataSo
     /// <typeparam name="T">The type of the elements in the query.</typeparam>
     /// <param name="query">The source query.</param>
     /// <param name="filter">The filter rule to apply.</param>
+    /// <param name="options">The options to use when building the filter expression.</param>
     /// <returns>The filtered query, or the original query if <paramref name="filter"/> is <c>null</c> or empty.</returns>
-    public static IQueryable<T> Filter<T>(this IQueryable<T> query, QueryRule? filter)
+    public static IQueryable<T> Filter<T>(this IQueryable<T> query, QueryRule? filter, LinqExpressionOptions? options = null)
     {
         if (filter is null)
             return query;
@@ -74,7 +75,7 @@ public static IQueryable<T> Filter<T>(this IQueryable<T> query, QueryRule? filte
 
         return LinqExpressionBuilder.Pool.Use(builder =>
         {
-            builder.Build(filter);
+            builder.Build(filter, options);
 
             var predicate = builder.Expression;
             var parameters = builder.Parameters.ToArray();
@@ -93,13 +94,14 @@ public static IQueryable<T> Filter<T>(this IQueryable<T> query, QueryRule? filte
     /// <typeparam name="T">The type of the elements in the query.</typeparam>
     /// <param name="query">The source query.</param>
     /// <param name="request">The data request containing filter, sort, and paging information.</param>
+    /// <param name="options">The options to use when building the filter expression.</param>
     /// <returns>A <see cref="DataResult{T}"/> containing the total count and the paged, sorted, and filtered results.</returns>
-    public static DataResult<T> DataQuery<T>(this IQueryable<T> query, DataRequest request)
+    public static DataResult<T> DataQuery<T>(this IQueryable<T> query, DataRequest request, LinqExpressionOptions? options = null)
     {
         ArgumentNullException.ThrowIfNull(query);
         ArgumentNullException.ThrowIfNull(request);
 
-        var filterQuery = query.Filter(request.Query);
+        var filterQuery = query.Filter(request.Query, options);
 
         var total = filterQuery.Count();
 

src/LoreSoft.Blazor.Controls/Forms/InputList.razor.cs

@@ -378,7 +378,7 @@ private async Task UpdateItem(int index, object? value)
         if (index >= list.Count)
             return;
 
-        list[index] = parsedValue;
+        list[index] = parsedValue!;
 
         ClearParsingError();
         await NotifyValueChanged(list).ConfigureAwait(false);

src/LoreSoft.Blazor.Controls/Utilities/LinqExpressionBuilder.cs

@@ -12,7 +12,9 @@ namespace LoreSoft.Blazor.Controls.Utilities;
 /// </summary>
 public class LinqExpressionBuilder
 {
-    private static readonly Dictionary<string, Action<StringBuilder, List<object?>, QueryFilter>> _filterWriters = new(StringComparer.OrdinalIgnoreCase);
+    private delegate void FilterWriter(StringBuilder builder, List<object?> parameters, QueryFilter filter, LinqExpressionOptions options);
+
+    private static readonly Dictionary<string, FilterWriter> _filterWriters = new(StringComparer.OrdinalIgnoreCase);
 
     /// <summary>
     /// Initializes static filter writers for supported query operators.
@@ -44,7 +46,7 @@ static LinqExpressionBuilder()
     /// <param name="writer">The writer action to use for the operator.</param>
     public static void RegisterWriter(string @operator, Action<StringBuilder, List<object?>, QueryFilter> writer)
     {
-        _filterWriters[@operator] = writer;
+        _filterWriters[@operator] = (builder, parameters, filter, _) => writer(builder, parameters, filter);
     }
 
     /// <summary>
@@ -100,6 +102,7 @@ public static bool IsValid(QueryFilter? queryFilter)
 
     private readonly StringBuilder _expression = new();
     private readonly List<object?> _values = [];
+    private LinqExpressionOptions _options = LinqExpressionOptions.Default;
 
     /// <summary>
     /// Gets the list of parameters used in the built LINQ expression.  Generated by <see cref="Build(QueryRule?)"/>.
@@ -118,9 +121,20 @@ public static bool IsValid(QueryFilter? queryFilter)
     /// </summary>
     /// <param name="queryRule">The query rule to build the expression from.</param>
     public void Build(QueryRule? queryRule)
+        => Build(queryRule, null);
+
+    /// <summary>
+    /// Builds a LINQ expression string and parameter list from the specified <see cref="QueryRule"/>.
+    /// Expression will be updated with the generated LINQ expression.
+    /// Parameters will also be updated with the values used in the expression.
+    /// </summary>
+    /// <param name="queryRule">The query rule to build the expression from.</param>
+    /// <param name="options">The options to use when building the expression.</param>
+    public void Build(QueryRule? queryRule, LinqExpressionOptions? options)
     {
         _expression.Length = 0;
         _values.Clear();
+        _options = options ?? LinqExpressionOptions.Default;
 
         if (queryRule == null)
             return;
@@ -205,9 +219,9 @@ private void WriteExpression(QueryFilter filter)
             comparison = QueryOperators.Equal;
 
         if (_filterWriters.TryGetValue(comparison, out var action))
-            action(_expression, _values, filter);
+            action(_expression, _values, filter, _options);
         else
-            WriteStandardFilter(_expression, _values, filter);
+            WriteStandardFilter(_expression, _values, filter, _options);
     }
 
     /// <summary>
@@ -216,7 +230,8 @@ private void WriteExpression(QueryFilter filter)
     /// <param name="builder">The <see cref="StringBuilder"/> to append to.</param>
     /// <param name="parameters">The parameter list to add values to.</param>
     /// <param name="filter">The query filter to write.</param>
-    private static void WriteStringFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter)
+    /// <param name="options">The options to use when writing the expression.</param>
+    private static void WriteStringFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter, LinqExpressionOptions options)
     {
         // Field required for expression
         if (string.IsNullOrWhiteSpace(filter.Field))
@@ -254,9 +269,16 @@ private static void WriteStringFilter(StringBuilder builder, List<object?> param
             .Append('.')
             .Append(method)
             .Append("(@")
-            .Append(index)
-            .Append(", StringComparison.OrdinalIgnoreCase")
-            .Append(')');
+            .Append(index);
+
+        if (options.StringComparison is { } stringComparison)
+        {
+            builder
+                .Append(", StringComparison.")
+                .Append(stringComparison);
+        }
+
+        builder.Append(')');
 
         parameters.Add(value);
     }
@@ -267,7 +289,8 @@ private static void WriteStringFilter(StringBuilder builder, List<object?> param
     /// <param name="builder">The <see cref="StringBuilder"/> to append to.</param>
     /// <param name="parameters">The parameter list to add values to.</param>
     /// <param name="filter">The query filter to write.</param>
-    private static void WriteStandardFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter)
+    /// <param name="options">The options to use when writing the expression.</param>
+    private static void WriteStandardFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter, LinqExpressionOptions options)
     {
         // Field required for expression
         if (string.IsNullOrWhiteSpace(filter.Field))
@@ -305,7 +328,8 @@ private static void WriteStandardFilter(StringBuilder builder, List<object?> par
     /// <param name="builder">The <see cref="StringBuilder"/> to append to.</param>
     /// <param name="parameters">The parameter list to add values to.</param>
     /// <param name="filter">The query filter to write.</param>
-    private static void WriteNullFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter)
+    /// <param name="options">The options to use when writing the expression.</param>
+    private static void WriteNullFilter(StringBuilder builder, List<object?> parameters, QueryFilter filter, LinqExpressionOptions options)
     {
         // Field required for expression
         if (string.IsNullOrWhiteSpace(filter.Field))

src/LoreSoft.Blazor.Controls/Utilities/LinqExpressionOptions.cs

@@ -0,0 +1,23 @@
+namespace LoreSoft.Blazor.Controls.Utilities;
+
+/// <summary>
+/// Provides options for building dynamic LINQ expressions.
+/// </summary>
+public class LinqExpressionOptions
+{
+    /// <summary>
+    /// Gets the default LINQ expression options.
+    /// </summary>
+    public static LinqExpressionOptions Default => new();
+
+    /// <summary>
+    /// Gets LINQ expression options with no optional provider-specific features enabled.
+    /// </summary>
+    public static LinqExpressionOptions Empty => new() { StringComparison = null };
+
+    /// <summary>
+    /// Gets or sets the string comparison to use for string filter methods.
+    /// Set to <c>null</c> to emit provider-compatible string methods without a comparison argument.
+    /// </summary>
+    public StringComparison? StringComparison { get; set; } = System.StringComparison.OrdinalIgnoreCase;
+}