chore(collection): release @discordjs/collection@1.1.0

fix(proxyRequests): typo in error message

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

.dockerignore

@@ -0,0 +1,38 @@
+# Packages
+node_modules/
+
+# Log files
+logs/
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Env
+.env
+
+# Dist
+dist/
+
+# Miscellaneous
+.tmp/
+.vscode/*
+!.vscode/extensions.json
+!.vscode/settings.json
+.idea/
+.DS_Store
+.turbo
+tsconfig.tsbuildinfo
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.eslintrc.json

@@ -0,0 +1,11 @@
+{
+	"root": true,
+	"extends": "marine/prettier/node",
+	"parserOptions": {
+		"project": "./tsconfig.eslint.json"
+	},
+	"ignorePatterns": ["**/dist/*"],
+	"env": {
+		"jest": true
+	}
+}

.github/.kodiak.toml

@@ -0,0 +1,11 @@
+version = 1
+
+[merge]
+require_automerge_label = false
+blocking_labels = ['blocked']
+method = 'squash'
+
+[merge.message]
+title = 'pull_request_title'
+strip_html_comments = true
+include_coauthors = true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -16,7 +16,9 @@ body:
         - collection
         - rest
         - proxy
+        - proxy-container
         - voice
+        - ws
     validations:
       required: true
   - type: textarea
@@ -127,6 +129,7 @@ body:
         - DirectMessages
         - DirectMessageReactions
         - DirectMessageTyping
+        - MessageContent
         - GuildScheduledEvents
       multiple: true
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -18,7 +18,9 @@ body:
         - collection
         - rest
         - proxy
+        - proxy-container
         - voice
+        - ws
     validations:
       required: true
   - type: textarea

.github/labeler.yml

@@ -1,7 +1,3 @@
-chore:
-  - any: ['*']
-    all: ['!packages/*', '!packages/**/*']
-
 'packages:builders':
   - packages/builders/*
   - packages/builders/**/*
@@ -14,10 +10,18 @@ chore:
   - packages/discord.js/*
   - packages/discord.js/**/*
 
+'packages:docgen':
+  - packages/docgen/*
+  - packages/docgen/**/*
+
 'packages:proxy':
   - packages/proxy/*
   - packages/proxy/**/*
 
+'packages:proxy-container':
+  - packages/proxy-container/*
+  - packages/proxy-container/**/*
+
 'packages:rest':
   - packages/rest/*
   - packages/rest/**/*
@@ -26,6 +30,10 @@ chore:
   - packages/voice/*
   - packages/voice/**/*
 
+'packages:website':
+  - packages/website/*
+  - packages/website/**/*
+
 'packages:ws':
   - packages/ws/*
   - packages/ws/**/*

.github/labels.yml

@@ -4,6 +4,8 @@
   color: '5663e9'
 - name: 'backlog'
   color: '7ef7ef'
+- name: 'blocked'
+  color: 'fc1423'
 - name: 'bug'
   color: 'd73a4a'
 - name: 'caching'
@@ -50,12 +52,18 @@
   color: 'fbca04'
 - name: 'packages:discord.js'
   color: 'fbca04'
+- name: 'packages:docgen'
+  color: 'fbca04'
 - name: 'packages:proxy'
   color: 'fbca04'
+- name: 'packages:proxy-container'
+  color: 'fbca04'
 - name: 'packages:rest'
   color: 'fbca04'
 - name: 'packages:voice'
   color: 'fbca04'
+- name: 'packages:website'
+  color: 'fbca04'
 - name: 'packages:ws'
   color: 'fbca04'
 - name: 'performance'

.github/workflows/documentation.yml

@@ -3,51 +3,68 @@ on:
   push:
     branches:
       - 'main'
-      - 'stable'
-      - '!docs'
     tags:
       - '**'
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The branch, tag or SHA to checkout'
+        required: true
+      ref_type:
+        type: choice
+        description: 'Branch or tag'
+        options:
+          - branch
+          - tag
+        required: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     name: Build documentation
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'discordjs'
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     outputs:
       BRANCH_NAME: ${{ steps.env.outputs.BRANCH_NAME }}
       BRANCH_OR_TAG: ${{ steps.env.outputs.BRANCH_OR_TAG }}
       SHA: ${{ steps.env.outputs.SHA }}
+    if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.ref || '' }}
 
       - name: Install node.js v16
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: 'yarn'
-          cache-dependency-path: yarn.lock
-
-      - name: Turbo cache
-        id: turbo-cache
-        uses: actions/cache@v2
-        with:
-          path: .turbo
-          key: turbo-${{ github.job }}-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            turbo-${{ github.job }}-${{ github.ref_name }}-
 
       - name: Install dependencies
         run: yarn --immutable
 
-      - name: Build docs
-        run: yarn docs --cache-dir=".turbo"
+      - name: Build dependencies
+        run: yarn build
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+      - name: Build docs
+        run: yarn docs
+
+      - name: Upload docgen artifacts
+        uses: actions/upload-artifact@v3
         with:
-          name: docs
+          name: docgen
           path: packages/*/docs/docs.json
 
+      - name: Upload api-extractor artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: api-extractor
+          path: packages/*/docs/docs.api.json
+
       - name: Set outputs for upload job
         id: env
         run: |
@@ -62,74 +79,78 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        package: ['builders', 'collection', 'discord.js', 'proxy', 'rest', 'voice']
+        package: ['builders', 'collection', 'discord.js', 'proxy', 'rest', 'voice', 'ws']
     runs-on: ubuntu-latest
     env:
-      BRANCH_NAME: ${{ needs.build.outputs.BRANCH_NAME }}
-      BRANCH_OR_TAG: ${{ needs.build.outputs.BRANCH_OR_TAG }}
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+      BRANCH_NAME: ${{ github.event.inputs.ref || needs.build.outputs.BRANCH_NAME }}
+      BRANCH_OR_TAG: ${{ github.event.inputs.ref_type || needs.build.outputs.BRANCH_OR_TAG }}
       SHA: ${{ needs.build.outputs.SHA }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install node.js v16
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: 'yarn'
-          cache-dependency-path: yarn.lock
-
-      - name: Turbo cache
-        id: turbo-cache
-        uses: actions/cache@v2
-        with:
-          path: .turbo
-          key: turbo-${{ github.job }}-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            turbo-${{ github.job }}-${{ github.ref_name }}-
 
       - name: Install dependencies
         run: yarn --immutable
 
       - name: Build actions
-        run: yarn build --cache-dir=".turbo"
+        run: yarn workspace @discordjs/actions build
 
-      - name: Download artifacts
-        uses: actions/download-artifact@v2
+      - name: Download docgen artifacts
+        uses: actions/download-artifact@v3
         with:
-          name: docs
+          name: docgen
+          path: docs
+
+      - name: Download api-extractor artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: api-extractor
           path: docs
 
       - name: Checkout docs repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: 'discordjs/docs'
           token: ${{ secrets.DJS_DOCS }}
           path: 'out'
 
       - name: Extract package and semver from tag
-        if: env.BRANCH_OR_TAG == 'tag'
+        if: ${{ github.event.inputs.ref_type == 'tag' || env.BRANCH_OR_TAG == 'tag' }}
         id: extract-tag
         uses: ./packages/actions/src/formatTag
         with:
           tag: ${{ env.BRANCH_NAME }}
 
       - name: Move docs to correct directory
-        if: env.BRANCH_OR_TAG == 'tag'
+        if: ${{ (github.event.inputs.ref_type == 'tag' || env.BRANCH_OR_TAG == 'tag') && matrix.package == steps.extract-tag.outputs.package }}
         env:
           PACKAGE: ${{ steps.extract-tag.outputs.package }}
           SEMVER: ${{ steps.extract-tag.outputs.semver }}
         run: |
           mkdir -p out/${PACKAGE}
           mv docs/${PACKAGE}/docs/docs.json out/${PACKAGE}/${SEMVER}.json
+          if [[ $PACKAGE != "discord.js" ]]; then
+            mv docs/${PACKAGE}/docs/docs.api.json out/${PACKAGE}/${SEMVER}.api.json
+          fi
 
       - name: Move docs to correct directory
-        if: env.BRANCH_OR_TAG == 'branch'
+        if: ${{ github.event.inputs.ref_type == 'branch' || env.BRANCH_OR_TAG == 'branch' }}
         env:
           PACKAGE: ${{ matrix.package }}
         run: |
           mkdir -p out/${PACKAGE}
           mv docs/${PACKAGE}/docs/docs.json out/${PACKAGE}/${BRANCH_NAME}.json
+          if [[ $PACKAGE != "discord.js" ]]; then
+            mv docs/${PACKAGE}/docs/docs.api.json out/${PACKAGE}/${BRANCH_NAME}.api.json
+          fi
 
       - name: Commit and push
         run: |

.github/workflows/label-sync.yml

@@ -1,4 +1,4 @@
-name: Label Sync
+name: Label sync
 on:
   schedule:
     - cron: '0 0 * * *'
@@ -9,14 +9,15 @@ on:
     paths:
       - '.github/labels.yml'
 jobs:
-  labelsync:
+  label-sync:
     name: Label sync
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Label sync
-        uses: crazy-max/ghaction-github-labeler@v3
+        uses: crazy-max/ghaction-github-labeler@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/npm-auto-deprecate.yml

@@ -1,28 +1,27 @@
 name: npm auto deprecate
 on:
-  workflow_dispatch:
   schedule:
     - cron: '0 1 * * *'
+  workflow_dispatch:
 jobs:
-  auto-deprecate:
+  npm-auto-deprecate:
     name: npm auto deprecate
     runs-on: ubuntu-latest
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install node.js v16
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: 'yarn'
-          cache-dependency-path: yarn.lock
 
       - name: Install dependencies
         run: yarn --immutable
 
       - name: Deprecate versions
-        run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/builders @discordjs/collection discord.js @discordjs/rest @discordjs/voice'
+        run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/builders @discordjs/collection discord.js @discordjs/proxy @discordjs/rest @discordjs/voice'
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/pr-triage.yml

@@ -1,12 +1,13 @@
-name: 'PR Automation'
+name: 'PR Triage'
 on:
   pull_request_target:
 jobs:
-  triage:
+  pr-triage:
+    name: PR Triage
     runs-on: ubuntu-latest
     steps:
       - name: Automatically label PR
-        uses: actions/labeler@v3
+        uses: actions/labeler@v4
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           sync-labels: true

.github/workflows/publish-dev-docker.yml

@@ -0,0 +1,25 @@
+name: Publish dev docker images
+on:
+  schedule:
+    - cron: '0 */12 * * *'
+  workflow_dispatch:
+jobs:
+  docker-publish:
+    name: Docker publish
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'discordjs'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+      - name: Build the image
+        run: docker build -t discordjs/proxy:latest -f packages/proxy-container/Dockerfile .
+
+      - name: Push image to DockerHub
+        run: docker push discordjs/proxy:latest

.github/workflows/publish-dev.yml

@@ -1,11 +1,11 @@
 name: Publish dev
 on:
-  workflow_dispatch:
   schedule:
     - cron: '0 */12 * * *'
+  workflow_dispatch:
 jobs:
-  npm:
-    name: npm
+  npm-publish:
+    name: npm publish
     strategy:
       fail-fast: false
       matrix:
@@ -22,54 +22,33 @@ jobs:
             folder: 'rest'
           - package: '@discordjs/voice'
             folder: 'voice'
+          - package: '@discordjs/ws'
+            folder: 'ws'
     runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install node.js v16
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
           cache: 'yarn'
-          cache-dependency-path: yarn.lock
-
-      - name: Turbo cache
-        id: turbo-cache
-        uses: actions/cache@v2
-        with:
-          path: .turbo
-          key: turbo-${{ github.job }}-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            turbo-${{ github.job }}-${{ github.ref_name }}-
-
-      - name: Check previous released version
-        id: pre-release
-        run: |
-          if [[ $(npm view ${{ matrix.package }}@dev version | grep -e "$(jq --raw-output '.version' packages/${{ matrix.folder }}/package.json)\..*-$(git rev-parse --short HEAD)") ]]; \
-          then echo '::set-output name=release::false'; \
-          else echo '::set-output name=release::true'; fi
 
       - name: Install dependencies
-        if: steps.pre-release.outputs.release == 'true'
         run: yarn --immutable
 
       - name: Build dependencies
-        if: steps.pre-release.outputs.release == 'true'
-        run: yarn build --cache-dir=".turbo"
+        run: yarn build
 
-      - name: Deprecate old versions
-        if: steps.pre-release.outputs.release == 'true'
-        run: npm deprecate ${{ matrix.package }}@"~$(jq --raw-output '.version' packages/${{ matrix.folder }}/package.json)" "no longer supported" || true
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
-
-      - name: Publish
-        if: steps.pre-release.outputs.release == 'true'
+      - name: Publish package
         run: |
-          yarn workspace ${{ matrix.package }} version $(jq --raw-output '.version' packages/${{ matrix.folder }}/package.json).$(date +%s)-$(git rev-parse --short HEAD)
+          yarn workspace ${{ matrix.package }} release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)"
           yarn workspace ${{ matrix.package }} npm publish --tag dev || true
         env:
           YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/publish-docker.yml

@@ -0,0 +1,25 @@
+name: Publish docker images
+on:
+  workflow_dispatch:
+jobs:
+  docker-publish:
+    name: Docker publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+      - name: Build docker image
+        run: docker build -t discordjs/proxy:latest -f packages/proxy-container/Dockerfile .
+
+      - name: Tag image with major
+        run: docker tag discordjs/proxy discordjs/proxy:$(cut -d '.' -f1 <<< $(jq --raw-output '.version' packages/proxy-container/package.json))
+
+      - name: Push image to DockerHub
+        run: docker push --all-tags discordjs/proxy

.github/workflows/test.yml

@@ -1,37 +0,0 @@
-name: Tests
-on: [push, pull_request]
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Install node.js v16
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          cache: 'yarn'
-          cache-dependency-path: yarn.lock
-
-      - name: Turbo cache
-        id: turbo-cache
-        uses: actions/cache@v2
-        with:
-          path: .turbo
-          key: turbo-${{ github.job }}-${{ github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            turbo-${{ github.job }}-${{ github.ref_name }}-
-
-      - name: Install dependencies
-        run: yarn --immutable
-
-      - name: ESLint
-        run: yarn lint --cache-dir=".turbo"
-
-      - name: Tests
-        run: yarn test --cache-dir=".turbo"
-
-      - name: Build
-        run: yarn build --cache-dir=".turbo"

.github/workflows/tests.yml

@@ -0,0 +1,40 @@
+name: Tests
+on:
+  push:
+  pull_request:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+      NEXT_PUBLIC_LOCAL_DEV: true
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install node.js v16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build dependencies
+        run: yarn build
+
+      - name: ESLint
+        run: yarn lint
+
+      - name: Tests
+        run: yarn test
+
+      - name: Upload Coverage
+        if: github.repository_owner == 'discordjs'
+        uses: ./packages/actions/src/uploadCoverage

.gitignore

@@ -26,6 +26,7 @@ dist/
 .DS_Store
 .turbo
 tsconfig.tsbuildinfo
+coverage/
 
 # yarn
 .pnp.*
@@ -35,3 +36,7 @@ tsconfig.tsbuildinfo
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+# Cache
+.prettiercache
+.eslintcache

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn format
+yarn build && yarn lint-staged

.lintstagedrc.json

@@ -0,0 +1,5 @@
+{
+	"*": "prettier --ignore-unknown --write",
+	"{src/**,__tests__/**}.{mjs,js,ts}": "eslint --ext mjs,js,ts --fix",
+	"src/**.ts": "vitest related --run"
+}

.vscode/extensions.json

@@ -7,6 +7,7 @@
 		"codezombiech.gitignore",
 		"eamodio.gitlens",
 		"christian-kohler.npm-intellisense",
-		"christian-kohler.path-intellisense"
+		"christian-kohler.path-intellisense",
+		"antfu.unocss"
 	]
 }

.vscode/settings.json

@@ -6,7 +6,6 @@
 		"source.fixAll": true,
 		"source.organizeImports": false
 	},
-	"files.exclude": {
-		"**/node_modules": true
-	}
+	"unocss.root": "./packages/website",
+	"typescript.tsdk": "node_modules/typescript/lib"
 }

.yarn/patches/@microsoft-tsdoc-config-npm-0.16.1-81031b1bbf.patch

