bakit 2.0.0-alpha.11 → 2.0.0-alpha.13

package/dist/bin/bakit.js

@@ -0,0 +1,111 @@
+import { config } from 'dotenv';
+import { program } from 'commander';
+import { fork } from 'child_process';
+import chokidar from 'chokidar';
+import path, { 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;
+    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 = this.resolve(module);
+    return !!path2 && !!this.jiti.cache[path2];
+  }
+  static unload(module) {
+    let path2 = this.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;
+  }
+};
+
+// 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

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, ClientOptions, ChatInputCommandInteraction, CacheType, Message, User, MessageCreateOptions, InteractionReplyOptions, Awaitable, Collection, Events, IntentsBitField, Client, ClientEvents } from 'discord.js';
+import { GatewayIntentBits, ClientOptions, ChatInputCommandInteraction, CacheType, Message, User, MessageCreateOptions, InteractionReplyOptions, Awaitable, Collection, Events, IntentsBitField, ClientEvents, Client } from 'discord.js';
 import z$1, { z } from 'zod';
 import * as jiti from 'jiti';
 import { inspect } from 'node:util';
@@ -7,7 +7,6 @@ import { inspect } from 'node:util';
 declare const ProjectConfigSchema: z.ZodObject<{
     intents: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"auto">, z.ZodBigInt, z.ZodArray<z.ZodEnum<typeof GatewayIntentBits>>]>>;
     clientOptions: z.ZodOptional<z.ZodCustom<Omit<ClientOptions, "intents">, Omit<ClientOptions, "intents">>>;
-    entryDir: z.ZodDefault<z.ZodString>;
     prefixes: z.ZodDefault<z.ZodArray<z.ZodString>>;
     token: z.ZodString;
 }, z.core.$strip>;
@@ -41,7 +40,14 @@ declare function tokenize(content: string): string[];
  */
 declare function extractSnowflakeId(input: string): string | null;
 
-declare const $jiti: jiti.Jiti;
+declare class Module {
+    static jiti: jiti.Jiti;
+    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;
+}
 
 declare class Context {
     canceled: boolean;
@@ -295,11 +301,43 @@ declare function defineCommand<const ParamsList extends readonly AnyParam<any>[]
     params?: ParamsList;
 }) | string): Command<ParamsList>;
 
+declare class BaseClientManager {
+    client: BakitClient;
+    constructor(client: BakitClient);
+}
+
 declare class CommandManager extends BaseClientManager {
     commands: Collection<string, Command<any[]>>;
-    loadModules(): Promise<Command[]>;
+    entries: Collection<string, Command<any[]>>;
+    loadModules(entryDir: string): Promise<Command[]>;
+    /**
+     * Load the file and add the command to the registry.
+     * @param path The path to the command file.
+     * @returns The command object if added successfully.
+     */
+    load(path: string): Promise<Command | undefined>;
+    /**
+     * Unload the file and remove the command from the registry.
+     * @param path The path to the command file.
+     * @returns The command object if unloaded successfully.
+     */
+    unload(path: string): Promise<Command | undefined>;
+    /**
+     * Add a command to the registry.
+     * @param command Command to add.
+     */
     add(command: Command): void;
+    /**
+     * Remove a command from the registry.
+     * @param target Command name or object to remove.
+     * @returns The command object if removed successfully.
+     */
     remove(target: string | Command): Command | undefined;
+    /**
+     * Get a command using its name.
+     * @param name The command to get.
+     * @returns The command object.
+     */
     get(name: string): Command<any[]> | undefined;
 }
 
