feat: added boolean filter

Author: Jamess-Lucass

example/Dto/UserDto.cs

@@ -8,6 +8,7 @@ public record UserDto
     public string Firstname { get; set; } = string.Empty;
     public string Lastname { get; set; } = string.Empty;
     public int Age { get; set; }
+    public bool IsEmailVerified { get; set; }
     public double Test { get; set; }
     public int? NullableInt { get; set; }
     public DateTime DateOfBirthUtc { get; set; }

example/Entities/User.cs

@@ -7,6 +7,7 @@ public record User
     public string Lastname { get; set; } = string.Empty;
     public int Age { get; set; }
     public bool IsDeleted { get; set; }
+    public bool IsEmailVerified { get; set; }
     public double Test { get; set; }
     public int? NullableInt { get; set; }
 

example/Program.cs

@@ -42,6 +42,7 @@
             .RuleFor(x => x.IsDeleted, f => f.Random.Bool())
             .RuleFor(x => x.Test, f => f.Random.Double())
             .RuleFor(x => x.NullableInt, f => f.Random.Bool() ? f.Random.Int(1, 100) : null)
+            .RuleFor(x => x.IsEmailVerified, f => f.Random.Bool())
             .Rules((f, u) =>
             {
                 var timeZone = TimeZoneInfo.FindSystemTimeZoneById("America/New_York");

src/GoatQuery/src/Ast/Literals.cs

@@ -85,4 +85,14 @@ public sealed class NullLiteral : QueryExpression
     public NullLiteral(Token token) : base(token)
     {
     }
+}
+
+public sealed class BooleanLiteral : QueryExpression
+{
+    public bool Value { get; set; }
+
+    public BooleanLiteral(Token token, bool value) : base(token)
+    {
+        Value = value;
+    }
 }

src/GoatQuery/src/Evaluator/FilterEvaluator.cs

@@ -65,6 +65,9 @@ public static Result<Expression> Evaluate(QueryExpression expression, ParameterE
                         case NullLiteral _:
                             value = Expression.Constant(null, property.Type);
                             break;
+                        case BooleanLiteral literal:
+                            value = Expression.Constant(literal.Value, property.Type);
+                            break;
                         default:
                             return Result.Fail($"Unsupported literal type: {exp.Right.GetType().Name}");
                     }

src/GoatQuery/src/Lexer/Lexer.cs

@@ -68,6 +68,13 @@ public Token NextToken()
                         return token;
                     }
 
+                    if (token.Literal.Equals(Keywords.True, StringComparison.OrdinalIgnoreCase) ||
+                        token.Literal.Equals(Keywords.False, StringComparison.OrdinalIgnoreCase))
+                    {
+                        token.Type = TokenType.BOOLEAN;
+                        return token;
+                    }
+
                     if (IsDigit(token.Literal[0]))
                     {
                         if (IsDate(token.Literal))

src/GoatQuery/src/Parser/Parser.cs

@@ -140,7 +140,7 @@ private Result<InfixExpression> ParseFilterStatement()
 
         var statement = new InfixExpression(_currentToken, identifier, _currentToken.Literal);
 
-        if (!PeekTokenIn(TokenType.STRING, TokenType.INT, TokenType.GUID, TokenType.DATETIME, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATE, TokenType.NULL))
+        if (!PeekTokenIn(TokenType.STRING, TokenType.INT, TokenType.GUID, TokenType.DATETIME, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATE, TokenType.NULL, TokenType.BOOLEAN))
         {
             return Result.Fail("Invalid value type within filter");
         }
@@ -159,7 +159,7 @@ private Result<InfixExpression> ParseFilterStatement()
 
         if (statement.Operator.In(Keywords.Lt, Keywords.Lte, Keywords.Gt, Keywords.Gte) && !CurrentTokenIn(TokenType.INT, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATETIME, TokenType.DATE))
         {
-            return Result.Fail($"Value must be an integer when using '{statement.Operator}' operand");
+            return Result.Fail($"Value must be a numeric or date type when using '{statement.Operator}' operand");
         }
 
         switch (_currentToken.Type)
@@ -218,6 +218,12 @@ private Result<InfixExpression> ParseFilterStatement()
             case TokenType.NULL:
                 statement.Right = new NullLiteral(_currentToken);
                 break;
+            case TokenType.BOOLEAN:
+                if (bool.TryParse(_currentToken.Literal, out var boolValue))
+                {
+                    statement.Right = new BooleanLiteral(_currentToken, boolValue);
+                }
+                break;
         }
 
         return statement;

src/GoatQuery/src/Token/Token.cs

@@ -12,6 +12,7 @@ public enum TokenType
     DATETIME,
     DATE,
     NULL,
+    BOOLEAN,
     LPAREN,
     RPAREN,
 }
@@ -30,6 +31,8 @@ public static class Keywords
     internal const string And = "and";
     internal const string Or = "or";
     internal const string Null = "null";
