Revert "Allow single fields in fields and _source parameters (#2317)" (…

…#2341) This reverts commit 9f40be8.
elastic · Nov 7, 2023 · 3893113 · 3893113
1 parent e627f16
commit 3893113
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 129 deletions.
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
@@ -26307,14 +26307,7 @@
                   "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": {
-                    "oneOf": [
-                      {
-                        "$ref": "#/components/schemas/_types:Field"
-                      },
-                      {
-                        "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
-                      }
-                    ]
+                    "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
                   }
                 },
                 "knn": {
@@ -26389,14 +26382,7 @@
                   "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": {
-                    "oneOf": [
-                      {
-                        "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
-                      },
-                      {
-                        "$ref": "#/components/schemas/_types:Field"
-                      }
-                    ]
+                    "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
                   }
                 },
                 "suggest": {
@@ -34082,9 +34068,6 @@
           {
             "type": "boolean"
           },
-          {
-            "$ref": "#/components/schemas/_types:Fields"
-          },
           {
             "$ref": "#/components/schemas/_global.search._types:SourceFilter"
           }
@@ -54996,14 +54979,7 @@
             "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": {
-              "oneOf": [
-                {
-                  "$ref": "#/components/schemas/_types:Field"
-                },
-                {
-                  "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
-                }
-              ]
+              "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
             }
           },
           "knn": {
@@ -55084,14 +55060,7 @@
             "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": {
-              "oneOf": [
-                {
-                  "$ref": "#/components/schemas/_types:Field"
-                },
-                {
-                  "$ref": "#/components/schemas/_types.query_dsl:FieldAndFormat"
-                }
-              ]
+              "$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,7 +23,6 @@ import { Dictionary } from '@spec_utils/Dictionary'
 import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
 import {
   ExpandWildcards,
-  Field,
   Fields,
   IndexName,
   Indices,
@@ -97,7 +96,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?: Array<Field | FieldAndFormat>
+  docvalue_fields?: FieldAndFormat[]
   /**
    * Defines the approximate kNN search to run.
    * @availability stack since=8.4.0
@@ -147,7 +146,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<Field | FieldAndFormat>
+  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

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?: Array<Field | FieldAndFormat>
+    docvalue_fields?: 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 | Field>
+    fields?: Array<FieldAndFormat>
     /**
      * 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, fields, filter
+ * @codegen_names fetch, filter
  */
-export type SourceConfig = boolean | Fields | SourceFilter
+export type SourceConfig = boolean | SourceFilter
 
 /**
  * Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.