@magicyan/discord 1.7.0 → 1.7.1

package/dist/functions/components/gallery.cjs

@@ -6,7 +6,7 @@ const core = require('@magicyan/core');
 
 function createMediaGallery(...items) {
   return new discord_js.MediaGalleryBuilder({
-    items: items.flat().filter(core.isDefined).map((item) => {
+    items: items.flat().filter((item) => typeof item !== "boolean").filter(core.isDefined).map((item) => {
       if (typeof item === "string") {
         return { media: { url: item } };
       }

package/dist/functions/components/gallery.mjs

@@ -4,7 +4,7 @@ import { isDefined } from '@magicyan/core';
 
 function createMediaGallery(...items) {
   return new MediaGalleryBuilder({
-    items: items.flat().filter(isDefined).map((item) => {
+    items: items.flat().filter((item) => typeof item !== "boolean").filter(isDefined).map((item) => {
       if (typeof item === "string") {
         return { media: { url: item } };
       }

package/dist/functions/components/label.cjs

@@ -2,26 +2,33 @@
 
 const discord_js = require('discord.js');
 
-function createLabel(argA, argB, argC, argD) {
-  if (typeof argA === "object") {
-    const { component, ...data } = argA;
-    return new discord_js.LabelBuilder({
+function createLabel(a, b, c, d) {
+  const label = new discord_js.LabelBuilder();
+  if (typeof a === "object") {
+    const { component, ...data } = a;
+    Object.assign(label.data, {
       ...data,
-      component: component?.toJSON()
+      component: discord_js.isJSONEncodable(component) ? component.toJSON() : component
     });
+    return label;
   }
-  if (typeof argB === "string") {
-    return new discord_js.LabelBuilder({
-      label: argA,
-      description: argB,
-      ...typeof argC === "number" ? { id: argC } : { component: argC?.toJSON(), id: argD }
+  if (typeof b === "string") {
+    Object.assign(label.data, {
+      label: a,
+      description: b,
+      ...typeof c === "number" ? { id: c } : {
+        component: discord_js.isJSONEncodable(c) ? c.toJSON() : c,
+        id: d
+      }
     });
+    return label;
   }
-  return new discord_js.LabelBuilder({
-    label: argA,
-    component: argB?.toJSON(),
-    ...typeof argC === "number" ? { id: argC } : {}
+  Object.assign(label.data, {
+    label: a,
+    component: discord_js.isJSONEncodable(b) ? b.toJSON() : b,
+    ...typeof c === "number" ? { id: c } : {}
   });
+  return label;
 }
 
 exports.createLabel = createLabel;

package/dist/functions/components/label.mjs

@@ -1,25 +1,32 @@
-import { LabelBuilder } from 'discord.js';
+import { LabelBuilder, isJSONEncodable } from 'discord.js';
 
-function createLabel(argA, argB, argC, argD) {
-  if (typeof argA === "object") {
-    const { component, ...data } = argA;
-    return new LabelBuilder({
+function createLabel(a, b, c, d) {
+  const label = new LabelBuilder();
+  if (typeof a === "object") {
+    const { component, ...data } = a;
+    Object.assign(label.data, {
       ...data,
-      component: component?.toJSON()
+      component: isJSONEncodable(component) ? component.toJSON() : component
     });
+    return label;
   }
-  if (typeof argB === "string") {
-    return new LabelBuilder({
-      label: argA,
-      description: argB,
-      ...typeof argC === "number" ? { id: argC } : { component: argC?.toJSON(), id: argD }
+  if (typeof b === "string") {
+    Object.assign(label.data, {
+      label: a,
+      description: b,
+      ...typeof c === "number" ? { id: c } : {
+        component: isJSONEncodable(c) ? c.toJSON() : c,
+        id: d
+      }
     });
+    return label;
   }
-  return new LabelBuilder({
-    label: argA,
-    component: argB?.toJSON(),
-    ...typeof argC === "number" ? { id: argC } : {}
+  Object.assign(label.data, {
+    label: a,
+    component: isJSONEncodable(b) ? b.toJSON() : b,
+    ...typeof c === "number" ? { id: c } : {}
   });
+  return label;
 }
 
 export { createLabel };

package/dist/functions/components/modal.cjs

@@ -30,6 +30,21 @@ function createModalFields(...components) {
     return data.data;
   });
 }
+function createModal(data, title, ...components) {
+  if (typeof data === "string") {
+    return new discord_js.ModalBuilder({
+      customId: data,
+      title,
+      components: createModalFields(...components)
+    });
+  }
+  return new discord_js.ModalBuilder({
+    customId: data.title,
+    title: data.title,
+    components: createModalFields(...data.components ?? [])
+  });
+}
 
+exports.createModal = createModal;
 exports.createModalFields = createModalFields;
 exports.modalFieldsToRecord = modalFieldsToRecord;

package/dist/functions/components/modal.mjs

@@ -1,5 +1,5 @@
 import { isDefined } from '@magicyan/core';
-import { ComponentType } from 'discord.js';
+import { ComponentType, ModalBuilder } from 'discord.js';
 
 function modalFieldsToRecord(data, parse) {
   const collection = "fields" in data ? "fields" in data.fields ? data.fields.fields : data.fields : data;
@@ -28,5 +28,19 @@ function createModalFields(...components) {
     return data.data;
   });
 }
+function createModal(data, title, ...components) {
+  if (typeof data === "string") {
+    return new ModalBuilder({
+      customId: data,
+      title,
+      components: createModalFields(...components)
+    });
+  }
+  return new ModalBuilder({
+    customId: data.title,
+    title: data.title,
+    components: createModalFields(...data.components ?? [])
+  });
+}
 
-export { createModalFields, modalFieldsToRecord };
+export { createModal, createModalFields, modalFieldsToRecord };

package/dist/functions/components/row.cjs

@@ -1,10 +1,11 @@
 'use strict';
 
+const core = require('@magicyan/core');
 const discord_js = require('discord.js');
 
 function createRow(...components) {
   return new discord_js.ActionRowBuilder({
-    components: components.flat()
+    components: components.flat().filter((c) => typeof c !== "boolean").filter((c) => core.isDefined(c))
   });
 }
 

package/dist/functions/components/row.mjs

@@ -1,8 +1,9 @@
+import { isDefined } from '@magicyan/core';
 import { ActionRowBuilder } from 'discord.js';
 
 function createRow(...components) {
   return new ActionRowBuilder({
-    components: components.flat()
+    components: components.flat().filter((c) => typeof c !== "boolean").filter((c) => isDefined(c))
   });
 }
 

package/dist/index.cjs

@@ -78,6 +78,7 @@ exports.createMediaGallery = gallery.createMediaGallery;
 exports.createModalInput = input.createModalInput;
 exports.createTextInput = input.createTextInput;
 exports.createLabel = label.createLabel;
+exports.createModal = modal.createModal;
 exports.createModalFields = modal.createModalFields;
 exports.modalFieldsToRecord = modal.modalFieldsToRecord;
 exports.createRow = row.createRow;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilderData, LabelBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, ModalBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilder, LabelBuilderData, ComponentInLabelData, ModalBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -381,7 +381,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
+type MediaGallerySource = MediaGalleryItemData | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -433,11 +433,46 @@ declare function createModalInput(data: Omit<TextInputComponentData, "type" | "s
     style?: TextInputStyle;
 }): ActionRowBuilder<TextInputBuilder>;
 
-type CreateLabelData = Omit<LabelBuilderData, "type">;
-type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+interface Unstable_CheckboxData {
+    type: ComponentType.Checkbox;
+    customId: string;
+    default?: boolean;
+    id?: number;
+}
+interface Unstable_CheckboxGroupData {
+    type: ComponentType.CheckboxGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    minValues?: number;
+    maxValues?: number;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface Unstable_RadioGroupData {
+    type: ComponentType.RadioGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface CreateLabelData extends Omit<LabelBuilderData, "type" | "component"> {
+    component?: LabelBuilderData["component"] | ComponentInLabelData | Unstable_CheckboxData | Unstable_CheckboxGroupData | Unstable_RadioGroupData;
+}
 declare function createLabel(data: CreateLabelData): LabelBuilder;
-declare function createLabel(label: string, description?: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
-declare function createLabel(label: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
+declare function createLabel(label: string, description?: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
+declare function createLabel(label: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
 
 type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
 type ResolveModalData = {
@@ -482,7 +517,17 @@ declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveM
 declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
 type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
 declare function createModalFields(...components: ModalComponents[]): ModalFields;
+interface CreateModalOptions {
+    customId: string;
+    title: string;
+    components: ModalComponents[];
+}
+declare function createModal(data: Partial<CreateModalOptions>): ModalBuilder;
+declare function createModal(customId: string): ModalBuilder;
+declare function createModal(customId: string, title: string): ModalBuilder;
+declare function createModal(customId: string, title: string, ...components: ModalComponents[]): ModalBuilder;
 
+type NullableValues = null | undefined | boolean;
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -522,7 +567,7 @@ declare function createModalFields(...components: ModalComponents[]): ModalField
  *     })
  * );
  */
-declare function createRow<Component extends AnyComponentBuilder>(...components: (Component | Component[])[]): ActionRowBuilder<Component>;
+declare function createRow<Component extends AnyComponentBuilder>(...components: (NullableValues | Component | Component[])[]): ActionRowBuilder<Component>;
 
 type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment | AttachmentBuilder | string;
 /**
@@ -1217,5 +1262,5 @@ declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
  */
 declare function isMessage(value: unknown): value is Message;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ComponentInLabelBuilder, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateLabelData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateModalOptions, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData, Unstable_CheckboxData, Unstable_CheckboxGroupData, Unstable_RadioGroupData };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilderData, LabelBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, ModalBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilder, LabelBuilderData, ComponentInLabelData, ModalBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -381,7 +381,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
+type MediaGallerySource = MediaGalleryItemData | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -433,11 +433,46 @@ declare function createModalInput(data: Omit<TextInputComponentData, "type" | "s
     style?: TextInputStyle;
 }): ActionRowBuilder<TextInputBuilder>;
 
-type CreateLabelData = Omit<LabelBuilderData, "type">;
-type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+interface Unstable_CheckboxData {
+    type: ComponentType.Checkbox;
+    customId: string;
+    default?: boolean;
+    id?: number;
+}
+interface Unstable_CheckboxGroupData {
+    type: ComponentType.CheckboxGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    minValues?: number;
+    maxValues?: number;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface Unstable_RadioGroupData {
+    type: ComponentType.RadioGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface CreateLabelData extends Omit<LabelBuilderData, "type" | "component"> {
+    component?: LabelBuilderData["component"] | ComponentInLabelData | Unstable_CheckboxData | Unstable_CheckboxGroupData | Unstable_RadioGroupData;
+}
 declare function createLabel(data: CreateLabelData): LabelBuilder;
-declare function createLabel(label: string, description?: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
-declare function createLabel(label: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
+declare function createLabel(label: string, description?: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
+declare function createLabel(label: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
 
 type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
 type ResolveModalData = {
@@ -482,7 +517,17 @@ declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveM
 declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
 type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
 declare function createModalFields(...components: ModalComponents[]): ModalFields;
+interface CreateModalOptions {
+    customId: string;
+    title: string;
+    components: ModalComponents[];
+}
+declare function createModal(data: Partial<CreateModalOptions>): ModalBuilder;
+declare function createModal(customId: string): ModalBuilder;
+declare function createModal(customId: string, title: string): ModalBuilder;
+declare function createModal(customId: string, title: string, ...components: ModalComponents[]): ModalBuilder;
 
+type NullableValues = null | undefined | boolean;
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -522,7 +567,7 @@ declare function createModalFields(...components: ModalComponents[]): ModalField
  *     })
  * );
  */
-declare function createRow<Component extends AnyComponentBuilder>(...components: (Component | Component[])[]): ActionRowBuilder<Component>;
+declare function createRow<Component extends AnyComponentBuilder>(...components: (NullableValues | Component | Component[])[]): ActionRowBuilder<Component>;
 
 type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment | AttachmentBuilder | string;
 /**
@@ -1217,5 +1262,5 @@ declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
  */
 declare function isMessage(value: unknown): value is Message;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ComponentInLabelBuilder, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateLabelData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateModalOptions, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData, Unstable_CheckboxData, Unstable_CheckboxGroupData, Unstable_RadioGroupData };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilderData, LabelBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, ModalBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, GuildEmoji, GuildMember, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, TextInputBuilder, TextInputComponentData, TextInputStyle, LabelBuilder, LabelBuilderData, ComponentInLabelData, ModalBuilder, Collection, ModalData, LabelComponentData, TextDisplayComponentData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, FileUploadBuilder, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -381,7 +381,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
+type MediaGallerySource = MediaGalleryItemData | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -433,11 +433,46 @@ declare function createModalInput(data: Omit<TextInputComponentData, "type" | "s
     style?: TextInputStyle;
 }): ActionRowBuilder<TextInputBuilder>;
 
-type CreateLabelData = Omit<LabelBuilderData, "type">;
-type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+interface Unstable_CheckboxData {
+    type: ComponentType.Checkbox;
+    customId: string;
+    default?: boolean;
+    id?: number;
+}
+interface Unstable_CheckboxGroupData {
+    type: ComponentType.CheckboxGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    minValues?: number;
+    maxValues?: number;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface Unstable_RadioGroupData {
+    type: ComponentType.RadioGroup;
+    id?: number;
+    customId: string;
+    required?: boolean;
+    options: {
+        label: string;
+        value: string;
+        description?: string;
+        default?: boolean;
+    }[];
+}
+
+interface CreateLabelData extends Omit<LabelBuilderData, "type" | "component"> {
+    component?: LabelBuilderData["component"] | ComponentInLabelData | Unstable_CheckboxData | Unstable_CheckboxGroupData | Unstable_RadioGroupData;
+}
 declare function createLabel(data: CreateLabelData): LabelBuilder;
-declare function createLabel(label: string, description?: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
-declare function createLabel(label: string, component?: ComponentInLabelBuilder, id?: number): LabelBuilder;
+declare function createLabel(label: string, description?: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
+declare function createLabel(label: string, component?: CreateLabelData["component"], id?: number): LabelBuilder;
 
 type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
 type ResolveModalData = {
@@ -482,7 +517,17 @@ declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveM
 declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
 type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
 declare function createModalFields(...components: ModalComponents[]): ModalFields;
+interface CreateModalOptions {
+    customId: string;
+    title: string;
+    components: ModalComponents[];
+}
+declare function createModal(data: Partial<CreateModalOptions>): ModalBuilder;
+declare function createModal(customId: string): ModalBuilder;
+declare function createModal(customId: string, title: string): ModalBuilder;
+declare function createModal(customId: string, title: string, ...components: ModalComponents[]): ModalBuilder;
 
+type NullableValues = null | undefined | boolean;
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -522,7 +567,7 @@ declare function createModalFields(...components: ModalComponents[]): ModalField
  *     })
  * );
  */
-declare function createRow<Component extends AnyComponentBuilder>(...components: (Component | Component[])[]): ActionRowBuilder<Component>;
+declare function createRow<Component extends AnyComponentBuilder>(...components: (NullableValues | Component | Component[])[]): ActionRowBuilder<Component>;
 
 type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment | AttachmentBuilder | string;
 /**
@@ -1217,5 +1262,5 @@ declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
  */
 declare function isMessage(value: unknown): value is Message;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ComponentInLabelBuilder, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateLabelData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createFileUpload, createLabel, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createTextInput, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, isFileBuilder, isMediaGalleryBuilder, isMediaGalleryItemBuilder, isMentionableSelectMenuBuilder, isMessage, isModalBuilder, isRoleSelectMenuBuilder, isSectionBuilder, isSeparatorBuilder, isStringSelectMenuBuilder, isTextDisplayBuilder, isTextInputBuilder, isUserSelectMenuBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentBuildersData, ComponentData, ContainerColor, ContainerComponentBuilder, ContainerData, ContainerInComponentType, CreateComponentData, CreateModalOptions, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, FileUploadData, MagicComponentData, MediaGallerySource, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData, Unstable_CheckboxData, Unstable_CheckboxGroupData, Unstable_RadioGroupData };

package/dist/index.mjs

@@ -18,7 +18,7 @@ export { createFile } from './functions/components/file.mjs';
 export { createMediaGallery } from './functions/components/gallery.mjs';
 export { createModalInput, createTextInput } from './functions/components/input.mjs';
 export { createLabel } from './functions/components/label.mjs';
-export { createModalFields, modalFieldsToRecord } from './functions/components/modal.mjs';
+export { createModal, createModalFields, modalFieldsToRecord } from './functions/components/modal.mjs';
 export { createRow } from './functions/components/row.mjs';
 export { createSection } from './functions/components/section.mjs';
 export { createSeparator } from './functions/components/separator.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "discord.js": "^14.24.2"
+    "discord.js": "^14.25.1"
   },
   "devDependencies": {
     "@magicyan/config": "*",