@magicyan/discord 1.5.4 → 1.6.1

package/dist/functions/components/components.cjs

@@ -9,7 +9,7 @@ const row = require('./row.cjs');
 const text = require('./text.cjs');
 
 function createComponents(...data) {
-  return data.flat().filter((value) => core.isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
+  return data.flat().filter((value) => core.isDefined(value) && typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return text.createTextDisplay(component);
     }

package/dist/functions/components/components.mjs

@@ -7,7 +7,7 @@ import { createRow } from './row.mjs';
 import { createTextDisplay } from './text.mjs';
 
 function createComponents(...data) {
-  return data.flat().filter((value) => isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
+  return data.flat().filter((value) => isDefined(value) && typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return createTextDisplay(component);
     }

package/dist/functions/components/gallery.cjs

@@ -5,19 +5,17 @@ const attachment = require('../../guards/attachment.cjs');
 const core = require('@magicyan/core');
 
 function createMediaGallery(...items) {
-  const gallery = new discord_js.MediaGalleryBuilder();
-  for (const item of items.flat().filter(core.isDefined)) {
-    if (typeof item === "string") {
-      gallery.addItems({ media: { url: item } });
-      continue;
-    }
-    if (attachment.isAttachment(item)) {
-      gallery.addItems({ media: { url: `attachment://${item.name}` } });
-      continue;
-    }
-    gallery.addItems(item);
-  }
-  return gallery;
+  return new discord_js.MediaGalleryBuilder({
+    items: items.flat().filter(core.isDefined).map((item) => {
+      if (typeof item === "string") {
+        return { media: { url: item } };
+      }
+      if (attachment.isAttachment(item)) {
+        return { media: { url: `attachment://${item.name}` } };
+      }
+      return item;
+    })
+  });
 }
 
 exports.createMediaGallery = createMediaGallery;

package/dist/functions/components/gallery.mjs

@@ -3,19 +3,17 @@ import { isAttachment } from '../../guards/attachment.mjs';
 import { isDefined } from '@magicyan/core';
 
 function createMediaGallery(...items) {
-  const gallery = new MediaGalleryBuilder();
-  for (const item of items.flat().filter(isDefined)) {
-    if (typeof item === "string") {
-      gallery.addItems({ media: { url: item } });
-      continue;
-    }
-    if (isAttachment(item)) {
-      gallery.addItems({ media: { url: `attachment://${item.name}` } });
-      continue;
-    }
-    gallery.addItems(item);
-  }
-  return gallery;
+  return new MediaGalleryBuilder({
+    items: items.flat().filter(isDefined).map((item) => {
+      if (typeof item === "string") {
+        return { media: { url: item } };
+      }
+      if (isAttachment(item)) {
+        return { media: { url: `attachment://${item.name}` } };
+      }
+      return item;
+    })
+  });
 }
 
 export { createMediaGallery };

package/dist/functions/components/input.cjs

@@ -0,0 +1,18 @@
+'use strict';
+
+const discord_js = require('discord.js');
+const row = require('./row.cjs');
+
+function createTextInput(data) {
+  data.style ?? (data.style = discord_js.TextInputStyle.Short);
+  if ("label" in data)
+    delete data.label;
+  return new discord_js.TextInputBuilder(data);
+}
+function createModalInput(data) {
+  data.style ?? (data.style = discord_js.TextInputStyle.Short);
+  return row.createRow(new discord_js.TextInputBuilder(data));
+}
+
+exports.createModalInput = createModalInput;
+exports.createTextInput = createTextInput;

package/dist/functions/components/input.mjs

@@ -0,0 +1,15 @@
+import { TextInputStyle, TextInputBuilder } from 'discord.js';
+import { createRow } from './row.mjs';
+
+function createTextInput(data) {
+  data.style ?? (data.style = TextInputStyle.Short);
+  if ("label" in data)
+    delete data.label;
+  return new TextInputBuilder(data);
+}
+function createModalInput(data) {
+  data.style ?? (data.style = TextInputStyle.Short);
+  return createRow(new TextInputBuilder(data));
+}
+
+export { createModalInput, createTextInput };

package/dist/functions/components/label.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+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({
+      ...data,
+      component: component?.toJSON()
+    });
+  }
+  if (typeof argB === "string") {
+    return new discord_js.LabelBuilder({
+      label: argA,
+      description: argB,
+      ...typeof argC === "number" ? { id: argC } : { component: argC?.toJSON(), id: argD }
+    });
+  }
+  return new discord_js.LabelBuilder({
+    label: argA,
+    component: argB?.toJSON(),
+    ...typeof argC === "number" ? { id: argC } : {}
+  });
+}
+
+exports.createLabel = createLabel;

package/dist/functions/components/label.mjs

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

package/dist/functions/components/modal.cjs

@@ -0,0 +1,37 @@
+'use strict';
+
+const core = require('@magicyan/core');
+const discord_js = require('discord.js');
+
+function modalFieldsToRecord(data, parse) {
+  const collection = "fields" in data ? "fields" in data.fields ? data.fields.fields : data.fields : data;
+  const record = collection.reduce((acc, data2) => {
+    if (data2.type === discord_js.ComponentType.TextInput) {
+      acc[data2.customId] = data2.value;
+      return acc;
+    }
+    if (data2.type === discord_js.ComponentType.FileUpload) {
+      const attachments = data2.attachments;
+      acc[data2.customId] = Array.from(
+        attachments.mapValues((data3) => data3.url).values()
+      );
+      return acc;
+    }
+    acc[data2.customId] = Array.from(data2.values ?? []);
+    return acc;
+  }, {});
+  return parse ? parse(record) : record;
+}
+function createModalFields(...components) {
+  return components.filter((v) => core.isDefined(v) && typeof v !== "boolean").map((data) => {
+    if (typeof data === "string")
+      return {
+        type: discord_js.ComponentType.TextDisplay,
+        content: data
+      };
+    return data.data;
+  });
+}
+
+exports.createModalFields = createModalFields;
+exports.modalFieldsToRecord = modalFieldsToRecord;

package/dist/functions/components/modal.mjs

@@ -0,0 +1,34 @@
+import { isDefined } from '@magicyan/core';
+import { ComponentType } from 'discord.js';
+
+function modalFieldsToRecord(data, parse) {
+  const collection = "fields" in data ? "fields" in data.fields ? data.fields.fields : data.fields : data;
+  const record = collection.reduce((acc, data2) => {
+    if (data2.type === ComponentType.TextInput) {
+      acc[data2.customId] = data2.value;
+      return acc;
+    }
+    if (data2.type === ComponentType.FileUpload) {
+      const attachments = data2.attachments;
+      acc[data2.customId] = Array.from(
+        attachments.mapValues((data3) => data3.url).values()
+      );
+      return acc;
+    }
+    acc[data2.customId] = Array.from(data2.values ?? []);
+    return acc;
+  }, {});
+  return parse ? parse(record) : record;
+}
+function createModalFields(...components) {
+  return components.filter((v) => isDefined(v) && typeof v !== "boolean").map((data) => {
+    if (typeof data === "string")
+      return {
+        type: ComponentType.TextDisplay,
+        content: data
+      };
+    return data.data;
+  });
+}
+
+export { createModalFields, modalFieldsToRecord };

package/dist/functions/components/upload.cjs

@@ -0,0 +1,19 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function createFileUpload(arg) {
+  if (typeof arg === "string")
+    return new discord_js.FileUploadBuilder({
+      custom_id: arg
+    });
+  const { customId, maxValues, minValues, ...data } = arg;
+  return new discord_js.FileUploadBuilder({
+    custom_id: customId,
+    max_values: maxValues,
+    min_values: minValues,
+    ...data
+  });
+}
+
+exports.createFileUpload = createFileUpload;

package/dist/functions/components/upload.mjs

@@ -0,0 +1,17 @@
+import { FileUploadBuilder } from 'discord.js';
+
+function createFileUpload(arg) {
+  if (typeof arg === "string")
+    return new FileUploadBuilder({
+      custom_id: arg
+    });
+  const { customId, maxValues, minValues, ...data } = arg;
+  return new FileUploadBuilder({
+    custom_id: customId,
+    max_values: maxValues,
+    min_values: minValues,
+    ...data
+  });
+}
+
+export { createFileUpload };

package/dist/index.cjs

@@ -10,7 +10,6 @@ const emojis = require('./functions/emojis.cjs');
 const members = require('./functions/members.cjs');
 const message = require('./functions/message.cjs');
 const misc = require('./functions/misc.cjs');
-const modals = require('./functions/modals.cjs');
 const regex = require('./functions/regex.cjs');
 const roles = require('./functions/roles.cjs');
 const webhooks = require('./functions/webhooks.cjs');
@@ -19,29 +18,33 @@ const components = require('./functions/components/components.cjs');
 const container = require('./functions/components/container.cjs');
 const file = require('./functions/components/file.cjs');
 const gallery = require('./functions/components/gallery.cjs');
+const input = require('./functions/components/input.cjs');
+const label = require('./functions/components/label.cjs');
+const modal = require('./functions/components/modal.cjs');
 const row = require('./functions/components/row.cjs');
 const section = require('./functions/components/section.cjs');
 const separator$1 = require('./functions/components/separator.cjs');
 const text = require('./functions/components/text.cjs');
 const thumbarea = require('./functions/components/thumbarea.cjs');
 const thumbnail = require('./functions/components/thumbnail.cjs');
+const upload = require('./functions/components/upload.cjs');
 const assets = require('./functions/embeds/assets.cjs');
 const author = require('./functions/embeds/author.cjs');
 const embedplus = require('./functions/embeds/embedplus.cjs');
 const files = require('./functions/embeds/files.cjs');
 const footer = require('./functions/embeds/footer.cjs');
 const attachment = require('./guards/attachment.cjs');
-const message$1 = require('./guards/message.cjs');
 const button = require('./guards/components/button.cjs');
 const container$1 = require('./guards/components/container.cjs');
 const gallery$1 = require('./guards/components/gallery.cjs');
-const modal = require('./guards/components/modal.cjs');
+const modal$1 = require('./guards/components/modal.cjs');
 const row$1 = require('./guards/components/row.cjs');
 const section$1 = require('./guards/components/section.cjs');
 const selectmenu = require('./guards/components/selectmenu.cjs');
 const separator$2 = require('./guards/components/separator.cjs');
 const textdisplay = require('./guards/components/textdisplay.cjs');
 const textinput = require('./guards/components/textinput.cjs');
+const message$1 = require('./guards/message.cjs');
 const core = require('@magicyan/core');
 
 
@@ -61,10 +64,6 @@ exports.fetchMessageFromURL = message.fetchMessageFromURL;
 exports.findMessage = message.findMessage;
 exports.getMessageURLInfo = message.getMessageURLInfo;
 exports.setMobileStatus = misc.setMobileStatus;
-exports.createModal = modals.createModal;
-exports.createModalFields = modals.createModalFields;
-exports.createModalInput = modals.createModalInput;
-exports.modalFieldsToRecord = modals.modalFieldsToRecord;
 exports.extractMentionId = regex.extractMentionId;
 exports.findRole = roles.findRole;
 exports.createWebhookClient = webhooks.createWebhookClient;
@@ -75,12 +74,18 @@ exports.ContainerPlusBuilder = container.ContainerPlusBuilder;
 exports.createContainer = container.createContainer;
 exports.createFile = file.createFile;
 exports.createMediaGallery = gallery.createMediaGallery;
+exports.createModalInput = input.createModalInput;
+exports.createTextInput = input.createTextInput;
+exports.createLabel = label.createLabel;
+exports.createModalFields = modal.createModalFields;
+exports.modalFieldsToRecord = modal.modalFieldsToRecord;
 exports.createRow = row.createRow;
 exports.createSection = section.createSection;
 exports.createSeparator = separator$1.createSeparator;
 exports.createTextDisplay = text.createTextDisplay;
 exports.createThumbArea = thumbarea.createThumbArea;
 exports.createThumbnail = thumbnail.createThumbnail;
+exports.createFileUpload = upload.createFileUpload;
 exports.createEmbedAsset = assets.createEmbedAsset;
 exports.createEmbedAuthor = author.createEmbedAuthor;
 exports.EmbedPlusBuilder = embedplus.EmbedPlusBuilder;
@@ -88,12 +93,11 @@ exports.createEmbed = embedplus.createEmbed;
 exports.createEmbedFiles = files.createEmbedFiles;
 exports.createEmbedFooter = footer.createEmbedFooter;
 exports.isAttachment = attachment.isAttachment;
-exports.isMessage = message$1.isMessage;
 exports.isButtonBuilder = button.isButtonBuilder;
 exports.isContainerBuilder = container$1.isContainerBuilder;
 exports.isMediaGalleryBuilder = gallery$1.isMediaGalleryBuilder;
 exports.isMediaGalleryItemBuilder = gallery$1.isMediaGalleryItemBuilder;
-exports.isModalBuilder = modal.isModalBuilder;
+exports.isModalBuilder = modal$1.isModalBuilder;
 exports.isActionRowBuilder = row$1.isActionRowBuilder;
 exports.isSectionBuilder = section$1.isSectionBuilder;
 exports.isAnySelectMenuBuilder = selectmenu.isAnySelectMenuBuilder;
@@ -105,6 +109,7 @@ exports.isUserSelectMenuBuilder = selectmenu.isUserSelectMenuBuilder;
 exports.isSeparatorBuilder = separator$2.isSeparatorBuilder;
 exports.isTextDisplayBuilder = textdisplay.isTextDisplayBuilder;
 exports.isTextInputBuilder = textinput.isTextInputBuilder;
+exports.isMessage = message$1.isMessage;
 Object.keys(core).forEach(function (k) {
 	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = core[k];
 });

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, ActionRowBuilder, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, 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, 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';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -144,22 +144,6 @@ declare function fetchMessageFromURL(client: Client | Client, url: string): Prom
 
 declare function setMobileStatus(): void;
 
-type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "style"> {
-    style?: TextInputStyle;
-}
-declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
-declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
-type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
-interface CreateModalData {
-    title?: string;
-    customId: string;
-    components: ModalFieldsData;
-}
-declare function createModal(data: CreateModalData): ModalBuilder;
-
 /**
  *
  * @param mention Discord mentionable string
@@ -429,6 +413,65 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  */
 declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
+type CreateInputData = Partial<Omit<TextInputComponentData, "type" | "label">>;
+declare function createTextInput(data: CreateInputData): TextInputBuilder;
+/**
+ * @deprecated Use {@link createTextInput} instead.
+ */
+declare function createModalInput(data: Omit<TextInputComponentData, "type" | "style"> & {
+    style?: TextInputStyle;
+}): ActionRowBuilder<TextInputBuilder>;
+
+type CreateLabelData = Omit<LabelBuilderData, "type">;
+type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+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;
+
+type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
+type ResolveModalData = {
+    fields: {
+        fields: Collection<string, ModalData>;
+    };
+} | {
+    fields: Collection<string, ModalData>;
+} | Collection<string, ModalData>;
+type ModalFieldsRecord = Record<string, string | string[]>;
+/**
+ * Converts modal submitted fields into a plain record object, mapping each component `customId` to its value.
+ *
+ * This function supports multiple modal submission data shapes coming from Discord.js,
+ * automatically extracting and normalizing values from:
+ * - Text input fields (`ComponentType.TextInput`) → string
+ * - Select menus & other multi-value components → string[]
+ * - File upload fields (`ComponentType.FileUpload`) → string[] of attachment URLs
+ *
+ * Optionally, a parser callback may be provided to transform the resulting record before returning it.
+ *
+ * @template T The expected return type after optional parsing.
+ * @param {ResolveModalData} data - The modal submission data, usually from an interaction.
+ * @param {(record: ModalFieldsRecord) => T} [parse] - Optional transform function applied to the resulting record.
+ * @returns {ModalFieldsRecord | T} The processed fields as a record, or the parser result if provided.
+ *
+ * @example
+ * ```ts
+ * const fields = modalFieldsToRecord(interaction.fields);
+ * console.log(fields.username); // "JohnDoe"
+ * ```
+ *
+ * @example With parsing
+ * ```ts
+ * const result = modalFieldsToRecord(interaction.fields, fields => ({
+ *   name: fields.username.trim(),
+ *   age: Number.parseInt(fields.age),
+ * }));
+ * ```
+ */
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData): T;
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
+type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
+declare function createModalFields(...components: ModalComponents[]): ModalFields;
+
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -675,6 +718,16 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
+interface FileUploadData {
+    customId?: string;
+    minValues?: number;
+    maxValues?: number;
+    required?: boolean;
+    id?: number;
+}
+declare function createFileUpload(data: FileUploadData): FileUploadBuilder;
+declare function createFileUpload(customId: string): FileUploadBuilder;
+
 type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
@@ -841,26 +894,6 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
  */
 declare function isAttachment(value: unknown): value is Attachment | AttachmentBuilder;
 
-/**
- * Checks whether the given value is a {@link Message}.
- *
- * This function returns `true` if the value is an instance of `Message`
- * or if it structurally resembles a `Message` object.
- *
- * @param value - The value to check.
- * @returns `true` if the value is a `Message`, otherwise `false`.
- *
- * @example
- * import type { Message, Interaction } from "discord.js";
- *
- * function handle(input: Message | Interaction | unknown) {
- *   if (isMessage(input)) {
- *     console.log("This is a message with ID:", input.id);
- *   }
- * }
- */
-declare function isMessage(value: unknown): value is Message;
-
 /**
  * Checks whether the given value is a {@link ButtonBuilder}.
  *
@@ -1082,5 +1115,25 @@ declare function isTextDisplayBuilder(value: unknown): value is TextDisplayBuild
  */
 declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, 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, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MagicComponentData, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+/**
+ * Checks whether the given value is a {@link Message}.
+ *
+ * This function returns `true` if the value is an instance of `Message`
+ * or if it structurally resembles a `Message` object.
+ *
+ * @param value - The value to check.
+ * @returns `true` if the value is a `Message`, otherwise `false`.
+ *
+ * @example
+ * import type { Message, Interaction } from "discord.js";
+ *
+ * function handle(input: Message | Interaction | unknown) {
+ *   if (isMessage(input)) {
+ *     console.log("This is a message with ID:", input.id);
+ *   }
+ * }
+ */
+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, 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 };

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, ActionRowBuilder, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, 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, 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';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -144,22 +144,6 @@ declare function fetchMessageFromURL(client: Client | Client, url: string): Prom
 
 declare function setMobileStatus(): void;
 
