V7 add search type and boost

Author: setopt

src/Concerns/InteractsWithIndex.php

@@ -21,8 +21,6 @@ abstract public function tiebreaker(): string;
 
     abstract protected function indexName(): string;
 
-    abstract protected function searchType(): ?string;
-
     protected function settings(): array
     {
         throw new Exception("Need to redefine the method");
@@ -31,17 +29,17 @@ protected function settings(): array
     /**
      * @see SearchIndex::search()
      */
-    public function search(array $dsl): array
+    public function search(array $dsl, ?string $searchType = null): array
     {
-        return $this->resolveClient()->search($this->indexName(), $dsl, $this->searchType());
+        return $this->resolveClient()->search($this->indexName(), $dsl, $searchType);
     }
 
     /**
      * @see SearchIndex::search()
      */
-    public function searchAsync(array $dsl): FutureArray
+    public function searchAsync(array $dsl, ?string $searchType = null): FutureArray
     {
-        return $this->resolveClient()->searchAsync($this->indexName(), $dsl);
+        return $this->resolveClient()->searchAsync($this->indexName(), $dsl, $searchType);
     }
 
     /**

src/Contracts/MultiMatchOptions.php

@@ -15,7 +15,7 @@ public static function make(
         ?string $operator = null,
         ?string $fuzziness = null,
         ?string $minimumShouldMatch = null,
-        ?float $boost = null
+        ?float $boost = null,
     ): static {
         Assert::nullOrOneOf($type, MatchType::cases());
         Assert::nullOrOneOf($operator, ['or', 'and']);

src/Contracts/SearchIndex.php

@@ -15,9 +15,10 @@ public function tiebreaker(): string;
      * Perform search query.
      *
      * @param array $dsl
+     * @param string|null $searchType
      * @return array
      */
-    public function search(array $dsl): array;
+    public function search(array $dsl, ?string $searchType = null): array;
 
     /**
      * Perform delete by query.

src/ElasticClient.php

@@ -36,14 +36,17 @@ public function search(string $indexName, array $dsl, ?string $searchType = null
             );
     }
 
-    public function searchAsync(string $indexName, array $dsl): FutureArray
+    public function searchAsync(string $indexName, array $dsl, ?string $searchType = null): FutureArray
     {
         $this->queryLog?->log($indexName, $dsl);
 
-        return $this->client->search($this->paramsAsync([
-            'index' => $indexName,
-            'body' => $dsl,
-        ]));
+        return $this->client->search($this->paramsAsync(
+            array_filter([
+                'index' => $indexName,
+                'body' => $dsl,
+                'search_type' => $searchType,
+            ]),
+        ));
     }
 
     public function deleteByQuery(string $indexName, array $dsl): array

src/ElasticIndex.php

@@ -26,9 +26,4 @@ protected function indexName(): string
     {
         return $this->name;
     }
-
-    protected function searchType(): ?string
-    {
-        return null;
-    }
 }

src/Search/SearchQuery.php

@@ -36,6 +36,7 @@ class SearchQuery implements SortableQuery, CollapsibleQuery
     protected array $fields = [];
     protected array $include = [];
     protected array $exclude = [];
+    protected ?string $searchType = null;
 
     public function __construct(protected SearchIndex $index)
     {
@@ -169,7 +170,7 @@ protected function execute(
 
         $dsl = array_filter($dsl);
 
-        return $async ? $this->index->searchAsync($dsl) : $this->index->search($dsl);
+        return $async ? $this->index->searchAsync($dsl, $this->searchType) : $this->index->search($dsl, $this->searchType);
     }
 
     protected function sourceToDSL(bool $source): array | bool
@@ -264,6 +265,15 @@ public function skip(int $count): static
         return $this;
     }
 
+    public function searchType(string $searchType): static
+    {
+        Assert::stringNotEmpty($searchType);
+
+        $this->searchType = $searchType;
+
+        return $this;
+    }
+
     //endregion
 
     protected function boolQuery(): BoolQueryBuilder