@magicyan/discord 1.4.2 → 1.4.4

package/dist/functions/components/components.cjs

@@ -1,11 +1,11 @@
 'use strict';
 
-const discord_js = require('discord.js');
-const selectmenu = require('../../guards/selectmenu.cjs');
 const attachment = require('../../guards/attachment.cjs');
+const button = require('../../guards/button.cjs');
+const selectmenu = require('../../guards/selectmenu.cjs');
 const gallery = require('./gallery.cjs');
-const text = require('./text.cjs');
 const row = require('./row.cjs');
+const text = require('./text.cjs');
 
 function createComponents(...data) {
   return data.filter((value) => value !== null && value !== void 0).map((component) => {
@@ -15,7 +15,10 @@ function createComponents(...data) {
     if (Array.isArray(component)) {
       return row.createRow(...component);
     }
-    if (selectmenu.isAnySelectMenuBuilder(component) || component instanceof discord_js.ButtonBuilder) {
+    if (selectmenu.isAnySelectMenuBuilder(component)) {
+      return row.createRow(component);
+    }
+    if (button.isButtonBuilder(component)) {
       return row.createRow(component);
     }
     if (attachment.isAttachment(component)) {

package/dist/functions/components/components.mjs

@@ -1,9 +1,9 @@
-import { ButtonBuilder } from 'discord.js';
-import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
 import { isAttachment } from '../../guards/attachment.mjs';
+import { isButtonBuilder } from '../../guards/button.mjs';
+import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
 import { createMediaGallery } from './gallery.mjs';
-import { createTextDisplay } from './text.mjs';
 import { createRow } from './row.mjs';
+import { createTextDisplay } from './text.mjs';
 
 function createComponents(...data) {
   return data.filter((value) => value !== null && value !== void 0).map((component) => {
@@ -13,7 +13,10 @@ function createComponents(...data) {
     if (Array.isArray(component)) {
       return createRow(...component);
     }
-    if (isAnySelectMenuBuilder(component) || component instanceof ButtonBuilder) {
+    if (isAnySelectMenuBuilder(component)) {
+      return createRow(component);
+    }
+    if (isButtonBuilder(component)) {
       return createRow(component);
     }
     if (isAttachment(component)) {

package/dist/functions/components/container.cjs

@@ -2,11 +2,11 @@
 
 const core = require('@magicyan/core');
 const discord_js = require('discord.js');
-const selectmenu = require('../../guards/selectmenu.cjs');
 const attachment = require('../../guards/attachment.cjs');
+const selectmenu = require('../../guards/selectmenu.cjs');
 const gallery = require('./gallery.cjs');
-const text = require('./text.cjs');
 const row = require('./row.cjs');
+const text = require('./text.cjs');
 
 function createContainer(data) {
   const container = new discord_js.ContainerBuilder();

package/dist/functions/components/container.mjs

@@ -1,10 +1,10 @@
 import { hexToRgb } from '@magicyan/core';
 import { ContainerBuilder, Colors, TextDisplayBuilder, ActionRowBuilder, ButtonBuilder, SectionBuilder, FileBuilder, MediaGalleryBuilder, SeparatorBuilder } from 'discord.js';
-import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
 import { isAttachment } from '../../guards/attachment.mjs';
+import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
 import { createMediaGallery } from './gallery.mjs';
-import { createTextDisplay } from './text.mjs';
 import { createRow } from './row.mjs';
+import { createTextDisplay } from './text.mjs';
 
 function createContainer(data) {
   const container = new ContainerBuilder();

package/dist/functions/components/section.cjs

@@ -6,17 +6,33 @@ const thumbnail = require('./thumbnail.cjs');
 
 function createSection(data) {
   const section = new discord_js.SectionBuilder();
-  if (data.button) {
-    section.setButtonAccessory(data.button);
-  }
-  if (data.thumbnail) {
-    section.setThumbnailAccessory(
-      thumbnail.createThumbnail(data.thumbnail)
+  function setAccessory(data2) {
+    if (data2 instanceof discord_js.ButtonBuilder) {
+      return section.setButtonAccessory(data2);
+    }
+    if (data2 instanceof discord_js.ThumbnailBuilder) {
+      return section.setThumbnailAccessory(data2);
+    }
+    if (typeof data2 === "string") {
+      return section.setThumbnailAccessory(
+        thumbnail.createThumbnail(data2)
+      );
+    }
+    if ("media" in data2 || "description" in data2) {
+      return section.setThumbnailAccessory(
+        thumbnail.createThumbnail(data2)
+      );
+    }
+    return section.setButtonAccessory(
+      new discord_js.ButtonBuilder(data2)
     );
   }
+  if (data.accessory || data.button || data.thumbnail) {
+    setAccessory(data.accessory ?? data.button ?? data.thumbnail);
+  }
   if (Array.isArray(data.content)) {
     section.addTextDisplayComponents(
-      data.content.map(text.createTextDisplay)
+      data.content.map((text$1) => text.createTextDisplay(text$1))
     );
   } else {
     section.addTextDisplayComponents(

package/dist/functions/components/section.mjs

@@ -1,20 +1,36 @@
-import { SectionBuilder } from 'discord.js';
+import { SectionBuilder, ButtonBuilder, ThumbnailBuilder } from 'discord.js';
 import { createTextDisplay } from './text.mjs';
 import { createThumbnail } from './thumbnail.mjs';
 
 function createSection(data) {
   const section = new SectionBuilder();
-  if (data.button) {
-    section.setButtonAccessory(data.button);
-  }
-  if (data.thumbnail) {
-    section.setThumbnailAccessory(
-      createThumbnail(data.thumbnail)
+  function setAccessory(data2) {
+    if (data2 instanceof ButtonBuilder) {
+      return section.setButtonAccessory(data2);
+    }
+    if (data2 instanceof ThumbnailBuilder) {
+      return section.setThumbnailAccessory(data2);
+    }
+    if (typeof data2 === "string") {
+      return section.setThumbnailAccessory(
+        createThumbnail(data2)
+      );
+    }
+    if ("media" in data2 || "description" in data2) {
+      return section.setThumbnailAccessory(
+        createThumbnail(data2)
+      );
+    }
+    return section.setButtonAccessory(
+      new ButtonBuilder(data2)
     );
   }
+  if (data.accessory || data.button || data.thumbnail) {
+    setAccessory(data.accessory ?? data.button ?? data.thumbnail);
+  }
   if (Array.isArray(data.content)) {
     section.addTextDisplayComponents(
-      data.content.map(createTextDisplay)
+      data.content.map((text) => createTextDisplay(text))
     );
   } else {
     section.addTextDisplayComponents(

package/dist/guards/button.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const discord_js = require('discord.js');
+
+function isButtonBuilder(value) {
+  return value instanceof discord_js.ButtonBuilder;
+}
+
+exports.isButtonBuilder = isButtonBuilder;

package/dist/guards/button.mjs

@@ -0,0 +1,7 @@
+import { ButtonBuilder } from 'discord.js';
+
+function isButtonBuilder(value) {
+  return value instanceof ButtonBuilder;
+}
+
+export { isButtonBuilder };

package/dist/index.cjs

@@ -30,6 +30,7 @@ const regex = require('./functions/regex.cjs');
 const webhooks = require('./functions/webhooks.cjs');
 const attachment = require('./guards/attachment.cjs');
 const selectmenu = require('./guards/selectmenu.cjs');
+const button = require('./guards/button.cjs');
 const core = require('@magicyan/core');
 
 
@@ -71,6 +72,7 @@ exports.extractMentionId = regex.extractMentionId;
 exports.createWebhookClient = webhooks.createWebhookClient;
 exports.isAttachment = attachment.isAttachment;
 exports.isAnySelectMenuBuilder = selectmenu.isAnySelectMenuBuilder;
+exports.isButtonBuilder = button.isButtonBuilder;
 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,6 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, ContainerComponentData, RGBTuple, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
-import * as _discordjs_builders from '/home/rinckodev/projects/npm/magicyan/node_modules/@discordjs/builders/dist/index.d.ts';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, RGBTuple, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -323,14 +322,23 @@ type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment
  */
 declare function createThumbnail(data: ThumbnailData): ThumbnailBuilder;
 
-type SectionAcessoryData = {
+type SectionThumbnailAccessory = ThumbnailBuilder | ThumbnailData;
+type SectionButtonAccessory = ButtonBuilder | Partial<ButtonComponentData>;
+type SectionAccessory = SectionThumbnailAccessory | SectionButtonAccessory;
+type SectionAccessoryData = {
+    accessory: SectionAccessory;
     button?: never;
-    thumbnail: ThumbnailData;
+    thumbnail?: never;
 } | {
-    button: ButtonBuilder;
+    button: SectionButtonAccessory;
     thumbnail?: never;
+    accessory?: never;
+} | {
+    thumbnail: SectionThumbnailAccessory;
+    button?: never;
+    accessory?: never;
 };
-type SectionData = SectionAcessoryData & {
+type SectionData = SectionAccessoryData & {
     content: string | string[];
 };
 /**
@@ -397,12 +405,13 @@ declare function createSection(data: SectionData): SectionBuilder;
  */
 declare function createTextDisplay(content: string, id?: number): TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | AttachmentBuilder | AttachmentBuilder | string | null | undefined;
-declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (_discordjs_builders.ButtonBuilder | TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined;
+declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
 type PresetColor = keyof typeof Colors;
+type ContainerColor = (string & {}) | number | null | RGBTuple | PresetColor;
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
-    accentColor?: (string & {}) | number | null | RGBTuple | PresetColor;
+    accentColor?: ContainerColor;
     components: ComponentData[];
 }
 /**
@@ -596,5 +605,7 @@ declare function isAttachment(value: unknown): value is Attachment | AttachmentB
 type AnySelectMenuBuilder = StringSelectMenuBuilder | UserSelectMenuBuilder | RoleSelectMenuBuilder | ChannelSelectMenuBuilder | MentionableSelectMenuBuilder;
 declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, modalFieldsToRecord, setMobileStatus };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAcessoryData, SectionData, SeparatorData, ThumbnailData };
+declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
+
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbnailData };

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, ContainerComponentData, RGBTuple, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
-import * as _discordjs_builders from '/home/rinckodev/projects/npm/magicyan/node_modules/@discordjs/builders/dist/index.d.ts';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, RGBTuple, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -323,14 +322,23 @@ type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment
  */
 declare function createThumbnail(data: ThumbnailData): ThumbnailBuilder;
 
-type SectionAcessoryData = {
+type SectionThumbnailAccessory = ThumbnailBuilder | ThumbnailData;
+type SectionButtonAccessory = ButtonBuilder | Partial<ButtonComponentData>;
+type SectionAccessory = SectionThumbnailAccessory | SectionButtonAccessory;
+type SectionAccessoryData = {
+    accessory: SectionAccessory;
     button?: never;
-    thumbnail: ThumbnailData;
+    thumbnail?: never;
 } | {
-    button: ButtonBuilder;
+    button: SectionButtonAccessory;
     thumbnail?: never;
+    accessory?: never;
+} | {
+    thumbnail: SectionThumbnailAccessory;
+    button?: never;
+    accessory?: never;
 };
-type SectionData = SectionAcessoryData & {
+type SectionData = SectionAccessoryData & {
     content: string | string[];
 };
 /**
@@ -397,12 +405,13 @@ declare function createSection(data: SectionData): SectionBuilder;
  */
 declare function createTextDisplay(content: string, id?: number): TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | AttachmentBuilder | AttachmentBuilder | string | null | undefined;
-declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (_discordjs_builders.ButtonBuilder | TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined;
+declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
 type PresetColor = keyof typeof Colors;
+type ContainerColor = (string & {}) | number | null | RGBTuple | PresetColor;
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
-    accentColor?: (string & {}) | number | null | RGBTuple | PresetColor;
+    accentColor?: ContainerColor;
     components: ComponentData[];
 }
 /**
@@ -596,5 +605,7 @@ declare function isAttachment(value: unknown): value is Attachment | AttachmentB
 type AnySelectMenuBuilder = StringSelectMenuBuilder | UserSelectMenuBuilder | RoleSelectMenuBuilder | ChannelSelectMenuBuilder | MentionableSelectMenuBuilder;
 declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, modalFieldsToRecord, setMobileStatus };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAcessoryData, SectionData, SeparatorData, ThumbnailData };
+declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
+
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbnailData };

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, ContainerComponentData, RGBTuple, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
-import * as _discordjs_builders from '/home/rinckodev/projects/npm/magicyan/node_modules/@discordjs/builders/dist/index.d.ts';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ButtonBuilder, LinkButtonComponentData, AnyComponentBuilder, ActionRowBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, Colors, RGBTuple, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -323,14 +322,23 @@ type ThumbnailData = Partial<Omit<ThumbnailComponentData, "type">> | Attachment
  */
 declare function createThumbnail(data: ThumbnailData): ThumbnailBuilder;
 
-type SectionAcessoryData = {
+type SectionThumbnailAccessory = ThumbnailBuilder | ThumbnailData;
+type SectionButtonAccessory = ButtonBuilder | Partial<ButtonComponentData>;
+type SectionAccessory = SectionThumbnailAccessory | SectionButtonAccessory;
+type SectionAccessoryData = {
+    accessory: SectionAccessory;
     button?: never;
-    thumbnail: ThumbnailData;
+    thumbnail?: never;
 } | {
-    button: ButtonBuilder;
+    button: SectionButtonAccessory;
     thumbnail?: never;
+    accessory?: never;
+} | {
+    thumbnail: SectionThumbnailAccessory;
+    button?: never;
+    accessory?: never;
 };
-type SectionData = SectionAcessoryData & {
+type SectionData = SectionAccessoryData & {
     content: string | string[];
 };
 /**
@@ -397,12 +405,13 @@ declare function createSection(data: SectionData): SectionBuilder;
  */
 declare function createTextDisplay(content: string, id?: number): TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | AttachmentBuilder | AttachmentBuilder | string | null | undefined;
-declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (_discordjs_builders.ButtonBuilder | TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined;
+declare function createComponents(...data: (ComponentData | ContainerBuilder)[]): (TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
 type PresetColor = keyof typeof Colors;
+type ContainerColor = (string & {}) | number | null | RGBTuple | PresetColor;
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
-    accentColor?: (string & {}) | number | null | RGBTuple | PresetColor;
+    accentColor?: ContainerColor;
     components: ComponentData[];
 }
 /**
@@ -596,5 +605,7 @@ declare function isAttachment(value: unknown): value is Attachment | AttachmentB
 type AnySelectMenuBuilder = StringSelectMenuBuilder | UserSelectMenuBuilder | RoleSelectMenuBuilder | ChannelSelectMenuBuilder | MentionableSelectMenuBuilder;
 declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, modalFieldsToRecord, setMobileStatus };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAcessoryData, SectionData, SeparatorData, ThumbnailData };
+declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
+
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, PresetColor, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbnailData };

package/dist/index.mjs

@@ -28,4 +28,5 @@ export { extractMentionId } from './functions/regex.mjs';
 export { createWebhookClient } from './functions/webhooks.mjs';
 export { isAttachment } from './guards/attachment.mjs';
 export { isAnySelectMenuBuilder } from './guards/selectmenu.mjs';
+export { isButtonBuilder } from './guards/button.mjs';
 export * from '@magicyan/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",