@hyperneutrino/djs-lite 1.6.0 → 1.6.1

package/index.ts

@@ -35,11 +35,36 @@ const identity = <T>(value: T): T => value;
 
 type Wrapper<T extends Function> = (fn: T) => T;
 
-type Handler<T extends CommandInteraction | AutocompleteInteraction | MessageComponentInteraction | ModalSubmitInteraction> = (
+type Handleable = CommandInteraction | AutocompleteInteraction | MessageComponentInteraction | ModalSubmitInteraction;
+
+type Handler<T extends Handleable> = (
     interaction: T,
     ...args: T extends MessageComponentInteraction | ModalSubmitInteraction ? (string | undefined)[] : []
 ) => Awaitable<unknown>;
 
+type WrapperConfig<R extends Record<string, Handleable>> = {
+    [K in keyof R]?: Wrapper<Handler<R[K]>>;
+};
+
+export interface CommandWrappers extends WrapperConfig<{
+    slashCommands: ChatInputCommandInteraction;
+    userCommands: UserContextMenuCommandInteraction;
+    messageCommands: MessageContextMenuCommandInteraction;
+    autocompletes: AutocompleteInteraction;
+}> {}
+
+export interface InteractionWrappers extends WrapperConfig<{
+    modal: ModalSubmitInteraction;
+    button: ButtonInteraction;
+    stringSelectMenu: StringSelectMenuInteraction;
+    userSelectMenu: UserSelectMenuInteraction;
+    roleSelectMenu: RoleSelectMenuInteraction;
+    mentionableSelectMenu: MentionableSelectMenuInteraction;
+    channelSelectMenu: ChannelSelectMenuInteraction;
+}> {}
+
+export interface Wrappers extends CommandWrappers, InteractionWrappers {}
+
 abstract class Command<T extends BaseApplicationCommandData, U extends CommandInteraction, Z extends boolean = false> {
     data: T;
     handler: Handler<U>;
@@ -190,19 +215,7 @@ async function loadSubcommandsAndGroups(directory: string): Promise<{
     };
 }
 
-export async function loadCommands(
-    client: Client<true>,
-    directory: string,
-    config?: {
-        guildId?: string;
-        wrappers?: {
-            slashCommands?: Wrapper<Handler<ChatInputCommandInteraction>>;
-            userCommands?: Wrapper<Handler<UserContextMenuCommandInteraction>>;
-            messageCommands?: Wrapper<Handler<MessageContextMenuCommandInteraction>>;
-            autocompletes?: Wrapper<Handler<AutocompleteInteraction>>;
-        };
-    },
-) {
+export async function loadCommands(client: Client<true>, directory: string, config?: { guildId?: string; wrappers?: CommandWrappers }) {
     const commandData: (ChatInputApplicationCommandData | UserApplicationCommandData | MessageApplicationCommandData)[] = [];
 
     const slashCommandHandlers = new Map<string, Handler<ChatInputCommandInteraction>>();
@@ -271,15 +284,7 @@ export async function loadInteractions(
     directory: string,
     config?: {
         argumentSeparator?: string;
-        wrappers?: {
-            modal?: Wrapper<Handler<ModalSubmitInteraction>>;
-            button?: Wrapper<Handler<ButtonInteraction>>;
-            stringSelectMenu?: Wrapper<Handler<StringSelectMenuInteraction>>;
-            userSelectMenu?: Wrapper<Handler<UserSelectMenuInteraction>>;
-            roleSelectMenu?: Wrapper<Handler<RoleSelectMenuInteraction>>;
-            mentionableSelectMenu?: Wrapper<Handler<MentionableSelectMenuInteraction>>;
-            channelSelectMenu?: Wrapper<Handler<ChannelSelectMenuInteraction>>;
-        };
+        wrappers?: InteractionWrappers;
     },
 ) {
     const modalHandlers = new Map<string, Handler<ModalSubmitInteraction>>();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@hyperneutrino/djs-lite",
     "private": false,
-    "version": "1.6.0",
+    "version": "1.6.1",
     "module": "index.ts",
     "type": "module",
     "devDependencies": {