@@ -321,11 +359,41 @@ declare function defineListener<const K extends EventKey = EventKey>(options: K
 
 declare class ListenerManager extends BaseClientManager {
     listeners: Listener[];
+    entries: Collection<string, Listener<keyof BakitClientEvents>>;
     private executors;
-    loadModules(): Promise<Listener[]>;
+    loadModules(entryDir: string): Promise<Listener[]>;
+    /**
+     * Load the file and add the listener to the registry.
+     * @param path The path to the listener file.
+     * @returns The listener object if added successfully.
+     */
+    load(path: string): Promise<Listener | undefined>;
+    /**
+     * Unload the file and remove the listener from the registry.
+     * @param path The path to the listener file.
+     * @returns The listener object if unloaded successfully.
+     */
+    unload(path: string): Promise<Listener | undefined>;
+    /**
+     * Add a listener to the registry and create a listener for client.
+     * @param listener Listener to add.
+     */
     add(listener: Listener): void;
+    /**
+     * Remove a listener from the registry and client.
+     * @param target Listener name or object to remove.
+     * @returns The list of listener objects if removed successfully.
+     */
     remove(target: string | Listener): Listener[];
+    /**
+     * Get a list of required intents for Bakit to run correctly.
+     * @returns Used intents.
+     */
     getBaseIntents(): IntentsBitField;
+    /**
+     * Get a list of needed intents based on registered listeners to receive needed events.
+     * @returns Used intents.
+     */
     getNeededIntents(): IntentsBitField;
 }
 
@@ -345,8 +413,10 @@ declare class Instance {
     cache: ProjectCacheManager;
     constructor();
     start(): Promise<void>;
+    private initProcess;
     private loadModules;
     private initIntents;
+    private onProcessMessage;
 }
 declare function useApp(): Instance;
 
@@ -379,11 +449,6 @@ declare class BakitClient<Ready extends boolean = boolean> extends Client<Ready>
     [inspect.custom](): string;
 }
 
