seyfert 1.4.0 → 2.0.0

package/lib/components/componentcontext.d.ts

@@ -1,7 +1,8 @@
-import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, ComponentCommand, Guild, GuildMember, MentionableSelectMenuInteraction, Message, ReturnCache, RoleSelectMenuInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction, WebhookMessage } from '..';
+import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, ComponentCommand, MentionableSelectMenuInteraction, ReturnCache, RoleSelectMenuInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction } from '..';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
 import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import type { GuildMemberStructure, GuildStructure, MessageStructure, WebhookMessageStructure } from '../client/transformers';
 export interface ComponentContext<Type extends keyof ContextComponentCommandInteractionMap = keyof ContextComponentCommandInteractionMap> extends BaseContext, ExtendContext {
 }
 /**
@@ -17,14 +18,14 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @param interaction - The component interaction object.
      */
     constructor(client: UsingClient, interaction: ContextComponentCommandInteractionMap[Type]);
-    command?: ComponentCommand;
+    command: ComponentCommand;
     metadata: CommandMetadata<UnionToTuple<M>>;
     globalMetadata: GlobalMetadata;
     /**
      * Gets the language object for the interaction's locale.
      */
     get t(): import("..").__InternalParseLocale<import("..").DefaultLocale> & {
-        get(locale?: string | undefined): import("..").DefaultLocale;
+        get(locale?: string): import("..").DefaultLocale;
     };
     /**
      * Gets the custom ID of the interaction.
@@ -35,7 +36,7 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @param body - The body of the response.
      * @param fetchReply - Whether to fetch the reply or not.
      */
-    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage, void>>;
+    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, import("..").WebhookMessage, void>>;
     /**
      * Defers the reply to the interaction.
      * @param ephemeral - Whether the reply should be ephemeral or not.
@@ -45,7 +46,7 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * Edits the response of the interaction.
      * @param body - The updated body of the response.
      */
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("..").WebhookMessage>;
     /**
      * Updates the interaction with new data.
      * @param body - The updated body of the interaction.
@@ -56,7 +57,7 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @param body - The body of the response or updated body of the interaction.
      * @param fetchReply - Whether to fetch the reply or not.
      */
-    editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
+    editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessageStructure | MessageStructure, void | WebhookMessageStructure | MessageStructure>>;
     /**
      * Deletes the response of the interaction.
      * @returns A promise that resolves when the response is deleted.
@@ -75,15 +76,15 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @param mode - The mode to fetch the member.
      * @returns A promise that resolves to the bot member.
      */
-    me(mode?: 'rest' | 'flow'): Promise<GuildMember>;
-    me(mode?: 'cache'): ReturnCache<GuildMember | undefined>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     /**
      * Gets the guild of the interaction.
      * @param mode - The mode to fetch the guild.
      * @returns A promise that resolves to the guild.
      */
-    guild(mode?: 'rest' | 'flow'): Promise<Guild<'cached' | 'api'> | undefined>;
-    guild(mode?: 'cache'): ReturnCache<Guild<'cached'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     /**
      * Gets the ID of the guild of the interaction.
      */

