Merge branch 'main' into inference-spec

elastic · Nov 6, 2023 · 4509e97 · 4509e97
2 parents 513f1df + 9f40be8
commit 4509e97
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 41 deletions.
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
@@ -26324,7 +26324,14 @@
                   "description": "Array of wildcard (`*`) patterns.\nThe request returns doc values for field names matching these patterns in the `hits.fields` property of the response.",
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                    "oneOf": [
+                      {
+                        "$ref": "#/components/schemas/_types:Field"
+                      },
+                      {
+                        "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                      }
+                    ]
                   }
                 },
                 "knn": {
@@ -26399,7 +26406,14 @@
                   "description": "Array of wildcard (`*`) patterns.\nThe request returns values for field names matching these patterns in the `hits.fields` property of the response.",
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                    "oneOf": [
+                      {
+                        "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                      },
+                      {
+                        "$ref": "#/components/schemas/_types:Field"
+                      }
+                    ]
                   }
                 },
                 "suggest": {
@@ -34085,6 +34099,9 @@
           {
             "type": "boolean"
           },
+          {
+            "$ref": "#/components/schemas/_types:Fields"
+          },
           {
             "$ref": "#/components/schemas/_global.search._types:SourceFilter"
           }
@@ -54996,7 +55013,14 @@
             "description": "Array of wildcard (*) patterns. The request returns doc values for field\nnames matching these patterns in the hits.fields property of the response.",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/_types:Field"
+                },
+                {
+                  "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                }
+              ]
             }
           },
           "knn": {
@@ -55077,7 +55101,14 @@
             "description": "Array of wildcard (*) patterns. The request returns values for field names\nmatching these patterns in the hits.fields property of the response.",
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/_types:Field"
+                },
+                {
+                  "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
+                }
+              ]
             }
           },
           "terminate_after": {

diff --git a/output/schema/schema.json b/output/schema/schema.json
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
diff --git a/specification/_global/msearch/types.ts b/specification/_global/msearch/types.ts
@@ -23,6 +23,7 @@ import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import {
   ExpandWildcards,
+  Field,
   Fields,
   IndexName,
   Indices,
@@ -96,7 +97,7 @@ export class MultisearchBody {
    * 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[]
+  docvalue_fields?: Array<Field | FieldAndFormat>
   /**
    * Defines the approximate kNN search to run.
    * @availability stack since=8.4.0
@@ -146,7 +147,7 @@ export class MultisearchBody {
    * 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>
+  fields?: Array<Field | FieldAndFormat>
   /**
    * Maximum number of documents to collect for each shard. If a query reaches this
    * limit, Elasticsearch terminates the query early. Elasticsearch collects documents

diff --git a/specification/_global/search/SearchRequest.ts b/specification/_global/search/SearchRequest.ts
@@ -371,7 +371,7 @@ export interface Request extends RequestBase {
      * 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[]
+    docvalue_fields?: Array<Field | FieldAndFormat>
     /**
      * Defines the approximate kNN search to run.
      * @availability stack since=8.4.0
@@ -442,7 +442,7 @@ export interface Request extends RequestBase {
      * 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>
+    fields?: Array<FieldAndFormat | Field>
     /**
      * Defines a suggester that provides similar looking terms based on a provided text.
      */

diff --git a/specification/_global/search/_types/SourceFilter.ts b/specification/_global/search/_types/SourceFilter.ts
@@ -32,9 +32,9 @@ export class SourceFilter {
 
 /**
  * Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.
- * @codegen_names fetch, filter
+ * @codegen_names fetch, fields, filter
  */
-export type SourceConfig = boolean | SourceFilter
+export type SourceConfig = boolean | Fields | SourceFilter
 
 /**
  * Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.