@@ -0,0 +1,14 @@
+diff --git a/lib/TSDocConfigFile.js b/lib/TSDocConfigFile.js
+index caf3515d60fd386c5909db5a0aa8b4180b10d602..6fa4f1984b6ba6b3a7aecd05e54477ebf141af94 100644
+--- a/lib/TSDocConfigFile.js
++++ b/lib/TSDocConfigFile.js
+@@ -31,8 +31,7 @@ const ajv_1 = __importDefault(require("ajv"));
+ const jju = __importStar(require("jju"));
+ const ajv = new ajv_1.default({ verbose: true });
+ function initializeSchemaValidator() {
+-    const jsonSchemaPath = resolve.sync('@microsoft/tsdoc/schemas/tsdoc.schema.json', { basedir: __dirname });
+-    const jsonSchemaContent = fs.readFileSync(jsonSchemaPath).toString();
++    const jsonSchemaContent = "{\"title\":\"TSDoc Configuration\",\"description\":\"Describes the TSDoc configuration for a TypeScript project\",\"type\":\"object\",\"properties\":{\"$schema\":{\"description\":\"Part of the JSON Schema standard, this optional keyword declares the URL of the schema that the file conforms to. Editors may download the schema and use it to perform syntax highlighting.\",\"type\":\"string\"},\"extends\":{\"description\":\"Optionally specifies one or more JSON config files that will be combined with this file.  This provides a way for standard settings to be shared across multiple projects.  Important: The \\\"extends\\\" paths are resolved using NodeJS module resolution, so a path to a local file MUST be prefixed with \\\"./\\\".\",\"type\":\"array\",\"items\":{\"type\":\"string\"}},\"noStandardTags\":{\"description\":\"By default, the config file loader will predefine all of the standardized TSDoc tags.  To disable this and start with a completely empty configuration, set \\\"noStandardTags\\\"=true.\",\"type\":\"boolean\"},\"tagDefinitions\":{\"description\":\"Additional tags to support when parsing documentation comments with TSDoc.\",\"type\":\"array\",\"items\":{\"$ref\":\"#/definitions/tsdocTagDefinition\"}},\"supportedHtmlElements\":{\"description\":\"The HTML element names that are supported in this configuration. Used in conjunction with the \\\"reportUnsupportedHtmlElements\\\" setting.\",\"type\":\"array\",\"items\":{\"type\":\"string\",\"pattern\":\"^[a-zA-Z0-9-]+$\"}},\"reportUnsupportedHtmlElements\":{\"description\":\"Whether an error should be reported when an unsupported HTML element is encountered in a doc comment. Defaults to \\\"true\\\" if the \\\"supportedHtmlElements\\\" field is present in this file, \\\"false\\\" if not.\",\"type\":\"boolean\"},\"supportForTags\":{\"description\":\"A collection of key/value pairs.  The key is a TSDoc tag name (e.g. \\\"@myTag\\\") that must be defined in this configuration.  The value is a boolean indicating whether the tag is supported.  The TSDoc parser may report warnings when unsupported tags are encountered.  If \\\"supportForTags\\\" is specified for at least one tag, then the \\\"reportUnsupportedTags\\\" validation check is enabled by default.\",\"type\":\"object\",\"patternProperties\":{\"@[a-zA-Z][a-zA-Z0-9]*$\":{\"type\":\"boolean\"}},\"additionalItems\":false}},\"required\":[\"$schema\"],\"additionalProperties\":false,\"definitions\":{\"tsdocTagDefinition\":{\"description\":\"Configuration for a custom supported TSDoc tag.\",\"type\":\"object\",\"properties\":{\"tagName\":{\"description\":\"Name of the custom tag. TSDoc tag names start with an at-sign (@) followed by ASCII letters using camelCase capitalization.\",\"type\":\"string\"},\"syntaxKind\":{\"description\":\"Syntax kind of the custom tag. \\\"inline\\\" means that this tag can appear inside other documentation sections (example: {@link}). \\\"block\\\" means that this tag starts a new documentation section (example: @remarks). \\\"modifier\\\" means that this tag's presence indicates an aspect of the associated API item (example: @internal).\",\"type\":\"string\",\"enum\":[\"inline\",\"block\",\"modifier\"]},\"allowMultiple\":{\"description\":\"If true, then this tag may appear multiple times in a doc comment. By default, a tag may only appear once.\",\"type\":\"boolean\"}},\"required\":[\"tagName\",\"syntaxKind\"],\"additionalProperties\":false}}}";
+     const jsonSchema = jju.parse(jsonSchemaContent, { mode: 'cjson' });
+     return ajv.compile(jsonSchema);
+ }

LICENSE

@@ -0,0 +1,191 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2021 Noel Buechler
+   Copyright 2015 Amish Shah
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,15 +1,19 @@
 <div align="center">
-  <br />
-  <p>
-    <a href="https://discord.js.org"><img src="https://discord.js.org/static/logo.svg" width="546" alt="discord.js" /></a>
-  </p>
-  <br />
-  <p>
-    <a href="https://discord.gg/djs"><img src="https://img.shields.io/discord/222078108977594368?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
-    <a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/v/discord.js.svg?maxAge=3600" alt="npm version" /></a>
-    <a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/dt/discord.js.svg?maxAge=3600" alt="npm downloads" /></a>
-    <a href="https://github.com/discordjs/discord.js/actions"><img src="https://github.com/discordjs/discord.js/actions/workflows/test.yml/badge.svg" alt="Tests status" /></a>
-  </p>
+	<br />
+	<p>
+		<a href="https://discord.js.org"><img src="https://discord.js.org/static/logo.svg" width="546" alt="discord.js" /></a>
+	</p>
+	<br />
+	<p>
+		<a href="https://discord.gg/djs"><img src="https://img.shields.io/discord/222078108977594368?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
+		<a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/v/discord.js.svg?maxAge=3600" alt="npm version" /></a>
+		<a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/dt/discord.js.svg?maxAge=3600" alt="npm downloads" /></a>
+		<a href="https://github.com/discordjs/discord.js/actions"><img src="https://github.com/discordjs/discord.js/actions/workflows/test.yml/badge.svg" alt="Tests status" /></a>
+		<a href="https://codecov.io/gh/discordjs/discord.js" ><img src="https://codecov.io/gh/discordjs/discord.js/branch/main/graph/badge.svg?precision=2" alt="Code coverage" /></a>
+	</p>
+	<p>
+		<a href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
+	</p>
 </div>
 
 ## About
@@ -42,19 +46,18 @@ pnpm add discord.js
 
 ## Example usage
 
