Reorg and rename mtermvectors

Author: stevejgordon

output/schema/schema.json

@@ -661,13 +661,22 @@ export interface MtermvectorsRequest extends RequestBase {
   version?: VersionNumber
   version_type?: VersionType
   body?: {
-    docs?: MtermvectorsMultiTermVectorOperation[]
+    docs?: MtermvectorsOperation[]
     ids?: Id[]
   }
 }
 
 export interface MtermvectorsResponse {
-  docs: TermvectorsTermVectorsResult[]
+  docs: MtermvectorsTermVectorResult[]
+}
+
+export interface MtermvectorsTermVectorResult {
+  found: boolean
+  id: Id
+  index: IndexName
+  term_vectors: Record<Field, TermvectorsTermVector>
+  took: long
+  version: VersionNumber
 }
 
 export interface OpenPointInTimeRequest extends RequestBase {
@@ -1551,12 +1560,6 @@ export interface SearchTemplateResponse<TDocument = unknown> {
   hits: SearchTypesHitsMetadata<TDocument>
 }
 
-export interface TermvectorsFieldStatistics {
-  doc_count: integer
-  sum_doc_freq: long
-  sum_ttf: long
-}
-
 export interface TermvectorsRequest<TDocument = unknown> extends RequestBase {
   index: IndexName
   id?: Id
@@ -1589,11 +1592,6 @@ export interface TermvectorsResponse {
   _version: VersionNumber
 }
 
-export interface TermvectorsTermVector {
-  field_statistics: TermvectorsFieldStatistics
-  terms: Record<string, TermvectorsTermVectorTerm>
-}
-
 export interface TermvectorsTermVectorFilter {
   max_doc_freq?: integer
   max_num_terms?: integer
@@ -1604,30 +1602,6 @@ export interface TermvectorsTermVectorFilter {
   min_word_length?: integer
 }
 
-export interface TermvectorsTermVectorTerm {
-  doc_freq?: integer
-  score?: double
-  term_freq: integer
-  tokens: TermvectorsToken[]
-  ttf?: integer
-}
-
-export interface TermvectorsTermVectorsResult {
-  found: boolean
-  id: Id
-  index: IndexName
-  term_vectors: Record<Field, TermvectorsTermVector>
-  took: long
-  version: VersionNumber
-}
-
-export interface TermvectorsToken {
-  end_offset?: integer
-  payload?: string
-  position: integer
-  start_offset?: integer
-}
-
 export interface UpdateRequest<TDocument = unknown, TPartialDocument = unknown> extends RequestBase {
   id: Id
   index: IndexName
@@ -4696,6 +4670,32 @@ export interface QueryDslWildcardQuery extends QueryDslQueryBase {
 
 export type QueryDslZeroTermsQuery = 'all' | 'none'
 
+export interface TermvectorsFieldStatistics {
+  doc_count: integer
+  sum_doc_freq: long
+  sum_ttf: long
+}
+
+export interface TermvectorsTermVector {
+  field_statistics: TermvectorsFieldStatistics
+  terms: Record<string, TermvectorsTermVectorTerm>
+}
+
+export interface TermvectorsTermVectorTerm {
+  doc_freq?: integer
+  score?: double
+  term_freq: integer
+  tokens: TermvectorsToken[]
+  ttf?: integer
+}
+
+export interface TermvectorsToken {
+  end_offset?: integer
+  payload?: string
+  position: integer
+  start_offset?: integer
+}
+
 export interface AsyncSearchAsyncSearch<TDocument = unknown> {
   aggregations?: Record<string, AggregationsAggregate>
   _clusters?: ClusterStatistics

output/typescript/types.ts

@@ -27,7 +27,7 @@ import {
   VersionNumber,
   VersionType
 } from '@_types/common'
-import { MultiTermVectorOperation } from './MultiTermVectorOperation'
+import { Operation } from './types'
 
 /**
  * @rest_spec_name mtermvectors
@@ -53,7 +53,7 @@ export interface Request extends RequestBase {
     version_type?: VersionType
   }
   body?: {
-    docs?: MultiTermVectorOperation[]
+    docs?: Operation[]
     ids?: Id[]
   }
 }

specification/_global/mtermvectors/MultiTermVectorsRequest.ts

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { TermVectorsResult } from '@global/termvectors/types'
+import { TermVectorResult } from './types'
 
 export class Response {
-  body: { docs: TermVectorsResult[] }
+  body: { docs: TermVectorResult[] }
 }

specification/_global/mtermvectors/MultiTermVectorsResponse.ts

@@ -18,16 +18,20 @@
  */
 
 import { TermVectorFilter } from '@global/termvectors/types'
+import { Dictionary } from '@spec_utils/Dictionary'
 import {
+  Field,
   Fields,
   Id,
   IndexName,
   Routing,
   VersionNumber,
   VersionType
 } from '@_types/common'
+import { long } from '@_types/Numeric'
+import { TermVector } from '@_types/termvectors/TermVector'
 
-export class MultiTermVectorOperation {
+export class Operation {
   doc: any
   fields: Fields
   field_statistics: boolean
@@ -42,3 +46,12 @@ export class MultiTermVectorOperation {
   version: VersionNumber
   version_type: VersionType
 }
+
+export class TermVectorResult {
+  found: boolean
+  id: Id
+  index: IndexName
+  term_vectors: Dictionary<Field, TermVector>
+  took: long
+  version: VersionNumber
+}

specification/_global/mtermvectors/MultiTermVectorOperation.ts renamed to specification/_global/mtermvectors/types.ts

@@ -20,7 +20,7 @@
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Field, Id, IndexName, Type, VersionNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
-import { TermVector } from './types'
+import { TermVector } from '@_types/termvectors/TermVector'
 
 export class Response {
   body: {

specification/_global/termvectors/TermVectorsResponse.ts

@@ -17,20 +17,7 @@
  * under the License.
  */
 
-import { Dictionary } from '@spec_utils/Dictionary'
-import { Field, Id, IndexName, VersionNumber } from '@_types/common'
-import { double, integer, long } from '@_types/Numeric'
-
-export class FieldStatistics {
-  doc_count: integer
-  sum_doc_freq: long
-  sum_ttf: long
-}
-
-export class TermVector {
-  field_statistics: FieldStatistics
-  terms: Dictionary<string, TermVectorTerm>
-}
+import { integer } from '@_types/Numeric'
 
 export class TermVectorFilter {
   max_doc_freq?: integer
@@ -41,27 +28,3 @@ export class TermVectorFilter {
   min_term_freq?: integer
   min_word_length?: integer
 }
-
-export class TermVectorsResult {
-  found: boolean
-  id: Id
-  index: IndexName
-  term_vectors: Dictionary<Field, TermVector>
-  took: long
-  version: VersionNumber
-}
-
-export class TermVectorTerm {
-  doc_freq?: integer
-  score?: double
-  term_freq: integer
-  tokens: Token[]
-  ttf?: integer
-}
-
-export class Token {
-  end_offset?: integer
-  payload?: string
-  position: integer
-  start_offset?: integer
-}

specification/_global/termvectors/types.ts

@@ -0,0 +1,47 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Dictionary } from '@spec_utils/Dictionary'
+import { double, integer, long } from '@_types/Numeric'
+
+export class TermVector {
+  field_statistics: FieldStatistics
+  terms: Dictionary<string, TermVectorTerm>
+}
+
+export class FieldStatistics {
+  doc_count: integer
+  sum_doc_freq: long
+  sum_ttf: long
+}
+
+export class TermVectorTerm {
+  doc_freq?: integer
+  score?: double
+  term_freq: integer
+  tokens: Token[]
+  ttf?: integer
+}
+
+export class Token {
+  end_offset?: integer
+  payload?: string
+  position: integer
+  start_offset?: integer
+}