Unify DocValueField and FieldAndFormat

Author: swallez

output/schema/schema.json

@@ -18,13 +18,10 @@
  */
 
 import { RequestBase } from '@_types/Base'
-import { Field, Fields, Indices, Routing } from '@_types/common'
+import { Fields, Indices, Routing } from '@_types/common'
 import { Query } from './_types/Knn'
-import {
-  DocValueField,
-  SourceConfig,
-  SourceFilter
-} from '@global/search/_types/SourceFilter'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
+import { FieldAndFormat } from '@_types/query_dsl/abstractions'
 
 /**
  * @rest_spec_name knn_search
@@ -55,7 +52,7 @@ export interface Request extends RequestBase {
      * The request returns doc values for field names matching these patterns
      * in the hits.fields property of the response. Accepts wildcard (*) patterns.
      */
-    docvalue_fields?: DocValueField[]
+    docvalue_fields?: FieldAndFormat[]
     /**
      * 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

output/typescript/types.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { SourceConfig, SourceFilter } from '@global/search/_types/SourceFilter'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {

specification/_global/knn_search/KnnSearchRequest.ts

@@ -43,12 +43,7 @@ import { Highlight } from './_types/highlighting'
 import { PointInTimeReference } from './_types/PointInTimeReference'
 import { Rescore } from './_types/rescoring'
 import { Sort, SortResults } from './_types/sort'
-import {
-  DocValueField,
-  GetSourceConfig,
-  SourceConfig,
-  SourceFilter
-} from './_types/SourceFilter'
+import { GetSourceConfig, SourceConfig } from './_types/SourceFilter'
 import { Suggester } from './_types/suggester'
 import { TrackHits } from '@global/search/_types/hits'
 
@@ -144,7 +139,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?: DocValueField[]
+    docvalue_fields?: FieldAndFormat[]
     /**
      * Minimum _score for matching documents. Documents with a lower _score are
      * not included in the search results.

specification/_global/mget/types.ts

@@ -38,9 +38,3 @@ export type SourceConfig = boolean | SourceFilter
 
 /** @codegen_names fetch, fields */
 export type GetSourceConfig = boolean | Fields
-
-/** @shortcut_property field */
-export class DocValueField {
-  field: Field
-  format?: string
-}

specification/_global/search/SearchRequest.ts

@@ -76,6 +76,7 @@ export type HighlighterType = BuiltinHighlighterType | string
 
 export enum BuiltinHighlighterType {
   plain = 0,
+  /** @codegen_name fast_vector */
   fvh = 1,
   unified = 2
 }

specification/_global/search/_types/SourceFilter.ts

@@ -35,7 +35,7 @@ import { ScriptField } from '@_types/Scripting'
 import { FieldCollapse } from './FieldCollapse'
 import { Highlight } from './highlighting'
 import { Sort, SortResults } from './sort'
-import { SourceConfig, SourceFilter } from './SourceFilter'
+import { SourceConfig } from './SourceFilter'
 import { FieldAndFormat } from '@_types/query_dsl/abstractions'
 
 export class Hit<TDocument> {

specification/_global/search/_types/highlighting.ts

@@ -19,7 +19,7 @@
 
 import { Highlight } from '@global/search/_types/highlighting'
 import { SortOrder, Sort } from '@global/search/_types/sort'
-import { SourceConfig, SourceFilter } from '@global/search/_types/SourceFilter'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { Field, Fields } from '@_types/common'

specification/_global/search/_types/hits.ts

@@ -44,10 +44,8 @@ import { PointInTimeReference } from '@global/search/_types/PointInTimeReference
 import { Rescore } from '@global/search/_types/rescoring'
 import { Sort, SortResults } from '@global/search/_types/sort'
 import {
-  DocValueField,
   GetSourceConfig,
-  SourceConfig,
-  SourceFilter
+  SourceConfig
 } from '@global/search/_types/SourceFilter'
 import { Suggester } from '@global/search/_types/suggester'
 import { TrackHits } from '@global/search/_types/hits'
@@ -151,7 +149,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?: DocValueField[]
+    docvalue_fields?: FieldAndFormat[]
     /**
      * Minimum _score for matching documents. Documents with a lower _score are
      * not included in the search results.

specification/_types/aggregations/metric.ts

@@ -18,7 +18,7 @@
  */
 
 import { Sort } from '@global/search/_types/sort'
-import { SourceConfig, SourceFilter } from '@global/search/_types/SourceFilter'
+import { SourceConfig } from '@global/search/_types/SourceFilter'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Field, Fields } from '@_types/common'
 import { long } from '@_types/Numeric'