-type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "style"> {
-    style?: TextInputStyle;
-}
-declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
-declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
-type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
-interface CreateModalData {
-    title?: string;
-    customId: string;
-    components: ModalFieldsData;
-}
-declare function createModal(data: CreateModalData): ModalBuilder;
-
 /**
  *
  * @param mention Discord mentionable string
@@ -429,6 +413,65 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  */
 declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
+type CreateInputData = Partial<Omit<TextInputComponentData, "type" | "label">>;
+declare function createTextInput(data: CreateInputData): TextInputBuilder;
+/**
+ * @deprecated Use {@link createTextInput} instead.
+ */
+declare function createModalInput(data: Omit<TextInputComponentData, "type" | "style"> & {
+    style?: TextInputStyle;
+}): ActionRowBuilder<TextInputBuilder>;
+
+type CreateLabelData = Omit<LabelBuilderData, "type">;
+type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+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;
+
+type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
+type ResolveModalData = {
+    fields: {
+        fields: Collection<string, ModalData>;
+    };
+} | {
+    fields: Collection<string, ModalData>;
+} | Collection<string, ModalData>;
+type ModalFieldsRecord = Record<string, string | string[]>;
+/**
+ * Converts modal submitted fields into a plain record object, mapping each component `customId` to its value.
+ *
+ * This function supports multiple modal submission data shapes coming from Discord.js,
+ * automatically extracting and normalizing values from:
+ * - Text input fields (`ComponentType.TextInput`) → string
+ * - Select menus & other multi-value components → string[]
+ * - File upload fields (`ComponentType.FileUpload`) → string[] of attachment URLs
+ *
+ * Optionally, a parser callback may be provided to transform the resulting record before returning it.
+ *
+ * @template T The expected return type after optional parsing.
+ * @param {ResolveModalData} data - The modal submission data, usually from an interaction.
+ * @param {(record: ModalFieldsRecord) => T} [parse] - Optional transform function applied to the resulting record.
+ * @returns {ModalFieldsRecord | T} The processed fields as a record, or the parser result if provided.
+ *
+ * @example
+ * ```ts
+ * const fields = modalFieldsToRecord(interaction.fields);
+ * console.log(fields.username); // "JohnDoe"
+ * ```
+ *
+ * @example With parsing
+ * ```ts
+ * const result = modalFieldsToRecord(interaction.fields, fields => ({
+ *   name: fields.username.trim(),
+ *   age: Number.parseInt(fields.age),
+ * }));
+ * ```
+ */
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData): T;
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
+type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
+declare function createModalFields(...components: ModalComponents[]): ModalFields;
+
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -675,6 +718,16 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
+interface FileUploadData {
+    customId?: string;
+    minValues?: number;
+    maxValues?: number;
+    required?: boolean;
+    id?: number;
+}
+declare function createFileUpload(data: FileUploadData): FileUploadBuilder;
+declare function createFileUpload(customId: string): FileUploadBuilder;
+
 type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
