@@ -132,15 +132,6 @@ export interface EsqlColumn {
132
132
type : string
133
133
}
134
134
135
- export type EsqlValue = any [ ]
136
-
137
- export type EsqlRow = EsqlValue [ ]
138
-
139
- export interface EsqlResponse {
140
- columns : EsqlColumn [ ]
141
- values : EsqlRow [ ]
142
- }
143
-
144
135
export interface EsqlHelper {
145
136
toRecords : < TDocument > ( ) => Promise < EsqlToRecords < TDocument > >
146
137
toArrowTable : ( ) => Promise < Table < TypeMap > >
@@ -963,7 +954,7 @@ export default class Helpers {
963
954
esql ( params : T . EsqlQueryRequest , reqOptions : TransportRequestOptions = { } ) : EsqlHelper {
964
955
const client = this [ kClient ]
965
956
966
- function toRecords < TDocument > ( response : EsqlResponse ) : TDocument [ ] {
957
+ function toRecords < TDocument > ( response : T . EsqlEsqlResult ) : TDocument [ ] {
967
958
const { columns, values } = response
968
959
return values . map ( row => {
969
960
const doc : Partial < TDocument > = { }
@@ -990,8 +981,7 @@ export default class Helpers {
990
981
991
982
params . format = 'json'
992
983
params . columnar = false
993
- // @ts -expect-error it's typed as ArrayBuffer but we know it will be JSON
994
- const response : EsqlResponse = await client . esql . query ( params , reqOptions )
984
+ const response = await client . esql . query ( params , reqOptions )
995
985
const records : TDocument [ ] = toRecords ( response )
996
986
const { columns } = response
997
987
return { records, columns }
@@ -1005,7 +995,8 @@ export default class Helpers {
1005
995
1006
996
params . format = 'arrow'
1007
997
1008
- const response = await client . esql . query ( params , reqOptions )
998
+ // @ts -expect-error the return type will be ArrayBuffer when the format is set to 'arrow'
999
+ const response : ArrayBuffer = await client . esql . query ( params , reqOptions )
1009
1000
return tableFromIPC ( response )
1010
1001
} ,
1011
1002
@@ -1018,7 +1009,8 @@ export default class Helpers {
1018
1009
1019
1010
params . format = 'arrow'
1020
1011
1021
- const response = await client . esql . query ( params , reqOptions )
1012
+ // @ts -expect-error the return type will be ArrayBuffer when the format is set to 'arrow'
1013
+ const response : ArrayBuffer = await client . esql . query ( params , reqOptions )
1022
1014
return RecordBatchStreamReader . from ( response )
1023
1015
}
1024
1016
}
0 commit comments