+    internal const string True = "true";
+    internal const string False = "false";
 }
 
 public sealed class Token

src/GoatQuery/tests/Filter/FilterTest.cs

@@ -4,13 +4,13 @@ public sealed class FilterTest
 {
     private static readonly Dictionary<string, User> _users = new Dictionary<string, User>
     {
-        ["John"] = new User { Age = 2, Firstname = "John", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2004-01-31 23:59:59"), BalanceDecimal = 1.50m },
-        ["Jane"] = new User { Age = 1, Firstname = "Jane", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2020-05-09 15:30:00"), BalanceDecimal = 0 },
-        ["Apple"] = new User { Age = 2, Firstname = "Apple", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("1980-12-31 00:00:01"), BalanceFloat = 1204050.98f },
-        ["Harry"] = new User { Age = 1, Firstname = "Harry", UserId = Guid.Parse("e4c7772b-8947-4e46-98ed-644b417d2a08"), DateOfBirth = DateTime.Parse("2002-08-01"), BalanceDecimal = 0.5372958205929493m },
-        ["Doe"] = new User { Age = 3, Firstname = "Doe", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2023-07-26 12:00:30"), BalanceDecimal = null },
-        ["Egg"] = new User { Age = 3, Firstname = "Egg", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2000-01-01 00:00:00"), BalanceDouble = 1334534453453433.33435443343231235652d },
-        ["NullUser"] = new User { Age = 4, Firstname = "NullUser", UserId = Guid.Parse("11111111-1111-1111-1111-111111111111"), DateOfBirth = null, BalanceDecimal = null, BalanceDouble = null, BalanceFloat = null },
+        ["John"] = new User { Age = 2, Firstname = "John", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2004-01-31 23:59:59"), BalanceDecimal = 1.50m, IsEmailVerified = true },
+        ["Jane"] = new User { Age = 1, Firstname = "Jane", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2020-05-09 15:30:00"), BalanceDecimal = 0, IsEmailVerified = false },
+        ["Apple"] = new User { Age = 2, Firstname = "Apple", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("1980-12-31 00:00:01"), BalanceFloat = 1204050.98f, IsEmailVerified = true },
+        ["Harry"] = new User { Age = 1, Firstname = "Harry", UserId = Guid.Parse("e4c7772b-8947-4e46-98ed-644b417d2a08"), DateOfBirth = DateTime.Parse("2002-08-01"), BalanceDecimal = 0.5372958205929493m, IsEmailVerified = false },
+        ["Doe"] = new User { Age = 3, Firstname = "Doe", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2023-07-26 12:00:30"), BalanceDecimal = null, IsEmailVerified = true },
+        ["Egg"] = new User { Age = 3, Firstname = "Egg", UserId = Guid.Parse("58cdeca3-645b-457c-87aa-7d5f87734255"), DateOfBirth = DateTime.Parse("2000-01-01 00:00:00"), BalanceDouble = 1334534453453433.33435443343231235652d, IsEmailVerified = false },
+        ["NullUser"] = new User { Age = 4, Firstname = "NullUser", UserId = Guid.Parse("11111111-1111-1111-1111-111111111111"), DateOfBirth = null, BalanceDecimal = null, BalanceDouble = null, BalanceFloat = null, IsEmailVerified = true },
     };
 
     public static IEnumerable<object[]> Parameters()
@@ -264,6 +264,36 @@ public static IEnumerable<object[]> Parameters()
             "firstname eq 'Doe' and balanceDecimal eq null",
             new[] { _users["Doe"] }
         };
+
+        yield return new object[] {
+            "isEmailVerified eq true",
+            new[] { _users["John"], _users["Apple"], _users["Doe"], _users["NullUser"] }
+        };
+
+        yield return new object[] {
+            "isEmailVerified eq false",
+            new[] { _users["Jane"], _users["Harry"], _users["Egg"] }
+        };
+
+        yield return new object[] {
+            "isEmailVerified ne true",
+            new[] { _users["Jane"], _users["Harry"], _users["Egg"] }
+        };
+
+        yield return new object[] {
+            "isEmailVerified ne false",
+            new[] { _users["John"], _users["Apple"], _users["Doe"], _users["NullUser"] }
+        };
+
+        yield return new object[] {
+            "age gt 2 and isEmailVerified eq true",
+            new[] { _users["Doe"], _users["NullUser"] }
+        };
+
+        yield return new object[] {
+            "isEmailVerified eq false or age eq 2",
+            new[] { _users["John"], _users["Jane"], _users["Apple"], _users["Harry"], _users["Egg"] }
+        };
     }
 
     [Theory]

src/GoatQuery/tests/User.cs

@@ -9,6 +9,7 @@ public record User
     public double? BalanceDouble { get; set; }
     public float? BalanceFloat { get; set; }
     public DateTime? DateOfBirth { get; set; }
+    public bool IsEmailVerified { get; set; }
 }
 
 public sealed record CustomJsonPropertyUser : User