commandkit 0.1.3-dev.20231002185336 → 0.1.3-dev.20231002200254

package/dist/index.d.mts

@@ -34,10 +34,9 @@ interface CommandKitOptions {
      */
     skipBuiltInValidations?: boolean;
     /**
-     * Uses discordjs/rest to register application commands.
-     * @experimental
+     * Bulk register application commands instead of one-by-one.
      */
-    useRest?: boolean;
+    bulkRegister?: boolean;
 }
 interface CommandFileObject {
     data: CommandData;
@@ -117,9 +116,16 @@ declare class CommandKit {
     constructor(options: CommandKitOptions);
     /**
      * Updates application commands with the latest from "commandsPath".
-     * @experimental
      */
     reloadCommands(type?: ReloadOptions): Promise<void>;
+    /**
+     * Updates application events with the latest from "eventsPath".
+     */
+    reloadEvents(): Promise<void>;
+    /**
+     * Updates application command validations with the latest from "validationsPath".
+     */
+    reloadValidations(): Promise<void>;
     /**
      * @returns An array of objects of all the commands that CommandKit is handling.
      */

package/dist/index.d.ts

@@ -34,10 +34,9 @@ interface CommandKitOptions {
      */
     skipBuiltInValidations?: boolean;
     /**
-     * Uses discordjs/rest to register application commands.
-     * @experimental
+     * Bulk register application commands instead of one-by-one.
      */
-    useRest?: boolean;
+    bulkRegister?: boolean;
 }
 interface CommandFileObject {
     data: CommandData;
@@ -117,9 +116,16 @@ declare class CommandKit {
     constructor(options: CommandKitOptions);
     /**
      * Updates application commands with the latest from "commandsPath".
-     * @experimental
      */
     reloadCommands(type?: ReloadOptions): Promise<void>;
+    /**
+     * Updates application events with the latest from "eventsPath".
+     */
+    reloadEvents(): Promise<void>;
+    /**
+     * Updates application command validations with the latest from "validationsPath".
+     */
+    reloadValidations(): Promise<void>;
     /**
      * @returns An array of objects of all the commands that CommandKit is handling.
      */

package/dist/index.js

@@ -239,22 +239,20 @@ async function registerGlobalCommands(client, commands) {
           )
         );
       } else {
-        targetCommand.delete().then(() => {
+        await targetCommand.delete().catch((error) => {
           console.log(
-            colors_default.green(`\u{1F6AE} Deleted command "${command.data.name}" globally.`)
+            colors_default.red(`\u274C Failed to delete command "${command.data.name}" globally.`)
           );
+          console.error(error);
         });
+        console.log(colors_default.green(`\u{1F6AE} Deleted command "${command.data.name}" globally.`));
       }
       continue;
     }
     if (targetCommand) {
       const commandsAreDifferent = areSlashCommandsDifferent(targetCommand, command.data);
       if (commandsAreDifferent) {
-        targetCommand.edit(command.data).then(() => {
-          console.log(
-            colors_default.green(`\u2705 Edited command "${command.data.name}" globally.`)
-          );
-        }).catch((error) => {
+        await targetCommand.edit(command.data).catch((error) => {
           console.log(
             colors_default.red(
               `\u274C Failed to edit command "${command.data.name}" globally.`
@@ -262,19 +260,19 @@ async function registerGlobalCommands(client, commands) {
           );
           console.error(error);
         });
+        console.log(colors_default.green(`\u2705 Edited command "${command.data.name}" globally.`));
         continue;
       }
     }
     if (targetCommand)
       continue;
-    appCommandsManager.create(command.data).then(() => {
-      console.log(colors_default.green(`\u2705 Registered command "${command.data.name}" globally.`));
-    }).catch((error) => {
+    await appCommandsManager.create(command.data).catch((error) => {
       console.log(
         colors_default.red(`\u274C Failed to register command "${command.data.name}" globally.`)
       );
       console.error(error);
     });
+    console.log(colors_default.green(`\u2705 Registered command "${command.data.name}" globally.`));
   }
 }
 async function registerDevCommands(client, commands, guildIds) {
@@ -308,26 +306,26 @@ async function registerDevCommands(client, commands, guildIds) {
             )
           );
         } else {
-          targetCommand.delete().then(() => {
+          await targetCommand.delete().catch((error) => {
             console.log(
-              colors_default.green(
-                `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`
+              colors_default.red(
+                `\u274C Failed to delete command "${command.data.name}" in ${guildCommands.guild.name}.`
               )
             );
+            console.error(error);
           });
+          console.log(
+            colors_default.green(
+              `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`
+            )
+          );
         }
         continue;
       }
       if (targetCommand) {
         const commandsAreDifferent = areSlashCommandsDifferent(targetCommand, command.data);
         if (commandsAreDifferent) {
-          targetCommand.edit(command.data).then(() => {
-            console.log(
-              colors_default.green(
-                `\u2705 Edited command "${command.data.name}" in ${guildCommands.guild.name}.`
-              )
-            );
-          }).catch((error) => {
+          await targetCommand.edit(command.data).catch((error) => {
             console.log(
               colors_default.red(
                 `\u274C Failed to edit command "${command.data.name}" in ${guildCommands.guild.name}.`
@@ -335,18 +333,17 @@ async function registerDevCommands(client, commands, guildIds) {
             );
             console.error(error);
           });
+          console.log(
+            colors_default.green(
+              `\u2705 Edited command "${command.data.name}" in ${guildCommands.guild.name}.`
+            )
+          );
           continue;
         }
       }
       if (targetCommand)
         continue;
-      guildCommands.create(command.data).then(() => {
-        console.log(
-          colors_default.green(
-            `\u2705 Registered command "${command.data.name}" in ${guildCommands.guild.name}.`
-          )
-        );
-      }).catch((error) => {
+      await guildCommands.create(command.data).catch((error) => {
         console.log(
           colors_default.red(
             `\u274C Failed to register command "${command.data.name}" in ${guildCommands.guild.name}.`
@@ -354,6 +351,11 @@ async function registerDevCommands(client, commands, guildIds) {
         );
         console.error(error);
       });
+      console.log(
+        colors_default.green(
+          `\u2705 Registered command "${command.data.name}" in ${guildCommands.guild.name}.`
+        )
+      );
     }
   }
 }
@@ -485,7 +487,7 @@ var CommandHandler = class {
         )
       );
     }
-    if (this.#data.useRest) {
+    if (this.#data.bulkRegister) {
       await loadCommandsWithRest({
         client: this.#data.client,
         devGuildIds: this.#data.devGuildIds,
@@ -620,7 +622,7 @@ var CommandHandler = class {
   async reloadCommands(type) {
     this.#data.commands = [];
     await this.#buildCommands();
-    if (this.#data.useRest) {
+    if (this.#data.bulkRegister) {
       await loadCommandsWithRest({
         client: this.#data.client,
         devGuildIds: this.#data.devGuildIds,
@@ -641,6 +643,8 @@ var CommandHandler = class {
 };
 
 // src/handlers/event-handler/EventHandler.ts
+var import_rfdc2 = __toESM(require("rfdc"));
+var clone2 = (0, import_rfdc2.default)();
 var EventHandler = class {
   #data;
   constructor({ ...options }) {
@@ -657,8 +661,9 @@ var EventHandler = class {
     const eventFolderPaths = getFolderPaths(this.#data.eventsPath);
     for (const eventFolderPath of eventFolderPaths) {
       const eventName = eventFolderPath.replace(/\\\\|\\/g, "/").split("/").pop();
+      const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
       const eventFilePaths = getFilePaths(eventFolderPath, true).filter(
-        (path3) => path3.endsWith(".js") || path3.endsWith(".ts")
+        (path3) => allowedExtensions.test(path3)
       );
       const eventObj = {
         name: eventName,
@@ -667,7 +672,11 @@ var EventHandler = class {
       this.#data.events.push(eventObj);
       for (const eventFilePath of eventFilePaths) {
         const modulePath = toFileURL(eventFilePath);
-        let eventFunction = (await import(modulePath)).default;
+        let importedFunction = (await import(`${modulePath}?t=${Date.now()}`)).default;
+        let eventFunction = clone2(importedFunction);
+        if (typeof module !== "undefined" && typeof require !== "undefined") {
+          delete require.cache[require.resolve(eventFilePath)];
+        }
         if (eventFunction?.default) {
           eventFunction = eventFunction.default;
         }
@@ -701,9 +710,17 @@ var EventHandler = class {
   get events() {
     return this.#data.events;
   }
+  async reloadEvents() {
+    await this.#buildEvents();
+    this.#data.events = [];
+    this.#data.client.removeAllListeners();
+    this.#registerEvents();
+  }
 };
 
 // src/handlers/validation-handler/ValidationHandler.ts
+var import_rfdc3 = __toESM(require("rfdc"));
+var clone3 = (0, import_rfdc3.default)();
 var ValidationHandler = class {
   #data;
   constructor({ ...options }) {
@@ -716,12 +733,17 @@ var ValidationHandler = class {
     await this.#buildValidations();
   }
   async #buildValidations() {
+    const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
     const validationFilePaths = getFilePaths(this.#data.validationsPath, true).filter(
-      (path3) => path3.endsWith(".js") || path3.endsWith(".ts")
+      (path3) => allowedExtensions.test(path3)
     );
     for (const validationFilePath of validationFilePaths) {
       const modulePath = toFileURL(validationFilePath);
-      let validationFunction = (await import(modulePath)).default;
+      let importedFunction = (await import(`${modulePath}?t=${Date.now()}`)).default;
+      let validationFunction = clone3(importedFunction);
+      if (typeof module !== "undefined" && typeof require !== "undefined") {
+        delete require.cache[require.resolve(validationFilePath)];
+      }
       if (validationFunction?.default) {
         validationFunction = validationFunction.default;
       }
@@ -740,6 +762,10 @@ var ValidationHandler = class {
   get validations() {
     return this.#data.validations;
   }
+  async reloadValidations() {
+    this.#data.validations = [];
+    await this.#buildValidations();
+  }
 };
 
 // src/CommandKit.ts
@@ -786,7 +812,7 @@ var CommandKit = class {
         customValidations: validationFunctions,
         skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
         handler: this,
-        useRest: this.#data.useRest || false
+        bulkRegister: this.#data.bulkRegister || false
       });
       await commandHandler.init();
       this.#data.commandHandler = commandHandler;
@@ -794,13 +820,28 @@ var CommandKit = class {
   }
   /**
    * Updates application commands with the latest from "commandsPath".
-   * @experimental
    */
   async reloadCommands(type) {
     if (!this.#data.commandHandler)
       return;
     await this.#data.commandHandler.reloadCommands(type);
   }
+  /**
+   * Updates application events with the latest from "eventsPath".
+   */
+  async reloadEvents() {
+    if (!this.#data.eventHandler)
+      return;
+    await this.#data.eventHandler.reloadEvents();
+  }
+  /**
+   * Updates application command validations with the latest from "validationsPath".
+   */
+  async reloadValidations() {
+    if (!this.#data.validationHandler)
+      return;
+    await this.#data.validationHandler.reloadValidations();
+  }
   /**
    * @returns An array of objects of all the commands that CommandKit is handling.
    */

package/dist/index.mjs

@@ -209,22 +209,20 @@ async function registerGlobalCommands(client, commands) {
           )
         );
       } else {
-        targetCommand.delete().then(() => {
+        await targetCommand.delete().catch((error) => {
           console.log(
-            colors_default.green(`\u{1F6AE} Deleted command "${command.data.name}" globally.`)
+            colors_default.red(`\u274C Failed to delete command "${command.data.name}" globally.`)
           );
+          console.error(error);
         });
+        console.log(colors_default.green(`\u{1F6AE} Deleted command "${command.data.name}" globally.`));
       }
       continue;
     }
     if (targetCommand) {
       const commandsAreDifferent = areSlashCommandsDifferent(targetCommand, command.data);
       if (commandsAreDifferent) {
-        targetCommand.edit(command.data).then(() => {
-          console.log(
-            colors_default.green(`\u2705 Edited command "${command.data.name}" globally.`)
-          );
-        }).catch((error) => {
+        await targetCommand.edit(command.data).catch((error) => {
           console.log(
             colors_default.red(
               `\u274C Failed to edit command "${command.data.name}" globally.`
@@ -232,19 +230,19 @@ async function registerGlobalCommands(client, commands) {
           );
           console.error(error);
         });
+        console.log(colors_default.green(`\u2705 Edited command "${command.data.name}" globally.`));
         continue;
       }
     }
     if (targetCommand)
       continue;
-    appCommandsManager.create(command.data).then(() => {
-      console.log(colors_default.green(`\u2705 Registered command "${command.data.name}" globally.`));
-    }).catch((error) => {
+    await appCommandsManager.create(command.data).catch((error) => {
       console.log(
         colors_default.red(`\u274C Failed to register command "${command.data.name}" globally.`)
       );
       console.error(error);
     });
+    console.log(colors_default.green(`\u2705 Registered command "${command.data.name}" globally.`));
   }
 }
 async function registerDevCommands(client, commands, guildIds) {
@@ -278,26 +276,26 @@ async function registerDevCommands(client, commands, guildIds) {
             )
           );
         } else {
-          targetCommand.delete().then(() => {
+          await targetCommand.delete().catch((error) => {
             console.log(
-              colors_default.green(
-                `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`
+              colors_default.red(
+                `\u274C Failed to delete command "${command.data.name}" in ${guildCommands.guild.name}.`
               )
             );
+            console.error(error);
           });
+          console.log(
+            colors_default.green(
+              `\u{1F6AE} Deleted command "${command.data.name}" in ${guildCommands.guild.name}.`
+            )
+          );
         }
         continue;
       }
       if (targetCommand) {
         const commandsAreDifferent = areSlashCommandsDifferent(targetCommand, command.data);
         if (commandsAreDifferent) {
-          targetCommand.edit(command.data).then(() => {
-            console.log(
-              colors_default.green(
-                `\u2705 Edited command "${command.data.name}" in ${guildCommands.guild.name}.`
-              )
-            );
-          }).catch((error) => {
+          await targetCommand.edit(command.data).catch((error) => {
             console.log(
               colors_default.red(
                 `\u274C Failed to edit command "${command.data.name}" in ${guildCommands.guild.name}.`
@@ -305,18 +303,17 @@ async function registerDevCommands(client, commands, guildIds) {
             );
             console.error(error);
           });
+          console.log(
+            colors_default.green(
+              `\u2705 Edited command "${command.data.name}" in ${guildCommands.guild.name}.`
+            )
+          );
           continue;
         }
       }
       if (targetCommand)
         continue;
-      guildCommands.create(command.data).then(() => {
-        console.log(
-          colors_default.green(
-            `\u2705 Registered command "${command.data.name}" in ${guildCommands.guild.name}.`
-          )
-        );
-      }).catch((error) => {
+      await guildCommands.create(command.data).catch((error) => {
         console.log(
           colors_default.red(
             `\u274C Failed to register command "${command.data.name}" in ${guildCommands.guild.name}.`
@@ -324,6 +321,11 @@ async function registerDevCommands(client, commands, guildIds) {
         );
         console.error(error);
       });
+      console.log(
+        colors_default.green(
+          `\u2705 Registered command "${command.data.name}" in ${guildCommands.guild.name}.`
+        )
+      );
     }
   }
 }
@@ -455,7 +457,7 @@ var CommandHandler = class {
         )
       );
     }
-    if (this.#data.useRest) {
+    if (this.#data.bulkRegister) {
       await loadCommandsWithRest({
         client: this.#data.client,
         devGuildIds: this.#data.devGuildIds,
@@ -590,7 +592,7 @@ var CommandHandler = class {
   async reloadCommands(type) {
     this.#data.commands = [];
     await this.#buildCommands();
-    if (this.#data.useRest) {
+    if (this.#data.bulkRegister) {
       await loadCommandsWithRest({
         client: this.#data.client,
         devGuildIds: this.#data.devGuildIds,
@@ -611,6 +613,8 @@ var CommandHandler = class {
 };
 
 // src/handlers/event-handler/EventHandler.ts
+import rdfc2 from "rfdc";
+var clone2 = rdfc2();
 var EventHandler = class {
   #data;
   constructor({ ...options }) {
@@ -627,8 +631,9 @@ var EventHandler = class {
     const eventFolderPaths = getFolderPaths(this.#data.eventsPath);
     for (const eventFolderPath of eventFolderPaths) {
       const eventName = eventFolderPath.replace(/\\\\|\\/g, "/").split("/").pop();
+      const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
       const eventFilePaths = getFilePaths(eventFolderPath, true).filter(
-        (path3) => path3.endsWith(".js") || path3.endsWith(".ts")
+        (path3) => allowedExtensions.test(path3)
       );
       const eventObj = {
         name: eventName,
@@ -637,7 +642,11 @@ var EventHandler = class {
       this.#data.events.push(eventObj);
       for (const eventFilePath of eventFilePaths) {
         const modulePath = toFileURL(eventFilePath);
-        let eventFunction = (await import(modulePath)).default;
+        let importedFunction = (await import(`${modulePath}?t=${Date.now()}`)).default;
+        let eventFunction = clone2(importedFunction);
+        if (typeof module !== "undefined" && typeof __require !== "undefined") {
+          delete __require.cache[__require.resolve(eventFilePath)];
+        }
         if (eventFunction?.default) {
           eventFunction = eventFunction.default;
         }
@@ -671,9 +680,17 @@ var EventHandler = class {
   get events() {
     return this.#data.events;
   }
+  async reloadEvents() {
+    await this.#buildEvents();
+    this.#data.events = [];
+    this.#data.client.removeAllListeners();
+    this.#registerEvents();
+  }
 };
 
 // src/handlers/validation-handler/ValidationHandler.ts
+import rdfc3 from "rfdc";
+var clone3 = rdfc3();
 var ValidationHandler = class {
   #data;
   constructor({ ...options }) {
@@ -686,12 +703,17 @@ var ValidationHandler = class {
     await this.#buildValidations();
   }
   async #buildValidations() {
+    const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
     const validationFilePaths = getFilePaths(this.#data.validationsPath, true).filter(
-      (path3) => path3.endsWith(".js") || path3.endsWith(".ts")
+      (path3) => allowedExtensions.test(path3)
     );
     for (const validationFilePath of validationFilePaths) {
       const modulePath = toFileURL(validationFilePath);
-      let validationFunction = (await import(modulePath)).default;
+      let importedFunction = (await import(`${modulePath}?t=${Date.now()}`)).default;
+      let validationFunction = clone3(importedFunction);
+      if (typeof module !== "undefined" && typeof __require !== "undefined") {
+        delete __require.cache[__require.resolve(validationFilePath)];
+      }
       if (validationFunction?.default) {
         validationFunction = validationFunction.default;
       }
@@ -710,6 +732,10 @@ var ValidationHandler = class {
   get validations() {
     return this.#data.validations;
   }
+  async reloadValidations() {
+    this.#data.validations = [];
+    await this.#buildValidations();
+  }
 };
 
 // src/CommandKit.ts
@@ -756,7 +782,7 @@ var CommandKit = class {
         customValidations: validationFunctions,
         skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
         handler: this,
-        useRest: this.#data.useRest || false
+        bulkRegister: this.#data.bulkRegister || false
       });
       await commandHandler.init();
       this.#data.commandHandler = commandHandler;
@@ -764,13 +790,28 @@ var CommandKit = class {
   }
   /**
    * Updates application commands with the latest from "commandsPath".
-   * @experimental
    */
   async reloadCommands(type) {
     if (!this.#data.commandHandler)
       return;
     await this.#data.commandHandler.reloadCommands(type);
   }
+  /**
+   * Updates application events with the latest from "eventsPath".
+   */
+  async reloadEvents() {
+    if (!this.#data.eventHandler)
+      return;
+    await this.#data.eventHandler.reloadEvents();
+  }
+  /**
+   * Updates application command validations with the latest from "validationsPath".
+   */
+  async reloadValidations() {
+    if (!this.#data.validationHandler)
+      return;
+    await this.#data.validationHandler.reloadValidations();
+  }
   /**
    * @returns An array of objects of all the commands that CommandKit is handling.
    */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commandkit",
   "description": "Beginner friendly command & event handler for Discord.js",
-  "version": "0.1.3-dev.20231002185336",
+  "version": "0.1.3-dev.20231002200254",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",