@@ -841,26 +894,6 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
  */
 declare function isAttachment(value: unknown): value is Attachment | AttachmentBuilder;
 
-/**
- * Checks whether the given value is a {@link Message}.
- *
- * This function returns `true` if the value is an instance of `Message`
- * or if it structurally resembles a `Message` object.
- *
- * @param value - The value to check.
- * @returns `true` if the value is a `Message`, otherwise `false`.
- *
- * @example
- * import type { Message, Interaction } from "discord.js";
- *
- * function handle(input: Message | Interaction | unknown) {
- *   if (isMessage(input)) {
- *     console.log("This is a message with ID:", input.id);
- *   }
- * }
- */
-declare function isMessage(value: unknown): value is Message;
-
 /**
  * Checks whether the given value is a {@link ButtonBuilder}.
  *
@@ -1082,5 +1115,25 @@ declare function isTextDisplayBuilder(value: unknown): value is TextDisplayBuild
  */
 declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, 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, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MagicComponentData, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+/**
+ * Checks whether the given value is a {@link Message}.
+ *
+ * This function returns `true` if the value is an instance of `Message`
+ * or if it structurally resembles a `Message` object.
+ *
+ * @param value - The value to check.
+ * @returns `true` if the value is a `Message`, otherwise `false`.
+ *
+ * @example
+ * import type { Message, Interaction } from "discord.js";
+ *
+ * function handle(input: Message | Interaction | unknown) {
+ *   if (isMessage(input)) {
+ *     console.log("This is a message with ID:", input.id);
+ *   }
+ * }
+ */
+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, 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 };

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, ActionRowBuilder, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, Role, WebhookClientOptions, WebhookClient, WebhookClientData, ComponentEmojiResolvable, ButtonBuilder, LinkButtonComponentData, Attachment, AttachmentBuilder, MessageActionRowComponentBuilder, TextDisplayBuilder, SeparatorBuilder, FileBuilder, SectionBuilder, MediaGalleryBuilder, ContainerBuilder, ContainerComponentBuilder as ContainerComponentBuilder$1, ColorResolvable, ComponentType, ContainerComponentData, ContainerComponent, APIUnfurledMediaItem, MediaGalleryItemData, AnyComponentBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, EmbedAssetData, User, ClientUser, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, MediaGalleryItemBuilder, 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, 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';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -144,22 +144,6 @@ declare function fetchMessageFromURL(client: Client | Client, url: string): Prom
 
 declare function setMobileStatus(): void;
 
