bakit 2.0.0-alpha.12 → 2.0.0-alpha.14

package/dist/bin/bakit.js

@@ -0,0 +1,100 @@
+import { config } from 'dotenv';
+import { program } from 'commander';
+import { fork } from 'child_process';
+import chokidar from 'chokidar';
+import path, { resolve, relative, sep } from 'path';
+import { createJiti } from 'jiti';
+
+// src/bin/bakit.ts
+var Module = class {
+  static jiti = createJiti(process.cwd());
+  static async import(module, defaultImport = false) {
+    let path2 = resolve(module);
+    try {
+      return await this.jiti.import(path2, { default: defaultImport });
+    } catch (error) {
+      return console.error(`[Module] Import failed for ${path2}:`, error), null;
+    }
+  }
+  static isLoaded(module) {
+    let path2 = resolve(module);
+    return !!path2 && !!this.jiti.cache[path2];
+  }
+  static unload(module) {
+    let path2 = resolve(module);
+    return !path2 || !this.jiti.cache[path2] ? false : (delete this.jiti.cache[path2], true);
+  }
+  static getTopLevel(path2, entryDir) {
+    return relative(entryDir, path2).split(sep)[0] ?? null;
+  }
+};
+
+// src/base/process/DevProcessManager.ts
+var DevProcessManager = class {
+  constructor(options) {
+    this.options = options;
+  }
+  child = null;
+  restartTimer = null;
+  start() {
+    console.log("Starting bakit in dev mode..."), this.startChild(), this.startWatcher();
+  }
+  startChild() {
+    if (this.child) return;
+    let entry = path.resolve(this.options.entry);
+    this.child = fork(entry, {
+      execArgv: ["--import", "tsx"],
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        NODE_ENV: "development"
+      }
+    }), this.child.on("exit", () => {
+      this.child = null;
+    });
+  }
+  restartChild() {
+    if (!this.child)
+      return this.startChild();
+    let old = this.child;
+    old.once("exit", () => {
+      this.child = null, this.startChild();
+    }), old.kill("SIGTERM");
+  }
+  startWatcher() {
+    let { rootDir } = this.options;
+    chokidar.watch(rootDir, {
+      ignoreInitial: true,
+      awaitWriteFinish: {
+        stabilityThreshold: 200,
+        pollInterval: 50
+      }
+    }).on("change", (file) => this.onFileChanged(file));
+  }
+  onFileChanged(file) {
+    if (!this.child)
+      return;
+    let top = Module.getTopLevel(file, this.options.rootDir);
+    if (top && this.options.hotDirs.includes(top)) {
+      this.child.connected && this.child.send({ type: `hmr:${top}`, file });
+      return;
+    }
+    this.scheduleRestart();
+  }
+  scheduleRestart() {
+    this.restartTimer && clearTimeout(this.restartTimer), this.restartTimer = setTimeout(() => {
+      console.log("Detected changes, restarting..."), this.restartChild(), this.restartTimer = null;
+    }, 150);
+  }
+};
+
+// src/bin/bakit.ts
+program.name("bakit");
+program.command("dev").action(() => {
+  config({ path: [".env.local", ".env"], quiet: true }), new DevProcessManager({
+    rootDir: "src",
+    entry: "src/index.ts",
+    hotDirs: ["commands", "listeners"]
+  }).start();
+});
+program.parse();

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;
 }
 

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,10 +589,7 @@ 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);
+    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}`), filtered;
   }
   /**
@@ -681,10 +672,7 @@ 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);
+    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}`), filtered;
   }
   /**

package/package.json

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