style: Run Prettier (#10604)

style: prettier

.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/.kodiak.toml

@@ -2,7 +2,7 @@ version = 1
 
 [merge]
 require_automerge_label = false
-blocking_labels = ['blocked', 'in review']
+blocking_labels = ['blocked', 'in review', 'semver:major']
 method = 'squash'
 
 [merge.message]

.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:
-  - apps/guide/*
-  - apps/guide/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - apps/guide/*
+          - apps/guide/**/*
 apps:website:
-  - apps/website/*
-  - apps/website/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - apps/website/*
+          - apps/website/**/*
 packages:api-extractor:
-  - packages/api-extractor/*
-  - packages/api-extractor/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/api-extractor/*
+          - packages/api-extractor/**/*
 packages:api-extractor-model:
-  - packages/api-extractor-model/*
-  - packages/api-extractor-model/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/api-extractor-model/*
+          - packages/api-extractor-model/**/*
 packages:brokers:
-  - packages/brokers/*
-  - packages/brokers/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/brokers/*
+          - packages/brokers/**/*
 packages:builders:
-  - packages/builders/*
-  - packages/builders/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/builders/*
+          - packages/builders/**/*
 packages:collection:
-  - packages/collection/*
-  - packages/collection/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/collection/*
+          - packages/collection/**/*
 packages:core:
-  - packages/core/*
-  - packages/core/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/core/*
+          - packages/core/**/*
 packages:create-discord-bot:
-  - packages/create-discord-bot/*
-  - packages/create-discord-bot/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/create-discord-bot/*
+          - packages/create-discord-bot/**/*
 packages:discord.js:
-  - packages/discord.js/*
-  - packages/discord.js/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/discord.js/*
+          - packages/discord.js/**/*
 packages:docgen:
-  - packages/docgen/*
-  - packages/docgen/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/docgen/*
+          - packages/docgen/**/*
 packages:formatters:
-  - packages/formatters/*
-  - packages/formatters/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/formatters/*
+          - packages/formatters/**/*
 packages:next:
-  - packages/next/*
-  - packages/next/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/next/*
+          - packages/next/**/*
 packages:proxy:
-  - packages/proxy/*
-  - packages/proxy/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/proxy/*
+          - packages/proxy/**/*
 packages:proxy-container:
-  - packages/proxy-container/*
-  - packages/proxy-container/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/proxy-container/*
+          - packages/proxy-container/**/*
 packages:rest:
-  - packages/rest/*
-  - packages/rest/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/rest/*
+          - packages/rest/**/*
 packages:ui:
-  - packages/ui/*
-  - packages/ui/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/ui/*
+          - packages/ui/**/*
 packages:util:
-  - packages/util/*
-  - packages/util/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/util/*
+          - packages/util/**/*
 packages:voice:
-  - packages/voice/*
-  - packages/voice/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/voice/*
+          - packages/voice/**/*
 packages:ws:
-  - packages/ws/*
-  - packages/ws/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/ws/*
+          - packages/ws/**/*

.github/workflows/cleanup-cache.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cleanup caches
         run: |

.github/workflows/deploy-website.yml

@@ -14,12 +14,12 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache

.github/workflows/deprecate-version.yml

@@ -34,12 +34,12 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache

.github/workflows/documentation.yml

@@ -36,14 +36,14 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || '' }}
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache
@@ -53,7 +53,7 @@ jobs:
 
       - name: Checkout main repository
         if: ${{ inputs.ref && inputs.ref != 'main' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: 'main'
 
@@ -75,7 +75,7 @@ jobs:
 
       - 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}}/"
+        run: sed -i 's!https://github.com/discordjs/discord.js/tree/main!https://github.com/discordjs/discord.js/tree/${{ github.ref_name }}!' "packages/${{ steps.extract-tag.outputs.package}}/api-extractor.json"
 
       - name: Build docs
         run: pnpm run docs
@@ -93,7 +93,7 @@ jobs:
           done
 
       - name: Checkout docs repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'discordjs/docs'
           token: ${{ secrets.DJS_DOCS }}
@@ -211,12 +211,12 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache

.github/workflows/issue-triage.yml

@@ -6,7 +6,7 @@ jobs:
   issue-triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/issue-labeler@v3.2
+      - uses: github/issue-labeler@v3.4
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           configuration-path: .github/issue-labeler.yml

.github/workflows/label-sync.yml

@@ -15,9 +15,9 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Label sync
-        uses: crazy-max/ghaction-github-labeler@v4
+        uses: crazy-max/ghaction-github-labeler@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: 365

.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
-        uses: actions/labeler@v4
+      - 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-docker.yml

@@ -10,18 +10,18 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

.github/workflows/publish-dev.yml

@@ -43,14 +43,14 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
 
       - name: Check the current development version
@@ -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 }}

.github/workflows/publish-docker.yml

@@ -7,18 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

.github/workflows/publish-release.yml

@@ -14,12 +14,12 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
 
       - name: Install dependencies

.github/workflows/tests.yml

@@ -15,14 +15,14 @@ jobs:
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         uses: ./packages/actions/src/pnpmCache
@@ -62,3 +62,5 @@ jobs:
       - name: Upload Coverage
         if: github.repository_owner == 'discordjs'
         uses: ./packages/actions/src/uploadCoverage
+        with:
+          codecov_token: ${{ secrets.CODECOV_TOKEN }}

apps/guide/next.config.js

@@ -1,25 +1,17 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-require-imports */
-// import bundleAnalyzer from '@next/bundle-analyzer';
 // import { withContentlayer } from 'next-contentlayer';
-const bundleAnalyzer = require('@next/bundle-analyzer');
 const { withContentlayer } = require('next-contentlayer');
 
