feat: support nested property

README.md

@@ -6,7 +6,7 @@ Welcome to the **SpelCompiler**! This library aims to provide .NET developers wi
 
 - Compile 'where' expressions from SpEL to .NET
 - Execute compiled expressions in a .NET environment
-
+- Support nested property
 Usage
 Here’s a basic example of how to use the library:
 

src/SpelParser/SpelGrammer.g4

@@ -20,7 +20,9 @@ comparision
 | Field=field Operator='!='	Constant=constant #NotEqualExpression
 ;
 
-field : FIELD;
+field : FIELD'.'FIELD # NestedPropertyExpression
+| FIELD # FieldExpression
+;
 
 constant
 : STRING #String

src/SpelParser/SpelGrammerCompiler.cs

@@ -1,5 +1,6 @@
 using Antlr4.Runtime;
 using Antlr4.Runtime.Misc;
+using Antlr4.Runtime.Tree;
 using SpelParser.Generated;
 using System;
 using System.Linq.Expressions;
@@ -15,6 +16,15 @@ public class SpelGrammerCompiler<T> : SpelGrammerBaseVisitor<Expression>
 
     private static string GetString(ConstantContext context) => context.GetText().Trim('"', '\'');
 
+    private static Expression CreateFieldExpression(ITerminalNode token)
+    {
+        var fieldNameToken = token.GetText();
+        var fieldExpression = typeof(T).GetProperty(fieldNameToken, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance)!;
+
+        ArgumentNullException.ThrowIfNull(fieldExpression, fieldNameToken);
+        return Expression.Property(_param, fieldExpression.Name);
+    }
+
     public override Expression VisitString([NotNull] StringContext context)
     {
         return Expression.Constant(GetString(context), typeof(string));
@@ -32,11 +42,21 @@ public override Expression VisitConstant([NotNull] ConstantContext context)
 
     public override Expression VisitField([NotNull] FieldContext context)
     {
-        var fieldNameToken = context.FIELD().GetText();
-        var fieldExpression = typeof(T).GetProperty(fieldNameToken, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance)!;
+        return base.Visit(context);       
+    }
+    public override Expression VisitErrorNode([NotNull] IErrorNode node)
+    {
+        node.GetText();
+        return base.VisitErrorNode(node);
+    }
+    public override Expression VisitNestedPropertyExpression([NotNull] NestedPropertyExpressionContext context)
+    {
+        return Expression.PropertyOrField(CreateFieldExpression(context.FIELD(0)), context.FIELD(1).GetText());
+    }
 
-        ArgumentNullException.ThrowIfNull(fieldExpression, fieldNameToken);
-        return Expression.Property(_param, fieldExpression.Name);
+    public override Expression VisitFieldExpression([NotNull] FieldExpressionContext context)
+    {
+        return CreateFieldExpression(context.FIELD());
     }
 
     public override Expression VisitAnd([NotNull] AndContext context)

src/SpelParser/SpelParser.csproj

@@ -3,9 +3,9 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<PackageVersion>1.0.201</PackageVersion>
+		<PackageVersion>1.1.0</PackageVersion>
 		<PackageId>SpelParser</PackageId>
-		<Version>1.0.201</Version>
+		<Version>1.1.0</Version>
 		<Authors>Saeed Bolhasani</Authors>
 		<PackageDescription>Convert string to expression</PackageDescription>
 		<RepositoryUrl>https://github.com/SaeedBolhasani/SpelParser</RepositoryUrl>

test/SpelParser.UnitTests/SpelGrammerCompilerUnitTests.cs

@@ -8,6 +8,11 @@ public enum EmployeeType : byte
     Employee = 2
 }
 
+public class Address
+{
+    public string City { get;set; }
+    public string PostalCode { get;set; }
+}
 public class EmployeeModel
 {
     public int Age { get; set; }
@@ -18,6 +23,7 @@ public class EmployeeModel
     public TimeSpan WorkingDuration { get; set; }
     public decimal AccountBalance { get; set; }
     public EmployeeType EmployeeType { get; set; }
+    public Address Address { get; set; }
 }
 
 public class SpelGrammerCompilerUnitTests
@@ -251,6 +257,22 @@ public void CreateFunc_QueryWithEnum_ResultSetShouldBeContainOnlyEligibleItems()
         result.Should().HaveCount(1);
     }
 
+    [Fact]
+    public void CreateFunc_QueryWithNestedProperty_ResultSetShouldBeContainOnlyEligibleItems()
+    {
+        var postalCode = "1";
+
+        var compiler = new SpelGrammerCompiler<EmployeeModel>();
+
+        var input = $"address.postalCode == '{postalCode}' ";
+        var query = compiler.CreateFunc(input);
+
+        var result = _models.Where(query.Compile()).ToArray();
+
+        result.Should().AllSatisfy(i => i.Address.PostalCode.Should().Be(postalCode));
+        result.Should().HaveCount(1);
+    }
+
     private readonly EmployeeModel[] _models =
      [
          new EmployeeModel
@@ -262,7 +284,12 @@ public void CreateFunc_QueryWithEnum_ResultSetShouldBeContainOnlyEligibleItems()
              Name = "Ali",
              BedTime = TimeOnly.Parse("19:00"),
              WorkingDuration = TimeSpan.FromHours(8),
-             EmployeeType = EmployeeType.Employee
+             EmployeeType = EmployeeType.Employee,
+             Address = new Address
+             {
+                 City = "Tehran",
+                 PostalCode = "1"
+             }
          },
          new EmployeeModel
          {
@@ -273,7 +300,12 @@ public void CreateFunc_QueryWithEnum_ResultSetShouldBeContainOnlyEligibleItems()
              Name = "Saeed",
              BedTime = TimeOnly.Parse("21:00"),
              WorkingDuration = TimeSpan.FromHours(8),
-             EmployeeType = EmployeeType.Manager
+             EmployeeType = EmployeeType.Manager,
+             Address = new Address
+             {
+                 City = "New York",
+                 PostalCode = "2"
+             }
          }
       ];