Bump to 8.16.1 (#2478)

Co-authored-by: Marci W <333176+marciw@users.noreply.github.com>

.buildkite/pipeline.yml

@@ -25,7 +25,7 @@ steps:
       provider: "gcp"
       image: family/core-ubuntu-2204
     plugins:
-      - junit-annotate#v2.6.0:
+      - junit-annotate#v2.4.1:
           artifacts: "junit-output/junit-*.xml"
           job-uuid-file-pattern: "junit-(.*).xml"
           fail-build-on-error: true

.dockerignore

@@ -5,4 +5,3 @@ elasticsearch
 .git
 lib
 junit-output
-.tap

.github/make.sh

@@ -65,7 +65,7 @@ codegen)
   if [ -v "$VERSION" ] || [[ -z "$VERSION" ]]; then
     # fall back to branch name or `main` if no VERSION is set
     branch_name=$(git rev-parse --abbrev-ref HEAD)
-    if [[ "$branch_name" =~ ^[0-9]+\.([0-9]+|x) ]]; then
+    if [[ "$branch_name" =~ ^[0-9]+\.[0-9]+ ]]; then
       echo -e "\033[36;1mTARGET: codegen -> No VERSION argument found, using branch name: \`$branch_name\`\033[0m"
       VERSION="$branch_name"
     else
@@ -150,7 +150,7 @@ if [[ -z "${BUILDKITE+x}" ]] && [[ -z "${CI+x}" ]] && [[ -z "${GITHUB_ACTIONS+x}
     -u "$(id -u):$(id -g)" \
     --volume "$repo:/usr/src/elasticsearch-js" \
     --volume /usr/src/elasticsearch-js/node_modules \
-    --volume "$(realpath "$repo/../elastic-client-generator-js"):/usr/src/elastic-client-generator-js" \
+    --volume "$(realpath $repo/../elastic-client-generator-js):/usr/src/elastic-client-generator-js" \
     --env "WORKFLOW=$WORKFLOW" \
     --name make-elasticsearch-js \
     --rm \
@@ -159,14 +159,6 @@ if [[ -z "${BUILDKITE+x}" ]] && [[ -z "${CI+x}" ]] && [[ -z "${GITHUB_ACTIONS+x}
       node .buildkite/make.mjs --task $TASK ${TASK_ARGS[*]}"
 else
   echo -e "\033[34;1mINFO: Running in CI mode"
-
-  # determine branch to clone
-  GENERATOR_BRANCH="main"
-  if [[ "$VERSION" == 8.* ]]; then
-    GENERATOR_BRANCH="8.x"
-  fi
-  echo -e "\033[34;1mINFO: Generator branch: $GENERATOR_BRANCH"
-
   docker run \
     --volume "$repo:/usr/src/elasticsearch-js" \
     --volume /usr/src/elasticsearch-js/node_modules \
@@ -176,7 +168,7 @@ else
     --rm \
     $product \
     /bin/bash -c "cd /usr/src && \
-      git clone --branch $GENERATOR_BRANCH https://$CLIENTS_GITHUB_TOKEN@github.com/elastic/elastic-client-generator-js.git && \
+      git clone https://$CLIENTS_GITHUB_TOKEN@github.com/elastic/elastic-client-generator-js.git && \
       mkdir -p /usr/src/elastic-client-generator-js/output && \
       cd /usr/src/elasticsearch-js && \
       node .buildkite/make.mjs --task $TASK ${TASK_ARGS[*]}"

.github/stale.yml

@@ -0,0 +1,26 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 15
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "discussion"
+  - "feature request"
+  - "bug"
+  - "todo"
+  - "good first issue"
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: |
+  We understand that this might be important for you, but this issue has been automatically marked as stale because it has not had recent activity either from our end or yours.
+  It will be closed if no further activity occurs, please write a comment if you would like to keep this going.
+
+  Note: in the past months we have built a new client, that has just landed in master. If you want to open an issue or a pr for the legacy client, you should do that in https://github.com/elastic/elasticsearch-js-legacy
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/nodejs.yml

@@ -11,10 +11,10 @@ jobs:
     outputs:
       src-only: "${{ steps.changes.outputs.src-only }}"
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: dorny/paths-filter/@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+      - uses: dorny/paths-filter/@v3.0.2
         id: changes
         with:
           filters: |
@@ -36,12 +36,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -66,12 +66,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Use Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@v4
         with:
           node-version: 22.x
 
@@ -96,12 +96,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Use Bun
-        uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2
+        uses: oven-sh/setup-bun@v2
 
       - name: Install
         run: |
@@ -118,3 +118,13 @@ jobs:
       - name: ECMAScript module test
         run: |
           bun run test:esm
+
+  auto-approve:
+    name: Auto-approve
+    needs: [test, license]
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    if: github.actor == 'elasticmachine'
+    steps:
+      - uses: hmarr/auto-approve-action@v4

.github/workflows/npm-publish.yml

@@ -12,29 +12,26 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           ref: ${{ github.event.inputs.branch }}
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "22.x"
           registry-url: "https://registry.npmjs.org"
       - run: npm install -g npm
       - run: npm install
       - run: npm test
-      - run: npm publish --provenance --access public --tag alpha
+      - run: npm publish --provenance --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish version on GitHub
-        run: |
+      - run: |
           version=$(jq -r .version package.json)
           gh release create \
-            -n "This is a 9.0.0 pre-release alpha. Changes may not be stable." \
-            --latest=false \
-            --prerelease \
+            -n "[Changelog](https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/$BRANCH_NAME/changelog-client.html)" \
             --target "$BRANCH_NAME" \
-            --title "v$version" \
+            -t "v$version" \
             "v$version"
         env:
           BRANCH_NAME: ${{ github.event.inputs.branch }}

.github/workflows/serverless-patch.yml

@@ -26,14 +26,14 @@ jobs:
         )
       )
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           repository: elastic/elasticsearch-js
           ref: main
           path: stack
           fetch-depth: 0
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           repository: elastic/elasticsearch-serverless-js
@@ -42,7 +42,7 @@ jobs:
       - name: Apply patch from stack to serverless
         id: apply-patch
         run: $GITHUB_WORKSPACE/stack/.github/workflows/serverless-patch.sh
-      - uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
+      - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GH_TOKEN }}
           path: serverless

.github/workflows/stale.yml

@@ -1,21 +1,21 @@
 ---
-name: "Close stale issues and PRs"
+name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: "30 1 * * *"
+    - cron: '30 1 * * *'
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
+      - uses: actions/stale@v8
         with:
           stale-issue-label: stale
           stale-pr-label: stale
           days-before-stale: 90
           days-before-close: 14
-          exempt-issue-labels: "good first issue,tracking"
+          exempt-issue-labels: 'good first issue'
           close-issue-label: closed-stale
           close-pr-label: closed-stale
-          stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove the `stale` label, or leave a comment, or this will be closed in 14 days."
-          stale-pr-message: "This pull request is stale because it has been open 90 days with no activity. Remove the `stale` label, or leave a comment, or this will be closed in 14 days."
+          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove the `stale` label, or leave a comment, or this will be closed in 14 days.'
+          stale-pr-message: 'This pull request is stale because it has been open 90 days with no activity. Remove the `stale` label, or leave a comment, or this will be closed in 14 days.'

.gitignore

@@ -67,4 +67,3 @@ junit-output
 bun.lockb
 test-results
 processinfo
-.tap

.npmignore

@@ -73,4 +73,3 @@ CONTRIBUTING.md
 
 src
 bun.lockb
-.tap

catalog-info.yaml

@@ -42,9 +42,6 @@ spec:
         main:
           branch: "main"
           cronline: "@daily"
-        8_x:
-          branch: "8.x"
-          cronline: "@daily"
         8_14:
-          branch: "8.16"
+          branch: "8.14"
           cronline: "@daily"

docs/changelog.asciidoc

@@ -1,56 +1,6 @@
 [[changelog-client]]
 == Release notes
 
-[discrete]
-=== 9.0.0
-
-[discrete]
-==== Breaking changes
-
-[discrete]
-===== Drop support for deprecated `body` parameter
-
-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]
-=== 8.17.0
-
-[discrete]
-==== Features
-
-[discrete]
-===== Support for Elasticsearch `v8.17`
-
-You can find all the API changes
-https://www.elastic.co/guide/en/elasticsearch/reference/8.17/release-notes-8.17.0.html[here].
-
-[discrete]
-=== 8.16.3
-
-[discrete]
-==== Fixes
-
-[discrete]
-===== Improved support for Elasticsearch `v8.16`
-
-Updated TypeScript types based on fixes and improvements to the Elasticsearch specification.
-
-[discrete]
-=== 8.16.2
-
-[discrete]
-==== Fixes
-
-[discrete]
-===== Improved support for Elasticsearch `v8.16`
-
-Updated TypeScript types based on fixes and improvements to the Elasticsearch specification.
-
-[discrete]
-===== Drop testing artifacts from npm package
-
-Tap, the unit testing tool used by this project, was recently upgraded and started writing to a `.tap` directory. Since tests are run prior to an `npm publish` in CI, this directory was being included in the published package and bloating its size.
-
 [discrete]
 === 8.16.1
 
