Comprehensive ElasticSearch Query and Aggregation Enhancement

README.md

@@ -78,6 +78,14 @@ The following query types are available:
 \Spatie\ElasticsearchQueryBuilder\Queries\ExistsQuery::create('terms_and_conditions');
 ```
 
+#### `FuzzyQuery`
+
+[https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-fuzzy-query](https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-fuzzy-query)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Queries\FuzzyQuery::create('name', 'john', fuzziness: 2, boost: 1.5, rewrite: 'constant_score_blended');
+```
+
 #### `GeoshapeQuery`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html);
@@ -91,6 +99,26 @@ The following query types are available:
 );
 ```
 
+#### `IdsQuery`
+
+[https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-ids-query](https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-ids-query)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Queries\IdsQuery::create(['user123', 'post456']);
+```
+
+#### `MatchAllQuery`
+
+[https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-match-all-query](https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-match-all-query)
+
+#### `MatchNoneQuery`
+
+[https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-match-all-query#query-dsl-match-none-query](https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-match-all-query#query-dsl-match-none-query)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Queries\MatchAllQuery::create(boost: 1.2);
+```
+
 #### `MatchQuery`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html)
@@ -115,6 +143,10 @@ The following query types are available:
 \Spatie\ElasticsearchQueryBuilder\Queries\MultiMatchQuery::create('john', ['email', 'email'], fuzziness: 'auto');
 ```
 
+```php
+\Spatie\ElasticsearchQueryBuilder\Queries\MatchNoneQuery::create();
+```
+
 #### `NestedQuery`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-query.html)
@@ -159,6 +191,14 @@ $nestedQuery->innerHits(
     ->lte(1337);
 ```
 
+#### `RegexpQuery`
+
+[https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-regexp-query](https://www.elastic.co/docs/reference/query-languages/query-dsl/query-dsl-regexp-query)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Queries\RegexpQuery::create('name', 'joh.*', flags: 'ALL', maxDeterminizedStates: 10000, rewrite: 'constant_score');
+```
+
 #### `TermQuery`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html)
@@ -272,6 +312,14 @@ The following query types are available:
 \Spatie\ElasticsearchQueryBuilder\Aggregations\CardinalityAggregation::create('team_agg', 'team_name');
 ```
 
+#### `AvgAggregation`
+
+[https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-avg-aggregation](https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-avg-aggregation)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Aggregations\AvgAggregation::create('avg_price', 'price');
+```
+
 #### `FilterAggregation`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filter-aggregation.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filter-aggregation.html)
@@ -284,6 +332,17 @@ The following query types are available:
 );
 ```
 
+#### `HistogramAggregation`
+
+[https://www.elastic.co/docs/reference/aggregations/search-aggregations-bucket-histogram-aggregation](https://www.elastic.co/docs/reference/aggregations/search-aggregations-bucket-histogram-aggregation)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Aggregations\HistogramAggregation::create('price_histogram', 'price', 50)
+    ->minDocCount(1)
+    ->hardBounds(0, 1000)
+    ->missing(0);
+```
+
 #### `MaxAggregation`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html)
@@ -321,6 +380,17 @@ The following query types are available:
 );
 ```
 
+#### `PercentilesAggregation`
+
+[https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-percentile-aggregation](https://www.elastic.co/docs/reference/aggregations/search-aggregations-metrics-percentile-aggregation)
+
+```php
+\Spatie\ElasticsearchQueryBuilder\Aggregations\PercentilesAggregation::create('load_time_outlier', 'load_time', [95, 99, 99.9])
+    ->keyed(false)
+    ->tdigest(200, 'high_accuracy')
+    ->missing(10);
+```
+
 #### `ReverseNestedAggregation`
 
 [https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html)

src/Aggregations/AvgAggregation.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Spatie\ElasticsearchQueryBuilder\Aggregations;
+
+use Spatie\ElasticsearchQueryBuilder\Aggregations\Concerns\WithMissing;
+
+class AvgAggregation extends Aggregation
+{
+    use WithMissing;
+
+    protected string $field;
+
+    public static function create(string $name, string $field): self
+    {
+        return new self($name, $field);
+    }
+
+    public function __construct(string $name, string $field)
+    {
+        $this->name = $name;
+        $this->field = $field;
+    }
+
+    public function payload(): array
+    {
+        $parameters = [
+            'field' => $this->field,
+        ];
+
+        if ($this->missing !== null) {
+            $parameters['missing'] = $this->missing;
+        }
+
+        return [
+            'avg' => $parameters,
+        ];
+    }
+}

src/Aggregations/HistogramAggregation.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace Spatie\ElasticsearchQueryBuilder\Aggregations;
+
+use Spatie\ElasticsearchQueryBuilder\AggregationCollection;
+use Spatie\ElasticsearchQueryBuilder\Aggregations\Concerns\WithAggregations;
+use Spatie\ElasticsearchQueryBuilder\Aggregations\Concerns\WithMissing;
+
+class HistogramAggregation extends Aggregation
+{
+    use WithMissing;
+    use WithAggregations;
+
+    protected string $field;
+    protected float $interval;
+    protected ?int $minDocCount = null;
+    protected ?array $extendedBounds = null;
+    protected ?array $hardBounds = null;
+    protected ?float $offset = null;
+
+    public static function create(string $name, string $field, float $interval): self
+    {
+        return new self($name, $field, $interval);
+    }
+
+    public function __construct(string $name, string $field, float $interval)
+    {
+        $this->name = $name;
+        $this->field = $field;
+        $this->interval = $interval;
+        $this->aggregations = new AggregationCollection();
+    }
+
+    public function minDocCount(int $minDocCount): self
+    {
+        $this->minDocCount = $minDocCount;
+
+        return $this;
+    }
+
+    public function extendedBounds(float $min, float $max): self
+    {
+        $this->extendedBounds = [
+            'min' => $min,
+            'max' => $max,
+        ];
+
+        return $this;
+    }
+
+    public function hardBounds(float $min, float $max): self
+    {
+        $this->hardBounds = [
+            'min' => $min,
+            'max' => $max,
+        ];
+
+        return $this;
+    }
+
+    public function offset(float $offset): self
+    {
+        $this->offset = $offset;
+
+        return $this;
+    }
+
+    public function payload(): array
+    {
+        $parameters = [
+            'field' => $this->field,
+            'interval' => $this->interval,
+        ];
+
+        if ($this->minDocCount !== null) {
+            $parameters['min_doc_count'] = $this->minDocCount;
+        }
+
+        if ($this->extendedBounds !== null) {
+            $parameters['extended_bounds'] = $this->extendedBounds;
+        }
+
+        if ($this->hardBounds !== null) {
+            $parameters['hard_bounds'] = $this->hardBounds;
+        }
+
+        if ($this->offset !== null) {
+            $parameters['offset'] = $this->offset;
+        }
+
+        if ($this->missing !== null) {
+            $parameters['missing'] = $this->missing;
+        }
+
+        $aggregation = [
+            'histogram' => $parameters,
+        ];
+
+        if (! $this->aggregations->isEmpty()) {
+            $aggregation['aggs'] = $this->aggregations->toArray();
+        }
+
+        return $aggregation;
+    }
+}

src/Aggregations/PercentilesAggregation.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace Spatie\ElasticsearchQueryBuilder\Aggregations;
+
+use Spatie\ElasticsearchQueryBuilder\Aggregations\Concerns\WithMissing;
+
+class PercentilesAggregation extends Aggregation
+{
+    use WithMissing;
+
+    protected string $field;
+
+    protected array $percents;
+
+    protected ?bool $keyed = null;
+
+    protected ?int $compression = null;
+
+    protected ?string $executionHint = null;
+
+    protected ?int $numberOfSignificantValueDigits = null;
+
+    public static function create(string $name, string $field, array $percents): self
+    {
+        return new self($name, $field, $percents);
+    }
+
+    public function __construct(string $name, string $field, array $percents)
+    {
+        $this->name = $name;
+        $this->field = $field;
+        $this->percents = $percents;
+    }
+
+    public function keyed(bool $keyed = true): self
+    {
+        $this->keyed = $keyed;
+
+        return $this;
+    }
+
+    public function compression(int $compression): self
+    {
+        $this->compression = $compression;
+
+        return $this;
+    }
+
+    public function tdigest(int $compression, ?string $executionHint = null): self
+    {
+        $this->compression = $compression;
+        $this->executionHint = $executionHint;
+
+        return $this;
+    }
+
+    public function hdr(int $numberOfSignificantValueDigits): self
+    {
+        $this->numberOfSignificantValueDigits = $numberOfSignificantValueDigits;
+
+        return $this;
+    }
+
+    public function payload(): array
+    {
+        $parameters = [
+            'field' => $this->field,
+            'percents' => $this->percents,
+        ];
+
+        // Add keyed parameter
+        if ($this->keyed !== null) {
+            $parameters['keyed'] = $this->keyed;
+        }
+
+        // Add TDigest configuration
+        if ($this->compression !== null || $this->executionHint !== null) {
+            $tdigest = [];
+            if ($this->compression !== null) {
+                $tdigest['compression'] = $this->compression;
+            }
+            if ($this->executionHint !== null) {
+                $tdigest['execution_hint'] = $this->executionHint;
+            }
+            $parameters['tdigest'] = $tdigest;
+        }
+
+        // Add HDR configuration
+        if ($this->numberOfSignificantValueDigits !== null) {
+            $parameters['hdr'] = [
+                'number_of_significant_value_digits' => $this->numberOfSignificantValueDigits,
+            ];
+        }
+
+        // Add missing value handling
+        if ($this->missing !== null) {
+            $parameters['missing'] = $this->missing;
+        }
+
+        return [
+            'percentiles' => $parameters,
+        ];
+    }
+}