package/lib/components/componentcontext.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentContext = void 0;
-const v10_1 = require("discord-api-types/v10");
+const types_1 = require("../types");
 const basecontext_1 = require("../commands/basecontext");
 /**
  * Represents a context for interacting with components in a Discord bot.
@@ -48,7 +48,7 @@ class ComponentContext extends basecontext_1.BaseContext {
      * @param ephemeral - Whether the reply should be ephemeral or not.
      */
     deferReply(ephemeral = false) {
-        return this.interaction.deferReply(ephemeral ? v10_1.MessageFlags.Ephemeral : undefined);
+        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined);
     }
     /**
      * Edits the response of the interaction.
@@ -135,22 +135,22 @@ class ComponentContext extends basecontext_1.BaseContext {
         return true;
     }
     isButton() {
-        return this.interaction.data.componentType === v10_1.ComponentType.Button;
+        return this.interaction.data.componentType === types_1.ComponentType.Button;
     }
     isChannelSelectMenu() {
-        return this.interaction.componentType === v10_1.ComponentType.ChannelSelect;
+        return this.interaction.componentType === types_1.ComponentType.ChannelSelect;
     }
     isRoleSelectMenu() {
-        return this.interaction.componentType === v10_1.ComponentType.RoleSelect;
+        return this.interaction.componentType === types_1.ComponentType.RoleSelect;
     }
     isMentionableSelectMenu() {
-        return this.interaction.componentType === v10_1.ComponentType.MentionableSelect;
+        return this.interaction.componentType === types_1.ComponentType.MentionableSelect;
     }
     isUserSelectMenu() {
-        return this.interaction.componentType === v10_1.ComponentType.UserSelect;
+        return this.interaction.componentType === types_1.ComponentType.UserSelect;
     }
     isStringSelectMenu() {
-        return this.interaction.componentType === v10_1.ComponentType.StringSelect;
+        return this.interaction.componentType === types_1.ComponentType.StringSelect;
     }
 }
 exports.ComponentContext = ComponentContext;

package/lib/components/handler.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="node" />
 import type { ComponentCallback, ListenerOptions, ModalSubmitCallback } from '../builders/types';
 import { LimitedCollection } from '../collection';
 import { type UsingClient } from '../commands';
+import type { FileLoaded } from '../commands/handler';
 import { BaseHandler, type Logger, type OnFailCallback } from '../common';
 import type { ComponentInteraction, ModalSubmitInteraction, StringSelectMenuInteraction } from '../structures';
 import { ComponentCommand } from './componentcommand';
@@ -19,16 +19,18 @@ type COMPONENTS = {
     timeout?: NodeJS.Timeout;
     __run: (customId: string | string[] | RegExp, callback: ComponentCallback) => any;
 };
+export type CollectorInteraction = ComponentInteraction | StringSelectMenuInteraction;
+export type ComponentCommands = ComponentCommand | ModalCommand;
 export declare class ComponentHandler extends BaseHandler {
     protected client: UsingClient;
     onFail: OnFailCallback;
     readonly values: Map<string, COMPONENTS>;
     readonly modals: LimitedCollection<string, ModalSubmitCallback>;
-    readonly commands: (ComponentCommand | ModalCommand)[];
+    readonly commands: ComponentCommands[];
     protected filter: (path: string) => boolean;
     constructor(logger: Logger, client: UsingClient);
     createComponentCollector(messageId: string, options?: ListenerOptions): {
-        run<T extends ComponentInteraction | StringSelectMenuInteraction = ComponentInteraction | StringSelectMenuInteraction>(customId: string | string[] | RegExp, callback: ComponentCallback<T>): any;
+        run<T extends CollectorInteraction = CollectorInteraction>(customId: string | string[] | RegExp, callback: ComponentCallback<T>): any;
         stop(reason?: string): any;
     };
     onComponent(id: string, interaction: ComponentInteraction): Promise<void>;
@@ -38,18 +40,17 @@ export declare class ComponentHandler extends BaseHandler {
     onModalSubmit(interaction: ModalSubmitInteraction): any;
     deleteValue(id: string, reason?: string): void;
     onMessageDelete(id: string): void;
-    load(componentsDir: string, instances?: {
-        new (): ModalCommand | ComponentCommand;
-    }[]): Promise<void>;
+    stablishDefaults(component: ComponentCommands): void;
+    set(instances: (new () => ComponentCommands)[]): void;
+    load(componentsDir: string): Promise<void>;
     reload(path: string): Promise<any>;
-    reloadAll(): Promise<void>;
-    executeComponent(context: ComponentContext): Promise<any>;
-    executeModal(context: ModalContext): Promise<any>;
-    setHandlers({ callback }: {
-        callback: ComponentHandler['callback'];
-    }): void;
-    callback: (file: {
-        new (): ModalCommand | ComponentCommand;
-    }) => ModalCommand | ComponentCommand | false;
+    reloadAll(stopIfFail?: boolean): Promise<void>;
+    execute(i: ComponentCommands, context: ComponentContext | ModalContext): Promise<any>;
+    executeComponent(context: ComponentContext): Promise<void>;
+    executeModal(context: ModalContext): Promise<void>;
+    onFile(file: FileLoaded<new () => ComponentCommands>): (new () => ComponentCommands)[] | undefined;
+    callback(file: {
+        new (): ComponentCommands;
+    }): ComponentCommands | false;
 }
 export {};

package/lib/components/handler.js

@@ -22,7 +22,7 @@ class ComponentHandler extends common_1.BaseHandler {
         this.values.set(messageId, {
             components: [],
             options,
-            idle: options.idle
+            idle: options.idle && options.idle > 0
                 ? setTimeout(() => {
                     this.deleteValue(messageId);
                     options.onStop?.('idle', () => {
@@ -30,7 +30,7 @@ class ComponentHandler extends common_1.BaseHandler {
                     });
                 }, options.idle)
                 : undefined,
-            timeout: options.timeout
+            timeout: options.timeout && options.timeout > 0
                 ? setTimeout(() => {
                     this.deleteValue(messageId);
                     options.onStop?.('timeout', () => {
@@ -117,55 +117,72 @@ class ComponentHandler extends common_1.BaseHandler {
     onMessageDelete(id) {
         this.deleteValue(id, 'messageDelete');
     }
-    async load(componentsDir, instances) {
-        const paths = instances?.map(x => {
-            const i = new x();
-            return { file: x, path: i.__filePath ?? '*' };
-        }) ?? (await this.loadFilesK(await this.getFiles(componentsDir)));
-        for (let i = 0; i < paths.length; i++) {
+    stablishDefaults(component) {
+        component.props ??= this.client.options.commands?.defaults?.props ?? {};
+        const is = component instanceof modalcommand_1.ModalCommand ? 'modals' : 'components';
+        component.onInternalError ??= this.client.options?.[is]?.defaults?.onInternalError;
+        component.onMiddlewaresError ??= this.client.options?.[is]?.defaults?.onMiddlewaresError;
+        component.onRunError ??= this.client.options?.[is]?.defaults?.onRunError;
+        component.onAfterRun ??= this.client.options?.[is]?.defaults?.onAfterRun;
+    }
+    set(instances) {
+        for (const i of instances) {
             let component;
             try {
-                component = this.callback(paths[i].file);
+                component = this.callback(i);
                 if (!component)
                     continue;
             }
             catch (e) {
-                if (e instanceof Error && e.message.includes('is not a constructor')) {
-                    this.logger.warn(`${paths[i].path
-                        .split(process.cwd())
-                        .slice(1)
-                        .join(process.cwd())} doesn't export the class by \`export default <ComponentCommand>\``);
-                }
-                else
-                    this.logger.warn(e, paths[i]);
+                this.logger.warn(e, i);
                 continue;
             }
-            if (!(component instanceof modalcommand_1.ModalCommand) && !(component instanceof componentcommand_1.ComponentCommand))
+            this.stablishDefaults(component);
+            this.commands.push(component);
+        }
+    }
+    async load(componentsDir) {
+        const paths = await this.loadFilesK(await this.getFiles(componentsDir));
+        for (const { components, file } of paths.map(x => ({ components: this.onFile(x.file), file: x }))) {
+            if (!components)
                 continue;
-            if (component instanceof modalcommand_1.ModalCommand) {
-                component.onInternalError ??= this.client.options?.modals?.defaults?.onInternalError;
-                component.onMiddlewaresError ??= this.client.options?.modals?.defaults?.onMiddlewaresError;
-                component.onRunError ??= this.client.options?.modals?.defaults?.onRunError;
-                component.onAfterRun ??= this.client.options?.modals?.defaults?.onAfterRun;
-            }
-            else {
-                component.onInternalError ??= this.client.options?.components?.defaults?.onInternalError;
-                component.onMiddlewaresError ??= this.client.options?.components?.defaults?.onMiddlewaresError;
-                component.onRunError ??= this.client.options?.components?.defaults?.onRunError;
-                component.onAfterRun ??= this.client.options?.components?.defaults?.onAfterRun;
+            for (const value of components) {
+                let component;
+                try {
+                    component = this.callback(value);
+                    if (!component)
+                        continue;
+                }
+                catch (e) {
+                    if (e instanceof Error && e.message.includes('is not a constructor')) {
+                        this.logger.warn(`${file.path
+                            .split(process.cwd())
+                            .slice(1)
+                            .join(process.cwd())} doesn't export the class by \`export default <ComponentCommand>\``);
+                    }
+                    else
+                        this.logger.warn(e, value);
+                    continue;
+                }
+                if (!(component instanceof modalcommand_1.ModalCommand || component instanceof componentcommand_1.ComponentCommand))
+                    continue;
+                this.stablishDefaults(component);
+                component.__filePath = file.path;
+                this.commands.push(component);
             }
-            component.__filePath = paths[i].path;
-            this.commands.push(component);
         }
     }
     async reload(path) {
         if (!this.client.components)
             return;
+        if ((0, common_1.isCloudfareWorker)()) {
+            throw new Error('Reload in cloudfare worker is not supported');
+        }
         const component = this.client.components.commands.find(x => x.__filePath?.endsWith(`${path}.js`) ||
             x.__filePath?.endsWith(`${path}.ts`) ||
             x.__filePath?.endsWith(path) ||
             x.__filePath === path);
-        if (!component || !component.__filePath)
+        if (!component?.__filePath)
             return null;
         delete require.cache[component.__filePath];
         const index = this.client.components.commands.findIndex(x => x.__filePath === component.__filePath);
@@ -178,13 +195,51 @@ class ComponentHandler extends common_1.BaseHandler {
         this.client.components.commands.push(command);
         return imported;
     }
-    async reloadAll() {
-        if (!this.client.components)
-            return;
-        for (const i of this.client.components.commands) {
-            if (!i.__filePath)
-                return this.logger.warn('Unknown command dont have __filePath property', i);
-            await this.reload(i.__filePath);
+    async reloadAll(stopIfFail = true) {
+        for (const i of this.commands) {
+            try {
+                await this.reload(i.__filePath ?? '');
+            }
+            catch (e) {
+                if (stopIfFail) {
+                    throw e;
+                }
+            }
+        }
+    }
+    async execute(i, context) {
+        try {
+            const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (context.client.options?.globalMiddlewares ?? []), true);
+            if (resultRunGlobalMiddlewares.pass) {
+                return;
+            }
+            if ('error' in resultRunGlobalMiddlewares) {
+                return i.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
+            }
+            const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, i.middlewares, false);
+            if (resultRunMiddlewares.pass) {
+                return;
+            }
+            if ('error' in resultRunMiddlewares) {
+                return i.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
+            }
+            try {
+                await i.run(context);
+                await i.onAfterRun?.(context, undefined);
+            }
+            catch (error) {
+                await i.onRunError?.(context, error);
+                await i.onAfterRun?.(context, error);
+            }
+        }
+        catch (error) {
+            try {
+                await i.onInternalError?.(this.client, error);
+            }
+            catch (e) {
+                // supress error
+                this.logger.error(e);
+            }
         }
     }
     async executeComponent(context) {
@@ -194,39 +249,7 @@ class ComponentHandler extends common_1.BaseHandler {
                     i.cType === context.interaction.componentType &&
                     (await i.filter(context))) {
                     context.command = i;
-                    try {
-                        const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (context.client.options?.globalMiddlewares ?? []), true);
-                        if (resultRunGlobalMiddlewares.pass) {
-                            return;
-                        }
-                        if ('error' in resultRunGlobalMiddlewares) {
-                            return i.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
-                        }
-                        const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, i.middlewares, false);
-                        if (resultRunMiddlewares.pass) {
-                            return;
-                        }
-                        if ('error' in resultRunMiddlewares) {
-                            return i.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
-                        }
-                        try {
-                            await i.run(context);
-                            await i.onAfterRun?.(context, undefined);
-                        }
-                        catch (error) {
-                            await i.onRunError?.(context, error);
-                            await i.onAfterRun?.(context, error);
-                        }
-                    }
-                    catch (error) {
-                        try {
-                            await i.onInternalError?.(this.client, error);
-                        }
-                        catch {
-                            // supress error
-                        }
-                    }
-                    break;
+                    await this.execute(i, context);
                 }
             }
             catch (e) {
@@ -239,39 +262,7 @@ class ComponentHandler extends common_1.BaseHandler {
             try {
                 if (i.type === componentcommand_1.InteractionCommandType.MODAL && (await i.filter(context))) {
                     context.command = i;
-                    try {
-                        const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (context.client.options?.globalMiddlewares ?? []), true);
-                        if (resultRunGlobalMiddlewares.pass) {
-                            return;
-                        }
-                        if ('error' in resultRunGlobalMiddlewares) {
-                            return i.onMiddlewaresError?.(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
-                        }
-                        const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, i.middlewares, false);
-                        if (resultRunMiddlewares.pass) {
-                            return;
-                        }
-                        if ('error' in resultRunMiddlewares) {
-                            return i.onMiddlewaresError?.(context, resultRunMiddlewares.error ?? 'Unknown error');
-                        }
-                        try {
-                            await i.run(context);
-                            await i.onAfterRun?.(context, undefined);
-                        }
-                        catch (error) {
-                            await i.onRunError?.(context, error);
-                            await i.onAfterRun?.(context, error);
-                        }
-                    }
-                    catch (error) {
-                        try {
-                            await i.onInternalError?.(this.client, error);
-                        }
-                        catch {
-                            // supress error
-                        }
-                    }
-                    break;
+                    await this.execute(i, context);
                 }
             }
             catch (e) {
@@ -279,9 +270,11 @@ class ComponentHandler extends common_1.BaseHandler {
             }
         }
     }
-    setHandlers({ callback }) {
-        this.callback = callback;
+    onFile(file) {
+        return file.default ? [file.default] : undefined;
+    }
+    callback(file) {
+        return new file();
     }
-    callback = (file) => new file();
 }
 exports.ComponentHandler = ComponentHandler;

package/lib/components/index.d.ts

@@ -1,13 +1,13 @@
-import { type APIMessageActionRowComponent } from 'discord-api-types/v10';
+import { type APIMessageActionRowComponent } from '../types';
 import { BaseComponent } from './BaseComponent';
-import { ButtonComponent, LinkButtonComponent } from './ButtonComponent';
+import { ButtonComponent, LinkButtonComponent, SKUButtonComponent } from './ButtonComponent';
 import { ChannelSelectMenuComponent } from './ChannelSelectMenuComponent';
 import { MentionableSelectMenuComponent } from './MentionableSelectMenuComponent';
 import { RoleSelectMenuComponent } from './RoleSelectMenuComponent';
 import { StringSelectMenuComponent } from './StringSelectMenuComponent';
 import type { TextInputComponent } from './TextInputComponent';
 import { UserSelectMenuComponent } from './UserSelectMenuComponent';
-export type MessageComponents = ButtonComponent | LinkButtonComponent | RoleSelectMenuComponent | UserSelectMenuComponent | StringSelectMenuComponent | ChannelSelectMenuComponent | MentionableSelectMenuComponent | TextInputComponent;
+export type MessageComponents = ButtonComponent | LinkButtonComponent | SKUButtonComponent | RoleSelectMenuComponent | UserSelectMenuComponent | StringSelectMenuComponent | ChannelSelectMenuComponent | MentionableSelectMenuComponent | TextInputComponent;
 export type ActionRowMessageComponents = Exclude<MessageComponents, TextInputComponent>;
 export * from './componentcommand';
 export * from './componentcontext';

package/lib/components/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentFactory = void 0;
-const v10_1 = require("discord-api-types/v10");
+exports.componentFactory = componentFactory;
+const types_1 = require("../types");
 const BaseComponent_1 = require("./BaseComponent");
 const ButtonComponent_1 = require("./ButtonComponent");
 const ChannelSelectMenuComponent_1 = require("./ChannelSelectMenuComponent");
@@ -35,23 +35,25 @@ __exportStar(require("./modalcontext"), exports);
  */
 function componentFactory(component) {
     switch (component.type) {
-        case v10_1.ComponentType.Button:
-            if (component.style === v10_1.ButtonStyle.Link) {
+        case types_1.ComponentType.Button:
+            if (component.style === types_1.ButtonStyle.Link) {
                 return new ButtonComponent_1.LinkButtonComponent(component);
             }
+            if (component.style === types_1.ButtonStyle.Premium) {
+                return new ButtonComponent_1.SKUButtonComponent(component);
+            }
             return new ButtonComponent_1.ButtonComponent(component);
-        case v10_1.ComponentType.ChannelSelect:
+        case types_1.ComponentType.ChannelSelect:
             return new ChannelSelectMenuComponent_1.ChannelSelectMenuComponent(component);
-        case v10_1.ComponentType.RoleSelect:
+        case types_1.ComponentType.RoleSelect:
             return new RoleSelectMenuComponent_1.RoleSelectMenuComponent(component);
-        case v10_1.ComponentType.StringSelect:
+        case types_1.ComponentType.StringSelect:
             return new StringSelectMenuComponent_1.StringSelectMenuComponent(component);
-        case v10_1.ComponentType.UserSelect:
+        case types_1.ComponentType.UserSelect:
             return new UserSelectMenuComponent_1.UserSelectMenuComponent(component);
-        case v10_1.ComponentType.MentionableSelect:
+        case types_1.ComponentType.MentionableSelect:
             return new MentionableSelectMenuComponent_1.MentionableSelectMenuComponent(component);
         default:
             return new BaseComponent_1.BaseComponent(component);
     }
 }
-exports.componentFactory = componentFactory;

package/lib/components/modalcommand.d.ts

@@ -1,4 +1,4 @@
-import type { RegisteredMiddlewares, UsingClient } from '../commands';
+import type { ExtraProps, RegisteredMiddlewares, UsingClient } from '../commands';
 import type { ModalContext } from './modalcontext';
 export interface ModalCommand {
     __filePath?: string;
@@ -8,6 +8,7 @@ export declare abstract class ModalCommand {
     abstract filter(context: ModalContext): Promise<boolean> | boolean;
     abstract run(context: ModalContext): any;
     middlewares: (keyof RegisteredMiddlewares)[];
+    props: ExtraProps;
     onAfterRun?(context: ModalContext, error: unknown | undefined): any;
     onRunError?(context: ModalContext, error: unknown): any;
     onMiddlewaresError?(context: ModalContext, error: string): any;

package/lib/components/modalcommand.js

@@ -5,5 +5,6 @@ const componentcommand_1 = require("./componentcommand");
 class ModalCommand {
     type = componentcommand_1.InteractionCommandType.MODAL;
     middlewares = [];
+    props;
 }
 exports.ModalCommand = ModalCommand;

package/lib/components/modalcontext.d.ts

@@ -1,7 +1,8 @@
-import type { AllChannels, Guild, GuildMember, Message, ModalCommand, ModalSubmitInteraction, ReturnCache, WebhookMessage } from '..';
+import type { AllChannels, ModalCommand, ModalSubmitInteraction, ReturnCache } from '..';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
 import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import type { GuildMemberStructure, GuildStructure, MessageStructure, WebhookMessageStructure } from '../client/transformers';
 export interface ModalContext extends BaseContext, ExtendContext {
 }
 /**
@@ -17,30 +18,30 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
      * @param interaction - The component interaction object.
      */
     constructor(client: UsingClient, interaction: ModalSubmitInteraction);
-    command?: ModalCommand;
+    command: ModalCommand;
     metadata: CommandMetadata<UnionToTuple<M>>;
     globalMetadata: GlobalMetadata;
     get customId(): string;
     get components(): {
         components: {
-            type: import("discord-api-types/v10").ComponentType;
+            type: import("../types").ComponentType;
             customId: string;
             value: string;
         }[];
-        type: import("discord-api-types/v10").ComponentType.ActionRow;
+        type: import("../types").ComponentType.ActionRow;
     }[];
     /**
      * Gets the language object for the interaction's locale.
      */
     get t(): import("..").__InternalParseLocale<import("..").DefaultLocale> & {
-        get(locale?: string | undefined): import("..").DefaultLocale;
+        get(locale?: string): import("..").DefaultLocale;
     };
     /**
      * Writes a response to the interaction.
      * @param body - The body of the response.
      * @param fetchReply - Whether to fetch the reply or not.
      */
-    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage, void>>;
+    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, import("..").WebhookMessage, void>>;
     /**
      * Defers the reply to the interaction.
      * @param ephemeral - Whether the reply should be ephemeral or not.
@@ -50,13 +51,13 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
      * Edits the response of the interaction.
      * @param body - The updated body of the response.
      */
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("..").WebhookMessage>;
     /**
      * Edits the response or replies to the interaction.
      * @param body - The body of the response or updated body of the interaction.
      * @param fetchReply - Whether to fetch the reply or not.
      */
-    editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
+    editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessageStructure | MessageStructure, void | WebhookMessageStructure | MessageStructure>>;
     /**
      * Deletes the response of the interaction.
      * @returns A promise that resolves when the response is deleted.
@@ -75,15 +76,15 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
      * @param mode - The mode to fetch the member.
      * @returns A promise that resolves to the bot member.
      */
-    me(mode?: 'rest' | 'flow'): Promise<GuildMember>;
-    me(mode?: 'cache'): ReturnCache<GuildMember | undefined>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMemberStructure>;
+    me(mode?: 'cache'): ReturnCache<GuildMemberStructure | undefined>;
     /**
      * Gets the guild of the interaction.
      * @param mode - The mode to fetch the guild.
      * @returns A promise that resolves to the guild.
      */
-    guild(mode?: 'rest' | 'flow'): Promise<Guild<'cached' | 'api'> | undefined>;
-    guild(mode?: 'cache'): ReturnCache<Guild<'cached'> | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'> | undefined>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     /**
      * Gets the ID of the guild of the interaction.
      */

package/lib/components/modalcontext.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModalContext = void 0;
-const v10_1 = require("discord-api-types/v10");
+const types_1 = require("../types");
 const basecontext_1 = require("../commands/basecontext");
 /**
  * Represents a context for interacting with components in a Discord bot.
@@ -48,7 +48,7 @@ class ModalContext extends basecontext_1.BaseContext {
      * @param ephemeral - Whether the reply should be ephemeral or not.
      */
     deferReply(ephemeral = false) {
-        return this.interaction.deferReply(ephemeral ? v10_1.MessageFlags.Ephemeral : undefined);
+        return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined);
     }
     /**
      * Edits the response of the interaction.