diff --git a/src/api/api/async_search.ts b/src/api/api/async_search.ts
index 8cd6b4175..4385269e7 100644
--- a/src/api/api/async_search.ts
+++ b/src/api/api/async_search.ts
@@ -114,16 +114,15 @@ export default class AsyncSearch {
   async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchSubmitResponse<TDocument>>
   async submit<TDocument = unknown> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const acceptedBody: string[] = ['aggs', 'aggregations', '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']
+    const acceptedBody: string[] = ['aggregations', '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']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -131,7 +130,12 @@ export default class AsyncSearch {
       if (acceptedBody.includes(key)) {
         body = body ?? {}
         // @ts-expect-error
-        body[key] = params[key]
+        if (key === 'sort' && typeof params[key] === 'string' && params[key].includes(':')) {
+          querystring[key] = params[key]
+        } else {
+          // @ts-expect-error
+          body[key] = params[key]
+        }
       } else if (acceptedPath.includes(key)) {
         continue
       } else if (key !== 'body') {
diff --git a/src/api/api/ccr.ts b/src/api/api/ccr.ts
index ae8243b25..63c7ada21 100644
--- a/src/api/api/ccr.ts
+++ b/src/api/api/ccr.ts
@@ -72,14 +72,13 @@ export default class Ccr {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['leader_index', 'max_outstanding_read_requests', 'max_outstanding_write_requests', 'max_read_request_operation_count', 'max_read_request_size', 'max_retry_delay', 'max_write_buffer_count', 'max_write_buffer_size', 'max_write_request_operation_count', 'max_write_request_size', 'read_poll_timeout', 'remote_cluster']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -151,14 +150,13 @@ export default class Ccr {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['follower_cluster', 'follower_index', 'follower_index_uuid', 'leader_remote_cluster']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -260,14 +258,13 @@ export default class Ccr {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['remote_cluster', 'follow_index_pattern', 'leader_index_patterns', 'leader_index_exclusion_patterns', 'max_outstanding_read_requests', 'settings', 'max_outstanding_write_requests', 'read_poll_timeout', 'max_read_request_operation_count', 'max_read_request_size', 'max_retry_delay', 'max_write_buffer_count', 'max_write_buffer_size', 'max_write_request_operation_count', 'max_write_request_size']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -317,14 +314,13 @@ export default class Ccr {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['max_outstanding_read_requests', 'max_outstanding_write_requests', 'max_read_request_operation_count', 'max_read_request_size', 'max_retry_delay', 'max_write_buffer_count', 'max_write_buffer_size', 'max_write_request_operation_count', 'max_write_request_size', 'read_poll_timeout']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/clear_scroll.ts b/src/api/api/clear_scroll.ts
index d29ecb2d6..a14482cd7 100644
--- a/src/api/api/clear_scroll.ts
+++ b/src/api/api/clear_scroll.ts
@@ -44,14 +44,13 @@ export default async function ClearScrollApi (this: That, params?: T.ClearScroll
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['scroll_id']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/close_point_in_time.ts b/src/api/api/close_point_in_time.ts
index 6b5234372..4e1a7d4b1 100644
--- a/src/api/api/close_point_in_time.ts
+++ b/src/api/api/close_point_in_time.ts
@@ -44,14 +44,13 @@ export default async function ClosePointInTimeApi (this: That, params: T.ClosePo
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['id']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/cluster.ts b/src/api/api/cluster.ts
index b812e99f6..1abdbdf8c 100644
--- a/src/api/api/cluster.ts
+++ b/src/api/api/cluster.ts
@@ -50,14 +50,13 @@ export default class Cluster {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['current_node', 'index', 'primary', 'shard']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -282,14 +281,13 @@ export default class Cluster {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['template', 'aliases', 'mappings', 'settings', 'version', '_meta']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -317,14 +315,13 @@ export default class Cluster {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['persistent', 'transient']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -376,14 +373,13 @@ export default class Cluster {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['commands']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/count.ts b/src/api/api/count.ts
index 4cb8af96a..aec469fd7 100644
--- a/src/api/api/count.ts
+++ b/src/api/api/count.ts
@@ -44,14 +44,13 @@ export default async function CountApi (this: That, params?: T.CountRequest | TB
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['query']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/delete_by_query.ts b/src/api/api/delete_by_query.ts
index 7c4194f78..665bfe810 100644
--- a/src/api/api/delete_by_query.ts
+++ b/src/api/api/delete_by_query.ts
@@ -44,14 +44,13 @@ export default async function DeleteByQueryApi (this: That, params: T.DeleteByQu
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['max_docs', 'query', 'slice']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/enrich.ts b/src/api/api/enrich.ts
index 8ab9e6167..74909ed40 100644
--- a/src/api/api/enrich.ts
+++ b/src/api/api/enrich.ts
@@ -124,14 +124,13 @@ export default class Enrich {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['geo_match', 'match']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/eql.ts b/src/api/api/eql.ts
index 93c815f92..73aabaa57 100644
--- a/src/api/api/eql.ts
+++ b/src/api/api/eql.ts
@@ -116,14 +116,13 @@ export default class Eql {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['query', 'case_sensitive', 'event_category_field', 'tiebreaker_field', 'timestamp_field', 'fetch_size', 'filter', 'keep_alive', 'keep_on_completion', 'wait_for_completion_timeout', 'size', 'fields', 'result_position']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/explain.ts b/src/api/api/explain.ts
index 37a29cd5f..4235f64c1 100644
--- a/src/api/api/explain.ts
+++ b/src/api/api/explain.ts
@@ -44,14 +44,13 @@ export default async function ExplainApi<TDocument = unknown> (this: That, param
   const acceptedPath: string[] = ['id', 'index']
   const acceptedBody: string[] = ['query']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/field_caps.ts b/src/api/api/field_caps.ts
index f1d1e33a4..d558bd531 100644
--- a/src/api/api/field_caps.ts
+++ b/src/api/api/field_caps.ts
@@ -44,14 +44,13 @@ export default async function FieldCapsApi (this: That, params?: T.FieldCapsRequ
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['index_filter', 'runtime_mappings']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/fleet.ts b/src/api/api/fleet.ts
index c50913d9a..91a82d88c 100644
--- a/src/api/api/fleet.ts
+++ b/src/api/api/fleet.ts
@@ -86,10 +86,10 @@ export default class Fleet {
     let path = ''
     if (params.index != null) {
       method = body != null ? 'POST' : 'GET'
-      path = `/${encodeURIComponent(params.index.toString())}/_fleet/_msearch`
+      path = `/${encodeURIComponent(params.index.toString())}/_fleet/_fleet_msearch`
     } else {
       method = body != null ? 'POST' : 'GET'
-      path = '/_fleet/_msearch'
+      path = '/_fleet/_fleet_msearch'
     }
     return await this.transport.request({ path, method, querystring, bulkBody: body }, options)
   }
@@ -112,7 +112,7 @@ export default class Fleet {
     }
 
     const method = body != null ? 'POST' : 'GET'
-    const path = `/${encodeURIComponent(params.index.toString())}/_fleet/_search`
+    const path = `/${encodeURIComponent(params.index.toString())}/_fleet/_fleet_search`
     return await this.transport.request({ path, method, querystring, body }, options)
   }
 }
diff --git a/src/api/api/graph.ts b/src/api/api/graph.ts
index 9342c73ca..fdfb8d7f6 100644
--- a/src/api/api/graph.ts
+++ b/src/api/api/graph.ts
@@ -50,14 +50,13 @@ export default class Graph {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['connections', 'controls', 'query', 'vertices']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/ilm.ts b/src/api/api/ilm.ts
index e8775bd9f..a7887e21e 100644
--- a/src/api/api/ilm.ts
+++ b/src/api/api/ilm.ts
@@ -169,14 +169,13 @@ export default class Ilm {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['current_step', 'next_step']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -204,14 +203,13 @@ export default class Ilm {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['policy']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/indices.ts b/src/api/api/indices.ts
index 45c8e3039..b71fdc405 100644
--- a/src/api/api/indices.ts
+++ b/src/api/api/indices.ts
@@ -72,14 +72,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['analyzer', 'attributes', 'char_filter', 'explain', 'field', 'filter', 'normalizer', 'text', 'tokenizer']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -145,14 +144,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index', 'target']
     const acceptedBody: string[] = ['aliases', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -202,14 +200,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['aliases', 'mappings', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -620,28 +617,6 @@ export default class Indices {
     return await this.transport.request({ path, method, querystring, body }, options)
   }
 
-  async freeze (this: That, params: T.IndicesFreezeRequest | TB.IndicesFreezeRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.IndicesFreezeResponse>
-  async freeze (this: That, params: T.IndicesFreezeRequest | TB.IndicesFreezeRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.IndicesFreezeResponse, unknown>>
-  async freeze (this: That, params: T.IndicesFreezeRequest | TB.IndicesFreezeRequest, options?: TransportRequestOptions): Promise<T.IndicesFreezeResponse>
-  async freeze (this: That, params: T.IndicesFreezeRequest | TB.IndicesFreezeRequest, options?: TransportRequestOptions): Promise<any> {
-    const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
-
-    for (const key in params) {
-      if (acceptedPath.includes(key)) {
-        continue
-      } else if (key !== 'body') {
-        // @ts-expect-error
-        querystring[key] = params[key]
-      }
-    }
-
-    const method = 'POST'
-    const path = `/${encodeURIComponent(params.index.toString())}/_freeze`
-    return await this.transport.request({ path, method, querystring, body }, options)
-  }
-
   async get (this: That, params: T.IndicesGetRequest | TB.IndicesGetRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.IndicesGetResponse>
   async get (this: That, params: T.IndicesGetRequest | TB.IndicesGetRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.IndicesGetResponse, unknown>>
   async get (this: That, params: T.IndicesGetRequest | TB.IndicesGetRequest, options?: TransportRequestOptions): Promise<T.IndicesGetResponse>
@@ -980,14 +955,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index', 'name']
     const acceptedBody: string[] = ['filter', 'index_routing', 'is_write_index', 'routing', 'search_routing']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1022,14 +996,13 @@ export default class Indices {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['index_patterns', 'composed_of', 'template', 'data_stream', 'priority', 'version', '_meta']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1057,14 +1030,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['date_detection', 'dynamic', 'dynamic_date_formats', 'dynamic_templates', '_field_names', '_meta', 'numeric_detection', 'properties', '_routing', '_source', 'runtime']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1126,14 +1098,13 @@ export default class Indices {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['aliases', 'index_patterns', 'mappings', 'order', 'settings', 'version']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1265,14 +1236,13 @@ export default class Indices {
     const acceptedPath: string[] = ['alias', 'new_index']
     const acceptedBody: string[] = ['aliases', 'conditions', 'mappings', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1367,14 +1337,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index', 'target']
     const acceptedBody: string[] = ['aliases', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1402,14 +1371,13 @@ export default class Indices {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['index_patterns', 'composed_of', 'overlapping', 'template']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1471,14 +1439,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index', 'target']
     const acceptedBody: string[] = ['aliases', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1564,14 +1531,13 @@ export default class Indices {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['actions']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -1600,14 +1566,13 @@ export default class Indices {
     const acceptedPath: string[] = ['index', 'type']
     const acceptedBody: string[] = ['query']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/ingest.ts b/src/api/api/ingest.ts
index 58a9fce71..ac7b77cd2 100644
--- a/src/api/api/ingest.ts
+++ b/src/api/api/ingest.ts
@@ -148,14 +148,13 @@ export default class Ingest {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['_meta', 'description', 'on_failure', 'processors', 'version']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -183,14 +182,13 @@ export default class Ingest {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['docs', 'pipeline']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/knn_search.ts b/src/api/api/knn_search.ts
index 4f6ffff5f..6431d505e 100644
--- a/src/api/api/knn_search.ts
+++ b/src/api/api/knn_search.ts
@@ -37,19 +37,31 @@ import * as T from '../types'
 import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
-export default async function KnnSearchApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise<T.TODO>
-export default async function KnnSearchApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.TODO, unknown>>
-export default async function KnnSearchApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<T.TODO>
-export default async function KnnSearchApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<any> {
+export default async function KnnSearchApi<TDocument = unknown> (this: That, params: T.KnnSearchRequest | TB.KnnSearchRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.KnnSearchResponse<TDocument>>
+export default async function KnnSearchApi<TDocument = unknown> (this: That, params: T.KnnSearchRequest | TB.KnnSearchRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.KnnSearchResponse<TDocument>, unknown>>
+export default async function KnnSearchApi<TDocument = unknown> (this: That, params: T.KnnSearchRequest | TB.KnnSearchRequest, options?: TransportRequestOptions): Promise<T.KnnSearchResponse<TDocument>>
+export default async function KnnSearchApi<TDocument = unknown> (this: That, params: T.KnnSearchRequest | TB.KnnSearchRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['index']
+  const acceptedBody: string[] = ['_source', 'docvalue_fields', 'stored_fields', 'fields', 'knn']
   const querystring: Record<string, any> = {}
-  const body = undefined
+  // @ts-expect-error
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
+  } else {
+    body = userBody != null ? { ...userBody } : undefined
+  }
 
-  params = params ?? {}
   for (const key in params) {
-    if (acceptedPath.includes(key)) {
+    if (acceptedBody.includes(key)) {
+      body = body ?? {}
+      // @ts-expect-error
+      body[key] = params[key]
+    } else if (acceptedPath.includes(key)) {
       continue
     } else if (key !== 'body') {
+      // @ts-expect-error
       querystring[key] = params[key]
     }
   }
diff --git a/src/api/api/license.ts b/src/api/api/license.ts
index 3960c0f44..26c4e59e7 100644
--- a/src/api/api/license.ts
+++ b/src/api/api/license.ts
@@ -142,14 +142,13 @@ export default class License {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['license', 'licenses']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/mget.ts b/src/api/api/mget.ts
index 5e9217999..a0d678656 100644
--- a/src/api/api/mget.ts
+++ b/src/api/api/mget.ts
@@ -44,14 +44,13 @@ export default async function MgetApi<TDocument = unknown> (this: That, params?:
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['docs', 'ids']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/ml.ts b/src/api/api/ml.ts
index e01d99111..4d0476bae 100644
--- a/src/api/api/ml.ts
+++ b/src/api/api/ml.ts
@@ -182,14 +182,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['requests_per_second', 'timeout']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -364,14 +363,13 @@ export default class Ml {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['analysis_config', 'max_bucket_cardinality', 'overall_cardinality']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -400,14 +398,13 @@ export default class Ml {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['evaluation', 'index', 'query']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -435,14 +432,13 @@ export default class Ml {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['source', 'dest', 'analysis', 'description', 'model_memory_limit', 'max_num_threads', 'analyzed_fields', 'allow_lazy_start']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -477,14 +473,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['advance_time', 'calc_interim', 'end', 'start']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -512,14 +507,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['duration', 'expires_in', 'max_model_memory']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -545,16 +539,15 @@ export default class Ml {
   async getBuckets (this: That, params: T.MlGetBucketsRequest | TB.MlGetBucketsRequest, options?: TransportRequestOptions): Promise<T.MlGetBucketsResponse>
   async getBuckets (this: That, params: T.MlGetBucketsRequest | TB.MlGetBucketsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['job_id', 'timestamp']
-    const acceptedBody: string[] = ['anomaly_score', 'desc', 'exclude_interim', 'expand', 'page', 'sort', 'start', 'end']
+    const acceptedBody: string[] = ['anomaly_score', 'desc', 'exclude_interim', 'expand', 'sort', 'start', 'end']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -611,14 +604,13 @@ export default class Ml {
     const acceptedPath: string[] = ['calendar_id']
     const acceptedBody: string[] = ['page']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -654,14 +646,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id', 'category_id']
     const acceptedBody: string[] = ['page']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -846,14 +837,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['page']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -941,14 +931,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id', 'snapshot_id']
     const acceptedBody: string[] = ['start', 'end']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -981,24 +970,11 @@ export default class Ml {
   async getOverallBuckets (this: That, params: T.MlGetOverallBucketsRequest | TB.MlGetOverallBucketsRequest, options?: TransportRequestOptions): Promise<T.MlGetOverallBucketsResponse>
   async getOverallBuckets (this: That, params: T.MlGetOverallBucketsRequest | TB.MlGetOverallBucketsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['job_id']
-    const acceptedBody: string[] = ['allow_no_jobs']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
-    // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
-    } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
-    }
+    const body = undefined
 
     for (const key in params) {
-      if (acceptedBody.includes(key)) {
-        body = body ?? {}
-        // @ts-expect-error
-        body[key] = params[key]
-      } else if (acceptedPath.includes(key)) {
+      if (acceptedPath.includes(key)) {
         continue
       } else if (key !== 'body') {
         // @ts-expect-error
@@ -1018,14 +994,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['desc', 'exclude_interim', 'page', 'record_score', 'sort', 'start', 'end']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1180,14 +1155,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['timeout']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1215,14 +1189,13 @@ export default class Ml {
     const acceptedPath: string[] = ['calendar_id']
     const acceptedBody: string[] = ['events']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1277,14 +1250,13 @@ export default class Ml {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['config']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -1318,16 +1290,15 @@ export default class Ml {
   async previewDatafeed<TDocument = unknown> (this: That, params?: T.MlPreviewDatafeedRequest | TB.MlPreviewDatafeedRequest, options?: TransportRequestOptions): Promise<T.MlPreviewDatafeedResponse<TDocument>>
   async previewDatafeed<TDocument = unknown> (this: That, params?: T.MlPreviewDatafeedRequest | TB.MlPreviewDatafeedRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['datafeed_id']
-    const acceptedBody: string[] = ['job_config', 'datafeed_config']
+    const acceptedBody: string[] = ['datafeed_config', 'job_config']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -1363,14 +1334,13 @@ export default class Ml {
     const acceptedPath: string[] = ['calendar_id']
     const acceptedBody: string[] = ['description']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1420,14 +1390,13 @@ export default class Ml {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['allow_lazy_start', 'analysis', 'analyzed_fields', 'description', 'dest', 'max_num_threads', 'model_memory_limit', 'source']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1455,14 +1424,13 @@ export default class Ml {
     const acceptedPath: string[] = ['datafeed_id']
     const acceptedBody: string[] = ['aggregations', 'chunking_config', 'delayed_data_check_config', 'frequency', 'indices', 'indices_options', 'job_id', 'max_empty_searches', 'query', 'query_delay', 'runtime_mappings', 'script_fields', 'scroll_size']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1490,14 +1458,13 @@ export default class Ml {
     const acceptedPath: string[] = ['filter_id']
     const acceptedBody: string[] = ['description', 'items']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1525,14 +1492,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['allow_lazy_open', 'analysis_config', 'analysis_limits', 'background_persist_interval', 'custom_settings', 'daily_model_snapshot_retention_after_days', 'data_description', 'datafeed_config', 'description', 'groups', 'model_plot_config', 'model_snapshot_retention_days', 'renormalization_window_days', 'results_index_name', 'results_retention_days']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1560,14 +1526,13 @@ export default class Ml {
     const acceptedPath: string[] = ['model_id']
     const acceptedBody: string[] = ['compressed_definition', 'definition', 'description', 'inference_config', 'input', 'metadata', 'tags']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1683,14 +1648,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id', 'snapshot_id']
     const acceptedBody: string[] = ['delete_intervening_results']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1763,14 +1727,13 @@ export default class Ml {
     const acceptedPath: string[] = ['datafeed_id']
     const acceptedBody: string[] = ['end', 'start', 'timeout']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1842,14 +1805,13 @@ export default class Ml {
     const acceptedPath: string[] = ['datafeed_id']
     const acceptedBody: string[] = ['force', 'timeout']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1899,14 +1861,13 @@ export default class Ml {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['description', 'model_memory_limit', 'max_num_threads', 'allow_lazy_start']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1956,14 +1917,13 @@ export default class Ml {
     const acceptedPath: string[] = ['filter_id']
     const acceptedBody: string[] = ['add_items', 'description', 'remove_items']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1991,14 +1951,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id']
     const acceptedBody: string[] = ['allow_lazy_open', 'analysis_limits', 'background_persist_interval', 'custom_settings', 'categorization_filters', 'description', 'model_plot_config', 'daily_model_snapshot_retention_after_days', 'model_snapshot_retention_days', 'renormalization_window_days', 'results_retention_days', 'groups', 'detectors', 'per_partition_categorization']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -2026,14 +1985,13 @@ export default class Ml {
     const acceptedPath: string[] = ['job_id', 'snapshot_id']
     const acceptedBody: string[] = ['description', 'retain']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -2083,14 +2041,13 @@ export default class Ml {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['job_id', 'analysis_config', 'analysis_limits', 'data_description', 'description', 'model_plot', 'model_snapshot_retention_days', 'results_index_name']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/mtermvectors.ts b/src/api/api/mtermvectors.ts
index dd1be8659..c3dcf2e07 100644
--- a/src/api/api/mtermvectors.ts
+++ b/src/api/api/mtermvectors.ts
@@ -44,14 +44,13 @@ export default async function MtermvectorsApi (this: That, params?: T.Mtermvecto
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['docs', 'ids']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/nodes.ts b/src/api/api/nodes.ts
index 438e53454..214684566 100644
--- a/src/api/api/nodes.ts
+++ b/src/api/api/nodes.ts
@@ -160,14 +160,13 @@ export default class Nodes {
     const acceptedPath: string[] = ['node_id']
     const acceptedBody: string[] = ['secure_settings_password']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/api/put_script.ts b/src/api/api/put_script.ts
index da5b93544..5d6711fd0 100644
--- a/src/api/api/put_script.ts
+++ b/src/api/api/put_script.ts
@@ -44,14 +44,13 @@ export default async function PutScriptApi (this: That, params: T.PutScriptReque
   const acceptedPath: string[] = ['id', 'context']
   const acceptedBody: string[] = ['script']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/rank_eval.ts b/src/api/api/rank_eval.ts
index 016091227..056e5bf7f 100644
--- a/src/api/api/rank_eval.ts
+++ b/src/api/api/rank_eval.ts
@@ -44,14 +44,13 @@ export default async function RankEvalApi (this: That, params: T.RankEvalRequest
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['requests', 'metric']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/reindex.ts b/src/api/api/reindex.ts
index 0c121f661..85e20deee 100644
--- a/src/api/api/reindex.ts
+++ b/src/api/api/reindex.ts
@@ -44,14 +44,13 @@ export default async function ReindexApi (this: That, params?: T.ReindexRequest
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['conflicts', 'dest', 'max_docs', 'script', 'size', 'source']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/render_search_template.ts b/src/api/api/render_search_template.ts
index cf9547a32..bf4d68841 100644
--- a/src/api/api/render_search_template.ts
+++ b/src/api/api/render_search_template.ts
@@ -44,14 +44,13 @@ export default async function RenderSearchTemplateApi (this: That, params?: T.Re
   const acceptedPath: string[] = ['id']
   const acceptedBody: string[] = ['file', 'params', 'source']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/rollup.ts b/src/api/api/rollup.ts
index df24e9005..848d0724e 100644
--- a/src/api/api/rollup.ts
+++ b/src/api/api/rollup.ts
@@ -154,14 +154,13 @@ export default class Rollup {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['cron', 'groups', 'index_pattern', 'metrics', 'page_size', 'rollup_index']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -214,16 +213,15 @@ export default class Rollup {
   async rollupSearch<TDocument = unknown> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise<T.RollupRollupSearchResponse<TDocument>>
   async rollupSearch<TDocument = unknown> (this: That, params: T.RollupRollupSearchRequest | TB.RollupRollupSearchRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index', 'type']
-    const acceptedBody: string[] = ['aggs', 'query', 'size']
+    const acceptedBody: string[] = ['aggregations', 'query', 'size']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/scripts_painless_execute.ts b/src/api/api/scripts_painless_execute.ts
index b15438660..f7757f513 100644
--- a/src/api/api/scripts_painless_execute.ts
+++ b/src/api/api/scripts_painless_execute.ts
@@ -44,14 +44,13 @@ export default async function ScriptsPainlessExecuteApi<TResult = unknown> (this
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['context', 'context_setup', 'script']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/scroll.ts b/src/api/api/scroll.ts
index 26191be83..c35577d1d 100644
--- a/src/api/api/scroll.ts
+++ b/src/api/api/scroll.ts
@@ -44,14 +44,13 @@ export default async function ScrollApi<TDocument = unknown> (this: That, params
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['scroll', 'scroll_id']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/search.ts b/src/api/api/search.ts
index 34125fafd..12d7aa1c3 100644
--- a/src/api/api/search.ts
+++ b/src/api/api/search.ts
@@ -42,16 +42,15 @@ export default async function SearchApi<TDocument = unknown> (this: That, params
 export default async function SearchApi<TDocument = unknown> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise<T.SearchResponse<TDocument>>
 export default async function SearchApi<TDocument = unknown> (this: That, params?: T.SearchRequest | TB.SearchRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['index']
-  const acceptedBody: string[] = ['aggs', 'aggregations', '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']
+  const acceptedBody: string[] = ['aggregations', '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']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
@@ -59,7 +58,12 @@ export default async function SearchApi<TDocument = unknown> (this: That, params
     if (acceptedBody.includes(key)) {
       body = body ?? {}
       // @ts-expect-error
-      body[key] = params[key]
+      if (key === 'sort' && typeof params[key] === 'string' && params[key].includes(':')) {
+        querystring[key] = params[key]
+      } else {
+        // @ts-expect-error
+        body[key] = params[key]
+      }
     } else if (acceptedPath.includes(key)) {
       continue
     } else if (key !== 'body') {
diff --git a/src/api/api/search_mvt.ts b/src/api/api/search_mvt.ts
index fd001aa06..23ec4c9a3 100644
--- a/src/api/api/search_mvt.ts
+++ b/src/api/api/search_mvt.ts
@@ -44,14 +44,13 @@ export default async function SearchMvtApi (this: That, params: T.SearchMvtReque
   const acceptedPath: string[] = ['index', 'field', 'zoom', 'x', 'y']
   const acceptedBody: string[] = ['aggs', 'exact_bounds', 'extent', 'fields', 'grid_precision', 'grid_type', 'query', 'runtime_mappings', 'size', 'sort']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/search_template.ts b/src/api/api/search_template.ts
index e716d7c7b..84c0fb9df 100644
--- a/src/api/api/search_template.ts
+++ b/src/api/api/search_template.ts
@@ -44,14 +44,13 @@ export default async function SearchTemplateApi<TDocument = unknown> (this: That
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['explain', 'id', 'params', 'profile', 'source']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params?.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   params = params ?? {}
diff --git a/src/api/api/searchable_snapshots.ts b/src/api/api/searchable_snapshots.ts
index 20547eadb..642eaa2e7 100644
--- a/src/api/api/searchable_snapshots.ts
+++ b/src/api/api/searchable_snapshots.ts
@@ -109,14 +109,13 @@ export default class SearchableSnapshots {
     const acceptedPath: string[] = ['repository', 'snapshot']
     const acceptedBody: string[] = ['index', 'renamed_index', 'index_settings', 'ignore_index_settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/security.ts b/src/api/api/security.ts
index cf97ed46c..c3430b533 100644
--- a/src/api/api/security.ts
+++ b/src/api/api/security.ts
@@ -73,14 +73,13 @@ export default class Security {
     const acceptedPath: string[] = ['username']
     const acceptedBody: string[] = ['password']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -226,14 +225,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['expiration', 'name', 'role_descriptors', 'metadata']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -683,14 +681,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['grant_type', 'scope', 'password', 'kerberos_ticket', 'refresh_token', 'username']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -772,14 +769,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['api_key', 'grant_type', 'access_token', 'username', 'password']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -807,14 +803,13 @@ export default class Security {
     const acceptedPath: string[] = ['user']
     const acceptedBody: string[] = ['application', 'cluster', 'index']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -850,14 +845,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['id', 'ids', 'name', 'owner', 'realm_name', 'username']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -886,14 +880,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['token', 'refresh_token', 'realm_name', 'username']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -949,14 +942,13 @@ export default class Security {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['applications', 'cluster', 'global', 'indices', 'metadata', 'run_as', 'transient_metadata']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -984,14 +976,13 @@ export default class Security {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['enabled', 'metadata', 'roles', 'rules', 'run_as']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -1019,14 +1010,13 @@ export default class Security {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['username', 'email', 'full_name', 'metadata', 'password', 'password_hash', 'roles', 'enabled']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/slm.ts b/src/api/api/slm.ts
index f12afa39e..a24fa13e5 100644
--- a/src/api/api/slm.ts
+++ b/src/api/api/slm.ts
@@ -193,14 +193,13 @@ export default class Slm {
     const acceptedPath: string[] = ['policy_id']
     const acceptedBody: string[] = ['config', 'name', 'repository', 'retention', 'schedule']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/snapshot.ts b/src/api/api/snapshot.ts
index e086a0b60..580e0fc97 100644
--- a/src/api/api/snapshot.ts
+++ b/src/api/api/snapshot.ts
@@ -72,14 +72,13 @@ export default class Snapshot {
     const acceptedPath: string[] = ['repository', 'snapshot', 'target_snapshot']
     const acceptedBody: string[] = ['indices']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -107,14 +106,13 @@ export default class Snapshot {
     const acceptedPath: string[] = ['repository', 'snapshot']
     const acceptedBody: string[] = ['ignore_unavailable', 'include_global_state', 'indices', 'feature_states', 'metadata', 'partial']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -142,14 +140,13 @@ export default class Snapshot {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['repository', 'type', 'settings']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -295,14 +292,13 @@ export default class Snapshot {
     const acceptedPath: string[] = ['repository', 'snapshot']
     const acceptedBody: string[] = ['ignore_index_settings', 'ignore_unavailable', 'include_aliases', 'include_global_state', 'index_settings', 'indices', 'partial', 'rename_pattern', 'rename_replacement']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/sql.ts b/src/api/api/sql.ts
index 24224218d..4273da298 100644
--- a/src/api/api/sql.ts
+++ b/src/api/api/sql.ts
@@ -50,14 +50,13 @@ export default class Sql {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['cursor']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -151,14 +150,13 @@ export default class Sql {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['columnar', 'cursor', 'fetch_size', 'filter', 'query', 'request_timeout', 'page_timeout', 'time_zone', 'field_multi_value_leniency']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -187,14 +185,13 @@ export default class Sql {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['fetch_size', 'filter', 'query', 'time_zone']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/terms_enum.ts b/src/api/api/terms_enum.ts
index ce3895dd1..eb88eb9db 100644
--- a/src/api/api/terms_enum.ts
+++ b/src/api/api/terms_enum.ts
@@ -44,14 +44,13 @@ export default async function TermsEnumApi (this: That, params: T.TermsEnumReque
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['field', 'size', 'timeout', 'case_insensitive', 'index_filter', 'string', 'search_after']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/termvectors.ts b/src/api/api/termvectors.ts
index 32c3456e5..d2cf887ba 100644
--- a/src/api/api/termvectors.ts
+++ b/src/api/api/termvectors.ts
@@ -44,14 +44,13 @@ export default async function TermvectorsApi<TDocument = unknown> (this: That, p
   const acceptedPath: string[] = ['index', 'id']
   const acceptedBody: string[] = ['doc', 'filter', 'per_field_analyzer']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/transform.ts b/src/api/api/transform.ts
index fdc47bf51..1edbc932c 100644
--- a/src/api/api/transform.ts
+++ b/src/api/api/transform.ts
@@ -124,14 +124,13 @@ export default class Transform {
     const acceptedPath: string[] = ['transform_id']
     const acceptedBody: string[] = ['dest', 'description', 'frequency', 'pivot', 'source', 'settings', 'sync', 'retention_policy', 'latest']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -167,14 +166,13 @@ export default class Transform {
     const acceptedPath: string[] = ['transform_id']
     const acceptedBody: string[] = ['dest', 'description', 'frequency', 'pivot', 'source', 'settings', 'sync', 'retention_policy', 'latest']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -246,14 +244,13 @@ export default class Transform {
     const acceptedPath: string[] = ['transform_id']
     const acceptedBody: string[] = ['dest', 'description', 'frequency', 'source', 'settings', 'sync', 'retention_policy']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
diff --git a/src/api/api/update.ts b/src/api/api/update.ts
index 454e6556f..a38f31c22 100644
--- a/src/api/api/update.ts
+++ b/src/api/api/update.ts
@@ -44,14 +44,13 @@ export default async function UpdateApi<TDocument = unknown, TPartialDocument =
   const acceptedPath: string[] = ['id', 'index', 'type']
   const acceptedBody: string[] = ['detect_noop', 'doc', 'doc_as_upsert', 'script', 'scripted_upsert', '_source', 'upsert']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/update_by_query.ts b/src/api/api/update_by_query.ts
index 808d3157e..ada1a9595 100644
--- a/src/api/api/update_by_query.ts
+++ b/src/api/api/update_by_query.ts
@@ -44,14 +44,13 @@ export default async function UpdateByQueryApi (this: That, params: T.UpdateByQu
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['max_docs', 'query', 'script', 'slice', 'conflicts']
   const querystring: Record<string, any> = {}
-  let body: Record<string, any> | string
   // @ts-expect-error
-  if (typeof params?.body === 'string') {
-    // @ts-expect-error
-    body = params.body
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
   } else {
-    // @ts-expect-error
-    body = params.body != null ? { ...params.body } : undefined
+    body = userBody != null ? { ...userBody } : undefined
   }
 
   for (const key in params) {
diff --git a/src/api/api/watcher.ts b/src/api/api/watcher.ts
index 9eeb6ae92..d01f43cf3 100644
--- a/src/api/api/watcher.ts
+++ b/src/api/api/watcher.ts
@@ -145,14 +145,13 @@ export default class Watcher {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['action_modes', 'alternative_input', 'ignore_condition', 'record_execution', 'simulated_actions', 'trigger_data', 'watch']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
@@ -210,14 +209,13 @@ export default class Watcher {
     const acceptedPath: string[] = ['id']
     const acceptedBody: string[] = ['actions', 'condition', 'input', 'metadata', 'throttle_period', 'transform', 'trigger']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     for (const key in params) {
@@ -245,14 +243,13 @@ export default class Watcher {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['from', 'size', 'query', 'sort', 'search_after']
     const querystring: Record<string, any> = {}
-    let body: Record<string, any> | string
     // @ts-expect-error
-    if (typeof params?.body === 'string') {
-      // @ts-expect-error
-      body = params.body
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
     } else {
-      // @ts-expect-error
-      body = params?.body != null ? { ...params.body } : undefined
+      body = userBody != null ? { ...userBody } : undefined
     }
 
     params = params ?? {}
diff --git a/src/api/kibana.ts b/src/api/kibana.ts
index 7d00e1f2d..4aab8b1eb 100644
--- a/src/api/kibana.ts
+++ b/src/api/kibana.ts
@@ -207,7 +207,6 @@ interface KibanaClient {
     fieldUsageStats: <TContext = unknown>(params?: T.TODO, options?: TransportRequestOptions) => Promise<TransportResult<T.TODO, unknown>>
     flush: <TContext = unknown>(params?: T.IndicesFlushRequest| TB.IndicesFlushRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesFlushResponse, TContext>>
     forcemerge: <TContext = unknown>(params?: T.IndicesForcemergeRequest| TB.IndicesForcemergeRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesForcemergeResponse, TContext>>
-    freeze: <TContext = unknown>(params: T.IndicesFreezeRequest| TB.IndicesFreezeRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesFreezeResponse, TContext>>
     get: <TContext = unknown>(params: T.IndicesGetRequest| TB.IndicesGetRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesGetResponse, TContext>>
     getAlias: <TContext = unknown>(params?: T.IndicesGetAliasRequest| TB.IndicesGetAliasRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesGetAliasResponse, TContext>>
     getDataStream: <TContext = unknown>(params?: T.IndicesGetDataStreamRequest| TB.IndicesGetDataStreamRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IndicesGetDataStreamResponse, TContext>>
@@ -250,7 +249,7 @@ interface KibanaClient {
     putPipeline: <TContext = unknown>(params: T.IngestPutPipelineRequest| TB.IngestPutPipelineRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IngestPutPipelineResponse, TContext>>
     simulate: <TContext = unknown>(params?: T.IngestSimulateRequest| TB.IngestSimulateRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.IngestSimulateResponse, TContext>>
   }
-  knnSearch: <TContext = unknown>(params?: T.TODO, options?: TransportRequestOptions) => Promise<TransportResult<T.TODO, unknown>>
+  knnSearch: <TDocument = unknown, TContext = unknown>(params: T.KnnSearchRequest| TB.KnnSearchRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.KnnSearchResponse<TDocument>, TContext>>
   license: {
     delete: <TContext = unknown>(params?: T.LicenseDeleteRequest| TB.LicenseDeleteRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.LicenseDeleteResponse, TContext>>
     get: <TContext = unknown>(params?: T.LicenseGetRequest| TB.LicenseGetRequest, options?: TransportRequestOptions) => Promise<TransportResult<T.LicenseGetResponse, TContext>>
diff --git a/src/api/types.ts b/src/api/types.ts
index 140608572..10df318d7 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -476,6 +476,34 @@ export interface InfoResponse {
   version: ElasticsearchVersionInfo
 }
 
+export interface KnnSearchRequest extends RequestBase {
+  index: Indices
+  routing?: Routing
+  _source?: boolean | Fields | SearchSourceFilter
+  docvalue_fields?: SearchDocValueField | (Field | SearchDocValueField)[]
+  stored_fields?: Fields
+  fields?: Fields
+  knn: KnnSearchQuery
+}
+
+export interface KnnSearchResponse<TDocument = unknown> {
+  took: long
+  timed_out: boolean
+  _shards: ShardStatistics
+  hits: SearchHitsMetadata<TDocument>
+  fields?: Record<string, any>
+  max_score?: double
+}
+
+export interface KnnSearchQuery {
+  field: Field
+  query_vector: KnnSearchQueryVector
+  k: long
+  num_candidates: long
+}
+
+export type KnnSearchQueryVector = double[]
+
 export interface MgetHit<TDocument = unknown> {
   error?: ErrorCause
   fields?: Record<string, any>
@@ -939,8 +967,8 @@ export interface SearchRequest extends RequestBase {
   size?: integer
   from?: integer
   sort?: string | string[]
-  aggs?: Record<string, AggregationsAggregationContainer>
   aggregations?: Record<string, AggregationsAggregationContainer>
+  aggs?: Record<string, AggregationsAggregationContainer>
   collapse?: SearchFieldCollapse
   highlight?: SearchHighlight
   indices_boost?: Record<IndexName, double>[]
@@ -1139,8 +1167,8 @@ export interface SearchGeoDistanceSortKeys {
   order?: SearchSortOrder
   unit?: DistanceUnit
 }
-export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys |
-{ [property: string]: QueryDslGeoLocation | QueryDslGeoLocation[] }
+export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys
+& { [property: string]: QueryDslGeoLocation | QueryDslGeoLocation[] | SearchSortMode | GeoDistanceType | SearchSortOrder | DistanceUnit }
 
 export interface SearchHighlight {
   fields: Record<Field, SearchHighlightField>
@@ -1408,8 +1436,8 @@ export interface SearchSortContainerKeys {
   _geo_distance?: SearchGeoDistanceSort
   _script?: SearchScriptSort
 }
-export type SearchSortContainer = SearchSortContainerKeys |
-{ [property: string]: SearchFieldSort | SearchSortOrder }
+export type SearchSortContainer = SearchSortContainerKeys
+& { [property: string]: SearchFieldSort | SearchSortOrder | SearchScoreSort | SearchGeoDistanceSort | SearchScriptSort }
 
 export type SearchSortMode = 'min' | 'max' | 'sum' | 'avg' | 'median'
 
@@ -1872,8 +1900,8 @@ export interface ErrorCauseKeys {
   root_cause?: ErrorCause[]
   suppressed?: ErrorCause[]
 }
-export type ErrorCause = ErrorCauseKeys |
-{ [property: string]: any }
+export type ErrorCause = ErrorCauseKeys
+& { [property: string]: any }
 
 export interface ErrorResponseBase {
   error: ErrorCause
@@ -1992,8 +2020,8 @@ export interface InlineGetKeys<TDocument = unknown> {
   _routing?: Routing
   _source: TDocument
 }
-export type InlineGet<TDocument = unknown> = InlineGetKeys<TDocument> |
-{ [property: string]: any }
+export type InlineGet<TDocument = unknown> = InlineGetKeys<TDocument>
+& { [property: string]: any }
 
 export interface InlineScript extends ScriptBase {
   source: string
@@ -2573,8 +2601,8 @@ export interface AggregationsCompositeAggregationSource {
 
 export interface AggregationsCompositeBucketKeys {
 }
-export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsCompositeBucketAggregate extends AggregationsMultiBucketAggregate<Record<string, any>> {
   after_key: Record<string, any>
@@ -2606,8 +2634,8 @@ export interface AggregationsDateHistogramAggregation extends AggregationsBucket
 
 export interface AggregationsDateHistogramBucketKeys {
 }
-export type AggregationsDateHistogramBucket = AggregationsDateHistogramBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsDateHistogramBucket = AggregationsDateHistogramBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export type AggregationsDateInterval = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year'
 
@@ -2682,8 +2710,8 @@ export interface AggregationsFiltersAggregation extends AggregationsBucketAggreg
 export interface AggregationsFiltersBucketItemKeys {
   doc_count: long
 }
-export type AggregationsFiltersBucketItem = AggregationsFiltersBucketItemKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsFiltersBucketItem = AggregationsFiltersBucketItemKeys
+& { [property: string]: AggregationsAggregate | long }
 
 export interface AggregationsFormatMetricAggregationBase extends AggregationsMetricAggregationBase {
   format?: string
@@ -2847,16 +2875,16 @@ export interface AggregationsIpRangeAggregationRange {
 
 export interface AggregationsIpRangeBucketKeys {
 }
-export type AggregationsIpRangeBucket = AggregationsIpRangeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsIpRangeBucket = AggregationsIpRangeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsKeyedBucketKeys<TKey = unknown> {
   doc_count: long
   key: TKey
   key_as_string: string
 }
-export type AggregationsKeyedBucket<TKey = unknown> = AggregationsKeyedBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsKeyedBucket<TKey = unknown> = AggregationsKeyedBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate | long | TKey | string }
 
 export interface AggregationsKeyedValueAggregate extends AggregationsValueAggregate {
   keys: string[]
@@ -3024,8 +3052,8 @@ export interface AggregationsRangeAggregation extends AggregationsBucketAggregat
 
 export interface AggregationsRangeBucketKeys {
 }
-export type AggregationsRangeBucket = AggregationsRangeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsRangeBucket = AggregationsRangeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsRareTermsAggregation extends AggregationsBucketAggregationBase {
   exclude?: string | string[]
@@ -3039,8 +3067,8 @@ export interface AggregationsRareTermsAggregation extends AggregationsBucketAggr
 
 export interface AggregationsRareTermsBucketKeys<TKey = unknown> {
 }
-export type AggregationsRareTermsBucket<TKey = unknown> = AggregationsRareTermsBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsRareTermsBucket<TKey = unknown> = AggregationsRareTermsBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsRateAggregation extends AggregationsFormatMetricAggregationBase {
   unit?: AggregationsDateInterval
@@ -3108,8 +3136,8 @@ export interface AggregationsSignificantTermsAggregation extends AggregationsBuc
 
 export interface AggregationsSignificantTermsBucketKeys<TKey = unknown> {
 }
-export type AggregationsSignificantTermsBucket<TKey = unknown> = AggregationsSignificantTermsBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsSignificantTermsBucket<TKey = unknown> = AggregationsSignificantTermsBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsSignificantTextAggregation extends AggregationsBucketAggregationBase {
   background_filter?: QueryDslQueryContainer
@@ -3133,8 +3161,8 @@ export interface AggregationsSignificantTextAggregation extends AggregationsBuck
 export interface AggregationsSingleBucketAggregateKeys extends AggregationsAggregateBase {
   doc_count: double
 }
-export type AggregationsSingleBucketAggregate = AggregationsSingleBucketAggregateKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsSingleBucketAggregate = AggregationsSingleBucketAggregateKeys
+& { [property: string]: AggregationsAggregate | double | Record<string, any> }
 
 export interface AggregationsStandardDeviationBounds {
   lower?: double
@@ -3302,14 +3330,14 @@ export interface AggregationsWeightedAverageValue {
   script?: Script
 }
 
-export type AnalysisAnalyzer = AnalysisCustomAnalyzer | AnalysisFingerprintAnalyzer | AnalysisKeywordAnalyzer | AnalysisLanguageAnalyzer | AnalysisNoriAnalyzer | AnalysisPatternAnalyzer | AnalysisSimpleAnalyzer | AnalysisStandardAnalyzer | AnalysisStopAnalyzer | AnalysisWhitespaceAnalyzer | AnalysisIcuAnalyzer | AnalysisKuromojiAnalyzer
+export type AnalysisAnalyzer = AnalysisCustomAnalyzer | AnalysisFingerprintAnalyzer | AnalysisKeywordAnalyzer | AnalysisLanguageAnalyzer | AnalysisNoriAnalyzer | AnalysisPatternAnalyzer | AnalysisSimpleAnalyzer | AnalysisStandardAnalyzer | AnalysisStopAnalyzer | AnalysisWhitespaceAnalyzer | AnalysisIcuAnalyzer | AnalysisKuromojiAnalyzer | AnalysisSnowballAnalyzer | AnalysisDutchAnalyzer
 
 export interface AnalysisAsciiFoldingTokenFilter extends AnalysisTokenFilterBase {
   type: 'asciifolding'
   preserve_original: boolean
 }
 
-export type AnalysisCharFilter = AnalysisHtmlStripCharFilter | AnalysisMappingCharFilter | AnalysisPatternReplaceTokenFilter
+export type AnalysisCharFilter = AnalysisHtmlStripCharFilter | AnalysisMappingCharFilter | AnalysisPatternReplaceCharFilter | AnalysisIcuNormalizationCharFilter | AnalysisKuromojiIterationMarkCharFilter
 
 export interface AnalysisCharFilterBase {
   version?: VersionString
@@ -3318,24 +3346,25 @@ export interface AnalysisCharFilterBase {
 export interface AnalysisCharGroupTokenizer extends AnalysisTokenizerBase {
   type: 'char_group'
   tokenize_on_chars: string[]
+  max_token_length?: integer
 }
 
 export interface AnalysisCommonGramsTokenFilter extends AnalysisTokenFilterBase {
   type: 'common_grams'
-  common_words: string[]
-  common_words_path: string
-  ignore_case: boolean
-  query_mode: boolean
+  common_words?: string[]
+  common_words_path?: string
+  ignore_case?: boolean
+  query_mode?: boolean
 }
 
 export interface AnalysisCompoundWordTokenFilterBase extends AnalysisTokenFilterBase {
-  hyphenation_patterns_path: string
-  max_subword_size: integer
-  min_subword_size: integer
-  min_word_size: integer
-  only_longest_match: boolean
-  word_list: string[]
-  word_list_path: string
+  hyphenation_patterns_path?: string
+  max_subword_size?: integer
+  min_subword_size?: integer
+  min_word_size?: integer
+  only_longest_match?: boolean
+  word_list?: string[]
+  word_list_path?: string
 }
 
 export interface AnalysisConditionTokenFilter extends AnalysisTokenFilterBase {
@@ -3367,18 +3396,28 @@ export interface AnalysisDelimitedPayloadTokenFilter extends AnalysisTokenFilter
   encoding: AnalysisDelimitedPayloadEncoding
 }
 
+export interface AnalysisDictionaryDecompounderTokenFilter extends AnalysisCompoundWordTokenFilterBase {
+  type: 'dictionary_decompounder'
+}
+
+export interface AnalysisDutchAnalyzer {
+  type: 'dutch'
+  stopwords?: AnalysisStopWords
+}
+
 export type AnalysisEdgeNGramSide = 'front' | 'back'
 
 export interface AnalysisEdgeNGramTokenFilter extends AnalysisTokenFilterBase {
   type: 'edge_ngram'
   max_gram: integer
   min_gram: integer
-  side: AnalysisEdgeNGramSide
+  side?: AnalysisEdgeNGramSide
+  preserve_original?: boolean
 }
 
 export interface AnalysisEdgeNGramTokenizer extends AnalysisTokenizerBase {
   type: 'edge_ngram'
-  custom_token_chars: string
+  custom_token_chars?: string
   max_gram: integer
   min_gram: integer
   token_chars: AnalysisTokenChar[]
@@ -3392,12 +3431,12 @@ export interface AnalysisElisionTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisFingerprintAnalyzer {
   type: 'fingerprint'
-  version: VersionString
+  version?: VersionString
   max_output_size: integer
   preserve_original: boolean
   separator: string
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisFingerprintTokenFilter extends AnalysisTokenFilterBase {
@@ -3428,10 +3467,62 @@ export interface AnalysisIcuAnalyzer {
   mode: AnalysisIcuNormalizationMode
 }
 
+export type AnalysisIcuCollationAlternate = 'shifted' | 'non-ignorable'
+
+export type AnalysisIcuCollationCaseFirst = 'lower' | 'upper'
+
+export type AnalysisIcuCollationDecomposition = 'no' | 'identical'
+
+export type AnalysisIcuCollationStrength = 'primary' | 'secondary' | 'tertiary' | 'quaternary' | 'identical'
+
+export interface AnalysisIcuCollationTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_collation'
+  alternate: AnalysisIcuCollationAlternate
+  caseFirst: AnalysisIcuCollationCaseFirst
+  caseLevel: boolean
+  country: string
+  decomposition: AnalysisIcuCollationDecomposition
+  hiraganaQuaternaryMode: boolean
+  language: string
+  numeric: boolean
+  strength: AnalysisIcuCollationStrength
+  variableTop?: string
+  variant: string
+}
+
+export interface AnalysisIcuFoldingTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_folding'
+  unicode_set_filter: string
+}
+
+export interface AnalysisIcuNormalizationCharFilter extends AnalysisCharFilterBase {
+  type: 'icu_normalizer'
+  mode?: AnalysisIcuNormalizationMode
+  name?: AnalysisIcuNormalizationType
+}
+
 export type AnalysisIcuNormalizationMode = 'decompose' | 'compose'
 
+export interface AnalysisIcuNormalizationTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_normalizer'
+  name: AnalysisIcuNormalizationType
+}
+
 export type AnalysisIcuNormalizationType = 'nfc' | 'nfkc' | 'nfkc_cf'
 
+export interface AnalysisIcuTokenizer extends AnalysisTokenizerBase {
+  type: 'icu_tokenizer'
+  rule_files: string
+}
+
+export type AnalysisIcuTransformDirection = 'forward' | 'reverse'
+
+export interface AnalysisIcuTransformTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_transform'
+  dir: AnalysisIcuTransformDirection
+  id: string
+}
+
 export interface AnalysisKStemTokenFilter extends AnalysisTokenFilterBase {
   type: 'kstem'
 }
@@ -3440,28 +3531,28 @@ export type AnalysisKeepTypesMode = 'include' | 'exclude'
 
 export interface AnalysisKeepTypesTokenFilter extends AnalysisTokenFilterBase {
   type: 'keep_types'
-  mode: AnalysisKeepTypesMode
-  types: string[]
+  mode?: AnalysisKeepTypesMode
+  types?: string[]
 }
 
 export interface AnalysisKeepWordsTokenFilter extends AnalysisTokenFilterBase {
   type: 'keep'
-  keep_words: string[]
-  keep_words_case: boolean
-  keep_words_path: string
+  keep_words?: string[]
+  keep_words_case?: boolean
+  keep_words_path?: string
 }
 
 export interface AnalysisKeywordAnalyzer {
   type: 'keyword'
-  version: VersionString
+  version?: VersionString
 }
 
 export interface AnalysisKeywordMarkerTokenFilter extends AnalysisTokenFilterBase {
   type: 'keyword_marker'
-  ignore_case: boolean
-  keywords: string[]
-  keywords_path: string
-  keywords_pattern: string
+  ignore_case?: boolean
+  keywords?: string[]
+  keywords_path?: string
+  keywords_pattern?: string
 }
 
 export interface AnalysisKeywordTokenizer extends AnalysisTokenizerBase {
@@ -3475,6 +3566,12 @@ export interface AnalysisKuromojiAnalyzer {
   user_dictionary?: string
 }
 
+export interface AnalysisKuromojiIterationMarkCharFilter extends AnalysisCharFilterBase {
+  type: 'kuromoji_iteration_mark'
+  normalize_kana: boolean
+  normalize_kanji: boolean
+}
+
 export interface AnalysisKuromojiPartOfSpeechTokenFilter extends AnalysisTokenFilterBase {
   type: 'kuromoji_part_of_speech'
   stoptags: string[]
@@ -3494,23 +3591,24 @@ export type AnalysisKuromojiTokenizationMode = 'normal' | 'search' | 'extended'
 
 export interface AnalysisKuromojiTokenizer extends AnalysisTokenizerBase {
   type: 'kuromoji_tokenizer'
-  discard_punctuation: boolean
+  discard_punctuation?: boolean
   mode: AnalysisKuromojiTokenizationMode
-  nbest_cost: integer
-  nbest_examples: string
-  user_dictionary: string
-  user_dictionary_rules: string[]
+  nbest_cost?: integer
+  nbest_examples?: string
+  user_dictionary?: string
+  user_dictionary_rules?: string[]
+  discard_compound_token?: boolean
 }
 
 export type AnalysisLanguage = 'Arabic' | 'Armenian' | 'Basque' | 'Brazilian' | 'Bulgarian' | 'Catalan' | 'Chinese' | 'Cjk' | 'Czech' | 'Danish' | 'Dutch' | 'English' | 'Estonian' | 'Finnish' | 'French' | 'Galician' | 'German' | 'Greek' | 'Hindi' | 'Hungarian' | 'Indonesian' | 'Irish' | 'Italian' | 'Latvian' | 'Norwegian' | 'Persian' | 'Portuguese' | 'Romanian' | 'Russian' | 'Sorani' | 'Spanish' | 'Swedish' | 'Turkish' | 'Thai'
 
 export interface AnalysisLanguageAnalyzer {
   type: 'language'
-  version: VersionString
+  version?: VersionString
   language: AnalysisLanguage
   stem_exclusion: string[]
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisLengthTokenFilter extends AnalysisTokenFilterBase {
@@ -3535,7 +3633,7 @@ export interface AnalysisLowercaseNormalizer {
 
 export interface AnalysisLowercaseTokenFilter extends AnalysisTokenFilterBase {
   type: 'lowercase'
-  language: string
+  language?: string
 }
 
 export interface AnalysisLowercaseTokenizer extends AnalysisTokenizerBase {
@@ -3556,13 +3654,14 @@ export interface AnalysisMultiplexerTokenFilter extends AnalysisTokenFilterBase
 
 export interface AnalysisNGramTokenFilter extends AnalysisTokenFilterBase {
   type: 'ngram'
-  max_gram: integer
-  min_gram: integer
+  max_gram?: integer
+  min_gram?: integer
+  preserve_original?: boolean
 }
 
 export interface AnalysisNGramTokenizer extends AnalysisTokenizerBase {
   type: 'ngram'
-  custom_token_chars: string
+  custom_token_chars?: string
   max_gram: integer
   min_gram: integer
   token_chars: AnalysisTokenChar[]
@@ -3570,10 +3669,10 @@ export interface AnalysisNGramTokenizer extends AnalysisTokenizerBase {
 
 export interface AnalysisNoriAnalyzer {
   type: 'nori'
-  version: VersionString
-  decompound_mode: AnalysisNoriDecompoundMode
-  stoptags: string[]
-  user_dictionary: string
+  version?: VersionString
+  decompound_mode?: AnalysisNoriDecompoundMode
+  stoptags?: string[]
+  user_dictionary?: string
 }
 
 export type AnalysisNoriDecompoundMode = 'discard' | 'none' | 'mixed'
@@ -3585,10 +3684,10 @@ export interface AnalysisNoriPartOfSpeechTokenFilter extends AnalysisTokenFilter
 
 export interface AnalysisNoriTokenizer extends AnalysisTokenizerBase {
   type: 'nori_tokenizer'
-  decompound_mode: AnalysisNoriDecompoundMode
-  discard_punctuation: boolean
-  user_dictionary: string
-  user_dictionary_rules: string[]
+  decompound_mode?: AnalysisNoriDecompoundMode
+  discard_punctuation?: boolean
+  user_dictionary?: string
+  user_dictionary_rules?: string[]
 }
 
 export type AnalysisNormalizer = AnalysisLowercaseNormalizer | AnalysisCustomNormalizer
@@ -3604,11 +3703,11 @@ export interface AnalysisPathHierarchyTokenizer extends AnalysisTokenizerBase {
 
 export interface AnalysisPatternAnalyzer {
   type: 'pattern'
-  version: VersionString
-  flags: string
-  lowercase: boolean
+  version?: VersionString
+  flags?: string
+  lowercase?: boolean
   pattern: string
-  stopwords: AnalysisStopWords
+  stopwords?: AnalysisStopWords
 }
 
 export interface AnalysisPatternCaptureTokenFilter extends AnalysisTokenFilterBase {
@@ -3617,6 +3716,13 @@ export interface AnalysisPatternCaptureTokenFilter extends AnalysisTokenFilterBa
   preserve_original: boolean
 }
 
+export interface AnalysisPatternReplaceCharFilter extends AnalysisCharFilterBase {
+  type: 'pattern_replace'
+  flags: string
+  pattern: string
+  replacement: string
+}
+
 export interface AnalysisPatternReplaceTokenFilter extends AnalysisTokenFilterBase {
   type: 'pattern_replace'
   flags: string
@@ -3624,6 +3730,31 @@ export interface AnalysisPatternReplaceTokenFilter extends AnalysisTokenFilterBa
   replacement: string
 }
 
+export interface AnalysisPatternTokenizer extends AnalysisTokenizerBase {
+  type: 'pattern'
+  flags: string
+  group: integer
+  pattern: string
+}
+
+export type AnalysisPhoneticEncoder = 'metaphone' | 'double_metaphone' | 'soundex' | 'refined_soundex' | 'caverphone1' | 'caverphone2' | 'cologne' | 'nysiis' | 'koelnerphonetik' | 'haasephonetik' | 'beider_morse' | 'daitch_mokotoff'
+
+export type AnalysisPhoneticLanguage = 'any' | 'common' | 'cyrillic' | 'english' | 'french' | 'german' | 'hebrew' | 'hungarian' | 'polish' | 'romanian' | 'russian' | 'spanish'
+
+export type AnalysisPhoneticNameType = 'generic' | 'ashkenazi' | 'sephardic'
+
+export type AnalysisPhoneticRuleType = 'approx' | 'exact'
+
+export interface AnalysisPhoneticTokenFilter extends AnalysisTokenFilterBase {
+  type: 'phonetic'
+  encoder: AnalysisPhoneticEncoder
+  languageset: AnalysisPhoneticLanguage[]
+  max_code_len?: integer
+  name_type: AnalysisPhoneticNameType
+  replace?: boolean
+  rule_type: AnalysisPhoneticRuleType
+}
+
 export interface AnalysisPorterStemTokenFilter extends AnalysisTokenFilterBase {
   type: 'porter_stem'
 }
@@ -3643,17 +3774,24 @@ export interface AnalysisReverseTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisShingleTokenFilter extends AnalysisTokenFilterBase {
   type: 'shingle'
-  filler_token: string
-  max_shingle_size: integer
-  min_shingle_size: integer
-  output_unigrams: boolean
-  output_unigrams_if_no_shingles: boolean
-  token_separator: string
+  filler_token?: string
+  max_shingle_size?: integer | string
+  min_shingle_size?: integer | string
+  output_unigrams?: boolean
+  output_unigrams_if_no_shingles?: boolean
+  token_separator?: string
 }
 
 export interface AnalysisSimpleAnalyzer {
   type: 'simple'
-  version: VersionString
+  version?: VersionString
+}
+
+export interface AnalysisSnowballAnalyzer {
+  type: 'snowball'
+  version?: VersionString
+  language: AnalysisSnowballLanguage
+  stopwords?: AnalysisStopWords
 }
 
 export type AnalysisSnowballLanguage = 'Armenian' | 'Basque' | 'Catalan' | 'Danish' | 'Dutch' | 'English' | 'Finnish' | 'French' | 'German' | 'German2' | 'Hungarian' | 'Italian' | 'Kp' | 'Lovins' | 'Norwegian' | 'Porter' | 'Portuguese' | 'Romanian' | 'Russian' | 'Spanish' | 'Swedish' | 'Turkish'
@@ -3665,19 +3803,19 @@ export interface AnalysisSnowballTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisStandardAnalyzer {
   type: 'standard'
-  max_token_length: integer
-  stopwords: AnalysisStopWords
+  max_token_length?: integer
+  stopwords?: AnalysisStopWords
 }
 
 export interface AnalysisStandardTokenizer extends AnalysisTokenizerBase {
   type: 'standard'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisStemmerOverrideTokenFilter extends AnalysisTokenFilterBase {
   type: 'stemmer_override'
-  rules: string[]
-  rules_path: string
+  rules?: string[]
+  rules_path?: string
 }
 
 export interface AnalysisStemmerTokenFilter extends AnalysisTokenFilterBase {
@@ -3687,9 +3825,9 @@ export interface AnalysisStemmerTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisStopAnalyzer {
   type: 'stop'
-  version: VersionString
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  version?: VersionString
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisStopTokenFilter extends AnalysisTokenFilterBase {
@@ -3706,13 +3844,13 @@ export type AnalysisSynonymFormat = 'solr' | 'wordnet'
 
 export interface AnalysisSynonymGraphTokenFilter extends AnalysisTokenFilterBase {
   type: 'synonym_graph'
-  expand: boolean
-  format: AnalysisSynonymFormat
-  lenient: boolean
-  synonyms: string[]
-  synonyms_path: string
-  tokenizer: string
-  updateable: boolean
+  expand?: boolean
+  format?: AnalysisSynonymFormat
+  lenient?: boolean
+  synonyms?: string[]
+  synonyms_path?: string
+  tokenizer?: string
+  updateable?: boolean
 }
 
 export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
@@ -3720,7 +3858,7 @@ export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
   expand?: boolean
   format?: AnalysisSynonymFormat
   lenient?: boolean
-  synonyms: string[]
+  synonyms?: string[]
   synonyms_path?: string
   tokenizer?: string
   updateable?: boolean
@@ -3728,13 +3866,13 @@ export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
 
 export type AnalysisTokenChar = 'letter' | 'digit' | 'whitespace' | 'punctuation' | 'symbol' | 'custom'
 
-export type AnalysisTokenFilter = AnalysisAsciiFoldingTokenFilter | AnalysisCommonGramsTokenFilter | AnalysisConditionTokenFilter | AnalysisDelimitedPayloadTokenFilter | AnalysisEdgeNGramTokenFilter | AnalysisElisionTokenFilter | AnalysisFingerprintTokenFilter | AnalysisHunspellTokenFilter | AnalysisHyphenationDecompounderTokenFilter | AnalysisKeepTypesTokenFilter | AnalysisKeepWordsTokenFilter | AnalysisKeywordMarkerTokenFilter | AnalysisKStemTokenFilter | AnalysisLengthTokenFilter | AnalysisLimitTokenCountTokenFilter | AnalysisLowercaseTokenFilter | AnalysisMultiplexerTokenFilter | AnalysisNGramTokenFilter | AnalysisNoriPartOfSpeechTokenFilter | AnalysisPatternCaptureTokenFilter | AnalysisPatternReplaceTokenFilter | AnalysisPorterStemTokenFilter | AnalysisPredicateTokenFilter | AnalysisRemoveDuplicatesTokenFilter | AnalysisReverseTokenFilter | AnalysisShingleTokenFilter | AnalysisSnowballTokenFilter | AnalysisStemmerOverrideTokenFilter | AnalysisStemmerTokenFilter | AnalysisStopTokenFilter | AnalysisSynonymGraphTokenFilter | AnalysisSynonymTokenFilter | AnalysisTrimTokenFilter | AnalysisTruncateTokenFilter | AnalysisUniqueTokenFilter | AnalysisUppercaseTokenFilter | AnalysisWordDelimiterGraphTokenFilter | AnalysisWordDelimiterTokenFilter | AnalysisKuromojiStemmerTokenFilter | AnalysisKuromojiReadingFormTokenFilter | AnalysisKuromojiPartOfSpeechTokenFilter
+export type AnalysisTokenFilter = AnalysisAsciiFoldingTokenFilter | AnalysisCommonGramsTokenFilter | AnalysisConditionTokenFilter | AnalysisDelimitedPayloadTokenFilter | AnalysisEdgeNGramTokenFilter | AnalysisElisionTokenFilter | AnalysisFingerprintTokenFilter | AnalysisHunspellTokenFilter | AnalysisHyphenationDecompounderTokenFilter | AnalysisKeepTypesTokenFilter | AnalysisKeepWordsTokenFilter | AnalysisKeywordMarkerTokenFilter | AnalysisKStemTokenFilter | AnalysisLengthTokenFilter | AnalysisLimitTokenCountTokenFilter | AnalysisLowercaseTokenFilter | AnalysisMultiplexerTokenFilter | AnalysisNGramTokenFilter | AnalysisNoriPartOfSpeechTokenFilter | AnalysisPatternCaptureTokenFilter | AnalysisPatternReplaceTokenFilter | AnalysisPorterStemTokenFilter | AnalysisPredicateTokenFilter | AnalysisRemoveDuplicatesTokenFilter | AnalysisReverseTokenFilter | AnalysisShingleTokenFilter | AnalysisSnowballTokenFilter | AnalysisStemmerOverrideTokenFilter | AnalysisStemmerTokenFilter | AnalysisStopTokenFilter | AnalysisSynonymGraphTokenFilter | AnalysisSynonymTokenFilter | AnalysisTrimTokenFilter | AnalysisTruncateTokenFilter | AnalysisUniqueTokenFilter | AnalysisUppercaseTokenFilter | AnalysisWordDelimiterGraphTokenFilter | AnalysisWordDelimiterTokenFilter | AnalysisKuromojiStemmerTokenFilter | AnalysisKuromojiReadingFormTokenFilter | AnalysisKuromojiPartOfSpeechTokenFilter | AnalysisIcuTokenizer | AnalysisIcuCollationTokenFilter | AnalysisIcuFoldingTokenFilter | AnalysisIcuNormalizationTokenFilter | AnalysisIcuTransformTokenFilter | AnalysisPhoneticTokenFilter | AnalysisDictionaryDecompounderTokenFilter
 
 export interface AnalysisTokenFilterBase {
   version?: VersionString
 }
 
-export type AnalysisTokenizer = AnalysisCharGroupTokenizer | AnalysisEdgeNGramTokenizer | AnalysisKeywordTokenizer | AnalysisLetterTokenizer | AnalysisLowercaseTokenizer | AnalysisNGramTokenizer | AnalysisNoriTokenizer | AnalysisPathHierarchyTokenizer | AnalysisStandardTokenizer | AnalysisUaxEmailUrlTokenizer | AnalysisWhitespaceTokenizer | AnalysisKuromojiTokenizer
+export type AnalysisTokenizer = AnalysisCharGroupTokenizer | AnalysisEdgeNGramTokenizer | AnalysisKeywordTokenizer | AnalysisLetterTokenizer | AnalysisLowercaseTokenizer | AnalysisNGramTokenizer | AnalysisNoriTokenizer | AnalysisPathHierarchyTokenizer | AnalysisStandardTokenizer | AnalysisUaxEmailUrlTokenizer | AnalysisWhitespaceTokenizer | AnalysisKuromojiTokenizer | AnalysisPatternTokenizer | AnalysisIcuTokenizer
 
 export interface AnalysisTokenizerBase {
   version?: VersionString
@@ -3751,12 +3889,12 @@ export interface AnalysisTruncateTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisUaxEmailUrlTokenizer extends AnalysisTokenizerBase {
   type: 'uax_url_email'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisUniqueTokenFilter extends AnalysisTokenFilterBase {
   type: 'unique'
-  only_on_same_position: boolean
+  only_on_same_position?: boolean
 }
 
 export interface AnalysisUppercaseTokenFilter extends AnalysisTokenFilterBase {
@@ -3765,47 +3903,48 @@ export interface AnalysisUppercaseTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisWhitespaceAnalyzer {
   type: 'whitespace'
-  version: VersionString
+  version?: VersionString
 }
 
 export interface AnalysisWhitespaceTokenizer extends AnalysisTokenizerBase {
   type: 'whitespace'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisWordDelimiterGraphTokenFilter extends AnalysisTokenFilterBase {
   type: 'word_delimiter_graph'
-  adjust_offsets: boolean
-  catenate_all: boolean
-  catenate_numbers: boolean
-  catenate_words: boolean
-  generate_number_parts: boolean
-  generate_word_parts: boolean
-  preserve_original: boolean
-  protected_words: string[]
-  protected_words_path: string
-  split_on_case_change: boolean
-  split_on_numerics: boolean
-  stem_english_possessive: boolean
-  type_table: string[]
-  type_table_path: string
+  adjust_offsets?: boolean
+  catenate_all?: boolean
+  catenate_numbers?: boolean
+  catenate_words?: boolean
+  generate_number_parts?: boolean
+  generate_word_parts?: boolean
+  ignore_keywords?: boolean
+  preserve_original?: boolean
+  protected_words?: string[]
+  protected_words_path?: string
+  split_on_case_change?: boolean
+  split_on_numerics?: boolean
+  stem_english_possessive?: boolean
+  type_table?: string[]
+  type_table_path?: string
 }
 
 export interface AnalysisWordDelimiterTokenFilter extends AnalysisTokenFilterBase {
   type: 'word_delimiter'
-  catenate_all: boolean
-  catenate_numbers: boolean
-  catenate_words: boolean
-  generate_number_parts: boolean
-  generate_word_parts: boolean
-  preserve_original: boolean
-  protected_words: string[]
-  protected_words_path: string
-  split_on_case_change: boolean
-  split_on_numerics: boolean
-  stem_english_possessive: boolean
-  type_table: string[]
-  type_table_path: string
+  catenate_all?: boolean
+  catenate_numbers?: boolean
+  catenate_words?: boolean
+  generate_number_parts?: boolean
+  generate_word_parts?: boolean
+  preserve_original?: boolean
+  protected_words?: string[]
+  protected_words_path?: string
+  split_on_case_change?: boolean
+  split_on_numerics?: boolean
+  stem_english_possessive?: boolean
+  type_table?: string[]
+  type_table_path?: string
 }
 
 export interface MappingAggregateMetricDoubleProperty extends MappingPropertyBase {
@@ -3885,6 +4024,7 @@ export interface MappingDateProperty extends MappingDocValuesPropertyBase {
   index?: boolean
   null_value?: DateString
   precision_step?: integer
+  locale?: string
   type: 'date'
 }
 
@@ -3893,9 +4033,18 @@ export interface MappingDateRangeProperty extends MappingRangePropertyBase {
   type: 'date_range'
 }
 
+export interface MappingDenseVectorIndexOptions {
+  type: string
+  m: integer
+  ef_construction: integer
+}
+
 export interface MappingDenseVectorProperty extends MappingPropertyBase {
   type: 'dense_vector'
   dims: integer
+  similarity?: string
+  index?: boolean
+  index_options?: MappingDenseVectorIndexOptions
 }
 
 export type MappingDocValuesProperty = MappingBinaryProperty | MappingBooleanProperty | MappingDateProperty | MappingDateNanosProperty | MappingKeywordProperty | MappingNumberProperty | MappingRangeProperty | MappingGeoPointProperty | MappingGeoShapeProperty | MappingCompletionProperty | MappingGenericProperty | MappingIpProperty | MappingMurmur3HashProperty | MappingShapeProperty | MappingTokenCountProperty | MappingVersionProperty | MappingWildcardProperty | MappingPointProperty
@@ -4049,6 +4198,7 @@ export interface MappingKeywordProperty extends MappingDocValuesPropertyBase {
   norms?: boolean
   null_value?: string
   split_queries_on_whitespace?: boolean
+  time_series_dimension?: boolean
   type: 'keyword'
 }
 
@@ -4079,6 +4229,7 @@ export type MappingNumberProperty = MappingFloatNumberProperty | MappingHalfFloa
 export interface MappingNumberPropertyBase extends MappingDocValuesPropertyBase {
   index?: boolean
   ignore_malformed?: boolean
+  time_series_metric?: MappingTimeSeriesMetricType
 }
 
 export interface MappingObjectProperty extends MappingCorePropertyBase {
@@ -4224,6 +4375,8 @@ export interface MappingTextProperty extends MappingCorePropertyBase {
   type: 'text'
 }
 
+export type MappingTimeSeriesMetricType = 'gauge' | 'counter' | 'summary' | 'histogram'
+
 export interface MappingTokenCountProperty extends MappingDocValuesPropertyBase {
   analyzer?: string
   boost?: double
@@ -4321,8 +4474,8 @@ export interface QueryDslConstantScoreQuery extends QueryDslQueryBase {
 
 export interface QueryDslDateDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslDateDecayFunction = QueryDslDateDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<DateMath, Time> }
+export type QueryDslDateDecayFunction = QueryDslDateDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<DateMath, Time> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export interface QueryDslDateDistanceFeatureQuery extends QueryDslDistanceFeatureQueryBase<DateMath, Time> {
 }
@@ -4422,15 +4575,15 @@ export interface QueryDslGeoBoundingBoxQueryKeys extends QueryDslQueryBase {
   validation_method?: QueryDslGeoValidationMethod
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoBoundingBoxQuery = QueryDslGeoBoundingBoxQueryKeys |
-{ [property: string]: QueryDslBoundingBox }
+export type QueryDslGeoBoundingBoxQuery = QueryDslGeoBoundingBoxQueryKeys
+& { [property: string]: QueryDslBoundingBox | QueryDslGeoExecution | QueryDslGeoValidationMethod | boolean | float | string }
 
 export type QueryDslGeoCoordinate = string | double[] | QueryDslThreeDimensionalPoint
 
 export interface QueryDslGeoDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslGeoDecayFunction = QueryDslGeoDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<QueryDslGeoLocation, Distance> }
+export type QueryDslGeoDecayFunction = QueryDslGeoDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<QueryDslGeoLocation, Distance> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export interface QueryDslGeoDistanceFeatureQuery extends QueryDslDistanceFeatureQueryBase<QueryDslGeoCoordinate, Distance> {
 }
@@ -4440,8 +4593,8 @@ export interface QueryDslGeoDistanceQueryKeys extends QueryDslQueryBase {
   distance_type?: GeoDistanceType
   validation_method?: QueryDslGeoValidationMethod
 }
-export type QueryDslGeoDistanceQuery = QueryDslGeoDistanceQueryKeys |
-{ [property: string]: QueryDslGeoLocation }
+export type QueryDslGeoDistanceQuery = QueryDslGeoDistanceQueryKeys
+& { [property: string]: QueryDslGeoLocation | Distance | GeoDistanceType | QueryDslGeoValidationMethod | float | string }
 
 export type QueryDslGeoExecution = 'memory' | 'indexed'
 
@@ -4455,8 +4608,8 @@ export interface QueryDslGeoPolygonQueryKeys extends QueryDslQueryBase {
   validation_method?: QueryDslGeoValidationMethod
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoPolygonQuery = QueryDslGeoPolygonQueryKeys |
-{ [property: string]: QueryDslGeoPolygonPoints }
+export type QueryDslGeoPolygonQuery = QueryDslGeoPolygonQueryKeys
+& { [property: string]: QueryDslGeoPolygonPoints | QueryDslGeoValidationMethod | boolean | float | string }
 
 export interface QueryDslGeoShapeFieldQuery {
   shape?: GeoShape
@@ -4467,8 +4620,8 @@ export interface QueryDslGeoShapeFieldQuery {
 export interface QueryDslGeoShapeQueryKeys extends QueryDslQueryBase {
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoShapeQuery = QueryDslGeoShapeQueryKeys |
-{ [property: string]: QueryDslGeoShapeFieldQuery }
+export type QueryDslGeoShapeQuery = QueryDslGeoShapeQueryKeys
+& { [property: string]: QueryDslGeoShapeFieldQuery | boolean | float | string }
 
 export type QueryDslGeoValidationMethod = 'coerce' | 'ignore_malformed' | 'strict'
 
@@ -4694,8 +4847,8 @@ export interface QueryDslNumberRangeQuery extends QueryDslRangeQueryBase {
 
 export interface QueryDslNumericDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslNumericDecayFunction = QueryDslNumericDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<double, double> }
+export type QueryDslNumericDecayFunction = QueryDslNumericDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<double, double> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export type QueryDslOperator = 'and' | 'or'
 
@@ -4899,8 +5052,8 @@ export interface QueryDslShapeFieldQuery {
 
 export interface QueryDslShapeQueryKeys extends QueryDslQueryBase {
 }
-export type QueryDslShapeQuery = QueryDslShapeQueryKeys |
-{ [property: string]: QueryDslShapeFieldQuery }
+export type QueryDslShapeQuery = QueryDslShapeQueryKeys
+& { [property: string]: QueryDslShapeFieldQuery | float | string }
 
 export type QueryDslSimpleQueryStringFlags = 'NONE' | 'AND' | 'OR' | 'NOT' | 'PREFIX' | 'PHRASE' | 'PRECEDENCE' | 'ESCAPE' | 'WHITESPACE' | 'FUZZY' | 'NEAR' | 'SLOP' | 'ALL'
 
@@ -4995,8 +5148,8 @@ export interface QueryDslTermsLookup {
 
 export interface QueryDslTermsQueryKeys extends QueryDslQueryBase {
 }
-export type QueryDslTermsQuery = QueryDslTermsQueryKeys |
-{ [property: string]: string[] | long[] | QueryDslTermsLookup }
+export type QueryDslTermsQuery = QueryDslTermsQueryKeys
+& { [property: string]: string[] | long[] | QueryDslTermsLookup | float | string }
 
 export interface QueryDslTermsSetQuery extends QueryDslQueryBase {
   minimum_should_match_field?: Field
@@ -5024,13 +5177,14 @@ export interface QueryDslTypeQuery extends QueryDslQueryBase {
 export interface QueryDslWildcardQuery extends QueryDslQueryBase {
   case_insensitive?: boolean
   rewrite?: MultiTermQueryRewrite
-  value: string
+  value?: string
+  wildcard?: string
 }
 
 export type QueryDslZeroTermsQuery = 'all' | 'none'
 
 export interface AsyncSearchAsyncSearch<TDocument = unknown> {
-  aggregations?: Record<string, AggregationsAggregate>
+  aggregations?: Record<AggregateName, AggregationsAggregate>
   _clusters?: ClusterStatistics
   fields?: Record<string, any>
   hits: SearchHitsMetadata<TDocument>
@@ -5132,8 +5286,8 @@ export interface AsyncSearchSubmitRequest extends RequestBase {
   size?: integer
   from?: integer
   sort?: string | string[]
-  aggs?: Record<string, AggregationsAggregationContainer>
   aggregations?: Record<string, AggregationsAggregationContainer>
+  aggs?: Record<string, AggregationsAggregationContainer>
   collapse?: SearchFieldCollapse
   highlight?: SearchHighlight
   indices_boost?: Record<IndexName, double>[]
@@ -5784,7 +5938,8 @@ export interface CatMlDatafeedsDatafeedsRecord {
 
 export interface CatMlDatafeedsRequest extends CatCatRequestBase {
   datafeed_id?: Id
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
+  time?: TimeUnit
 }
 
 export type CatMlDatafeedsResponse = CatMlDatafeedsDatafeedsRecord[]
@@ -5968,8 +6123,9 @@ export interface CatMlJobsJobsRecord {
 
 export interface CatMlJobsRequest extends CatCatRequestBase {
   job_id?: Id
-  allow_no_jobs?: boolean
+  allow_no_match?: boolean
   bytes?: Bytes
+  time?: TimeUnit
 }
 
 export type CatMlJobsResponse = CatMlJobsJobsRecord[]
@@ -8323,6 +8479,13 @@ export interface IndicesIndexRoutingRebalance {
 
 export type IndicesIndexRoutingRebalanceOptions = 'all' | 'primaries' | 'replicas' | 'none'
 
+export interface IndicesIndexSegmentSort {
+  field: Fields
+  order: IndicesSegmentSortOrder | IndicesSegmentSortOrder[]
+  mode?: IndicesSegmentSortMode
+  missing?: IndicesSegmentSortMissing
+}
+
 export interface IndicesIndexSettingBlocks {
   read_only?: boolean
   read_only_allow_delete?: boolean
@@ -8332,6 +8495,15 @@ export interface IndicesIndexSettingBlocks {
 }
 
 export interface IndicesIndexSettings {
+  index?: IndicesIndexSettings
+  mode?: string
+  'index.mode'?: string
+  routing_path?: string[]
+  'index.routing_path'?: string[]
+  soft_deletes?: IndicesSoftDeletes
+  'index.soft_deletes'?: IndicesSoftDeletes
+  sort?: IndicesIndexSegmentSort
+  'index.sort'?: IndicesIndexSegmentSort
   number_of_shards?: integer | string
   'index.number_of_shards'?: integer | string
   number_of_replicas?: integer | string
@@ -8342,8 +8514,8 @@ export interface IndicesIndexSettings {
   'index.check_on_startup'?: IndicesIndexCheckOnStartup
   codec?: string
   'index.codec'?: string
-  routing_partition_size?: integer | string
-  'index.routing_partition_size'?: integer | string
+  routing_partition_size?: integer
+  'index.routing_partition_size'?: integer
   'soft_deletes.retention_lease.period'?: Time
   'index.soft_deletes.retention_lease.period'?: Time
   load_fixed_bitset_filters_eagerly?: boolean
@@ -8352,6 +8524,8 @@ export interface IndicesIndexSettings {
   'index.hidden'?: boolean | string
   auto_expand_replicas?: string
   'index.auto_expand_replicas'?: string
+  'merge.scheduler.max_thread_count'?: integer
+  'index.merge.scheduler.max_thread_count'?: integer
   'search.idle.after'?: Time
   'index.search.idle.after'?: Time
   refresh_interval?: Time
@@ -8420,12 +8594,15 @@ export interface IndicesIndexSettings {
   'index.max_slices_per_scroll'?: integer
   'translog.durability'?: string
   'index.translog.durability'?: string
+  'translog.flush_threshold_size'?: string
+  'index.translog.flush_threshold_size'?: string
   'query_string.lenient'?: boolean | string
   'index.query_string.lenient'?: boolean | string
   priority?: integer | string
   'index.priority'?: integer | string
   top_metrics_max_size?: integer
   analysis?: IndicesIndexSettingsAnalysis
+  'index.analysis'?: IndicesIndexSettingsAnalysis
   settings?: IndicesIndexSettings
 }
 
@@ -8434,6 +8611,7 @@ export interface IndicesIndexSettingsAnalysis {
   char_filter?: Record<string, AnalysisCharFilter>
   filter?: Record<string, AnalysisTokenFilter>
   normalizer?: Record<string, AnalysisNormalizer>
+  tokenizer?: Record<string, AnalysisTokenizer>
 }
 
 export interface IndicesIndexSettingsLifecycle {
@@ -8466,6 +8644,16 @@ export interface IndicesOverlappingIndexTemplate {
   index_patterns?: IndexName[]
 }
 
+export type IndicesSegmentSortMissing = '_last' | '_first'
+
+export type IndicesSegmentSortMode = 'min' | 'max'
+
+export type IndicesSegmentSortOrder = 'asc' | 'desc'
+
+export interface IndicesSoftDeletes {
+  enabled: boolean
+}
+
 export interface IndicesStringFielddata {
   format: IndicesStringFielddataFormat
 }
@@ -8626,9 +8814,9 @@ export interface IndicesCreateRequest extends RequestBase {
   master_timeout?: Time
   timeout?: Time
   wait_for_active_shards?: WaitForActiveShards
-  aliases?: Record<IndexName, IndicesAlias>
-  mappings?: Record<string, MappingTypeMapping> | MappingTypeMapping
-  settings?: Record<string, any>
+  aliases?: Record<Name, IndicesAlias>
+  mappings?: MappingTypeMapping
+  settings?: IndicesIndexSettings
 }
 
 export interface IndicesCreateResponse {
@@ -8801,20 +8989,6 @@ export interface IndicesForcemergeRequest extends RequestBase {
 export interface IndicesForcemergeResponse extends ShardsOperationResponseBase {
 }
 
-export interface IndicesFreezeRequest extends RequestBase {
-  index: IndexName
-  allow_no_indices?: boolean
-  expand_wildcards?: ExpandWildcards
-  ignore_unavailable?: boolean
-  master_timeout?: Time
-  timeout?: Time
-  wait_for_active_shards?: WaitForActiveShards
-}
-
-export interface IndicesFreezeResponse extends AcknowledgedResponseBase {
-  shards_acknowledged: boolean
-}
-
 export interface IndicesGetRequest extends RequestBase {
   index: Indices
   allow_no_indices?: boolean
@@ -10162,7 +10336,6 @@ export interface LicensePostStartTrialRequest extends RequestBase {
 
 export interface LicensePostStartTrialResponse extends AcknowledgedResponseBase {
   error_message?: string
-  acknowledged: boolean
   trial_was_started: boolean
   type: LicenseLicenseType
 }
@@ -10237,8 +10410,8 @@ export interface MlAnalysisConfig {
   categorization_filters?: string[]
   detectors: MlDetector[]
   influencers?: Field[]
-  model_prune_window?: Time
   latency?: Time
+  model_prune_window?: Time
   multivariate_by_fields?: boolean
   per_partition_categorization?: MlPerPartitionCategorization
   summary_count_field_name?: Field
@@ -10410,7 +10583,7 @@ export interface MlDataCounts {
 
 export interface MlDataDescription {
   format?: string
-  time_field: Field
+  time_field?: Field
   time_format?: string
   field_delimiter?: string
 }
@@ -10795,6 +10968,8 @@ export interface MlHyperparameters {
   soft_tree_depth_tolerance?: double
 }
 
+export type MlInclude = 'definition' | 'feature_importance_baseline' | 'hyperparameters' | 'total_feature_importance'
+
 export interface MlInfluence {
   influencer_field_name: string
   influencer_field_values: string[]
@@ -11062,7 +11237,6 @@ export interface MlValidationLoss {
 export interface MlCloseJobRequest extends RequestBase {
   job_id: Id
   allow_no_match?: boolean
-  allow_no_jobs?: boolean
   force?: boolean
   timeout?: Time
 }
@@ -11328,7 +11502,6 @@ export interface MlGetBucketsRequest extends RequestBase {
   end?: DateString
   anomaly_score?: double
   expand?: boolean
-  page?: MlPage
 }
 
 export interface MlGetBucketsResponse {
@@ -11410,7 +11583,7 @@ export interface MlGetDataFrameAnalyticsStatsResponse {
 
 export interface MlGetDatafeedStatsRequest extends RequestBase {
   datafeed_id?: Ids
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
 }
 
 export interface MlGetDatafeedStatsResponse {
@@ -11420,7 +11593,7 @@ export interface MlGetDatafeedStatsResponse {
 
 export interface MlGetDatafeedsRequest extends RequestBase {
   datafeed_id?: Ids
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
   exclude_generated?: boolean
 }
 
@@ -11460,7 +11633,7 @@ export interface MlGetInfluencersResponse {
 
 export interface MlGetJobStatsRequest extends RequestBase {
   job_id?: Id
-  allow_no_jobs?: boolean
+  allow_no_match?: boolean
 }
 
 export interface MlGetJobStatsResponse {
@@ -11471,7 +11644,6 @@ export interface MlGetJobStatsResponse {
 export interface MlGetJobsRequest extends RequestBase {
   job_id?: Ids
   allow_no_match?: boolean
-  allow_no_jobs?: boolean
   exclude_generated?: boolean
 }
 
@@ -11498,14 +11670,13 @@ export interface MlGetModelSnapshotsResponse {
 
 export interface MlGetOverallBucketsRequest extends RequestBase {
   job_id: Id
-  bucket_span?: Time
-  overall_score?: double | string
-  top_n?: integer
-  end?: Time
-  start?: Time
-  exclude_interim?: boolean
   allow_no_match?: boolean
-  allow_no_jobs?: boolean
+  bucket_span?: Time
+  end?: Time
+  exclude_interim?: boolean
+  overall_score?: double | string
+  start?: Time
+  top_n?: integer
 }
 
 export interface MlGetOverallBucketsResponse {
@@ -11537,7 +11708,7 @@ export interface MlGetTrainedModelsRequest extends RequestBase {
   decompress_definition?: boolean
   exclude_generated?: boolean
   from?: integer
-  include?: string
+  include?: MlInclude
   size?: integer
   tags?: string
 }
@@ -11659,8 +11830,8 @@ export interface MlPreviewDataFrameAnalyticsResponse {
 
 export interface MlPreviewDatafeedRequest extends RequestBase {
   datafeed_id?: Id
-  job_config?: MlJobConfig
   datafeed_config?: MlDatafeedConfig
+  job_config?: MlJobConfig
 }
 
 export interface MlPreviewDatafeedResponse<TDocument = unknown> {
@@ -11726,6 +11897,7 @@ export interface MlPutDatafeedRequest extends RequestBase {
   delayed_data_check_config?: MlDelayedDataCheckConfig
   frequency?: Time
   indices?: string[]
+  indexes?: string[]
   indices_options?: MlDatafeedIndicesOptions
   job_id?: Id
   max_empty_searches?: integer
@@ -12916,6 +13088,7 @@ export interface RollupRollupSearchRequest extends RequestBase {
   type?: Type
   rest_total_hits_as_int?: boolean
   typed_keys?: boolean
+  aggregations?: Record<string, AggregationsAggregationContainer>
   aggs?: Record<string, AggregationsAggregationContainer>
   query?: QueryDslQueryContainer
   size?: integer
diff --git a/src/api/typesWithBodyKey.ts b/src/api/typesWithBodyKey.ts
index 67f407c2f..3e5780abb 100644
--- a/src/api/typesWithBodyKey.ts
+++ b/src/api/typesWithBodyKey.ts
@@ -499,6 +499,37 @@ export interface InfoResponse {
   version: ElasticsearchVersionInfo
 }
 
+export interface KnnSearchRequest extends RequestBase {
+  index: Indices
+  routing?: Routing
+  /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
+  body?: {
+    _source?: boolean | Fields | SearchSourceFilter
+    docvalue_fields?: SearchDocValueField | (Field | SearchDocValueField)[]
+    stored_fields?: Fields
+    fields?: Fields
+    knn: KnnSearchQuery
+  }
+}
+
+export interface KnnSearchResponse<TDocument = unknown> {
+  took: long
+  timed_out: boolean
+  _shards: ShardStatistics
+  hits: SearchHitsMetadata<TDocument>
+  fields?: Record<string, any>
+  max_score?: double
+}
+
+export interface KnnSearchQuery {
+  field: Field
+  query_vector: KnnSearchQueryVector
+  k: long
+  num_candidates: long
+}
+
+export type KnnSearchQueryVector = double[]
+
 export interface MgetHit<TDocument = unknown> {
   error?: ErrorCause
   fields?: Record<string, any>
@@ -993,8 +1024,8 @@ export interface SearchRequest extends RequestBase {
   sort?: string | string[]
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
-    aggs?: Record<string, AggregationsAggregationContainer>
     aggregations?: Record<string, AggregationsAggregationContainer>
+    aggs?: Record<string, AggregationsAggregationContainer>
     collapse?: SearchFieldCollapse
     explain?: boolean
     from?: integer
@@ -1208,8 +1239,8 @@ export interface SearchGeoDistanceSortKeys {
   order?: SearchSortOrder
   unit?: DistanceUnit
 }
-export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys |
-{ [property: string]: QueryDslGeoLocation | QueryDslGeoLocation[] }
+export type SearchGeoDistanceSort = SearchGeoDistanceSortKeys
+& { [property: string]: QueryDslGeoLocation | QueryDslGeoLocation[] | SearchSortMode | GeoDistanceType | SearchSortOrder | DistanceUnit }
 
 export interface SearchHighlight {
   fields: Record<Field, SearchHighlightField>
@@ -1477,8 +1508,8 @@ export interface SearchSortContainerKeys {
   _geo_distance?: SearchGeoDistanceSort
   _script?: SearchScriptSort
 }
-export type SearchSortContainer = SearchSortContainerKeys |
-{ [property: string]: SearchFieldSort | SearchSortOrder }
+export type SearchSortContainer = SearchSortContainerKeys
+& { [property: string]: SearchFieldSort | SearchSortOrder | SearchScoreSort | SearchGeoDistanceSort | SearchScriptSort }
 
 export type SearchSortMode = 'min' | 'max' | 'sum' | 'avg' | 'median'
 
@@ -1968,8 +1999,8 @@ export interface ErrorCauseKeys {
   root_cause?: ErrorCause[]
   suppressed?: ErrorCause[]
 }
-export type ErrorCause = ErrorCauseKeys |
-{ [property: string]: any }
+export type ErrorCause = ErrorCauseKeys
+& { [property: string]: any }
 
 export interface ErrorResponseBase {
   error: ErrorCause
@@ -2088,8 +2119,8 @@ export interface InlineGetKeys<TDocument = unknown> {
   _routing?: Routing
   _source: TDocument
 }
-export type InlineGet<TDocument = unknown> = InlineGetKeys<TDocument> |
-{ [property: string]: any }
+export type InlineGet<TDocument = unknown> = InlineGetKeys<TDocument>
+& { [property: string]: any }
 
 export interface InlineScript extends ScriptBase {
   source: string
@@ -2669,8 +2700,8 @@ export interface AggregationsCompositeAggregationSource {
 
 export interface AggregationsCompositeBucketKeys {
 }
-export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsCompositeBucket = AggregationsCompositeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsCompositeBucketAggregate extends AggregationsMultiBucketAggregate<Record<string, any>> {
   after_key: Record<string, any>
@@ -2702,8 +2733,8 @@ export interface AggregationsDateHistogramAggregation extends AggregationsBucket
 
 export interface AggregationsDateHistogramBucketKeys {
 }
-export type AggregationsDateHistogramBucket = AggregationsDateHistogramBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsDateHistogramBucket = AggregationsDateHistogramBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export type AggregationsDateInterval = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year'
 
@@ -2778,8 +2809,8 @@ export interface AggregationsFiltersAggregation extends AggregationsBucketAggreg
 export interface AggregationsFiltersBucketItemKeys {
   doc_count: long
 }
-export type AggregationsFiltersBucketItem = AggregationsFiltersBucketItemKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsFiltersBucketItem = AggregationsFiltersBucketItemKeys
+& { [property: string]: AggregationsAggregate | long }
 
 export interface AggregationsFormatMetricAggregationBase extends AggregationsMetricAggregationBase {
   format?: string
@@ -2943,16 +2974,16 @@ export interface AggregationsIpRangeAggregationRange {
 
 export interface AggregationsIpRangeBucketKeys {
 }
-export type AggregationsIpRangeBucket = AggregationsIpRangeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsIpRangeBucket = AggregationsIpRangeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsKeyedBucketKeys<TKey = unknown> {
   doc_count: long
   key: TKey
   key_as_string: string
 }
-export type AggregationsKeyedBucket<TKey = unknown> = AggregationsKeyedBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsKeyedBucket<TKey = unknown> = AggregationsKeyedBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate | long | TKey | string }
 
 export interface AggregationsKeyedValueAggregate extends AggregationsValueAggregate {
   keys: string[]
@@ -3120,8 +3151,8 @@ export interface AggregationsRangeAggregation extends AggregationsBucketAggregat
 
 export interface AggregationsRangeBucketKeys {
 }
-export type AggregationsRangeBucket = AggregationsRangeBucketKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsRangeBucket = AggregationsRangeBucketKeys
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsRareTermsAggregation extends AggregationsBucketAggregationBase {
   exclude?: string | string[]
@@ -3135,8 +3166,8 @@ export interface AggregationsRareTermsAggregation extends AggregationsBucketAggr
 
 export interface AggregationsRareTermsBucketKeys<TKey = unknown> {
 }
-export type AggregationsRareTermsBucket<TKey = unknown> = AggregationsRareTermsBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsRareTermsBucket<TKey = unknown> = AggregationsRareTermsBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsRateAggregation extends AggregationsFormatMetricAggregationBase {
   unit?: AggregationsDateInterval
@@ -3204,8 +3235,8 @@ export interface AggregationsSignificantTermsAggregation extends AggregationsBuc
 
 export interface AggregationsSignificantTermsBucketKeys<TKey = unknown> {
 }
-export type AggregationsSignificantTermsBucket<TKey = unknown> = AggregationsSignificantTermsBucketKeys<TKey> |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsSignificantTermsBucket<TKey = unknown> = AggregationsSignificantTermsBucketKeys<TKey>
+& { [property: string]: AggregationsAggregate }
 
 export interface AggregationsSignificantTextAggregation extends AggregationsBucketAggregationBase {
   background_filter?: QueryDslQueryContainer
@@ -3229,8 +3260,8 @@ export interface AggregationsSignificantTextAggregation extends AggregationsBuck
 export interface AggregationsSingleBucketAggregateKeys extends AggregationsAggregateBase {
   doc_count: double
 }
-export type AggregationsSingleBucketAggregate = AggregationsSingleBucketAggregateKeys |
-{ [property: string]: AggregationsAggregate }
+export type AggregationsSingleBucketAggregate = AggregationsSingleBucketAggregateKeys
+& { [property: string]: AggregationsAggregate | double | Record<string, any> }
 
 export interface AggregationsStandardDeviationBounds {
   lower?: double
@@ -3398,14 +3429,14 @@ export interface AggregationsWeightedAverageValue {
   script?: Script
 }
 
-export type AnalysisAnalyzer = AnalysisCustomAnalyzer | AnalysisFingerprintAnalyzer | AnalysisKeywordAnalyzer | AnalysisLanguageAnalyzer | AnalysisNoriAnalyzer | AnalysisPatternAnalyzer | AnalysisSimpleAnalyzer | AnalysisStandardAnalyzer | AnalysisStopAnalyzer | AnalysisWhitespaceAnalyzer | AnalysisIcuAnalyzer | AnalysisKuromojiAnalyzer
+export type AnalysisAnalyzer = AnalysisCustomAnalyzer | AnalysisFingerprintAnalyzer | AnalysisKeywordAnalyzer | AnalysisLanguageAnalyzer | AnalysisNoriAnalyzer | AnalysisPatternAnalyzer | AnalysisSimpleAnalyzer | AnalysisStandardAnalyzer | AnalysisStopAnalyzer | AnalysisWhitespaceAnalyzer | AnalysisIcuAnalyzer | AnalysisKuromojiAnalyzer | AnalysisSnowballAnalyzer | AnalysisDutchAnalyzer
 
 export interface AnalysisAsciiFoldingTokenFilter extends AnalysisTokenFilterBase {
   type: 'asciifolding'
   preserve_original: boolean
 }
 
-export type AnalysisCharFilter = AnalysisHtmlStripCharFilter | AnalysisMappingCharFilter | AnalysisPatternReplaceTokenFilter
+export type AnalysisCharFilter = AnalysisHtmlStripCharFilter | AnalysisMappingCharFilter | AnalysisPatternReplaceCharFilter | AnalysisIcuNormalizationCharFilter | AnalysisKuromojiIterationMarkCharFilter
 
 export interface AnalysisCharFilterBase {
   version?: VersionString
@@ -3414,24 +3445,25 @@ export interface AnalysisCharFilterBase {
 export interface AnalysisCharGroupTokenizer extends AnalysisTokenizerBase {
   type: 'char_group'
   tokenize_on_chars: string[]
+  max_token_length?: integer
 }
 
 export interface AnalysisCommonGramsTokenFilter extends AnalysisTokenFilterBase {
   type: 'common_grams'
-  common_words: string[]
-  common_words_path: string
-  ignore_case: boolean
-  query_mode: boolean
+  common_words?: string[]
+  common_words_path?: string
+  ignore_case?: boolean
+  query_mode?: boolean
 }
 
 export interface AnalysisCompoundWordTokenFilterBase extends AnalysisTokenFilterBase {
-  hyphenation_patterns_path: string
-  max_subword_size: integer
-  min_subword_size: integer
-  min_word_size: integer
-  only_longest_match: boolean
-  word_list: string[]
-  word_list_path: string
+  hyphenation_patterns_path?: string
+  max_subword_size?: integer
+  min_subword_size?: integer
+  min_word_size?: integer
+  only_longest_match?: boolean
+  word_list?: string[]
+  word_list_path?: string
 }
 
 export interface AnalysisConditionTokenFilter extends AnalysisTokenFilterBase {
@@ -3463,18 +3495,28 @@ export interface AnalysisDelimitedPayloadTokenFilter extends AnalysisTokenFilter
   encoding: AnalysisDelimitedPayloadEncoding
 }
 
+export interface AnalysisDictionaryDecompounderTokenFilter extends AnalysisCompoundWordTokenFilterBase {
+  type: 'dictionary_decompounder'
+}
+
+export interface AnalysisDutchAnalyzer {
+  type: 'dutch'
+  stopwords?: AnalysisStopWords
+}
+
 export type AnalysisEdgeNGramSide = 'front' | 'back'
 
 export interface AnalysisEdgeNGramTokenFilter extends AnalysisTokenFilterBase {
   type: 'edge_ngram'
   max_gram: integer
   min_gram: integer
-  side: AnalysisEdgeNGramSide
+  side?: AnalysisEdgeNGramSide
+  preserve_original?: boolean
 }
 
 export interface AnalysisEdgeNGramTokenizer extends AnalysisTokenizerBase {
   type: 'edge_ngram'
-  custom_token_chars: string
+  custom_token_chars?: string
   max_gram: integer
   min_gram: integer
   token_chars: AnalysisTokenChar[]
@@ -3488,12 +3530,12 @@ export interface AnalysisElisionTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisFingerprintAnalyzer {
   type: 'fingerprint'
-  version: VersionString
+  version?: VersionString
   max_output_size: integer
   preserve_original: boolean
   separator: string
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisFingerprintTokenFilter extends AnalysisTokenFilterBase {
@@ -3524,10 +3566,62 @@ export interface AnalysisIcuAnalyzer {
   mode: AnalysisIcuNormalizationMode
 }
 
+export type AnalysisIcuCollationAlternate = 'shifted' | 'non-ignorable'
+
+export type AnalysisIcuCollationCaseFirst = 'lower' | 'upper'
+
+export type AnalysisIcuCollationDecomposition = 'no' | 'identical'
+
+export type AnalysisIcuCollationStrength = 'primary' | 'secondary' | 'tertiary' | 'quaternary' | 'identical'
+
+export interface AnalysisIcuCollationTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_collation'
+  alternate: AnalysisIcuCollationAlternate
+  caseFirst: AnalysisIcuCollationCaseFirst
+  caseLevel: boolean
+  country: string
+  decomposition: AnalysisIcuCollationDecomposition
+  hiraganaQuaternaryMode: boolean
+  language: string
+  numeric: boolean
+  strength: AnalysisIcuCollationStrength
+  variableTop?: string
+  variant: string
+}
+
+export interface AnalysisIcuFoldingTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_folding'
+  unicode_set_filter: string
+}
+
+export interface AnalysisIcuNormalizationCharFilter extends AnalysisCharFilterBase {
+  type: 'icu_normalizer'
+  mode?: AnalysisIcuNormalizationMode
+  name?: AnalysisIcuNormalizationType
+}
+
 export type AnalysisIcuNormalizationMode = 'decompose' | 'compose'
 
+export interface AnalysisIcuNormalizationTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_normalizer'
+  name: AnalysisIcuNormalizationType
+}
+
 export type AnalysisIcuNormalizationType = 'nfc' | 'nfkc' | 'nfkc_cf'
 
+export interface AnalysisIcuTokenizer extends AnalysisTokenizerBase {
+  type: 'icu_tokenizer'
+  rule_files: string
+}
+
+export type AnalysisIcuTransformDirection = 'forward' | 'reverse'
+
+export interface AnalysisIcuTransformTokenFilter extends AnalysisTokenFilterBase {
+  type: 'icu_transform'
+  dir: AnalysisIcuTransformDirection
+  id: string
+}
+
 export interface AnalysisKStemTokenFilter extends AnalysisTokenFilterBase {
   type: 'kstem'
 }
@@ -3536,28 +3630,28 @@ export type AnalysisKeepTypesMode = 'include' | 'exclude'
 
 export interface AnalysisKeepTypesTokenFilter extends AnalysisTokenFilterBase {
   type: 'keep_types'
-  mode: AnalysisKeepTypesMode
-  types: string[]
+  mode?: AnalysisKeepTypesMode
+  types?: string[]
 }
 
 export interface AnalysisKeepWordsTokenFilter extends AnalysisTokenFilterBase {
   type: 'keep'
-  keep_words: string[]
-  keep_words_case: boolean
-  keep_words_path: string
+  keep_words?: string[]
+  keep_words_case?: boolean
+  keep_words_path?: string
 }
 
 export interface AnalysisKeywordAnalyzer {
   type: 'keyword'
-  version: VersionString
+  version?: VersionString
 }
 
 export interface AnalysisKeywordMarkerTokenFilter extends AnalysisTokenFilterBase {
   type: 'keyword_marker'
-  ignore_case: boolean
-  keywords: string[]
-  keywords_path: string
-  keywords_pattern: string
+  ignore_case?: boolean
+  keywords?: string[]
+  keywords_path?: string
+  keywords_pattern?: string
 }
 
 export interface AnalysisKeywordTokenizer extends AnalysisTokenizerBase {
@@ -3571,6 +3665,12 @@ export interface AnalysisKuromojiAnalyzer {
   user_dictionary?: string
 }
 
+export interface AnalysisKuromojiIterationMarkCharFilter extends AnalysisCharFilterBase {
+  type: 'kuromoji_iteration_mark'
+  normalize_kana: boolean
+  normalize_kanji: boolean
+}
+
 export interface AnalysisKuromojiPartOfSpeechTokenFilter extends AnalysisTokenFilterBase {
   type: 'kuromoji_part_of_speech'
   stoptags: string[]
@@ -3590,23 +3690,24 @@ export type AnalysisKuromojiTokenizationMode = 'normal' | 'search' | 'extended'
 
 export interface AnalysisKuromojiTokenizer extends AnalysisTokenizerBase {
   type: 'kuromoji_tokenizer'
-  discard_punctuation: boolean
+  discard_punctuation?: boolean
   mode: AnalysisKuromojiTokenizationMode
-  nbest_cost: integer
-  nbest_examples: string
-  user_dictionary: string
-  user_dictionary_rules: string[]
+  nbest_cost?: integer
+  nbest_examples?: string
+  user_dictionary?: string
+  user_dictionary_rules?: string[]
+  discard_compound_token?: boolean
 }
 
 export type AnalysisLanguage = 'Arabic' | 'Armenian' | 'Basque' | 'Brazilian' | 'Bulgarian' | 'Catalan' | 'Chinese' | 'Cjk' | 'Czech' | 'Danish' | 'Dutch' | 'English' | 'Estonian' | 'Finnish' | 'French' | 'Galician' | 'German' | 'Greek' | 'Hindi' | 'Hungarian' | 'Indonesian' | 'Irish' | 'Italian' | 'Latvian' | 'Norwegian' | 'Persian' | 'Portuguese' | 'Romanian' | 'Russian' | 'Sorani' | 'Spanish' | 'Swedish' | 'Turkish' | 'Thai'
 
 export interface AnalysisLanguageAnalyzer {
   type: 'language'
-  version: VersionString
+  version?: VersionString
   language: AnalysisLanguage
   stem_exclusion: string[]
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisLengthTokenFilter extends AnalysisTokenFilterBase {
@@ -3631,7 +3732,7 @@ export interface AnalysisLowercaseNormalizer {
 
 export interface AnalysisLowercaseTokenFilter extends AnalysisTokenFilterBase {
   type: 'lowercase'
-  language: string
+  language?: string
 }
 
 export interface AnalysisLowercaseTokenizer extends AnalysisTokenizerBase {
@@ -3652,13 +3753,14 @@ export interface AnalysisMultiplexerTokenFilter extends AnalysisTokenFilterBase
 
 export interface AnalysisNGramTokenFilter extends AnalysisTokenFilterBase {
   type: 'ngram'
-  max_gram: integer
-  min_gram: integer
+  max_gram?: integer
+  min_gram?: integer
+  preserve_original?: boolean
 }
 
 export interface AnalysisNGramTokenizer extends AnalysisTokenizerBase {
   type: 'ngram'
-  custom_token_chars: string
+  custom_token_chars?: string
   max_gram: integer
   min_gram: integer
   token_chars: AnalysisTokenChar[]
@@ -3666,10 +3768,10 @@ export interface AnalysisNGramTokenizer extends AnalysisTokenizerBase {
 
 export interface AnalysisNoriAnalyzer {
   type: 'nori'
-  version: VersionString
-  decompound_mode: AnalysisNoriDecompoundMode
-  stoptags: string[]
-  user_dictionary: string
+  version?: VersionString
+  decompound_mode?: AnalysisNoriDecompoundMode
+  stoptags?: string[]
+  user_dictionary?: string
 }
 
 export type AnalysisNoriDecompoundMode = 'discard' | 'none' | 'mixed'
@@ -3681,10 +3783,10 @@ export interface AnalysisNoriPartOfSpeechTokenFilter extends AnalysisTokenFilter
 
 export interface AnalysisNoriTokenizer extends AnalysisTokenizerBase {
   type: 'nori_tokenizer'
-  decompound_mode: AnalysisNoriDecompoundMode
-  discard_punctuation: boolean
-  user_dictionary: string
-  user_dictionary_rules: string[]
+  decompound_mode?: AnalysisNoriDecompoundMode
+  discard_punctuation?: boolean
+  user_dictionary?: string
+  user_dictionary_rules?: string[]
 }
 
 export type AnalysisNormalizer = AnalysisLowercaseNormalizer | AnalysisCustomNormalizer
@@ -3700,11 +3802,11 @@ export interface AnalysisPathHierarchyTokenizer extends AnalysisTokenizerBase {
 
 export interface AnalysisPatternAnalyzer {
   type: 'pattern'
-  version: VersionString
-  flags: string
-  lowercase: boolean
+  version?: VersionString
+  flags?: string
+  lowercase?: boolean
   pattern: string
-  stopwords: AnalysisStopWords
+  stopwords?: AnalysisStopWords
 }
 
 export interface AnalysisPatternCaptureTokenFilter extends AnalysisTokenFilterBase {
@@ -3713,6 +3815,13 @@ export interface AnalysisPatternCaptureTokenFilter extends AnalysisTokenFilterBa
   preserve_original: boolean
 }
 
+export interface AnalysisPatternReplaceCharFilter extends AnalysisCharFilterBase {
+  type: 'pattern_replace'
+  flags: string
+  pattern: string
+  replacement: string
+}
+
 export interface AnalysisPatternReplaceTokenFilter extends AnalysisTokenFilterBase {
   type: 'pattern_replace'
   flags: string
@@ -3720,6 +3829,31 @@ export interface AnalysisPatternReplaceTokenFilter extends AnalysisTokenFilterBa
   replacement: string
 }
 
+export interface AnalysisPatternTokenizer extends AnalysisTokenizerBase {
+  type: 'pattern'
+  flags: string
+  group: integer
+  pattern: string
+}
+
+export type AnalysisPhoneticEncoder = 'metaphone' | 'double_metaphone' | 'soundex' | 'refined_soundex' | 'caverphone1' | 'caverphone2' | 'cologne' | 'nysiis' | 'koelnerphonetik' | 'haasephonetik' | 'beider_morse' | 'daitch_mokotoff'
+
+export type AnalysisPhoneticLanguage = 'any' | 'common' | 'cyrillic' | 'english' | 'french' | 'german' | 'hebrew' | 'hungarian' | 'polish' | 'romanian' | 'russian' | 'spanish'
+
+export type AnalysisPhoneticNameType = 'generic' | 'ashkenazi' | 'sephardic'
+
+export type AnalysisPhoneticRuleType = 'approx' | 'exact'
+
+export interface AnalysisPhoneticTokenFilter extends AnalysisTokenFilterBase {
+  type: 'phonetic'
+  encoder: AnalysisPhoneticEncoder
+  languageset: AnalysisPhoneticLanguage[]
+  max_code_len?: integer
+  name_type: AnalysisPhoneticNameType
+  replace?: boolean
+  rule_type: AnalysisPhoneticRuleType
+}
+
 export interface AnalysisPorterStemTokenFilter extends AnalysisTokenFilterBase {
   type: 'porter_stem'
 }
@@ -3739,17 +3873,24 @@ export interface AnalysisReverseTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisShingleTokenFilter extends AnalysisTokenFilterBase {
   type: 'shingle'
-  filler_token: string
-  max_shingle_size: integer
-  min_shingle_size: integer
-  output_unigrams: boolean
-  output_unigrams_if_no_shingles: boolean
-  token_separator: string
+  filler_token?: string
+  max_shingle_size?: integer | string
+  min_shingle_size?: integer | string
+  output_unigrams?: boolean
+  output_unigrams_if_no_shingles?: boolean
+  token_separator?: string
 }
 
 export interface AnalysisSimpleAnalyzer {
   type: 'simple'
-  version: VersionString
+  version?: VersionString
+}
+
+export interface AnalysisSnowballAnalyzer {
+  type: 'snowball'
+  version?: VersionString
+  language: AnalysisSnowballLanguage
+  stopwords?: AnalysisStopWords
 }
 
 export type AnalysisSnowballLanguage = 'Armenian' | 'Basque' | 'Catalan' | 'Danish' | 'Dutch' | 'English' | 'Finnish' | 'French' | 'German' | 'German2' | 'Hungarian' | 'Italian' | 'Kp' | 'Lovins' | 'Norwegian' | 'Porter' | 'Portuguese' | 'Romanian' | 'Russian' | 'Spanish' | 'Swedish' | 'Turkish'
@@ -3761,19 +3902,19 @@ export interface AnalysisSnowballTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisStandardAnalyzer {
   type: 'standard'
-  max_token_length: integer
-  stopwords: AnalysisStopWords
+  max_token_length?: integer
+  stopwords?: AnalysisStopWords
 }
 
 export interface AnalysisStandardTokenizer extends AnalysisTokenizerBase {
   type: 'standard'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisStemmerOverrideTokenFilter extends AnalysisTokenFilterBase {
   type: 'stemmer_override'
-  rules: string[]
-  rules_path: string
+  rules?: string[]
+  rules_path?: string
 }
 
 export interface AnalysisStemmerTokenFilter extends AnalysisTokenFilterBase {
@@ -3783,9 +3924,9 @@ export interface AnalysisStemmerTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisStopAnalyzer {
   type: 'stop'
-  version: VersionString
-  stopwords: AnalysisStopWords
-  stopwords_path: string
+  version?: VersionString
+  stopwords?: AnalysisStopWords
+  stopwords_path?: string
 }
 
 export interface AnalysisStopTokenFilter extends AnalysisTokenFilterBase {
@@ -3802,13 +3943,13 @@ export type AnalysisSynonymFormat = 'solr' | 'wordnet'
 
 export interface AnalysisSynonymGraphTokenFilter extends AnalysisTokenFilterBase {
   type: 'synonym_graph'
-  expand: boolean
-  format: AnalysisSynonymFormat
-  lenient: boolean
-  synonyms: string[]
-  synonyms_path: string
-  tokenizer: string
-  updateable: boolean
+  expand?: boolean
+  format?: AnalysisSynonymFormat
+  lenient?: boolean
+  synonyms?: string[]
+  synonyms_path?: string
+  tokenizer?: string
+  updateable?: boolean
 }
 
 export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
@@ -3816,7 +3957,7 @@ export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
   expand?: boolean
   format?: AnalysisSynonymFormat
   lenient?: boolean
-  synonyms: string[]
+  synonyms?: string[]
   synonyms_path?: string
   tokenizer?: string
   updateable?: boolean
@@ -3824,13 +3965,13 @@ export interface AnalysisSynonymTokenFilter extends AnalysisTokenFilterBase {
 
 export type AnalysisTokenChar = 'letter' | 'digit' | 'whitespace' | 'punctuation' | 'symbol' | 'custom'
 
-export type AnalysisTokenFilter = AnalysisAsciiFoldingTokenFilter | AnalysisCommonGramsTokenFilter | AnalysisConditionTokenFilter | AnalysisDelimitedPayloadTokenFilter | AnalysisEdgeNGramTokenFilter | AnalysisElisionTokenFilter | AnalysisFingerprintTokenFilter | AnalysisHunspellTokenFilter | AnalysisHyphenationDecompounderTokenFilter | AnalysisKeepTypesTokenFilter | AnalysisKeepWordsTokenFilter | AnalysisKeywordMarkerTokenFilter | AnalysisKStemTokenFilter | AnalysisLengthTokenFilter | AnalysisLimitTokenCountTokenFilter | AnalysisLowercaseTokenFilter | AnalysisMultiplexerTokenFilter | AnalysisNGramTokenFilter | AnalysisNoriPartOfSpeechTokenFilter | AnalysisPatternCaptureTokenFilter | AnalysisPatternReplaceTokenFilter | AnalysisPorterStemTokenFilter | AnalysisPredicateTokenFilter | AnalysisRemoveDuplicatesTokenFilter | AnalysisReverseTokenFilter | AnalysisShingleTokenFilter | AnalysisSnowballTokenFilter | AnalysisStemmerOverrideTokenFilter | AnalysisStemmerTokenFilter | AnalysisStopTokenFilter | AnalysisSynonymGraphTokenFilter | AnalysisSynonymTokenFilter | AnalysisTrimTokenFilter | AnalysisTruncateTokenFilter | AnalysisUniqueTokenFilter | AnalysisUppercaseTokenFilter | AnalysisWordDelimiterGraphTokenFilter | AnalysisWordDelimiterTokenFilter | AnalysisKuromojiStemmerTokenFilter | AnalysisKuromojiReadingFormTokenFilter | AnalysisKuromojiPartOfSpeechTokenFilter
+export type AnalysisTokenFilter = AnalysisAsciiFoldingTokenFilter | AnalysisCommonGramsTokenFilter | AnalysisConditionTokenFilter | AnalysisDelimitedPayloadTokenFilter | AnalysisEdgeNGramTokenFilter | AnalysisElisionTokenFilter | AnalysisFingerprintTokenFilter | AnalysisHunspellTokenFilter | AnalysisHyphenationDecompounderTokenFilter | AnalysisKeepTypesTokenFilter | AnalysisKeepWordsTokenFilter | AnalysisKeywordMarkerTokenFilter | AnalysisKStemTokenFilter | AnalysisLengthTokenFilter | AnalysisLimitTokenCountTokenFilter | AnalysisLowercaseTokenFilter | AnalysisMultiplexerTokenFilter | AnalysisNGramTokenFilter | AnalysisNoriPartOfSpeechTokenFilter | AnalysisPatternCaptureTokenFilter | AnalysisPatternReplaceTokenFilter | AnalysisPorterStemTokenFilter | AnalysisPredicateTokenFilter | AnalysisRemoveDuplicatesTokenFilter | AnalysisReverseTokenFilter | AnalysisShingleTokenFilter | AnalysisSnowballTokenFilter | AnalysisStemmerOverrideTokenFilter | AnalysisStemmerTokenFilter | AnalysisStopTokenFilter | AnalysisSynonymGraphTokenFilter | AnalysisSynonymTokenFilter | AnalysisTrimTokenFilter | AnalysisTruncateTokenFilter | AnalysisUniqueTokenFilter | AnalysisUppercaseTokenFilter | AnalysisWordDelimiterGraphTokenFilter | AnalysisWordDelimiterTokenFilter | AnalysisKuromojiStemmerTokenFilter | AnalysisKuromojiReadingFormTokenFilter | AnalysisKuromojiPartOfSpeechTokenFilter | AnalysisIcuTokenizer | AnalysisIcuCollationTokenFilter | AnalysisIcuFoldingTokenFilter | AnalysisIcuNormalizationTokenFilter | AnalysisIcuTransformTokenFilter | AnalysisPhoneticTokenFilter | AnalysisDictionaryDecompounderTokenFilter
 
 export interface AnalysisTokenFilterBase {
   version?: VersionString
 }
 
-export type AnalysisTokenizer = AnalysisCharGroupTokenizer | AnalysisEdgeNGramTokenizer | AnalysisKeywordTokenizer | AnalysisLetterTokenizer | AnalysisLowercaseTokenizer | AnalysisNGramTokenizer | AnalysisNoriTokenizer | AnalysisPathHierarchyTokenizer | AnalysisStandardTokenizer | AnalysisUaxEmailUrlTokenizer | AnalysisWhitespaceTokenizer | AnalysisKuromojiTokenizer
+export type AnalysisTokenizer = AnalysisCharGroupTokenizer | AnalysisEdgeNGramTokenizer | AnalysisKeywordTokenizer | AnalysisLetterTokenizer | AnalysisLowercaseTokenizer | AnalysisNGramTokenizer | AnalysisNoriTokenizer | AnalysisPathHierarchyTokenizer | AnalysisStandardTokenizer | AnalysisUaxEmailUrlTokenizer | AnalysisWhitespaceTokenizer | AnalysisKuromojiTokenizer | AnalysisPatternTokenizer | AnalysisIcuTokenizer
 
 export interface AnalysisTokenizerBase {
   version?: VersionString
@@ -3847,12 +3988,12 @@ export interface AnalysisTruncateTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisUaxEmailUrlTokenizer extends AnalysisTokenizerBase {
   type: 'uax_url_email'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisUniqueTokenFilter extends AnalysisTokenFilterBase {
   type: 'unique'
-  only_on_same_position: boolean
+  only_on_same_position?: boolean
 }
 
 export interface AnalysisUppercaseTokenFilter extends AnalysisTokenFilterBase {
@@ -3861,47 +4002,48 @@ export interface AnalysisUppercaseTokenFilter extends AnalysisTokenFilterBase {
 
 export interface AnalysisWhitespaceAnalyzer {
   type: 'whitespace'
-  version: VersionString
+  version?: VersionString
 }
 
 export interface AnalysisWhitespaceTokenizer extends AnalysisTokenizerBase {
   type: 'whitespace'
-  max_token_length: integer
+  max_token_length?: integer
 }
 
 export interface AnalysisWordDelimiterGraphTokenFilter extends AnalysisTokenFilterBase {
   type: 'word_delimiter_graph'
-  adjust_offsets: boolean
-  catenate_all: boolean
-  catenate_numbers: boolean
-  catenate_words: boolean
-  generate_number_parts: boolean
-  generate_word_parts: boolean
-  preserve_original: boolean
-  protected_words: string[]
-  protected_words_path: string
-  split_on_case_change: boolean
-  split_on_numerics: boolean
-  stem_english_possessive: boolean
-  type_table: string[]
-  type_table_path: string
+  adjust_offsets?: boolean
+  catenate_all?: boolean
+  catenate_numbers?: boolean
+  catenate_words?: boolean
+  generate_number_parts?: boolean
+  generate_word_parts?: boolean
+  ignore_keywords?: boolean
+  preserve_original?: boolean
+  protected_words?: string[]
+  protected_words_path?: string
+  split_on_case_change?: boolean
+  split_on_numerics?: boolean
+  stem_english_possessive?: boolean
+  type_table?: string[]
+  type_table_path?: string
 }
 
 export interface AnalysisWordDelimiterTokenFilter extends AnalysisTokenFilterBase {
   type: 'word_delimiter'
-  catenate_all: boolean
-  catenate_numbers: boolean
-  catenate_words: boolean
-  generate_number_parts: boolean
-  generate_word_parts: boolean
-  preserve_original: boolean
-  protected_words: string[]
-  protected_words_path: string
-  split_on_case_change: boolean
-  split_on_numerics: boolean
-  stem_english_possessive: boolean
-  type_table: string[]
-  type_table_path: string
+  catenate_all?: boolean
+  catenate_numbers?: boolean
+  catenate_words?: boolean
+  generate_number_parts?: boolean
+  generate_word_parts?: boolean
+  preserve_original?: boolean
+  protected_words?: string[]
+  protected_words_path?: string
+  split_on_case_change?: boolean
+  split_on_numerics?: boolean
+  stem_english_possessive?: boolean
+  type_table?: string[]
+  type_table_path?: string
 }
 
 export interface MappingAggregateMetricDoubleProperty extends MappingPropertyBase {
@@ -3981,6 +4123,7 @@ export interface MappingDateProperty extends MappingDocValuesPropertyBase {
   index?: boolean
   null_value?: DateString
   precision_step?: integer
+  locale?: string
   type: 'date'
 }
 
@@ -3989,9 +4132,18 @@ export interface MappingDateRangeProperty extends MappingRangePropertyBase {
   type: 'date_range'
 }
 
+export interface MappingDenseVectorIndexOptions {
+  type: string
+  m: integer
+  ef_construction: integer
+}
+
 export interface MappingDenseVectorProperty extends MappingPropertyBase {
   type: 'dense_vector'
   dims: integer
+  similarity?: string
+  index?: boolean
+  index_options?: MappingDenseVectorIndexOptions
 }
 
 export type MappingDocValuesProperty = MappingBinaryProperty | MappingBooleanProperty | MappingDateProperty | MappingDateNanosProperty | MappingKeywordProperty | MappingNumberProperty | MappingRangeProperty | MappingGeoPointProperty | MappingGeoShapeProperty | MappingCompletionProperty | MappingGenericProperty | MappingIpProperty | MappingMurmur3HashProperty | MappingShapeProperty | MappingTokenCountProperty | MappingVersionProperty | MappingWildcardProperty | MappingPointProperty
@@ -4145,6 +4297,7 @@ export interface MappingKeywordProperty extends MappingDocValuesPropertyBase {
   norms?: boolean
   null_value?: string
   split_queries_on_whitespace?: boolean
+  time_series_dimension?: boolean
   type: 'keyword'
 }
 
@@ -4175,6 +4328,7 @@ export type MappingNumberProperty = MappingFloatNumberProperty | MappingHalfFloa
 export interface MappingNumberPropertyBase extends MappingDocValuesPropertyBase {
   index?: boolean
   ignore_malformed?: boolean
+  time_series_metric?: MappingTimeSeriesMetricType
 }
 
 export interface MappingObjectProperty extends MappingCorePropertyBase {
@@ -4320,6 +4474,8 @@ export interface MappingTextProperty extends MappingCorePropertyBase {
   type: 'text'
 }
 
+export type MappingTimeSeriesMetricType = 'gauge' | 'counter' | 'summary' | 'histogram'
+
 export interface MappingTokenCountProperty extends MappingDocValuesPropertyBase {
   analyzer?: string
   boost?: double
@@ -4417,8 +4573,8 @@ export interface QueryDslConstantScoreQuery extends QueryDslQueryBase {
 
 export interface QueryDslDateDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslDateDecayFunction = QueryDslDateDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<DateMath, Time> }
+export type QueryDslDateDecayFunction = QueryDslDateDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<DateMath, Time> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export interface QueryDslDateDistanceFeatureQuery extends QueryDslDistanceFeatureQueryBase<DateMath, Time> {
 }
@@ -4518,15 +4674,15 @@ export interface QueryDslGeoBoundingBoxQueryKeys extends QueryDslQueryBase {
   validation_method?: QueryDslGeoValidationMethod
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoBoundingBoxQuery = QueryDslGeoBoundingBoxQueryKeys |
-{ [property: string]: QueryDslBoundingBox }
+export type QueryDslGeoBoundingBoxQuery = QueryDslGeoBoundingBoxQueryKeys
+& { [property: string]: QueryDslBoundingBox | QueryDslGeoExecution | QueryDslGeoValidationMethod | boolean | float | string }
 
 export type QueryDslGeoCoordinate = string | double[] | QueryDslThreeDimensionalPoint
 
 export interface QueryDslGeoDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslGeoDecayFunction = QueryDslGeoDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<QueryDslGeoLocation, Distance> }
+export type QueryDslGeoDecayFunction = QueryDslGeoDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<QueryDslGeoLocation, Distance> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export interface QueryDslGeoDistanceFeatureQuery extends QueryDslDistanceFeatureQueryBase<QueryDslGeoCoordinate, Distance> {
 }
@@ -4536,8 +4692,8 @@ export interface QueryDslGeoDistanceQueryKeys extends QueryDslQueryBase {
   distance_type?: GeoDistanceType
   validation_method?: QueryDslGeoValidationMethod
 }
-export type QueryDslGeoDistanceQuery = QueryDslGeoDistanceQueryKeys |
-{ [property: string]: QueryDslGeoLocation }
+export type QueryDslGeoDistanceQuery = QueryDslGeoDistanceQueryKeys
+& { [property: string]: QueryDslGeoLocation | Distance | GeoDistanceType | QueryDslGeoValidationMethod | float | string }
 
 export type QueryDslGeoExecution = 'memory' | 'indexed'
 
@@ -4551,8 +4707,8 @@ export interface QueryDslGeoPolygonQueryKeys extends QueryDslQueryBase {
   validation_method?: QueryDslGeoValidationMethod
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoPolygonQuery = QueryDslGeoPolygonQueryKeys |
-{ [property: string]: QueryDslGeoPolygonPoints }
+export type QueryDslGeoPolygonQuery = QueryDslGeoPolygonQueryKeys
+& { [property: string]: QueryDslGeoPolygonPoints | QueryDslGeoValidationMethod | boolean | float | string }
 
 export interface QueryDslGeoShapeFieldQuery {
   shape?: GeoShape
@@ -4563,8 +4719,8 @@ export interface QueryDslGeoShapeFieldQuery {
 export interface QueryDslGeoShapeQueryKeys extends QueryDslQueryBase {
   ignore_unmapped?: boolean
 }
-export type QueryDslGeoShapeQuery = QueryDslGeoShapeQueryKeys |
-{ [property: string]: QueryDslGeoShapeFieldQuery }
+export type QueryDslGeoShapeQuery = QueryDslGeoShapeQueryKeys
+& { [property: string]: QueryDslGeoShapeFieldQuery | boolean | float | string }
 
 export type QueryDslGeoValidationMethod = 'coerce' | 'ignore_malformed' | 'strict'
 
@@ -4790,8 +4946,8 @@ export interface QueryDslNumberRangeQuery extends QueryDslRangeQueryBase {
 
 export interface QueryDslNumericDecayFunctionKeys extends QueryDslDecayFunctionBase {
 }
-export type QueryDslNumericDecayFunction = QueryDslNumericDecayFunctionKeys |
-{ [property: string]: QueryDslDecayPlacement<double, double> }
+export type QueryDslNumericDecayFunction = QueryDslNumericDecayFunctionKeys
+& { [property: string]: QueryDslDecayPlacement<double, double> | QueryDslMultiValueMode | QueryDslQueryContainer | double }
 
 export type QueryDslOperator = 'and' | 'or'
 
@@ -4995,8 +5151,8 @@ export interface QueryDslShapeFieldQuery {
 
 export interface QueryDslShapeQueryKeys extends QueryDslQueryBase {
 }
-export type QueryDslShapeQuery = QueryDslShapeQueryKeys |
-{ [property: string]: QueryDslShapeFieldQuery }
+export type QueryDslShapeQuery = QueryDslShapeQueryKeys
+& { [property: string]: QueryDslShapeFieldQuery | float | string }
 
 export type QueryDslSimpleQueryStringFlags = 'NONE' | 'AND' | 'OR' | 'NOT' | 'PREFIX' | 'PHRASE' | 'PRECEDENCE' | 'ESCAPE' | 'WHITESPACE' | 'FUZZY' | 'NEAR' | 'SLOP' | 'ALL'
 
@@ -5091,8 +5247,8 @@ export interface QueryDslTermsLookup {
 
 export interface QueryDslTermsQueryKeys extends QueryDslQueryBase {
 }
-export type QueryDslTermsQuery = QueryDslTermsQueryKeys |
-{ [property: string]: string[] | long[] | QueryDslTermsLookup }
+export type QueryDslTermsQuery = QueryDslTermsQueryKeys
+& { [property: string]: string[] | long[] | QueryDslTermsLookup | float | string }
 
 export interface QueryDslTermsSetQuery extends QueryDslQueryBase {
   minimum_should_match_field?: Field
@@ -5120,13 +5276,14 @@ export interface QueryDslTypeQuery extends QueryDslQueryBase {
 export interface QueryDslWildcardQuery extends QueryDslQueryBase {
   case_insensitive?: boolean
   rewrite?: MultiTermQueryRewrite
-  value: string
+  value?: string
+  wildcard?: string
 }
 
 export type QueryDslZeroTermsQuery = 'all' | 'none'
 
 export interface AsyncSearchAsyncSearch<TDocument = unknown> {
-  aggregations?: Record<string, AggregationsAggregate>
+  aggregations?: Record<AggregateName, AggregationsAggregate>
   _clusters?: ClusterStatistics
   fields?: Record<string, any>
   hits: SearchHitsMetadata<TDocument>
@@ -5230,8 +5387,8 @@ export interface AsyncSearchSubmitRequest extends RequestBase {
   sort?: string | string[]
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
-    aggs?: Record<string, AggregationsAggregationContainer>
     aggregations?: Record<string, AggregationsAggregationContainer>
+    aggs?: Record<string, AggregationsAggregationContainer>
     collapse?: SearchFieldCollapse
     explain?: boolean
     from?: integer
@@ -5898,7 +6055,8 @@ export interface CatMlDatafeedsDatafeedsRecord {
 
 export interface CatMlDatafeedsRequest extends CatCatRequestBase {
   datafeed_id?: Id
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
+  time?: TimeUnit
 }
 
 export type CatMlDatafeedsResponse = CatMlDatafeedsDatafeedsRecord[]
@@ -6082,8 +6240,9 @@ export interface CatMlJobsJobsRecord {
 
 export interface CatMlJobsRequest extends CatCatRequestBase {
   job_id?: Id
-  allow_no_jobs?: boolean
+  allow_no_match?: boolean
   bytes?: Bytes
+  time?: TimeUnit
 }
 
 export type CatMlJobsResponse = CatMlJobsJobsRecord[]
@@ -8479,6 +8638,13 @@ export interface IndicesIndexRoutingRebalance {
 
 export type IndicesIndexRoutingRebalanceOptions = 'all' | 'primaries' | 'replicas' | 'none'
 
+export interface IndicesIndexSegmentSort {
+  field: Fields
+  order: IndicesSegmentSortOrder | IndicesSegmentSortOrder[]
+  mode?: IndicesSegmentSortMode
+  missing?: IndicesSegmentSortMissing
+}
+
 export interface IndicesIndexSettingBlocks {
   read_only?: boolean
   read_only_allow_delete?: boolean
@@ -8488,6 +8654,15 @@ export interface IndicesIndexSettingBlocks {
 }
 
 export interface IndicesIndexSettings {
+  index?: IndicesIndexSettings
+  mode?: string
+  'index.mode'?: string
+  routing_path?: string[]
+  'index.routing_path'?: string[]
+  soft_deletes?: IndicesSoftDeletes
+  'index.soft_deletes'?: IndicesSoftDeletes
+  sort?: IndicesIndexSegmentSort
+  'index.sort'?: IndicesIndexSegmentSort
   number_of_shards?: integer | string
   'index.number_of_shards'?: integer | string
   number_of_replicas?: integer | string
@@ -8498,8 +8673,8 @@ export interface IndicesIndexSettings {
   'index.check_on_startup'?: IndicesIndexCheckOnStartup
   codec?: string
   'index.codec'?: string
-  routing_partition_size?: integer | string
-  'index.routing_partition_size'?: integer | string
+  routing_partition_size?: integer
+  'index.routing_partition_size'?: integer
   'soft_deletes.retention_lease.period'?: Time
   'index.soft_deletes.retention_lease.period'?: Time
   load_fixed_bitset_filters_eagerly?: boolean
@@ -8508,6 +8683,8 @@ export interface IndicesIndexSettings {
   'index.hidden'?: boolean | string
   auto_expand_replicas?: string
   'index.auto_expand_replicas'?: string
+  'merge.scheduler.max_thread_count'?: integer
+  'index.merge.scheduler.max_thread_count'?: integer
   'search.idle.after'?: Time
   'index.search.idle.after'?: Time
   refresh_interval?: Time
@@ -8576,12 +8753,15 @@ export interface IndicesIndexSettings {
   'index.max_slices_per_scroll'?: integer
   'translog.durability'?: string
   'index.translog.durability'?: string
+  'translog.flush_threshold_size'?: string
+  'index.translog.flush_threshold_size'?: string
   'query_string.lenient'?: boolean | string
   'index.query_string.lenient'?: boolean | string
   priority?: integer | string
   'index.priority'?: integer | string
   top_metrics_max_size?: integer
   analysis?: IndicesIndexSettingsAnalysis
+  'index.analysis'?: IndicesIndexSettingsAnalysis
   settings?: IndicesIndexSettings
 }
 
@@ -8590,6 +8770,7 @@ export interface IndicesIndexSettingsAnalysis {
   char_filter?: Record<string, AnalysisCharFilter>
   filter?: Record<string, AnalysisTokenFilter>
   normalizer?: Record<string, AnalysisNormalizer>
+  tokenizer?: Record<string, AnalysisTokenizer>
 }
 
 export interface IndicesIndexSettingsLifecycle {
@@ -8622,6 +8803,16 @@ export interface IndicesOverlappingIndexTemplate {
   index_patterns?: IndexName[]
 }
 
+export type IndicesSegmentSortMissing = '_last' | '_first'
+
+export type IndicesSegmentSortMode = 'min' | 'max'
+
+export type IndicesSegmentSortOrder = 'asc' | 'desc'
+
+export interface IndicesSoftDeletes {
+  enabled: boolean
+}
+
 export interface IndicesStringFielddata {
   format: IndicesStringFielddataFormat
 }
@@ -8790,9 +8981,9 @@ export interface IndicesCreateRequest extends RequestBase {
   wait_for_active_shards?: WaitForActiveShards
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
-    aliases?: Record<IndexName, IndicesAlias>
-    mappings?: Record<string, MappingTypeMapping> | MappingTypeMapping
-    settings?: Record<string, any>
+    aliases?: Record<Name, IndicesAlias>
+    mappings?: MappingTypeMapping
+    settings?: IndicesIndexSettings
   }
 }
 
@@ -8966,20 +9157,6 @@ export interface IndicesForcemergeRequest extends RequestBase {
 export interface IndicesForcemergeResponse extends ShardsOperationResponseBase {
 }
 
-export interface IndicesFreezeRequest extends RequestBase {
-  index: IndexName
-  allow_no_indices?: boolean
-  expand_wildcards?: ExpandWildcards
-  ignore_unavailable?: boolean
-  master_timeout?: Time
-  timeout?: Time
-  wait_for_active_shards?: WaitForActiveShards
-}
-
-export interface IndicesFreezeResponse extends AcknowledgedResponseBase {
-  shards_acknowledged: boolean
-}
-
 export interface IndicesGetRequest extends RequestBase {
   index: Indices
   allow_no_indices?: boolean
@@ -10369,7 +10546,6 @@ export interface LicensePostStartTrialRequest extends RequestBase {
 
 export interface LicensePostStartTrialResponse extends AcknowledgedResponseBase {
   error_message?: string
-  acknowledged: boolean
   trial_was_started: boolean
   type: LicenseLicenseType
 }
@@ -10445,8 +10621,8 @@ export interface MlAnalysisConfig {
   categorization_filters?: string[]
   detectors: MlDetector[]
   influencers?: Field[]
-  model_prune_window?: Time
   latency?: Time
+  model_prune_window?: Time
   multivariate_by_fields?: boolean
   per_partition_categorization?: MlPerPartitionCategorization
   summary_count_field_name?: Field
@@ -10618,7 +10794,7 @@ export interface MlDataCounts {
 
 export interface MlDataDescription {
   format?: string
-  time_field: Field
+  time_field?: Field
   time_format?: string
   field_delimiter?: string
 }
@@ -11003,6 +11179,8 @@ export interface MlHyperparameters {
   soft_tree_depth_tolerance?: double
 }
 
+export type MlInclude = 'definition' | 'feature_importance_baseline' | 'hyperparameters' | 'total_feature_importance'
+
 export interface MlInfluence {
   influencer_field_name: string
   influencer_field_values: string[]
@@ -11270,7 +11448,6 @@ export interface MlValidationLoss {
 export interface MlCloseJobRequest extends RequestBase {
   job_id: Id
   allow_no_match?: boolean
-  allow_no_jobs?: boolean
   force?: boolean
   timeout?: Time
 }
@@ -11560,7 +11737,6 @@ export interface MlGetBucketsRequest extends RequestBase {
     desc?: boolean
     exclude_interim?: boolean
     expand?: boolean
-    page?: MlPage
     sort?: Field
     start?: DateString
     end?: DateString
@@ -11652,7 +11828,7 @@ export interface MlGetDataFrameAnalyticsStatsResponse {
 
 export interface MlGetDatafeedStatsRequest extends RequestBase {
   datafeed_id?: Ids
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
 }
 
 export interface MlGetDatafeedStatsResponse {
@@ -11662,7 +11838,7 @@ export interface MlGetDatafeedStatsResponse {
 
 export interface MlGetDatafeedsRequest extends RequestBase {
   datafeed_id?: Ids
-  allow_no_datafeeds?: boolean
+  allow_no_match?: boolean
   exclude_generated?: boolean
 }
 
@@ -11705,7 +11881,7 @@ export interface MlGetInfluencersResponse {
 
 export interface MlGetJobStatsRequest extends RequestBase {
   job_id?: Id
-  allow_no_jobs?: boolean
+  allow_no_match?: boolean
 }
 
 export interface MlGetJobStatsResponse {
@@ -11716,7 +11892,6 @@ export interface MlGetJobStatsResponse {
 export interface MlGetJobsRequest extends RequestBase {
   job_id?: Ids
   allow_no_match?: boolean
-  allow_no_jobs?: boolean
   exclude_generated?: boolean
 }
 
@@ -11748,17 +11923,13 @@ export interface MlGetModelSnapshotsResponse {
 
 export interface MlGetOverallBucketsRequest extends RequestBase {
   job_id: Id
-  bucket_span?: Time
-  overall_score?: double | string
-  top_n?: integer
-  end?: Time
-  start?: Time
-  exclude_interim?: boolean
   allow_no_match?: boolean
-  /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
-  body?: {
-    allow_no_jobs?: boolean
-  }
+  bucket_span?: Time
+  end?: Time
+  exclude_interim?: boolean
+  overall_score?: double | string
+  start?: Time
+  top_n?: integer
 }
 
 export interface MlGetOverallBucketsResponse {
@@ -11796,7 +11967,7 @@ export interface MlGetTrainedModelsRequest extends RequestBase {
   decompress_definition?: boolean
   exclude_generated?: boolean
   from?: integer
-  include?: string
+  include?: MlInclude
   size?: integer
   tags?: string
 }
@@ -11930,8 +12101,8 @@ export interface MlPreviewDatafeedRequest extends RequestBase {
   datafeed_id?: Id
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
-    job_config?: MlJobConfig
     datafeed_config?: MlDatafeedConfig
+    job_config?: MlJobConfig
   }
 }
 
@@ -12006,6 +12177,7 @@ export interface MlPutDatafeedRequest extends RequestBase {
     delayed_data_check_config?: MlDelayedDataCheckConfig
     frequency?: Time
     indices?: string[]
+    indexes?: string[]
     indices_options?: MlDatafeedIndicesOptions
     job_id?: Id
     max_empty_searches?: integer
@@ -13243,6 +13415,7 @@ export interface RollupRollupSearchRequest extends RequestBase {
   typed_keys?: boolean
   /** @deprecated The use of the 'body' key has been deprecated, move the nested keys to the top level object. */
   body?: {
+    aggregations?: Record<string, AggregationsAggregationContainer>
     aggs?: Record<string, AggregationsAggregationContainer>
     query?: QueryDslQueryContainer
     size?: integer