@hyperneutrino/djs-lite 1.3.0 → 1.4.0

package/index.ts

@@ -1,4 +1,5 @@
 import {
+    ApplicationCommandOptionType,
     ApplicationCommandType,
     AutocompleteInteraction,
     ButtonInteraction,
@@ -56,12 +57,12 @@ abstract class Command<T extends BaseApplicationCommandData, U extends CommandIn
     }
 }
 
-export class SlashCommand extends Command<ChatInputApplicationCommandData & { type: ApplicationCommandType.ChatInput }, ChatInputCommandInteraction, true> {}
-export class UserCommand extends Command<UserApplicationCommandData, UserContextMenuCommandInteraction> {}
-export class MessageCommand extends Command<MessageApplicationCommandData, MessageContextMenuCommandInteraction> {}
+export class SlashCommand extends Command<Omit<ChatInputApplicationCommandData, "type">, ChatInputCommandInteraction, true> {}
+export class UserCommand extends Command<Omit<UserApplicationCommandData, "type">, UserContextMenuCommandInteraction> {}
+export class MessageCommand extends Command<Omit<MessageApplicationCommandData, "type">, MessageContextMenuCommandInteraction> {}
 
 export class SlashCommandWithSubcommands {
-    data: Omit<ChatInputApplicationCommandData, "options"> & { type: ApplicationCommandType.ChatInput };
+    data: Omit<ChatInputApplicationCommandData, "options" | "type">;
 
     constructor(data: typeof this.data) {
         this.data = data;
@@ -69,7 +70,7 @@ export class SlashCommandWithSubcommands {
 }
 
 export class SubcommandGroup {
-    data: Omit<ApplicationCommandSubGroupData, "options">;
+    data: Omit<ApplicationCommandSubGroupData, "options" | "type">;
 
     constructor(data: typeof this.data) {
         this.data = data;
@@ -77,7 +78,7 @@ export class SubcommandGroup {
 }
 
 export class Subcommand {
-    data: ApplicationCommandSubCommandData;
+    data: Omit<ApplicationCommandSubCommandData, "type">;
     handler: Handler<ChatInputCommandInteraction>;
 
     constructor({ handler, ...data }: typeof this.data & { handler: Subcommand["handler"] }) {
@@ -143,7 +144,7 @@ export async function loadSubcommands(directory: string): Promise<{
 
     await importAll({ directory, recursive: false }, async ({ file, relativePath, item }) => {
         if (item instanceof Subcommand) {
-            options.push(item.data);
+            options.push({ ...item.data, type: ApplicationCommandOptionType.Subcommand });
             handlers.set(item.data.name, item.handler);
         } else throw new Error(`Loading commands failed: export from ${relativePath} (third-level in commands folder) was not an instance of Subcommand.`);
 
@@ -165,11 +166,11 @@ export async function loadSubcommandsAndGroups(directory: string): Promise<{
 
     await importAll({ directory, recursive: false }, async ({ file, relativePath, item }) => {
         if (item instanceof Subcommand) {
-            options.push(item.data);
+            options.push({ ...item.data, type: ApplicationCommandOptionType.Subcommand });
             handlers.set(`/${item.data.name}`, item.handler);
         } else if (item instanceof SubcommandGroup) {
             const subcommands = await loadSubcommands(relativePath.replace(/\.[^/.]+$/, ""));
-            options.push({ ...item.data, options: subcommands.options });
+            options.push({ ...item.data, type: ApplicationCommandOptionType.SubcommandGroup, options: subcommands.options });
             subcommands.handlers.entries().forEach(([key, handler]) => handlers.set(`${item.data.name}/${key}`, handler));
         } else
             throw new Error(
@@ -207,11 +208,14 @@ export async function loadCommands(client: Client<true>, directory: string, guil
             const { default: item } = await import(absolutePath);
 
             if (item instanceof SlashCommand) {
+                commandData.push({ ...item.data, type: ApplicationCommandType.ChatInput });
                 slashCommandHandlers.set(item.data.name, item.handler);
                 if (item.autocomplete) slashCommandAutocompletes.set(item.data.name, item.autocomplete);
             } else if (item instanceof UserCommand) {
+                commandData.push({ ...item.data, type: ApplicationCommandType.User });
                 userCommandHandlers.set(item.data.name, item.handler);
             } else if (item instanceof MessageCommand) {
+                commandData.push({ ...item.data, type: ApplicationCommandType.Message });
                 messageCommandHandlers.set(item.data.name, item.handler);
             } else if (item instanceof SlashCommandWithSubcommands) {
                 const { options, handler } = await loadSubcommandsAndGroups(relativePath.replace(/\.[^/.]+$/, ""));
@@ -223,8 +227,6 @@ export async function loadCommands(client: Client<true>, directory: string, guil
 
             if (item.data.name !== file.name.replace(/.[^/.]+$/, ""))
                 throw new Error(`Code style enforcement: name exported from ${relativePath} does not match the filename`);
-
-            commandData.push(item.data);
         }),
     );
 

package/package.json

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