bakit 2.0.0-alpha.25 → 2.0.0-alpha.26

package/dist/index.d.ts

@@ -377,11 +377,13 @@ declare class Instance {
     private loadModules;
     private initIntents;
     private isInHotDirectory;
-    private isFileHotReloadable;
     private restart;
     shutdown(): Promise<void>;
+    private containsEntryPoint;
+    private containsHotModule;
     private onFileRemove;
     private onFileChange;
+    private unloadModule;
 }
 declare function useApp(): Instance;
 
@@ -460,8 +462,11 @@ declare function getTopLevelDirectory(path: string, entryDir: string): string |
 
 declare function $initLoader(): void;
 declare function $unloadFile(path: string): Promise<boolean>;
-declare function isImported(filePath: string): boolean;
-declare function isImportedBy(filePath: string, matcher: string | RegExp | ((path: string) => boolean)): boolean;
+declare function getImporters(path: string, createNew: true): Set<string>;
+declare function getImporters(path: string, createNew?: false): Set<string> | undefined;
+declare function getDependencyChain(path: string): string[];
+declare function isImported(path: string): boolean;
+declare function isImportedBy(path: string, matcher: string | RegExp | ((path: string) => boolean)): boolean;
 
 declare const RPC_RESPONSE_MARK = "$DONE:";
 declare const RPC_RESPONSE_TIMEOUT = 5000;
@@ -564,4 +569,4 @@ interface LoadResult {
 type NextResolve = (specifier: string, context: ResolveContext) => Promise<ResolveResult>;
 type NextLoad = (url: string, context: LoadContext) => Promise<LoadResult>;
 
-export { $initLoader, $unloadFile, type AnyParam, ArgumentError, BakitClient, type BakitClientEvents, BakitError, BaseClientManager, BaseCommandContext, BaseParam, type BaseParamOptions, BaseParamSchema, type BaseRPCMessage, type BaseRPCResponse, 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, type InitializeData, Instance, LifecycleManager, Listener, ListenerManager, type ListenerOptions, ListenerOptionsSchema, type LoadContext, type LoadResult, type MainHookCallback, MessageContext, type MessageContextSendOptions, type NextLoad, type NextResolve, type NumberOptions, NumberParam, NumberParamSchema, type ParamResolvedOutputType, ParamUserType, Params, ProjectCacheManager, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, RPC, type RPCErrorResponse, type RPCMessage, type RPCPendingPromise, type RPCRequest, type RPCResponse, type RPCSuccessResponse, RPC_RESPONSE_MARK, RPC_RESPONSE_TIMEOUT, type ResolveContext, type ResolveResult, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, isImported, isImportedBy, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };
+export { $initLoader, $unloadFile, type AnyParam, ArgumentError, BakitClient, type BakitClientEvents, BakitError, BaseClientManager, BaseCommandContext, BaseParam, type BaseParamOptions, BaseParamSchema, type BaseRPCMessage, type BaseRPCResponse, 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, type InitializeData, Instance, LifecycleManager, Listener, ListenerManager, type ListenerOptions, ListenerOptionsSchema, type LoadContext, type LoadResult, type MainHookCallback, MessageContext, type MessageContextSendOptions, type NextLoad, type NextResolve, type NumberOptions, NumberParam, NumberParamSchema, type ParamResolvedOutputType, ParamUserType, Params, ProjectCacheManager, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, RPC, type RPCErrorResponse, type RPCMessage, type RPCPendingPromise, type RPCRequest, type RPCResponse, type RPCSuccessResponse, RPC_RESPONSE_MARK, RPC_RESPONSE_TIMEOUT, type ResolveContext, type ResolveResult, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getDependencyChain, getImporters, getTopLevelDirectory, isImported, isImportedBy, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };

package/dist/index.js

@@ -231,6 +231,8 @@ var RPC_RESPONSE_MARK = "$DONE:", RPC_RESPONSE_TIMEOUT = 5e3, RPC = class extend
     });
   }
 };
