Fix nested "or not"

Author: GromNaN

src/Query/Builder.php

@@ -1002,32 +1002,26 @@ protected function compileWheres(): array
                 });
             }
 
-            $not = false;
-            if ($where['boolean'] === 'and not') {
-                $where['boolean'] = 'and';
-                $not = true;
-            } elseif ($where['boolean'] === 'or not') {
-                $where['boolean'] = 'or';
-                $not = true;
-            }
-
             // The next item in a "chain" of wheres devices the boolean of the
             // first item. So if we see that there are multiple wheres, we will
             // use the operator of the next where.
-            if ($i == 0 && count($wheres) > 1 && $where['boolean'] == 'and') {
-                $where['boolean'] = $wheres[$i + 1]['boolean'];
+            if ($i == 0 && count($wheres) > 1
+                && str_starts_with($where['boolean'], 'and')
+                && str_starts_with($wheres[$i + 1]['boolean'], 'or')
+            ) {
+                $where['boolean'] = 'or'.(str_ends_with($where['boolean'], 'not') ? ' not' : '');
             }
 
             // We use different methods to compile different wheres.
             $method = "compileWhere{$where['type']}";
             $result = $this->{$method}($where);
 
-            if ($not) {
+            if (str_ends_with($where['boolean'], 'not')) {
                 $result = ['$not' => $result];
             }
 
             // Wrap the where with an $or operator.
-            if ($where['boolean'] == 'or') {
+            if (str_starts_with($where['boolean'], 'or')) {
                 $result = ['$or' => [$result]];
             }
 

tests/Query/BuilderTest.php

@@ -60,6 +60,30 @@ public static function provideQueryBuilderToMql(): iterable
             fn (Builder $builder) => $builder->where(['foo' => 1, 'bar' => 2]),
         ];
 
+        yield 'nested orWhere and where' => [
+            ['find' => [
+                ['$and' => [
+                    ['$or' => [
+                        ['$and' => [
+                            ['foo' => 1],
+                            ['$not' => ['bar' => 2]],
+                        ]],
+                    ]],
+                    ['baz' => 3],
+                ]],
+                [], // options
+            ]],
+            fn (Builder $builder) => $builder
+                ->where(
+                    fn (Builder $q) => $q->orWhere(
+                        fn (Builder $q) => $q
+                            ->where('foo', 1)
+                            ->whereNot('bar', 2)
+                    )
+                )
+                ->where('baz', 3),
+        ];
+
         yield 'find > date' => [
             ['find' => [['foo' => ['$gt' => new UTCDateTime($date)]], []]],
             fn (Builder $builder) => $builder->where('foo', '>', $date),
@@ -176,10 +200,10 @@ public static function provideQueryBuilderToMql(): iterable
 
         yield 'where or whereNot' => [
             ['find' => [
-                [
-                    '$and' => [['name' => 'bar']],
-                    '$or' => [['$not' => ['email' => 'foo']]],
-                ],
+                ['$or' => [
+                    ['name' => 'bar'],
+                    ['$not' => ['email' => 'foo']],
+                ]],
                 [], // options
             ]],
             fn (Builder $builder) => $builder