added support for multiple expressions in arrays

Author: romaklayt

src/romaklayt.DynamicFilter.Common/Models/ElementOperators.cs

@@ -0,0 +1,57 @@
+// ReSharper disable MemberCanBePrivate.Global
+
+using System.Collections.Generic;
+
+namespace romaklayt.DynamicFilter.Common.Models;
+
+internal static class ElementOperators
+{
+    public static Dictionary<string, ElementOperatorEnum> Get =>
+        new()
+        {
+            { "==*", ElementOperatorEnum.EqualsCaseInsensitive },
+            { "_-=*", ElementOperatorEnum.EndsWithCaseInsensitive },
+            { "_=*", ElementOperatorEnum.StartsWithCaseInsensitive },
+            { "@=*", ElementOperatorEnum.ContainsCaseInsensitive },
+            { "_-=", ElementOperatorEnum.EndsWith },
+            { "_=", ElementOperatorEnum.StartsWith },
+            { "<=", ElementOperatorEnum.LessOrEqual },
+            { ">=", ElementOperatorEnum.GreaterOrEqual },
+            { "<", ElementOperatorEnum.LessThan },
+            { ">", ElementOperatorEnum.GreaterThan },
+            { "@=", ElementOperatorEnum.Contains },
+            { "==", ElementOperatorEnum.Equals }
+        };
+}
+
+internal enum ElementOperatorEnum
+{
+    Equals,
+    Contains,
+    GreaterThan,
+    LessThan,
+    GreaterOrEqual,
+    LessOrEqual,
+    StartsWith,
+    EndsWith,
+    ContainsCaseInsensitive,
+    StartsWithCaseInsensitive,
+    EndsWithCaseInsensitive,
+    EqualsCaseInsensitive
+}
+
+internal static class EnumerableOperators
+{
+    public static Dictionary<string, EnumerableOperatorEnum> Get =>
+        new()
+        {
+            { "any", EnumerableOperatorEnum.Any },
+            { "all", EnumerableOperatorEnum.All }
+        };
+}
+
+internal enum EnumerableOperatorEnum
+{
+    Any,
+    All
+}

src/romaklayt.DynamicFilter.Common/Models/FilterArray.cs

@@ -10,12 +10,12 @@ internal class FilterArray
     public FilterArray(string filterArray, Type type, Expression parameter)
     {
         var split = filterArray.Split(FilterArrayLogicOperators.GetOperators(), StringSplitOptions.RemoveEmptyEntries);
-        FilterElements = split.Select(s => new FilterElement(s.Trim('(', ')'), type, parameter)).ToList();
+        FilterElements = split.Select(s => new FilterSimpleQuery(s.Trim('(', ')'), type, parameter)).ToList();
         Operators = Extensions.ParseOperators(filterArray, split);
         Expression = GetExpression();
     }
 
-    private List<FilterElement> FilterElements { get; }
+    private List<FilterSimpleQuery> FilterElements { get; }
     private List<FilterArrayLogicOperatorEnum> Operators { get; }
     public Expression Expression { get; }
 

src/romaklayt.DynamicFilter.Common/Models/FilterArrayLogicOperators.cs

@@ -1,5 +1,7 @@
 // ReSharper disable MemberCanBePrivate.Global
 
+using System.Collections.Generic;
+
 namespace romaklayt.DynamicFilter.Common.Models;
 
 internal class FilterArrayLogicOperators
@@ -14,4 +16,17 @@ internal enum FilterArrayLogicOperatorEnum
 {
     Or,
     And
+}
+
+internal class FilterEnumerableLogicOperators
+{
+    public const char Or = '|';
+    public const char And = '&';
+
+    public static Dictionary<char, FilterArrayLogicOperatorEnum> Get =>
+        new()
+        {
+            { Or, FilterArrayLogicOperatorEnum.Or },
+            { And, FilterArrayLogicOperatorEnum.And }
+        };
 }