search body refactor + object script

Author: l-trotta

output/openapi/elasticsearch-openapi.json

@@ -44,6 +44,12 @@
       ],
       "response": []
     },
+    "fleet.msearch": {
+      "request": [
+        "interface definition _types:RankContainer - Property rrf is a single-variant and must be required"
+      ],
+      "response": []
+    },
     "get_source": {
       "request": [
         "Request: query parameter 'stored_fields' does not exist in the json spec"
@@ -87,12 +93,6 @@
       ],
       "response": []
     },
-    "search": {
-      "request": [
-        "interface definition _types:RankContainer - Property rrf is a single-variant and must be required"
-      ],
-      "response": []
-    },
     "search_mvt": {
       "request": [
         "Request: query parameter 'grid_agg' does not exist in the json spec",

output/openapi/elasticsearch-serverless-openapi.json

@@ -18,36 +18,15 @@
  */
 
 import { ResponseBody as SearchResponse } from '@global/search/SearchResponse'
-import { FieldCollapse } from '@global/search/_types/FieldCollapse'
-import { Highlight } from '@global/search/_types/highlighting'
-import { TrackHits } from '@global/search/_types/hits'
-import { PointInTimeReference } from '@global/search/_types/PointInTimeReference'
-import { Rescore } from '@global/search/_types/rescoring'
-import { SourceConfig } from '@global/search/_types/SourceFilter'
-import { Suggester } from '@global/search/_types/suggester'
-import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
-import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
-import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
+import { SearchRequestBody } from '@global/search/_types/SearchRequestBody'
 import { ErrorResponseBase } from '@_types/Base'
-import {
-  ExpandWildcards,
-  Fields,
-  IndexName,
-  Indices,
-  Routing,
-  SearchType
-} from '@_types/common'
-import { KnnSearch } from '@_types/Knn'
-import { RuntimeFields } from '@_types/mapping/RuntimeFields'
-import { double, integer, long } from '@_types/Numeric'
-import { FieldAndFormat, QueryContainer } from '@_types/query_dsl/abstractions'
-import { ScriptField } from '@_types/Scripting'
-import { Sort, SortResults } from '@_types/sort'
+import { ExpandWildcards, Indices, Routing, SearchType } from '@_types/common'
+import { integer, long } from '@_types/Numeric'
 
 /**
  * @codegen_names header, body
  */
-export type RequestItem = MultisearchHeader | MultisearchBody
+export type RequestItem = MultisearchHeader | SearchRequestBody
 
 /**
  * Contains parameters used to limit or change the subsequent search body request.
@@ -66,143 +45,6 @@ export class MultisearchHeader {
   ignore_throttled?: boolean
 }
 
-// We should keep this in sync with the normal search request body.
-export class MultisearchBody {
-  /**
-   * @aliases aggs
-   * @ext_doc_id search-aggregations
-   */ // ES uses "aggregations" in serialization
-  aggregations?: Dictionary<string, AggregationContainer>
-  collapse?: FieldCollapse
-  /**
-   * Defines the search definition using the Query DSL.
-   */
-  query?: QueryContainer
-  /**
-   * If true, returns detailed information about score computation as part of a hit.
-   * @server_default false
-   */
-  explain?: boolean
-  /**
-   * Configuration of search extensions defined by Elasticsearch plugins.
-   */
-  ext?: Dictionary<string, UserDefinedValue>
-  /**
-   * List of stored fields to return as part of a hit. If no fields are specified,
-   * no stored fields are included in the response. If this field is specified, the _source
-   * parameter defaults to false. You can pass _source: true to return both source fields
-   * and stored fields in the search response.
-   */
-  stored_fields?: Fields
-  /**
-   * Array of wildcard (*) patterns. The request returns doc values for field
-   * names matching these patterns in the hits.fields property of the response.
-   */
-  docvalue_fields?: FieldAndFormat[]
-  /**
-   * Defines the approximate kNN search to run.
-   * @availability stack since=8.4.0
-   * @availability serverless
-   */
-  knn?: KnnSearch | KnnSearch[]
-  /**
-   * Starting document offset. By default, you cannot page through more than 10,000
-   * hits using the from and size parameters. To page through more hits, use the
-   * search_after parameter.
-   * @server_default 0
-   */
-  from?: integer
-  highlight?: Highlight
-  /**
-   * Boosts the _score of documents from specified indices.
-   */
-  indices_boost?: Array<SingleKeyDictionary<IndexName, double>>
-  /**
-   * Minimum _score for matching documents. Documents with a lower _score are
-   * not included in the search results.
-   */
-  min_score?: double
-  post_filter?: QueryContainer
-  profile?: boolean
-  rescore?: Rescore | Rescore[]
-  /**
-   * Retrieve a script evaluation (based on different fields) for each hit.
-   */
-  script_fields?: Dictionary<string, ScriptField>
-  search_after?: SortResults
-  /**
-   * The number of hits to return. By default, you cannot page through more
-   * than 10,000 hits using the from and size parameters. To page through more
-   * hits, use the search_after parameter.
-   * @server_default 10
-   */
-  size?: integer
-  /** @doc_id sort-search-results */
-  sort?: Sort
-  /**
-   * Indicates which source fields are returned for matching documents. These
-   * fields are returned in the hits._source property of the search response.
-   */
-  _source?: SourceConfig
-  /**
-   * Array of wildcard (*) patterns. The request returns values for field names
-   * matching these patterns in the hits.fields property of the response.
-   */
-  fields?: Array<FieldAndFormat>
-  /**
-   * Maximum number of documents to collect for each shard. If a query reaches this
-   * limit, Elasticsearch terminates the query early. Elasticsearch collects documents
-   * before sorting. Defaults to 0, which does not terminate query execution early.
-   * @server_default 0
-   */
-  terminate_after?: long
-  /**
-   * Stats groups to associate with the search. Each group maintains a statistics
-   * aggregation for its associated searches. You can retrieve these stats using
-   * the indices stats API.
-   */
-  stats?: string[]
-  /**
-   * Specifies the period of time to wait for a response from each shard. If no response
-   * is received before the timeout expires, the request fails and returns an error.
-   * Defaults to no timeout.
-   */
-  timeout?: string
-  /**
-   * If true, calculate and return document scores, even if the scores are not used for sorting.
-   * @server_default false
-   */
-  track_scores?: boolean
-  /**
-   * Number of hits matching the query to count accurately. If true, the exact
-   * number of hits is returned at the cost of some performance. If false, the
-   * response does not include the total number of hits matching the query.
-   * Defaults to 10,000 hits.
-   */
-  track_total_hits?: TrackHits
-  /**
-   * If true, returns document version as part of a hit.
-   * @server_default false
-   */
-  version?: boolean
-  /**
-   * Defines one or more runtime fields in the search request. These fields take
-   * precedence over mapped fields with the same name.
-   */
-  runtime_mappings?: RuntimeFields
-  /**
-   * If true, returns sequence number and primary term of the last modification
-   * of each hit. See Optimistic concurrency control.
-   */
-  seq_no_primary_term?: boolean
-  /**
-   * Limits the search to a point in time (PIT). If you provide a PIT, you
-   * cannot specify an <index> in the request path.
-   */
-  pit?: PointInTimeReference
-  suggest?: Suggester
-}
-
 export class MultiSearchResult<TDocument> {
   took: long
   responses: Array<ResponseItem<TDocument>>

output/schema/schema-serverless.json

@@ -17,7 +17,12 @@
  * under the License.
  */
 
+import { FieldCollapse } from '@global/search/_types/FieldCollapse'
+import { Highlight } from '@global/search/_types/highlighting'
 import { TrackHits } from '@global/search/_types/hits'
+import { PointInTimeReference } from '@global/search/_types/PointInTimeReference'
+import { Rescore } from '@global/search/_types/rescoring'
+import { Suggester } from '@global/search/_types/suggester'
 import { Dictionary, SingleKeyDictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
@@ -43,12 +48,7 @@ import { ScriptField } from '@_types/Scripting'
 import { SlicedScroll } from '@_types/SlicedScroll'
 import { Sort, SortResults } from '@_types/sort'
 import { Duration } from '@_types/Time'
-import { FieldCollapse } from './_types/FieldCollapse'
-import { Highlight } from './_types/highlighting'
-import { PointInTimeReference } from './_types/PointInTimeReference'
-import { Rescore } from './_types/rescoring'
 import { SourceConfig, SourceConfigParam } from './_types/SourceFilter'
-import { Suggester } from './_types/suggester'
 
 /**
  * Run a search.
@@ -383,7 +383,7 @@ export interface Request extends RequestBase {
      */
     force_synthetic_source?: boolean
   }
-  // We should keep this in sync with the multi search request body.
+  // Keep this in sync with global/search/_types/SearchRequestBody.ts
   body: {
     /**
      * Defines the aggregations that are run as part of the search request.