-declare class BaseClientManager {
-    client: BakitClient;
-    constructor(client: BakitClient);
-}
-
 declare const Params: {
     readonly string: <Required extends boolean = true>(options: string | {
         name: string;
@@ -406,6 +471,24 @@ declare const Params: {
     }) => UserParam<Required>;
 };
 
+interface DevManagerOptions {
+    rootDir: string;
+    entry: string;
+    hotDirs: string[];
+}
+declare class DevProcessManager {
+    private options;
+    private child;
+    private restartTimer;
+    constructor(options: DevManagerOptions);
+    start(): void;
+    private startChild;
+    private restartChild;
+    private startWatcher;
+    private onFileChanged;
+    private scheduleRestart;
+}
+
 declare class BakitError extends Error {
     constructor(message: string);
 }
@@ -416,4 +499,4 @@ declare class ArgumentError extends BakitError {
     constructor(target: string, reason: string);
 }
 
-export { $jiti, type AnyParam, ArgumentError, BakitClient, type BakitClientEvents, BakitError, BaseClientManager, BaseCommandContext, BaseParam, type BaseParamOptions, BaseParamSchema, ChatInputContext, type ChatInputContextSendOptions, Command, type CommandContext, CommandManager, type CommandOptions, type CommandOptionsInput, CommandOptionsSchema, Context, type ContextSendOptions, EVENT_INTENT_MAPPING, type ErrorHookCallback, type GetPrefixFunction, HookOrder, HookState, type InferParamTuple, type InferParamValue, Instance, LifecycleManager, Listener, ListenerManager, type ListenerOptions, ListenerOptionsSchema, type MainHookCallback, MessageContext, type MessageContextSendOptions, type NumberOptions, NumberParam, NumberParamSchema, type ParamResolvedOutputType, ParamUserType, Params, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, loadConfig, tokenize, useApp, validateParamsOrder };
+export { type AnyParam, ArgumentError, BakitClient, type BakitClientEvents, BakitError, BaseClientManager, BaseCommandContext, BaseParam, type BaseParamOptions, BaseParamSchema, ChatInputContext, type ChatInputContextSendOptions, Command, type CommandContext, CommandManager, type CommandOptions, type CommandOptionsInput, CommandOptionsSchema, Context, type ContextSendOptions, DevProcessManager, EVENT_INTENT_MAPPING, type ErrorHookCallback, type GetPrefixFunction, HookOrder, HookState, type InferParamTuple, type InferParamValue, Instance, LifecycleManager, Listener, ListenerManager, type ListenerOptions, ListenerOptionsSchema, type MainHookCallback, MessageContext, type MessageContextSendOptions, Module, type NumberOptions, NumberParam, NumberParamSchema, type ParamResolvedOutputType, ParamUserType, Params, ProjectCacheManager, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, loadConfig, tokenize, useApp, validateParamsOrder };

package/dist/index.js

@@ -1,9 +1,12 @@
-import { GatewayIntentBits, Events, Client, IntentsBitField, Collection, SlashCommandBuilder, SlashCommandStringOption, SlashCommandNumberOption, SlashCommandUserOption, ChatInputCommandInteraction, Message } from 'discord.js';
+import { GatewayIntentBits, Events, Client, Collection, IntentsBitField, SlashCommandBuilder, SlashCommandStringOption, SlashCommandNumberOption, SlashCommandUserOption, ChatInputCommandInteraction, Message } from 'discord.js';
 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 { inspect } from 'util';
-import { posix, join, dirname } from 'path';
+import { fork } from 'child_process';
+import chokidar from 'chokidar';
 import { existsSync, mkdirSync, rmSync } from 'fs';
 import { mkdir, writeFile, readFile, rm } from 'fs/promises';
 import { createHash } from 'crypto';
@@ -132,9 +135,38 @@ function extractSnowflakeId(input) {
   let idMatch = /^(\d{17,20})$/.exec(input);
   return idMatch?.[1] ? idMatch[1] : null;
 }
-
-// src/utils/index.ts
-var $jiti = createJiti(import.meta.url);
+var Module = class {
+  static jiti = createJiti(process.cwd());
+  static async import(module, defaultImport = false) {
+    let path2 = this.resolve(module);
+    if (!path2)
+      return null;
+    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 = this.resolve(module);
+    return !!path2 && !!this.jiti.cache[path2];
+  }
+  static unload(module) {
+    let path2 = this.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;
+  }
+};
 
 // src/config.ts
 var ProjectConfigSchema = z.object({
@@ -156,22 +188,13 @@ var ProjectConfigSchema = z.object({
    * @see {@link https://discord.js.org/docs/packages/discord.js/main/ClientOptions:Interface}
    */
   clientOptions: z.custom().optional(),
-  /**
-   * The path to the main project source directory.
-   *
-   * @defaultvalue `src`
-   */
-  entryDir: z.string().default("src"),
   prefixes: z.array(z.string()).default([]),
   token: z.string()
 });
 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
@@ -180,22 +203,13 @@ async function loadConfig(cwd = process.cwd()) {
   if (!configPath)
     throw new Error("Missing config file");
   other && console.warn(`Multiple config files found in ${cwd}. Using ${configPath}.`);
-  let config = await $jiti.import(configPath, { default: true });
-  return _config = Object.freeze(await ProjectConfigSchema.parseAsync(config)), _config;
+  let config = await Module.import(configPath, true);
+  return Object.freeze(await ProjectConfigSchema.parseAsync(config));
 }
 function getConfig() {
-  if (!_config)
-    throw new Error("Project config is not loaded.");
-  return _config;
+  throw new Error("Project config is not loaded.");
 }
 
-// src/base/BaseClientManager.ts
-var BaseClientManager = class {
-  constructor(client) {
-    this.client = client;
-  }
-};
-
 // src/base/lifecycle/Context.ts
 var Context = class {
   canceled = false;
@@ -569,31 +583,55 @@ function defineCommand(options) {
   return new Command(options);
 }
 
+// src/base/client/BaseClientManager.ts
+var BaseClientManager = class {
+  constructor(client) {
+    this.client = client;
+  }
+};
+
 // src/base/command/CommandManager.ts
 var CommandManager = class extends BaseClientManager {
   commands = new Collection();
-  async loadModules() {
-    let entryDir = posix.resolve(getConfig().entryDir), pattern = posix.join(entryDir, "commands", "**/*.{ts,js}"), loads = (await glob(pattern, {
+  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
-    })).map(async (file) => {
-      try {
-        let command = await $jiti.import(file, { default: !0 });
-        if (!command) {
-          console.warn(`[Loader] File has no default export: ${file}`);
-          return;
-        }
-        if (!(command instanceof Command)) {
-          console.warn(`[Loader] Default export is not a Command: ${file}`);
-          return;
-        }
-        return this.add(command), command;
-      } catch (error) {
-        console.error(`An error occurred while trying to add command for '${file}':`, error);
-      }
-    }), loaded = (await Promise.all(loads)).filter((x) => x !== void 0);
-    return console.log(`Loaded ${loaded.length} command(s).`), loaded;
+    }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((c) => !!c);
+    return console.log(`[Loader] Loaded ${filtered.length}/${files.length}`), filtered;
+  }
+  /**
+   * Load the file and add the command to the registry.
+   * @param path The path to the command file.
+   * @returns The command object if added successfully.
+   */
+  async load(path2) {
+    let command = await Module.import(path2, true);
+    if (!command) {
+      console.warn(`[Loader] File has no default export: ${path2}`);
+      return;
+    }
+    if (!(command instanceof Command)) {
+      console.warn(`[Loader] Default export is not a Command: ${path2}`);
+      return;
+    }
+    return this.add(command), this.entries.set(path2, command), command;
   }
+  /**
+   * Unload the file and remove the command from the registry.
+   * @param path The path to the command file.
+   * @returns The command object if unloaded successfully.
+   */
+  async unload(path2) {
+    let command = this.entries.get(path2);
+    if (Module.isLoaded(path2) && (command ??= await Module.import(path2, true), Module.unload(path2)), this.entries.delete(path2), !!command)
+      return this.remove(command);
+  }
+  /**
+   * Add a command to the registry.
+   * @param command Command to add.
+   */
   add(command) {
     if (!(command instanceof Command))
       throw new Error("Invalid command provided");
@@ -604,11 +642,23 @@ var CommandManager = class extends BaseClientManager {
     }
     this.commands.set(name, command);
   }
+  /**
+   * Remove a command from the registry.
+   * @param target Command name or object to remove.
+   * @returns The command object if removed successfully.
+   */
   remove(target) {
+    if (typeof target != "string" && !(target instanceof Command))
+      return;
     let name = typeof target == "string" ? target : target.options.name, existing = this.commands.get(name);
     if (existing)
       return this.commands.delete(name), existing;
   }
+  /**
+   * Get a command using its name.
+   * @param name The command to get.
+   * @returns The command object.
+   */
   get(name) {
     return this.commands.get(name);
   }
@@ -628,40 +678,59 @@ function defineListener(options) {
 }
 var ListenerManager = class extends BaseClientManager {
   listeners = [];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  entries = new Collection();
   executors = /* @__PURE__ */ new WeakMap();
-  async loadModules() {
-    let entryDir = posix.resolve(getConfig().entryDir), pattern = posix.join(entryDir, "listeners", "**/*.{ts,js}"), loads = (await glob(pattern, {
+  async loadModules(entryDir) {
+    let pattern = posix.join(posix.resolve(entryDir), "listeners", "**/*.{ts,js}"), files = await glob(pattern, {
       cwd: process.cwd(),
       absolute: true
-    })).map(async (file) => {
-      try {
-        let listener = await $jiti.import(file, { default: !0 });
-        if (!listener) {
-          console.warn(`[Loader] File has no default export: ${file}`);
-          return;
-        }
-        if (!(listener instanceof Listener)) {
-          console.warn(`[Loader] Default export is not a Listener: ${file}`);
-          return;
-        }
-        return this.add(listener), listener;
-      } catch (error) {
-        console.error(`An error occurred while trying to add listener for '${file}':`, error);
-      }
-    }), loaded = (await Promise.all(loads)).filter((x) => x !== void 0);
-    return console.log(`Loaded ${loaded.length} listener(s).`), loaded;
+    }), filtered = (await Promise.all(files.map((file) => this.load(file)))).filter((l) => !!l);
+    return console.log(`[Loader] Loaded ${filtered.length}/${files.length}`), filtered;
+  }
+  /**
+   * Load the file and add the listener to the registry.
+   * @param path The path to the listener file.
+   * @returns The listener object if added successfully.
+   */
+  async load(path2) {
+    let listener = await Module.import(path2, true);
+    if (!listener) {
+      console.warn(`[Loader] File has no default export: ${path2}`);
+      return;
+    }
+    if (!(listener instanceof Listener)) {
+      console.warn(`[Loader] Default export is not a Listener: ${path2}`);
+      return;
+    }
+    return this.add(listener), this.entries.set(path2, listener), listener;
+  }
+  /**
+   * Unload the file and remove the listener from the registry.
+   * @param path The path to the listener file.
+   * @returns The listener object if unloaded successfully.
+   */
+  async unload(path2) {
+    let listener = this.entries.get(path2);
+    if (Module.isLoaded(path2) && (listener ??= await Module.import(path2, true), Module.unload(path2)), this.entries.delete(path2), !!listener)
+      return this.remove(listener)?.[0];
   }
+  /**
+   * Add a listener to the registry and create a listener for client.
+   * @param listener Listener to add.
+   */
   add(listener) {
     if (!(listener instanceof Listener))
       throw new Error("Invalid listener provided");
-    let execute = (...args) => {
+    let { once, name } = listener.options, execute = (...args) => {
       listener.execute(new Context(), ...args);
     };
-    this.listeners.push(listener), this.executors.set(listener, execute);
-    let { once, name } = listener.options;
-    this.client[once ? "once" : "on"](name, execute);
+    this.listeners.push(listener), this.executors.set(listener, execute), this.client[once ? "once" : "on"](name, execute);
   }
+  /**
+   * Remove a listener from the registry and client.
+   * @param target Listener name or object to remove.
+   * @returns The list of listener objects if removed successfully.
+   */
   remove(target) {
     let isMatched = (listener) => typeof target == "string" ? listener.options.name === target : listener === target, removed = [];
     return this.listeners = this.listeners.filter((listener) => {
@@ -672,9 +741,17 @@ var ListenerManager = class extends BaseClientManager {
       return execute && (this.client.removeListener(listener.options.name, execute), this.executors.delete(listener)), false;
     }), removed;
   }
+  /**
+   * Get a list of required intents for Bakit to run correctly.
+   * @returns Used intents.
+   */
   getBaseIntents() {
     return new IntentsBitField([GatewayIntentBits.Guilds]);
   }
+  /**
+   * Get a list of needed intents based on registered listeners to receive needed events.
+   * @returns Used intents.
+   */
   getNeededIntents() {
     let result = this.getBaseIntents();
     for (let listener of this.listeners) {
@@ -685,7 +762,7 @@ var ListenerManager = class extends BaseClientManager {
   }
 };
 
-// src/base/BakitClient.ts
+// src/base/client/BakitClient.ts
 var BakitClient2 = class extends Client {
   constructor(options, instance) {
     super(options);
@@ -738,8 +815,63 @@ var Params = {
   number: createFactory(NumberParam),
   user: createFactory(UserParam)
 };
-
-// src/defaults/command.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);
+  }
+};
 var messageCommandHandler = defineListener(Events.MessageCreate), chatInputCommandHandler = defineListener(Events.InteractionCreate), registerCommandsHandler = defineListener({
   name: Events.ClientReady,
   once: true
@@ -809,14 +941,14 @@ var ProjectCacheManager = class {
   getHash(data) {
     return createHash("sha256").update(JSON.stringify(data)).digest("hex");
   }
-  async write(path, data) {
-    let fullPath = join(this.rootDir, path), dir = dirname(fullPath);
+  async write(path2, data) {
+    let fullPath = join(this.rootDir, path2), dir = dirname(fullPath);
     await mkdir(dir, { recursive: true });
     let content = typeof data == "string" ? data : JSON.stringify(data);
     await writeFile(fullPath, content, "utf-8");
   }
-  async read(path) {
-    let fullPath = join(this.rootDir, path);
+  async read(path2) {
+    let fullPath = join(this.rootDir, path2);
     try {
       let content = await readFile(fullPath, "utf-8");
       return JSON.parse(content);
@@ -832,7 +964,7 @@ var ProjectCacheManager = class {
   }
 };
 
-// src/base/Instance.ts
+// src/base/process/Instance.ts
 var Instance = class {
   client;
   cache;
@@ -848,19 +980,37 @@ var Instance = class {
         ...config.clientOptions
       },
       this
-    ), await this.loadModules(), this.initIntents(), await this.client.login(config.token);
+    ), await this.loadModules(), this.initIntents(), await this.client.login(config.token), this.initProcess();
+  }
+  initProcess() {
+    process.on("message", (msg) => this.onProcessMessage(msg));
   }
   loadModules() {
     let { managers } = this.client, { commands, listeners } = managers;
-    return listeners.add(chatInputCommandHandler), listeners.add(messageCommandHandler), listeners.add(registerCommandsHandler), Promise.all([commands.loadModules(), listeners.loadModules()]);
+    return listeners.add(chatInputCommandHandler), listeners.add(messageCommandHandler), listeners.add(registerCommandsHandler), Promise.all([commands.loadModules("src"), listeners.loadModules("src")]);
   }
   initIntents() {
     let config = getConfig(), { options, managers } = this.client, { listeners } = managers, intents;
     config.intents === "auto" ? intents = listeners.getNeededIntents() : (intents = listeners.getBaseIntents(), typeof config.intents == "bigint" ? intents.bitfield = Number(config.intents) : intents.add(...config.intents)), options.intents = intents;
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async onProcessMessage(message) {
+    let { type, file } = message;
+    if (!type.startsWith("hmr:"))
+      return;
+    let target = type.split(":")[1], { listeners, commands } = this.client.managers;
+    switch (target) {
+      case "listeners":
+        listeners.unload(file), await listeners.load(file);
+        break;
+      case "commands":
+        commands.unload(file), await listeners.load(file);
+        break;
+    }
+  }
 };
 function useApp() {
   return new Instance();
 }
 
-export { $jiti, ArgumentError, BakitClient2 as BakitClient, BakitError, BaseClientManager, BaseCommandContext, BaseParam, BaseParamSchema, ChatInputContext, Command, CommandManager, CommandOptionsSchema, Context, EVENT_INTENT_MAPPING, HookOrder, HookState, Instance, LifecycleManager, Listener, ListenerManager, ListenerOptionsSchema, MessageContext, NumberParam, NumberParamSchema, ParamUserType, Params, ProjectConfigSchema, StringParam, StringParamSchema, UserParam, UserParamSchema, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, loadConfig, tokenize, useApp, validateParamsOrder };
+export { ArgumentError, BakitClient2 as BakitClient, BakitError, BaseClientManager, BaseCommandContext, BaseParam, BaseParamSchema, ChatInputContext, Command, CommandManager, CommandOptionsSchema, Context, DevProcessManager, EVENT_INTENT_MAPPING, HookOrder, HookState, Instance, LifecycleManager, Listener, ListenerManager, ListenerOptionsSchema, MessageContext, Module, NumberParam, NumberParamSchema, ParamUserType, Params, ProjectCacheManager, ProjectConfigSchema, StringParam, StringParamSchema, UserParam, UserParamSchema, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, loadConfig, tokenize, useApp, validateParamsOrder };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bakit",
-	"version": "2.0.0-alpha.11",
+	"version": "2.0.0-alpha.13",
 	"description": "A framework for discord.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",
@@ -11,7 +11,7 @@
 		"test": "vitest run --pass-with-no-tests"
 	},
 	"bin": {
-		"bakit": "./bin/bakit.js"
+		"bakit": "./dist/bin/bakit.js"
 	},
 	"files": [
 		"dist"
@@ -37,6 +37,7 @@
 		"discord.js": "^14.0.0"
 	},
 	"dependencies": {
+		"chokidar": "^5.0.0",
 		"commander": "^14.0.2",
 		"dotenv": "^17.2.1",
 		"jiti": "^2.6.1",

package/bin/bakit.js

@@ -1,39 +0,0 @@
-// @ts-check
-import { config as useEnv } from "dotenv";
-import { program } from "commander";
-
-program.name("bakit");
-
-program.command("dev").action(async () => {
-	useEnv({
-		path: [".env.local", ".env"],
-		quiet: true,
-	});
-	const { default: nodemon } = await import("nodemon");
-
-	nodemon({
-		script: "src/index.ts",
-		exec: `${process.execPath} --import tsx`,
-		ext: "ts,js",
-		watch: ["src"],
-		env: {
-			...process.env,
-			FORCE_COLOR: "1",
-			NODE_ENV: "development",
-		},
-	});
-
-	nodemon.on("start", () => {
-		console.log("Starting bakit app...");
-	});
-
-	nodemon.on("restart", () => {
-		console.log("Bakit detected changes! Restarting...");
-	});
-
-	nodemon.on("quit", () => {
-		process.exit();
-	});
-});
-
-program.parse();