-type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "style"> {
-    style?: TextInputStyle;
-}
-declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
-declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
-type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
-interface CreateModalData {
-    title?: string;
-    customId: string;
-    components: ModalFieldsData;
-}
-declare function createModal(data: CreateModalData): ModalBuilder;
-
 /**
  *
  * @param mention Discord mentionable string
@@ -429,6 +413,65 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  */
 declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
+type CreateInputData = Partial<Omit<TextInputComponentData, "type" | "label">>;
+declare function createTextInput(data: CreateInputData): TextInputBuilder;
+/**
+ * @deprecated Use {@link createTextInput} instead.
+ */
+declare function createModalInput(data: Omit<TextInputComponentData, "type" | "style"> & {
+    style?: TextInputStyle;
+}): ActionRowBuilder<TextInputBuilder>;
+
+type CreateLabelData = Omit<LabelBuilderData, "type">;
+type ComponentInLabelBuilder = NonNullable<CreateLabelData["component"]>;
+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;
+
+type ModalComponents = LabelBuilder | TextDisplayBuilder | string | null | boolean | undefined;
+type ResolveModalData = {
+    fields: {
+        fields: Collection<string, ModalData>;
+    };
+} | {
+    fields: Collection<string, ModalData>;
+} | Collection<string, ModalData>;
+type ModalFieldsRecord = Record<string, string | string[]>;
+/**
+ * Converts modal submitted fields into a plain record object, mapping each component `customId` to its value.
+ *
+ * This function supports multiple modal submission data shapes coming from Discord.js,
+ * automatically extracting and normalizing values from:
+ * - Text input fields (`ComponentType.TextInput`) → string
+ * - Select menus & other multi-value components → string[]
+ * - File upload fields (`ComponentType.FileUpload`) → string[] of attachment URLs
+ *
+ * Optionally, a parser callback may be provided to transform the resulting record before returning it.
+ *
+ * @template T The expected return type after optional parsing.
+ * @param {ResolveModalData} data - The modal submission data, usually from an interaction.
+ * @param {(record: ModalFieldsRecord) => T} [parse] - Optional transform function applied to the resulting record.
+ * @returns {ModalFieldsRecord | T} The processed fields as a record, or the parser result if provided.
+ *
+ * @example
+ * ```ts
+ * const fields = modalFieldsToRecord(interaction.fields);
+ * console.log(fields.username); // "JohnDoe"
+ * ```
+ *
+ * @example With parsing
+ * ```ts
+ * const result = modalFieldsToRecord(interaction.fields, fields => ({
+ *   name: fields.username.trim(),
+ *   age: Number.parseInt(fields.age),
+ * }));
+ * ```
+ */
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData): T;
+declare function modalFieldsToRecord<const T = ModalFieldsRecord>(data: ResolveModalData, parse: (record: ModalFieldsRecord) => T): T;
+type ModalFields = (LabelComponentData | TextDisplayComponentData)[];
+declare function createModalFields(...components: ModalComponents[]): ModalFields;
+
 /**
  * Creates an {@link ActionRowBuilder} containing one or more UI components.
  *
@@ -675,6 +718,16 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
+interface FileUploadData {
+    customId?: string;
+    minValues?: number;
+    maxValues?: number;
+    required?: boolean;
+    id?: number;
+}
+declare function createFileUpload(data: FileUploadData): FileUploadBuilder;
+declare function createFileUpload(customId: string): FileUploadBuilder;
+
 type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
@@ -841,26 +894,6 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
  */
 declare function isAttachment(value: unknown): value is Attachment | AttachmentBuilder;
 
