chore(builders): release @discordjs/builders@1.13.0

* feat: support file uploads

* test: add tests

* style: sort imports

* feat(Label): add method

.commitlintrc.json

@@ -5,8 +5,9 @@
 		"type-enum": [
 			2,
 			"always",
-			["chore", "build", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test", "types", "typings"]
+			["chore", "build", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test", "types"]
 		],
-		"scope-case": [0]
+		"scope-case": [0],
+		"subject-exclamation-mark": [0]
 	}
 }

.github/COMMIT_CONVENTION.md

@@ -7,7 +7,7 @@
 Messages must be matched by the following regex:
 
 ```js
-/^(revert: )?(feat|fix|docs|style|refactor|perf|test|workflow|build|ci|chore|types|wip)(\(.+\))?: .{1,72}/;
+/^(revert: )?(feat|fix|docs|style|refactor|perf|test|build|ci|chore|types)(\(.+\))?!?: .{1,72}/;
 ```
 
 #### Examples
@@ -55,6 +55,7 @@ A commit message consists of a **header**, **body** and **footer**. The header h
 ```
 
 The **header** is mandatory and the **scope** of the header is optional.
+If the commit contains **Breaking Changes**, a `!` can be added before the `:` as an indicator.
 
 ### Revert
 

.github/labeler.yml

@@ -1,60 +1,100 @@
 apps:guide:
   - changed-files:
-    - any-glob-to-any-file: ['apps/guide/*', 'apps/guide/**/*']
+      - any-glob-to-any-file:
+          - apps/guide/*
+          - apps/guide/**/*
 apps:website:
   - changed-files:
-    - any-glob-to-any-file: ['apps/website/*', 'apps/website/**/*']
+      - any-glob-to-any-file:
+          - apps/website/*
+          - apps/website/**/*
 packages:api-extractor:
   - changed-files:
-    - any-glob-to-any-file: ['packages/api-extractor/*', 'packages/api-extractor/**/*']
+      - any-glob-to-any-file:
+          - packages/api-extractor/*
+          - packages/api-extractor/**/*
 packages:api-extractor-model:
   - changed-files:
-    - any-glob-to-any-file: ['packages/api-extractor-model/*', 'packages/api-extractor-model/**/*']
+      - any-glob-to-any-file:
+          - packages/api-extractor-model/*
+          - packages/api-extractor-model/**/*
 packages:brokers:
   - changed-files:
-    - any-glob-to-any-file: ['packages/brokers/*', 'packages/brokers/**/*']
+      - any-glob-to-any-file:
+          - packages/brokers/*
+          - packages/brokers/**/*
 packages:builders:
   - changed-files:
-    - any-glob-to-any-file: ['packages/builders/*', 'packages/builders/**/*']
+      - any-glob-to-any-file:
+          - packages/builders/*
+          - packages/builders/**/*
 packages:collection:
   - changed-files:
-    - any-glob-to-any-file: ['packages/collection/*', 'packages/collection/**/*']
+      - any-glob-to-any-file:
+          - packages/collection/*
+          - packages/collection/**/*
 packages:core:
   - changed-files:
-    - any-glob-to-any-file: ['packages/core/*', 'packages/core/**/*']
+      - any-glob-to-any-file:
+          - packages/core/*
+          - packages/core/**/*
 packages:create-discord-bot:
   - changed-files:
-    - any-glob-to-any-file: ['packages/create-discord-bot/*', 'packages/create-discord-bot/**/*']
+      - any-glob-to-any-file:
+          - packages/create-discord-bot/*
+          - packages/create-discord-bot/**/*
 packages:discord.js:
   - changed-files:
-    - any-glob-to-any-file: ['packages/discord.js/*', 'packages/discord.js/**/*']
+      - any-glob-to-any-file:
+          - packages/discord.js/*
+          - packages/discord.js/**/*
 packages:docgen:
   - changed-files:
-    - any-glob-to-any-file: ['packages/docgen/*', 'packages/docgen/**/*']
+      - any-glob-to-any-file:
+          - packages/docgen/*
+          - packages/docgen/**/*
 packages:formatters:
   - changed-files:
-    - any-glob-to-any-file: ['packages/formatters/*', 'packages/formatters/**/*']
+      - any-glob-to-any-file:
+          - packages/formatters/*
+          - packages/formatters/**/*
 packages:next:
   - changed-files:
-    - any-glob-to-any-file: ['packages/next/*', 'packages/next/**/*']
+      - any-glob-to-any-file:
+          - packages/next/*
+          - packages/next/**/*
 packages:proxy:
   - changed-files:
-    - any-glob-to-any-file: ['packages/proxy/*', 'packages/proxy/**/*']
+      - any-glob-to-any-file:
+          - packages/proxy/*
+          - packages/proxy/**/*
 packages:proxy-container:
   - changed-files:
-    - any-glob-to-any-file: ['packages/proxy-container/*', 'packages/proxy-container/**/*']
+      - any-glob-to-any-file:
+          - packages/proxy-container/*
+          - packages/proxy-container/**/*
 packages:rest:
   - changed-files:
-    - any-glob-to-any-file: ['packages/rest/*', 'packages/rest/**/*']
+      - any-glob-to-any-file:
+          - packages/rest/*
+          - packages/rest/**/*
 packages:ui:
   - changed-files:
-    - any-glob-to-any-file: ['packages/ui/*', 'packages/ui/**/*']
+      - any-glob-to-any-file:
+          - packages/ui/*
+          - packages/ui/**/*
 packages:util:
   - changed-files:
-    - any-glob-to-any-file: ['packages/util/*', 'packages/util/**/*']
+      - any-glob-to-any-file:
+          - packages/util/*
+          - packages/util/**/*
 packages:voice:
   - changed-files:
-    - any-glob-to-any-file: ['packages/voice/*', 'packages/voice/**/*']
+      - any-glob-to-any-file:
+          - packages/voice/*
+          - packages/voice/**/*
 packages:ws:
   - changed-files:
-    - any-glob-to-any-file: ['packages/ws/*', 'packages/ws/**/*']
+      - any-glob-to-any-file:
+          - packages/ws/*
+          - packages/ws/**/*

.github/workflows/documentation.yml

@@ -1,232 +0,0 @@
-name: Documentation
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'packages/*/src/**'
-      - '!packages/create-discord-bot/**'
-      - '!packages/proxy-container/**'
-      - '!packages/ui/**'
-    tags:
-      - '**'
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'The branch, tag or SHA to checkout'
-        required: true
-      ref_type:
-        type: choice
-        description: 'Branch or tag'
-        options:
-          - branch
-          - tag
-        required: true
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-jobs:
-  build-docs:
-    name: Build & upload documentation
-    runs-on: ubuntu-latest
-    env:
-      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-      REF_TYPE: ${{ inputs.ref_type || github.ref_type }}
-    if: github.repository_owner == 'discordjs'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref || '' }}
-
-      - name: Install Node.js v20
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install dependencies
-        uses: ./packages/actions/src/pnpmCache
-
-      - name: Build dependencies
-        run: pnpm run build
-
-      - name: Checkout main repository
-        if: ${{ inputs.ref && inputs.ref != 'main' }}
-        uses: actions/checkout@v4
-        with:
-          path: 'main'
-
-      - name: Build main
-        if: ${{ inputs.ref && inputs.ref != 'main' }}
-        shell: bash
-        run: |
-          cd main
-          pnpm install --frozen-lockfile --prefer-offline --loglevel error
-          pnpm run build
-          cd ..
-
-      - name: Extract package and semver from tag
-        if: ${{ env.REF_TYPE == 'tag' }}
-        id: extract-tag
-        uses: ./packages/actions/src/formatTag
-        with:
-          tag: ${{ inputs.ref || github.ref_name }}
-
-      - name: Apply tag to api-extractor config
-        if: ${{ env.REF_TYPE == 'tag' && !inputs.ref }}
-        run: sed -i 's!https://github.com/discordjs/discord.js/tree/main!https://github.com/discordjs/discord.js/tree/${{ steps.extract-tag.outputs.semver }}!' "packages/${{ steps.extract-tag.outputs.package}}/api-extractor.json"
-
-      - name: Build docs
-        run: pnpm run docs
-
-      - name: Build docs with main api-extractor
-        if: ${{ inputs.ref && inputs.ref != 'main' }}
-        run: |
-          declare -a PACKAGES=("brokers" "builders" "collection" "core" "discord.js" "formatters" "next" "proxy" "rest" "util" "voice" "ws")
-          for PACKAGE in "${PACKAGES[@]}"; do
-            cd "packages/${PACKAGE}"
-            sed -i 's!https://github.com/discordjs/discord.js/tree/main!https://github.com/discordjs/discord.js/tree/${{ inputs.ref }}!' api-extractor.json
-            ../../main/packages/api-extractor/bin/api-extractor run --local --minify
-            ../../main/packages/scripts/bin/generateSplitDocumentation.js
-            cd ../..
-          done
-
-      - name: Checkout docs repository
-        uses: actions/checkout@v4
-        with:
-          repository: 'discordjs/docs'
-          token: ${{ secrets.DJS_DOCS }}
-          path: 'out'
-
-      - name: Upload documentation to database
-        if: ${{ env.REF_TYPE == 'tag' && (!inputs.ref || inputs.ref == 'main') }}
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./packages/actions/src/uploadDocumentation
-        with:
-          package: ${{ steps.extract-tag.outputs.package }}
-          version: ${{ steps.extract-tag.outputs.semver }}
-
-      - name: Upload documentation to database
-        if: ${{ env.REF_TYPE == 'tag' && inputs.ref && inputs.ref != 'main' }}
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./main/packages/actions/src/uploadDocumentation
-        with:
-          package: ${{ steps.extract-tag.outputs.package }}
-          version: ${{ steps.extract-tag.outputs.semver }}
-
-      - name: Upload split documentation to blob storage
-        if: ${{ env.REF_TYPE == 'tag' && (!inputs.ref || inputs.ref == 'main') }}
-        env:
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./packages/actions/src/uploadSplitDocumentation
-        with:
-          package: ${{ steps.extract-tag.outputs.package }}
-          version: ${{ steps.extract-tag.outputs.semver }}
-
-      - name: Upload split documentation to blob storage
-        if: ${{ env.REF_TYPE == 'tag' && inputs.ref && inputs.ref != 'main' }}
-        env:
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./main/packages/actions/src/uploadSplitDocumentation
-        with:
-          package: ${{ steps.extract-tag.outputs.package }}
-          version: ${{ steps.extract-tag.outputs.semver }}
-
-      - name: Move docs to correct directory
-        if: ${{ env.REF_TYPE == 'tag' }}
-        env:
-          PACKAGE: ${{ steps.extract-tag.outputs.package }}
-          SEMVER: ${{ steps.extract-tag.outputs.semver }}
-        run: |
-          mkdir -p "out/${PACKAGE}"
-          if [[ "${PACKAGE}" == "discord.js" ]]; then
-            mv "packages/${PACKAGE}/docs/docs.json" "out/${PACKAGE}/${SEMVER}.json"
-            mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${SEMVER}.api.json"
-          else
-            mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${SEMVER}.api.json"
-          fi
-
-      - name: Upload documentation to database
-        if: ${{ env.REF_TYPE == 'branch' && (!inputs.ref || inputs.ref == 'main') }}
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./packages/actions/src/uploadDocumentation
-
-      - name: Upload documentation to database
-        if: ${{ env.REF_TYPE == 'branch' && inputs.ref && inputs.ref != 'main' }}
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./main/packages/actions/src/uploadDocumentation
-
-      - name: Upload split documentation to blob storage
-        if: ${{ env.REF_TYPE == 'branch' && (!inputs.ref || inputs.ref == 'main') }}
-        env:
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./packages/actions/src/uploadSplitDocumentation
-
-      - name: Upload split documentation to blob storage
-        if: ${{ env.REF_TYPE == 'branch' && inputs.ref && inputs.ref != 'main' }}
-        env:
-          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
-        uses: ./main/packages/actions/src/uploadSplitDocumentation
-
-      - name: Move docs to correct directory
-        if: ${{ env.REF_TYPE == 'branch' }}
-        run: |
-          declare -a PACKAGES=("brokers" "builders" "collection" "core" "discord.js" "formatters" "next" "proxy" "rest" "util" "voice" "ws")
-          for PACKAGE in "${PACKAGES[@]}"; do
-            if [[ "${PACKAGE}" == "discord.js" ]]; then
-              mkdir -p "out/${PACKAGE}"
-              mv "packages/${PACKAGE}/docs/docs.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.json"
-              mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.api.json"
-            else
-              mkdir -p "out/${PACKAGE}"
-              mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.api.json"
-            fi
-          done
-
-      - name: Commit and push
-        run: |
-          cd out
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-          git add .
-          git commit -m "Docs build for ${GITHUB_REF_TYPE} ${GITHUB_REF_NAME}: ${GITHUB_SHA}" || true
-          git push
-
-  build-indices:
-    needs: build-docs
-    name: Build & upload search indices
-    runs-on: ubuntu-latest
-    env:
-      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-    if: github.repository_owner == 'discordjs'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Node.js v20
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install dependencies
-        uses: ./packages/actions/src/pnpmCache
-
-      - name: Build dependencies
-        run: pnpm run build
-
-      - name: Upload search indices to meilisearch
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          SEARCH_API_URL: ${{ secrets.SEARCH_API_URL }}
-          SEARCH_API_KEY: ${{ secrets.SEARCH_API_KEY }}
-        uses: ./packages/actions/src/uploadSearchIndices

.github/workflows/pr-triage.yml

@@ -1,13 +1,35 @@
 name: 'PR Triage'
 on:
   pull_request_target:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
 jobs:
-  pr-triage:
-    name: PR Triage
+  label:
+    name: Label
+    if: github.event.action != 'edited'
     runs-on: ubuntu-latest
     steps:
-      - name: Automatically label PR
+      - name: Label pull request
         uses: actions/labeler@v5
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           sync-labels: true
+  validate-title:
+    name: Validate title
+    if: github.event.action != 'synchronize'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate pull request title
+        env:
+          TITLE: ${{ github.event.pull_request.title }}
+        run: |
+          REGEX="^(revert: )?(feat|fix|docs|style|refactor|perf|test|build|ci|chore|types)(\\(.+\\))?!?: .{1,72}$"
+
+          echo "Title: \"$TITLE\""
+
+          if [[ ! "$TITLE" =~ $REGEX ]]; then
+            exit 1
+          fi

.github/workflows/publish-dev.yml

@@ -72,7 +72,7 @@ jobs:
       - name: Publish package
         if: steps.release-check.outputs.release == '1'
         run: |
-          pnpm --filter=${{ matrix.package }} run release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)"
+          pnpm --filter=${{ matrix.package }} run release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)" --skip-changelog
           pnpm --filter=${{ matrix.package }} publish --provenance --no-git-checks --tag dev || true
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

apps/guide/package.json

@@ -48,8 +48,8 @@
 		"@code-hike/mdx": "^0.9.0",
 		"@discordjs/ui": "workspace:^",
 		"@react-icons/all-files": "^4.1.0",
-		"@vercel/analytics": "^1.2.2",
-		"@vercel/edge-config": "^1.1.0",
+		"@vercel/analytics": "^1.3.1",
+		"@vercel/edge-config": "^1.1.1",
 		"@vercel/og": "^0.6.2",
 		"ariakit": "2.0.0-next.44",
 		"cmdk": "^1.0.0",
@@ -69,29 +69,29 @@
 		"@testing-library/react": "^15.0.7",
 		"@testing-library/user-event": "^14.5.2",
 		"@types/html-escaper": "^3.0.2",
-		"@types/node": "18.18.8",
+		"@types/node": "^18.19.45",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
-		"@unocss/eslint-plugin": "^0.60.2",
-		"@unocss/postcss": "^0.60.2",
-		"@unocss/reset": "^0.60.2",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitest/coverage-v8": "^1.6.0",
+		"@unocss/eslint-plugin": "^0.60.4",
+		"@unocss/postcss": "^0.60.4",
+		"@unocss/reset": "^0.60.4",
+		"@vitejs/plugin-react": "^4.3.0",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"happy-dom": "^14.11.0",
+		"happy-dom": "^14.12.0",
 		"hast-util-to-string": "^2.0.0",
 		"hastscript": "^8.0.0",
 		"html-escaper": "^3.0.3",
 		"postcss": "^8.4.38",
-		"prettier": "^3.2.5",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"unocss": "^0.60.2",
-		"vercel": "^34.0.0",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"unocss": "^0.60.4",
+		"vercel": "^37.0.0",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

apps/guide/src/content/03-topics/03-collectors.mdx

@@ -134,8 +134,8 @@ collector.on('end', (collected) => {
 
 ### Await reactions
 
-<DocsLink type="class" parent="Message" symbol="awaitReactions" brackets /> works almost the same as a reaction collector,
-except it is Promise-based. The same differences apply as with channel collectors.
+<DocsLink type="class" parent="Message" symbol="awaitReactions" brackets /> works almost the same as a reaction
+collector, except it is Promise-based. The same differences apply as with channel collectors.
 
 ```js
 const collectorFilter = (reaction, user) => {

apps/guide/src/content/04-additional-info/03-updating-to-v14.mdx

@@ -158,21 +158,25 @@ Various _`create()`_ and _`edit()`_ methods on managers and objects have had the
 - <DocsLink type="class" parent="Role" symbol="edit" brackets /> now takes _`reason`_ in the _`data`_ parameter
 - <DocsLink type="class" parent="Sticker" symbol="edit" brackets /> now takes _`reason`_ in the _`data`_ parameter
 - <DocsLink type="class" parent="ThreadChannel" symbol="edit" brackets /> now takes _`reason`_ in the _`data`_ parameter
-- <DocsLink type="class" parent="GuildChannelManager" symbol="create" brackets /> now takes _`name`_ in the _`options`_ parameter
+- <DocsLink type="class" parent="GuildChannelManager" symbol="create" brackets /> now takes _`name`_ in the _`options`_
+  parameter
 - <DocsLink type="class" parent="GuildChannelManager" symbol="createWebhook" brackets /> (and other text-based channels)
   now takes _`channel`_ and _`name`_ in the _`options`_ parameter
-- <DocsLink type="class" parent="GuildChannelManager" symbol="edit" brackets /> now takes _`reason`_ as a part of _`data`_
+- <DocsLink type="class" parent="GuildChannelManager" symbol="edit" brackets /> now takes _`reason`_ as a part of
+  _`data`_
 - <DocsLink type="class" parent="GuildEmojiManager" symbol="edit" brackets /> now takes _`reason`_ as a part of _`data`_
 - <DocsLink type="class" parent="GuildManager" symbol="create" brackets /> now takes _`name`_ as a part of _`options`_
-- <DocsLink type="class" parent="GuildMemberManager" symbol="edit" brackets /> now takes _`reason`_ as a part of _`data`_
+- <DocsLink type="class" parent="GuildMemberManager" symbol="edit" brackets /> now takes _`reason`_ as a part of
+  _`data`_
 - <DocsLink type="class" parent="GuildMember" symbol="edit" brackets /> now takes _`reason`_ as a part of _`data`_
-- <DocsLink type="class" parent="GuildStickerManager" symbol="edit" brackets /> now takes _`reason`_ as a part of _`data`_
+- <DocsLink type="class" parent="GuildStickerManager" symbol="edit" brackets /> now takes _`reason`_ as a part of
+  _`data`_
 - <DocsLink type="class" parent="RoleManager" symbol="edit" brackets /> now takes _`reason`_ as a part of _`options`_
 - <DocsLink type="class" parent="Webhook" symbol="edit" brackets /> now takes _`reason`_ as a part of _`options`_
 - <DocsLink type="class" parent="GuildEmojiManager" symbol="create" brackets /> now takes _`attachment`_ and _`name`_ as
   a part of _`options`_
-- <DocsLink type="class" parent="GuildStickerManager" symbol="create" brackets /> now takes _`file`_, _`name`_, and _`tags`_
-  as a part of _`options`_
+- <DocsLink type="class" parent="GuildStickerManager" symbol="create" brackets /> now takes _`file`_, _`name`_, and
+  _`tags`_ as a part of _`options`_
 
 ### Activity
 
@@ -236,9 +240,10 @@ Dynamic URLs use <DocsLink package="rest" type="Interface" parent="ImageURLOptio
 
 ### CategoryChannel
 
-<DocsLink type="class" parent="CategoryChannel" symbol="children" /> is no longer a _`Collection`_ of channels the category
-contains. It is now a <DocsLink type="class" parent="CategoryChannelChildManager" />. This also means
-_`CategoryChannel#createChannel()`_ has been moved to the <DocsLink type="class" parent="CategoryChannelChildManager" />.
+<DocsLink type="class" parent="CategoryChannel" symbol="children" /> is no longer a _`Collection`_ of channels the
+category contains. It is now a <DocsLink type="class" parent="CategoryChannelChildManager" />. This also means
+_`CategoryChannel#createChannel()`_ has been moved to the <DocsLink type="class" parent="CategoryChannelChildManager" />
+.
 
 ### Channel
 
@@ -262,8 +267,8 @@ The _`restWsBridgeTimeout`_ client option has been removed.
 
 ### CommandInteractionOptionResolver
 
-<DocsLink type="class" parent="CommandInteractionOptionResolver" symbol="getMember" brackets /> no longer has a parameter
-for _`required`_.[^1]
+<DocsLink type="class" parent="CommandInteractionOptionResolver" symbol="getMember" brackets /> no longer has a
+parameter for _`required`_.[^1]
 
 ### Constants
 
@@ -357,7 +362,8 @@ The following properties & methods have been moved to the <DocsLink type="class"
 
 ### GuildMember
 
-<DocsLink type="class" parent="GuildMember" symbol="pending" /> is now nullable to account for partial guild members.[^4]
+<DocsLink type="class" parent="GuildMember" symbol="pending" /> is now nullable to account for partial guild
+members.[^4]
 
 ### IntegrationApplication
 
@@ -582,8 +588,8 @@ _`Role.comparePositions()`_ has been removed. Use <DocsLink type="class" parent=
 
 ### Sticker
 
-<DocsLink type="class" parent="Sticker" symbol="tags" /> is now a nullable string (_`string | null`_). Previously, it was
-a nullable array of strings (_`string[] | null`_).[^5]
+<DocsLink type="class" parent="Sticker" symbol="tags" /> is now a nullable string (_`string | null`_). Previously, it
+was a nullable array of strings (_`string[] | null`_).[^5]
 
 ### ThreadChannel
 
@@ -668,8 +674,8 @@ Added support for <DocsLink type="class" parent="BaseChannel" symbol="flags" />.
 
 Store channels have been removed as they are no longer part of the API.
 
-<DocsLink type="class" parent="BaseChannel" symbol="url" /> has been added which is a link to a channel, just like in the
-client.
+<DocsLink type="class" parent="BaseChannel" symbol="url" /> has been added which is a link to a channel, just like in
+the client.
 
 Additionally, new typeguards have been added:
 
@@ -713,13 +719,13 @@ Component collector options now use the <DiscordAPITypesLink type="enum" parent=
 
 ### CommandInteraction
 
-<DocsLink type="class" parent="CommandInteraction" symbol="commandGuildId" /> has been added which is the id of the guild
-the invoked application command is registered to.
+<DocsLink type="class" parent="CommandInteraction" symbol="commandGuildId" /> has been added which is the id of the
+guild the invoked application command is registered to.
 
 ### CommandInteractionOptionResolver
 
-<DocsLink type="class" parent="CommandInteractionOptionResolver" symbol="getChannel" brackets /> now has a third parameter
-which narrows the channel type.
+<DocsLink type="class" parent="CommandInteractionOptionResolver" symbol="getChannel" brackets /> now has a third
+parameter which narrows the channel type.
 
 ### Events
 
@@ -814,9 +820,15 @@ Added the _`threadName`_ property in <DocsLink type="typedef" parent="WebhookMes
 discord.js uses <DocsLink package="ws" /> internally.
 
 [^1]: https://github.com/discordjs/discord.js/pull/7188
+
 [^2]: https://github.com/discordjs/discord.js/pull/6492
+
 [^3]: https://github.com/discordjs/discord.js/pull/7669
+
 [^4]: https://github.com/discordjs/discord.js/issues/6546
+
 [^5]: https://github.com/discordjs/discord.js/pull/8010
+
 [^6]: https://github.com/discordjs/discord.js/issues/7091
+
 [^7]: https://github.com/discord/discord-api-docs/pull/6017

apps/website/package.json

@@ -49,38 +49,37 @@
 	"dependencies": {
 		"@radix-ui/react-collapsible": "^1.0.3",
 		"@react-icons/all-files": "^4.1.0",
-		"@vercel/analytics": "^1.3.0",
-		"@vercel/blob": "^0.23.3",
+		"@vercel/analytics": "^1.3.1",
 		"@vercel/edge-config": "^1.1.1",
 		"@vercel/og": "^0.6.2",
-		"@vercel/postgres": "^0.8.0",
+		"@vercel/postgres": "^0.9.0",
 		"cmdk": "^1.0.0",
 		"geist": "^1.3.0",
-		"jotai": "^2.8.1",
+		"jotai": "^2.8.2",
 		"lucide-react": "^0.379.0",
 		"meilisearch": "^0.40.0",
 		"next": "^15.0.0-rc.0",
 		"next-mdx-remote-client": "^1.0.3",
 		"next-themes": "^0.3.0",
-		"overlayscrollbars": "^2.8.2",
+		"overlayscrollbars": "^2.8.3",
 		"overlayscrollbars-react": "^0.5.6",
-		"react": "^19.0.0-rc-4c2e457c7c-20240522",
+		"react": "19.0.0-rc-f994737d14-20240522",
 		"react-aria-components": "^1.2.1",
-		"react-dom": "^19.0.0-rc-4c2e457c7c-20240522",
+		"react-dom": "19.0.0-rc-f994737d14-20240522",
 		"sharp": "^0.33.4",
 		"usehooks-ts": "^3.1.0",
 		"vaul": "^0.9.1"
 	},
 	"devDependencies": {
-		"@shikijs/rehype": "^1.6.0",
+		"@shikijs/rehype": "^1.6.2",
 		"@tailwindcss/typography": "^0.5.13",
 		"@testing-library/react": "^15.0.7",
 		"@testing-library/user-event": "^14.5.2",
-		"@types/node": "18.18.8",
+		"@types/node": "^18.19.45",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitest/coverage-v8": "^1.6.0",
+		"@vitejs/plugin-react": "^4.3.0",
+		"@vitest/coverage-v8": "^2.0.5",
 		"autoprefixer": "^10.4.19",
 		"babel-plugin-react-compiler": "0.0.0-experimental-592953e-20240517",
 		"cpy-cli": "^5.0.0",
@@ -88,18 +87,18 @@
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"happy-dom": "^14.11.0",
+		"happy-dom": "^14.12.0",
 		"postcss": "^8.4.38",
-		"prettier": "^3.2.5",
+		"prettier": "^3.3.3",
 		"prettier-plugin-tailwindcss": "^0.5.14",
 		"remark-gfm": "^4.0.0",
 		"remark-rehype": "^11.1.0",
-		"shiki": "^1.6.0",
+		"shiki": "^1.6.2",
 		"tailwindcss": "^3.4.3",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vercel": "^34.2.2",
-		"vitest": "^1.5.0"
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vercel": "^37.0.0",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

apps/website/src/components/Badges.tsx

@@ -18,8 +18,9 @@ export async function Badges({ node }: { readonly node: any }) {
 	const isAbstract = node.isAbstract;
 	const isReadonly = node.isReadonly;
 	const isOptional = node.isOptional;
+	const isExternal = node.isExternal;
 
-	const isAny = isDeprecated || isProtected || isStatic || isAbstract || isReadonly || isOptional;
+	const isAny = isDeprecated || isProtected || isStatic || isAbstract || isReadonly || isOptional || isExternal;
 
 	return isAny ? (
 		<div className="mb-1 flex gap-3">
@@ -33,6 +34,7 @@ export async function Badges({ node }: { readonly node: any }) {
 			{isAbstract ? <Badge className="bg-cyan-500/20 text-cyan-500">abstract</Badge> : null}
 			{isReadonly ? <Badge className="bg-purple-500/20 text-purple-500">readonly</Badge> : null}
 			{isOptional ? <Badge className="bg-cyan-500/20 text-cyan-500">optional</Badge> : null}
+			{isExternal ? <Badge className="bg-purple-500/20 text-purple-500">external</Badge> : null}
 		</div>
 	) : null;
 }

apps/website/src/components/DocNode.tsx

@@ -30,7 +30,7 @@ export async function DocNode({ node, version }: { readonly node?: any; readonly
 							rel="external noreferrer noopener"
 							target="_blank"
 						>
-							{`${node.text}${node.members}`}
+							{`${node.text}${node.members ?? ''}`}
 						</a>
 					);
 				}

apps/website/src/components/ExcerptNode.tsx

@@ -4,7 +4,7 @@ import { BuiltinDocumentationLinks } from '~/util/builtinDocumentationLinks';
 
 export async function ExcerptNode({ node, version }: { readonly node?: any; readonly version: string }) {
 	const createExcerpt = (excerpts: any) => {
-		const excerpt = Array.isArray(excerpts) ? excerpts : excerpts.excerpts ?? [excerpts];
+		const excerpt = Array.isArray(excerpts) ? excerpts : (excerpts.excerpts ?? [excerpts]);
 
 		return (
 			<span

package.json

@@ -28,7 +28,7 @@
 	"contributors": [
 		"Crawl <icrawltogo@gmail.com>",
 		"Amish Shah <amishshah.2k@gmail.com>",
-		"Vlad Frangu <kingdgrizzle@gmail.com>",
+		"Vlad Frangu <me@vladfrangu.dev>",
 		"SpaceEEC <spaceeec@yahoo.com>",
 		"Aura Román <kyradiscord@gmail.com>"
 	],
@@ -50,28 +50,28 @@
 	"homepage": "https://discord.js.org",
 	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"devDependencies": {
-		"@commitlint/cli": "^19.2.2",
-		"@commitlint/config-angular": "^19.2.2",
-		"@favware/cliff-jumper": "^3.0.2",
+		"@commitlint/cli": "^19.4.0",
+		"@commitlint/config-angular": "^19.3.0",
+		"@favware/cliff-jumper": "^4.1.0",
 		"@favware/npm-deprecate": "^1.0.7",
 		"@types/lodash.merge": "^4.6.9",
-		"@unocss/eslint-plugin": "^0.59.3",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@unocss/eslint-plugin": "^0.59.4",
+		"@vitest/coverage-v8": "^2.0.5",
 		"conventional-changelog-cli": "^4.1.0",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
-		"husky": "^9.0.11",
+		"husky": "^9.1.5",
 		"is-ci": "^3.0.1",
-		"lint-staged": "^15.2.2",
+		"lint-staged": "^15.2.9",
 		"lodash.merge": "^4.6.2",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"typescript-eslint": "^7.7.0",
-		"unocss": "^0.60.2",
-		"vercel": "^34.0.0",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"typescript-eslint": "^8.2.0",
+		"unocss": "^0.60.4",
+		"vercel": "^37.0.0",
+		"vitest": "^2.0.5"
 	},
 	"pnpm": {
 		"peerDependencyRules": {
@@ -97,5 +97,5 @@
 	"engines": {
 		"node": ">=18"
 	},
-	"packageManager": "pnpm@9.1.1"
+	"packageManager": "pnpm@9.8.0"
 }

packages/actions/package.json

@@ -42,27 +42,27 @@
 	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"dependencies": {
 		"@actions/core": "^1.10.1",
-		"@actions/glob": "^0.4.0",
+		"@actions/glob": "^0.5.0",
 		"@discordjs/scripts": "workspace:^",
-		"@vercel/blob": "^0.22.3",
-		"@vercel/postgres": "^0.8.0",
+		"@vercel/blob": "^0.23.4",
+		"@vercel/postgres": "^0.9.0",
 		"meilisearch": "^0.38.0",
-		"p-limit": "^5.0.0",
-		"tslib": "^2.6.2",
-		"undici": "6.13.0"
+		"p-limit": "^6.1.0",
+		"tslib": "^2.6.3",
+		"undici": "6.21.1"
 	},
 	"devDependencies": {
-		"@types/node": "18.18.8",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@types/node": "^18.19.45",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

packages/actions/src/formatTag/formatTag.ts

@@ -4,7 +4,7 @@ export function formatTag(tag: string) {
 
 	if (parsed?.groups) {
 		const isSubpackage = typeof parsed.groups.package === 'string';
-		const pkg = isSubpackage ? parsed.groups.package : parsedPackage?.groups?.package ?? 'discord.js';
+		const pkg = isSubpackage ? parsed.groups.package : (parsedPackage?.groups?.package ?? 'discord.js');
 		const semver = parsed.groups.semver;
 
 		return {

packages/actions/src/uploadCoverage/action.yml

@@ -8,99 +8,127 @@ runs:
   using: 'composite'
   steps:
     - name: Upload Guide Coverage
+      if: ${{ hashFiles('apps/guide/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./apps/guide/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: guide
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Website Coverage
+      if: ${{ hashFiles('apps/website/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./apps/website/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: website
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Brokers Coverage
+      if: ${{ hashFiles('packages/brokers/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/brokers/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: brokers
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Builders Coverage
+      if: ${{ hashFiles('packages/builders/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/builders/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: builders
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Collection Coverage
+      if: ${{ hashFiles('packages/collection/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/collection/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: collection
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Discord.js Coverage
+      if: ${{ hashFiles('packages/discord.js/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/discord.js/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: discord.js
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Formatters Coverage
+      if: ${{ hashFiles('packages/formatters/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/formatters/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: formatters
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Next Coverage
+      if: ${{ hashFiles('packages/next/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/next/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: next
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Proxy Coverage
+      if: ${{ hashFiles('packages/proxy/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/proxy/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: proxy
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Rest Coverage
+      if: ${{ hashFiles('packages/rest/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/rest/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: rest
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Voice Coverage
+      if: ${{ hashFiles('packages/voice/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/voice/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: voice
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload WS Coverage
+      if: ${{ hashFiles('packages/ws/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/ws/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: ws
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Util Coverage
+      if: ${{ hashFiles('packages/util/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/util/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: util
         token: ${{ inputs.CODECOV_TOKEN }}
 
     - name: Upload Utilities Coverage
+      if: ${{ hashFiles('packages/actions/coverage/cobertura-coverage.xml') != '' || hashFiles('packages/scripts/coverage/cobertura-coverage.xml') != '' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./packages/actions/coverage/cobertura-coverage.xml, ./packages/scripts/coverage/cobertura-coverage.xml
+        disable_search: true
         flags: utilities
         token: ${{ inputs.CODECOV_TOKEN }}

packages/actions/src/uploadSearchIndices/index.ts

@@ -53,7 +53,6 @@ try {
 	console.log('Uploading indices...');
 
 	try {
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
 		promises = indices.map(async (index) =>
 			limit(async () => {
 				console.log(`Uploading ${index.index}...`);

packages/api-extractor-model/package.json

@@ -37,14 +37,15 @@
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.12",
-		"@types/node": "^18.19.22",
+		"@types/node": "^18.19.45",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
 		"jest": "^29.7.0",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4"
 	}
 }

packages/api-extractor-model/src/model/ApiPackage.ts

@@ -380,7 +380,7 @@ export class ApiPackage extends ApiItemContainerMixin(ApiNameMixin(ApiDocumented
 				toolPackage: ioptions.toolPackage ?? packageJson.name,
 				// In test mode, we don't write the real version, since that would cause spurious diffs whenever
 				// the version is bumped.  Instead we write a placeholder string.
-				toolVersion: ioptions.testMode ? '[test mode]' : ioptions.toolVersion ?? packageJson.version,
+				toolVersion: ioptions.testMode ? '[test mode]' : (ioptions.toolVersion ?? packageJson.version),
 				schemaVersion: ApiJsonSchemaVersion.LATEST,
 				oldestForwardsCompatibleVersion: ApiJsonSchemaVersion.OLDEST_FORWARDS_COMPATIBLE,
 				tsdocConfig,

packages/api-extractor-model/src/model/Deserializer.ts

@@ -182,7 +182,9 @@ export interface DocgenJson {
 }
 
 function formatVarType(type: DocgenVarTypeJson): string {
-	return (Array.isArray(type) ? type : type.types ?? []).map((t1) => t1.map((t2) => t2.join('')).join('')).join(' | ');
+	return (Array.isArray(type) ? type : (type.types ?? []))
+		.map((t1) => t1.map((t2) => t2.join('')).join(''))
+		.join(' | ');
 }
 
 function getFirstType(type: DocgenVarTypeJson): string {
@@ -192,7 +194,7 @@ function getFirstType(type: DocgenVarTypeJson): string {
 // function mapEvent(_event: DocgenEventJson, _package: string, _parent: DocgenClassJson): void {}
 
 function mapVarType(type: DocgenVarTypeJson, _package: string): IExcerptToken[] {
-	const mapper = Array.isArray(type) ? type : type.types ?? [];
+	const mapper = Array.isArray(type) ? type : (type.types ?? []);
 	return mapper.flatMap((typ) =>
 		typ.reduce<IExcerptToken[]>(
 			(arr, [_class, symbol]) => [

packages/api-extractor-model/src/model/ModelReferenceResolver.ts

@@ -115,6 +115,7 @@ export class ModelReferenceResolver {
 			if (memberSelector === undefined) {
 				if (foundMembers.length > 1) {
 					const foundClass: ApiItem | undefined = foundMembers.find((member) => member.kind === ApiItemKind.Class);
+					const foundEvent: ApiItem | undefined = foundMembers.find((member) => member.kind === ApiItemKind.Event);
 					if (
 						foundClass &&
 						foundMembers.filter((member) => member.kind === ApiItemKind.Interface).length === foundMembers.length - 1
@@ -124,6 +125,11 @@ export class ModelReferenceResolver {
 						foundMembers.every((member) => member.kind === ApiItemKind.Method && (member as ApiMethod).overloadIndex)
 					) {
 						currentItem = foundMembers.find((member) => (member as ApiMethod).overloadIndex === 1)!;
+					} else if (
+						foundEvent &&
+						foundMembers.filter((member) => member.kind === ApiItemKind.Method).length === foundMembers.length - 1
+					) {
+						currentItem = foundEvent;
 					} else {
 						result.errorMessage = `The member reference ${JSON.stringify(identifier)} was ambiguous`;
 						return result;

packages/api-extractor-utils/package.json

@@ -50,15 +50,15 @@
 		"@microsoft/tsdoc": "0.14.2"
 	},
 	"devDependencies": {
-		"@types/node": "18.18.8",
+		"@types/node": "^18.19.45",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4"
 	},
 	"engines": {
 		"node": ">=18"

packages/api-extractor-utils/src/parse.ts

@@ -199,7 +199,7 @@ export function genToken(model: ApiModel, token: ExcerptToken, version: string)
 	}
 
 	const item = token.canonicalReference
-		? model.resolveDeclarationReference(token.canonicalReference, undefined).resolvedApiItem ?? null
+		? (model.resolveDeclarationReference(token.canonicalReference, undefined).resolvedApiItem ?? null)
 		: null;
 
 	return {

packages/api-extractor/package.json

@@ -61,12 +61,12 @@
 		"resolve": "~1.22.1",
 		"semver": "~7.5.4",
 		"source-map": "0.6.1",
-		"typescript": "^5.4.5"
+		"typescript": "~5.5.4"
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.12",
-		"@types/lodash": "^4.17.0",
-		"@types/node": "^18.19.22",
+		"@types/lodash": "^4.17.4",
+		"@types/node": "^18.19.45",
 		"@types/resolve": "^1.20.6",
 		"@types/semver": "^7.5.8",
 		"cpy-cli": "^5.0.0",
@@ -75,8 +75,8 @@
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
 		"jest": "^29.7.0",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14"
 	}
 }

packages/api-extractor/src/generators/ApiModelGenerator.ts

@@ -114,7 +114,7 @@ interface DocgenEventJson {
 }
 
 interface DocgenParamJson {
-	default?: string;
+	default?: boolean | number | string;
 	description: string;
 	name: string;
 	nullable?: boolean;
@@ -155,7 +155,7 @@ interface DocgenMethodJson {
 interface DocgenPropertyJson {
 	abstract?: boolean;
 	access?: DocgenAccess;
-	default?: string;
+	default?: boolean | number | string;
 	deprecated?: DocgenDeprecated;
 	description: string;
 	meta: DocgenMetaJson;
@@ -1264,7 +1264,7 @@ export class ApiModelGenerator {
 				const apiItemMetadata: ApiItemMetadata = this._collector.fetchApiItemMetadata(astDeclaration);
 				const docComment: tsdoc.DocComment | undefined = jsDoc
 					? this._tsDocParser.parseString(
-							`/**\n * ${this._fixLinkTags(jsDoc.description) ?? ''}\n${
+							`/**\n * ${this._fixLinkTags(jsDoc.description) ?? ''}${jsDoc.default ? ` (default: ${this._escapeSpecialChars(jsDoc.default)})` : ''}\n${
 								'see' in jsDoc ? jsDoc.see.map((see) => ` * @see ${see}\n`).join('') : ''
 							}${'readonly' in jsDoc && jsDoc.readonly ? ' * @readonly\n' : ''}${
 								'deprecated' in jsDoc && jsDoc.deprecated
@@ -1342,7 +1342,7 @@ export class ApiModelGenerator {
 				const apiItemMetadata: ApiItemMetadata = this._collector.fetchApiItemMetadata(astDeclaration);
 				const docComment: tsdoc.DocComment | undefined = jsDoc
 					? this._tsDocParser.parseString(
-							`/**\n * ${this._fixLinkTags(jsDoc.description) ?? ''}\n${
+							`/**\n * ${this._fixLinkTags(jsDoc.description) ?? ''}${jsDoc.default ? ` (default: ${this._escapeSpecialChars(jsDoc.default)})` : ''}\n${
 								'see' in jsDoc ? jsDoc.see.map((see) => ` * @see ${see}\n`).join('') : ''
 							}${'readonly' in jsDoc && jsDoc.readonly ? ' * @readonly\n' : ''}${
 								'deprecated' in jsDoc && jsDoc.deprecated
@@ -1423,7 +1423,9 @@ export class ApiModelGenerator {
 						}${
 							'returns' in jsDoc
 								? jsDoc.returns
-										.map((ret) => ` * @returns ${Array.isArray(ret) ? '' : this._fixLinkTags(ret.description) ?? ''}\n`)
+										.map(
+											(ret) => ` * @returns ${Array.isArray(ret) ? '' : (this._fixLinkTags(ret.description) ?? '')}\n`,
+										)
 										.join('')
 								: ''
 						} */`,
@@ -1744,6 +1746,14 @@ export class ApiModelGenerator {
 		return sourceLocation;
 	}
 
+	private _escapeSpecialChars(input: boolean | number | string) {
+		if (typeof input !== 'string') {
+			return input;
+		}
+
+		return input.replaceAll(/(?<char>[{}])/g, '\\$<char>');
+	}
+
 	private _fixLinkTags(input?: string): string | undefined {
 		return input
 			?.replaceAll(linkRegEx, (_match, _p1, _p2, _p3, _p4, _p5, _offset, _string, groups) => {
@@ -1764,7 +1774,7 @@ export class ApiModelGenerator {
 	}
 
 	private _mapVarType(typey: DocgenVarTypeJson): IExcerptToken[] {
-		const mapper = Array.isArray(typey) ? typey : typey.types ?? [];
+		const mapper = Array.isArray(typey) ? typey : (typey.types ?? []);
 		const lookup: { [K in ts.SyntaxKind]?: string } = {
 			[ts.SyntaxKind.ClassDeclaration]: 'class',
 			[ts.SyntaxKind.EnumDeclaration]: 'enum',
@@ -1788,18 +1798,20 @@ export class ApiModelGenerator {
 						{
 							kind: type?.includes("'") ? ExcerptTokenKind.Content : ExcerptTokenKind.Reference,
 							text: fixPrimitiveTypes(type ?? 'unknown', symbol),
-							canonicalReference: type?.includes("'")
-								? undefined
-								: DeclarationReference.package(pkg)
-										.addNavigationStep(
-											Navigation.Members as any,
-											DeclarationReference.parseComponent(type ?? 'unknown'),
-										)
-										.withMeaning(
-											(lookup[astSymbol?.astDeclarations.at(-1)?.declaration.kind ?? ts.SyntaxKind.ClassDeclaration] ??
-												'class') as Meaning,
-										)
-										.toString(),
+							canonicalReference:
+								type?.includes("'") || !astEntity
+									? undefined
+									: DeclarationReference.package(pkg)
+											.addNavigationStep(
+												Navigation.Members as any,
+												DeclarationReference.parseComponent(type ?? 'unknown'),
+											)
+											.withMeaning(
+												(lookup[
+													astSymbol?.astDeclarations.at(-1)?.declaration.kind ?? ts.SyntaxKind.ClassDeclaration
+												] ?? 'class') as Meaning,
+											)
+											.toString(),
 						},
 						{ kind: ExcerptTokenKind.Content, text: symbol ?? '' },
 					];
@@ -1819,7 +1831,7 @@ export class ApiModelGenerator {
 			isOptional: Boolean(prop.nullable),
 			isReadonly: Boolean(prop.readonly),
 			docComment: this._tsDocParser.parseString(
-				`/**\n * ${this._fixLinkTags(prop.description) ?? ''}\n${
+				`/**\n * ${this._fixLinkTags(prop.description) ?? ''}${prop.default ? ` (default: ${this._escapeSpecialChars(prop.default)})` : ''}\n${
 					prop.see?.map((see) => ` * @see ${see}\n`).join('') ?? ''
 				}${prop.readonly ? ' * @readonly\n' : ''} */`,
 			).docComment,
@@ -1867,7 +1879,7 @@ export class ApiModelGenerator {
 					: `${method.access ? `${method.access} ` : ''}${method.scope === 'static' ? 'static ' : ''}${method.name}(`
 			}${
 				method.params?.length
-					? `${method.params[0]!.name}${method.params[0]!.nullable || method.params[0]!.optional ? '?' : ''}`
+					? `${method.params[0]!.name}${method.params[0]!.nullable || method.params[0]!.optional ? '?' : ''}: `
 					: '): '
 			}`,
 		});

packages/brokers/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/brokers@1.0.0](https://github.com/discordjs/discord.js/compare/@discordjs/brokers@0.3.0...@discordjs/brokers@1.0.0) - (2024-09-01)
+
+## Refactor
+
+- **brokers:** Re-design API to make groups a constructor option (#10297) ([38a37b5](https://github.com/discordjs/discord.js/commit/38a37b5caf06913131c6dc2dc5cc258aecfe2266))
+- **brokers:** Make option props more correct (#10242) ([393ded4](https://github.com/discordjs/discord.js/commit/393ded4ea14e73b2bb42226f57896130329f88ca))
+  - **BREAKING CHANGE:** Classes now take redis client as standalone parameter, various props from the base option interface moved to redis options
+
 # [@discordjs/brokers@0.3.0](https://github.com/discordjs/discord.js/compare/@discordjs/brokers@0.2.3...@discordjs/brokers@0.3.0) - (2024-05-04)
 
 ## Bug Fixes

packages/brokers/cliff.toml

@@ -5,13 +5,16 @@ header = """
 All notable changes to this project will be documented in this file.\n
 """
 body = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
 {% if version %}\
 	# [{{ version | trim_start_matches(pat="v") }}]\
 	{% if previous %}\
 		{% if previous.version %}\
-			(https://github.com/discordjs/discord.js/compare/{{ previous.version }}...{{ version }})\
+			({{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }})\
 		{% else %}\
-			(https://github.com/discordjs/discord.js/tree/{{ version }})\
+			({{ self::remote_url() }}/tree/{{ version }})\
 		{% endif %}\
 	{% endif %} \
 	- ({{ timestamp | date(format="%Y-%m-%d") }})
@@ -24,14 +27,21 @@ body = """
 		- {% if commit.scope %}\
 			**{{commit.scope}}:** \
 		  {% endif %}\
-			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/discordjs/discord.js/commit/{{ commit.id }}))\
+			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
+			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
 			{% for breakingChange in commit.footers %}\
 				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
-{% endfor %}\n
+{% endfor %}\
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length %}\
+	\n### New Contributors\n
+	{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}\
+		* @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }}
+	{% endfor %}\
+{% endif %}\n
 """
 trim = true
 footer = ""
@@ -59,5 +69,9 @@ commit_parsers = [
 filter_commits = true
 tag_pattern = "@discordjs/brokers@[0-9]*"
 ignore_tags = ""
-topo_order = true
+topo_order = false
 sort_commits = "newest"
+
+[remote.github]
+owner = "discordjs"
+repo = "discord.js"

packages/brokers/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/brokers",
-	"version": "0.3.0",
+	"version": "1.0.0",
 	"description": "Powerful set of message brokers",
 	"scripts": {
 		"test": "vitest run",
@@ -42,7 +42,7 @@
 		"Crawl <icrawltogo@gmail.com>",
 		"Amish Shah <amishshah.2k@gmail.com>",
 		"SpaceEEC <spaceeec@yahoo.com>",
-		"Vlad Frangu <kingdgrizzle@gmail.com>",
+		"Vlad Frangu <me@vladfrangu.dev>",
 		"Aura Roman <kyradiscord@gmail.com>",
 		"DD <didinele.dev@gmail.com>"
 	],
@@ -68,25 +68,25 @@
 	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"dependencies": {
 		"@msgpack/msgpack": "^3.0.0-beta2",
-		"@vladfrangu/async_event_emitter": "^2.2.4",
-		"ioredis": "^5.3.2"
+		"@vladfrangu/async_event_emitter": "^2.4.6",
+		"ioredis": "^5.4.1"
 	},
 	"devDependencies": {
 		"@discordjs/api-extractor": "workspace:^",
 		"@discordjs/scripts": "workspace:^",
-		"@favware/cliff-jumper": "^3.0.2",
-		"@types/node": "18.18.8",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@favware/cliff-jumper": "^4.1.0",
+		"@types/node": "^18.19.45",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.2.1",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

packages/brokers/src/brokers/Broker.ts

@@ -30,17 +30,17 @@ export const DefaultBrokerOptions = {
 } as const satisfies Required<BaseBrokerOptions>;
 
 export type ToEventMap<
-	TRecord extends Record<string, any>,
+	TRecord extends Record<string, any[]>,
 	TResponses extends Record<keyof TRecord, any> | undefined = undefined,
 > = {
 	[TKey in keyof TRecord]: [
 		event: TResponses extends Record<keyof TRecord, any>
 			? { ack(): Promise<void>; reply(data: TResponses[TKey]): Promise<void> }
-			: { ack(): Promise<void> } & { data: TRecord[TKey] },
+			: { ack(): Promise<void>; data: TRecord[TKey] },
 	];
-} & { [K: string]: any };
+};
 
-export interface IBaseBroker<TEvents extends Record<string, any>> {
+export interface IBaseBroker<TEvents extends {}> {
 	/**
 	 * Subscribes to the given events
 	 */
@@ -51,7 +51,7 @@ export interface IBaseBroker<TEvents extends Record<string, any>> {
 	unsubscribe(events: (keyof TEvents)[]): Promise<void>;
 }
 
-export interface IPubSubBroker<TEvents extends Record<string, any>>
+export interface IPubSubBroker<TEvents extends {}>
 	extends IBaseBroker<TEvents>,
 		AsyncEventEmitter<ToEventMap<TEvents>> {
 	/**
@@ -60,7 +60,7 @@ export interface IPubSubBroker<TEvents extends Record<string, any>>
 	publish<Event extends keyof TEvents>(event: Event, data: TEvents[Event]): Promise<void>;
 }
 
-export interface IRPCBroker<TEvents extends Record<string, any>, TResponses extends Record<keyof TEvents, any>>
+export interface IRPCBroker<TEvents extends Record<string, any[]>, TResponses extends Record<keyof TEvents, any>>
 	extends IBaseBroker<TEvents>,
 		AsyncEventEmitter<ToEventMap<TEvents, TResponses>> {
 	/**

packages/brokers/src/brokers/redis/BaseRedis.ts

@@ -57,8 +57,11 @@ export const DefaultRedisBrokerOptions = {
 /**
  * Helper class with shared Redis logic
  */
-export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
-	extends AsyncEventEmitter<ToEventMap<TEvents>>
+export abstract class BaseRedisBroker<
+		TEvents extends Record<string, any[]>,
+		TResponses extends Record<keyof TEvents, any> | undefined = undefined,
+	>
+	extends AsyncEventEmitter<ToEventMap<TEvents, TResponses>>
 	implements IBaseBroker<TEvents>
 {
 	/**
@@ -182,6 +185,7 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 					}
 				}
 			} catch (error) {
+				// @ts-expect-error: Intended
 				this.emit('error', error);
 				break;
 			}

packages/brokers/src/brokers/redis/PubSubRedis.ts

@@ -48,6 +48,7 @@ export class PubSubRedisBroker<TEvents extends Record<string, any>>
 			},
 		};
 
+		// @ts-expect-error: Intended
 		this.emit(event, payload);
 	}
 }

packages/brokers/src/brokers/redis/RPCRedis.ts

@@ -54,8 +54,8 @@ export const DefaultRPCRedisBrokerOptions = {
  * await broker.subscribe('responders', ['testcall']);
  * ```
  */
-export class RPCRedisBroker<TEvents extends Record<string, any>, TResponses extends Record<keyof TEvents, any>>
-	extends BaseRedisBroker<TEvents>
+export class RPCRedisBroker<TEvents extends Record<string, any[]>, TResponses extends Record<keyof TEvents, any>>
+	extends BaseRedisBroker<TEvents, TResponses>
 	implements IRPCBroker<TEvents, TResponses>
 {
 	/**
@@ -125,6 +125,7 @@ export class RPCRedisBroker<TEvents extends Record<string, any>, TResponses exte
 			},
 		};
 
+		// @ts-expect-error: Intended
 		this.emit(event, payload);
 	}
 }

packages/builders/CHANGELOG.md

@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/builders@1.13.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.12.2...@discordjs/builders@1.13.0) - (2025-10-24)
+
+## Features
+
+- V1 builders file uploads support (#11196) ([1417c49](https://github.com/discordjs/discord.js/commit/1417c498a40b843d772ecf88dfff5f87a1665042))
+
+## Testing
+
+- Fix type error ([f780c6a](https://github.com/discordjs/discord.js/commit/f780c6a5500f7ea5c7a1ea7cd6720f6159d9d36e))
+
+# [@discordjs/builders@1.12.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.12.1...@discordjs/builders@1.12.2) - (2025-10-09)
+
+## Bug Fixes
+
+- **Assertions:** Literal default values ([43362c9](https://github.com/discordjs/discord.js/commit/43362c93525f98d72b894eb0fc6b358d30ec45b9))
+
+# [@discordjs/builders@1.12.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.12.0...@discordjs/builders@1.12.1) - (2025-10-08)
+
+## Bug Fixes
+
+- **builders:** Text display component support for modals (#11155) ([99b8436](https://github.com/discordjs/discord.js/commit/99b8436117bc12654278337abc4a23f5bdf4ba46))
+
+# [@discordjs/builders@1.12.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.11.3...@discordjs/builders@1.12.0) - (2025-10-08)
+
+## Features
+
+- **builders:** Modal select menus in builders v1 (#11138) ([ac683b9](https://github.com/discordjs/discord.js/commit/ac683b9d040635de8514c80a9d433d9c6d63701b))
+
+# [@discordjs/builders@1.11.3](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.11.2...@discordjs/builders@1.11.3) - (2025-08-10)
+
+## Bug Fixes
+
+- **contextMenuCommands:** Remove regular expression validation (#10996) ([4906aae](https://github.com/discordjs/discord.js/commit/4906aaea4c0e6e868fa658d3359026eb662fbcb8))
+
+# [@discordjs/builders@1.11.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.10.1...@discordjs/builders@1.11.0) - (2025-04-25)
+
+## Features
+
+- Components v2 in builders v1 (#10787) ([118e682](https://github.com/discordjs/discord.js/commit/118e6826821b3b90f5923e40f167747e0658cfd1))
+
+# [@discordjs/builders@1.10.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.10.0...@discordjs/builders@1.10.1) - (2025-02-10)
+
+## Bug Fixes
+
+- **EmbedBuilder:** Allow empty `name` and `value` on fields (#10747) ([49ef3a8](https://github.com/discordjs/discord.js/commit/49ef3a833eab23d426d5c667e28aa493ddc9cb6c))
+
+# [@discordjs/builders@1.9.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.8.2...@discordjs/builders@1.9.0) - (2024-09-01)
+
+## Features
+
+- User-installable apps (#10227) ([fc0b6f7](https://github.com/discordjs/discord.js/commit/fc0b6f7f8ebd94a4a05fac0c76e49b23752a8e65))
+- **builders:** Update to @sapphire/shapeshift v4 (#10291) ([2d5531f](https://github.com/discordjs/discord.js/commit/2d5531f35c6b4d70f83e46b99c284030108dcf5c))
+- **SlashCommandBuilder:** Add explicit command type when building (#10395) ([b2970bb](https://github.com/discordjs/discord.js/commit/b2970bb2dddf70d2d918fda825059315f35d23f3))
+- Premium buttons (#10353) ([4f59b74](https://github.com/discordjs/discord.js/commit/4f59b740d01b9ff2213949708a36e17da32b89c3))
+- Add user-installable apps support  (#10348) ([9c76bbe](https://github.com/discordjs/discord.js/commit/9c76bbea172d49320f7fdac19ec1a43a49d05116))
+
 # [@discordjs/builders@1.8.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.8.1...@discordjs/builders@1.8.2) - (2024-06-02)
 
 ## Bug Fixes
@@ -270,261 +326,6 @@ All notable changes to this project will be documented in this file.
 
 - Cleanup tests and tsup configs ([6b8ef20](https://github.com/discordjs/discord.js/commit/6b8ef20cb3af5b5cfd176dd0aa0a1a1e98551629))
 
-# [@discordjs/builders@1.6.5](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.4...@discordjs/builders@1.6.5) - (2023-08-17)
-
-## Documentation
-
-- Update Node.js requirement to 16.11.0 (#9764) ([188877c](https://github.com/discordjs/discord.js/commit/188877c50af70f0d5cffb246620fa277435c6ce6))
-
-# [@discordjs/builders@1.6.3](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.2...@discordjs/builders@1.6.3) - (2023-05-01)
-
-## Refactor
-
-- Remove `@discordjs/util` re-export (#9488) ([54ceedf](https://github.com/discordjs/discord.js/commit/54ceedf6c535d4641643d4106b6286cbef09de4a))
-
-# [@discordjs/builders@1.6.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.1...@discordjs/builders@1.6.2) - (2023-05-01)
-
-## Bug Fixes
-
-- **BaseSelectMenuBuilder:** Modify class to be `abstract` (#9358) ([ca4de2d](https://github.com/discordjs/discord.js/commit/ca4de2d9c6bc204e85d1b7eae7eabd23dbeb4475))
-- Correct `@link` tags that involve parents (#9351) ([fbbce3e](https://github.com/discordjs/discord.js/commit/fbbce3eb4ba20bc0c4806ca2259d1f86001594be))
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Reference package names properly (#9426) ([d6bca9b](https://github.com/discordjs/discord.js/commit/d6bca9bb4d976dc069a5039250db7d5b3e9142ef))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-- **builders:** Add some basic documentation (#9359) ([8073561](https://github.com/discordjs/discord.js/commit/8073561824f911d1a18d0b4f1de39f452bc69fa9))
-- Use `@link` in `@see` (#9348) ([d66d113](https://github.com/discordjs/discord.js/commit/d66d1133331b81563588db4500c63a18c3c3dfae))
-
-# [@discordjs/builders@1.6.3](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.2...@discordjs/builders@1.6.3) - (2023-05-01)
-
-## Refactor
-
-- Remove `@discordjs/util` re-export (#9488) ([54ceedf](https://github.com/discordjs/discord.js/commit/54ceedf6c535d4641643d4106b6286cbef09de4a))
-
-# [@discordjs/builders@1.6.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.1...@discordjs/builders@1.6.2) - (2023-05-01)
-
-## Bug Fixes
-
-- **BaseSelectMenuBuilder:** Modify class to be `abstract` (#9358) ([ca4de2d](https://github.com/discordjs/discord.js/commit/ca4de2d9c6bc204e85d1b7eae7eabd23dbeb4475))
-- Correct `@link` tags that involve parents (#9351) ([fbbce3e](https://github.com/discordjs/discord.js/commit/fbbce3eb4ba20bc0c4806ca2259d1f86001594be))
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Reference package names properly (#9426) ([d6bca9b](https://github.com/discordjs/discord.js/commit/d6bca9bb4d976dc069a5039250db7d5b3e9142ef))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-- **builders:** Add some basic documentation (#9359) ([8073561](https://github.com/discordjs/discord.js/commit/8073561824f911d1a18d0b4f1de39f452bc69fa9))
-- Use `@link` in `@see` (#9348) ([d66d113](https://github.com/discordjs/discord.js/commit/d66d1133331b81563588db4500c63a18c3c3dfae))
-
-# [@discordjs/builders@1.6.3](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.2...@discordjs/builders@1.6.3) - (2023-05-01)
-
-## Refactor
-
-- Remove `@discordjs/util` re-export (#9488) ([54ceedf](https://github.com/discordjs/discord.js/commit/54ceedf6c535d4641643d4106b6286cbef09de4a))
-
-# [@discordjs/builders@1.6.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.1...@discordjs/builders@1.6.2) - (2023-05-01)
-
-## Bug Fixes
-
-- **BaseSelectMenuBuilder:** Modify class to be `abstract` (#9358) ([ca4de2d](https://github.com/discordjs/discord.js/commit/ca4de2d9c6bc204e85d1b7eae7eabd23dbeb4475))
-- Correct `@link` tags that involve parents (#9351) ([fbbce3e](https://github.com/discordjs/discord.js/commit/fbbce3eb4ba20bc0c4806ca2259d1f86001594be))
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Reference package names properly (#9426) ([d6bca9b](https://github.com/discordjs/discord.js/commit/d6bca9bb4d976dc069a5039250db7d5b3e9142ef))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-- **builders:** Add some basic documentation (#9359) ([8073561](https://github.com/discordjs/discord.js/commit/8073561824f911d1a18d0b4f1de39f452bc69fa9))
-- Use `@link` in `@see` (#9348) ([d66d113](https://github.com/discordjs/discord.js/commit/d66d1133331b81563588db4500c63a18c3c3dfae))
-
-# [@discordjs/builders@1.6.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.6.1...@discordjs/builders@1.6.2) - (2023-05-01)
-
-## Bug Fixes
-
-- **BaseSelectMenuBuilder:** Modify class to be `abstract` (#9358) ([ca4de2d](https://github.com/discordjs/discord.js/commit/ca4de2d9c6bc204e85d1b7eae7eabd23dbeb4475))
-- Correct `@link` tags that involve parents (#9351) ([fbbce3e](https://github.com/discordjs/discord.js/commit/fbbce3eb4ba20bc0c4806ca2259d1f86001594be))
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Reference package names properly (#9426) ([d6bca9b](https://github.com/discordjs/discord.js/commit/d6bca9bb4d976dc069a5039250db7d5b3e9142ef))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-- **builders:** Add some basic documentation (#9359) ([8073561](https://github.com/discordjs/discord.js/commit/8073561824f911d1a18d0b4f1de39f452bc69fa9))
-- Use `@link` in `@see` (#9348) ([d66d113](https://github.com/discordjs/discord.js/commit/d66d1133331b81563588db4500c63a18c3c3dfae))
-
-# [@discordjs/builders@1.6.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.5.0...@discordjs/builders@1.6.0) - (2023-04-01)
-
-## Bug Fixes
-
-- **scripts:** Accessing tsComment ([d8d5f31](https://github.com/discordjs/discord.js/commit/d8d5f31d3927fd1de62f1fa3a1a6e454243ad87b))
-
-## Features
-
-- **website:** Render syntax and mdx on the server (#9086) ([ee5169e](https://github.com/discordjs/discord.js/commit/ee5169e0aadd7bbfcd752aae614ec0f69602b68b))
-
-# [@discordjs/builders@1.5.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.4.0...@discordjs/builders@1.5.0) - (2023-03-12)
-
-## Documentation
-
-- **EmbedBuilder#spliceFields:** Fix a typo (#9159) ([4367ab9](https://github.com/discordjs/discord.js/commit/4367ab930227048868db3ed8437f6c4507ff32e1))
-- Fix version export (#9049) ([8b70f49](https://github.com/discordjs/discord.js/commit/8b70f497a1207e30edebdecd12b926c981c13d28))
-
-## Features
-
-- **website:** Add support for source file links (#9048) ([f6506e9](https://github.com/discordjs/discord.js/commit/f6506e99c496683ee0ab67db0726b105b929af38))
-- **StringSelectMenu:** Add `spliceOptions()` (#8937) ([a6941d5](https://github.com/discordjs/discord.js/commit/a6941d536ce24ed2b5446a154cbc886b2b97c63a))
-- Add support for nsfw commands (#7976) ([7a51344](https://github.com/discordjs/discord.js/commit/7a5134459c5f06864bf74631d83b96d9c21b72d8))
-- Add `@discordjs/formatters` (#8889) ([3fca638](https://github.com/discordjs/discord.js/commit/3fca638a8470dcea2f79ddb9f18526dbc0017c88))
-
-## Styling
-
-- Run prettier (#9041) ([2798ba1](https://github.com/discordjs/discord.js/commit/2798ba1eb3d734f0cf2eeccd2e16cfba6804873b))
-
-# [@discordjs/builders@1.4.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.3.0...@discordjs/builders@1.4.0) - (2022-11-28)
-
-## Bug Fixes
-
-- Pin @types/node version ([9d8179c](https://github.com/discordjs/discord.js/commit/9d8179c6a78e1c7f9976f852804055964d5385d4))
-
-## Features
-
-- New select menus (#8793) ([5152abf](https://github.com/discordjs/discord.js/commit/5152abf7285581abf7689e9050fdc56c4abb1e2b))
-- Allow punctuation characters in context menus (#8783) ([b521366](https://github.com/discordjs/discord.js/commit/b5213664fa66746daab1673ebe2adf2db3d1522c))
-
-## Typings
-
-- **Formatters:** Allow boolean in `formatEmoji` (#8823) ([ec37f13](https://github.com/discordjs/discord.js/commit/ec37f137fd4fca0fdbdb8a5c83abf32362a8f285))
-
-# [@discordjs/builders@1.3.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.2.0...@discordjs/builders@1.3.0) - (2022-10-08)
-
-## Bug Fixes
-
-- Allow adding forums to `channelTypes` (#8658) ([b1e190c](https://github.com/discordjs/discord.js/commit/b1e190c4f0773a1a739625f5b41026f593515370))
-- **SlashCommandBuilder:** Missing methods in subcommand builder (#8583) ([1c5b78f](https://github.com/discordjs/discord.js/commit/1c5b78fd2130f09c951459cf4c2d637f46c3c2c9))
-- Footer / sidebar / deprecation alert ([ba3e0ed](https://github.com/discordjs/discord.js/commit/ba3e0ed348258fe8e51eefb4aa7379a1230616a9))
-
-## Documentation
-
-- **builders/components:** Document constructors (#8636) ([8444576](https://github.com/discordjs/discord.js/commit/8444576f45da5fdddbf8ba2d91b4cb31a3b51c04))
-- Change name (#8604) ([dd5a089](https://github.com/discordjs/discord.js/commit/dd5a08944c258a847fc4377f1d5e953264ab47d0))
-- Use remarks instead of `Note` in descriptions (#8597) ([f3ce4a7](https://github.com/discordjs/discord.js/commit/f3ce4a75d0c4eafc89a1f0ce9f4964bcbcdae6da))
-
-## Features
-
-- Web-components (#8715) ([0ac3e76](https://github.com/discordjs/discord.js/commit/0ac3e766bd9dbdeb106483fa4bb085d74de346a2))
-- Add `@discordjs/util` (#8591) ([b2ec865](https://github.com/discordjs/discord.js/commit/b2ec865765bf94181473864a627fb63ea8173fd3))
-- Add `chatInputApplicationCommandMention` formatter (#8546) ([d08a57c](https://github.com/discordjs/discord.js/commit/d08a57cadd9d69a734077cc1902d931ab10336db))
-
-## Refactor
-
-- Replace usage of deprecated `ChannelType`s (#8625) ([669c3cd](https://github.com/discordjs/discord.js/commit/669c3cd2566eac68ef38ab522dd6378ba761e8b3))
-- Website components (#8600) ([c334157](https://github.com/discordjs/discord.js/commit/c3341570d983aea9ecc419979d5a01de658c9d67))
-- Use `eslint-config-neon` for packages. (#8579) ([edadb9f](https://github.com/discordjs/discord.js/commit/edadb9fe5dfd9ff51a3cfc9b25cb242d3f9f5241))
-
-## Testing
-
-- Rename incorrect test (#8596) ([ce991dd](https://github.com/discordjs/discord.js/commit/ce991dd1d883f6785b5f4b4b3ac80ef21cb304e7))
-
-## Typings
-
-- **interactions:** Fix `{Slash,ContextMenu}CommandBuilder#toJSON` (#8568) ([b7eb96d](https://github.com/discordjs/discord.js/commit/b7eb96d45670616521fbcca28a657793d91605c7))
-
-# [@discordjs/builders@1.2.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.1.0...@discordjs/builders@1.2.0) - (2022-08-22)
-
-## Features
-
-- **website:** Show `constructor` information (#8540) ([e42fd16](https://github.com/discordjs/discord.js/commit/e42fd1636973b10dd7ed6fb4280ee1a4a8f82007))
-- **website:** Show descriptions for `@typeParam` blocks (#8523) ([e475b63](https://github.com/discordjs/discord.js/commit/e475b63f257f6261d73cb89fee9ecbcdd84e2a6b))
-- **website:** Show parameter descriptions (#8519) ([7f415a2](https://github.com/discordjs/discord.js/commit/7f415a2502bf7ce2025dbcfed9017b0635a19966))
-- **WebSocketShard:** Support new resume url (#8480) ([bc06cc6](https://github.com/discordjs/discord.js/commit/bc06cc638d2f57ab5c600e8cdb6afc8eb2180166))
-
-## Refactor
-
-- Docs design (#8487) ([4ab1d09](https://github.com/discordjs/discord.js/commit/4ab1d09997a18879a9eb9bda39df6f15aa22557e))
-
-# [@discordjs/builders@1.1.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.16.0...@discordjs/builders@1.1.0) - (2022-07-29)
-
-## Bug Fixes
-
-- Use proper format for `@link` text (#8384) ([2655639](https://github.com/discordjs/discord.js/commit/26556390a3800e954974a00c1328ff47d3e67e9a))
-- **Formatters:** Add newline in `codeBlock` (#8369) ([5d8bd03](https://github.com/discordjs/discord.js/commit/5d8bd030d60ef364de3ef5f9963da8bda5c4efd4))
-- **selectMenu:** Allow json to be used for select menu options (#8322) ([6a2d0d8](https://github.com/discordjs/discord.js/commit/6a2d0d8e96d157d5b85cee7f17bffdfff4240074))
-
-## Documentation
-
-- Use link tags (#8382) ([5494791](https://github.com/discordjs/discord.js/commit/549479131318c659f86f0eb18578d597e22522d3))
-
-## Features
-
-- Add channel & message URL formatters (#8371) ([a7deb8f](https://github.com/discordjs/discord.js/commit/a7deb8f89830ead6185c5fb46a49688b6d209ed1))
-
-## Testing
-
-- **builders:** Improve coverage (#8274) ([b7e6238](https://github.com/discordjs/discord.js/commit/b7e62380f2e6b9324d6bba9b9eaa5315080bf66a))
-
-# [@discordjs/builders@0.16.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.15.0...@discordjs/builders@0.16.0) - (2022-07-17)
-
-## Bug Fixes
-
-- Slash command name regex (#8265) ([32f9056](https://github.com/discordjs/discord.js/commit/32f9056b15edede3bab07de96afb4b56d3a9ecca))
-- **TextInputBuilder:** Parse `custom_id`, `label`, and `style` (#8216) ([2d9dfa3](https://github.com/discordjs/discord.js/commit/2d9dfa3c6ea4bb972da2f7e088d148b798c866d9))
-
-## Documentation
-
-- Add codecov coverage badge to readmes (#8226) ([f6db285](https://github.com/discordjs/discord.js/commit/f6db285c073898a749fe4591cbd4463d1896daf5))
-
-## Features
-
-- **builder:** Add max min length in string option (#8214) ([96c8d21](https://github.com/discordjs/discord.js/commit/96c8d21f95eb366c46ae23505ba9054f44821b25))
-- Codecov (#8219) ([f10f4cd](https://github.com/discordjs/discord.js/commit/f10f4cdcd88ca6be7ec735ed3a415ba13da83db0))
-- **docgen:** Update typedoc ([b3346f4](https://github.com/discordjs/discord.js/commit/b3346f4b9b3d4f96443506643d4631dc1c6d7b21))
-- Website (#8043) ([127931d](https://github.com/discordjs/discord.js/commit/127931d1df7a2a5c27923c2f2151dbf3824e50cc))
-- **docgen:** Typescript support ([3279b40](https://github.com/discordjs/discord.js/commit/3279b40912e6aa61507bedb7db15a2b8668de44b))
-- Docgen package (#8029) ([8b979c0](https://github.com/discordjs/discord.js/commit/8b979c0245c42fd824d8e98745ee869f5360fc86))
-
-## Refactor
-
-- **builder:** Remove `unsafe*Builder`s (#8074) ([a4d1862](https://github.com/discordjs/discord.js/commit/a4d18629828234f43f03d1bd4851d4b727c6903b))
-- Remove @sindresorhus/is as it's now esm only (#8133) ([c6f285b](https://github.com/discordjs/discord.js/commit/c6f285b7b089b004776fbeb444fe973a68d158d8))
-- Move all the config files to root (#8033) ([769ea0b](https://github.com/discordjs/discord.js/commit/769ea0bfe78c4f1d413c6b397c604ffe91e39c6a))
-
-## Typings
-
-- Remove expect error (#8242) ([7e6dbaa](https://github.com/discordjs/discord.js/commit/7e6dbaaed900c07d1a04e23bbbf9cd0d1b0501c5))
-- **builder:** Remove casting (#8241) ([8198da5](https://github.com/discordjs/discord.js/commit/8198da5cd0898e06954615a2287853321e7ebbd4))
-
-# [@discordjs/builders@0.15.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.14.0...@discordjs/builders@0.15.0) - (2022-06-06)
-
-## Features
-
-- Allow builders to accept rest params and arrays (#7874) ([ad75be9](https://github.com/discordjs/discord.js/commit/ad75be9a9cf90c8624495df99b75177e6c24022f))
-- Use vitest instead of jest for more speed ([8d8e6c0](https://github.com/discordjs/discord.js/commit/8d8e6c03decd7352a2aa180f6e5bc1a13602539b))
-- Add scripts package for locally used scripts ([f2ae1f9](https://github.com/discordjs/discord.js/commit/f2ae1f9348bfd893332a9060f71a8a5f272a1b8b))
-
-# [@discordjs/builders@0.14.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.13.0...@discordjs/builders@0.14.0) - (2022-06-04)
-
-## Bug Fixes
-
-- **builders:** Leftover invalid null type ([8a7cd10](https://github.com/discordjs/discord.js/commit/8a7cd10554a2a71cd2fe7f6a177b5f4f43464348))
-- **SlashCommandBuilder:** Import `Permissions` correctly (#7921) ([7ce641d](https://github.com/discordjs/discord.js/commit/7ce641d33a4af6586d5e7beffbe7d38619dcf1a2))
-- Add localizations for subcommand builders and option choices (#7862) ([c1b5e73](https://github.com/discordjs/discord.js/commit/c1b5e731daa9cbbfca03a046e47cb1221ee1ed7c))
-
-## Features
-
-- Export types from `interactions/slashCommands/mixins` (#7942) ([68d5169](https://github.com/discordjs/discord.js/commit/68d5169f66c96f8fe5be17a1c01cdd5155607ab2))
-- **builders:** Add new command permissions v2 (#7861) ([de3f157](https://github.com/discordjs/discord.js/commit/de3f1573f07dda294cc0fbb1ca4b659eb2388a12))
-- **builders:** Improve embed errors and predicates (#7795) ([ec8d87f](https://github.com/discordjs/discord.js/commit/ec8d87f93272cc9987f9613735c0361680c4ed1e))
-
-## Refactor
-
-- Use arrays instead of rest parameters for builders (#7759) ([29293d7](https://github.com/discordjs/discord.js/commit/29293d7bbb5ed463e52e5a5853817e5a09cf265b))
-
-## Styling
-
-- Cleanup tests and tsup configs ([6b8ef20](https://github.com/discordjs/discord.js/commit/6b8ef20cb3af5b5cfd176dd0aa0a1a1e98551629))
-
 # [@discordjs/builders@0.13.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.12.0...@discordjs/builders@0.13.0) - (2022-04-17)
 
 ## Bug Fixes

packages/builders/__tests__/components/actionRow.test.ts

@@ -2,7 +2,7 @@ import {
 	ButtonStyle,
 	ComponentType,
 	type APIActionRowComponent,
-	type APIMessageActionRowComponent,
+	type APIComponentInMessageActionRow,
 } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
 import {
@@ -13,7 +13,7 @@ import {
 	StringSelectMenuOptionBuilder,
 } from '../../src/index.js';
 
-const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
+const rowWithButtonData: APIActionRowComponent<APIComponentInMessageActionRow> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -25,7 +25,7 @@ const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 	],
 };
 
-const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
+const rowWithSelectMenuData: APIActionRowComponent<APIComponentInMessageActionRow> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -57,7 +57,7 @@ describe('Action Row Components', () => {
 		});
 
 		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
-			const actionRowData: APIActionRowComponent<APIMessageActionRowComponent> = {
+			const actionRowData: APIActionRowComponent<APIComponentInMessageActionRow> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -92,7 +92,7 @@ describe('Action Row Components', () => {
 		});
 
 		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
+			const rowWithButtonData: APIActionRowComponent<APIComponentInMessageActionRow> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -104,7 +104,7 @@ describe('Action Row Components', () => {
 				],
 			};
 
-			const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
+			const rowWithSelectMenuData: APIActionRowComponent<APIComponentInMessageActionRow> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{

packages/builders/__tests__/components/button.test.ts

@@ -50,6 +50,11 @@ describe('Button Components', () => {
 				button.toJSON();
 			}).not.toThrowError();
 
+			expect(() => {
+				const button = buttonComponent().setSKUId('123456789012345678').setStyle(ButtonStyle.Premium);
+				button.toJSON();
+			}).not.toThrowError();
+
 			expect(() => buttonComponent().setURL('https://google.com')).not.toThrowError();
 		});
 
@@ -101,6 +106,47 @@ describe('Button Components', () => {
 				button.toJSON();
 			}).toThrowError();
 
+			expect(() => {
+				const button = buttonComponent().setStyle(ButtonStyle.Primary).setSKUId('123456789012345678');
+				button.toJSON();
+			}).toThrowError();
+
+			expect(() => {
+				const button = buttonComponent()
+					.setStyle(ButtonStyle.Secondary)
+					.setLabel('button')
+					.setSKUId('123456789012345678');
+
+				button.toJSON();
+			}).toThrowError();
+
+			expect(() => {
+				const button = buttonComponent()
+					.setStyle(ButtonStyle.Success)
+					.setEmoji({ name: '😇' })
+					.setSKUId('123456789012345678');
+
+				button.toJSON();
+			}).toThrowError();
+
+			expect(() => {
+				const button = buttonComponent()
+					.setStyle(ButtonStyle.Danger)
+					.setCustomId('test')
+					.setSKUId('123456789012345678');
+
+				button.toJSON();
+			}).toThrowError();
+
+			expect(() => {
+				const button = buttonComponent()
+					.setStyle(ButtonStyle.Link)
+					.setURL('https://google.com')
+					.setSKUId('123456789012345678');
+
+				button.toJSON();
+			}).toThrowError();
+
 			// @ts-expect-error: Invalid style
 			expect(() => buttonComponent().setStyle(24)).toThrowError();
 			expect(() => buttonComponent().setLabel(longStr)).toThrowError();

packages/builders/__tests__/components/components.test.ts

@@ -3,7 +3,7 @@ import {
 	ComponentType,
 	TextInputStyle,
 	type APIButtonComponent,
-	type APIMessageActionRowComponent,
+	type APIComponentInMessageActionRow,
 	type APISelectMenuComponent,
 	type APITextInputComponent,
 	type APIActionRowComponent,
@@ -27,7 +27,7 @@ describe('createComponentBuilder', () => {
 	);
 
 	test('GIVEN an action row component THEN returns a ActionRowBuilder', () => {
-		const actionRow: APIActionRowComponent<APIMessageActionRowComponent> = {
+		const actionRow: APIActionRowComponent<APIComponentInMessageActionRow> = {
 			components: [],
 			type: ComponentType.ActionRow,
 		};

packages/builders/__tests__/components/fileUpload.test.ts

@@ -0,0 +1,46 @@
+import type { APIFileUploadComponent } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import { FileUploadBuilder } from '../../src/components/fileUpload/FileUpload.js';
+
+describe('File Upload Components', () => {
+	test('Valid builder does not throw.', () => {
+		expect(() => new FileUploadBuilder().setCustomId('file_upload').toJSON()).not.toThrowError();
+		expect(() => new FileUploadBuilder().setCustomId('file_upload').setId(5).toJSON()).not.toThrowError();
+
+		expect(() =>
+			new FileUploadBuilder().setCustomId('file_upload').setMaxValues(5).setMinValues(2).toJSON(),
+		).not.toThrowError();
+
+		expect(() => new FileUploadBuilder().setCustomId('file_upload').setRequired(false).toJSON()).not.toThrowError();
+	});
+
+	test('Invalid builder does throw.', () => {
+		expect(() => new FileUploadBuilder().toJSON()).toThrowError();
+		expect(() => new FileUploadBuilder().setCustomId('file_upload').setId(-3).toJSON()).toThrowError();
+		expect(() => new FileUploadBuilder().setMaxValues(5).setMinValues(2).setId(10).toJSON()).toThrowError();
+		expect(() => new FileUploadBuilder().setCustomId('file_upload').setMaxValues(500).toJSON()).toThrowError();
+
+		expect(() =>
+			new FileUploadBuilder().setCustomId('file_upload').setMinValues(500).setMaxValues(501).toJSON(),
+		).toThrowError();
+
+		expect(() => new FileUploadBuilder().setRequired(false).toJSON()).toThrowError();
+	});
+
+	test('API data equals toJSON().', () => {
+		const fileUploadData = {
+			type: ComponentType.FileUpload,
+			custom_id: 'file_upload',
+			min_values: 4,
+			max_values: 9,
+			required: false,
+		} satisfies APIFileUploadComponent;
+
+		expect(new FileUploadBuilder(fileUploadData).toJSON()).toEqual(fileUploadData);
+
+		expect(
+			new FileUploadBuilder().setCustomId('file_upload').setMinValues(4).setMaxValues(9).setRequired(false).toJSON(),
+		).toEqual(fileUploadData);
+	});
+});

packages/builders/__tests__/components/textInput.test.ts

@@ -100,11 +100,11 @@ describe('Text Input Components', () => {
 				.setPlaceholder('hello')
 				.setStyle(TextInputStyle.Paragraph)
 				.toJSON();
-		}).toThrowError();
+		}).not.toThrowError();
 	});
 
 	test('GIVEN valid input THEN valid JSON outputs are given', () => {
-		const textInputData: APITextInputComponent = {
+		const textInputData = {
 			type: ComponentType.TextInput,
 			label: 'label',
 			custom_id: 'custom id',
@@ -114,7 +114,7 @@ describe('Text Input Components', () => {
 			value: 'value',
 			required: false,
 			style: TextInputStyle.Paragraph,
-		};
+		} satisfies APITextInputComponent;
 
 		expect(new TextInputBuilder(textInputData).toJSON()).toEqual(textInputData);
 		expect(

packages/builders/__tests__/components/v2/container.test.ts

@@ -0,0 +1,248 @@
+import { type APIContainerComponent, ComponentType, SeparatorSpacingSize } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import { ActionRowBuilder } from '../../../src/components/ActionRow.js';
+import { createComponentBuilder } from '../../../src/components/Components.js';
+import { ButtonBuilder } from '../../../src/components/button/Button.js';
+import { ContainerBuilder } from '../../../src/components/v2/Container.js';
+import { FileBuilder } from '../../../src/components/v2/File.js';
+import { MediaGalleryBuilder } from '../../../src/components/v2/MediaGallery.js';
+import { SectionBuilder } from '../../../src/components/v2/Section.js';
+import { SeparatorBuilder } from '../../../src/components/v2/Separator.js';
+import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay.js';
+
+const containerWithTextDisplay: APIContainerComponent = {
+	type: ComponentType.Container,
+	components: [
+		{
+			type: ComponentType.TextDisplay,
+			content: 'test',
+			id: 123,
+		},
+	],
+};
+
+const containerWithSeparatorData: APIContainerComponent = {
+	type: ComponentType.Container,
+	components: [
+		{
+			type: ComponentType.Separator,
+			id: 1_234,
+			spacing: SeparatorSpacingSize.Small,
+			divider: false,
+		},
+	],
+	accent_color: 0x00ff00,
+};
+
+const containerWithSeparatorDataNoColor: APIContainerComponent = {
+	type: ComponentType.Container,
+	components: [
+		{
+			type: ComponentType.Separator,
+			id: 1_234,
+			spacing: SeparatorSpacingSize.Small,
+			divider: false,
+		},
+	],
+};
+
+describe('Container Components', () => {
+	describe('Assertion Tests', () => {
+		test('GIVEN valid components THEN do not throw', () => {
+			expect(() =>
+				new ContainerBuilder().addActionRowComponents(
+					new ActionRowBuilder<ButtonBuilder>().addComponents(new ButtonBuilder()),
+				),
+			).not.toThrowError();
+			expect(() => new ContainerBuilder().addFileComponents(new FileBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().addMediaGalleryComponents(new MediaGalleryBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().addSectionComponents(new SectionBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().addSeparatorComponents(new SeparatorBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().addTextDisplayComponents(new TextDisplayBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().spliceComponents(0, 0, new SeparatorBuilder())).not.toThrowError();
+			expect(() => new ContainerBuilder().addSeparatorComponents([new SeparatorBuilder()])).not.toThrowError();
+			expect(() =>
+				new ContainerBuilder().spliceComponents(0, 0, [{ type: ComponentType.Separator }]),
+			).not.toThrowError();
+		});
+
+		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
+			const containerData: APIContainerComponent = {
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+						id: 3,
+					},
+					{
+						type: ComponentType.Separator,
+						spacing: SeparatorSpacingSize.Large,
+						divider: true,
+						id: 4,
+					},
+					{
+						type: ComponentType.File,
+						file: {
+							url: 'attachment://file.png',
+						},
+						spoiler: false,
+					},
+				],
+				accent_color: 0xff00ff,
+				spoiler: true,
+			};
+
+			expect(new ContainerBuilder(containerData).toJSON()).toEqual(containerData);
+			expect(() => createComponentBuilder({ type: ComponentType.Container, components: [] })).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given', () => {
+			const containerWithTextDisplay: APIContainerComponent = {
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+						id: 123,
+					},
+				],
+			};
+
+			const containerWithSeparatorData: APIContainerComponent = {
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.Separator,
+						id: 1_234,
+						spacing: SeparatorSpacingSize.Small,
+						divider: false,
+					},
+				],
+				accent_color: 0x00ff00,
+			};
+
+			expect(new ContainerBuilder(containerWithTextDisplay).toJSON()).toEqual(containerWithTextDisplay);
+			expect(new ContainerBuilder(containerWithSeparatorData).toJSON()).toEqual(containerWithSeparatorData);
+			expect(() => createComponentBuilder({ type: ComponentType.Container, components: [] })).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
+			const textDisplay = new TextDisplayBuilder().setContent('test').setId(123);
+			const separator = new SeparatorBuilder().setId(1_234).setSpacing(SeparatorSpacingSize.Small).setDivider(false);
+
+			expect(new ContainerBuilder().addTextDisplayComponents(textDisplay).toJSON()).toEqual(containerWithTextDisplay);
+			expect(new ContainerBuilder().addSeparatorComponents(separator).toJSON()).toEqual(
+				containerWithSeparatorDataNoColor,
+			);
+			expect(new ContainerBuilder().addTextDisplayComponents([textDisplay]).toJSON()).toEqual(containerWithTextDisplay);
+			expect(new ContainerBuilder().addSeparatorComponents([separator]).toJSON()).toEqual(
+				containerWithSeparatorDataNoColor,
+			);
+		});
+
+		test('GIVEN valid accent color THEN valid JSON output is given', () => {
+			expect(
+				new ContainerBuilder({
+					components: [
+						{
+							type: ComponentType.TextDisplay,
+							content: 'test',
+						},
+					],
+				})
+					.setAccentColor([255, 0, 255])
+					.toJSON(),
+			).toEqual({
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				accent_color: 0xff00ff,
+			});
+			expect(
+				new ContainerBuilder({
+					components: [
+						{
+							type: ComponentType.TextDisplay,
+							content: 'test',
+						},
+					],
+				})
+					.setAccentColor(0xff00ff)
+					.toJSON(),
+			).toEqual({
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				accent_color: 0xff00ff,
+			});
+			expect(
+				new ContainerBuilder({
+					components: [
+						{
+							type: ComponentType.TextDisplay,
+							content: 'test',
+						},
+					],
+				})
+					.setAccentColor([255, 0, 255])
+					.clearAccentColor()
+					.toJSON(),
+			).toEqual({
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+			});
+			expect(new ContainerBuilder(containerWithSeparatorData).clearAccentColor().toJSON()).toEqual(
+				containerWithSeparatorDataNoColor,
+			);
+		});
+
+		test('GIVEN valid method parameters THEN valid JSON is given', () => {
+			expect(
+				new ContainerBuilder()
+					.addTextDisplayComponents(new TextDisplayBuilder().setId(3).clearId().setContent('test'))
+					.setSpoiler()
+					.toJSON(),
+			).toEqual({
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				spoiler: true,
+			});
+			expect(
+				new ContainerBuilder()
+					.addTextDisplayComponents({ type: ComponentType.TextDisplay, content: 'test' })
+					.setSpoiler(false)
+					.setId(5)
+					.toJSON(),
+			).toEqual({
+				type: ComponentType.Container,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				spoiler: false,
+				id: 5,
+			});
+		});
+	});
+});

packages/builders/__tests__/components/v2/file.test.ts

@@ -0,0 +1,44 @@
+import { ComponentType } from 'discord-api-types/v10';
+import { describe, expect, test } from 'vitest';
+import { FileBuilder } from '../../../src/components/v2/File';
+
+const dummy = {
+	type: ComponentType.File as const,
+	file: { url: 'attachment://owo.png' },
+};
+
+describe('File', () => {
+	describe('File url', () => {
+		test('GIVEN a file with a pre-defined url THEN return valid toJSON data', () => {
+			const file = new FileBuilder({ file: { url: 'attachment://owo.png' } });
+			expect(file.toJSON()).toEqual({ ...dummy, file: { url: 'attachment://owo.png' } });
+		});
+
+		test('GIVEN a file using File#setURL THEN return valid toJSON data', () => {
+			const file = new FileBuilder();
+			file.setURL('attachment://uwu.png');
+
+			expect(file.toJSON()).toEqual({ ...dummy, file: { url: 'attachment://uwu.png' } });
+		});
+
+		test('GIVEN a file with an invalid url THEN throws error', () => {
+			const file = new FileBuilder();
+
+			expect(() => file.setURL('https://google.com')).toThrowError();
+		});
+	});
+
+	describe('File spoiler', () => {
+		test('GIVEN a file with a pre-defined spoiler status THEN return valid toJSON data', () => {
+			const file = new FileBuilder({ ...dummy, spoiler: true });
+			expect(file.toJSON()).toEqual({ ...dummy, spoiler: true });
+		});
+
+		test('GIVEN a file using File#setSpoiler THEN return valid toJSON data', () => {
+			const file = new FileBuilder({ ...dummy });
+			file.setSpoiler(false);
+
+			expect(file.toJSON()).toEqual({ ...dummy, spoiler: false });
+		});
+	});
+});

packages/builders/__tests__/components/v2/mediagallery.test.ts

@@ -0,0 +1,150 @@
+import { type APIMediaGalleryItem, type APIMediaGalleryComponent, ComponentType } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import { createComponentBuilder } from '../../../src/components/Components.js';
+import { MediaGalleryBuilder } from '../../../src/components/v2/MediaGallery.js';
+import { MediaGalleryItemBuilder } from '../../../src/components/v2/MediaGalleryItem.js';
+
+const galleryHttpsDisplay: APIMediaGalleryComponent = {
+	type: ComponentType.MediaGallery,
+	items: [
+		{
+			description: 'test',
+			spoiler: false,
+			media: { url: 'https://discord.com/logo.png' },
+		},
+	],
+};
+
+const galleryAttachmentData: APIMediaGalleryComponent = {
+	type: ComponentType.MediaGallery,
+	items: [
+		{
+			media: { url: 'attachment://file.png' },
+		},
+	],
+	id: 123,
+};
+
+describe('Media Gallery Components', () => {
+	describe('Assertion Tests', () => {
+		test('GIVEN an empty media gallery THEN throws error', () => {
+			const gallery = new MediaGalleryBuilder();
+			expect(() => gallery.toJSON()).toThrow();
+		});
+
+		test('GIVEN valid items THEN do not throw', () => {
+			expect(() => new MediaGalleryBuilder().addItems(new MediaGalleryItemBuilder())).not.toThrowError();
+			expect(() => new MediaGalleryBuilder().spliceItems(0, 0, new MediaGalleryItemBuilder())).not.toThrowError();
+			expect(() => new MediaGalleryBuilder().addItems([new MediaGalleryItemBuilder()])).not.toThrowError();
+			expect(() => new MediaGalleryBuilder().spliceItems(0, 0, [new MediaGalleryItemBuilder()])).not.toThrowError();
+		});
+
+		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
+			const mediaGalleryData: APIMediaGalleryComponent = {
+				type: ComponentType.MediaGallery,
+				items: [
+					{
+						media: { url: 'attachment://file.png' },
+						description: 'test',
+						spoiler: false,
+					},
+					{
+						media: { url: 'https://discord.js.org/logo.jpg' },
+						spoiler: true,
+					},
+				],
+				id: 1_234,
+			};
+
+			expect(new MediaGalleryBuilder(mediaGalleryData).toJSON()).toEqual(mediaGalleryData);
+			expect(() => createComponentBuilder({ type: ComponentType.MediaGallery, items: [] })).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given', () => {
+			const galleryHttpsDisplay: APIMediaGalleryComponent = {
+				type: ComponentType.MediaGallery,
+				items: [
+					{
+						description: 'test',
+						spoiler: false,
+						media: { url: 'https://discord.com/logo.png' },
+					},
+				],
+			};
+
+			const galleryAttachmentData: APIMediaGalleryComponent = {
+				type: ComponentType.MediaGallery,
+				items: [
+					{
+						media: { url: 'attachment://file.png' },
+					},
+				],
+				id: 123,
+			};
+
+			expect(new MediaGalleryBuilder(galleryHttpsDisplay).toJSON()).toEqual(galleryHttpsDisplay);
+			expect(new MediaGalleryBuilder(galleryAttachmentData).toJSON()).toEqual(galleryAttachmentData);
+			expect(() => createComponentBuilder({ type: ComponentType.MediaGallery, items: [] })).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
+			const item1 = new MediaGalleryItemBuilder()
+				.setDescription('test')
+				.setSpoiler(false)
+				.setURL('https://discord.com/logo.png');
+			const item2 = new MediaGalleryItemBuilder().setURL('attachment://file.png');
+
+			expect(new MediaGalleryBuilder().addItems(item1).toJSON()).toEqual(galleryHttpsDisplay);
+			expect(new MediaGalleryBuilder().addItems(item2).setId(123).toJSON()).toEqual(galleryAttachmentData);
+			expect(new MediaGalleryBuilder().addItems([item1]).toJSON()).toEqual(galleryHttpsDisplay);
+			expect(new MediaGalleryBuilder().addItems([item2]).setId(123).toJSON()).toEqual(galleryAttachmentData);
+		});
+
+		test('GIVEN valid JSON options THEN valid JSON output is given 2', () => {
+			const item1: APIMediaGalleryItem = {
+				description: 'test',
+				spoiler: false,
+				media: { url: 'https://discord.com/logo.png' },
+			};
+			const item2 = {
+				media: { url: 'attachment://file.png' },
+			};
+
+			expect(new MediaGalleryBuilder().addItems(item1).toJSON()).toEqual(galleryHttpsDisplay);
+			expect(new MediaGalleryBuilder().addItems(item2).setId(123).toJSON()).toEqual(galleryAttachmentData);
+			expect(new MediaGalleryBuilder().addItems([item1]).toJSON()).toEqual(galleryHttpsDisplay);
+			expect(new MediaGalleryBuilder().addItems([item2]).setId(123).toJSON()).toEqual(galleryAttachmentData);
+		});
+
+		test('GIVEN valid builder callback THEN valid JSON output is given', () => {
+			const item1 = new MediaGalleryItemBuilder()
+				.setDescription('test')
+				.setSpoiler(false)
+				.setURL('https://discord.com/logo.png');
+			const item2 = new MediaGalleryItemBuilder().setURL('attachment://file.png');
+
+			expect(
+				new MediaGalleryBuilder()
+					.addItems((item) => item.setDescription('test').setSpoiler(false).setURL('https://discord.com/logo.png'))
+					.toJSON(),
+			).toEqual(galleryHttpsDisplay);
+			expect(
+				new MediaGalleryBuilder()
+					.spliceItems(0, 0, (item) => item.setURL('attachment://file.png'))
+					.setId(123)
+					.toJSON(),
+			).toEqual(galleryAttachmentData);
+			expect(
+				new MediaGalleryBuilder()
+					.addItems([(item) => item.setDescription('test').setSpoiler(false).setURL('https://discord.com/logo.png')])
+					.toJSON(),
+			).toEqual(galleryHttpsDisplay);
+			expect(
+				new MediaGalleryBuilder()
+					.spliceItems(0, 0, [(item) => item.setDescription('test').clearDescription().setURL('attachment://file.png')])
+					.setId(123)
+					.toJSON(),
+			).toEqual(galleryAttachmentData);
+		});
+	});
+});

packages/builders/__tests__/components/v2/section.test.ts

@@ -0,0 +1,191 @@
+import { type APISectionComponent, ButtonStyle, ComponentType } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import { createComponentBuilder } from '../../../src/components/Components.js';
+import { ButtonBuilder } from '../../../src/components/button/Button.js';
+import { SectionBuilder } from '../../../src/components/v2/Section.js';
+import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay.js';
+import { ThumbnailBuilder } from '../../../src/components/v2/Thumbnail.js';
+
+const sectionWithButtonData: APISectionComponent = {
+	type: ComponentType.Section,
+	components: [
+		{
+			type: ComponentType.TextDisplay,
+			content: 'test',
+		},
+	],
+	accessory: {
+		type: ComponentType.Button,
+		label: 'test',
+		custom_id: '123',
+		style: ButtonStyle.Primary,
+	},
+};
+
+const sectionWithThumbnailData: APISectionComponent = {
+	type: ComponentType.Section,
+	components: [
+		{
+			type: ComponentType.TextDisplay,
+			content: 'test',
+		},
+	],
+	accessory: {
+		type: ComponentType.Thumbnail,
+		media: { url: 'attachment://file.png' },
+		spoiler: true,
+		description: 'test',
+	},
+};
+
+describe('Section Components', () => {
+	describe('Assertion Tests', () => {
+		test('GIVEN valid components THEN do not throw', () => {
+			expect(() => new SectionBuilder().addTextDisplayComponents(new TextDisplayBuilder())).not.toThrowError();
+			expect(() => new SectionBuilder().spliceTextDisplayComponents(0, 0, new TextDisplayBuilder())).not.toThrowError();
+			expect(() => new SectionBuilder().addTextDisplayComponents([new TextDisplayBuilder()])).not.toThrowError();
+			expect(() =>
+				new SectionBuilder().spliceTextDisplayComponents(0, 0, [new TextDisplayBuilder()]),
+			).not.toThrowError();
+		});
+
+		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
+			const sectionData: APISectionComponent = {
+				type: ComponentType.Section,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+						id: 123,
+					},
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				accessory: {
+					type: ComponentType.Thumbnail,
+					media: { url: 'attachment://file.png' },
+				},
+			};
+
+			expect(new SectionBuilder(sectionData).toJSON()).toEqual(sectionData);
+			expect(() =>
+				createComponentBuilder({
+					type: ComponentType.Section,
+					components: [],
+					accessory: { type: ComponentType.Thumbnail, media: { url: 'https://discord.com/logo.png' } },
+				}),
+			).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given', () => {
+			const sectionWithButtonData: APISectionComponent = {
+				type: ComponentType.Section,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				accessory: {
+					type: ComponentType.Button,
+					label: 'test',
+					custom_id: '123',
+					style: ButtonStyle.Primary,
+				},
+			};
+
+			const sectionWithThumbnailData: APISectionComponent = {
+				type: ComponentType.Section,
+				components: [
+					{
+						type: ComponentType.TextDisplay,
+						content: 'test',
+					},
+				],
+				accessory: {
+					type: ComponentType.Thumbnail,
+					media: { url: 'attachment://file.png' },
+					spoiler: true,
+					description: 'test',
+				},
+			};
+
+			expect(new SectionBuilder(sectionWithButtonData).toJSON()).toEqual(sectionWithButtonData);
+			expect(new SectionBuilder(sectionWithThumbnailData).toJSON()).toEqual(sectionWithThumbnailData);
+			expect(() =>
+				createComponentBuilder({
+					type: ComponentType.Section,
+					components: [],
+					accessory: {
+						type: ComponentType.Button,
+						label: 'test',
+						custom_id: '123',
+						style: ButtonStyle.Primary,
+					},
+				}),
+			).not.toThrowError();
+		});
+
+		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
+			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
+			const thumbnail = new ThumbnailBuilder().setDescription('test').setSpoiler().setURL('attachment://file.png');
+			const textDisplay = new TextDisplayBuilder().setContent('test');
+
+			expect(new SectionBuilder().addTextDisplayComponents(textDisplay).setButtonAccessory(button).toJSON()).toEqual(
+				sectionWithButtonData,
+			);
+			expect(
+				new SectionBuilder().addTextDisplayComponents(textDisplay).setThumbnailAccessory(thumbnail).toJSON(),
+			).toEqual(sectionWithThumbnailData);
+			expect(
+				new SectionBuilder()
+					.addTextDisplayComponents([textDisplay])
+					.setButtonAccessory((button) => button.setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123'))
+					.toJSON(),
+			).toEqual(sectionWithButtonData);
+			expect(
+				new SectionBuilder()
+					.addTextDisplayComponents([textDisplay])
+					.setThumbnailAccessory((thumbnail) =>
+						thumbnail.setDescription('test').setSpoiler().setURL('attachment://file.png'),
+					)
+					.toJSON(),
+			).toEqual(sectionWithThumbnailData);
+		});
+
+		test('GIVEN valid builder callback THEN valid JSON output is given', () => {
+			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
+
+			expect(
+				new SectionBuilder()
+					.addTextDisplayComponents((textDisplay) => textDisplay.setContent('test'))
+					.setButtonAccessory(button)
+					.toJSON(),
+			).toEqual(sectionWithButtonData);
+			expect(
+				new SectionBuilder()
+					.spliceTextDisplayComponents(0, 0, (textDisplay) => textDisplay.setContent('test'))
+					.setButtonAccessory(button)
+					.toJSON(),
+			).toEqual(sectionWithButtonData);
+			expect(
+				new SectionBuilder()
+					.addTextDisplayComponents([(textDisplay) => textDisplay.setContent('test')])
+					.setButtonAccessory(button)
+					.toJSON(),
+			).toEqual(sectionWithButtonData);
+			expect(
+				new SectionBuilder()
+					.spliceTextDisplayComponents(0, 0, [(textDisplay) => textDisplay.setContent('test')])
+					.setButtonAccessory(button)
+					.toJSON(),
+			).toEqual(sectionWithButtonData);
+		});
+	});
+});

packages/builders/__tests__/components/v2/separator.test.ts

@@ -0,0 +1,35 @@
+import { ComponentType, SeparatorSpacingSize } from 'discord-api-types/v10';
+import { describe, expect, test } from 'vitest';
+import { SeparatorBuilder } from '../../../src/components/v2/Separator';
+
+describe('Separator', () => {
+	describe('Divider', () => {
+		test('GIVEN a separator with a pre-defined divider THEN return valid toJSON data', () => {
+			const separator = new SeparatorBuilder({ divider: true });
+			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, divider: true });
+		});
+
+		test('GIVEN a separator with a set divider THEN return valid toJSON data', () => {
+			const separator = new SeparatorBuilder().setDivider(false);
+			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, divider: false });
+		});
+	});
+
+	describe('Spacing', () => {
+		test('GIVEN a separator with a pre-defined spacing THEN return valid toJSON data', () => {
+			const separator = new SeparatorBuilder({ spacing: SeparatorSpacingSize.Small });
+			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, spacing: SeparatorSpacingSize.Small });
+		});
+
+		test('GIVEN a separator with a set spacing THEN return valid toJSON data', () => {
+			const separator = new SeparatorBuilder().setSpacing(SeparatorSpacingSize.Large);
+			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, spacing: SeparatorSpacingSize.Large });
+		});
+
+		test('GIVEN a separator with a set spacing THEN clear spacing THEN return valid toJSON data', () => {
+			const separator = new SeparatorBuilder({ spacing: SeparatorSpacingSize.Small });
+			separator.clearSpacing();
+			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator });
+		});
+	});
+});

packages/builders/__tests__/components/v2/textDisplay.test.ts

@@ -0,0 +1,23 @@
+import { ComponentType } from 'discord-api-types/v10';
+import { describe, expect, test } from 'vitest';
+import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay';
+
+describe('TextDisplay', () => {
+	describe('TextDisplay content', () => {
+		test('GIVEN a text display with a pre-defined content THEN return valid toJSON data', () => {
+			const textDisplay = new TextDisplayBuilder({ content: 'foo' });
+			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'foo' });
+		});
+
+		test('GIVEN a text display with a set content THEN return valid toJSON data', () => {
+			const textDisplay = new TextDisplayBuilder().setContent('foo');
+			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'foo' });
+		});
+
+		test('GIVEN a text display with a pre-defined content THEN overwritten content THEN return valid toJSON data', () => {
+			const textDisplay = new TextDisplayBuilder({ content: 'foo' });
+			textDisplay.setContent('bar');
+			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'bar' });
+		});
+	});
+});

packages/builders/__tests__/components/v2/thumbnail.test.ts

@@ -0,0 +1,69 @@
+import { ComponentType } from 'discord-api-types/v10';
+import { describe, expect, test } from 'vitest';
+import { ThumbnailBuilder } from '../../../src/components/v2/Thumbnail';
+
+const dummy = {
+	type: ComponentType.Thumbnail as const,
+	media: { url: 'https://google.com' },
+};
+
+describe('Thumbnail', () => {
+	describe('Thumbnail url', () => {
+		test('GIVEN a thumbnail with a pre-defined url THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ media: { url: 'https://google.com' } });
+			expect(thumbnail.toJSON()).toEqual({ type: ComponentType.Thumbnail, media: { url: 'https://google.com' } });
+		});
+
+		test('GIVEN a thumbnail with a set url THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder().setURL('https://google.com');
+			expect(thumbnail.toJSON()).toEqual({ type: ComponentType.Thumbnail, media: { url: 'https://google.com' } });
+		});
+
+		test.each(['owo', 'discord://user'])('GIVEN a thumbnail with an invalid URL (%s) THEN throws error', (input) => {
+			const thumbnail = new ThumbnailBuilder();
+
+			expect(() => thumbnail.setURL(input)).toThrowError();
+		});
+	});
+
+	describe('Thumbnail description', () => {
+		test('GIVEN a thumbnail with a pre-defined description THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ ...dummy, description: 'foo' });
+			expect(thumbnail.toJSON()).toEqual({ ...dummy, description: 'foo' });
+		});
+
+		test('GIVEN a thumbnail with a set description THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ ...dummy });
+			thumbnail.setDescription('foo');
+
+			expect(thumbnail.toJSON()).toEqual({ ...dummy, description: 'foo' });
+		});
+
+		test('GIVEN a thumbnail with a pre-defined description THEN unset description THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ description: 'foo', ...dummy });
+			thumbnail.clearDescription();
+
+			expect(thumbnail.toJSON()).toEqual({ ...dummy });
+		});
+
+		test('GIVEN a thumbnail with an invalid description THEN throws error', () => {
+			const thumbnail = new ThumbnailBuilder();
+
+			expect(() => thumbnail.setDescription('a'.repeat(1_025))).toThrowError();
+		});
+	});
+
+	describe('Thumbnail spoiler', () => {
+		test('GIVEN a thumbnail with a pre-defined spoiler status THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ ...dummy, spoiler: true });
+			expect(thumbnail.toJSON()).toEqual({ ...dummy, spoiler: true });
+		});
+
+		test('GIVEN a thumbnail with a set spoiler status THEN return valid toJSON data', () => {
+			const thumbnail = new ThumbnailBuilder({ ...dummy });
+			thumbnail.setSpoiler(false);
+
+			expect(thumbnail.toJSON()).toEqual({ ...dummy, spoiler: false });
+		});
+	});
+});

packages/builders/__tests__/interactions/ContextMenuCommands.test.ts

@@ -1,4 +1,4 @@
-import { PermissionFlagsBits } from 'discord-api-types/v10';
+import { ApplicationIntegrationType, InteractionContextType, PermissionFlagsBits } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
 import { ContextMenuCommandAssertions, ContextMenuCommandBuilder } from '../../src/index.js';
 
@@ -16,8 +16,8 @@ describe('Context Menu Commands', () => {
 			// Too short of a name
 			expect(() => ContextMenuCommandAssertions.validateName('')).toThrowError();
 
-			// Invalid characters used
-			expect(() => ContextMenuCommandAssertions.validateName('ABC123$%^&')).toThrowError();
+			// This should be fine, even with trailing and leading spaces (API trims it).
+			expect(() => ContextMenuCommandAssertions.validateName(' 🩵 ABC 123 $%^& ')).not.toThrowError();
 
 			// Too long of a name
 			expect(() =>
@@ -60,8 +60,6 @@ describe('Context Menu Commands', () => {
 			});
 
 			test('GIVEN invalid name THEN throw error', () => {
-				expect(() => getBuilder().setName('$$$')).toThrowError();
-
 				expect(() => getBuilder().setName(' ')).toThrowError();
 			});
 
@@ -144,5 +142,51 @@ describe('Context Menu Commands', () => {
 				expect(() => getBuilder().setDefaultMemberPermissions(1.1)).toThrowError();
 			});
 		});
+
+		describe('contexts', () => {
+			test('GIVEN a builder with valid contexts THEN does not throw an error', () => {
+				expect(() =>
+					getBuilder().setContexts([InteractionContextType.Guild, InteractionContextType.BotDM]),
+				).not.toThrowError();
+
+				expect(() =>
+					getBuilder().setContexts(InteractionContextType.Guild, InteractionContextType.BotDM),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid contexts THEN does throw an error', () => {
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setContexts(999)).toThrowError();
+
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setContexts([999, 998])).toThrowError();
+			});
+		});
+
+		describe('integration types', () => {
+			test('GIVEN a builder with valid integraton types THEN does not throw an error', () => {
+				expect(() =>
+					getBuilder().setIntegrationTypes([
+						ApplicationIntegrationType.GuildInstall,
+						ApplicationIntegrationType.UserInstall,
+					]),
+				).not.toThrowError();
+
+				expect(() =>
+					getBuilder().setIntegrationTypes(
+						ApplicationIntegrationType.GuildInstall,
+						ApplicationIntegrationType.UserInstall,
+					),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid integration types THEN does throw an error', () => {
+				// @ts-expect-error: Invalid integration types
+				expect(() => getBuilder().setIntegrationTypes(999)).toThrowError();
+
+				// @ts-expect-error: Invalid integration types
+				expect(() => getBuilder().setIntegrationTypes([999, 998])).toThrowError();
+			});
+		});
 	});
 });

packages/builders/__tests__/interactions/SlashCommands/SlashCommands.test.ts

@@ -1,4 +1,11 @@
-import { ChannelType, PermissionFlagsBits, type APIApplicationCommandOptionChoice } from 'discord-api-types/v10';
+import {
+	ApplicationCommandType,
+	ApplicationIntegrationType,
+	ChannelType,
+	InteractionContextType,
+	PermissionFlagsBits,
+	type APIApplicationCommandOptionChoice,
+} from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
 import {
 	SlashCommandAssertions,
@@ -127,6 +134,10 @@ describe('Slash Commands', () => {
 		});
 
 		describe('Builder with simple options', () => {
+			test('GIVEN valid builder THEN returns type included', () => {
+				expect(getNamedBuilder().toJSON()).includes({ type: ApplicationCommandType.ChatInput });
+			});
+
 			test('GIVEN valid builder with options THEN does not throw error', () => {
 				expect(() =>
 					getBuilder()
@@ -532,5 +543,51 @@ describe('Slash Commands', () => {
 				expect(() => getBuilder().addChannelOption(getChannelOption()).setDMPermission(false)).not.toThrowError();
 			});
 		});
+
+		describe('contexts', () => {
+			test('GIVEN a builder with valid contexts THEN does not throw an error', () => {
+				expect(() =>
+					getBuilder().setContexts([InteractionContextType.Guild, InteractionContextType.BotDM]),
+				).not.toThrowError();
+
+				expect(() =>
+					getBuilder().setContexts(InteractionContextType.Guild, InteractionContextType.BotDM),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid contexts THEN does throw an error', () => {
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setContexts(999)).toThrowError();
+
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setContexts([999, 998])).toThrowError();
+			});
+		});
+
+		describe('integration types', () => {
+			test('GIVEN a builder with valid integraton types THEN does not throw an error', () => {
+				expect(() =>
+					getBuilder().setIntegrationTypes([
+						ApplicationIntegrationType.GuildInstall,
+						ApplicationIntegrationType.UserInstall,
+					]),
+				).not.toThrowError();
+
+				expect(() =>
+					getBuilder().setIntegrationTypes(
+						ApplicationIntegrationType.GuildInstall,
+						ApplicationIntegrationType.UserInstall,
+					),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid integration types THEN does throw an error', () => {
+				// @ts-expect-error: Invalid integration types
+				expect(() => getBuilder().setIntegrationTypes(999)).toThrowError();
+
+				// @ts-expect-error: Invalid integration types
+				expect(() => getBuilder().setIntegrationTypes([999, 998])).toThrowError();
+			});
+		});
 	});
 });

packages/builders/__tests__/messages/embed.test.ts

@@ -324,12 +324,16 @@ describe('Embed', () => {
 		test('GIVEN an embed using Embed#addFields THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.addFields({ name: 'foo', value: 'bar' });
-			embed.addFields([{ name: 'foo', value: 'bar' }]);
+			embed.addFields([
+				{ name: 'foo', value: 'bar' },
+				{ name: '', value: '' },
+			]);
 
 			expect(embed.toJSON()).toStrictEqual({
 				fields: [
 					{ name: 'foo', value: 'bar' },
 					{ name: 'foo', value: 'bar' },
+					{ name: '', value: '' },
 				],
 			});
 		});
@@ -381,38 +385,24 @@ describe('Embed', () => {
 			expect(() => embed.setFields(Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })))).toThrowError();
 		});
 
-		describe('GIVEN invalid field amount THEN throws error', () => {
-			test('1', () => {
-				const embed = new EmbedBuilder();
+		test('GIVEN invalid field amount THEN throws error', () => {
+			const embed = new EmbedBuilder();
 
-				expect(() =>
-					embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
-				).toThrowError();
-			});
+			expect(() =>
+				embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
+			).toThrowError();
 		});
 
-		describe('GIVEN invalid field name THEN throws error', () => {
-			test('2', () => {
-				const embed = new EmbedBuilder();
+		test('GIVEN invalid field name length THEN throws error', () => {
+			const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields({ name: '', value: 'bar' })).toThrowError();
-			});
+			expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
 		});
 
-		describe('GIVEN invalid field name length THEN throws error', () => {
-			test('3', () => {
-				const embed = new EmbedBuilder();
+		test('GIVEN invalid field value length THEN throws error', () => {
+			const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
-			});
-		});
-
-		describe('GIVEN invalid field value length THEN throws error', () => {
-			test('4', () => {
-				const embed = new EmbedBuilder();
-
-				expect(() => embed.addFields({ name: '', value: 'a'.repeat(1_025) })).toThrowError();
-			});
+			expect(() => embed.addFields({ name: '', value: 'a'.repeat(1_025) })).toThrowError();
 		});
 	});
 });

packages/builders/cliff.toml

@@ -5,13 +5,16 @@ header = """
 All notable changes to this project will be documented in this file.\n
 """
 body = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
 {% if version %}\
 	# [{{ version | trim_start_matches(pat="v") }}]\
 	{% if previous %}\
 		{% if previous.version %}\
-			(https://github.com/discordjs/discord.js/compare/{{ previous.version }}...{{ version }})\
+			({{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }})\
 		{% else %}\
-			(https://github.com/discordjs/discord.js/tree/{{ version }})\
+			({{ self::remote_url() }}/tree/{{ version }})\
 		{% endif %}\
 	{% endif %} \
 	- ({{ timestamp | date(format="%Y-%m-%d") }})
@@ -24,14 +27,21 @@ body = """
 		- {% if commit.scope %}\
 			**{{commit.scope}}:** \
 		  {% endif %}\
-			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/discordjs/discord.js/commit/{{ commit.id }}))\
+			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
+			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
 			{% for breakingChange in commit.footers %}\
 				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
-{% endfor %}\n
+{% endfor %}\
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length %}\
+	\n### New Contributors\n
+	{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}\
+		* @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }}
+	{% endfor %}\
+{% endif %}\n
 """
 trim = true
 footer = ""
@@ -59,5 +69,9 @@ commit_parsers = [
 filter_commits = true
 tag_pattern = "@discordjs/builders@[0-9]*"
 ignore_tags = ""
-topo_order = true
+topo_order = false
 sort_commits = "newest"
+
+[remote.github]
+owner = "discordjs"
+repo = "discord.js"

packages/builders/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/builders",
-	"version": "1.8.2",
+	"version": "1.13.0",
 	"description": "A set of builders that you can use when creating your bot",
 	"scripts": {
 		"test": "vitest run",
@@ -38,7 +38,7 @@
 		"dist"
 	],
 	"contributors": [
-		"Vlad Frangu <kingdgrizzle@gmail.com>",
+		"Vlad Frangu <me@vladfrangu.dev>",
 		"Crawl <icrawltogo@gmail.com>",
 		"Amish Shah <amishshah.2k@gmail.com>",
 		"SpaceEEC <spaceeec@yahoo.com>",
@@ -67,28 +67,28 @@
 	"dependencies": {
 		"@discordjs/formatters": "workspace:^",
 		"@discordjs/util": "workspace:^",
-		"@sapphire/shapeshift": "^3.9.7",
-		"discord-api-types": "0.37.83",
+		"@sapphire/shapeshift": "^4.0.0",
+		"discord-api-types": "^0.38.31",
 		"fast-deep-equal": "^3.1.3",
 		"ts-mixer": "^6.0.4",
-		"tslib": "^2.6.2"
+		"tslib": "^2.6.3"
 	},
 	"devDependencies": {
 		"@discordjs/api-extractor": "workspace:^",
 		"@discordjs/scripts": "workspace:^",
-		"@favware/cliff-jumper": "^3.0.2",
-		"@types/node": "16.18.60",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@favware/cliff-jumper": "^4.1.0",
+		"@types/node": "^16.18.105",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.2.1",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=16.11.0"

packages/builders/src/components/ActionRow.ts

@@ -3,9 +3,9 @@
 import {
 	type APIActionRowComponent,
 	ComponentType,
-	type APIMessageActionRowComponent,
-	type APIModalActionRowComponent,
-	type APIActionRowComponentTypes,
+	type APIComponentInMessageActionRow,
+	type APIComponentInModalActionRow,
+	type APIComponentInActionRow,
 } from 'discord-api-types/v10';
 import { normalizeArray, type RestOrArray } from '../util/normalizeArray.js';
 import { ComponentBuilder } from './Component.js';
@@ -18,13 +18,6 @@ import type { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
 import type { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
 import type { TextInputBuilder } from './textInput/TextInput.js';
 
-/**
- * The builders that may be used for messages.
- */
-export type MessageComponentBuilder =
-	| ActionRowBuilder<MessageActionRowComponentBuilder>
-	| MessageActionRowComponentBuilder;
-
 /**
  * The builders that may be used for modals.
  */
@@ -57,7 +50,7 @@ export type AnyComponentBuilder = MessageActionRowComponentBuilder | ModalAction
  * @typeParam ComponentType - The types of components this action row holds
  */
 export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends ComponentBuilder<
-	APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
+	APIActionRowComponent<APIComponentInMessageActionRow | APIComponentInModalActionRow>
 > {
 	/**
 	 * The components within this action row.
@@ -98,7 +91,7 @@ export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends
 	 * 	.addComponents(button2, button3);
 	 * ```
 	 */
-	public constructor({ components, ...data }: Partial<APIActionRowComponent<APIActionRowComponentTypes>> = {}) {
+	public constructor({ components, ...data }: Partial<APIActionRowComponent<APIComponentInActionRow>> = {}) {
 		super({ type: ComponentType.ActionRow, ...data });
 		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as ComponentType[];
 	}

packages/builders/src/components/Assertions.ts

@@ -3,35 +3,49 @@ import { ButtonStyle, ChannelType, type APIMessageComponentEmoji } from 'discord
 import { isValidationEnabled } from '../util/validation.js';
 import { StringSelectMenuOptionBuilder } from './selectMenu/StringSelectMenuOption.js';
 
-export const customIdValidator = s.string
+export const idValidator = s
+	.number()
+	.safeInt()
+	.greaterThanOrEqual(1)
+	.lessThan(4_294_967_296) // 2^32 - 1
+	.setValidationEnabled(isValidationEnabled);
+
+export const customIdValidator = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(100)
 	.setValidationEnabled(isValidationEnabled);
 
 export const emojiValidator = s
 	.object({
-		id: s.string,
-		name: s.string,
-		animated: s.boolean,
+		id: s.string(),
+		name: s.string(),
+		animated: s.boolean(),
 	})
-	.partial.strict.setValidationEnabled(isValidationEnabled);
+	.partial()
+	.strict()
+	.setValidationEnabled(isValidationEnabled);
 
-export const disabledValidator = s.boolean;
+export const disabledValidator = s.boolean();
 
-export const buttonLabelValidator = s.string
+export const buttonLabelValidator = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(80)
 	.setValidationEnabled(isValidationEnabled);
 
 export const buttonStyleValidator = s.nativeEnum(ButtonStyle);
 
-export const placeholderValidator = s.string.lengthLessThanOrEqual(150).setValidationEnabled(isValidationEnabled);
-export const minMaxValidator = s.number.int
+export const placeholderValidator = s.string().lengthLessThanOrEqual(150).setValidationEnabled(isValidationEnabled);
+export const minMaxValidator = s
+	.number()
+	.int()
 	.greaterThanOrEqual(0)
 	.lessThanOrEqual(25)
 	.setValidationEnabled(isValidationEnabled);
 
-export const labelValueDescriptionValidator = s.string
+export const labelValueDescriptionValidator = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(100)
 	.setValidationEnabled(isValidationEnabled);
@@ -40,18 +54,21 @@ export const jsonOptionValidator = s
 	.object({
 		label: labelValueDescriptionValidator,
 		value: labelValueDescriptionValidator,
-		description: labelValueDescriptionValidator.optional,
-		emoji: emojiValidator.optional,
-		default: s.boolean.optional,
+		description: labelValueDescriptionValidator.optional(),
+		emoji: emojiValidator.optional(),
+		default: s.boolean().optional(),
 	})
 	.setValidationEnabled(isValidationEnabled);
 
 export const optionValidator = s.instance(StringSelectMenuOptionBuilder).setValidationEnabled(isValidationEnabled);
 
-export const optionsValidator = optionValidator.array
+export const optionsValidator = optionValidator
+	.array()
 	.lengthGreaterThanOrEqual(0)
 	.setValidationEnabled(isValidationEnabled);
-export const optionsLengthValidator = s.number.int
+export const optionsLengthValidator = s
+	.number()
+	.int()
 	.greaterThanOrEqual(0)
 	.lessThanOrEqual(25)
 	.setValidationEnabled(isValidationEnabled);
@@ -61,16 +78,17 @@ export function validateRequiredSelectMenuParameters(options: StringSelectMenuOp
 	optionsValidator.parse(options);
 }
 
-export const defaultValidator = s.boolean;
+export const defaultValidator = s.boolean();
 
 export function validateRequiredSelectMenuOptionParameters(label?: string, value?: string) {
 	labelValueDescriptionValidator.parse(label);
 	labelValueDescriptionValidator.parse(value);
 }
 
-export const channelTypesValidator = s.nativeEnum(ChannelType).array.setValidationEnabled(isValidationEnabled);
+export const channelTypesValidator = s.nativeEnum(ChannelType).array().setValidationEnabled(isValidationEnabled);
 
-export const urlValidator = s.string
+export const urlValidator = s
+	.string()
 	.url({
 		allowedProtocols: ['http:', 'https:', 'discord:'],
 	})
@@ -81,21 +99,36 @@ export function validateRequiredButtonParameters(
 	label?: string,
 	emoji?: APIMessageComponentEmoji,
 	customId?: string,
+	skuId?: string,
 	url?: string,
 ) {
-	if (url && customId) {
-		throw new RangeError('URL and custom id are mutually exclusive');
-	}
-
-	if (!label && !emoji) {
-		throw new RangeError('Buttons must have a label and/or an emoji');
-	}
-
-	if (style === ButtonStyle.Link) {
-		if (!url) {
-			throw new RangeError('Link buttons must have a url');
+	if (style === ButtonStyle.Premium) {
+		if (!skuId) {
+			throw new RangeError('Premium buttons must have an SKU id.');
+		}
+
+		if (customId || label || url || emoji) {
+			throw new RangeError('Premium buttons cannot have a custom id, label, URL, or emoji.');
+		}
+	} else {
+		if (skuId) {
+			throw new RangeError('Non-premium buttons must not have an SKU id.');
+		}
+
+		if (url && customId) {
+			throw new RangeError('URL and custom id are mutually exclusive.');
+		}
+
+		if (!label && !emoji) {
+			throw new RangeError('Non-premium buttons must have a label and/or an emoji.');
+		}
+
+		if (style === ButtonStyle.Link) {
+			if (!url) {
+				throw new RangeError('Link buttons must have a URL.');
+			}
+		} else if (url) {
+			throw new RangeError('Non-premium and non-link buttons cannot have a URL.');
 		}
-	} else if (url) {
-		throw new RangeError('Non-link buttons cannot have a url');
 	}
 }

packages/builders/src/components/Component.ts

@@ -1,15 +1,22 @@
 import type { JSONEncodable } from '@discordjs/util';
 import type {
 	APIActionRowComponent,
-	APIActionRowComponentTypes,
+	APIComponentInActionRow,
 	APIBaseComponent,
 	ComponentType,
+	APIMessageComponent,
+	APIModalComponent,
 } from 'discord-api-types/v10';
+import { idValidator } from './Assertions';
 
 /**
  * Any action row component data represented as an object.
  */
-export type AnyAPIActionRowComponent = APIActionRowComponent<APIActionRowComponentTypes> | APIActionRowComponentTypes;
+export type AnyAPIActionRowComponent =
+	| APIActionRowComponent<APIComponentInActionRow>
+	| APIComponentInActionRow
+	| APIMessageComponent
+	| APIModalComponent;
 
 /**
  * The base component builder that contains common symbols for all sorts of components.
@@ -42,4 +49,22 @@ export abstract class ComponentBuilder<
 	public constructor(data: Partial<DataType>) {
 		this.data = data;
 	}
+
+	/**
+	 * Sets the id (not the custom id) for this component.
+	 *
+	 * @param id - The id for this component
+	 */
+	public setId(id: number) {
+		this.data.id = idValidator.parse(id);
+		return this;
+	}
+
+	/**
+	 * Clears the id of this component, defaulting to a default incremented id.
+	 */
+	public clearId() {
+		this.data.id = undefined;
+		return this;
+	}
 }

packages/builders/src/components/Components.ts

@@ -1,18 +1,42 @@
+import type { JSONEncodable } from '@discordjs/util';
 import { ComponentType, type APIMessageComponent, type APIModalComponent } from 'discord-api-types/v10';
 import {
 	ActionRowBuilder,
+	type MessageActionRowComponentBuilder,
 	type AnyComponentBuilder,
-	type MessageComponentBuilder,
 	type ModalComponentBuilder,
 } from './ActionRow.js';
 import { ComponentBuilder } from './Component.js';
 import { ButtonBuilder } from './button/Button.js';
+import { FileUploadBuilder } from './fileUpload/FileUpload.js';
+import { LabelBuilder } from './label/Label.js';
 import { ChannelSelectMenuBuilder } from './selectMenu/ChannelSelectMenu.js';
 import { MentionableSelectMenuBuilder } from './selectMenu/MentionableSelectMenu.js';
 import { RoleSelectMenuBuilder } from './selectMenu/RoleSelectMenu.js';
 import { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
 import { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
 import { TextInputBuilder } from './textInput/TextInput.js';
+import { ContainerBuilder } from './v2/Container.js';
+import { FileBuilder } from './v2/File.js';
+import { MediaGalleryBuilder } from './v2/MediaGallery.js';
+import { SectionBuilder } from './v2/Section.js';
+import { SeparatorBuilder } from './v2/Separator.js';
+import { TextDisplayBuilder } from './v2/TextDisplay.js';
+import { ThumbnailBuilder } from './v2/Thumbnail.js';
+
+/**
+ * The builders that may be used for messages.
+ */
+export type MessageComponentBuilder =
+	| ActionRowBuilder<MessageActionRowComponentBuilder>
+	| ContainerBuilder
+	| FileBuilder
+	| MediaGalleryBuilder
+	| MessageActionRowComponentBuilder
+	| SectionBuilder
+	| SeparatorBuilder
+	| TextDisplayBuilder
+	| ThumbnailBuilder;
 
 /**
  * Components here are mapped to their respective builder.
@@ -50,6 +74,42 @@ export interface MappedComponentTypes {
 	 * The channel select component type is associated with a {@link ChannelSelectMenuBuilder}.
 	 */
 	[ComponentType.ChannelSelect]: ChannelSelectMenuBuilder;
+	/**
+	 * The file component type is associated with a {@link FileBuilder}.
+	 */
+	[ComponentType.File]: FileBuilder;
+	/**
+	 * The separator component type is associated with a {@link SeparatorBuilder}.
+	 */
+	[ComponentType.Separator]: SeparatorBuilder;
+	/**
+	 * The container component type is associated with a {@link ContainerBuilder}.
+	 */
+	[ComponentType.Container]: ContainerBuilder;
+	/**
+	 * The text display component type is associated with a {@link TextDisplayBuilder}.
+	 */
+	[ComponentType.TextDisplay]: TextDisplayBuilder;
+	/**
+	 * The thumbnail component type is associated with a {@link ThumbnailBuilder}.
+	 */
+	[ComponentType.Thumbnail]: ThumbnailBuilder;
+	/**
+	 * The section component type is associated with a {@link SectionBuilder}.
+	 */
+	[ComponentType.Section]: SectionBuilder;
+	/**
+	 * The media gallery component type is associated with a {@link MediaGalleryBuilder}.
+	 */
+	[ComponentType.MediaGallery]: MediaGalleryBuilder;
+	/**
+	 * The label component type is associated with a {@link LabelBuilder}.
+	 */
+	[ComponentType.Label]: LabelBuilder;
+	/**
+	 * The file upload component type is associated with a {@link FileUploadBuilder}.
+	 */
+	[ComponentType.FileUpload]: FileUploadBuilder;
 }
 
 /**
@@ -97,8 +157,48 @@ export function createComponentBuilder(
 			return new MentionableSelectMenuBuilder(data);
 		case ComponentType.ChannelSelect:
 			return new ChannelSelectMenuBuilder(data);
+		case ComponentType.File:
+			return new FileBuilder(data);
+		case ComponentType.Container:
+			return new ContainerBuilder(data);
+		case ComponentType.Section:
+			return new SectionBuilder(data);
+		case ComponentType.Separator:
+			return new SeparatorBuilder(data);
+		case ComponentType.TextDisplay:
+			return new TextDisplayBuilder(data);
+		case ComponentType.Thumbnail:
+			return new ThumbnailBuilder(data);
+		case ComponentType.MediaGallery:
+			return new MediaGalleryBuilder(data);
+		case ComponentType.Label:
+			return new LabelBuilder(data);
+		case ComponentType.FileUpload:
+			return new FileUploadBuilder(data);
 		default:
 			// @ts-expect-error This case can still occur if we get a newer unsupported component type
 			throw new Error(`Cannot properly serialize component type: ${data.type}`);
 	}
 }
+
+function isBuilder<Builder extends JSONEncodable<any>>(
+	builder: unknown,
+	Constructor: new () => Builder,
+): builder is Builder {
+	return builder instanceof Constructor;
+}
+
+export function resolveBuilder<ComponentType extends Record<PropertyKey, any>, Builder extends JSONEncodable<any>>(
+	builder: Builder | ComponentType | ((builder: Builder) => Builder),
+	Constructor: new (data?: ComponentType) => Builder,
+) {
+	if (isBuilder(builder, Constructor)) {
+		return builder;
+	}
+
+	if (typeof builder === 'function') {
+		return builder(new Constructor());
+	}
+
+	return new Constructor(builder);
+}

packages/builders/src/components/button/Button.ts

@@ -1,10 +1,12 @@
 import {
 	ComponentType,
-	type APIMessageComponentEmoji,
 	type APIButtonComponent,
-	type APIButtonComponentWithURL,
 	type APIButtonComponentWithCustomId,
+	type APIButtonComponentWithSKUId,
+	type APIButtonComponentWithURL,
+	type APIMessageComponentEmoji,
 	type ButtonStyle,
+	type Snowflake,
 } from 'discord-api-types/v10';
 import {
 	buttonLabelValidator,
@@ -88,13 +90,24 @@ export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
 		return this;
 	}
 
+	/**
+	 * Sets the SKU id that represents a purchasable SKU for this button.
+	 *
+	 * @remarks Only available when using premium-style buttons.
+	 * @param skuId - The SKU id to use
+	 */
+	public setSKUId(skuId: Snowflake) {
+		(this.data as APIButtonComponentWithSKUId).sku_id = skuId;
+		return this;
+	}
+
 	/**
 	 * Sets the emoji to display on this button.
 	 *
 	 * @param emoji - The emoji to use
 	 */
 	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emojiValidator.parse(emoji);
+		(this.data as Exclude<APIButtonComponent, APIButtonComponentWithSKUId>).emoji = emojiValidator.parse(emoji);
 		return this;
 	}
 
@@ -114,7 +127,7 @@ export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
 	 * @param label - The label to use
 	 */
 	public setLabel(label: string) {
-		this.data.label = buttonLabelValidator.parse(label);
+		(this.data as Exclude<APIButtonComponent, APIButtonComponentWithSKUId>).label = buttonLabelValidator.parse(label);
 		return this;
 	}
 
@@ -124,9 +137,10 @@ export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
 	public toJSON(): APIButtonComponent {
 		validateRequiredButtonParameters(
 			this.data.style,
-			this.data.label,
-			this.data.emoji,
+			(this.data as Exclude<APIButtonComponent, APIButtonComponentWithSKUId>).label,
+			(this.data as Exclude<APIButtonComponent, APIButtonComponentWithSKUId>).emoji,
 			(this.data as APIButtonComponentWithCustomId).custom_id,
+			(this.data as APIButtonComponentWithSKUId).sku_id,
 			(this.data as APIButtonComponentWithURL).url,
 		);
 

packages/builders/src/components/fileUpload/Assertions.ts

@@ -0,0 +1,12 @@
+import { s } from '@sapphire/shapeshift';
+import { ComponentType } from 'discord-api-types/v10';
+import { customIdValidator, idValidator } from '../Assertions.js';
+
+export const fileUploadPredicate = s.object({
+	type: s.literal(ComponentType.FileUpload),
+	id: idValidator.optional(),
+	custom_id: customIdValidator,
+	min_values: s.number().greaterThanOrEqual(0).lessThanOrEqual(10).optional(),
+	max_values: s.number().greaterThanOrEqual(1).lessThanOrEqual(10).optional(),
+	required: s.boolean().optional(),
+});

packages/builders/src/components/fileUpload/FileUpload.ts

@@ -0,0 +1,99 @@
+import { type APIFileUploadComponent, ComponentType } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component.js';
+import { fileUploadPredicate } from './Assertions.js';
+
+/**
+ * A builder that creates API-compatible JSON data for file uploads.
+ */
+export class FileUploadBuilder extends ComponentBuilder<APIFileUploadComponent> {
+	/**
+	 * Creates a new file upload.
+	 *
+	 * @param data - The API data to create this file upload with
+	 * @example
+	 * Creating a file upload from an API data object:
+	 * ```ts
+	 * const fileUpload = new FileUploadBuilder({
+	 * 	custom_id: "file_upload",
+	 *  min_values: 2,
+	 *  max_values: 5,
+	 * });
+	 * ```
+	 * @example
+	 * Creating a file upload using setters and API data:
+	 * ```ts
+	 * const fileUpload = new FileUploadBuilder({
+	 * 	custom_id: "file_upload",
+	 *  min_values: 2,
+	 *  max_values: 5,
+	 * }).setRequired();
+	 * ```
+	 */
+	public constructor(data: Partial<APIFileUploadComponent> = {}) {
+		super({ type: ComponentType.FileUpload, ...data });
+	}
+
+	/**
+	 * Sets the custom id for this file upload.
+	 *
+	 * @param customId - The custom id to use
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customId;
+		return this;
+	}
+
+	/**
+	 * Sets the minimum number of file uploads required.
+	 *
+	 * @param minValues - The minimum values that must be uploaded
+	 */
+	public setMinValues(minValues: number) {
+		this.data.min_values = minValues;
+		return this;
+	}
+
+	/**
+	 * Clears the minimum values.
+	 */
+	public clearMinValues() {
+		this.data.min_values = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets the maximum number of file uploads required.
+	 *
+	 * @param maxValues - The maximum values that must be uploaded
+	 */
+	public setMaxValues(maxValues: number) {
+		this.data.max_values = maxValues;
+		return this;
+	}
+
+	/**
+	 * Clears the maximum values.
+	 */
+	public clearMaxValues() {
+		this.data.max_values = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets whether this file upload is required.
+	 *
+	 * @param required - Whether this file upload is required
+	 */
+	public setRequired(required = true) {
+		this.data.required = required;
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APIFileUploadComponent {
+		fileUploadPredicate.parse(this.data);
+		return this.data as APIFileUploadComponent;
+	}
+}

packages/builders/src/components/label/Assertions.ts

@@ -0,0 +1,31 @@
+import { s } from '@sapphire/shapeshift';
+import { ComponentType } from 'discord-api-types/v10';
+import { isValidationEnabled } from '../../util/validation.js';
+import { idValidator } from '../Assertions.js';
+import { fileUploadPredicate } from '../fileUpload/Assertions.js';
+import {
+	selectMenuChannelPredicate,
+	selectMenuMentionablePredicate,
+	selectMenuRolePredicate,
+	selectMenuStringPredicate,
+	selectMenuUserPredicate,
+} from '../selectMenu/Assertions.js';
+import { textInputPredicate } from '../textInput/Assertions.js';
+
+export const labelPredicate = s
+	.object({
+		id: idValidator.optional(),
+		type: s.literal(ComponentType.Label),
+		label: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(45),
+		description: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100).optional(),
+		component: s.union([
+			textInputPredicate,
+			selectMenuUserPredicate,
+			selectMenuRolePredicate,
+			selectMenuMentionablePredicate,
+			selectMenuChannelPredicate,
+			selectMenuStringPredicate,
+			fileUploadPredicate,
+		]),
+	})
+	.setValidationEnabled(isValidationEnabled);

packages/builders/src/components/label/Label.ts

@@ -0,0 +1,213 @@
+import type {
+	APIChannelSelectComponent,
+	APIFileUploadComponent,
+	APILabelComponent,
+	APIMentionableSelectComponent,
+	APIRoleSelectComponent,
+	APIStringSelectComponent,
+	APITextInputComponent,
+	APIUserSelectComponent,
+} from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component.js';
+import { createComponentBuilder, resolveBuilder } from '../Components.js';
+import { FileUploadBuilder } from '../fileUpload/FileUpload.js';
+import { ChannelSelectMenuBuilder } from '../selectMenu/ChannelSelectMenu.js';
+import { MentionableSelectMenuBuilder } from '../selectMenu/MentionableSelectMenu.js';
+import { RoleSelectMenuBuilder } from '../selectMenu/RoleSelectMenu.js';
+import { StringSelectMenuBuilder } from '../selectMenu/StringSelectMenu.js';
+import { UserSelectMenuBuilder } from '../selectMenu/UserSelectMenu.js';
+import { TextInputBuilder } from '../textInput/TextInput.js';
+import { labelPredicate } from './Assertions.js';
+
+export interface LabelBuilderData extends Partial<Omit<APILabelComponent, 'component'>> {
+	component?:
+		| ChannelSelectMenuBuilder
+		| FileUploadBuilder
+		| MentionableSelectMenuBuilder
+		| RoleSelectMenuBuilder
+		| StringSelectMenuBuilder
+		| TextInputBuilder
+		| UserSelectMenuBuilder;
+}
+
+/**
+ * A builder that creates API-compatible JSON data for labels.
+ */
+export class LabelBuilder extends ComponentBuilder<LabelBuilderData> {
+	/**
+	 * @internal
+	 */
+	public override readonly data: LabelBuilderData;
+
+	/**
+	 * Creates a new label.
+	 *
+	 * @param data - The API data to create this label with
+	 * @example
+	 * Creating a label from an API data object:
+	 * ```ts
+	 * const label = new LabelBuilder({
+	 * 	label: "label",
+	 * 	component,
+	 * });
+	 * ```
+	 * @example
+	 * Creating a label using setters and API data:
+	 * ```ts
+	 * const label = new LabelBuilder({
+	 * 	label: 'label',
+	 * 	component,
+	 * }).setLabel('new text');
+	 * ```
+	 */
+	public constructor(data: Partial<APILabelComponent> = {}) {
+		super({ type: ComponentType.Label });
+
+		const { component, ...rest } = data;
+
+		this.data = {
+			...rest,
+			component: component ? createComponentBuilder(component) : undefined,
+			type: ComponentType.Label,
+		};
+	}
+
+	/**
+	 * Sets the label for this label.
+	 *
+	 * @param label - The label to use
+	 */
+	public setLabel(label: string) {
+		this.data.label = label;
+		return this;
+	}
+
+	/**
+	 * Sets the description for this label.
+	 *
+	 * @param description - The description to use
+	 */
+	public setDescription(description: string) {
+		this.data.description = description;
+		return this;
+	}
+
+	/**
+	 * Clears the description for this label.
+	 */
+	public clearDescription() {
+		this.data.description = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets a string select menu component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setStringSelectMenuComponent(
+		input:
+			| APIStringSelectComponent
+			| StringSelectMenuBuilder
+			| ((builder: StringSelectMenuBuilder) => StringSelectMenuBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, StringSelectMenuBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a user select menu component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setUserSelectMenuComponent(
+		input: APIUserSelectComponent | UserSelectMenuBuilder | ((builder: UserSelectMenuBuilder) => UserSelectMenuBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, UserSelectMenuBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a role select menu component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setRoleSelectMenuComponent(
+		input: APIRoleSelectComponent | RoleSelectMenuBuilder | ((builder: RoleSelectMenuBuilder) => RoleSelectMenuBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, RoleSelectMenuBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a mentionable select menu component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setMentionableSelectMenuComponent(
+		input:
+			| APIMentionableSelectComponent
+			| MentionableSelectMenuBuilder
+			| ((builder: MentionableSelectMenuBuilder) => MentionableSelectMenuBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, MentionableSelectMenuBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a channel select menu component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setChannelSelectMenuComponent(
+		input:
+			| APIChannelSelectComponent
+			| ChannelSelectMenuBuilder
+			| ((builder: ChannelSelectMenuBuilder) => ChannelSelectMenuBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, ChannelSelectMenuBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a text input component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setTextInputComponent(
+		input: APITextInputComponent | TextInputBuilder | ((builder: TextInputBuilder) => TextInputBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, TextInputBuilder);
+		return this;
+	}
+
+	/**
+	 * Sets a file upload component to this label.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public setFileUploadComponent(
+		input: APIFileUploadComponent | FileUploadBuilder | ((builder: FileUploadBuilder) => FileUploadBuilder),
+	): this {
+		this.data.component = resolveBuilder(input, FileUploadBuilder);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(): APILabelComponent {
+		const { component, ...rest } = this.data;
+
+		const data = {
+			...rest,
+			// The label predicate validates the component.
+			component: component?.toJSON(),
+		};
+
+		labelPredicate.parse(data);
+
+		return data as APILabelComponent;
+	}
+}

packages/builders/src/components/selectMenu/Assertions.ts

@@ -0,0 +1,92 @@
+import { Result, s } from '@sapphire/shapeshift';
+import { ChannelType, ComponentType, SelectMenuDefaultValueType } from 'discord-api-types/v10';
+import { isValidationEnabled } from '../../util/validation.js';
+import { customIdValidator, emojiValidator, idValidator } from '../Assertions.js';
+import { labelValidator } from '../textInput/Assertions.js';
+
+const selectMenuBasePredicate = s.object({
+	id: idValidator.optional(),
+	placeholder: s.string().lengthLessThanOrEqual(150).optional(),
+	min_values: s.number().greaterThanOrEqual(0).lessThanOrEqual(25).optional(),
+	max_values: s.number().greaterThanOrEqual(0).lessThanOrEqual(25).optional(),
+	custom_id: customIdValidator,
+	disabled: s.boolean().optional(),
+});
+
+export const selectMenuChannelPredicate = selectMenuBasePredicate
+	.extend({
+		type: s.literal(ComponentType.ChannelSelect),
+		channel_types: s.nativeEnum(ChannelType).array().optional(),
+		default_values: s
+			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.Channel) })
+			.array()
+			.lengthLessThanOrEqual(25)
+			.optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const selectMenuMentionablePredicate = selectMenuBasePredicate
+	.extend({
+		type: s.literal(ComponentType.MentionableSelect),
+		default_values: s
+			.object({
+				id: s.string(),
+				type: s.union([s.literal(SelectMenuDefaultValueType.Role), s.literal(SelectMenuDefaultValueType.User)]),
+			})
+			.array()
+			.lengthLessThanOrEqual(25)
+			.optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const selectMenuRolePredicate = selectMenuBasePredicate
+	.extend({
+		type: s.literal(ComponentType.RoleSelect),
+		default_values: s
+			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.Role) })
+			.array()
+			.lengthLessThanOrEqual(25)
+			.optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const selectMenuUserPredicate = selectMenuBasePredicate
+	.extend({
+		type: s.literal(ComponentType.UserSelect),
+		default_values: s
+			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.User) })
+			.array()
+			.lengthLessThanOrEqual(25)
+			.optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const selectMenuStringOptionPredicate = s
+	.object({
+		label: labelValidator,
+		value: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100),
+		description: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100).optional(),
+		emoji: emojiValidator.optional(),
+		default: s.boolean().optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const selectMenuStringPredicate = selectMenuBasePredicate
+	.extend({
+		type: s.literal(ComponentType.StringSelect),
+		options: selectMenuStringOptionPredicate.array().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(25),
+	})
+	.reshape((value) => {
+		if (value.min_values !== undefined && value.options.length < value.min_values) {
+			return Result.err(new RangeError(`The number of options must be greater than or equal to min_values`));
+		}
+
+		if (value.min_values !== undefined && value.max_values !== undefined && value.min_values > value.max_values) {
+			return Result.err(
+				new RangeError(`The maximum amount of options must be greater than or equal to the minimum amount of options`),
+			);
+		}
+
+		return Result.ok(value);
+	})
+	.setValidationEnabled(isValidationEnabled);

packages/builders/src/components/selectMenu/BaseSelectMenu.ts

@@ -1,6 +1,7 @@
 import type { APISelectMenuComponent } from 'discord-api-types/v10';
 import { customIdValidator, disabledValidator, minMaxValidator, placeholderValidator } from '../Assertions.js';
 import { ComponentBuilder } from '../Component.js';
+import { requiredValidator } from '../textInput/Assertions.js';
 
 /**
  * The base select menu builder that contains common symbols for select menu builders.
@@ -60,6 +61,17 @@ export abstract class BaseSelectMenuBuilder<
 		return this;
 	}
 
+	/**
+	 * Sets whether this select menu is required.
+	 *
+	 * @remarks Only for use in modals.
+	 * @param required - Whether this select menu is required
+	 */
+	public setRequired(required = true) {
+		this.data.required = requiredValidator.parse(required);
+		return this;
+	}
+
 	/**
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */

packages/builders/src/components/textInput/Assertions.ts

@@ -1,27 +1,45 @@
 import { s } from '@sapphire/shapeshift';
-import { TextInputStyle } from 'discord-api-types/v10';
+import { ComponentType, TextInputStyle } from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
-import { customIdValidator } from '../Assertions.js';
+import { customIdValidator, idValidator } from '../Assertions.js';
 
-export const textInputStyleValidator = s.nativeEnum(TextInputStyle);
-export const minLengthValidator = s.number.int
+export const textInputStyleValidator = s.nativeEnum(TextInputStyle).setValidationEnabled(isValidationEnabled);
+export const minLengthValidator = s
+	.number()
+	.int()
 	.greaterThanOrEqual(0)
 	.lessThanOrEqual(4_000)
 	.setValidationEnabled(isValidationEnabled);
-export const maxLengthValidator = s.number.int
+export const maxLengthValidator = s
+	.number()
+	.int()
 	.greaterThanOrEqual(1)
 	.lessThanOrEqual(4_000)
 	.setValidationEnabled(isValidationEnabled);
-export const requiredValidator = s.boolean;
-export const valueValidator = s.string.lengthLessThanOrEqual(4_000).setValidationEnabled(isValidationEnabled);
-export const placeholderValidator = s.string.lengthLessThanOrEqual(100).setValidationEnabled(isValidationEnabled);
-export const labelValidator = s.string
+export const requiredValidator = s.boolean().setValidationEnabled(isValidationEnabled);
+export const valueValidator = s.string().lengthLessThanOrEqual(4_000).setValidationEnabled(isValidationEnabled);
+export const placeholderValidator = s.string().lengthLessThanOrEqual(100).setValidationEnabled(isValidationEnabled);
+export const labelValidator = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(45)
 	.setValidationEnabled(isValidationEnabled);
 
-export function validateRequiredParameters(customId?: string, style?: TextInputStyle, label?: string) {
+export const textInputPredicate = s
+	.object({
+		type: s.literal(ComponentType.TextInput),
+		custom_id: customIdValidator,
+		style: textInputStyleValidator,
+		id: idValidator.optional(),
+		min_length: minLengthValidator.optional(),
+		max_length: maxLengthValidator.optional(),
+		placeholder: placeholderValidator.optional(),
+		value: valueValidator.optional(),
+		required: requiredValidator.optional(),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export function validateRequiredParameters(customId?: string, style?: TextInputStyle) {
 	customIdValidator.parse(customId);
 	textInputStyleValidator.parse(style);
-	labelValidator.parse(label);
 }

packages/builders/src/components/textInput/TextInput.ts

@@ -30,7 +30,7 @@ export class TextInputBuilder
 	 * ```ts
 	 * const textInput = new TextInputBuilder({
 	 * 	custom_id: 'a cool text input',
-	 * 	label: 'Type something',
+	 * 	placeholder: 'Type something',
 	 * 	style: TextInputStyle.Short,
 	 * });
 	 * ```
@@ -38,7 +38,7 @@ export class TextInputBuilder
 	 * Creating a text input using setters and API data:
 	 * ```ts
 	 * const textInput = new TextInputBuilder({
-	 * 	label: 'Type something else',
+	 * 	placeholder: 'Type something else',
 	 * })
 	 * 	.setCustomId('woah')
 	 * 	.setStyle(TextInputStyle.Paragraph);
@@ -62,6 +62,7 @@ export class TextInputBuilder
 	 * Sets the label for this text input.
 	 *
 	 * @param label - The label to use
+	 * @deprecated Use a label builder to create a label (and optionally a description) instead.
 	 */
 	public setLabel(label: string) {
 		this.data.label = labelValidator.parse(label);
@@ -132,7 +133,7 @@ export class TextInputBuilder
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
 	public toJSON(): APITextInputComponent {
-		validateRequiredParameters(this.data.custom_id, this.data.style, this.data.label);
+		validateRequiredParameters(this.data.custom_id, this.data.style);
 
 		return {
 			...this.data,

packages/builders/src/components/v2/Assertions.ts

@@ -0,0 +1,72 @@
+import { s } from '@sapphire/shapeshift';
+import { SeparatorSpacingSize } from 'discord-api-types/v10';
+import { colorPredicate } from '../../messages/embed/Assertions';
+import { isValidationEnabled } from '../../util/validation';
+import { ComponentBuilder } from '../Component';
+import { ButtonBuilder } from '../button/Button';
+import type { ContainerComponentBuilder } from './Container';
+import type { MediaGalleryItemBuilder } from './MediaGalleryItem';
+import type { TextDisplayBuilder } from './TextDisplay';
+import { ThumbnailBuilder } from './Thumbnail';
+
+export const unfurledMediaItemPredicate = s
+	.object({
+		url: s
+			.string()
+			.url(
+				{ allowedProtocols: ['http:', 'https:', 'attachment:'] },
+				{ message: 'Invalid protocol for media URL. Must be http:, https:, or attachment:' },
+			),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const descriptionPredicate = s
+	.string()
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(1_024)
+	.setValidationEnabled(isValidationEnabled);
+
+export const filePredicate = s
+	.object({
+		url: s
+			.string()
+			.url({ allowedProtocols: ['attachment:'] }, { message: 'Invalid protocol for file URL. Must be attachment:' }),
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const spoilerPredicate = s.boolean();
+
+export const dividerPredicate = s.boolean();
+
+export const spacingPredicate = s.nativeEnum(SeparatorSpacingSize);
+
+export const textDisplayContentPredicate = s
+	.string()
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(4_000)
+	.setValidationEnabled(isValidationEnabled);
+
+export const accessoryPredicate = s
+	.instance(ButtonBuilder)
+	.or(s.instance(ThumbnailBuilder))
+	.setValidationEnabled(isValidationEnabled);
+
+export const containerColorPredicate = colorPredicate.nullish();
+
+export function assertReturnOfBuilder<ReturnType extends MediaGalleryItemBuilder | TextDisplayBuilder>(
+	input: unknown,
+	ExpectedInstanceOf: new () => ReturnType,
+): asserts input is ReturnType {
+	s.instance(ExpectedInstanceOf).setValidationEnabled(isValidationEnabled).parse(input);
+}
+
+export function validateComponentArray<
+	ReturnType extends ContainerComponentBuilder | MediaGalleryItemBuilder = ContainerComponentBuilder,
+>(input: unknown, min: number, max: number, ExpectedInstanceOf?: new () => ReturnType): asserts input is ReturnType[] {
+	(ExpectedInstanceOf ? s.instance(ExpectedInstanceOf) : s.instance(ComponentBuilder))
+		.array()
+		.lengthGreaterThanOrEqual(min)
+		.lengthLessThanOrEqual(max)
+		.setValidationEnabled(isValidationEnabled)
+		.parse(input);
+}

packages/builders/src/components/v2/Container.ts

@@ -0,0 +1,239 @@
+/* eslint-disable jsdoc/check-param-names */
+
+import type {
+	APIActionRowComponent,
+	APIComponentInContainer,
+	APIComponentInMessageActionRow,
+	APIContainerComponent,
+	APIFileComponent,
+	APIMediaGalleryComponent,
+	APISectionComponent,
+	APISeparatorComponent,
+	APITextDisplayComponent,
+} from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import type { RGBTuple } from '../../index.js';
+import { MediaGalleryBuilder, SectionBuilder } from '../../index.js';
+import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
+import type { AnyComponentBuilder, MessageActionRowComponentBuilder } from '../ActionRow.js';
+import { ActionRowBuilder } from '../ActionRow.js';
+import { ComponentBuilder } from '../Component.js';
+import { createComponentBuilder, resolveBuilder } from '../Components.js';
+import { containerColorPredicate, spoilerPredicate } from './Assertions.js';
+import { FileBuilder } from './File.js';
+import { SeparatorBuilder } from './Separator.js';
+import { TextDisplayBuilder } from './TextDisplay.js';
+
+/**
+ * The builders that may be used within a container.
+ */
+export type ContainerComponentBuilder =
+	| ActionRowBuilder<AnyComponentBuilder>
+	| FileBuilder
+	| MediaGalleryBuilder
+	| SectionBuilder
+	| SeparatorBuilder
+	| TextDisplayBuilder;
+
+/**
+ * A builder that creates API-compatible JSON data for a container.
+ */
+export class ContainerBuilder extends ComponentBuilder<APIContainerComponent> {
+	/**
+	 * The components within this container.
+	 */
+	public readonly components: ContainerComponentBuilder[];
+
+	/**
+	 * Creates a new container from API data.
+	 *
+	 * @param data - The API data to create this container with
+	 * @example
+	 * Creating a container from an API data object:
+	 * ```ts
+	 * const container = new ContainerBuilder({
+	 * 	components: [
+	 * 		{
+	 * 			content: "Some text here",
+	 * 			type: ComponentType.TextDisplay,
+	 * 		},
+	 * 	],
+	 * });
+	 * ```
+	 * @example
+	 * Creating a container using setters and API data:
+	 * ```ts
+	 * const container = new ContainerBuilder({
+	 * 	components: [
+	 * 		{
+	 * 			content: "# Heading",
+	 * 			type: ComponentType.TextDisplay,
+	 * 		},
+	 * 	],
+	 * })
+	 * 	.addComponents(separator, section);
+	 * ```
+	 */
+	public constructor({ components, ...data }: Partial<APIContainerComponent> = {}) {
+		super({ type: ComponentType.Container, ...data });
+		this.components = (components?.map((component) => createComponentBuilder(component)) ??
+			[]) as ContainerComponentBuilder[];
+	}
+
+	/**
+	 * Sets the accent color of this container.
+	 *
+	 * @param color - The color to use
+	 */
+	public setAccentColor(color?: RGBTuple | number): this {
+		// Data assertions
+		containerColorPredicate.parse(color);
+
+		if (Array.isArray(color)) {
+			const [red, green, blue] = color;
+			this.data.accent_color = (red << 16) + (green << 8) + blue;
+			return this;
+		}
+
+		this.data.accent_color = color;
+		return this;
+	}
+
+	/**
+	 * Clears the accent color of this container.
+	 */
+	public clearAccentColor() {
+		this.data.accent_color = undefined;
+		return this;
+	}
+
+	/**
+	 * Adds action row components to this container.
+	 *
+	 * @param components - The action row components to add
+	 */
+	public addActionRowComponents<ComponentType extends MessageActionRowComponentBuilder>(
+		...components: RestOrArray<
+			| ActionRowBuilder<ComponentType>
+			| APIActionRowComponent<APIComponentInMessageActionRow>
+			| ((builder: ActionRowBuilder<ComponentType>) => ActionRowBuilder<ComponentType>)
+		>
+	) {
+		this.components.push(
+			...normalizeArray(components).map((component) => resolveBuilder(component, ActionRowBuilder<ComponentType>)),
+		);
+		return this;
+	}
+
+	/**
+	 * Adds file components to this container.
+	 *
+	 * @param components - The file components to add
+	 */
+	public addFileComponents(
+		...components: RestOrArray<APIFileComponent | FileBuilder | ((builder: FileBuilder) => FileBuilder)>
+	) {
+		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, FileBuilder)));
+		return this;
+	}
+
+	/**
+	 * Adds media gallery components to this container.
+	 *
+	 * @param components - The media gallery components to add
+	 */
+	public addMediaGalleryComponents(
+		...components: RestOrArray<
+			APIMediaGalleryComponent | MediaGalleryBuilder | ((builder: MediaGalleryBuilder) => MediaGalleryBuilder)
+		>
+	) {
+		this.components.push(
+			...normalizeArray(components).map((component) => resolveBuilder(component, MediaGalleryBuilder)),
+		);
+		return this;
+	}
+
+	/**
+	 * Adds section components to this container.
+	 *
+	 * @param components - The section components to add
+	 */
+	public addSectionComponents(
+		...components: RestOrArray<APISectionComponent | SectionBuilder | ((builder: SectionBuilder) => SectionBuilder)>
+	) {
+		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, SectionBuilder)));
+		return this;
+	}
+
+	/**
+	 * Adds separator components to this container.
+	 *
+	 * @param components - The separator components to add
+	 */
+	public addSeparatorComponents(
+		...components: RestOrArray<
+			APISeparatorComponent | SeparatorBuilder | ((builder: SeparatorBuilder) => SeparatorBuilder)
+		>
+	) {
+		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, SeparatorBuilder)));
+		return this;
+	}
+
+	/**
+	 * Adds text display components to this container.
+	 *
+	 * @param components - The text display components to add
+	 */
+	public addTextDisplayComponents(
+		...components: RestOrArray<
+			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
+		>
+	) {
+		this.components.push(
+			...normalizeArray(components).map((component) => resolveBuilder(component, TextDisplayBuilder)),
+		);
+		return this;
+	}
+
+	/**
+	 * Removes, replaces, or inserts components for this container.
+	 *
+	 * @param index - The index to start removing, replacing or inserting components
+	 * @param deleteCount - The amount of components to remove
+	 * @param components - The components to set
+	 */
+	public spliceComponents(
+		index: number,
+		deleteCount: number,
+		...components: RestOrArray<APIComponentInContainer | ContainerComponentBuilder>
+	) {
+		this.components.splice(
+			index,
+			deleteCount,
+			...normalizeArray(components).map((component) =>
+				component instanceof ComponentBuilder ? component : createComponentBuilder(component),
+			),
+		);
+		return this;
+	}
+
+	/**
+	 * Sets the spoiler status of this container.
+	 *
+	 * @param spoiler - The spoiler status to use
+	 */
+	public setSpoiler(spoiler = true) {
+		this.data.spoiler = spoilerPredicate.parse(spoiler);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APIContainerComponent {
+		return {
+			...this.data,
+			components: this.components.map((component) => component.toJSON()),
+		} as APIContainerComponent;
+	}
+}

packages/builders/src/components/v2/File.ts

@@ -0,0 +1,63 @@
+import { ComponentType, type APIFileComponent } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component';
+import { filePredicate, spoilerPredicate } from './Assertions';
+
+export class FileBuilder extends ComponentBuilder<APIFileComponent> {
+	/**
+	 * Creates a new file from API data.
+	 *
+	 * @param data - The API data to create this file with
+	 * @example
+	 * Creating a file from an API data object:
+	 * ```ts
+	 * const file = new FileBuilder({
+	 * 	spoiler: true,
+	 * 	file: {
+	 * 		url: 'attachment://file.png',
+	 * 	},
+	 * });
+	 * ```
+	 * @example
+	 * Creating a file using setters and API data:
+	 * ```ts
+	 * const file = new FileBuilder({
+	 * 	file: {
+	 * 		url: 'attachment://image.jpg',
+	 * 	},
+	 * })
+	 * 	.setSpoiler(false);
+	 * ```
+	 */
+	public constructor(data: Partial<APIFileComponent> = {}) {
+		super({ type: ComponentType.File, ...data, file: data.file ? { url: data.file.url } : undefined });
+	}
+
+	/**
+	 * Sets the spoiler status of this file.
+	 *
+	 * @param spoiler - The spoiler status to use
+	 */
+	public setSpoiler(spoiler = true) {
+		this.data.spoiler = spoilerPredicate.parse(spoiler);
+		return this;
+	}
+
+	/**
+	 * Sets the media URL of this file.
+	 *
+	 * @param url - The URL to use
+	 */
+	public setURL(url: string) {
+		this.data.file = filePredicate.parse({ url });
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(): APIFileComponent {
+		filePredicate.parse(this.data.file);
+
+		return { ...this.data, file: { ...this.data.file } } as APIFileComponent;
+	}
+}

packages/builders/src/components/v2/MediaGallery.ts

@@ -0,0 +1,117 @@
+/* eslint-disable jsdoc/check-param-names */
+
+import type { APIMediaGalleryComponent, APIMediaGalleryItem } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
+import { ComponentBuilder } from '../Component.js';
+import { resolveBuilder } from '../Components.js';
+import { assertReturnOfBuilder, validateComponentArray } from './Assertions.js';
+import { MediaGalleryItemBuilder } from './MediaGalleryItem.js';
+
+/**
+ * A builder that creates API-compatible JSON data for a container.
+ */
+export class MediaGalleryBuilder extends ComponentBuilder<APIMediaGalleryComponent> {
+	/**
+	 * The components within this container.
+	 */
+	public readonly items: MediaGalleryItemBuilder[];
+
+	/**
+	 * Creates a new media gallery from API data.
+	 *
+	 * @param data - The API data to create this media gallery with
+	 * @example
+	 * Creating a media gallery from an API data object:
+	 * ```ts
+	 * const mediaGallery = new MediaGalleryBuilder({
+	 * 	items: [
+	 * 		{
+	 * 			description: "Some text here",
+	 * 			media: {
+	 * 				url: 'https://cdn.discordapp.com/embed/avatars/2.png',
+	 * 			},
+	 * 		},
+	 * 	],
+	 * });
+	 * ```
+	 * @example
+	 * Creating a media gallery using setters and API data:
+	 * ```ts
+	 * const mediaGallery = new MediaGalleryBuilder({
+	 * 	items: [
+	 * 		{
+	 * 			description: "alt text",
+	 * 			media: {
+	 * 				url: 'https://cdn.discordapp.com/embed/avatars/5.png',
+	 * 			},
+	 * 		},
+	 * 	],
+	 * })
+	 * 	.addItems(item2, item3);
+	 * ```
+	 */
+	public constructor({ items, ...data }: Partial<APIMediaGalleryComponent> = {}) {
+		super({ type: ComponentType.MediaGallery, ...data });
+		this.items = items?.map((item) => new MediaGalleryItemBuilder(item)) ?? [];
+	}
+
+	/**
+	 * Adds items to this media gallery.
+	 *
+	 * @param items - The items to add
+	 */
+	public addItems(
+		...items: RestOrArray<
+			APIMediaGalleryItem | MediaGalleryItemBuilder | ((builder: MediaGalleryItemBuilder) => MediaGalleryItemBuilder)
+		>
+	) {
+		this.items.push(
+			...normalizeArray(items).map((input) => {
+				const result = resolveBuilder(input, MediaGalleryItemBuilder);
+
+				assertReturnOfBuilder(result, MediaGalleryItemBuilder);
+				return result;
+			}),
+		);
+		return this;
+	}
+
+	/**
+	 * Removes, replaces, or inserts media gallery items for this media gallery.
+	 *
+	 * @param index - The index to start removing, replacing or inserting items
+	 * @param deleteCount - The amount of items to remove
+	 * @param items - The items to insert
+	 */
+	public spliceItems(
+		index: number,
+		deleteCount: number,
+		...items: RestOrArray<
+			APIMediaGalleryItem | MediaGalleryItemBuilder | ((builder: MediaGalleryItemBuilder) => MediaGalleryItemBuilder)
+		>
+	) {
+		this.items.splice(
+			index,
+			deleteCount,
+			...normalizeArray(items).map((input) => {
+				const result = resolveBuilder(input, MediaGalleryItemBuilder);
+
+				assertReturnOfBuilder(result, MediaGalleryItemBuilder);
+				return result;
+			}),
+		);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APIMediaGalleryComponent {
+		validateComponentArray(this.items, 1, 10, MediaGalleryItemBuilder);
+		return {
+			...this.data,
+			items: this.items.map((item) => item.toJSON()),
+		} as APIMediaGalleryComponent;
+	}
+}

packages/builders/src/components/v2/MediaGalleryItem.ts

@@ -0,0 +1,90 @@
+import type { JSONEncodable } from '@discordjs/util';
+import type { APIMediaGalleryItem } from 'discord-api-types/v10';
+import { descriptionPredicate, spoilerPredicate, unfurledMediaItemPredicate } from './Assertions';
+
+export class MediaGalleryItemBuilder implements JSONEncodable<APIMediaGalleryItem> {
+	/**
+	 * The API data associated with this media gallery item.
+	 */
+	public readonly data: Partial<APIMediaGalleryItem>;
+
+	/**
+	 * Creates a new media gallery item from API data.
+	 *
+	 * @param data - The API data to create this media gallery item with
+	 * @example
+	 * Creating a media gallery item from an API data object:
+	 * ```ts
+	 * const item = new MediaGalleryItemBuilder({
+	 * 	description: "Some text here",
+	 * 	media: {
+	 * 		url: 'https://cdn.discordapp.com/embed/avatars/2.png',
+	 * 	},
+	 * });
+	 * ```
+	 * @example
+	 * Creating a media gallery item using setters and API data:
+	 * ```ts
+	 * const item = new MediaGalleryItemBuilder({
+	 * 	media: {
+	 * 		url: 'https://cdn.discordapp.com/embed/avatars/5.png',
+	 * 	},
+	 * })
+	 * 	.setDescription("alt text");
+	 * ```
+	 */
+	public constructor(data: Partial<APIMediaGalleryItem> = {}) {
+		this.data = data;
+	}
+
+	/**
+	 * Sets the description of this media gallery item.
+	 *
+	 * @param description - The description to use
+	 */
+	public setDescription(description: string) {
+		this.data.description = descriptionPredicate.parse(description);
+		return this;
+	}
+
+	/**
+	 * Clears the description of this media gallery item.
+	 */
+	public clearDescription() {
+		this.data.description = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets the spoiler status of this media gallery item.
+	 *
+	 * @param spoiler - The spoiler status to use
+	 */
+	public setSpoiler(spoiler = true) {
+		this.data.spoiler = spoilerPredicate.parse(spoiler);
+		return this;
+	}
+
+	/**
+	 * Sets the media URL of this media gallery item.
+	 *
+	 * @param url - The URL to use
+	 */
+	public setURL(url: string) {
+		this.data.media = unfurledMediaItemPredicate.parse({ url });
+		return this;
+	}
+
+	/**
+	 * Serializes this builder to API-compatible JSON data.
+	 *
+	 * @remarks
+	 * This method runs validations on the data before serializing it.
+	 * As such, it may throw an error if the data is invalid.
+	 */
+	public toJSON(): APIMediaGalleryItem {
+		unfurledMediaItemPredicate.parse(this.data.media);
+
+		return { ...this.data } as APIMediaGalleryItem;
+	}
+}

packages/builders/src/components/v2/Section.ts

@@ -0,0 +1,153 @@
+/* eslint-disable jsdoc/check-param-names */
+
+import type {
+	APIButtonComponent,
+	APISectionComponent,
+	APITextDisplayComponent,
+	APIThumbnailComponent,
+} from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { ButtonBuilder, ThumbnailBuilder } from '../../index.js';
+import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
+import { ComponentBuilder } from '../Component.js';
+import { createComponentBuilder, resolveBuilder } from '../Components.js';
+import { accessoryPredicate, assertReturnOfBuilder, validateComponentArray } from './Assertions.js';
+import { TextDisplayBuilder } from './TextDisplay.js';
+
+/**
+ * A builder that creates API-compatible JSON data for a section.
+ */
+export class SectionBuilder extends ComponentBuilder<APISectionComponent> {
+	/**
+	 * The components within this section.
+	 */
+	public readonly components: ComponentBuilder[];
+
+	/**
+	 * The accessory of this section.
+	 */
+	public readonly accessory?: ButtonBuilder | ThumbnailBuilder;
+
+	/**
+	 * Creates a new section from API data.
+	 *
+	 * @param data - The API data to create this section with
+	 * @example
+	 * Creating a section from an API data object:
+	 * ```ts
+	 * const section = new SectionBuilder({
+	 * 	components: [
+	 * 		{
+	 * 			content: "Some text here",
+	 * 			type: ComponentType.TextDisplay,
+	 * 		},
+	 * 	],
+	 *  accessory: {
+	 *      media: {
+	 *          url: 'https://cdn.discordapp.com/embed/avatars/3.png',
+	 *      },
+	 *  }
+	 * });
+	 * ```
+	 * @example
+	 * Creating a section using setters and API data:
+	 * ```ts
+	 * const section = new SectionBuilder({
+	 * 	components: [
+	 * 		{
+	 * 			content: "# Heading",
+	 * 			type: ComponentType.TextDisplay,
+	 * 		},
+	 * 	],
+	 * })
+	 * 	.setPrimaryButtonAccessory(button);
+	 * ```
+	 */
+	public constructor({ components, accessory, ...data }: Partial<APISectionComponent> = {}) {
+		super({ type: ComponentType.Section, ...data });
+		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as ComponentBuilder[];
+		this.accessory = accessory ? createComponentBuilder(accessory) : undefined;
+	}
+
+	/**
+	 * Sets the accessory of this section to a button.
+	 *
+	 * @param accessory - The accessory to use
+	 */
+	public setButtonAccessory(
+		accessory: APIButtonComponent | ButtonBuilder | ((builder: ButtonBuilder) => ButtonBuilder),
+	): this {
+		Reflect.set(this, 'accessory', accessoryPredicate.parse(resolveBuilder(accessory, ButtonBuilder)));
+		return this;
+	}
+
+	/**
+	 * Sets the accessory of this section to a thumbnail.
+	 *
+	 * @param accessory - The accessory to use
+	 */
+	public setThumbnailAccessory(
+		accessory: APIThumbnailComponent | ThumbnailBuilder | ((builder: ThumbnailBuilder) => ThumbnailBuilder),
+	): this {
+		Reflect.set(this, 'accessory', accessoryPredicate.parse(resolveBuilder(accessory, ThumbnailBuilder)));
+		return this;
+	}
+
+	/**
+	 * Adds text display components to this section.
+	 *
+	 * @param components - The text display components to add
+	 */
+	public addTextDisplayComponents(
+		...components: RestOrArray<TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)>
+	) {
+		this.components.push(
+			...normalizeArray(components).map((input) => {
+				const result = resolveBuilder(input, TextDisplayBuilder);
+
+				assertReturnOfBuilder(result, TextDisplayBuilder);
+				return result;
+			}),
+		);
+		return this;
+	}
+
+	/**
+	 * Removes, replaces, or inserts text display components for this section.
+	 *
+	 * @param index - The index to start removing, replacing or inserting text display components
+	 * @param deleteCount - The amount of text display components to remove
+	 * @param components - The text display components to insert
+	 */
+	public spliceTextDisplayComponents(
+		index: number,
+		deleteCount: number,
+		...components: RestOrArray<
+			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
+		>
+	) {
+		this.components.splice(
+			index,
+			deleteCount,
+			...normalizeArray(components).map((input) => {
+				const result = resolveBuilder(input, TextDisplayBuilder);
+
+				assertReturnOfBuilder(result, TextDisplayBuilder);
+				return result;
+			}),
+		);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APISectionComponent {
+		validateComponentArray(this.components, 1, 3, TextDisplayBuilder);
+		return {
+			...this.data,
+			components: this.components.map((component) => component.toJSON()),
+			accessory: accessoryPredicate.parse(this.accessory).toJSON(),
+		} as APISectionComponent;
+	}
+}

packages/builders/src/components/v2/Separator.ts

@@ -0,0 +1,69 @@
+import type { SeparatorSpacingSize, APISeparatorComponent } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component';
+import { dividerPredicate, spacingPredicate } from './Assertions';
+
+export class SeparatorBuilder extends ComponentBuilder<APISeparatorComponent> {
+	/**
+	 * Creates a new separator from API data.
+	 *
+	 * @param data - The API data to create this separator with
+	 * @example
+	 * Creating a separator from an API data object:
+	 * ```ts
+	 * const separator = new SeparatorBuilder({
+	 * 	spacing: SeparatorSpacingSize.Small,
+	 *  divider: true,
+	 * });
+	 * ```
+	 * @example
+	 * Creating a separator using setters and API data:
+	 * ```ts
+	 * const separator = new SeparatorBuilder({
+	 * 	spacing: SeparatorSpacingSize.Large,
+	 * })
+	 * 	.setDivider(false);
+	 * ```
+	 */
+	public constructor(data: Partial<APISeparatorComponent> = {}) {
+		super({
+			type: ComponentType.Separator,
+			...data,
+		});
+	}
+
+	/**
+	 * Sets whether this separator should show a divider line.
+	 *
+	 * @param divider - Whether to show a divider line
+	 */
+	public setDivider(divider = true) {
+		this.data.divider = dividerPredicate.parse(divider);
+		return this;
+	}
+
+	/**
+	 * Sets the spacing of this separator.
+	 *
+	 * @param spacing - The spacing to use
+	 */
+	public setSpacing(spacing: SeparatorSpacingSize) {
+		this.data.spacing = spacingPredicate.parse(spacing);
+		return this;
+	}
+
+	/**
+	 * Clears the spacing of this separator.
+	 */
+	public clearSpacing() {
+		this.data.spacing = undefined;
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(): APISeparatorComponent {
+		return { ...this.data } as APISeparatorComponent;
+	}
+}

packages/builders/src/components/v2/TextDisplay.ts

@@ -0,0 +1,52 @@
+import type { APITextDisplayComponent } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component';
+import { textDisplayContentPredicate } from './Assertions';
+
+export class TextDisplayBuilder extends ComponentBuilder<APITextDisplayComponent> {
+	/**
+	 * Creates a new text display from API data.
+	 *
+	 * @param data - The API data to create this text display with
+	 * @example
+	 * Creating a text display from an API data object:
+	 * ```ts
+	 * const textDisplay = new TextDisplayBuilder({
+	 * 	content: 'some text',
+	 * });
+	 * ```
+	 * @example
+	 * Creating a text display using setters and API data:
+	 * ```ts
+	 * const textDisplay = new TextDisplayBuilder({
+	 * 	content: 'old text',
+	 * })
+	 * 	.setContent('new text');
+	 * ```
+	 */
+	public constructor(data: Partial<APITextDisplayComponent> = {}) {
+		super({
+			type: ComponentType.TextDisplay,
+			...data,
+		});
+	}
+
+	/**
+	 * Sets the text of this text display.
+	 *
+	 * @param content - The text to use
+	 */
+	public setContent(content: string) {
+		this.data.content = textDisplayContentPredicate.parse(content);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(): APITextDisplayComponent {
+		textDisplayContentPredicate.parse(this.data.content);
+
+		return { ...this.data } as APITextDisplayComponent;
+	}
+}

packages/builders/src/components/v2/Thumbnail.ts

@@ -0,0 +1,86 @@
+import type { APIThumbnailComponent } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
+import { ComponentBuilder } from '../Component';
+import { descriptionPredicate, spoilerPredicate, unfurledMediaItemPredicate } from './Assertions';
+
+export class ThumbnailBuilder extends ComponentBuilder<APIThumbnailComponent> {
+	/**
+	 * Creates a new thumbnail from API data.
+	 *
+	 * @param data - The API data to create this thumbnail with
+	 * @example
+	 * Creating a thumbnail from an API data object:
+	 * ```ts
+	 * const thumbnail = new ThumbnailBuilder({
+	 * 	description: 'some text',
+	 *  media: {
+	 *      url: 'https://cdn.discordapp.com/embed/avatars/4.png',
+	 *  },
+	 * });
+	 * ```
+	 * @example
+	 * Creating a thumbnail using setters and API data:
+	 * ```ts
+	 * const thumbnail = new ThumbnailBuilder({
+	 * 	media: {
+	 *      url: 'attachment://image.png',
+	 *  },
+	 * })
+	 * 	.setDescription('alt text');
+	 * ```
+	 */
+	public constructor(data: Partial<APIThumbnailComponent> = {}) {
+		super({
+			type: ComponentType.Thumbnail,
+			...data,
+			media: data.media ? { url: data.media.url } : undefined,
+		});
+	}
+
+	/**
+	 * Sets the description of this thumbnail.
+	 *
+	 * @param description - The description to use
+	 */
+	public setDescription(description: string) {
+		this.data.description = descriptionPredicate.parse(description);
+		return this;
+	}
+
+	/**
+	 * Clears the description of this thumbnail.
+	 */
+	public clearDescription() {
+		this.data.description = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets the spoiler status of this thumbnail.
+	 *
+	 * @param spoiler - The spoiler status to use
+	 */
+	public setSpoiler(spoiler = true) {
+		this.data.spoiler = spoilerPredicate.parse(spoiler);
+		return this;
+	}
+
+	/**
+	 * Sets the media URL of this thumbnail.
+	 *
+	 * @param url - The URL to use
+	 */
+	public setURL(url: string) {
+		this.data.media = unfurledMediaItemPredicate.parse({ url });
+		return this;
+	}
+
+	/**
+	 * {@inheritdoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(): APIThumbnailComponent {
+		unfurledMediaItemPredicate.parse(this.data.media);
+
+		return { ...this.data } as APIThumbnailComponent;
+	}
+}

packages/builders/src/index.ts

@@ -34,6 +34,22 @@ export {
 export * from './components/selectMenu/StringSelectMenuOption.js';
 export * from './components/selectMenu/UserSelectMenu.js';
 
+export * from './components/fileUpload/FileUpload.js';
+export * as FileUploadAssertions from './components/fileUpload/Assertions.js';
+
+export * from './components/label/Label.js';
+export * as LabelAssertions from './components/label/Assertions.js';
+
+export * as ComponentsV2Assertions from './components/v2/Assertions.js';
+export * from './components/v2/Container.js';
+export * from './components/v2/File.js';
+export * from './components/v2/MediaGallery.js';
+export * from './components/v2/MediaGalleryItem.js';
+export * from './components/v2/Section.js';
+export * from './components/v2/Separator.js';
+export * from './components/v2/TextDisplay.js';
+export * from './components/v2/Thumbnail.js';
+
 export * as SlashCommandAssertions from './interactions/slashCommands/Assertions.js';
 export * from './interactions/slashCommands/SlashCommandBuilder.js';
 export * from './interactions/slashCommands/SlashCommandSubcommands.js';

packages/builders/src/interactions/contextMenuCommands/Assertions.ts

@@ -1,18 +1,18 @@
 import { s } from '@sapphire/shapeshift';
-import { ApplicationCommandType } from 'discord-api-types/v10';
+import { ApplicationCommandType, ApplicationIntegrationType, InteractionContextType } from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
 import type { ContextMenuCommandType } from './ContextMenuCommandBuilder.js';
 
-const namePredicate = s.string
+const namePredicate = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(32)
-	// eslint-disable-next-line prefer-named-capture-group
-	.regex(/^( *[\p{P}\p{L}\p{N}\p{sc=Devanagari}\p{sc=Thai}]+ *)+$/u)
+	.regex(/\S/)
 	.setValidationEnabled(isValidationEnabled);
 const typePredicate = s
-	.union(s.literal(ApplicationCommandType.User), s.literal(ApplicationCommandType.Message))
+	.union([s.literal(ApplicationCommandType.User), s.literal(ApplicationCommandType.Message)])
 	.setValidationEnabled(isValidationEnabled);
-const booleanPredicate = s.boolean;
+const booleanPredicate = s.boolean();
 
 export function validateDefaultPermission(value: unknown): asserts value is boolean {
 	booleanPredicate.parse(value);
@@ -34,18 +34,31 @@ export function validateRequiredParameters(name: string, type: number) {
 	validateType(type);
 }
 
-const dmPermissionPredicate = s.boolean.nullish;
+const dmPermissionPredicate = s.boolean().nullish();
 
 export function validateDMPermission(value: unknown): asserts value is boolean | null | undefined {
 	dmPermissionPredicate.parse(value);
 }
 
-const memberPermissionPredicate = s.union(
-	s.bigint.transform((value) => value.toString()),
-	s.number.safeInt.transform((value) => value.toString()),
-	s.string.regex(/^\d+$/),
-).nullish;
+const memberPermissionPredicate = s
+	.union([
+		s.bigint().transform((value) => value.toString()),
+		s
+			.number()
+			.safeInt()
+			.transform((value) => value.toString()),
+		s.string().regex(/^\d+$/),
+	])
+	.nullish();
 
 export function validateDefaultMemberPermissions(permissions: unknown) {
 	return memberPermissionPredicate.parse(permissions);
 }
+
+export const contextsPredicate = s.array(
+	s.nativeEnum(InteractionContextType).setValidationEnabled(isValidationEnabled),
+);
+
+export const integrationTypesPredicate = s.array(
+	s.nativeEnum(ApplicationIntegrationType).setValidationEnabled(isValidationEnabled),
+);

packages/builders/src/interactions/contextMenuCommands/ContextMenuCommandBuilder.ts

@@ -1,10 +1,14 @@
 import type {
 	ApplicationCommandType,
+	ApplicationIntegrationType,
+	InteractionContextType,
 	LocaleString,
 	LocalizationMap,
 	Permissions,
 	RESTPostAPIContextMenuApplicationCommandsJSONBody,
 } from 'discord-api-types/v10';
+import type { RestOrArray } from '../../util/normalizeArray.js';
+import { normalizeArray } from '../../util/normalizeArray.js';
 import { validateLocale, validateLocalizationMap } from '../slashCommands/Assertions.js';
 import {
 	validateRequiredParameters,
@@ -13,6 +17,8 @@ import {
 	validateDefaultPermission,
 	validateDefaultMemberPermissions,
 	validateDMPermission,
+	contextsPredicate,
+	integrationTypesPredicate,
 } from './Assertions.js';
 
 /**
@@ -39,6 +45,11 @@ export class ContextMenuCommandBuilder {
 	 */
 	public readonly type: ContextMenuCommandType = undefined!;
 
+	/**
+	 * The contexts for this command.
+	 */
+	public readonly contexts?: InteractionContextType[];
+
 	/**
 	 * Whether this command is enabled by default when the application is added to a guild.
 	 *
@@ -56,9 +67,38 @@ export class ContextMenuCommandBuilder {
 	 *
 	 * @remarks
 	 * By default, commands are visible. This property is only for global commands.
+	 * @deprecated
+	 * Use {@link ContextMenuCommandBuilder.contexts} instead.
 	 */
 	public readonly dm_permission: boolean | undefined = undefined;
 
+	/**
+	 * The integration types for this command.
+	 */
+	public readonly integration_types?: ApplicationIntegrationType[];
+
+	/**
+	 * Sets the contexts of this command.
+	 *
+	 * @param contexts - The contexts
+	 */
+	public setContexts(...contexts: RestOrArray<InteractionContextType>) {
+		Reflect.set(this, 'contexts', contextsPredicate.parse(normalizeArray(contexts)));
+
+		return this;
+	}
+
+	/**
+	 * Sets integration types of this command.
+	 *
+	 * @param integrationTypes - The integration types
+	 */
+	public setIntegrationTypes(...integrationTypes: RestOrArray<ApplicationIntegrationType>) {
+		Reflect.set(this, 'integration_types', integrationTypesPredicate.parse(normalizeArray(integrationTypes)));
+
+		return this;
+	}
+
 	/**
 	 * Sets the name of this command.
 	 *
@@ -129,6 +169,7 @@ export class ContextMenuCommandBuilder {
 	 * By default, commands are visible. This method is only for global commands.
 	 * @param enabled - Whether the command should be enabled in direct messages
 	 * @see {@link https://discord.com/developers/docs/interactions/application-commands#permissions}
+	 * @deprecated Use {@link ContextMenuCommandBuilder.setContexts} instead.
 	 */
 	public setDMPermission(enabled: boolean | null | undefined) {
 		// Assert the value matches the conditions

packages/builders/src/interactions/modals/Assertions.ts

@@ -1,21 +1,25 @@
 import { s } from '@sapphire/shapeshift';
 import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow.js';
 import { customIdValidator } from '../../components/Assertions.js';
+import { LabelBuilder } from '../../components/label/Label.js';
+import { TextDisplayBuilder } from '../../components/v2/TextDisplay.js';
 import { isValidationEnabled } from '../../util/validation.js';
 
-export const titleValidator = s.string
+export const titleValidator = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(45)
 	.setValidationEnabled(isValidationEnabled);
 export const componentsValidator = s
-	.instance(ActionRowBuilder)
-	.array.lengthGreaterThanOrEqual(1)
+	.union([s.instance(ActionRowBuilder), s.instance(LabelBuilder), s.instance(TextDisplayBuilder)])
+	.array()
+	.lengthGreaterThanOrEqual(1)
 	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredParameters(
 	customId?: string,
 	title?: string,
-	components?: ActionRowBuilder<ModalActionRowComponentBuilder>[],
+	components?: (ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder)[],
 ) {
 	customIdValidator.parse(customId);
 	titleValidator.parse(title);

packages/builders/src/interactions/modals/Modal.ts

@@ -2,13 +2,20 @@
 
 import type { JSONEncodable } from '@discordjs/util';
 import type {
+	APITextInputComponent,
 	APIActionRowComponent,
-	APIModalActionRowComponent,
+	APIComponentInModalActionRow,
+	APILabelComponent,
 	APIModalInteractionResponseCallbackData,
+	APITextDisplayComponent,
 } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
 import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow.js';
 import { customIdValidator } from '../../components/Assertions.js';
-import { createComponentBuilder } from '../../components/Components.js';
+import { createComponentBuilder, resolveBuilder } from '../../components/Components.js';
+import { LabelBuilder } from '../../components/label/Label.js';
+import { TextInputBuilder } from '../../components/textInput/TextInput.js';
+import { TextDisplayBuilder } from '../../components/v2/TextDisplay.js';
 import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
 import { titleValidator, validateRequiredParameters } from './Assertions.js';
 
@@ -24,7 +31,8 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	/**
 	 * The components within this modal.
 	 */
-	public readonly components: ActionRowBuilder<ModalActionRowComponentBuilder>[] = [];
+	public readonly components: (ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder)[] =
+		[];
 
 	/**
 	 * Creates a new modal from API data.
@@ -33,8 +41,10 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 */
 	public constructor({ components, ...data }: Partial<APIModalInteractionResponseCallbackData> = {}) {
 		this.data = { ...data };
-		this.components = (components?.map((component) => createComponentBuilder(component)) ??
-			[]) as ActionRowBuilder<ModalActionRowComponentBuilder>[];
+		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as (
+			| ActionRowBuilder<ModalActionRowComponentBuilder>
+			| LabelBuilder
+		)[];
 	}
 
 	/**
@@ -61,28 +71,182 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 * Adds components to this modal.
 	 *
 	 * @param components - The components to add
+	 * @deprecated Use {@link ModalBuilder.addLabelComponents} or {@link ModalBuilder.addTextDisplayComponents} instead
 	 */
 	public addComponents(
 		...components: RestOrArray<
-			ActionRowBuilder<ModalActionRowComponentBuilder> | APIActionRowComponent<APIModalActionRowComponent>
+			| ActionRowBuilder<ModalActionRowComponentBuilder>
+			| APIActionRowComponent<APIComponentInModalActionRow>
+			| APILabelComponent
+			| APITextDisplayComponent
+			| APITextInputComponent
+			| LabelBuilder
+			| TextDisplayBuilder
+			| TextInputBuilder
 		>
 	) {
 		this.components.push(
-			...normalizeArray(components).map((component) =>
-				component instanceof ActionRowBuilder
-					? component
-					: new ActionRowBuilder<ModalActionRowComponentBuilder>(component),
-			),
+			...normalizeArray(components).map((component, idx) => {
+				if (
+					component instanceof ActionRowBuilder ||
+					component instanceof LabelBuilder ||
+					component instanceof TextDisplayBuilder
+				) {
+					return component;
+				}
+
+				// Deprecated support
+				if (component instanceof TextInputBuilder) {
+					return new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(component);
+				}
+
+				if ('type' in component) {
+					if (component.type === ComponentType.ActionRow) {
+						return new ActionRowBuilder<ModalActionRowComponentBuilder>(component);
+					}
+
+					if (component.type === ComponentType.Label) {
+						return new LabelBuilder(component);
+					}
+
+					if (component.type === ComponentType.TextDisplay) {
+						return new TextDisplayBuilder(component);
+					}
+
+					// Deprecated, should go in a label component
+					if (component.type === ComponentType.TextInput) {
+						return new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
+							new TextInputBuilder(component),
+						);
+					}
+				}
+
+				throw new TypeError(`Invalid component passed in ModalBuilder.addComponents at index ${idx}!`);
+			}),
 		);
 		return this;
 	}
 
+	/**
+	 * Adds label components to this modal.
+	 *
+	 * @param components - The components to add
+	 */
+	public addLabelComponents(
+		...components: RestOrArray<APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder)>
+	) {
+		const normalized = normalizeArray(components);
+		const resolved = normalized.map((label) => resolveBuilder(label, LabelBuilder));
+
+		this.components.push(...resolved);
+
+		return this;
+	}
+
+	/**
+	 * Adds text display components to this modal.
+	 *
+	 * @param components - The components to add
+	 */
+	public addTextDisplayComponents(
+		...components: RestOrArray<
+			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
+		>
+	) {
+		const normalized = normalizeArray(components);
+		const resolved = normalized.map((row) => resolveBuilder(row, TextDisplayBuilder));
+
+		this.components.push(...resolved);
+
+		return this;
+	}
+
+	/**
+	 * Adds action rows to this modal.
+	 *
+	 * @param components - The components to add
+	 * @deprecated Use {@link ModalBuilder.addLabelComponents} instead
+	 */
+	public addActionRowComponents(
+		...components: RestOrArray<
+			| ActionRowBuilder<ModalActionRowComponentBuilder>
+			| APIActionRowComponent<APIComponentInModalActionRow>
+			| ((
+					builder: ActionRowBuilder<ModalActionRowComponentBuilder>,
+			  ) => ActionRowBuilder<ModalActionRowComponentBuilder>)
+		>
+	) {
+		const normalized = normalizeArray(components);
+		const resolved = normalized.map((row) => resolveBuilder(row, ActionRowBuilder<ModalActionRowComponentBuilder>));
+
+		this.components.push(...resolved);
+
+		return this;
+	}
+
+	/**
+	 * Sets the labels for this modal.
+	 *
+	 * @param components - The components to set
+	 */
+	public setLabelComponents(
+		...components: RestOrArray<APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder)>
+	) {
+		const normalized = normalizeArray(components);
+		this.spliceLabelComponents(0, this.components.length, ...normalized);
+
+		return this;
+	}
+
+	/**
+	 * Removes, replaces, or inserts labels for this modal.
+	 *
+	 * @remarks
+	 * This method behaves similarly
+	 * to {@link https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/splice | Array.prototype.splice()}.
+	 * The maximum amount of labels that can be added is 5.
+	 *
+	 * It's useful for modifying and adjusting order of the already-existing labels of a modal.
+	 * @example
+	 * Remove the first label:
+	 * ```ts
+	 * modal.spliceLabelComponents(0, 1);
+	 * ```
+	 * @example
+	 * Remove the first n labels:
+	 * ```ts
+	 * const n = 4;
+	 * modal.spliceLabelComponents(0, n);
+	 * ```
+	 * @example
+	 * Remove the last label:
+	 * ```ts
+	 * modal.spliceLabelComponents(-1, 1);
+	 * ```
+	 * @param index - The index to start at
+	 * @param deleteCount - The number of labels to remove
+	 * @param labels - The replacing label objects
+	 */
+	public spliceLabelComponents(
+		index: number,
+		deleteCount: number,
+		...labels: (APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder))[]
+	): this {
+		const resolved = labels.map((label) => resolveBuilder(label, LabelBuilder));
+		this.components.splice(index, deleteCount, ...resolved);
+
+		return this;
+	}
+
 	/**
 	 * Sets components for this modal.
 	 *
 	 * @param components - The components to set
+	 * @deprecated Use {@link ModalBuilder.setLabelComponents} instead
 	 */
-	public setComponents(...components: RestOrArray<ActionRowBuilder<ModalActionRowComponentBuilder>>) {
+	public setComponents(
+		...components: RestOrArray<ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder>
+	) {
 		this.components.splice(0, this.components.length, ...normalizeArray(components));
 		return this;
 	}

packages/builders/src/interactions/slashCommands/Assertions.ts

@@ -1,11 +1,18 @@
 import { s } from '@sapphire/shapeshift';
-import { Locale, type APIApplicationCommandOptionChoice, type LocalizationMap } from 'discord-api-types/v10';
+import {
+	ApplicationIntegrationType,
+	InteractionContextType,
+	Locale,
+	type APIApplicationCommandOptionChoice,
+	type LocalizationMap,
+} from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
 import type { ToAPIApplicationCommandOptions } from './SlashCommandBuilder.js';
 import type { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder } from './SlashCommandSubcommands.js';
 import type { ApplicationCommandOptionBase } from './mixins/ApplicationCommandOptionBase.js';
 
-const namePredicate = s.string
+const namePredicate = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(32)
 	.regex(/^[\p{Ll}\p{Lm}\p{Lo}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u)
@@ -15,7 +22,8 @@ export function validateName(name: unknown): asserts name is string {
 	namePredicate.parse(name);
 }
 
-const descriptionPredicate = s.string
+const descriptionPredicate = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(100)
 	.setValidationEnabled(isValidationEnabled);
@@ -25,7 +33,7 @@ export function validateDescription(description: unknown): asserts description i
 	descriptionPredicate.parse(description);
 }
 
-const maxArrayLengthPredicate = s.unknown.array.lengthLessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
+const maxArrayLengthPredicate = s.unknown().array().lengthLessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
 export function validateLocale(locale: unknown) {
 	return localePredicate.parse(locale);
 }
@@ -49,7 +57,7 @@ export function validateRequiredParameters(
 	validateMaxOptionsLength(options);
 }
 
-const booleanPredicate = s.boolean;
+const booleanPredicate = s.boolean();
 
 export function validateDefaultPermission(value: unknown): asserts value is boolean {
 	booleanPredicate.parse(value);
@@ -59,7 +67,7 @@ export function validateRequired(required: unknown): asserts required is boolean
 	booleanPredicate.parse(required);
 }
 
-const choicesLengthPredicate = s.number.lessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
+const choicesLengthPredicate = s.number().lessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
 
 export function validateChoicesLength(amountAdding: number, choices?: APIApplicationCommandOptionChoice[]): void {
 	choicesLengthPredicate.parse((choices?.length ?? 0) + amountAdding);
@@ -72,24 +80,31 @@ export function assertReturnOfBuilder<
 }
 
 export const localizationMapPredicate = s
-	.object<LocalizationMap>(Object.fromEntries(Object.values(Locale).map((locale) => [locale, s.string.nullish])))
-	.strict.nullish.setValidationEnabled(isValidationEnabled);
+	.object<LocalizationMap>(Object.fromEntries(Object.values(Locale).map((locale) => [locale, s.string().nullish()])))
+	.strict()
+	.nullish()
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateLocalizationMap(value: unknown): asserts value is LocalizationMap {
 	localizationMapPredicate.parse(value);
 }
 
-const dmPermissionPredicate = s.boolean.nullish;
+const dmPermissionPredicate = s.boolean().nullish();
 
 export function validateDMPermission(value: unknown): asserts value is boolean | null | undefined {
 	dmPermissionPredicate.parse(value);
 }
 
-const memberPermissionPredicate = s.union(
-	s.bigint.transform((value) => value.toString()),
-	s.number.safeInt.transform((value) => value.toString()),
-	s.string.regex(/^\d+$/),
-).nullish;
+const memberPermissionPredicate = s
+	.union([
+		s.bigint().transform((value) => value.toString()),
+		s
+			.number()
+			.safeInt()
+			.transform((value) => value.toString()),
+		s.string().regex(/^\d+$/),
+	])
+	.nullish();
 
 export function validateDefaultMemberPermissions(permissions: unknown) {
 	return memberPermissionPredicate.parse(permissions);
@@ -98,3 +113,11 @@ export function validateDefaultMemberPermissions(permissions: unknown) {
 export function validateNSFW(value: unknown): asserts value is boolean {
 	booleanPredicate.parse(value);
 }
+
+export const contextsPredicate = s.array(
+	s.nativeEnum(InteractionContextType).setValidationEnabled(isValidationEnabled),
+);
+
+export const integrationTypesPredicate = s.array(
+	s.nativeEnum(ApplicationIntegrationType).setValidationEnabled(isValidationEnabled),
+);

packages/builders/src/interactions/slashCommands/SlashCommandBuilder.ts

@@ -1,4 +1,10 @@
-import type { APIApplicationCommandOption, LocalizationMap, Permissions } from 'discord-api-types/v10';
+import type {
+	APIApplicationCommandOption,
+	ApplicationIntegrationType,
+	InteractionContextType,
+	LocalizationMap,
+	Permissions,
+} from 'discord-api-types/v10';
 import { mix } from 'ts-mixer';
 import { SharedNameAndDescription } from './mixins/NameAndDescription.js';
 import { SharedSlashCommand } from './mixins/SharedSlashCommand.js';
@@ -35,6 +41,11 @@ export class SlashCommandBuilder {
 	 */
 	public readonly options: ToAPIApplicationCommandOptions[] = [];
 
+	/**
+	 * The contexts for this command.
+	 */
+	public readonly contexts?: InteractionContextType[];
+
 	/**
 	 * Whether this command is enabled by default when the application is added to a guild.
 	 *
@@ -52,9 +63,16 @@ export class SlashCommandBuilder {
 	 *
 	 * @remarks
 	 * By default, commands are visible. This property is only for global commands.
+	 * @deprecated
+	 * Use {@link SlashCommandBuilder.contexts} instead.
 	 */
 	public readonly dm_permission: boolean | undefined = undefined;
 
+	/**
+	 * The integration types for this command.
+	 */
+	public readonly integration_types?: ApplicationIntegrationType[];
+
 	/**
 	 * Whether this command is NSFW.
 	 */

packages/builders/src/interactions/slashCommands/mixins/ApplicationCommandOptionChannelTypesMixin.ts

@@ -26,7 +26,7 @@ const allowedChannelTypes = [
  */
 export type ApplicationCommandOptionAllowedChannelTypes = (typeof allowedChannelTypes)[number];
 
-const channelTypesPredicate = s.array(s.union(...allowedChannelTypes.map((type) => s.literal(type))));
+const channelTypesPredicate = s.array(s.union(allowedChannelTypes.map((type) => s.literal(type))));
 
 /**
  * This mixin holds channel type symbols used for options.

packages/builders/src/interactions/slashCommands/mixins/ApplicationCommandOptionWithAutocompleteMixin.ts

@@ -1,7 +1,7 @@
 import { s } from '@sapphire/shapeshift';
 import type { ApplicationCommandOptionType } from 'discord-api-types/v10';
 
-const booleanPredicate = s.boolean;
+const booleanPredicate = s.boolean();
 
 /**
  * This mixin holds choices and autocomplete symbols used for options.

packages/builders/src/interactions/slashCommands/mixins/ApplicationCommandOptionWithChoicesMixin.ts

@@ -3,13 +3,15 @@ import { ApplicationCommandOptionType, type APIApplicationCommandOptionChoice }
 import { normalizeArray, type RestOrArray } from '../../../util/normalizeArray.js';
 import { localizationMapPredicate, validateChoicesLength } from '../Assertions.js';
 
-const stringPredicate = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
-const numberPredicate = s.number.greaterThan(Number.NEGATIVE_INFINITY).lessThan(Number.POSITIVE_INFINITY);
-const choicesPredicate = s.object({
-	name: stringPredicate,
-	name_localizations: localizationMapPredicate,
-	value: s.union(stringPredicate, numberPredicate),
-}).array;
+const stringPredicate = s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
+const numberPredicate = s.number().greaterThan(Number.NEGATIVE_INFINITY).lessThan(Number.POSITIVE_INFINITY);
+const choicesPredicate = s
+	.object({
+		name: stringPredicate,
+		name_localizations: localizationMapPredicate,
+		value: s.union([stringPredicate, numberPredicate]),
+	})
+	.array();
 
 /**
  * This mixin holds choices and autocomplete symbols used for options.

packages/builders/src/interactions/slashCommands/mixins/SharedSlashCommand.ts

@@ -1,9 +1,16 @@
-import type {
-	LocalizationMap,
-	Permissions,
-	RESTPostAPIChatInputApplicationCommandsJSONBody,
-} from 'discord-api-types/v10';
 import {
+	ApplicationCommandType,
+	type ApplicationIntegrationType,
+	type InteractionContextType,
+	type LocalizationMap,
+	type Permissions,
+	type RESTPostAPIChatInputApplicationCommandsJSONBody,
+} from 'discord-api-types/v10';
+import type { RestOrArray } from '../../../util/normalizeArray.js';
+import { normalizeArray } from '../../../util/normalizeArray.js';
+import {
+	contextsPredicate,
+	integrationTypesPredicate,
 	validateDMPermission,
 	validateDefaultMemberPermissions,
 	validateDefaultPermission,
@@ -27,6 +34,8 @@ export class SharedSlashCommand {
 
 	public readonly options: ToAPIApplicationCommandOptions[] = [];
 
+	public readonly contexts?: InteractionContextType[];
+
 	/**
 	 * @deprecated Use {@link SharedSlashCommand.setDefaultMemberPermissions} or {@link SharedSlashCommand.setDMPermission} instead.
 	 */
@@ -34,10 +43,37 @@ export class SharedSlashCommand {
 
 	public readonly default_member_permissions: Permissions | null | undefined = undefined;
 
+	/**
+	 * @deprecated Use {@link SharedSlashCommand.contexts} instead.
+	 */
 	public readonly dm_permission: boolean | undefined = undefined;
 
+	public readonly integration_types?: ApplicationIntegrationType[];
+
 	public readonly nsfw: boolean | undefined = undefined;
 
+	/**
+	 * Sets the contexts of this command.
+	 *
+	 * @param contexts - The contexts
+	 */
+	public setContexts(...contexts: RestOrArray<InteractionContextType>) {
+		Reflect.set(this, 'contexts', contextsPredicate.parse(normalizeArray(contexts)));
+
+		return this;
+	}
+
+	/**
+	 * Sets the integration types of this command.
+	 *
+	 * @param integrationTypes - The integration types
+	 */
+	public setIntegrationTypes(...integrationTypes: RestOrArray<ApplicationIntegrationType>) {
+		Reflect.set(this, 'integration_types', integrationTypesPredicate.parse(normalizeArray(integrationTypes)));
+
+		return this;
+	}
+
 	/**
 	 * Sets whether the command is enabled by default when the application is added to a guild.
 	 *
@@ -80,6 +116,8 @@ export class SharedSlashCommand {
 	 * By default, commands are visible. This method is only for global commands.
 	 * @param enabled - Whether the command should be enabled in direct messages
 	 * @see {@link https://discord.com/developers/docs/interactions/application-commands#permissions}
+	 * @deprecated
+	 * Use {@link SharedSlashCommand.setContexts} instead.
 	 */
 	public setDMPermission(enabled: boolean | null | undefined) {
 		// Assert the value matches the conditions
@@ -117,6 +155,7 @@ export class SharedSlashCommand {
 
 		return {
 			...this,
+			type: ApplicationCommandType.ChatInput,
 			options: this.options.map((option) => option.toJSON()),
 		};
 	}

packages/builders/src/interactions/slashCommands/options/integer.ts

@@ -6,7 +6,7 @@ import { ApplicationCommandOptionBase } from '../mixins/ApplicationCommandOption
 import { ApplicationCommandOptionWithAutocompleteMixin } from '../mixins/ApplicationCommandOptionWithAutocompleteMixin.js';
 import { ApplicationCommandOptionWithChoicesMixin } from '../mixins/ApplicationCommandOptionWithChoicesMixin.js';
 
-const numberValidator = s.number.int;
+const numberValidator = s.number().int();
 
 /**
  * A slash command integer option.

packages/builders/src/interactions/slashCommands/options/number.ts

@@ -6,7 +6,7 @@ import { ApplicationCommandOptionBase } from '../mixins/ApplicationCommandOption
 import { ApplicationCommandOptionWithAutocompleteMixin } from '../mixins/ApplicationCommandOptionWithAutocompleteMixin.js';
 import { ApplicationCommandOptionWithChoicesMixin } from '../mixins/ApplicationCommandOptionWithChoicesMixin.js';
 
-const numberValidator = s.number;
+const numberValidator = s.number();
 
 /**
  * A slash command number option.

packages/builders/src/interactions/slashCommands/options/string.ts

@@ -5,8 +5,8 @@ import { ApplicationCommandOptionBase } from '../mixins/ApplicationCommandOption
 import { ApplicationCommandOptionWithAutocompleteMixin } from '../mixins/ApplicationCommandOptionWithAutocompleteMixin.js';
 import { ApplicationCommandOptionWithChoicesMixin } from '../mixins/ApplicationCommandOptionWithChoicesMixin.js';
 
-const minLengthValidator = s.number.greaterThanOrEqual(0).lessThanOrEqual(6_000);
-const maxLengthValidator = s.number.greaterThanOrEqual(1).lessThanOrEqual(6_000);
+const minLengthValidator = s.number().greaterThanOrEqual(0).lessThanOrEqual(6_000);
+const maxLengthValidator = s.number().greaterThanOrEqual(1).lessThanOrEqual(6_000);
 
 /**
  * A slash command string option.

packages/builders/src/messages/embed/Assertions.ts

@@ -2,17 +2,11 @@ import { s } from '@sapphire/shapeshift';
 import type { APIEmbedField } from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
 
-export const fieldNamePredicate = s.string
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(256)
-	.setValidationEnabled(isValidationEnabled);
+export const fieldNamePredicate = s.string().lengthLessThanOrEqual(256).setValidationEnabled(isValidationEnabled);
 
-export const fieldValuePredicate = s.string
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(1_024)
-	.setValidationEnabled(isValidationEnabled);
+export const fieldValuePredicate = s.string().lengthLessThanOrEqual(1_024).setValidationEnabled(isValidationEnabled);
 
-export const fieldInlinePredicate = s.boolean.optional;
+export const fieldInlinePredicate = s.boolean().optional();
 
 export const embedFieldPredicate = s
 	.object({
@@ -22,27 +16,34 @@ export const embedFieldPredicate = s
 	})
 	.setValidationEnabled(isValidationEnabled);
 
-export const embedFieldsArrayPredicate = embedFieldPredicate.array.setValidationEnabled(isValidationEnabled);
+export const embedFieldsArrayPredicate = embedFieldPredicate.array().setValidationEnabled(isValidationEnabled);
 
-export const fieldLengthPredicate = s.number.lessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
+export const fieldLengthPredicate = s.number().lessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
 
 export function validateFieldLength(amountAdding: number, fields?: APIEmbedField[]): void {
 	fieldLengthPredicate.parse((fields?.length ?? 0) + amountAdding);
 }
 
-export const authorNamePredicate = fieldNamePredicate.nullable.setValidationEnabled(isValidationEnabled);
+export const authorNamePredicate = fieldNamePredicate
+	.lengthGreaterThanOrEqual(1)
+	.nullable()
+	.setValidationEnabled(isValidationEnabled);
 
-export const imageURLPredicate = s.string
+export const imageURLPredicate = s
+	.string()
 	.url({
 		allowedProtocols: ['http:', 'https:', 'attachment:'],
 	})
-	.nullish.setValidationEnabled(isValidationEnabled);
+	.nullish()
+	.setValidationEnabled(isValidationEnabled);
 
-export const urlPredicate = s.string
+export const urlPredicate = s
+	.string()
 	.url({
 		allowedProtocols: ['http:', 'https:'],
 	})
-	.nullish.setValidationEnabled(isValidationEnabled);
+	.nullish()
+	.setValidationEnabled(isValidationEnabled);
 
 export const embedAuthorPredicate = s
 	.object({
@@ -52,25 +53,34 @@ export const embedAuthorPredicate = s
 	})
 	.setValidationEnabled(isValidationEnabled);
 
-export const RGBPredicate = s.number.int
+export const RGBPredicate = s
+	.number()
+	.int()
 	.greaterThanOrEqual(0)
 	.lessThanOrEqual(255)
 	.setValidationEnabled(isValidationEnabled);
-export const colorPredicate = s.number.int
+export const colorPredicate = s
+	.number()
+	.int()
 	.greaterThanOrEqual(0)
 	.lessThanOrEqual(0xffffff)
 	.or(s.tuple([RGBPredicate, RGBPredicate, RGBPredicate]))
-	.nullable.setValidationEnabled(isValidationEnabled);
+	.nullable()
+	.setValidationEnabled(isValidationEnabled);
 
-export const descriptionPredicate = s.string
+export const descriptionPredicate = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(4_096)
-	.nullable.setValidationEnabled(isValidationEnabled);
+	.nullable()
+	.setValidationEnabled(isValidationEnabled);
 
-export const footerTextPredicate = s.string
+export const footerTextPredicate = s
+	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(2_048)
-	.nullable.setValidationEnabled(isValidationEnabled);
+	.nullable()
+	.setValidationEnabled(isValidationEnabled);
 
 export const embedFooterPredicate = s
 	.object({
@@ -79,6 +89,9 @@ export const embedFooterPredicate = s
 	})
 	.setValidationEnabled(isValidationEnabled);
 
-export const timestampPredicate = s.union(s.number, s.date).nullable.setValidationEnabled(isValidationEnabled);
+export const timestampPredicate = s.union([s.number(), s.date()]).nullable().setValidationEnabled(isValidationEnabled);
 
-export const titlePredicate = fieldNamePredicate.nullable.setValidationEnabled(isValidationEnabled);
+export const titlePredicate = fieldNamePredicate
+	.lengthGreaterThanOrEqual(1)
+	.nullable()
+	.setValidationEnabled(isValidationEnabled);

packages/collection/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/collection@2.1.1](https://github.com/discordjs/discord.js/compare/@discordjs/collection@2.1.0...@discordjs/collection@2.1.1) - (2024-09-01)
+
+## Bug Fixes
+
+- **build:** Update to support strictBuiltinIteratorReturn (#10394) ([bf83db9](https://github.com/discordjs/discord.js/commit/bf83db9480e9f31d5dadee38a2d053a543150776))
+
+## Testing
+
+- Complete collection coverage (#10380) ([d8e94d8](https://github.com/discordjs/discord.js/commit/d8e94d8f10367d165d15904f7c7a31165842f9ec))
+
+## Typings
+
+- **collection:** Reduce* method signatures (#10405) ([6b38335](https://github.com/discordjs/discord.js/commit/6b383350a6de6d26b62cf62f619c89ffb0d6b0d1))
+
 # [@discordjs/collection@2.1.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@2.0.0...@discordjs/collection@2.1.0) - (2024-05-04)
 
 ## Bug Fixes
@@ -180,174 +194,6 @@ All notable changes to this project will be documented in this file.
 
 - Cleanup tests and tsup configs ([6b8ef20](https://github.com/discordjs/discord.js/commit/6b8ef20cb3af5b5cfd176dd0aa0a1a1e98551629))
 
-# [@discordjs/collection@1.5.3](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.2...@discordjs/collection@1.5.3) - (2023-08-17)
-
-## Documentation
-
-- Update Node.js requirement to 16.11.0 (#9764) ([188877c](https://github.com/discordjs/discord.js/commit/188877c50af70f0d5cffb246620fa277435c6ce6))
-
-# [@discordjs/collection@1.5.2](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.1...@discordjs/collection@1.5.2) - (2023-07-31)
-
-## Refactor
-
-- **collection:** Reduce `reduce`'s code (#9581) ([b85a3f2](https://github.com/discordjs/discord.js/commit/b85a3f2ddee8fc5974749b95fc07389a03093df2))
-
-# [@discordjs/collection@1.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.0...@discordjs/collection@1.5.1) - (2023-05-01)
-
-## Bug Fixes
-
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-
-# [@discordjs/collection@1.5.2](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.1...@discordjs/collection@1.5.2) - (2023-07-31)
-
-## Refactor
-
-- **collection:** Reduce `reduce`'s code (#9581) ([b85a3f2](https://github.com/discordjs/discord.js/commit/b85a3f2ddee8fc5974749b95fc07389a03093df2))
-
-# [@discordjs/collection@1.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.0...@discordjs/collection@1.5.1) - (2023-05-01)
-
-## Bug Fixes
-
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-
-# [@discordjs/collection@1.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.5.0...@discordjs/collection@1.5.1) - (2023-05-01)
-
-## Bug Fixes
-
-- Fix external links (#9313) ([a7425c2](https://github.com/discordjs/discord.js/commit/a7425c29c4f23f1b31f4c6a463107ca9eb7fd7e2))
-
-## Documentation
-
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-
-# [@discordjs/collection@1.5.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.4.0...@discordjs/collection@1.5.0) - (2023-04-01)
-
-## Bug Fixes
-
-- **scripts:** Accessing tsComment ([d8d5f31](https://github.com/discordjs/discord.js/commit/d8d5f31d3927fd1de62f1fa3a1a6e454243ad87b))
-
-## Features
-
-- **website:** Render syntax and mdx on the server (#9086) ([ee5169e](https://github.com/discordjs/discord.js/commit/ee5169e0aadd7bbfcd752aae614ec0f69602b68b))
-
-## Refactor
-
-- **collection:** Fix/silence linter warnings (#9266) ([d6f4e60](https://github.com/discordjs/discord.js/commit/d6f4e60efd1a1796fc84dbbfbac4f9790e480a1c))
-
-# [@discordjs/collection@1.4.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.3.0...@discordjs/collection@1.4.0) - (2023-03-12)
-
-## Documentation
-
-- Fix version export (#9049) ([8b70f49](https://github.com/discordjs/discord.js/commit/8b70f497a1207e30edebdecd12b926c981c13d28))
-
-## Features
-
-- **website:** Add support for source file links (#9048) ([f6506e9](https://github.com/discordjs/discord.js/commit/f6506e99c496683ee0ab67db0726b105b929af38))
-
-## Refactor
-
-- Compare with `undefined` directly (#9191) ([869153c](https://github.com/discordjs/discord.js/commit/869153c3fdf155783e7c0ecebd3627b087c3a026))
-
-# [@discordjs/collection@1.3.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.2.0...@discordjs/collection@1.3.0) - (2022-11-28)
-
-## Bug Fixes
-
-- Pin @types/node version ([9d8179c](https://github.com/discordjs/discord.js/commit/9d8179c6a78e1c7f9976f852804055964d5385d4))
-
-## Features
-
-- Add `Collection#subtract()` (#8393) ([291f36c](https://github.com/discordjs/discord.js/commit/291f36cd736b5dea058145a1335bf7c78ec1d81d))
-
-# [@discordjs/collection@1.2.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.1.0...@discordjs/collection@1.2.0) - (2022-10-08)
-
-## Bug Fixes
-
-- Footer / sidebar / deprecation alert ([ba3e0ed](https://github.com/discordjs/discord.js/commit/ba3e0ed348258fe8e51eefb4aa7379a1230616a9))
-
-## Documentation
-
-- Change name (#8604) ([dd5a089](https://github.com/discordjs/discord.js/commit/dd5a08944c258a847fc4377f1d5e953264ab47d0))
-- Remove xml tag from collection#find (#8550) ([4032457](https://github.com/discordjs/discord.js/commit/40324574ebea9894cadcc967e0db0e4e21d62768))
-
-## Features
-
-- Web-components (#8715) ([0ac3e76](https://github.com/discordjs/discord.js/commit/0ac3e766bd9dbdeb106483fa4bb085d74de346a2))
-
-## Refactor
-
-- Website components (#8600) ([c334157](https://github.com/discordjs/discord.js/commit/c3341570d983aea9ecc419979d5a01de658c9d67))
-- Use `eslint-config-neon` for packages. (#8579) ([edadb9f](https://github.com/discordjs/discord.js/commit/edadb9fe5dfd9ff51a3cfc9b25cb242d3f9f5241))
-
-## Typings
-
-- **Collection:** Make fn return type unknown (#8676) ([822b7f2](https://github.com/discordjs/discord.js/commit/822b7f234af053c8f917b0a998b82abfccd33801))
-
-# [@discordjs/collection@1.1.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@1.0.1...@discordjs/collection@1.1.0) - (2022-08-22)
-
-## Bug Fixes
-
-- Use proper format for `@link` text (#8384) ([2655639](https://github.com/discordjs/discord.js/commit/26556390a3800e954974a00c1328ff47d3e67e9a))
-
-## Documentation
-
-- Fence examples in codeblocks ([193b252](https://github.com/discordjs/discord.js/commit/193b252672440a860318d3c2968aedd9cb88e0ce))
-- Use link tags (#8382) ([5494791](https://github.com/discordjs/discord.js/commit/549479131318c659f86f0eb18578d597e22522d3))
-
-## Features
-
-- **website:** Show `constructor` information (#8540) ([e42fd16](https://github.com/discordjs/discord.js/commit/e42fd1636973b10dd7ed6fb4280ee1a4a8f82007))
-- **website:** Show descriptions for `@typeParam` blocks (#8523) ([e475b63](https://github.com/discordjs/discord.js/commit/e475b63f257f6261d73cb89fee9ecbcdd84e2a6b))
-
-## Refactor
-
-- **website:** Adjust typography (#8503) ([0f83402](https://github.com/discordjs/discord.js/commit/0f834029850d2448981596cf082ff59917018d66))
-- Docs design (#8487) ([4ab1d09](https://github.com/discordjs/discord.js/commit/4ab1d09997a18879a9eb9bda39df6f15aa22557e))
-
-# [@discordjs/collection@0.8.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@0.7.0...@discordjs/collection@0.8.0) - (2022-07-17)
-
-## Bug Fixes
-
-- **Collection:** Make error messages consistent (#8224) ([5bd6b28](https://github.com/discordjs/discord.js/commit/5bd6b28b3ebfced1cb9d23e83bd7c0def7a12404))
-- Check for function type (#8064) ([3bb9c0e](https://github.com/discordjs/discord.js/commit/3bb9c0e5c37311044ff41761b572ac4f91cda57c))
-
-## Documentation
-
-- Add codecov coverage badge to readmes (#8226) ([f6db285](https://github.com/discordjs/discord.js/commit/f6db285c073898a749fe4591cbd4463d1896daf5))
-
-## Features
-
-- Codecov (#8219) ([f10f4cd](https://github.com/discordjs/discord.js/commit/f10f4cdcd88ca6be7ec735ed3a415ba13da83db0))
-- **docgen:** Update typedoc ([b3346f4](https://github.com/discordjs/discord.js/commit/b3346f4b9b3d4f96443506643d4631dc1c6d7b21))
-- Website (#8043) ([127931d](https://github.com/discordjs/discord.js/commit/127931d1df7a2a5c27923c2f2151dbf3824e50cc))
-- **docgen:** Typescript support ([3279b40](https://github.com/discordjs/discord.js/commit/3279b40912e6aa61507bedb7db15a2b8668de44b))
-- Docgen package (#8029) ([8b979c0](https://github.com/discordjs/discord.js/commit/8b979c0245c42fd824d8e98745ee869f5360fc86))
-- Use vitest instead of jest for more speed ([8d8e6c0](https://github.com/discordjs/discord.js/commit/8d8e6c03decd7352a2aa180f6e5bc1a13602539b))
-- Add scripts package for locally used scripts ([f2ae1f9](https://github.com/discordjs/discord.js/commit/f2ae1f9348bfd893332a9060f71a8a5f272a1b8b))
-
-## Refactor
-
-- **collection:** Remove `default` property (#8055) ([c8f1690](https://github.com/discordjs/discord.js/commit/c8f1690896f55f06e05a83704262783cfc2bb91d))
-- **collection:** Remove default export (#8053) ([16810f3](https://github.com/discordjs/discord.js/commit/16810f3e410bf35ed7e6e7412d517ea74c792c5d))
-- Move all the config files to root (#8033) ([769ea0b](https://github.com/discordjs/discord.js/commit/769ea0bfe78c4f1d413c6b397c604ffe91e39c6a))
-
-## Testing
-
-- **collection:** Improve coverage (#8222) ([a51f721](https://github.com/discordjs/discord.js/commit/a51f7215eca67a0f46fba8b2d706f7ec6f6dc228))
-
-# [@discordjs/collection@0.7.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@0.6.0...@discordjs/collection@0.7.0) - (2022-06-04)
-
-## Styling
-
-- Cleanup tests and tsup configs ([6b8ef20](https://github.com/discordjs/discord.js/commit/6b8ef20cb3af5b5cfd176dd0aa0a1a1e98551629))
-
 # [@discordjs/collection@0.6.0](https://github.com/discordjs/discord.js/compare/@discordjs/collection@0.5.0...@discordjs/collection@0.6.0) - (2022-04-17)
 
 ## Features

packages/collection/__tests__/collection.test.ts

@@ -138,6 +138,12 @@ describe('each() tests', () => {
 		expectInvalidFunctionError(() => coll.each(123), 123);
 	});
 
+	test('binds the thisArg', () => {
+		coll.each(function each() {
+			expect(this).toBeNull();
+		}, null);
+	});
+
 	test('iterate over each item', () => {
 		const coll = createTestCollection();
 		const a: [string, number][] = [];
@@ -707,14 +713,57 @@ describe('reduce() tests', () => {
 		expect<number>(sum).toStrictEqual(6);
 	});
 
+	test('reduce collection into a single value with different accumulator type', () => {
+		const str = coll.reduce((a, x) => a.concat(x.toString()), '');
+		expect<string>(str).toStrictEqual('123');
+	});
+
 	test('reduce empty collection with initial value', () => {
 		const coll = createCollection();
-		expect(coll.reduce((a, x) => a + x, 0)).toStrictEqual(0);
+		expect<number>(coll.reduce((a, x) => a + x, 0)).toStrictEqual(0);
 	});
 
 	test('reduce empty collection without initial value', () => {
 		const coll = createCollection();
-		expect(() => coll.reduce((a: number, x) => a + x)).toThrowError(
+		expect(() => coll.reduce((a, x) => a + x)).toThrowError(
+			new TypeError('Reduce of empty collection with no initial value'),
+		);
+	});
+});
+
+describe('reduceRight() tests', () => {
+	const coll = createTestCollection();
+
+	test('throws if fn is not a function', () => {
+		// @ts-expect-error: Invalid function
+		expectInvalidFunctionError(() => coll.reduceRight());
+		// @ts-expect-error: Invalid function
+		expectInvalidFunctionError(() => coll.reduceRight(123), 123);
+	});
+
+	test('reduce collection into a single value with initial value', () => {
+		const sum = coll.reduceRight((a, x) => a + x, 0);
+		expect<number>(sum).toStrictEqual(6);
+	});
+
+	test('reduce collection into a single value without initial value', () => {
+		const sum = coll.reduceRight((a, x) => a + x);
+		expect<number>(sum).toStrictEqual(6);
+	});
+
+	test('reduce collection into a single value with different accumulator type', () => {
+		const str = coll.reduceRight((a, x) => a.concat(x.toString()), '');
+		expect<string>(str).toStrictEqual('321');
+	});
+
+	test('reduce empty collection with initial value', () => {
+		const coll = createCollection();
+		expect<number>(coll.reduceRight((a, x) => a + x, 0)).toStrictEqual(0);
+	});
+
+	test('reduce empty collection without initial value', () => {
+		const coll = createCollection();
+		expect(() => coll.reduceRight((a, x) => a + x)).toThrowError(
 			new TypeError('Reduce of empty collection with no initial value'),
 		);
 	});
@@ -964,6 +1013,10 @@ describe('findLast() tests', () => {
 		expect(coll.findLast((value) => value % 2 === 1)).toStrictEqual(3);
 	});
 
+	test('returns undefined if no item matches', () => {
+		expect(coll.findLast((value) => value === 10)).toBeUndefined();
+	});
+
 	test('throws if fn is not a function', () => {
 		// @ts-expect-error: Invalid function
 		expectInvalidFunctionError(() => createCollection().findLast());
@@ -985,6 +1038,10 @@ describe('findLastKey() tests', () => {
 		expect(coll.findLastKey((value) => value % 2 === 1)).toStrictEqual('c');
 	});
 
+	test('returns undefined if no item matches', () => {
+		expect(coll.findLastKey((value) => value === 10)).toBeUndefined();
+	});
+
 	test('throws if fn is not a function', () => {
 		// @ts-expect-error: Invalid function
 		expectInvalidFunctionError(() => createCollection().findLastKey());
@@ -999,31 +1056,3 @@ describe('findLastKey() tests', () => {
 		}, null);
 	});
 });
-
-describe('reduceRight() tests', () => {
-	const coll = createTestCollection();
-
-	test('throws if fn is not a function', () => {
-		// @ts-expect-error: Invalid function
-		expectInvalidFunctionError(() => coll.reduceRight());
-		// @ts-expect-error: Invalid function
-		expectInvalidFunctionError(() => coll.reduceRight(123), 123);
-	});
-
-	test('reduce collection into a single value with initial value', () => {
-		const sum = coll.reduceRight((a, x) => a + x, 0);
-		expect(sum).toStrictEqual(6);
-	});
-
-	test('reduce collection into a single value without initial value', () => {
-		const sum = coll.reduceRight<number>((a, x) => a + x);
-		expect(sum).toStrictEqual(6);
-	});
-
-	test('reduce empty collection without initial value', () => {
-		const coll = createCollection();
-		expect(() => coll.reduceRight((a: number, x) => a + x)).toThrowError(
-			new TypeError('Reduce of empty collection with no initial value'),
-		);
-	});
-});

packages/collection/cliff.toml

@@ -5,13 +5,16 @@ header = """
 All notable changes to this project will be documented in this file.\n
 """
 body = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
 {% if version %}\
 	# [{{ version | trim_start_matches(pat="v") }}]\
 	{% if previous %}\
 		{% if previous.version %}\
-			(https://github.com/discordjs/discord.js/compare/{{ previous.version }}...{{ version }})\
+			({{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }})\
 		{% else %}\
-			(https://github.com/discordjs/discord.js/tree/{{ version }})\
+			({{ self::remote_url() }}/tree/{{ version }})\
 		{% endif %}\
 	{% endif %} \
 	- ({{ timestamp | date(format="%Y-%m-%d") }})
@@ -24,14 +27,21 @@ body = """
 		- {% if commit.scope %}\
 			**{{commit.scope}}:** \
 		  {% endif %}\
-			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/discordjs/discord.js/commit/{{ commit.id }}))\
+			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
+			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
 			{% for breakingChange in commit.footers %}\
 				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
-{% endfor %}\n
+{% endfor %}\
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length %}\
+	\n### New Contributors\n
+	{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}\
+		* @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }}
+	{% endfor %}\
+{% endif %}\n
 """
 trim = true
 footer = ""
@@ -59,5 +69,9 @@ commit_parsers = [
 filter_commits = true
 tag_pattern = "@discordjs/collection@[0-9]*"
 ignore_tags = ""
-topo_order = true
+topo_order = false
 sort_commits = "newest"
+
+[remote.github]
+owner = "discordjs"
+repo = "discord.js"

packages/collection/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/collection",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "Utility data structure used in discord.js",
 	"scripts": {
 		"test": "vitest run",
@@ -41,7 +41,7 @@
 		"Crawl <icrawltogo@gmail.com>",
 		"Amish Shah <amishshah.2k@gmail.com>",
 		"SpaceEEC <spaceeec@yahoo.com>",
-		"Vlad Frangu <kingdgrizzle@gmail.com>",
+		"Vlad Frangu <me@vladfrangu.dev>",
 		"Aura Román <kyradiscord@gmail.com>"
 	],
 	"license": "Apache-2.0",
@@ -63,19 +63,19 @@
 	"devDependencies": {
 		"@discordjs/api-extractor": "workspace:^",
 		"@discordjs/scripts": "workspace:^",
-		"@favware/cliff-jumper": "^3.0.2",
-		"@types/node": "18.18.8",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@favware/cliff-jumper": "^4.1.0",
+		"@types/node": "^18.19.45",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.2.1",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

packages/collection/src/collection.ts

@@ -87,7 +87,7 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 		if (amount < 0) return this.last(amount * -1);
 		amount = Math.min(this.size, amount);
 		const iter = this.values();
-		return Array.from({ length: amount }, (): Value => iter.next().value);
+		return Array.from({ length: amount }, (): Value => iter.next().value!);
 	}
 
 	/**
@@ -104,7 +104,7 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 		if (amount < 0) return this.lastKey(amount * -1);
 		amount = Math.min(this.size, amount);
 		const iter = this.keys();
-		return Array.from({ length: amount }, (): Key => iter.next().value);
+		return Array.from({ length: amount }, (): Key => iter.next().value!);
 	}
 
 	/**
@@ -512,7 +512,7 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 		if (thisArg !== undefined) fn = fn.bind(thisArg);
 		const iter = this.entries();
 		return Array.from({ length: this.size }, (): NewValue => {
-			const [key, value] = iter.next().value;
+			const [key, value] = iter.next().value!;
 			return fn(value, key, this);
 		});
 	}
@@ -616,7 +616,15 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 	 * collection.reduce((acc, guild) => acc + guild.memberCount, 0);
 	 * ```
 	 */
-	public reduce<InitialValue = Value>(
+	public reduce(
+		fn: (accumulator: Value, value: Value, key: Key, collection: this) => Value,
+		initialValue?: Value,
+	): Value;
+	public reduce<InitialValue>(
+		fn: (accumulator: InitialValue, value: Value, key: Key, collection: this) => InitialValue,
+		initialValue: InitialValue,
+	): InitialValue;
+	public reduce<InitialValue>(
 		fn: (accumulator: InitialValue, value: Value, key: Key, collection: this) => InitialValue,
 		initialValue?: InitialValue,
 	): InitialValue {
@@ -626,7 +634,7 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 		const iterator = this.entries();
 		if (initialValue === undefined) {
 			if (this.size === 0) throw new TypeError('Reduce of empty collection with no initial value');
-			accumulator = iterator.next().value[1];
+			accumulator = iterator.next().value![1] as unknown as InitialValue;
 		} else {
 			accumulator = initialValue;
 		}
@@ -645,6 +653,14 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 	 * @param fn - Function used to reduce, taking four arguments; `accumulator`, `value`, `key`, and `collection`
 	 * @param initialValue - Starting value for the accumulator
 	 */
+	public reduceRight(
+		fn: (accumulator: Value, value: Value, key: Key, collection: this) => Value,
+		initialValue?: Value,
+	): Value;
+	public reduceRight<InitialValue>(
+		fn: (accumulator: InitialValue, value: Value, key: Key, collection: this) => InitialValue,
+		initialValue: InitialValue,
+	): InitialValue;
 	public reduceRight<InitialValue>(
 		fn: (accumulator: InitialValue, value: Value, key: Key, collection: this) => InitialValue,
 		initialValue?: InitialValue,

packages/core/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/core@2.0.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@1.2.0...@discordjs/core@2.0.0) - (2024-09-01)
+
+## Bug Fixes
+
+- **OAuth2API:** Enable token exchange without token (#10312) ([9b07036](https://github.com/discordjs/discord.js/commit/9b07036d707b123709480987d5741d6ba75b148b))
+
+## Documentation
+
+- **stageInstances:** Correct reference for stage instance creation (#10333) ([7f60a8f](https://github.com/discordjs/discord.js/commit/7f60a8fc5d412718e269774505b2ed4fc30a83cd))
+
+## Features
+
+- Use get sticker pack endpoint (#10445) ([1b1ae2f](https://github.com/discordjs/discord.js/commit/1b1ae2f0cb339170e4c0692eb43fbc966fd64030))
+- **VoiceState:** Add methods for fetching voice state (#10442) ([9907ff9](https://github.com/discordjs/discord.js/commit/9907ff915e7c72e7e980d68bf005763a3aacad1c))
+- Application emojis (#10399) ([5d92525](https://github.com/discordjs/discord.js/commit/5d92525596a0193fe65626119bb040c2eb9e945a))
+- **OAuth2API:** Add `revokeToken` method (#10440) ([69adc6f](https://github.com/discordjs/discord.js/commit/69adc6f4b9eb4fafe4a20b01137a270621f1365f))
+- Premium buttons (#10353) ([4f59b74](https://github.com/discordjs/discord.js/commit/4f59b740d01b9ff2213949708a36e17da32b89c3))
+- Add `reason` to `followAnnouncements` method (#10275) ([b36ec98](https://github.com/discordjs/discord.js/commit/b36ec983828c7001e47debcd435592ea026768d5))
+
+## Refactor
+
+- Use get guild role endpoint (#10443) ([bba0e72](https://github.com/discordjs/discord.js/commit/bba0e72e2283630b9f84b77d53525397036c6b31))
+- **ws:** Event layout (#10376) ([bf6761a](https://github.com/discordjs/discord.js/commit/bf6761a44adec1fe5017f6bf5d8bc0734916961f))
+  - **BREAKING CHANGE:** All events now emit shard id as its own param
+
 # [@discordjs/core@1.2.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@1.1.1...@discordjs/core@1.2.0) - (2024-05-04)
 
 ## Bug Fixes
@@ -125,126 +150,6 @@ All notable changes to this project will be documented in this file.
 
 - **ChannelsAPI:** Use correct type for `editMessage` (#9399) ([0a1701b](https://github.com/discordjs/discord.js/commit/0a1701b0463919a895c518e5daa9836760d9b6cf))
 
-# [@discordjs/core@1.0.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.6.0...@discordjs/core@1.0.0) - (2023-07-31)
-
-## Bug Fixes
-
-- **core:** Fix inconsistencies on `core` (#9680) ([6d5840c](https://github.com/discordjs/discord.js/commit/6d5840c61e5164c461b821fbd79b71b812aa046e))
-- **client:** Add missing application command permissions update event (#9639) ([2818d7c](https://github.com/discordjs/discord.js/commit/2818d7cc1d76c06252a5d89dbc48c4340cf23f3f))
-- **api:** Various fixes for overlooked stuff (#9588) ([6c7a5ed](https://github.com/discordjs/discord.js/commit/6c7a5ed1e7f05ca9350cb84c429c76acf3851fc0))
-- **GuildsAPI:** Use `level` rather than `mfa_level` when editing MFA (#9584) ([3535321](https://github.com/discordjs/discord.js/commit/3535321b98cec4a715aca19e8fd34e6d3b27975f))
-- **roleConnections:** Fix `body` type for `updateMetadataRecords()` (#9516) ([166c961](https://github.com/discordjs/discord.js/commit/166c9612611b8665a62d8a5f657f64b5a266d0f4))
-
-## Documentation
-
-- Define /core token in example (#9586) ([bc2798b](https://github.com/discordjs/discord.js/commit/bc2798b8ee33895506c4bc684b59bc8acefb615d))
-
-## Features
-
-- **WebhooksAPI:** Allow `with token` requests without bot auth (#9715) ([bc83cab](https://github.com/discordjs/discord.js/commit/bc83cabfdad76fec9352ddb9a7d488e058ede180))
-- Guild onboarding (#9120) ([dc73c93](https://github.com/discordjs/discord.js/commit/dc73c938ff9d04a0d7d57630faeb8e81ea343006))
-- **ChannelsAPI:** Add permission overwrites (#9651) ([78381a5](https://github.com/discordjs/discord.js/commit/78381a56cf9a122d0a44ab1b0966cb0d7691ad7d))
-- **api:** Add stage instances (#9578) ([985def3](https://github.com/discordjs/discord.js/commit/985def3f255b37891642172a3c83897c1d2749f6))
-- **GuildsAPI:** Add `removeMember()` (#9576) ([5d6eed6](https://github.com/discordjs/discord.js/commit/5d6eed64140029837043cf537033b97c40f39607))
-- **api:** Add `getMemberBans()` query options and `getMemberBan()` (#9569) ([590f5bc](https://github.com/discordjs/discord.js/commit/590f5bc38e6eab09e8d3d6cfd3967390202913c4))
-- **client:** Support more request member fields (#9475) ([1edd01a](https://github.com/discordjs/discord.js/commit/1edd01a7a494ee7604b81bc2a3ec25a55d957f92))
-
-## Refactor
-
-- **rest:** Switch api to fetch-like and provide strategies (#9416) ([cdaa0a3](https://github.com/discordjs/discord.js/commit/cdaa0a36f586459f1e5ede868c4250c7da90455c))
-  - **BREAKING CHANGE:** NodeJS v18+ is required when using node due to the use of global `fetch`
-  - **BREAKING CHANGE:** The raw method of REST now returns a web compatible `Respone` object.
-  - **BREAKING CHANGE:** The `parseResponse` utility method has been updated to operate on a web compatible `Response` object.
-  - **BREAKING CHANGE:** Many underlying internals have changed, some of which were exported.
-  - **BREAKING CHANGE:** `DefaultRestOptions` used to contain a default `agent`, which is now set to `null` instead.
-
-## Typings
-
-- Use `Snowflake` instead of `string` for snowflakes (#9583) ([1c4a12c](https://github.com/discordjs/discord.js/commit/1c4a12c7d62d060d655668a81d0ff4f1ae95607a))
-
-# [@discordjs/core@0.6.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.5.2...@discordjs/core@0.6.0) - (2023-05-01)
-
-## Documentation
-
-- Update example usage (#9461) ([6212bff](https://github.com/discordjs/discord.js/commit/6212bffa30f4c6bbe6a81dc5b2b037e5b65d493c))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-
-## Features
-
-- **core:** Abstract gateway (#9410) ([5d1a4c2](https://github.com/discordjs/discord.js/commit/5d1a4c27d5ee2686c8fab6cad8bd97d8d0876e66))
-
-# [@discordjs/core@0.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.5.0...@discordjs/core@0.5.1) - (2023-04-16)
-
-## Bug Fixes
-
-- **interactions:** Make `data` parameter optional (#9379) ([66dc401](https://github.com/discordjs/discord.js/commit/66dc4014fe4553f1dd73aaa7c32fd83e10bde263))
-- **core:** Support attachment editing on interactions (#9356) ([676307f](https://github.com/discordjs/discord.js/commit/676307ff5c6c4ef56a353b6fc74501a1080da869))
-- **core:** Missed optional options (#9311) ([6912faa](https://github.com/discordjs/discord.js/commit/6912faa9b3852adbacc7d0b002aae81be041f529))
-
-## Typings
-
-- **ChannelsAPI:** Use correct type for `editMessage` (#9399) ([0a1701b](https://github.com/discordjs/discord.js/commit/0a1701b0463919a895c518e5daa9836760d9b6cf))
-
-# [@discordjs/core@0.6.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.5.2...@discordjs/core@0.6.0) - (2023-05-01)
-
-## Documentation
-
-- Update example usage (#9461) ([6212bff](https://github.com/discordjs/discord.js/commit/6212bffa30f4c6bbe6a81dc5b2b037e5b65d493c))
-- Generate static imports for types with api-extractor ([98a76db](https://github.com/discordjs/discord.js/commit/98a76db482879f79d6bb2fb2e5fc65ac2c34e2d9))
-
-## Features
-
-- **core:** Abstract gateway (#9410) ([5d1a4c2](https://github.com/discordjs/discord.js/commit/5d1a4c27d5ee2686c8fab6cad8bd97d8d0876e66))
-
-# [@discordjs/core@0.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.5.0...@discordjs/core@0.5.1) - (2023-04-16)
-
-## Bug Fixes
-
-- **interactions:** Make `data` parameter optional (#9379) ([66dc401](https://github.com/discordjs/discord.js/commit/66dc4014fe4553f1dd73aaa7c32fd83e10bde263))
-- **core:** Support attachment editing on interactions (#9356) ([676307f](https://github.com/discordjs/discord.js/commit/676307ff5c6c4ef56a353b6fc74501a1080da869))
-- **core:** Missed optional options (#9311) ([6912faa](https://github.com/discordjs/discord.js/commit/6912faa9b3852adbacc7d0b002aae81be041f529))
-
-## Typings
-
-- **ChannelsAPI:** Use correct type for `editMessage` (#9399) ([0a1701b](https://github.com/discordjs/discord.js/commit/0a1701b0463919a895c518e5daa9836760d9b6cf))
-
-# [@discordjs/core@0.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.4.0...@discordjs/core@0.5.1) - (2023-04-16)
-
-## Bug Fixes
-
-- **interactions:** Make `data` parameter optional (#9379) ([66dc401](https://github.com/discordjs/discord.js/commit/66dc4014fe4553f1dd73aaa7c32fd83e10bde263))
-- **core:** Support attachment editing on interactions (#9356) ([676307f](https://github.com/discordjs/discord.js/commit/676307ff5c6c4ef56a353b6fc74501a1080da869))
-- **core:** Missed optional options (#9311) ([6912faa](https://github.com/discordjs/discord.js/commit/6912faa9b3852adbacc7d0b002aae81be041f529))
-
-## Typings
-
-- **ChannelsAPI:** Use correct type for `editMessage` (#9399) ([0a1701b](https://github.com/discordjs/discord.js/commit/0a1701b0463919a895c518e5daa9836760d9b6cf))
-
-# [@discordjs/core@0.5.1](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.5.0...@discordjs/core@0.5.1) - (2023-04-16)
-
-## Bug Fixes
-
-- **interactions:** Make `data` parameter optional (#9379) ([66dc401](https://github.com/discordjs/discord.js/commit/66dc4014fe4553f1dd73aaa7c32fd83e10bde263))
-- **core:** Support attachment editing on interactions (#9356) ([676307f](https://github.com/discordjs/discord.js/commit/676307ff5c6c4ef56a353b6fc74501a1080da869))
-- **core:** Missed optional options (#9311) ([6912faa](https://github.com/discordjs/discord.js/commit/6912faa9b3852adbacc7d0b002aae81be041f529))
-
-## Typings
-
-- **ChannelsAPI:** Use correct type for `editMessage` (#9399) ([0a1701b](https://github.com/discordjs/discord.js/commit/0a1701b0463919a895c518e5daa9836760d9b6cf))
-
-# [@discordjs/core@0.5.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.4.0...@discordjs/core@0.5.0) - (2023-04-01)
-
-## Bug Fixes
-
-- **core:** Include data for defer (#9284) ([9d69bba](https://github.com/discordjs/discord.js/commit/9d69bba47c73b756086992bc14e57c40fadb34d1))
-- **scripts:** Accessing tsComment ([d8d5f31](https://github.com/discordjs/discord.js/commit/d8d5f31d3927fd1de62f1fa3a1a6e454243ad87b))
-
-## Features
-
-- **core:** Http-only wrapper (#9281) ([11e682c](https://github.com/discordjs/discord.js/commit/11e682cfe388b9a3070388f73ebef3c27555c0dd))
-- **core:** Add `AbortSignal` support. (#9042) ([907eb1b](https://github.com/discordjs/discord.js/commit/907eb1b4708bdaf30f4e59f4016ef8a717f47a4c))
-- **website:** Render syntax and mdx on the server (#9086) ([ee5169e](https://github.com/discordjs/discord.js/commit/ee5169e0aadd7bbfcd752aae614ec0f69602b68b))
-
 # [@discordjs/core@0.4.0](https://github.com/discordjs/discord.js/compare/@discordjs/core@0.3.0...@discordjs/core@0.4.0) - (2023-03-12)
 
 ## Bug Fixes

packages/core/api-extractor.json

@@ -1,5 +1,6 @@
 {
 	"extends": "../../api-extractor.json",
+	"bundledPackages": ["discord-api-types"],
 	"docModel": {
 		"projectFolderUrl": "https://github.com/discordjs/discord.js/tree/main/packages/core"
 	}

packages/core/cliff.toml

@@ -5,13 +5,16 @@ header = """
 All notable changes to this project will be documented in this file.\n
 """
 body = """
+{%- macro remote_url() -%}
+  https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}
+{%- endmacro -%}
 {% if version %}\
 	# [{{ version | trim_start_matches(pat="v") }}]\
 	{% if previous %}\
 		{% if previous.version %}\
-			(https://github.com/discordjs/discord.js/compare/{{ previous.version }}...{{ version }})\
+			({{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }})\
 		{% else %}\
-			(https://github.com/discordjs/discord.js/tree/{{ version }})\
+			({{ self::remote_url() }}/tree/{{ version }})\
 		{% endif %}\
 	{% endif %} \
 	- ({{ timestamp | date(format="%Y-%m-%d") }})
@@ -24,14 +27,21 @@ body = """
 		- {% if commit.scope %}\
 			**{{commit.scope}}:** \
 		  {% endif %}\
-			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/discordjs/discord.js/commit/{{ commit.id }}))\
+			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
+			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
 			{% for breakingChange in commit.footers %}\
 				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
-{% endfor %}\n
+{% endfor %}\
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length %}\
+	\n### New Contributors\n
+	{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}\
+		* @{{ contributor.username }} made their first contribution in #{{ contributor.pr_number }}
+	{% endfor %}\
+{% endif %}\n
 """
 trim = true
 footer = ""
@@ -59,5 +69,9 @@ commit_parsers = [
 filter_commits = true
 tag_pattern = "@discordjs/core@[0-9]*"
 ignore_tags = ""
-topo_order = true
+topo_order = false
 sort_commits = "newest"
+
+[remote.github]
+owner = "discordjs"
+repo = "discord.js"

packages/core/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/core",
-	"version": "1.2.0",
+	"version": "2.0.0",
 	"description": "A thinly abstracted wrapper around the rest API, and gateway.",
 	"scripts": {
 		"test": "vitest run",
@@ -48,7 +48,7 @@
 	"contributors": [
 		"Crawl <icrawltogo@gmail.com>",
 		"SpaceEEC <spaceeec@yahoo.com>",
-		"Vlad Frangu <kingdgrizzle@gmail.com>",
+		"Vlad Frangu <me@vladfrangu.dev>",
 		"Aura Román <kyradiscord@gmail.com>",
 		"Suneet Tipirneni <suneettipirneni@icloud.com>"
 	],
@@ -69,25 +69,25 @@
 		"@discordjs/util": "workspace:^",
 		"@discordjs/ws": "workspace:^",
 		"@sapphire/snowflake": "^3.5.3",
-		"@vladfrangu/async_event_emitter": "^2.2.4",
-		"discord-api-types": "0.37.83"
+		"@vladfrangu/async_event_emitter": "^2.4.6",
+		"discord-api-types": "^0.37.119"
 	},
 	"devDependencies": {
 		"@discordjs/api-extractor": "workspace:^",
 		"@discordjs/scripts": "workspace:^",
-		"@favware/cliff-jumper": "^3.0.2",
-		"@types/node": "18.18.8",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@favware/cliff-jumper": "^4.1.0",
+		"@types/node": "^18.19.45",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.2.1",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"prettier": "^3.2.5",
-		"tsup": "^8.0.2",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vitest": "^1.5.0"
+		"prettier": "^3.3.3",
+		"tsup": "^8.2.4",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
 		"node": ">=18"

packages/core/src/api/applications.ts

@@ -2,10 +2,17 @@
 
 import type { RequestData, REST } from '@discordjs/rest';
 import {
+	Routes,
+	type RESTGetAPIApplicationEmojiResult,
+	type RESTGetAPIApplicationEmojisResult,
 	type RESTGetCurrentApplicationResult,
+	type RESTPatchAPIApplicationEmojiJSONBody,
+	type RESTPatchAPIApplicationEmojiResult,
 	type RESTPatchCurrentApplicationJSONBody,
 	type RESTPatchCurrentApplicationResult,
-	Routes,
+	type RESTPostAPIApplicationEmojiJSONBody,
+	type RESTPostAPIApplicationEmojiResult,
+	type Snowflake,
 } from 'discord-api-types/v10';
 
 export class ApplicationsAPI {
@@ -34,4 +41,83 @@ export class ApplicationsAPI {
 			signal,
 		}) as Promise<RESTPatchCurrentApplicationResult>;
 	}
+
+	/**
+	 * Fetches all emojis of an application
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/emoji#list-application-emojis}
+	 * @param applicationId - The id of the application to fetch the emojis of
+	 * @param options - The options for fetching the emojis
+	 */
+	public async getEmojis(applicationId: Snowflake, { signal }: Pick<RequestData, 'signal'> = {}) {
+		return this.rest.get(Routes.applicationEmojis(applicationId), {
+			signal,
+		}) as Promise<RESTGetAPIApplicationEmojisResult>;
+	}
+
+	/**
+	 * Fetches an emoji of an application
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/emoji#get-application-emoji}
+	 * @param applicationId - The id of the application to fetch the emoji of
+	 * @param emojiId - The id of the emoji to fetch
+	 * @param options - The options for fetching the emoji
+	 */
+	public async getEmoji(applicationId: Snowflake, emojiId: Snowflake, { signal }: Pick<RequestData, 'signal'> = {}) {
+		return this.rest.get(Routes.applicationEmoji(applicationId, emojiId), {
+			signal,
+		}) as Promise<RESTGetAPIApplicationEmojiResult>;
+	}
+
+	/**
+	 * Creates a new emoji of an application
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/emoji#create-application-emoji}
+	 * @param applicationId - The id of the application to create the emoji of
+	 * @param body - The data for creating the emoji
+	 * @param options - The options for creating the emoji
+	 */
+	public async createEmoji(
+		applicationId: Snowflake,
+		body: RESTPostAPIApplicationEmojiJSONBody,
+		{ signal }: Pick<RequestData, 'signal'> = {},
+	) {
+		return this.rest.post(Routes.applicationEmojis(applicationId), {
+			body,
+			signal,
+		}) as Promise<RESTPostAPIApplicationEmojiResult>;
+	}
+
+	/**
+	 * Edits an emoji of an application
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/emoji#modify-application-emoji}
+	 * @param applicationId - The id of the application to edit the emoji of
+	 * @param emojiId - The id of the emoji to edit
+	 * @param body - The data for editing the emoji
+	 * @param options - The options for editing the emoji
+	 */
+	public async editEmoji(
+		applicationId: Snowflake,
+		emojiId: Snowflake,
+		body: RESTPatchAPIApplicationEmojiJSONBody,
+		{ signal }: Pick<RequestData, 'signal'> = {},
+	) {
+		return this.rest.patch(Routes.applicationEmoji(applicationId, emojiId), {
+			body,
+			signal,
+		}) as Promise<RESTPatchAPIApplicationEmojiResult>;
+	}
+
+	/**
+	 * Deletes an emoji of an application
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/emoji#delete-application-emoji}
+	 * @param applicationId - The id of the application to delete the emoji of
+	 * @param emojiId - The id of the emoji to delete
+	 * @param options - The options for deleting the emoji
+	 */
+	public async deleteEmoji(applicationId: Snowflake, emojiId: Snowflake, { signal }: Pick<RequestData, 'signal'> = {}) {
+		await this.rest.delete(Routes.applicationEmoji(applicationId, emojiId), { signal });
+	}
 }

packages/core/src/api/guild.ts

@@ -28,6 +28,7 @@ import {
 	type RESTGetAPIGuildPruneCountResult,
 	type RESTGetAPIGuildQuery,
 	type RESTGetAPIGuildResult,
+	type RESTGetAPIGuildRoleResult,
 	type RESTGetAPIGuildRolesResult,
 	type RESTGetAPIGuildScheduledEventQuery,
 	type RESTGetAPIGuildScheduledEventResult,
@@ -67,7 +68,6 @@ import {
 	type RESTPatchAPIGuildTemplateJSONBody,
 	type RESTPatchAPIGuildTemplateResult,
 	type RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody,
-	type RESTPatchAPIGuildVoiceStateCurrentMemberResult,
 	type RESTPatchAPIGuildVoiceStateUserJSONBody,
 	type RESTPatchAPIGuildWelcomeScreenJSONBody,
 	type RESTPatchAPIGuildWelcomeScreenResult,
@@ -102,6 +102,7 @@ import {
 	type RESTPutAPIGuildTemplateSyncResult,
 	type Snowflake,
 } from 'discord-api-types/v10';
+import { VoiceAPI } from './voice';
 
 export class GuildsAPI {
 	public constructor(private readonly rest: REST) {}
@@ -397,6 +398,18 @@ export class GuildsAPI {
 		return this.rest.get(Routes.guildRoles(guildId), { signal }) as Promise<RESTGetAPIGuildRolesResult>;
 	}
 
+	/**
+	 * Get a role in a guild
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/guild#get-guild-role}
+	 * @param guildId - The id of the guild to fetch the role from
+	 * @param roleId - The id of the role to fetch
+	 * @param options - The options for fetching the guild role
+	 */
+	public async getRole(guildId: Snowflake, roleId: Snowflake, { signal }: Pick<RequestData, 'signal'> = {}) {
+		return this.rest.get(Routes.guildRole(guildId, roleId), { signal }) as Promise<RESTGetAPIGuildRoleResult>;
+	}
+
 	/**
 	 * Creates a guild role
 	 *
@@ -687,11 +700,12 @@ export class GuildsAPI {
 	/**
 	 * Edits a user's voice state in a guild
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/guild#modify-user-voice-state}
+	 * @see {@link https://discord.com/developers/docs/resources/voice#modify-user-voice-state}
 	 * @param guildId - The id of the guild to edit the current user's voice state in
 	 * @param userId - The id of the user to edit the voice state for
 	 * @param body - The data for editing the voice state
 	 * @param options - The options for editing the voice state
+	 * @deprecated Use {@link VoiceAPI.editUserVoiceState} instead
 	 */
 	public async editUserVoiceState(
 		guildId: Snowflake,
@@ -699,7 +713,7 @@ export class GuildsAPI {
 		body: RESTPatchAPIGuildVoiceStateUserJSONBody,
 		{ reason, signal }: Pick<RequestData, 'reason' | 'signal'> = {},
 	) {
-		await this.rest.patch(Routes.guildVoiceState(guildId, userId), { reason, body, signal });
+		return new VoiceAPI(this.rest).editUserVoiceState(guildId, userId, body, { reason, signal });
 	}
 
 	/**
@@ -1298,14 +1312,18 @@ export class GuildsAPI {
 	/**
 	 * Sets the voice state for the current user
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state}
+	 * @see {@link https://discord.com/developers/docs/resources/voice#modify-current-user-voice-state}
 	 * @param guildId - The id of the guild
-	 * @param body - The options for setting the voice state
+	 * @param body - The data for setting the voice state
+	 * @param options - The options for setting the voice state
+	 * @deprecated Use {@link VoiceAPI.editVoiceState} instead
 	 */
-	public async setVoiceState(guildId: Snowflake, body: RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody = {}) {
-		return this.rest.patch(Routes.guildVoiceState(guildId, '@me'), {
-			body,
-		}) as Promise<RESTPatchAPIGuildVoiceStateCurrentMemberResult>;
+	public async setVoiceState(
+		guildId: Snowflake,
+		body: RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody = {},
+		{ signal }: Pick<RequestData, 'signal'> = {},
+	) {
+		return new VoiceAPI(this.rest).editVoiceState(guildId, body, { signal });
 	}
 
 	/**

packages/core/src/api/interactions.ts

@@ -258,6 +258,7 @@ export class InteractionsAPI {
 	 * @param interactionId - The id of the interaction
 	 * @param interactionToken - The token of the interaction
 	 * @param options - The options for sending the premium required response
+	 * @deprecated Sending a premium-style button is the new Discord behaviour.
 	 */
 	public async sendPremiumRequired(
 		interactionId: Snowflake,