Implicit bools in nested methods

src/CouchDB.Driver/ExpressionVisitors/BoolMemberToConstantEvaluator.cs

@@ -4,25 +4,31 @@
 
 namespace CouchDB.Driver.CompositeExpressionsEvaluator
 {
-    internal  class BoolMemberToConstantEvaluator : ExpressionVisitor
+    internal class BoolMemberToConstantEvaluator : ExpressionVisitor
     {
-        private bool _visitingWhereMethod;
+        private bool _isVisitingWhereMethodOrChild;
 
         protected override Expression VisitMethodCall(MethodCallExpression m)
         {
-            _visitingWhereMethod = m.Method.Name == nameof(Queryable.Where) && m.Method.DeclaringType == typeof(Queryable);
-            if (_visitingWhereMethod)
+            bool isRootWhereMethod = !_isVisitingWhereMethodOrChild && m.Method.Name == nameof(Queryable.Where) && m.Method.DeclaringType == typeof(Queryable);
+            if (isRootWhereMethod)
             {
-                Expression result = base.VisitMethodCall(m);
-                _visitingWhereMethod = false;
-                return result;
+                _isVisitingWhereMethodOrChild = true;
             }
-            return base.VisitMethodCall(m);
+
+            Expression result = base.VisitMethodCall(m);
+
+            if (isRootWhereMethod)
+            {
+                _isVisitingWhereMethodOrChild = false;
+            }
+
+            return result;
         }
 
         protected override Expression VisitBinary(BinaryExpression expression)
         {
-            if (_visitingWhereMethod && expression.Right is ConstantExpression c && c.Type == typeof(bool) && 
+            if (_isVisitingWhereMethodOrChild && expression.Right is ConstantExpression c && c.Type == typeof(bool) &&
                 (expression.NodeType == ExpressionType.Equal || expression.NodeType == ExpressionType.NotEqual))
             {
                 return expression;
@@ -50,8 +56,8 @@ protected override Expression VisitUnary(UnaryExpression expression)
 
         private bool IsWhereBooleanExpression(MemberExpression expression)
         {
-            return _visitingWhereMethod && 
-                expression.Member is PropertyInfo info && 
+            return _isVisitingWhereMethodOrChild &&
+                expression.Member is PropertyInfo info &&
                 info.PropertyType == typeof(bool);
         }
     }

tests/CouchDB.Driver.E2ETests/Client_Tests.cs

@@ -8,6 +8,7 @@
 
 namespace CouchDB.Driver.E2E
 {
+    [Trait("Category", "Integration")]
     public class ClientTests
     {
         [Fact]
@@ -54,10 +55,10 @@ public async Task Users()
                 {
                     users = await client.CreateDatabaseAsync<CouchUser>().ConfigureAwait(false);
                 }
-                
+
                 var luke = await users.CreateAsync(new CouchUser(name: "luke", password: "lasersword")).ConfigureAwait(false);
                 Assert.Equal("luke", luke.Name);
-                
+
                 luke = await users.FindAsync(luke.Id).ConfigureAwait(false);
                 Assert.Equal("luke", luke.Name);
 

tests/CouchDB.Driver.UnitTests/Find/Find_Selector_Combinations.cs

@@ -59,10 +59,40 @@ public void ElemMatch()
             Assert.Equal(@"{""selector"":{""battles"":{""$elemMatch"":{""planet"":""Naboo""}}}}", json);
         }
         [Fact]
+        public void ElemMatchImplicitBool()
+        {
+            var json = _rebels.Where(r => r.Battles.Any(b => b.DidWin)).ToString();
+            Assert.Equal(@"{""selector"":{""battles"":{""$elemMatch"":{""didWin"":true}}}}", json);
+        }
+        [Fact]
+        public void ElemMatchBoolExplicit()
+        {
+            var json = _rebels.Where(r => r.Battles.Any(b => b.DidWin == true)).ToString();
+            Assert.Equal(@"{""selector"":{""battles"":{""$elemMatch"":{""didWin"":true}}}}", json);
+        }
+        [Fact]
+        public void ElemMatchNested()
+        {
+            var json = _rebels.Where(r => r.Battles.Any(b => b.Vehicles.Any(v => v.CanFly == true))).ToString();
+            Assert.Equal(@"{""selector"":{""battles"":{""$elemMatch"":{""vehicles"":{""$elemMatch"":{""canFly"":true}}}}}}", json);
+        }
+        [Fact]
+        public void ElemMatchNestedImplicitBool()
+        {
+            var json = _rebels.Where(r => r.Battles.Any(b => b.Vehicles.Any(v => v.CanFly))).ToString();
+            Assert.Equal(@"{""selector"":{""battles"":{""$elemMatch"":{""vehicles"":{""$elemMatch"":{""canFly"":true}}}}}}", json);
+        }
+        [Fact]
         public void AllMatch()
         {
             var json = _rebels.Where(r => r.Battles.All(b => b.Planet == "Naboo")).ToString();
             Assert.Equal(@"{""selector"":{""battles"":{""$allMatch"":{""planet"":""Naboo""}}}}", json);
         }
+        [Fact]
+        public void AllMatchImplicitBool()
+        {
+            var json = _rebels.Where(r => r.Battles.All(b => b.DidWin)).ToString();
+            Assert.Equal(@"{""selector"":{""battles"":{""$allMatch"":{""didWin"":true}}}}", json);
+        }
     }
 }

tests/CouchDB.Driver.UnitTests/_Models/Battle.cs

@@ -6,7 +6,9 @@ namespace CouchDB.Driver.UnitTests.Models
 {
     public class Battle
     {
+        public bool DidWin { get; set; }
         public string Planet { get; set; }
         public DateTime Date { get; set; }
+        public List<Vehicle> Vehicles { get; set; } = new List<Vehicle>();
     }
 }

tests/CouchDB.Driver.UnitTests/_Models/Vehicle.cs

@@ -0,0 +1,7 @@
+namespace CouchDB.Driver.UnitTests.Models
+{
+    public class Vehicle
+    {
+        public bool CanFly { get; set; }
+    }
+}