-/**
- * Checks whether the given value is a {@link Message}.
- *
- * This function returns `true` if the value is an instance of `Message`
- * or if it structurally resembles a `Message` object.
- *
- * @param value - The value to check.
- * @returns `true` if the value is a `Message`, otherwise `false`.
- *
- * @example
- * import type { Message, Interaction } from "discord.js";
- *
- * function handle(input: Message | Interaction | unknown) {
- *   if (isMessage(input)) {
- *     console.log("This is a message with ID:", input.id);
- *   }
- * }
- */
-declare function isMessage(value: unknown): value is Message;
-
 /**
  * Checks whether the given value is a {@link ButtonBuilder}.
  *
@@ -1082,5 +1115,25 @@ declare function isTextDisplayBuilder(value: unknown): value is TextDisplayBuild
  */
 declare function isTextInputBuilder(value: unknown): value is TextInputBuilder;
 
-export { ContainerPlusBuilder, CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isActionRowBuilder, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, isChannelSelectMenuBuilder, isContainerBuilder, 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, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MagicComponentData, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+/**
+ * Checks whether the given value is a {@link Message}.
+ *
+ * This function returns `true` if the value is an instance of `Message`
+ * or if it structurally resembles a `Message` object.
+ *
+ * @param value - The value to check.
+ * @returns `true` if the value is a `Message`, otherwise `false`.
+ *
+ * @example
+ * import type { Message, Interaction } from "discord.js";
+ *
+ * function handle(input: Message | Interaction | unknown) {
+ *   if (isMessage(input)) {
+ *     console.log("This is a message with ID:", input.id);
+ *   }
+ * }
+ */
+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, 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 };