-Install all required dependencies:
+Install discord.js:
 
 ```sh-session
-npm install discord.js @discordjs/rest discord-api-types
-yarn add discord.js @discordjs/rest discord-api-types
-pnpm add discord.js @discordjs/rest discord-api-types
+npm install discord.js
+yarn add discord.js
+pnpm add discord.js
 ```
 
 Register a slash command against the Discord API:
 
 ```js
-const { REST } = require('@discordjs/rest');
-const { Routes } = require('discord-api-types/v10');
+const { REST, Routes } = require('discord.js');
 
 const commands = [
 	{
@@ -69,7 +72,7 @@ const rest = new REST({ version: '10' }).setToken('token');
 	try {
 		console.log('Started refreshing application (/) commands.');
 
-		await rest.put(Routes.applicationGuildCommands(CLIENT_ID, GUILD_ID), { body: commands });
+		await rest.put(Routes.applicationCommands(CLIENT_ID), { body: commands });
 
 		console.log('Successfully reloaded application (/) commands.');
 	} catch (error) {
@@ -89,7 +92,7 @@ client.on('ready', () => {
 });
 
 client.on('interactionCreate', async (interaction) => {
-	if (!interaction.isCommand()) return;
+	if (!interaction.isChatInputCommand()) return;
 
 	if (interaction.commandName === 'ping') {
 		await interaction.reply('Pong!');
@@ -101,10 +104,10 @@ client.login('token');
 
 ## Links
 
-- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/website))
+- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/discord.js/tree/main/packages/website))
 - [Documentation](https://discord.js.org/#/docs)
 - [Guide](https://discordjs.guide/) ([source](https://github.com/discordjs/guide))
-  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v13.html), including updated and removed items in the library.
+  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v14.html), including updated and removed items in the library.
 - [discord.js Discord server](https://discord.gg/djs)
 - [Discord API Discord server](https://discord.gg/discord-api)
 - [GitHub](https://github.com/discordjs/discord.js)

build.config.ts

@@ -0,0 +1,95 @@
+import { relative, resolve } from 'node:path';
+import glob from 'fast-glob';
+import isCi from 'is-ci';
+import typescript from 'rollup-plugin-typescript2';
+import { defineBuildConfig, BuildEntry } from 'unbuild';
+
+interface ConfigOptions {
+	entries: (BuildEntry | string)[];
+	minify: boolean;
+	emitCJS: boolean;
+	externals: string[];
+	cjsBridge: boolean;
+	sourcemap: boolean;
+	preserveModules: boolean;
+	preserveModulesRoot: string;
+	declaration: boolean;
+	typeCheck: boolean;
+}
+
+export function createUnbuildConfig({
+	entries = [{ builder: 'rollup', input: 'src/index' }],
+	minify = false,
+	emitCJS = true,
+	cjsBridge = true,
+	externals = [],
+	sourcemap = true,
+	preserveModules = true,
+	preserveModulesRoot = 'src',
+	declaration = true,
+	typeCheck = isCi,
+}: Partial<ConfigOptions> = {}) {
+	const files = glob
+		.sync('**', { cwd: 'src' })
+		.map((file) => [`${file.slice(0, -2)}cjs`, `${file.slice(0, -2)}mjs`])
+		.flat();
+
+	return defineBuildConfig({
+		entries,
+		clean: true,
+		rollup: {
+			esbuild: {
+				minify,
+				minifyIdentifiers: false,
+			},
+			emitCJS,
+			cjsBridge,
+			json: {
+				namedExports: false,
+				preferConst: true,
+			},
+		},
+
+		externals: [...files, ...externals],
+
+		hooks: {
+			'rollup:options': (_, options) => {
+				// @ts-expect-error: This will always be an array
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				options.output![0] = {
+					// @ts-expect-error: This will always be an array
+					...options.output![0],
+					sourcemap,
+					preserveModules,
+					preserveModulesRoot,
+				};
+
+				if (emitCJS) {
+					// @ts-expect-error: This will always be an array
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					options.output![1] = {
+						// @ts-expect-error: This will always be an array
+						...options.output![1],
+						sourcemap,
+						preserveModules,
+						preserveModulesRoot,
+					};
+				}
+
+				if (declaration) {
+					options.plugins?.unshift(
+						typescript({
+							check: typeCheck,
+							tsconfig: relative(__dirname, resolve(process.cwd(), 'tsconfig.json')),
+							tsconfigOverride: {
+								compilerOptions: {
+									emitDeclarationOnly: true,
+								},
+							},
+						}),
+					);
+				}
+			},
+		},
+	});
+}

codecov.yml

@@ -0,0 +1,26 @@
+codecov:
+  notify:
+    after_n_builds: 6
+  strict_yaml_branch: main
+
+coverage:
+  range: '50...90'
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 5%
+        informational: true
+    patch: off
+
+flag_management:
+  default_rules:
+    statuses:
+      - type: project
+        target: auto
+        threshold: 2%
+        informational: true
+
+comment:
+  require_changes: true
+  after_n_builds: 6

package.json

@@ -5,13 +5,12 @@
 	"private": true,
 	"scripts": {
 		"build": "turbo run build",
-		"test": "turbo run test",
-		"lint": "turbo run lint",
-		"format": "turbo run format",
-		"fmt": "turbo run format",
+		"test": "turbo run test --parallel",
+		"lint": "turbo run lint --parallel",
+		"format": "turbo run format --parallel",
+		"fmt": "turbo run format --parallel",
 		"postinstall": "is-ci || husky install",
-		"docs": "turbo run docs",
-		"changelog": "turbo run changelog",
+		"docs": "turbo run docs --parallel",
 		"update": "yarn upgrade-interactive"
 	},
 	"contributors": [
@@ -38,13 +37,21 @@
 	},
 	"homepage": "https://discord.js.org",
 	"devDependencies": {
-		"@commitlint/cli": "^17.0.2",
-		"@commitlint/config-angular": "^17.0.0",
-		"@favware/npm-deprecate": "^1.0.4",
+		"@commitlint/cli": "^17.0.3",
+		"@commitlint/config-angular": "^17.0.3",
+		"@favware/cliff-jumper": "^1.8.7",
+		"@favware/npm-deprecate": "^1.0.5",
+		"@types/is-ci": "^3.0.0",
 		"conventional-changelog-cli": "^2.2.2",
+		"fast-glob": "^3.2.11",
 		"husky": "^8.0.1",
-		"prettier": "^2.6.2",
-		"turbo": "^1.2.16"
+		"is-ci": "^3.0.1",
+		"lint-staged": "^13.0.3",
+		"turbo": "^1.4.3",
+		"typescript": "^4.7.4"
+	},
+	"resolutions": {
+		"@microsoft/tsdoc-config": "patch:@microsoft/tsdoc-config@npm:0.16.1#.yarn/patches/@microsoft-tsdoc-config-npm-0.16.1-81031b1bbf.patch"
 	},
 	"engines": {
 		"node": ">=16.9.0"

packages/actions/.eslintrc.json

@@ -1,12 +1,3 @@
 {
-	"root": true,
-	"extends": "marine/prettier/node",
-	"parserOptions": {
-		"project": "./tsconfig.eslint.json",
-		"extraFileExtensions": [".mjs"]
-	},
-	"ignorePatterns": ["**/dist/*"],
-	"env": {
-		"jest": true
-	}
+	"extends": "../../.eslintrc.json"
 }

packages/actions/.lintstagedrc.js

@@ -0,0 +1 @@
+module.exports = require('../../.lintstagedrc.json');

packages/actions/.prettierignore

@@ -5,4 +5,4 @@ dist/
 docs/**/*
 !docs/index.yml
 !docs/README.md
-coverage/
+coverage/

packages/actions/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('../../.prettierrc.json');

packages/actions/.prettierrc.json

@@ -1,8 +0,0 @@
-{
-	"printWidth": 120,
-	"useTabs": true,
-	"singleQuote": true,
-	"quoteProps": "as-needed",
-	"trailingComma": "all",
-	"endOfLine": "lf"
-}

packages/actions/LICENSE

@@ -175,8 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 Noel Buechler
-   Copyright 2021 Vlad Frangu
+   Copyright 2022 Noel Buechler
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

packages/actions/README.md

@@ -4,47 +4,28 @@
 		<a href="https://discord.js.org"><img src="https://discord.js.org/static/logo.svg" width="546" alt="discord.js" /></a>
 	</p>
 	<br />
-		<p>
+	<p>
 		<a href="https://discord.gg/djs"><img src="https://img.shields.io/discord/222078108977594368?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
-		<a href="https://www.npmjs.com/package/@discordjs/builders"><img src="https://img.shields.io/npm/v/@discordjs/builders.svg?maxAge=3600" alt="npm version" /></a>
-		<a href="https://www.npmjs.com/package/@discordjs/builders"><img src="https://img.shields.io/npm/dt/@discordjs/builders.svg?maxAge=3600" alt="npm downloads" /></a>
 		<a href="https://github.com/discordjs/discord.js/actions"><img src="https://github.com/discordjs/discord.js/actions/workflows/test.yml/badge.svg" alt="Build status" /></a>
-		<a href="https://codecov.io/gh/discordjs/builders"><img src="https://codecov.io/gh/discordjs/builders/branch/main/graph/badge.svg" alt="Code coverage" /></a>
+	</p>
+	<p>
+		<a href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
 	</p>
 </div>
 
-## Installation
-
-**Node.js 16.9.0 or newer is required.**
-
-```sh-session
-npm install @discordjs/builders
-yarn add @discordjs/builders
-pnpm add @discordjs/builders
-```
-
-## Examples
-
-Here are some examples for the builders and utilities you can find in this package:
-
-- [Slash Command Builders](https://github.com/discordjs/discord.js/blob/main/packages/builders/docs/examples/Slash%20Command%20Builders.md)
-
 ## Links
 
-- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/website))
-- [Documentation](https://discord.js.org/#/docs/builders)
+- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/discord.js/tree/main/packages/website))
+- [Documentation](https://discord.js.org/#/docs)
 - [Guide](https://discordjs.guide/) ([source](https://github.com/discordjs/guide))
-  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v13.html), including updated and removed items in the library.
+  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v14.html), including updated and removed items in the library.
 - [discord.js Discord server](https://discord.gg/djs)
 - [Discord API Discord server](https://discord.gg/discord-api)
-- [GitHub](https://github.com/discordjs/discord.js/tree/main/packages/builders)
-- [npm](https://www.npmjs.com/package/@discordjs/builders)
+- [GitHub](https://github.com/discordjs/discord.js/tree/main/packages/scripts)
 - [Related libraries](https://discord.com/developers/docs/topics/community-resources#libraries)
 
 ## Contributing
 
-Before creating an issue, please ensure that it hasn't already been reported/suggested, and double-check the
-[documentation](https://discord.js.org/#/docs/builders).  
 See [the contribution guide](https://github.com/discordjs/discord.js/blob/main/.github/CONTRIBUTING.md) if you'd like to submit a PR.
 
 ## Help

packages/actions/__tests__/formatTag.test.ts

@@ -1,3 +1,4 @@
+import { describe, test, expect } from 'vitest';
 import { formatTag } from '../src';
 
 describe('Format Tag', () => {
@@ -10,8 +11,8 @@ describe('Format Tag', () => {
 	});
 
 	test('GIVEN tag with no prefix THEN return tag', () => {
-		expect(formatTag('13.5.1')).toEqual({ semver: '13.5.1' });
-		expect(formatTag('13.7.0')).toEqual({ package: undefined, semver: '13.7.0' });
+		expect(formatTag('13.5.1')).toEqual({ package: 'discord.js', semver: '13.5.1' });
+		expect(formatTag('13.7.0')).toEqual({ package: 'discord.js', semver: '13.7.0' });
 	});
 
 	test('GIVEN no or invalid tag THEN return null', () => {

packages/actions/babel.config.js

@@ -1,18 +0,0 @@
-/**
- * @type {import('@babel/core').TransformOptions}
- */
-module.exports = {
-	parserOpts: { strictMode: true },
-	sourceMaps: 'inline',
-	presets: [
-		[
-			'@babel/preset-env',
-			{
-				targets: { node: 'current' },
-				modules: 'commonjs',
-			},
-		],
-		'@babel/preset-typescript',
-	],
-	plugins: ['babel-plugin-transform-typescript-metadata', ['@babel/plugin-proposal-decorators', { legacy: true }]],
-};

packages/actions/build.config.ts

@@ -0,0 +1,11 @@
+import { createUnbuildConfig } from '../../build.config';
+
+export default createUnbuildConfig({
+	entries: [
+		{ builder: 'rollup', input: 'src/index' },
+		{ builder: 'rollup', input: 'src/formatTag/index' },
+	],
+	preserveModules: false,
+	minify: true,
+	emitCJS: false,
+});

packages/actions/codecov.yml

@@ -1,10 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 70%
-        threshold: 5%
-    patch:
-      default:
-        target: 70%
-        threshold: 5%

packages/actions/jest.config.js

@@ -1,19 +0,0 @@
-/**
- * @type {import('@jest/types').Config.InitialOptions}
- */
-module.exports = {
-	testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-	testEnvironment: 'node',
-	collectCoverage: true,
-	collectCoverageFrom: ['src/**/*.ts'],
-	coverageDirectory: 'coverage',
-	coverageReporters: ['text', 'lcov', 'clover'],
-	coverageThreshold: {
-		global: {
-			branches: 70,
-			lines: 70,
-			statements: 70,
-		},
-	},
-	coveragePathIgnorePatterns: ['src/index.ts', 'src/formatTag/index.ts'],
-};

packages/actions/package.json

@@ -1,22 +1,17 @@
 {
 	"name": "@discordjs/actions",
-	"version": "0.1.0-dev",
+	"version": "0.1.0",
 	"description": "A set of actions that we use for our workflows",
 	"private": true,
 	"scripts": {
-		"build": "tsup",
-		"test": "jest --pass-with-no-tests",
-		"lint": "prettier --check . && eslint src __tests__ --ext mjs,js,ts",
-		"format": "prettier --write . && eslint src __tests__ --ext mjs,js,ts --fix"
+		"test": "vitest run",
+		"build": "unbuild",
+		"lint": "prettier --check . && TIMING=1 eslint src __tests__ --ext mjs,js,ts",
+		"format": "prettier --write . && TIMING=1 eslint src __tests__ --ext mjs,js,ts --fix",
+		"fmt": "yarn format"
 	},
-	"main": "./dist/index.js",
-	"module": "./dist/index.mjs",
+	"main": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
-	"exports": {
-		"import": "./dist/index.mjs",
-		"require": "./dist/index.js",
-		"types": "./dist/index.d.ts"
-	},
 	"directories": {
 		"lib": "src",
 		"test": "__tests__"
@@ -44,28 +39,24 @@
 	},
 	"homepage": "https://discord.js.org",
 	"dependencies": {
-		"@actions/core": "^1.8.2",
+		"@actions/core": "^1.9.1",
 		"tslib": "^2.4.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.18.2",
-		"@babel/plugin-proposal-decorators": "^7.18.2",
-		"@babel/preset-env": "^7.18.2",
-		"@babel/preset-typescript": "^7.17.12",
-		"@types/jest": "^28.1.0",
-		"@types/node": "^16.11.38",
-		"@typescript-eslint/eslint-plugin": "^5.27.0",
-		"@typescript-eslint/parser": "^5.27.0",
-		"babel-plugin-transform-typescript-metadata": "^0.3.2",
-		"eslint": "^8.17.0",
+		"@types/node": "^16.11.52",
+		"@typescript-eslint/eslint-plugin": "^5.33.1",
+		"@typescript-eslint/parser": "^5.33.1",
+		"@vitest/coverage-c8": "^0.22.1",
+		"eslint": "^8.22.0",
 		"eslint-config-marine": "^9.4.1",
 		"eslint-config-prettier": "^8.5.0",
+		"eslint-import-resolver-typescript": "^3.4.2",
 		"eslint-plugin-import": "^2.26.0",
-		"jest": "^28.1.0",
-		"prettier": "^2.6.2",
-		"tsup": "^6.0.1",
-		"typedoc": "^0.22.17",
-		"typescript": "^4.7.3"
+		"prettier": "^2.7.1",
+		"rollup-plugin-typescript2": "^0.33.0",
+		"typescript": "^4.7.4",
+		"unbuild": "^0.8.9",
+		"vitest": "^0.22.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

packages/actions/src/formatTag/action.yml

@@ -11,4 +11,4 @@ outputs:
     description: 'The semver string that was extracted from this tag'
 runs:
   using: node16
-  main: ../../dist/formatTag/index.mjs
+  main: ../../dist/index.mjs

packages/actions/src/formatTag/formatTag.ts

@@ -2,7 +2,10 @@ export function formatTag(tag: string) {
 	const parsed = /(^@.*\/(?<package>.*)@v?)?(?<semver>\d+.\d+.\d+)-?.*/.exec(tag);
 
 	if (parsed?.groups) {
-		return parsed.groups;
+		return {
+			package: parsed.groups.package ?? 'discord.js',
+			semver: parsed.groups.semver,
+		};
 	}
 
 	return null;

packages/actions/src/formatTag/index.ts

@@ -4,7 +4,7 @@ import { formatTag } from './formatTag';
 const tag = getInput('tag', { required: true });
 const parsed = formatTag(tag);
 
-if (parsed?.groups) {
+if (parsed) {
 	setOutput('package', parsed.package);
 	setOutput('semver', parsed.semver);
 }

packages/actions/src/uploadCoverage/action.yml

@@ -0,0 +1,58 @@
+name: 'Upload Coverage'
+description: 'Uploads code coverage reports to codecov with separate flags for separate packages'
+runs:
+  using: 'composite'
+  steps:
+    - name: Upload Builders Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/builders/coverage/cobertura-coverage.xml
+        flags: builders
+
+    - name: Upload Collection Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/collection/coverage/cobertura-coverage.xml
+        flags: collection
+
+    - name: Upload Discord.js Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/discord.js/coverage/cobertura-coverage.xml
+        flags: discord.js
+
+    - name: Upload Proxy Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/proxy/coverage/cobertura-coverage.xml
+        flags: proxy
+
+    - name: Upload Rest Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/rest/coverage/cobertura-coverage.xml
+        flags: rest
+
+    - name: Upload Voice Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/voice/coverage/cobertura-coverage.xml
+        flags: voice
+
+    - name: Upload Website Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/website/coverage/cobertura-coverage.xml
+        flags: website
+
+    - name: Upload WS Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/ws/coverage/cobertura-coverage.xml
+        flags: ws
+
+    - name: Upload Utilities Coverage
+      uses: codecov/codecov-action@v3
+      with:
+        files: ./packages/actions/coverage/cobertura-coverage.xml, ./packages/scripts/coverage/cobertura-coverage.xml
+        flags: utilities

packages/actions/tsup.config.ts

@@ -1,13 +0,0 @@
-import { defineConfig } from 'tsup';
-
-export default defineConfig({
-	clean: true,
-	dts: true,
-	entryPoints: ['src/index.ts', 'src/formatTag/index.ts'],
-	format: ['esm'],
-	minify: true,
-	skipNodeModulesBundle: false,
-	noExternal: ['@actions/core'],
-	sourcemap: true,
-	target: 'es2021',
-});

packages/builders/.cliff-jumperrc.json

@@ -0,0 +1,5 @@
+{
+	"name": "builders",
+	"org": "discordjs",
+	"packagePath": "packages/builders"
+}

packages/builders/.eslintrc.json

@@ -1,12 +1,7 @@
 {
-	"root": true,
-	"extends": "marine/prettier/node",
-	"parserOptions": {
-		"project": "./tsconfig.eslint.json",
-		"extraFileExtensions": [".mjs"]
-	},
-	"ignorePatterns": ["**/dist/*"],
-	"env": {
-		"jest": true
+	"extends": "../../.eslintrc.json",
+	"plugins": ["eslint-plugin-tsdoc"],
+	"rules": {
+		"tsdoc/syntax": "warn"
 	}
 }

packages/builders/.gitignore

@@ -19,7 +19,7 @@ dist/
 typings/
 
 docs/**/*
-!docs/index.yml
+!docs/index.json
 !docs/README.md
 !docs/examples/
 !docs/examples/*.md

packages/builders/.lintstagedrc.js

@@ -0,0 +1 @@
+module.exports = require('../../.lintstagedrc.json');

packages/builders/.prettierignore

@@ -5,4 +5,4 @@ dist/
 docs/**/*
 !docs/index.yml
 !docs/README.md
-coverage/
+coverage/

packages/builders/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('../../.prettierrc.json');

packages/builders/.prettierrc.json

@@ -1,8 +0,0 @@
-{
-	"printWidth": 120,
-	"useTabs": true,
-	"singleQuote": true,
-	"quoteProps": "as-needed",
-	"trailingComma": "all",
-	"endOfLine": "lf"
-}

packages/builders/.versionrc

@@ -1,3 +0,0 @@
-{
-	"releaseCommitMessageFormat": "chore(Release): publish"
-}

packages/builders/CHANGELOG.md

@@ -2,6 +2,75 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/builders@1.1.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.0.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))
+
+# [@discordjs/builders@1.0.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.16.0...@discordjs/builders@1.0.0) - (2022-07-17)
+
+## Info
+
+- 1.0.0 release bump, no new features.
+
+# [@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.15.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@0.14.0...@discordjs/builders@0.15.0) - (2022-06-05)
+
+## 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

packages/builders/README.md

@@ -4,12 +4,15 @@
 		<a href="https://discord.js.org"><img src="https://discord.js.org/static/logo.svg" width="546" alt="discord.js" /></a>
 	</p>
 	<br />
-		<p>
+	<p>
 		<a href="https://discord.gg/djs"><img src="https://img.shields.io/discord/222078108977594368?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
 		<a href="https://www.npmjs.com/package/@discordjs/builders"><img src="https://img.shields.io/npm/v/@discordjs/builders.svg?maxAge=3600" alt="npm version" /></a>
 		<a href="https://www.npmjs.com/package/@discordjs/builders"><img src="https://img.shields.io/npm/dt/@discordjs/builders.svg?maxAge=3600" alt="npm downloads" /></a>
 		<a href="https://github.com/discordjs/discord.js/actions"><img src="https://github.com/discordjs/discord.js/actions/workflows/test.yml/badge.svg" alt="Build status" /></a>
-		<a href="https://codecov.io/gh/discordjs/builders"><img src="https://codecov.io/gh/discordjs/builders/branch/main/graph/badge.svg" alt="Code coverage" /></a>
+		<a href="https://codecov.io/gh/discordjs/discord.js" ><img src="https://codecov.io/gh/discordjs/discord.js/branch/main/graph/badge.svg?precision=2&flag=builders" alt="Code coverage" /></a>
+	</p>
+	<p>
+		<a href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
 	</p>
 </div>
 
@@ -31,10 +34,10 @@ Here are some examples for the builders and utilities you can find in this packa
 
 ## Links
 
-- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/website))
+- [Website](https://discord.js.org/) ([source](https://github.com/discordjs/discord.js/tree/main/packages/website))
 - [Documentation](https://discord.js.org/#/docs/builders)
 - [Guide](https://discordjs.guide/) ([source](https://github.com/discordjs/guide))
-  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v13.html), including updated and removed items in the library.
+  See also the [Update Guide](https://discordjs.guide/additional-info/changes-in-v14.html), including updated and removed items in the library.
 - [discord.js Discord server](https://discord.gg/djs)
 - [Discord API Discord server](https://discord.gg/discord-api)
 - [GitHub](https://github.com/discordjs/discord.js/tree/main/packages/builders)

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

@@ -1,4 +1,5 @@
 import { APIActionRowComponent, APIMessageActionRowComponent, ButtonStyle, ComponentType } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import {
 	ActionRowBuilder,
 	ButtonBuilder,
@@ -44,6 +45,8 @@ const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent>
 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();
 		});
@@ -82,6 +85,7 @@ describe('Action Row Components', () => {
 			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', () => {
 			const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
@@ -122,17 +126,24 @@ describe('Action Row Components', () => {
 			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', () => {
+
+		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
 			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
 			const selectMenu = new SelectMenuBuilder()
 				.setCustomId('1234')
 				.setMaxValues(10)
 				.setMinValues(12)
+				.setOptions(
+					new SelectMenuOptionBuilder().setLabel('one').setValue('one'),
+					new SelectMenuOptionBuilder().setLabel('two').setValue('two'),
+				)
 				.setOptions([
 					new SelectMenuOptionBuilder().setLabel('one').setValue('one'),
 					new SelectMenuOptionBuilder().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);
 		});

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

@@ -4,6 +4,7 @@ import {
 	ButtonStyle,
 	ComponentType,
 } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import { buttonLabelValidator, buttonStyleValidator } from '../../src/components/Assertions';
 import { ButtonBuilder } from '../../src/components/button/Button';
 
@@ -124,7 +125,7 @@ describe('Button Components', () => {
 			expect(
 				buttonComponent()
 					.setCustomId(interactionData.custom_id)
-					.setLabel(interactionData.label)
+					.setLabel(interactionData.label!)
 					.setStyle(interactionData.style)
 					.setDisabled(interactionData.disabled)
 					.toJSON(),
@@ -140,7 +141,7 @@ describe('Button Components', () => {
 
 			expect(new ButtonBuilder(linkData).toJSON()).toEqual(linkData);
 
-			expect(buttonComponent().setLabel(linkData.label).setDisabled(true).setURL(linkData.url));
+			expect(buttonComponent().setLabel(linkData.label!).setDisabled(true).setURL(linkData.url));
 		});
 	});
 });

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

@@ -0,0 +1,73 @@
+import {
+	APIActionRowComponent,
+	APIButtonComponent,
+	APIMessageActionRowComponent,
+	APISelectMenuComponent,
+	APITextInputComponent,
+	ButtonStyle,
+	ComponentType,
+	TextInputStyle,
+} from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
+import {
+	ActionRowBuilder,
+	ButtonBuilder,
+	createComponentBuilder,
+	SelectMenuBuilder,
+	TextInputBuilder,
+} from '../../src/index';
+
+describe('createComponentBuilder', () => {
+	test.each([ButtonBuilder, SelectMenuBuilder, TextInputBuilder])(
+		'passing an instance of %j should return itself',
+		(Builder) => {
+			const builder = new Builder();
+			expect(createComponentBuilder(builder)).toBe(builder);
+		},
+	);
+
+	test('GIVEN an action row component THEN returns a ActionRowBuilder', () => {
+		const actionRow: APIActionRowComponent<APIMessageActionRowComponent> = {
+			components: [],
+			type: ComponentType.ActionRow,
+		};
+
+		expect(createComponentBuilder(actionRow)).toBeInstanceOf(ActionRowBuilder);
+	});
+
+	test('GIVEN a button component THEN returns a ButtonBuilder', () => {
+		const button: APIButtonComponent = {
+			custom_id: 'abc',
+			style: ButtonStyle.Primary,
+			type: ComponentType.Button,
+		};
+
+		expect(createComponentBuilder(button)).toBeInstanceOf(ButtonBuilder);
+	});
+
+	test('GIVEN a select menu component THEN returns a SelectMenuBuilder', () => {
+		const selectMenu: APISelectMenuComponent = {
+			custom_id: 'abc',
+			options: [],
+			type: ComponentType.SelectMenu,
+		};
+
+		expect(createComponentBuilder(selectMenu)).toBeInstanceOf(SelectMenuBuilder);
+	});
+
+	test('GIVEN a text input component THEN returns a TextInputBuilder', () => {
+		const textInput: APITextInputComponent = {
+			custom_id: 'abc',
+			label: 'abc',
+			style: TextInputStyle.Short,
+			type: ComponentType.TextInput,
+		};
+
+		expect(createComponentBuilder(textInput)).toBeInstanceOf(TextInputBuilder);
+	});
+
+	test('GIVEN an unknown component type THEN throws error', () => {
+		// @ts-expect-error
+		expect(() => createComponentBuilder({ type: 'invalid' })).toThrowError();
+	});
+});

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

@@ -1,4 +1,5 @@
 import { APISelectMenuComponent, APISelectMenuOption, ComponentType } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import { SelectMenuBuilder, SelectMenuOptionBuilder } from '../../src/index';
 
 const selectMenu = () => new SelectMenuBuilder();
@@ -43,12 +44,15 @@ describe('Select Menu Components', () => {
 				.setDefault(true)
 				.setEmoji({ name: 'test' })
 				.setDescription('description');
+			expect(() => selectMenu().addOptions(option)).not.toThrowError();
+			expect(() => selectMenu().setOptions(option)).not.toThrowError();
+			expect(() => selectMenu().setOptions({ label: 'test', value: 'test' })).not.toThrowError();
 			expect(() => selectMenu().addOptions([option])).not.toThrowError();
 			expect(() => selectMenu().setOptions([option])).not.toThrowError();
 			expect(() => selectMenu().setOptions([{ label: 'test', value: 'test' }])).not.toThrowError();
 			expect(() =>
-				selectMenu().addOptions([
-					{
+				selectMenu()
+					.addOptions({
 						label: 'test',
 						value: 'test',
 						emoji: {
@@ -56,14 +60,31 @@ describe('Select Menu Components', () => {
 							name: 'test',
 							animated: true,
 						},
-					},
-				]),
+					})
+					.addOptions([
+						{
+							label: 'test',
+							value: 'test',
+							emoji: {
+								id: '123',
+								name: 'test',
+								animated: true,
+							},
+						},
+					]),
 			).not.toThrowError();
 
 			const options = new Array<APISelectMenuOption>(25).fill({ label: 'test', value: 'test' });
+			expect(() => selectMenu().addOptions(...options)).not.toThrowError();
+			expect(() => selectMenu().setOptions(...options)).not.toThrowError();
 			expect(() => selectMenu().addOptions(options)).not.toThrowError();
 			expect(() => selectMenu().setOptions(options)).not.toThrowError();
 
+			expect(() =>
+				selectMenu()
+					.addOptions({ label: 'test', value: 'test' })
+					.addOptions(...new Array<APISelectMenuOption>(24).fill({ label: 'test', value: 'test' })),
+			).not.toThrowError();
 			expect(() =>
 				selectMenu()
 					.addOptions([{ label: 'test', value: 'test' }])
@@ -79,6 +100,17 @@ describe('Select Menu Components', () => {
 			expect(() => selectMenu().setDisabled(0)).toThrowError();
 			expect(() => selectMenu().setPlaceholder(longStr)).toThrowError();
 			// @ts-expect-error
+			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
+			expect(() => selectMenu().addOptions({ label: 'test', value: 'test', default: 100 })).toThrowError();
+			// @ts-expect-error
+			expect(() => selectMenu().addOptions({ value: 'test' })).toThrowError();
+			// @ts-expect-error
+			expect(() => selectMenu().addOptions({ default: true })).toThrowError();
+			// @ts-expect-error
 			expect(() => selectMenu().addOptions([{ label: 'test' }])).toThrowError();
 			expect(() => selectMenu().addOptions([{ label: longStr, value: 'test' }])).toThrowError();
 			expect(() => selectMenu().addOptions([{ value: longStr, label: 'test' }])).toThrowError();
@@ -91,8 +123,14 @@ describe('Select Menu Components', () => {
 			expect(() => selectMenu().addOptions([{ default: true }])).toThrowError();
 
 			const tooManyOptions = new Array<APISelectMenuOption>(26).fill({ label: 'test', value: 'test' });
+			expect(() => selectMenu().setOptions(...tooManyOptions)).toThrowError();
 			expect(() => selectMenu().setOptions(tooManyOptions)).toThrowError();
 
+			expect(() =>
+				selectMenu()
+					.addOptions({ label: 'test', value: 'test' })
+					.addOptions(...tooManyOptions),
+			).toThrowError();
 			expect(() =>
 				selectMenu()
 					.addOptions([{ label: 'test', value: 'test' }])
@@ -111,7 +149,23 @@ describe('Select Menu Components', () => {
 			}).toThrowError();
 		});
 
+		test('GIVEN valid option types THEN does not throw', () => {
+			expect(() =>
+				selectMenu().addOptions({
+					label: 'test',
+					value: 'test',
+				}),
+			).not.toThrowError();
+
+			expect(() => selectMenu().addOptions(selectMenuOption().setLabel('test').setValue('test'))).not.toThrowError();
+		});
+
 		test('GIVEN valid JSON input THEN valid JSON history is correct', () => {
+			expect(
+				new SelectMenuBuilder(selectMenuDataWithoutOptions)
+					.addOptions(new SelectMenuOptionBuilder(selectMenuOptionData))
+					.toJSON(),
+			).toEqual(selectMenuData);
 			expect(
 				new SelectMenuBuilder(selectMenuDataWithoutOptions)
 					.addOptions([new SelectMenuOptionBuilder(selectMenuOptionData)])

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

@@ -1,4 +1,5 @@
 import { APITextInputComponent, ComponentType, TextInputStyle } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import {
 	labelValidator,
 	maxLengthValidator,
@@ -45,7 +46,7 @@ describe('Text Input Components', () => {
 			expect(() => maxLengthValidator.parse(10)).not.toThrowError();
 		});
 
-		test('GIVEN invalid min length THEN validator does throw', () => {
+		test('GIVEN invalid min length THEN validator does throw 2', () => {
 			expect(() => maxLengthValidator.parse(4001)).toThrowError();
 		});
 
@@ -61,7 +62,7 @@ describe('Text Input Components', () => {
 			expect(() => placeholderValidator.parse('foobar')).not.toThrowError();
 		});
 
-		test('GIVEN invalid value THEN validator does throw', () => {
+		test('GIVEN invalid value THEN validator does throw 2', () => {
 			expect(() => placeholderValidator.parse(superLongStr)).toThrowError();
 		});
 
@@ -81,6 +82,12 @@ describe('Text Input Components', () => {
 					.setStyle(TextInputStyle.Paragraph)
 					.toJSON();
 			}).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();
+			}).not.toThrowError();
 		});
 	});
 
@@ -114,10 +121,10 @@ describe('Text Input Components', () => {
 			textInputComponent()
 				.setCustomId(textInputData.custom_id)
 				.setLabel(textInputData.label)
-				.setPlaceholder(textInputData.placeholder)
-				.setMaxLength(textInputData.max_length)
-				.setMinLength(textInputData.min_length)
-				.setValue(textInputData.value)
+				.setPlaceholder(textInputData.placeholder!)
+				.setMaxLength(textInputData.max_length!)
+				.setMinLength(textInputData.min_length!)
+				.setValue(textInputData.value!)
 				.setRequired(textInputData.required)
 				.setStyle(textInputData.style)
 				.toJSON(),

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

@@ -1,4 +1,5 @@
 import { PermissionFlagsBits } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import { ContextMenuCommandAssertions, ContextMenuCommandBuilder } from '../../src/index';
 
 const getBuilder = () => new ContextMenuCommandBuilder();
@@ -85,6 +86,10 @@ describe('Context Menu Commands', () => {
 			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', () => {

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

@@ -1,4 +1,5 @@
 import {
+	APIApplicationCommandAttachmentOption,
 	APIApplicationCommandBooleanOption,
 	APIApplicationCommandChannelOption,
 	APIApplicationCommandIntegerOption,
@@ -10,7 +11,9 @@ import {
 	ApplicationCommandOptionType,
 	ChannelType,
 } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import {
+	SlashCommandAttachmentOption,
 	SlashCommandBooleanOption,
 	SlashCommandChannelOption,
 	SlashCommandIntegerOption,
@@ -57,6 +60,9 @@ const getRoleOption = () => new SlashCommandRoleOption().setName('owo').setDescr
 const getMentionableOption = () =>
 	new SlashCommandMentionableOption().setName('owo').setDescription('Testing 123').setRequired(true);
 
+const getAttachmentOption = () =>
+	new SlashCommandAttachmentOption().setName('attachment').setDescription('attachment').setRequired(true);
+
 describe('Application Command toJSON() results', () => {
 	test('GIVEN a boolean option THEN calling toJSON should return a valid JSON', () => {
 		expect(getBooleanOption().toJSON()).toEqual<APIApplicationCommandBooleanOption>({
@@ -166,11 +172,13 @@ describe('Application Command toJSON() results', () => {
 	});
 
 	test('GIVEN a string option THEN calling toJSON should return a valid JSON', () => {
-		expect(getStringOption().toJSON()).toEqual<APIApplicationCommandStringOption>({
+		expect(getStringOption().setMinLength(1).setMaxLength(10).toJSON()).toEqual<APIApplicationCommandStringOption>({
 			name: 'owo',
 			description: 'Testing 123',
 			type: ApplicationCommandOptionType.String,
 			required: true,
+			max_length: 10,
+			min_length: 1,
 		});
 
 		expect(getStringOption().setAutocomplete(true).setChoices().toJSON()).toEqual<APIApplicationCommandStringOption>({
@@ -202,4 +210,13 @@ describe('Application Command toJSON() results', () => {
 			required: true,
 		});
 	});
+
+	test('GIVEN an attachment option THEN calling toJSON should return a valid JSON', () => {
+		expect(getAttachmentOption().toJSON()).toEqual<APIApplicationCommandAttachmentOption>({
+			name: 'attachment',
+			description: 'attachment',
+			type: ApplicationCommandOptionType.Attachment,
+			required: true,
+		});
+	});
 });

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

@@ -1,4 +1,5 @@
 import { APIApplicationCommandOptionChoice, ChannelType, PermissionFlagsBits } from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import {
 	SlashCommandAssertions,
 	SlashCommandBooleanOption,
@@ -41,6 +42,8 @@ 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', () => {
@@ -50,7 +53,10 @@ describe('Slash Commands', () => {
 			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(() =>
@@ -87,6 +93,7 @@ describe('Slash Commands', () => {
 		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();
 		});
 
@@ -127,6 +134,7 @@ describe('Slash Commands', () => {
 					getBuilder()
 						.setName('example')
 						.setDescription('Example command')
+						.setDMPermission(false)
 						.addBooleanOption((boolean) =>
 							boolean.setName('iscool').setDescription('Are we cool or what?').setRequired(true),
 						)
@@ -313,8 +321,10 @@ describe('Slash Commands', () => {
 				// @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

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

@@ -1,4 +1,10 @@
-import { APIModalInteractionResponseCallbackData, ComponentType, TextInputStyle } from 'discord-api-types/v10';
+import {
+	APIModalInteractionResponseCallbackData,
+	APITextInputComponent,
+	ComponentType,
+	TextInputStyle,
+} from 'discord-api-types/v10';
+import { describe, test, expect } from 'vitest';
 import {
 	ActionRowBuilder,
 	ButtonBuilder,
@@ -48,12 +54,18 @@ describe('Modals', () => {
 
 	test('GIVEN valid fields THEN builder does not throw', () => {
 		expect(() =>
-			modal().setTitle('test').setCustomId('foobar').setComponents([new ActionRowBuilder()]),
+			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();
 	});
 
 	test('GIVEN invalid fields THEN builder does throw', () => {
 		expect(() => modal().setTitle('test').setCustomId('foobar').toJSON()).toThrowError();
+
 		// @ts-expect-error
 		expect(() => modal().setTitle('test').setCustomId(42).toJSON()).toThrowError();
 	});
@@ -74,6 +86,17 @@ describe('Modals', () => {
 						},
 					],
 				},
+				{
+					type: ComponentType.ActionRow,
+					components: [
+						{
+							type: ComponentType.TextInput,
+							label: 'label',
+							style: TextInputStyle.Paragraph,
+							custom_id: 'custom id',
+						},
+					],
+				},
 			],
 		};
 
@@ -83,12 +106,68 @@ describe('Modals', () => {
 			modal()
 				.setTitle(modalData.title)
 				.setCustomId('custom id')
-				.setComponents([
-					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents([
+				.setComponents(
+					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
 						new TextInputBuilder().setCustomId('custom id').setLabel('label').setStyle(TextInputStyle.Paragraph),
-					]),
+					),
+				)
+				.addComponents([
+					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
+						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

@@ -1,3 +1,4 @@
+import { describe, test, expect } from 'vitest';
 import { EmbedBuilder, embedLength } from '../../src';
 
 const alpha = 'abcdefghijklmnopqrstuvwxyz';
@@ -322,28 +323,29 @@ describe('Embed', () => {
 
 		test('GIVEN an embed using Embed#addFields THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
+			embed.addFields({ name: 'foo', value: 'bar' });
 			embed.addFields([{ name: 'foo', value: 'bar' }]);
 
 			expect(embed.toJSON()).toStrictEqual({
-				fields: [{ name: 'foo', value: 'bar' }],
+				fields: [
+					{ name: 'foo', value: 'bar' },
+					{ name: 'foo', value: 'bar' },
+				],
 			});
 		});
 
 		test('GIVEN an embed using Embed#spliceFields THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
-			embed.addFields([
-				{ name: 'foo', value: 'bar' },
-				{ name: 'foo', value: 'baz' },
-			]);
+			embed.addFields({ name: 'foo', value: 'bar' }, { name: 'foo', value: 'baz' });
 
 			expect(embed.spliceFields(0, 1).toJSON()).toStrictEqual({
 				fields: [{ name: 'foo', value: 'baz' }],
 			});
 		});
 
-		test('GIVEN an embed using Embed#spliceFields THEN returns valid toJSON data', () => {
+		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' })));
+			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));
 
 			expect(() =>
 				embed.spliceFields(0, 3, ...Array.from({ length: 5 }, () => ({ name: 'foo', value: 'bar' }))),
@@ -352,7 +354,7 @@ describe('Embed', () => {
 
 		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' })));
+			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));
 
 			expect(() =>
 				embed.spliceFields(0, 3, ...Array.from({ length: 8 }, () => ({ name: 'foo', value: 'bar' }))),
@@ -362,6 +364,9 @@ describe('Embed', () => {
 		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();
@@ -370,38 +375,43 @@ describe('Embed', () => {
 		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();
 		});
 
 		describe('GIVEN invalid field amount THEN throws error', () => {
-			test('', () => {
+			test('1', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields(Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })))).toThrowError();
+				expect(() =>
+					embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
+				).toThrowError();
 			});
 		});
 
 		describe('GIVEN invalid field name THEN throws error', () => {
-			test('', () => {
+			test('2', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields([{ name: '', value: 'bar' }])).toThrowError();
+				expect(() => embed.addFields({ name: '', value: 'bar' })).toThrowError();
 			});
 		});
 
 		describe('GIVEN invalid field name length THEN throws error', () => {
-			test('', () => {
+			test('3', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields([{ name: 'a'.repeat(257), value: 'bar' }])).toThrowError();
+				expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
 			});
 		});
 
 		describe('GIVEN invalid field value length THEN throws error', () => {
-			test('', () => {
+			test('4', () => {
 				const embed = new EmbedBuilder();
 
-				expect(() => embed.addFields([{ name: '', value: 'a'.repeat(1025) }])).toThrowError();
+				expect(() => embed.addFields({ name: '', value: 'a'.repeat(1025) })).toThrowError();
 			});
 		});
 	});

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

@@ -1,6 +1,9 @@
+import { URL } from 'node:url';
+import { describe, test, expect, vitest } from 'vitest';
 import {
 	blockQuote,
 	bold,
+	channelLink,
 	channelMention,
 	codeBlock,
 	Faces,
@@ -9,6 +12,7 @@ import {
 	hyperlink,
 	inlineCode,
 	italic,
+	messageLink,
 	quote,
 	roleMention,
 	spoiler,
@@ -22,11 +26,11 @@ import {
 describe('Message formatters', () => {
 	describe('codeBlock', () => {
 		test('GIVEN "discord.js" with no language THEN returns "```\\ndiscord.js```"', () => {
-			expect<'```\ndiscord.js```'>(codeBlock('discord.js')).toEqual('```\ndiscord.js```');
+			expect<'```\ndiscord.js\n```'>(codeBlock('discord.js')).toEqual('```\ndiscord.js\n```');
 		});
 
 		test('GIVEN "discord.js" with "js" as language THEN returns "```js\\ndiscord.js```"', () => {
-			expect<'```js\ndiscord.js```'>(codeBlock('js', 'discord.js')).toEqual('```js\ndiscord.js```');
+			expect<'```js\ndiscord.js\n```'>(codeBlock('js', 'discord.js')).toEqual('```js\ndiscord.js\n```');
 		});
 	});
 
@@ -148,14 +152,42 @@ describe('Message formatters', () => {
 		});
 	});
 
+	describe('channelLink', () => {
+		test('GIVEN channelId THEN returns "https://discord.com/channels/@me/${channelId}"', () => {
+			expect<'https://discord.com/channels/@me/123456789012345678'>(channelLink('123456789012345678')).toEqual(
+				'https://discord.com/channels/@me/123456789012345678',
+			);
+		});
+
+		test('GIVEN channelId WITH guildId THEN returns "https://discord.com/channels/${guildId}/${channelId}"', () => {
+			expect<'https://discord.com/channels/987654321987654/123456789012345678'>(
+				channelLink('123456789012345678', '987654321987654'),
+			).toEqual('https://discord.com/channels/987654321987654/123456789012345678');
+		});
+	});
+
+	describe('messageLink', () => {
+		test('GIVEN channelId AND messageId THEN returns "https://discord.com/channels/@me/${channelId}/${messageId}"', () => {
+			expect<'https://discord.com/channels/@me/123456789012345678/102938475657483'>(
+				messageLink('123456789012345678', '102938475657483'),
+			).toEqual('https://discord.com/channels/@me/123456789012345678/102938475657483');
+		});
+
+		test('GIVEN channelId AND messageId WITH guildId THEN returns "https://discord.com/channels/${guildId}/${channelId}/${messageId}"', () => {
+			expect<'https://discord.com/channels/987654321987654/123456789012345678/102938475657483'>(
+				messageLink('123456789012345678', '102938475657483', '987654321987654'),
+			).toEqual('https://discord.com/channels/987654321987654/123456789012345678/102938475657483');
+		});
+	});
+
 	describe('time', () => {
 		test('GIVEN no arguments THEN returns "<t:${bigint}>"', () => {
-			jest.useFakeTimers('modern');
-			jest.setSystemTime(1566424897579);
+			vitest.useFakeTimers();
+			vitest.setSystemTime(1566424897579);
 
 			expect<`<t:${bigint}>`>(time()).toEqual('<t:1566424897>');
 
-			jest.useRealTimers();
+			vitest.useRealTimers();
 		});
 
 		test('GIVEN a date THEN returns "<t:${bigint}>"', () => {

packages/builders/__tests__/util.test.ts

@@ -0,0 +1,42 @@
+import { describe, test, expect } from 'vitest';
+import {
+	isJSONEncodable,
+	isEquatable,
+	ActionRowBuilder,
+	enableValidators,
+	disableValidators,
+	isValidationEnabled,
+} from '../src/index';
+
+describe('isEquatable', () => {
+	test('returns true if the object is equatable', () => {
+		expect(isEquatable({ equals: () => true })).toBeTruthy();
+	});
+
+	test('returns false if the object is not equatable', () => {
+		expect(isEquatable({})).toBeFalsy();
+	});
+});
+
+describe('isJSONEncodable', () => {
+	test('returns true if the object is JSON encodable', () => {
+		expect(isJSONEncodable({ toJSON: () => ({}) })).toBeTruthy();
+		expect(isJSONEncodable(new ActionRowBuilder())).toBeTruthy();
+	});
+
+	test('returns false if the object is not JSON encodable', () => {
+		expect(isJSONEncodable({})).toBeFalsy();
+	});
+});
+
+describe('validation', () => {
+	test('enables validation', () => {
+		enableValidators();
+		expect(isValidationEnabled()).toBeTruthy();
+	});
+
+	test('disables validation', () => {
+		disableValidators();
+		expect(isValidationEnabled()).toBeFalsy();
+	});
+});

packages/builders/api-extractor.json

@@ -0,0 +1,376 @@
+/**
+ * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
+ */
+{
+	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+	/**
+	 * Optionally specifies another JSON config file that this file extends from.  This provides a way for
+	 * standard settings to be shared across multiple projects.
+	 *
+	 * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
+	 * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
+	 * resolved using NodeJS require().
+	 *
+	 * SUPPORTED TOKENS: none
+	 * DEFAULT VALUE: ""
+	 */
+	// "extends": "./shared/api-extractor-base.json"
+	// "extends": "my-package/include/api-extractor-base.json"
+
+	/**
+	 * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
+	 * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
+	 *
+	 * The path is resolved relative to the folder of the config file that contains the setting.
+	 *
+	 * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
+	 * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
+	 * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
+	 * will be reported.
+	 *
+	 * SUPPORTED TOKENS: <lookup>
+	 * DEFAULT VALUE: "<lookup>"
+	 */
+	// "projectFolder": "..",
+
+	/**
+	 * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
+	 * analyzes the symbols exported by this module.
+	 *
+	 * The file extension must be ".d.ts" and not ".ts".
+	 *
+	 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+	 * prepend a folder token such as "<projectFolder>".
+	 *
+	 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+	 */
+	"mainEntryPointFilePath": "<projectFolder>/docs/dist/index.d.ts",
+
+	/**
+	 * A list of NPM package names whose exports should be treated as part of this package.
+	 *
+	 * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
+	 * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
+	 * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
+	 * imports library2.  To avoid this, we can specify:
+	 *
+	 *   "bundledPackages": [ "library2" ],
+	 *
+	 * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
+	 * local files for library1.
+	 */
+	"bundledPackages": [],
+
+	/**
+	 * Determines how the TypeScript compiler engine will be invoked by API Extractor.
+	 */
+	"compiler": {
+		/**
+		 * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * Note: This setting will be ignored if "overrideTsconfig" is used.
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
+		 */
+		// "tsconfigFilePath": "<projectFolder>/tsconfig.json",
+		/**
+		 * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
+		 * The object must conform to the TypeScript tsconfig schema:
+		 *
+		 * http://json.schemastore.org/tsconfig
+		 *
+		 * If omitted, then the tsconfig.json file will be read from the "projectFolder".
+		 *
+		 * DEFAULT VALUE: no overrideTsconfig section
+		 */
+		// "overrideTsconfig": {
+		//   . . .
+		// }
+		/**
+		 * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
+		 * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
+		 * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
+		 * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
+		 *
+		 * DEFAULT VALUE: false
+		 */
+		// "skipLibCheck": true,
+	},
+
+	/**
+	 * Configures how the API report file (*.api.md) will be generated.
+	 */
+	"apiReport": {
+		/**
+		 * (REQUIRED) Whether to generate an API report.
+		 */
+		"enabled": false
+
+		/**
+		 * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
+		 * a full file path.
+		 *
+		 * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
+		 *
+		 * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<unscopedPackageName>.api.md"
+		 */
+		// "reportFileName": "<unscopedPackageName>.api.md",
+
+		/**
+		 * Specifies the folder where the API report file is written.  The file name portion is determined by
+		 * the "reportFileName" setting.
+		 *
+		 * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
+		 * e.g. for an API review.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<projectFolder>/temp/"
+		 */
+		// "reportFolder": "<projectFolder>/temp/",
+
+		/**
+		 * Specifies the folder where the temporary report file is written.  The file name portion is determined by
+		 * the "reportFileName" setting.
+		 *
+		 * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
+		 * If they are different, a production build will fail.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<projectFolder>/temp/"
+		 */
+		// "reportTempFolder": "<projectFolder>/temp/"
+	},
+
+	/**
+	 * Configures how the doc model file (*.api.json) will be generated.
+	 */
+	"docModel": {
+		/**
+		 * (REQUIRED) Whether to generate a doc model file.
+		 */
+		"enabled": true,
+
+		/**
+		 * The output path for the doc model file.  The file extension should be ".api.json".
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
+		 */
+		"apiJsonFilePath": "<projectFolder>/docs/docs.api.json"
+	},
+
+	/**
+	 * Configures how the .d.ts rollup file will be generated.
+	 */
+	"dtsRollup": {
+		/**
+		 * (REQUIRED) Whether to generate the .d.ts rollup file.
+		 */
+		"enabled": false
+
+		/**
+		 * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
+		 * This file will include all declarations that are exported by the main entry point.
+		 *
+		 * If the path is an empty string, then this file will not be written.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
+		 */
+		// "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
+
+		/**
+		 * Specifies the output path for a .d.ts rollup file to be generated with trimming for an "alpha" release.
+		 * This file will include only declarations that are marked as "@public", "@beta", or "@alpha".
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: ""
+		 */
+		// "alphaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-alpha.d.ts",
+
+		/**
+		 * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
+		 * This file will include only declarations that are marked as "@public" or "@beta".
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: ""
+		 */
+		// "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
+
+		/**
+		 * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
+		 * This file will include only declarations that are marked as "@public".
+		 *
+		 * If the path is an empty string, then this file will not be written.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: ""
+		 */
+		// "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
+
+		/**
+		 * When a declaration is trimmed, by default it will be replaced by a code comment such as
+		 * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
+		 * declaration completely.
+		 *
+		 * DEFAULT VALUE: false
+		 */
+		// "omitTrimmingComments": true
+	},
+
+	/**
+	 * Configures how the tsdoc-metadata.json file will be generated.
+	 */
+	"tsdocMetadata": {
+		/**
+		 * Whether to generate the tsdoc-metadata.json file.
+		 *
+		 * DEFAULT VALUE: true
+		 */
+		// "enabled": true,
+		/**
+		 * Specifies where the TSDoc metadata file should be written.
+		 *
+		 * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+		 * prepend a folder token such as "<projectFolder>".
+		 *
+		 * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
+		 * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
+		 * falls back to "tsdoc-metadata.json" in the package folder.
+		 *
+		 * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+		 * DEFAULT VALUE: "<lookup>"
+		 */
+		// "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
+	},
+
+	/**
+	 * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
+	 * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
+	 * To use the OS's default newline kind, specify "os".
+	 *
+	 * DEFAULT VALUE: "crlf"
+	 */
+	"newlineKind": "lf",
+
+	/**
+	 * Configures how API Extractor reports error and warning messages produced during analysis.
+	 *
+	 * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
+	 */
+	"messages": {
+		/**
+		 * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
+		 * the input .d.ts files.
+		 *
+		 * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
+		 *
+		 * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+		 */
+		"compilerMessageReporting": {
+			/**
+			 * Configures the default routing for messages that don't match an explicit rule in this table.
+			 */
+			"default": {
+				/**
+				 * Specifies whether the message should be written to the the tool's output log.  Note that
+				 * the "addToApiReportFile" property may supersede this option.
+				 *
+				 * Possible values: "error", "warning", "none"
+				 *
+				 * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
+				 * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
+				 * the "--local" option), the warning is displayed but the build will not fail.
+				 *
+				 * DEFAULT VALUE: "warning"
+				 */
+				"logLevel": "warning"
+
+				/**
+				 * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
+				 * then the message will be written inside that file; otherwise, the message is instead logged according to
+				 * the "logLevel" option.
+				 *
+				 * DEFAULT VALUE: false
+				 */
+				// "addToApiReportFile": false
+			}
+
+			// "TS2551": {
+			//   "logLevel": "warning",
+			//   "addToApiReportFile": true
+			// },
+			//
+			// . . .
+		},
+
+		/**
+		 * Configures handling of messages reported by API Extractor during its analysis.
+		 *
+		 * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
+		 *
+		 * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
+		 */
+		"extractorMessageReporting": {
+			"default": {
+				"logLevel": "warning"
+				// "addToApiReportFile": false
+			}
+
+			// "ae-extra-release-tag": {
+			//   "logLevel": "warning",
+			//   "addToApiReportFile": true
+			// },
+			//
+			// . . .
+		},
+
+		/**
+		 * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
+		 *
+		 * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
+		 *
+		 * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+		 */
+		"tsdocMessageReporting": {
+			"default": {
+				"logLevel": "warning"
+				// "addToApiReportFile": false
+			}
+
+			// "tsdoc-link-tag-unescaped-text": {
+			//   "logLevel": "warning",
+			//   "addToApiReportFile": true
+			// },
+			//
+			// . . .
+		}
+	}
+}

packages/builders/babel.config.js

@@ -1,18 +0,0 @@
-/**
- * @type {import('@babel/core').TransformOptions}
- */
-module.exports = {
-	parserOpts: { strictMode: true },
-	sourceMaps: 'inline',
-	presets: [
-		[
-			'@babel/preset-env',
-			{
-				targets: { node: 'current' },
-				modules: 'commonjs',
-			},
-		],
-		'@babel/preset-typescript',
-	],
-	plugins: ['babel-plugin-transform-typescript-metadata', ['@babel/plugin-proposal-decorators', { legacy: true }]],
-};

packages/builders/build.config.ts

@@ -0,0 +1,3 @@
+import { createUnbuildConfig } from '../../build.config';
+
+export default createUnbuildConfig();

packages/builders/cliff.toml

@@ -10,7 +10,7 @@ body = """
 	{% if previous %}\
 		{% if previous.version %}\
 			(https://github.com/discordjs/discord.js/compare/{{ previous.version }}...{{ version }})\
-		{% else %}
+		{% else %}\
 			(https://github.com/discordjs/discord.js/tree/{{ version }})\
 		{% endif %}\
 	{% endif %} \
@@ -26,9 +26,8 @@ body = """
 		  {% endif %}\
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}](https://github.com/discordjs/discord.js/commit/{{ commit.id }}))\
 		{% if commit.breaking %}\
-			\n\n {% raw %}  {% endraw %} ### Breaking Changes:\n \
 			{% for breakingChange in commit.footers %}\
-				{% raw %}  {% endraw %} - {{ breakingChange }}\n\
+				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
@@ -60,5 +59,5 @@ commit_parsers = [
 filter_commits = true
 tag_pattern = "@discordjs/builders@[0-9]*"
 ignore_tags = ""
-topo_order = false
+date_order = true
 sort_commits = "newest"

packages/builders/codecov.yml

@@ -1,10 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 70%
-        threshold: 5%
-    patch:
-      default:
-        target: 70%
-        threshold: 5%

packages/builders/docs/index.json

@@ -0,0 +1 @@
+[{ "name": "General", "files": [{ "name": "Welcome", "id": "welcome", "path": "../../README.md" }] }]

packages/builders/docs/index.yml

@@ -1,5 +0,0 @@
-- name: General
-  files:
-    - name: Welcome
-      id: welcome
-      path: ../../README.md

packages/builders/jest.config.js

@@ -1,19 +0,0 @@
-/**
- * @type {import('@jest/types').Config.InitialOptions}
- */
-module.exports = {
-	testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-	testEnvironment: 'node',
-	collectCoverage: true,
-	collectCoverageFrom: ['src/**/*.ts'],
-	coverageDirectory: 'coverage',
-	coverageReporters: ['text', 'lcov', 'clover'],
-	coverageThreshold: {
-		global: {
-			branches: 70,
-			lines: 70,
-			statements: 70,
-		},
-	},
-	coveragePathIgnorePatterns: ['src/index.ts'],
-};

packages/builders/package.json

@@ -1,22 +1,24 @@
 {
 	"name": "@discordjs/builders",
-	"version": "0.14.0",
+	"version": "1.1.0",
 	"description": "A set of builders that you can use when creating your bot",
 	"scripts": {
-		"build": "tsup",
-		"test": "jest --pass-with-no-tests",
-		"lint": "prettier --check . && eslint src __tests__ --ext mjs,js,ts",
-		"format": "prettier --write . && eslint src __tests__ --ext mjs,js,ts --fix",
-		"docs": "typedoc --json docs/typedoc-out.json src/index.ts && node scripts/docs.mjs",
-		"prepublishOnly": "yarn build && yarn lint && yarn test",
-		"changelog": "git cliff --prepend ./CHANGELOG.md -l -c ./cliff.toml -r ../../ --include-path 'packages/builders/*'"
+		"test": "vitest run",
+		"build": "unbuild",
+		"lint": "prettier --check . && TIMING=1 eslint src __tests__ --ext mjs,js,ts",
+		"format": "prettier --write . && TIMING=1 eslint src __tests__ --ext mjs,js,ts --fix",
+		"fmt": "yarn format",
+		"docs": "downlevel-dts . docs --to=3.7 && docgen -i src/index.ts -c docs/index.json -o docs/docs.json --typescript && api-extractor run --local",
+		"prepack": "yarn lint && yarn test && yarn build",
+		"changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/builders/*'",
+		"release": "cliff-jumper"
 	},
-	"main": "./dist/index.js",
+	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
 	"exports": {
 		"import": "./dist/index.mjs",
-		"require": "./dist/index.js",
+		"require": "./dist/index.cjs",
 		"types": "./dist/index.d.ts"
 	},
 	"directories": {
@@ -52,33 +54,32 @@
 	},
 	"homepage": "https://discord.js.org",
 	"dependencies": {
-		"@sapphire/shapeshift": "^3.1.0",
-		"@sindresorhus/is": "^4.6.0",
-		"discord-api-types": "^0.33.3",
+		"@sapphire/shapeshift": "^3.5.1",
+		"discord-api-types": "^0.37.3",
 		"fast-deep-equal": "^3.1.3",
 		"ts-mixer": "^6.0.1",
 		"tslib": "^2.4.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.18.2",
-		"@babel/plugin-proposal-decorators": "^7.18.2",
-		"@babel/preset-env": "^7.18.2",
-		"@babel/preset-typescript": "^7.17.12",
-		"@discordjs/ts-docgen": "^0.4.1",
-		"@types/jest": "^28.1.0",
-		"@types/node": "^16.11.38",
-		"@typescript-eslint/eslint-plugin": "^5.27.0",
-		"@typescript-eslint/parser": "^5.27.0",
-		"babel-plugin-transform-typescript-metadata": "^0.3.2",
-		"eslint": "^8.17.0",
+		"@discordjs/docgen": "workspace:^",
+		"@favware/cliff-jumper": "^1.8.7",
+		"@microsoft/api-extractor": "^7.29.3",
+		"@types/node": "^16.11.52",
+		"@typescript-eslint/eslint-plugin": "^5.33.1",
+		"@typescript-eslint/parser": "^5.33.1",
+		"@vitest/coverage-c8": "^0.22.1",
+		"downlevel-dts": "^0.10.0",
+		"eslint": "^8.22.0",
 		"eslint-config-marine": "^9.4.1",
 		"eslint-config-prettier": "^8.5.0",
+		"eslint-import-resolver-typescript": "^3.4.2",
 		"eslint-plugin-import": "^2.26.0",
-		"jest": "^28.1.0",
-		"prettier": "^2.6.2",
-		"tsup": "^6.0.1",
-		"typedoc": "^0.22.17",
-		"typescript": "^4.7.3"
+		"eslint-plugin-tsdoc": "^0.2.16",
+		"prettier": "^2.7.1",
+		"rollup-plugin-typescript2": "^0.33.0",
+		"typescript": "^4.7.4",
+		"unbuild": "^0.8.9",
+		"vitest": "^0.22.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

packages/builders/scripts/docs.mjs

@@ -1,7 +0,0 @@
-import { runGenerator } from '@discordjs/ts-docgen';
-
-runGenerator({
-	existingOutput: 'docs/typedoc-out.json',
-	custom: 'docs/index.yml',
-	output: 'docs/docs.json',
-});

packages/builders/src/components/ActionRow.ts

@@ -7,7 +7,10 @@ import {
 } from 'discord-api-types/v10';
 import { ComponentBuilder } from './Component';
 import { createComponentBuilder } from './Components';
-import type { ButtonBuilder, SelectMenuBuilder, TextInputBuilder } from '..';
+import type { ButtonBuilder } from './button/Button';
+import type { SelectMenuBuilder } from './selectMenu/SelectMenu';
+import type { TextInputBuilder } from './textInput/TextInput';
+import { normalizeArray, type RestOrArray } from '../util/normalizeArray';
 
 export type MessageComponentBuilder =
 	| MessageActionRowComponentBuilder
@@ -19,6 +22,8 @@ export type AnyComponentBuilder = MessageActionRowComponentBuilder | ModalAction
 
 /**
  * Represents an action row component
+ *
+ * @typeParam T - The types of components this action row holds
  */
 export class ActionRowBuilder<T extends AnyComponentBuilder> extends ComponentBuilder<
 	APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
@@ -35,23 +40,27 @@ export class ActionRowBuilder<T extends AnyComponentBuilder> extends ComponentBu
 
 	/**
 	 * Adds components to this action row.
-	 * @param components The components to add to this action row.
-	 * @returns
+	 *
+	 * @param components - The components to add to this action row.
 	 */
-	public addComponents(components: T[]) {
-		this.components.push(...components);
+	public addComponents(...components: RestOrArray<T>) {
+		this.components.push(...normalizeArray(components));
 		return this;
 	}
 
 	/**
 	 * Sets the components in this action row
-	 * @param components The components to set this row to
+	 *
+	 * @param components - The components to set this row to
 	 */
-	public setComponents(components: T[]) {
-		this.components.splice(0, this.components.length, ...components);
+	public setComponents(...components: RestOrArray<T>) {
+		this.components.splice(0, this.components.length, ...normalizeArray(components));
 		return this;
 	}
 
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
 	public toJSON(): APIActionRowComponent<ReturnType<T['toJSON']>> {
 		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 		return {

packages/builders/src/components/Assertions.ts

@@ -1,55 +1,78 @@
 import { s } from '@sapphire/shapeshift';
 import { APIMessageComponentEmoji, ButtonStyle } from 'discord-api-types/v10';
-import type { SelectMenuOptionBuilder } from './selectMenu/SelectMenuOption';
-import { UnsafeSelectMenuOptionBuilder } from './selectMenu/UnsafeSelectMenuOption';
+import { SelectMenuOptionBuilder } from './selectMenu/SelectMenuOption';
+import { isValidationEnabled } from '../util/validation';
 
-export const customIdValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
+export const customIdValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(100)
+	.setValidationEnabled(isValidationEnabled);
 
-export const emojiValidator = s.object({
-	id: s.string,
-	name: s.string,
-	animated: s.boolean,
-}).partial.strict;
+export const emojiValidator = s
+	.object({
+		id: s.string,
+		name: s.string,
+		animated: s.boolean,
+	})
+	.partial.strict.setValidationEnabled(isValidationEnabled);
 
 export const disabledValidator = s.boolean;
 
-export const buttonLabelValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(80);
+export const buttonLabelValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(80)
+	.setValidationEnabled(isValidationEnabled);
 
 export const buttonStyleValidator = s.nativeEnum(ButtonStyle);
 
-export const placeholderValidator = s.string.lengthLessThanOrEqual(150);
-export const minMaxValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(25);
+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);
-export const optionValidator = s.union(
-	s.object({
+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,
-	}),
-	s.instance(UnsafeSelectMenuOptionBuilder),
-);
-export const optionsValidator = optionValidator.array.lengthGreaterThanOrEqual(0);
-export const optionsLengthValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(25);
+	})
+	.setValidationEnabled(isValidationEnabled);
+
+export const optionValidator = s.instance(SelectMenuOptionBuilder).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: SelectMenuOptionBuilder[], customId?: string) {
 	customIdValidator.parse(customId);
 	optionsValidator.parse(options);
 }
 
-export const labelValueValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
 export const defaultValidator = s.boolean;
 
 export function validateRequiredSelectMenuOptionParameters(label?: string, value?: string) {
-	labelValueValidator.parse(label);
-	labelValueValidator.parse(value);
+	labelValueDescriptionValidator.parse(label);
+	labelValueDescriptionValidator.parse(value);
 }
 
-export const urlValidator = s.string.url({
-	allowedProtocols: ['http:', 'https:', 'discord:'],
-});
+export const urlValidator = s.string
+	.url({
+		allowedProtocols: ['http:', 'https:', 'discord:'],
+	})
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredButtonParameters(
 	style?: ButtonStyle,

packages/builders/src/components/Component.ts

@@ -10,6 +10,8 @@ export type AnyAPIActionRowComponent = APIActionRowComponentTypes | APIActionRow
 
 /**
  * Represents a discord component
+ *
+ * @typeParam DataType - The type of internal API data that is stored within the component
  */
 export abstract class ComponentBuilder<
 	DataType extends Partial<APIBaseComponent<ComponentType>> = APIBaseComponent<ComponentType>,
@@ -20,6 +22,13 @@ export abstract class ComponentBuilder<
 	 */
 	public readonly data: Partial<DataType>;
 
+	/**
+	 * Serializes this component to an API-compatible JSON object
+	 *
+	 * @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;
 
 	public constructor(data: Partial<DataType>) {

packages/builders/src/components/Components.ts

@@ -1,6 +1,14 @@
 import { APIMessageComponent, APIModalComponent, ComponentType } from 'discord-api-types/v10';
-import type { AnyComponentBuilder, MessageComponentBuilder, ModalComponentBuilder } from './ActionRow';
-import { ActionRowBuilder, ButtonBuilder, ComponentBuilder, SelectMenuBuilder, TextInputBuilder } from '../index';
+import {
+	ActionRowBuilder,
+	type AnyComponentBuilder,
+	type MessageComponentBuilder,
+	type ModalComponentBuilder,
+} from './ActionRow';
+import { ComponentBuilder } from './Component';
+import { ButtonBuilder } from './button/Button';
+import { SelectMenuBuilder } from './selectMenu/SelectMenu';
+import { TextInputBuilder } from './textInput/TextInput';
 
 export interface MappedComponentTypes {
 	[ComponentType.ActionRow]: ActionRowBuilder<AnyComponentBuilder>;
@@ -11,7 +19,8 @@ export interface MappedComponentTypes {
 
 /**
  * Factory for creating components from API data
- * @param data The api data to transform to a component class
+ *
+ * @param data - The api data to transform to a component class
  */
 export function createComponentBuilder<T extends keyof MappedComponentTypes>(
 	data: (APIMessageComponent | APIModalComponent) & { type: T },

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

@@ -1,11 +1,11 @@
-import type {
+import {
+	ComponentType,
 	ButtonStyle,
-	APIMessageComponentEmoji,
-	APIButtonComponent,
-	APIButtonComponentWithCustomId,
-	APIButtonComponentWithURL,
+	type APIMessageComponentEmoji,
+	type APIButtonComponent,
+	type APIButtonComponentWithURL,
+	type APIButtonComponentWithCustomId,
 } from 'discord-api-types/v10';
-import { UnsafeButtonBuilder } from './UnsafeButton';
 import {
 	buttonLabelValidator,
 	buttonStyleValidator,
@@ -15,36 +15,116 @@ import {
 	urlValidator,
 	validateRequiredButtonParameters,
 } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
 /**
- * Represents a validated button component
+ * Represents a button component
  */
-export class ButtonBuilder extends UnsafeButtonBuilder {
-	public override setStyle(style: ButtonStyle) {
-		return super.setStyle(buttonStyleValidator.parse(style));
+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({
+	 * 	style: 'primary',
+	 * 	label: 'Click Me',
+	 * 	emoji: {
+	 * 		name: ':smile:',
+	 * 		id: '12345678901234567890123456789012',
+	 * 	},
+	 *  custom_id: '12345678901234567890123456789012',
+	 * });
+	 * ```
+	 *
+	 * @example
+	 * Creating a button using setters and API data
+	 * ```ts
+	 * const button = new ButtonBuilder({
+	 * 	style: 'primary',
+	 * 	label: 'Click Me',
+	 * })
+	 * .setEmoji({ name: ':smile:', id: '12345678901234567890123456789012' })
+	 * .setCustomId('12345678901234567890123456789012');
+	 * ```
+	 */
+	public constructor(data?: Partial<APIButtonComponent>) {
+		super({ type: ComponentType.Button, ...data });
 	}
 
