discord.js 15.0.0-dev.1740701540-b6fda781c → 15.0.0-dev.1740746538-46be1567a

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1740701540-b6fda781c",
+  "version": "15.0.0-dev.1740746538-46be1567a",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -52,7 +52,6 @@
   "homepage": "https://discord.js.org",
   "funding": "https://github.com/discordjs/discord.js?sponsor",
   "dependencies": {
-    "@discordjs/builders": "^1.9.0",
     "@sapphire/snowflake": "3.5.5",
     "@vladfrangu/async_event_emitter": "^2.4.6",
     "discord-api-types": "^0.37.118",
@@ -60,10 +59,11 @@
     "lodash.snakecase": "4.1.1",
     "tslib": "^2.8.1",
     "undici": "6.21.1",
+    "@discordjs/builders": "^1.9.0",
     "@discordjs/collection": "^2.1.1",
     "@discordjs/formatters": "^0.5.0",
-    "@discordjs/rest": "^2.4.0",
     "@discordjs/util": "^1.1.1",
+    "@discordjs/rest": "^2.4.0",
     "@discordjs/ws": "^2.0.0"
   },
   "devDependencies": {
@@ -81,9 +81,9 @@
     "tslint": "6.1.3",
     "turbo": "^2.3.3",
     "typescript": "~5.5.4",
-    "@discordjs/api-extractor": "^7.38.1",
+    "@discordjs/docgen": "^0.12.1",
     "@discordjs/scripts": "^0.1.0",
-    "@discordjs/docgen": "^0.12.1"
+    "@discordjs/api-extractor": "^7.38.1"
   },
   "engines": {
     "node": ">=22.12.0"

package/src/index.js

@@ -92,7 +92,6 @@ exports.VoiceStateManager = require('./managers/VoiceStateManager.js').VoiceStat
 
 // Structures
 exports.ActionRow = require('./structures/ActionRow.js').ActionRow;
-exports.ActionRowBuilder = require('./structures/ActionRowBuilder.js').ActionRowBuilder;
 exports.Activity = require('./structures/Presence.js').Activity;
 exports.AnnouncementChannel = require('./structures/AnnouncementChannel.js').AnnouncementChannel;
 exports.AnonymousGuild = require('./structures/AnonymousGuild.js').AnonymousGuild;
@@ -115,11 +114,9 @@ exports.BaseGuildTextChannel = require('./structures/BaseGuildTextChannel.js').B
 exports.BaseGuildVoiceChannel = require('./structures/BaseGuildVoiceChannel.js').BaseGuildVoiceChannel;
 exports.BaseInteraction = require('./structures/BaseInteraction.js').BaseInteraction;
 exports.BaseSelectMenuComponent = require('./structures/BaseSelectMenuComponent.js').BaseSelectMenuComponent;
-exports.ButtonBuilder = require('./structures/ButtonBuilder.js').ButtonBuilder;
 exports.ButtonComponent = require('./structures/ButtonComponent.js').ButtonComponent;
 exports.ButtonInteraction = require('./structures/ButtonInteraction.js').ButtonInteraction;
 exports.CategoryChannel = require('./structures/CategoryChannel.js').CategoryChannel;
-exports.ChannelSelectMenuBuilder = require('./structures/ChannelSelectMenuBuilder.js').ChannelSelectMenuBuilder;
 exports.ChannelSelectMenuComponent = require('./structures/ChannelSelectMenuComponent.js').ChannelSelectMenuComponent;
 exports.ChannelSelectMenuInteraction =
   require('./structures/ChannelSelectMenuInteraction.js').ChannelSelectMenuInteraction;
@@ -137,7 +134,6 @@ exports.ContextMenuCommandInteraction =
   require('./structures/ContextMenuCommandInteraction.js').ContextMenuCommandInteraction;
 exports.DMChannel = require('./structures/DMChannel.js').DMChannel;
 exports.Embed = require('./structures/Embed.js').Embed;
-exports.EmbedBuilder = require('./structures/EmbedBuilder.js').EmbedBuilder;
 exports.Emoji = require('./structures/Emoji.js').Emoji;
 exports.Entitlement = require('./structures/Entitlement.js').Entitlement;
 exports.ForumChannel = require('./structures/ForumChannel.js').ForumChannel;
@@ -168,8 +164,6 @@ exports.InteractionWebhook = require('./structures/InteractionWebhook.js').Inter
 exports.Invite = require('./structures/Invite.js').Invite;
 exports.InviteGuild = require('./structures/InviteGuild.js').InviteGuild;
 exports.MediaChannel = require('./structures/MediaChannel.js').MediaChannel;
-exports.MentionableSelectMenuBuilder =
-  require('./structures/MentionableSelectMenuBuilder.js').MentionableSelectMenuBuilder;
 exports.MentionableSelectMenuComponent =
   require('./structures/MentionableSelectMenuComponent.js').MentionableSelectMenuComponent;
 exports.MentionableSelectMenuInteraction =
@@ -185,7 +179,6 @@ exports.MessageContextMenuCommandInteraction =
 exports.MessageMentions = require('./structures/MessageMentions.js').MessageMentions;
 exports.MessagePayload = require('./structures/MessagePayload.js').MessagePayload;
 exports.MessageReaction = require('./structures/MessageReaction.js').MessageReaction;
-exports.ModalBuilder = require('./structures/ModalBuilder.js').ModalBuilder;
 exports.ModalSubmitFields = require('./structures/ModalSubmitFields.js').ModalSubmitFields;
 exports.ModalSubmitInteraction = require('./structures/ModalSubmitInteraction.js').ModalSubmitInteraction;
 exports.OAuth2Guild = require('./structures/OAuth2Guild.js').OAuth2Guild;
@@ -198,7 +191,6 @@ exports.ReactionCollector = require('./structures/ReactionCollector.js').Reactio
 exports.ReactionEmoji = require('./structures/ReactionEmoji.js').ReactionEmoji;
 exports.RichPresenceAssets = require('./structures/Presence.js').RichPresenceAssets;
 exports.Role = require('./structures/Role.js').Role;
-exports.RoleSelectMenuBuilder = require('./structures/RoleSelectMenuBuilder.js').RoleSelectMenuBuilder;
 exports.RoleSelectMenuComponent = require('./structures/RoleSelectMenuComponent.js').RoleSelectMenuComponent;
 exports.RoleSelectMenuInteraction = require('./structures/RoleSelectMenuInteraction.js').RoleSelectMenuInteraction;
 exports.SKU = require('./structures/SKU.js').SKU;
@@ -206,17 +198,13 @@ exports.StageChannel = require('./structures/StageChannel.js').StageChannel;
 exports.StageInstance = require('./structures/StageInstance.js').StageInstance;
 exports.Sticker = require('./structures/Sticker.js').Sticker;
 exports.StickerPack = require('./structures/StickerPack.js').StickerPack;
-exports.StringSelectMenuBuilder = require('./structures/StringSelectMenuBuilder.js').StringSelectMenuBuilder;
 exports.StringSelectMenuComponent = require('./structures/StringSelectMenuComponent.js').StringSelectMenuComponent;
 exports.StringSelectMenuInteraction =
   require('./structures/StringSelectMenuInteraction.js').StringSelectMenuInteraction;
-exports.StringSelectMenuOptionBuilder =
-  require('./structures/StringSelectMenuOptionBuilder.js').StringSelectMenuOptionBuilder;
 exports.Subscription = require('./structures/Subscription.js').Subscription;
 exports.Team = require('./structures/Team.js').Team;
 exports.TeamMember = require('./structures/TeamMember.js').TeamMember;
 exports.TextChannel = require('./structures/TextChannel.js').TextChannel;
-exports.TextInputBuilder = require('./structures/TextInputBuilder.js').TextInputBuilder;
 exports.TextInputComponent = require('./structures/TextInputComponent.js').TextInputComponent;
 exports.ThreadChannel = require('./structures/ThreadChannel.js').ThreadChannel;
 exports.ThreadMember = require('./structures/ThreadMember.js').ThreadMember;
@@ -225,7 +213,6 @@ exports.Typing = require('./structures/Typing.js').Typing;
 exports.User = require('./structures/User.js').User;
 exports.UserContextMenuCommandInteraction =
   require('./structures/UserContextMenuCommandInteraction.js').UserContextMenuCommandInteraction;
-exports.UserSelectMenuBuilder = require('./structures/UserSelectMenuBuilder.js').UserSelectMenuBuilder;
 exports.UserSelectMenuComponent = require('./structures/UserSelectMenuComponent.js').UserSelectMenuComponent;
 exports.UserSelectMenuInteraction = require('./structures/UserSelectMenuInteraction.js').UserSelectMenuInteraction;
 exports.VoiceChannel = require('./structures/VoiceChannel.js').VoiceChannel;

package/src/structures/MessagePayload.js

@@ -3,7 +3,6 @@
 const { Buffer } = require('node:buffer');
 const { isJSONEncodable } = require('@discordjs/util');
 const { DiscordSnowflake } = require('@sapphire/snowflake');
-const { ActionRowBuilder } = require('./ActionRowBuilder.js');
 const { DiscordjsError, DiscordjsRangeError, ErrorCodes } = require('../errors/index.js');
 const { resolveFile } = require('../util/DataResolver.js');
 const { MessageFlagsBitField } = require('../util/MessageFlagsBitField.js');
@@ -133,7 +132,7 @@ class MessagePayload {
     }
 
     const components = this.options.components?.map(component =>
-      (isJSONEncodable(component) ? component : new ActionRowBuilder(component)).toJSON(),
+      isJSONEncodable(component) ? component.toJSON() : this.target.client.options.jsonTransformer(component),
     );
 
     let username;
@@ -192,17 +191,19 @@ class MessagePayload {
 
     let poll;
     if (this.options.poll) {
-      poll = {
-        question: {
-          text: this.options.poll.question.text,
-        },
-        answers: this.options.poll.answers.map(answer => ({
-          poll_media: { text: answer.text, emoji: resolvePartialEmoji(answer.emoji) },
-        })),
-        duration: this.options.poll.duration,
-        allow_multiselect: this.options.poll.allowMultiselect,
-        layout_type: this.options.poll.layoutType,
-      };
+      poll = isJSONEncodable(this.options.poll)
+        ? this.options.poll.toJSON()
+        : {
+            question: {
+              text: this.options.poll.question.text,
+            },
+            answers: this.options.poll.answers.map(answer => ({
+              poll_media: { text: answer.text, emoji: resolvePartialEmoji(answer.emoji) },
+            })),
+            duration: this.options.poll.duration,
+            allow_multiselect: this.options.poll.allowMultiselect,
+            layout_type: this.options.poll.layoutType,
+          };
     }
 
     this.body = {

package/src/util/Components.js

@@ -1,72 +1,7 @@
 'use strict';
 
-const { ComponentBuilder } = require('@discordjs/builders');
 const { ComponentType } = require('discord-api-types/v10');
 
-/**
- * @typedef {Object} BaseComponentData
- * @property {ComponentType} type The type of component
- */
-
-/**
- * @typedef {BaseComponentData} ActionRowData
- * @property {ComponentData[]} components The components in this action row
- */
-
-/**
- * @typedef {BaseComponentData} ButtonComponentData
- * @property {ButtonStyle} style The style of the button
- * @property {?boolean} disabled Whether this button is disabled
- * @property {string} label The label of this button
- * @property {?APIMessageComponentEmoji} emoji The emoji on this button
- * @property {?string} customId The custom id of the button
- * @property {?string} url The URL of the button
- */
-
-/**
- * @typedef {object} SelectMenuComponentOptionData
- * @property {string} label The label of the option
- * @property {string} value The value of the option
- * @property {?string} description The description of the option
- * @property {?APIMessageComponentEmoji} emoji The emoji on the option
- * @property {?boolean} default Whether this option is selected by default
- */
-
-/**
- * @typedef {BaseComponentData} SelectMenuComponentData
- * @property {string} customId The custom id of the select menu
- * @property {?boolean} disabled Whether the select menu is disabled or not
- * @property {?number} maxValues The maximum amount of options that can be selected
- * @property {?number} minValues The minimum amount of options that can be selected
- * @property {?SelectMenuComponentOptionData[]} options The options in this select menu
- * @property {?string} placeholder The placeholder of the select menu
- */
-
-/**
- * @typedef {ActionRowData|ButtonComponentData|SelectMenuComponentData} MessageComponentData
- */
-
-/**
- * @typedef {BaseComponentData} TextInputComponentData
- * @property {string} customId The custom id of the text input
- * @property {TextInputStyle} style The style of the text input
- * @property {string} label The text that appears on top of the text input field
- * @property {?number} minLength The minimum number of characters that can be entered in the text input
- * @property {?number} maxLength The maximum number of characters that can be entered in the text input
- * @property {?boolean} required Whether or not the text input is required or not
- * @property {?string} value The pre-filled text in the text input
- * @property {?string} placeholder Placeholder for the text input
- */
-
-/**
- * @typedef {ActionRowData|ButtonComponentData|SelectMenuComponentData|TextInputComponentData} ComponentData
- */
-
-/**
- * Any emoji data that can be used within a button
- * @typedef {APIMessageComponentEmoji|string} ComponentEmojiResolvable
- */
-
 /**
  * Transforms API data into a component
  * @param {APIMessageComponent|Component} data The data to create the component from
@@ -100,56 +35,14 @@ function createComponent(data) {
   }
 }
 
-/**
- * Transforms API data into a component builder
- * @param {APIMessageComponent|ComponentBuilder} data The data to create the component from
- * @returns {ComponentBuilder}
- * @ignore
- */
-function createComponentBuilder(data) {
-  if (data instanceof ComponentBuilder) {
-    return data;
-  }
-
-  switch (data.type) {
-    case ComponentType.ActionRow:
-      return new ActionRowBuilder(data);
-    case ComponentType.Button:
-      return new ButtonBuilder(data);
-    case ComponentType.StringSelect:
-      return new StringSelectMenuBuilder(data);
-    case ComponentType.TextInput:
-      return new TextInputBuilder(data);
-    case ComponentType.UserSelect:
-      return new UserSelectMenuBuilder(data);
-    case ComponentType.RoleSelect:
-      return new RoleSelectMenuBuilder(data);
-    case ComponentType.MentionableSelect:
-      return new MentionableSelectMenuBuilder(data);
-    case ComponentType.ChannelSelect:
-      return new ChannelSelectMenuBuilder(data);
-    default:
-      return new ComponentBuilder(data);
-  }
-}
-
 exports.createComponent = createComponent;
-exports.createComponentBuilder = createComponentBuilder;
 
 const { ActionRow } = require('../structures/ActionRow.js');
-const { ActionRowBuilder } = require('../structures/ActionRowBuilder.js');
-const { ButtonBuilder } = require('../structures/ButtonBuilder.js');
 const { ButtonComponent } = require('../structures/ButtonComponent.js');
-const { ChannelSelectMenuBuilder } = require('../structures/ChannelSelectMenuBuilder.js');
 const { ChannelSelectMenuComponent } = require('../structures/ChannelSelectMenuComponent.js');
 const { Component } = require('../structures/Component.js');
-const { MentionableSelectMenuBuilder } = require('../structures/MentionableSelectMenuBuilder.js');
 const { MentionableSelectMenuComponent } = require('../structures/MentionableSelectMenuComponent.js');
-const { RoleSelectMenuBuilder } = require('../structures/RoleSelectMenuBuilder.js');
 const { RoleSelectMenuComponent } = require('../structures/RoleSelectMenuComponent.js');
-const { StringSelectMenuBuilder } = require('../structures/StringSelectMenuBuilder.js');
 const { StringSelectMenuComponent } = require('../structures/StringSelectMenuComponent.js');
-const { TextInputBuilder } = require('../structures/TextInputBuilder.js');
 const { TextInputComponent } = require('../structures/TextInputComponent.js');
-const { UserSelectMenuBuilder } = require('../structures/UserSelectMenuBuilder.js');
 const { UserSelectMenuComponent } = require('../structures/UserSelectMenuComponent.js');

package/src/util/Util.js

@@ -112,7 +112,6 @@ function parseEmoji(text) {
  * Resolves a partial emoji object from an {@link EmojiIdentifierResolvable}, without checking a Client.
  * @param {Emoji|EmojiIdentifierResolvable} emoji Emoji identifier to resolve
  * @returns {?(PartialEmoji|PartialEmojiOnlyId)} Supplying a snowflake yields `PartialEmojiOnlyId`.
- * @private
  */
 function resolvePartialEmoji(emoji) {
   if (!emoji) return null;

package/typings/index.d.mts

@@ -1,21 +1,3 @@
-import {
-  ActionRowBuilder as BuilderActionRow,
-  MessageActionRowComponentBuilder,
-  ButtonBuilder as BuilderButtonComponent,
-  EmbedBuilder as BuildersEmbed,
-  ChannelSelectMenuBuilder as BuilderChannelSelectMenuComponent,
-  MentionableSelectMenuBuilder as BuilderMentionableSelectMenuComponent,
-  RoleSelectMenuBuilder as BuilderRoleSelectMenuComponent,
-  StringSelectMenuBuilder as BuilderStringSelectMenuComponent,
-  UserSelectMenuBuilder as BuilderUserSelectMenuComponent,
-  TextInputBuilder as BuilderTextInputComponent,
-  SelectMenuOptionBuilder as BuildersSelectMenuOption,
-  ModalActionRowComponentBuilder,
-  ModalBuilder as BuildersModal,
-  AnyComponentBuilder,
-  type RestOrArray,
-  ApplicationCommandOptionAllowedChannelTypes,
-} from '@discordjs/builders';
 import { Awaitable, JSONEncodable } from '@discordjs/util';
 import { Collection, ReadonlyCollection } from '@discordjs/collection';
 import { BaseImageURLOptions, ImageURLOptions, RawFile, REST, RESTOptions } from '@discordjs/rest';
@@ -176,6 +158,7 @@ import {
   RESTAPIInteractionCallbackActivityInstanceResource,
   VoiceChannelEffectSendAnimationType,
   GatewayVoiceChannelEffectSendDispatchData,
+  RESTAPIPoll,
 } from 'discord-api-types/v10';
 import { ChildProcess } from 'node:child_process';
 import { Stream } from 'node:stream';
@@ -236,6 +219,7 @@ import {
   RawWidgetData,
   RawWidgetMemberData,
 } from './rawDataTypes.mjs';
+import { ApplicationCommandOptionAllowedChannelTypes, MessageActionRowComponentBuilder } from '@discordjs/builders';
 
 //#region Classes
 
@@ -293,22 +277,6 @@ export interface ActionRowData<ComponentType extends JSONEncodable<APIActionRowC
   components: readonly ComponentType[];
 }
 
-export class ActionRowBuilder<
-  ComponentType extends AnyComponentBuilder = AnyComponentBuilder,
-> extends BuilderActionRow<ComponentType> {
-  public constructor(
-    data?: Partial<
-      | ActionRowData<ActionRowComponentData | JSONEncodable<APIActionRowComponentTypes>>
-      | APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
-    >,
-  );
-  public static from<ComponentType extends AnyComponentBuilder = AnyComponentBuilder>(
-    other:
-      | JSONEncodable<APIActionRowComponent<ReturnType<ComponentType['toJSON']>>>
-      | APIActionRowComponent<ReturnType<ComponentType['toJSON']>>,
-  ): ActionRowBuilder<ComponentType>;
-}
-
 export type MessageActionRowComponent =
   | ButtonComponent
   | StringSelectMenuComponent
@@ -750,70 +718,6 @@ export class ButtonComponent extends Component<APIButtonComponent> {
 
 export type ComponentEmojiResolvable = APIMessageComponentEmoji | string;
 
-export class ButtonBuilder extends BuilderButtonComponent {
-  public constructor(data?: Partial<ButtonComponentData> | Partial<APIButtonComponent>);
-  public static from(other: JSONEncodable<APIButtonComponent> | APIButtonComponent): ButtonBuilder;
-  public override setEmoji(emoji: ComponentEmojiResolvable): this;
-}
-
-export class StringSelectMenuBuilder extends BuilderStringSelectMenuComponent {
-  public constructor(data?: Partial<StringSelectMenuComponentData | APIStringSelectComponent>);
-  private static normalizeEmoji(
-    selectMenuOption: JSONEncodable<APISelectMenuOption> | SelectMenuComponentOptionData,
-  ): (APISelectMenuOption | StringSelectMenuOptionBuilder)[];
-  public override addOptions(
-    ...options: RestOrArray<BuildersSelectMenuOption | SelectMenuComponentOptionData | APISelectMenuOption>
-  ): this;
-  public override setOptions(
-    ...options: RestOrArray<BuildersSelectMenuOption | SelectMenuComponentOptionData | APISelectMenuOption>
-  ): this;
-  public static from(
-    other: JSONEncodable<APIStringSelectComponent> | APIStringSelectComponent,
-  ): StringSelectMenuBuilder;
-}
-
-export class UserSelectMenuBuilder extends BuilderUserSelectMenuComponent {
-  public constructor(data?: Partial<UserSelectMenuComponentData | APIUserSelectComponent>);
-  public static from(other: JSONEncodable<APIUserSelectComponent> | APIUserSelectComponent): UserSelectMenuBuilder;
-}
-
-export class RoleSelectMenuBuilder extends BuilderRoleSelectMenuComponent {
-  public constructor(data?: Partial<RoleSelectMenuComponentData | APIRoleSelectComponent>);
-  public static from(other: JSONEncodable<APIRoleSelectComponent> | APIRoleSelectComponent): RoleSelectMenuBuilder;
-}
-
-export class MentionableSelectMenuBuilder extends BuilderMentionableSelectMenuComponent {
-  public constructor(data?: Partial<MentionableSelectMenuComponentData | APIMentionableSelectComponent>);
-  public static from(
-    other: JSONEncodable<APIMentionableSelectComponent> | APIMentionableSelectComponent,
-  ): MentionableSelectMenuBuilder;
-}
-
-export class ChannelSelectMenuBuilder extends BuilderChannelSelectMenuComponent {
-  public constructor(data?: Partial<ChannelSelectMenuComponentData | APIChannelSelectComponent>);
-  public static from(
-    other: JSONEncodable<APIChannelSelectComponent> | APIChannelSelectComponent,
-  ): ChannelSelectMenuBuilder;
-}
-
-export class StringSelectMenuOptionBuilder extends BuildersSelectMenuOption {
-  public constructor(data?: SelectMenuComponentOptionData | APISelectMenuOption);
-  public override setEmoji(emoji: ComponentEmojiResolvable): this;
-  public static from(other: JSONEncodable<APISelectMenuOption> | APISelectMenuOption): StringSelectMenuOptionBuilder;
-}
-
-export class ModalBuilder extends BuildersModal {
-  public constructor(data?: Partial<ModalComponentData> | Partial<APIModalInteractionResponseCallbackData>);
-  public static from(
-    other: JSONEncodable<APIModalInteractionResponseCallbackData> | APIModalInteractionResponseCallbackData,
-  ): ModalBuilder;
-}
-
-export class TextInputBuilder extends BuilderTextInputComponent {
-  public constructor(data?: Partial<TextInputComponentData | APITextInputComponent>);
-  public static from(other: JSONEncodable<APITextInputComponent> | APITextInputComponent): TextInputBuilder;
-}
-
 export class TextInputComponent extends Component<APITextInputComponent> {
   public get customId(): string;
   public get value(): string;
@@ -871,13 +775,6 @@ export interface EmbedAssetData extends Omit<APIEmbedImage, 'proxy_url'> {
   proxyURL?: string;
 }
 
-export class EmbedBuilder extends BuildersEmbed {
-  public constructor(data?: EmbedData | APIEmbed);
-  public override setColor(color: ColorResolvable | null): this;
-  public static from(other: JSONEncodable<APIEmbed> | APIEmbed): EmbedBuilder;
-  public get length(): number;
-}
-
 export class Embed {
   private constructor(data: APIEmbed);
   public readonly data: Readonly<APIEmbed>;
@@ -3507,9 +3404,7 @@ export function moveElementInArray(
 ): number;
 export function parseEmoji(text: string): PartialEmoji | null;
 export function resolveColor(color: ColorResolvable): number;
-/** @internal */
 export function resolvePartialEmoji(emoji: Snowflake): PartialEmojiOnlyId;
-/** @internal */
 export function resolvePartialEmoji(emoji: Emoji | EmojiIdentifierResolvable): PartialEmoji | null;
 /** @internal */
 export function resolveGuildEmoji(client: Client, emojiId: Snowflake): GuildEmoji | null;
@@ -6265,16 +6160,6 @@ export interface MessageCollectorOptions extends CollectorOptions<[Message, Coll
   maxProcessed?: number;
 }
 
-export type MessageComponent =
-  | Component
-  | ActionRowBuilder<MessageActionRowComponentBuilder | ModalActionRowComponentBuilder>
-  | ButtonComponent
-  | StringSelectMenuComponent
-  | UserSelectMenuComponent
-  | RoleSelectMenuComponent
-  | MentionableSelectMenuComponent
-  | ChannelSelectMenuComponent;
-
 export type CollectedMessageInteraction<Cached extends CacheType = CacheType> = Exclude<
   CollectedInteraction<Cached>,
   ModalSubmitInteraction
@@ -6345,14 +6230,14 @@ export interface BaseMessageOptions {
     | AttachmentPayload
   )[];
   components?: readonly (
-    | JSONEncodable<APIActionRowComponent<APIMessageActionRowComponent>>
+    | JSONEncodable<APIActionRowComponent<APIActionRowComponentTypes>>
     | ActionRowData<MessageActionRowComponentData | MessageActionRowComponentBuilder>
     | APIActionRowComponent<APIMessageActionRowComponent>
   )[];
 }
 
 export interface BaseMessageOptionsWithPoll extends BaseMessageOptions {
-  poll?: PollData;
+  poll?: JSONEncodable<RESTAPIPoll> | PollData;
 }
 
 export interface MessageCreateOptions extends BaseMessageOptionsWithPoll {