package/dist/index.mjs

@@ -8,7 +8,6 @@ export { findEmoji } from './functions/emojis.mjs';
 export { findMember } from './functions/members.mjs';
 export { fetchMessageFromURL, findMessage, getMessageURLInfo } from './functions/message.mjs';
 export { setMobileStatus } from './functions/misc.mjs';
-export { createModal, createModalFields, createModalInput, modalFieldsToRecord } from './functions/modals.mjs';
 export { extractMentionId } from './functions/regex.mjs';
 export { findRole } from './functions/roles.mjs';
 export { createWebhookClient } from './functions/webhooks.mjs';
@@ -17,19 +16,22 @@ export { createComponents } from './functions/components/components.mjs';
 export { ContainerPlusBuilder, createContainer } from './functions/components/container.mjs';
 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 { createRow } from './functions/components/row.mjs';
 export { createSection } from './functions/components/section.mjs';
 export { createSeparator } from './functions/components/separator.mjs';
 export { createTextDisplay } from './functions/components/text.mjs';
 export { createThumbArea } from './functions/components/thumbarea.mjs';
 export { createThumbnail } from './functions/components/thumbnail.mjs';
+export { createFileUpload } from './functions/components/upload.mjs';
 export { createEmbedAsset } from './functions/embeds/assets.mjs';
 export { createEmbedAuthor } from './functions/embeds/author.mjs';
 export { EmbedPlusBuilder, createEmbed } from './functions/embeds/embedplus.mjs';
 export { createEmbedFiles } from './functions/embeds/files.mjs';
 export { createEmbedFooter } from './functions/embeds/footer.mjs';
 export { isAttachment } from './guards/attachment.mjs';
