Allow scoping individual queries within Eloquent union builder

Author: tobyzerner

src/Laravel/EloquentCollection.php

@@ -50,25 +50,27 @@ public function endpoints(): array
 
     public function query(Context $context): object
     {
-        $queries = array_map(function ($resource) use ($context) {
+        $queries = [];
+
+        foreach ($this->eloquentResources($context) as $resource) {
             $keyName = $resource->newModel($context)->getQualifiedKeyName();
             $type = $resource->type();
 
-            $query = $resource
+            $queries[$type] = $resource
                 ->query($context)
                 ->toBase()
                 ->select("$keyName as id")
                 ->selectRaw('? as type', [$type]);
+        }
 
-            $this->scope($query, $type);
+        $query = new UnionBuilder($queries);
 
-            return $query;
-        }, $this->eloquentResources($context));
+        $this->scope($query, $context);
 
-        return new UnionBuilder($queries);
+        return $query;
     }
 
-    public function scope(Builder $query, string $type): void
+    public function scope(UnionBuilder $query, Context $context): void
     {
     }
 

src/Laravel/UnionBuilder.php

@@ -3,10 +3,10 @@
 namespace Tobyz\JsonApiServer\Laravel;
 
 use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Support\Collection;
 
 class UnionBuilder implements Builder
 {
-    private array $queryCalls = [];
     private array $outerQueryCalls = [];
     private ?int $limit = null;
     private int $offset = 0;
@@ -15,6 +15,27 @@ public function __construct(protected array $queries)
     {
     }
 
+    public function for(string $type): Builder
+    {
+        return $this->queries[$type];
+    }
+
+    public function inner(callable $callback): static
+    {
+        foreach ($this->queries as $query) {
+            $callback($query);
+        }
+
+        return $this;
+    }
+
+    public function outer(callable $callback): static
+    {
+        $this->outerQueryCalls[] = $callback;
+
+        return $this;
+    }
+
     public function skip(int $value): static
     {
         return $this->offset($value);
@@ -41,36 +62,21 @@ public function limit(?int $value): static
         return $this;
     }
 
-    public function orderBy($column, $direction = 'asc'): static
-    {
-        $this->queryCalls[] = fn($query) => $query
-            ->addSelect($column)
-            ->orderBy($column, $direction);
-
-        $this->outerQueryCalls[] = fn($query) => $query->orderBy($column, $direction);
-
-        return $this;
-    }
-
     public function count($columns = '*'): int
     {
         return $this->buildQuery()->count($columns);
     }
 
-    public function get($columns = ['*'])
+    public function get($columns = ['*']): Collection
     {
         return $this->buildQuery()->get($columns);
     }
 
-    protected function buildQuery()
+    protected function buildQuery(): Builder
     {
         $queries = array_map(fn($query) => clone $query, $this->queries);
 
         foreach ($queries as $query) {
-            foreach ($this->queryCalls as $call) {
-                $call($query);
-            }
-
             if ($this->limit) {
                 $query->take($this->offset + $this->limit);
             }
@@ -95,7 +101,10 @@ protected function buildQuery()
 
     public function __call($method, $parameters)
     {
-        $this->queryCalls[] = fn($query) => $query->$method(...$parameters);
+        $callback = fn($query) => $query->$method(...$parameters);
+
+        $this->inner($callback);
+        $this->outer($callback);
 
         return $this;
     }