commandkit 0.1.3-dev.20231003081511 → 0.1.3-dev.20231003092307

package/dist/index.js

@@ -500,7 +500,7 @@ var CommandHandler = class {
         commands: this.#data.commands
       });
     }
-    this.#handleCommands();
+    this.handleCommands();
   }
   async #buildCommands() {
     const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
@@ -564,7 +564,7 @@ var CommandHandler = class {
       this.#data.builtInValidations.push(validationFunction);
     }
   }
-  #handleCommands() {
+  handleCommands() {
     this.#data.client.on("interactionCreate", async (interaction) => {
       if (!interaction.isChatInputCommand() && !interaction.isContextMenuCommand())
         return;
@@ -579,21 +579,24 @@ var CommandHandler = class {
         options: targetCommand.options,
         ...rest
       };
-      let canRun = true;
-      for (const validationFunction of this.#data.customValidations) {
-        const stopValidationLoop = await validationFunction({
-          interaction,
-          commandObj,
-          client: this.#data.client,
-          handler: this.#data.handler
-        });
-        if (stopValidationLoop) {
-          canRun = false;
-          break;
+      if (this.#data.validationHandler) {
+        let canRun2 = true;
+        for (const validationFunction of this.#data.validationHandler.validations) {
+          const stopValidationLoop = await validationFunction({
+            interaction,
+            commandObj,
+            client: this.#data.client,
+            handler: this.#data.commandkitInstance
+          });
+          if (stopValidationLoop) {
+            canRun2 = false;
+            break;
+          }
         }
+        if (!canRun2)
+          return;
       }
-      if (!canRun)
-        return;
+      let canRun = true;
       if (!this.#data.skipBuiltInValidations) {
         for (const validation of this.#data.builtInValidations) {
           const stopValidationLoop = validation({
@@ -612,7 +615,7 @@ var CommandHandler = class {
       targetCommand.run({
         interaction,
         client: this.#data.client,
-        handler: this.#data.handler
+        handler: this.#data.commandkitInstance
       });
     });
   }
@@ -640,6 +643,8 @@ var CommandHandler = class {
       });
     }
   }
+  async useUpdatedValidations() {
+  }
 };
 
 // src/handlers/event-handler/EventHandler.ts
@@ -710,11 +715,12 @@ var EventHandler = class {
   get events() {
     return this.#data.events;
   }
-  async reloadEvents() {
-    await this.#buildEvents();
+  async reloadEvents(commandHandler) {
     this.#data.events = [];
+    await this.#buildEvents();
     this.#data.client.removeAllListeners();
     this.#registerEvents();
+    commandHandler?.handleCommands();
   }
 };
 
@@ -793,13 +799,10 @@ var CommandKit = class {
       await eventHandler.init();
       this.#data.eventHandler = eventHandler;
     }
-    let validationFunctions = [];
     if (this.#data.validationsPath) {
       const validationHandler = new ValidationHandler({
         validationsPath: this.#data.validationsPath
       });
-      await validationHandler.init();
-      validationHandler.validations.forEach((v) => validationFunctions.push(v));
       this.#data.validationHandler = validationHandler;
     }
     if (this.#data.commandsPath) {
@@ -809,9 +812,9 @@ var CommandKit = class {
         devGuildIds: this.#data.devGuildIds || [],
         devUserIds: this.#data.devUserIds || [],
         devRoleIds: this.#data.devRoleIds || [],
-        customValidations: validationFunctions,
+        validationHandler: this.#data.validationHandler,
         skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
-        handler: this,
+        commandkitInstance: this,
         bulkRegister: this.#data.bulkRegister || false
       });
       await commandHandler.init();
@@ -832,7 +835,7 @@ var CommandKit = class {
   async reloadEvents() {
     if (!this.#data.eventHandler)
       return;
-    await this.#data.eventHandler.reloadEvents();
+    await this.#data.eventHandler.reloadEvents(this.#data.commandHandler);
   }
   /**
    * Updates application command validations with the latest from "validationsPath".

package/dist/index.mjs

@@ -470,7 +470,7 @@ var CommandHandler = class {
         commands: this.#data.commands
       });
     }
-    this.#handleCommands();
+    this.handleCommands();
   }
   async #buildCommands() {
     const allowedExtensions = /\.(js|mjs|cjs|ts)$/i;
@@ -534,7 +534,7 @@ var CommandHandler = class {
       this.#data.builtInValidations.push(validationFunction);
     }
   }
-  #handleCommands() {
+  handleCommands() {
     this.#data.client.on("interactionCreate", async (interaction) => {
       if (!interaction.isChatInputCommand() && !interaction.isContextMenuCommand())
         return;
@@ -549,21 +549,24 @@ var CommandHandler = class {
         options: targetCommand.options,
         ...rest
       };
-      let canRun = true;
-      for (const validationFunction of this.#data.customValidations) {
-        const stopValidationLoop = await validationFunction({
-          interaction,
-          commandObj,
-          client: this.#data.client,
-          handler: this.#data.handler
-        });
-        if (stopValidationLoop) {
-          canRun = false;
-          break;
+      if (this.#data.validationHandler) {
+        let canRun2 = true;
+        for (const validationFunction of this.#data.validationHandler.validations) {
+          const stopValidationLoop = await validationFunction({
+            interaction,
+            commandObj,
+            client: this.#data.client,
+            handler: this.#data.commandkitInstance
+          });
+          if (stopValidationLoop) {
+            canRun2 = false;
+            break;
+          }
         }
+        if (!canRun2)
+          return;
       }
-      if (!canRun)
-        return;
+      let canRun = true;
       if (!this.#data.skipBuiltInValidations) {
         for (const validation of this.#data.builtInValidations) {
           const stopValidationLoop = validation({
@@ -582,7 +585,7 @@ var CommandHandler = class {
       targetCommand.run({
         interaction,
         client: this.#data.client,
-        handler: this.#data.handler
+        handler: this.#data.commandkitInstance
       });
     });
   }
@@ -610,6 +613,8 @@ var CommandHandler = class {
       });
     }
   }
+  async useUpdatedValidations() {
+  }
 };
 
 // src/handlers/event-handler/EventHandler.ts
@@ -680,11 +685,12 @@ var EventHandler = class {
   get events() {
     return this.#data.events;
   }
-  async reloadEvents() {
-    await this.#buildEvents();
+  async reloadEvents(commandHandler) {
     this.#data.events = [];
+    await this.#buildEvents();
     this.#data.client.removeAllListeners();
     this.#registerEvents();
+    commandHandler?.handleCommands();
   }
 };
 
@@ -763,13 +769,10 @@ var CommandKit = class {
       await eventHandler.init();
       this.#data.eventHandler = eventHandler;
     }
-    let validationFunctions = [];
     if (this.#data.validationsPath) {
       const validationHandler = new ValidationHandler({
         validationsPath: this.#data.validationsPath
       });
-      await validationHandler.init();
-      validationHandler.validations.forEach((v) => validationFunctions.push(v));
       this.#data.validationHandler = validationHandler;
     }
     if (this.#data.commandsPath) {
@@ -779,9 +782,9 @@ var CommandKit = class {
         devGuildIds: this.#data.devGuildIds || [],
         devUserIds: this.#data.devUserIds || [],
         devRoleIds: this.#data.devRoleIds || [],
-        customValidations: validationFunctions,
+        validationHandler: this.#data.validationHandler,
         skipBuiltInValidations: this.#data.skipBuiltInValidations || false,
-        handler: this,
+        commandkitInstance: this,
         bulkRegister: this.#data.bulkRegister || false
       });
       await commandHandler.init();
@@ -802,7 +805,7 @@ var CommandKit = class {
   async reloadEvents() {
     if (!this.#data.eventHandler)
       return;
-    await this.#data.eventHandler.reloadEvents();
+    await this.#data.eventHandler.reloadEvents(this.#data.commandHandler);
   }
   /**
    * Updates application command validations with the latest from "validationsPath".

package/package.json

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