Extract nested filters, preserving deeply nested filters

Author: stevebauman

src/Query/Builder.php

@@ -764,11 +764,9 @@ public function andFilter(Closure $closure): static
         $query = $this->newNestedInstance($closure);
 
         if ($filter = $query->getFilter()) {
-            $filters = $filter instanceof GroupFilter
-                ? $filter->getFilters()
-                : [$filter];
-
-            $this->addFilter(new AndGroup(...$filters), wrap: false);
+            $this->addFilter(new AndGroup(
+                ...$this->extractNestedFilters($filter)
+            ), wrap: false);
         }
 
         return $this;
@@ -782,16 +780,38 @@ public function orFilter(Closure $closure): static
         $query = $this->newNestedInstance($closure);
 
         if ($filter = $query->getFilter()) {
-            $filters = $filter instanceof GroupFilter
-                ? $filter->getFilters()
-                : [$filter];
-
-            $this->addFilter(new OrGroup(...$filters), wrap: false);
+            $this->addFilter(new OrGroup(
+                ...$this->extractNestedFilters($filter)
+            ), wrap: false);
         }
 
         return $this;
     }
 
+    /**
+     * Extract filters from a nested group filter for re-wrapping, preserving nested groups.
+     *
+     * @return array<Filter>
+     */
+    protected function extractNestedFilters(Filter $filter): array
+    {
+        if (! $filter instanceof GroupFilter) {
+            return [$filter];
+        }
+
+        $children = $filter->getFilters();
+
+        // If any child is a group, preserve the structure
+        foreach ($children as $child) {
+            if ($child instanceof GroupFilter) {
+                return $children;
+            }
+        }
+
+        // All children are non-groups, it's safe to unwrap.
+        return $children;
+    }
+
     /**
      * Add a nested 'not' filter to the query.
      */
@@ -1163,22 +1183,14 @@ public function addFilter(Filter $filter, string $boolean = 'and', bool $wrap =
             return $this;
         }
 
-        if (! $wrap) {
-            $this->filter = $boolean === 'or'
-                ? new OrGroup($this->filter, $filter)
-                : new AndGroup($this->filter, $filter);
-
-            return $this;
-        }
-
         // Flatten same-type groups to avoid deeply nested structures.
         // Ex: AndGroup(AndGroup(a, b), c) becomes AndGroup(a, b, c)
         if ($boolean === 'or') {
-            $this->filter = $this->filter instanceof OrGroup
+            $this->filter = $this->filter instanceof OrGroup && $wrap
                 ? new OrGroup(...[...$this->filter->getFilters(), $filter])
                 : new OrGroup($this->filter, $filter);
         } else {
-            $this->filter = $this->filter instanceof AndGroup
+            $this->filter = $this->filter instanceof AndGroup && $wrap
                 ? new AndGroup(...[...$this->filter->getFilters(), $filter])
                 : new AndGroup($this->filter, $filter);
         }