Skip to content

Commit bda15ca

Browse files
authored
Fix ndjson APIs (#1688)
1 parent 2cc0fd4 commit bda15ca

File tree

11 files changed

+106
-98
lines changed

11 files changed

+106
-98
lines changed

docs/reference.asciidoc

Lines changed: 87 additions & 79 deletions
Large diffs are not rendered by default.

src/api/api/async_search.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ export default class AsyncSearch {
6565
return await this.transport.request({ path, method, querystring, body }, options)
6666
}
6767

68-
async get<TDocument = unknown> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchGetResponse<TDocument>>
69-
async get<TDocument = unknown> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchGetResponse<TDocument>, unknown>>
70-
async get<TDocument = unknown> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchGetResponse<TDocument>>
71-
async get<TDocument = unknown> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<any> {
68+
async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
69+
async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchGetResponse<TDocument, TAggregations>, unknown>>
70+
async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
71+
async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<any> {
7272
const acceptedPath: string[] = ['id']
7373
const querystring: Record<string, any> = {}
7474
const body = undefined
@@ -109,10 +109,10 @@ export default class AsyncSearch {
109109
return await this.transport.request({ path, method, querystring, body }, options)
110110
}
111111

112-
async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchSubmitResponse<TDocument>>
113-
async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchSubmitResponse<TDocument>, unknown>>
114-
async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchSubmitResponse<TDocument>>
115-
async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<any> {
112+
async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
113+
async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchSubmitResponse<TDocument, TAggregations>, unknown>>
114+
async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
115+
async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<any> {
116116
const acceptedPath: string[] = ['index']
117117
const acceptedBody: string[] = ['aggregations', 'aggs', 'collapse', 'explain', 'from', 'highlight', 'track_total_hits', 'indices_boost', 'docvalue_fields', 'min_score', 'post_filter', 'profile', 'query', 'rescore', 'script_fields', 'search_after', 'size', 'slice', 'sort', '_source', 'fields', 'suggest', 'terminate_after', 'timeout', 'track_scores', 'version', 'seq_no_primary_term', 'stored_fields', 'pit', 'runtime_mappings', 'stats']
118118
const querystring: Record<string, any> = {}

src/api/api/bulk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ export default async function BulkApi<TDocument = unknown, TPartialDocument = un
6868
method = 'POST'
6969
path = '/_bulk'
7070
}
71-
return await this.transport.request({ path, method, querystring, body }, options)
71+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
7272
}

src/api/api/fleet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export default class Fleet {
9696
method = body != null ? 'POST' : 'GET'
9797
path = '/_fleet/_fleet_msearch'
9898
}
99-
return await this.transport.request({ path, method, querystring, body }, options)
99+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
100100
}
101101

102102
async search<TDocument = unknown> (this: That, params: T.FleetSearchRequest | TB.FleetSearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.FleetSearchResponse<TDocument>>

src/api/api/ml.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ export default class Ml {
13071307

13081308
const method = 'POST'
13091309
const path = `/_ml/anomaly_detectors/${encodeURIComponent(params.job_id.toString())}/_data`
1310-
return await this.transport.request({ path, method, querystring, body }, options)
1310+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
13111311
}
13121312

13131313
async previewDataFrameAnalytics (this: That, params?: T.MlPreviewDataFrameAnalyticsRequest | TB.MlPreviewDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.MlPreviewDataFrameAnalyticsResponse>

src/api/api/monitoring.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ export default class Monitoring {
6767

6868
const method = 'POST'
6969
const path = '/_monitoring/bulk'
70-
return await this.transport.request({ path, method, querystring, body }, options)
70+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
7171
}
7272
}

src/api/api/msearch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ export default async function MsearchApi<TDocument = unknown, TAggregations = Re
6868
method = body != null ? 'POST' : 'GET'
6969
path = '/_msearch'
7070
}
71-
return await this.transport.request({ path, method, querystring, body }, options)
71+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
7272
}

src/api/api/msearch_template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ export default async function MsearchTemplateApi<TDocument = unknown, TAggregati
6868
method = body != null ? 'POST' : 'GET'
6969
path = '/_msearch/template'
7070
}
71-
return await this.transport.request({ path, method, querystring, body }, options)
71+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
7272
}

src/api/api/text_structure.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ export default class TextStructure {
6767

6868
const method = 'POST'
6969
const path = '/_text_structure/find_structure'
70-
return await this.transport.request({ path, method, querystring, body }, options)
70+
return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
7171
}
7272
}

src/api/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5634,7 +5634,7 @@ export interface AsyncSearchGetRequest extends RequestBase {
56345634
wait_for_completion_timeout?: Time
56355635
}
56365636

5637-
export type AsyncSearchGetResponse<TDocument = unknown, AsyncSearchTAggregations = unknown> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, AsyncSearchTAggregations>
5637+
export type AsyncSearchGetResponse<TDocument = unknown, TAggregations = Record<AggregateName, AggregationsAggregate>> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, TAggregations>
56385638

56395639
export interface AsyncSearchStatusRequest extends RequestBase {
56405640
id: Id
@@ -5714,7 +5714,7 @@ export interface AsyncSearchSubmitRequest extends RequestBase {
57145714
runtime_mappings?: MappingRuntimeFields
57155715
}
57165716

5717-
export type AsyncSearchSubmitResponse<TDocument = unknown, AsyncSearchTAggregations = unknown> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, AsyncSearchTAggregations>
5717+
export type AsyncSearchSubmitResponse<TDocument = unknown, TAggregations = Record<AggregateName, AggregationsAggregate>> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, TAggregations>
57185718

57195719
export interface AutoscalingAutoscalingPolicy {
57205720
roles: string[]

src/api/typesWithBodyKey.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5734,7 +5734,7 @@ export interface AsyncSearchGetRequest extends RequestBase {
57345734
wait_for_completion_timeout?: Time
57355735
}
57365736

5737-
export type AsyncSearchGetResponse<TDocument = unknown, AsyncSearchTAggregations = unknown> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, AsyncSearchTAggregations>
5737+
export type AsyncSearchGetResponse<TDocument = unknown, TAggregations = Record<AggregateName, AggregationsAggregate>> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, TAggregations>
57385738

57395739
export interface AsyncSearchStatusRequest extends RequestBase {
57405740
id: Id
@@ -5831,7 +5831,7 @@ export interface AsyncSearchSubmitRequest extends RequestBase {
58315831
}
58325832
}
58335833

5834-
export type AsyncSearchSubmitResponse<TDocument = unknown, AsyncSearchTAggregations = unknown> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, AsyncSearchTAggregations>
5834+
export type AsyncSearchSubmitResponse<TDocument = unknown, TAggregations = Record<AggregateName, AggregationsAggregate>> = AsyncSearchAsyncSearchDocumentResponseBase<TDocument, TAggregations>
58355835

58365836
export interface AutoscalingAutoscalingPolicy {
58375837
roles: string[]

0 commit comments

Comments
 (0)