-	public override setURL(url: string) {
-		return super.setURL(urlValidator.parse(url));
+	/**
+	 * Sets the style of this button
+	 *
+	 * @param style - The style of the button
+	 */
+	public setStyle(style: ButtonStyle) {
+		this.data.style = buttonStyleValidator.parse(style);
+		return this;
 	}
 
-	public override setCustomId(customId: string) {
-		return super.setCustomId(customIdValidator.parse(customId));
+	/**
+	 * 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 open when this button is clicked
+	 */
+	public setURL(url: string) {
+		(this.data as APIButtonComponentWithURL).url = urlValidator.parse(url);
+		return this;
 	}
 
-	public override setEmoji(emoji: APIMessageComponentEmoji) {
-		return super.setEmoji(emojiValidator.parse(emoji));
+	/**
+	 * 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 for this button
+	 */
+	public setCustomId(customId: string) {
+		(this.data as APIButtonComponentWithCustomId).custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override setDisabled(disabled = true) {
-		return super.setDisabled(disabledValidator.parse(disabled));
+	/**
+	 * Sets the emoji to display on this button
+	 *
+	 * @param emoji - The emoji to display on this button
+	 */
+	public setEmoji(emoji: APIMessageComponentEmoji) {
+		this.data.emoji = emojiValidator.parse(emoji);
+		return this;
 	}
 
-	public override setLabel(label: string) {
-		return super.setLabel(buttonLabelValidator.parse(label));
+	/**
+	 * Sets whether this button is disabled
+	 *
+	 * @param disabled - Whether to disable this button
+	 */
+	public setDisabled(disabled = true) {
+		this.data.disabled = disabledValidator.parse(disabled);
+		return this;
 	}
 
-	public override toJSON(): APIButtonComponent {
+	/**
+	 * Sets the label for this button
+	 *
+	 * @param label - The label to display on this button
+	 */
+	public setLabel(label: string) {
+		this.data.label = buttonLabelValidator.parse(label);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APIButtonComponent {
 		validateRequiredButtonParameters(
 			this.data.style,
 			this.data.label,
@@ -52,6 +132,9 @@ export class ButtonBuilder extends UnsafeButtonBuilder {
 			(this.data as APIButtonComponentWithCustomId).custom_id,
 			(this.data as APIButtonComponentWithURL).url,
 		);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APIButtonComponent;
 	}
 }

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

@@ -1,79 +0,0 @@
-import {
-	ComponentType,
-	ButtonStyle,
-	type APIMessageComponentEmoji,
-	type APIButtonComponent,
-	type APIButtonComponentWithURL,
-	type APIButtonComponentWithCustomId,
-} from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-
-/**
- * Represents a non-validated button component
- */
-export class UnsafeButtonBuilder extends ComponentBuilder<APIButtonComponent> {
-	public constructor(data?: Partial<APIButtonComponent>) {
-		super({ type: ComponentType.Button, ...data });
-	}
-
-	/**
-	 * Sets the style of this button
-	 * @param style The style of the button
-	 */
-	public setStyle(style: ButtonStyle) {
-		this.data.style = style;
-		return this;
-	}
-
-	/**
-	 * Sets the URL for this button
-	 * @param url The URL to open when this button is clicked
-	 */
-	public setURL(url: string) {
-		(this.data as APIButtonComponentWithURL).url = url;
-		return this;
-	}
-
-	/**
-	 * Sets the custom Id for this button
-	 * @param customId The custom id to use for this button
-	 */
-	public setCustomId(customId: string) {
-		(this.data as APIButtonComponentWithCustomId).custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets the emoji to display on this button
-	 * @param emoji The emoji to display on this button
-	 */
-	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emoji;
-		return this;
-	}
-
-	/**
-	 * Sets whether this button is disable or not
-	 * @param disabled Whether or not to disable this button or not
-	 */
-	public setDisabled(disabled = true) {
-		this.data.disabled = disabled;
-		return this;
-	}
-
-	/**
-	 * Sets the label for this button
-	 * @param label The label to display on this button
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	public toJSON(): APIButtonComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APIButtonComponent;
-	}
-}

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

@@ -1,68 +1,130 @@
-import type { APISelectMenuComponent, APISelectMenuOption } from 'discord-api-types/v10';
-import { UnsafeSelectMenuBuilder } from './UnsafeSelectMenu';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
+import { APISelectMenuOption, ComponentType, type APISelectMenuComponent } from 'discord-api-types/v10';
+import { SelectMenuOptionBuilder } from './SelectMenuOption';
+import { normalizeArray, type RestOrArray } from '../../util/normalizeArray';
 import {
 	customIdValidator,
 	disabledValidator,
+	jsonOptionValidator,
 	minMaxValidator,
 	optionsLengthValidator,
-	optionValidator,
 	placeholderValidator,
 	validateRequiredSelectMenuParameters,
 } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
 /**
- * Represents a validated select menu component
+ * Represents a select menu component
  */
-export class SelectMenuBuilder extends UnsafeSelectMenuBuilder {
-	public override setPlaceholder(placeholder: string) {
-		return super.setPlaceholder(placeholderValidator.parse(placeholder));
+export class SelectMenuBuilder extends ComponentBuilder<APISelectMenuComponent> {
+	/**
+	 * The options within this select menu
+	 */
+	public readonly options: SelectMenuOptionBuilder[];
+
+	public constructor(data?: Partial<APISelectMenuComponent>) {
+		const { options, ...initData } = data ?? {};
+		super({ type: ComponentType.SelectMenu, ...initData });
+		this.options = options?.map((o) => new SelectMenuOptionBuilder(o)) ?? [];
 	}
 
-	public override setMinValues(minValues: number) {
-		return super.setMinValues(minMaxValidator.parse(minValues));
+	/**
+	 * Sets the placeholder for this select menu
+	 *
+	 * @param placeholder - The placeholder to use for this select menu
+	 */
+	public setPlaceholder(placeholder: string) {
+		this.data.placeholder = placeholderValidator.parse(placeholder);
+		return this;
 	}
 
-	public override setMaxValues(maxValues: number) {
-		return super.setMaxValues(minMaxValidator.parse(maxValues));
+	/**
+	 * Sets the minimum values that must be selected in the select menu
+	 *
+	 * @param minValues - The minimum values that must be selected
+	 */
+	public setMinValues(minValues: number) {
+		this.data.min_values = minMaxValidator.parse(minValues);
+		return this;
 	}
 
-	public override setCustomId(customId: string) {
-		return super.setCustomId(customIdValidator.parse(customId));
+	/**
+	 * Sets the maximum values that must be selected in the select menu
+	 *
+	 * @param maxValues - The maximum values that must be selected
+	 */
+	public setMaxValues(maxValues: number) {
+		this.data.max_values = minMaxValidator.parse(maxValues);
+		return this;
 	}
 
-	public override setDisabled(disabled = true) {
-		return super.setDisabled(disabledValidator.parse(disabled));
+	/**
+	 * Sets the custom id for this select menu
+	 *
+	 * @param customId - The custom id to use for this select menu
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override addOptions(options: (UnsafeSelectMenuOptionBuilder | APISelectMenuOption)[]) {
+	/**
+	 * Sets whether this select menu is disabled
+	 *
+	 * @param disabled - Whether this select menu is disabled
+	 */
+	public setDisabled(disabled = true) {
+		this.data.disabled = disabledValidator.parse(disabled);
+		return this;
+	}
+
+	/**
+	 * Adds options to this select menu
+	 *
+	 * @param options - The options to add to this select menu
+	 * @returns
+	 */
+	public addOptions(...options: RestOrArray<SelectMenuOptionBuilder | APISelectMenuOption>) {
+		options = normalizeArray(options);
 		optionsLengthValidator.parse(this.options.length + options.length);
 		this.options.push(
 			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder
+				option instanceof SelectMenuOptionBuilder
 					? option
-					: new UnsafeSelectMenuOptionBuilder(optionValidator.parse(option) as APISelectMenuOption),
+					: new SelectMenuOptionBuilder(jsonOptionValidator.parse(option)),
 			),
 		);
 		return this;
 	}
 
-	public override setOptions(options: (UnsafeSelectMenuOptionBuilder | APISelectMenuOption)[]) {
+	/**
+	 * Sets the options on this select menu
+	 *
+	 * @param options - The options to set on this select menu
+	 */
+	public setOptions(...options: RestOrArray<SelectMenuOptionBuilder | APISelectMenuOption>) {
+		options = normalizeArray(options);
 		optionsLengthValidator.parse(options.length);
 		this.options.splice(
 			0,
 			this.options.length,
 			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder
+				option instanceof SelectMenuOptionBuilder
 					? option
-					: new UnsafeSelectMenuOptionBuilder(optionValidator.parse(option) as APISelectMenuOption),
+					: new SelectMenuOptionBuilder(jsonOptionValidator.parse(option)),
 			),
 		);
 		return this;
 	}
 
-	public override toJSON(): APISelectMenuComponent {
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APISelectMenuComponent {
 		validateRequiredSelectMenuParameters(this.options, this.data.custom_id);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+			options: this.options.map((o) => o.toJSON()),
+		} as APISelectMenuComponent;
 	}
 }

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

@@ -1,30 +1,77 @@
 import type { APIMessageComponentEmoji, APISelectMenuOption } from 'discord-api-types/v10';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
+import type { JSONEncodable } from '../../util/jsonEncodable';
+
 import {
 	defaultValidator,
 	emojiValidator,
-	labelValueValidator,
+	labelValueDescriptionValidator,
 	validateRequiredSelectMenuOptionParameters,
 } from '../Assertions';
 
 /**
- * Represents a validated option within a select menu component
+ * Represents a option within a select menu component
  */
-export class SelectMenuOptionBuilder extends UnsafeSelectMenuOptionBuilder {
-	public override setDescription(description: string) {
-		return super.setDescription(labelValueValidator.parse(description));
+export class SelectMenuOptionBuilder implements JSONEncodable<APISelectMenuOption> {
+	public constructor(public data: Partial<APISelectMenuOption> = {}) {}
+
+	/**
+	 * Sets the label of this option
+	 *
+	 * @param label - The label to show on this option
+	 */
+	public setLabel(label: string) {
+		this.data.label = labelValueDescriptionValidator.parse(label);
+		return this;
 	}
 
-	public override setDefault(isDefault = true) {
-		return super.setDefault(defaultValidator.parse(isDefault));
+	/**
+	 * Sets the value of this option
+	 *
+	 * @param value - The value of this option
+	 */
+	public setValue(value: string) {
+		this.data.value = labelValueDescriptionValidator.parse(value);
+		return this;
 	}
 
-	public override setEmoji(emoji: APIMessageComponentEmoji) {
-		return super.setEmoji(emojiValidator.parse(emoji));
+	/**
+	 * Sets the description of this option
+	 *
+	 * @param description - The description of this option
+	 */
+	public setDescription(description: string) {
+		this.data.description = labelValueDescriptionValidator.parse(description);
+		return this;
 	}
 
-	public override toJSON(): APISelectMenuOption {
+	/**
+	 * Sets whether this option is selected by default
+	 *
+	 * @param isDefault - Whether this option is selected by default
+	 */
+	public setDefault(isDefault = true) {
+		this.data.default = defaultValidator.parse(isDefault);
+		return this;
+	}
+
+	/**
+	 * Sets the emoji to display on this option
+	 *
+	 * @param emoji - The emoji to display on this option
+	 */
+	public setEmoji(emoji: APIMessageComponentEmoji) {
+		this.data.emoji = emojiValidator.parse(emoji);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APISelectMenuOption {
 		validateRequiredSelectMenuOptionParameters(this.data.label, this.data.value);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APISelectMenuOption;
 	}
 }

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

@@ -1,101 +0,0 @@
-import { APISelectMenuOption, ComponentType, type APISelectMenuComponent } from 'discord-api-types/v10';
-import { UnsafeSelectMenuOptionBuilder } from './UnsafeSelectMenuOption';
-import { ComponentBuilder } from '../Component';
-
-/**
- * Represents a non-validated select menu component
- */
-export class UnsafeSelectMenuBuilder extends ComponentBuilder<APISelectMenuComponent> {
-	/**
-	 * The options within this select menu
-	 */
-	public readonly options: UnsafeSelectMenuOptionBuilder[];
-
-	public constructor(data?: Partial<APISelectMenuComponent>) {
-		const { options, ...initData } = data ?? {};
-		super({ type: ComponentType.SelectMenu, ...initData });
-		this.options = options?.map((o) => new UnsafeSelectMenuOptionBuilder(o)) ?? [];
-	}
-
-	/**
-	 * Sets the placeholder for this select menu
-	 * @param placeholder The placeholder to use for this select menu
-	 */
-	public setPlaceholder(placeholder: string) {
-		this.data.placeholder = placeholder;
-		return this;
-	}
-
-	/**
-	 * Sets the minimum values that must be selected in the select menu
-	 * @param minValues The minimum values that must be selected
-	 */
-	public setMinValues(minValues: number) {
-		this.data.min_values = minValues;
-		return this;
-	}
-
-	/**
-	 * Sets the maximum values that must be selected in the select menu
-	 * @param minValues The maximum values that must be selected
-	 */
-	public setMaxValues(maxValues: number) {
-		this.data.max_values = maxValues;
-		return this;
-	}
-
-	/**
-	 * Sets the custom Id for this select menu
-	 * @param customId The custom id to use for this select menu
-	 */
-	public setCustomId(customId: string) {
-		this.data.custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets whether or not this select menu is disabled
-	 * @param disabled Whether or not this select menu is disabled
-	 */
-	public setDisabled(disabled = true) {
-		this.data.disabled = disabled;
-		return this;
-	}
-
-	/**
-	 * Adds options to this select menu
-	 * @param options The options to add to this select menu
-	 * @returns
-	 */
-	public addOptions(options: (UnsafeSelectMenuOptionBuilder | APISelectMenuOption)[]) {
-		this.options.push(
-			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder ? option : new UnsafeSelectMenuOptionBuilder(option),
-			),
-		);
-		return this;
-	}
-
-	/**
-	 * Sets the options on this select menu
-	 * @param options The options to set on this select menu
-	 */
-	public setOptions(options: (UnsafeSelectMenuOptionBuilder | APISelectMenuOption)[]) {
-		this.options.splice(
-			0,
-			this.options.length,
-			...options.map((option) =>
-				option instanceof UnsafeSelectMenuOptionBuilder ? option : new UnsafeSelectMenuOptionBuilder(option),
-			),
-		);
-		return this;
-	}
-
-	public toJSON(): APISelectMenuComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-			options: this.options.map((o) => o.toJSON()),
-		} as APISelectMenuComponent;
-	}
-}

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

@@ -1,60 +0,0 @@
-import type { APIMessageComponentEmoji, APISelectMenuOption } from 'discord-api-types/v10';
-
-/**
- * Represents a non-validated option within a select menu component
- */
-export class UnsafeSelectMenuOptionBuilder {
-	public constructor(public data: Partial<APISelectMenuOption> = {}) {}
-
-	/**
-	 * Sets the label of this option
-	 * @param label The label to show on this option
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	/**
-	 * Sets the value of this option
-	 * @param value The value of this option
-	 */
-	public setValue(value: string) {
-		this.data.value = value;
-		return this;
-	}
-
-	/**
-	 * Sets the description of this option.
-	 * @param description The description of this option
-	 */
-	public setDescription(description: string) {
-		this.data.description = description;
-		return this;
-	}
-
-	/**
-	 * Sets whether this option is selected by default
-	 * @param isDefault Whether this option is selected by default
-	 */
-	public setDefault(isDefault = true) {
-		this.data.default = isDefault;
-		return this;
-	}
-
-	/**
-	 * Sets the emoji to display on this option
-	 * @param emoji The emoji to display on this option
-	 */
-	public setEmoji(emoji: APIMessageComponentEmoji) {
-		this.data.emoji = emoji;
-		return this;
-	}
-
-	public toJSON(): APISelectMenuOption {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APISelectMenuOption;
-	}
-}

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

@@ -1,14 +1,24 @@
 import { s } from '@sapphire/shapeshift';
 import { TextInputStyle } from 'discord-api-types/v10';
+import { isValidationEnabled } from '../../util/validation';
 import { customIdValidator } from '../Assertions';
 
 export const textInputStyleValidator = s.nativeEnum(TextInputStyle);
-export const minLengthValidator = s.number.int.greaterThanOrEqual(0).lessThanOrEqual(4000);
-export const maxLengthValidator = s.number.int.greaterThanOrEqual(1).lessThanOrEqual(4000);
+export const minLengthValidator = s.number.int
+	.greaterThanOrEqual(0)
+	.lessThanOrEqual(4000)
+	.setValidationEnabled(isValidationEnabled);
+export const maxLengthValidator = s.number.int
+	.greaterThanOrEqual(1)
+	.lessThanOrEqual(4000)
+	.setValidationEnabled(isValidationEnabled);
 export const requiredValidator = s.boolean;
-export const valueValidator = s.string.lengthLessThanOrEqual(4000);
-export const placeholderValidator = s.string.lengthLessThanOrEqual(100);
-export const labelValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(45);
+export const valueValidator = s.string.lengthLessThanOrEqual(4000).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);

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

@@ -1,4 +1,5 @@
-import type { APITextInputComponent } from 'discord-api-types/v10';
+import { ComponentType, type TextInputStyle, type APITextInputComponent } from 'discord-api-types/v10';
+import isEqual from 'fast-deep-equal';
 import {
 	maxLengthValidator,
 	minLengthValidator,
@@ -6,32 +7,121 @@ import {
 	requiredValidator,
 	valueValidator,
 	validateRequiredParameters,
+	labelValidator,
+	textInputStyleValidator,
 } from './Assertions';
-import { UnsafeTextInputBuilder } from './UnsafeTextInput';
+import type { Equatable } from '../../util/equatable';
+import { isJSONEncodable, type JSONEncodable } from '../../util/jsonEncodable';
+import { customIdValidator } from '../Assertions';
+import { ComponentBuilder } from '../Component';
 
-export class TextInputBuilder extends UnsafeTextInputBuilder {
-	public override setMinLength(minLength: number) {
-		return super.setMinLength(minLengthValidator.parse(minLength));
+export class TextInputBuilder
+	extends ComponentBuilder<APITextInputComponent>
+	implements Equatable<JSONEncodable<APITextInputComponent> | APITextInputComponent>
+{
+	public constructor(data?: APITextInputComponent & { type?: ComponentType.TextInput }) {
+		super({ type: ComponentType.TextInput, ...data });
 	}
 
-	public override setMaxLength(maxLength: number) {
-		return super.setMaxLength(maxLengthValidator.parse(maxLength));
+	/**
+	 * Sets the custom id for this text input
+	 *
+	 * @param customId - The custom id of this text input
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customIdValidator.parse(customId);
+		return this;
 	}
 
-	public override setRequired(required = true) {
-		return super.setRequired(requiredValidator.parse(required));
+	/**
+	 * Sets the label for this text input
+	 *
+	 * @param label - The label for this text input
+	 */
+	public setLabel(label: string) {
+		this.data.label = labelValidator.parse(label);
+		return this;
 	}
 
-	public override setValue(value: string) {
-		return super.setValue(valueValidator.parse(value));
+	/**
+	 * Sets the style for this text input
+	 *
+	 * @param style - The style for this text input
+	 */
+	public setStyle(style: TextInputStyle) {
+		this.data.style = textInputStyleValidator.parse(style);
+		return this;
 	}
 
-	public override setPlaceholder(placeholder: string) {
-		return super.setPlaceholder(placeholderValidator.parse(placeholder));
+	/**
+	 * Sets the minimum length of text for this text input
+	 *
+	 * @param minLength - The minimum length of text for this text input
+	 */
+	public setMinLength(minLength: number) {
+		this.data.min_length = minLengthValidator.parse(minLength);
+		return this;
 	}
 
-	public override toJSON(): APITextInputComponent {
+	/**
+	 * Sets the maximum length of text for this text input
+	 *
+	 * @param maxLength - The maximum length of text for this text input
+	 */
+	public setMaxLength(maxLength: number) {
+		this.data.max_length = maxLengthValidator.parse(maxLength);
+		return this;
+	}
+
+	/**
+	 * Sets the placeholder of this text input
+	 *
+	 * @param placeholder - The placeholder of this text input
+	 */
+	public setPlaceholder(placeholder: string) {
+		this.data.placeholder = placeholderValidator.parse(placeholder);
+		return this;
+	}
+
+	/**
+	 * Sets the value of this text input
+	 *
+	 * @param value - The value for this text input
+	 */
+	public setValue(value: string) {
+		this.data.value = valueValidator.parse(value);
+		return this;
+	}
+
+	/**
+	 * Sets whether this text input is required
+	 *
+	 * @param required - Whether this text input is required
+	 */
+	public setRequired(required = true) {
+		this.data.required = requiredValidator.parse(required);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APITextInputComponent {
 		validateRequiredParameters(this.data.custom_id, this.data.style, this.data.label);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+		} as APITextInputComponent;
+	}
+
+	/**
+	 * {@inheritDoc Equatable.equals}
+	 */
+	public equals(other: JSONEncodable<APITextInputComponent> | APITextInputComponent): boolean {
+		if (isJSONEncodable(other)) {
+			return isEqual(other.toJSON(), this.data);
+		}
+
+		return isEqual(other, this.data);
 	}
 }

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

@@ -1,96 +0,0 @@
-import { ComponentType, type TextInputStyle, type APITextInputComponent } from 'discord-api-types/v10';
-import isEqual from 'fast-deep-equal';
-import { ComponentBuilder } from '../../index';
-
-export class UnsafeTextInputBuilder extends ComponentBuilder<APITextInputComponent> {
-	public constructor(data?: APITextInputComponent & { type?: ComponentType.TextInput }) {
-		super({ type: ComponentType.TextInput, ...data });
-	}
-
-	/**
-	 * Sets the custom id for this text input
-	 * @param customId The custom id of this text input
-	 */
-	public setCustomId(customId: string) {
-		this.data.custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Sets the label for this text input
-	 * @param label The label for this text input
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	/**
-	 * Sets the style for this text input
-	 * @param style The style for this text input
-	 */
-	public setStyle(style: TextInputStyle) {
-		this.data.style = style;
-		return this;
-	}
-
-	/**
-	 * Sets the minimum length of text for this text input
-	 * @param minLength The minimum length of text for this text input
-	 */
-	public setMinLength(minLength: number) {
-		this.data.min_length = minLength;
-		return this;
-	}
-
-	/**
-	 * Sets the maximum length of text for this text input
-	 * @param maxLength The maximum length of text for this text input
-	 */
-	public setMaxLength(maxLength: number) {
-		this.data.max_length = maxLength;
-		return this;
-	}
-
-	/**
-	 * Sets the placeholder of this text input
-	 * @param placeholder The placeholder of this text input
-	 */
-	public setPlaceholder(placeholder: string) {
-		this.data.placeholder = placeholder;
-		return this;
-	}
-
-	/**
-	 * Sets the value of this text input
-	 * @param value The value for this text input
-	 */
-	public setValue(value: string) {
-		this.data.value = value;
-		return this;
-	}
-
-	/**
-	 * Sets whether this text input is required or not
-	 * @param required Whether this text input is required or not
-	 */
-	public setRequired(required = true) {
-		this.data.required = required;
-		return this;
-	}
-
-	public toJSON(): APITextInputComponent {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-		} as APITextInputComponent;
-	}
-
-	public equals(other: UnsafeTextInputBuilder | APITextInputComponent): boolean {
-		if (other instanceof UnsafeTextInputBuilder) {
-			return isEqual(other.data, this.data);
-		}
-
-		return isEqual(other, this.data);
-	}
-}

packages/builders/src/index.ts

@@ -1,7 +1,6 @@
 export * as EmbedAssertions from './messages/embed/Assertions';
 export * from './messages/embed/Embed';
 export * from './messages/formatters';
-export * from './messages/embed/UnsafeEmbed';
 
 export * as ComponentAssertions from './components/Assertions';
 export * from './components/ActionRow';
@@ -10,15 +9,10 @@ export * from './components/Component';
 export * from './components/Components';
 export * from './components/textInput/TextInput';
 export * as TextInputAssertions from './components/textInput/Assertions';
-export * from './components/textInput/UnsafeTextInput';
-export * from './interactions/modals/UnsafeModal';
 export * from './interactions/modals/Modal';
 export * as ModalAssertions from './interactions/modals/Assertions';
 export * from './components/selectMenu/SelectMenu';
 export * from './components/selectMenu/SelectMenuOption';
-export * from './components/button/UnsafeButton';
-export * from './components/selectMenu/UnsafeSelectMenu';
-export * from './components/selectMenu/UnsafeSelectMenuOption';
 
 export * as SlashCommandAssertions from './interactions/slashCommands/Assertions';
 export * from './interactions/slashCommands/SlashCommandBuilder';
@@ -45,3 +39,5 @@ export * from './interactions/contextMenuCommands/ContextMenuCommandBuilder';
 export * from './util/jsonEncodable';
 export * from './util/equatable';
 export * from './util/componentUtil';
+export * from './util/normalizeArray';
+export * from './util/validation';

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

@@ -1,14 +1,16 @@
 import { s } from '@sapphire/shapeshift';
 import { ApplicationCommandType } from 'discord-api-types/v10';
 import type { ContextMenuCommandType } from './ContextMenuCommandBuilder';
+import { isValidationEnabled } from '../../util/validation';
 
 const namePredicate = s.string
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(32)
-	.regex(/^( *[\p{L}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+ *)+$/u);
-
-const typePredicate = s.union(s.literal(ApplicationCommandType.User), s.literal(ApplicationCommandType.Message));
-
+	.regex(/^( *[\p{L}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+ *)+$/u)
+	.setValidationEnabled(isValidationEnabled);
+const typePredicate = s
+	.union(s.literal(ApplicationCommandType.User), s.literal(ApplicationCommandType.Message))
+	.setValidationEnabled(isValidationEnabled);
 const booleanPredicate = s.boolean;
 
 export function validateDefaultPermission(value: unknown): asserts value is boolean {

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

@@ -35,7 +35,7 @@ export class ContextMenuCommandBuilder {
 	 * Whether the command is enabled by default when the app is added to a guild
 	 *
 	 * @deprecated This property is deprecated and will be removed in the future.
-	 * You should use `setDefaultMemberPermissions` or `setDMPermission` instead.
+	 * You should use {@link ContextMenuCommandBuilder.setDefaultMemberPermissions} or {@link ContextMenuCommandBuilder.setDMPermission} instead.
 	 */
 	public readonly default_permission: boolean | undefined = undefined;
 
@@ -53,7 +53,7 @@ export class ContextMenuCommandBuilder {
 	/**
 	 * Sets the name
 	 *
-	 * @param name The name
+	 * @param name - The name
 	 */
 	public setName(name: string) {
 		// Assert the name matches the conditions
@@ -67,7 +67,7 @@ export class ContextMenuCommandBuilder {
 	/**
 	 * Sets the type
 	 *
-	 * @param type The type
+	 * @param type - The type
 	 */
 	public setType(type: ContextMenuCommandType) {
 		// Assert the type is valid
@@ -83,10 +83,10 @@ export class ContextMenuCommandBuilder {
 	 *
 	 * **Note**: If set to `false`, you will have to later `PUT` the permissions for this command.
 	 *
-	 * @param value Whether or not to enable this command by default
+	 * @param value - Whether or not to enable this command by default
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
-	 * @deprecated Use `setDefaultMemberPermissions` or `setDMPermission` instead.
+	 * @deprecated Use {@link ContextMenuCommandBuilder.setDefaultMemberPermissions} or {@link ContextMenuCommandBuilder.setDMPermission} instead.
 	 */
 	public setDefaultPermission(value: boolean) {
 		// Assert the value matches the conditions
@@ -102,7 +102,7 @@ export class ContextMenuCommandBuilder {
 	 *
 	 * **Note:** You can set this to `'0'` to disable the command by default.
 	 *
-	 * @param permissions The permissions bit field to set
+	 * @param permissions - The permissions bit field to set
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
 	 */
@@ -119,7 +119,7 @@ export class ContextMenuCommandBuilder {
 	 * Sets if the command is available in DMs with the application, only for globally-scoped commands.
 	 * By default, commands are visible.
 	 *
-	 * @param enabled If the command should be enabled in DMs
+	 * @param enabled - If the command should be enabled in DMs
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
 	 */
@@ -135,8 +135,8 @@ export class ContextMenuCommandBuilder {
 	/**
 	 * Sets a name localization
 	 *
-	 * @param locale The locale to set a description for
-	 * @param localizedName The localized description for the given locale
+	 * @param locale - The locale to set a description for
+	 * @param localizedName - The localized description for the given locale
 	 */
 	public setNameLocalization(locale: LocaleString, localizedName: string | null) {
 		if (!this.name_localizations) {
@@ -159,7 +159,7 @@ export class ContextMenuCommandBuilder {
 	/**
 	 * Sets the name localizations
 	 *
-	 * @param localizedNames The dictionary of localized descriptions to set
+	 * @param localizedNames - The dictionary of localized descriptions to set
 	 */
 	public setNameLocalizations(localizedNames: LocalizationMap | null) {
 		if (localizedNames === null) {

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

@@ -1,9 +1,16 @@
 import { s } from '@sapphire/shapeshift';
-import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../..';
+import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow';
 import { customIdValidator } from '../../components/Assertions';
+import { isValidationEnabled } from '../../util/validation';
 
-export const titleValidator = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(45);
-export const componentsValidator = s.instance(ActionRowBuilder).array.lengthGreaterThanOrEqual(1);
+export const titleValidator = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(45)
+	.setValidationEnabled(isValidationEnabled);
+export const componentsValidator = s
+	.instance(ActionRowBuilder)
+	.array.lengthGreaterThanOrEqual(1)
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateRequiredParameters(
 	customId?: string,

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

@@ -1,19 +1,84 @@
-import type { APIModalInteractionResponseCallbackData } from 'discord-api-types/v10';
+import type {
+	APIActionRowComponent,
+	APIModalActionRowComponent,
+	APIModalInteractionResponseCallbackData,
+} from 'discord-api-types/v10';
 import { titleValidator, validateRequiredParameters } from './Assertions';
-import { UnsafeModalBuilder } from './UnsafeModal';
+import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow';
 import { customIdValidator } from '../../components/Assertions';
+import { createComponentBuilder } from '../../components/Components';
+import type { JSONEncodable } from '../../util/jsonEncodable';
+import { normalizeArray, type RestOrArray } from '../../util/normalizeArray';
 
-export class ModalBuilder extends UnsafeModalBuilder {
-	public override setCustomId(customId: string): this {
-		return super.setCustomId(customIdValidator.parse(customId));
+export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCallbackData> {
+	public readonly data: Partial<APIModalInteractionResponseCallbackData>;
+	public readonly components: ActionRowBuilder<ModalActionRowComponentBuilder>[] = [];
+
+	public constructor({ components, ...data }: Partial<APIModalInteractionResponseCallbackData> = {}) {
+		this.data = { ...data };
+		this.components = (components?.map((c) => createComponentBuilder(c)) ??
+			[]) as ActionRowBuilder<ModalActionRowComponentBuilder>[];
 	}
 
-	public override setTitle(title: string) {
-		return super.setTitle(titleValidator.parse(title));
+	/**
+	 * Sets the title of the modal
+	 *
+	 * @param title - The title of the modal
+	 */
+	public setTitle(title: string) {
+		this.data.title = titleValidator.parse(title);
+		return this;
 	}
 
-	public override toJSON(): APIModalInteractionResponseCallbackData {
+	/**
+	 * Sets the custom id of the modal
+	 *
+	 * @param customId - The custom id of this modal
+	 */
+	public setCustomId(customId: string) {
+		this.data.custom_id = customIdValidator.parse(customId);
+		return this;
+	}
+
+	/**
+	 * Adds components to this modal
+	 *
+	 * @param components - The components to add to this modal
+	 */
+	public addComponents(
+		...components: RestOrArray<
+			ActionRowBuilder<ModalActionRowComponentBuilder> | APIActionRowComponent<APIModalActionRowComponent>
+		>
+	) {
+		this.components.push(
+			...normalizeArray(components).map((component) =>
+				component instanceof ActionRowBuilder
+					? component
+					: new ActionRowBuilder<ModalActionRowComponentBuilder>(component),
+			),
+		);
+		return this;
+	}
+
+	/**
+	 * Sets the components in this modal
+	 *
+	 * @param components - The components to set this modal to
+	 */
+	public setComponents(...components: RestOrArray<ActionRowBuilder<ModalActionRowComponentBuilder>>) {
+		this.components.splice(0, this.components.length, ...normalizeArray(components));
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc ComponentBuilder.toJSON}
+	 */
+	public toJSON(): APIModalInteractionResponseCallbackData {
 		validateRequiredParameters(this.data.custom_id, this.data.title, this.components);
-		return super.toJSON();
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		return {
+			...this.data,
+			components: this.components.map((component) => component.toJSON()),
+		} as APIModalInteractionResponseCallbackData;
 	}
 }

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

@@ -1,72 +0,0 @@
-import type {
-	APIActionRowComponent,
-	APIModalActionRowComponent,
-	APIModalInteractionResponseCallbackData,
-} from 'discord-api-types/v10';
-import { ActionRowBuilder, createComponentBuilder, JSONEncodable, ModalActionRowComponentBuilder } from '../../index';
-
-export class UnsafeModalBuilder implements JSONEncodable<APIModalInteractionResponseCallbackData> {
-	public readonly data: Partial<APIModalInteractionResponseCallbackData>;
-	public readonly components: ActionRowBuilder<ModalActionRowComponentBuilder>[] = [];
-
-	public constructor({ components, ...data }: Partial<APIModalInteractionResponseCallbackData> = {}) {
-		this.data = { ...data };
-		this.components = (components?.map((c) => createComponentBuilder(c)) ??
-			[]) as ActionRowBuilder<ModalActionRowComponentBuilder>[];
-	}
-
-	/**
-	 * Sets the title of the modal
-	 * @param title The title of the modal
-	 */
-	public setTitle(title: string) {
-		this.data.title = title;
-		return this;
-	}
-
-	/**
-	 * Sets the custom id of the modal
-	 * @param customId The custom id of this modal
-	 */
-	public setCustomId(customId: string) {
-		this.data.custom_id = customId;
-		return this;
-	}
-
-	/**
-	 * Adds components to this modal
-	 * @param components The components to add to this modal
-	 */
-	public addComponents(
-		components: (
-			| ActionRowBuilder<ModalActionRowComponentBuilder>
-			| APIActionRowComponent<APIModalActionRowComponent>
-		)[],
-	) {
-		this.components.push(
-			...components.map((component) =>
-				component instanceof ActionRowBuilder
-					? component
-					: new ActionRowBuilder<ModalActionRowComponentBuilder>(component),
-			),
-		);
-		return this;
-	}
-
-	/**
-	 * Sets the components in this modal
-	 * @param components The components to set this modal to
-	 */
-	public setComponents(components: ActionRowBuilder<ModalActionRowComponentBuilder>[]) {
-		this.components.splice(0, this.components.length, ...components);
-		return this;
-	}
-
-	public toJSON(): APIModalInteractionResponseCallbackData {
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		return {
-			...this.data,
-			components: this.components.map((component) => component.toJSON()),
-		} as APIModalInteractionResponseCallbackData;
-	}
-}

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

@@ -1,27 +1,31 @@
 import { s } from '@sapphire/shapeshift';
-import is from '@sindresorhus/is';
 import { type APIApplicationCommandOptionChoice, Locale, LocalizationMap } from 'discord-api-types/v10';
 import type { ToAPIApplicationCommandOptions } from './SlashCommandBuilder';
 import type { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder } from './SlashCommandSubcommands';
 import type { ApplicationCommandOptionBase } from './mixins/ApplicationCommandOptionBase';
+import { isValidationEnabled } from '../../util/validation';
 
 const namePredicate = s.string
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(32)
-	.regex(/^[\P{Lu}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u);
+	.regex(/^[\p{Ll}\p{Lm}\p{Lo}\p{N}\p{sc=Devanagari}\p{sc=Thai}_-]+$/u)
+	.setValidationEnabled(isValidationEnabled);
 
 export function validateName(name: unknown): asserts name is string {
 	namePredicate.parse(name);
 }
 
-const descriptionPredicate = s.string.lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100);
+const descriptionPredicate = s.string
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(100)
+	.setValidationEnabled(isValidationEnabled);
 const localePredicate = s.nativeEnum(Locale);
 
 export function validateDescription(description: unknown): asserts description is string {
 	descriptionPredicate.parse(description);
 }
 
-const maxArrayLengthPredicate = s.unknown.array.lengthLessThanOrEqual(25);
+const maxArrayLengthPredicate = s.unknown.array.lengthLessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
 export function validateLocale(locale: unknown) {
 	return localePredicate.parse(locale);
 }
@@ -55,7 +59,7 @@ export function validateRequired(required: unknown): asserts required is boolean
 	booleanPredicate.parse(required);
 }
 
-const choicesLengthPredicate = s.number.lessThanOrEqual(25);
+const choicesLengthPredicate = s.number.lessThanOrEqual(25).setValidationEnabled(isValidationEnabled);
 
 export function validateChoicesLength(amountAdding: number, choices?: APIApplicationCommandOptionChoice[]): void {
 	choicesLengthPredicate.parse((choices?.length ?? 0) + amountAdding);
@@ -64,33 +68,12 @@ export function validateChoicesLength(amountAdding: number, choices?: APIApplica
 export function assertReturnOfBuilder<
 	T extends ApplicationCommandOptionBase | SlashCommandSubcommandBuilder | SlashCommandSubcommandGroupBuilder,
 >(input: unknown, ExpectedInstanceOf: new () => T): asserts input is T {
-	const instanceName = ExpectedInstanceOf.name;
-
-	if (is.nullOrUndefined(input)) {
-		throw new TypeError(
-			`Expected to receive a ${instanceName} builder, got ${input === null ? 'null' : 'undefined'} instead.`,
-		);
-	}
-
-	if (is.primitive(input)) {
-		throw new TypeError(`Expected to receive a ${instanceName} builder, got a primitive (${typeof input}) instead.`);
-	}
-
-	if (!(input instanceof ExpectedInstanceOf)) {
-		const casted = input as Record<PropertyKey, unknown>;
-
-		const constructorName = is.function_(input) ? input.name : casted.constructor.name;
-		const stringTag = Reflect.get(casted, Symbol.toStringTag) as string | undefined;
-
-		const fullResultName = stringTag ? `${constructorName} [${stringTag}]` : constructorName;
-
-		throw new TypeError(`Expected to receive a ${instanceName} builder, got ${fullResultName} instead.`);
-	}
+	s.instance(ExpectedInstanceOf).parse(input);
 }
 
-export const localizationMapPredicate = s.object<LocalizationMap>(
-	Object.fromEntries(Object.values(Locale).map((locale) => [locale, s.string.nullish])),
-).strict.nullish;
+export const localizationMapPredicate = s
+	.object<LocalizationMap>(Object.fromEntries(Object.values(Locale).map((locale) => [locale, s.string.nullish])))
+	.strict.nullish.setValidationEnabled(isValidationEnabled);
 
 export function validateLocalizationMap(value: unknown): asserts value is LocalizationMap {
 	localizationMapPredicate.parse(value);

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

@@ -49,7 +49,7 @@ export class SlashCommandBuilder {
 	 * Whether the command is enabled by default when the app is added to a guild
 	 *
 	 * @deprecated This property is deprecated and will be removed in the future.
-	 * You should use `setDefaultMemberPermissions` or `setDMPermission` instead.
+	 * You should use {@link (SlashCommandBuilder:class).setDefaultMemberPermissions} or {@link (SlashCommandBuilder:class).setDMPermission} instead.
 	 */
 	public readonly default_permission: boolean | undefined = undefined;
 
@@ -86,10 +86,10 @@ export class SlashCommandBuilder {
 	 *
 	 * **Note**: If set to `false`, you will have to later `PUT` the permissions for this command.
 	 *
-	 * @param value Whether or not to enable this command by default
+	 * @param value - Whether or not to enable this command by default
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
-	 * @deprecated Use `setDefaultMemberPermissions` or `setDMPermission` instead.
+	 * @deprecated Use {@link (SlashCommandBuilder:class).setDefaultMemberPermissions} or {@link (SlashCommandBuilder:class).setDMPermission} instead.
 	 */
 	public setDefaultPermission(value: boolean) {
 		// Assert the value matches the conditions
@@ -105,7 +105,7 @@ export class SlashCommandBuilder {
 	 *
 	 * **Note:** You can set this to `'0'` to disable the command by default.
 	 *
-	 * @param permissions The permissions bit field to set
+	 * @param permissions - The permissions bit field to set
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
 	 */
@@ -122,7 +122,7 @@ export class SlashCommandBuilder {
 	 * Sets if the command is available in DMs with the application, only for globally-scoped commands.
 	 * By default, commands are visible.
 	 *
-	 * @param enabled If the command should be enabled in DMs
+	 * @param enabled - If the command should be enabled in DMs
 	 *
 	 * @see https://discord.com/developers/docs/interactions/application-commands#permissions
 	 */
@@ -138,7 +138,7 @@ export class SlashCommandBuilder {
 	/**
 	 * Adds a new subcommand group to this command
 	 *
-	 * @param input A function that returns a subcommand group builder, or an already built builder
+	 * @param input - A function that returns a subcommand group builder, or an already built builder
 	 */
 	public addSubcommandGroup(
 		input:
@@ -164,7 +164,7 @@ export class SlashCommandBuilder {
 	/**
 	 * Adds a new subcommand to this command
 	 *
-	 * @param input A function that returns a subcommand builder, or an already built builder
+	 * @param input - A function that returns a subcommand builder, or an already built builder
 	 */
 	public addSubcommand(
 		input:

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

@@ -35,7 +35,7 @@ export class SlashCommandSubcommandGroupBuilder implements ToAPIApplicationComma
 	/**
 	 * Adds a new subcommand to this group
 	 *
-	 * @param input A function that returns a subcommand builder, or an already built builder
+	 * @param input - A function that returns a subcommand builder, or an already built builder
 	 */
 	public addSubcommand(
 		input: