oceanic.js 1.5.1-dev.41182e4 → 1.5.1-dev.66991ee

package/dist/lib/types/channels.d.ts

@@ -40,6 +40,7 @@ import type ForumChannel from "../structures/ForumChannel";
 import type Message from "../structures/Message";
 import type Guild from "../structures/Guild";
 import type Invite from "../structures/Invite";
+import type { RawComponentsContainer, RawEmbedsContainer } from "../util/RawContainer";
 
 export interface RawChannel {
     application_id?: string;
@@ -83,23 +84,23 @@ export interface RawChannel {
     user_limit?: number;
     video_quality_mode?: VideoQualityModes;
 }
-export type RawGuildChannel = Required<Pick<RawChannel, "id" | "guild_id" | "parent_id">> & { name: string; type: GuildChannelTypes; };
-export type RawPrivateChannel = Required<Pick<RawChannel, "id" | "last_message_id" | "recipients">> & { type: ChannelTypes.DM; };
+export interface RawGuildChannel extends Required<Pick<RawChannel, "id" | "guild_id" | "parent_id">> { name: string; type: GuildChannelTypes; }
+export interface RawPrivateChannel extends Required<Pick<RawChannel, "id" | "last_message_id" | "recipients">> { type: ChannelTypes.DM; }
 // nicks is undocumented, creating a group dm DOES work, and they show in the client, so we're supporting them
-export type RawGroupChannel = Required<Pick<RawChannel, "id" | "recipients" | "application_id" | "icon" | "owner_id" | "nsfw" | "last_message_id">> & { managed: boolean; name: string; nicks?: Array<Record<"id" | "nick", string>>; type: ChannelTypes.GROUP_DM; };
-export type RawTextChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "default_auto_archive_duration" | "last_message_id" | "last_pin_timestamp" | "rate_limit_per_user" | "topic" | "nsfw" | "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_TEXT; };
-export type RawCategoryChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel,  "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_CATEGORY; };
-export type RawAnnouncementChannel = Omit<RawTextChannel, "type"> & { type: ChannelTypes.GUILD_ANNOUNCEMENT; };
-export type RawVoiceChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "bitrate" | "user_limit" | "video_quality_mode" | "rtc_region" | "nsfw" | "topic" | "permission_overwrites" | "position" | "last_message_id" | "rate_limit_per_user">> & { type: ChannelTypes.GUILD_VOICE; };
-export type RawStageChannel = Omit<RawVoiceChannel, "type"> & { type: ChannelTypes.GUILD_STAGE_VOICE; };
+export interface RawGroupChannel extends Required<Pick<RawChannel, "id" | "recipients" | "application_id" | "icon" | "owner_id" | "nsfw" | "last_message_id">> { managed: boolean; name: string; nicks?: Array<Record<"id" | "nick", string>>; type: ChannelTypes.GROUP_DM; }
+export interface RawTextChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel, "default_auto_archive_duration" | "last_message_id" | "last_pin_timestamp" | "rate_limit_per_user" | "topic" | "nsfw" | "permission_overwrites" | "position">> { type: ChannelTypes.GUILD_TEXT; }
+export interface RawCategoryChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel,  "permission_overwrites" | "position">> { type: ChannelTypes.GUILD_CATEGORY; }
+export interface RawAnnouncementChannel extends Omit<RawTextChannel, "type"> { type: ChannelTypes.GUILD_ANNOUNCEMENT; }
+export interface RawVoiceChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel, "bitrate" | "user_limit" | "video_quality_mode" | "rtc_region" | "nsfw" | "topic" | "permission_overwrites" | "position" | "last_message_id" | "rate_limit_per_user">> { type: ChannelTypes.GUILD_VOICE; }
+export interface RawStageChannel extends Omit<RawVoiceChannel, "type"> { type: ChannelTypes.GUILD_STAGE_VOICE; }
 export type RawThreadChannel = RawAnnouncementThreadChannel | RawPublicThreadChannel | RawPrivateThreadChannel;
-export type RawAnnouncementThreadChannel = Required<Pick<RawChannel, "id" | "guild_id" | "parent_id" | "owner_id" | "last_message_id" | "thread_metadata" | "message_count" | "member_count" | "rate_limit_per_user" | "flags" | "total_message_sent" | "newly_created" | "member">> & { name: string; type: ChannelTypes.ANNOUNCEMENT_THREAD; };
-export type RawPublicThreadChannel = Omit<RawAnnouncementThreadChannel, "type"> & { type: ChannelTypes.PUBLIC_THREAD; } & Required<Pick<RawChannel, "applied_tags">>;
-export type RawPrivateThreadChannel = Omit<RawAnnouncementThreadChannel, "type"> & { member: RawChannel["member"]; type: ChannelTypes.PRIVATE_THREAD; };
-export type RawForumChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "position" | "topic" | "flags" | "permission_overwrites" | "rate_limit_per_user" | "nsfw" | "available_tags" | "template" | "default_reaction_emoji" | "last_message_id" | "default_sort_order" | "default_thread_rate_limit_per_user" | "default_auto_archive_duration" | "default_forum_layout">> & { type: ChannelTypes.GUILD_FORUM; };
+export interface RawAnnouncementThreadChannel extends Required<Pick<RawChannel, "id" | "guild_id" | "parent_id" | "owner_id" | "last_message_id" | "thread_metadata" | "message_count" | "member_count" | "rate_limit_per_user" | "flags" | "total_message_sent" | "newly_created" | "member">> { name: string; type: ChannelTypes.ANNOUNCEMENT_THREAD; }
+export interface RawPublicThreadChannel extends Omit<RawAnnouncementThreadChannel, "type">, Required<Pick<RawChannel, "applied_tags">> { type: ChannelTypes.PUBLIC_THREAD; }
+export interface RawPrivateThreadChannel extends Omit<RawAnnouncementThreadChannel, "type" | "member"> { member: RawChannel["member"]; type: ChannelTypes.PRIVATE_THREAD; }
+export interface RawForumChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel, "position" | "topic" | "flags" | "permission_overwrites" | "rate_limit_per_user" | "nsfw" | "available_tags" | "template" | "default_reaction_emoji" | "last_message_id" | "default_sort_order" | "default_thread_rate_limit_per_user" | "default_auto_archive_duration" | "default_forum_layout">> { type: ChannelTypes.GUILD_FORUM; }
 
-export type PartialChannel = Pick<RawChannel, "id" | "name" | "type">;
-export type RawInteractionResolvedChannel = Omit<Required<Pick<RawChannel, "id" | "type" | "permissions">>, "name"> & { name: string | null; } & Pick<RawChannel, "thread_metadata" | "parent_id">;
+export interface PartialChannel extends Pick<RawChannel, "id" | "name" | "type"> {}
+export interface RawInteractionResolvedChannel extends Omit<Required<Pick<RawChannel, "id" | "type" | "permissions">>, "name">, Pick<RawChannel, "thread_metadata" | "parent_id"> { name: string | null; }
 
 export interface RawOverwrite {
     allow: string;
@@ -224,16 +225,16 @@ export interface EditGuildChannelOptions {
     videoQualityMode?: VideoQualityModes | null;
 }
 
-export type EditChannelOptions = EditGroupDMOptions & EditGuildChannelOptions;
-export type EditAnyGuildChannelOptions = Pick<EditGuildChannelOptions, "name" | "position" | "permissionOverwrites">;
-export type EditTextChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuildChannelOptions, "topic" | "nsfw" | "rateLimitPerUser" | "parentID" | "defaultAutoArchiveDuration"> & { type?: ChannelTypes.GUILD_ANNOUNCEMENT; };
-export type EditAnnouncementChannelOptions = Omit<EditTextChannelOptions, "rateLimitPerUser"> & { type?: ChannelTypes.GUILD_TEXT; };
-export type EditVoiceChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuildChannelOptions, "nsfw" | "bitrate" | "userLimit" | "parentID" | "rtcRegion" | "videoQualityMode">;
-export type EditStageChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuildChannelOptions, "bitrate" | "rtcRegion">;
+export interface EditChannelOptions extends EditGroupDMOptions, EditGuildChannelOptions {}
+export interface EditAnyGuildChannelOptions extends Pick<EditGuildChannelOptions, "name" | "position" | "permissionOverwrites"> {}
+export interface EditTextChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "topic" | "nsfw" | "rateLimitPerUser" | "parentID" | "defaultAutoArchiveDuration"> { type?: ChannelTypes.GUILD_ANNOUNCEMENT; }
+export interface EditAnnouncementChannelOptions extends Omit<EditTextChannelOptions, "rateLimitPerUser" | "type"> { type?: ChannelTypes.GUILD_TEXT; }
+export interface EditVoiceChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "nsfw" | "bitrate" | "userLimit" | "parentID" | "rtcRegion" | "videoQualityMode"> {}
+export interface EditStageChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "bitrate" | "rtcRegion"> {}
 export type EditThreadChannelOptions = EditPublicThreadChannelOptions | EditPrivateThreadChannelOptions;
-export type EditPublicThreadChannelOptions = Pick<EditGuildChannelOptions, "name" | "archived" | "autoArchiveDuration" | "locked" | "rateLimitPerUser" | "flags" | "appliedTags">;
-export type EditPrivateThreadChannelOptions = EditPublicThreadChannelOptions & Pick<EditGuildChannelOptions, "invitable">;
-export type EditForumChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultSortOrder" |"defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "topic">;
+export interface EditPublicThreadChannelOptions extends Pick<EditGuildChannelOptions, "name" | "archived" | "autoArchiveDuration" | "locked" | "rateLimitPerUser" | "flags" | "appliedTags"> {}
+export interface EditPrivateThreadChannelOptions extends EditPublicThreadChannelOptions, Pick<EditGuildChannelOptions, "invitable"> {}
+export interface EditForumChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultSortOrder" |"defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "topic"> {}
 
 export interface AddGroupRecipientOptions {
     /** The access token of the user to add. */
@@ -250,11 +251,11 @@ export interface CreateMessageOptions {
     /** An array of [partial attachments](https://discord.com/developers/docs/resources/channel#attachment-object) related to the sent files. */
     attachments?: Array<MessageAttachment>;
     /** An array of [components](https://discord.com/developers/docs/interactions/message-components) to send. Convert `snake_case` keys to `camelCase`. */
-    components?: Array<MessageActionRow>;
+    components?: Array<MessageActionRow | RawComponentsContainer<RawMessageActionRow>>;
     /** The content of the message. */
     content?: string;
     /** An array of [embeds](https://discord.com/developers/docs/resources/channel#embed-object) to send. Convert `snake_case` keys to `camelCase`. */
-    embeds?: Array<EmbedOptions>;
+    embeds?: Array<EmbedOptions | RawEmbedsContainer>;
     /** The files to send. */
     files?: Array<File>;
     /** The [flags](https://discord.com/developers/docs/resources/channel#message-object-message-flags) to send with the message. */
@@ -455,8 +456,11 @@ export interface RawActionRowBase<T extends RawComponent> {
     type: ComponentTypes.ACTION_ROW;
 }
 
-export type RawMessageActionRow = RawActionRowBase<RawMessageComponent>;
-export type RawModalActionRow = RawActionRowBase<RawModalComponent>;
+export interface RawMessageActionRow extends RawActionRowBase<RawMessageComponent> {}
+export interface RawModalActionRow extends RawActionRowBase<RawModalComponent> {}
+export type ActionRowToRaw<T extends MessageActionRow | ModalActionRow> =
+T extends MessageActionRow ? RawMessageActionRow :
+    T extends ModalActionRow ? RawModalActionRow : never;
 
 export type Component = MessageComponent | ModalComponent;
 export type MessageComponent = ButtonComponent | SelectMenuComponent;
@@ -512,11 +516,11 @@ export interface RawChannelSelectMenuOptions {
     channel_types: Array<ChannelTypes>;
 }
 
-export type RawStringSelectMenu      = RawSelectMenuBase<ComponentTypes.STRING_SELECT> & RawStringSelectMenuOptions;
-export type RawUserSelectMenu        = RawSelectMenuBase<ComponentTypes.USER_SELECT>;
-export type RawRoleSelectMenu        = RawSelectMenuBase<ComponentTypes.ROLE_SELECT>;
-export type RawMentionableSelectMenu = RawSelectMenuBase<ComponentTypes.MENTIONABLE_SELECT>;
-export type RawChannelSelectMenu     = RawSelectMenuBase<ComponentTypes.CHANNEL_SELECT> & RawChannelSelectMenuOptions;
+export interface RawStringSelectMenu extends RawSelectMenuBase<ComponentTypes.STRING_SELECT>, RawStringSelectMenuOptions {}
+export interface RawUserSelectMenu extends RawSelectMenuBase<ComponentTypes.USER_SELECT> {}
+export interface RawRoleSelectMenu extends RawSelectMenuBase<ComponentTypes.ROLE_SELECT> {}
+export interface RawMentionableSelectMenu extends RawSelectMenuBase<ComponentTypes.MENTIONABLE_SELECT> {}
+export interface RawChannelSelectMenu extends RawSelectMenuBase<ComponentTypes.CHANNEL_SELECT>, RawChannelSelectMenuOptions {}
 
 
 export interface SelectMenuBase<T extends SelectMenuTypes> {
@@ -536,11 +540,11 @@ export interface ChannelSelectMenuOptions {
     channelTypes: Array<ChannelTypes>;
 }
 
-export type StringSelectMenu      = SelectMenuBase<ComponentTypes.STRING_SELECT> & StringSelectMenuOptions;
-export type UserSelectMenu        = SelectMenuBase<ComponentTypes.USER_SELECT>;
-export type RoleSelectMenu        = SelectMenuBase<ComponentTypes.ROLE_SELECT>;
-export type MentionableSelectMenu = SelectMenuBase<ComponentTypes.MENTIONABLE_SELECT>;
-export type ChannelSelectMenu     = SelectMenuBase<ComponentTypes.CHANNEL_SELECT> & ChannelSelectMenuOptions;
+export interface StringSelectMenu extends SelectMenuBase<ComponentTypes.STRING_SELECT>, StringSelectMenuOptions {}
+export interface UserSelectMenu extends SelectMenuBase<ComponentTypes.USER_SELECT> {}
+export interface RoleSelectMenu extends SelectMenuBase<ComponentTypes.ROLE_SELECT> {}
+export interface MentionableSelectMenu extends SelectMenuBase<ComponentTypes.MENTIONABLE_SELECT> {}
+export interface ChannelSelectMenu extends SelectMenuBase<ComponentTypes.CHANNEL_SELECT>, ChannelSelectMenuOptions {}
 
 export interface SelectOption {
     default?: boolean;
@@ -587,7 +591,7 @@ export interface RawAttachment {
     width?: number;
 }
 // @TODO verify what can be sent with `attachments` in message creation/deletion, this is an assumption
-export type MessageAttachment = Pick<RawAttachment, "id"> & Partial<Pick<RawAttachment, "description" | "filename">>;
+export interface MessageAttachment extends Pick<RawAttachment, "id">, Partial<Pick<RawAttachment, "description" | "filename">> {}
 
 export interface RawAllowedMentions {
     parse: Array<"everyone" | "roles" | "users">;
@@ -732,7 +736,7 @@ export interface GetReactionsOptions {
     limit?: number;
 }
 
-export type EditMessageOptions = Pick<CreateMessageOptions, "content" | "embeds" | "allowedMentions" | "components" | "attachments" | "files" | "flags">;
+export interface EditMessageOptions extends Pick<CreateMessageOptions, "content" | "embeds" | "allowedMentions" | "components" | "attachments" | "files" | "flags"> {}
 
 export interface EditPermissionOptions {
     /** The permissions to allow. */

package/dist/lib/types/client.d.ts

@@ -34,7 +34,7 @@ export interface ClientOptions {
     /** The options for the request handler. */
     rest?: RESTOptions;
 }
-type ClientInstanceOptions = Required<Omit<ClientOptions, "rest" | "gateway" | "collectionLimits">> & { collectionLimits: Required<CollectionLimitsOptions>; };
+export interface ClientInstanceOptions extends Required<Omit<ClientOptions, "rest" | "gateway" | "collectionLimits">> { collectionLimits: Required<CollectionLimitsOptions>; }
 
 export interface RESTOptions {
     /**

package/dist/lib/types/gateway.d.ts

@@ -199,7 +199,7 @@ export interface Activity {
     type: ActivityTypes;
     url?: string | null;
 }
-export type BotActivity = Pick<Activity, "name" | "url"> & { type: BotActivityTypes; };
+export interface BotActivity extends Pick<Activity, "name" | "url"> { type: BotActivityTypes; }
 
 export interface ActivityEmoji {
     animated?: boolean;

package/dist/lib/types/guild-template.d.ts

@@ -30,4 +30,4 @@ export interface CreateTemplateOptions {
     name: string;
 }
 
-export type EditGuildTemplateOptions = Partial<CreateTemplateOptions>;
+export interface EditGuildTemplateOptions extends Partial<CreateTemplateOptions> {}

package/dist/lib/types/guilds.d.ts

@@ -100,7 +100,8 @@ export interface RawGuild {
     widget_channel_id?: string | null;
     widget_enabled?: boolean;
 }
-export type RawInviteGuild = Pick<RawGuild, "id" | "name" | "splash" | "banner" | "description" | "icon" | "features" | "verification_level" | "vanity_url_code" | "premium_subscription_count" | "nsfw_level">;
+
+export interface RawInviteGuild extends Pick<RawGuild, "id" | "name" | "splash" | "banner" | "description" | "icon" | "features" | "verification_level" | "vanity_url_code" | "premium_subscription_count" | "nsfw_level"> {}
 
 export interface RawRole {
     color: number;
@@ -141,8 +142,8 @@ export interface Emoji {
     roles?: Array<string>;
     user?: RawUser;
 }
-export type RawGuildEmoji = Required<Omit<Emoji, "user" | "id">> & { id: string; user?: RawUser; };
-export type GuildEmoji = Omit<RawGuildEmoji, "user" | "id" | "require_colons"> & { id: string; requireColons?: boolean; user?: User; };
+export interface RawGuildEmoji extends Required<Omit<Emoji, "user" | "id">>  { id: string; user?: RawUser; }
+export interface GuildEmoji extends Omit<RawGuildEmoji, "user" | "id" | "require_colons"> { id: string; requireColons?: boolean; user?: User; }
 export interface RawWelcomeScreen {
     description: string | null;
     welcome_channels: Array<RawWelcomeScreenChannel>;
@@ -218,8 +219,8 @@ export interface RawMember {
     roles: Array<string>;
     user?: RawUser;
 }
-export type RESTMember = Required<Omit<RawMember, "permissions" | "joined_at">> & { joined_at: string; };
-export type InteractionMember = Required<RawMember>;
+export interface RESTMember extends Required<Omit<RawMember, "permissions" | "joined_at">> { joined_at: string; }
+export interface InteractionMember extends Required<RawMember> {}
 
 export interface RawIntegration {
     account: IntegrationAccount;
@@ -253,7 +254,7 @@ export interface RawIntegrationApplication {
     name: string;
 }
 
-export type PartialEmoji = Pick<Emoji, "id" | "name" | "animated">;
+export interface PartialEmoji extends Pick<Emoji, "id" | "name" | "animated"> {}
 
 export interface CreateEmojiOptions {
     /** The image (buffer, or full data url). */
@@ -400,11 +401,11 @@ export interface CreateChannelOptions<T extends GuildChannelTypesWithoutThreads
     videoQualityMode?: VideoQualityModes | null;
 }
 
-export type CreateTextChannelOptions = Omit<CreateChannelOptions<ChannelTypes.GUILD_TEXT>, "rtcRegion" | "userLimit" | "videoQualityMode">;
-export type CreateVoiceChannelOptions = Omit<CreateChannelOptions<ChannelTypes.GUILD_VOICE>, "defaultAutoArchiveDuration" | "topic">;
-export type CreateCategoryChannelOptions = Omit<CreateChannelOptions<ChannelTypes.GUILD_CATEGORY>, "defaultAutoArchiveDuration" | "nsfw" | "parentID" | "rtcRegion" | "topic" | "userLimit" | "videoQualityMode">;
-export type CreateAnnouncementChannelOptions = Omit<CreateChannelOptions<ChannelTypes.GUILD_ANNOUNCEMENT>, "rtcRegion" | "userLimit" | "videoQualityMode">;
-export type CreateStageChannelOptions = Omit<CreateChannelOptions<ChannelTypes.GUILD_STAGE_VOICE>, "defaultAutoArchiveDuration" | "nsfw" | "rtcRegion" | "topic" | "userLimit" | "videoQualityMode">;
+export interface CreateTextChannelOptions extends Omit<CreateChannelOptions<ChannelTypes.GUILD_TEXT>, "rtcRegion" | "userLimit" | "videoQualityMode"> {}
+export interface CreateVoiceChannelOptions extends Omit<CreateChannelOptions<ChannelTypes.GUILD_VOICE>, "defaultAutoArchiveDuration" | "topic"> {}
+export interface CreateCategoryChannelOptions extends Omit<CreateChannelOptions<ChannelTypes.GUILD_CATEGORY>, "defaultAutoArchiveDuration" | "nsfw" | "parentID" | "rtcRegion" | "topic" | "userLimit" | "videoQualityMode"> {}
+export interface CreateAnnouncementChannelOptions extends Omit<CreateChannelOptions<ChannelTypes.GUILD_ANNOUNCEMENT>, "rtcRegion" | "userLimit" | "videoQualityMode"> {}
+export interface CreateStageChannelOptions extends Omit<CreateChannelOptions<ChannelTypes.GUILD_STAGE_VOICE>, "defaultAutoArchiveDuration" | "nsfw" | "rtcRegion" | "topic" | "userLimit" | "videoQualityMode"> {}
 
 export type CreateChannelReturn<T extends GuildChannelTypesWithoutThreads> =
     T extends ChannelTypes.GUILD_TEXT ? TextChannel :
@@ -495,7 +496,7 @@ export interface EditMemberOptions {
     roles?: Array<string>;
 }
 
-export type EditCurrentMemberOptions = Pick<EditMemberOptions, "nick" | "reason">;
+export interface EditCurrentMemberOptions extends Pick<EditMemberOptions, "nick" | "reason"> {}
 
 export interface GetBansOptions {
     /** The ID of the user to get bans after. */
@@ -532,7 +533,7 @@ export interface EditRolePositionsEntry {
     position?: number | null;
 }
 
-export type EditRoleOptions = CreateRoleOptions;
+export interface EditRoleOptions extends CreateRoleOptions {}
 
 export interface GetPruneCountOptions {
     /** The number of days to prune. */
@@ -666,10 +667,10 @@ export interface CreateStageInstanceOptions {
     topic: string;
 }
 
-export type EditStageInstanceOptions = Pick<CreateStageInstanceOptions, "topic" | "privacyLevel"> & {
+export interface EditStageInstanceOptions extends Pick<CreateStageInstanceOptions, "topic" | "privacyLevel"> {
     /** The reason for editing the stage instance. */
     reason?: string;
-};
+}
 
 export interface EditMFALevelOptions {
     /** The new MFA level. */
@@ -733,14 +734,14 @@ export interface RawOAuthGuild {
     permissions: string;
 }
 
-export type PresenceActivity = Omit<GatewayActivity, "application_id" | "assets" | "created_at"> & {
+export interface PresenceActivity extends Omit<GatewayActivity, "application_id" | "assets" | "created_at"> {
     applicationID?: string;
     assets?: Partial<Record<"largeImage" | "largeText" | "smallImage" | "smallText", string>>;
     createdAt: number;
-};
+}
 
-export type Presence = Omit<PresenceUpdate, "user" | "guild_id" | "client_status" | "activities"> & {
+export interface Presence extends Omit<PresenceUpdate, "user" | "guild_id" | "client_status" | "activities"> {
     activities?: Array<PresenceActivity>;
     clientStatus: ClientStatus;
     guildID: string;
-};
+}

package/dist/lib/types/interactions.d.ts

@@ -36,8 +36,10 @@ import type PrivateChannel from "../structures/PrivateChannel";
 import type TypedCollection from "../util/TypedCollection";
 import type InteractionResolvedChannel from "../structures/InteractionResolvedChannel";
 import type SelectMenuValuesWrapper from "../util/SelectMenuValuesWrapper";
+import type { RawComponentsContainer } from "../util/RawContainer";
 
-export type InteractionContent = Pick<ExecuteWebhookOptions, "tts" | "content" | "embeds" | "allowedMentions" | "flags" | "components" | "attachments" | "files">;
+export interface InteractionContent extends Pick<ExecuteWebhookOptions, "tts" | "content" | "embeds" | "allowedMentions" | "flags" | "components" | "attachments" | "files"> {}
+export interface InitialInteractionContent extends Omit<InteractionContent, "files"> {}
 
 export type InteractionResponse = PingInteractionResponse | MessageInteractionResponse | DeferredInteractionResponse | AutocompleteInteractionResponse | ModalInteractionResponse;
 export interface PingInteractionResponse {
@@ -70,7 +72,7 @@ export interface ModalInteractionResponse {
 
 
 export interface ModalData {
-    components: Array<ModalActionRow>;
+    components: Array<ModalActionRow | RawComponentsContainer<RawModalActionRow>>;
     /** The custom ID of the modal. */
     customID: string;
     /** The title of the modal. */
@@ -96,11 +98,11 @@ export interface RawInteraction {
 
 export type AnyRawInteraction = RawPingInteraction | AnyRawGatewayInteraction;
 export type AnyRawGatewayInteraction = RawApplicationCommandInteraction | RawMessageComponentInteraction | RawAutocompleteInteraction | RawModalSubmitInteraction;
-export type RawPingInteraction = Pick<RawInteraction, "application_id" | "id" | "token" | "type" | "version">;
-export type RawApplicationCommandInteraction = Omit<RawInteraction, "data" | "message"> & { data: RawApplicationCommandInteractionData; };
-export type RawMessageComponentInteraction = Omit<RawInteraction, "data" | "message"> & { data: RawMessageComponentInteractionData; message: RawMessage; };
-export type RawAutocompleteInteraction = Omit<RawInteraction, "data" | "message"> & { data: RawAutocompleteInteractionData; };
-export type RawModalSubmitInteraction = Omit<RawInteraction, "data" | "message"> & { data: RawModalSubmitInteractionData; };
+export interface RawPingInteraction extends Pick<RawInteraction, "application_id" | "id" | "token" | "type" | "version"> {}
+export interface RawApplicationCommandInteraction extends Omit<RawInteraction, "data" | "message"> { data: RawApplicationCommandInteractionData; }
+export interface RawMessageComponentInteraction extends Omit<RawInteraction, "data" | "message"> { data: RawMessageComponentInteractionData; message: RawMessage; }
+export interface RawAutocompleteInteraction extends Omit<RawInteraction, "data" | "message"> { data: RawAutocompleteInteractionData; }
+export interface RawModalSubmitInteraction extends Omit<RawInteraction, "data" | "message"> { data: RawModalSubmitInteractionData; }
 
 export type RawInteractionData = RawApplicationCommandInteractionData | RawMessageComponentInteractionData | RawAutocompleteInteractionData | RawModalSubmitInteractionData;
 export type InteractionData = ApplicationCommandInteractionData | MessageComponentInteractionData | AutocompleteInteractionData | ModalSubmitInteractionData;
@@ -123,8 +125,8 @@ export interface ApplicationCommandInteractionData {
     targetID?: string;
     type: ApplicationCommandTypes;
 }
-export type RawAutocompleteInteractionData = Omit<RawApplicationCommandInteractionData, "resolved" | "target_id">;
-export type AutocompleteInteractionData = Omit<ApplicationCommandInteractionData, "resolved" | "targetID">;
+export interface RawAutocompleteInteractionData extends Omit<RawApplicationCommandInteractionData, "resolved" | "target_id"> {}
+export interface AutocompleteInteractionData extends Omit<ApplicationCommandInteractionData, "resolved" | "targetID"> {}
 
 export interface RawMessageComponentInteractionResolvedData {
     channels?: Record<string, RawInteractionResolvedChannel>;
@@ -251,23 +253,23 @@ export interface AutocompleteChoice {
 
 
 export type GuildAutocompleteInteraction = AutocompleteInteraction<AnyGuildTextChannel>;
-export type PrivateAutocompleteInteraction = Omit<AutocompleteInteraction<PrivateChannel | Uncached>, | "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions">;
+export interface PrivateAutocompleteInteraction extends Omit<AutocompleteInteraction<PrivateChannel | Uncached>, | "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions"> {}
 export type AnyAutocompleteInteraction = GuildAutocompleteInteraction | PrivateAutocompleteInteraction;
 
 export type GuildCommandInteraction = CommandInteraction<AnyGuildTextChannel>;
-export type PrivateCommandInteraction = Omit<CommandInteraction<PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions">;
+export interface PrivateCommandInteraction extends Omit<CommandInteraction<PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions"> {}
 export type AnyCommandInteraction = GuildCommandInteraction | PrivateCommandInteraction;
 
-export type GuildComponentButtonInteraction = Omit<ComponentInteraction<ComponentTypes.BUTTON, AnyGuildTextChannel>, "data"> & { data: MessageComponentButtonInteractionData; };
-export type GuildComponentSelectMenuInteraction = Omit<ComponentInteraction<SelectMenuTypes, AnyGuildTextChannel>, "data"> & { data: MessageComponentSelectMenuInteractionData; };
+export interface GuildComponentButtonInteraction extends Omit<ComponentInteraction<ComponentTypes.BUTTON, AnyGuildTextChannel>, "data"> { data: MessageComponentButtonInteractionData; }
+export interface GuildComponentSelectMenuInteraction extends Omit<ComponentInteraction<SelectMenuTypes, AnyGuildTextChannel>, "data"> { data: MessageComponentSelectMenuInteractionData; }
 export type GuildComponentInteraction = GuildComponentButtonInteraction | GuildComponentSelectMenuInteraction;
-export type PrivateComponentButtonInteraction = Omit<ComponentInteraction<ComponentTypes.BUTTON, PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions" | "data"> & { data: MessageComponentButtonInteractionData; };
-export type PrivateComponentSelectMenuInteraction = Omit<ComponentInteraction<SelectMenuTypes, PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions" | "data"> & { data: MessageComponentSelectMenuInteractionData; };
+export interface PrivateComponentButtonInteraction extends Omit<ComponentInteraction<ComponentTypes.BUTTON, PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions" | "data"> { data: MessageComponentButtonInteractionData; }
+export interface PrivateComponentSelectMenuInteraction extends Omit<ComponentInteraction<SelectMenuTypes, PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions" | "data"> { data: MessageComponentSelectMenuInteractionData; }
 export type PrivateComponentInteraction = PrivateComponentButtonInteraction | PrivateComponentSelectMenuInteraction;
 export type AnyComponentInteraction = GuildComponentInteraction | PrivateComponentInteraction;
 
 export type GuildModalSubmitInteraction = ModalSubmitInteraction<AnyGuildTextChannel>;
-export type PrivateModalSubmitInteraction = Omit<ModalSubmitInteraction<PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions">;
+export interface PrivateModalSubmitInteraction extends Omit<ModalSubmitInteraction<PrivateChannel | Uncached>, "appPermissions" | "guild" | "guildID" | "guildLocale" | "member" | "memberPermissions"> {}
 export type AnyModalSubmitInteraction = GuildModalSubmitInteraction | PrivateModalSubmitInteraction;
 
 export type SubCommandArray = [subcommand: string] | [subcommandGroup: string, subcommand: string];

package/dist/lib/types/oauth.d.ts

@@ -39,9 +39,9 @@ export interface RawApplication {
     terms_of_service_url?: string;
     verify_key: string;
 }
-export type RawPartialApplication = Pick<RawApplication, "id" | "name" | "icon" | "description"> & Partial<Pick<RawApplication, "bot_public" | "bot_require_code_grant" | "verify_key">>;
-export type RESTApplication = Omit<RawApplication, "cover_image" | "flags" | "owner" | "rpc_origins"> & Required<Pick<RawApplication, "cover_image" | "flags" | "install_params" | "owner" | "rpc_origins">>;
-export type RawClientApplication = Required<Pick<RawApplication, "id" | "flags">>;
+export interface RawPartialApplication extends Pick<RawApplication, "id" | "name" | "icon" | "description">, Partial<Pick<RawApplication, "bot_public" | "bot_require_code_grant" | "verify_key">> {}
+export interface RESTApplication extends Omit<RawApplication, "cover_image" | "flags" | "owner" | "rpc_origins" | "install_params">, Required<Pick<RawApplication, "cover_image" | "flags" | "install_params" | "owner" | "rpc_origins">> {}
+export interface RawClientApplication extends Required<Pick<RawApplication, "id" | "flags">> {}
 
 export interface RawTeam {
     icon: string | null;
@@ -162,8 +162,8 @@ export interface RefreshTokenOptions {
     refreshToken: string;
 }
 
-export type RawRefreshTokenResponse = Omit<RawExchangeCodeResponse, "webhook">;
-export type RefreshTokenResponse = Omit<ExchangeCodeResponse, "webhook">;
+export interface RawRefreshTokenResponse extends Omit<RawExchangeCodeResponse, "webhook"> {}
+export interface RefreshTokenResponse extends Omit<ExchangeCodeResponse, "webhook"> {}
 
 export interface ClientCredentialsTokenOptions {
     /** The id of the client to perform the authorization with. This can be omitted if the global authorization is the proper (Basic base64(clientID:clientSecret)) already, or if connected to the gateway and ready. */
@@ -174,8 +174,8 @@ export interface ClientCredentialsTokenOptions {
     scopes: Array<string>;
 }
 
-export type RawClientCredentialsTokenResponse = Omit<RawExchangeCodeResponse, "refresh_token">;
-export type ClientCredentialsTokenResponse = Omit<ExchangeCodeResponse, "refreshToken">;
+export interface RawClientCredentialsTokenResponse extends Omit<RawExchangeCodeResponse, "refresh_token"> {}
+export interface ClientCredentialsTokenResponse extends Omit<ExchangeCodeResponse, "refreshToken"> {}
 
 export interface RevokeTokenOptions {
     /** The id of the client the authorization was performed with. */

package/dist/lib/types/request-handler.d.ts

@@ -4,7 +4,7 @@ import type { RESTMethod } from "../Constants";
 import type { FormData } from "undici";
 
 // internal use
-type RequestHandlerInstanceOptions = Required<Omit<RESTOptions, "agent">> & Pick<RESTOptions, "agent">;
+export interface RequestHandlerInstanceOptions extends Required<Omit<RESTOptions, "agent">>, Pick<RESTOptions, "agent"> {}
 
 export interface RequestOptions {
     auth?: boolean | string;

package/dist/lib/types/users.d.ts

@@ -22,10 +22,10 @@ export interface RESTUser {
     username: string;
     verified?: boolean;
 }
-export type RawUser = Pick<RESTUser, "id" | "username" | "discriminator" | "avatar" | "avatar_decoration" | "bot" | "system" | "banner" | "accent_color"> & Required<Pick<RESTUser, "public_flags">>;
-export type RawUserWithMember = RawUser & Pick<RESTUser, "member">;
-export type RawOAuthUser = Pick<RESTUser, "id" | "username" | "discriminator" | "avatar" | "avatar_decoration" | "bot" | "system"> & Required<Pick<RESTUser, "banner" | "accent_color" | "locale" | "mfa_enabled" | "email" | "verified" | "flags" | "public_flags">>;
-export type RawExtendedUser = Pick<RawOAuthUser, "avatar" | "avatar_decoration" | "bot" | "discriminator" | "email" | "flags" | "id" | "mfa_enabled" | "username" | "verified">;
+export interface RawUser extends Pick<RESTUser, "id" | "username" | "discriminator" | "avatar" | "avatar_decoration" | "bot" | "system" | "banner" | "accent_color">, Required<Pick<RESTUser, "public_flags">> {}
+export interface RawUserWithMember extends RawUser, Pick<RESTUser, "member"> {}
+export interface RawOAuthUser extends Pick<RESTUser, "id" | "username" | "discriminator" | "avatar" | "avatar_decoration" | "bot" | "system">, Required<Pick<RESTUser, "banner" | "accent_color" | "locale" | "mfa_enabled" | "email" | "verified" | "flags" | "public_flags">> {}
+export interface RawExtendedUser extends Pick<RawOAuthUser, "avatar" | "avatar_decoration" | "bot" | "discriminator" | "email" | "flags" | "id" | "mfa_enabled" | "username" | "verified"> {}
 
 export interface EditSelfUserOptions {
     /** The new avatar (buffer, or full data url). `null` to reset. */

package/dist/lib/types/webhooks.d.ts

@@ -18,11 +18,11 @@ export interface RawWebhook {
     url?: string;
     user?: RawUser;
 }
-export type BasicWebhook = Pick<RawWebhook, "type" | "id" | "name" | "avatar" | "channel_id" | "guild_id" | "application_id">;
-export type OAuthWebhook = Required<BasicWebhook & Pick<RawWebhook, "url" | "token">>;
-export type GuildWebhook = BasicWebhook & Pick<RawWebhook, "user" | "token">;
-export type ApplicationWebhook = Pick<RawWebhook, "type" | "id" | "name" | "avatar" | "channel_id" | "guild_id" | "application_id"> & Required<Pick<RawWebhook, "token">>;
-export type ChannelFollowerWebhook = BasicWebhook & Required<Pick<RawWebhook, "source_guild" | "source_channel">> & Pick<RawWebhook, "user">;
+export interface BasicWebhook extends Pick<RawWebhook, "type" | "id" | "name" | "avatar" | "channel_id" | "guild_id" | "application_id"> {}
+export interface OAuthWebhook extends Required<BasicWebhook & Pick<RawWebhook, "url" | "token">> {}
+export interface GuildWebhook extends BasicWebhook, Pick<RawWebhook, "user" | "token"> {}
+export interface ApplicationWebhook extends Pick<RawWebhook, "type" | "id" | "name" | "avatar" | "channel_id" | "guild_id" | "application_id">, Required<Pick<RawWebhook, "token">> {}
+export interface ChannelFollowerWebhook extends BasicWebhook, Required<Pick<RawWebhook, "source_guild" | "source_channel">>, Pick<RawWebhook, "user"> {}
 
 export interface CreateWebhookOptions {
     /** The avatar (buffer, or full data url). */
@@ -46,7 +46,7 @@ export interface EditWebhookOptions extends EditWebhookTokenOptions {
     reason?: string;
 }
 
-export type ExecuteWebhookOptions = Pick<CreateMessageOptions, "content" | "tts" | "embeds" | "allowedMentions" | "components" | "attachments" | "flags" | "files"> & {
+export interface ExecuteWebhookOptions extends Pick<CreateMessageOptions, "content" | "tts" | "embeds" | "allowedMentions" | "components" | "attachments" | "flags" | "files"> {
     /** The url of an avatar to use. */
     avatarURL?: string;
     /** The id of the thread to send the message to. */
@@ -57,15 +57,15 @@ export type ExecuteWebhookOptions = Pick<CreateMessageOptions, "content" | "tts"
     username?: string;
     /** If the created message should be returned. */
     wait?: boolean;
-};
-export type ExecuteWebhookWaitOptions = Omit<ExecuteWebhookOptions, "wait">  & { wait: true; };
+}
+export interface ExecuteWebhookWaitOptions extends Omit<ExecuteWebhookOptions, "wait"> { wait: true; }
 
 export interface GetWebhookMessageOptions {
     messageID: string;
     threadID?: string;
 }
 
-export type EditWebhookMessageOptions = Pick<ExecuteWebhookOptions, "content" | "embeds" | "allowedMentions" | "components" | "attachments" | "threadID" | "files">;
+export interface EditWebhookMessageOptions extends Pick<ExecuteWebhookOptions, "content" | "embeds" | "allowedMentions" | "components" | "attachments" | "threadID" | "files"> {}
 
 export interface DeleteWebhookMessageOptions {
     /** The id of the thread the message is in. */

package/dist/lib/util/RawContainer.d.ts

@@ -0,0 +1,11 @@
+/** @module RawContainer */
+import type { RawModalActionRow, RawMessageActionRow, RawEmbedOptions } from "../types/channels";
+export type RawContainerData = RawEmbedOptions | RawModalActionRow | RawMessageActionRow;
+export type RawEmbedsContainer = RawContainer<RawEmbedOptions>;
+export type RawComponentsContainer<T extends RawMessageActionRow | RawModalActionRow = RawMessageActionRow | RawModalActionRow> = RawContainer<T>;
+/** A container for raw data, such as {@link Types/Channels~RawEmbedOptions | embeds}, {@link Types/Channels~RawMessageActionRow | components}, or {@link Types/Channels~RawModalActionRow | modals}. */
+export default class RawContainer<D extends RawContainerData> {
+    private data;
+    constructor(data: D);
+    get(): D;
+}

package/dist/lib/util/RawContainer.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/** A container for raw data, such as {@link Types/Channels~RawEmbedOptions | embeds}, {@link Types/Channels~RawMessageActionRow | components}, or {@link Types/Channels~RawModalActionRow | modals}. */
+class RawContainer {
+    data;
+    constructor(data) {
+        this.data = data;
+    }
+    get() {
+        return this.data;
+    }
+}
+exports.default = RawContainer;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmF3Q29udGFpbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWwvUmF3Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBTUEsd01BQXdNO0FBQ3hNLE1BQXFCLFlBQVk7SUFDckIsSUFBSSxDQUFJO0lBQ2hCLFlBQVksSUFBTztRQUNmLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQ3JCLENBQUM7SUFFRCxHQUFHO1FBQ0MsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ3JCLENBQUM7Q0FDSjtBQVRELCtCQVNDIn0=

package/dist/lib/util/Util.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+import { type RawComponentsContainer, type RawEmbedsContainer } from "./RawContainer";
 import type Client from "../Client";
 import { type ImageFormat } from "../Constants";
-import type { AllowedMentions, AnyChannel, AnyThreadChannel, Component, Embed, EmbedOptions, MessageActionRow, ModalActionRow, RawAllowedMentions, RawChannel, RawComponent, RawEmbed, RawEmbedOptions, RawMessageActionRow, RawModalActionRow, RawThreadChannel, ToComponentFromRaw, ToRawFromComponent } from "../types/channels";
+import type { ActionRowToRaw, AllowedMentions, AnyChannel, AnyThreadChannel, Component, Embed, EmbedOptions, MessageActionRow, ModalActionRow, RawAllowedMentions, RawChannel, RawComponent, RawEmbed, RawEmbedOptions, RawMessageActionRow, RawModalActionRow, RawThreadChannel, ToComponentFromRaw, ToRawFromComponent } from "../types/channels";
 import type { RawMember, RawSticker, RESTMember, Sticker } from "../types/guilds";
 import type { ApplicationCommandOptions, RawApplicationCommandOption } from "../types/application-commands";
 import Member from "../structures/Member";
@@ -10,16 +11,20 @@ export default class Util {
     #private;
     static BASE64URL_REGEX: RegExp;
     constructor(client: Client);
+    static raw(data: RawEmbedOptions): RawEmbedsContainer;
+    static raw(data: Array<RawEmbedOptions>): Array<RawEmbedsContainer>;
+    static raw<T extends RawModalActionRow | RawMessageActionRow>(data: T): RawComponentsContainer<T>;
+    static raw<T extends RawModalActionRow | RawMessageActionRow>(data: Array<T>): Array<RawComponentsContainer<T>>;
     /** @hidden intentionally not documented - this is an internal function */
     _convertImage(image: Buffer | string, name: string): string;
     componentToParsed<T extends RawComponent>(component: T): ToComponentFromRaw<T>;
     componentToRaw<T extends Component>(component: T): ToRawFromComponent<T>;
     componentsToParsed<T extends RawModalActionRow | RawMessageActionRow>(components: Array<T>): T extends RawModalActionRow ? Array<ModalActionRow> : T extends RawMessageActionRow ? Array<MessageActionRow> : never;
-    componentsToRaw<T extends ModalActionRow | MessageActionRow>(components: Array<T>): T extends ModalActionRow ? Array<RawModalActionRow> : T extends MessageActionRow ? Array<RawMessageActionRow> : never;
+    componentsToRaw<T extends ModalActionRow | MessageActionRow>(components: Array<T | RawComponentsContainer<ActionRowToRaw<T>>>): Array<ActionRowToRaw<T>>;
     convertImage(img: Buffer | string): string;
     convertSticker(raw: RawSticker): Sticker;
     embedsToParsed(embeds: Array<RawEmbed>): Array<Embed>;
-    embedsToRaw(embeds: Array<EmbedOptions>): Array<RawEmbedOptions>;
+    embedsToRaw(embeds: Array<EmbedOptions | RawEmbedsContainer>): Array<RawEmbedOptions>;
     formatAllowedMentions(allowed?: AllowedMentions): RawAllowedMentions;
     formatImage(url: string, format?: ImageFormat, size?: number): string;
     getMagic(file: Buffer, len?: number): string;