commandkit 0.0.10 → 0.1.0

package/dist/index.d.mts

@@ -1,6 +1,4 @@
-import * as discord_js from 'discord.js';
-import { Client } from 'discord.js';
-import * as _discordjs_builders from '@discordjs/builders';
+import { Client, Interaction, CommandInteraction, ChatInputCommandInteraction, ContextMenuCommandInteraction, PermissionResolvable, APIApplicationCommandSubcommandOption, APIApplicationCommandSubcommandGroupOption } from 'discord.js';
 
 interface CommandKitOptions {
     client: Client;
@@ -13,39 +11,69 @@ interface CommandKitOptions {
     skipBuiltInValidations?: boolean;
 }
 
+interface CommandFileObject {
+    data: CommandData;
+    options?: CommandOptions;
+    run: ({}: { interaction: Interaction; client: Client; handler: CommandKit }) => void;
+}
+
+interface CommandProps {
+    interaction: CommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface SlashCommandProps {
+    interaction: ChatInputCommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface ContextMenuCommandProps {
+    interaction: ContextMenuCommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface ValidationFunctionProps {
+    interaction: ChatInputCommandInteraction | ContextMenuCommandInteraction;
+    client: Client<true>;
+    commandObj: CommandObject;
+    handler: CommandKit;
+}
+interface CommandOptions {
+    guildOnly?: boolean;
+    devOnly?: boolean;
+    deleted?: boolean;
+    userPermissions?: PermissionResolvable;
+    botPermissions?: PermissionResolvable;
+    [key: string]: any;
+}
+declare enum CommandType {
+    'ChatInput' = 1,
+    'Message' = 3,
+    'User' = 2
+}
+type LocaleString = 'id' | 'en-US' | 'en-GB' | 'bg' | 'zh-CN' | 'zh-TW' | 'hr' | 'cs' | 'da' | 'nl' | 'fi' | 'fr' | 'de' | 'el' | 'hi' | 'hu' | 'it' | 'ja' | 'ko' | 'lt' | 'no' | 'pl' | 'pt-BR' | 'ro' | 'ru' | 'es-ES' | 'sv-SE' | 'th' | 'tr' | 'uk' | 'vi';
+type CommandData = {
+    name: string;
+    description: string;
+    type?: CommandType;
+    name_localizations?: Partial<Record<LocaleString, string | null>>;
+    description_localizations?: Partial<Record<LocaleString, string | null>>;
+    dm_permission?: boolean;
+    default_member_permissions?: string;
+    nsfw?: boolean;
+    options?: Array<APIApplicationCommandSubcommandOption | APIApplicationCommandSubcommandGroupOption>;
+};
+type CommandObject = Omit<CommandFileObject, 'run'>;
+
 declare class CommandKit {
     #private;
     constructor({ ...options }: CommandKitOptions);
-    get commands(): ({
-        data: _discordjs_builders.SlashCommandBuilder | {
-            name: string;
-            name_localizations?: any;
-            description: string;
-            dm_permission?: boolean | undefined;
-            options?: discord_js.APIApplicationCommandOption[] | undefined;
-        };
-        options?: {
-            guildOnly?: boolean | undefined;
-            devOnly?: boolean | undefined;
-            deleted?: boolean | undefined;
-            userPermissions?: discord_js.PermissionResolvable[] | undefined;
-            botPermissions?: discord_js.PermissionResolvable[] | undefined;
-        } | undefined;
-    } | {
-        data: _discordjs_builders.ContextMenuCommandBuilder | {
-            name: string;
-            name_localizations?: any;
-            type: _discordjs_builders.ContextMenuCommandType;
-            dm_permission?: boolean | undefined;
-        };
-        options?: {
-            guildOnly?: boolean | undefined;
-            devOnly?: boolean | undefined;
-            deleted?: boolean | undefined;
-            userPermissions?: discord_js.PermissionResolvable[] | undefined;
-            botPermissions?: discord_js.PermissionResolvable[] | undefined;
-        } | undefined;
-    })[];
+    /**
+     * Returns all the commands that CommandKit is handling.
+     *
+     * @returns An array of command objects
+     */
+    get commands(): CommandObject[];
 }
 
-export { CommandKit };
+export { CommandData, CommandKit, CommandObject, CommandOptions, CommandProps, CommandType, ContextMenuCommandProps, SlashCommandProps, ValidationFunctionProps };

package/dist/index.d.ts

@@ -1,6 +1,4 @@
-import * as discord_js from 'discord.js';
-import { Client } from 'discord.js';
-import * as _discordjs_builders from '@discordjs/builders';
+import { Client, Interaction, CommandInteraction, ChatInputCommandInteraction, ContextMenuCommandInteraction, PermissionResolvable, APIApplicationCommandSubcommandOption, APIApplicationCommandSubcommandGroupOption } from 'discord.js';
 
 interface CommandKitOptions {
     client: Client;
@@ -13,39 +11,69 @@ interface CommandKitOptions {
     skipBuiltInValidations?: boolean;
 }
 
+interface CommandFileObject {
+    data: CommandData;
+    options?: CommandOptions;
+    run: ({}: { interaction: Interaction; client: Client; handler: CommandKit }) => void;
+}
+
+interface CommandProps {
+    interaction: CommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface SlashCommandProps {
+    interaction: ChatInputCommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface ContextMenuCommandProps {
+    interaction: ContextMenuCommandInteraction;
+    client: Client<true>;
+    handler: CommandKit;
+}
+interface ValidationFunctionProps {
+    interaction: ChatInputCommandInteraction | ContextMenuCommandInteraction;
+    client: Client<true>;
+    commandObj: CommandObject;
+    handler: CommandKit;
+}
+interface CommandOptions {
+    guildOnly?: boolean;
+    devOnly?: boolean;
+    deleted?: boolean;
+    userPermissions?: PermissionResolvable;
+    botPermissions?: PermissionResolvable;
+    [key: string]: any;
+}
+declare enum CommandType {
+    'ChatInput' = 1,
+    'Message' = 3,
+    'User' = 2
+}
+type LocaleString = 'id' | 'en-US' | 'en-GB' | 'bg' | 'zh-CN' | 'zh-TW' | 'hr' | 'cs' | 'da' | 'nl' | 'fi' | 'fr' | 'de' | 'el' | 'hi' | 'hu' | 'it' | 'ja' | 'ko' | 'lt' | 'no' | 'pl' | 'pt-BR' | 'ro' | 'ru' | 'es-ES' | 'sv-SE' | 'th' | 'tr' | 'uk' | 'vi';
+type CommandData = {
+    name: string;
+    description: string;
+    type?: CommandType;
+    name_localizations?: Partial<Record<LocaleString, string | null>>;
+    description_localizations?: Partial<Record<LocaleString, string | null>>;
+    dm_permission?: boolean;
+    default_member_permissions?: string;
+    nsfw?: boolean;
+    options?: Array<APIApplicationCommandSubcommandOption | APIApplicationCommandSubcommandGroupOption>;
+};
+type CommandObject = Omit<CommandFileObject, 'run'>;
+
 declare class CommandKit {
     #private;
     constructor({ ...options }: CommandKitOptions);
-    get commands(): ({
-        data: _discordjs_builders.SlashCommandBuilder | {
-            name: string;
-            name_localizations?: any;
-            description: string;
-            dm_permission?: boolean | undefined;
-            options?: discord_js.APIApplicationCommandOption[] | undefined;
-        };
-        options?: {
-            guildOnly?: boolean | undefined;
-            devOnly?: boolean | undefined;
-            deleted?: boolean | undefined;
-            userPermissions?: discord_js.PermissionResolvable[] | undefined;
-            botPermissions?: discord_js.PermissionResolvable[] | undefined;
-        } | undefined;
-    } | {
-        data: _discordjs_builders.ContextMenuCommandBuilder | {
-            name: string;
-            name_localizations?: any;
-            type: _discordjs_builders.ContextMenuCommandType;
-            dm_permission?: boolean | undefined;
-        };
-        options?: {
-            guildOnly?: boolean | undefined;
-            devOnly?: boolean | undefined;
-            deleted?: boolean | undefined;
-            userPermissions?: discord_js.PermissionResolvable[] | undefined;
-            botPermissions?: discord_js.PermissionResolvable[] | undefined;
-        } | undefined;
-    })[];
+    /**
+     * Returns all the commands that CommandKit is handling.
+     *
+     * @returns An array of command objects
+     */
+    get commands(): CommandObject[];
 }
 
-export { CommandKit };
+export { CommandData, CommandKit, CommandObject, CommandOptions, CommandProps, CommandType, ContextMenuCommandProps, SlashCommandProps, ValidationFunctionProps };

package/dist/index.js

@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  CommandKit: () => CommandKit
+  CommandKit: () => CommandKit,
+  CommandType: () => CommandType
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -78,31 +79,34 @@ function toFileURL(filePath) {
 }
 
 // src/handlers/command-handler/validations/botPermissions.ts
-function botPermissions_default({
-  interaction,
-  targetCommand
-}) {
+function botPermissions_default({ interaction, targetCommand }) {
   const botMember = interaction.guild?.members.me;
-  if (targetCommand.options?.botPermissions && botMember) {
-    for (const permission of targetCommand.options.botPermissions) {
-      const hasPermission = botMember.permissions.has(permission);
-      if (!hasPermission) {
-        interaction.reply({
-          content: `\u274C I do not have enough permission to execute this command. Required permission: \`${permission}\``,
-          ephemeral: true
-        });
-        return true;
-      }
+  let commandPermissions = targetCommand.options?.botPermissions;
+  if (!botMember || !commandPermissions)
+    return;
+  if (!Array.isArray(commandPermissions)) {
+    commandPermissions = [commandPermissions];
+  }
+  const missingPermissions = [];
+  for (const permission of commandPermissions) {
+    const hasPermission = botMember.permissions.has(permission);
+    if (!hasPermission) {
+      missingPermissions.push(`\`${permission.toString()}\``);
     }
   }
+  if (missingPermissions.length) {
+    interaction.reply({
+      content: `\u274C I do not have enough permissions to execute this command. Missing: ${missingPermissions.join(
+        ", "
+      )}`,
+      ephemeral: true
+    });
+    return true;
+  }
 }
 
 // src/handlers/command-handler/validations/devOnly.ts
-function devOnly_default({
-  interaction,
-  targetCommand,
-  handlerData
-}) {
+function devOnly_default({ interaction, targetCommand, handlerData }) {
   if (targetCommand.options?.devOnly) {
     if (interaction.inGuild() && !handlerData.devGuildIds.includes(interaction.guildId)) {
       interaction.reply({
@@ -111,9 +115,7 @@ function devOnly_default({
       });
       return true;
     }
-    const guildMember = interaction.guild?.members.cache.get(
-      interaction.user.id
-    );
+    const guildMember = interaction.guild?.members.cache.get(interaction.user.id);
     const memberRoles = guildMember?.roles.cache;
     let hasDevRole = false;
     memberRoles?.forEach((role) => {
@@ -133,10 +135,7 @@ function devOnly_default({
 }
 
 // src/handlers/command-handler/validations/guildOnly.ts
-function guildOnly_default({
-  interaction,
-  targetCommand
-}) {
+function guildOnly_default({ interaction, targetCommand }) {
   if (targetCommand.options?.guildOnly && !interaction.inGuild()) {
     interaction.reply({
       content: "\u274C This command can only be used inside a server.",
@@ -147,23 +146,30 @@ function guildOnly_default({
 }
 
 // src/handlers/command-handler/validations/userPermissions.ts
-function userPermissions_default({
-  interaction,
-  targetCommand
-}) {
+function userPermissions_default({ interaction, targetCommand }) {
   const memberPermissions = interaction.memberPermissions;
-  if (targetCommand.options?.userPermissions && memberPermissions) {
-    for (const permission of targetCommand.options.userPermissions) {
-      const hasPermission = memberPermissions.has(permission);
-      if (!hasPermission) {
-        interaction.reply({
-          content: `\u274C You do not have enough permission to run this command. Required permission: \`${permission}\``,
-          ephemeral: true
-        });
-        return true;
-      }
+  let commandPermissions = targetCommand.options?.userPermissions;
+  if (!memberPermissions || !commandPermissions)
+    return;
+  if (!Array.isArray(commandPermissions)) {
+    commandPermissions = [commandPermissions];
+  }
+  const missingPermissions = [];
+  for (const permission of commandPermissions) {
+    const hasPermission = memberPermissions.has(permission);
+    if (!hasPermission) {
+      missingPermissions.push(`\`${permission.toString()}\``);
     }
   }
+  if (missingPermissions.length) {
+    interaction.reply({
+      content: `\u274C You do not have enough permissions to run this command. Missing: ${missingPermissions.join(
+        ", "
+      )}`,
+      ephemeral: true
+    });
+    return true;
+  }
 }
 
 // src/handlers/command-handler/validations/index.ts
@@ -185,7 +191,7 @@ function areSlashCommandsDifferent(appCommand, localCommand) {
 }
 
 // src/handlers/command-handler/functions/registerCommands.ts
-var import_colors = require("colors");
+var import_safe = __toESM(require("colors/safe"));
 async function registerCommands(commandHandler) {
   const client = commandHandler._data.client;
   const devGuildIds = commandHandler._data.devGuildIds;
@@ -195,7 +201,11 @@ async function registerCommands(commandHandler) {
     for (const devGuildId of devGuildIds) {
       const guild = client.guilds.cache.get(devGuildId);
       if (!guild) {
-        console.log(`\u23E9 Ignoring: Guild ${devGuildId} does not exist or client isn't in this guild.`.yellow);
+        console.log(
+          import_safe.default.yellow(
+            `\u23E9 Ignoring: Guild ${devGuildId} does not exist or client isn't in this guild.`
+          )
+        );
         continue;
       }
       devGuilds.push(guild);
@@ -209,58 +219,92 @@ async function registerCommands(commandHandler) {
       devGuildCommands.push(guildCommands);
     }
     for (const command of commands) {
+      let commandData = command.data;
       if (command.options?.deleted) {
-        const targetCommand = appCommands?.cache.find((cmd) => cmd.name === command.data.name);
+        const targetCommand = appCommands?.cache.find(
+          (cmd) => cmd.name === commandData.name
+        );
         if (!targetCommand) {
-          console.log(`\u23E9 Ignoring: Command "${command.data.name}" is globally marked as deleted.`.yellow);
+          console.log(
+            import_safe.default.yellow(
+              `\u23E9 Ignoring: Command "${commandData.name}" is globally marked as deleted.`
+            )
+          );
         } else {
           targetCommand.delete().then(() => {
-            console.log(`\u{1F6AE} Deleted command "${command.data.name}" globally.`.green);
+            console.log(
+              import_safe.default.green(`\u{1F6AE} Deleted command "${commandData.name}" globally.`)
+            );
           });
         }
         for (const guildCommands of devGuildCommands) {
-          const targetCommand2 = guildCommands.cache.find((cmd) => cmd.name === command.data.name);
+          const targetCommand2 = guildCommands.cache.find(
+            (cmd) => cmd.name === commandData.name
+          );
           if (!targetCommand2) {
             console.log(
-              `\u23E9 Ignoring: Command "${command.data.name}" is marked as deleted for ${guildCommands.guild.name}.`.yellow
+              import_safe.default.yellow(
+                `\u23E9 Ignoring: Command "${commandData.name}" is marked as deleted for ${guildCommands.guild.name}.`
+              )
             );
           } else {
             targetCommand2.delete().then(() => {
               console.log(
-                `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`.green
+                import_safe.default.green(
+                  `\u{1F6AE} Deleted command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
             });
           }
         }
         continue;
       }
-      let commandData = command.data;
       let editedCommand = false;
-      const appGlobalCommand = appCommands?.cache.find((cmd) => cmd.name === command.data.name);
+      const appGlobalCommand = appCommands?.cache.find(
+        (cmd) => cmd.name === commandData.name
+      );
       if (appGlobalCommand) {
-        const commandsAreDifferent = areSlashCommandsDifferent(appGlobalCommand, commandData);
+        const commandsAreDifferent = areSlashCommandsDifferent(
+          appGlobalCommand,
+          commandData
+        );
         if (commandsAreDifferent) {
           appGlobalCommand.edit(commandData).then(() => {
-            console.log(`\u2705 Edited command "${commandData.name}" globally.`.green);
+            console.log(
+              import_safe.default.green(`\u2705 Edited command "${commandData.name}" globally.`)
+            );
           }).catch((error) => {
-            console.log(`\u274C Failed to edit command "${commandData.name}" globally.`.red);
+            console.log(
+              import_safe.default.red(
+                `\u274C Failed to edit command "${commandData.name}" globally.`
+              )
+            );
             console.error(error);
           });
           editedCommand = true;
         }
       }
       for (const guildCommands of devGuildCommands) {
-        const appGuildCommand = guildCommands.cache.find((cmd) => cmd.name === commandData.name);
+        const appGuildCommand = guildCommands.cache.find(
+          (cmd) => cmd.name === commandData.name
+        );
         if (appGuildCommand) {
-          const commandsAreDifferent = areSlashCommandsDifferent(appGuildCommand, commandData);
+          const commandsAreDifferent = areSlashCommandsDifferent(
+            appGuildCommand,
+            commandData
+          );
           if (commandsAreDifferent) {
             appGuildCommand.edit(commandData).then(() => {
               console.log(
-                `\u2705 Edited command "${commandData.name}" in ${guildCommands.guild.name}.`.green
+                import_safe.default.green(
+                  `\u2705 Edited command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
             }).catch((error) => {
               console.log(
-                `\u274C Failed to edit command "${commandData.name}" in ${guildCommands.guild.name}.`.red
+                import_safe.default.red(
+                  `\u274C Failed to edit command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
               console.error(error);
             });
@@ -273,29 +317,47 @@ async function registerCommands(commandHandler) {
       if (command.options?.devOnly) {
         if (!devGuilds.length) {
           console.log(
-            `\u23E9 Ignoring: Cannot register command "${command.data.name}" as no valid "devGuildIds" were provided.`.yellow
+            import_safe.default.yellow(
+              `\u23E9 Ignoring: Cannot register command "${commandData.name}" as no valid "devGuildIds" were provided.`
+            )
           );
           continue;
         }
         for (const guild of devGuilds) {
-          const cmdExists = guild.commands.cache.some((cmd) => cmd.name === command.data.name);
+          const cmdExists = guild.commands.cache.some(
+            (cmd) => cmd.name === commandData.name
+          );
           if (cmdExists)
             continue;
-          guild?.commands.create(command.data).then(() => {
-            console.log(`\u2705 Registered command "${command.data.name}" in ${guild.name}.`.green);
+          guild?.commands.create(commandData).then(() => {
+            console.log(
+              import_safe.default.green(
+                `\u2705 Registered command "${commandData.name}" in ${guild.name}.`
+              )
+            );
           }).catch((error) => {
-            console.log(`\u274C Failed to register command "${command.data.name}" in ${guild.name}.`.red);
+            console.log(
+              import_safe.default.red(
+                `\u274C Failed to register command "${commandData.name}" in ${guild.name}.`
+              )
+            );
             console.error(error);
           });
         }
       } else {
-        const cmdExists = appCommands?.cache.some((cmd) => cmd.name === command.data.name);
+        const cmdExists = appCommands?.cache.some((cmd) => cmd.name === commandData.name);
         if (cmdExists)
           continue;
-        appCommands?.create(command.data).then(() => {
-          console.log(`\u2705 Registered command "${command.data.name}" globally.`.green);
+        appCommands?.create(commandData).then(() => {
+          console.log(
+            import_safe.default.green(`\u2705 Registered command "${commandData.name}" globally.`)
+          );
         }).catch((error) => {
-          console.log(`\u274C Failed to register command "${command.data.name}" globally.`.red);
+          console.log(
+            import_safe.default.red(
+              `\u274C Failed to register command "${commandData.name}" globally.`
+            )
+          );
           console.error(error);
         });
       }
@@ -306,10 +368,13 @@ async function registerCommands(commandHandler) {
 // src/handlers/command-handler/functions/handleCommands.ts
 function handleCommands(commandHandler) {
   const client = commandHandler._data.client;
+  const handler = commandHandler._data.commandKitInstance;
   client.on("interactionCreate", async (interaction) => {
     if (!interaction.isChatInputCommand() && !interaction.isContextMenuCommand())
       return;
-    const targetCommand = commandHandler._data.commands.find((cmd) => cmd.data.name === interaction.commandName);
+    const targetCommand = commandHandler._data.commands.find(
+      (cmd) => cmd.data.name === interaction.commandName
+    );
     if (!targetCommand)
       return;
     const { data, options, run, ...rest } = targetCommand;
@@ -323,7 +388,8 @@ function handleCommands(commandHandler) {
       const stopValidationLoop = await validationFunction({
         interaction,
         client,
-        commandObj
+        commandObj,
+        handler
       });
       if (stopValidationLoop) {
         canRun = false;
@@ -347,12 +413,12 @@ function handleCommands(commandHandler) {
     }
     if (!canRun)
       return;
-    targetCommand.run({ interaction, client });
+    targetCommand.run({ interaction, client, handler });
   });
 }
 
 // src/handlers/command-handler/CommandHandler.ts
-var import_colors2 = require("colors");
+var import_safe2 = __toESM(require("colors/safe"));
 var CommandHandler = class {
   _data;
   constructor({ ...options }) {
@@ -379,11 +445,17 @@ var CommandHandler = class {
       if (commandObj.default)
         commandObj = commandObj.default;
       if (!commandObj.data) {
-        console.log(`\u23E9 Ignoring: Command ${compactFilePath} does not export "data".`.yellow);
+        console.log(
+          import_safe2.default.yellow(
+            `\u23E9 Ignoring: Command ${compactFilePath} does not export "data".`
+          )
+        );
         continue;
       }
       if (!commandObj.run) {
-        console.log(`\u23E9 Ignoring: Command ${compactFilePath} does not export "run".`.yellow);
+        console.log(
+          import_safe2.default.yellow(`\u23E9 Ignoring: Command ${compactFilePath} does not export "run".`)
+        );
         continue;
       }
       this._data.commands.push(commandObj);
@@ -406,7 +478,7 @@ var CommandHandler = class {
 };
 
 // src/handlers/event-handler/EventHandler.ts
-var import_colors3 = require("colors");
+var import_safe3 = __toESM(require("colors/safe"));
 var EventHandler = class {
   #data;
   constructor({ ...options }) {
@@ -436,7 +508,11 @@ var EventHandler = class {
         let eventFunction = (await import(modulePath)).default;
         const compactFilePath = eventFilePath.split(process.cwd())[1] || eventFilePath;
         if (typeof eventFunction !== "function") {
-          console.log(`\u23E9 Ignoring: Event ${compactFilePath} does not export a function.`.yellow);
+          console.log(
+            import_safe3.default.yellow(
+              `\u23E9 Ignoring: Event ${compactFilePath} does not export a function.`
+            )
+          );
           continue;
         }
         eventObj.functions.push(eventFunction);
@@ -445,10 +521,11 @@ var EventHandler = class {
   }
   #registerEvents() {
     const client = this.#data.client;
+    const handler = this.#data.commandKitInstance;
     for (const eventObj of this.#data.events) {
       client.on(eventObj.name, async (...params) => {
         for (const eventFunction of eventObj.functions) {
-          const stopEventLoop = await eventFunction(...params, client);
+          const stopEventLoop = await eventFunction(...params, client, handler);
           if (stopEventLoop) {
             break;
           }
@@ -462,7 +539,7 @@ var EventHandler = class {
 };
 
 // src/handlers/validation-handler/ValidationHandler.ts
-var import_colors4 = require("colors");
+var import_safe4 = __toESM(require("colors/safe"));
 var ValidationHandler = class {
   #data;
   constructor({ ...options }) {
@@ -483,7 +560,11 @@ var ValidationHandler = class {
       let validationFunction = (await import(modulePath)).default;
       const compactFilePath = validationFilePath.split(process.cwd())[1] || validationFilePath;
       if (typeof validationFunction !== "function") {
-        console.log(`\u23E9 Ignoring: Validation ${compactFilePath} does not export a function.`.yellow);
+        console.log(
+          import_safe4.default.yellow(
+            `\u23E9 Ignoring: Validation ${compactFilePath} does not export a function.`
+          )
+        );
         continue;
       }
       this.#data.validations.push(validationFunction);
@@ -495,15 +576,17 @@ var ValidationHandler = class {
 };
 
 // src/CommandKit.ts
-var import_colors5 = require("colors");
+var import_safe5 = __toESM(require("colors/safe"));
 var CommandKit = class {
   #data;
   constructor({ ...options }) {
     if (!options.client) {
-      throw new Error('"client" is required when instantiating CommandKit.'.red);
+      throw new Error(import_safe5.default.red('"client" is required when instantiating CommandKit.'));
     }
     if (options.validationsPath && !options.commandsPath) {
-      throw new Error('"commandsPath" is required when "validationsPath" is set.'.red);
+      throw new Error(
+        import_safe5.default.red('"commandsPath" is required when "validationsPath" is set.')
+      );
     }
     this.#data = {
       ...options,
@@ -515,7 +598,8 @@ var CommandKit = class {
     if (this.#data.eventsPath) {
       const eventHandler = new EventHandler({
         client: this.#data.client,
-        eventsPath: this.#data.eventsPath
+        eventsPath: this.#data.eventsPath,
+        commandKitInstance: this
       });
       await eventHandler.init();
     }
@@ -535,20 +619,36 @@ var CommandKit = class {
         devUserIds: this.#data.devUserIds || [],
         devRoleIds: this.#data.devRoleIds || [],
         customValidations: validationFunctions,
-        skipBuiltInValidations: this.#data.skipBuiltInValidations || false
+        skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
+        commandKitInstance: this
       });
       await commandHandler.init();
       this.#data.commands = commandHandler.commands;
     }
   }
+  /**
+   * Returns all the commands that CommandKit is handling.
+   *
+   * @returns An array of command objects
+   */
   get commands() {
-    return this.#data.commands.map((cmd) => {
+    const commands = this.#data.commands.map((cmd) => {
       const { run, ...command } = cmd;
       return command;
     });
+    return commands;
   }
 };
+
+// src/types/index.ts
+var CommandType = /* @__PURE__ */ ((CommandType2) => {
+  CommandType2[CommandType2["ChatInput"] = 1] = "ChatInput";
+  CommandType2[CommandType2["Message"] = 3] = "Message";
+  CommandType2[CommandType2["User"] = 2] = "User";
+  return CommandType2;
+})(CommandType || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CommandKit
+  CommandKit,
+  CommandType
 });

package/dist/index.mjs

@@ -42,31 +42,34 @@ function toFileURL(filePath) {
 }
 
 // src/handlers/command-handler/validations/botPermissions.ts
-function botPermissions_default({
-  interaction,
-  targetCommand
-}) {
+function botPermissions_default({ interaction, targetCommand }) {
   const botMember = interaction.guild?.members.me;
-  if (targetCommand.options?.botPermissions && botMember) {
-    for (const permission of targetCommand.options.botPermissions) {
-      const hasPermission = botMember.permissions.has(permission);
-      if (!hasPermission) {
-        interaction.reply({
-          content: `\u274C I do not have enough permission to execute this command. Required permission: \`${permission}\``,
-          ephemeral: true
-        });
-        return true;
-      }
+  let commandPermissions = targetCommand.options?.botPermissions;
+  if (!botMember || !commandPermissions)
+    return;
+  if (!Array.isArray(commandPermissions)) {
+    commandPermissions = [commandPermissions];
+  }
+  const missingPermissions = [];
+  for (const permission of commandPermissions) {
+    const hasPermission = botMember.permissions.has(permission);
+    if (!hasPermission) {
+      missingPermissions.push(`\`${permission.toString()}\``);
     }
   }
+  if (missingPermissions.length) {
+    interaction.reply({
+      content: `\u274C I do not have enough permissions to execute this command. Missing: ${missingPermissions.join(
+        ", "
+      )}`,
+      ephemeral: true
+    });
+    return true;
+  }
 }
 
 // src/handlers/command-handler/validations/devOnly.ts
-function devOnly_default({
-  interaction,
-  targetCommand,
-  handlerData
-}) {
+function devOnly_default({ interaction, targetCommand, handlerData }) {
   if (targetCommand.options?.devOnly) {
     if (interaction.inGuild() && !handlerData.devGuildIds.includes(interaction.guildId)) {
       interaction.reply({
@@ -75,9 +78,7 @@ function devOnly_default({
       });
       return true;
     }
-    const guildMember = interaction.guild?.members.cache.get(
-      interaction.user.id
-    );
+    const guildMember = interaction.guild?.members.cache.get(interaction.user.id);
     const memberRoles = guildMember?.roles.cache;
     let hasDevRole = false;
     memberRoles?.forEach((role) => {
@@ -97,10 +98,7 @@ function devOnly_default({
 }
 
 // src/handlers/command-handler/validations/guildOnly.ts
-function guildOnly_default({
-  interaction,
-  targetCommand
-}) {
+function guildOnly_default({ interaction, targetCommand }) {
   if (targetCommand.options?.guildOnly && !interaction.inGuild()) {
     interaction.reply({
       content: "\u274C This command can only be used inside a server.",
@@ -111,23 +109,30 @@ function guildOnly_default({
 }
 
 // src/handlers/command-handler/validations/userPermissions.ts
-function userPermissions_default({
-  interaction,
-  targetCommand
-}) {
+function userPermissions_default({ interaction, targetCommand }) {
   const memberPermissions = interaction.memberPermissions;
-  if (targetCommand.options?.userPermissions && memberPermissions) {
-    for (const permission of targetCommand.options.userPermissions) {
-      const hasPermission = memberPermissions.has(permission);
-      if (!hasPermission) {
-        interaction.reply({
-          content: `\u274C You do not have enough permission to run this command. Required permission: \`${permission}\``,
-          ephemeral: true
-        });
-        return true;
-      }
+  let commandPermissions = targetCommand.options?.userPermissions;
+  if (!memberPermissions || !commandPermissions)
+    return;
+  if (!Array.isArray(commandPermissions)) {
+    commandPermissions = [commandPermissions];
+  }
+  const missingPermissions = [];
+  for (const permission of commandPermissions) {
+    const hasPermission = memberPermissions.has(permission);
+    if (!hasPermission) {
+      missingPermissions.push(`\`${permission.toString()}\``);
     }
   }
+  if (missingPermissions.length) {
+    interaction.reply({
+      content: `\u274C You do not have enough permissions to run this command. Missing: ${missingPermissions.join(
+        ", "
+      )}`,
+      ephemeral: true
+    });
+    return true;
+  }
 }
 
 // src/handlers/command-handler/validations/index.ts
@@ -149,7 +154,7 @@ function areSlashCommandsDifferent(appCommand, localCommand) {
 }
 
 // src/handlers/command-handler/functions/registerCommands.ts
-import "colors";
+import colors from "colors/safe";
 async function registerCommands(commandHandler) {
   const client = commandHandler._data.client;
   const devGuildIds = commandHandler._data.devGuildIds;
@@ -159,7 +164,11 @@ async function registerCommands(commandHandler) {
     for (const devGuildId of devGuildIds) {
       const guild = client.guilds.cache.get(devGuildId);
       if (!guild) {
-        console.log(`\u23E9 Ignoring: Guild ${devGuildId} does not exist or client isn't in this guild.`.yellow);
+        console.log(
+          colors.yellow(
+            `\u23E9 Ignoring: Guild ${devGuildId} does not exist or client isn't in this guild.`
+          )
+        );
         continue;
       }
       devGuilds.push(guild);
@@ -173,58 +182,92 @@ async function registerCommands(commandHandler) {
       devGuildCommands.push(guildCommands);
     }
     for (const command of commands) {
+      let commandData = command.data;
       if (command.options?.deleted) {
-        const targetCommand = appCommands?.cache.find((cmd) => cmd.name === command.data.name);
+        const targetCommand = appCommands?.cache.find(
+          (cmd) => cmd.name === commandData.name
+        );
         if (!targetCommand) {
-          console.log(`\u23E9 Ignoring: Command "${command.data.name}" is globally marked as deleted.`.yellow);
+          console.log(
+            colors.yellow(
+              `\u23E9 Ignoring: Command "${commandData.name}" is globally marked as deleted.`
+            )
+          );
         } else {
           targetCommand.delete().then(() => {
-            console.log(`\u{1F6AE} Deleted command "${command.data.name}" globally.`.green);
+            console.log(
+              colors.green(`\u{1F6AE} Deleted command "${commandData.name}" globally.`)
+            );
           });
         }
         for (const guildCommands of devGuildCommands) {
-          const targetCommand2 = guildCommands.cache.find((cmd) => cmd.name === command.data.name);
+          const targetCommand2 = guildCommands.cache.find(
+            (cmd) => cmd.name === commandData.name
+          );
           if (!targetCommand2) {
             console.log(
-              `\u23E9 Ignoring: Command "${command.data.name}" is marked as deleted for ${guildCommands.guild.name}.`.yellow
+              colors.yellow(
+                `\u23E9 Ignoring: Command "${commandData.name}" is marked as deleted for ${guildCommands.guild.name}.`
+              )
             );
           } else {
             targetCommand2.delete().then(() => {
               console.log(
-                `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`.green
+                colors.green(
+                  `\u{1F6AE} Deleted command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
             });
           }
         }
         continue;
       }
-      let commandData = command.data;
       let editedCommand = false;
-      const appGlobalCommand = appCommands?.cache.find((cmd) => cmd.name === command.data.name);
+      const appGlobalCommand = appCommands?.cache.find(
+        (cmd) => cmd.name === commandData.name
+      );
       if (appGlobalCommand) {
-        const commandsAreDifferent = areSlashCommandsDifferent(appGlobalCommand, commandData);
+        const commandsAreDifferent = areSlashCommandsDifferent(
+          appGlobalCommand,
+          commandData
+        );
         if (commandsAreDifferent) {
           appGlobalCommand.edit(commandData).then(() => {
-            console.log(`\u2705 Edited command "${commandData.name}" globally.`.green);
+            console.log(
+              colors.green(`\u2705 Edited command "${commandData.name}" globally.`)
+            );
           }).catch((error) => {
-            console.log(`\u274C Failed to edit command "${commandData.name}" globally.`.red);
+            console.log(
+              colors.red(
+                `\u274C Failed to edit command "${commandData.name}" globally.`
+              )
+            );
             console.error(error);
           });
           editedCommand = true;
         }
       }
       for (const guildCommands of devGuildCommands) {
-        const appGuildCommand = guildCommands.cache.find((cmd) => cmd.name === commandData.name);
+        const appGuildCommand = guildCommands.cache.find(
+          (cmd) => cmd.name === commandData.name
+        );
         if (appGuildCommand) {
-          const commandsAreDifferent = areSlashCommandsDifferent(appGuildCommand, commandData);
+          const commandsAreDifferent = areSlashCommandsDifferent(
+            appGuildCommand,
+            commandData
+          );
           if (commandsAreDifferent) {
             appGuildCommand.edit(commandData).then(() => {
               console.log(
-                `\u2705 Edited command "${commandData.name}" in ${guildCommands.guild.name}.`.green
+                colors.green(
+                  `\u2705 Edited command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
             }).catch((error) => {
               console.log(
-                `\u274C Failed to edit command "${commandData.name}" in ${guildCommands.guild.name}.`.red
+                colors.red(
+                  `\u274C Failed to edit command "${commandData.name}" in ${guildCommands.guild.name}.`
+                )
               );
               console.error(error);
             });
@@ -237,29 +280,47 @@ async function registerCommands(commandHandler) {
       if (command.options?.devOnly) {
         if (!devGuilds.length) {
           console.log(
-            `\u23E9 Ignoring: Cannot register command "${command.data.name}" as no valid "devGuildIds" were provided.`.yellow
+            colors.yellow(
+              `\u23E9 Ignoring: Cannot register command "${commandData.name}" as no valid "devGuildIds" were provided.`
+            )
           );
           continue;
         }
         for (const guild of devGuilds) {
-          const cmdExists = guild.commands.cache.some((cmd) => cmd.name === command.data.name);
+          const cmdExists = guild.commands.cache.some(
+            (cmd) => cmd.name === commandData.name
+          );
           if (cmdExists)
             continue;
-          guild?.commands.create(command.data).then(() => {
-            console.log(`\u2705 Registered command "${command.data.name}" in ${guild.name}.`.green);
+          guild?.commands.create(commandData).then(() => {
+            console.log(
+              colors.green(
+                `\u2705 Registered command "${commandData.name}" in ${guild.name}.`
+              )
+            );
           }).catch((error) => {
-            console.log(`\u274C Failed to register command "${command.data.name}" in ${guild.name}.`.red);
+            console.log(
+              colors.red(
+                `\u274C Failed to register command "${commandData.name}" in ${guild.name}.`
+              )
+            );
             console.error(error);
           });
         }
       } else {
-        const cmdExists = appCommands?.cache.some((cmd) => cmd.name === command.data.name);
+        const cmdExists = appCommands?.cache.some((cmd) => cmd.name === commandData.name);
         if (cmdExists)
           continue;
-        appCommands?.create(command.data).then(() => {
-          console.log(`\u2705 Registered command "${command.data.name}" globally.`.green);
+        appCommands?.create(commandData).then(() => {
+          console.log(
+            colors.green(`\u2705 Registered command "${commandData.name}" globally.`)
+          );
         }).catch((error) => {
-          console.log(`\u274C Failed to register command "${command.data.name}" globally.`.red);
+          console.log(
+            colors.red(
+              `\u274C Failed to register command "${commandData.name}" globally.`
+            )
+          );
           console.error(error);
         });
       }
@@ -270,10 +331,13 @@ async function registerCommands(commandHandler) {
 // src/handlers/command-handler/functions/handleCommands.ts
 function handleCommands(commandHandler) {
   const client = commandHandler._data.client;
+  const handler = commandHandler._data.commandKitInstance;
   client.on("interactionCreate", async (interaction) => {
     if (!interaction.isChatInputCommand() && !interaction.isContextMenuCommand())
       return;
-    const targetCommand = commandHandler._data.commands.find((cmd) => cmd.data.name === interaction.commandName);
+    const targetCommand = commandHandler._data.commands.find(
+      (cmd) => cmd.data.name === interaction.commandName
+    );
     if (!targetCommand)
       return;
     const { data, options, run, ...rest } = targetCommand;
@@ -287,7 +351,8 @@ function handleCommands(commandHandler) {
       const stopValidationLoop = await validationFunction({
         interaction,
         client,
-        commandObj
+        commandObj,
+        handler
       });
       if (stopValidationLoop) {
         canRun = false;
@@ -311,12 +376,12 @@ function handleCommands(commandHandler) {
     }
     if (!canRun)
       return;
-    targetCommand.run({ interaction, client });
+    targetCommand.run({ interaction, client, handler });
   });
 }
 
 // src/handlers/command-handler/CommandHandler.ts
-import "colors";
+import colors2 from "colors/safe";
 var CommandHandler = class {
   _data;
   constructor({ ...options }) {
@@ -343,11 +408,17 @@ var CommandHandler = class {
       if (commandObj.default)
         commandObj = commandObj.default;
       if (!commandObj.data) {
-        console.log(`\u23E9 Ignoring: Command ${compactFilePath} does not export "data".`.yellow);
+        console.log(
+          colors2.yellow(
+            `\u23E9 Ignoring: Command ${compactFilePath} does not export "data".`
+          )
+        );
         continue;
       }
       if (!commandObj.run) {
-        console.log(`\u23E9 Ignoring: Command ${compactFilePath} does not export "run".`.yellow);
+        console.log(
+          colors2.yellow(`\u23E9 Ignoring: Command ${compactFilePath} does not export "run".`)
+        );
         continue;
       }
       this._data.commands.push(commandObj);
@@ -370,7 +441,7 @@ var CommandHandler = class {
 };
 
 // src/handlers/event-handler/EventHandler.ts
-import "colors";
+import colors3 from "colors/safe";
 var EventHandler = class {
   #data;
   constructor({ ...options }) {
@@ -400,7 +471,11 @@ var EventHandler = class {
         let eventFunction = (await import(modulePath)).default;
         const compactFilePath = eventFilePath.split(process.cwd())[1] || eventFilePath;
         if (typeof eventFunction !== "function") {
-          console.log(`\u23E9 Ignoring: Event ${compactFilePath} does not export a function.`.yellow);
+          console.log(
+            colors3.yellow(
+              `\u23E9 Ignoring: Event ${compactFilePath} does not export a function.`
+            )
+          );
           continue;
         }
         eventObj.functions.push(eventFunction);
@@ -409,10 +484,11 @@ var EventHandler = class {
   }
   #registerEvents() {
     const client = this.#data.client;
+    const handler = this.#data.commandKitInstance;
     for (const eventObj of this.#data.events) {
       client.on(eventObj.name, async (...params) => {
         for (const eventFunction of eventObj.functions) {
-          const stopEventLoop = await eventFunction(...params, client);
+          const stopEventLoop = await eventFunction(...params, client, handler);
           if (stopEventLoop) {
             break;
           }
@@ -426,7 +502,7 @@ var EventHandler = class {
 };
 
 // src/handlers/validation-handler/ValidationHandler.ts
-import "colors";
+import colors4 from "colors/safe";
 var ValidationHandler = class {
   #data;
   constructor({ ...options }) {
@@ -447,7 +523,11 @@ var ValidationHandler = class {
       let validationFunction = (await import(modulePath)).default;
       const compactFilePath = validationFilePath.split(process.cwd())[1] || validationFilePath;
       if (typeof validationFunction !== "function") {
-        console.log(`\u23E9 Ignoring: Validation ${compactFilePath} does not export a function.`.yellow);
+        console.log(
+          colors4.yellow(
+            `\u23E9 Ignoring: Validation ${compactFilePath} does not export a function.`
+          )
+        );
         continue;
       }
       this.#data.validations.push(validationFunction);
@@ -459,15 +539,17 @@ var ValidationHandler = class {
 };
 
 // src/CommandKit.ts
-import "colors";
+import colors5 from "colors/safe";
 var CommandKit = class {
   #data;
   constructor({ ...options }) {
     if (!options.client) {
-      throw new Error('"client" is required when instantiating CommandKit.'.red);
+      throw new Error(colors5.red('"client" is required when instantiating CommandKit.'));
     }
     if (options.validationsPath && !options.commandsPath) {
-      throw new Error('"commandsPath" is required when "validationsPath" is set.'.red);
+      throw new Error(
+        colors5.red('"commandsPath" is required when "validationsPath" is set.')
+      );
     }
     this.#data = {
       ...options,
@@ -479,7 +561,8 @@ var CommandKit = class {
     if (this.#data.eventsPath) {
       const eventHandler = new EventHandler({
         client: this.#data.client,
-        eventsPath: this.#data.eventsPath
+        eventsPath: this.#data.eventsPath,
+        commandKitInstance: this
       });
       await eventHandler.init();
     }
@@ -499,19 +582,35 @@ var CommandKit = class {
         devUserIds: this.#data.devUserIds || [],
         devRoleIds: this.#data.devRoleIds || [],
         customValidations: validationFunctions,
-        skipBuiltInValidations: this.#data.skipBuiltInValidations || false
+        skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
+        commandKitInstance: this
       });
       await commandHandler.init();
       this.#data.commands = commandHandler.commands;
     }
   }
+  /**
+   * Returns all the commands that CommandKit is handling.
+   *
+   * @returns An array of command objects
+   */
   get commands() {
-    return this.#data.commands.map((cmd) => {
+    const commands = this.#data.commands.map((cmd) => {
       const { run, ...command } = cmd;
       return command;
     });
+    return commands;
   }
 };
+
+// src/types/index.ts
+var CommandType = /* @__PURE__ */ ((CommandType2) => {
+  CommandType2[CommandType2["ChatInput"] = 1] = "ChatInput";
+  CommandType2[CommandType2["Message"] = 3] = "Message";
+  CommandType2[CommandType2["User"] = 2] = "User";
+  return CommandType2;
+})(CommandType || {});
 export {
-  CommandKit
+  CommandKit,
+  CommandType
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "commandkit",
-    "version": "0.0.10",
+    "version": "0.1.0",
     "license": "MIT",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",
@@ -14,7 +14,10 @@
     },
     "scripts": {
         "lint": "tsc",
-        "build": "yarn lint && tsup"
+        "dev": "tsup --watch",
+        "build": "tsup",
+        "deploy": "npm publish",
+        "test": "tsx tests/index.ts"
     },
     "repository": {
         "type": "git",
@@ -31,8 +34,12 @@
         "colors": "^1.4.0"
     },
     "devDependencies": {
-        "discord.js": "^14.12.1",
+        "@types/node": "^20.5.9",
+        "discord.js": "^14.13.0",
+        "dotenv": "^16.3.1",
+        "tsconfig": "workspace:*",
         "tsup": "^7.2.0",
+        "tsx": "^3.12.8",
         "typescript": "^5.1.6"
     },
     "peerDependencies": {