bump 9.0.0 alpha.3 (#2591)

* github-action: Add AsciiDoc freeze warning

* github-action: Add AsciiDoc freeze warning

.github/workflows/comment-on-asciidoc-changes.yml

@@ -0,0 +1,21 @@
+---
+name: Comment on PR for .asciidoc changes
+
+on:
+  # We need to use pull_request_target to be able to comment on PRs from forks
+  pull_request_target:
+    types:
+      - synchronize
+      - opened
+      - reopened
+    branches:
+      - main
+      - master
+      - "9.0"
+
+jobs:
+  comment-on-asciidoc-change:
+    permissions:
+      contents: read
+      pull-requests: write
+    uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
         with:
           stale-issue-label: stale
           stale-pr-label: stale

docs/basic-config.asciidoc

@@ -13,7 +13,6 @@ const client = new Client({
   cloud: { id: '<cloud-id>' },
   auth: { apiKey: 'base64EncodedKey' },
   maxRetries: 5,
-  requestTimeout: 60000,
   sniffOnStart: true
 })
 ----
@@ -82,7 +81,7 @@ _Default:_ `3`
 
 |`requestTimeout`
 |`number` - Max request timeout in milliseconds for each request. +
-_Default:_ `30000`
+_Default:_ No value
 
 |`pingTimeout`
 |`number` - Max ping request timeout in milliseconds for each request. +

docs/changelog.asciidoc

@@ -12,6 +12,11 @@
 
 In 8.0, the top-level `body` parameter that was available on all API functions <<remove-body-key,was deprecated>>. In 9.0 this property is completely removed.
 
+[discrete]
+===== Remove the default 30-second timeout on all requests sent to Elasticsearch
+
+Setting HTTP timeouts on Elasticsearch requests goes against Elastic's recommendations. See <<timeout-best-practices>> for more information.
+
 [discrete]
 === 8.17.0
 

docs/child.asciidoc

@@ -1,22 +1,22 @@
 [[child]]
 === Creating a child client
 
-There are some use cases where you may need multiple instances of the client. 
-You can easily do that by calling `new Client()` as many times as you need, but 
-you will lose all the benefits of using one single client, such as the long 
-living connections and the connection pool handling. To avoid this problem, the 
-client offers a `child` API, which returns a new client instance that shares the 
+There are some use cases where you may need multiple instances of the client.
+You can easily do that by calling `new Client()` as many times as you need, but
+you will lose all the benefits of using one single client, such as the long
+living connections and the connection pool handling. To avoid this problem, the
+client offers a `child` API, which returns a new client instance that shares the
 connection pool with the parent client.
 
-NOTE: The event emitter is shared between the parent and the child(ren). If you 
-extend the parent client, the child client will have the same extensions, while 
+NOTE: The event emitter is shared between the parent and the child(ren). If you
+extend the parent client, the child client will have the same extensions, while
 if the child client adds an extension, the parent client will not be extended.
 
-You can pass to the `child` every client option you would pass to a normal 
-client, but the connection pool specific options (`ssl`, `agent`, `pingTimeout`, 
+You can pass to the `child` every client option you would pass to a normal
+client, but the connection pool specific options (`ssl`, `agent`, `pingTimeout`,
 `Connection`, and `resurrectStrategy`).
 
-CAUTION: If you call `close` in any of the parent/child clients, every client 
+CAUTION: If you call `close` in any of the parent/child clients, every client
 will be closed.
 
 [source,js]
@@ -28,9 +28,8 @@ const client = new Client({
 })
 const child = client.child({
   headers: { 'x-foo': 'bar' },
-  requestTimeout: 1000
 })
 
 client.info().then(console.log, console.log)
 child.info().then(console.log, console.log)
-----
+----

docs/connecting.asciidoc

@@ -414,8 +414,8 @@ The supported request specific options are:
 _Default:_ `null`
 
 |`requestTimeout`
-|`number | string` - Max request timeout for the request in milliseconds, it overrides the client default. +
-_Default:_ `30000`
+|`number | string | null` - Max request timeout for the request in milliseconds. This overrides the client default, which is to not time out at all. See https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html#_http_client_configuration[Elasticsearch best practices for HTML clients] for more info. +
+_Default:_ No timeout
 
 |`retryOnTimeout`
 |`boolean` - Retry requests that have timed out.

docs/doc_examples/0722b302b2b3275a988d858044f99d5d.asciidoc

@@ -3,8 +3,8 @@
 
 [source, js]
 ----
-const response = await client.indices.unfreeze({
-  index: "my-index-000001",
+const response = await client.indices.getMapping({
+  index: "kibana_sample_data_ecommerce",
 });
 console.log(response);
 ----

docs/doc_examples/074e4602d1ca54412380a40867d078bc.asciidoc

@@ -11,6 +11,8 @@ const response = await client.indices.putSettings({
     "index.indexing.slowlog.threshold.index.debug": "2s",
     "index.indexing.slowlog.threshold.index.trace": "500ms",
     "index.indexing.slowlog.source": "1000",
+    "index.indexing.slowlog.reformat": true,
+    "index.indexing.slowlog.include.user": true,
   },
 });
 console.log(response);

docs/doc_examples/082e78c7a2061a7c4a52b494e5ede0e8.asciidoc

@@ -0,0 +1,42 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.create({
+  index: "my-rank-vectors-bit",
+  mappings: {
+    properties: {
+      my_vector: {
+        type: "rank_vectors",
+        element_type: "bit",
+      },
+    },
+  },
+});
+console.log(response);
+
+const response1 = await client.bulk({
+  index: "my-rank-vectors-bit",
+  refresh: "true",
+  operations: [
+    {
+      index: {
+        _id: "1",
+      },
+    },
+    {
+      my_vector: [127, -127, 0, 1, 42],
+    },
+    {
+      index: {
+        _id: "2",
+      },
+    },
+    {
+      my_vector: "8100012a7f",
+    },
+  ],
+});
+console.log(response1);
+----

docs/doc_examples/0c52af573c9401a2a687e86a4beb182b.asciidoc

@@ -10,7 +10,7 @@ const response = await client.ingest.putPipeline({
     {
       attachment: {
         field: "data",
-        remove_binary: false,
+        remove_binary: true,
       },
     },
   ],

docs/doc_examples/0e83f140237d75469a428ff403564bb5.asciidoc

@@ -1,15 +0,0 @@
-// This file is autogenerated, DO NOT EDIT
-// Use `node scripts/generate-docs-examples.js` to generate the docs examples
-
-[source, js]
-----
-const response = await client.cluster.putSettings({
-  persistent: {
-    "cluster.routing.allocation.disk.watermark.low": "100gb",
-    "cluster.routing.allocation.disk.watermark.high": "50gb",
-    "cluster.routing.allocation.disk.watermark.flood_stage": "10gb",
-    "cluster.info.update.interval": "1m",
-  },
-});
-console.log(response);
-----

docs/doc_examples/120fcf9f55128d6a81d5e87a9c235bbd.asciidoc

@@ -0,0 +1,20 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.transport.request({
+  method: "POST",
+  path: "/_inference/chat_completion/openai-completion/_stream",
+  body: {
+    model: "gpt-4o",
+    messages: [
+      {
+        role: "user",
+        content: "What is Elastic?",
+      },
+    ],
+  },
+});
+console.log(response);
+----

docs/doc_examples/141ef0ebaa3b0772892b79b9bb85efb0.asciidoc

@@ -3,11 +3,13 @@
 
 [source, js]
 ----
-const response = await client.inference.inference({
+const response = await client.inference.put({
   task_type: "my-inference-endpoint",
   inference_id: "_update",
-  service_settings: {
-    api_key: "<API_KEY>",
+  inference_config: {
+    service_settings: {
+      api_key: "<API_KEY>",
+    },
   },
 });
 console.log(response);

docs/doc_examples/1420a22aa817c7a996baaed0ad366d6f.asciidoc

@@ -1,22 +0,0 @@
-// This file is autogenerated, DO NOT EDIT
-// Use `node scripts/generate-docs-examples.js` to generate the docs examples
-
-[source, js]
-----
-const response = await client.search({
-  index: "test-index",
-  query: {
-    nested: {
-      path: "inference_field.inference.chunks",
-      query: {
-        sparse_vector: {
-          field: "inference_field.inference.chunks.embeddings",
-          inference_id: "my-inference-id",
-          query: "mountain lake",
-        },
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/246763219ec06172f7aa57bba28d344a.asciidoc

@@ -0,0 +1,67 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.create({
+  index: "my-rank-vectors-bit",
+  mappings: {
+    properties: {
+      my_vector: {
+        type: "rank_vectors",
+        element_type: "bit",
+      },
+    },
+  },
+});
+console.log(response);
+
+const response1 = await client.bulk({
+  index: "my-rank-vectors-bit",
+  refresh: "true",
+  operations: [
+    {
+      index: {
+        _id: "1",
+      },
+    },
+    {
+      my_vector: [127, -127, 0, 1, 42],
+    },
+    {
+      index: {
+        _id: "2",
+      },
+    },
+    {
+      my_vector: "8100012a7f",
+    },
+  ],
+});
+console.log(response1);
+
+const response2 = await client.search({
+  index: "my-rank-vectors-bit",
+  query: {
+    script_score: {
+      query: {
+        match_all: {},
+      },
+      script: {
+        source: "maxSimDotProduct(params.query_vector, 'my_vector')",
+        params: {
+          query_vector: [
+            [
+              0.35, 0.77, 0.95, 0.15, 0.11, 0.08, 0.58, 0.06, 0.44, 0.52, 0.21,
+              0.62, 0.65, 0.16, 0.64, 0.39, 0.93, 0.06, 0.93, 0.31, 0.92, 0,
+              0.66, 0.86, 0.92, 0.03, 0.81, 0.31, 0.2, 0.92, 0.95, 0.64, 0.19,
+              0.26, 0.77, 0.64, 0.78, 0.32, 0.97, 0.84,
+            ],
+          ],
+        },
+      },
+    },
+  },
+});
+console.log(response2);
+----

docs/doc_examples/2a21674c40f9b182a8944769d20b2357.asciidoc

@@ -0,0 +1,26 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "my-rank-vectors-float",
+  query: {
+    script_score: {
+      query: {
+        match_all: {},
+      },
+      script: {
+        source: "maxSimDotProduct(params.query_vector, 'my_vector')",
+        params: {
+          query_vector: [
+            [0.5, 10, 6],
+            [-0.5, 10, 10],
+          ],
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/2a67608dadbf220a2f040f3a79d3677d.asciidoc

@@ -0,0 +1,35 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.ingest.putPipeline({
+  id: "attachment",
+  description: "Extract attachment information including original binary",
+  processors: [
+    {
+      attachment: {
+        field: "data",
+        remove_binary: false,
+      },
+    },
+  ],
+});
+console.log(response);
+
+const response1 = await client.index({
+  index: "my-index-000001",
+  id: "my_id",
+  pipeline: "attachment",
+  document: {
+    data: "e1xydGYxXGFuc2kNCkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0DQpccGFyIH0=",
+  },
+});
+console.log(response1);
+
+const response2 = await client.get({
+  index: "my-index-000001",
+  id: "my_id",
+});
+console.log(response2);
+----

docs/doc_examples/2f72a63c73dd672ac2dc3997ad15dd41.asciidoc

@@ -0,0 +1,23 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.create({
+  index: "test-index",
+  mappings: {
+    properties: {
+      source_field: {
+        type: "text",
+        fields: {
+          infer_field: {
+            type: "semantic_text",
+            inference_id: ".elser-2-elasticsearch",
+          },
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/3312c82f81816bf76629db9582991812.asciidoc

@@ -14,6 +14,7 @@ const response = await client.indices.putSettings({
     "index.search.slowlog.threshold.fetch.info": "800ms",
     "index.search.slowlog.threshold.fetch.debug": "500ms",
     "index.search.slowlog.threshold.fetch.trace": "200ms",
+    "index.search.slowlog.include.user": true,
   },
 });
 console.log(response);

docs/doc_examples/37f367ca81a16d3aef4ef7126ec33a2e.asciidoc

@@ -0,0 +1,67 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "movies",
+  size: 10,
+  retriever: {
+    rescorer: {
+      rescore: {
+        query: {
+          window_size: 50,
+          rescore_query: {
+            script_score: {
+              script: {
+                source:
+                  "cosineSimilarity(params.queryVector, 'product-vector_final_stage') + 1.0",
+                params: {
+                  queryVector: [-0.5, 90, -10, 14.8, -156],
+                },
+              },
+            },
+          },
+        },
+      },
+      retriever: {
+        rrf: {
+          rank_window_size: 100,
+          retrievers: [
+            {
+              standard: {
+                query: {
+                  sparse_vector: {
+                    field: "plot_embedding",
+                    inference_id: "my-elser-model",
+                    query: "films that explore psychological depths",
+                  },
+                },
+              },
+            },
+            {
+              standard: {
+                query: {
+                  multi_match: {
+                    query: "crime",
+                    fields: ["plot", "title"],
+                  },
+                },
+              },
+            },
+            {
+              knn: {
+                field: "vector",
+                query_vector: [10, 22, 77],
+                k: 10,
+                num_candidates: 10,
+              },
+            },
+          ],
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/38ba93890494bfa7beece58dffa44f98.asciidoc

@@ -1,23 +0,0 @@
-// This file is autogenerated, DO NOT EDIT
-// Use `node scripts/generate-docs-examples.js` to generate the docs examples
-
-[source, js]
-----
-const response = await client.bulk({
-  index: "test-index",
-  operations: [
-    {
-      update: {
-        _id: "1",
-      },
-    },
-    {
-      doc: {
-        infer_field: "updated inference field",
-        source_field: "updated source field",
-      },
-    },
-  ],
-});
-console.log(response);
-----

docs/doc_examples/3ea4c971b3f47735dcc207ee2645fa03.asciidoc

@@ -0,0 +1,16 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.updateAliases({
+  actions: [
+    {
+      remove_index: {
+        index: "my-index-2099.05.06-000001",
+      },
+    },
+  ],
+});
+console.log(response);
+----

docs/doc_examples/3f9dcf2aa42f3ecfb5ebfe48c1774103.asciidoc

@@ -0,0 +1,18 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    order_stats: {
+      stats: {
+        field: "taxful_total_price",
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/41d24383d29b2808a65258a0a3256e96.asciidoc

@@ -4,16 +4,12 @@
 [source, js]
 ----
 const response = await client.indices.create({
-  index: "semantic-embeddings",
+  index: "jinaai-index",
   mappings: {
     properties: {
-      semantic_text: {
-        type: "semantic_text",
-        inference_id: "my-elser-endpoint",
-      },
       content: {
-        type: "text",
-        copy_to: "semantic_text",
+        type: "semantic_text",
+        inference_id: "jinaai-embeddings",
       },
     },
   },

docs/doc_examples/45954b8aaedfed57012be8b6538b0a24.asciidoc

@@ -0,0 +1,47 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.transport.request({
+  method: "POST",
+  path: "/_inference/chat_completion/openai-completion/_stream",
+  body: {
+    messages: [
+      {
+        role: "user",
+        content: [
+          {
+            type: "text",
+            text: "What's the price of a scarf?",
+          },
+        ],
+      },
+    ],
+    tools: [
+      {
+        type: "function",
+        function: {
+          name: "get_current_price",
+          description: "Get the current price of a item",
+          parameters: {
+            type: "object",
+            properties: {
+              item: {
+                id: "123",
+              },
+            },
+          },
+        },
+      },
+    ],
+    tool_choice: {
+      type: "function",
+      function: {
+        name: "get_current_price",
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/48e142e6c69014e0509d4c9251749d77.asciidoc

@@ -10,7 +10,8 @@ const response = await client.inference.put({
     service: "openai",
     service_settings: {
       api_key: "<api_key>",
-      model_id: "text-embedding-ada-002",
+      model_id: "text-embedding-3-small",
+      dimensions: 128,
     },
   },
 });

docs/doc_examples/519e46350316a33162740e5d7968aa2c.asciidoc

@@ -3,15 +3,18 @@
 
 [source, js]
 ----
-const response = await client.knnSearch({
-  index: "my-index",
+const response = await client.search({
+  index: "image-index",
   knn: {
-    field: "image_vector",
-    query_vector: [0.3, 0.1, 1.2],
+    field: "image-vector",
+    query_vector: [-5, 9, -12],
     k: 10,
     num_candidates: 100,
+    rescore_vector: {
+      oversample: 2,
+    },
   },
-  _source: ["name", "file_type"],
+  fields: ["title", "file-type"],
 });
 console.log(response);
 ----

docs/doc_examples/5836b09198feb1269ed12839b416123d.asciidoc

@@ -0,0 +1,16 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "jinaai-index",
+  query: {
+    semantic: {
+      field: "content",
+      query: "who inspired taking care of the sea?",
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/681d24c2633f598fc43d6afff8996dbb.asciidoc

@@ -5,6 +5,9 @@
 ----
 const response = await client.indices.create({
   index: "retrievers_example",
+  settings: {
+    number_of_shards: 1,
+  },
   mappings: {
     properties: {
       vector: {
@@ -12,6 +15,9 @@ const response = await client.indices.create({
         dims: 3,
         similarity: "l2_norm",
         index: true,
+        index_options: {
+          type: "flat",
+        },
       },
       text: {
         type: "text",

docs/doc_examples/6b67c6121efb86ee100d40c2646f77b5.asciidoc

@@ -4,9 +4,11 @@
 [source, js]
 ----
 const response = await client.indices.putSettings({
-  index: "my-index-000001",
+  index: "*",
   settings: {
     "index.search.slowlog.include.user": true,
+    "index.search.slowlog.threshold.fetch.warn": "30s",
+    "index.search.slowlog.threshold.query.warn": "30s",
   },
 });
 console.log(response);

docs/doc_examples/6fa02c2ad485bbe91f44b321158250f3.asciidoc

@@ -12,6 +12,13 @@ const response = await client.search({
       fields: ["my_field", "my_field._2gram", "my_field._3gram"],
     },
   },
+  highlight: {
+    fields: {
+      my_field: {
+        matched_fields: ["my_field._index_prefix"],
+      },
+    },
+  },
 });
 console.log(response);
 ----

docs/doc_examples/730045fae3743c39b612813a42c330c3.asciidoc

@@ -0,0 +1,24 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "my-index-000001",
+  query: {
+    prefix: {
+      full_name: {
+        value: "ki",
+      },
+    },
+  },
+  highlight: {
+    fields: {
+      full_name: {
+        matched_fields: ["full_name._index_prefix"],
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/7478ff69113fb53f41ea07cdf911fa67.asciidoc

@@ -0,0 +1,33 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    daily_sales: {
+      date_histogram: {
+        field: "order_date",
+        calendar_interval: "day",
+      },
+      aggs: {
+        daily_revenue: {
+          sum: {
+            field: "taxful_total_price",
+          },
+        },
+        smoothed_revenue: {
+          moving_fn: {
+            buckets_path: "daily_revenue",
+            window: 3,
+            script: "MovingFunctions.unweightedAvg(values)",
+          },
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/74b229a6e020113e5749099451979c89.asciidoc

@@ -1,26 +0,0 @@
-// This file is autogenerated, DO NOT EDIT
-// Use `node scripts/generate-docs-examples.js` to generate the docs examples
-
-[source, js]
-----
-const response = await client.search({
-  index: "test-index",
-  query: {
-    nested: {
-      path: "inference_field.inference.chunks",
-      query: {
-        knn: {
-          field: "inference_field.inference.chunks.embeddings",
-          query_vector_builder: {
-            text_embedding: {
-              model_id: "my_inference_id",
-              model_text: "mountain lake",
-            },
-          },
-        },
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/77cebba946fe648873a1e7375c13df41.asciidoc

@@ -5,7 +5,8 @@
 ----
 const response = await client.cluster.putSettings({
   persistent: {
-    "cluster.routing.allocation.disk.watermark.low": "30gb",
+    "cluster.routing.allocation.disk.watermark.low": "90%",
+    "cluster.routing.allocation.disk.watermark.high": "95%",
   },
 });
 console.log(response);

docs/doc_examples/790684b45bef2bb848ea932f0fd0cfbd.asciidoc

@@ -0,0 +1,35 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  query: {
+    intervals: {
+      my_text: {
+        all_of: {
+          ordered: false,
+          max_gaps: 1,
+          intervals: [
+            {
+              match: {
+                query: "my favorite food",
+                max_gaps: 0,
+                ordered: true,
+              },
+            },
+            {
+              match: {
+                query: "cold porridge",
+                max_gaps: 4,
+                ordered: true,
+              },
+            },
+          ],
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/7bdc283b96c7a965fae23013647b8578.asciidoc

@@ -7,14 +7,14 @@ const response = await client.indices.create({
   index: "test-index",
   mappings: {
     properties: {
-      infer_field: {
-        type: "semantic_text",
-        inference_id: "my-elser-endpoint",
-      },
       source_field: {
         type: "text",
         copy_to: "infer_field",
       },
+      infer_field: {
+        type: "semantic_text",
+        inference_id: ".elser-2-elasticsearch",
+      },
     },
   },
 });

docs/doc_examples/7dd0d9cc6c5982a2c003d301e90feeba.asciidoc

@@ -0,0 +1,37 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    daily_sales: {
+      date_histogram: {
+        field: "order_date",
+        calendar_interval: "day",
+        format: "yyyy-MM-dd",
+      },
+      aggs: {
+        revenue: {
+          sum: {
+            field: "taxful_total_price",
+          },
+        },
+        unique_customers: {
+          cardinality: {
+            field: "customer_id",
+          },
+        },
+        avg_basket_size: {
+          avg: {
+            field: "total_quantity",
+          },
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/80135e8c644e34cc70ce8a4e7915d1a2.asciidoc

@@ -12,7 +12,7 @@ const response = await client.ingest.putPipeline({
         field: "data",
         indexed_chars: 11,
         indexed_chars_field: "max_size",
-        remove_binary: false,
+        remove_binary: true,
       },
     },
   ],

docs/doc_examples/82bb6c61dab959f4446dc5ecab7ecbdf.asciidoc

@@ -0,0 +1,34 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.transport.request({
+  method: "POST",
+  path: "/_inference/chat_completion/openai-completion/_stream",
+  body: {
+    messages: [
+      {
+        role: "assistant",
+        content: "Let's find out what the weather is",
+        tool_calls: [
+          {
+            id: "call_KcAjWtAww20AihPHphUh46Gd",
+            type: "function",
+            function: {
+              name: "get_current_weather",
+              arguments: '{"location":"Boston, MA"}',
+            },
+          },
+        ],
+      },
+      {
+        role: "tool",
+        content: "The weather is cold",
+        tool_call_id: "call_KcAjWtAww20AihPHphUh46Gd",
+      },
+    ],
+  },
+});
+console.log(response);
+----

docs/doc_examples/8c639d3eef5c2de29e12bd9c6a42d3d4.asciidoc

@@ -0,0 +1,39 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    categories: {
+      terms: {
+        field: "category.keyword",
+        size: 5,
+        order: {
+          total_revenue: "desc",
+        },
+      },
+      aggs: {
+        total_revenue: {
+          sum: {
+            field: "taxful_total_price",
+          },
+        },
+        avg_order_value: {
+          avg: {
+            field: "taxful_total_price",
+          },
+        },
+        total_items: {
+          sum: {
+            field: "total_quantity",
+          },
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/9250ac57ec81d5192e8ad4c462438489.asciidoc

@@ -0,0 +1,42 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.bulk({
+  index: "jinaai-index",
+  operations: [
+    {
+      index: {
+        _index: "jinaai-index",
+        _id: "1",
+      },
+    },
+    {
+      content:
+        "Sarah Johnson is a talented marine biologist working at the Oceanographic Institute. Her groundbreaking research on coral reef ecosystems has garnered international attention and numerous accolades.",
+    },
+    {
+      index: {
+        _index: "jinaai-index",
+        _id: "2",
+      },
+    },
+    {
+      content:
+        "She spends months at a time diving in remote locations, meticulously documenting the intricate relationships between various marine species. ",
+    },
+    {
+      index: {
+        _index: "jinaai-index",
+        _id: "3",
+      },
+    },
+    {
+      content:
+        "Her dedication to preserving these delicate underwater environments has inspired a new generation of conservationists.",
+    },
+  ],
+});
+console.log(response);
+----

docs/doc_examples/948418e0ef1b7e7cfee2f11be715d7d2.asciidoc

@@ -5,6 +5,9 @@
 ----
 const response = await client.indices.create({
   index: "retrievers_example_nested",
+  settings: {
+    number_of_shards: 1,
+  },
   mappings: {
     properties: {
       nested_field: {
@@ -18,6 +21,9 @@ const response = await client.indices.create({
             dims: 3,
             similarity: "l2_norm",
             index: true,
+            index_options: {
+              type: "flat",
+            },
           },
         },
       },

docs/doc_examples/9cc952d4a03264b700136cbc45abc8c6.asciidoc

@@ -0,0 +1,30 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.create({
+  index: "my-rank-vectors-byte",
+  mappings: {
+    properties: {
+      my_vector: {
+        type: "rank_vectors",
+        element_type: "byte",
+      },
+    },
+  },
+});
+console.log(response);
+
+const response1 = await client.index({
+  index: "my-rank-vectors-byte",
+  id: 1,
+  document: {
+    my_vector: [
+      [1, 2, 3],
+      [4, 5, 6],
+    ],
+  },
+});
+console.log(response1);
+----

docs/doc_examples/b590241c4296299b836fbb5a95bdd2dc.asciidoc

@@ -0,0 +1,18 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    avg_order_value: {
+      avg: {
+        field: "taxful_total_price",
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/b6d278737d27973e498ac61cda9e5126.asciidoc

@@ -0,0 +1,21 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    daily_orders: {
+      date_histogram: {
+        field: "order_date",
+        calendar_interval: "day",
+        format: "yyyy-MM-dd",
+        min_doc_count: 0,
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/bccd4eb26b1a325d103b12e198a13c08.asciidoc

@@ -0,0 +1,12 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.getSettings({
+  index: "_all",
+  expand_wildcards: "all",
+  filter_path: "*.settings.index.*.slowlog",
+});
+console.log(response);
+----

docs/doc_examples/bdc55256fa5f701680631a149dbb75a9.asciidoc

@@ -0,0 +1,22 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    sales_by_category: {
+      terms: {
+        field: "category.keyword",
+        size: 5,
+        order: {
+          _count: "desc",
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/bdd28276618235487ac96bd6679bc206.asciidoc

@@ -0,0 +1,31 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "kibana_sample_data_ecommerce",
+  size: 0,
+  aggs: {
+    daily_sales: {
+      date_histogram: {
+        field: "order_date",
+        calendar_interval: "day",
+      },
+      aggs: {
+        revenue: {
+          sum: {
+            field: "taxful_total_price",
+          },
+        },
+        cumulative_revenue: {
+          cumulative_sum: {
+            buckets_path: "revenue",
+          },
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/bf3c3bc41c593a80faebef1df353e483.asciidoc

@@ -4,17 +4,17 @@
 [source, js]
 ----
 const response = await client.inference.put({
-  task_type: "sparse_embedding",
-  inference_id: "my-elser-endpoint",
+  task_type: "rerank",
+  inference_id: "jinaai-rerank",
   inference_config: {
-    service: "elser",
+    service: "jinaai",
     service_settings: {
-      adaptive_allocations: {
-        enabled: true,
-        min_number_of_allocations: 3,
-        max_number_of_allocations: 10,
-      },
-      num_threads: 1,
+      api_key: "<api_key>",
+      model_id: "jina-reranker-v2-base-multilingual",
+    },
+    task_settings: {
+      top_n: 10,
+      return_documents: true,
     },
   },
 });

docs/doc_examples/cdb7613b445e6ed6e8b473f9cae1af90.asciidoc

@@ -0,0 +1,35 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  query: {
+    intervals: {
+      my_text: {
+        all_of: {
+          ordered: true,
+          max_gaps: 1,
+          intervals: [
+            {
+              match: {
+                query: "my favorite food",
+                max_gaps: 0,
+                ordered: true,
+              },
+            },
+            {
+              match: {
+                query: "cold porridge",
+                max_gaps: 4,
+                ordered: true,
+              },
+            },
+          ],
+        },
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/cecfaa659af6646b3b67d7b311586fa0.asciidoc

@@ -14,7 +14,7 @@ const response = await client.ingest.putPipeline({
           attachment: {
             target_field: "_ingest._value.attachment",
             field: "_ingest._value.data",
-            remove_binary: false,
+            remove_binary: true,
           },
         },
       },

docs/doc_examples/d3672a87a857ddb87519788236e57497.asciidoc

@@ -0,0 +1,28 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.search({
+  index: "jinaai-index",
+  retriever: {
+    text_similarity_reranker: {
+      retriever: {
+        standard: {
+          query: {
+            semantic: {
+              field: "content",
+              query: "who inspired taking care of the sea?",
+            },
+          },
+        },
+      },
+      field: "content",
+      rank_window_size: 100,
+      inference_id: "jinaai-rerank",
+      inference_text: "who inspired taking care of the sea?",
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/d5242b1ab0213f25e5e0742032274ce6.asciidoc

@@ -10,7 +10,7 @@ const response = await client.ingest.putPipeline({
     {
       attachment: {
         field: "data",
-        remove_binary: false,
+        remove_binary: true,
       },
     },
   ],

docs/doc_examples/df81b88a2192dd6f9912e0c948a44487.asciidoc

@@ -7,7 +7,7 @@ const response = await client.inference.put({
   task_type: "sparse_embedding",
   inference_id: "elser_embeddings",
   inference_config: {
-    service: "elser",
+    service: "elasticsearch",
     service_settings: {
       num_allocations: 1,
       num_threads: 1,

docs/doc_examples/e20037f66bf54bcac7d10f536f031f34.asciidoc

@@ -1,13 +0,0 @@
-// This file is autogenerated, DO NOT EDIT
-// Use `node scripts/generate-docs-examples.js` to generate the docs examples
-
-[source, js]
-----
-const response = await client.indices.putSettings({
-  index: "my-index-000001",
-  settings: {
-    "index.blocks.read_only_allow_delete": null,
-  },
-});
-console.log(response);
-----

docs/doc_examples/e375c7da666276c4df6664c6821cd5f4.asciidoc

@@ -0,0 +1,29 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.indices.create({
+  index: "my-rank-vectors-float",
+  mappings: {
+    properties: {
+      my_vector: {
+        type: "rank_vectors",
+      },
+    },
+  },
+});
+console.log(response);
+
+const response1 = await client.index({
+  index: "my-rank-vectors-float",
+  id: 1,
+  document: {
+    my_vector: [
+      [0.5, 10, 6],
+      [-0.5, 10, 10],
+    ],
+  },
+});
+console.log(response1);
+----

docs/doc_examples/e77c2f41a7eca765b0c5f734a66d919f.asciidoc

@@ -11,7 +11,7 @@ const response = await client.ingest.putPipeline({
       attachment: {
         field: "data",
         properties: ["content", "title"],
-        remove_binary: false,
+        remove_binary: true,
       },
     },
   ],

docs/doc_examples/ea8c4229afa6dd4f1321355542be9912.asciidoc

@@ -12,7 +12,7 @@ const response = await client.ingest.putPipeline({
         field: "data",
         indexed_chars: 11,
         indexed_chars_field: "max_size",
-        remove_binary: false,
+        remove_binary: true,
       },
     },
   ],

docs/doc_examples/ec4b43c3ebd8816799fa004596b2f0cb.asciidoc

@@ -4,9 +4,10 @@
 [source, js]
 ----
 const response = await client.indices.putSettings({
-  index: "my-index-000001",
+  index: "*",
   settings: {
     "index.indexing.slowlog.include.user": true,
+    "index.indexing.slowlog.threshold.index.warn": "30s",
   },
 });
 console.log(response);

docs/doc_examples/fff86117c47f974074284644e8a97a99.asciidoc

@@ -0,0 +1,18 @@
+// This file is autogenerated, DO NOT EDIT
+// Use `node scripts/generate-docs-examples.js` to generate the docs examples
+
+[source, js]
+----
+const response = await client.inference.put({
+  task_type: "text_embedding",
+  inference_id: "jinaai-embeddings",
+  inference_config: {
+    service: "jinaai",
+    service_settings: {
+      model_id: "jina-embeddings-v3",
+      api_key: "<api_key>",
+    },
+  },
+});
+console.log(response);
+----

docs/examples/bulk.asciidoc

@@ -1,10 +1,10 @@
 [[bulk_examples]]
 === Bulk
 
-With the {jsclient}/api-reference.html#_bulk[`bulk` API], you can perform multiple index/delete operations in a 
+With the {jsclient}/api-reference.html#_bulk[`bulk` API], you can perform multiple index/delete operations in a
 single API call. The `bulk` API significantly increases indexing speed.
 
-NOTE: You can also use the {jsclient}/client-helpers.html[bulk helper].
+NOTE: You can also use the <<bulk-helper,bulk helper>>.
 
 [source,js]
 ----

docs/examples/exists.asciidoc

@@ -6,7 +6,7 @@ Check that the document `/game-of-thrones/1` exists.
 NOTE: Since this API uses the `HEAD` method, the body value will be boolean.
 
 [source,js]
----------
+----
 'use strict'
 
 const { Client } = require('@elastic/elasticsearch')
@@ -34,4 +34,4 @@ async function run () {
 }
 
 run().catch(console.log)
----------
+----

docs/examples/get.asciidoc

@@ -1,12 +1,12 @@
 [[get_examples]]
 === Get
 
-The get API allows to get a typed JSON document from the index based on its id. 
-The following example gets a JSON document from an index called 
+The get API allows to get a typed JSON document from the index based on its id.
+The following example gets a JSON document from an index called
 `game-of-thrones`, under a type called `_doc`, with id valued `'1'`.
 
 [source,js]
----------
+----
 'use strict'
 
 const { Client } = require('@elastic/elasticsearch')
@@ -34,4 +34,4 @@ async function run () {
 }
 
 run().catch(console.log)
----------
+----

docs/examples/ignore.asciidoc

@@ -62,4 +62,4 @@ async function run () {
 }
 
 run().catch(console.log)
-----
+----

docs/examples/scroll.asciidoc

@@ -1,25 +1,25 @@
 [[scroll_examples]]
 === Scroll
 
-While a search request returns a single “page” of results, the scroll API can be 
-used to retrieve large numbers of results (or even all results) from a single 
-search request, in much the same way as you would use a cursor on a traditional 
+While a search request returns a single “page” of results, the scroll API can be
+used to retrieve large numbers of results (or even all results) from a single
+search request, in much the same way as you would use a cursor on a traditional
 database.
 
-Scrolling is not intended for real time user requests, but rather for processing 
-large amounts of data, for example in order to reindex the contents of one index 
+Scrolling is not intended for real time user requests, but rather for processing
+large amounts of data, for example in order to reindex the contents of one index
 into a new index with a different configuration.
 
-NOTE: The results that are returned from a scroll request reflect the state of 
-the index at the time that the initial search request was made, like a snapshot 
-in time. Subsequent changes to documents (index, update or delete) will only 
+NOTE: The results that are returned from a scroll request reflect the state of
+the index at the time that the initial search request was made, like a snapshot
+in time. Subsequent changes to documents (index, update or delete) will only
 affect later search requests.
 
-In order to use scrolling, the initial search request should specify the scroll 
-parameter in the query string, which tells {es} how long it should keep the 
+In order to use scrolling, the initial search request should specify the scroll
+parameter in the query string, which tells {es} how long it should keep the
 “search context” alive.
 
-NOTE: Did you know that we provide an helper for sending scroll requests? You can find it {jsclient}/client-helpers.html[here].
+NOTE: Did you know that we provide an helper for sending scroll requests? You can find it <<scroll-search-helper,here>>.
 
 [source,js]
 ----
@@ -113,7 +113,7 @@ async function run () {
 run().catch(console.log)
 ----
 
-Another cool usage of the `scroll` API can be done with Node.js ≥ 10, by using 
+Another cool usage of the `scroll` API can be done with Node.js ≥ 10, by using
 async iteration!
 
 [source,js]

docs/examples/update.asciidoc

@@ -1,12 +1,12 @@
 [[update_examples]]
 === Update
 
-The update API allows updates of a specific document using the given script. In 
-the following example, we will index a document that also tracks how many times 
+The update API allows updates of a specific document using the given script. In
+the following example, we will index a document that also tracks how many times
 a character has said the given quote, and then we will update the `times` field.
 
 [source,js]
----------
+----
 'use strict'
 
 const { Client } = require('@elastic/elasticsearch')
@@ -48,12 +48,12 @@ async function run () {
 
 run().catch(console.log)
 
----------
+----
 
 With the update API, you can also run a partial update of a document.
 
 [source,js]
----------
+----
 'use strict'
 
 const { Client } = require('@elastic/elasticsearch')
@@ -92,4 +92,4 @@ async function run () {
 run().catch(console.log)
 
 
----------
+----

docs/examples/update_by_query.asciidoc

@@ -1,12 +1,12 @@
 [[update_by_query_examples]]
 === Update By Query
 
-The simplest usage of _update_by_query just performs an update on every document 
-in the index without changing the source. This is useful to pick up a new 
+The simplest usage of _update_by_query just performs an update on every document
+in the index without changing the source. This is useful to pick up a new
 property or some other online mapping change.
 
 [source,js]
----------
+----
 'use strict'
 
 const { Client } = require('@elastic/elasticsearch')
@@ -57,4 +57,4 @@ async function run () {
 
 run().catch(console.log)
 
----------
+----

docs/timeout-best-practices.asciidoc

@@ -1,10 +1,8 @@
 [[timeout-best-practices]]
 === Timeout best practices
 
-This client is configured by default to operate like many HTTP client libraries do, by using a relatively short (30 second) timeout on all requests sent to {es}, raising a `TimeoutError` when that time period has elapsed without receiving a response. However, {es} will always eventually respond to any request, even if it takes several minutes. The {ref}/modules-network.html#_http_client_configuration[official {es} recommendation] is to disable response timeouts entirely by default.
+Starting in 9.0.0, this client is configured to not time out any HTTP request by default. {es} will always eventually respond to any request, even if it takes several minutes. Reissuing a request that it has not responded to yet can cause performance side effects. See the {ref}/modules-network.html#_http_client_configuration[official {es} recommendations for HTTP clients] for more information.
 
-Since changing this default would be a breaking change, we won't do that until the next major release. In the meantime, here is our recommendation for properly configuring your client:
+Prior to 9.0, this client was configured by default to operate like many HTTP client libraries do, by using a relatively short (30 second) timeout on all requests sent to {es}, raising a `TimeoutError` when that time period elapsed without receiving a response.
 
-* Ensure keep-alive is enabled; this is the default, so no settings need to be changed, unless you have set `agent` to `false` or provided an alternate `agent` that disables keep-alive
-* If using the default `UndiciConnection`, disable request timeouts by setting `timeout` to `0`
-* If using the legacy `HttpConnection`, set `timeout` to a very large number (e.g. `86400000`, or one day)
+If your circumstances require you to set timeouts on Elasticsearch requests, setting the `requestTimeout` value to a millisecond value will cause this client to operate as it did prior to 9.0.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elastic/elasticsearch",
-  "version": "9.0.0-alpha.1",
+  "version": "9.0.0-alpha.3",
   "versionCanary": "9.0.0-canary.0",
   "description": "The official Elasticsearch client for Node.js",
   "main": "./index.js",
@@ -57,14 +57,13 @@
   },
   "devDependencies": {
     "@elastic/request-converter": "8.17.0",
-    "@sinonjs/fake-timers": "github:sinonjs/fake-timers#48f089f",
+    "@sinonjs/fake-timers": "14.0.0",
     "@types/debug": "4.1.12",
     "@types/ms": "0.7.34",
-    "@types/node": "22.10.1",
+    "@types/node": "22.10.7",
     "@types/sinonjs__fake-timers": "8.1.5",
     "@types/split2": "4.2.3",
     "@types/stoppable": "1.1.3",
-    "@types/tap": "15.0.12",
     "chai": "5.1.2",
     "cross-zip": "4.0.1",
     "desm": "1.3.1",
@@ -84,13 +83,13 @@
     "tap": "21.0.1",
     "ts-node": "10.9.2",
     "ts-standard": "12.0.2",
-    "typescript": "5.7.2",
+    "typescript": "5.7.3",
     "workq": "3.0.0",
     "xmlbuilder2": "3.1.1",
     "zx": "7.2.3"
   },
   "dependencies": {
-    "@elastic/transport": "^8.9.1",
+    "@elastic/transport": "9.0.0-alpha.1",
     "apache-arrow": "^18.0.0",
     "tslib": "^2.4.0"
   },

renovate.json

@@ -17,13 +17,10 @@
       ]
     },
     {
-      "matchPackageNames": [
-        "node"
-      ],
       "matchManagers": [
         "dockerfile"
       ],
-      "enabled": false
+      "pinDigests": false
     }
   ]
 }

scripts/codemod/drop-body.test.ts

@@ -1,54 +0,0 @@
-import { Client } from '../..'
-
-const client = new Client({
-  node: 'http://localhost:9200',
-  auth: { username: 'elastic', password: 'changeme' }
-})
-
-async function doThings () {
-  // should get fixed by codemod
-  await client.closePointInTime({
-    body: {
-      id: 'foobar'
-    }
-  })
-
-  await client.asyncSearch.get({
-  // @ts-expect-error should get fixed by codemod
-    body: {
-      id: 'foo'
-    }
-  })
-
-  // @ts-expect-error should get fixed by codemod
-  await client.create({
-    id: 'foo',
-    body: { index: 'my-index' }
-  })
-
-  await client.watcher.putWatch({
-    id: 'foo',
-    active: true
-  })
-
-  const body = { id: 'foo' }
-  // @ts-expect-error should get fixed by codemod
-  await client.asyncSearch.get({ body })
-  await client.asyncSearch.get(body)
-
-  const request = { body }
-  // @ts-expect-error should get fixed by codemod
-  await client.asyncSearch.get(request)
-
-  const request2 = body
-  await client.closePointInTime(request2)
-
-  // some non-client calls
-  const x = Math.random()
-  console.log(x)
-  console.log({ body: 'foo' })
-}
-
-doThings()
-  .then(() => console.log('done'))
-  .catch(() => console.error('uh oh'))

scripts/codemod/drop-body.ts

@@ -1,172 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License") you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import ts from 'typescript'
-import path from 'node:path'
-import minimist from 'minimist'
-
-const apis = [
-  'asyncSearch',
-  'autoscaling',
-  'bulk',
-  'capabilities',
-  'cat',
-  'ccr',
-  'clearScroll',
-  'closePointInTime',
-  'cluster',
-  'connector',
-  'count',
-  'create',
-  'danglingIndices',
-  'delete',
-  'deleteByQuery',
-  'deleteByQueryRethrottle',
-  'deleteScript',
-  'enrich',
-  'eql',
-  'esql',
-  'exists',
-  'existsSource',
-  'explain',
-  'features',
-  'fieldCaps',
-]
-
-/**
- * Detects whether a node is a `Client` instance identifier
- * @remarks Uses duck-typing by checking that several Elasticsearch APIs exist as members on the identifier
- */
-function isClient(node: ts.Identifier) {
-  const type = checker.getTypeAtLocation(node)
-  const properties = type.getProperties().map(prop => prop.escapedName.toString())
-
-  for (const api of apis) {
-    if (!properties.includes(api)) return false
-  }
-  return true
-}
-
-/**
-  * Returns true if the call expression node is running a client API function, otherwise false
-  */
-function isClientExpression(node: ts.CallExpression): boolean {
-  let flag = false
-  function visitIdentifiers(node: ts.Node) {
-    if (ts.isIdentifier(node) && isClient(node)) {
-      flag = true
-      return
-    }
-    ts.forEachChild(node, visitIdentifiers)
-  }
-  visitIdentifiers(node)
-  return flag
-}
-
-/**
-  * Returns an array of all call expressions to `Client` functions
-  */
-function collectClientCallExpressions(node: ts.SourceFile): ts.CallExpression[] {
-  const clientExpressions: ts.CallExpression[] = []
-
-  // recurse through all child nodes looking for `Client` call expressions
-  function collect(node: ts.Node) {
-    if (ts.isCallExpression(node)) {
-      // look for client identifier
-      if (isClientExpression(node)) {
-        clientExpressions.push(node)
-      }
-    }
-
-    ts.forEachChild(node, collect)
-  }
-
-  ts.forEachChild(node, collect)
-
-  return clientExpressions
-}
-
-function fixBodyProp(sourceFile: ts.SourceFile, node: ts.Node) {
-  if (ts.isObjectLiteralExpression(node)) {
-    // @ts-expect-error need to cast `prop` to a more specific type
-    const prop = node.properties.find(prop => prop.name.escapedText === 'body')
-    if (prop != null) {
-      console.log('// needs fix:')
-      console.log(sourceFile?.text.slice(node.pos, node.end))
-
-      // TODO: fix { body: value }
-      // TODO: fix { body: { ... } }
-      // TODO: fix { body }
-    }
-  } else if (ts.isIdentifier(node)) {
-    // @ts-expect-error
-    if (node.flowNode.antecedent?.node != null) {
-      // @ts-expect-error
-      fixBodyProp(sourceFile, node.flowNode.antecedent.node)
-    } else {
-      // console.log('uh oh')
-      // console.log(sourceFile?.text.slice(node.pos, node.end))
-    }
-  } else {
-    // @ts-expect-error
-    if (node.flowNode?.antecedent?.node != null) {
-      // console.log('two')
-      // @ts-expect-error
-      fixBodyProp(sourceFile, node.flowNode.antecedent.node)
-    } else {
-      // console.log('something else')
-      // console.log(node.kind)
-      // console.log(sourceFile?.text.slice(node.pos, node.end))
-    }
-  }
-  return false
-}
-
-function lookForBodyProp(sourceFile: ts.SourceFile, node: ts.CallExpression) {
-  if (node.arguments.length === 0) return
-  const first = node.arguments[0]
-  fixBodyProp(sourceFile, first)
-}
-
-// build TS project from provided file names
-const args = minimist(process.argv.slice(2))
-const cwd = process.cwd()
-const files = args._.map(file => path.join(cwd, file))
-const program = ts.createProgram(files, {})
-const checker = program.getTypeChecker()
-
-let processed = 0
-program.getSourceFiles().forEach(sourceFile => {
-  if (program.isSourceFileFromExternalLibrary(sourceFile)) return
-  const { fileName } = sourceFile
-
-  try {
-    // get all `Client` call expressions
-    const exprs = collectClientCallExpressions(sourceFile)
-    if (exprs.length > 0) {
-      console.log(`found ${exprs.length} Client expressions in ${fileName}`)
-    }
-    // for each call expression, get the first function argument, determine if it's an object and whether it has a `body` key
-    exprs.forEach(expr => lookForBodyProp(sourceFile, expr))
-  } catch (e) {
-    // continue
-    console.error(`Could not process ${fileName}: ${e}`)
-  }
-  processed++
-})
-console.log(`Done scanning ${processed} files`)

scripts/generate.js

@@ -0,0 +1,143 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const { join } = require('path')
+const { readdirSync, writeFileSync, readFileSync } = require('fs')
+const minimist = require('minimist')
+const ora = require('ora')
+const rimraf = require('rimraf')
+const standard = require('standard')
+const downloadArtifacts = require('./download-artifacts')
+const {
+  generate,
+  genFactory,
+  generateDocs,
+  generateRequestTypes
+} = require('./utils')
+
+start(minimist(process.argv.slice(2), {
+  string: ['version', 'hash']
+}))
+
+function start (opts) {
+  if (opts.version == null) {
+    console.error('Missing version parameter')
+    process.exit(1)
+  }
+
+  const packageFolder = join(__dirname, '..', 'api')
+  const apiOutputFolder = join(packageFolder, 'api')
+  const mainOutputFile = join(packageFolder, 'index.js')
+  const docOutputFile = join(__dirname, '..', 'docs', 'reference.asciidoc')
+  const typeDefFile = join(__dirname, '..', 'index.d.ts')
+  const requestParamsOutputFile = join(packageFolder, 'requestParams.d.ts')
+
+  let log
+  downloadArtifacts({ version: opts.version, hash: opts.hash })
+    .then(onArtifactsDownloaded)
+    .catch(err => {
+      console.log(err)
+      process.exit(1)
+    })
+
+  function onArtifactsDownloaded () {
+    log = ora('Generating APIs').start()
+
+    log.text = 'Cleaning API folder...'
+    rimraf.sync(join(apiOutputFolder, '*.js'))
+
+    const allSpec = readdirSync(downloadArtifacts.locations.specFolder)
+      .filter(file => file !== '_common.json')
+      .filter(file => !file.includes('deprecated'))
+      .sort()
+      .map(file => require(join(downloadArtifacts.locations.specFolder, file)))
+
+    const namespaces = namespacify(readdirSync(downloadArtifacts.locations.specFolder))
+    for (const namespace in namespaces) {
+      if (namespace === '_common') continue
+      const code = generate(namespace, namespaces[namespace], downloadArtifacts.locations.specFolder, opts.version)
+      const filePath = join(apiOutputFolder, `${namespace}.js`)
+      writeFileSync(filePath, code, { encoding: 'utf8' })
+    }
+
+    writeFileSync(
+      requestParamsOutputFile,
+      generateRequestTypes(opts.version, allSpec),
+      { encoding: 'utf8' }
+    )
+
+    const { fn: factory, types } = genFactory(apiOutputFolder, downloadArtifacts.locations.specFolder, namespaces)
+    writeFileSync(
+      mainOutputFile,
+      factory,
+      { encoding: 'utf8' }
+    )
+
+    const oldTypeDefString = readFileSync(typeDefFile, 'utf8')
+    const start = oldTypeDefString.indexOf('/* GENERATED */')
+    const end = oldTypeDefString.indexOf('/* /GENERATED */')
+    const newTypeDefString = oldTypeDefString.slice(0, start + 15) + '\n' + types + '\n  ' + oldTypeDefString.slice(end)
+    writeFileSync(
+      typeDefFile,
+      newTypeDefString,
+      { encoding: 'utf8' }
+    )
+
+    lintFiles(log, () => {
+      log.text = 'Generating documentation'
+      writeFileSync(
+        docOutputFile,
+        generateDocs(require(join(downloadArtifacts.locations.specFolder, '_common.json')), allSpec),
+        { encoding: 'utf8' }
+      )
+
+      log.succeed('Done!')
+    })
+  }
+
+  function lintFiles (log, cb) {
+    log.text = 'Linting...'
+    const files = [join(packageFolder, '*.js'), join(apiOutputFolder, '*.js')]
+    standard.lintFiles(files, { fix: true }, err => {
+      if (err) {
+        return log.fail(err.message)
+      }
+      cb()
+    })
+  }
+
+  function namespacify (apis) {
+    return apis
+      .map(api => api.slice(0, -5))
+      .filter(api => api !== '_common')
+      .filter(api => !api.includes('deprecated'))
+      .reduce((acc, val) => {
+        if (val.includes('.')) {
+          val = val.split('.')
+          acc[val[0]] = acc[val[0]] || []
+          acc[val[0]].push(val[1])
+        } else {
+          acc[val] = []
+        }
+        return acc
+      }, {})
+  }
+}

scripts/kibana-docker.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+exec docker run \
+  --rm \
+  -e ELASTICSEARCH_URL="http://elasticsearch:9200" \
+  -p 5601:5601 \
+  --network=elastic \
+  docker.elastic.co/kibana/kibana:7.0.0-beta1

scripts/utils/clone-es.js

@@ -0,0 +1,139 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const { accessSync, mkdirSync } = require('fs')
+const { join } = require('path')
+const Git = require('simple-git')
+
+const esRepo = 'https://github.com/elastic/elasticsearch.git'
+const esFolder = join(__dirname, '..', '..', 'elasticsearch')
+const apiFolder = join(esFolder, 'rest-api-spec', 'src', 'main', 'resources', 'rest-api-spec', 'api')
+const xPackFolder = join(esFolder, 'x-pack', 'plugin', 'src', 'test', 'resources', 'rest-api-spec', 'api')
+
+function cloneAndCheckout (opts, callback) {
+  const { log, tag, branch } = opts
+  withTag(tag, callback)
+
+  /**
+   * Sets the elasticsearch repository to the given tag.
+   * If the repository is not present in `esFolder` it will
+   * clone the repository and the checkout the tag.
+   * If the repository is already present but it cannot checkout to
+   * the given tag, it will perform a pull and then try again.
+   * @param {string} tag
+   * @param {function} callback
+   */
+  function withTag (tag, callback) {
+    let fresh = false
+    let retry = 0
+
+    if (!pathExist(esFolder)) {
+      if (!createFolder(esFolder)) {
+        log.fail('Failed folder creation')
+        return
+      }
+      fresh = true
+    }
+
+    const git = Git(esFolder)
+
+    if (fresh) {
+      clone(checkout)
+    } else if (opts.branch) {
+      checkout(true)
+    } else {
+      checkout()
+    }
+
+    function checkout (alsoPull = false) {
+      if (branch) {
+        log.text = `Checking out branch '${branch}'`
+      } else {
+        log.text = `Checking out tag '${tag}'`
+      }
+      git.checkout(branch || tag, err => {
+        if (err) {
+          if (retry++ > 0) {
+            callback(new Error(`Cannot checkout tag '${tag}'`), { apiFolder, xPackFolder })
+            return
+          }
+          return pull(checkout)
+        }
+        if (alsoPull) {
+          return pull(checkout)
+        }
+        callback(null, { apiFolder, xPackFolder })
+      })
+    }
+
+    function pull (cb) {
+      log.text = 'Pulling elasticsearch repository...'
+      git.pull(err => {
+        if (err) {
+          callback(err, { apiFolder, xPackFolder })
+          return
+        }
+        cb()
+      })
+    }
+
+    function clone (cb) {
+      log.text = 'Cloning elasticsearch repository...'
+      git.clone(esRepo, esFolder, err => {
+        if (err) {
+          callback(err, { apiFolder, xPackFolder })
+          return
+        }
+        cb()
+      })
+    }
+  }
+
+  /**
+   * Checks if the given path exists
+   * @param {string} path
+   * @returns {boolean} true if exists, false if not
+   */
+  function pathExist (path) {
+    try {
+      accessSync(path)
+      return true
+    } catch (err) {
+      return false
+    }
+  }
+
+  /**
+   * Creates the given folder
+   * @param {string} name
+   * @returns {boolean} true on success, false on failure
+   */
+  function createFolder (name) {
+    try {
+      mkdirSync(name)
+      return true
+    } catch (err) {
+      return false
+    }
+  }
+}
+
+module.exports = cloneAndCheckout

scripts/utils/generateApis.js

@@ -0,0 +1,553 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint camelcase: 0 */
+
+'use strict'
+
+const { join } = require('path')
+const dedent = require('dedent')
+const allowedMethods = {
+  noBody: ['GET', 'HEAD', 'DELETE'],
+  body: ['POST', 'PUT', 'DELETE']
+}
+
+// if a parameter is depracted in a minor release
+// we should be able to support it until the next major
+const deprecatedParameters = require('./patch.json')
+
+// list of apis that does not need any kind of validation
+// because of how the url is built or the `type` handling in ES7
+const noPathValidation = [
+  'create',
+  'exists',
+  'explain',
+  'get',
+  'get_source',
+  'index',
+  'indices.get_alias',
+  'indices.exists_alias',
+  'indices.get_field_mapping',
+  'indices.get_mapping',
+  'indices.get_settings',
+  'indices.put_mapping',
+  'indices.stats',
+  'delete',
+  'nodes.info',
+  'nodes.stats',
+  'nodes.usage',
+  'tasks.cancel',
+  'termvectors',
+  'update'
+]
+
+function generateNamespace (namespace, nested, specFolder, version) {
+  const common = require(join(specFolder, '_common.json'))
+  let code = dedent`
+  /*
+   * Licensed to Elasticsearch B.V. under one or more contributor
+   * license agreements. See the NOTICE file distributed with
+   * this work for additional information regarding copyright
+   * ownership. Elasticsearch B.V. licenses this file to you under
+   * the Apache License, Version 2.0 (the "License"); you may
+   * not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   *    http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing,
+   * software distributed under the License is distributed on an
+   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   * KIND, either express or implied.  See the License for the
+   * specific language governing permissions and limitations
+   * under the License.
+   */
+
+  'use strict'
+
+  /* eslint camelcase: 0 */
+  /* eslint no-unused-vars: 0 */
+
+  const { handleError, snakeCaseKeys, normalizeArguments, kConfigurationError } = require('../utils')
+`
+  if (nested.length > 0) {
+    let getters = ''
+    for (const n of nested) {
+      if (n.includes('_')) {
+        const nameSnaked = n
+          .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+          .replace(/_([a-z])/g, k => k[1].toUpperCase())
+        getters += `${n}: { get () { return this.${nameSnaked} } },\n`
+      }
+    }
+    const api = generateMultiApi(version, namespace, nested, common, specFolder)
+    if (getters.length > 0) {
+      getters = `Object.defineProperties(${api.namespace}Api.prototype, {\n${getters}})`
+    }
+
+    code += `
+  const acceptedQuerystring = ${JSON.stringify(api.acceptedQuerystring)}
+  const snakeCase = ${JSON.stringify(api.snakeCase)}
+
+  function ${api.namespace}Api (transport, ConfigurationError) {
+    this.transport = transport
+    this[kConfigurationError] = ConfigurationError
+  }
+
+  ${api.code}
+
+  ${getters}
+
+  module.exports = ${api.namespace}Api
+    `
+  } else {
+    const spec = require(join(specFolder, `${namespace}.json`))
+    const api = generateSingleApi(version, spec, common)
+    code += `
+  const acceptedQuerystring = ${JSON.stringify(api.acceptedQuerystring)}
+  const snakeCase = ${JSON.stringify(api.snakeCase)}
+
+  ${api.code}
+
+  module.exports = ${api.name}Api
+    `
+  }
+  return code
+}
+
+function generateMultiApi (version, namespace, nested, common, specFolder) {
+  const namespaceSnaked = namespace
+    .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+    .replace(/_([a-z])/g, k => k[1].toUpperCase())
+  let code = ''
+  const snakeCase = {}
+  const acceptedQuerystring = []
+  for (const n of nested) {
+    const nameSnaked = n
+      .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+      .replace(/_([a-z])/g, k => k[1].toUpperCase())
+    const spec = require(join(specFolder, `${namespace}.${n}.json`))
+    const api = generateSingleApi(version, spec, common)
+    code += `${Uppercase(namespaceSnaked)}Api.prototype.${nameSnaked} = ${api.code}\n\n`
+    Object.assign(snakeCase, api.snakeCase)
+    for (const q of api.acceptedQuerystring) {
+      if (!acceptedQuerystring.includes(q)) {
+        acceptedQuerystring.push(q)
+      }
+    }
+  }
+  return { code, snakeCase, acceptedQuerystring, namespace: Uppercase(namespaceSnaked) }
+}
+
+function generateSingleApi (version, spec, common) {
+  const release = version.charAt(0)
+  const api = Object.keys(spec)[0]
+  const name = api
+    .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+    .replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+  const { paths } = spec[api].url
+  const { params } = spec[api]
+  const acceptedQuerystring = []
+  const required = []
+
+  const methods = paths.reduce((acc, val) => {
+    for (const method of val.methods) {
+      if (!acc.includes(method)) acc.push(method)
+    }
+    return acc
+  }, [])
+  const parts = paths.reduce((acc, val) => {
+    if (!val.parts) return acc
+    for (const part of Object.keys(val.parts)) {
+      if (!acc.includes(part)) acc.push(part)
+    }
+    return acc
+  }, [])
+
+  // get the required parts from the url
+  // if the url has at least one static path,
+  // then there are not required parts of the url
+  let allParts = []
+  for (const path of paths) {
+    if (path.parts) {
+      allParts.push(Object.keys(path.parts))
+    } else {
+      allParts = []
+      break
+    }
+  }
+  if (allParts.length > 0) {
+    intersect(...allParts).forEach(r => required.push(r))
+  }
+
+  for (const key in params) {
+    if (params[key].required) {
+      required.push(key)
+    }
+
+    acceptedQuerystring.push(key)
+    if (deprecatedParameters[release] && deprecatedParameters[release][key]) {
+      acceptedQuerystring.push(deprecatedParameters[release][key])
+    }
+  }
+
+  for (const key in spec[api]) {
+    const k = spec[api][key]
+    if (k && k.required) {
+      required.push(key)
+    }
+  }
+  if (common && common.params) {
+    for (const key in common.params) {
+      acceptedQuerystring.push(key)
+    }
+  }
+
+  const code = `
+  function ${name}Api (params, options, callback) {
+    ;[params, options, callback] = normalizeArguments(params, options, callback)
+
+    ${genRequiredChecks()}
+
+    ${genUrlValidation(paths, api)}
+
+    let { ${genQueryDenylist(false)}, ...querystring } = params
+    querystring = snakeCaseKeys(acceptedQuerystring, snakeCase, querystring)
+
+    let path = ''
+    ${buildPath()}
+
+    // build request object
+    const request = {
+      method,
+      path,
+      ${genBody(api, methods, spec[api].body, spec)}
+      querystring
+    }
+
+    return this.transport.request(request, options, callback)
+  }
+  `.trim() // always call trim to avoid newlines
+
+  return {
+    name,
+    code,
+    acceptedQuerystring: acceptedQuerystring,
+    snakeCase: genSnakeCaseMap(),
+    documentation: generateDocumentation(spec[api], api)
+  }
+
+  function genRequiredChecks () {
+    const code = required
+      .map(_genRequiredCheck)
+      .concat(_noBody())
+      .filter(Boolean)
+
+    if (code.length) {
+      code.unshift('// check required parameters')
+    }
+
+    return code.join('\n        ')
+
+    function _genRequiredCheck (param) {
+      const camelCased = param[0] === '_'
+        ? '_' + param.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+        : param.replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+      if (param === camelCased) {
+        const check = `
+          if (params['${param}'] == null) {
+            const err = new this[kConfigurationError]('Missing required parameter: ${param}')
+            return handleError(err, callback)
+          }
+        `
+        return check.trim()
+      } else {
+        const check = `
+          if (params['${param}'] == null && params['${camelCased}'] == null) {
+            const err = new this[kConfigurationError]('Missing required parameter: ${param} or ${camelCased}')
+            return handleError(err, callback)
+          }
+        `
+        return check.trim()
+      }
+    }
+
+    function _noBody () {
+      const check = `
+        if (params.body != null) {
+          const err = new this[kConfigurationError]('This API does not require a body')
+          return handleError(err, callback)
+        }
+      `
+      return spec[api].body === null ? check.trim() : ''
+    }
+  }
+
+  function genSnakeCaseMap () {
+    const toCamelCase = str => {
+      return str[0] === '_'
+        ? '_' + str.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+        : str.replace(/_([a-z])/g, k => k[1].toUpperCase())
+    }
+
+    return acceptedQuerystring.reduce((acc, val, index) => {
+      if (toCamelCase(val) !== val) {
+        acc[toCamelCase(val)] = val
+      }
+      return acc
+    }, {})
+  }
+
+  function genQueryDenylist (addQuotes = true) {
+    const toCamelCase = str => {
+      return str[0] === '_'
+        ? '_' + str.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+        : str.replace(/_([a-z])/g, k => k[1].toUpperCase())
+    }
+
+    const denylist = ['method', 'body']
+    parts.forEach(p => {
+      const camelStr = toCamelCase(p)
+      if (camelStr !== p) denylist.push(`${camelStr}`)
+      denylist.push(`${p}`)
+    })
+    return addQuotes ? denylist.map(q => `'${q}'`) : denylist
+  }
+
+  function buildPath () {
+    const toCamelCase = str => {
+      return str[0] === '_'
+        ? '_' + str.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+        : str.replace(/_([a-z])/g, k => k[1].toUpperCase())
+    }
+
+    const genAccessKey = str => {
+      const camelStr = toCamelCase(str)
+      return camelStr === str
+        ? str
+        : `${str} || ${camelStr}`
+    }
+
+    const genCheck = path => {
+      return path
+        .split('/')
+        .filter(Boolean)
+        .map(p => p.startsWith('{') ? `(${genAccessKey(p.slice(1, -1))}) != null` : false)
+        .filter(Boolean)
+        .join(' && ')
+    }
+
+    const genPath = path => {
+      path = path
+        .split('/')
+        .filter(Boolean)
+        .map(p => p.startsWith('{') ? `encodeURIComponent(${genAccessKey(p.slice(1, -1))})` : `'${p}'`)
+        .join(' + \'/\' + ')
+      return path.length > 0 ? ('\'/\' + ' + path) : '\'/\''
+    }
+
+    let hasStaticPath = false
+    let sortedPaths = paths
+      // some legacy API have mutliple statis paths
+      // this filter removes them
+      .filter(p => {
+        if (p.path.includes('{')) return true
+        if (hasStaticPath === false && p.deprecated == null) {
+          hasStaticPath = true
+          return true
+        }
+        return false
+      })
+      // sort by number of parameters (desc)
+      .sort((a, b) => Object.keys(b.parts || {}).length - Object.keys(a.parts || {}).length)
+
+    const allDeprecated = paths.filter(path => path.deprecated != null)
+    if (allDeprecated.length === paths.length) sortedPaths = [paths[0]]
+
+    let code = ''
+    for (let i = 0; i < sortedPaths.length; i++) {
+      const { path, methods } = sortedPaths[i]
+      if (sortedPaths.length === 1) {
+        code += `if (method == null) method = ${generatePickMethod(methods)}
+          path = ${genPath(path)}
+        `
+      } else if (i === 0) {
+        code += `if (${genCheck(path)}) {
+            if (method == null) method = ${generatePickMethod(methods)}
+            path = ${genPath(path)}
+          }
+        `
+      } else if (i === sortedPaths.length - 1) {
+        code += ` else {
+            if (method == null) method = ${generatePickMethod(methods)}
+            path = ${genPath(path)}
+          }
+        `
+      } else {
+        code += ` else if (${genCheck(path)}) {
+            if (method == null) method = ${generatePickMethod(methods)}
+            path = ${genPath(path)}
+          }
+        `
+      }
+    }
+
+    return code
+  }
+}
+
+function generatePickMethod (methods) {
+  if (methods.length === 1) {
+    return `'${methods[0]}'`
+  }
+  const bodyMethod = getBodyMethod(methods)
+  const noBodyMethod = getNoBodyMethod(methods)
+  if (bodyMethod && noBodyMethod) {
+    return `body == null ? '${noBodyMethod}' : '${bodyMethod}'`
+  } else if (bodyMethod) {
+    return `'${bodyMethod}'`
+  } else {
+    return `'${noBodyMethod}'`
+  }
+}
+
+function genBody (api, methods, body, spec) {
+  const bodyMethod = getBodyMethod(methods)
+  const { content_type } = spec[api].headers
+  if (content_type && content_type.includes('application/x-ndjson')) {
+    return 'bulkBody: body,'
+  }
+  if (body === null && bodyMethod) {
+    return 'body: \'\','
+  } else if (bodyMethod) {
+    return 'body: body || \'\','
+  } else {
+    return 'body: null,'
+  }
+}
+
+function getBodyMethod (methods) {
+  const m = methods.filter(m => ~allowedMethods.body.indexOf(m))
+  if (m.length) return m[0]
+  return null
+}
+
+function getNoBodyMethod (methods) {
+  const m = methods.filter(m => ~allowedMethods.noBody.indexOf(m))
+  if (m.length) return m[0]
+  return null
+}
+
+function genUrlValidation (paths, api) {
+  // this api does not need url validation
+  if (!needsPathValidation(api)) return ''
+  // gets only the dynamic components of the url in an array
+  // then we reverse it. A parameters always require what is
+  // at its right in the array.
+  const chunks = paths
+    .sort((a, b) => Object.keys(a.parts || {}).length > Object.keys(b.parts || {}).length ? -1 : 1)
+    .slice(0, 1)
+    .reduce((acc, val) => val.path, '')
+    // .reduce((a, b) => a.path.split('/').length > b.path.split('/').length ? a.path : b.path)
+    .split('/')
+    .filter(s => s.startsWith('{'))
+    .map(s => s.slice(1, -1))
+    .reverse()
+
+  let code = ''
+
+  const len = chunks.length
+  chunks.forEach((chunk, index) => {
+    if (index === len - 1) return
+    const params = []
+    let camelCased = chunk[0] === '_'
+      ? '_' + chunk.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+      : chunk.replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+    if (chunk === camelCased) {
+      code += `${index ? '} else ' : ''}if (params['${chunk}'] != null && (`
+    } else {
+      code += `${index ? '} else ' : ''}if ((params['${chunk}'] != null || params['${camelCased}'] != null) && (`
+    }
+    for (let i = index + 1; i < len; i++) {
+      params.push(chunks[i])
+      // url parts can be declared in camelCase fashion
+      camelCased = chunks[i][0] === '_'
+        ? '_' + chunks[i].slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+        : chunks[i].replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+      if (chunks[i] === camelCased) {
+        code += `params['${chunks[i]}'] == null${i === len - 1 ? '' : ' || '}`
+      } else {
+        code += `(params['${chunks[i]}'] == null && params['${camelCased}'] == null)${i === len - 1 ? '' : ' || '}`
+      }
+    }
+    code += `)) {
+      const err = new this[kConfigurationError]('Missing required parameter of the url: ${params.join(', ')}')
+      return handleError(err, callback)
+    `
+  })
+
+  if (chunks.length > 1) {
+    code += '\n}'
+  }
+
+  if (code.length) {
+    code = '// check required url components\n' + code
+  }
+
+  return code.trim()
+}
+
+function generateDocumentation ({ documentation }, op) {
+  // we use `replace(/\u00A0/g, ' ')` to remove no breaking spaces
+  // because some parts of the description fields are using it
+
+  if (documentation == null) return ''
+
+  let doc = '/**\n'
+  doc += `     * Perform a ${op} request\n`
+  if (documentation.description) {
+    doc += `     * ${documentation.description.replace(/\u00A0/g, ' ')}\n`
+  }
+  if (documentation.url) {
+    doc += `     * ${documentation.url}\n`
+  }
+  doc += '     */'
+
+  return doc
+}
+
+function needsPathValidation (api) {
+  return noPathValidation.indexOf(api) === -1
+}
+
+function intersect (first, ...rest) {
+  return rest.reduce((accum, current) => {
+    return accum.filter(x => current.indexOf(x) !== -1)
+  }, first)
+}
+
+function Uppercase (str) {
+  return str[0].toUpperCase() + str.slice(1)
+}
+
+module.exports = generateNamespace

scripts/utils/generateDocs.js

@@ -0,0 +1,318 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const { readdirSync } = require('fs')
+const { join } = require('path')
+const dedent = require('dedent')
+
+const codeExamples = readdirSync(join(__dirname, '..', '..', 'docs', 'examples'))
+  .map(file => file.slice(0, -9))
+  .filter(api => api !== 'index')
+
+function generateDocs (common, spec) {
+  let doc = dedent`
+  [[api-reference]]
+
+  ////////
+
+
+
+  ===========================================================================================================================
+  ||                                                                                                                       ||
+  ||                                                                                                                       ||
+  ||                                                                                                                       ||
+  ||        ██████╗ ███████╗ █████╗ ██████╗ ███╗   ███╗███████╗                                                            ||
+  ||        ██╔══██╗██╔════╝██╔══██╗██╔══██╗████╗ ████║██╔════╝                                                            ||
+  ||        ██████╔╝█████╗  ███████║██║  ██║██╔████╔██║█████╗                                                              ||
+  ||        ██╔══██╗██╔══╝  ██╔══██║██║  ██║██║╚██╔╝██║██╔══╝                                                              ||
+  ||        ██║  ██║███████╗██║  ██║██████╔╝██║ ╚═╝ ██║███████╗                                                            ||
+  ||        ╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚═════╝ ╚═╝     ╚═╝╚══════╝                                                            ||
+  ||                                                                                                                       ||
+  ||                                                                                                                       ||
+  ||    This file is autogenerated, DO NOT send pull requests that changes this file directly.                             ||
+  ||    You should update the script that does the generation, which can be found in '/scripts/utils/generateDocs.js'.     ||
+  ||                                                                                                                       ||
+  ||    You can run the script with the following command:                                                                 ||
+  ||       node scripts/generate --branch <branch_name>                                                                    ||
+  ||    or                                                                                                                 ||
+  ||       node scripts/generate --tag <tag_name>                                                                          ||
+  ||                                                                                                                       ||
+  ||                                                                                                                       ||
+  ||                                                                                                                       ||
+  ===========================================================================================================================
+
+
+
+  ////////
+
+  == API Reference
+
+  This document contains the entire list of the Elasticsearch API supported by the client, both OSS and commercial. The client is entirely licensed under Apache 2.0.
+
+  Elasticsearch exposes an HTTP layer to communicate with, and the client is a library that will help you do this. Because of this reason, you will see HTTP related parameters, such as ${'`'}body${'`'} or ${'`'}headers${'`'}.
+
+  Every API can accept two objects, the first contains all the parameters that will be sent to Elasticsearch, while the second includes the request specific parameters, such as timeouts, headers, and so on.
+  In the first object, every parameter but the body will be sent via querystring or url parameter, depending on the API, and every unrecognized parameter will be sent as querystring.
+
+  [source,js]
+  ----
+  // promise API
+  const result = await client.search({
+    index: 'my-index',
+    from: 20,
+    size: 10,
+    body: { foo: 'bar' }
+  }, {
+    ignore: [404],
+    maxRetries: 3
+  })
+
+  // callback API
+  client.search({
+    index: 'my-index',
+    from: 20,
+    size: 10,
+    body: { foo: 'bar' }
+  }, {
+    ignore: [404],
+    maxRetries: 3
+  }, (err, result) => {
+    if (err) console.log(err)
+  })
+  ----
+
+  In this document, you will find the reference of every parameter accepted by the querystring or the url. If you also need to send the body, you can find the documentation of its format in the reference link that is present along with every endpoint.
+
+  \n\n`
+  doc += commonParameters(common)
+  spec.forEach(s => {
+    doc += '\n' + generateApiDoc(s)
+  })
+  return doc
+}
+
+function commonParameters (spec) {
+  let doc = dedent`
+  [discrete]
+  === Common parameters
+  Parameters that are accepted by all API endpoints.
+
+  link:{ref}/common-options.html[Documentation]
+  [cols=2*]
+  |===\n`
+  Object.keys(spec.params).forEach(key => {
+    const name = isSnakeCased(key) && key !== camelify(key)
+      ? '`' + key + '` or `' + camelify(key) + '`'
+      : '`' + key + '`'
+
+    doc += dedent`
+    |${name}
+    |${'`' + spec.params[key].type + '`'} - ${spec.params[key].description}`
+    if (spec.params[key].default) {
+      doc += ` +
+    _Default:_ ${'`' + spec.params[key].default + '`'}`
+    }
+    doc += '\n\n'
+  })
+
+  doc += dedent`
+  |===
+  `
+  return doc
+}
+
+function generateApiDoc (spec) {
+  const name = Object.keys(spec)[0]
+  const documentationUrl = spec[name].documentation && spec[name].documentation.url
+    ? fixLink(name, spec[name].documentation.url)
+    : ''
+  const params = []
+  // url params
+  const urlParts = spec[name].url.paths.reduce((acc, path) => {
+    if (!path.parts) return acc
+    for (const part in path.parts) {
+      if (acc[part] != null) continue
+      acc[part] = path.parts[part]
+    }
+    return acc
+  }, {})
+  if (urlParts) {
+    Object.keys(urlParts).forEach(param => {
+      params.push({
+        name: param,
+        type: getType(urlParts[param].type, urlParts[param].options),
+        description: urlParts[param].description,
+        default: urlParts[param].default,
+        deprecated: !!urlParts[param].deprecated
+      })
+    })
+  }
+
+  // query params
+  const urlParams = spec[name].params
+  if (urlParams) {
+    Object.keys(urlParams).forEach(param => {
+      const duplicate = params.find(ele => ele.name === param)
+      if (duplicate) return
+      params.push({
+        name: param,
+        type: getType(urlParams[param].type, urlParams[param].options),
+        description: urlParams[param].description,
+        default: urlParams[param].default,
+        deprecated: !!urlParams[param].deprecated
+      })
+    })
+  }
+
+  // body params
+  const body = spec[name].body
+  if (body) {
+    params.push({
+      name: 'body',
+      type: 'object',
+      description: body.description,
+      default: body.default,
+      deprecated: !!body.deprecated
+    })
+  }
+
+  const codeParameters = params
+    .reduce((acc, val) => {
+      const code = `${val.name}: ${val.type},`
+      acc += acc === ''
+        ? code
+        : '\n    ' + code
+
+      return acc
+    }, '')
+    // remove last comma
+    .slice(0, -1)
+
+  const stability = spec[name].stability === 'stable'
+    ? ''
+    : `*Stability:* ${spec[name].stability}`
+
+  let doc = dedent`
+  [discrete]
+  === ${camelify(name)}
+  ${stability}
+  [source,ts]
+  ----
+  client.${camelify(name)}(${codeParameters.length > 0 ? `{\n    ${codeParameters}\n}` : ''})
+  ----\n`
+  if (documentationUrl) {
+    doc += `link:${documentationUrl}[Documentation] +\n`
+  }
+  if (codeExamples.includes(name)) {
+    doc += `{jsclient}/${name.replace(/\./g, '_')}_examples.html[Code Example] +\n`
+  }
+
+  if (params.length !== 0) {
+    doc += dedent`[cols=2*]
+    |===\n`
+    doc += params.reduce((acc, val) => {
+      const name = isSnakeCased(val.name) && val.name !== camelify(val.name)
+        ? '`' + val.name + '` or `' + camelify(val.name) + '`'
+        : '`' + val.name + '`'
+      acc += dedent`
+      |${name}
+      |${'`' + val.type.replace(/\|/g, '\\|') + '`'} - ${val.description}`
+      if (val.default) {
+        acc += ` +\n_Default:_ ${'`' + val.default + '`'}`
+      }
+      if (val.deprecated) {
+        acc += ' +\n\nWARNING: This parameter has been deprecated.'
+      }
+      return acc + '\n\n'
+    }, '')
+
+    doc += dedent`
+    |===
+    `
+  }
+  doc += '\n'
+  return doc
+}
+
+const LINK_OVERRIDES = {
+  'license.delete': '{ref}/delete-license.html',
+  'license.get': '{ref}/get-license.html',
+  'license.get_basic_status': '{ref}/get-basic-status.html',
+  'license.get_trial_status': '{ref}/get-trial-status.html',
+  'license.post': '{ref}/update-license.html',
+  'license.post_start_basic': '{ref}/start-basic.html',
+  'license.post_start_trial': '{ref}/start-trial.html',
+  'migration.deprecations': '{ref}/migration-api-deprecation.html',
+  'monitoring.bulk': '{ref}/monitor-elasticsearch-cluster.html',
+  'ingest.delete_pipeline': '{ref}/delete-pipeline-api.html',
+  'ingest.get_pipeline': '{ref}/get-pipeline-api.html',
+  'ingest.put_pipeline': '{ref}/put-pipeline-api.html',
+  'ingest.simulate': '{ref}/simulate-pipeline-api.html',
+  'ingest.processor_grok': '{ref}/grok-processor.html#grok-processor-rest-get'
+}
+// Fixes bad urls in the JSON spec
+function fixLink (name, str) {
+  /* In 6.x some API start with `xpack.` when in master they do not. We
+   * can safely ignore that for link generation. */
+  name = name.replace(/^xpack\./, '')
+  const override = LINK_OVERRIDES[name]
+  if (override) return override
+  if (!str) return ''
+  /* Replace references to the guide with the attribute {ref} because
+   * the json files in the Elasticsearch repo are a bit of a mess. */
+  str = str.replace(/^.+guide\/en\/elasticsearch\/reference\/[^/]+\/([^./]*\.html(?:#.+)?)$/, '{ref}/$1')
+  str = str.replace(/frozen\.html/, 'freeze-index-api.html')
+  str = str.replace(/ml-file-structure\.html/, 'ml-find-file-structure.html')
+  str = str.replace(/security-api-get-user-privileges\.html/, 'security-api-get-privileges.html')
+
+  return str
+}
+
+function getType (type, options) {
+  switch (type) {
+    case 'list':
+      return 'string | string[]'
+    case 'date':
+    case 'time':
+    case 'timeout':
+      return 'string'
+    case 'enum':
+      return options.map(k => `'${k}'`).join(' | ')
+    case 'int':
+    case 'double':
+    case 'long':
+      return 'number'
+    default:
+      return type
+  }
+}
+
+function camelify (str) {
+  return str[0] === '_'
+    ? '_' + str.slice(1).replace(/_([a-z])/g, k => k[1].toUpperCase())
+    : str.replace(/_([a-z])/g, k => k[1].toUpperCase())
+}
+
+function isSnakeCased (str) {
+  return !!~str.indexOf('_')
+}
+
+module.exports = generateDocs

scripts/utils/generateMain.js

@@ -0,0 +1,299 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable no-template-curly-in-string  */
+/* eslint camelcase: 0 */
+
+'use strict'
+
+const { readdirSync } = require('fs')
+const { join } = require('path')
+const dedent = require('dedent')
+const deepmerge = require('deepmerge')
+
+function genFactory (folder, specFolder, namespaces) {
+  // get all the API files
+  // const apiFiles = readdirSync(folder)
+  const apiFiles = readdirSync(specFolder)
+    .filter(file => file !== '_common.json')
+    .filter(file => !file.includes('deprecated'))
+    .sort()
+  const types = apiFiles
+    .map(file => {
+      const name = file
+        .slice(0, -5)
+        .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+        .replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+      return file
+        .slice(0, -5) // remove `.json` extension
+        .split('.')
+        .reverse()
+        .reduce((acc, val) => {
+          const spec = readSpec(specFolder, file.slice(0, -5))
+          const isHead = isHeadMethod(spec, file.slice(0, -5))
+          const body = hasBody(spec, file.slice(0, -5))
+          const methods = acc === null ? buildMethodDefinition({ kibana: false }, val, name, body, isHead, spec) : null
+          const obj = {}
+          if (methods) {
+            for (const m of methods) {
+              obj[m.key] = m.val
+            }
+          } else {
+            obj[val] = acc
+            if (isSnakeCased(val)) {
+              obj[camelify(val)] = acc
+            }
+          }
+          return obj
+        }, null)
+    })
+    .reduce((acc, val) => deepmerge(acc, val), {})
+
+  const kibanaTypes = apiFiles
+    .map(file => {
+      const name = file
+        .slice(0, -5)
+        .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+        .replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+      return file
+        .slice(0, -5) // remove `.json` extension
+        .split('.')
+        .reverse()
+        .reduce((acc, val) => {
+          const spec = readSpec(specFolder, file.slice(0, -5))
+          const isHead = isHeadMethod(spec, file.slice(0, -5))
+          const body = hasBody(spec, file.slice(0, -5))
+          const methods = acc === null ? buildMethodDefinition({ kibana: true }, val, name, body, isHead, spec) : null
+          const obj = {}
+          if (methods) {
+            for (const m of methods) {
+              obj[m.key] = m.val
+            }
+          } else {
+            obj[camelify(val)] = acc
+          }
+          return obj
+        }, null)
+    })
+    .reduce((acc, val) => deepmerge(acc, val), {})
+
+  // serialize the type object
+  const typesStr = Object.keys(types)
+    .map(key => {
+      const line = `  ${key}: ${JSON.stringify(types[key], null, 4)}`
+      if (line.slice(-1) === '}') {
+        return line.slice(0, -1) + '  }'
+      }
+      return line
+    })
+    .join('\n')
+    // remove useless quotes and commas
+    .replace(/"/g, '')
+    .replace(/,$/gm, '')
+  const kibanaTypesStr = Object.keys(kibanaTypes)
+    .map(key => {
+      const line = `  ${key}: ${JSON.stringify(kibanaTypes[key], null, 4)}`
+      if (line.slice(-1) === '}') {
+        return line.slice(0, -1) + '  }'
+      }
+      return line
+    })
+    .join('\n')
+    // remove useless quotes and commas
+    .replace(/"/g, '')
+    .replace(/,$/gm, '')
+
+  let apisStr = ''
+  const getters = []
+  for (const namespace in namespaces) {
+    if (namespaces[namespace].length > 0) {
+      getters.push(`${camelify(namespace)}: {
+        get () {
+          if (this[k${toPascalCase(camelify(namespace))}] === null) {
+            this[k${toPascalCase(camelify(namespace))}] = new ${toPascalCase(camelify(namespace))}Api(this.transport, this[kConfigurationError])
+          }
+          return this[k${toPascalCase(camelify(namespace))}]
+        }
+      },\n`)
+      if (namespace.includes('_')) {
+        getters.push(`${namespace}: { get () { return this.${camelify(namespace)} } },\n`)
+      }
+    } else {
+      apisStr += `ESAPI.prototype.${camelify(namespace)} = ${camelify(namespace)}Api\n`
+      if (namespace.includes('_')) {
+        getters.push(`${namespace}: { get () { return this.${camelify(namespace)} } },\n`)
+      }
+    }
+  }
+
+  apisStr += '\nObject.defineProperties(ESAPI.prototype, {\n'
+  for (const getter of getters) {
+    apisStr += getter
+  }
+  apisStr += '})'
+
+  let modules = ''
+  let symbols = ''
+  let symbolsInstance = ''
+  for (const namespace in namespaces) {
+    if (namespaces[namespace].length > 0) {
+      modules += `const ${toPascalCase(camelify(namespace))}Api = require('./api/${namespace}')\n`
+      symbols += `const k${toPascalCase(camelify(namespace))} = Symbol('${toPascalCase(camelify(namespace))}')\n`
+      symbolsInstance += `this[k${toPascalCase(camelify(namespace))}] = null\n`
+    } else {
+      modules += `const ${camelify(namespace)}Api = require('./api/${namespace}')\n`
+    }
+  }
+
+  const fn = dedent`
+  /*
+   * Licensed to Elasticsearch B.V. under one or more contributor
+   * license agreements. See the NOTICE file distributed with
+   * this work for additional information regarding copyright
+   * ownership. Elasticsearch B.V. licenses this file to you under
+   * the Apache License, Version 2.0 (the "License"); you may
+   * not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   *    http://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing,
+   * software distributed under the License is distributed on an
+   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   * KIND, either express or implied.  See the License for the
+   * specific language governing permissions and limitations
+   * under the License.
+   */
+
+  'use strict'
+
+  ${modules}
+
+  const { kConfigurationError } = require('./utils')
+  ${symbols}
+
+  function ESAPI (opts) {
+    this[kConfigurationError] = opts.ConfigurationError
+    ${symbolsInstance}
+  }
+
+  ${apisStr}
+
+  module.exports = ESAPI
+  `
+
+  // new line at the end of file
+  return { fn: fn + '\n', types: typesStr, kibanaTypes: kibanaTypesStr }
+}
+
+// from snake_case to camelCase
+function camelify (str) {
+  return str.replace(/_([a-z])/g, k => k[1].toUpperCase())
+}
+
+function isSnakeCased (str) {
+  return !!~str.indexOf('_')
+}
+
+function toPascalCase (str) {
+  return str[0].toUpperCase() + str.slice(1)
+}
+
+function buildMethodDefinition (opts, api, name, hasBody, isHead, spec) {
+  const Name = toPascalCase(name)
+  const { content_type } = spec[Object.keys(spec)[0]].headers
+  const bodyType = content_type && content_type.includes('application/x-ndjson') ? 'RequestNDBody' : 'RequestBody'
+  const responseType = isHead ? 'boolean' : 'Record<string, any>'
+  const defaultBodyType = content_type && content_type.includes('application/x-ndjson') ? 'Record<string, any>[]' : 'Record<string, any>'
+
+  if (opts.kibana) {
+    if (hasBody) {
+      return [
+        { key: `${camelify(api)}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params?: RequestParams.${Name}<TRequestBody>, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' }
+      ]
+    } else {
+      return [
+        { key: `${camelify(api)}<TResponse = ${responseType}, TContext = Context>(params?: RequestParams.${Name}, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' }
+      ]
+    }
+  }
+
+  if (hasBody) {
+    let methods = [
+      { key: `${api}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params?: RequestParams.${Name}<TRequestBody>, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' },
+      { key: `${api}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+      { key: `${api}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params: RequestParams.${Name}<TRequestBody>, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+      { key: `${api}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params: RequestParams.${Name}<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' }
+    ]
+    if (isSnakeCased(api)) {
+      methods = methods.concat([
+        { key: `${camelify(api)}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params?: RequestParams.${Name}<TRequestBody>, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params: RequestParams.${Name}<TRequestBody>, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TRequestBody extends ${bodyType} = ${defaultBodyType}, TContext = Context>(params: RequestParams.${Name}<TRequestBody>, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' }
+      ])
+    }
+    return methods
+  } else {
+    let methods = [
+      { key: `${api}<TResponse = ${responseType}, TContext = Context>(params?: RequestParams.${Name}, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' },
+      { key: `${api}<TResponse = ${responseType}, TContext = Context>(callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+      { key: `${api}<TResponse = ${responseType}, TContext = Context>(params: RequestParams.${Name}, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+      { key: `${api}<TResponse = ${responseType}, TContext = Context>(params: RequestParams.${Name}, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' }
+    ]
+    if (isSnakeCased(api)) {
+      methods = methods.concat([
+        { key: `${camelify(api)}<TResponse = ${responseType}, TContext = Context>(params?: RequestParams.${Name}, options?: TransportRequestOptions)`, val: 'TransportRequestPromise<ApiResponse<TResponse, TContext>>' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TContext = Context>(callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TContext = Context>(params: RequestParams.${Name}, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' },
+        { key: `${camelify(api)}<TResponse = ${responseType}, TContext = Context>(params: RequestParams.${Name}, options: TransportRequestOptions, callback: callbackFn<TResponse, TContext>)`, val: 'TransportRequestCallback' }
+      ])
+    }
+    return methods
+  }
+}
+
+function hasBody (spec, api) {
+  return !!spec[api].body
+}
+
+function isHeadMethod (spec, api) {
+  const { paths } = spec[api].url
+  const methods = []
+  for (const path of paths) {
+    for (const method of path.methods) {
+      if (!methods.includes(method)) {
+        methods.push(method)
+      }
+    }
+  }
+  return methods.length === 1 && methods[0] === 'HEAD'
+}
+
+function readSpec (specFolder, file) {
+  try {
+    return require(join(specFolder, file))
+  } catch (err) {
+    throw new Error(`Cannot read spec file ${file}`)
+  }
+}
+
+module.exports = genFactory

scripts/utils/generateRequestTypes.js

@@ -0,0 +1,191 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint camelcase: 0 */
+
+'use strict'
+
+const deprecatedParameters = require('./patch.json')
+
+function generate (version, api) {
+  const release = version.charAt(0)
+  let types = `/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RequestBody, RequestNDBody } from '../lib/Transport'
+
+export interface Generic {
+  method?: string;
+  filter_path?: string | string[];
+  pretty?: boolean;
+  human?: boolean;
+  error_trace?: boolean;
+  source?: string;
+}
+`
+
+  api.forEach(generateRequestType)
+  return types
+
+  function generateRequestType (spec) {
+    const api = Object.keys(spec)[0]
+    const name = api
+      .replace(/\.([a-z])/g, k => k[1].toUpperCase())
+      .replace(/_([a-z])/g, k => k[1].toUpperCase())
+
+    const { paths = {} } = spec[api].url
+    const { body, params = {} } = spec[api]
+
+    // get the required parts from the url
+    // if the url has at least one static path,
+    // then there are not required parts of the url
+    let allParts = []
+    let requiredParts = []
+    for (const path of paths) {
+      if (path.parts) {
+        allParts.push(Object.keys(path.parts))
+      } else {
+        allParts = []
+        break
+      }
+    }
+    if (allParts.length > 0) {
+      requiredParts = intersect(...allParts)
+    }
+
+    const parts = paths.reduce((acc, path) => {
+      if (!path.parts) return acc
+      for (const part in path.parts) {
+        if (acc[part] != null) continue
+        acc[part] = { key: part, value: path.parts[part], required: requiredParts.includes(part) }
+      }
+      return acc
+    }, {})
+    const deprecatedParametersToAdd = []
+    const paramsArr = Object.keys(params)
+      .filter(k => !Object.keys(parts).includes(k))
+      .map(k => {
+        if (deprecatedParameters[release] && deprecatedParameters[release][k]) {
+          deprecatedParametersToAdd.push({
+            key: deprecatedParameters[release][k],
+            value: params[k],
+            required: params[k].required
+          })
+        }
+        return { key: k, value: params[k], required: params[k].required }
+      })
+
+    const partsArr = Object.keys(parts).map(k => parts[k])
+    deprecatedParametersToAdd.forEach(k => partsArr.push(k))
+
+    const genLine = e => {
+      const optional = e.required ? '' : '?'
+      return `${e.key}${optional}: ${getType(e.value.type, e.value.options)};`
+    }
+
+    const { content_type } = spec[api].headers
+    const bodyGeneric = content_type && content_type.includes('application/x-ndjson') ? 'RequestNDBody' : 'RequestBody'
+
+    const code = `
+export interface ${toPascalCase(name)}${body ? `<T = ${bodyGeneric}>` : ''} extends Generic {
+  ${partsArr.map(genLine).join('\n  ')}
+  ${paramsArr.map(genLine).join('\n  ')}
+  ${body ? `body${body.required ? '' : '?'}: T;` : ''}
+}
+`
+
+    types += '\n'
+    // remove empty lines
+    types += code.replace(/^\s*\n/gm, '')
+  }
+
+  function getType (type, options) {
+    switch (type) {
+      case 'list':
+        return 'string | string[]'
+      case 'date':
+      case 'time':
+      case 'timeout':
+        return 'string'
+      case 'enum': {
+        // the following code changes 'true' | 'false' to boolean
+        let foundTrue = false
+        let foundFalse = false
+        options = options
+          .map(k => {
+            if (k === 'true') {
+              foundTrue = true
+              return true
+            } else if (k === 'false') {
+              foundFalse = true
+              return false
+            } else {
+              return `'${k}'`
+            }
+          })
+          .filter(k => {
+            if (foundTrue && foundFalse && (k === true || k === false)) {
+              return false
+            }
+            return true
+          })
+        if (foundTrue && foundFalse) {
+          options.push('boolean')
+        }
+        return options.join(' | ')
+      }
+      case 'int':
+      case 'double':
+      case 'long':
+        return 'number'
+      case 'boolean|long':
+        return 'boolean | number'
+      default:
+        return type
+    }
+  }
+}
+
+function intersect (first, ...rest) {
+  return rest.reduce((accum, current) => {
+    return accum.filter(x => current.indexOf(x) !== -1)
+  }, first)
+}
+
+function toPascalCase (str) {
+  return str[0].toUpperCase() + str.slice(1)
+}
+
+module.exports = generate

scripts/utils/index.js

@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict'
+
+const generate = require('./generateApis')
+const cloneAndCheckout = require('./clone-es')
+const genFactory = require('./generateMain')
+const generateDocs = require('./generateDocs')
+const generateRequestTypes = require('./generateRequestTypes')
+
+module.exports = {
+  generate,
+  cloneAndCheckout,
+  genFactory,
+  generateDocs,
+  generateRequestTypes
+}

scripts/utils/patch.json

@@ -0,0 +1,14 @@
+{
+  "6": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  },
+  "7": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  },
+  "8": {
+    "_source_includes": "_source_include",
+    "_source_excludes": "_source_exclude"
+  }
+}

scripts/wait-cluster.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+TEST_ES_SERVER=${TEST_ES_SERVER:-"http://localhost:9200"}
+
+attempt_counter=0
+max_attempts=5
+url="${TEST_ES_SERVER}/_cluster/health?wait_for_status=green&timeout=50s"
+
+echo "Waiting for Elasticsearch..."
+while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' --max-time 55 "$url")" != "200" ]]; do
+  if [ ${attempt_counter} -eq ${max_attempts} ];then
+    echo "\nCouldn't connect to Elasticsearch"
+    exit 1
+  fi
+
+  printf '.'
+  attempt_counter=$(($attempt_counter+1))
+  sleep 5
+done
+
+echo "\nReady"

src/api/api/async_search.ts

@@ -52,13 +52,23 @@ export default class AsyncSearch {
   async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchDeleteResponse>
   async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -84,13 +94,23 @@ export default class AsyncSearch {
   async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
   async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -116,13 +136,23 @@ export default class AsyncSearch {
   async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchStatusResponse>
   async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -149,12 +179,23 @@ export default class AsyncSearch {
   async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['aggregations', 'aggs', 'collapse', 'explain', 'ext', 'from', 'highlight', 'track_total_hits', 'indices_boost', 'docvalue_fields', 'knn', '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> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         if (key === 'sort' && typeof params[key] === 'string' && params[key].includes(':')) { // eslint-disable-line
           querystring[key] = params[key]
         } else {
@@ -163,7 +204,7 @@ export default class AsyncSearch {
         }
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/autoscaling.ts

@@ -52,13 +52,23 @@ export default class Autoscaling {
   async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingDeleteAutoscalingPolicyResponse>
   async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -84,14 +94,24 @@ export default class Autoscaling {
   async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingCapacityResponse>
   async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -114,13 +134,23 @@ export default class Autoscaling {
   async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingPolicyResponse>
   async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -147,16 +177,17 @@ export default class Autoscaling {
   async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['policy']
-    const querystring: Record<string, any> = {}
-    let body: any
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
 
+    let body: any = params.body ?? undefined
     for (const key in params) {
       if (acceptedBody.includes(key)) {
         // @ts-expect-error
         body = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/capabilities.ts

@@ -46,14 +46,24 @@ export default async function CapabilitiesApi (this: That, params?: T.TODO, opti
 export default async function CapabilitiesApi (this: That, params?: T.TODO, options?: TransportRequestOptions): Promise<T.TODO>
 export default async function CapabilitiesApi (this: That, params?: T.TODO, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
-  const querystring: Record<string, any> = {}
-  const body = undefined
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   params = params ?? {}
   for (const key in params) {
     if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       querystring[key] = params[key]
     }
   }

src/api/api/cat.ts

@@ -44,7 +44,7 @@ export default class Cat {
   }
 
   /**
-    * Get aliases. Retrieves the cluster’s index aliases, including filter and routing information. The API does not return data stream aliases. CAT APIs are only intended for human consumption using the command line or the Kibana console. They are not intended for use by applications. For application consumption, use the aliases API.
+    * Get aliases. Get the cluster's index aliases, including filter and routing information. This API does not return data stream aliases. IMPORTANT: CAT APIs are only intended for human consumption using the command line or the Kibana console. They are not intended for use by applications. For application consumption, use the aliases API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html | Elasticsearch API documentation}
     */
   async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAliasesResponse>
@@ -52,14 +52,24 @@ export default class Cat {
   async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptions): Promise<T.CatAliasesResponse>
   async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -84,7 +94,7 @@ export default class Cat {
   }
 
   /**
-    * Get shard allocation information. Get a snapshot of the number of shards allocated to each data node and their disk space. IMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications.
+    * Get shard allocation information. Get a snapshot of the number of shards allocated to each data node and their disk space. IMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html | Elasticsearch API documentation}
     */
   async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAllocationResponse>
@@ -92,14 +102,24 @@ export default class Cat {
   async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptions): Promise<T.CatAllocationResponse>
   async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['node_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -124,7 +144,7 @@ export default class Cat {
   }
 
   /**
-    * Get component templates. Returns information about component templates in a cluster. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases. CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the get component template API.
+    * Get component templates. Get information about component templates in a cluster. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases. IMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the get component template API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-component-templates.html | Elasticsearch API documentation}
     */
   async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatComponentTemplatesResponse>
@@ -132,14 +152,24 @@ export default class Cat {
   async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatComponentTemplatesResponse>
   async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -164,7 +194,7 @@ export default class Cat {
   }
 
   /**
-    * Get a document count. Provides quick access to a document count for a data stream, an index, or an entire cluster. The document count only includes live documents, not deleted documents which have not yet been removed by the merge process. CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the count API.
+    * Get a document count. Get quick access to a document count for a data stream, an index, or an entire cluster. The document count only includes live documents, not deleted documents which have not yet been removed by the merge process. IMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the count API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html | Elasticsearch API documentation}
     */
   async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatCountResponse>
@@ -172,14 +202,24 @@ export default class Cat {
   async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptions): Promise<T.CatCountResponse>
   async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -212,14 +252,24 @@ export default class Cat {
   async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptions): Promise<T.CatFielddataResponse>
   async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['fields']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -244,7 +294,7 @@ export default class Cat {
   }
 
   /**
-    * Get the cluster health status. IMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the cluster health API. This API is often used to check malfunctioning clusters. To help you track cluster health alongside log files and alerting systems, the API returns timestamps in two formats: `HH:MM:SS`, which is human-readable but includes no date information; `Unix epoch time`, which is machine-sortable and includes date information. The latter format is useful for cluster recoveries that take multiple days. You can use the cat health API to verify cluster health across multiple nodes. You also can use the API to track the recovery of a large cluster over a longer period of time.
+    * Get the cluster health status. IMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the cluster health API. This API is often used to check malfunctioning clusters. To help you track cluster health alongside log files and alerting systems, the API returns timestamps in two formats: `HH:MM:SS`, which is human-readable but includes no date information; `Unix epoch time`, which is machine-sortable and includes date information. The latter format is useful for cluster recoveries that take multiple days. You can use the cat health API to verify cluster health across multiple nodes. You also can use the API to track the recovery of a large cluster over a longer period of time.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html | Elasticsearch API documentation}
     */
   async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHealthResponse>
@@ -252,14 +302,24 @@ export default class Cat {
   async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptions): Promise<T.CatHealthResponse>
   async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -274,7 +334,7 @@ export default class Cat {
   }
 
   /**
-    * Get CAT help. Returns help for the CAT APIs.
+    * Get CAT help. Get help for the CAT APIs.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html | Elasticsearch API documentation}
     */
   async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHelpResponse>
@@ -282,14 +342,24 @@ export default class Cat {
   async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptions): Promise<T.CatHelpResponse>
   async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -304,7 +374,7 @@ export default class Cat {
   }
 
   /**
-    * Get index information. Returns high-level information about indices in a cluster, including backing indices for data streams. Use this request to get the following information for each index in a cluster: - shard count - document count - deleted document count - primary store size - total store size of all shards, including shard replicas These metrics are retrieved directly from Lucene, which Elasticsearch uses internally to power indexing and search. As a result, all document counts include hidden nested documents. To get an accurate count of Elasticsearch documents, use the cat count or count APIs. CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use an index endpoint.
+    * Get index information. Get high-level information about indices in a cluster, including backing indices for data streams. Use this request to get the following information for each index in a cluster: - shard count - document count - deleted document count - primary store size - total store size of all shards, including shard replicas These metrics are retrieved directly from Lucene, which Elasticsearch uses internally to power indexing and search. As a result, all document counts include hidden nested documents. To get an accurate count of Elasticsearch documents, use the cat count or count APIs. CAT APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use an index endpoint.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html | Elasticsearch API documentation}
     */
   async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatIndicesResponse>
@@ -312,14 +382,24 @@ export default class Cat {
   async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptions): Promise<T.CatIndicesResponse>
   async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -352,14 +432,24 @@ export default class Cat {
   async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptions): Promise<T.CatMasterResponse>
   async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -374,7 +464,7 @@ export default class Cat {
   }
 
   /**
-    * Get data frame analytics jobs. Returns configuration and usage information about data frame analytics jobs. CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get data frame analytics jobs statistics API.
+    * Get data frame analytics jobs. Get configuration and usage information about data frame analytics jobs. IMPORTANT: CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get data frame analytics jobs statistics API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-dfanalytics.html | Elasticsearch API documentation}
     */
   async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDataFrameAnalyticsResponse>
@@ -382,14 +472,24 @@ export default class Cat {
   async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<T.CatMlDataFrameAnalyticsResponse>
   async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -414,7 +514,7 @@ export default class Cat {
   }
 
   /**
-    * Get datafeeds. Returns configuration and usage information about datafeeds. This API returns a maximum of 10,000 datafeeds. If the Elasticsearch security features are enabled, you must have `monitor_ml`, `monitor`, `manage_ml`, or `manage` cluster privileges to use this API. CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get datafeed statistics API.
+    * Get datafeeds. Get configuration and usage information about datafeeds. This API returns a maximum of 10,000 datafeeds. If the Elasticsearch security features are enabled, you must have `monitor_ml`, `monitor`, `manage_ml`, or `manage` cluster privileges to use this API. IMPORTANT: CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get datafeed statistics API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-datafeeds.html | Elasticsearch API documentation}
     */
   async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDatafeedsResponse>
@@ -422,14 +522,24 @@ export default class Cat {
   async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<T.CatMlDatafeedsResponse>
   async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['datafeed_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -454,7 +564,7 @@ export default class Cat {
   }
 
   /**
-    * Get anomaly detection jobs. Returns configuration and usage information for anomaly detection jobs. This API returns a maximum of 10,000 jobs. If the Elasticsearch security features are enabled, you must have `monitor_ml`, `monitor`, `manage_ml`, or `manage` cluster privileges to use this API. CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get anomaly detection job statistics API.
+    * Get anomaly detection jobs. Get configuration and usage information for anomaly detection jobs. This API returns a maximum of 10,000 jobs. If the Elasticsearch security features are enabled, you must have `monitor_ml`, `monitor`, `manage_ml`, or `manage` cluster privileges to use this API. IMPORTANT: CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get anomaly detection job statistics API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-anomaly-detectors.html | Elasticsearch API documentation}
     */
   async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlJobsResponse>
@@ -462,14 +572,24 @@ export default class Cat {
   async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptions): Promise<T.CatMlJobsResponse>
   async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['job_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -494,7 +614,7 @@ export default class Cat {
   }
 
   /**
-    * Get trained models. Returns configuration and usage information about inference trained models. CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get trained models statistics API.
+    * Get trained models. Get configuration and usage information about inference trained models. IMPORTANT: CAT APIs are only intended for human consumption using the Kibana console or command line. They are not intended for use by applications. For application consumption, use the get trained models statistics API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-trained-model.html | Elasticsearch API documentation}
     */
   async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlTrainedModelsResponse>
@@ -502,14 +622,24 @@ export default class Cat {
   async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<T.CatMlTrainedModelsResponse>
   async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['model_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -542,14 +672,24 @@ export default class Cat {
   async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<T.CatNodeattrsResponse>
   async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -572,14 +712,24 @@ export default class Cat {
   async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptions): Promise<T.CatNodesResponse>
   async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -602,14 +752,24 @@ export default class Cat {
   async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<T.CatPendingTasksResponse>
   async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -632,14 +792,24 @@ export default class Cat {
   async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptions): Promise<T.CatPluginsResponse>
   async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -662,14 +832,24 @@ export default class Cat {
   async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptions): Promise<T.CatRecoveryResponse>
   async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -702,14 +882,24 @@ export default class Cat {
   async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<T.CatRepositoriesResponse>
   async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -732,14 +922,24 @@ export default class Cat {
   async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptions): Promise<T.CatSegmentsResponse>
   async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -772,14 +972,24 @@ export default class Cat {
   async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptions): Promise<T.CatShardsResponse>
   async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -804,7 +1014,7 @@ export default class Cat {
   }
 
   /**
-    * Get snapshot information Get information about the snapshots stored in one or more repositories. A snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the get snapshot API.
+    * Get snapshot information. Get information about the snapshots stored in one or more repositories. A snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human consumption using the command line or Kibana console. They are not intended for use by applications. For application consumption, use the get snapshot API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html | Elasticsearch API documentation}
     */
   async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatSnapshotsResponse>
@@ -812,14 +1022,24 @@ export default class Cat {
   async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<T.CatSnapshotsResponse>
   async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['repository']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -852,14 +1072,24 @@ export default class Cat {
   async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptions): Promise<T.CatTasksResponse>
   async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -882,14 +1112,24 @@ export default class Cat {
   async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatTemplatesResponse>
   async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -922,14 +1162,24 @@ export default class Cat {
   async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<T.CatThreadPoolResponse>
   async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['thread_pool_patterns']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -962,14 +1212,24 @@ export default class Cat {
   async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptions): Promise<T.CatTransformsResponse>
   async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['transform_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/ccr.ts

@@ -44,7 +44,7 @@ export default class Ccr {
   }
 
   /**
-    * Deletes auto-follow patterns.
+    * Delete auto-follow patterns. Delete a collection of cross-cluster replication auto-follow patterns.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-delete-auto-follow-pattern.html | Elasticsearch API documentation}
     */
   async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrDeleteAutoFollowPatternResponse>
@@ -52,13 +52,23 @@ export default class Ccr {
   async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrDeleteAutoFollowPatternResponse>
   async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -76,7 +86,7 @@ export default class Ccr {
   }
 
   /**
-    * Creates a new follower index configured to follow the referenced leader index.
+    * Create a follower. Create a cross-cluster replication follower index that follows a specific leader index. When the API returns, the follower index exists and cross-cluster replication starts replicating operations from the leader index to the follower index.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-put-follow.html | Elasticsearch API documentation}
     */
   async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowResponse>
@@ -85,16 +95,27 @@ export default class Ccr {
   async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['data_stream_name', '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', 'settings']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -112,7 +133,7 @@ export default class Ccr {
   }
 
   /**
-    * Retrieves information about all follower indices, including parameters and status for each follower index
+    * Get follower information. Get information about all cross-cluster replication follower indices. For example, the results include follower index names, leader index names, replication options, and whether the follower indices are active or paused.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-follow-info.html | Elasticsearch API documentation}
     */
   async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowInfoResponse>
@@ -120,13 +141,23 @@ export default class Ccr {
   async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<T.CcrFollowInfoResponse>
   async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -144,7 +175,7 @@ export default class Ccr {
   }
 
   /**
-    * Retrieves follower stats. return shard-level stats about the following tasks associated with each shard for the specified indices.
+    * Get follower stats. Get cross-cluster replication follower stats. The API returns shard-level stats about the "following tasks" associated with each shard for the specified indices.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-follow-stats.html | Elasticsearch API documentation}
     */
   async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowStatsResponse>
@@ -152,13 +183,23 @@ export default class Ccr {
   async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<T.CcrFollowStatsResponse>
   async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -176,7 +217,7 @@ export default class Ccr {
   }
 
   /**
-    * Removes the follower retention leases from the leader.
+    * Forget a follower. Remove the cross-cluster replication follower retention leases from the leader. A following index takes out retention leases on its leader index. These leases are used to increase the likelihood that the shards of the leader index retain the history of operations that the shards of the following index need to run replication. When a follower index is converted to a regular index by the unfollow API (either by directly calling the API or by index lifecycle management tasks), these leases are removed. However, removal of the leases can fail, for example when the remote cluster containing the leader index is unavailable. While the leases will eventually expire on their own, their extended existence can cause the leader index to hold more history than necessary and prevent index lifecycle management from performing some operations on the leader index. This API exists to enable manually removing the leases when the unfollow API is unable to do so. NOTE: This API does not stop replication by a following index. If you use this API with a follower index that is still actively following, the following index will add back retention leases on the leader. The only purpose of this API is to handle the case of failure to remove the following retention leases after the unfollow API is invoked.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-forget-follower.html | Elasticsearch API documentation}
     */
   async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrForgetFollowerResponse>
@@ -185,16 +226,27 @@ export default class Ccr {
   async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const acceptedBody: string[] = ['follower_cluster', 'follower_index', 'follower_index_uuid', 'leader_remote_cluster']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -212,7 +264,7 @@ export default class Ccr {
   }
 
   /**
-    * Gets configured auto-follow patterns. Returns the specified auto-follow pattern collection.
+    * Get auto-follow patterns. Get cross-cluster replication auto-follow patterns.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-auto-follow-pattern.html | Elasticsearch API documentation}
     */
   async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrGetAutoFollowPatternResponse>
@@ -220,14 +272,24 @@ export default class Ccr {
   async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrGetAutoFollowPatternResponse>
   async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -252,7 +314,7 @@ export default class Ccr {
   }
 
   /**
-    * Pauses an auto-follow pattern
+    * Pause an auto-follow pattern. Pause a cross-cluster replication auto-follow pattern. When the API returns, the auto-follow pattern is inactive. New indices that are created on the remote cluster and match the auto-follow patterns are ignored. You can resume auto-following with the resume auto-follow pattern API. When it resumes, the auto-follow pattern is active again and automatically configures follower indices for newly created indices on the remote cluster that match its patterns. Remote indices that were created while the pattern was paused will also be followed, unless they have been deleted or closed in the interim.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-pause-auto-follow-pattern.html | Elasticsearch API documentation}
     */
   async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseAutoFollowPatternResponse>
@@ -260,13 +322,23 @@ export default class Ccr {
   async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrPauseAutoFollowPatternResponse>
   async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -284,7 +356,7 @@ export default class Ccr {
   }
 
   /**
-    * Pauses a follower index. The follower index will not fetch any additional operations from the leader index.
+    * Pause a follower. Pause a cross-cluster replication follower index. The follower index will not fetch any additional operations from the leader index. You can resume following with the resume follower API. You can pause and resume a follower index to change the configuration of the following task.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-pause-follow.html | Elasticsearch API documentation}
     */
   async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseFollowResponse>
@@ -292,13 +364,23 @@ export default class Ccr {
   async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<T.CcrPauseFollowResponse>
   async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -316,7 +398,7 @@ export default class Ccr {
   }
 
   /**
-    * Creates a new named collection of auto-follow patterns against a specified remote cluster. Newly created indices on the remote cluster matching any of the specified patterns will be automatically configured as follower indices.
+    * Create or update auto-follow patterns. Create a collection of cross-cluster replication auto-follow patterns for a remote cluster. Newly created indices on the remote cluster that match any of the patterns are automatically configured as follower indices. Indices on the remote cluster that were created before the auto-follow pattern was created will not be auto-followed even if they match the pattern. This API can also be used to update auto-follow patterns. NOTE: Follower indices that were configured automatically before updating an auto-follow pattern will remain unchanged even if they do not match against the new patterns.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-put-auto-follow-pattern.html | Elasticsearch API documentation}
     */
   async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPutAutoFollowPatternResponse>
@@ -325,16 +407,27 @@ export default class Ccr {
   async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     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> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -352,7 +445,7 @@ export default class Ccr {
   }
 
   /**
-    * Resumes an auto-follow pattern that has been paused
+    * Resume an auto-follow pattern. Resume a cross-cluster replication auto-follow pattern that was paused. The auto-follow pattern will resume configuring following indices for newly created indices that match its patterns on the remote cluster. Remote indices created while the pattern was paused will also be followed unless they have been deleted or closed in the interim.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-resume-auto-follow-pattern.html | Elasticsearch API documentation}
     */
   async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeAutoFollowPatternResponse>
@@ -360,13 +453,23 @@ export default class Ccr {
   async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrResumeAutoFollowPatternResponse>
   async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -384,7 +487,7 @@ export default class Ccr {
   }
 
   /**
-    * Resumes a follower index that has been paused
+    * Resume a follower. Resume a cross-cluster replication follower index that was paused. The follower index could have been paused with the pause follower API. Alternatively it could be paused due to replication that cannot be retried due to failures during following tasks. When this API returns, the follower index will resume fetching operations from the leader index.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-resume-follow.html | Elasticsearch API documentation}
     */
   async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeFollowResponse>
@@ -393,16 +496,27 @@ export default class Ccr {
   async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptions): Promise<any> {
     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> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -420,7 +534,7 @@ export default class Ccr {
   }
 
   /**
-    * Gets all stats related to cross-cluster replication.
+    * Get cross-cluster replication stats. This API returns stats about auto-following and the same shard-level stats as the get follower stats API.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-stats.html | Elasticsearch API documentation}
     */
   async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrStatsResponse>
@@ -428,14 +542,24 @@ export default class Ccr {
   async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptions): Promise<T.CcrStatsResponse>
   async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -450,7 +574,7 @@ export default class Ccr {
   }
 
   /**
-    * Stops the following task associated with a follower index and removes index metadata and settings associated with cross-cluster replication.
+    * Unfollow an index. Convert a cross-cluster replication follower index to a regular index. The API stops the following task associated with a follower index and removes index metadata and settings associated with cross-cluster replication. The follower index must be paused and closed before you call the unfollow API. NOTE: Currently cross-cluster replication does not support converting an existing regular index to a follower index. Converting a follower index to a regular index is an irreversible operation.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-unfollow.html | Elasticsearch API documentation}
     */
   async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrUnfollowResponse>
@@ -458,13 +582,23 @@ export default class Ccr {
   async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<T.CcrUnfollowResponse>
   async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/clear_scroll.ts

@@ -47,17 +47,28 @@ export default async function ClearScrollApi (this: That, params?: T.ClearScroll
 export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['scroll_id']
-  const querystring: Record<string, any> = {}
-  const body: Record<string, any> = {}
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   params = params ?? {}
   for (const key in params) {
     if (acceptedBody.includes(key)) {
+      body = body ?? {}
       // @ts-expect-error
       body[key] = params[key]
     } else if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/close_point_in_time.ts

@@ -47,16 +47,27 @@ export default async function ClosePointInTimeApi (this: That, params: T.ClosePo
 export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['id']
-  const querystring: Record<string, any> = {}
-  const body: Record<string, any> = {}
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   for (const key in params) {
     if (acceptedBody.includes(key)) {
+      body = body ?? {}
       // @ts-expect-error
       body[key] = params[key]
     } else if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/cluster.ts

@@ -53,17 +53,28 @@ export default class Cluster {
   async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['current_node', 'index', 'primary', 'shard']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -78,7 +89,7 @@ export default class Cluster {
   }
 
   /**
-    * Delete component templates. Deletes component templates. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases.
+    * Delete component templates. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
     */
   async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterDeleteComponentTemplateResponse>
@@ -86,13 +97,23 @@ export default class Cluster {
   async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteComponentTemplateResponse>
   async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -118,14 +139,24 @@ export default class Cluster {
   async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteVotingConfigExclusionsResponse>
   async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -148,13 +179,23 @@ export default class Cluster {
   async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterExistsComponentTemplateResponse>
   async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -172,7 +213,7 @@ export default class Cluster {
   }
 
   /**
-    * Get component templates. Retrieves information about component templates.
+    * Get component templates. Get information about component templates.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
     */
   async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterGetComponentTemplateResponse>
@@ -180,14 +221,24 @@ export default class Cluster {
   async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterGetComponentTemplateResponse>
   async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -220,14 +271,24 @@ export default class Cluster {
   async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<T.ClusterGetSettingsResponse>
   async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -250,14 +311,24 @@ export default class Cluster {
   async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptions): Promise<T.ClusterHealthResponse>
   async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -290,13 +361,23 @@ export default class Cluster {
   async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterInfoResponse>
   async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['target']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -322,14 +403,24 @@ export default class Cluster {
   async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<T.ClusterPendingTasksResponse>
   async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -352,14 +443,24 @@ export default class Cluster {
   async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterPostVotingConfigExclusionsResponse>
   async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -374,7 +475,7 @@ export default class Cluster {
   }
 
   /**
-    * Create or update a component template. Creates or updates a component template. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases. An index template can be composed of multiple component templates. To use a component template, specify it in an index template’s `composed_of` list. Component templates are only applied to new data streams and indices as part of a matching index template. Settings and mappings specified directly in the index template or the create index request override any settings or mappings specified in a component template. Component templates are only used during index creation. For data streams, this includes data stream creation and the creation of a stream’s backing indices. Changes to component templates do not affect existing indices, including a stream’s backing indices. You can use C-style `/* *\/` block comments in component templates. You can include comments anywhere in the request body except before the opening curly bracket.
+    * Create or update a component template. Component templates are building blocks for constructing index templates that specify index mappings, settings, and aliases. An index template can be composed of multiple component templates. To use a component template, specify it in an index template’s `composed_of` list. Component templates are only applied to new data streams and indices as part of a matching index template. Settings and mappings specified directly in the index template or the create index request override any settings or mappings specified in a component template. Component templates are only used during index creation. For data streams, this includes data stream creation and the creation of a stream’s backing indices. Changes to component templates do not affect existing indices, including a stream’s backing indices. You can use C-style `/* *\/` block comments in component templates. You can include comments anywhere in the request body except before the opening curly bracket. **Applying component templates** You cannot directly apply a component template to a data stream or index. To be applied, a component template must be included in an index template's `composed_of` list.
     * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
     */
   async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPutComponentTemplateResponse>
@@ -383,16 +484,27 @@ export default class Cluster {
   async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['template', 'version', '_meta', 'deprecated']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -419,17 +531,28 @@ export default class Cluster {
   async putSettings (this: That, params?: T.ClusterPutSettingsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['persistent', 'transient']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -452,14 +575,24 @@ export default class Cluster {
   async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterRemoteInfoResponse>
   async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -483,17 +616,28 @@ export default class Cluster {
   async reroute (this: That, params?: T.ClusterRerouteRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['commands']
-    const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -516,14 +660,24 @@ export default class Cluster {
   async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptions): Promise<T.ClusterStateResponse>
   async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['metric', 'index']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -560,14 +714,24 @@ export default class Cluster {
   async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptions): Promise<T.ClusterStatsResponse>
   async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['node_id']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/count.ts

@@ -38,7 +38,7 @@ import * as T from '../types'
 interface That { transport: Transport }
 
 /**
-  * Count search results. Get the number of documents matching a query.
+  * Count search results. Get the number of documents matching a query. The query can either be provided using a simple query string as a parameter or using the Query DSL defined within the request body. The latter must be nested in a `query` key, which is the same as the search API. The count API supports multi-target syntax. You can run a single count API search across multiple data streams and indices. The operation is broadcast across all shards. For each shard ID group, a replica is chosen and the search is run against it. This means that replicas increase the scalability of the count.
   * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html | Elasticsearch API documentation}
   */
 export default async function CountApi (this: That, params?: T.CountRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CountResponse>
@@ -47,17 +47,28 @@ export default async function CountApi (this: That, params?: T.CountRequest, opt
 export default async function CountApi (this: That, params?: T.CountRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['query']
-  const querystring: Record<string, any> = {}
-  const body: Record<string, any> = {}
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   params = params ?? {}
   for (const key in params) {
     if (acceptedBody.includes(key)) {
+      body = body ?? {}
       // @ts-expect-error
       body[key] = params[key]
     } else if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/dangling_indices.ts

@@ -45,20 +45,30 @@ export default class DanglingIndices {
 
   /**
     * Delete a dangling index. If Elasticsearch encounters index data that is absent from the current cluster state, those indices are considered to be dangling. For example, this can happen if you delete more than `cluster.indices.tombstones.size` indices while an Elasticsearch node is offline.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/dangling-index-delete.html | Elasticsearch API documentation}
     */
   async deleteDanglingIndex (this: That, params: T.DanglingIndicesDeleteDanglingIndexRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.DanglingIndicesDeleteDanglingIndexResponse>
   async deleteDanglingIndex (this: That, params: T.DanglingIndicesDeleteDanglingIndexRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.DanglingIndicesDeleteDanglingIndexResponse, unknown>>
   async deleteDanglingIndex (this: That, params: T.DanglingIndicesDeleteDanglingIndexRequest, options?: TransportRequestOptions): Promise<T.DanglingIndicesDeleteDanglingIndexResponse>
   async deleteDanglingIndex (this: That, params: T.DanglingIndicesDeleteDanglingIndexRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index_uuid']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -77,20 +87,30 @@ export default class DanglingIndices {
 
   /**
     * Import a dangling index. If Elasticsearch encounters index data that is absent from the current cluster state, those indices are considered to be dangling. For example, this can happen if you delete more than `cluster.indices.tombstones.size` indices while an Elasticsearch node is offline.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/dangling-index-import.html | Elasticsearch API documentation}
     */
   async importDanglingIndex (this: That, params: T.DanglingIndicesImportDanglingIndexRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.DanglingIndicesImportDanglingIndexResponse>
   async importDanglingIndex (this: That, params: T.DanglingIndicesImportDanglingIndexRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.DanglingIndicesImportDanglingIndexResponse, unknown>>
   async importDanglingIndex (this: That, params: T.DanglingIndicesImportDanglingIndexRequest, options?: TransportRequestOptions): Promise<T.DanglingIndicesImportDanglingIndexResponse>
   async importDanglingIndex (this: That, params: T.DanglingIndicesImportDanglingIndexRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index_uuid']
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -109,21 +129,31 @@ export default class DanglingIndices {
 
   /**
     * Get the dangling indices. If Elasticsearch encounters index data that is absent from the current cluster state, those indices are considered to be dangling. For example, this can happen if you delete more than `cluster.indices.tombstones.size` indices while an Elasticsearch node is offline. Use this API to list dangling indices, which you can then import or delete.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/dangling-indices-list.html | Elasticsearch API documentation}
     */
   async listDanglingIndices (this: That, params?: T.DanglingIndicesListDanglingIndicesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.DanglingIndicesListDanglingIndicesResponse>
   async listDanglingIndices (this: That, params?: T.DanglingIndicesListDanglingIndicesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.DanglingIndicesListDanglingIndicesResponse, unknown>>
   async listDanglingIndices (this: That, params?: T.DanglingIndicesListDanglingIndicesRequest, options?: TransportRequestOptions): Promise<T.DanglingIndicesListDanglingIndicesResponse>
   async listDanglingIndices (this: That, params?: T.DanglingIndicesListDanglingIndicesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
-    const querystring: Record<string, any> = {}
-    const body = undefined
+    const userQuery = params?.querystring
+    const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+    let body: Record<string, any> | string | undefined
+    const userBody = params?.body
+    if (userBody != null) {
+      if (typeof userBody === 'string') {
+        body = userBody
+      } else {
+        body = { ...userBody }
+      }
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body' && key !== 'querystring') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/delete.ts

@@ -38,7 +38,7 @@ import * as T from '../types'
 interface That { transport: Transport }
 
 /**
-  * Delete a document. Removes a JSON document from the specified index.
+  * Delete a document. Remove a JSON document from the specified index. NOTE: You cannot send deletion requests directly to a data stream. To delete a document in a data stream, you must target the backing index containing the document. **Optimistic concurrency control** Delete operations can be made conditional and only be performed if the last modification to the document was assigned the sequence number and primary term specified by the `if_seq_no` and `if_primary_term` parameters. If a mismatch is detected, the operation will result in a `VersionConflictException` and a status code of `409`. **Versioning** Each document indexed is versioned. When deleting a document, the version can be specified to make sure the relevant document you are trying to delete is actually being deleted and it has not changed in the meantime. Every write operation run on a document, deletes included, causes its version to be incremented. The version number of a deleted document remains available for a short time after deletion to allow for control of concurrent operations. The length of time for which a deleted document's version remains available is determined by the `index.gc_deletes` index setting. **Routing** If routing is used during indexing, the routing value also needs to be specified to delete a document. If the `_routing` mapping is set to `required` and no routing value is specified, the delete API throws a `RoutingMissingException` and rejects the request. For example: ``` DELETE /my-index-000001/_doc/1?routing=shard-1 ``` This request deletes the document with ID 1, but it is routed based on the user. The document is not deleted if the correct routing is not specified. **Distributed** The delete operation gets hashed into a specific shard ID. It then gets redirected into the primary shard within that ID group and replicated (if needed) to shard replicas within that ID group.
   * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html | Elasticsearch API documentation}
   */
 export default async function DeleteApi (this: That, params: T.DeleteRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.DeleteResponse>
@@ -46,13 +46,23 @@ export default async function DeleteApi (this: That, params: T.DeleteRequest, op
 export default async function DeleteApi (this: That, params: T.DeleteRequest, options?: TransportRequestOptions): Promise<T.DeleteResponse>
 export default async function DeleteApi (this: That, params: T.DeleteRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['id', 'index']
-  const querystring: Record<string, any> = {}
-  const body = undefined
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   for (const key in params) {
     if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/delete_by_query_rethrottle.ts

@@ -39,20 +39,30 @@ interface That { transport: Transport }
 
 /**
   * Throttle a delete by query operation. Change the number of requests per second for a particular delete by query operation. Rethrottling that speeds up the query takes effect immediately but rethrotting that slows down the query takes effect after completing the current batch to prevent scroll timeouts.
-  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html | Elasticsearch API documentation}
+  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html#docs-delete-by-query-rethrottle | Elasticsearch API documentation}
   */
 export default async function DeleteByQueryRethrottleApi (this: That, params: T.DeleteByQueryRethrottleRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.DeleteByQueryRethrottleResponse>
 export default async function DeleteByQueryRethrottleApi (this: That, params: T.DeleteByQueryRethrottleRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.DeleteByQueryRethrottleResponse, unknown>>
 export default async function DeleteByQueryRethrottleApi (this: That, params: T.DeleteByQueryRethrottleRequest, options?: TransportRequestOptions): Promise<T.DeleteByQueryRethrottleResponse>
 export default async function DeleteByQueryRethrottleApi (this: That, params: T.DeleteByQueryRethrottleRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['task_id']
-  const querystring: Record<string, any> = {}
-  const body = undefined
+  const userQuery = params?.querystring
+  const querystring: Record<string, any> = userQuery != null ? { ...userQuery } : {}
+
+  let body: Record<string, any> | string | undefined
+  const userBody = params?.body
+  if (userBody != null) {
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = { ...userBody }
+    }
+  }
 
   for (const key in params) {
     if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body' && key !== 'querystring') {
       // @ts-expect-error
       querystring[key] = params[key]
     }