+
+// src/lib/loader/loader.ts
 var rpc, reverseDependencyGraph = /* @__PURE__ */ new Map();
 function $initLoader() {
   let { port1, port2 } = new MessageChannel(), hookPath = new URL("./hooks.js", import.meta.url).href;
@@ -244,26 +246,33 @@ function $unloadFile(path) {
     throw new Error("Loader isn't initialized");
   return rpc.request("unload", resolve(path));
 }
-function isImported(filePath) {
-  return !!reverseDependencyGraph.get(filePath)?.size;
+function getImporters(path, createNew = false) {
+  path = resolve(path);
+  let entry = reverseDependencyGraph.get(path);
+  return createNew && !entry && (entry = /* @__PURE__ */ new Set(), reverseDependencyGraph.set(path, entry)), entry;
 }
-function isImportedBy(filePath, matcher) {
-  let queue = [filePath], visited = /* @__PURE__ */ new Set();
+function getDependencyChain(path) {
+  path = resolve(path);
+  let queue = [path], visited = /* @__PURE__ */ new Set();
   for (; queue.length > 0; ) {
     let current = queue.shift();
-    if (visited.has(current))
+    if (!current || visited.has(current) || (visited.add(current), current.includes("/node_modules/")))
       continue;
-    visited.add(current);
-    let parents = reverseDependencyGraph.get(current);
+    let parents = getImporters(current);
     if (parents)
-      for (let parent of parents) {
-        let isMatch = false;
-        if (typeof matcher == "string" ? isMatch = parent === matcher : matcher instanceof RegExp ? isMatch = matcher.test(parent) : typeof matcher == "function" && (isMatch = matcher(parent)), isMatch)
-          return true;
+      for (let parent of parents)
         visited.has(parent) || queue.push(parent);
-      }
   }
-  return false;
+  return Array.from(visited);
+}
+function isImported(path) {
+  return !!getImporters(path)?.size;
+}
+function isImportedBy(path, matcher) {
+  return getDependencyChain(path).slice(1).some((p) => {
+    let isMatch = false;
+    return typeof matcher == "string" && (isMatch = resolve(matcher) === p), typeof matcher == "function" && (isMatch = matcher(p)), matcher instanceof RegExp && (isMatch = matcher.test(p)), isMatch;
+  });
 }
 function onDependencyAdd(data) {
   let { url, parentURL } = data, path = fileURLToPath(url), parentPath = fileURLToPath(parentURL), entry = reverseDependencyGraph.get(path);
@@ -994,7 +1003,7 @@ chatInputCommandHandler.main(async (_, interaction) => {
 });
 
 // src/core/internal/Instance.ts
-var HOT_DIRECTORIES = ["listeners", "commands"], SOURCE_ROOT = resolve(process.cwd(), "src"), Instance = class {
+var HOT_DIRECTORIES = ["listeners", "commands"], SOURCE_ROOT = resolve(process.cwd(), "src"), APP_ENTRY_POINTS = /* @__PURE__ */ new Set([resolve(SOURCE_ROOT, "index.ts"), resolve(SOURCE_ROOT, "index.js")]), Instance = class {
   client;
   cache;
   rpc;
@@ -1029,46 +1038,53 @@ var HOT_DIRECTORIES = ["listeners", "commands"], SOURCE_ROOT = resolve(process.c
     let topLevelDir = getTopLevelDirectory(path, SOURCE_ROOT);
     return !!topLevelDir && HOT_DIRECTORIES.includes(topLevelDir);
   }
-  isFileHotReloadable(path) {
-    return path = resolve(path), !(!this.isInHotDirectory(path) || isImportedBy(path, (parentPath) => !this.isInHotDirectory(parentPath)));
-  }
   restart() {
     this.rpc.send("restart", {});
   }
   async shutdown() {
     this.client && await this.client.destroy().catch(() => null), process.exit(0);
   }
+  containsEntryPoint(chain) {
+    return chain.some((x) => APP_ENTRY_POINTS.has(x));
+  }
+  containsHotModule(chain) {
+    return chain.some((x) => this.isInHotDirectory(x));
+  }
   async onFileRemove(path) {
     if (!isImported(path))
       return;
-    if (!this.isFileHotReloadable(path)) {
+    let chain = getDependencyChain(path);
+    if (this.containsEntryPoint(chain)) {
       this.restart();
       return;
     }
-    let topLevelDir = getTopLevelDirectory(path, SOURCE_ROOT), { listeners, commands } = this.client.managers;
-    switch (topLevelDir) {
-      case "listeners":
-        await listeners.unload(path);
-        break;
-      case "commands":
-        await commands.unload(path);
-        break;
-    }
+    if (this.containsHotModule(chain))
+      for (let path2 of chain.reverse())
+        await this.unloadModule(path2);
   }
   async onFileChange(path) {
     if (!isImported(path))
       return;
-    if (!this.isFileHotReloadable(path)) {
+    let chain = getDependencyChain(path);
+    if (this.containsEntryPoint(chain)) {
       this.restart();
       return;
     }
-    let topLevelDir = getTopLevelDirectory(path, SOURCE_ROOT), { listeners, commands } = this.client.managers;
-    switch (topLevelDir) {
+    if (this.containsHotModule(chain))
+      for (let path2 of chain.reverse())
+        await this.unloadModule(path2, true);
+  }
+  async unloadModule(path, reload = false) {
+    let { listeners, commands } = this.client.managers;
+    switch (getTopLevelDirectory(path, SOURCE_ROOT)) {
       case "listeners":
-        await listeners.reload(path);
+        await listeners[reload ? "reload" : "unload"](path);
         break;
       case "commands":
-        await commands.reload(path);
+        await commands[reload ? "reload" : "unload"](path);
+        break;
+      default:
+        await $unloadFile(path);
         break;
     }
   }
@@ -1087,4 +1103,4 @@ var Params = {
   user: createFactory(UserParam)
 };
 
-export { $initLoader, $unloadFile, ArgumentError, 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, ProjectCacheManager, ProjectConfigSchema, RPC, RPC_RESPONSE_MARK, RPC_RESPONSE_TIMEOUT, StringParam, StringParamSchema, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, isImported, isImportedBy, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };
+export { $initLoader, $unloadFile, ArgumentError, 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, ProjectCacheManager, ProjectConfigSchema, RPC, RPC_RESPONSE_MARK, RPC_RESPONSE_TIMEOUT, StringParam, StringParamSchema, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getDependencyChain, getImporters, getTopLevelDirectory, isImported, isImportedBy, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bakit",
-	"version": "2.0.0-alpha.25",
+	"version": "2.0.0-alpha.26",
 	"description": "A framework for discord.js",
 	"type": "module",
 	"exports": {