-export { isMessage } from './guards/message.mjs';
 export { isButtonBuilder } from './guards/components/button.mjs';
 export { isContainerBuilder } from './guards/components/container.mjs';
 export { isMediaGalleryBuilder, isMediaGalleryItemBuilder } from './guards/components/gallery.mjs';
@@ -40,4 +42,5 @@ export { isAnySelectMenuBuilder, isChannelSelectMenuBuilder, isMentionableSelect
 export { isSeparatorBuilder } from './guards/components/separator.mjs';
 export { isTextDisplayBuilder } from './guards/components/textdisplay.mjs';
 export { isTextInputBuilder } from './guards/components/textinput.mjs';
+export { isMessage } from './guards/message.mjs';
 export * from '@magicyan/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.5.4",
+  "version": "1.6.1",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "discord.js": "^14.22.1"
+    "discord.js": "^14.24.0"
   },
   "devDependencies": {
     "@magicyan/config": "*",
@@ -49,6 +49,7 @@
     "vitest": "^2.1.9"
   },
   "dependencies": {
-    "@magicyan/core": "^1.1.5"
+    "@magicyan/core": "^1.1.5",
+    "zod": "^4.1.12"
   }
 }

package/dist/functions/modals.cjs

@@ -1,33 +0,0 @@
-'use strict';
-
-const discord_js = require('discord.js');
-const row = require('./components/row.cjs');
-
-function createModalInput(data) {
-  data.style ?? (data.style = discord_js.TextInputStyle.Short);
-  return row.createRow(new discord_js.TextInputBuilder(data));
-}
-function createModalFields(data) {
-  return Object.entries(data).map(
-    ([customId, data2]) => createModalInput({ customId, ...data2 })
-  );
-}
-function modalFieldsToRecord(fields) {
-  const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
-  return modalFields.reduce((acc, { customId, value }) => {
-    acc[customId] = value;
-    return acc;
-  }, {});
-}
-function createModal(data) {
-  return new discord_js.ModalBuilder({
-    title: data.title ?? data.customId,
-    customId: data.customId,
-    components: createModalFields(data.components)
-  });
-}
-
-exports.createModal = createModal;
-exports.createModalFields = createModalFields;
-exports.createModalInput = createModalInput;
-exports.modalFieldsToRecord = modalFieldsToRecord;

package/dist/functions/modals.mjs

@@ -1,28 +0,0 @@
-import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction, ModalBuilder } from 'discord.js';
-import { createRow } from './components/row.mjs';
-
-function createModalInput(data) {
-  data.style ?? (data.style = TextInputStyle.Short);
-  return createRow(new TextInputBuilder(data));
-}
-function createModalFields(data) {
-  return Object.entries(data).map(
-    ([customId, data2]) => createModalInput({ customId, ...data2 })
-  );
-}
-function modalFieldsToRecord(fields) {
-  const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
-  return modalFields.reduce((acc, { customId, value }) => {
-    acc[customId] = value;
-    return acc;
-  }, {});
-}
-function createModal(data) {
-  return new ModalBuilder({
-    title: data.title ?? data.customId,
-    customId: data.customId,
-    components: createModalFields(data.components)
-  });
-}
-
-export { createModal, createModalFields, createModalInput, modalFieldsToRecord };