@@ -87,27 +37,11 @@ The ES|QL helper can now return results as an Apache Arrow `Table` or `RecordBat
 
 The client's `disablePrototypePoisoningProtection` option was set to `true` by default, but when it was set to any other value it was ignored, making it impossible to enable prototype poisoning protection without providing a custom serializer implementation.
 
-[discrete]
-=== 8.15.3
-
-[discrete]
-==== Fixes
-
-[discrete]
-===== Improved support for Elasticsearch `v8.15`
-
-Updated TypeScript types based on fixes and improvements to the Elasticsearch specification.
-
-[discrete]
-===== Drop testing artifacts from npm package
-
-Tap, the unit testing tool, was recently upgraded and started writing to a `.tap` directory. Since tests are run prior to an `npm publish` in CI, this directory was being included in the published package and bloating its size.
-
 [discrete]
 === 8.15.2
 
 [discrete]
-==== Fixes
+==== Features
 
 [discrete]
 ===== Improved support for Elasticsearch `v8.15`
@@ -118,7 +52,7 @@ Updated TypeScript types based on fixes and improvements to the Elasticsearch sp
 === 8.15.1
 
 [discrete]
-==== Fixes
+==== Features
 
 [discrete]
 ===== Improved support for Elasticsearch `v8.15`
@@ -679,7 +613,6 @@ ac.abort()
 ----
 
 [discrete]
-[[remove-body-key]]
 ===== Remove the body key from the request
 
 *Breaking: Yes* | *Migration effort: Small*

docs/doc_examples/015e6e6132b6d6d44bddb06bc3b316ed.asciidoc

@@ -1,46 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              range: {
-                year: {
-                  gt: 2023,
-                },
-              },
-            },
-          },
-        },
-        {
-          standard: {
-            query: {
-              term: {
-                topic: "elastic",
-              },
-            },
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  _source: false,
-  aggs: {
-    topics: {
-      terms: {
-        field: "topic",
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/0165d22da5f2fc7678392b31d8eb5566.asciidoc

@@ -1,18 +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.inference.put({
-  task_type: "rerank",
-  inference_id: "my-rerank-model",
-  inference_config: {
-    service: "cohere",
-    service_settings: {
-      model_id: "rerank-english-v3.0",
-      api_key: "{{COHERE_API_KEY}}",
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/0bc6155e0c88062a4d8490da49db3aa8.asciidoc

@@ -1,49 +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: "retrievers_example_nested",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              nested: {
-                path: "nested_field",
-                inner_hits: {
-                  name: "nested_vector",
-                  _source: false,
-                  fields: ["nested_field.paragraph_id"],
-                },
-                query: {
-                  knn: {
-                    field: "nested_field.nested_vector",
-                    query_vector: [1, 0, 0.5],
-                    k: 10,
-                  },
-                },
-              },
-            },
-          },
-        },
-        {
-          standard: {
-            query: {
-              term: {
-                topic: "ai",
-              },
-            },
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  _source: ["topic"],
-});
-console.log(response);
-----

docs/doc_examples/0bee07a581c5776e068f6f4efad5a399.asciidoc

@@ -3,12 +3,8 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_query/async",
-  querystring: {
-    format: "json",
-  },
+const response = await client.esql.asyncQuery({
+  format: "json",
   body: {
     query:
       "\n    FROM my-index-000001,cluster_one:my-index-000001,cluster_two:my-index*\n    | STATS COUNT(http.response.status_code) BY user.id\n    | LIMIT 2\n  ",

docs/doc_examples/0d689ac6e78be5d438f9b5d441be2b44.asciidoc

@@ -1,57 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              term: {
-                topic: "elastic",
-              },
-            },
-          },
-        },
-        {
-          rrf: {
-            retrievers: [
-              {
-                standard: {
-                  query: {
-                    query_string: {
-                      query:
-                        "(information retrieval) OR (artificial intelligence)",
-                      default_field: "text",
-                    },
-                  },
-                },
-              },
-              {
-                knn: {
-                  field: "vector",
-                  query_vector: [0.23, 0.67, 0.89],
-                  k: 3,
-                  num_candidates: 5,
-                },
-              },
-            ],
-            rank_window_size: 10,
-            rank_constant: 1,
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  _source: false,
-  size: 1,
-  explain: true,
-});
-console.log(response);
-----

docs/doc_examples/0dfde6a9d953822fd4b3aa0121ddd8fb.asciidoc

@@ -3,9 +3,8 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_application/search_application/my-app/_render_query",
+const response = await client.searchApplication.renderQuery({
+  name: "my-app",
   body: {
     params: {
       query_string: "my first query",

docs/doc_examples/16634cfa7916cf4e8048a1d70e6240f2.asciidoc

@@ -11,7 +11,7 @@ const response = await client.searchApplication.put({
       script: {
         lang: "mustache",
         source:
-          '\n        {\n          "query": {\n            "bool": {\n              "must": [\n              {{#query}}\n              {{/query}}\n            ],\n            "filter": {{#toJson}}_es_filters{{/toJson}}\n            }\n          },\n          "_source": {\n            "includes": ["title", "plot"]\n            },\n            "highlight": {\n              "fields": {\n                "title": { "fragment_size": 0 },\n                "plot": { "fragment_size": 200 }\n                }\n                },\n                "aggs": {{#toJson}}_es_aggs{{/toJson}},\n                "from": {{from}},\n                "size": {{size}},\n                "sort": {{#toJson}}_es_sort_fields{{/toJson}}\n                }\n                ',
+          '\n        {\n          "query": {\n            "bool": {\n              "must": [\n              {{#query}}\n                \n              {{/query}}\n            ],\n            "filter": {{#toJson}}_es_filters{{/toJson}}\n            }\n          },\n          "_source": {\n            "includes": ["title", "plot"]\n            },\n            "highlight": {\n              "fields": {\n                "title": { "fragment_size": 0 },\n                "plot": { "fragment_size": 200 }\n                }\n                },\n                "aggs": {{#toJson}}_es_aggs{{/toJson}},\n                "from": {{from}},\n                "size": {{size}},\n                "sort": {{#toJson}}_es_sort_fields{{/toJson}}\n                }\n                ',
         params: {
           query: "",
           _es_filters: {},

docs/doc_examples/17b1647c8509543f2388c886f2584a20.asciidoc

@@ -1,27 +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({
-  retriever: {
-    text_similarity_reranker: {
-      retriever: {
-        standard: {
-          query: {
-            match: {
-              text: "How often does the moon hide the sun?",
-            },
-          },
-        },
-      },
-      field: "text",
-      inference_id: "elastic-rerank",
-      inference_text: "How often does the moon hide the sun?",
-      rank_window_size: 100,
-      min_score: 0.5,
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/191074b2eebd5f74e628c2ada4b6d2e4.asciidoc

@@ -8,6 +8,11 @@ const response = await client.search({
   query: {
     bool: {
       must: [
+        {
+          term: {
+            "category.keyword": "Main Course",
+          },
+        },
         {
           term: {
             tags: "vegetarian",
@@ -22,11 +27,6 @@ const response = await client.search({
         },
       ],
       should: [
-        {
-          term: {
-            category: "Main Course",
-          },
-        },
         {
           multi_match: {
             query: "curry spicy",

docs/doc_examples/19c00c6b29bc7dbc5e92b3668da2da93.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_ingest/_simulate",
+const response = await client.simulate.ingest({
   body: {
     docs: [
       {

docs/doc_examples/19f1f9f25933f8e7aba59a10881c648b.asciidoc

@@ -9,6 +9,7 @@ const response = await client.indices.create({
     properties: {
       inference_field: {
         type: "semantic_text",
+        inference_id: "my-elser-endpoint",
       },
     },
   },

docs/doc_examples/2577acb462b95bd4394523cf2f8a661f.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.esql.query({
+  format: "txt",
+  query:
+    "\n      FROM library\n    | SORT page_count DESC\n    | KEEP name, author\n    | LOOKUP era ON author\n    | LIMIT 5\n  ",
+  tables: {
+    era: {
+      author: {
+        keyword: [
+          "Frank Herbert",
+          "Peter F. Hamilton",
+          "Vernor Vinge",
+          "Alastair Reynolds",
+          "James S.A. Corey",
+        ],
+      },
+      era: {
+        keyword: ["The New Wave", "Diamond", "Diamond", "Diamond", "Hadron"],
+      },
+    },
+  },
+});
+console.log(response);
+----

docs/doc_examples/2a1eece9a59ac1773edcf0a932c26de0.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/oidc/logout",
+const response = await client.security.oidcLogout({
   body: {
     token:
       "dGhpcyBpcyBub3QgYSByZWFsIHRva2VuIGJ1dCBpdCBpcyBvbmx5IHRlc3QgZGF0YS4gZG8gbm90IHRyeSB0byByZWFkIHRva2VuIQ==",

docs/doc_examples/2afdf0d83724953aa2875b5fb37d60cc.asciidoc

@@ -3,12 +3,10 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "GET",
-  path: "/_query/async/FmNJRUZ1YWZCU3dHY1BIOUhaenVSRkEaaXFlZ3h4c1RTWFNocDdnY2FSaERnUTozNDE=",
-  querystring: {
-    wait_for_completion_timeout: "30s",
-  },
+const response = await client.esql.asyncQueryGet({
+  id: "FmNJRUZ1YWZCU3dHY1BIOUhaenVSRkEaaXFlZ3h4c1RTWFNocDdnY2FSaERnUTozNDE=",
+  wait_for_completion_timeout: "30s",
+  body: null,
 });
 console.log(response);
 ----

docs/doc_examples/2bb41b0b4876ce98cd0cd8fb6d337f18.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.cluster.putSettings({
+  persistent: {
+    "cluster.indices.close.enable": false,
+    "indices.recovery.max_bytes_per_sec": "50mb",
+  },
+  transient: {
+    "*": null,
+  },
+});
+console.log(response);
+----

docs/doc_examples/2fd458d37aab509fe2d970c0b6e2a10f.asciidoc

@@ -45,7 +45,7 @@ console.log(response);
 
 const response1 = await client.indices.putIndexTemplate({
   name: 2,
-  index_patterns: ["k9s*"],
+  index_patterns: ["k8s*"],
   composed_of: ["destination_template"],
   data_stream: {},
 });

docs/doc_examples/30d051f534aeb884176eedb2c11dac85.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.inference.put({
-  task_type: "rerank",
-  inference_id: "my-elastic-rerank",
-  inference_config: {
-    service: "elasticsearch",
-    service_settings: {
-      model_id: ".rerank-v1",
-      num_threads: 1,
-      adaptive_allocations: {
-        enabled: true,
-        min_number_of_allocations: 1,
-        max_number_of_allocations: 4,
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/3f1fe5f5f99b98d0891f38003e10b636.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_query/async",
+const response = await client.esql.asyncQuery({
   body: {
     query:
       "\n    FROM library\n    | EVAL year = DATE_TRUNC(1 YEARS, release_date)\n    | STATS MAX(page_count) BY year\n    | SORT year\n    | LIMIT 5\n  ",

docs/doc_examples/405511f7c1f12cc0a227b4563fe7b2e2.asciidoc

@@ -3,9 +3,9 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "GET",
-  path: "/_query/async/FkpMRkJGS1gzVDRlM3g4ZzMyRGlLbkEaTXlJZHdNT09TU2VTZVBoNDM3cFZMUToxMDM=",
+const response = await client.esql.asyncQueryGet({
+  id: "FkpMRkJGS1gzVDRlM3g4ZzMyRGlLbkEaTXlJZHdNT09TU2VTZVBoNDM3cFZMUToxMDM=",
+  body: null,
 });
 console.log(response);
 ----

docs/doc_examples/4b91ad7c9b44e07db4a4e81390f19ad3.asciidoc

@@ -3,9 +3,9 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_inference/completion/openai-completion/_stream",
+const response = await client.inference.streamInference({
+  task_type: "completion",
+  inference_id: "openai-completion",
   body: {
     input: "What is Elastic?",
   },

docs/doc_examples/4dab4c5168047ba596af1beb0e55b845.asciidoc

@@ -3,8 +3,8 @@
 
 [source, js]
 ----
-const response = await client.indices.rollover({
-  alias: "datastream",
+const response = await client.cluster.getSettings({
+  flat_settings: "true",
 });
 console.log(response);
 ----

docs/doc_examples/53d9d2ec9cb8d211772d764e76fe6890.asciidoc

@@ -1,18 +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.ingest.simulate({
-  id: "query_helper_pipeline",
-  docs: [
-    {
-      _source: {
-        content:
-          "artificial intelligence in medicine articles published in the last 12 months",
-      },
-    },
-  ],
-});
-console.log(response);
-----

docs/doc_examples/57dc15e5ad663c342fd5c1d86fcd1b29.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/oidc/prepare",
+const response = await client.security.oidcPrepareAuthentication({
   body: {
     realm: "oidc1",
     state: "lGYK0EcSLjqH6pkT5EVZjC6eIW5YCGgywj2sxROO",

docs/doc_examples/58f6b72009512851843c7b7a20e9504a.asciidoc

@@ -4,7 +4,7 @@
 [source, js]
 ----
 const response = await client.indices.create({
-  index: "my-index-000003",
+  index: "my-index-000002",
   mappings: {
     properties: {
       inference_field: {

docs/doc_examples/5bba213a7f543190139d1a69ab2ed076.asciidoc

@@ -3,12 +3,8 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_query/async",
-  querystring: {
-    format: "json",
-  },
+const response = await client.esql.asyncQuery({
+  format: "json",
   body: {
     query:
       "\n    FROM cluster_one:my-index*,cluster_two:logs*\n    | STATS COUNT(http.response.status_code) BY user.id\n    | LIMIT 2\n  ",

docs/doc_examples/6b6fd0a5942dfb9762ad2790cf421a80.asciidoc

@@ -11,7 +11,7 @@ const response = await client.searchApplication.put({
       script: {
         lang: "mustache",
         source:
-          '\n        {\n          "query": {\n            "bool": {\n              "must": [\n              {{#query}}\n              {{/query}}\n            ],\n            "filter": {{#toJson}}_es_filters{{/toJson}}\n            }\n          },\n          "_source": {\n            "includes": ["title", "plot"]\n          },\n          "aggs": {{#toJson}}_es_aggs{{/toJson}},\n          "from": {{from}},\n          "size": {{size}},\n          "sort": {{#toJson}}_es_sort_fields{{/toJson}}\n        }\n      ',
+          '\n        {\n          "query": {\n            "bool": {\n              "must": [\n              {{#query}}\n                \n              {{/query}}\n            ],\n            "filter": {{#toJson}}_es_filters{{/toJson}}\n            }\n          },\n          "_source": {\n            "includes": ["title", "plot"]\n          },\n          "aggs": {{#toJson}}_es_aggs{{/toJson}},\n          "from": {{from}},\n          "size": {{size}},\n          "sort": {{#toJson}}_es_sort_fields{{/toJson}}\n        }\n      ',
         params: {
           query: "",
           _es_filters: {},

docs/doc_examples/6f3b723bf6179b96c3413597ed7f49e1.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/api_key/_bulk_update",
+const response = await client.security.bulkUpdateApiKeys({
   body: {
     ids: ["VuaCfGcBCdbkQm-e5aOx", "H3_AhoIBA9hmeQJdg7ij"],
   },

docs/doc_examples/76e02434835630cb830724beb92df354.asciidoc

@@ -1,44 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          knn: {
-            field: "vector",
-            query_vector: [0.23, 0.67, 0.89],
-            k: 3,
-            num_candidates: 5,
-          },
-        },
-        {
-          text_similarity_reranker: {
-            retriever: {
-              standard: {
-                query: {
-                  term: {
-                    topic: "ai",
-                  },
-                },
-              },
-            },
-            field: "text",
-            inference_id: "my-rerank-model",
-            inference_text:
-              "Can I use generative AI to identify user intent and improve search relevance?",
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/77518e8c6198acfe77c0934fd2fe65cb.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_text_structure/find_message_structure",
+const response = await client.textStructure.findMessageStructure({
   body: {
     messages: [
       "[2024-03-05T10:52:36,256][INFO ][o.a.l.u.VectorUtilPanamaProvider] [laptop] Java vector incubator API enabled; uses preferredBitSize=128",

docs/doc_examples/78043831fd32004a82930c8ac8a1d809.asciidoc

@@ -1,46 +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: "retrievers_example",
-  retriever: {
-    text_similarity_reranker: {
-      retriever: {
-        rrf: {
-          retrievers: [
-            {
-              standard: {
-                query: {
-                  query_string: {
-                    query:
-                      "(information retrieval) OR (artificial intelligence)",
-                    default_field: "text",
-                  },
-                },
-              },
-            },
-            {
-              knn: {
-                field: "vector",
-                query_vector: [0.23, 0.67, 0.89],
-                k: 3,
-                num_candidates: 5,
-              },
-            },
-          ],
-          rank_window_size: 10,
-          rank_constant: 1,
-        },
-      },
-      field: "text",
-      inference_id: "my-rerank-model",
-      inference_text:
-        "What are the state of the art applications of AI in information retrieval?",
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/79d206a528be704050a437adce2496dd.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.inference.put({
-  task_type: "rerank",
-  inference_id: "my-elastic-rerank",
-  inference_config: {
-    service: "elasticsearch",
-    service_settings: {
-      model_id: ".rerank-v1",
-      num_threads: 1,
-      adaptive_allocations: {
-        enabled: true,
-        min_number_of_allocations: 1,
-        max_number_of_allocations: 10,
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/7b9691bd34a02dd859562eb927f175e0.asciidoc

@@ -12,7 +12,7 @@ const response = await client.inference.put({
       adaptive_allocations: {
         enabled: true,
         min_number_of_allocations: 1,
-        max_number_of_allocations: 4,
+        max_number_of_allocations: 10,
       },
       num_threads: 1,
       model_id: ".elser_model_2",

docs/doc_examples/7ba29f0be2297b54a640b0a17d7ef5ca.asciidoc

@@ -1,11 +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.transport.request({
-  method: "DELETE",
-  path: "/_ingest/ip_location/database/my-database-id",
-});
-console.log(response);
-----

docs/doc_examples/80dd7f5882c59b9c1c90e8351937441f.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/api_key/_bulk_update",
+const response = await client.security.bulkUpdateApiKeys({
   body: {
     ids: ["VuaCfGcBCdbkQm-e5aOx", "H3_AhoIBA9hmeQJdg7ij"],
     role_descriptors: {

docs/doc_examples/91e106a2affbc8df32cd940684a779ed.asciidoc

@@ -1,17 +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.transport.request({
-  method: "PUT",
-  path: "/_ingest/ip_location/database/my-database-1",
-  body: {
-    name: "GeoIP2-Domain",
-    maxmind: {
-      account_id: "1234567",
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/931817b168e055ecf738785c721125dd.asciidoc

@@ -1,32 +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.ingest.putPipeline({
-  id: "query_helper_pipeline",
-  processors: [
-    {
-      script: {
-        source:
-          "ctx.prompt = 'Please generate an elasticsearch search query on index `articles_index` for the following natural language query. Dates are in the field `@timestamp`, document types are in the field `type` (options are `news`, `publication`), categories in the field `category` and can be multiple (options are `medicine`, `pharmaceuticals`, `technology`), and document names are in the field `title` which should use a fuzzy match. Ignore fields which cannot be determined from the natural language query context: ' + ctx.content",
-      },
-    },
-    {
-      inference: {
-        model_id: "openai_chat_completions",
-        input_output: {
-          input_field: "prompt",
-          output_field: "query",
-        },
-      },
-    },
-    {
-      remove: {
-        field: "prompt",
-      },
-    },
-  ],
-});
-console.log(response);
-----

docs/doc_examples/96e88611f99e6834bd64b58dc8a282c1.asciidoc

@@ -1,18 +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.create({
-  index: "my-index-000002",
-  mappings: {
-    properties: {
-      inference_field: {
-        type: "semantic_text",
-        inference_id: "my-openai-endpoint",
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/97c6c07f46f4177f0565a04bc50924a3.asciidoc

@@ -1,37 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              query_string: {
-                query: "(information retrieval) OR (artificial intelligence)",
-                default_field: "text",
-              },
-            },
-          },
-        },
-        {
-          knn: {
-            field: "vector",
-            query_vector: [0.23, 0.67, 0.89],
-            k: 3,
-            num_candidates: 5,
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/99fb82d49ac477e6a9dfdd71f9465374.asciidoc

@@ -1,11 +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.transport.request({
-  method: "DELETE",
-  path: "/_ingest/ip_location/database/example-database-id",
-});
-console.log(response);
-----

docs/doc_examples/9afa0844883b7471883aa378a8dd10b4.asciidoc

@@ -3,9 +3,9 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_application/analytics/my_analytics_collection/event/search_click",
+const response = await client.searchApplication.postBehavioralAnalyticsEvent({
+  collection_name: "my_analytics_collection",
+  event_type: "search_click",
   body: {
     session: {
       id: "1797ca95-91c9-4e2e-b1bd-9c38e6f386a9",

docs/doc_examples/9c01db07c9ac395b6370e3b33965c21f.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/oidc/authenticate",
+const response = await client.security.oidcAuthenticate({
   body: {
     redirect_uri:
       "https://oidc-kibana.elastic.co:5603/api/security/oidc/callback?code=jtI3Ntt8v3_XvcLzCFGq&state=4dbrihtIAt3wBTwo6DxK-vdk-sSyDBV8Yf0AjdkdT5I",

docs/doc_examples/a162eb50853331c80596f5994e9d1c38.asciidoc

@@ -3,9 +3,8 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_application/search_application/my_search_application/_render_query",
+const response = await client.searchApplication.renderQuery({
+  name: "my_search_application",
   body: {
     params: {
       query_string: "rock climbing",

docs/doc_examples/ac22cc2b0f4ad659055feed2852a2d59.asciidoc

@@ -1,37 +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: "retrievers_example",
-  retriever: {
-    text_similarity_reranker: {
-      retriever: {
-        text_similarity_reranker: {
-          retriever: {
-            knn: {
-              field: "vector",
-              query_vector: [0.23, 0.67, 0.89],
-              k: 3,
-              num_candidates: 5,
-            },
-          },
-          rank_window_size: 100,
-          field: "text",
-          inference_id: "my-rerank-model",
-          inference_text:
-            "What are the state of the art applications of AI in information retrieval?",
-        },
-      },
-      rank_window_size: 10,
-      field: "text",
-      inference_id: "my-other-more-expensive-rerank-model",
-      inference_text:
-        "Applications of Large Language Models in technology and their impact on user satisfaction",
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/b0bddf2ffaa83049b195829c06b875cd.asciidoc

@@ -3,9 +3,9 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_application/search_application/my_search_application/_render_query",
+const response = await client.searchApplication.renderQuery({
+  name: "my_search_application",
+  body: null,
 });
 console.log(response);
 ----

docs/doc_examples/b62eaa20c4e0e48134a6d1d1b3c30b26.asciidoc

@@ -208,13 +208,10 @@ const response = await client.bulk({
 });
 console.log(response);
 
-const response1 = await client.transport.request({
-  method: "GET",
-  path: "/_text_structure/find_field_structure",
-  querystring: {
-    index: "test-logs",
-    field: "message",
-  },
+const response1 = await client.textStructure.findFieldStructure({
+  index: "test-logs",
+  field: "message",
+  body: null,
 });
 console.log(response1);
 ----

docs/doc_examples/bb2ba5d1885f87506f90dbb002e518f4.asciidoc

@@ -1,45 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              query_string: {
-                query: "(information retrieval) OR (artificial intelligence)",
-                default_field: "text",
-              },
-            },
-          },
-        },
-        {
-          knn: {
-            field: "vector",
-            query_vector: [0.23, 0.67, 0.89],
-            k: 3,
-            num_candidates: 5,
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  highlight: {
-    fields: {
-      text: {
-        fragment_size: 150,
-        number_of_fragments: 3,
-      },
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/bcdfaa4487747249699a86a0dcd22f5e.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_ingest/_simulate",
+const response = await client.simulate.ingest({
   body: {
     docs: [
       {

docs/doc_examples/bee3fda7bb07086243424b62e5b16ca7.asciidoc

@@ -1,83 +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.create({
-  index: "retrievers_example_nested",
-  mappings: {
-    properties: {
-      nested_field: {
-        type: "nested",
-        properties: {
-          paragraph_id: {
-            type: "keyword",
-          },
-          nested_vector: {
-            type: "dense_vector",
-            dims: 3,
-            similarity: "l2_norm",
-            index: true,
-          },
-        },
-      },
-      topic: {
-        type: "keyword",
-      },
-    },
-  },
-});
-console.log(response);
-
-const response1 = await client.index({
-  index: "retrievers_example_nested",
-  id: 1,
-  document: {
-    nested_field: [
-      {
-        paragraph_id: "1a",
-        nested_vector: [-1.12, -0.59, 0.78],
-      },
-      {
-        paragraph_id: "1b",
-        nested_vector: [-0.12, 1.56, 0.42],
-      },
-      {
-        paragraph_id: "1c",
-        nested_vector: [1, -1, 0],
-      },
-    ],
-    topic: ["ai"],
-  },
-});
-console.log(response1);
-
-const response2 = await client.index({
-  index: "retrievers_example_nested",
-  id: 2,
-  document: {
-    nested_field: [
-      {
-        paragraph_id: "2a",
-        nested_vector: [0.23, 1.24, 0.65],
-      },
-    ],
-    topic: ["information_retrieval"],
-  },
-});
-console.log(response2);
-
-const response3 = await client.index({
-  index: "retrievers_example_nested",
-  id: 3,
-  document: {
-    topic: ["ai"],
-  },
-});
-console.log(response3);
-
-const response4 = await client.indices.refresh({
-  index: "retrievers_example_nested",
-});
-console.log(response4);
-----

docs/doc_examples/c02c2916b97b6fa7db82dbc7f0378310.asciidoc

@@ -16,7 +16,7 @@ const response = await client.search({
         },
       },
       field: "text",
-      inference_id: "my-elastic-rerank",
+      inference_id: "my-cohere-rerank-model",
       inference_text: "How often does the moon hide the sun?",
       rank_window_size: 100,
       min_score: 0.5,

docs/doc_examples/c580990a70028bb49cca8a6bde86bbf6.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/api_key/_bulk_update",
+const response = await client.security.bulkUpdateApiKeys({
   body: {
     ids: ["VuaCfGcBCdbkQm-e5aOx", "H3_AhoIBA9hmeQJdg7ij"],
     role_descriptors: {},

docs/doc_examples/c8fa8d7e029792d539464fede18ce258.asciidoc

@@ -9,6 +9,7 @@ const response = await client.indices.create({
     properties: {
       content: {
         type: "semantic_text",
+        inference_id: "my-elser-endpoint",
       },
     },
   },

docs/doc_examples/ccc613951c61f0b17e1ed8a2d3ae54a2.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_ingest/_simulate",
+const response = await client.simulate.ingest({
   body: {
     docs: [
       {

docs/doc_examples/d01a590fa9ea8a0cb34ed8dda502296c.asciidoc

@@ -3,9 +3,9 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "GET",
-  path: "/_ingest/ip_location/database/my-database-id",
+const response = await client.cluster.getSettings({
+  flat_settings: "true",
+  filter_path: "transient",
 });
 console.log(response);
 ----

docs/doc_examples/d29031409016b2b798148ef173a196ae.asciidoc

@@ -1,24 +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.create({
-  index: "test-index",
-  query: {
-    semantic: {
-      field: "my_semantic_field",
-    },
-  },
-  highlight: {
-    fields: {
-      my_semantic_field: {
-        type: "semantic",
-        number_of_fragments: 2,
-        order: "score",
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/d35c8cf7a98b3f112e1de8797ec6689d.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/oidc/prepare",
+const response = await client.security.oidcPrepareAuthentication({
   body: {
     iss: "http://127.0.0.1:8080",
     login_hint: "this_is_an_opaque_string",

docs/doc_examples/d4158d486e7fee2702a14068b69e3b33.asciidoc

@@ -1,154 +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.putIndexTemplate({
-  name: "datastream_template",
-  index_patterns: ["datastream*"],
-  data_stream: {},
-  template: {
-    lifecycle: {
-      downsampling: [
-        {
-          after: "1m",
-          fixed_interval: "1h",
-        },
-      ],
-    },
-    settings: {
-      index: {
-        mode: "time_series",
-      },
-    },
-    mappings: {
-      properties: {
-        "@timestamp": {
-          type: "date",
-        },
-        kubernetes: {
-          properties: {
-            container: {
-              properties: {
-                cpu: {
-                  properties: {
-                    usage: {
-                      properties: {
-                        core: {
-                          properties: {
-                            ns: {
-                              type: "long",
-                            },
-                          },
-                        },
-                        limit: {
-                          properties: {
-                            pct: {
-                              type: "float",
-                            },
-                          },
-                        },
-                        nanocores: {
-                          type: "long",
-                          time_series_metric: "gauge",
-                        },
-                        node: {
-                          properties: {
-                            pct: {
-                              type: "float",
-                            },
-                          },
-                        },
-                      },
-                    },
-                  },
-                },
-                memory: {
-                  properties: {
-                    available: {
-                      properties: {
-                        bytes: {
-                          type: "long",
-                          time_series_metric: "gauge",
-                        },
-                      },
-                    },
-                    majorpagefaults: {
-                      type: "long",
-                    },
-                    pagefaults: {
-                      type: "long",
-                      time_series_metric: "gauge",
-                    },
-                    rss: {
-                      properties: {
-                        bytes: {
-                          type: "long",
-                          time_series_metric: "gauge",
-                        },
-                      },
-                    },
-                    usage: {
-                      properties: {
-                        bytes: {
-                          type: "long",
-                          time_series_metric: "gauge",
-                        },
-                        limit: {
-                          properties: {
-                            pct: {
-                              type: "float",
-                            },
-                          },
-                        },
-                        node: {
-                          properties: {
-                            pct: {
-                              type: "float",
-                            },
-                          },
-                        },
-                      },
-                    },
-                    workingset: {
-                      properties: {
-                        bytes: {
-                          type: "long",
-                          time_series_metric: "gauge",
-                        },
-                      },
-                    },
-                  },
-                },
-                name: {
-                  type: "keyword",
-                },
-                start_time: {
-                  type: "date",
-                },
-              },
-            },
-            host: {
-              type: "keyword",
-              time_series_dimension: true,
-            },
-            namespace: {
-              type: "keyword",
-              time_series_dimension: true,
-            },
-            node: {
-              type: "keyword",
-              time_series_dimension: true,
-            },
-            pod: {
-              type: "keyword",
-              time_series_dimension: true,
-            },
-          },
-        },
-      },
-    },
-  },
-});
-console.log(response);
-----

docs/doc_examples/d4df39f72d3a3b80cd4042f6a21c3f19.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.transport.request({
-  method: "PUT",
-  path: "/_ingest/ip_location/database/my-database-2",
-  body: {
-    name: "standard_location",
-    ipinfo: {},
-  },
-});
-console.log(response);
-----

docs/doc_examples/dd71b0c9f9197684ff29c61062c55660.asciidoc

@@ -3,9 +3,6 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "GET",
-  path: "/_security/settings",
-});
+const response = await client.security.getSettings();
 console.log(response);
 ----

docs/doc_examples/e3019fd5f23458ae49ad9854c97d321c.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_security/oidc/prepare",
+const response = await client.security.oidcPrepareAuthentication({
   body: {
     realm: "oidc1",
   },

docs/doc_examples/e4b38973c74037335378d8480f1ce894.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_ingest/_simulate",
+const response = await client.simulate.ingest({
   body: {
     docs: [
       {

docs/doc_examples/e6f6d3aeea7ecea47cfd5c3d727f7004.asciidoc

@@ -1,44 +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: "retrievers_example",
-  retriever: {
-    rrf: {
-      retrievers: [
-        {
-          standard: {
-            query: {
-              query_string: {
-                query: "(information retrieval) OR (artificial intelligence)",
-                default_field: "text",
-              },
-            },
-          },
-        },
-        {
-          knn: {
-            field: "vector",
-            query_vector: [0.23, 0.67, 0.89],
-            k: 3,
-            num_candidates: 5,
-          },
-        },
-      ],
-      rank_window_size: 10,
-      rank_constant: 1,
-    },
-  },
-  collapse: {
-    field: "year",
-    inner_hits: {
-      name: "topic related documents",
-      _source: ["year"],
-    },
-  },
-  _source: false,
-});
-console.log(response);
-----

docs/doc_examples/ee05714a83d75fb6858e3b9fcbeb8f8b.asciidoc

@@ -1,94 +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.create({
-  index: "retrievers_example",
-  mappings: {
-    properties: {
-      vector: {
-        type: "dense_vector",
-        dims: 3,
-        similarity: "l2_norm",
-        index: true,
-      },
-      text: {
-        type: "text",
-      },
-      year: {
-        type: "integer",
-      },
-      topic: {
-        type: "keyword",
-      },
-    },
-  },
-});
-console.log(response);
-
-const response1 = await client.index({
-  index: "retrievers_example",
-  id: 1,
-  document: {
-    vector: [0.23, 0.67, 0.89],
-    text: "Large language models are revolutionizing information retrieval by boosting search precision, deepening contextual understanding, and reshaping user experiences in data-rich environments.",
-    year: 2024,
-    topic: ["llm", "ai", "information_retrieval"],
-  },
-});
-console.log(response1);
-
-const response2 = await client.index({
-  index: "retrievers_example",
-  id: 2,
-  document: {
-    vector: [0.12, 0.56, 0.78],
-    text: "Artificial intelligence is transforming medicine, from advancing diagnostics and tailoring treatment plans to empowering predictive patient care for improved health outcomes.",
-    year: 2023,
-    topic: ["ai", "medicine"],
-  },
-});
-console.log(response2);
-
-const response3 = await client.index({
-  index: "retrievers_example",
-  id: 3,
-  document: {
-    vector: [0.45, 0.32, 0.91],
-    text: "AI is redefining security by enabling advanced threat detection, proactive risk analysis, and dynamic defenses against increasingly sophisticated cyber threats.",
-    year: 2024,
-    topic: ["ai", "security"],
-  },
-});
-console.log(response3);
-
-const response4 = await client.index({
-  index: "retrievers_example",
-  id: 4,
-  document: {
-    vector: [0.34, 0.21, 0.98],
-    text: "Elastic introduces Elastic AI Assistant, the open, generative AI sidekick powered by ESRE to democratize cybersecurity and enable users of every skill level.",
-    year: 2023,
-    topic: ["ai", "elastic", "assistant"],
-  },
-});
-console.log(response4);
-
-const response5 = await client.index({
-  index: "retrievers_example",
-  id: 5,
-  document: {
-    vector: [0.11, 0.65, 0.47],
-    text: "Learn how to spin up a deployment of our hosted Elasticsearch Service and use Elastic Observability to gain deeper insight into the behavior of your applications and systems.",
-    year: 2024,
-    topic: ["documentation", "observability", "elastic"],
-  },
-});
-console.log(response5);
-
-const response6 = await client.indices.refresh({
-  index: "retrievers_example",
-});
-console.log(response6);
-----

docs/doc_examples/f6f647eb644a2d236637ff05f833cb73.asciidoc

@@ -3,9 +3,7 @@
 
 [source, js]
 ----
-const response = await client.transport.request({
-  method: "POST",
-  path: "/_connector/_secret",
+const response = await client.connector.secretPost({
   body: {
     value: "encoded_api_key",
   },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/elasticsearch",
-  "version": "9.0.0-alpha.1",
-  "versionCanary": "9.0.0-canary.0",
+  "version": "8.16.1",
+  "versionCanary": "8.16.1-canary.0",
   "description": "The official Elasticsearch client for Node.js",
   "main": "./index.js",
   "types": "index.d.ts",
@@ -56,38 +56,38 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@elastic/request-converter": "8.17.0",
-    "@sinonjs/fake-timers": "github:sinonjs/fake-timers#48f089f",
-    "@types/debug": "4.1.12",
-    "@types/ms": "0.7.34",
-    "@types/node": "22.10.1",
-    "@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",
-    "into-stream": "8.0.1",
-    "js-yaml": "4.1.0",
-    "license-checker": "25.0.1",
-    "minimist": "1.2.8",
-    "ms": "2.1.3",
-    "node-abort-controller": "3.1.1",
-    "node-fetch": "2.7.0",
-    "ora": "5.4.1",
-    "proxy": "1.0.2",
-    "rimraf": "3.0.2",
-    "semver": "7.6.3",
-    "split2": "4.2.0",
-    "stoppable": "1.1.0",
-    "tap": "21.0.1",
-    "ts-node": "10.9.2",
-    "ts-standard": "12.0.2",
-    "typescript": "5.7.2",
-    "workq": "3.0.0",
-    "xmlbuilder2": "3.1.1",
-    "zx": "7.2.3"
+    "@elastic/request-converter": "^8.16.1",
+    "@sinonjs/fake-timers": "github:sinonjs/fake-timers#0bfffc1",
+    "@types/debug": "^4.1.7",
+    "@types/ms": "^0.7.31",
+    "@types/node": "^18.19.55",
+    "@types/sinonjs__fake-timers": "^8.1.2",
+    "@types/split2": "^3.2.1",
+    "@types/stoppable": "^1.1.1",
+    "@types/tap": "^15.0.7",
+    "chai": "^4.3.7",
+    "cross-zip": "^4.0.0",
+    "desm": "^1.2.0",
+    "into-stream": "^7.0.0",
+    "js-yaml": "^4.1.0",
+    "license-checker": "^25.0.1",
+    "minimist": "^1.2.6",
+    "ms": "^2.1.3",
+    "node-abort-controller": "^3.0.1",
+    "node-fetch": "^2.6.7",
+    "ora": "^5.4.1",
+    "proxy": "^1.0.2",
+    "rimraf": "^3.0.2",
+    "semver": "^7.3.7",
+    "split2": "^4.1.0",
+    "stoppable": "^1.1.0",
+    "tap": "^21.0.1",
+    "ts-node": "^10.7.0",
+    "ts-standard": "^12.0.2",
+    "typescript": "^4.6.4",
+    "workq": "^3.0.0",
+    "xmlbuilder2": "^3.0.2",
+    "zx": "^7.2.2"
   },
   "dependencies": {
     "@elastic/transport": "^8.9.1",

renovate.json

@@ -1,29 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "local>elastic/renovate-config"
-  ],
-  "schedule": [
-    "* * * * 0"
-  ],
-  "packageRules": [
-    {
-      "matchDepTypes": [
-        "devDependencies"
-      ],
-      "automerge": true,
-      "labels": [
-        "backport 8.x"
-      ]
-    },
-    {
-      "matchPackageNames": [
-        "node"
-      ],
-      "matchManagers": [
-        "dockerfile"
-      ],
-      "enabled": 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

@@ -35,6 +35,7 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 export default class AsyncSearch {
@@ -45,12 +46,12 @@ export default class AsyncSearch {
 
   /**
     * Delete an async search. If the asynchronous search is still running, it is cancelled. Otherwise, the saved search results are deleted. If the Elasticsearch security features are enabled, the deletion of a specific async search is restricted to: the authenticated user that submitted the original search request; users that have the `cancel_task` cluster privilege.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/async-search.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/async-search.html | Elasticsearch API documentation}
     */
-  async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchDeleteResponse>
-  async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchDeleteResponse, unknown>>
-  async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchDeleteResponse>
-  async delete (this: That, params: T.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<any> {
+  async delete (this: That, params: T.AsyncSearchDeleteRequest | TB.AsyncSearchDeleteRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchDeleteResponse>
+  async delete (this: That, params: T.AsyncSearchDeleteRequest | TB.AsyncSearchDeleteRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchDeleteResponse, unknown>>
+  async delete (this: That, params: T.AsyncSearchDeleteRequest | TB.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchDeleteResponse>
+  async delete (this: That, params: T.AsyncSearchDeleteRequest | TB.AsyncSearchDeleteRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -58,7 +59,7 @@ export default class AsyncSearch {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -77,12 +78,12 @@ export default class AsyncSearch {
 
   /**
     * Get async search results. Retrieve the results of a previously submitted asynchronous search request. If the Elasticsearch security features are enabled, access to the results of a specific async search is restricted to the user or API key that submitted it.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/async-search.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/async-search.html | Elasticsearch API documentation}
     */
-  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
-  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchGetResponse<TDocument, TAggregations>, unknown>>
-  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> {
+  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
+  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchGetResponse<TDocument, TAggregations>, unknown>>
+  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchGetResponse<TDocument, TAggregations>>
+  async get<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params: T.AsyncSearchGetRequest | TB.AsyncSearchGetRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -90,7 +91,7 @@ export default class AsyncSearch {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -109,12 +110,12 @@ export default class AsyncSearch {
 
   /**
     * Get the async search status. Get the status of a previously submitted async search request given its identifier, without retrieving search results. If the Elasticsearch security features are enabled, use of this API is restricted to the `monitoring_user` role.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/async-search.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/async-search.html | Elasticsearch API documentation}
     */
-  async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchStatusResponse>
-  async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchStatusResponse, unknown>>
-  async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchStatusResponse>
-  async status (this: That, params: T.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<any> {
+  async status (this: That, params: T.AsyncSearchStatusRequest | TB.AsyncSearchStatusRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchStatusResponse>
+  async status (this: That, params: T.AsyncSearchStatusRequest | TB.AsyncSearchStatusRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchStatusResponse, unknown>>
+  async status (this: That, params: T.AsyncSearchStatusRequest | TB.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchStatusResponse>
+  async status (this: That, params: T.AsyncSearchStatusRequest | TB.AsyncSearchStatusRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -122,7 +123,7 @@ export default class AsyncSearch {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -141,21 +142,31 @@ export default class AsyncSearch {
 
   /**
     * Run an async search. When the primary sort of the results is an indexed field, shards get sorted based on minimum and maximum value that they hold for that field. Partial results become available following the sort criteria that was requested. Warning: Asynchronous search does not support scroll or search requests that include only the suggest section. By default, Elasticsearch does not allow you to store an async search response larger than 10Mb and an attempt to do this results in an error. The maximum allowed size for a stored async search response can be set by changing the `search.max_async_search_response_size` cluster level setting.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/async-search.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/async-search.html | Elasticsearch API documentation}
     */
-  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
-  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchSubmitResponse<TDocument, TAggregations>, unknown>>
-  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
-  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<any> {
+  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
+  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AsyncSearchSubmitResponse<TDocument, TAggregations>, unknown>>
+  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.AsyncSearchSubmitRequest, options?: TransportRequestOptions): Promise<T.AsyncSearchSubmitResponse<TDocument, TAggregations>>
+  async submit<TDocument = unknown, TAggregations = Record<T.AggregateName, T.AggregationsAggregate>> (this: That, params?: T.AsyncSearchSubmitRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
+        // @ts-expect-error
         if (key === 'sort' && typeof params[key] === 'string' && params[key].includes(':')) { // eslint-disable-line
+          // @ts-expect-error
           querystring[key] = params[key]
         } else {
           // @ts-expect-error
@@ -163,7 +174,7 @@ export default class AsyncSearch {
         }
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/autoscaling.ts

@@ -35,6 +35,7 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 export default class Autoscaling {
@@ -45,12 +46,12 @@ export default class Autoscaling {
 
   /**
     * Delete an autoscaling policy. NOTE: This feature is designed for indirect use by Elasticsearch Service, Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not supported.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/autoscaling-delete-autoscaling-policy.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/autoscaling-delete-autoscaling-policy.html | Elasticsearch API documentation}
     */
-  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingDeleteAutoscalingPolicyResponse>
-  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingDeleteAutoscalingPolicyResponse, unknown>>
-  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingDeleteAutoscalingPolicyResponse>
-  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
+  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest | TB.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingDeleteAutoscalingPolicyResponse>
+  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest | TB.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingDeleteAutoscalingPolicyResponse, unknown>>
+  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest | TB.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingDeleteAutoscalingPolicyResponse>
+  async deleteAutoscalingPolicy (this: That, params: T.AutoscalingDeleteAutoscalingPolicyRequest | TB.AutoscalingDeleteAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -58,7 +59,7 @@ export default class Autoscaling {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -77,12 +78,12 @@ export default class Autoscaling {
 
   /**
     * Get the autoscaling capacity. NOTE: This feature is designed for indirect use by Elasticsearch Service, Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not supported. This API gets the current autoscaling capacity based on the configured autoscaling policy. It will return information to size the cluster appropriately to the current workload. The `required_capacity` is calculated as the maximum of the `required_capacity` result of all individual deciders that are enabled for the policy. The operator should verify that the `current_nodes` match the operator’s knowledge of the cluster to avoid making autoscaling decisions based on stale or incomplete information. The response contains decider-specific information you can use to diagnose how and why autoscaling determined a certain capacity was required. This information is provided for diagnosis only. Do not use this information to make autoscaling decisions.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/autoscaling-get-autoscaling-capacity.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/autoscaling-get-autoscaling-capacity.html | Elasticsearch API documentation}
     */
-  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingGetAutoscalingCapacityResponse>
-  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingGetAutoscalingCapacityResponse, unknown>>
-  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingCapacityResponse>
-  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<any> {
+  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest | TB.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingGetAutoscalingCapacityResponse>
+  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest | TB.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingGetAutoscalingCapacityResponse, unknown>>
+  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest | TB.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingCapacityResponse>
+  async getAutoscalingCapacity (this: That, params?: T.AutoscalingGetAutoscalingCapacityRequest | TB.AutoscalingGetAutoscalingCapacityRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -91,7 +92,7 @@ export default class Autoscaling {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -107,12 +108,12 @@ export default class Autoscaling {
 
   /**
     * Get an autoscaling policy. NOTE: This feature is designed for indirect use by Elasticsearch Service, Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not supported.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/autoscaling-get-autoscaling-capacity.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/autoscaling-get-autoscaling-capacity.html | Elasticsearch API documentation}
     */
-  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingGetAutoscalingPolicyResponse>
-  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingGetAutoscalingPolicyResponse, unknown>>
-  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingPolicyResponse>
-  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
+  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest | TB.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingGetAutoscalingPolicyResponse>
+  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest | TB.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingGetAutoscalingPolicyResponse, unknown>>
+  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest | TB.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingGetAutoscalingPolicyResponse>
+  async getAutoscalingPolicy (this: That, params: T.AutoscalingGetAutoscalingPolicyRequest | TB.AutoscalingGetAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -120,7 +121,7 @@ export default class Autoscaling {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -139,16 +140,17 @@ export default class Autoscaling {
 
   /**
     * Create or update an autoscaling policy. NOTE: This feature is designed for indirect use by Elasticsearch Service, Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not supported.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/autoscaling-put-autoscaling-policy.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/autoscaling-put-autoscaling-policy.html | Elasticsearch API documentation}
     */
-  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingPutAutoscalingPolicyResponse>
-  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingPutAutoscalingPolicyResponse, unknown>>
-  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingPutAutoscalingPolicyResponse>
-  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
+  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest | TB.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.AutoscalingPutAutoscalingPolicyResponse>
+  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest | TB.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.AutoscalingPutAutoscalingPolicyResponse, unknown>>
+  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest | TB.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<T.AutoscalingPutAutoscalingPolicyResponse>
+  async putAutoscalingPolicy (this: That, params: T.AutoscalingPutAutoscalingPolicyRequest | TB.AutoscalingPutAutoscalingPolicyRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const acceptedBody: string[] = ['policy']
     const querystring: Record<string, any> = {}
-    let body: any
+    // @ts-expect-error
+    let body: any = params.body ?? undefined
 
     for (const key in params) {
       if (acceptedBody.includes(key)) {
@@ -156,7 +158,7 @@ export default class Autoscaling {
         body = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/bulk.ts

@@ -35,20 +35,22 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 /**
   * Bulk index or delete documents. Performs multiple indexing or delete operations in a single API call. This reduces overhead and can greatly increase indexing speed.
-  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html | Elasticsearch API documentation}
+  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/docs-bulk.html | Elasticsearch API documentation}
   */
-export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptionsWithOutMeta): Promise<T.BulkResponse>
-export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.BulkResponse, unknown>>
-export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptions): Promise<T.BulkResponse>
-export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptions): Promise<any> {
+export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument> | TB.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptionsWithOutMeta): Promise<T.BulkResponse>
+export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument> | TB.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.BulkResponse, unknown>>
+export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument> | TB.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptions): Promise<T.BulkResponse>
+export default async function BulkApi<TDocument = unknown, TPartialDocument = unknown> (this: That, params: T.BulkRequest<TDocument, TPartialDocument> | TB.BulkRequest<TDocument, TPartialDocument>, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = ['index']
   const acceptedBody: string[] = ['operations']
   const querystring: Record<string, any> = {}
-  let body: any
+  // @ts-expect-error
+  let body: any = params.body ?? undefined
 
   for (const key in params) {
     if (acceptedBody.includes(key)) {
@@ -56,7 +58,7 @@ export default async function BulkApi<TDocument = unknown, TPartialDocument = un
       body = params[key]
     } else if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/capabilities.ts

@@ -35,16 +35,17 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 /**
   * Checks if the specified combination of method, API, parameters, and arbitrary capabilities are supported
   * @see {@link https://github.com/elastic/elasticsearch/blob/main/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/README.asciidoc#require-or-skip-api-capabilities | Elasticsearch API documentation}
   */
-export default async function CapabilitiesApi (this: That, params?: T.TODO, options?: TransportRequestOptionsWithOutMeta): Promise<T.TODO>
-export default async function CapabilitiesApi (this: That, params?: T.TODO, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.TODO, unknown>>
-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> {
+export default async function CapabilitiesApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithOutMeta): Promise<T.TODO>
+export default async function CapabilitiesApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.TODO, unknown>>
+export default async function CapabilitiesApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<T.TODO>
+export default async function CapabilitiesApi (this: That, params?: T.TODO | TB.TODO, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
   const querystring: Record<string, any> = {}
   const body = undefined
@@ -53,7 +54,7 @@ export default async function CapabilitiesApi (this: That, params?: T.TODO, opti
   for (const key in params) {
     if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body') {
       querystring[key] = params[key]
     }
   }

src/api/api/cat.ts

@@ -35,6 +35,7 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 export default class Cat {
@@ -45,12 +46,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-alias.html | Elasticsearch API documentation}
     */
-  async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAliasesResponse>
-  async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatAliasesResponse, unknown>>
-  async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptions): Promise<T.CatAliasesResponse>
-  async aliases (this: That, params?: T.CatAliasesRequest, options?: TransportRequestOptions): Promise<any> {
+  async aliases (this: That, params?: T.CatAliasesRequest | TB.CatAliasesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAliasesResponse>
+  async aliases (this: That, params?: T.CatAliasesRequest | TB.CatAliasesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatAliasesResponse, unknown>>
+  async aliases (this: That, params?: T.CatAliasesRequest | TB.CatAliasesRequest, options?: TransportRequestOptions): Promise<T.CatAliasesResponse>
+  async aliases (this: That, params?: T.CatAliasesRequest | TB.CatAliasesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -59,7 +60,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -84,13 +85,13 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html | Elasticsearch API documentation}
+    * Provides 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/8.16/cat-allocation.html | Elasticsearch API documentation}
     */
-  async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAllocationResponse>
-  async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatAllocationResponse, unknown>>
-  async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptions): Promise<T.CatAllocationResponse>
-  async allocation (this: That, params?: T.CatAllocationRequest, options?: TransportRequestOptions): Promise<any> {
+  async allocation (this: That, params?: T.CatAllocationRequest | TB.CatAllocationRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatAllocationResponse>
+  async allocation (this: That, params?: T.CatAllocationRequest | TB.CatAllocationRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatAllocationResponse, unknown>>
+  async allocation (this: That, params?: T.CatAllocationRequest | TB.CatAllocationRequest, options?: TransportRequestOptions): Promise<T.CatAllocationResponse>
+  async allocation (this: That, params?: T.CatAllocationRequest | TB.CatAllocationRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['node_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -99,7 +100,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -125,12 +126,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-component-templates.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-component-templates.html | Elasticsearch API documentation}
     */
-  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatComponentTemplatesResponse>
-  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatComponentTemplatesResponse, unknown>>
-  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatComponentTemplatesResponse>
-  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
+  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest | TB.CatComponentTemplatesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatComponentTemplatesResponse>
+  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest | TB.CatComponentTemplatesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatComponentTemplatesResponse, unknown>>
+  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest | TB.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatComponentTemplatesResponse>
+  async componentTemplates (this: That, params?: T.CatComponentTemplatesRequest | TB.CatComponentTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -139,7 +140,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -165,12 +166,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-count.html | Elasticsearch API documentation}
     */
-  async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatCountResponse>
-  async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatCountResponse, unknown>>
-  async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptions): Promise<T.CatCountResponse>
-  async count (this: That, params?: T.CatCountRequest, options?: TransportRequestOptions): Promise<any> {
+  async count (this: That, params?: T.CatCountRequest | TB.CatCountRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatCountResponse>
+  async count (this: That, params?: T.CatCountRequest | TB.CatCountRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatCountResponse, unknown>>
+  async count (this: That, params?: T.CatCountRequest | TB.CatCountRequest, options?: TransportRequestOptions): Promise<T.CatCountResponse>
+  async count (this: That, params?: T.CatCountRequest | TB.CatCountRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -179,7 +180,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -204,13 +205,13 @@ export default class Cat {
   }
 
   /**
-    * Get field data cache information. Get the amount of heap memory currently used by the field data cache on every data node in the 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 nodes stats API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html | Elasticsearch API documentation}
+    * Returns the amount of heap memory currently used by the field data cache on every data node in the 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 nodes stats API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-fielddata.html | Elasticsearch API documentation}
     */
-  async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatFielddataResponse>
-  async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatFielddataResponse, unknown>>
-  async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptions): Promise<T.CatFielddataResponse>
-  async fielddata (this: That, params?: T.CatFielddataRequest, options?: TransportRequestOptions): Promise<any> {
+  async fielddata (this: That, params?: T.CatFielddataRequest | TB.CatFielddataRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatFielddataResponse>
+  async fielddata (this: That, params?: T.CatFielddataRequest | TB.CatFielddataRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatFielddataResponse, unknown>>
+  async fielddata (this: That, params?: T.CatFielddataRequest | TB.CatFielddataRequest, options?: TransportRequestOptions): Promise<T.CatFielddataResponse>
+  async fielddata (this: That, params?: T.CatFielddataRequest | TB.CatFielddataRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['fields']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -219,7 +220,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -244,13 +245,13 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html | Elasticsearch API documentation}
+    * Returns the health status of a cluster, similar to the cluster health API. 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/8.16/cat-health.html | Elasticsearch API documentation}
     */
-  async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHealthResponse>
-  async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatHealthResponse, unknown>>
-  async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptions): Promise<T.CatHealthResponse>
-  async health (this: That, params?: T.CatHealthRequest, options?: TransportRequestOptions): Promise<any> {
+  async health (this: That, params?: T.CatHealthRequest | TB.CatHealthRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHealthResponse>
+  async health (this: That, params?: T.CatHealthRequest | TB.CatHealthRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatHealthResponse, unknown>>
+  async health (this: That, params?: T.CatHealthRequest | TB.CatHealthRequest, options?: TransportRequestOptions): Promise<T.CatHealthResponse>
+  async health (this: That, params?: T.CatHealthRequest | TB.CatHealthRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -259,7 +260,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -275,12 +276,12 @@ export default class Cat {
 
   /**
     * Get CAT help. Returns help for the CAT APIs.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat.html | Elasticsearch API documentation}
     */
-  async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHelpResponse>
-  async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatHelpResponse, unknown>>
-  async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptions): Promise<T.CatHelpResponse>
-  async help (this: That, params?: T.CatHelpRequest, options?: TransportRequestOptions): Promise<any> {
+  async help (this: That, params?: T.CatHelpRequest | TB.CatHelpRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatHelpResponse>
+  async help (this: That, params?: T.CatHelpRequest | TB.CatHelpRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatHelpResponse, unknown>>
+  async help (this: That, params?: T.CatHelpRequest | TB.CatHelpRequest, options?: TransportRequestOptions): Promise<T.CatHelpResponse>
+  async help (this: That, params?: T.CatHelpRequest | TB.CatHelpRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -289,7 +290,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -305,12 +306,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-indices.html | Elasticsearch API documentation}
     */
-  async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatIndicesResponse>
-  async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatIndicesResponse, unknown>>
-  async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptions): Promise<T.CatIndicesResponse>
-  async indices (this: That, params?: T.CatIndicesRequest, options?: TransportRequestOptions): Promise<any> {
+  async indices (this: That, params?: T.CatIndicesRequest | TB.CatIndicesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatIndicesResponse>
+  async indices (this: That, params?: T.CatIndicesRequest | TB.CatIndicesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatIndicesResponse, unknown>>
+  async indices (this: That, params?: T.CatIndicesRequest | TB.CatIndicesRequest, options?: TransportRequestOptions): Promise<T.CatIndicesResponse>
+  async indices (this: That, params?: T.CatIndicesRequest | TB.CatIndicesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -319,7 +320,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -344,13 +345,13 @@ export default class Cat {
   }
 
   /**
-    * Get master node information. Get information about the master node, including the ID, bound IP address, and name. 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 nodes info API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html | Elasticsearch API documentation}
+    * Returns information about the master node, including the ID, bound IP address, and name. 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 nodes info API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-master.html | Elasticsearch API documentation}
     */
-  async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMasterResponse>
-  async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMasterResponse, unknown>>
-  async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptions): Promise<T.CatMasterResponse>
-  async master (this: That, params?: T.CatMasterRequest, options?: TransportRequestOptions): Promise<any> {
+  async master (this: That, params?: T.CatMasterRequest | TB.CatMasterRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMasterResponse>
+  async master (this: That, params?: T.CatMasterRequest | TB.CatMasterRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMasterResponse, unknown>>
+  async master (this: That, params?: T.CatMasterRequest | TB.CatMasterRequest, options?: TransportRequestOptions): Promise<T.CatMasterResponse>
+  async master (this: That, params?: T.CatMasterRequest | TB.CatMasterRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -359,7 +360,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -375,12 +376,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-dfanalytics.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-dfanalytics.html | Elasticsearch API documentation}
     */
-  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDataFrameAnalyticsResponse>
-  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlDataFrameAnalyticsResponse, unknown>>
-  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<T.CatMlDataFrameAnalyticsResponse>
-  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<any> {
+  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest | TB.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDataFrameAnalyticsResponse>
+  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest | TB.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlDataFrameAnalyticsResponse, unknown>>
+  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest | TB.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<T.CatMlDataFrameAnalyticsResponse>
+  async mlDataFrameAnalytics (this: That, params?: T.CatMlDataFrameAnalyticsRequest | TB.CatMlDataFrameAnalyticsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -389,7 +390,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -415,12 +416,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-datafeeds.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-datafeeds.html | Elasticsearch API documentation}
     */
-  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDatafeedsResponse>
-  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlDatafeedsResponse, unknown>>
-  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<T.CatMlDatafeedsResponse>
-  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<any> {
+  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest | TB.CatMlDatafeedsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlDatafeedsResponse>
+  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest | TB.CatMlDatafeedsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlDatafeedsResponse, unknown>>
+  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest | TB.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<T.CatMlDatafeedsResponse>
+  async mlDatafeeds (this: That, params?: T.CatMlDatafeedsRequest | TB.CatMlDatafeedsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['datafeed_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -429,7 +430,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -455,12 +456,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-anomaly-detectors.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-anomaly-detectors.html | Elasticsearch API documentation}
     */
-  async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlJobsResponse>
-  async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlJobsResponse, unknown>>
-  async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptions): Promise<T.CatMlJobsResponse>
-  async mlJobs (this: That, params?: T.CatMlJobsRequest, options?: TransportRequestOptions): Promise<any> {
+  async mlJobs (this: That, params?: T.CatMlJobsRequest | TB.CatMlJobsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlJobsResponse>
+  async mlJobs (this: That, params?: T.CatMlJobsRequest | TB.CatMlJobsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlJobsResponse, unknown>>
+  async mlJobs (this: That, params?: T.CatMlJobsRequest | TB.CatMlJobsRequest, options?: TransportRequestOptions): Promise<T.CatMlJobsResponse>
+  async mlJobs (this: That, params?: T.CatMlJobsRequest | TB.CatMlJobsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['job_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -469,7 +470,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -495,12 +496,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-trained-model.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-trained-model.html | Elasticsearch API documentation}
     */
-  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlTrainedModelsResponse>
-  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlTrainedModelsResponse, unknown>>
-  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<T.CatMlTrainedModelsResponse>
-  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<any> {
+  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest | TB.CatMlTrainedModelsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatMlTrainedModelsResponse>
+  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest | TB.CatMlTrainedModelsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatMlTrainedModelsResponse, unknown>>
+  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest | TB.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<T.CatMlTrainedModelsResponse>
+  async mlTrainedModels (this: That, params?: T.CatMlTrainedModelsRequest | TB.CatMlTrainedModelsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['model_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -509,7 +510,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -534,13 +535,13 @@ export default class Cat {
   }
 
   /**
-    * Get node attribute information. Get information about custom node attributes. 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 nodes info API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html | Elasticsearch API documentation}
+    * Returns information about custom node attributes. 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 nodes info API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-nodeattrs.html | Elasticsearch API documentation}
     */
-  async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatNodeattrsResponse>
-  async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatNodeattrsResponse, unknown>>
-  async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<T.CatNodeattrsResponse>
-  async nodeattrs (this: That, params?: T.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<any> {
+  async nodeattrs (this: That, params?: T.CatNodeattrsRequest | TB.CatNodeattrsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatNodeattrsResponse>
+  async nodeattrs (this: That, params?: T.CatNodeattrsRequest | TB.CatNodeattrsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatNodeattrsResponse, unknown>>
+  async nodeattrs (this: That, params?: T.CatNodeattrsRequest | TB.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<T.CatNodeattrsResponse>
+  async nodeattrs (this: That, params?: T.CatNodeattrsRequest | TB.CatNodeattrsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -549,7 +550,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -564,13 +565,13 @@ export default class Cat {
   }
 
   /**
-    * Get node information. Get information about the nodes in a 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 nodes info API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html | Elasticsearch API documentation}
+    * Returns information about the nodes in a 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 nodes info API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-nodes.html | Elasticsearch API documentation}
     */
-  async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatNodesResponse>
-  async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatNodesResponse, unknown>>
-  async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptions): Promise<T.CatNodesResponse>
-  async nodes (this: That, params?: T.CatNodesRequest, options?: TransportRequestOptions): Promise<any> {
+  async nodes (this: That, params?: T.CatNodesRequest | TB.CatNodesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatNodesResponse>
+  async nodes (this: That, params?: T.CatNodesRequest | TB.CatNodesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatNodesResponse, unknown>>
+  async nodes (this: That, params?: T.CatNodesRequest | TB.CatNodesRequest, options?: TransportRequestOptions): Promise<T.CatNodesResponse>
+  async nodes (this: That, params?: T.CatNodesRequest | TB.CatNodesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -579,7 +580,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -594,13 +595,13 @@ export default class Cat {
   }
 
   /**
-    * Get pending task information. Get information about cluster-level changes that have not yet taken effect. 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 pending cluster tasks API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html | Elasticsearch API documentation}
+    * Returns cluster-level changes that have not yet been executed. 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 pending cluster tasks API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-pending-tasks.html | Elasticsearch API documentation}
     */
-  async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatPendingTasksResponse>
-  async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatPendingTasksResponse, unknown>>
-  async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<T.CatPendingTasksResponse>
-  async pendingTasks (this: That, params?: T.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
+  async pendingTasks (this: That, params?: T.CatPendingTasksRequest | TB.CatPendingTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatPendingTasksResponse>
+  async pendingTasks (this: That, params?: T.CatPendingTasksRequest | TB.CatPendingTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatPendingTasksResponse, unknown>>
+  async pendingTasks (this: That, params?: T.CatPendingTasksRequest | TB.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<T.CatPendingTasksResponse>
+  async pendingTasks (this: That, params?: T.CatPendingTasksRequest | TB.CatPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -609,7 +610,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -624,13 +625,13 @@ export default class Cat {
   }
 
   /**
-    * Get plugin information. Get a list of plugins running on each node of a 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 nodes info API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html | Elasticsearch API documentation}
+    * Returns a list of plugins running on each node of a 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 nodes info API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-plugins.html | Elasticsearch API documentation}
     */
-  async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatPluginsResponse>
-  async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatPluginsResponse, unknown>>
-  async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptions): Promise<T.CatPluginsResponse>
-  async plugins (this: That, params?: T.CatPluginsRequest, options?: TransportRequestOptions): Promise<any> {
+  async plugins (this: That, params?: T.CatPluginsRequest | TB.CatPluginsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatPluginsResponse>
+  async plugins (this: That, params?: T.CatPluginsRequest | TB.CatPluginsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatPluginsResponse, unknown>>
+  async plugins (this: That, params?: T.CatPluginsRequest | TB.CatPluginsRequest, options?: TransportRequestOptions): Promise<T.CatPluginsResponse>
+  async plugins (this: That, params?: T.CatPluginsRequest | TB.CatPluginsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -639,7 +640,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -654,13 +655,13 @@ export default class Cat {
   }
 
   /**
-    * Get shard recovery information. Get information about ongoing and completed shard recoveries. Shard recovery is the process of initializing a shard copy, such as restoring a primary shard from a snapshot or syncing a replica shard from a primary shard. When a shard recovery completes, the recovered shard is available for search and indexing. For data streams, the API returns information about the stream’s backing indices. 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 index recovery API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html | Elasticsearch API documentation}
+    * Returns information about ongoing and completed shard recoveries. Shard recovery is the process of initializing a shard copy, such as restoring a primary shard from a snapshot or syncing a replica shard from a primary shard. When a shard recovery completes, the recovered shard is available for search and indexing. For data streams, the API returns information about the stream’s backing indices. 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 index recovery API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-recovery.html | Elasticsearch API documentation}
     */
-  async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatRecoveryResponse>
-  async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatRecoveryResponse, unknown>>
-  async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptions): Promise<T.CatRecoveryResponse>
-  async recovery (this: That, params?: T.CatRecoveryRequest, options?: TransportRequestOptions): Promise<any> {
+  async recovery (this: That, params?: T.CatRecoveryRequest | TB.CatRecoveryRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatRecoveryResponse>
+  async recovery (this: That, params?: T.CatRecoveryRequest | TB.CatRecoveryRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatRecoveryResponse, unknown>>
+  async recovery (this: That, params?: T.CatRecoveryRequest | TB.CatRecoveryRequest, options?: TransportRequestOptions): Promise<T.CatRecoveryResponse>
+  async recovery (this: That, params?: T.CatRecoveryRequest | TB.CatRecoveryRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -669,7 +670,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -694,13 +695,13 @@ export default class Cat {
   }
 
   /**
-    * Get snapshot repository information. Get a list of snapshot repositories for a 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 repository API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html | Elasticsearch API documentation}
+    * Returns the snapshot repositories for a 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 repository API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-repositories.html | Elasticsearch API documentation}
     */
-  async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatRepositoriesResponse>
-  async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatRepositoriesResponse, unknown>>
-  async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<T.CatRepositoriesResponse>
-  async repositories (this: That, params?: T.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<any> {
+  async repositories (this: That, params?: T.CatRepositoriesRequest | TB.CatRepositoriesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatRepositoriesResponse>
+  async repositories (this: That, params?: T.CatRepositoriesRequest | TB.CatRepositoriesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatRepositoriesResponse, unknown>>
+  async repositories (this: That, params?: T.CatRepositoriesRequest | TB.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<T.CatRepositoriesResponse>
+  async repositories (this: That, params?: T.CatRepositoriesRequest | TB.CatRepositoriesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -709,7 +710,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -724,13 +725,13 @@ export default class Cat {
   }
 
   /**
-    * Get segment information. Get low-level information about the Lucene segments in index shards. For data streams, the API returns information about the backing indices. 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 index segments API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html | Elasticsearch API documentation}
+    * Returns low-level information about the Lucene segments in index shards. For data streams, the API returns information about the backing indices. 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 index segments API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-segments.html | Elasticsearch API documentation}
     */
-  async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatSegmentsResponse>
-  async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatSegmentsResponse, unknown>>
-  async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptions): Promise<T.CatSegmentsResponse>
-  async segments (this: That, params?: T.CatSegmentsRequest, options?: TransportRequestOptions): Promise<any> {
+  async segments (this: That, params?: T.CatSegmentsRequest | TB.CatSegmentsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatSegmentsResponse>
+  async segments (this: That, params?: T.CatSegmentsRequest | TB.CatSegmentsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatSegmentsResponse, unknown>>
+  async segments (this: That, params?: T.CatSegmentsRequest | TB.CatSegmentsRequest, options?: TransportRequestOptions): Promise<T.CatSegmentsResponse>
+  async segments (this: That, params?: T.CatSegmentsRequest | TB.CatSegmentsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -739,7 +740,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -764,13 +765,13 @@ export default class Cat {
   }
 
   /**
-    * Get shard information. Get information about the shards in a cluster. For data streams, the API returns information about the backing indices. 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-shards.html | Elasticsearch API documentation}
+    * Returns information about the shards in a cluster. For data streams, the API returns information about the backing indices. 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/8.16/cat-shards.html | Elasticsearch API documentation}
     */
-  async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatShardsResponse>
-  async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatShardsResponse, unknown>>
-  async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptions): Promise<T.CatShardsResponse>
-  async shards (this: That, params?: T.CatShardsRequest, options?: TransportRequestOptions): Promise<any> {
+  async shards (this: That, params?: T.CatShardsRequest | TB.CatShardsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatShardsResponse>
+  async shards (this: That, params?: T.CatShardsRequest | TB.CatShardsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatShardsResponse, unknown>>
+  async shards (this: That, params?: T.CatShardsRequest | TB.CatShardsRequest, options?: TransportRequestOptions): Promise<T.CatShardsResponse>
+  async shards (this: That, params?: T.CatShardsRequest | TB.CatShardsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -779,7 +780,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -804,13 +805,13 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html | Elasticsearch API documentation}
+    * Returns 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/8.16/cat-snapshots.html | Elasticsearch API documentation}
     */
-  async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatSnapshotsResponse>
-  async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatSnapshotsResponse, unknown>>
-  async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<T.CatSnapshotsResponse>
-  async snapshots (this: That, params?: T.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<any> {
+  async snapshots (this: That, params?: T.CatSnapshotsRequest | TB.CatSnapshotsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatSnapshotsResponse>
+  async snapshots (this: That, params?: T.CatSnapshotsRequest | TB.CatSnapshotsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatSnapshotsResponse, unknown>>
+  async snapshots (this: That, params?: T.CatSnapshotsRequest | TB.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<T.CatSnapshotsResponse>
+  async snapshots (this: That, params?: T.CatSnapshotsRequest | TB.CatSnapshotsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['repository']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -819,7 +820,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -844,13 +845,13 @@ export default class Cat {
   }
 
   /**
-    * Get task information. Get information about tasks currently running in the 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 task management API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html | Elasticsearch API documentation}
+    * Returns information about tasks currently executing in the 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 task management API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/tasks.html | Elasticsearch API documentation}
     */
-  async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTasksResponse>
-  async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTasksResponse, unknown>>
-  async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptions): Promise<T.CatTasksResponse>
-  async tasks (this: That, params?: T.CatTasksRequest, options?: TransportRequestOptions): Promise<any> {
+  async tasks (this: That, params?: T.CatTasksRequest | TB.CatTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTasksResponse>
+  async tasks (this: That, params?: T.CatTasksRequest | TB.CatTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTasksResponse, unknown>>
+  async tasks (this: That, params?: T.CatTasksRequest | TB.CatTasksRequest, options?: TransportRequestOptions): Promise<T.CatTasksResponse>
+  async tasks (this: That, params?: T.CatTasksRequest | TB.CatTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -859,7 +860,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -874,13 +875,13 @@ export default class Cat {
   }
 
   /**
-    * Get index template information. Get information about the index templates in a cluster. You can use index templates to apply index settings and field mappings to new indices at creation. 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 index template API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html | Elasticsearch API documentation}
+    * Returns information about index templates in a cluster. You can use index templates to apply index settings and field mappings to new indices at creation. 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 index template API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-templates.html | Elasticsearch API documentation}
     */
-  async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTemplatesResponse>
-  async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTemplatesResponse, unknown>>
-  async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatTemplatesResponse>
-  async templates (this: That, params?: T.CatTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
+  async templates (this: That, params?: T.CatTemplatesRequest | TB.CatTemplatesRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTemplatesResponse>
+  async templates (this: That, params?: T.CatTemplatesRequest | TB.CatTemplatesRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTemplatesResponse, unknown>>
+  async templates (this: That, params?: T.CatTemplatesRequest | TB.CatTemplatesRequest, options?: TransportRequestOptions): Promise<T.CatTemplatesResponse>
+  async templates (this: That, params?: T.CatTemplatesRequest | TB.CatTemplatesRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -889,7 +890,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -914,13 +915,13 @@ export default class Cat {
   }
 
   /**
-    * Get thread pool statistics. Get thread pool statistics for each node in a cluster. Returned information includes all built-in thread pools and custom thread pools. 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 nodes info API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html | Elasticsearch API documentation}
+    * Returns thread pool statistics for each node in a cluster. Returned information includes all built-in thread pools and custom thread pools. 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 nodes info API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-thread-pool.html | Elasticsearch API documentation}
     */
-  async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatThreadPoolResponse>
-  async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatThreadPoolResponse, unknown>>
-  async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<T.CatThreadPoolResponse>
-  async threadPool (this: That, params?: T.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<any> {
+  async threadPool (this: That, params?: T.CatThreadPoolRequest | TB.CatThreadPoolRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatThreadPoolResponse>
+  async threadPool (this: That, params?: T.CatThreadPoolRequest | TB.CatThreadPoolRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatThreadPoolResponse, unknown>>
+  async threadPool (this: That, params?: T.CatThreadPoolRequest | TB.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<T.CatThreadPoolResponse>
+  async threadPool (this: That, params?: T.CatThreadPoolRequest | TB.CatThreadPoolRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['thread_pool_patterns']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -929,7 +930,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -954,13 +955,13 @@ export default class Cat {
   }
 
   /**
-    * Get transform information. Get configuration and usage information about transforms. 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 transform statistics API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-transforms.html | Elasticsearch API documentation}
+    * Get transforms. Returns configuration and usage information about transforms. 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 transform statistics API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cat-transforms.html | Elasticsearch API documentation}
     */
-  async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTransformsResponse>
-  async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTransformsResponse, unknown>>
-  async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptions): Promise<T.CatTransformsResponse>
-  async transforms (this: That, params?: T.CatTransformsRequest, options?: TransportRequestOptions): Promise<any> {
+  async transforms (this: That, params?: T.CatTransformsRequest | TB.CatTransformsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CatTransformsResponse>
+  async transforms (this: That, params?: T.CatTransformsRequest | TB.CatTransformsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CatTransformsResponse, unknown>>
+  async transforms (this: That, params?: T.CatTransformsRequest | TB.CatTransformsRequest, options?: TransportRequestOptions): Promise<T.CatTransformsResponse>
+  async transforms (this: That, params?: T.CatTransformsRequest | TB.CatTransformsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['transform_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -969,7 +970,7 @@ export default class Cat {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/ccr.ts

@@ -35,6 +35,7 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 export default class Ccr {
@@ -45,12 +46,12 @@ export default class Ccr {
 
   /**
     * Deletes auto-follow patterns.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-delete-auto-follow-pattern.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-delete-auto-follow-pattern.html | Elasticsearch API documentation}
     */
-  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrDeleteAutoFollowPatternResponse>
-  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrDeleteAutoFollowPatternResponse, unknown>>
-  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrDeleteAutoFollowPatternResponse>
-  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
+  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest | TB.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrDeleteAutoFollowPatternResponse>
+  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest | TB.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrDeleteAutoFollowPatternResponse, unknown>>
+  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest | TB.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrDeleteAutoFollowPatternResponse>
+  async deleteAutoFollowPattern (this: That, params: T.CcrDeleteAutoFollowPatternRequest | TB.CcrDeleteAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -58,7 +59,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -77,24 +78,32 @@ export default class Ccr {
 
   /**
     * Creates a new follower index configured to follow the referenced leader index.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-put-follow.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-put-follow.html | Elasticsearch API documentation}
     */
-  async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowResponse>
-  async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowResponse, unknown>>
-  async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptions): Promise<T.CcrFollowResponse>
-  async follow (this: That, params: T.CcrFollowRequest, options?: TransportRequestOptions): Promise<any> {
+  async follow (this: That, params: T.CcrFollowRequest | TB.CcrFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowResponse>
+  async follow (this: That, params: T.CcrFollowRequest | TB.CcrFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowResponse, unknown>>
+  async follow (this: That, params: T.CcrFollowRequest | TB.CcrFollowRequest, options?: TransportRequestOptions): Promise<T.CcrFollowResponse>
+  async follow (this: That, params: T.CcrFollowRequest | TB.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 acceptedBody: string[] = ['leader_index', 'max_outstanding_read_requests', 'max_outstanding_write_requests', 'max_read_request_operation_count', 'max_read_request_size', 'max_retry_delay', 'max_write_buffer_count', 'max_write_buffer_size', 'max_write_request_operation_count', 'max_write_request_size', 'read_poll_timeout', 'remote_cluster']
     const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     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') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -113,12 +122,12 @@ export default class Ccr {
 
   /**
     * Retrieves information about all follower indices, including parameters and status for each follower index
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-follow-info.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-get-follow-info.html | Elasticsearch API documentation}
     */
-  async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowInfoResponse>
-  async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowInfoResponse, unknown>>
-  async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<T.CcrFollowInfoResponse>
-  async followInfo (this: That, params: T.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<any> {
+  async followInfo (this: That, params: T.CcrFollowInfoRequest | TB.CcrFollowInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowInfoResponse>
+  async followInfo (this: That, params: T.CcrFollowInfoRequest | TB.CcrFollowInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowInfoResponse, unknown>>
+  async followInfo (this: That, params: T.CcrFollowInfoRequest | TB.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<T.CcrFollowInfoResponse>
+  async followInfo (this: That, params: T.CcrFollowInfoRequest | TB.CcrFollowInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -126,7 +135,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -145,12 +154,12 @@ export default class Ccr {
 
   /**
     * Retrieves follower stats. return 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}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-get-follow-stats.html | Elasticsearch API documentation}
     */
-  async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowStatsResponse>
-  async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowStatsResponse, unknown>>
-  async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<T.CcrFollowStatsResponse>
-  async followStats (this: That, params: T.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<any> {
+  async followStats (this: That, params: T.CcrFollowStatsRequest | TB.CcrFollowStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrFollowStatsResponse>
+  async followStats (this: That, params: T.CcrFollowStatsRequest | TB.CcrFollowStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrFollowStatsResponse, unknown>>
+  async followStats (this: That, params: T.CcrFollowStatsRequest | TB.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<T.CcrFollowStatsResponse>
+  async followStats (this: That, params: T.CcrFollowStatsRequest | TB.CcrFollowStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -158,7 +167,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -177,24 +186,32 @@ export default class Ccr {
 
   /**
     * Removes the follower retention leases from the leader.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-forget-follower.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-post-forget-follower.html | Elasticsearch API documentation}
     */
-  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrForgetFollowerResponse>
-  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrForgetFollowerResponse, unknown>>
-  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptions): Promise<T.CcrForgetFollowerResponse>
-  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest, options?: TransportRequestOptions): Promise<any> {
+  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest | TB.CcrForgetFollowerRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrForgetFollowerResponse>
+  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest | TB.CcrForgetFollowerRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrForgetFollowerResponse, unknown>>
+  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest | TB.CcrForgetFollowerRequest, options?: TransportRequestOptions): Promise<T.CcrForgetFollowerResponse>
+  async forgetFollower (this: That, params: T.CcrForgetFollowerRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     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') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -213,12 +230,12 @@ export default class Ccr {
 
   /**
     * Gets configured auto-follow patterns. Returns the specified auto-follow pattern collection.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-auto-follow-pattern.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-get-auto-follow-pattern.html | Elasticsearch API documentation}
     */
-  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrGetAutoFollowPatternResponse>
-  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrGetAutoFollowPatternResponse, unknown>>
-  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrGetAutoFollowPatternResponse>
-  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
+  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest | TB.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrGetAutoFollowPatternResponse>
+  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest | TB.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrGetAutoFollowPatternResponse, unknown>>
+  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest | TB.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrGetAutoFollowPatternResponse>
+  async getAutoFollowPattern (this: That, params?: T.CcrGetAutoFollowPatternRequest | TB.CcrGetAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -227,7 +244,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -253,12 +270,12 @@ export default class Ccr {
 
   /**
     * Pauses an auto-follow pattern
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-pause-auto-follow-pattern.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-pause-auto-follow-pattern.html | Elasticsearch API documentation}
     */
-  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseAutoFollowPatternResponse>
-  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPauseAutoFollowPatternResponse, unknown>>
-  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrPauseAutoFollowPatternResponse>
-  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
+  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest | TB.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseAutoFollowPatternResponse>
+  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest | TB.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPauseAutoFollowPatternResponse, unknown>>
+  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest | TB.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrPauseAutoFollowPatternResponse>
+  async pauseAutoFollowPattern (this: That, params: T.CcrPauseAutoFollowPatternRequest | TB.CcrPauseAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -266,7 +283,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -285,12 +302,12 @@ export default class Ccr {
 
   /**
     * Pauses a follower index. The follower index will not fetch any additional operations from the leader index.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-pause-follow.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-post-pause-follow.html | Elasticsearch API documentation}
     */
-  async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseFollowResponse>
-  async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPauseFollowResponse, unknown>>
-  async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<T.CcrPauseFollowResponse>
-  async pauseFollow (this: That, params: T.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<any> {
+  async pauseFollow (this: That, params: T.CcrPauseFollowRequest | TB.CcrPauseFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPauseFollowResponse>
+  async pauseFollow (this: That, params: T.CcrPauseFollowRequest | TB.CcrPauseFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPauseFollowResponse, unknown>>
+  async pauseFollow (this: That, params: T.CcrPauseFollowRequest | TB.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<T.CcrPauseFollowResponse>
+  async pauseFollow (this: That, params: T.CcrPauseFollowRequest | TB.CcrPauseFollowRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -298,7 +315,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -317,24 +334,32 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-put-auto-follow-pattern.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-put-auto-follow-pattern.html | Elasticsearch API documentation}
     */
-  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPutAutoFollowPatternResponse>
-  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPutAutoFollowPatternResponse, unknown>>
-  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrPutAutoFollowPatternResponse>
-  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
+  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest | TB.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrPutAutoFollowPatternResponse>
+  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest | TB.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrPutAutoFollowPatternResponse, unknown>>
+  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest | TB.CcrPutAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrPutAutoFollowPatternResponse>
+  async putAutoFollowPattern (this: That, params: T.CcrPutAutoFollowPatternRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     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') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -353,12 +378,12 @@ export default class Ccr {
 
   /**
     * Resumes an auto-follow pattern that has been paused
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-resume-auto-follow-pattern.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-resume-auto-follow-pattern.html | Elasticsearch API documentation}
     */
-  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeAutoFollowPatternResponse>
-  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrResumeAutoFollowPatternResponse, unknown>>
-  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrResumeAutoFollowPatternResponse>
-  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
+  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest | TB.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeAutoFollowPatternResponse>
+  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest | TB.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrResumeAutoFollowPatternResponse, unknown>>
+  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest | TB.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<T.CcrResumeAutoFollowPatternResponse>
+  async resumeAutoFollowPattern (this: That, params: T.CcrResumeAutoFollowPatternRequest | TB.CcrResumeAutoFollowPatternRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -366,7 +391,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -385,24 +410,32 @@ export default class Ccr {
 
   /**
     * Resumes a follower index that has been paused
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-resume-follow.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-post-resume-follow.html | Elasticsearch API documentation}
     */
-  async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeFollowResponse>
-  async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrResumeFollowResponse, unknown>>
-  async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptions): Promise<T.CcrResumeFollowResponse>
-  async resumeFollow (this: That, params: T.CcrResumeFollowRequest, options?: TransportRequestOptions): Promise<any> {
+  async resumeFollow (this: That, params: T.CcrResumeFollowRequest | TB.CcrResumeFollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrResumeFollowResponse>
+  async resumeFollow (this: That, params: T.CcrResumeFollowRequest | TB.CcrResumeFollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrResumeFollowResponse, unknown>>
+  async resumeFollow (this: That, params: T.CcrResumeFollowRequest | TB.CcrResumeFollowRequest, options?: TransportRequestOptions): Promise<T.CcrResumeFollowResponse>
+  async resumeFollow (this: That, params: T.CcrResumeFollowRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     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') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -421,12 +454,12 @@ export default class Ccr {
 
   /**
     * Gets all stats related to cross-cluster replication.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-get-stats.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-get-stats.html | Elasticsearch API documentation}
     */
-  async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrStatsResponse>
-  async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrStatsResponse, unknown>>
-  async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptions): Promise<T.CcrStatsResponse>
-  async stats (this: That, params?: T.CcrStatsRequest, options?: TransportRequestOptions): Promise<any> {
+  async stats (this: That, params?: T.CcrStatsRequest | TB.CcrStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrStatsResponse>
+  async stats (this: That, params?: T.CcrStatsRequest | TB.CcrStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrStatsResponse, unknown>>
+  async stats (this: That, params?: T.CcrStatsRequest | TB.CcrStatsRequest, options?: TransportRequestOptions): Promise<T.CcrStatsResponse>
+  async stats (this: That, params?: T.CcrStatsRequest | TB.CcrStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -435,7 +468,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -451,12 +484,12 @@ export default class Ccr {
 
   /**
     * Stops the following task associated with a follower index and removes index metadata and settings associated with cross-cluster replication.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/ccr-post-unfollow.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/ccr-post-unfollow.html | Elasticsearch API documentation}
     */
-  async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrUnfollowResponse>
-  async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrUnfollowResponse, unknown>>
-  async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<T.CcrUnfollowResponse>
-  async unfollow (this: That, params: T.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<any> {
+  async unfollow (this: That, params: T.CcrUnfollowRequest | TB.CcrUnfollowRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.CcrUnfollowResponse>
+  async unfollow (this: That, params: T.CcrUnfollowRequest | TB.CcrUnfollowRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.CcrUnfollowResponse, unknown>>
+  async unfollow (this: That, params: T.CcrUnfollowRequest | TB.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<T.CcrUnfollowResponse>
+  async unfollow (this: That, params: T.CcrUnfollowRequest | TB.CcrUnfollowRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -464,7 +497,7 @@ export default class Ccr {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }

src/api/api/clear_scroll.ts

@@ -35,29 +35,38 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 /**
   * Clear a scrolling search. Clear the search context and results for a scrolling search.
-  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/clear-scroll-api.html | Elasticsearch API documentation}
+  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/clear-scroll-api.html | Elasticsearch API documentation}
   */
-export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClearScrollResponse>
-export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClearScrollResponse, unknown>>
-export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest, options?: TransportRequestOptions): Promise<T.ClearScrollResponse>
-export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest, options?: TransportRequestOptions): Promise<any> {
+export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest | TB.ClearScrollRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClearScrollResponse>
+export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest | TB.ClearScrollRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClearScrollResponse, unknown>>
+export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest | TB.ClearScrollRequest, options?: TransportRequestOptions): Promise<T.ClearScrollResponse>
+export default async function ClearScrollApi (this: That, params?: T.ClearScrollRequest | TB.ClearScrollRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['scroll_id']
   const querystring: Record<string, any> = {}
-  const body: Record<string, any> = {}
+  // @ts-expect-error
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
+  } else {
+    body = userBody != null ? { ...userBody } : undefined
+  }
 
   params = params ?? {}
   for (const key in params) {
     if (acceptedBody.includes(key)) {
+      body = body ?? {}
       // @ts-expect-error
       body[key] = params[key]
     } else if (acceptedPath.includes(key)) {
       continue
-    } else {
+    } else if (key !== 'body') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/close_point_in_time.ts

@@ -35,28 +35,37 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 /**
   * Close a point in time. A point in time must be opened explicitly before being used in search requests. The `keep_alive` parameter tells Elasticsearch how long it should persist. A point in time is automatically closed when the `keep_alive` period has elapsed. However, keeping points in time has a cost; close them as soon as they are no longer required for search requests.
-  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html | Elasticsearch API documentation}
+  * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/point-in-time-api.html | Elasticsearch API documentation}
   */
-export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClosePointInTimeResponse>
-export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClosePointInTimeResponse, unknown>>
-export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest, options?: TransportRequestOptions): Promise<T.ClosePointInTimeResponse>
-export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest, options?: TransportRequestOptions): Promise<any> {
+export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest | TB.ClosePointInTimeRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClosePointInTimeResponse>
+export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest | TB.ClosePointInTimeRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClosePointInTimeResponse, unknown>>
+export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest | TB.ClosePointInTimeRequest, options?: TransportRequestOptions): Promise<T.ClosePointInTimeResponse>
+export default async function ClosePointInTimeApi (this: That, params: T.ClosePointInTimeRequest | TB.ClosePointInTimeRequest, options?: TransportRequestOptions): Promise<any> {
   const acceptedPath: string[] = []
   const acceptedBody: string[] = ['id']
   const querystring: Record<string, any> = {}
-  const body: Record<string, any> = {}
+  // @ts-expect-error
+  const userBody: any = params?.body
+  let body: Record<string, any> | string
+  if (typeof userBody === 'string') {
+    body = userBody
+  } else {
+    body = userBody != null ? { ...userBody } : undefined
+  }
 
   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') {
       // @ts-expect-error
       querystring[key] = params[key]
     }

src/api/api/cluster.ts

@@ -35,6 +35,7 @@ import {
   TransportResult
 } from '@elastic/transport'
 import * as T from '../types'
+import * as TB from '../typesWithBodyKey'
 interface That { transport: Transport }
 
 export default class Cluster {
@@ -44,26 +45,34 @@ export default class Cluster {
   }
 
   /**
-    * Explain the shard allocations. Get explanations for shard allocations in the cluster. For unassigned shards, it provides an explanation for why the shard is unassigned. For assigned shards, it provides an explanation for why the shard is remaining on its current node and has not moved or rebalanced to another node. This API can be very useful when attempting to diagnose why a shard is unassigned or why a shard continues to remain on its current node when you might expect otherwise.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html | Elasticsearch API documentation}
+    * Provides explanations for shard allocations in the cluster.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-allocation-explain.html | Elasticsearch API documentation}
     */
-  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterAllocationExplainResponse>
-  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterAllocationExplainResponse, unknown>>
-  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest, options?: TransportRequestOptions): Promise<T.ClusterAllocationExplainResponse>
-  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest, options?: TransportRequestOptions): Promise<any> {
+  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest | TB.ClusterAllocationExplainRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterAllocationExplainResponse>
+  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest | TB.ClusterAllocationExplainRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterAllocationExplainResponse, unknown>>
+  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest | TB.ClusterAllocationExplainRequest, options?: TransportRequestOptions): Promise<T.ClusterAllocationExplainResponse>
+  async allocationExplain (this: That, params?: T.ClusterAllocationExplainRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -79,12 +88,12 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/indices-component-template.html | Elasticsearch API documentation}
     */
-  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterDeleteComponentTemplateResponse>
-  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterDeleteComponentTemplateResponse, unknown>>
-  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteComponentTemplateResponse>
-  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
+  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest | TB.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterDeleteComponentTemplateResponse>
+  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest | TB.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterDeleteComponentTemplateResponse, unknown>>
+  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest | TB.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteComponentTemplateResponse>
+  async deleteComponentTemplate (this: That, params: T.ClusterDeleteComponentTemplateRequest | TB.ClusterDeleteComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -92,7 +101,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -110,13 +119,13 @@ export default class Cluster {
   }
 
   /**
-    * Clear cluster voting config exclusions. Remove master-eligible nodes from the voting configuration exclusion list.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html | Elasticsearch API documentation}
+    * Clears cluster voting config exclusions.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/voting-config-exclusions.html | Elasticsearch API documentation}
     */
-  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterDeleteVotingConfigExclusionsResponse>
-  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterDeleteVotingConfigExclusionsResponse, unknown>>
-  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteVotingConfigExclusionsResponse>
-  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
+  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest | TB.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterDeleteVotingConfigExclusionsResponse>
+  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest | TB.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterDeleteVotingConfigExclusionsResponse, unknown>>
+  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest | TB.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterDeleteVotingConfigExclusionsResponse>
+  async deleteVotingConfigExclusions (this: That, params?: T.ClusterDeleteVotingConfigExclusionsRequest | TB.ClusterDeleteVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -125,7 +134,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -141,12 +150,12 @@ export default class Cluster {
 
   /**
     * Check component templates. Returns information about whether a particular component template exists.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/indices-component-template.html | Elasticsearch API documentation}
     */
-  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterExistsComponentTemplateResponse>
-  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterExistsComponentTemplateResponse, unknown>>
-  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterExistsComponentTemplateResponse>
-  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
+  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest | TB.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterExistsComponentTemplateResponse>
+  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest | TB.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterExistsComponentTemplateResponse, unknown>>
+  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest | TB.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterExistsComponentTemplateResponse>
+  async existsComponentTemplate (this: That, params: T.ClusterExistsComponentTemplateRequest | TB.ClusterExistsComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -154,7 +163,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -173,12 +182,12 @@ export default class Cluster {
 
   /**
     * Get component templates. Retrieves information about component templates.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/indices-component-template.html | Elasticsearch API documentation}
     */
-  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterGetComponentTemplateResponse>
-  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterGetComponentTemplateResponse, unknown>>
-  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterGetComponentTemplateResponse>
-  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
+  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest | TB.ClusterGetComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterGetComponentTemplateResponse>
+  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest | TB.ClusterGetComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterGetComponentTemplateResponse, unknown>>
+  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest | TB.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterGetComponentTemplateResponse>
+  async getComponentTemplate (this: That, params?: T.ClusterGetComponentTemplateRequest | TB.ClusterGetComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['name']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -187,7 +196,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -212,13 +221,13 @@ export default class Cluster {
   }
 
   /**
-    * Get cluster-wide settings. By default, it returns only settings that have been explicitly defined.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-get-settings.html | Elasticsearch API documentation}
+    * Returns cluster-wide settings. By default, it returns only settings that have been explicitly defined.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-get-settings.html | Elasticsearch API documentation}
     */
-  async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterGetSettingsResponse>
-  async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterGetSettingsResponse, unknown>>
-  async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<T.ClusterGetSettingsResponse>
-  async getSettings (this: That, params?: T.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<any> {
+  async getSettings (this: That, params?: T.ClusterGetSettingsRequest | TB.ClusterGetSettingsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterGetSettingsResponse>
+  async getSettings (this: That, params?: T.ClusterGetSettingsRequest | TB.ClusterGetSettingsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterGetSettingsResponse, unknown>>
+  async getSettings (this: That, params?: T.ClusterGetSettingsRequest | TB.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<T.ClusterGetSettingsResponse>
+  async getSettings (this: That, params?: T.ClusterGetSettingsRequest | TB.ClusterGetSettingsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -227,7 +236,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -242,13 +251,13 @@ export default class Cluster {
   }
 
   /**
-    * Get the cluster health status. You can also use the API to get the health status of only specified data streams and indices. For data streams, the API retrieves the health status of the stream’s backing indices. The cluster health status is: green, yellow or red. On the shard level, a red status indicates that the specific shard is not allocated in the cluster. Yellow means that the primary shard is allocated but replicas are not. Green means that all shards are allocated. The index level status is controlled by the worst shard status. One of the main benefits of the API is the ability to wait until the cluster reaches a certain high watermark health level. The cluster status is controlled by the worst index status.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html | Elasticsearch API documentation}
+    * The cluster health API returns a simple status on the health of the cluster. You can also use the API to get the health status of only specified data streams and indices. For data streams, the API retrieves the health status of the stream’s backing indices. The cluster health status is: green, yellow or red. On the shard level, a red status indicates that the specific shard is not allocated in the cluster, yellow means that the primary shard is allocated but replicas are not, and green means that all shards are allocated. The index level status is controlled by the worst shard status. The cluster status is controlled by the worst index status.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-health.html | Elasticsearch API documentation}
     */
-  async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterHealthResponse>
-  async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterHealthResponse, unknown>>
-  async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptions): Promise<T.ClusterHealthResponse>
-  async health (this: That, params?: T.ClusterHealthRequest, options?: TransportRequestOptions): Promise<any> {
+  async health (this: That, params?: T.ClusterHealthRequest | TB.ClusterHealthRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterHealthResponse>
+  async health (this: That, params?: T.ClusterHealthRequest | TB.ClusterHealthRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterHealthResponse, unknown>>
+  async health (this: That, params?: T.ClusterHealthRequest | TB.ClusterHealthRequest, options?: TransportRequestOptions): Promise<T.ClusterHealthResponse>
+  async health (this: That, params?: T.ClusterHealthRequest | TB.ClusterHealthRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -257,7 +266,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -283,12 +292,12 @@ export default class Cluster {
 
   /**
     * Get cluster info. Returns basic information about the cluster.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-info.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-info.html | Elasticsearch API documentation}
     */
-  async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterInfoResponse>
-  async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterInfoResponse, unknown>>
-  async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterInfoResponse>
-  async info (this: That, params: T.ClusterInfoRequest, options?: TransportRequestOptions): Promise<any> {
+  async info (this: That, params: T.ClusterInfoRequest | TB.ClusterInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterInfoResponse>
+  async info (this: That, params: T.ClusterInfoRequest | TB.ClusterInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterInfoResponse, unknown>>
+  async info (this: That, params: T.ClusterInfoRequest | TB.ClusterInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterInfoResponse>
+  async info (this: That, params: T.ClusterInfoRequest | TB.ClusterInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['target']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -296,7 +305,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -314,13 +323,13 @@ export default class Cluster {
   }
 
   /**
-    * Get the pending cluster tasks. Get information about cluster-level changes (such as create index, update mapping, allocate or fail shard) that have not yet taken effect. NOTE: This API returns a list of any pending updates to the cluster state. These are distinct from the tasks reported by the task management API which include periodic tasks and tasks initiated by the user, such as node stats, search queries, or create index requests. However, if a user-initiated task such as a create index command causes a cluster state update, the activity of this task might be reported by both task api and pending cluster tasks API.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html | Elasticsearch API documentation}
+    * Returns cluster-level changes (such as create index, update mapping, allocate or fail shard) that have not yet been executed. NOTE: This API returns a list of any pending updates to the cluster state. These are distinct from the tasks reported by the Task Management API which include periodic tasks and tasks initiated by the user, such as node stats, search queries, or create index requests. However, if a user-initiated task such as a create index command causes a cluster state update, the activity of this task might be reported by both task api and pending cluster tasks API.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-pending.html | Elasticsearch API documentation}
     */
-  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPendingTasksResponse>
-  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPendingTasksResponse, unknown>>
-  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<T.ClusterPendingTasksResponse>
-  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
+  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest | TB.ClusterPendingTasksRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPendingTasksResponse>
+  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest | TB.ClusterPendingTasksRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPendingTasksResponse, unknown>>
+  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest | TB.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<T.ClusterPendingTasksResponse>
+  async pendingTasks (this: That, params?: T.ClusterPendingTasksRequest | TB.ClusterPendingTasksRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -329,7 +338,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -344,13 +353,13 @@ export default class Cluster {
   }
 
   /**
-    * Update voting configuration exclusions. Update the cluster voting config exclusions by node IDs or node names. By default, if there are more than three master-eligible nodes in the cluster and you remove fewer than half of the master-eligible nodes in the cluster at once, the voting configuration automatically shrinks. If you want to shrink the voting configuration to contain fewer than three nodes or to remove half or more of the master-eligible nodes in the cluster at once, use this API to remove departing nodes from the voting configuration manually. The API adds an entry for each specified node to the cluster’s voting configuration exclusions list. It then waits until the cluster has reconfigured its voting configuration to exclude the specified nodes. Clusters should have no voting configuration exclusions in normal operation. Once the excluded nodes have stopped, clear the voting configuration exclusions with `DELETE /_cluster/voting_config_exclusions`. This API waits for the nodes to be fully removed from the cluster before it returns. If your cluster has voting configuration exclusions for nodes that you no longer intend to remove, use `DELETE /_cluster/voting_config_exclusions?wait_for_removal=false` to clear the voting configuration exclusions without waiting for the nodes to leave the cluster. A response to `POST /_cluster/voting_config_exclusions` with an HTTP status code of 200 OK guarantees that the node has been removed from the voting configuration and will not be reinstated until the voting configuration exclusions are cleared by calling `DELETE /_cluster/voting_config_exclusions`. If the call to `POST /_cluster/voting_config_exclusions` fails or returns a response with an HTTP status code other than 200 OK then the node may not have been removed from the voting configuration. In that case, you may safely retry the call. NOTE: Voting exclusions are required only when you remove at least half of the master-eligible nodes from a cluster in a short time period. They are not required when removing master-ineligible nodes or when removing fewer than half of the master-eligible nodes.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html | Elasticsearch API documentation}
+    * Updates the cluster voting config exclusions by node ids or node names.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/voting-config-exclusions.html | Elasticsearch API documentation}
     */
-  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPostVotingConfigExclusionsResponse>
-  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPostVotingConfigExclusionsResponse, unknown>>
-  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterPostVotingConfigExclusionsResponse>
-  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
+  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest | TB.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPostVotingConfigExclusionsResponse>
+  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest | TB.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPostVotingConfigExclusionsResponse, unknown>>
+  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest | TB.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<T.ClusterPostVotingConfigExclusionsResponse>
+  async postVotingConfigExclusions (this: That, params?: T.ClusterPostVotingConfigExclusionsRequest | TB.ClusterPostVotingConfigExclusionsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -359,7 +368,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -375,24 +384,32 @@ 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.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html | Elasticsearch API documentation}
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/indices-component-template.html | Elasticsearch API documentation}
     */
-  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPutComponentTemplateResponse>
-  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPutComponentTemplateResponse, unknown>>
-  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterPutComponentTemplateResponse>
-  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest, options?: TransportRequestOptions): Promise<any> {
+  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest | TB.ClusterPutComponentTemplateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPutComponentTemplateResponse>
+  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest | TB.ClusterPutComponentTemplateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPutComponentTemplateResponse, unknown>>
+  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest | TB.ClusterPutComponentTemplateRequest, options?: TransportRequestOptions): Promise<T.ClusterPutComponentTemplateResponse>
+  async putComponentTemplate (this: That, params: T.ClusterPutComponentTemplateRequest | TB.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> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     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') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -410,26 +427,34 @@ export default class Cluster {
   }
 
   /**
-    * Update the cluster settings. Configure and update dynamic settings on a running cluster. You can also configure dynamic settings locally on an unstarted or shut down node in `elasticsearch.yml`. Updates made with this API can be persistent, which apply across cluster restarts, or transient, which reset after a cluster restart. You can also reset transient or persistent settings by assigning them a null value. If you configure the same setting using multiple methods, Elasticsearch applies the settings in following order of precedence: 1) Transient setting; 2) Persistent setting; 3) `elasticsearch.yml` setting; 4) Default setting value. For example, you can apply a transient setting to override a persistent setting or `elasticsearch.yml` setting. However, a change to an `elasticsearch.yml` setting will not override a defined transient or persistent setting. TIP: In Elastic Cloud, use the user settings feature to configure all cluster settings. This method automatically rejects unsafe settings that could break your cluster. If you run Elasticsearch on your own hardware, use this API to configure dynamic cluster settings. Only use `elasticsearch.yml` for static cluster settings and node settings. The API doesn’t require a restart and ensures a setting’s value is the same on all nodes. WARNING: Transient cluster settings are no longer recommended. Use persistent cluster settings instead. If a cluster becomes unstable, transient settings can clear unexpectedly, resulting in a potentially undesired cluster configuration.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html | Elasticsearch API documentation}
+    * Updates the cluster settings.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-update-settings.html | Elasticsearch API documentation}
     */
-  async putSettings (this: That, params?: T.ClusterPutSettingsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPutSettingsResponse>
-  async putSettings (this: That, params?: T.ClusterPutSettingsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPutSettingsResponse, unknown>>
-  async putSettings (this: That, params?: T.ClusterPutSettingsRequest, options?: TransportRequestOptions): Promise<T.ClusterPutSettingsResponse>
-  async putSettings (this: That, params?: T.ClusterPutSettingsRequest, options?: TransportRequestOptions): Promise<any> {
+  async putSettings (this: That, params?: T.ClusterPutSettingsRequest | TB.ClusterPutSettingsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterPutSettingsResponse>
+  async putSettings (this: That, params?: T.ClusterPutSettingsRequest | TB.ClusterPutSettingsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterPutSettingsResponse, unknown>>
+  async putSettings (this: That, params?: T.ClusterPutSettingsRequest | TB.ClusterPutSettingsRequest, options?: TransportRequestOptions): Promise<T.ClusterPutSettingsResponse>
+  async putSettings (this: That, params?: T.ClusterPutSettingsRequest | TB.ClusterPutSettingsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['persistent', 'transient']
     const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -444,13 +469,13 @@ export default class Cluster {
   }
 
   /**
-    * Get remote cluster information. Get all of the configured remote cluster information. This API returns connection and endpoint information keyed by the configured remote cluster alias.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html | Elasticsearch API documentation}
+    * The cluster remote info API allows you to retrieve all of the configured remote cluster information. It returns connection and endpoint information keyed by the configured remote cluster alias.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-remote-info.html | Elasticsearch API documentation}
     */
-  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterRemoteInfoResponse>
-  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterRemoteInfoResponse, unknown>>
-  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterRemoteInfoResponse>
-  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<any> {
+  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest | TB.ClusterRemoteInfoRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterRemoteInfoResponse>
+  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest | TB.ClusterRemoteInfoRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterRemoteInfoResponse, unknown>>
+  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest | TB.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<T.ClusterRemoteInfoResponse>
+  async remoteInfo (this: That, params?: T.ClusterRemoteInfoRequest | TB.ClusterRemoteInfoRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -459,7 +484,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -474,26 +499,34 @@ export default class Cluster {
   }
 
   /**
-    * Reroute the cluster. Manually change the allocation of individual shards in the cluster. For example, a shard can be moved from one node to another explicitly, an allocation can be canceled, and an unassigned shard can be explicitly allocated to a specific node. It is important to note that after processing any reroute commands Elasticsearch will perform rebalancing as normal (respecting the values of settings such as `cluster.routing.rebalance.enable`) in order to remain in a balanced state. For example, if the requested allocation includes moving a shard from node1 to node2 then this may cause a shard to be moved from node2 back to node1 to even things out. The cluster can be set to disable allocations using the `cluster.routing.allocation.enable` setting. If allocations are disabled then the only allocations that will be performed are explicit ones given using the reroute command, and consequent allocations due to rebalancing. The cluster will attempt to allocate a shard a maximum of `index.allocation.max_retries` times in a row (defaults to `5`), before giving up and leaving the shard unallocated. This scenario can be caused by structural problems such as having an analyzer which refers to a stopwords file which doesn’t exist on all nodes. Once the problem has been corrected, allocation can be manually retried by calling the reroute API with the `?retry_failed` URI query parameter, which will attempt a single retry round for these shards.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html | Elasticsearch API documentation}
+    * Allows to manually change the allocation of individual shards in the cluster.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-reroute.html | Elasticsearch API documentation}
     */
-  async reroute (this: That, params?: T.ClusterRerouteRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterRerouteResponse>
-  async reroute (this: That, params?: T.ClusterRerouteRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterRerouteResponse, unknown>>
-  async reroute (this: That, params?: T.ClusterRerouteRequest, options?: TransportRequestOptions): Promise<T.ClusterRerouteResponse>
-  async reroute (this: That, params?: T.ClusterRerouteRequest, options?: TransportRequestOptions): Promise<any> {
+  async reroute (this: That, params?: T.ClusterRerouteRequest | TB.ClusterRerouteRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterRerouteResponse>
+  async reroute (this: That, params?: T.ClusterRerouteRequest | TB.ClusterRerouteRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterRerouteResponse, unknown>>
+  async reroute (this: That, params?: T.ClusterRerouteRequest | TB.ClusterRerouteRequest, options?: TransportRequestOptions): Promise<T.ClusterRerouteResponse>
+  async reroute (this: That, params?: T.ClusterRerouteRequest | TB.ClusterRerouteRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = []
     const acceptedBody: string[] = ['commands']
     const querystring: Record<string, any> = {}
-    const body: Record<string, any> = {}
+    // @ts-expect-error
+    const userBody: any = params?.body
+    let body: Record<string, any> | string
+    if (typeof userBody === 'string') {
+      body = userBody
+    } else {
+      body = userBody != null ? { ...userBody } : undefined
+    }
 
     params = params ?? {}
     for (const key in params) {
       if (acceptedBody.includes(key)) {
+        body = body ?? {}
         // @ts-expect-error
         body[key] = params[key]
       } else if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -508,13 +541,13 @@ export default class Cluster {
   }
 
   /**
-    * Get the cluster state. Get comprehensive information about the state of the cluster. The cluster state is an internal data structure which keeps track of a variety of information needed by every node, including the identity and attributes of the other nodes in the cluster; cluster-wide settings; index metadata, including the mapping and settings for each index; the location and status of every shard copy in the cluster. The elected master node ensures that every node in the cluster has a copy of the same cluster state. This API lets you retrieve a representation of this internal state for debugging or diagnostic purposes. You may need to consult the Elasticsearch source code to determine the precise meaning of the response. By default the API will route requests to the elected master node since this node is the authoritative source of cluster states. You can also retrieve the cluster state held on the node handling the API request by adding the `?local=true` query parameter. Elasticsearch may need to expend significant effort to compute a response to this API in larger clusters, and the response may comprise a very large quantity of data. If you use this API repeatedly, your cluster may become unstable. WARNING: The response is a representation of an internal data structure. Its format is not subject to the same compatibility guarantees as other more stable APIs and may change from version to version. Do not query this API using external monitoring tools. Instead, obtain the information you require using other more stable cluster APIs.
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html | Elasticsearch API documentation}
+    * Returns a comprehensive information about the state of the cluster.
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-state.html | Elasticsearch API documentation}
     */
-  async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterStateResponse>
-  async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterStateResponse, unknown>>
-  async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptions): Promise<T.ClusterStateResponse>
-  async state (this: That, params?: T.ClusterStateRequest, options?: TransportRequestOptions): Promise<any> {
+  async state (this: That, params?: T.ClusterStateRequest | TB.ClusterStateRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterStateResponse>
+  async state (this: That, params?: T.ClusterStateRequest | TB.ClusterStateRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterStateResponse, unknown>>
+  async state (this: That, params?: T.ClusterStateRequest | TB.ClusterStateRequest, options?: TransportRequestOptions): Promise<T.ClusterStateResponse>
+  async state (this: That, params?: T.ClusterStateRequest | TB.ClusterStateRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['metric', 'index']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -523,7 +556,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }
@@ -552,13 +585,13 @@ export default class Cluster {
   }
 
   /**
-    * Get cluster statistics. Get basic index metrics (shard numbers, store size, memory usage) and information about the current nodes that form the cluster (number, roles, os, jvm versions, memory usage, cpu and installed plugins).
-    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html | Elasticsearch API documentation}
+    * Returns cluster statistics. It returns basic index metrics (shard numbers, store size, memory usage) and information about the current nodes that form the cluster (number, roles, os, jvm versions, memory usage, cpu and installed plugins).
+    * @see {@link https://www.elastic.co/guide/en/elasticsearch/reference/8.16/cluster-stats.html | Elasticsearch API documentation}
     */
-  async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterStatsResponse>
-  async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterStatsResponse, unknown>>
-  async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptions): Promise<T.ClusterStatsResponse>
-  async stats (this: That, params?: T.ClusterStatsRequest, options?: TransportRequestOptions): Promise<any> {
+  async stats (this: That, params?: T.ClusterStatsRequest | TB.ClusterStatsRequest, options?: TransportRequestOptionsWithOutMeta): Promise<T.ClusterStatsResponse>
+  async stats (this: That, params?: T.ClusterStatsRequest | TB.ClusterStatsRequest, options?: TransportRequestOptionsWithMeta): Promise<TransportResult<T.ClusterStatsResponse, unknown>>
+  async stats (this: That, params?: T.ClusterStatsRequest | TB.ClusterStatsRequest, options?: TransportRequestOptions): Promise<T.ClusterStatsResponse>
+  async stats (this: That, params?: T.ClusterStatsRequest | TB.ClusterStatsRequest, options?: TransportRequestOptions): Promise<any> {
     const acceptedPath: string[] = ['node_id']
     const querystring: Record<string, any> = {}
     const body = undefined
@@ -567,7 +600,7 @@ export default class Cluster {
     for (const key in params) {
       if (acceptedPath.includes(key)) {
         continue
-      } else {
+      } else if (key !== 'body') {
         // @ts-expect-error
         querystring[key] = params[key]
       }