-const withBundleAnalyzer = bundleAnalyzer({
-	enabled: process.env.ANALYZE === 'true',
+module.exports = withContentlayer({
+	reactStrictMode: true,
+	experimental: {
+		typedRoutes: true,
+	},
+	images: {
+		dangerouslyAllowSVG: true,
+		contentDispositionType: 'attachment',
+		contentSecurityPolicy: "default-src 'self'; frame-src 'none'; sandbox;",
+	},
+	poweredByHeader: false,
 });
-
-module.exports = withBundleAnalyzer(
-	withContentlayer({
-		reactStrictMode: true,
-		experimental: {
-			typedRoutes: true,
-		},
-		images: {
-			dangerouslyAllowSVG: true,
-			contentDispositionType: 'attachment',
-			contentSecurityPolicy: "default-src 'self'; frame-src 'none'; sandbox;",
-		},
-		poweredByHeader: false,
-	}),
-);

apps/guide/package.json

@@ -48,51 +48,50 @@
 		"@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",
 		"contentlayer": "^0.3.4",
-		"next": "14.2.1",
+		"next": "^14.2.3",
 		"next-contentlayer": "^0.3.4",
 		"next-themes": "^0.3.0",
-		"react": "^18.2.0",
+		"react": "^18.3.1",
 		"react-custom-scrollbars-2": "^4.5.0",
-		"react-dom": "^18.2.0",
+		"react-dom": "^18.3.1",
 		"rehype-autolink-headings": "^6.1.1",
 		"rehype-slug": "^5.1.0",
 		"remark-gfm": "^3.0.1",
-		"sharp": "^0.33.3"
+		"sharp": "^0.33.4"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "14.2.1",
-		"@testing-library/react": "^15.0.2",
+		"@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/react": "^18.2.79",
-		"@types/react-dom": "^18.2.25",
-		"@unocss/eslint-plugin": "^0.59.3",
-		"@unocss/postcss": "^0.58.5",
-		"@unocss/reset": "^0.59.3",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@types/node": "^18.19.45",
+		"@types/react": "^18.3.3",
+		"@types/react-dom": "^18.3.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.7.1",
+		"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.59.3",
-		"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/next.config.mjs

@@ -1,11 +1,7 @@
-import bundleAnalyzer from '@next/bundle-analyzer';
-import localesPlugin from '@react-aria/optimize-locales-plugin';
-
-const withBundleAnalyzer = bundleAnalyzer({
-	enabled: process.env.ANALYZE === 'true',
-});
-
-export default withBundleAnalyzer({
+/**
+ * @type {import('next').NextConfig}
+ */
+export default {
 	reactStrictMode: true,
 	images: {
 		dangerouslyAllowSVG: true,
@@ -18,14 +14,8 @@ export default withBundleAnalyzer({
 		},
 	},
 	experimental: {
-		ppr: false,
-	},
-	webpack(config, { isServer }) {
-		if (!isServer) {
-			config.plugins.push(localesPlugin.webpack({ locales: ['en-US'] }));
-		}
-
-		return config;
+		ppr: true,
+		reactCompiler: true,
 	},
 	async redirects() {
 		return [
@@ -41,4 +31,4 @@ export default withBundleAnalyzer({
 			},
 		];
 	},
-});
+};

apps/website/package.json

@@ -49,58 +49,56 @@
 	"dependencies": {
 		"@radix-ui/react-collapsible": "^1.0.3",
 		"@react-icons/all-files": "^4.1.0",
-		"@vercel/analytics": "^1.2.2",
-		"@vercel/blob": "^0.22.3",
-		"@vercel/edge-config": "^1.1.0",
+		"@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.0",
-		"lucide-react": "^0.368.0",
-		"meilisearch": "^0.38.0",
-		"next": "14.2.1",
-		"next-mdx-remote": "^4.4.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.6.0",
+		"overlayscrollbars": "^2.8.3",
 		"overlayscrollbars-react": "^0.5.6",
-		"react": "^18.2.0",
-		"react-aria-components": "^1.1.1",
-		"react-dom": "^18.2.0",
-		"sharp": "^0.33.3",
+		"react": "19.0.0-rc-f994737d14-20240522",
+		"react-aria-components": "^1.2.1",
+		"react-dom": "19.0.0-rc-f994737d14-20240522",
+		"sharp": "^0.33.4",
 		"usehooks-ts": "^3.1.0",
-		"vaul": "^0.9.0"
+		"vaul": "^0.9.1"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "14.2.1",
-		"@react-aria/optimize-locales-plugin": "^1.0.2",
-		"@shikijs/rehype": "1.1.7",
-		"@tailwindcss/typography": "^0.5.12",
-		"@testing-library/react": "^15.0.2",
+		"@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/react": "^18.2.79",
-		"@types/react-dom": "^18.2.25",
-		"@vitejs/plugin-react": "^4.2.1",
-		"@vitest/coverage-v8": "^1.5.0",
+		"@types/node": "^18.19.45",
+		"@types/react": "^18.3.3",
+		"@types/react-dom": "^18.3.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",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.57.0",
 		"eslint-config-neon": "^0.1.62",
 		"eslint-formatter-pretty": "^6.0.1",
-		"happy-dom": "^14.7.1",
+		"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": "^3.0.1",
+		"remark-gfm": "^4.0.0",
 		"remark-rehype": "^11.1.0",
-		"shiki": "1.3.0",
+		"shiki": "^1.6.2",
 		"tailwindcss": "^3.4.3",
-		"turbo": "^1.13.2",
-		"typescript": "^5.4.5",
-		"vercel": "^34.0.0",
-		"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/app/docs/packages/[packageName]/[version]/[item]/opengraph-image.tsx

@@ -1,4 +1,5 @@
 /* eslint-disable react/no-unknown-property */
+
 import { ImageResponse } from 'next/og';
 import { resolveKind } from '~/util/resolveNodeKind';
 

apps/website/src/app/docs/packages/[packageName]/[version]/[item]/page.tsx

@@ -1,4 +1,5 @@
 import type { Metadata } from 'next';
+import { notFound } from 'next/navigation';
 import { DocItem } from '~/components/DocItem';
 import { fetchNode } from '~/util/fetchNode';
 
@@ -25,6 +26,10 @@ export default async function Page({
 }) {
 	const node = await fetchNode({ item: params.item, packageName: params.packageName, version: params.version });
 
+	if (!node) {
+		notFound();
+	}
+
 	return (
 		<main className="flex w-full flex-col gap-8 pb-12 md:pb-0">
 			<DocItem node={node} packageName={params.packageName} version={params.version} />

apps/website/src/app/docs/packages/[packageName]/[version]/layout.tsx

@@ -5,7 +5,6 @@ import { Navigation } from '~/components/Navigation';
 import { OverlayScrollbarsComponent } from '~/components/OverlayScrollbars';
 import { Drawer } from '~/components/ui/Drawer';
 import { Footer } from '~/components/ui/Footer';
-import { ENV } from '~/util/env';
 import { fetchDependencies } from '~/util/fetchDependencies';
 
 // eslint-disable-next-line promise/prefer-await-to-then
@@ -33,11 +32,9 @@ export default async function Layout({
 	return (
 		// eslint-disable-next-line react/no-unknown-property
 		<div vaul-drawer-wrapper="" className="mx-auto flex max-w-screen-2xl flex-col gap-12 p-6 md:flex-row">
-			<div
-				className={`sticky hidden flex-shrink-0 self-start md:block ${ENV.IS_LOCAL_DEV || ENV.IS_PREVIEW ? 'top-[64px]' : 'top-6'}`}
-			>
+			<div className="sticky top-6 hidden flex-shrink-0 self-start md:block">
 				<OverlayScrollbarsComponent
-					className={`${ENV.IS_LOCAL_DEV || ENV.IS_PREVIEW ? 'max-h-[calc(100dvh-48px-40px)]' : 'max-h-[calc(100dvh-48px)]'}`}
+					className="max-h-[calc(100dvh-48px)]"
 					defer
 					options={{
 						overflow: { x: 'hidden' },

apps/website/src/app/docs/packages/[packageName]/[version]/page.tsx

@@ -1,7 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import rehypeShikiFromHighlighter from '@shikijs/rehype/core';
-import { MDXRemote } from 'next-mdx-remote/rsc';
+import { MDXRemote } from 'next-mdx-remote-client/rsc';
 import remarkGfm from 'remark-gfm';
 import { getHighlighterCore } from 'shiki/core';
 import getWasm from 'shiki/wasm';
@@ -30,7 +30,7 @@ export default async function Page({ params }: { readonly params: { readonly pac
 						remarkPlugins: [remarkGfm],
 						rehypePlugins: [
 							[
-								rehypeShikiFromHighlighter as any,
+								rehypeShikiFromHighlighter,
 								highlighter,
 								{
 									themes: {

apps/website/src/app/layout.tsx

@@ -20,11 +20,7 @@ export const viewport: Viewport = {
 };
 
 export const metadata: Metadata = {
-	metadataBase: new URL(
-		process.env.NEXT_PUBLIC_LOCAL_DEV === 'true'
-			? `http://localhost:${process.env.PORT ?? 3_000}`
-			: 'https://discord.js.org',
-	),
+	metadataBase: new URL(ENV.IS_LOCAL_DEV ? `http://localhost:${ENV.PORT}` : 'https://discord.js.org'),
 	title: {
 		template: '%s | discord.js',
 		default: 'discord.js',

apps/website/src/components/DocNode.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { BuiltinDocumentationLinks } from '~/util/builtinDocumentationLinks';
 import { OverlayScrollbarsComponent } from './OverlayScrollbars';
 import { SyntaxHighlighter } from './SyntaxHighlighter';
 
@@ -28,6 +29,21 @@ export async function DocNode({ node, version }: { readonly node?: any; readonly
 							href={node.uri}
 							rel="external noreferrer noopener"
 							target="_blank"
+						>
+							{`${node.text}${node.members ?? ''}`}
+						</a>
+					);
+				}
+
+				if (node.text in BuiltinDocumentationLinks) {
+					const href = BuiltinDocumentationLinks[node.text as keyof typeof BuiltinDocumentationLinks];
+					return (
+						<a
+							key={`${node.text}-${idx}`}
+							className="text-blurple hover:text-blurple-500 dark:hover:text-blurple-300"
+							href={href}
+							rel="external noreferrer noopener"
+							target="_blank"
 						>
 							{node.text}
 						</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

apps/website/src/components/Navigation.tsx

@@ -2,6 +2,7 @@ import { VscGithubInverted } from '@react-icons/all-files/vsc/VscGithubInverted'
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
+import { notFound } from 'next/navigation';
 import { fetchSitemap } from '~/util/fetchSitemap';
 import { fetchVersions } from '~/util/fetchVersions';
 import { resolveNodeKind } from './DocKind';
@@ -28,6 +29,11 @@ export async function Navigation({
 	readonly version: string;
 }) {
 	const node = await fetchSitemap({ packageName, version });
+
+	if (!node) {
+		notFound();
+	}
+
 	const versions = await fetchVersions(packageName);
 
 	const groupedNodes = node.reduce((acc: any, node: any) => {

apps/website/src/components/ParameterNode.tsx

@@ -29,6 +29,7 @@ export async function ParameterNode({
 								{description ? <Badges node={parameter} /> : null}
 								{parameter.name}
 								{parameter.isOptional ? '?' : ''}: <ExcerptNode node={parameter.typeExcerpt} version={version} />
+								{parameter.defaultValue ? ` = ${parameter.defaultValue}` : ''}
 							</span>
 							{description && parameter.description?.length ? (
 								<div className="mt-4 pl-4">

apps/website/src/components/PropertyNode.tsx

@@ -51,7 +51,13 @@ export async function PropertyNode({
 													<LinkIcon aria-hidden size={16} />
 												</Link>
 												{property.displayName}
-												{property.isOptional ? '?' : ''} : <ExcerptNode node={property.typeExcerpt} version={version} />
+												{property.isOptional ? '?' : ''} : <ExcerptNode node={property.typeExcerpt} version={version} />{' '}
+												{property.summary?.defaultValueBlock.length
+													? `= ${property.summary.defaultValueBlock.reduce(
+															(acc: string, def: { kind: string; text: string }) => `${acc}${def.text}`,
+															'',
+														)}`
+													: ''}
 											</span>
 										</h3>
 

apps/website/src/components/ui/CmdK.tsx

@@ -5,7 +5,7 @@ import { useAtom, useSetAtom } from 'jotai';
 import { ArrowRight } from 'lucide-react';
 import MeiliSearch from 'meilisearch';
 import { usePathname, useRouter } from 'next/navigation';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useDebounceValue } from 'usehooks-ts';
 import { isCmdKOpenAtom } from '~/stores/cmdk';
 import { isDrawerOpenAtom } from '~/stores/drawer';
@@ -25,32 +25,29 @@ export function CmdK({ dependencies }: { readonly dependencies: string[] }) {
 	const [search, setSearch] = useDebounceValue('', 250);
 	const [searchResults, setSearchResults] = useState<any[]>([]);
 
-	const packageName = useMemo(() => pathname?.split('/').slice(3, 4)[0], [pathname]);
-	const branchName = useMemo(() => pathname?.split('/').slice(4, 5)[0], [pathname]);
+	const packageName = pathname?.split('/').slice(3, 4)[0];
+	const branchName = pathname?.split('/').slice(4, 5)[0];
 
-	const searchResultItems = useMemo(
-		() =>
-			searchResults?.map((item, idx) => (
-				<Command.Item
-					key={`${item.id}-${idx}`}
-					className="flex cursor-pointer place-items-center gap-2 rounded-md p-2 data-[selected]:bg-neutral-200 dark:data-[selected]:bg-neutral-800"
-					onSelect={() => {
-						router.push(item.path);
-						setOpen(false);
-					}}
-					value={item.id}
-				>
-					{resolveKind(item.kind)}
-					<div className="flex flex-grow flex-col">
-						<span className="font-semibold">{item.name}</span>
-						<span className="line-clamp-1 text-sm">{item.summary}</span>
-						<span className="truncate text-xs">{item.path}</span>
-					</div>
-					<ArrowRight aria-hidden className="flex-shrink-0" />
-				</Command.Item>
-			)) ?? [],
-		[router, searchResults, setOpen],
-	);
+	const searchResultItems =
+		searchResults?.map((item, idx) => (
+			<Command.Item
+				key={`${item.id}-${idx}`}
+				className="flex cursor-pointer place-items-center gap-2 rounded-md p-2 data-[selected='true']:bg-neutral-200 dark:data-[selected='true']:bg-neutral-800"
+				onSelect={() => {
+					router.push(item.path);
+					setOpen(false);
+				}}
+				value={item.id}
+			>
+				{resolveKind(item.kind)}
+				<div className="flex flex-grow flex-col">
+					<span className="font-semibold">{item.name}</span>
+					<span className="line-clamp-1 text-sm">{item.summary}</span>
+					<span className="truncate text-xs">{item.path}</span>
+				</div>
+				<ArrowRight aria-hidden className="flex-shrink-0" />
+			</Command.Item>
+		)) ?? [];
 
 	// Toggle the menu when ⌘K is pressed
 	useEffect(() => {

apps/website/src/util/env.ts

@@ -1,4 +1,5 @@
 export const ENV = {
 	IS_LOCAL_DEV: process.env.VERCEL_ENV === 'development' || process.env.NEXT_PUBLIC_LOCAL_DEV === 'true',
 	IS_PREVIEW: process.env.VERCEL_ENV === 'preview',
+	PORT: process.env.PORT ?? 3_000,
 };

apps/website/src/util/fetchDependencies.ts

@@ -20,7 +20,7 @@ export async function fetchDependencies({
 
 			return Object.entries<string>(parsedDependencies)
 				.filter(([key]) => key.startsWith('@discordjs/') && !key.includes('api-extractor'))
-				.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${value.replaceAll('.', '-')}`);
+				.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${sanitizeVersion(value)}`);
 		} catch {
 			return [];
 		}
@@ -36,8 +36,12 @@ export async function fetchDependencies({
 
 		return Object.entries<string>(parsedDependencies)
 			.filter(([key]) => key.startsWith('@discordjs/') && !key.includes('api-extractor'))
-			.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${value.replaceAll('.', '-')}`);
+			.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${sanitizeVersion(value)}`);
 	} catch {
 		return [];
 	}
 }
+
+function sanitizeVersion(version: string) {
+	return version.replaceAll('.', '-').replace(/^[\^~]/, '');
+}

apps/website/src/util/fetchNode.ts

@@ -1,6 +1,5 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { notFound } from 'next/navigation';
 import { ENV } from './env';
 
 export async function fetchNode({
@@ -15,30 +14,26 @@ export async function fetchNode({
 	const normalizeItem = item.split(encodeURIComponent(':')).join('.').toLowerCase();
 
 	if (ENV.IS_LOCAL_DEV) {
-		try {
-			const fileContent = await readFile(
-				join(
-					process.cwd(),
-					`../../packages/${packageName}/docs/${packageName}/split/${version}.${normalizeItem}.api.json`,
-				),
-				'utf8',
-			);
-
-			return JSON.parse(fileContent);
-		} catch {
-			notFound();
-		}
-	}
-
-	try {
-		const isMainVersion = version === 'main';
-		const fileContent = await fetch(
-			`${process.env.BLOB_STORAGE_URL}/rewrite/${packageName}/${version}.${normalizeItem}.api.json`,
-			{ next: isMainVersion ? { revalidate: 0 } : { revalidate: 604_800 } },
+		const fileContent = await readFile(
+			join(
+				process.cwd(),
+				`../../packages/${packageName}/docs/${packageName}/split/${version}.${normalizeItem}.api.json`,
+			),
+			'utf8',
 		);
 
-		return await fileContent.json();
-	} catch {
-		notFound();
+		return JSON.parse(fileContent);
 	}
+
+	const isMainVersion = version === 'main';
+	const fileContent = await fetch(
+		`${process.env.BLOB_STORAGE_URL}/rewrite/${packageName}/${version}.${normalizeItem}.api.json`,
+		{ next: isMainVersion ? { revalidate: 0 } : { revalidate: 604_800 } },
+	);
+
+	if (!fileContent.ok) {
+		return null;
+	}
+
+	return fileContent.json();
 }

apps/website/src/util/fetchSitemap.ts

@@ -1,6 +1,5 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { notFound } from 'next/navigation';
 import { ENV } from './env';
 
 export async function fetchSitemap({
@@ -11,27 +10,19 @@ export async function fetchSitemap({
 	readonly version: string;
 }) {
 	if (ENV.IS_LOCAL_DEV) {
-		try {
-			const fileContent = await readFile(
-				join(process.cwd(), `../../packages/${packageName}/docs/${packageName}/split/${version}.sitemap.api.json`),
-				'utf8',
-			);
-
-			return JSON.parse(fileContent);
-		} catch {
-			notFound();
-		}
-	}
-
-	try {
-		const isMainVersion = version === 'main';
-		const fileContent = await fetch(
-			`${process.env.BLOB_STORAGE_URL}/rewrite/${packageName}/${version}.sitemap.api.json`,
-			{ next: isMainVersion ? { revalidate: 0 } : { revalidate: 604_800 } },
+		const fileContent = await readFile(
+			join(process.cwd(), `../../packages/${packageName}/docs/${packageName}/split/${version}.sitemap.api.json`),
+			'utf8',
 		);
 
-		return await fileContent.json();
-	} catch {
-		notFound();
+		return JSON.parse(fileContent);
 	}
+
+	const isMainVersion = version === 'main';
+	const fileContent = await fetch(
+		`${process.env.BLOB_STORAGE_URL}/rewrite/${packageName}/${version}.sitemap.api.json`,
+		{ next: isMainVersion ? { revalidate: 0 } : { revalidate: 604_800 } },
+	);
+
+	return fileContent.json();
 }

package.json

@@ -6,19 +6,19 @@
 	"private": true,
 	"scripts": {
 		"build": "turbo run build --concurrency=4",
-		"build:affected": "turbo run build --filter='...[origin/main]' --concurrency=4",
-		"build:apps": "turbo run build:local --filter='...{apps/*}' --concurrency=4",
-		"build:apps:affected": "turbo run build:local --filter='...{apps/*}[origin/main]' --concurrency=4",
+		"build:affected": "turbo run build --filter=...[origin/main] --concurrency=4",
+		"build:apps": "turbo run build:local --filter=...{apps/*} --concurrency=4",
+		"build:apps:affected": "turbo run build:local --filter=...{apps/*}[origin/main] --concurrency=4",
 		"test": "turbo run test --concurrency=4",
-		"test:affected": "turbo run test --filter='...[origin/main]' --concurrency=4",
+		"test:affected": "turbo run test --filter=...[origin/main] --concurrency=4",
 		"lint": "turbo run lint --concurrency=4",
-		"lint:affected": "turbo run lint --filter='...[origin/main]' --concurrency=4",
+		"lint:affected": "turbo run lint --filter=...[origin/main] --concurrency=4",
 		"format": "turbo run format --concurrency=4",
-		"format:affected": "turbo run format --filter='...[origin/main]' --concurrency=4",
+		"format:affected": "turbo run format --filter=...[origin/main] --concurrency=4",
 		"fmt": "turbo run format --concurrency=4",
-		"fmt:affected": "turbo run format --filter='...[origin/main]' --concurrency=4",
+		"fmt:affected": "turbo run format --filter=...[origin/main] --concurrency=4",
 		"docs": "turbo run docs --concurrency=4",
-		"docs:affected": "turbo run docs --filter='...[origin/main]' --concurrency=4",
+		"docs:affected": "turbo run docs --filter=...[origin/main] --concurrency=4",
 		"prepare": "is-ci || husky",
 		"update": "pnpm --recursive update --interactive",
 		"update:latest": "pnpm --recursive update --interactive --latest",
@@ -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.59.3",
-		"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@8.15.7+sha256.50783dd0fa303852de2dd1557cd4b9f07cb5b018154a6e76d0f40635d6cee019"
+	"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.19.8"
 	},
 	"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/pnpmCache/action.yml

@@ -9,7 +9,7 @@ runs:
       with:
         swap-size-gb: 10
 
-    - uses: pnpm/action-setup@v2.2.4
+    - uses: pnpm/action-setup@v4.0.0
       name: Install pnpm
       with:
         run_install: false
@@ -26,7 +26,7 @@ runs:
       run: |
         echo "YEAR_MONTH=$(/bin/date -u "+%Y%m")" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Setup pnpm cache
       with:
         path: ${{ steps.pnpm-config.outputs.STORE_PATH }}

packages/actions/src/uploadCoverage/action.yml

@@ -1,88 +1,134 @@
 name: 'Upload Coverage'
 description: 'Uploads code coverage reports to codecov with separate flags for separate packages'
+inputs:
+  codecov_token:
+    description: 'Codecov token.'
+    required: true
 runs:
   using: 'composite'
   steps:
     - name: Upload Guide Coverage
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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
-      uses: codecov/codecov-action@v3
+      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/actions/src/yarnCache/action.yml

@@ -21,7 +21,7 @@ runs:
         echo "NPM_GLOBAL_CACHE_FOLDER=$(npm config get cache)" >> $GITHUB_OUTPUT
 
     - name: Restore yarn cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: yarn-download-cache
       with:
         path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
@@ -31,7 +31,7 @@ runs:
 
     - name: Restore global npm cache folder
       id: npm-global-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.yarn-config.outputs.NPM_GLOBAL_CACHE_FOLDER }}
         key: npm-global-cache-default-${{ runner.os }}-${{ steps.yarn-config.outputs.CURRENT_NODE_VERSION }}-${{ hashFiles(yarn.lock, .yarnrc.yml) }}

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/mixins/ApiItemContainerMixin.ts

@@ -2,7 +2,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { TSDocConfiguration } from '@microsoft/tsdoc';
+import {
+	type DocNode,
+	type DocPlainText,
+	DocDeclarationReference,
+	DocNodeKind,
+	TSDocConfiguration,
+	DocMemberReference,
+	DocMemberIdentifier,
+} from '@microsoft/tsdoc';
 import type { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference.js';
 import { InternalError } from '@rushstack/node-core-library';
 import type { IExcerptToken, IExcerptTokenRange } from '../index.js';
@@ -42,6 +50,11 @@ export interface IApiItemContainerJson extends IApiItemJson {
 	preserveMemberOrder?: boolean;
 }
 
+interface Mixin {
+	declarationReference: DocDeclarationReference;
+	typeParameters: IExcerptTokenRange[];
+}
+
 interface ExcerptTokenRangeInDeclaredItem {
 	item: ApiDeclaredItem;
 	range: IExcerptTokenRange;
@@ -393,14 +406,52 @@ export function ApiItemContainerMixin<TBaseClass extends IApiItemConstructor>(
 					}
 				}
 
+				const findPlainTextNode = (node: DocNode): DocPlainText | undefined => {
+					switch (node.kind) {
+						case DocNodeKind.PlainText:
+							return node as DocPlainText;
+						default:
+							for (const child of node.getChildNodes()) {
+								const result = findPlainTextNode(child);
+								if (result) return result;
+							}
+					}
+
+					return undefined;
+				};
+
 				// Interfaces can extend multiple interfaces, so iterate through all of them.
+				// Also Classes can have multiple mixins
 				const extendedItems: IMappedTypeParameters[] = [];
-				let extendsTypes: readonly HeritageType[] | undefined;
+				let extendsTypes: readonly (HeritageType | Mixin)[] | undefined;
 
 				switch (next.item.kind) {
 					case ApiItemKind.Class: {
 						const apiClass: ApiClass = next.item as ApiClass;
-						extendsTypes = apiClass.extendsType ? [apiClass.extendsType] : [];
+						const configuration = apiClass.tsdocComment?.configuration ?? new TSDocConfiguration();
+						const mixins =
+							apiClass.tsdocComment?.customBlocks
+								.filter(
+									(block) => block.blockTag.tagName === '@mixes', // &&
+									// block.getChildNodes().some((node) => node.kind === DocNodeKind.PlainText),
+								)
+								.map(findPlainTextNode)
+								.filter((block) => block !== undefined)
+								.map((block) => ({
+									declarationReference: new DocDeclarationReference({
+										configuration,
+										memberReferences: block.text.split('.').map(
+											(part, index) =>
+												new DocMemberReference({
+													configuration,
+													hasDot: index > 0,
+													memberIdentifier: new DocMemberIdentifier({ configuration, identifier: part }),
+												}),
+										),
+									}),
+									typeParameters: [] as IExcerptTokenRange[],
+								})) ?? [];
+						extendsTypes = apiClass.extendsType ? [apiClass.extendsType, ...mixins] : [...mixins];
 						break;
 					}
 
@@ -425,30 +476,38 @@ export function ApiItemContainerMixin<TBaseClass extends IApiItemConstructor>(
 				}
 
 				for (const extendsType of extendsTypes) {
-					// We want to find the reference token associated with the actual inherited declaration.
-					// In every case we support, this is the first reference token. For example:
-					//
-					// ```
-					// export class A extends B {}
-					//                        ^
-					// export class A extends B<C> {}
-					//                        ^
-					// export class A extends B.C {}
-					//                        ^^^
-					// ```
-					const firstReferenceToken: ExcerptToken | undefined = extendsType.excerpt.spannedTokens.find(
-						(token: ExcerptToken) => {
-							return token.kind === ExcerptTokenKind.Reference && token.canonicalReference;
-						},
-					);
+					let canonicalReference: DeclarationReference | DocDeclarationReference;
+					if ('excerpt' in extendsType) {
+						// We want to find the reference token associated with the actual inherited declaration.
+						// In every case we support, this is the first reference token. For example:
+						//
+						// ```
+						// export class A extends B {}
+						//                        ^
+						// export class A extends B<C> {}
+						//                        ^
+						// export class A extends B.C {}
+						//                        ^^^
+						// ```
+						const firstReferenceToken: ExcerptToken | undefined = extendsType.excerpt.spannedTokens.find(
+							(token: ExcerptToken) => {
+								return token.kind === ExcerptTokenKind.Reference && token.canonicalReference;
+							},
+						);
 
-					if (!firstReferenceToken) {
-						messages.push({
-							messageId: FindApiItemsMessageId.ExtendsClauseMissingReference,
-							text: `Unable to analyze extends clause ${extendsType.excerpt.text} of API item ${next.item.displayName} because no canonical reference was found`,
-						});
-						maybeIncompleteResult = true;
-						continue;
+						if (!firstReferenceToken) {
+							messages.push({
+								messageId: FindApiItemsMessageId.ExtendsClauseMissingReference,
+								text: `Unable to analyze extends clause ${extendsType.excerpt.text} of API item ${next.item.displayName} because no canonical reference was found`,
+							});
+							maybeIncompleteResult = true;
+							continue;
+						}
+
+						canonicalReference = firstReferenceToken.canonicalReference!;
+					} else {
+						// extendsType is a Mixin
+						canonicalReference = extendsType.declarationReference;
 					}
 
 					const apiModel: ApiModel | undefined = this.getAssociatedModel();
@@ -461,10 +520,9 @@ export function ApiItemContainerMixin<TBaseClass extends IApiItemConstructor>(
 						continue;
 					}
 
-					const canonicalReference: DeclarationReference = firstReferenceToken.canonicalReference!;
 					const apiItemResult: IResolveDeclarationReferenceResult = apiModel.resolveDeclarationReference(
 						canonicalReference,
-						undefined,
+						this,
 					);
 
 					const apiItem: ApiItem | undefined = apiItemResult.resolvedApiItem;

packages/api-extractor-model/src/mixins/ApiParameterListMixin.ts

@@ -14,6 +14,7 @@ import type { IExcerptTokenRange } from './Excerpt.js';
  * @public
  */
 export interface IApiParameterOptions {
+	defaultValue: string | undefined;
 	isOptional: boolean;
 	isRest: boolean;
 	parameterName: string;
@@ -124,6 +125,7 @@ export function ApiParameterListMixin<TBaseClass extends IApiItemConstructor>(
 							isOptional: Boolean(parameterOptions.isOptional),
 							isRest: Boolean(parameterOptions.isRest),
 							parent: this,
+							defaultValue: parameterOptions.defaultValue,
 						});
 
 						this[_parameters].push(parameter);
@@ -171,6 +173,7 @@ export function ApiParameterListMixin<TBaseClass extends IApiItemConstructor>(
 					parameterTypeTokenRange: parameter.parameterTypeExcerpt.tokenRange,
 					isOptional: parameter.isOptional,
 					isRest: parameter.isRest,
+					defaultValue: parameter.defaultValue,
 				});
 			}
 

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

@@ -41,6 +41,7 @@ const MinifyJSONMapping = {
 	constraintTokenRange: 'ctr',
 	dependencies: 'dp',
 	defaultTypeTokenRange: 'dtr',
+	defaultValue: 'dv',
 	docComment: 'd',
 	endIndex: 'en',
 	excerptTokens: 'ex',
@@ -293,7 +294,11 @@ export class ApiPackage extends ApiItemContainerMixin(ApiNameMixin(ApiDocumented
 
 		const tsdocConfiguration: TSDocConfiguration = new TSDocConfiguration();
 
-		if (versionToDeserialize >= ApiJsonSchemaVersion.V_1004 && 'tsdocConfiguration' in jsonObject) {
+		if (
+			versionToDeserialize >= ApiJsonSchemaVersion.V_1004 &&
+			'tsdocConfig' in jsonObject.metadata &&
+			'$schema' in jsonObject.metadata.tsdocConfig
+		) {
 			const tsdocConfigFile: TSDocConfigFile = TSDocConfigFile.loadFromObject(jsonObject.metadata.tsdocConfig);
 			if (tsdocConfigFile.hasErrors) {
 				throw new Error(`Error loading ${apiJsonFilename}:\n` + tsdocConfigFile.getErrorSummary());
@@ -380,7 +385,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,
@@ -420,6 +425,8 @@ export class ApiPackage extends ApiItemContainerMixin(ApiNameMixin(ApiDocumented
 				for (const key of Object.keys(item)) {
 					if (key === 'dependencies') {
 						result[MinifyJSONMapping.dependencies] = item.dependencies;
+					} else if (key === 'tsdocConfig') {
+						result[MinifyJSONMapping.tsdocConfig] = item.tsdocConfig;
 					} else
 						result[MinifyJSONMapping[key as keyof typeof MinifyJSONMapping]] =
 							typeof item[key] === 'object' ? mapper(item[key]) : item[key];
@@ -440,6 +447,8 @@ export class ApiPackage extends ApiItemContainerMixin(ApiNameMixin(ApiDocumented
 				for (const key of Object.keys(item)) {
 					if (key === MinifyJSONMapping.dependencies) {
 						result.dependencies = item[MinifyJSONMapping.dependencies];
+					} else if (key === MinifyJSONMapping.tsdocConfig) {
+						result.tsdocConfig = item[MinifyJSONMapping.tsdocConfig];
 					} else
 						result[
 							Object.keys(MinifyJSONMapping).find(

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]) => [
@@ -260,6 +262,7 @@ function mapParam(
 			startIndex: 1 + index + paramTokens.slice(0, index).reduce((akk, num) => akk + num, 0),
 			endIndex: 1 + index + paramTokens.slice(0, index + 1).reduce((akk, num) => akk + num, 0),
 		},
+		defaultValue: param.default,
 	};
 }
 

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

@@ -6,6 +6,7 @@ import { type ApiItem, ApiItemKind } from '../items/ApiItem.js';
 import { ApiItemContainerMixin } from '../mixins/ApiItemContainerMixin.js';
 import { ApiParameterListMixin } from '../mixins/ApiParameterListMixin.js';
 import type { ApiEntryPoint } from './ApiEntryPoint.js';
+import type { ApiMethod } from './ApiMethod.js';
 import type { ApiModel } from './ApiModel.js';
 import type { ApiPackage } from './ApiPackage.js';
 
@@ -114,11 +115,21 @@ 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
 					) {
 						currentItem = foundClass;
+					} else if (
+						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-model/src/model/Parameter.ts

@@ -12,6 +12,7 @@ import type { Excerpt } from '../mixins/Excerpt.js';
  * @public
  */
 export interface IParameterOptions {
+	defaultValue: string | undefined;
 	isOptional: boolean;
 	isRest: boolean;
 	name: string;
@@ -56,6 +57,11 @@ export class Parameter {
 	 */
 	public isRest: boolean;
 
+	/**
+	 * The default value for this parameter if optional
+	 */
+	public defaultValue: string | undefined;
+
 	private readonly _parent: ApiParameterListMixin;
 
 	public constructor(options: IParameterOptions) {
@@ -64,6 +70,7 @@ export class Parameter {
 		this.isOptional = options.isOptional;
 		this.isRest = options.isRest;
 		this._parent = options.parent;
+		this.defaultValue = options.defaultValue;
 	}
 
 	/**

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/extends/tsdoc-base.json

@@ -32,6 +32,10 @@
 		{
 			"tagName": "@preapproved",
 			"syntaxKind": "modifier"
+		},
+		{
+			"tagName": "@mixes",
+			"syntaxKind": "block"
 		}
 	],
 

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;
@@ -843,6 +843,7 @@ export class ApiModelGenerator {
 			const parameters: IApiParameterOptions[] = this._captureParameters(
 				nodesToCapture,
 				functionDeclaration.parameters,
+				jsDoc?.params,
 			);
 
 			const excerptTokens: IExcerptToken[] = this._buildExcerptTokens(astDeclaration, nodesToCapture);
@@ -1043,6 +1044,7 @@ export class ApiModelGenerator {
 				const parameters: IApiParameterOptions[] = this._captureParameters(
 					nodesToCapture,
 					methodDeclaration.parameters,
+					jsDoc?.params,
 				);
 
 				const excerptTokens: IExcerptToken[] = this._buildExcerptTokens(astDeclaration, nodesToCapture);
@@ -1137,7 +1139,11 @@ export class ApiModelGenerator {
 					methodSignature.typeParameters,
 				);
 
-				const parameters: IApiParameterOptions[] = this._captureParameters(nodesToCapture, methodSignature.parameters);
+				const parameters: IApiParameterOptions[] = this._captureParameters(
+					nodesToCapture,
+					methodSignature.parameters,
+					jsDoc?.params,
+				);
 
 				const excerptTokens: IExcerptToken[] = this._buildExcerptTokens(astDeclaration, nodesToCapture);
 				const apiItemMetadata: ApiItemMetadata = this._collector.fetchApiItemMetadata(astDeclaration);
@@ -1264,7 +1270,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 +1348,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 ? `\n * @defaultValue ${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 +1429,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('')
 								: ''
 						} */`,
@@ -1508,15 +1516,17 @@ export class ApiModelGenerator {
 			const excerptTokens: IExcerptToken[] = [
 				{
 					kind: ExcerptTokenKind.Content,
-					text: `on('${name}', (${
-						jsDoc.params?.length ? `${jsDoc.params[0]?.name}${jsDoc.params[0]?.nullable ? '?' : ''}: ` : ') => {})'
+					text: `public on(eventName: '${name}', listener: (${
+						jsDoc.params?.length
+							? `${jsDoc.params[0]?.name}${jsDoc.params[0]?.optional ? '?' : ''}: `
+							: ') => void): this;'
 					}`,
 				},
 			];
 			const parameters: IApiParameterOptions[] = [];
 			for (let index = 0; index < (jsDoc.params?.length ?? 0) - 1; index++) {
 				const parameter = jsDoc.params![index]!;
-				const newTokens = this._mapVarType(parameter.type);
+				const newTokens = this._mapVarType(parameter.type, parameter.nullable);
 				parameters.push({
 					parameterName: parameter.name,
 					parameterTypeTokenRange: {
@@ -1525,6 +1535,7 @@ export class ApiModelGenerator {
 					},
 					isOptional: Boolean(parameter.optional),
 					isRest: parameter.name.startsWith('...'),
+					defaultValue: parameter.default?.toString(),
 				});
 				excerptTokens.push(...newTokens);
 				excerptTokens.push({
@@ -1535,7 +1546,7 @@ export class ApiModelGenerator {
 
 			if (jsDoc.params?.length) {
 				const parameter = jsDoc.params![jsDoc.params.length - 1]!;
-				const newTokens = this._mapVarType(parameter.type);
+				const newTokens = this._mapVarType(parameter.type, parameter.nullable);
 				parameters.push({
 					parameterName: parameter.name,
 					parameterTypeTokenRange: {
@@ -1544,11 +1555,12 @@ export class ApiModelGenerator {
 					},
 					isOptional: Boolean(parameter.optional),
 					isRest: parameter.name.startsWith('...'),
+					defaultValue: parameter.default?.toString(),
 				});
 				excerptTokens.push(...newTokens);
 				excerptTokens.push({
 					kind: ExcerptTokenKind.Content,
-					text: `) => {})`,
+					text: `) => void): this;`,
 				});
 			}
 
@@ -1636,6 +1648,7 @@ export class ApiModelGenerator {
 	private _captureParameters(
 		nodesToCapture: IExcerptBuilderNodeToCapture[],
 		parameterNodes: ts.NodeArray<ts.ParameterDeclaration>,
+		jsDoc?: DocgenParamJson[] | undefined,
 	): IApiParameterOptions[] {
 		const parameters: IApiParameterOptions[] = [];
 		for (const parameter of parameterNodes) {
@@ -1646,6 +1659,9 @@ export class ApiModelGenerator {
 				parameterTypeTokenRange,
 				isOptional: this._collector.typeChecker.isOptionalParameter(parameter),
 				isRest: Boolean(parameter.dotDotDotToken),
+				defaultValue:
+					parameter.initializer?.getText() ??
+					jsDoc?.find((param) => param.name === parameter.name.getText().trim())?.default?.toString(),
 			});
 		}
 
@@ -1744,6 +1760,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) => {
@@ -1763,8 +1787,8 @@ export class ApiModelGenerator {
 			.replaceAll('* ', '\n * * ');
 	}
 
-	private _mapVarType(typey: DocgenVarTypeJson): IExcerptToken[] {
-		const mapper = Array.isArray(typey) ? typey : typey.types ?? [];
+	private _mapVarType(typey: DocgenVarTypeJson, nullable?: boolean): IExcerptToken[] {
+		const mapper = Array.isArray(typey) ? typey : (typey.types ?? []);
 		const lookup: { [K in ts.SyntaxKind]?: string } = {
 			[ts.SyntaxKind.ClassDeclaration]: 'class',
 			[ts.SyntaxKind.EnumDeclaration]: 'enum',
@@ -1788,23 +1812,40 @@ 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 ?? '' },
 					];
 				}, []);
-				return index === 0 ? result : [{ kind: ExcerptTokenKind.Content, text: ' | ' }, ...result];
+				return index === 0
+					? mapper.length === 1 && (nullable || ('nullable' in typey && typey.nullable))
+						? [
+								...result,
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								{ kind: ExcerptTokenKind.Reference, text: 'null' },
+							]
+						: result
+					: index === mapper.length - 1 && (nullable || ('nullable' in typey && typey.nullable))
+						? [
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								...result,
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								{ kind: ExcerptTokenKind.Reference, text: 'null' },
+							]
+						: [{ kind: ExcerptTokenKind.Content, text: ' | ' }, ...result];
 			})
 			.filter((excerpt) => excerpt.text.length);
 	}
@@ -1819,7 +1860,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) ?? ''}\n${prop.default ? ` * @defaultValue ${this._escapeSpecialChars(prop.default)}\n` : ''}${
 					prop.see?.map((see) => ` * @see ${see}\n`).join('') ?? ''
 				}${prop.readonly ? ' * @readonly\n' : ''} */`,
 			).docComment,
@@ -1831,7 +1872,7 @@ export class ApiModelGenerator {
 					}${prop.name} :`,
 				},
 				...mappedVarType,
-				{ kind: ExcerptTokenKind.Content, text: ';' },
+				{ kind: ExcerptTokenKind.Content, text: `${prop.default ? ` = ${prop.default}` : ''};` },
 			],
 			propertyTypeTokenRange: { startIndex: 1, endIndex: 1 + mappedVarType.length },
 			releaseTag: prop.access === 'private' ? ReleaseTag.Internal : ReleaseTag.Public,
@@ -1854,6 +1895,7 @@ export class ApiModelGenerator {
 				startIndex: 1 + index + paramTokens.slice(0, index).reduce((akk, num) => akk + num, 0),
 				endIndex: 1 + index + paramTokens.slice(0, index + 1).reduce((akk, num) => akk + num, 0),
 			},
+			defaultValue: param.default?.toString(),
 		};
 	}
 
@@ -1867,7 +1909,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 ? '?' : ''}: `
 					: '): '
 			}`,
 		});
@@ -1878,7 +1920,7 @@ export class ApiModelGenerator {
 			excerptTokens.push(...newTokens);
 			excerptTokens.push({
 				kind: ExcerptTokenKind.Content,
-				text: `, ${method.params![index + 1]!.name}${
+				text: `${method.params![index]!.default ? ` = ${method.params![index]!.default}` : ''}, ${method.params![index + 1]!.name}${
 					method.params![index + 1]!.nullable || method.params![index + 1]!.optional ? '?' : ''
 				}: `,
 			});
@@ -1888,7 +1930,10 @@ export class ApiModelGenerator {
 			const newTokens = this._mapVarType(method.params[method.params.length - 1]!.type);
 			paramTokens.push(newTokens.length);
 			excerptTokens.push(...newTokens);
-			excerptTokens.push({ kind: ExcerptTokenKind.Content, text: `): ` });
+			excerptTokens.push({
+				kind: ExcerptTokenKind.Content,
+				text: `${method.params![method.params.length - 1]!.default ? ` = ${method.params![method.params.length - 1]!.default}` : ''}): `,
+			});
 		}
 
 		const returnTokens = this._mapVarType(method.returns?.[0] ?? []);

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/README.md

@@ -23,7 +23,7 @@
 
 ## Installation
 
-**Node.js 18 or newer is required.**
+**Node.js 20 or newer is required.**
 
 ```sh
 npm install @discordjs/brokers
@@ -40,7 +40,7 @@ pnpm add @discordjs/brokers
 import { PubSubRedisBroker } from '@discordjs/brokers';
 import Redis from 'ioredis';
 
-const broker = new PubSubRedisBroker({ redisClient: new Redis() });
+const broker = new PubSubRedisBroker(new Redis());
 
 await broker.publish('test', 'Hello World!');
 await broker.destroy();
@@ -49,7 +49,7 @@ await broker.destroy();
 import { PubSubRedisBroker } from '@discordjs/brokers';
 import Redis from 'ioredis';
 
-const broker = new PubSubRedisBroker({ redisClient: new Redis() });
+const broker = new PubSubRedisBroker(new Redis());
 broker.on('test', ({ data, ack }) => {
 	console.log(data);
 	void ack();
@@ -65,7 +65,7 @@ await broker.subscribe('subscribers', ['test']);
 import { RPCRedisBroker } from '@discordjs/brokers';
 import Redis from 'ioredis';
 
-const broker = new RPCRedisBroker({ redisClient: new Redis() });
+const broker = new RPCRedisBroker(new Redis());
 
 console.log(await broker.call('testcall', 'Hello World!'));
 await broker.destroy();
@@ -74,7 +74,7 @@ await broker.destroy();
 import { RPCRedisBroker } from '@discordjs/brokers';
 import Redis from 'ioredis';
 
-const broker = new RPCRedisBroker({ redisClient: new Redis() });
+const broker = new RPCRedisBroker(new Redis());
 broker.on('testcall', ({ data, ack, reply }) => {
 	console.log('responder', data);
 	void ack();

packages/brokers/__tests__/index.test.ts

@@ -17,7 +17,7 @@ const mockRedisClient = {
 test('pubsub with custom encoding', async () => {
 	const encode = vi.fn((data) => data);
 
-	const broker = new PubSubRedisBroker({ redisClient: mockRedisClient, encode });
+	const broker = new PubSubRedisBroker(mockRedisClient, { encode });
 	await broker.publish('test', 'test');
 	expect(encode).toHaveBeenCalledWith('test');
 });

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,23 @@ 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 }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% 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 +71,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,28 +68,28 @@
 	"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"
+		"node": ">=20"
 	},
 	"publishConfig": {
 		"access": "public",

packages/brokers/src/brokers/Broker.ts

@@ -1,5 +1,4 @@
 import { Buffer } from 'node:buffer';
-import { randomBytes } from 'node:crypto';
 import { encode, decode } from '@msgpack/msgpack';
 import type { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
 
@@ -7,10 +6,6 @@ import type { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
  * Base options for a broker implementation
  */
 export interface BaseBrokerOptions {
-	/**
-	 * How long to block for messages when polling
-	 */
-	blockTimeout?: number;
 	/**
 	 * Function to use for decoding messages
 	 */
@@ -21,25 +16,12 @@ export interface BaseBrokerOptions {
 	 */
 	// eslint-disable-next-line @typescript-eslint/method-signature-style
 	encode?: (data: unknown) => Buffer;
-	/**
-	 * Max number of messages to poll at once
-	 */
-	maxChunk?: number;
-	/**
-	 * Unique consumer name.
-	 *
-	 * @see {@link https://redis.io/commands/xreadgroup/}
-	 */
-	name?: string;
 }
 
 /**
  * Default broker options
  */
 export const DefaultBrokerOptions = {
-	name: randomBytes(20).toString('hex'),
-	maxChunk: 10,
-	blockTimeout: 5_000,
 	encode: (data): Buffer => {
 		const encoded = encode(data);
 		return Buffer.from(encoded.buffer, encoded.byteOffset, encoded.byteLength);
@@ -48,28 +30,28 @@ 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, grouping them by the given group name
+	 * Subscribes to the given events
 	 */
-	subscribe(group: string, events: (keyof TEvents)[]): Promise<void>;
+	subscribe(events: (keyof TEvents)[]): Promise<void>;
 	/**
-	 * Unsubscribes from the given events - it's required to pass the same group name as when subscribing for proper cleanup
+	 * Unsubscribes from the given events
 	 */
-	unsubscribe(group: string, events: (keyof TEvents)[]): Promise<void>;
+	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>> {
 	/**
@@ -78,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

@@ -1,4 +1,5 @@
 import type { Buffer } from 'node:buffer';
+import { randomBytes } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
@@ -19,16 +20,48 @@ declare module 'ioredis' {
  */
 export interface RedisBrokerOptions extends BaseBrokerOptions {
 	/**
-	 * The Redis client to use
+	 * How long to block for messages when polling
 	 */
-	redisClient: Redis;
+	blockTimeout?: number;
+
+	/**
+	 * Consumer group name to use for this broker
+	 *
+	 * @see {@link https://redis.io/commands/xreadgroup/}
+	 */
+	group: string;
+
+	/**
+	 * Max number of messages to poll at once
+	 */
+	maxChunk?: number;
+
+	/**
+	 * Unique consumer name.
+	 *
+	 * @see {@link https://redis.io/commands/xreadgroup/}
+	 */
+	name?: string;
 }
 
+/**
+ * Default broker options for redis
+ */
+export const DefaultRedisBrokerOptions = {
+	...DefaultBrokerOptions,
+	name: randomBytes(20).toString('hex'),
+	maxChunk: 10,
+	blockTimeout: 5_000,
+} as const satisfies Required<Omit<RedisBrokerOptions, 'group'>>;
+
 /**
  * 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>
 {
 	/**
@@ -56,26 +89,29 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 	 */
 	protected listening = false;
 
-	public constructor(options: RedisBrokerOptions) {
+	public constructor(
+		protected readonly redisClient: Redis,
+		options: RedisBrokerOptions,
+	) {
 		super();
-		this.options = { ...DefaultBrokerOptions, ...options };
-		options.redisClient.defineCommand('xcleangroup', {
+		this.options = { ...DefaultRedisBrokerOptions, ...options };
+		redisClient.defineCommand('xcleangroup', {
 			numberOfKeys: 1,
 			lua: readFileSync(resolve(__dirname, '..', 'scripts', 'xcleangroup.lua'), 'utf8'),
 		});
-		this.streamReadClient = options.redisClient.duplicate();
+		this.streamReadClient = redisClient.duplicate();
 	}
 
 	/**
 	 * {@inheritDoc IBaseBroker.subscribe}
 	 */
-	public async subscribe(group: string, events: (keyof TEvents)[]): Promise<void> {
+	public async subscribe(events: (keyof TEvents)[]): Promise<void> {
 		await Promise.all(
 			// @ts-expect-error: Intended
 			events.map(async (event) => {
 				this.subscribedEvents.add(event as string);
 				try {
-					return await this.options.redisClient.xgroup('CREATE', event as string, group, 0, 'MKSTREAM');
+					return await this.redisClient.xgroup('CREATE', event as string, this.options.group, 0, 'MKSTREAM');
 				} catch (error) {
 					if (!(error instanceof ReplyError)) {
 						throw error;
@@ -83,21 +119,21 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 				}
 			}),
 		);
-		void this.listen(group);
+		void this.listen();
 	}
 
 	/**
 	 * {@inheritDoc IBaseBroker.unsubscribe}
 	 */
-	public async unsubscribe(group: string, events: (keyof TEvents)[]): Promise<void> {
+	public async unsubscribe(events: (keyof TEvents)[]): Promise<void> {
 		const commands: unknown[][] = Array.from({ length: events.length * 2 });
 		for (let idx = 0; idx < commands.length; idx += 2) {
 			const event = events[idx / 2];
-			commands[idx] = ['xgroup', 'delconsumer', event as string, group, this.options.name];
-			commands[idx + 1] = ['xcleangroup', event as string, group];
+			commands[idx] = ['xgroup', 'delconsumer', event as string, this.options.group, this.options.name];
+			commands[idx + 1] = ['xcleangroup', event as string, this.options.group];
 		}
 
-		await this.options.redisClient.pipeline(commands).exec();
+		await this.redisClient.pipeline(commands).exec();
 
 		for (const event of events) {
 			this.subscribedEvents.delete(event as string);
@@ -107,18 +143,18 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 	/**
 	 * Begins polling for events, firing them to {@link BaseRedisBroker.listen}
 	 */
-	protected async listen(group: string): Promise<void> {
+	protected async listen(): Promise<void> {
 		if (this.listening) {
 			return;
 		}
 
 		this.listening = true;
 
-		while (true) {
+		while (this.subscribedEvents.size > 0) {
 			try {
 				const data = await this.streamReadClient.xreadgroupBuffer(
 					'GROUP',
-					group,
+					this.options.group,
 					this.options.name,
 					'COUNT',
 					String(this.options.maxChunk),
@@ -145,10 +181,11 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 							continue;
 						}
 
-						this.emitEvent(id, group, event.toString('utf8'), this.options.decode(data));
+						this.emitEvent(id, this.options.group, event.toString('utf8'), this.options.decode(data));
 					}
 				}
 			} catch (error) {
+				// @ts-expect-error: Intended
 				this.emit('error', error);
 				break;
 			}
@@ -161,8 +198,9 @@ export abstract class BaseRedisBroker<TEvents extends Record<string, any>>
 	 * Destroys the broker, closing all connections
 	 */
 	public async destroy() {
+		await this.unsubscribe([...this.subscribedEvents]);
 		this.streamReadClient.disconnect();
-		this.options.redisClient.disconnect();
+		this.redisClient.disconnect();
 	}
 
 	/**

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

@@ -11,7 +11,7 @@ import { BaseRedisBroker } from './BaseRedis.js';
  * import { PubSubRedisBroker } from '@discordjs/brokers';
  * import Redis from 'ioredis';
  *
- * const broker = new PubSubRedisBroker({ redisClient: new Redis() });
+ * const broker = new PubSubRedisBroker(new Redis());
  *
  * await broker.publish('test', 'Hello World!');
  * await broker.destroy();
@@ -20,7 +20,7 @@ import { BaseRedisBroker } from './BaseRedis.js';
  * import { PubSubRedisBroker } from '@discordjs/brokers';
  * import Redis from 'ioredis';
  *
- * const broker = new PubSubRedisBroker({ redisClient: new Redis() });
+ * const broker = new PubSubRedisBroker(new Redis());
  * 	broker.on('test', ({ data, ack }) => {
  * 	console.log(data);
  * 	void ack();
@@ -37,22 +37,18 @@ export class PubSubRedisBroker<TEvents extends Record<string, any>>
 	 * {@inheritDoc IPubSubBroker.publish}
 	 */
 	public async publish<Event extends keyof TEvents>(event: Event, data: TEvents[Event]): Promise<void> {
-		await this.options.redisClient.xadd(
-			event as string,
-			'*',
-			BaseRedisBroker.STREAM_DATA_KEY,
-			this.options.encode(data),
-		);
+		await this.redisClient.xadd(event as string, '*', BaseRedisBroker.STREAM_DATA_KEY, this.options.encode(data));
 	}
 
 	protected emitEvent(id: Buffer, group: string, event: string, data: unknown) {
 		const payload: { ack(): Promise<void>; data: unknown } = {
 			data,
 			ack: async () => {
-				await this.options.redisClient.xack(event, group, id);
+				await this.redisClient.xack(event, group, id);
 			},
 		};
 
+		// @ts-expect-error: Intended
 		this.emit(event, payload);
 	}
 }

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

@@ -1,9 +1,9 @@
 import type { Buffer } from 'node:buffer';
 import { clearTimeout, setTimeout } from 'node:timers';
+import type Redis from 'ioredis/built/Redis.js';
 import type { IRPCBroker } from '../Broker.js';
-import { DefaultBrokerOptions } from '../Broker.js';
 import type { RedisBrokerOptions } from './BaseRedis.js';
-import { BaseRedisBroker } from './BaseRedis.js';
+import { BaseRedisBroker, DefaultRedisBrokerOptions } from './BaseRedis.js';
 
 interface InternalPromise {
 	reject(error: any): void;
@@ -22,9 +22,9 @@ export interface RPCRedisBrokerOptions extends RedisBrokerOptions {
  * Default values used for the {@link RPCRedisBrokerOptions}
  */
 export const DefaultRPCRedisBrokerOptions = {
-	...DefaultBrokerOptions,
+	...DefaultRedisBrokerOptions,
 	timeout: 5_000,
-} as const satisfies Required<Omit<RPCRedisBrokerOptions, 'redisClient'>>;
+} as const satisfies Required<Omit<RPCRedisBrokerOptions, 'group'>>;
 
 /**
  * RPC broker powered by Redis
@@ -35,7 +35,7 @@ export const DefaultRPCRedisBrokerOptions = {
  * import { RPCRedisBroker } from '@discordjs/brokers';
  * import Redis from 'ioredis';
  *
- * const broker = new RPCRedisBroker({ redisClient: new Redis() });
+ * const broker = new RPCRedisBroker(new Redis());
  *
  * console.log(await broker.call('testcall', 'Hello World!'));
  * await broker.destroy();
@@ -44,7 +44,7 @@ export const DefaultRPCRedisBrokerOptions = {
  * import { RPCRedisBroker } from '@discordjs/brokers';
  * import Redis from 'ioredis';
  *
- * const broker = new RPCRedisBroker({ redisClient: new Redis() });
+ * const broker = new RPCRedisBroker(new Redis());
  * broker.on('testcall', ({ data, ack, reply }) => {
  * 	console.log('responder', data);
  * 	void ack();
@@ -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>
 {
 	/**
@@ -65,8 +65,8 @@ export class RPCRedisBroker<TEvents extends Record<string, any>, TResponses exte
 
 	protected readonly promises = new Map<string, InternalPromise>();
 
-	public constructor(options: RPCRedisBrokerOptions) {
-		super(options);
+	public constructor(redisClient: Redis, options: RPCRedisBrokerOptions) {
+		super(redisClient, options);
 		this.options = { ...DefaultRPCRedisBrokerOptions, ...options };
 
 		this.streamReadClient.on('messageBuffer', (channel: Buffer, message: Buffer) => {
@@ -88,7 +88,7 @@ export class RPCRedisBroker<TEvents extends Record<string, any>, TResponses exte
 		data: TEvents[Event],
 		timeoutDuration: number = this.options.timeout,
 	): Promise<TResponses[Event]> {
-		const id = await this.options.redisClient.xadd(
+		const id = await this.redisClient.xadd(
 			event as string,
 			'*',
 			BaseRedisBroker.STREAM_DATA_KEY,
@@ -114,17 +114,18 @@ export class RPCRedisBroker<TEvents extends Record<string, any>, TResponses exte
 		});
 	}
 
-	protected emitEvent(id: Buffer, group: string, event: string, data: unknown) {
+	protected emitEvent(id: Buffer, event: string, data: unknown) {
 		const payload: { ack(): Promise<void>; data: unknown; reply(data: unknown): Promise<void> } = {
 			data,
 			ack: async () => {
-				await this.options.redisClient.xack(event, group, id);
+				await this.redisClient.xack(event, this.options.group, id);
 			},
 			reply: async (data) => {
-				await this.options.redisClient.publish(`${event}:${id.toString()}`, this.options.encode(data));
+				await this.redisClient.publish(`${event}:${id.toString()}`, this.options.encode(data));
 			},
 		};
 
+		// @ts-expect-error: Intended
 		this.emit(event, payload);
 	}
 }

packages/builders/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@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
+
+- **SlashCommandBuilder:** Add missing shared properties (#10255) ([29fd89f](https://github.com/discordjs/discord.js/commit/29fd89f23c22ac5b4ce0a3ed34f5d27e28b1a0b8))
+
+## Documentation
+
+- **SelectMenuBuilder:** Correct grammatical errors  (#10309) ([aae2faf](https://github.com/discordjs/discord.js/commit/aae2faf9e923a268f84c8b7fb3283aea09dca586))
+- **TextInputBuilder:** Correct constructor documentation (#10308) ([c1e6890](https://github.com/discordjs/discord.js/commit/c1e6890132d5597a6ebd9d79383ec572582c0601))
+- **MappedComponentTypes:** Fix "inpiut" typo (#10306) ([29a50bb](https://github.com/discordjs/discord.js/commit/29a50bb476e8e84896dbaec96c6009589afaafbf))
+
+# [@discordjs/builders@1.8.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.8.0...@discordjs/builders@1.8.1) - (2024-05-05)
+
+## Bug Fixes
+
+- Slashcommand builder type split (#10253) ([07c1210](https://github.com/discordjs/discord.js/commit/07c12101e534fdce836a94bc571b53f75979ea86))
+- Don't mutate user provided array (#10014) ([7ea3638](https://github.com/discordjs/discord.js/commit/7ea3638dbcf38926596fb5da8b85040e70f1b98b))
+- Minify mainlib docs json (#9963) ([4b88306](https://github.com/discordjs/discord.js/commit/4b88306dcb2b16b840ec61e9e33047af3a31c45d))
+
+## Documentation
+
+- Split docs.api.json into multiple json files ([597340f](https://github.com/discordjs/discord.js/commit/597340f288437c35da8c703d9b621274de60d880))
+
+## Features
+
+- **api-extractor:** Support `export * as ___` syntax (#10173) ([1c5de21](https://github.com/discordjs/discord.js/commit/1c5de21a2905fe21b54dea805013f089ed9000d0))
+- Allow RestOrArray for command option builders (#10175) ([a1a3a95](https://github.com/discordjs/discord.js/commit/a1a3a95c94194a8ab789d567a778b376e13ea973))
+- Local and preview detection ([79fbda3](https://github.com/discordjs/discord.js/commit/79fbda3aac6d4f0f8bfb193e797d09cbe331d315))
+
+## Refactor
+
+- Docs (#10126) ([18cce83](https://github.com/discordjs/discord.js/commit/18cce83d80598c430218775c53441b6b2ecdc776))
+- Make builders types great again (#10026) ([a0c83a2](https://github.com/discordjs/discord.js/commit/a0c83a254c21dad5ac14b649a95ded57d6678d95))
+
+# [@discordjs/builders@1.8.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.8.0...@discordjs/builders@1.8.1) - (2024-05-05)
+
+## Bug Fixes
+
+- Slashcommand builder type split (#10253) ([07c1210](https://github.com/discordjs/discord.js/commit/07c12101e534fdce836a94bc571b53f75979ea86))
+
 # [@discordjs/builders@1.8.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.7.0...@discordjs/builders@1.8.0) - (2024-05-04)
 
 ## Bug Fixes
@@ -229,261 +280,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/README.md

@@ -23,7 +23,7 @@
 
 ## Installation
 
-**Node.js 16.11.0 or newer is required.**
+**Node.js 18 or newer is required.**
 
 ```sh
 npm install @discordjs/builders

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

@@ -7,8 +7,8 @@ import {
 import { describe, test, expect } from 'vitest';
 import {
 	ActionRowBuilder,
-	ButtonBuilder,
 	createComponentBuilder,
+	PrimaryButtonBuilder,
 	StringSelectMenuBuilder,
 	StringSelectMenuOptionBuilder,
 } from '../../src/index.js';
@@ -41,21 +41,14 @@ const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent>
 					value: 'two',
 				},
 			],
-			max_values: 10,
-			min_values: 12,
+			max_values: 2,
+			min_values: 2,
 		},
 	],
 };
 
 describe('Action Row Components', () => {
 	describe('Assertion Tests', () => {
-		test('GIVEN valid components THEN do not throw', () => {
-			expect(() => new ActionRowBuilder().addComponents(new ButtonBuilder())).not.toThrowError();
-			expect(() => new ActionRowBuilder().setComponents(new ButtonBuilder())).not.toThrowError();
-			expect(() => new ActionRowBuilder().addComponents([new ButtonBuilder()])).not.toThrowError();
-			expect(() => new ActionRowBuilder().setComponents([new ButtonBuilder()])).not.toThrowError();
-		});
-
 		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
 			const actionRowData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
@@ -72,22 +65,10 @@ describe('Action Row Components', () => {
 						style: ButtonStyle.Link,
 						url: 'https://google.com',
 					},
-					{
-						type: ComponentType.StringSelect,
-						placeholder: 'test',
-						custom_id: 'test',
-						options: [
-							{
-								label: 'option',
-								value: 'option',
-							},
-						],
-					},
 				],
 			};
 
 			expect(new ActionRowBuilder(actionRowData).toJSON()).toEqual(actionRowData);
-			expect(new ActionRowBuilder().toJSON()).toEqual({ type: ComponentType.ActionRow, components: [] });
 			expect(() => createComponentBuilder({ type: ComponentType.ActionRow, components: [] })).not.toThrowError();
 		});
 
@@ -120,24 +101,23 @@ describe('Action Row Components', () => {
 								value: 'two',
 							},
 						],
-						max_values: 10,
-						min_values: 12,
+						max_values: 1,
+						min_values: 1,
 					},
 				],
 			};
 
 			expect(new ActionRowBuilder(rowWithButtonData).toJSON()).toEqual(rowWithButtonData);
 			expect(new ActionRowBuilder(rowWithSelectMenuData).toJSON()).toEqual(rowWithSelectMenuData);
-			expect(new ActionRowBuilder().toJSON()).toEqual({ type: ComponentType.ActionRow, components: [] });
 			expect(() => createComponentBuilder({ type: ComponentType.ActionRow, components: [] })).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 button = new PrimaryButtonBuilder().setLabel('test').setCustomId('123');
 			const selectMenu = new StringSelectMenuBuilder()
 				.setCustomId('1234')
-				.setMaxValues(10)
-				.setMinValues(12)
+				.setMaxValues(2)
+				.setMinValues(2)
 				.setOptions(
 					new StringSelectMenuOptionBuilder().setLabel('one').setValue('one'),
 					new StringSelectMenuOptionBuilder().setLabel('two').setValue('two'),
@@ -147,10 +127,39 @@ describe('Action Row Components', () => {
 					new StringSelectMenuOptionBuilder().setLabel('two').setValue('two'),
 				]);
 
-			expect(new ActionRowBuilder().addComponents(button).toJSON()).toEqual(rowWithButtonData);
-			expect(new ActionRowBuilder().addComponents(selectMenu).toJSON()).toEqual(rowWithSelectMenuData);
-			expect(new ActionRowBuilder().addComponents([button]).toJSON()).toEqual(rowWithButtonData);
-			expect(new ActionRowBuilder().addComponents([selectMenu]).toJSON()).toEqual(rowWithSelectMenuData);
+			expect(new ActionRowBuilder().addPrimaryButtonComponents(button).toJSON()).toEqual(rowWithButtonData);
+			expect(new ActionRowBuilder().addStringSelectMenuComponent(selectMenu).toJSON()).toEqual(rowWithSelectMenuData);
+			expect(new ActionRowBuilder().addPrimaryButtonComponents([button]).toJSON()).toEqual(rowWithButtonData);
+		});
+
+		test('GIVEN 2 select menus THEN it throws', () => {
+			const selectMenu = new StringSelectMenuBuilder()
+				.setCustomId('1234')
+				.setOptions(
+					new StringSelectMenuOptionBuilder().setLabel('one').setValue('one'),
+					new StringSelectMenuOptionBuilder().setLabel('two').setValue('two'),
+				);
+
+			expect(() =>
+				new ActionRowBuilder()
+					.addStringSelectMenuComponent(selectMenu)
+					.addStringSelectMenuComponent(selectMenu)
+					.toJSON(),
+			).toThrowError();
+		});
+
+		test('GIVEN a button and a select menu THEN it throws', () => {
+			const button = new PrimaryButtonBuilder().setLabel('test').setCustomId('123');
+			const selectMenu = new StringSelectMenuBuilder()
+				.setCustomId('1234')
+				.setOptions(
+					new StringSelectMenuOptionBuilder().setLabel('one').setValue('one'),
+					new StringSelectMenuOptionBuilder().setLabel('two').setValue('two'),
+				);
+
+			expect(() =>
+				new ActionRowBuilder().addStringSelectMenuComponent(selectMenu).addPrimaryButtonComponents(button).toJSON(),
+			).toThrowError();
 		});
 	});
 });

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

@@ -5,111 +5,62 @@ import {
 	type APIButtonComponentWithURL,
 } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
-import { buttonLabelValidator, buttonStyleValidator } from '../../src/components/Assertions.js';
-import { ButtonBuilder } from '../../src/components/button/Button.js';
-
-const buttonComponent = () => new ButtonBuilder();
+import { PrimaryButtonBuilder, PremiumButtonBuilder, LinkButtonBuilder } from '../../src/index.js';
 
 const longStr =
 	'looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong';
 
 describe('Button Components', () => {
 	describe('Assertion Tests', () => {
-		test('GIVEN valid label THEN validator does not throw', () => {
-			expect(() => buttonLabelValidator.parse('foobar')).not.toThrowError();
-		});
-
-		test('GIVEN invalid label THEN validator does throw', () => {
-			expect(() => buttonLabelValidator.parse(null)).toThrowError();
-			expect(() => buttonLabelValidator.parse('')).toThrowError();
-
-			expect(() => buttonLabelValidator.parse(longStr)).toThrowError();
-		});
-
-		test('GIVEN valid style THEN validator does not throw', () => {
-			expect(() => buttonStyleValidator.parse(3)).not.toThrowError();
-			expect(() => buttonStyleValidator.parse(ButtonStyle.Secondary)).not.toThrowError();
-		});
-
-		test('GIVEN invalid style THEN validator does throw', () => {
-			expect(() => buttonStyleValidator.parse(7)).toThrowError();
-		});
-
 		test('GIVEN valid fields THEN builder does not throw', () => {
-			expect(() =>
-				buttonComponent().setCustomId('custom').setStyle(ButtonStyle.Primary).setLabel('test'),
-			).not.toThrowError();
+			expect(() => new PrimaryButtonBuilder().setCustomId('custom').setLabel('test')).not.toThrowError();
 
 			expect(() => {
-				const button = buttonComponent()
+				const button = new PrimaryButtonBuilder()
 					.setCustomId('custom')
-					.setStyle(ButtonStyle.Primary)
+					.setLabel('test')
 					.setDisabled(true)
 					.setEmoji({ name: 'test' });
 
 				button.toJSON();
 			}).not.toThrowError();
 
-			expect(() => buttonComponent().setURL('https://google.com')).not.toThrowError();
+			expect(() => {
+				const button = new PremiumButtonBuilder().setSKUId('123456789012345678');
+				button.toJSON();
+			}).not.toThrowError();
+
+			expect(() => new LinkButtonBuilder().setURL('https://google.com')).not.toThrowError();
 		});
 
 		test('GIVEN invalid fields THEN build does throw', () => {
 			expect(() => {
-				buttonComponent().setCustomId(longStr);
-			}).toThrowError();
-
-			expect(() => {
-				const button = buttonComponent()
-					.setCustomId('custom')
-					.setStyle(ButtonStyle.Primary)
-					.setDisabled(true)
-					.setLabel('test')
-					.setURL('https://google.com')
-					.setEmoji({ name: 'test' });
-
-				button.toJSON();
+				new PrimaryButtonBuilder().setCustomId(longStr).toJSON();
 			}).toThrowError();
 
 			expect(() => {
 				// @ts-expect-error: Invalid emoji
-				const button = buttonComponent().setEmoji('test');
+				const button = new PrimaryButtonBuilder().setEmoji('test');
 				button.toJSON();
 			}).toThrowError();
 
 			expect(() => {
-				const button = buttonComponent().setStyle(ButtonStyle.Primary);
+				const button = new PrimaryButtonBuilder();
 				button.toJSON();
 			}).toThrowError();
 
 			expect(() => {
-				const button = buttonComponent().setStyle(ButtonStyle.Primary).setCustomId('test');
-				button.toJSON();
-			}).toThrowError();
-
-			expect(() => {
-				const button = buttonComponent().setStyle(ButtonStyle.Link);
-				button.toJSON();
-			}).toThrowError();
-
-			expect(() => {
-				const button = buttonComponent().setStyle(ButtonStyle.Primary).setLabel('test').setURL('https://google.com');
-				button.toJSON();
-			}).toThrowError();
-
-			expect(() => {
-				const button = buttonComponent().setStyle(ButtonStyle.Link).setLabel('test');
+				const button = new PrimaryButtonBuilder().setCustomId('test');
 				button.toJSON();
 			}).toThrowError();
 
 			// @ts-expect-error: Invalid style
-			expect(() => buttonComponent().setStyle(24)).toThrowError();
-			expect(() => buttonComponent().setLabel(longStr)).toThrowError();
+			expect(() => new PrimaryButtonBuilder().setCustomId('hi').setStyle(24).toJSON()).toThrowError();
+			expect(() => new PrimaryButtonBuilder().setCustomId('hi').setLabel(longStr).toJSON()).toThrowError();
 			// @ts-expect-error: Invalid parameter for disabled
-			expect(() => buttonComponent().setDisabled(0)).toThrowError();
+			expect(() => new PrimaryButtonBuilder().setCustomId('hi').setDisabled(0).toJSON()).toThrowError();
 			// @ts-expect-error: Invalid emoji
-			expect(() => buttonComponent().setEmoji('foo')).toThrowError();
-
-			expect(() => buttonComponent().setURL('foobar')).toThrowError();
+			expect(() => new PrimaryButtonBuilder().setCustomId('hi').setEmoji('foo').toJSON()).toThrowError();
 		});
 
 		test('GiVEN valid input THEN valid JSON outputs are given', () => {
@@ -121,13 +72,12 @@ describe('Button Components', () => {
 				disabled: true,
 			};
 
-			expect(new ButtonBuilder(interactionData).toJSON()).toEqual(interactionData);
+			expect(new PrimaryButtonBuilder(interactionData).toJSON()).toEqual(interactionData);
 
 			expect(
-				buttonComponent()
+				new PrimaryButtonBuilder()
 					.setCustomId(interactionData.custom_id)
 					.setLabel(interactionData.label!)
-					.setStyle(interactionData.style)
 					.setDisabled(interactionData.disabled)
 					.toJSON(),
 			).toEqual(interactionData);
@@ -140,9 +90,7 @@ describe('Button Components', () => {
 				url: 'https://google.com',
 			};
 
-			expect(new ButtonBuilder(linkData).toJSON()).toEqual(linkData);
-
-			expect(buttonComponent().setLabel(linkData.label!).setDisabled(true).setURL(linkData.url));
+			expect(new LinkButtonBuilder(linkData).toJSON()).toEqual(linkData);
 		});
 	});
 });

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

@@ -11,14 +11,14 @@ import {
 import { describe, test, expect } from 'vitest';
 import {
 	ActionRowBuilder,
-	ButtonBuilder,
 	createComponentBuilder,
+	CustomIdButtonBuilder,
 	StringSelectMenuBuilder,
 	TextInputBuilder,
 } from '../../src/index.js';
 
 describe('createComponentBuilder', () => {
-	test.each([ButtonBuilder, StringSelectMenuBuilder, TextInputBuilder])(
+	test.each([StringSelectMenuBuilder, TextInputBuilder])(
 		'passing an instance of %j should return itself',
 		(Builder) => {
 			const builder = new Builder();
@@ -42,7 +42,7 @@ describe('createComponentBuilder', () => {
 			type: ComponentType.Button,
 		};
 
-		expect(createComponentBuilder(button)).toBeInstanceOf(ButtonBuilder);
+		expect(createComponentBuilder(button)).toBeInstanceOf(CustomIdButtonBuilder);
 	});
 
 	test('GIVEN a select menu component THEN returns a StringSelectMenuBuilder', () => {

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

@@ -3,6 +3,7 @@ import { describe, test, expect } from 'vitest';
 import { StringSelectMenuBuilder, StringSelectMenuOptionBuilder } from '../../src/index.js';
 
 const selectMenu = () => new StringSelectMenuBuilder();
+const selectMenuWithId = () => new StringSelectMenuBuilder({ custom_id: 'hi' });
 const selectMenuOption = () => new StringSelectMenuOptionBuilder();
 
 const longStr = 'a'.repeat(256);
@@ -16,10 +17,10 @@ const selectMenuOptionData: APISelectMenuOption = {
 };
 
 const selectMenuDataWithoutOptions = {
-	type: ComponentType.SelectMenu,
+	type: ComponentType.StringSelect,
 	custom_id: 'test',
-	max_values: 10,
-	min_values: 3,
+	max_values: 1,
+	min_values: 1,
 	disabled: true,
 	placeholder: 'test',
 } as const;
@@ -109,49 +110,87 @@ describe('Select Menu Components', () => {
 		});
 
 		test('GIVEN invalid inputs THEN Select Menu does throw', () => {
-			expect(() => selectMenu().setCustomId(longStr)).toThrowError();
-			expect(() => selectMenu().setMaxValues(30)).toThrowError();
-			expect(() => selectMenu().setMinValues(-20)).toThrowError();
+			expect(() => selectMenu().setCustomId(longStr).toJSON()).toThrowError();
+			expect(() => selectMenuWithId().setMaxValues(30).toJSON()).toThrowError();
+			expect(() => selectMenuWithId().setMinValues(-20).toJSON()).toThrowError();
 			// @ts-expect-error: Invalid disabled value
-			expect(() => selectMenu().setDisabled(0)).toThrowError();
-			expect(() => selectMenu().setPlaceholder(longStr)).toThrowError();
+			expect(() => selectMenuWithId().setDisabled(0).toJSON()).toThrowError();
+			expect(() => selectMenuWithId().setPlaceholder(longStr).toJSON()).toThrowError();
 			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions({ label: 'test' })).toThrowError();
-			expect(() => selectMenu().addOptions({ label: longStr, value: 'test' })).toThrowError();
-			expect(() => selectMenu().addOptions({ value: longStr, label: 'test' })).toThrowError();
-			expect(() => selectMenu().addOptions({ label: 'test', value: 'test', description: longStr })).toThrowError();
+			expect(() => selectMenuWithId().addOptions({ label: 'test' }).toJSON()).toThrowError();
+			expect(() => selectMenuWithId().addOptions({ label: longStr, value: 'test' }).toJSON()).toThrowError();
+			expect(() => selectMenuWithId().addOptions({ value: longStr, label: 'test' }).toJSON()).toThrowError();
+			expect(() =>
+				selectMenuWithId().addOptions({ label: 'test', value: 'test', description: longStr }).toJSON(),
+			).toThrowError();
+			expect(() =>
+				// @ts-expect-error: Invalid option
+				selectMenuWithId().addOptions({ label: 'test', value: 'test', default: 100 }).toJSON(),
+			).toThrowError();
 			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions({ label: 'test', value: 'test', default: 100 })).toThrowError();
+			expect(() => selectMenuWithId().addOptions({ value: 'test' }).toJSON()).toThrowError();
 			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions({ value: 'test' })).toThrowError();
-			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions({ default: true })).toThrowError();
-			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions([{ label: 'test' }])).toThrowError();
-			expect(() => selectMenu().addOptions([{ label: longStr, value: 'test' }])).toThrowError();
-			expect(() => selectMenu().addOptions([{ value: longStr, label: 'test' }])).toThrowError();
-			expect(() => selectMenu().addOptions([{ label: 'test', value: 'test', description: longStr }])).toThrowError();
-			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions([{ label: 'test', value: 'test', default: 100 }])).toThrowError();
-			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions([{ value: 'test' }])).toThrowError();
-			// @ts-expect-error: Invalid option
-			expect(() => selectMenu().addOptions([{ default: true }])).toThrowError();
+			expect(() => selectMenuWithId().addOptions({ default: true }).toJSON()).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					// @ts-expect-error: Invalid option
+					.addOptions([{ label: 'test' }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					.addOptions([{ label: longStr, value: 'test' }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					.addOptions([{ value: longStr, label: 'test' }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					.addOptions([{ label: 'test', value: 'test', description: longStr }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					// @ts-expect-error: Invalid option
+					.addOptions([{ label: 'test', value: 'test', default: 100 }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					// @ts-expect-error: Invalid option
+					.addOptions([{ value: 'test' }])
+					.toJSON(),
+			).toThrowError();
+			expect(() =>
+				selectMenuWithId()
+					// @ts-expect-error: Invalid option
+					.addOptions([{ default: true }])
+					.toJSON(),
+			).toThrowError();
 
 			const tooManyOptions = Array.from<APISelectMenuOption>({ length: 26 }).fill({ label: 'test', value: 'test' });
 
-			expect(() => selectMenu().setOptions(...tooManyOptions)).toThrowError();
-			expect(() => selectMenu().setOptions(tooManyOptions)).toThrowError();
+			expect(() =>
+				selectMenu()
+					.setOptions(...tooManyOptions)
+					.toJSON(),
+			).toThrowError();
+			expect(() => selectMenu().setOptions(tooManyOptions).toJSON()).toThrowError();
 
 			expect(() =>
 				selectMenu()
 					.addOptions({ label: 'test', value: 'test' })
-					.addOptions(...tooManyOptions),
+					.addOptions(...tooManyOptions)
+					.toJSON(),
 			).toThrowError();
 			expect(() =>
 				selectMenu()
 					.addOptions([{ label: 'test', value: 'test' }])
-					.addOptions(tooManyOptions),
+					.addOptions(tooManyOptions)
+					.toJSON(),
 			).toThrowError();
 
 			expect(() => {
@@ -162,7 +201,8 @@ describe('Select Menu Components', () => {
 					.setDefault(-1)
 					// @ts-expect-error: Invalid emoji
 					.setEmoji({ name: 1 })
-					.setDescription(longStr);
+					.setDescription(longStr)
+					.toJSON();
 			}).toThrowError();
 		});
 
@@ -212,17 +252,16 @@ describe('Select Menu Components', () => {
 			).toStrictEqual([selectMenuOptionData]);
 
 			expect(() =>
-				makeStringSelectMenuWithOptions().spliceOptions(
-					0,
-					0,
-					...Array.from({ length: 26 }, () => selectMenuOptionData),
-				),
+				makeStringSelectMenuWithOptions()
+					.spliceOptions(0, 0, ...Array.from({ length: 26 }, () => selectMenuOptionData))
+					.toJSON(),
 			).toThrowError();
 
 			expect(() =>
 				makeStringSelectMenuWithOptions()
 					.setOptions(Array.from({ length: 25 }, () => selectMenuOptionData))
-					.spliceOptions(-1, 2, selectMenuOptionData, selectMenuOptionData),
+					.spliceOptions(-1, 2, selectMenuOptionData, selectMenuOptionData)
+					.toJSON(),
 			).toThrowError();
 		});
 	});

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

@@ -1,13 +1,5 @@
 import { ComponentType, TextInputStyle, type APITextInputComponent } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
-import {
-	labelValidator,
-	maxLengthValidator,
-	minLengthValidator,
-	placeholderValidator,
-	valueValidator,
-	textInputStyleValidator,
-} from '../../src/components/textInput/Assertions.js';
 import { TextInputBuilder } from '../../src/components/textInput/TextInput.js';
 
 const superLongStr = 'a'.repeat(5_000);
@@ -16,56 +8,6 @@ const textInputComponent = () => new TextInputBuilder();
 
 describe('Text Input Components', () => {
 	describe('Assertion Tests', () => {
-		test('GIVEN valid label THEN validator does not throw', () => {
-			expect(() => labelValidator.parse('foobar')).not.toThrowError();
-		});
-
-		test('GIVEN invalid label THEN validator does throw', () => {
-			expect(() => labelValidator.parse(24)).toThrowError();
-			expect(() => labelValidator.parse(undefined)).toThrowError();
-		});
-
-		test('GIVEN valid style THEN validator does not throw', () => {
-			expect(() => textInputStyleValidator.parse(TextInputStyle.Paragraph)).not.toThrowError();
-			expect(() => textInputStyleValidator.parse(TextInputStyle.Short)).not.toThrowError();
-		});
-
-		test('GIVEN invalid style THEN validator does throw', () => {
-			expect(() => textInputStyleValidator.parse(24)).toThrowError();
-		});
-
-		test('GIVEN valid min length THEN validator does not throw', () => {
-			expect(() => minLengthValidator.parse(10)).not.toThrowError();
-		});
-
-		test('GIVEN invalid min length THEN validator does throw', () => {
-			expect(() => minLengthValidator.parse(-1)).toThrowError();
-		});
-
-		test('GIVEN valid max length THEN validator does not throw', () => {
-			expect(() => maxLengthValidator.parse(10)).not.toThrowError();
-		});
-
-		test('GIVEN invalid min length THEN validator does throw 2', () => {
-			expect(() => maxLengthValidator.parse(4_001)).toThrowError();
-		});
-
-		test('GIVEN valid value THEN validator does not throw', () => {
-			expect(() => valueValidator.parse('foobar')).not.toThrowError();
-		});
-
-		test('GIVEN invalid value THEN validator does throw', () => {
-			expect(() => valueValidator.parse(superLongStr)).toThrowError();
-		});
-
-		test('GIVEN valid placeholder THEN validator does not throw', () => {
-			expect(() => placeholderValidator.parse('foobar')).not.toThrowError();
-		});
-
-		test('GIVEN invalid value THEN validator does throw 2', () => {
-			expect(() => placeholderValidator.parse(superLongStr)).toThrowError();
-		});
-
 		test('GIVEN valid fields THEN builder does not throw', () => {
 			expect(() => {
 				textInputComponent().setCustomId('foobar').setLabel('test').setStyle(TextInputStyle.Paragraph).toJSON();
@@ -84,9 +26,7 @@ describe('Text Input Components', () => {
 			}).not.toThrowError();
 
 			expect(() => {
-				// Issue #8107
-				// @ts-expect-error: Shapeshift maps the enum key to the value when parsing
-				textInputComponent().setCustomId('Custom').setLabel('Guess').setStyle('Short').toJSON();
+				textInputComponent().setCustomId('Custom').setLabel('Guess').setStyle(TextInputStyle.Short).toJSON();
 			}).not.toThrowError();
 		});
 	});

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

@@ -0,0 +1,516 @@
+import {
+	ApplicationCommandType,
+	ApplicationIntegrationType,
+	ChannelType,
+	InteractionContextType,
+	PermissionFlagsBits,
+} from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import {
+	ChatInputCommandBooleanOption,
+	ChatInputCommandBuilder,
+	ChatInputCommandChannelOption,
+	ChatInputCommandIntegerOption,
+	ChatInputCommandMentionableOption,
+	ChatInputCommandNumberOption,
+	ChatInputCommandRoleOption,
+	ChatInputCommandAttachmentOption,
+	ChatInputCommandStringOption,
+	ChatInputCommandSubcommandBuilder,
+	ChatInputCommandSubcommandGroupBuilder,
+	ChatInputCommandUserOption,
+} from '../../../src/index.js';
+
+const getBuilder = () => new ChatInputCommandBuilder();
+const getNamedBuilder = () => getBuilder().setName('example').setDescription('Example command');
+const getStringOption = () => new ChatInputCommandStringOption().setName('owo').setDescription('Testing 123');
+const getIntegerOption = () => new ChatInputCommandIntegerOption().setName('owo').setDescription('Testing 123');
+const getNumberOption = () => new ChatInputCommandNumberOption().setName('owo').setDescription('Testing 123');
+const getBooleanOption = () => new ChatInputCommandBooleanOption().setName('owo').setDescription('Testing 123');
+const getUserOption = () => new ChatInputCommandUserOption().setName('owo').setDescription('Testing 123');
+const getChannelOption = () => new ChatInputCommandChannelOption().setName('owo').setDescription('Testing 123');
+const getRoleOption = () => new ChatInputCommandRoleOption().setName('owo').setDescription('Testing 123');
+const getAttachmentOption = () => new ChatInputCommandAttachmentOption().setName('owo').setDescription('Testing 123');
+const getMentionableOption = () => new ChatInputCommandMentionableOption().setName('owo').setDescription('Testing 123');
+const getSubcommandGroup = () =>
+	new ChatInputCommandSubcommandGroupBuilder().setName('owo').setDescription('Testing 123');
+const getSubcommand = () => new ChatInputCommandSubcommandBuilder().setName('owo').setDescription('Testing 123');
+
+class Collection {
+	public readonly [Symbol.toStringTag] = 'Map';
+}
+
+describe('ChatInput Commands', () => {
+	describe('ChatInputCommandBuilder', () => {
+		describe('Builder with no options', () => {
+			test('GIVEN empty builder THEN throw error when calling toJSON', () => {
+				expect(() => getBuilder().toJSON()).toThrowError();
+			});
+
+			test('GIVEN valid builder THEN does not throw error', () => {
+				expect(() => getBuilder().setName('example').setDescription('Example command').toJSON()).not.toThrowError();
+			});
+		});
+
+		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()
+						.setName('example')
+						.setDescription('Example command')
+						.addBooleanOptions((boolean) =>
+							boolean.setName('iscool').setDescription('Are we cool or what?').setRequired(true),
+						)
+						.addChannelOptions((channel) => channel.setName('iscool').setDescription('Are we cool or what?'))
+						.addMentionableOptions((mentionable) =>
+							mentionable.setName('iscool').setDescription('Are we cool or what?'),
+						)
+						.addRoleOptions((role) => role.setName('iscool').setDescription('Are we cool or what?'))
+						.addUserOptions((user) => user.setName('iscool').setDescription('Are we cool or what?'))
+						.addIntegerOptions((integer) =>
+							integer
+								.setName('iscool')
+								.setDescription('Are we cool or what?')
+								.addChoices({ name: 'Very cool', value: 1_000 })
+								.addChoices([{ name: 'Even cooler', value: 2_000 }]),
+						)
+						.addNumberOptions((number) =>
+							number
+								.setName('iscool')
+								.setDescription('Are we cool or what?')
+								.addChoices({ name: 'Very cool', value: 1.5 })
+								.addChoices([{ name: 'Even cooler', value: 2.5 }]),
+						)
+						.addStringOptions((string) =>
+							string
+								.setName('iscool')
+								.setDescription('Are we cool or what?')
+								.addChoices({ name: 'Fancy Pants', value: 'fp_1' }, { name: 'Fancy Shoes', value: 'fs_1' })
+								.addChoices([{ name: 'The Whole shebang', value: 'all' }]),
+						)
+						.addIntegerOptions((integer) =>
+							integer.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
+						)
+						.addNumberOptions((number) =>
+							number.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
+						)
+						.addStringOptions((string) =>
+							string.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
+						)
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid autocomplete THEN does throw an error', () => {
+				expect(() =>
+					// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+					getNamedBuilder().addStringOptions(getStringOption().setAutocomplete('not a boolean')).toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN a builder with both choices and autocomplete THEN does throw an error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addStringOptions(
+							getStringOption().setAutocomplete(true).addChoices({ name: 'Fancy Pants', value: 'fp_1' }),
+						)
+						.toJSON(),
+				).toThrowError();
+
+				expect(() =>
+					getNamedBuilder()
+						.addStringOptions(
+							getStringOption()
+								.setAutocomplete(true)
+								.addChoices(
+									{ name: 'Fancy Pants', value: 'fp_1' },
+									{ name: 'Fancy Shoes', value: 'fs_1' },
+									{ name: 'The Whole shebang', value: 'all' },
+								),
+						)
+						.toJSON(),
+				).toThrowError();
+
+				expect(() =>
+					getNamedBuilder()
+						.addStringOptions(
+							getStringOption().addChoices({ name: 'Fancy Pants', value: 'fp_1' }).setAutocomplete(true),
+						)
+						.toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN a builder with valid channel options and channel_types THEN does not throw an error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addChannelOptions(
+							getChannelOption().addChannelTypes(ChannelType.GuildText).addChannelTypes([ChannelType.GuildVoice]),
+						)
+						.toJSON(),
+				).not.toThrowError();
+
+				expect(() => {
+					getNamedBuilder()
+						.addChannelOptions(getChannelOption().addChannelTypes(ChannelType.GuildAnnouncement, ChannelType.GuildText))
+						.toJSON();
+				}).not.toThrowError();
+			});
+
+			test('GIVEN a builder with valid channel options and channel_types THEN does throw an error', () => {
+				expect(() =>
+					// @ts-expect-error: Invalid channel type
+					getNamedBuilder().addChannelOptions(getChannelOption().addChannelTypes(100)).toJSON(),
+				).toThrowError();
+
+				expect(() =>
+					// @ts-expect-error: Invalid channel types
+					getNamedBuilder().addChannelOptions(getChannelOption().addChannelTypes(100, 200)).toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN a builder with invalid number min/max options THEN does throw an error', () => {
+				// @ts-expect-error: Invalid max value
+				expect(() => getNamedBuilder().addNumberOptions(getNumberOption().setMaxValue('test')).toJSON()).toThrowError();
+
+				expect(() =>
+					// @ts-expect-error: Invalid max value
+					getNamedBuilder().addIntegerOptions(getIntegerOption().setMaxValue('test')).toJSON(),
+				).toThrowError();
+
+				// @ts-expect-error: Invalid min value
+				expect(() => getNamedBuilder().addNumberOptions(getNumberOption().setMinValue('test')).toJSON()).toThrowError();
+
+				expect(() =>
+					// @ts-expect-error: Invalid min value
+					getNamedBuilder().addIntegerOptions(getIntegerOption().setMinValue('test')).toJSON(),
+				).toThrowError();
+
+				expect(() => getNamedBuilder().addIntegerOptions(getIntegerOption().setMinValue(1.5)).toJSON()).toThrowError();
+			});
+
+			test('GIVEN a builder with valid number min/max options THEN does not throw an error', () => {
+				expect(() =>
+					getNamedBuilder().addIntegerOptions(getIntegerOption().setMinValue(1)).toJSON(),
+				).not.toThrowError();
+
+				expect(() =>
+					getNamedBuilder().addNumberOptions(getNumberOption().setMinValue(1.5)).toJSON(),
+				).not.toThrowError();
+
+				expect(() =>
+					getNamedBuilder().addIntegerOptions(getIntegerOption().setMaxValue(1)).toJSON(),
+				).not.toThrowError();
+
+				expect(() =>
+					getNamedBuilder().addNumberOptions(getNumberOption().setMaxValue(1.5)).toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN an already built builder THEN does not throw an error', () => {
+				expect(() => getNamedBuilder().addStringOptions(getStringOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addIntegerOptions(getIntegerOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addNumberOptions(getNumberOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addBooleanOptions(getBooleanOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addUserOptions(getUserOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addChannelOptions(getChannelOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addRoleOptions(getRoleOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addAttachmentOptions(getAttachmentOption()).toJSON()).not.toThrowError();
+
+				expect(() => getNamedBuilder().addMentionableOptions(getMentionableOption()).toJSON()).not.toThrowError();
+			});
+
+			test('GIVEN invalid name THEN throw error', () => {
+				expect(() => getBuilder().setName('TEST_COMMAND').setDescription(':3').toJSON()).toThrowError();
+				expect(() => getBuilder().setName('ĂĂĂĂĂĂ').setDescription(':3').toJSON()).toThrowError();
+			});
+
+			test('GIVEN valid names THEN does not throw error', () => {
+				expect(() => getBuilder().setName('hi_there').setDescription(':3')).not.toThrowError();
+				expect(() => getBuilder().setName('o_comandă').setDescription(':3')).not.toThrowError();
+				expect(() => getBuilder().setName('どうも').setDescription(':3')).not.toThrowError();
+			});
+
+			test('GIVEN invalid returns for builder THEN throw error', () => {
+				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+				expect(() => getNamedBuilder().addBooleanOptions(true).toJSON()).toThrowError();
+
+				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+				expect(() => getNamedBuilder().addBooleanOptions(null).toJSON()).toThrowError();
+
+				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+				expect(() => getNamedBuilder().addBooleanOptions(undefined).toJSON()).toThrowError();
+
+				expect(() =>
+					getNamedBuilder()
+						// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+						.addBooleanOptions(() => ChatInputCommandStringOption)
+						.toJSON(),
+				).toThrowError();
+				expect(() =>
+					getNamedBuilder()
+						// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+						.addBooleanOptions(() => new Collection())
+						.toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN an option that is autocompletable and has choices, THEN passing nothing to setChoices should not throw an error', () => {
+				expect(() =>
+					getNamedBuilder().addStringOptions(getStringOption().setAutocomplete(true).setChoices()).toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN an option that is autocompletable, THEN setting choices should throw an error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addStringOptions(getStringOption().setAutocomplete(true).setChoices({ name: 'owo', value: 'uwu' }))
+						.toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN an option, THEN setting choices should not throw an error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addStringOptions(getStringOption().setChoices({ name: 'owo', value: 'uwu' }))
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN valid builder with NSFW, THEN does not throw error', () => {
+				expect(() => getNamedBuilder().setName('foo').setDescription('foo').setNSFW(true).toJSON()).not.toThrowError();
+			});
+		});
+
+		describe('Builder with subcommand (group) options', () => {
+			test('GIVEN builder with subcommand group THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addSubcommandGroups((group) =>
+							group.setName('group').setDescription('Group us together!').addSubcommands(getSubcommand()),
+						)
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN builder with subcommand THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.addSubcommands((subcommand) => subcommand.setName('boop').setDescription('Boops a fellow nerd (you)'))
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN builder with subcommand THEN has regular ChatInput command fields', () => {
+				expect(() =>
+					getBuilder()
+						.setName('name')
+						.setDescription('description')
+						.addSubcommands((option) => option.setName('ye').setDescription('ye'))
+						.addSubcommands((option) => option.setName('no').setDescription('no'))
+						.setDefaultMemberPermissions(1n)
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN builder with already built subcommand group THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder().addSubcommandGroups(getSubcommandGroup().addSubcommands(getSubcommand())).toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN builder with already built subcommand THEN does not throw error', () => {
+				expect(() => getNamedBuilder().addSubcommands(getSubcommand()).toJSON()).not.toThrowError();
+			});
+
+			test('GIVEN builder with already built subcommand with options THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder().addSubcommands(getSubcommand().addBooleanOptions(getBooleanOption())).toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN builder with a subcommand that tries to add an invalid result THEN throw error', () => {
+				expect(() =>
+					// @ts-expect-error: Checking if check works JS-side too
+					getNamedBuilder().addSubcommands(getSubcommand()).addIntegerOptions(getInteger()).toJSON(),
+				).toThrowError();
+			});
+
+			test('GIVEN no valid return for an addSubcommand(Group) method THEN throw error', () => {
+				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+				expect(() => getNamedBuilder().addSubcommands(getSubcommandGroup()).toJSON()).toThrowError();
+			});
+		});
+
+		describe('Subcommand group builder', () => {
+			test('GIVEN no valid subcommand THEN throw error', () => {
+				expect(() => getSubcommandGroup().addSubcommands().toJSON()).toThrowError();
+
+				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
+				expect(() => getSubcommandGroup().addSubcommands(getSubcommandGroup()).toJSON()).toThrowError();
+			});
+
+			test('GIVEN a valid subcommand THEN does not throw an error', () => {
+				expect(() =>
+					getSubcommandGroup()
+						.addSubcommands((sub) => sub.setName('sub').setDescription('Testing 123'))
+						.toJSON(),
+				).not.toThrowError();
+			});
+		});
+
+		describe('Subcommand builder', () => {
+			test('GIVEN a valid subcommand with options THEN does not throw error', () => {
+				expect(() => getSubcommand().addBooleanOptions(getBooleanOption()).toJSON()).not.toThrowError();
+			});
+		});
+
+		describe('ChatInput command localizations', () => {
+			const expectedSingleLocale = { 'en-US': 'foobar' };
+			const expectedMultipleLocales = {
+				...expectedSingleLocale,
+				bg: 'test',
+			};
+
+			test('GIVEN valid name localizations THEN does not throw error', () => {
+				expect(() => getBuilder().setNameLocalization('en-US', 'foobar')).not.toThrowError();
+				expect(() => getBuilder().setNameLocalizations({ 'en-US': 'foobar' })).not.toThrowError();
+			});
+
+			test('GIVEN invalid name localizations THEN does throw error', () => {
+				// @ts-expect-error: Invalid localization
+				expect(() => getNamedBuilder().setNameLocalization('en-U', 'foobar').toJSON()).toThrowError();
+				// @ts-expect-error: Invalid localization
+				expect(() => getNamedBuilder().setNameLocalizations({ 'en-U': 'foobar' }).toJSON()).toThrowError();
+			});
+
+			test('GIVEN valid name localizations THEN valid data is stored', () => {
+				expect(getNamedBuilder().setNameLocalization('en-US', 'foobar').toJSON().name_localizations).toEqual(
+					expectedSingleLocale,
+				);
+				expect(
+					getNamedBuilder().setNameLocalizations({ 'en-US': 'foobar', bg: 'test' }).toJSON().name_localizations,
+				).toEqual(expectedMultipleLocales);
+				expect(getNamedBuilder().clearNameLocalizations().toJSON().name_localizations).toBeUndefined();
+				expect(getNamedBuilder().clearNameLocalization('en-US').toJSON().name_localizations).toEqual({
+					'en-US': undefined,
+				});
+			});
+
+			test('GIVEN valid description localizations THEN does not throw error', () => {
+				expect(() => getNamedBuilder().setDescriptionLocalization('en-US', 'foobar').toJSON()).not.toThrowError();
+				expect(() => getNamedBuilder().setDescriptionLocalizations({ 'en-US': 'foobar' }).toJSON()).not.toThrowError();
+			});
+
+			test('GIVEN invalid description localizations THEN does throw error', () => {
+				// @ts-expect-error: Invalid localization description
+				expect(() => getNamedBuilder().setDescriptionLocalization('en-U', 'foobar').toJSON()).toThrowError();
+				// @ts-expect-error: Invalid localization description
+				expect(() => getNamedBuilder().setDescriptionLocalizations({ 'en-U': 'foobar' }).toJSON()).toThrowError();
+			});
+
+			test('GIVEN valid description localizations THEN valid data is stored', () => {
+				expect(
+					getNamedBuilder().setDescriptionLocalization('en-US', 'foobar').toJSON(false).description_localizations,
+				).toEqual(expectedSingleLocale);
+				expect(
+					getNamedBuilder().setDescriptionLocalizations({ 'en-US': 'foobar', bg: 'test' }).toJSON(false)
+						.description_localizations,
+				).toEqual(expectedMultipleLocales);
+				expect(
+					getNamedBuilder().clearDescriptionLocalizations().toJSON(false).description_localizations,
+				).toBeUndefined();
+				expect(getNamedBuilder().clearDescriptionLocalization('en-US').toJSON(false).description_localizations).toEqual(
+					{
+						'en-US': undefined,
+					},
+				);
+			});
+		});
+
+		describe('permissions', () => {
+			test('GIVEN valid permission string THEN does not throw error', () => {
+				expect(() => getNamedBuilder().setDefaultMemberPermissions('1')).not.toThrowError();
+			});
+
+			test('GIVEN valid permission bitfield THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder().setDefaultMemberPermissions(
+						PermissionFlagsBits.AddReactions | PermissionFlagsBits.AttachFiles,
+					),
+				).not.toThrowError();
+			});
+
+			test('GIVEN null permissions THEN does not throw error', () => {
+				expect(() => getNamedBuilder().clearDefaultMemberPermissions()).not.toThrowError();
+			});
+
+			test('GIVEN invalid inputs THEN does throw error', () => {
+				expect(() => getNamedBuilder().setDefaultMemberPermissions('1.1').toJSON()).toThrowError();
+				expect(() => getNamedBuilder().setDefaultMemberPermissions(1.1).toJSON()).toThrowError();
+			});
+
+			test('GIVEN valid permission with options THEN does not throw error', () => {
+				expect(() =>
+					getNamedBuilder().addBooleanOptions(getBooleanOption()).setDefaultMemberPermissions('1').toJSON(),
+				).not.toThrowError();
+
+				expect(() => getNamedBuilder().addChannelOptions(getChannelOption())).not.toThrowError();
+			});
+		});
+
+		describe('contexts', () => {
+			test('GIVEN a builder with valid contexts THEN does not throw an error', () => {
+				expect(() =>
+					getNamedBuilder().setContexts([InteractionContextType.Guild, InteractionContextType.BotDM]).toJSON(),
+				).not.toThrowError();
+
+				expect(() =>
+					getNamedBuilder().setContexts(InteractionContextType.Guild, InteractionContextType.BotDM).toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid contexts THEN does throw an error', () => {
+				// @ts-expect-error: Invalid contexts
+				expect(() => getNamedBuilder().setContexts(999).toJSON()).toThrowError();
+
+				// @ts-expect-error: Invalid contexts
+				expect(() => getNamedBuilder().setContexts([999, 998]).toJSON()).toThrowError();
+			});
+		});
+
+		describe('integration types', () => {
+			test('GIVEN a builder with valid integraton types THEN does not throw an error', () => {
+				expect(() =>
+					getNamedBuilder()
+						.setIntegrationTypes([ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall])
+						.toJSON(),
+				).not.toThrowError();
+
+				expect(() =>
+					getNamedBuilder()
+						.setIntegrationTypes(ApplicationIntegrationType.GuildInstall, ApplicationIntegrationType.UserInstall)
+						.toJSON(),
+				).not.toThrowError();
+			});
+
+			test('GIVEN a builder with invalid integration types THEN does throw an error', () => {
+				// @ts-expect-error: Invalid integration types
+				expect(() => getNamedBuilder().setIntegrationTypes(999).toJSON()).toThrowError();
+
+				// @ts-expect-error: Invalid integration types
+				expect(() => getNamedBuilder().setIntegrationTypes([999, 998]).toJSON()).toThrowError();
+			});
+		});
+	});
+});

packages/builders/__tests__/interactions/ChatInputCommands/Options.test.ts

@@ -13,32 +13,32 @@ import {
 } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
 import {
-	SlashCommandAttachmentOption,
-	SlashCommandBooleanOption,
-	SlashCommandChannelOption,
-	SlashCommandIntegerOption,
-	SlashCommandMentionableOption,
-	SlashCommandNumberOption,
-	SlashCommandRoleOption,
-	SlashCommandStringOption,
-	SlashCommandUserOption,
+	ChatInputCommandAttachmentOption,
+	ChatInputCommandBooleanOption,
+	ChatInputCommandChannelOption,
+	ChatInputCommandIntegerOption,
+	ChatInputCommandMentionableOption,
+	ChatInputCommandNumberOption,
+	ChatInputCommandRoleOption,
+	ChatInputCommandStringOption,
+	ChatInputCommandUserOption,
 } from '../../../src/index.js';
 
 const getBooleanOption = () =>
-	new SlashCommandBooleanOption().setName('owo').setDescription('Testing 123').setRequired(true);
+	new ChatInputCommandBooleanOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
 const getChannelOption = () =>
-	new SlashCommandChannelOption()
+	new ChatInputCommandChannelOption()
 		.setName('owo')
 		.setDescription('Testing 123')
 		.setRequired(true)
 		.addChannelTypes(ChannelType.GuildText);
 
 const getStringOption = () =>
-	new SlashCommandStringOption().setName('owo').setDescription('Testing 123').setRequired(true);
+	new ChatInputCommandStringOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
 const getIntegerOption = () =>
-	new SlashCommandIntegerOption()
+	new ChatInputCommandIntegerOption()
 		.setName('owo')
 		.setDescription('Testing 123')
 		.setRequired(true)
@@ -46,22 +46,24 @@ const getIntegerOption = () =>
 		.setMaxValue(10);
 
 const getNumberOption = () =>
-	new SlashCommandNumberOption()
+	new ChatInputCommandNumberOption()
 		.setName('owo')
 		.setDescription('Testing 123')
 		.setRequired(true)
 		.setMinValue(-1.23)
 		.setMaxValue(10);
 
-const getUserOption = () => new SlashCommandUserOption().setName('owo').setDescription('Testing 123').setRequired(true);
+const getUserOption = () =>
+	new ChatInputCommandUserOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
-const getRoleOption = () => new SlashCommandRoleOption().setName('owo').setDescription('Testing 123').setRequired(true);
+const getRoleOption = () =>
+	new ChatInputCommandRoleOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
 const getMentionableOption = () =>
-	new SlashCommandMentionableOption().setName('owo').setDescription('Testing 123').setRequired(true);
+	new ChatInputCommandMentionableOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
 const getAttachmentOption = () =>
-	new SlashCommandAttachmentOption().setName('attachment').setDescription('attachment').setRequired(true);
+	new ChatInputCommandAttachmentOption().setName('attachment').setDescription('attachment').setRequired(true);
 
 describe('Application Command toJSON() results', () => {
 	test('GIVEN a boolean option THEN calling toJSON should return a valid JSON', () => {
@@ -101,7 +103,6 @@ describe('Application Command toJSON() results', () => {
 			max_value: 10,
 			min_value: -1,
 			autocomplete: true,
-			// TODO
 			choices: [],
 		});
 

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

@@ -1,74 +1,31 @@
-import { PermissionFlagsBits } from 'discord-api-types/v10';
+import {
+	ApplicationCommandType,
+	ApplicationIntegrationType,
+	InteractionContextType,
+	PermissionFlagsBits,
+} from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
-import { ContextMenuCommandAssertions, ContextMenuCommandBuilder } from '../../src/index.js';
+import { MessageContextCommandBuilder } from '../../src/index.js';
 
-const getBuilder = () => new ContextMenuCommandBuilder();
+const getBuilder = () => new MessageContextCommandBuilder();
 
 describe('Context Menu Commands', () => {
-	describe('Assertions tests', () => {
-		test('GIVEN valid name THEN does not throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateName('ping')).not.toThrowError();
-		});
-
-		test('GIVEN invalid name THEN throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateName(null)).toThrowError();
-
-			// Too short of a name
-			expect(() => ContextMenuCommandAssertions.validateName('')).toThrowError();
-
-			// Invalid characters used
-			expect(() => ContextMenuCommandAssertions.validateName('ABC123$%^&')).toThrowError();
-
-			// Too long of a name
-			expect(() =>
-				ContextMenuCommandAssertions.validateName('qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnm'),
-			).toThrowError();
-		});
-
-		test('GIVEN valid type THEN does not throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateType(3)).not.toThrowError();
-		});
-
-		test('GIVEN invalid type THEN throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateType(null)).toThrowError();
-
-			// Out of range
-			expect(() => ContextMenuCommandAssertions.validateType(1)).toThrowError();
-		});
-
-		test('GIVEN valid required parameters THEN does not throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateRequiredParameters('owo', 2)).not.toThrowError();
-		});
-
-		test('GIVEN valid default_permission THEN does not throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateDefaultPermission(true)).not.toThrowError();
-		});
-
-		test('GIVEN invalid default_permission THEN throw error', () => {
-			expect(() => ContextMenuCommandAssertions.validateDefaultPermission(null)).toThrowError();
-		});
-	});
-
 	describe('ContextMenuCommandBuilder', () => {
 		describe('Builder tests', () => {
 			test('GIVEN empty builder THEN throw error when calling toJSON', () => {
 				expect(() => getBuilder().toJSON()).toThrowError();
 			});
 
-			test('GIVEN valid builder THEN does not throw error', () => {
-				expect(() => getBuilder().setName('example').setType(3).toJSON()).not.toThrowError();
-			});
-
 			test('GIVEN invalid name THEN throw error', () => {
-				expect(() => getBuilder().setName('$$$')).toThrowError();
+				expect(() => getBuilder().setName('$$$').toJSON()).toThrowError();
 
-				expect(() => getBuilder().setName(' ')).toThrowError();
+				expect(() => getBuilder().setName(' ').toJSON()).toThrowError();
 			});
 
 			test('GIVEN valid names THEN does not throw error', () => {
-				expect(() => getBuilder().setName('hi_there')).not.toThrowError();
+				expect(() => getBuilder().setName('hi_there').toJSON()).not.toThrowError();
 
-				expect(() => getBuilder().setName('A COMMAND')).not.toThrowError();
+				expect(() => getBuilder().setName('A COMMAND').toJSON()).not.toThrowError();
 
 				// Translation: a_command
 				expect(() => getBuilder().setName('o_comandă')).not.toThrowError();
@@ -76,20 +33,6 @@ describe('Context Menu Commands', () => {
 				// Translation: thx (according to GTranslate)
 				expect(() => getBuilder().setName('どうも')).not.toThrowError();
 			});
-
-			test('GIVEN valid types THEN does not throw error', () => {
-				expect(() => getBuilder().setType(2)).not.toThrowError();
-
-				expect(() => getBuilder().setType(3)).not.toThrowError();
-			});
-
-			test('GIVEN valid builder with defaultPermission false THEN does not throw error', () => {
-				expect(() => getBuilder().setName('foo').setDefaultPermission(false)).not.toThrowError();
-			});
-
-			test('GIVEN valid builder with dmPermission false THEN does not throw error', () => {
-				expect(() => getBuilder().setName('foo').setDMPermission(false)).not.toThrowError();
-			});
 		});
 
 		describe('Context menu command localizations', () => {
@@ -106,19 +49,22 @@ describe('Context Menu Commands', () => {
 
 			test('GIVEN invalid name localizations THEN does throw error', () => {
 				// @ts-expect-error: Invalid localization
-				expect(() => getBuilder().setNameLocalization('en-U', 'foobar')).toThrowError();
+				expect(() => getBuilder().setNameLocalization('en-U', 'foobar').toJSON()).toThrowError();
 				// @ts-expect-error: Invalid localization
-				expect(() => getBuilder().setNameLocalizations({ 'en-U': 'foobar' })).toThrowError();
+				expect(() => getBuilder().setNameLocalizations({ 'en-U': 'foobar' }).toJSON()).toThrowError();
 			});
 
 			test('GIVEN valid name localizations THEN valid data is stored', () => {
-				expect(getBuilder().setNameLocalization('en-US', 'foobar').name_localizations).toEqual(expectedSingleLocale);
-				expect(getBuilder().setNameLocalizations({ 'en-US': 'foobar', bg: 'test' }).name_localizations).toEqual(
-					expectedMultipleLocales,
+				expect(getBuilder().setName('hi').setNameLocalization('en-US', 'foobar').toJSON().name_localizations).toEqual(
+					expectedSingleLocale,
 				);
-				expect(getBuilder().setNameLocalizations(null).name_localizations).toBeNull();
-				expect(getBuilder().setNameLocalization('en-US', null).name_localizations).toEqual({
-					'en-US': null,
+				expect(
+					getBuilder().setName('hi').setNameLocalizations({ 'en-US': 'foobar', bg: 'test' }).toJSON()
+						.name_localizations,
+				).toEqual(expectedMultipleLocales);
+				expect(getBuilder().setName('hi').clearNameLocalizations().toJSON().name_localizations).toBeUndefined();
+				expect(getBuilder().setName('hi').clearNameLocalization('en-US').toJSON().name_localizations).toEqual({
+					'en-US': undefined,
 				});
 			});
 		});
@@ -134,14 +80,56 @@ describe('Context Menu Commands', () => {
 				).not.toThrowError();
 			});
 
-			test('GIVEN null permissions THEN does not throw error', () => {
-				expect(() => getBuilder().setDefaultMemberPermissions(null)).not.toThrowError();
+			test('GIVEN invalid inputs THEN does throw error', () => {
+				expect(() => getBuilder().setName('hi').setDefaultMemberPermissions('1.1').toJSON()).toThrowError();
+
+				expect(() => getBuilder().setName('hi').setDefaultMemberPermissions(1.1).toJSON()).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 invalid inputs THEN does throw error', () => {
-				expect(() => getBuilder().setDefaultMemberPermissions('1.1')).toThrowError();
+			test('GIVEN a builder with invalid contexts THEN does throw an error', () => {
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setName('hi').setContexts(999).toJSON()).toThrowError();
 
-				expect(() => getBuilder().setDefaultMemberPermissions(1.1)).toThrowError();
+				// @ts-expect-error: Invalid contexts
+				expect(() => getBuilder().setName('hi').setContexts([999, 998]).toJSON()).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().setName('hi').setIntegrationTypes(999).toJSON()).toThrowError();
+
+				// @ts-expect-error: Invalid integration types
+				expect(() => getBuilder().setName('hi').setIntegrationTypes([999, 998]).toJSON()).toThrowError();
 			});
 		});
 	});

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

@@ -1,524 +0,0 @@
-import { ChannelType, PermissionFlagsBits, type APIApplicationCommandOptionChoice } from 'discord-api-types/v10';
-import { describe, test, expect } from 'vitest';
-import {
-	SlashCommandAssertions,
-	SlashCommandBooleanOption,
-	SlashCommandBuilder,
-	SlashCommandChannelOption,
-	SlashCommandIntegerOption,
-	SlashCommandMentionableOption,
-	SlashCommandNumberOption,
-	SlashCommandRoleOption,
-	SlashCommandAttachmentOption,
-	SlashCommandStringOption,
-	SlashCommandSubcommandBuilder,
-	SlashCommandSubcommandGroupBuilder,
-	SlashCommandUserOption,
-} from '../../../src/index.js';
-
-const largeArray = Array.from({ length: 26 }, () => 1 as unknown as APIApplicationCommandOptionChoice);
-
-const getBuilder = () => new SlashCommandBuilder();
-const getNamedBuilder = () => getBuilder().setName('example').setDescription('Example command');
-const getStringOption = () => new SlashCommandStringOption().setName('owo').setDescription('Testing 123');
-const getIntegerOption = () => new SlashCommandIntegerOption().setName('owo').setDescription('Testing 123');
-const getNumberOption = () => new SlashCommandNumberOption().setName('owo').setDescription('Testing 123');
-const getBooleanOption = () => new SlashCommandBooleanOption().setName('owo').setDescription('Testing 123');
-const getUserOption = () => new SlashCommandUserOption().setName('owo').setDescription('Testing 123');
-const getChannelOption = () => new SlashCommandChannelOption().setName('owo').setDescription('Testing 123');
-const getRoleOption = () => new SlashCommandRoleOption().setName('owo').setDescription('Testing 123');
-const getAttachmentOption = () => new SlashCommandAttachmentOption().setName('owo').setDescription('Testing 123');
-const getMentionableOption = () => new SlashCommandMentionableOption().setName('owo').setDescription('Testing 123');
-const getSubcommandGroup = () => new SlashCommandSubcommandGroupBuilder().setName('owo').setDescription('Testing 123');
-const getSubcommand = () => new SlashCommandSubcommandBuilder().setName('owo').setDescription('Testing 123');
-
-class Collection {
-	public readonly [Symbol.toStringTag] = 'Map';
-}
-
-describe('Slash Commands', () => {
-	describe('Assertions tests', () => {
-		test('GIVEN valid name THEN does not throw error', () => {
-			expect(() => SlashCommandAssertions.validateName('ping')).not.toThrowError();
-			expect(() => SlashCommandAssertions.validateName('hello-world_command')).not.toThrowError();
-			expect(() => SlashCommandAssertions.validateName('aˇ㐆1٢〣²अก')).not.toThrowError();
-		});
-
-		test('GIVEN invalid name THEN throw error', () => {
-			expect(() => SlashCommandAssertions.validateName(null)).toThrowError();
-
-			// Too short of a name
-			expect(() => SlashCommandAssertions.validateName('')).toThrowError();
-
-			// Invalid characters used
-			expect(() => SlashCommandAssertions.validateName('ABC')).toThrowError();
-			expect(() => SlashCommandAssertions.validateName('ABC123$%^&')).toThrowError();
-			expect(() => SlashCommandAssertions.validateName('help ping')).toThrowError();
-			expect(() => SlashCommandAssertions.validateName('🦦')).toThrowError();
-
-			// Too long of a name
-			expect(() =>
-				SlashCommandAssertions.validateName('qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnm'),
-			).toThrowError();
-		});
-
-		test('GIVEN valid description THEN does not throw error', () => {
-			expect(() => SlashCommandAssertions.validateDescription('This is an OwO moment fur sure!~')).not.toThrowError();
-		});
-
-		test('GIVEN invalid description THEN throw error', () => {
-			expect(() => SlashCommandAssertions.validateDescription(null)).toThrowError();
-
-			// Too short of a description
-			expect(() => SlashCommandAssertions.validateDescription('')).toThrowError();
-
-			// Too long of a description
-			expect(() =>
-				SlashCommandAssertions.validateDescription(
-					'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magnam autem libero expedita vitae accusamus nostrum ipsam tempore repudiandae deserunt ipsum facilis, velit fugiat facere accusantium, explicabo corporis aliquam non quos.',
-				),
-			).toThrowError();
-		});
-
-		test('GIVEN valid default_permission THEN does not throw error', () => {
-			expect(() => SlashCommandAssertions.validateDefaultPermission(true)).not.toThrowError();
-		});
-
-		test('GIVEN invalid default_permission THEN throw error', () => {
-			expect(() => SlashCommandAssertions.validateDefaultPermission(null)).toThrowError();
-		});
-
-		test('GIVEN valid array of options or choices THEN does not throw error', () => {
-			expect(() => SlashCommandAssertions.validateMaxOptionsLength([])).not.toThrowError();
-
-			expect(() => SlashCommandAssertions.validateChoicesLength(25)).not.toThrowError();
-			expect(() => SlashCommandAssertions.validateChoicesLength(25, [])).not.toThrowError();
-		});
-
-		test('GIVEN invalid options or choices THEN throw error', () => {
-			expect(() => SlashCommandAssertions.validateMaxOptionsLength(null)).toThrowError();
-
-			// Given an array that's too big
-			expect(() => SlashCommandAssertions.validateMaxOptionsLength(largeArray)).toThrowError();
-
-			expect(() => SlashCommandAssertions.validateChoicesLength(1, largeArray)).toThrowError();
-		});
-
-		test('GIVEN valid required parameters THEN does not throw error', () => {
-			expect(() =>
-				SlashCommandAssertions.validateRequiredParameters(
-					'owo',
-					'My fancy command that totally exists, to test assertions',
-					[],
-				),
-			).not.toThrowError();
-		});
-	});
-
-	describe('SlashCommandBuilder', () => {
-		describe('Builder with no options', () => {
-			test('GIVEN empty builder THEN throw error when calling toJSON', () => {
-				expect(() => getBuilder().toJSON()).toThrowError();
-			});
-
-			test('GIVEN valid builder THEN does not throw error', () => {
-				expect(() => getBuilder().setName('example').setDescription('Example command').toJSON()).not.toThrowError();
-			});
-		});
-
-		describe('Builder with simple options', () => {
-			test('GIVEN valid builder with options THEN does not throw error', () => {
-				expect(() =>
-					getBuilder()
-						.setName('example')
-						.setDescription('Example command')
-						.setDMPermission(false)
-						.addBooleanOption((boolean) =>
-							boolean.setName('iscool').setDescription('Are we cool or what?').setRequired(true),
-						)
-						.addChannelOption((channel) => channel.setName('iscool').setDescription('Are we cool or what?'))
-						.addMentionableOption((mentionable) => mentionable.setName('iscool').setDescription('Are we cool or what?'))
-						.addRoleOption((role) => role.setName('iscool').setDescription('Are we cool or what?'))
-						.addUserOption((user) => user.setName('iscool').setDescription('Are we cool or what?'))
-						.addIntegerOption((integer) =>
-							integer
-								.setName('iscool')
-								.setDescription('Are we cool or what?')
-								.addChoices({ name: 'Very cool', value: 1_000 })
-								.addChoices([{ name: 'Even cooler', value: 2_000 }]),
-						)
-						.addNumberOption((number) =>
-							number
-								.setName('iscool')
-								.setDescription('Are we cool or what?')
-								.addChoices({ name: 'Very cool', value: 1.5 })
-								.addChoices([{ name: 'Even cooler', value: 2.5 }]),
-						)
-						.addStringOption((string) =>
-							string
-								.setName('iscool')
-								.setDescription('Are we cool or what?')
-								.addChoices({ name: 'Fancy Pants', value: 'fp_1' }, { name: 'Fancy Shoes', value: 'fs_1' })
-								.addChoices([{ name: 'The Whole shebang', value: 'all' }]),
-						)
-						.addIntegerOption((integer) =>
-							integer.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
-						)
-						.addNumberOption((number) =>
-							number.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
-						)
-						.addStringOption((string) =>
-							string.setName('iscool').setDescription('Are we cool or what?').setAutocomplete(true),
-						)
-						.toJSON(),
-				).not.toThrowError();
-			});
-
-			test('GIVEN a builder with invalid autocomplete THEN does throw an error', () => {
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addStringOption(getStringOption().setAutocomplete('not a boolean'))).toThrowError();
-			});
-
-			test('GIVEN a builder with both choices and autocomplete THEN does throw an error', () => {
-				expect(() =>
-					getBuilder().addStringOption(
-						getStringOption().setAutocomplete(true).addChoices({ name: 'Fancy Pants', value: 'fp_1' }),
-					),
-				).toThrowError();
-
-				expect(() =>
-					getBuilder().addStringOption(
-						getStringOption()
-							.setAutocomplete(true)
-							.addChoices(
-								{ name: 'Fancy Pants', value: 'fp_1' },
-								{ name: 'Fancy Shoes', value: 'fs_1' },
-								{ name: 'The Whole shebang', value: 'all' },
-							),
-					),
-				).toThrowError();
-
-				expect(() =>
-					getBuilder().addStringOption(
-						getStringOption().addChoices({ name: 'Fancy Pants', value: 'fp_1' }).setAutocomplete(true),
-					),
-				).toThrowError();
-
-				expect(() => {
-					const option = getStringOption();
-					Reflect.set(option, 'autocomplete', true);
-					Reflect.set(option, 'choices', [{ name: 'Fancy Pants', value: 'fp_1' }]);
-					return option.toJSON();
-				}).toThrowError();
-
-				expect(() => {
-					const option = getNumberOption();
-					Reflect.set(option, 'autocomplete', true);
-					Reflect.set(option, 'choices', [{ name: 'Fancy Pants', value: 'fp_1' }]);
-					return option.toJSON();
-				}).toThrowError();
-
-				expect(() => {
-					const option = getIntegerOption();
-					Reflect.set(option, 'autocomplete', true);
-					Reflect.set(option, 'choices', [{ name: 'Fancy Pants', value: 'fp_1' }]);
-					return option.toJSON();
-				}).toThrowError();
-			});
-
-			test('GIVEN a builder with valid channel options and channel_types THEN does not throw an error', () => {
-				expect(() =>
-					getBuilder().addChannelOption(
-						getChannelOption().addChannelTypes(ChannelType.GuildText).addChannelTypes([ChannelType.GuildVoice]),
-					),
-				).not.toThrowError();
-
-				expect(() => {
-					getBuilder().addChannelOption(
-						getChannelOption().addChannelTypes(ChannelType.GuildAnnouncement, ChannelType.GuildText),
-					);
-				}).not.toThrowError();
-			});
-
-			test('GIVEN a builder with valid channel options and channel_types THEN does throw an error', () => {
-				// @ts-expect-error: Invalid channel type
-				expect(() => getBuilder().addChannelOption(getChannelOption().addChannelTypes(100))).toThrowError();
-
-				// @ts-expect-error: Invalid channel types
-				expect(() => getBuilder().addChannelOption(getChannelOption().addChannelTypes(100, 200))).toThrowError();
-			});
-
-			test('GIVEN a builder with invalid number min/max options THEN does throw an error', () => {
-				// @ts-expect-error: Invalid max value
-				expect(() => getBuilder().addNumberOption(getNumberOption().setMaxValue('test'))).toThrowError();
-
-				// @ts-expect-error: Invalid max value
-				expect(() => getBuilder().addIntegerOption(getIntegerOption().setMaxValue('test'))).toThrowError();
-
-				// @ts-expect-error: Invalid min value
-				expect(() => getBuilder().addNumberOption(getNumberOption().setMinValue('test'))).toThrowError();
-
-				// @ts-expect-error: Invalid min value
-				expect(() => getBuilder().addIntegerOption(getIntegerOption().setMinValue('test'))).toThrowError();
-
-				expect(() => getBuilder().addIntegerOption(getIntegerOption().setMinValue(1.5))).toThrowError();
-			});
-
-			test('GIVEN a builder with valid number min/max options THEN does not throw an error', () => {
-				expect(() => getBuilder().addIntegerOption(getIntegerOption().setMinValue(1))).not.toThrowError();
-
-				expect(() => getBuilder().addNumberOption(getNumberOption().setMinValue(1.5))).not.toThrowError();
-
-				expect(() => getBuilder().addIntegerOption(getIntegerOption().setMaxValue(1))).not.toThrowError();
-
-				expect(() => getBuilder().addNumberOption(getNumberOption().setMaxValue(1.5))).not.toThrowError();
-			});
-
-			test('GIVEN an already built builder THEN does not throw an error', () => {
-				expect(() => getBuilder().addStringOption(getStringOption())).not.toThrowError();
-
-				expect(() => getBuilder().addIntegerOption(getIntegerOption())).not.toThrowError();
-
-				expect(() => getBuilder().addNumberOption(getNumberOption())).not.toThrowError();
-
-				expect(() => getBuilder().addBooleanOption(getBooleanOption())).not.toThrowError();
-
-				expect(() => getBuilder().addUserOption(getUserOption())).not.toThrowError();
-
-				expect(() => getBuilder().addChannelOption(getChannelOption())).not.toThrowError();
-
-				expect(() => getBuilder().addRoleOption(getRoleOption())).not.toThrowError();
-
-				expect(() => getBuilder().addAttachmentOption(getAttachmentOption())).not.toThrowError();
-
-				expect(() => getBuilder().addMentionableOption(getMentionableOption())).not.toThrowError();
-			});
-
-			test('GIVEN no valid return for an addOption method THEN throw error', () => {
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption()).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(getRoleOption())).toThrowError();
-			});
-
-			test('GIVEN invalid name THEN throw error', () => {
-				expect(() => getBuilder().setName('TEST_COMMAND')).toThrowError();
-
-				expect(() => getBuilder().setName('ĂĂĂĂĂĂ')).toThrowError();
-			});
-
-			test('GIVEN valid names THEN does not throw error', () => {
-				expect(() => getBuilder().setName('hi_there')).not.toThrowError();
-
-				// Translation: a_command
-				expect(() => getBuilder().setName('o_comandă')).not.toThrowError();
-
-				// Translation: thx (according to GTranslate)
-				expect(() => getBuilder().setName('どうも')).not.toThrowError();
-			});
-
-			test('GIVEN invalid returns for builder THEN throw error', () => {
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(true)).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(null)).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(undefined)).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(() => SlashCommandStringOption)).toThrowError();
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addBooleanOption(() => new Collection())).toThrowError();
-			});
-
-			test('GIVEN valid builder with defaultPermission false THEN does not throw error', () => {
-				expect(() => getBuilder().setName('foo').setDescription('foo').setDefaultPermission(false)).not.toThrowError();
-			});
-
-			test('GIVEN an option that is autocompletable and has choices, THEN passing nothing to setChoices should not throw an error', () => {
-				expect(() =>
-					getBuilder().addStringOption(getStringOption().setAutocomplete(true).setChoices()),
-				).not.toThrowError();
-			});
-
-			test('GIVEN an option that is autocompletable, THEN setting choices should throw an error', () => {
-				expect(() =>
-					getBuilder().addStringOption(
-						getStringOption().setAutocomplete(true).setChoices({ name: 'owo', value: 'uwu' }),
-					),
-				).toThrowError();
-			});
-
-			test('GIVEN an option, THEN setting choices should not throw an error', () => {
-				expect(() =>
-					getBuilder().addStringOption(getStringOption().setChoices({ name: 'owo', value: 'uwu' })),
-				).not.toThrowError();
-			});
-		});
-
-		describe('Builder with subcommand (group) options', () => {
-			test('GIVEN builder with subcommand group THEN does not throw error', () => {
-				expect(() =>
-					getNamedBuilder().addSubcommandGroup((group) => group.setName('group').setDescription('Group us together!')),
-				).not.toThrowError();
-			});
-
-			test('GIVEN builder with subcommand THEN does not throw error', () => {
-				expect(() =>
-					getNamedBuilder().addSubcommand((subcommand) =>
-						subcommand.setName('boop').setDescription('Boops a fellow nerd (you)'),
-					),
-				).not.toThrowError();
-			});
-
-			test('GIVEN builder with subcommand THEN has regular slash command fields', () => {
-				expect(() =>
-					getBuilder()
-						.setName('name')
-						.setDescription('description')
-						.addSubcommand((option) => option.setName('ye').setDescription('ye'))
-						.addSubcommand((option) => option.setName('no').setDescription('no'))
-						.setDMPermission(false)
-						.setDefaultMemberPermissions(1n),
-				).not.toThrowError();
-			});
-
-			test('GIVEN builder with already built subcommand group THEN does not throw error', () => {
-				expect(() => getNamedBuilder().addSubcommandGroup(getSubcommandGroup())).not.toThrowError();
-			});
-
-			test('GIVEN builder with already built subcommand THEN does not throw error', () => {
-				expect(() => getNamedBuilder().addSubcommand(getSubcommand())).not.toThrowError();
-			});
-
-			test('GIVEN builder with already built subcommand with options THEN does not throw error', () => {
-				expect(() =>
-					getNamedBuilder().addSubcommand(getSubcommand().addBooleanOption(getBooleanOption())),
-				).not.toThrowError();
-			});
-
-			test('GIVEN builder with a subcommand that tries to add an invalid result THEN throw error', () => {
-				expect(() =>
-					// @ts-expect-error: Checking if check works JS-side too
-					getNamedBuilder().addSubcommand(getSubcommand()).addInteger(getInteger()),
-				).toThrowError();
-			});
-
-			test('GIVEN no valid return for an addSubcommand(Group) method THEN throw error', () => {
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addSubcommandGroup()).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addSubcommand()).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getBuilder().addSubcommand(getSubcommandGroup())).toThrowError();
-			});
-		});
-
-		describe('Subcommand group builder', () => {
-			test('GIVEN no valid subcommand THEN throw error', () => {
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getSubcommandGroup().addSubcommand()).toThrowError();
-
-				// @ts-expect-error: Checking if not providing anything, or an invalid return type causes an error
-				expect(() => getSubcommandGroup().addSubcommand(getSubcommandGroup())).toThrowError();
-			});
-
-			test('GIVEN a valid subcommand THEN does not throw an error', () => {
-				expect(() =>
-					getSubcommandGroup()
-						.addSubcommand((sub) => sub.setName('sub').setDescription('Testing 123'))
-						.toJSON(),
-				).not.toThrowError();
-			});
-		});
-
-		describe('Subcommand builder', () => {
-			test('GIVEN a valid subcommand with options THEN does not throw error', () => {
-				expect(() => getSubcommand().addBooleanOption(getBooleanOption()).toJSON()).not.toThrowError();
-			});
-		});
-
-		describe('Slash command localizations', () => {
-			const expectedSingleLocale = { 'en-US': 'foobar' };
-			const expectedMultipleLocales = {
-				...expectedSingleLocale,
-				bg: 'test',
-			};
-
-			test('GIVEN valid name localizations THEN does not throw error', () => {
-				expect(() => getBuilder().setNameLocalization('en-US', 'foobar')).not.toThrowError();
-				expect(() => getBuilder().setNameLocalizations({ 'en-US': 'foobar' })).not.toThrowError();
-			});
-
-			test('GIVEN invalid name localizations THEN does throw error', () => {
-				// @ts-expect-error: Invalid localization
-				expect(() => getBuilder().setNameLocalization('en-U', 'foobar')).toThrowError();
-				// @ts-expect-error: Invalid localization
-				expect(() => getBuilder().setNameLocalizations({ 'en-U': 'foobar' })).toThrowError();
-			});
-
-			test('GIVEN valid name localizations THEN valid data is stored', () => {
-				expect(getBuilder().setNameLocalization('en-US', 'foobar').name_localizations).toEqual(expectedSingleLocale);
-				expect(getBuilder().setNameLocalizations({ 'en-US': 'foobar', bg: 'test' }).name_localizations).toEqual(
-					expectedMultipleLocales,
-				);
-				expect(getBuilder().setNameLocalizations(null).name_localizations).toBeNull();
-				expect(getBuilder().setNameLocalization('en-US', null).name_localizations).toEqual({
-					'en-US': null,
-				});
-			});
-
-			test('GIVEN valid description localizations THEN does not throw error', () => {
-				expect(() => getBuilder().setDescriptionLocalization('en-US', 'foobar')).not.toThrowError();
-				expect(() => getBuilder().setDescriptionLocalizations({ 'en-US': 'foobar' })).not.toThrowError();
-			});
-
-			test('GIVEN invalid description localizations THEN does throw error', () => {
-				// @ts-expect-error: Invalid localization description
-				expect(() => getBuilder().setDescriptionLocalization('en-U', 'foobar')).toThrowError();
-				// @ts-expect-error: Invalid localization description
-				expect(() => getBuilder().setDescriptionLocalizations({ 'en-U': 'foobar' })).toThrowError();
-			});
-
-			test('GIVEN valid description localizations THEN valid data is stored', () => {
-				expect(getBuilder().setDescriptionLocalization('en-US', 'foobar').description_localizations).toEqual(
-					expectedSingleLocale,
-				);
-				expect(
-					getBuilder().setDescriptionLocalizations({ 'en-US': 'foobar', bg: 'test' }).description_localizations,
-				).toEqual(expectedMultipleLocales);
-				expect(getBuilder().setDescriptionLocalizations(null).description_localizations).toBeNull();
-				expect(getBuilder().setDescriptionLocalization('en-US', null).description_localizations).toEqual({
-					'en-US': null,
-				});
-			});
-		});
-
-		describe('permissions', () => {
-			test('GIVEN valid permission string THEN does not throw error', () => {
-				expect(() => getBuilder().setDefaultMemberPermissions('1')).not.toThrowError();
-			});
-
-			test('GIVEN valid permission bitfield THEN does not throw error', () => {
-				expect(() =>
-					getBuilder().setDefaultMemberPermissions(PermissionFlagsBits.AddReactions | PermissionFlagsBits.AttachFiles),
-				).not.toThrowError();
-			});
-
-			test('GIVEN null permissions THEN does not throw error', () => {
-				expect(() => getBuilder().setDefaultMemberPermissions(null)).not.toThrowError();
-			});
-
-			test('GIVEN invalid inputs THEN does throw error', () => {
-				expect(() => getBuilder().setDefaultMemberPermissions('1.1')).toThrowError();
-
-				expect(() => getBuilder().setDefaultMemberPermissions(1.1)).toThrowError();
-			});
-		});
-	});
-});

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

@@ -1,71 +1,21 @@
-import {
-	ComponentType,
-	TextInputStyle,
-	type APIModalInteractionResponseCallbackData,
-	type APITextInputComponent,
-} from 'discord-api-types/v10';
+import { ComponentType, TextInputStyle, type APIModalInteractionResponseCallbackData } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
-import {
-	ActionRowBuilder,
-	ButtonBuilder,
-	ModalBuilder,
-	TextInputBuilder,
-	type ModalActionRowComponentBuilder,
-} from '../../src/index.js';
-import {
-	componentsValidator,
-	titleValidator,
-	validateRequiredParameters,
-} from '../../src/interactions/modals/Assertions.js';
+import { ActionRowBuilder, ModalBuilder, TextInputBuilder } from '../../src/index.js';
 
 const modal = () => new ModalBuilder();
+const textInput = () =>
+	new ActionRowBuilder().addTextInputComponent(
+		new TextInputBuilder().setCustomId('text').setLabel(':3').setStyle(TextInputStyle.Short),
+	);
 
 describe('Modals', () => {
-	describe('Assertion Tests', () => {
-		test('GIVEN valid title THEN validator does not throw', () => {
-			expect(() => titleValidator.parse('foobar')).not.toThrowError();
-		});
-
-		test('GIVEN invalid title THEN validator does throw', () => {
-			expect(() => titleValidator.parse(42)).toThrowError();
-		});
-
-		test('GIVEN valid components THEN validator does not throw', () => {
-			expect(() => componentsValidator.parse([new ActionRowBuilder(), new ActionRowBuilder()])).not.toThrowError();
-		});
-
-		test('GIVEN invalid components THEN validator does throw', () => {
-			expect(() => componentsValidator.parse([new ButtonBuilder(), new TextInputBuilder()])).toThrowError();
-		});
-
-		test('GIVEN valid required parameters THEN validator does not throw', () => {
-			expect(() =>
-				validateRequiredParameters('123', 'title', [new ActionRowBuilder(), new ActionRowBuilder()]),
-			).not.toThrowError();
-		});
-
-		test('GIVEN invalid required parameters THEN validator does throw', () => {
-			expect(() =>
-				// @ts-expect-error: Missing required parameter
-				validateRequiredParameters('123', undefined, [new ActionRowBuilder(), new ButtonBuilder()]),
-			).toThrowError();
-		});
-	});
-
 	test('GIVEN valid fields THEN builder does not throw', () => {
-		expect(() =>
-			modal().setTitle('test').setCustomId('foobar').setComponents(new ActionRowBuilder()),
-		).not.toThrowError();
-
-		expect(() =>
-			// @ts-expect-error: You can pass a TextInputBuilder and it will add it to an action row
-			modal().setTitle('test').setCustomId('foobar').addComponents(new TextInputBuilder()),
-		).not.toThrowError();
+		expect(() => modal().setTitle('test').setCustomId('foobar').setActionRows(textInput()).toJSON()).not.toThrowError();
+		expect(() => modal().setTitle('test').setCustomId('foobar').addActionRows(textInput()).toJSON()).not.toThrowError();
 	});
 
 	test('GIVEN invalid fields THEN builder does throw', () => {
 		expect(() => modal().setTitle('test').setCustomId('foobar').toJSON()).toThrowError();
-
 		// @ts-expect-error: CustomId is invalid
 		expect(() => modal().setTitle('test').setCustomId(42).toJSON()).toThrowError();
 	});
@@ -106,68 +56,17 @@ describe('Modals', () => {
 			modal()
 				.setTitle(modalData.title)
 				.setCustomId('custom id')
-				.setComponents(
-					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
+				.setActionRows(
+					new ActionRowBuilder().addTextInputComponent(
 						new TextInputBuilder().setCustomId('custom id').setLabel('label').setStyle(TextInputStyle.Paragraph),
 					),
 				)
-				.addComponents([
-					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
+				.addActionRows([
+					new ActionRowBuilder().addTextInputComponent(
 						new TextInputBuilder().setCustomId('custom id').setLabel('label').setStyle(TextInputStyle.Paragraph),
 					),
 				])
 				.toJSON(),
 		).toEqual(modalData);
 	});
-
-	describe('equals()', () => {
-		const textInput1 = new TextInputBuilder()
-			.setCustomId('custom id')
-			.setLabel('label')
-			.setStyle(TextInputStyle.Paragraph);
-
-		const textInput2: APITextInputComponent = {
-			type: ComponentType.TextInput,
-			custom_id: 'custom id',
-			label: 'label',
-			style: TextInputStyle.Paragraph,
-		};
-
-		test('GIVEN equal builders THEN returns true', () => {
-			const equalTextInput = new TextInputBuilder()
-				.setCustomId('custom id')
-				.setLabel('label')
-				.setStyle(TextInputStyle.Paragraph);
-
-			expect(textInput1.equals(equalTextInput)).toBeTruthy();
-		});
-
-		test('GIVEN the same builder THEN returns true', () => {
-			expect(textInput1.equals(textInput1)).toBeTruthy();
-		});
-
-		test('GIVEN equal builder and data THEN returns true', () => {
-			expect(textInput1.equals(textInput2)).toBeTruthy();
-		});
-
-		test('GIVEN different builders THEN returns false', () => {
-			const diffTextInput = new TextInputBuilder()
-				.setCustomId('custom id')
-				.setLabel('label 2')
-				.setStyle(TextInputStyle.Paragraph);
-
-			expect(textInput1.equals(diffTextInput)).toBeFalsy();
-		});
-
-		test('GIVEN different text input builder and data THEN returns false', () => {
-			const diffTextInputData: APITextInputComponent = {
-				type: ComponentType.TextInput,
-				custom_id: 'custom id',
-				label: 'label 2',
-				style: TextInputStyle.Short,
-			};
-
-			expect(textInput1.equals(diffTextInputData)).toBeFalsy();
-		});
-	});
 });

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

@@ -3,6 +3,16 @@ import { EmbedBuilder, embedLength } from '../../src/index.js';
 
 const alpha = 'abcdefghijklmnopqrstuvwxyz';
 
+const dummy = {
+	title: 'ooooo aaaaa uuuuuu aaaa',
+};
+
+const base = {
+	author: undefined,
+	fields: [],
+	footer: undefined,
+};
+
 describe('Embed', () => {
 	describe('Embed getters', () => {
 		test('GIVEN an embed with specific amount of characters THEN returns amount of characters', () => {
@@ -14,127 +24,136 @@ describe('Embed', () => {
 				footer: { text: alpha },
 			});
 
-			expect(embedLength(embed.data)).toEqual(alpha.length * 6);
+			expect(embedLength(embed.toJSON())).toEqual(alpha.length * 6);
 		});
 
 		test('GIVEN an embed with zero characters THEN returns amount of characters', () => {
 			const embed = new EmbedBuilder();
 
-			expect(embedLength(embed.data)).toEqual(0);
+			expect(embedLength(embed.toJSON(false))).toEqual(0);
 		});
 	});
 
 	describe('Embed title', () => {
 		test('GIVEN an embed with a pre-defined title THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder({ title: 'foo' });
-			expect(embed.toJSON()).toStrictEqual({ title: 'foo' });
+			expect(embed.toJSON()).toStrictEqual({ ...base, title: 'foo' });
 		});
 
 		test('GIVEN an embed using Embed#setTitle THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.setTitle('foo');
 
-			expect(embed.toJSON()).toStrictEqual({ title: 'foo' });
+			expect(embed.toJSON()).toStrictEqual({ ...base, title: 'foo' });
 		});
 
 		test('GIVEN an embed with a pre-defined title THEN unset title THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ title: 'foo' });
-			embed.setTitle(null);
+			const embed = new EmbedBuilder({ title: 'foo', description: ':3' });
+			embed.clearTitle();
 
-			expect(embed.toJSON()).toStrictEqual({ title: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, description: ':3', title: undefined });
 		});
 
 		test('GIVEN an embed with an invalid title THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setTitle('a'.repeat(257))).toThrowError();
+			embed.setTitle('a'.repeat(257));
+
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
 	describe('Embed description', () => {
 		test('GIVEN an embed with a pre-defined description THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder({ description: 'foo' });
-			expect(embed.toJSON()).toStrictEqual({ description: 'foo' });
+			expect(embed.toJSON()).toStrictEqual({ ...base, description: 'foo' });
 		});
 
 		test('GIVEN an embed using Embed#setDescription THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.setDescription('foo');
 
-			expect(embed.toJSON()).toStrictEqual({ description: 'foo' });
+			expect(embed.toJSON()).toStrictEqual({ ...base, description: 'foo' });
 		});
 
 		test('GIVEN an embed with a pre-defined description THEN unset description THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ description: 'foo' });
-			embed.setDescription(null);
+			const embed = new EmbedBuilder({ description: 'foo', ...dummy });
+			embed.clearDescription();
 
-			expect(embed.toJSON()).toStrictEqual({ description: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, description: undefined });
 		});
 
 		test('GIVEN an embed with an invalid description THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setDescription('a'.repeat(4_097))).toThrowError();
+			embed.setDescription('a'.repeat(4_097));
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
 	describe('Embed URL', () => {
 		test('GIVEN an embed with a pre-defined url THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder({ url: 'https://discord.js.org/' });
+			const embed = new EmbedBuilder({ url: 'https://discord.js.org/', ...dummy });
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
+				...dummy,
 				url: 'https://discord.js.org/',
 			});
 		});
 
 		test('GIVEN an embed using Embed#setURL THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder();
+			const embed = new EmbedBuilder(dummy);
 			embed.setURL('https://discord.js.org/');
 
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
+				...dummy,
 				url: 'https://discord.js.org/',
 			});
 		});
 
 		test('GIVEN an embed with a pre-defined title THEN unset title THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ url: 'https://discord.js.org' });
-			embed.setURL(null);
+			const embed = new EmbedBuilder({ url: 'https://discord.js.org', ...dummy });
+			embed.clearURL();
 
-			expect(embed.toJSON()).toStrictEqual({ url: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, url: undefined });
 		});
 
 		test.each(['owo', 'discord://user'])('GIVEN an embed with an invalid URL THEN throws error', (input) => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setURL(input)).toThrowError();
+			embed.setURL(input);
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
 	describe('Embed Color', () => {
 		test('GIVEN an embed with a pre-defined color THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder({ color: 0xff0000 });
-			expect(embed.toJSON()).toStrictEqual({ color: 0xff0000 });
+			const embed = new EmbedBuilder({ color: 0xff0000, ...dummy });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, color: 0xff0000 });
 		});
 
 		test('GIVEN an embed using Embed#setColor THEN returns valid toJSON data', () => {
-			expect(new EmbedBuilder().setColor(0xff0000).toJSON()).toStrictEqual({ color: 0xff0000 });
-			expect(new EmbedBuilder().setColor([242, 66, 245]).toJSON()).toStrictEqual({ color: 0xf242f5 });
+			expect(new EmbedBuilder(dummy).setColor(0xff0000).toJSON()).toStrictEqual({ ...base, ...dummy, color: 0xff0000 });
 		});
 
 		test('GIVEN an embed with a pre-defined color THEN unset color THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ color: 0xff0000 });
-			embed.setColor(null);
+			const embed = new EmbedBuilder({ ...dummy, color: 0xff0000 });
+			embed.clearColor();
 
-			expect(embed.toJSON()).toStrictEqual({ color: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, color: undefined });
 		});
 
 		test('GIVEN an embed with an invalid color THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
 			// @ts-expect-error: Invalid color
-			expect(() => embed.setColor('RED')).toThrowError();
+			embed.setColor('RED');
+			expect(() => embed.toJSON()).toThrowError();
+
 			// @ts-expect-error: Invalid color
-			expect(() => embed.setColor([42, 36])).toThrowError();
-			expect(() => embed.setColor([42, 36, 1_000])).toThrowError();
+			embed.setColor([42, 36]);
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
@@ -142,98 +161,92 @@ describe('Embed', () => {
 		const now = new Date();
 
 		test('GIVEN an embed with a pre-defined timestamp THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder({ timestamp: now.toISOString() });
-			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
+			const embed = new EmbedBuilder({ timestamp: now.toISOString(), ...dummy });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, timestamp: now.toISOString() });
 		});
 
-		test('given an embed using Embed#setTimestamp (with Date) THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder();
+		test('GIVEN an embed using Embed#setTimestamp (with Date) THEN returns valid toJSON data', () => {
+			const embed = new EmbedBuilder(dummy);
 			embed.setTimestamp(now);
 
-			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, timestamp: now.toISOString() });
 		});
 
 		test('GIVEN an embed using Embed#setTimestamp (with int) THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder();
+			const embed = new EmbedBuilder(dummy);
 			embed.setTimestamp(now.getTime());
 
-			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, timestamp: now.toISOString() });
 		});
 
 		test('GIVEN an embed using Embed#setTimestamp (default) THEN returns valid toJSON data', () => {
-			const embed = new EmbedBuilder();
+			const embed = new EmbedBuilder(dummy);
 			embed.setTimestamp();
 
-			expect(embed.toJSON()).toStrictEqual({ timestamp: embed.data.timestamp });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, timestamp: embed.toJSON().timestamp });
 		});
 
 		test('GIVEN an embed with a pre-defined timestamp THEN unset timestamp THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ timestamp: now.toISOString() });
-			embed.setTimestamp(null);
+			const embed = new EmbedBuilder({ timestamp: now.toISOString(), ...dummy });
+			embed.clearTimestamp();
 
-			expect(embed.toJSON()).toStrictEqual({ timestamp: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, timestamp: undefined });
 		});
 	});
 
 	describe('Embed Thumbnail', () => {
 		test('GIVEN an embed with a pre-defined thumbnail THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
-			expect(embed.toJSON()).toStrictEqual({
-				thumbnail: { url: 'https://discord.js.org/static/logo.svg' },
-			});
+			expect(embed.toJSON()).toStrictEqual({ ...base, thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
 		test('GIVEN an embed using Embed#setThumbnail THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.setThumbnail('https://discord.js.org/static/logo.svg');
 
-			expect(embed.toJSON()).toStrictEqual({
-				thumbnail: { url: 'https://discord.js.org/static/logo.svg' },
-			});
+			expect(embed.toJSON()).toStrictEqual({ ...base, thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
 		test('GIVEN an embed with a pre-defined thumbnail THEN unset thumbnail THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
-			embed.setThumbnail(null);
+			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' }, ...dummy });
+			embed.clearThumbnail();
 
-			expect(embed.toJSON()).toStrictEqual({ thumbnail: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, thumbnail: undefined });
 		});
 
 		test('GIVEN an embed with an invalid thumbnail THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setThumbnail('owo')).toThrowError();
+			embed.setThumbnail('owo');
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
 	describe('Embed Image', () => {
 		test('GIVEN an embed with a pre-defined image THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder({ image: { url: 'https://discord.js.org/static/logo.svg' } });
-			expect(embed.toJSON()).toStrictEqual({
-				image: { url: 'https://discord.js.org/static/logo.svg' },
-			});
+			expect(embed.toJSON()).toStrictEqual({ ...base, image: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
 		test('GIVEN an embed using Embed#setImage THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.setImage('https://discord.js.org/static/logo.svg');
 
-			expect(embed.toJSON()).toStrictEqual({
-				image: { url: 'https://discord.js.org/static/logo.svg' },
-			});
+			expect(embed.toJSON()).toStrictEqual({ ...base, image: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
 		test('GIVEN an embed with a pre-defined image THEN unset image THEN return valid toJSON data', () => {
-			const embed = new EmbedBuilder({ image: { url: 'https://discord.js/org/static/logo.svg' } });
-			embed.setImage(null);
+			const embed = new EmbedBuilder({ image: { url: 'https://discord.js/org/static/logo.svg' }, ...dummy });
+			embed.clearImage();
 
-			expect(embed.toJSON()).toStrictEqual({ image: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, image: undefined });
 		});
 
 		test('GIVEN an embed with an invalid image THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setImage('owo')).toThrowError();
+			embed.setImage('owo');
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
@@ -243,19 +256,19 @@ describe('Embed', () => {
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
 			});
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
 			});
 		});
 
 		test('GIVEN an embed using Embed#setAuthor THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
-			embed.setAuthor({
-				name: 'Wumpus',
-				iconURL: 'https://discord.js.org/static/logo.svg',
-				url: 'https://discord.js.org',
-			});
+			embed.setAuthor((author) =>
+				author.setName('Wumpus').setIconURL('https://discord.js.org/static/logo.svg').setURL('https://discord.js.org'),
+			);
 
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
 			});
 		});
@@ -263,16 +276,18 @@ describe('Embed', () => {
 		test('GIVEN an embed with a pre-defined author THEN unset author THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder({
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
+				...dummy,
 			});
-			embed.setAuthor(null);
+			embed.clearAuthor();
 
-			expect(embed.toJSON()).toStrictEqual({ author: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, author: undefined });
 		});
 
 		test('GIVEN an embed with an invalid author name THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setAuthor({ name: 'a'.repeat(257) })).toThrowError();
+			embed.setAuthor({ name: 'a'.repeat(257) });
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
@@ -282,32 +297,36 @@ describe('Embed', () => {
 				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
 			});
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
 				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
 			});
 		});
 
 		test('GIVEN an embed using Embed#setAuthor THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
-			embed.setFooter({ text: 'Wumpus', iconURL: 'https://discord.js.org/static/logo.svg' });
+			embed.setFooter({ text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' });
 
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
 				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
 			});
 		});
 
 		test('GIVEN an embed with a pre-defined footer THEN unset footer THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder({
+				...dummy,
 				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
 			});
-			embed.setFooter(null);
+			embed.clearFooter();
 
-			expect(embed.toJSON()).toStrictEqual({ footer: undefined });
+			expect(embed.toJSON()).toStrictEqual({ ...base, ...dummy, footer: undefined });
 		});
 
 		test('GIVEN an embed with invalid footer text THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() => embed.setFooter({ text: 'a'.repeat(2_049) })).toThrowError();
+			embed.setFooter({ text: 'a'.repeat(2_049) });
+			expect(() => embed.toJSON()).toThrowError();
 		});
 	});
 
@@ -316,9 +335,7 @@ describe('Embed', () => {
 			const embed = new EmbedBuilder({
 				fields: [{ name: 'foo', value: 'bar' }],
 			});
-			expect(embed.toJSON()).toStrictEqual({
-				fields: [{ name: 'foo', value: 'bar' }],
-			});
+			expect(embed.toJSON()).toStrictEqual({ ...base, fields: [{ name: 'foo', value: 'bar' }] });
 		});
 
 		test('GIVEN an embed using Embed#addFields THEN returns valid toJSON data', () => {
@@ -327,6 +344,7 @@ describe('Embed', () => {
 			embed.addFields([{ name: 'foo', value: 'bar' }]);
 
 			expect(embed.toJSON()).toStrictEqual({
+				...base,
 				fields: [
 					{ name: 'foo', value: 'bar' },
 					{ name: 'foo', value: 'bar' },
@@ -338,56 +356,51 @@ describe('Embed', () => {
 			const embed = new EmbedBuilder();
 			embed.addFields({ name: 'foo', value: 'bar' }, { name: 'foo', value: 'baz' });
 
-			expect(embed.spliceFields(0, 1).toJSON()).toStrictEqual({
-				fields: [{ name: 'foo', value: 'baz' }],
-			});
+			expect(embed.spliceFields(0, 1).toJSON()).toStrictEqual({ ...base, fields: [{ name: 'foo', value: 'baz' }] });
 		});
 
 		test('GIVEN an embed using Embed#spliceFields THEN returns valid toJSON data 2', () => {
 			const embed = new EmbedBuilder();
 			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));
 
-			expect(() =>
-				embed.spliceFields(0, 3, ...Array.from({ length: 5 }, () => ({ name: 'foo', value: 'bar' }))),
-			).not.toThrowError();
+			embed.spliceFields(0, 3, ...Array.from({ length: 5 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).not.toThrowError();
 		});
 
 		test('GIVEN an embed using Embed#spliceFields that adds additional fields resulting in fields > 25 THEN throws error', () => {
 			const embed = new EmbedBuilder();
 			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));
 
-			expect(() =>
-				embed.spliceFields(0, 3, ...Array.from({ length: 8 }, () => ({ name: 'foo', value: 'bar' }))),
-			).toThrowError();
+			embed.spliceFields(0, 3, ...Array.from({ length: 8 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).toThrowError();
 		});
 
 		test('GIVEN an embed using Embed#setFields THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() =>
-				embed.setFields(...Array.from({ length: 25 }, () => ({ name: 'foo', value: 'bar' }))),
-			).not.toThrowError();
-			expect(() =>
-				embed.setFields(Array.from({ length: 25 }, () => ({ name: 'foo', value: 'bar' }))),
-			).not.toThrowError();
+			embed.setFields(...Array.from({ length: 25 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).not.toThrowError();
+
+			embed.setFields(Array.from({ length: 25 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).not.toThrowError();
 		});
 
 		test('GIVEN an embed using Embed#setFields that sets more than 25 fields THEN throws error', () => {
 			const embed = new EmbedBuilder();
 
-			expect(() =>
-				embed.setFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
-			).toThrowError();
-			expect(() => embed.setFields(Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })))).toThrowError();
+			embed.setFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).toThrowError();
+
+			embed.setFields(Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })));
+			expect(() => embed.toJSON()).toThrowError();
 		});
 
 		describe('GIVEN invalid field amount THEN throws error', () => {
 			test('1', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() =>
-					embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
-				).toThrowError();
+				embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })));
+				expect(() => embed.toJSON()).toThrowError();
 			});
 		});
 
@@ -395,7 +408,8 @@ describe('Embed', () => {
 			test('2', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields({ name: '', value: 'bar' })).toThrowError();
+				embed.addFields({ name: '', value: 'bar' });
+				expect(() => embed.toJSON()).toThrowError();
 			});
 		});
 
@@ -403,7 +417,8 @@ describe('Embed', () => {
 			test('3', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
+				embed.addFields({ name: 'a'.repeat(257), value: 'bar' });
+				expect(() => embed.toJSON()).toThrowError();
 			});
 		});
 
@@ -411,7 +426,8 @@ describe('Embed', () => {
 			test('4', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields({ name: '', value: 'a'.repeat(1_025) })).toThrowError();
+				embed.addFields({ name: '', value: 'a'.repeat(1_025) });
+				expect(() => embed.toJSON()).toThrowError();
 			});
 		});
 	});

packages/builders/__tests__/types.test.ts

@@ -0,0 +1,21 @@
+import { expectTypeOf } from 'vitest';
+import {
+	ChatInputCommandBuilder,
+	ChatInputCommandStringOption,
+	ChatInputCommandSubcommandBuilder,
+} from '../src/index.js';
+
+const getBuilder = () => new ChatInputCommandBuilder();
+const getStringOption = () => new ChatInputCommandStringOption().setName('owo').setDescription('Testing 123');
+const getSubcommand = () => new ChatInputCommandSubcommandBuilder().setName('owo').setDescription('Testing 123');
+
+type BuilderPropsOnly<Type = ChatInputCommandBuilder> = Pick<
+	Type,
+	keyof {
+		[Key in keyof Type as Type[Key] extends (...args: any) => any ? never : Key]: any;
+	}
+>;
+
+expectTypeOf(getBuilder().addStringOptions(getStringOption())).toMatchTypeOf<BuilderPropsOnly>();
+
+expectTypeOf(getBuilder().addSubcommands(getSubcommand())).toMatchTypeOf<BuilderPropsOnly>();

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,23 @@ 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 }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% 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 +71,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.0",
+	"version": "1.9.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>",
@@ -65,33 +65,32 @@
 	"homepage": "https://discord.js.org",
 	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"dependencies": {
-		"@discordjs/formatters": "workspace:^",
 		"@discordjs/util": "workspace:^",
-		"@sapphire/shapeshift": "^3.9.7",
-		"discord-api-types": "0.37.83",
-		"fast-deep-equal": "^3.1.3",
+		"discord-api-types": "^0.37.103",
 		"ts-mixer": "^6.0.4",
-		"tslib": "^2.6.2"
+		"tslib": "^2.6.3",
+		"zod": "^3.23.8",
+		"zod-validation-error": "^3.4.0"
 	},
 	"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": "^18.19.44",
+		"@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"
+		"node": ">=18"
 	},
 	"publishConfig": {
 		"access": "public",

packages/builders/src/Assertions.ts

@@ -0,0 +1,20 @@
+import { Locale } from 'discord-api-types/v10';
+import { z } from 'zod';
+
+export const customIdPredicate = z.string().min(1).max(100);
+
+export const memberPermissionsPredicate = z.coerce.bigint();
+
+export const localeMapPredicate = z
+	.object(
+		Object.fromEntries(Object.values(Locale).map((loc) => [loc, z.string().optional()])) as Record<
+			Locale,
+			z.ZodOptional<z.ZodString>
+		>,
+	)
+	.strict();
+
+export const refineURLPredicate = (allowedProtocols: string[]) => (value: string) => {
+	const url = new URL(value);
+	return allowedProtocols.includes(url.protocol);
+};

packages/builders/src/components/ActionRow.ts

@@ -1,68 +1,60 @@
 /* eslint-disable jsdoc/check-param-names */
 
-import {
-	type APIActionRowComponent,
-	ComponentType,
-	type APIMessageActionRowComponent,
-	type APIModalActionRowComponent,
-	type APIActionRowComponentTypes,
+import type {
+	APITextInputComponent,
+	APIActionRowComponent,
+	APIActionRowComponentTypes,
+	APIChannelSelectComponent,
+	APIMentionableSelectComponent,
+	APIRoleSelectComponent,
+	APIStringSelectComponent,
+	APIUserSelectComponent,
+	APIButtonComponentWithCustomId,
+	APIButtonComponentWithSKUId,
+	APIButtonComponentWithURL,
 } from 'discord-api-types/v10';
+import { ComponentType } from 'discord-api-types/v10';
 import { normalizeArray, type RestOrArray } from '../util/normalizeArray.js';
+import { resolveBuilder } from '../util/resolveBuilder.js';
+import { validate } from '../util/validation.js';
+import { actionRowPredicate } from './Assertions.js';
 import { ComponentBuilder } from './Component.js';
+import type { AnyActionRowComponentBuilder } from './Components.js';
 import { createComponentBuilder } from './Components.js';
-import type { ButtonBuilder } from './button/Button.js';
-import type { ChannelSelectMenuBuilder } from './selectMenu/ChannelSelectMenu.js';
-import type { MentionableSelectMenuBuilder } from './selectMenu/MentionableSelectMenu.js';
-import type { RoleSelectMenuBuilder } from './selectMenu/RoleSelectMenu.js';
-import type { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
-import type { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
-import type { TextInputBuilder } from './textInput/TextInput.js';
+import {
+	DangerButtonBuilder,
+	PrimaryButtonBuilder,
+	SecondaryButtonBuilder,
+	SuccessButtonBuilder,
+} from './button/CustomIdButton.js';
+import { LinkButtonBuilder } from './button/LinkButton.js';
+import { PremiumButtonBuilder } from './button/PremiumButton.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';
 
-/**
- * The builders that may be used for messages.
- */
-export type MessageComponentBuilder =
-	| ActionRowBuilder<MessageActionRowComponentBuilder>
-	| MessageActionRowComponentBuilder;
-
-/**
- * The builders that may be used for modals.
- */
-export type ModalComponentBuilder = ActionRowBuilder<ModalActionRowComponentBuilder> | ModalActionRowComponentBuilder;
-
-/**
- * The builders that may be used within an action row for messages.
- */
-export type MessageActionRowComponentBuilder =
-	| ButtonBuilder
-	| ChannelSelectMenuBuilder
-	| MentionableSelectMenuBuilder
-	| RoleSelectMenuBuilder
-	| StringSelectMenuBuilder
-	| UserSelectMenuBuilder;
-
-/**
- * The builders that may be used within an action row for modals.
- */
-export type ModalActionRowComponentBuilder = TextInputBuilder;
-
-/**
- * Any builder.
- */
-export type AnyComponentBuilder = MessageActionRowComponentBuilder | ModalActionRowComponentBuilder;
+export interface ActionRowBuilderData
+	extends Partial<Omit<APIActionRowComponent<APIActionRowComponentTypes>, 'components'>> {
+	components: AnyActionRowComponentBuilder[];
+}
 
 /**
  * A builder that creates API-compatible JSON data for action rows.
  *
  * @typeParam ComponentType - The types of components this action row holds
  */
-export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends ComponentBuilder<
-	APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
-> {
+export class ActionRowBuilder extends ComponentBuilder<APIActionRowComponent<APIActionRowComponentTypes>> {
+	private readonly data: ActionRowBuilderData;
+
 	/**
 	 * The components within this action row.
 	 */
-	public readonly components: ComponentType[];
+	public get components(): readonly AnyActionRowComponentBuilder[] {
+		return this.data.components;
+	}
 
 	/**
 	 * Creates a new action row from API data.
@@ -98,38 +90,254 @@ export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends
 	 * 	.addComponents(button2, button3);
 	 * ```
 	 */
-	public constructor({ components, ...data }: Partial<APIActionRowComponent<APIActionRowComponentTypes>> = {}) {
-		super({ type: ComponentType.ActionRow, ...data });
-		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as ComponentType[];
+	public constructor({ components = [], ...data }: Partial<APIActionRowComponent<APIActionRowComponentTypes>> = {}) {
+		super();
+		this.data = {
+			...structuredClone(data),
+			type: ComponentType.ActionRow,
+			components: components.map((component) => createComponentBuilder(component)),
+		};
 	}
 
 	/**
-	 * Adds components to this action row.
+	 * Adds primary button components to this action row.
 	 *
-	 * @param components - The components to add
+	 * @param input - The buttons to add
 	 */
-	public addComponents(...components: RestOrArray<ComponentType>) {
-		this.components.push(...normalizeArray(components));
+	public addPrimaryButtonComponents(
+		...input: RestOrArray<
+			APIButtonComponentWithCustomId | PrimaryButtonBuilder | ((builder: PrimaryButtonBuilder) => PrimaryButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, PrimaryButtonBuilder));
+
+		this.data.components.push(...resolved);
 		return this;
 	}
 
 	/**
-	 * Sets components for this action row.
+	 * Adds secondary button components to this action row.
 	 *
-	 * @param components - The components to set
+	 * @param input - The buttons to add
 	 */
-	public setComponents(...components: RestOrArray<ComponentType>) {
-		this.components.splice(0, this.components.length, ...normalizeArray(components));
+	public addSecondaryButtonComponents(
+		...input: RestOrArray<
+			| APIButtonComponentWithCustomId
+			| SecondaryButtonBuilder
+			| ((builder: SecondaryButtonBuilder) => SecondaryButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, SecondaryButtonBuilder));
+
+		this.data.components.push(...resolved);
+		return this;
+	}
+
+	/**
+	 * Adds success button components to this action row.
+	 *
+	 * @param input - The buttons to add
+	 */
+	public addSuccessButtonComponents(
+		...input: RestOrArray<
+			APIButtonComponentWithCustomId | SuccessButtonBuilder | ((builder: SuccessButtonBuilder) => SuccessButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, SuccessButtonBuilder));
+
+		this.data.components.push(...resolved);
+		return this;
+	}
+
+	/**
+	 * Adds danger button components to this action row.
+	 */
+	public addDangerButtonComponents(
+		...input: RestOrArray<
+			APIButtonComponentWithCustomId | DangerButtonBuilder | ((builder: DangerButtonBuilder) => DangerButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, DangerButtonBuilder));
+
+		this.data.components.push(...resolved);
+		return this;
+	}
+
+	/**
+	 * Generically add any type of component to this action row, only takes in an instance of a component builder.
+	 */
+	public addComponents(...input: RestOrArray<AnyActionRowComponentBuilder>): this {
+		const normalized = normalizeArray(input);
+		this.data.components.push(...normalized);
+
+		return this;
+	}
+
+	/**
+	 * Adds SKU id button components to this action row.
+	 *
+	 * @param input - The buttons to add
+	 */
+	public addPremiumButtonComponents(
+		...input: RestOrArray<
+			APIButtonComponentWithSKUId | PremiumButtonBuilder | ((builder: PremiumButtonBuilder) => PremiumButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, PremiumButtonBuilder));
+
+		this.data.components.push(...resolved);
+		return this;
+	}
+
+	/**
+	 * Adds URL button components to this action row.
+	 *
+	 * @param input - The buttons to add
+	 */
+	public addLinkButtonComponents(
+		...input: RestOrArray<
+			APIButtonComponentWithURL | LinkButtonBuilder | ((builder: LinkButtonBuilder) => LinkButtonBuilder)
+		>
+	): this {
+		const normalized = normalizeArray(input);
+		const resolved = normalized.map((component) => resolveBuilder(component, LinkButtonBuilder));
+
+		this.data.components.push(...resolved);
+		return this;
+	}
+
+	/**
+	 * Adds a channel select menu component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addChannelSelectMenuComponent(
+		input:
+			| APIChannelSelectComponent
+			| ChannelSelectMenuBuilder
+			| ((builder: ChannelSelectMenuBuilder) => ChannelSelectMenuBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, ChannelSelectMenuBuilder));
+		return this;
+	}
+
+	/**
+	 * Adds a mentionable select menu component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addMentionableSelectMenuComponent(
+		input:
+			| APIMentionableSelectComponent
+			| MentionableSelectMenuBuilder
+			| ((builder: MentionableSelectMenuBuilder) => MentionableSelectMenuBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, MentionableSelectMenuBuilder));
+		return this;
+	}
+
+	/**
+	 * Adds a role select menu component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addRoleSelectMenuComponent(
+		input: APIRoleSelectComponent | RoleSelectMenuBuilder | ((builder: RoleSelectMenuBuilder) => RoleSelectMenuBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, RoleSelectMenuBuilder));
+		return this;
+	}
+
+	/**
+	 * Adds a string select menu component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addStringSelectMenuComponent(
+		input:
+			| APIStringSelectComponent
+			| StringSelectMenuBuilder
+			| ((builder: StringSelectMenuBuilder) => StringSelectMenuBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, StringSelectMenuBuilder));
+		return this;
+	}
+
+	/**
+	 * Adds a user select menu component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addUserSelectMenuComponent(
+		input: APIUserSelectComponent | UserSelectMenuBuilder | ((builder: UserSelectMenuBuilder) => UserSelectMenuBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, UserSelectMenuBuilder));
+		return this;
+	}
+
+	/**
+	 * Adds a text input component to this action row.
+	 *
+	 * @param input - A function that returns a component builder or an already built builder
+	 */
+	public addTextInputComponent(
+		input: APITextInputComponent | TextInputBuilder | ((builder: TextInputBuilder) => TextInputBuilder),
+	): this {
+		this.data.components.push(resolveBuilder(input, TextInputBuilder));
+		return this;
+	}
+
+	/**
+	 * Removes, replaces, or inserts components for this action row.
+	 *
+	 * @remarks
+	 * This method behaves similarly
+	 * to {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice | Array.prototype.splice()}.
+	 *
+	 * It's useful for modifying and adjusting order of the already-existing components of an action row.
+	 * @example
+	 * Remove the first component:
+	 * ```ts
+	 * actionRow.spliceComponents(0, 1);
+	 * ```
+	 * @example
+	 * Remove the first n components:
+	 * ```ts
+	 * const n = 4;
+	 * actionRow.spliceComponents(0, n);
+	 * ```
+	 * @example
+	 * Remove the last component:
+	 * ```ts
+	 * actionRow.spliceComponents(-1, 1);
+	 * ```
+	 * @param index - The index to start at
+	 * @param deleteCount - The number of components to remove
+	 * @param components - The replacing component objects
+	 */
+	public spliceComponents(index: number, deleteCount: number, ...components: AnyActionRowComponentBuilder[]): this {
+		this.data.components.splice(index, deleteCount, ...components);
 		return this;
 	}
 
 	/**
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
-	public toJSON(): APIActionRowComponent<ReturnType<ComponentType['toJSON']>> {
-		return {
-			...this.data,
-			components: this.components.map((component) => component.toJSON()),
-		} as APIActionRowComponent<ReturnType<ComponentType['toJSON']>>;
+	public override toJSON(validationOverride?: boolean): APIActionRowComponent<APIActionRowComponentTypes> {
+		const { components, ...rest } = this.data;
+
+		const data = {
+			...structuredClone(rest),
+			components: components.map((component) => component.toJSON(validationOverride)),
+		};
+
+		validate(actionRowPredicate, data, validationOverride);
+
+		return data as APIActionRowComponent<APIActionRowComponentTypes>;
 	}
 }

packages/builders/src/components/Assertions.ts

@@ -1,101 +1,168 @@
-import { s } from '@sapphire/shapeshift';
-import { ButtonStyle, ChannelType, type APIMessageComponentEmoji } from 'discord-api-types/v10';
-import { isValidationEnabled } from '../util/validation.js';
-import { StringSelectMenuOptionBuilder } from './selectMenu/StringSelectMenuOption.js';
+import { ButtonStyle, ChannelType, ComponentType, SelectMenuDefaultValueType } from 'discord-api-types/v10';
+import { z } from 'zod';
+import { customIdPredicate, refineURLPredicate } from '../Assertions.js';
 
-export const customIdValidator = s.string
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(100)
-	.setValidationEnabled(isValidationEnabled);
+const labelPredicate = z.string().min(1).max(80);
 
-export const emojiValidator = s
+export const emojiPredicate = z
 	.object({
-		id: s.string,
-		name: s.string,
-		animated: s.boolean,
+		id: z.string().optional(),
+		name: z.string().min(2).max(32).optional(),
+		animated: z.boolean().optional(),
 	})
-	.partial.strict.setValidationEnabled(isValidationEnabled);
+	.strict()
+	.refine((data) => data.id !== undefined || data.name !== undefined, {
+		message: "Either 'id' or 'name' must be provided",
+	});
 
-export const disabledValidator = s.boolean;
+const buttonPredicateBase = z.object({
+	type: z.literal(ComponentType.Button),
+	disabled: z.boolean().optional(),
+});
 
-export const buttonLabelValidator = s.string
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(80)
-	.setValidationEnabled(isValidationEnabled);
+const buttonCustomIdPredicateBase = buttonPredicateBase.extend({
+	custom_id: customIdPredicate,
+	emoji: emojiPredicate.optional(),
+	label: labelPredicate,
+});
 
-export const buttonStyleValidator = s.nativeEnum(ButtonStyle);
+const buttonPrimaryPredicate = buttonCustomIdPredicateBase.extend({ style: z.literal(ButtonStyle.Primary) }).strict();
+const buttonSecondaryPredicate = buttonCustomIdPredicateBase
+	.extend({ style: z.literal(ButtonStyle.Secondary) })
+	.strict();
+const buttonSuccessPredicate = buttonCustomIdPredicateBase.extend({ style: z.literal(ButtonStyle.Success) }).strict();
+const buttonDangerPredicate = buttonCustomIdPredicateBase.extend({ style: z.literal(ButtonStyle.Danger) }).strict();
 
-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
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(100)
-	.setValidationEnabled(isValidationEnabled);
-
-export const jsonOptionValidator = s
-	.object({
-		label: labelValueDescriptionValidator,
-		value: labelValueDescriptionValidator,
-		description: labelValueDescriptionValidator.optional,
-		emoji: emojiValidator.optional,
-		default: s.boolean.optional,
+const buttonLinkPredicate = buttonPredicateBase
+	.extend({
+		style: z.literal(ButtonStyle.Link),
+		url: z
+			.string()
+			.url()
+			.refine(refineURLPredicate(['http:', 'https:', 'discord:'])),
+		emoji: emojiPredicate.optional(),
+		label: labelPredicate,
 	})
-	.setValidationEnabled(isValidationEnabled);
+	.strict();
 
-export const optionValidator = s.instance(StringSelectMenuOptionBuilder).setValidationEnabled(isValidationEnabled);
-
-export const optionsValidator = optionValidator.array
-	.lengthGreaterThanOrEqual(0)
-	.setValidationEnabled(isValidationEnabled);
-export const optionsLengthValidator = s.number.int
-	.greaterThanOrEqual(0)
-	.lessThanOrEqual(25)
-	.setValidationEnabled(isValidationEnabled);
-
-export function validateRequiredSelectMenuParameters(options: StringSelectMenuOptionBuilder[], customId?: string) {
-	customIdValidator.parse(customId);
-	optionsValidator.parse(options);
-}
-
-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 urlValidator = s.string
-	.url({
-		allowedProtocols: ['http:', 'https:', 'discord:'],
+const buttonPremiumPredicate = buttonPredicateBase
+	.extend({
+		style: z.literal(ButtonStyle.Premium),
+		sku_id: z.string(),
 	})
-	.setValidationEnabled(isValidationEnabled);
+	.strict();
 
-export function validateRequiredButtonParameters(
-	style?: ButtonStyle,
-	label?: string,
-	emoji?: APIMessageComponentEmoji,
-	customId?: string,
-	url?: string,
-) {
-	if (url && customId) {
-		throw new RangeError('URL and custom id are mutually exclusive');
-	}
+export const buttonPredicate = z.discriminatedUnion('style', [
+	buttonLinkPredicate,
+	buttonPrimaryPredicate,
+	buttonSecondaryPredicate,
+	buttonSuccessPredicate,
+	buttonDangerPredicate,
+	buttonPremiumPredicate,
+]);
 
-	if (!label && !emoji) {
-		throw new RangeError('Buttons must have a label and/or an emoji');
-	}
+const selectMenuBasePredicate = z.object({
+	placeholder: z.string().max(150).optional(),
+	min_values: z.number().min(0).max(25).optional(),
+	max_values: z.number().min(0).max(25).optional(),
+	custom_id: customIdPredicate,
+	disabled: z.boolean().optional(),
+});
 
-	if (style === ButtonStyle.Link) {
-		if (!url) {
-			throw new RangeError('Link buttons must have a url');
+export const selectMenuChannelPredicate = selectMenuBasePredicate.extend({
+	type: z.literal(ComponentType.ChannelSelect),
+	channel_types: z.nativeEnum(ChannelType).array().optional(),
+	default_values: z
+		.object({ id: z.string(), type: z.literal(SelectMenuDefaultValueType.Channel) })
+		.array()
+		.max(25)
+		.optional(),
+});
+
+export const selectMenuMentionablePredicate = selectMenuBasePredicate.extend({
+	type: z.literal(ComponentType.MentionableSelect),
+	default_values: z
+		.object({
+			id: z.string(),
+			type: z.union([z.literal(SelectMenuDefaultValueType.Role), z.literal(SelectMenuDefaultValueType.User)]),
+		})
+		.array()
+		.max(25)
+		.optional(),
+});
+
+export const selectMenuRolePredicate = selectMenuBasePredicate.extend({
+	type: z.literal(ComponentType.RoleSelect),
+	default_values: z
+		.object({ id: z.string(), type: z.literal(SelectMenuDefaultValueType.Role) })
+		.array()
+		.max(25)
+		.optional(),
+});
+
+export const selectMenuStringOptionPredicate = z.object({
+	label: labelPredicate,
+	value: z.string().min(1).max(100),
+	description: z.string().min(1).max(100).optional(),
+	emoji: emojiPredicate.optional(),
+	default: z.boolean().optional(),
+});
+
+export const selectMenuStringPredicate = selectMenuBasePredicate
+	.extend({
+		type: z.literal(ComponentType.StringSelect),
+		options: selectMenuStringOptionPredicate.array().min(1).max(25),
+	})
+	.superRefine((menu, ctx) => {
+		const addIssue = (name: string, minimum: number) =>
+			ctx.addIssue({
+				code: 'too_small',
+				message: `The number of options must be greater than or equal to ${name}`,
+				inclusive: true,
+				minimum,
+				type: 'number',
+				path: ['options'],
+			});
+
+		if (menu.max_values !== undefined && menu.options.length < menu.max_values) {
+			addIssue('max_values', menu.max_values);
 		}
-	} else if (url) {
-		throw new RangeError('Non-link buttons cannot have a url');
-	}
-}
+
+		if (menu.min_values !== undefined && menu.options.length < menu.min_values) {
+			addIssue('min_values', menu.min_values);
+		}
+	});
+
+export const selectMenuUserPredicate = selectMenuBasePredicate.extend({
+	type: z.literal(ComponentType.UserSelect),
+	default_values: z
+		.object({ id: z.string(), type: z.literal(SelectMenuDefaultValueType.User) })
+		.array()
+		.max(25)
+		.optional(),
+});
+
+export const actionRowPredicate = z.object({
+	type: z.literal(ComponentType.ActionRow),
+	components: z.union([
+		z
+			.object({ type: z.literal(ComponentType.Button) })
+			.array()
+			.min(1)
+			.max(5),
+		z
+			.object({
+				type: z.union([
+					z.literal(ComponentType.ChannelSelect),
+					z.literal(ComponentType.MentionableSelect),
+					z.literal(ComponentType.RoleSelect),
+					z.literal(ComponentType.StringSelect),
+					z.literal(ComponentType.UserSelect),
+					// And this!
+					z.literal(ComponentType.TextInput),
+				]),
+			})
+			.array()
+			.length(1),
+	]),
+});

packages/builders/src/components/Component.ts

@@ -1,10 +1,5 @@
 import type { JSONEncodable } from '@discordjs/util';
-import type {
-	APIActionRowComponent,
-	APIActionRowComponentTypes,
-	APIBaseComponent,
-	ComponentType,
-} from 'discord-api-types/v10';
+import type { APIActionRowComponent, APIActionRowComponentTypes } from 'discord-api-types/v10';
 
 /**
  * Any action row component data represented as an object.
@@ -14,32 +9,15 @@ export type AnyAPIActionRowComponent = APIActionRowComponent<APIActionRowCompone
 /**
  * The base component builder that contains common symbols for all sorts of components.
  *
- * @typeParam DataType - The type of internal API data that is stored within the component
+ * @typeParam Component - The type of API data that is stored within the builder
  */
-export abstract class ComponentBuilder<
-	DataType extends Partial<APIBaseComponent<ComponentType>> = APIBaseComponent<ComponentType>,
-> implements JSONEncodable<AnyAPIActionRowComponent>
-{
-	/**
-	 * The API data associated with this component.
-	 */
-	public readonly data: Partial<DataType>;
-
+export abstract class ComponentBuilder<Component extends AnyAPIActionRowComponent> implements JSONEncodable<Component> {
 	/**
 	 * 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 abstract toJSON(): AnyAPIActionRowComponent;
-
-	/**
-	 * Constructs a new kind of component.
+	 * Note that by disabling validation, there is no guarantee that the resulting object will be valid.
 	 *
-	 * @param data - The data to construct a component out of
+	 * @param validationOverride - Force validation to run/not run regardless of your global preference
 	 */
-	public constructor(data: Partial<DataType>) {
-		this.data = data;
-	}
+	public abstract toJSON(validationOverride?: boolean): Component;
 }

packages/builders/src/components/Components.ts

@@ -1,12 +1,17 @@
-import { ComponentType, type APIMessageComponent, type APIModalComponent } from 'discord-api-types/v10';
-import {
-	ActionRowBuilder,
-	type AnyComponentBuilder,
-	type MessageComponentBuilder,
-	type ModalComponentBuilder,
-} from './ActionRow.js';
+import type { APIButtonComponent, APIMessageComponent, APIModalComponent } from 'discord-api-types/v10';
+import { ButtonStyle, ComponentType } from 'discord-api-types/v10';
+import { ActionRowBuilder } from './ActionRow.js';
+import type { AnyAPIActionRowComponent } from './Component.js';
 import { ComponentBuilder } from './Component.js';
-import { ButtonBuilder } from './button/Button.js';
+import type { BaseButtonBuilder } from './button/Button.js';
+import {
+	DangerButtonBuilder,
+	PrimaryButtonBuilder,
+	SecondaryButtonBuilder,
+	SuccessButtonBuilder,
+} from './button/CustomIdButton.js';
+import { LinkButtonBuilder } from './button/LinkButton.js';
+import { PremiumButtonBuilder } from './button/PremiumButton.js';
 import { ChannelSelectMenuBuilder } from './selectMenu/ChannelSelectMenu.js';
 import { MentionableSelectMenuBuilder } from './selectMenu/MentionableSelectMenu.js';
 import { RoleSelectMenuBuilder } from './selectMenu/RoleSelectMenu.js';
@@ -14,6 +19,48 @@ import { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
 import { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
 import { TextInputBuilder } from './textInput/TextInput.js';
 
+/**
+ * The builders that may be used for messages.
+ */
+export type MessageComponentBuilder = ActionRowBuilder | MessageActionRowComponentBuilder;
+
+/**
+ * The builders that may be used for modals.
+ */
+export type ModalComponentBuilder = ActionRowBuilder | ModalActionRowComponentBuilder;
+
+/**
+ * Any button builder
+ */
+export type ButtonBuilder =
+	| DangerButtonBuilder
+	| LinkButtonBuilder
+	| PremiumButtonBuilder
+	| PrimaryButtonBuilder
+	| SecondaryButtonBuilder
+	| SuccessButtonBuilder;
+
+/**
+ * The builders that may be used within an action row for messages.
+ */
+export type MessageActionRowComponentBuilder =
+	| ButtonBuilder
+	| ChannelSelectMenuBuilder
+	| MentionableSelectMenuBuilder
+	| RoleSelectMenuBuilder
+	| StringSelectMenuBuilder
+	| UserSelectMenuBuilder;
+
+/**
+ * The builders that may be used within an action row for modals.
+ */
+export type ModalActionRowComponentBuilder = TextInputBuilder;
+
+/**
+ * Any action row component builder.
+ */
+export type AnyActionRowComponentBuilder = MessageActionRowComponentBuilder | ModalActionRowComponentBuilder;
+
 /**
  * Components here are mapped to their respective builder.
  */
@@ -21,33 +68,33 @@ export interface MappedComponentTypes {
 	/**
 	 * The action row component type is associated with an {@link ActionRowBuilder}.
 	 */
-	[ComponentType.ActionRow]: ActionRowBuilder<AnyComponentBuilder>;
+	[ComponentType.ActionRow]: ActionRowBuilder;
 	/**
-	 * The button component type is associated with an {@link ButtonBuilder}.
+	 * The button component type is associated with a {@link BaseButtonBuilder}.
 	 */
 	[ComponentType.Button]: ButtonBuilder;
 	/**
-	 * The string select component type is associated with an {@link StringSelectMenuBuilder}.
+	 * The string select component type is associated with a {@link StringSelectMenuBuilder}.
 	 */
 	[ComponentType.StringSelect]: StringSelectMenuBuilder;
 	/**
-	 * The text inpiut component type is associated with an {@link TextInputBuilder}.
+	 * The text input component type is associated with a {@link TextInputBuilder}.
 	 */
 	[ComponentType.TextInput]: TextInputBuilder;
 	/**
-	 * The user select component type is associated with an {@link UserSelectMenuBuilder}.
+	 * The user select component type is associated with a {@link UserSelectMenuBuilder}.
 	 */
 	[ComponentType.UserSelect]: UserSelectMenuBuilder;
 	/**
-	 * The role select component type is associated with an {@link RoleSelectMenuBuilder}.
+	 * The role select component type is associated with a {@link RoleSelectMenuBuilder}.
 	 */
 	[ComponentType.RoleSelect]: RoleSelectMenuBuilder;
 	/**
-	 * The mentionable select component type is associated with an {@link MentionableSelectMenuBuilder}.
+	 * The mentionable select component type is associated with a {@link MentionableSelectMenuBuilder}.
 	 */
 	[ComponentType.MentionableSelect]: MentionableSelectMenuBuilder;
 	/**
-	 * The channel select component type is associated with an {@link ChannelSelectMenuBuilder}.
+	 * The channel select component type is associated with a {@link ChannelSelectMenuBuilder}.
 	 */
 	[ComponentType.ChannelSelect]: ChannelSelectMenuBuilder;
 }
@@ -75,7 +122,7 @@ export function createComponentBuilder<ComponentBuilder extends MessageComponent
 
 export function createComponentBuilder(
 	data: APIMessageComponent | APIModalComponent | MessageComponentBuilder,
-): ComponentBuilder {
+): ComponentBuilder<AnyAPIActionRowComponent> {
 	if (data instanceof ComponentBuilder) {
 		return data;
 	}
@@ -84,7 +131,7 @@ export function createComponentBuilder(
 		case ComponentType.ActionRow:
 			return new ActionRowBuilder(data);
 		case ComponentType.Button:
-			return new ButtonBuilder(data);
+			return createButtonBuilder(data);
 		case ComponentType.StringSelect:
 			return new StringSelectMenuBuilder(data);
 		case ComponentType.TextInput:
@@ -102,3 +149,23 @@ export function createComponentBuilder(
 			throw new Error(`Cannot properly serialize component type: ${data.type}`);
 	}
 }
+
+function createButtonBuilder(data: APIButtonComponent): ButtonBuilder {
+	switch (data.style) {
+		case ButtonStyle.Primary:
+			return new PrimaryButtonBuilder(data);
+		case ButtonStyle.Secondary:
+			return new SecondaryButtonBuilder(data);
+		case ButtonStyle.Success:
+			return new SuccessButtonBuilder(data);
+		case ButtonStyle.Danger:
+			return new DangerButtonBuilder(data);
+		case ButtonStyle.Link:
+			return new LinkButtonBuilder(data);
+		case ButtonStyle.Premium:
+			return new PremiumButtonBuilder(data);
+		default:
+			// @ts-expect-error This case can still occur if we get a newer unsupported button style
+			throw new Error(`Cannot properly serialize button with style: ${data.style}`);
+	}
+}

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

@@ -1,102 +1,13 @@
-import {
-	ComponentType,
-	type APIMessageComponentEmoji,
-	type APIButtonComponent,
-	type APIButtonComponentWithURL,
-	type APIButtonComponentWithCustomId,
-	type ButtonStyle,
-} from 'discord-api-types/v10';
-import {
-	buttonLabelValidator,
-	buttonStyleValidator,
-	customIdValidator,
-	disabledValidator,
-	emojiValidator,
-	urlValidator,
-	validateRequiredButtonParameters,
-} from '../Assertions.js';
+import type { APIButtonComponent } from 'discord-api-types/v10';
+import { validate } from '../../util/validation.js';
+import { buttonPredicate } from '../Assertions.js';
 import { ComponentBuilder } from '../Component.js';
 
 /**
  * A builder that creates API-compatible JSON data for buttons.
  */
-export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
-	/**
-	 * Creates a new button from API data.
-	 *
-	 * @param data - The API data to create this button with
-	 * @example
-	 * Creating a button from an API data object:
-	 * ```ts
-	 * const button = new ButtonBuilder({
-	 * 	custom_id: 'a cool button',
-	 * 	style: ButtonStyle.Primary,
-	 * 	label: 'Click Me',
-	 * 	emoji: {
-	 * 		name: 'smile',
-	 * 		id: '123456789012345678',
-	 * 	},
-	 * });
-	 * ```
-	 * @example
-	 * Creating a button using setters and API data:
-	 * ```ts
-	 * const button = new ButtonBuilder({
-	 * 	style: ButtonStyle.Secondary,
-	 * 	label: 'Click Me',
-	 * })
-	 * 	.setEmoji({ name: '🙂' })
-	 * 	.setCustomId('another cool button');
-	 * ```
-	 */
-	public constructor(data?: Partial<APIButtonComponent>) {
-		super({ type: ComponentType.Button, ...data });
-	}
-
-	/**
-	 * Sets the style of this button.
-	 *
-	 * @param style - The style to use
-	 */
-	public setStyle(style: ButtonStyle) {
-		this.data.style = buttonStyleValidator.parse(style);
-		return this;
-	}
-
-	/**
-	 * Sets the URL for this button.
-	 *
-	 * @remarks
-	 * This method is only available to buttons using the `Link` button style.
-	 * Only three types of URL schemes are currently supported: `https://`, `http://`, and `discord://`.
-	 * @param url - The URL to use
-	 */
-	public setURL(url: string) {
-		(this.data as APIButtonComponentWithURL).url = urlValidator.parse(url);
-		return this;
-	}
-
-	/**
-	 * Sets the custom id for this button.
-	 *
-	 * @remarks
-	 * This method is only applicable to buttons that are not using the `Link` button style.
-	 * @param customId - The custom id to use
-	 */
-	public setCustomId(customId: string) {
-		(this.data as APIButtonComponentWithCustomId).custom_id = customIdValidator.parse(customId);
-		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);
-		return this;
-	}
+export abstract class BaseButtonBuilder<ButtonData extends APIButtonComponent> extends ComponentBuilder<ButtonData> {
+	protected declare readonly data: Partial<ButtonData>;
 
 	/**
 	 * Sets whether this button is disabled.
@@ -104,34 +15,17 @@ export class ButtonBuilder extends ComponentBuilder<APIButtonComponent> {
 	 * @param disabled - Whether to disable this button
 	 */
 	public setDisabled(disabled = true) {
-		this.data.disabled = disabledValidator.parse(disabled);
-		return this;
-	}
-
-	/**
-	 * Sets the label for this button.
-	 *
-	 * @param label - The label to use
-	 */
-	public setLabel(label: string) {
-		this.data.label = buttonLabelValidator.parse(label);
+		this.data.disabled = disabled;
 		return this;
 	}
 
 	/**
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
-	public toJSON(): APIButtonComponent {
-		validateRequiredButtonParameters(
-			this.data.style,
-			this.data.label,
-			this.data.emoji,
-			(this.data as APIButtonComponentWithCustomId).custom_id,
-			(this.data as APIButtonComponentWithURL).url,
-		);
+	public override toJSON(validationOverride?: boolean): ButtonData {
+		const clone = structuredClone(this.data);
+		validate(buttonPredicate, clone, validationOverride);
 
-		return {
-			...this.data,
-		} as APIButtonComponent;
+		return clone as ButtonData;
 	}
 }

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

@@ -0,0 +1,69 @@
+import { ButtonStyle, ComponentType, type APIButtonComponentWithCustomId } from 'discord-api-types/v10';
+import { Mixin } from 'ts-mixer';
+import { BaseButtonBuilder } from './Button.js';
+import { EmojiOrLabelButtonMixin } from './mixins/EmojiOrLabelButtonMixin.js';
+
+export type CustomIdButtonStyle = APIButtonComponentWithCustomId['style'];
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with custom IDs.
+ */
+export abstract class CustomIdButtonBuilder extends Mixin(
+	BaseButtonBuilder<APIButtonComponentWithCustomId>,
+	EmojiOrLabelButtonMixin,
+) {
+	protected override readonly data: Partial<APIButtonComponentWithCustomId>;
+
+	protected constructor(data: Partial<APIButtonComponentWithCustomId> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.Button };
+	}
+
+	/**
+	 * Sets the custom id for this button.
+	 *
+	 * @remarks
+	 * This method is only applicable to buttons that are not using the `Link` button style.
+	 * @param customId - The custom id to use
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customId;
+		return this;
+	}
+}
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with custom IDs (using the primary style).
+ */
+export class PrimaryButtonBuilder extends CustomIdButtonBuilder {
+	public constructor(data: Partial<APIButtonComponentWithCustomId> = {}) {
+		super({ ...data, style: ButtonStyle.Primary });
+	}
+}
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with custom IDs (using the secondary style).
+ */
+export class SecondaryButtonBuilder extends CustomIdButtonBuilder {
+	public constructor(data: Partial<APIButtonComponentWithCustomId> = {}) {
+		super({ ...data, style: ButtonStyle.Secondary });
+	}
+}
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with custom IDs (using the success style).
+ */
+export class SuccessButtonBuilder extends CustomIdButtonBuilder {
+	public constructor(data: Partial<APIButtonComponentWithCustomId> = {}) {
+		super({ ...data, style: ButtonStyle.Success });
+	}
+}
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with custom IDs (using the danger style).
+ */
+export class DangerButtonBuilder extends CustomIdButtonBuilder {
+	public constructor(data: Partial<APIButtonComponentWithCustomId> = {}) {
+		super({ ...data, style: ButtonStyle.Danger });
+	}
+}

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

@@ -0,0 +1,34 @@
+import {
+	ButtonStyle,
+	ComponentType,
+	type APIButtonComponent,
+	type APIButtonComponentWithURL,
+} from 'discord-api-types/v10';
+import { Mixin } from 'ts-mixer';
+import { BaseButtonBuilder } from './Button.js';
+import { EmojiOrLabelButtonMixin } from './mixins/EmojiOrLabelButtonMixin.js';
+
+/**
+ * A builder that creates API-compatible JSON data for buttons with links.
+ */
+export class LinkButtonBuilder extends Mixin(BaseButtonBuilder<APIButtonComponentWithURL>, EmojiOrLabelButtonMixin) {
+	protected override readonly data: Partial<APIButtonComponentWithURL>;
+
+	public constructor(data: Partial<APIButtonComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.Button, style: ButtonStyle.Link };
+	}
+
+	/**
+	 * Sets the URL for this button.
+	 *
+	 * @remarks
+	 * This method is only available to buttons using the `Link` button style.
+	 * Only three types of URL schemes are currently supported: `https://`, `http://`, and `discord://`.
+	 * @param url - The URL to use
+	 */
+	public setURL(url: string) {
+		this.data.url = url;
+		return this;
+	}
+}

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

@@ -0,0 +1,26 @@
+import type { APIButtonComponentWithSKUId, Snowflake } from 'discord-api-types/v10';
+import { ButtonStyle, ComponentType } from 'discord-api-types/v10';
+import { BaseButtonBuilder } from './Button.js';
+
+/**
+ * A builder that creates API-compatible JSON data for premium buttons.
+ */
+export class PremiumButtonBuilder extends BaseButtonBuilder<APIButtonComponentWithSKUId> {
+	protected override readonly data: Partial<APIButtonComponentWithSKUId>;
+
+	public constructor(data: Partial<APIButtonComponentWithSKUId> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.Button, style: ButtonStyle.Premium };
+	}
+
+	/**
+	 * 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.sku_id = skuId;
+		return this;
+	}
+}

packages/builders/src/components/button/mixins/EmojiOrLabelButtonMixin.ts

@@ -0,0 +1,44 @@
+import type { APIButtonComponent, APIButtonComponentWithSKUId, APIMessageComponentEmoji } from 'discord-api-types/v10';
+
+export interface EmojiOrLabelButtonData
+	extends Pick<Exclude<APIButtonComponent, APIButtonComponentWithSKUId>, 'emoji' | 'label'> {}
+
+export class EmojiOrLabelButtonMixin {
+	protected declare readonly data: EmojiOrLabelButtonData;
+
+	/**
+	 * Sets the emoji to display on this button.
+	 *
+	 * @param emoji - The emoji to use
+	 */
+	public setEmoji(emoji: APIMessageComponentEmoji) {
+		this.data.emoji = emoji;
+		return this;
+	}
+
+	/**
+	 * Clears the emoji on this button.
+	 */
+	public clearEmoji() {
+		this.data.emoji = undefined;
+		return this;
+	}
+
+	/**
+	 * Sets the label for this button.
+	 *
+	 * @param label - The label to use
+	 */
+	public setLabel(label: string) {
+		this.data.label = label;
+		return this;
+	}
+
+	/**
+	 * Clears the label on this button.
+	 */
+	public clearLabel() {
+		this.data.label = undefined;
+		return this;
+	}
+}

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

@@ -1,5 +1,5 @@
+import type { JSONEncodable } from '@discordjs/util';
 import type { APISelectMenuComponent } from 'discord-api-types/v10';
-import { customIdValidator, disabledValidator, minMaxValidator, placeholderValidator } from '../Assertions.js';
 import { ComponentBuilder } from '../Component.js';
 
 /**
@@ -7,16 +7,29 @@ import { ComponentBuilder } from '../Component.js';
  *
  * @typeParam SelectMenuType - The type of select menu this would be instantiated for.
  */
-export abstract class BaseSelectMenuBuilder<
-	SelectMenuType extends APISelectMenuComponent,
-> extends ComponentBuilder<SelectMenuType> {
+export abstract class BaseSelectMenuBuilder<Data extends APISelectMenuComponent>
+	extends ComponentBuilder<Data>
+	implements JSONEncodable<APISelectMenuComponent>
+{
+	protected abstract readonly data: Partial<
+		Pick<Data, 'custom_id' | 'disabled' | 'max_values' | 'min_values' | 'placeholder'>
+	>;
+
 	/**
 	 * Sets the placeholder for this select menu.
 	 *
 	 * @param placeholder - The placeholder to use
 	 */
 	public setPlaceholder(placeholder: string) {
-		this.data.placeholder = placeholderValidator.parse(placeholder);
+		this.data.placeholder = placeholder;
+		return this;
+	}
+
+	/**
+	 * Clears the placeholder for this select menu.
+	 */
+	public clearPlaceholder() {
+		this.data.placeholder = undefined;
 		return this;
 	}
 
@@ -26,7 +39,7 @@ export abstract class BaseSelectMenuBuilder<
 	 * @param minValues - The minimum values that must be selected
 	 */
 	public setMinValues(minValues: number) {
-		this.data.min_values = minMaxValidator.parse(minValues);
+		this.data.min_values = minValues;
 		return this;
 	}
 
@@ -36,7 +49,7 @@ export abstract class BaseSelectMenuBuilder<
 	 * @param maxValues - The maximum values that must be selected
 	 */
 	public setMaxValues(maxValues: number) {
-		this.data.max_values = minMaxValidator.parse(maxValues);
+		this.data.max_values = maxValues;
 		return this;
 	}
 
@@ -46,7 +59,7 @@ export abstract class BaseSelectMenuBuilder<
 	 * @param customId - The custom id to use
 	 */
 	public setCustomId(customId: string) {
-		this.data.custom_id = customIdValidator.parse(customId);
+		this.data.custom_id = customId;
 		return this;
 	}
 
@@ -56,17 +69,7 @@ export abstract class BaseSelectMenuBuilder<
 	 * @param disabled - Whether this select menu is disabled
 	 */
 	public setDisabled(disabled = true) {
-		this.data.disabled = disabledValidator.parse(disabled);
+		this.data.disabled = disabled;
 		return this;
 	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public toJSON(): SelectMenuType {
-		customIdValidator.parse(this.data.custom_id);
-		return {
-			...this.data,
-		} as SelectMenuType;
-	}
 }

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

@@ -6,13 +6,16 @@ import {
 	SelectMenuDefaultValueType,
 } from 'discord-api-types/v10';
 import { type RestOrArray, normalizeArray } from '../../util/normalizeArray.js';
-import { channelTypesValidator, customIdValidator, optionsLengthValidator } from '../Assertions.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuChannelPredicate } from '../Assertions.js';
 import { BaseSelectMenuBuilder } from './BaseSelectMenu.js';
 
 /**
  * A builder that creates API-compatible JSON data for channel select menus.
  */
 export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSelectComponent> {
+	protected override readonly data: Partial<APIChannelSelectComponent>;
+
 	/**
 	 * Creates a new select menu from API data.
 	 *
@@ -36,8 +39,9 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	 * 	.setMinValues(2);
 	 * ```
 	 */
-	public constructor(data?: Partial<APIChannelSelectComponent>) {
-		super({ ...data, type: ComponentType.ChannelSelect });
+	public constructor(data: Partial<APIChannelSelectComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.ChannelSelect };
 	}
 
 	/**
@@ -48,7 +52,7 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	public addChannelTypes(...types: RestOrArray<ChannelType>) {
 		const normalizedTypes = normalizeArray(types);
 		this.data.channel_types ??= [];
-		this.data.channel_types.push(...channelTypesValidator.parse(normalizedTypes));
+		this.data.channel_types.push(...normalizedTypes);
 		return this;
 	}
 
@@ -60,7 +64,7 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	public setChannelTypes(...types: RestOrArray<ChannelType>) {
 		const normalizedTypes = normalizeArray(types);
 		this.data.channel_types ??= [];
-		this.data.channel_types.splice(0, this.data.channel_types.length, ...channelTypesValidator.parse(normalizedTypes));
+		this.data.channel_types.splice(0, this.data.channel_types.length, ...normalizedTypes);
 		return this;
 	}
 
@@ -71,7 +75,6 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	 */
 	public addDefaultChannels(...channels: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(channels);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
 		this.data.default_values ??= [];
 
 		this.data.default_values.push(
@@ -85,13 +88,12 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	}
 
 	/**
-	 * Sets default channels to this auto populated select menu.
+	 * Sets default channels for this auto populated select menu.
 	 *
 	 * @param channels - The channels to set
 	 */
 	public setDefaultChannels(...channels: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(channels);
-		optionsLengthValidator.parse(normalizedValues.length);
 
 		this.data.default_values = normalizedValues.map((id) => ({
 			id,
@@ -102,13 +104,12 @@ export class ChannelSelectMenuBuilder extends BaseSelectMenuBuilder<APIChannelSe
 	}
 
 	/**
-	 * {@inheritDoc BaseSelectMenuBuilder.toJSON}
+	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
-	public override toJSON(): APIChannelSelectComponent {
-		customIdValidator.parse(this.data.custom_id);
+	public override toJSON(validationOverride?: boolean): APIChannelSelectComponent {
+		const clone = structuredClone(this.data);
+		validate(selectMenuChannelPredicate, clone, validationOverride);
 
-		return {
-			...this.data,
-		} as APIChannelSelectComponent;
+		return clone as APIChannelSelectComponent;
 	}
 }

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

@@ -6,13 +6,16 @@ import {
 	SelectMenuDefaultValueType,
 } from 'discord-api-types/v10';
 import { type RestOrArray, normalizeArray } from '../../util/normalizeArray.js';
-import { optionsLengthValidator } from '../Assertions.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuMentionablePredicate } from '../Assertions.js';
 import { BaseSelectMenuBuilder } from './BaseSelectMenu.js';
 
 /**
  * A builder that creates API-compatible JSON data for mentionable select menus.
  */
 export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMentionableSelectComponent> {
+	protected override readonly data: Partial<APIMentionableSelectComponent>;
+
 	/**
 	 * Creates a new select menu from API data.
 	 *
@@ -35,8 +38,9 @@ export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMenti
 	 * 	.setMinValues(1);
 	 * ```
 	 */
-	public constructor(data?: Partial<APIMentionableSelectComponent>) {
-		super({ ...data, type: ComponentType.MentionableSelect });
+	public constructor(data: Partial<APIMentionableSelectComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.MentionableSelect };
 	}
 
 	/**
@@ -46,7 +50,6 @@ export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMenti
 	 */
 	public addDefaultRoles(...roles: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(roles);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
 		this.data.default_values ??= [];
 
 		this.data.default_values.push(
@@ -66,7 +69,6 @@ export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMenti
 	 */
 	public addDefaultUsers(...users: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(users);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
 		this.data.default_values ??= [];
 
 		this.data.default_values.push(
@@ -91,14 +93,13 @@ export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMenti
 		>
 	) {
 		const normalizedValues = normalizeArray(values);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
 		this.data.default_values ??= [];
 		this.data.default_values.push(...normalizedValues);
 		return this;
 	}
 
 	/**
-	 * Sets default values to this auto populated select menu.
+	 * Sets default values for this auto populated select menu.
 	 *
 	 * @param values - The values to set
 	 */
@@ -109,8 +110,17 @@ export class MentionableSelectMenuBuilder extends BaseSelectMenuBuilder<APIMenti
 		>
 	) {
 		const normalizedValues = normalizeArray(values);
-		optionsLengthValidator.parse(normalizedValues.length);
 		this.data.default_values = normalizedValues;
 		return this;
 	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(validationOverride?: boolean): APIMentionableSelectComponent {
+		const clone = structuredClone(this.data);
+		validate(selectMenuMentionablePredicate, clone, validationOverride);
+
+		return clone as APIMentionableSelectComponent;
+	}
 }

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

@@ -5,13 +5,16 @@ import {
 	SelectMenuDefaultValueType,
 } from 'discord-api-types/v10';
 import { type RestOrArray, normalizeArray } from '../../util/normalizeArray.js';
-import { optionsLengthValidator } from '../Assertions.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuRolePredicate } from '../Assertions.js';
 import { BaseSelectMenuBuilder } from './BaseSelectMenu.js';
 
 /**
  * A builder that creates API-compatible JSON data for role select menus.
  */
 export class RoleSelectMenuBuilder extends BaseSelectMenuBuilder<APIRoleSelectComponent> {
+	protected override readonly data: Partial<APIRoleSelectComponent>;
+
 	/**
 	 * Creates a new select menu from API data.
 	 *
@@ -34,8 +37,9 @@ export class RoleSelectMenuBuilder extends BaseSelectMenuBuilder<APIRoleSelectCo
 	 * 	.setMinValues(1);
 	 * ```
 	 */
-	public constructor(data?: Partial<APIRoleSelectComponent>) {
-		super({ ...data, type: ComponentType.RoleSelect });
+	public constructor(data: Partial<APIRoleSelectComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.RoleSelect };
 	}
 
 	/**
@@ -45,7 +49,6 @@ export class RoleSelectMenuBuilder extends BaseSelectMenuBuilder<APIRoleSelectCo
 	 */
 	public addDefaultRoles(...roles: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(roles);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
 		this.data.default_values ??= [];
 
 		this.data.default_values.push(
@@ -59,13 +62,12 @@ export class RoleSelectMenuBuilder extends BaseSelectMenuBuilder<APIRoleSelectCo
 	}
 
 	/**
-	 * Sets default roles to this auto populated select menu.
+	 * Sets default roles for this auto populated select menu.
 	 *
 	 * @param roles - The roles to set
 	 */
 	public setDefaultRoles(...roles: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(roles);
-		optionsLengthValidator.parse(normalizedValues.length);
 
 		this.data.default_values = normalizedValues.map((id) => ({
 			id,
@@ -74,4 +76,14 @@ export class RoleSelectMenuBuilder extends BaseSelectMenuBuilder<APIRoleSelectCo
 
 		return this;
 	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(validationOverride?: boolean): APIRoleSelectComponent {
+		const clone = structuredClone(this.data);
+		validate(selectMenuRolePredicate, clone, validationOverride);
+
+		return clone as APIRoleSelectComponent;
+	}
 }

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

@@ -1,18 +1,30 @@
+/* eslint-disable jsdoc/check-param-names */
+
 import { ComponentType } from 'discord-api-types/v10';
 import type { APIStringSelectComponent, APISelectMenuOption } from 'discord-api-types/v10';
 import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
-import { jsonOptionValidator, optionsLengthValidator, validateRequiredSelectMenuParameters } from '../Assertions.js';
+import { resolveBuilder } from '../../util/resolveBuilder.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuStringPredicate } from '../Assertions.js';
 import { BaseSelectMenuBuilder } from './BaseSelectMenu.js';
 import { StringSelectMenuOptionBuilder } from './StringSelectMenuOption.js';
 
+export interface StringSelectMenuData extends Partial<Omit<APIStringSelectComponent, 'options'>> {
+	options: StringSelectMenuOptionBuilder[];
+}
+
 /**
  * A builder that creates API-compatible JSON data for string select menus.
  */
 export class StringSelectMenuBuilder extends BaseSelectMenuBuilder<APIStringSelectComponent> {
+	protected override readonly data: StringSelectMenuData;
+
 	/**
-	 * The options within this select menu.
+	 * The options for this select menu.
 	 */
-	public readonly options: StringSelectMenuOptionBuilder[];
+	public get options(): readonly StringSelectMenuOptionBuilder[] {
+		return this.data.options;
+	}
 
 	/**
 	 * Creates a new select menu from API data.
@@ -45,10 +57,13 @@ export class StringSelectMenuBuilder extends BaseSelectMenuBuilder<APIStringSele
 	 * 	});
 	 * ```
 	 */
-	public constructor(data?: Partial<APIStringSelectComponent>) {
-		const { options, ...initData } = data ?? {};
-		super({ ...initData, type: ComponentType.StringSelect });
-		this.options = options?.map((option: APISelectMenuOption) => new StringSelectMenuOptionBuilder(option)) ?? [];
+	public constructor({ options = [], ...data }: Partial<APIStringSelectComponent> = {}) {
+		super();
+		this.data = {
+			...structuredClone(data),
+			options: options.map((option) => new StringSelectMenuOptionBuilder(option)),
+			type: ComponentType.StringSelect,
+		};
 	}
 
 	/**
@@ -56,16 +71,18 @@ export class StringSelectMenuBuilder extends BaseSelectMenuBuilder<APIStringSele
 	 *
 	 * @param options - The options to add
 	 */
-	public addOptions(...options: RestOrArray<APISelectMenuOption | StringSelectMenuOptionBuilder>) {
+	public addOptions(
+		...options: RestOrArray<
+			| APISelectMenuOption
+			| StringSelectMenuOptionBuilder
+			| ((builder: StringSelectMenuOptionBuilder) => StringSelectMenuOptionBuilder)
+		>
+	) {
 		const normalizedOptions = normalizeArray(options);
-		optionsLengthValidator.parse(this.options.length + normalizedOptions.length);
-		this.options.push(
-			...normalizedOptions.map((normalizedOption) =>
-				normalizedOption instanceof StringSelectMenuOptionBuilder
-					? normalizedOption
-					: new StringSelectMenuOptionBuilder(jsonOptionValidator.parse(normalizedOption)),
-			),
-		);
+		const resolved = normalizedOptions.map((option) => resolveBuilder(option, StringSelectMenuOptionBuilder));
+
+		this.data.options.push(...resolved);
+
 		return this;
 	}
 
@@ -74,8 +91,14 @@ export class StringSelectMenuBuilder extends BaseSelectMenuBuilder<APIStringSele
 	 *
 	 * @param options - The options to set
 	 */
-	public setOptions(...options: RestOrArray<APISelectMenuOption | StringSelectMenuOptionBuilder>) {
-		return this.spliceOptions(0, this.options.length, ...options);
+	public setOptions(
+		...options: RestOrArray<
+			| APISelectMenuOption
+			| StringSelectMenuOptionBuilder
+			| ((builder: StringSelectMenuOptionBuilder) => StringSelectMenuOptionBuilder)
+		>
+	) {
+		return this.spliceOptions(0, this.options.length, ...normalizeArray(options));
 	}
 
 	/**
@@ -108,36 +131,33 @@ export class StringSelectMenuBuilder extends BaseSelectMenuBuilder<APIStringSele
 	public spliceOptions(
 		index: number,
 		deleteCount: number,
-		...options: RestOrArray<APISelectMenuOption | StringSelectMenuOptionBuilder>
+		...options: (
+			| APISelectMenuOption
+			| StringSelectMenuOptionBuilder
+			| ((builder: StringSelectMenuOptionBuilder) => StringSelectMenuOptionBuilder)
+		)[]
 	) {
-		const normalizedOptions = normalizeArray(options);
+		const resolved = options.map((option) => resolveBuilder(option, StringSelectMenuOptionBuilder));
 
-		const clone = [...this.options];
+		this.data.options ??= [];
+		this.data.options.splice(index, deleteCount, ...resolved);
 
-		clone.splice(
-			index,
-			deleteCount,
-			...normalizedOptions.map((normalizedOption) =>
-				normalizedOption instanceof StringSelectMenuOptionBuilder
-					? normalizedOption
-					: new StringSelectMenuOptionBuilder(jsonOptionValidator.parse(normalizedOption)),
-			),
-		);
-
-		optionsLengthValidator.parse(clone.length);
-		this.options.splice(0, this.options.length, ...clone);
 		return this;
 	}
 
 	/**
-	 * {@inheritDoc BaseSelectMenuBuilder.toJSON}
+	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
-	public override toJSON(): APIStringSelectComponent {
-		validateRequiredSelectMenuParameters(this.options, this.data.custom_id);
+	public override toJSON(validationOverride?: boolean): APIStringSelectComponent {
+		const { options, ...rest } = this.data;
+		const data = {
+			...(structuredClone(rest) as APIStringSelectComponent),
+			// selectMenuStringPredicate covers the validation of options
+			options: options.map((option) => option.toJSON(false)),
+		};
 
-		return {
-			...this.data,
-			options: this.options.map((option) => option.toJSON()),
-		} as APIStringSelectComponent;
+		validate(selectMenuStringPredicate, data, validationOverride);
+
+		return data as APIStringSelectComponent;
 	}
 }

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

@@ -1,16 +1,14 @@
 import type { JSONEncodable } from '@discordjs/util';
 import type { APIMessageComponentEmoji, APISelectMenuOption } from 'discord-api-types/v10';
-import {
-	defaultValidator,
-	emojiValidator,
-	labelValueDescriptionValidator,
-	validateRequiredSelectMenuOptionParameters,
-} from '../Assertions.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuStringOptionPredicate } from '../Assertions.js';
 
 /**
  * A builder that creates API-compatible JSON data for string select menu options.
  */
 export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMenuOption> {
+	private readonly data: Partial<APISelectMenuOption>;
+
 	/**
 	 * Creates a new string select menu option from API data.
 	 *
@@ -33,7 +31,9 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * 	.setLabel('woah');
 	 * ```
 	 */
-	public constructor(public data: Partial<APISelectMenuOption> = {}) {}
+	public constructor(data: Partial<APISelectMenuOption> = {}) {
+		this.data = structuredClone(data);
+	}
 
 	/**
 	 * Sets the label for this option.
@@ -41,7 +41,7 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * @param label - The label to use
 	 */
 	public setLabel(label: string) {
-		this.data.label = labelValueDescriptionValidator.parse(label);
+		this.data.label = label;
 		return this;
 	}
 
@@ -51,7 +51,7 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * @param value - The value to use
 	 */
 	public setValue(value: string) {
-		this.data.value = labelValueDescriptionValidator.parse(value);
+		this.data.value = value;
 		return this;
 	}
 
@@ -61,7 +61,15 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * @param description - The description to use
 	 */
 	public setDescription(description: string) {
-		this.data.description = labelValueDescriptionValidator.parse(description);
+		this.data.description = description;
+		return this;
+	}
+
+	/**
+	 * Clears the description for this option.
+	 */
+	public clearDescription() {
+		this.data.description = undefined;
 		return this;
 	}
 
@@ -71,7 +79,7 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * @param isDefault - Whether this option is selected by default
 	 */
 	public setDefault(isDefault = true) {
-		this.data.default = defaultValidator.parse(isDefault);
+		this.data.default = isDefault;
 		return this;
 	}
 
@@ -81,18 +89,25 @@ export class StringSelectMenuOptionBuilder implements JSONEncodable<APISelectMen
 	 * @param emoji - The emoji to use
 	 */
 	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emojiValidator.parse(emoji);
+		this.data.emoji = emoji;
 		return this;
 	}
 
 	/**
-	 * {@inheritDoc BaseSelectMenuBuilder.toJSON}
+	 * Clears the emoji for this option.
 	 */
-	public toJSON(): APISelectMenuOption {
-		validateRequiredSelectMenuOptionParameters(this.data.label, this.data.value);
+	public clearEmoji() {
+		this.data.emoji = undefined;
+		return this;
+	}
 
-		return {
-			...this.data,
-		} as APISelectMenuOption;
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(validationOverride?: boolean): APISelectMenuOption {
+		const clone = structuredClone(this.data);
+		validate(selectMenuStringOptionPredicate, clone, validationOverride);
+
+		return clone as APISelectMenuOption;
 	}
 }

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

@@ -5,13 +5,16 @@ import {
 	SelectMenuDefaultValueType,
 } from 'discord-api-types/v10';
 import { type RestOrArray, normalizeArray } from '../../util/normalizeArray.js';
-import { optionsLengthValidator } from '../Assertions.js';
+import { validate } from '../../util/validation.js';
+import { selectMenuUserPredicate } from '../Assertions.js';
 import { BaseSelectMenuBuilder } from './BaseSelectMenu.js';
 
 /**
  * A builder that creates API-compatible JSON data for user select menus.
  */
 export class UserSelectMenuBuilder extends BaseSelectMenuBuilder<APIUserSelectComponent> {
+	protected override readonly data: Partial<APIUserSelectComponent>;
+
 	/**
 	 * Creates a new select menu from API data.
 	 *
@@ -34,8 +37,9 @@ export class UserSelectMenuBuilder extends BaseSelectMenuBuilder<APIUserSelectCo
 	 * 	.setMinValues(1);
 	 * ```
 	 */
-	public constructor(data?: Partial<APIUserSelectComponent>) {
-		super({ ...data, type: ComponentType.UserSelect });
+	public constructor(data: Partial<APIUserSelectComponent> = {}) {
+		super();
+		this.data = { ...structuredClone(data), type: ComponentType.UserSelect };
 	}
 
 	/**
@@ -45,9 +49,8 @@ export class UserSelectMenuBuilder extends BaseSelectMenuBuilder<APIUserSelectCo
 	 */
 	public addDefaultUsers(...users: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(users);
-		optionsLengthValidator.parse((this.data.default_values?.length ?? 0) + normalizedValues.length);
-		this.data.default_values ??= [];
 
+		this.data.default_values ??= [];
 		this.data.default_values.push(
 			...normalizedValues.map((id) => ({
 				id,
@@ -59,13 +62,12 @@ export class UserSelectMenuBuilder extends BaseSelectMenuBuilder<APIUserSelectCo
 	}
 
 	/**
-	 * Sets default users to this auto populated select menu.
+	 * Sets default users for this auto populated select menu.
 	 *
 	 * @param users - The users to set
 	 */
 	public setDefaultUsers(...users: RestOrArray<Snowflake>) {
 		const normalizedValues = normalizeArray(users);
-		optionsLengthValidator.parse(normalizedValues.length);
 
 		this.data.default_values = normalizedValues.map((id) => ({
 			id,
@@ -74,4 +76,14 @@ export class UserSelectMenuBuilder extends BaseSelectMenuBuilder<APIUserSelectCo
 
 		return this;
 	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public override toJSON(validationOverride?: boolean): APIUserSelectComponent {
+		const clone = structuredClone(this.data);
+		validate(selectMenuUserPredicate, clone, validationOverride);
+
+		return clone as APIUserSelectComponent;
+	}
 }

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

@@ -1,27 +1,15 @@
-import { s } from '@sapphire/shapeshift';
-import { TextInputStyle } from 'discord-api-types/v10';
-import { isValidationEnabled } from '../../util/validation.js';
-import { customIdValidator } from '../Assertions.js';
+import { ComponentType, TextInputStyle } from 'discord-api-types/v10';
+import { z } from 'zod';
+import { customIdPredicate } from '../../Assertions.js';
 
-export const textInputStyleValidator = s.nativeEnum(TextInputStyle);
-export const minLengthValidator = s.number.int
-	.greaterThanOrEqual(0)
-	.lessThanOrEqual(4_000)
-	.setValidationEnabled(isValidationEnabled);
-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
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(45)
-	.setValidationEnabled(isValidationEnabled);
-
-export function validateRequiredParameters(customId?: string, style?: TextInputStyle, label?: string) {
-	customIdValidator.parse(customId);
-	textInputStyleValidator.parse(style);
-	labelValidator.parse(label);
-}
+export const textInputPredicate = z.object({
+	type: z.literal(ComponentType.TextInput),
+	custom_id: customIdPredicate,
+	label: z.string().min(1).max(45),
+	style: z.nativeEnum(TextInputStyle),
+	min_length: z.number().min(0).max(4_000).optional(),
+	max_length: z.number().min(1).max(4_000).optional(),
+	placeholder: z.string().max(100).optional(),
+	value: z.string().max(4_000).optional(),
+	required: z.boolean().optional(),
+});