Add DSL query support and multi-column aggregation

Introduces the ability to return queries as DSL via an `asDsl` flag and a new `dslQuery()` method. Updates aggregation methods to support multiple columns and adjusts return types for `get` and `count` to allow array results when using DSL mode.

Author: pdphilip

src/Eloquent/Builder.php

@@ -37,6 +37,8 @@ class Builder extends BaseEloquentBuilder
 
     protected $type;
 
+    protected $asDsl = false;
+
     protected $model;
 
     protected $passthru = [
@@ -113,6 +115,13 @@ public function query(): QueryBuilder
         return $this->query;
     }
 
+    public function dslQuery(): QueryBuilder
+    {
+        $this->query->asDsl = true;
+
+        return $this->query;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -132,8 +141,9 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
     /**
      * {@inheritdoc}
      */
-    public function get($columns = ['*']): ElasticCollection
+    public function get($columns = ['*']): ElasticCollection|array
     {
+
         if (! is_array($columns)) {
             $columns = [$columns];
         }
@@ -525,9 +535,9 @@ public function stringStats($columns, $options = [])
         return $this->hydrateAggregationResult($this->query->stringStats($columns, $options));
     }
 
-    public function agg(array $functions, string $column, array $options = [])
+    public function agg(array $functions, string|array $columns, array $options = [])
     {
-        return $this->hydrateAggregationResult($this->query->agg($functions, $column, $options));
+        return $this->hydrateAggregationResult($this->query->agg($functions, $columns, $options));
     }
 
     protected function hydrateAggregationResult($result)

src/Query/Builder.php

@@ -495,9 +495,11 @@ public function orderBy($column, $direction = 1, array $options = []): self
      *
      * @param  array  $columns
      */
-    public function get($columns = ['*']): ElasticCollection
+    public function get($columns = ['*']): ElasticCollection|array
     {
-
+        if ($this->asDsl) {
+            return $this->toDsl();
+        }
         $original = $this->columns;
 
         if (is_null($original)) {
@@ -620,20 +622,24 @@ public function exists(): bool
     /**
      * {@inheritdoc}
      */
-    public function count($columns = null, array $options = []): int
+    public function count($columns = null, array $options = []): int|array
     {
         // If columns are specified, we will aggregate the count of the specified columns.
         //        if ($columns) {
         //            return $this->aggregate(__FUNCTION__, Arr::wrap($columns), $options);
         //        }
 
         // Otherwise, we will just count the records.
+        if ($this->asDsl) {
+            return $this->grammar->compileCount($this);
+        }
+
         return $this->connection->count($this->grammar->compileCount($this));
     }
 
-    public function agg(array $functions, string $column, array $options = [])
+    public function agg(array $functions, string|array $columns, array $options = [])
     {
-        return $this->aggregateMultiMetric($functions, $column, $options);
+        return $this->aggregateMultiMetric($functions, $columns, $options);
     }
 
     /**
@@ -1851,20 +1857,28 @@ protected function aggregateMetric($function, $columns = ['*'], $options = [])
                 'options' => $options,
             ];
         }
+        if ($this->asDsl) {
+            return $this->grammar->compileSelect($this);
+        }
 
         return $this->processor->processAggregations($this, $this->connection->select($this->grammar->compileSelect($this), []));
     }
 
-    protected function aggregateMultiMetric(array $functions, string $column, $options = [])
+    protected function aggregateMultiMetric(array $functions, string|array $columns, $options = [])
     {
         // Each column we want aggregated
-        foreach ($functions as $function) {
-            $this->metricsAggregations[] = [
-                'key' => $function.'_'.$column,
-                'args' => $column,
-                'type' => $function,
-                'options' => $options,
-            ];
+        if (! is_array($columns)) {
+            $columns = Arr::wrap($columns);
+        }
+        foreach ($columns as $column) {
+            foreach ($functions as $function) {
+                $this->metricsAggregations[] = [
+                    'key' => $function.'_'.$column,
+                    'args' => $column,
+                    'type' => $function,
+                    'options' => $options,
+                ];
+            }
         }
 
         return $this->processor->processAggregations($this, $this->connection->select($this->grammar->compileSelect($this), []));