bakit 2.0.0-alpha.13 → 2.0.0-alpha.15

package/dist/bin/bakit.js

@@ -2,17 +2,14 @@ import { config } from 'dotenv';
 import { program } from 'commander';
 import { fork } from 'child_process';
 import chokidar from 'chokidar';
-import path, { relative, sep } from 'path';
+import path, { resolve, relative, sep } from 'path';
 import { createJiti } from 'jiti';
-import { fileURLToPath } from 'url';
 
 // src/bin/bakit.ts
 var Module = class {
   static jiti = createJiti(process.cwd());
   static async import(module, defaultImport = false) {
-    let path2 = this.resolve(module);
-    if (!path2)
-      return null;
+    let path2 = resolve(module);
     try {
       return await this.jiti.import(path2, { default: defaultImport });
     } catch (error) {
@@ -20,21 +17,13 @@ var Module = class {
     }
   }
   static isLoaded(module) {
-    let path2 = this.resolve(module);
+    let path2 = resolve(module);
     return !!path2 && !!this.jiti.cache[path2];
   }
   static unload(module) {
-    let path2 = this.resolve(module);
+    let path2 = resolve(module);
     return !path2 || !this.jiti.cache[path2] ? false : (delete this.jiti.cache[path2], true);
   }
-  static resolve(module) {
-    try {
-      let url = this.jiti.esmResolve(module);
-      return fileURLToPath(url);
-    } catch {
-      return null;
-    }
-  }
   static getTopLevel(path2, entryDir) {
     return relative(entryDir, path2).split(sep)[0] ?? null;
   }

package/dist/index.d.ts

@@ -45,7 +45,6 @@ declare class Module {
     static import<T>(module: string, defaultImport?: boolean): Promise<T | null>;
     static isLoaded(module: string): boolean;
     static unload(module: string): boolean;
-    static resolve(module: string): string | null;
     static getTopLevel(path: string, entryDir: string): string | null;
 }
 
@@ -322,6 +321,7 @@ declare class CommandManager extends BaseClientManager {
      * @returns The command object if unloaded successfully.
      */
     unload(path: string): Promise<Command | undefined>;
+    reload(path: string): Promise<Command<any[]> | undefined>;
     /**
      * Add a command to the registry.
      * @param command Command to add.
@@ -374,6 +374,7 @@ declare class ListenerManager extends BaseClientManager {
      * @returns The listener object if unloaded successfully.
      */
     unload(path: string): Promise<Listener | undefined>;
+    reload(path: string): Promise<Listener<keyof BakitClientEvents> | undefined>;
     /**
      * Add a listener to the registry and create a listener for client.
      * @param listener Listener to add.

package/dist/index.js

@@ -2,8 +2,7 @@ import { GatewayIntentBits, Events, Client, Collection, IntentsBitField, SlashCo
 import z4, { z } from 'zod';
 import glob from 'tiny-glob';
 import { createJiti } from 'jiti';
-import { fileURLToPath } from 'url';
-import path, { relative, sep, posix, join, dirname } from 'path';
+import path, { resolve, relative, sep, posix, join, dirname } from 'path';
 import { inspect } from 'util';
 import { fork } from 'child_process';
 import chokidar from 'chokidar';
@@ -138,9 +137,7 @@ function extractSnowflakeId(input) {
 var Module = class {
   static jiti = createJiti(process.cwd());
   static async import(module, defaultImport = false) {
-    let path2 = this.resolve(module);
-    if (!path2)
-      return null;
+    let path2 = resolve(module);
     try {
       return await this.jiti.import(path2, { default: defaultImport });
     } catch (error) {
@@ -148,21 +145,13 @@ var Module = class {
     }
   }
   static isLoaded(module) {
-    let path2 = this.resolve(module);
+    let path2 = resolve(module);
     return !!path2 && !!this.jiti.cache[path2];
   }
   static unload(module) {
-    let path2 = this.resolve(module);
+    let path2 = resolve(module);
     return !path2 || !this.jiti.cache[path2] ? false : (delete this.jiti.cache[path2], true);
   }
-  static resolve(module) {
-    try {
-      let url = this.jiti.esmResolve(module);
-      return fileURLToPath(url);
-    } catch {
-      return null;
-    }
-  }
   static getTopLevel(path2, entryDir) {
     return relative(entryDir, path2).split(sep)[0] ?? null;
   }
@@ -194,7 +183,10 @@ var ProjectConfigSchema = z.object({
 function defineConfig(config) {
   return config;
 }
+var _config;
 async function loadConfig(cwd = process.cwd()) {
+  if (_config)
+    return console.warn("loadConfig() was called more than once. This shouldn't happen."), _config;
   let globPattern = `bakit.config.{${["ts", "js"].join(",")}}`, [configPath, other] = await glob(globPattern, {
     cwd: cwd.replace(/\\/g, "/"),
     // ensure the path uses `/` instead of `\` on Windows
@@ -204,10 +196,12 @@ async function loadConfig(cwd = process.cwd()) {
     throw new Error("Missing config file");
   other && console.warn(`Multiple config files found in ${cwd}. Using ${configPath}.`);
   let config = await Module.import(configPath, true);
-  return Object.freeze(await ProjectConfigSchema.parseAsync(config));
+  return _config = Object.freeze(await ProjectConfigSchema.parseAsync(config)), _config;
 }
 function getConfig() {
-  throw new Error("Project config is not loaded.");
+  if (!_config)
+    throw new Error("Project config is not loaded.");
+  return _config;
 }
 
 // src/base/lifecycle/Context.ts
@@ -595,11 +589,8 @@ var CommandManager = class extends BaseClientManager {
   commands = new Collection();
   entries = new Collection();
   async loadModules(entryDir) {
-    let pattern = posix.join(posix.resolve(entryDir), "commands", "**/*.{ts,js}"), files = await glob(pattern, {
-      cwd: process.cwd(),
-      absolute: true
-    }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((c) => !!c);
-    return console.log(`[Loader] Loaded ${filtered.length}/${files.length}`), filtered;
+    let pattern = posix.join(posix.resolve(entryDir), "commands", "**/*.{ts,js}"), files = await glob(pattern, { cwd: process.cwd() }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((c) => !!c);
+    return console.log(`[Loader] Loaded ${filtered.length}/${files.length} command(s)`), filtered;
   }
   /**
    * Load the file and add the command to the registry.
@@ -628,6 +619,12 @@ var CommandManager = class extends BaseClientManager {
     if (Module.isLoaded(path2) && (command ??= await Module.import(path2, true), Module.unload(path2)), this.entries.delete(path2), !!command)
       return this.remove(command);
   }
+  async reload(path2) {
+    await this.unload(path2);
+    let command = await this.load(path2);
+    if (command)
+      return console.log(`[Loader] Reloaded command'${command.options.name}' at '${path2}'`), command;
+  }
   /**
    * Add a command to the registry.
    * @param command Command to add.
@@ -681,11 +678,8 @@ var ListenerManager = class extends BaseClientManager {
   entries = new Collection();
   executors = /* @__PURE__ */ new WeakMap();
   async loadModules(entryDir) {
-    let pattern = posix.join(posix.resolve(entryDir), "listeners", "**/*.{ts,js}"), files = await glob(pattern, {
-      cwd: process.cwd(),
-      absolute: true
-    }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((l) => !!l);
-    return console.log(`[Loader] Loaded ${filtered.length}/${files.length}`), filtered;
+    let pattern = posix.join(posix.resolve(entryDir), "listeners", "**/*.{ts,js}"), files = await glob(pattern, { cwd: process.cwd() }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((l) => !!l);
+    return console.log(`[Loader] Loaded ${filtered.length}/${files.length} listener(s)`), filtered;
   }
   /**
    * Load the file and add the listener to the registry.
@@ -714,6 +708,12 @@ var ListenerManager = class extends BaseClientManager {
     if (Module.isLoaded(path2) && (listener ??= await Module.import(path2, true), Module.unload(path2)), this.entries.delete(path2), !!listener)
       return this.remove(listener)?.[0];
   }
+  async reload(path2) {
+    await this.unload(path2);
+    let listener = await this.load(path2);
+    if (listener)
+      return console.log(`[Loader] Reloaded listener '${listener.options.name}' at '${path2}'`), listener;
+  }
   /**
    * Add a listener to the registry and create a listener for client.
    * @param listener Listener to add.
@@ -1001,10 +1001,10 @@ var Instance = class {
     let target = type.split(":")[1], { listeners, commands } = this.client.managers;
     switch (target) {
       case "listeners":
-        listeners.unload(file), await listeners.load(file);
+        await listeners.reload(file);
         break;
       case "commands":
-        commands.unload(file), await listeners.load(file);
+        await commands.reload(file);
         break;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bakit",
-	"version": "2.0.0-alpha.13",
+	"version": "2.0.0-alpha.15",
 	"description": "A framework for discord.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",