bakit 2.0.0-alpha.22 → 2.0.0-alpha.24

package/dist/cli.js

@@ -1,14 +1,15 @@
 import { config } from 'dotenv';
 import { program } from 'commander';
 import { fork } from 'child_process';
+import path, { resolve, relative, sep } from 'path';
 import chokidar from 'chokidar';
-import path, { relative, sep } from 'path';
-import { pathToFileURL } from 'url';
 
 // src/cli/bin.ts
 function getTopLevelDirectory(path2, entryDir) {
   return relative(entryDir, path2).split(sep)[0] ?? null;
 }
+
+// src/cli/process/DevProcessManager.ts
 var DevProcessManager = class {
   constructor(options) {
     this.options = options;
@@ -22,7 +23,7 @@ var DevProcessManager = class {
     if (this.child) return;
     let entry = path.resolve(this.options.entry);
     this.child = fork(entry, {
-      execArgv: ["--import", "bakit/loader/register"],
+      execArgv: ["--import", "bakit/register"],
       stdio: "inherit",
       env: {
         ...process.env,
@@ -57,7 +58,7 @@ var DevProcessManager = class {
       return;
     let top = getTopLevelDirectory(path2, this.options.rootDir);
     if (top && this.options.hotDirs.includes(top)) {
-      this.child.connected && this.child.send({ type: `hmr:${top}`, url: pathToFileURL(path2).href });
+      this.child.connected && this.child.send({ type: `hmr:${top}`, path: resolve(path2) });
       return;
     }
     this.scheduleRestart();

package/dist/{loader/hooks.js → hooks.js}

@@ -4,10 +4,13 @@ import { Module } from 'module';
 import { dirname, resolve as resolve$1, basename } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 
-// src/loader/hooks.ts
-var EXTENSIONS = [".js", ".ts"], inDev = false, parentPort, versions, esbuild;
+// src/lib/loader/hooks.ts
+var EXTENSIONS = [".js", ".ts"], parentPort, versions, esbuild;
+function isDevelopment() {
+  return process.env.NODE_ENV === "development";
+}
 async function initialize({ port }) {
-  inDev = process.env.NODE_ENV === "development", inDev && (parentPort = port, parentPort.on("message", onMessage), versions = /* @__PURE__ */ new Map(), esbuild = await import('esbuild'));
+  isDevelopment() && (parentPort = port, parentPort.on("message", onMessage), versions = /* @__PURE__ */ new Map(), esbuild = await import('esbuild'));
 }
 async function resolve(specifier, context, nextResolve) {
   if (shouldSkip(specifier))
@@ -22,7 +25,7 @@ async function resolve(specifier, context, nextResolve) {
     url = pathToFileURL(absPath).href;
   }
   let urlObj = new URL(url);
-  if (inDev) {
+  if (isDevelopment()) {
     let filePath = fileURLToPath(urlObj), version = createVersion(filePath);
     urlObj.searchParams.set("hmr", version), parentURL && parentPort && parentPort.postMessage({
       type: "dependency",
@@ -39,19 +42,22 @@ async function resolve(specifier, context, nextResolve) {
 async function load(url, context, nextLoad) {
   if (shouldSkip(url))
     return nextLoad(url, context);
-  let cleanURL = url.split("?")[0], filePath = fileURLToPath(cleanURL ?? "");
-  if (filePath.endsWith(".ts") && esbuild) {
-    let raw = await readFile(filePath, "utf8");
-    return {
-      source: (await esbuild.transform(raw, {
-        platform: "node",
-        sourcefile: filePath,
-        sourcemap: "inline",
-        loader: "ts"
-      })).code,
-      format: "module",
-      shortCircuit: true
-    };
+  try {
+    let cleanURL = url.split("?")[0], filePath = fileURLToPath(cleanURL ?? "");
+    if (filePath.endsWith(".ts") && esbuild) {
+      let raw = await readFile(filePath, "utf8");
+      return {
+        source: (await esbuild.transform(raw, {
+          platform: "node",
+          sourcefile: filePath,
+          sourcemap: "inline",
+          loader: "ts"
+        })).code,
+        format: "module",
+        shortCircuit: !0
+      };
+    }
+  } catch {
   }
   return nextLoad(url, context);
 }
@@ -69,7 +75,18 @@ function shouldSkip(specifier) {
   return true;
 }
 function onMessage(message) {
-  message.type === "unload" && versions?.delete(fileURLToPath(message.target));
+  let { type, data, id } = message;
+  if (type !== "unload") {
+    parentPort?.postMessage({
+      id,
+      data: false
+    });
+    return;
+  }
+  versions?.delete(data), parentPort?.postMessage({
+    id,
+    data: true
+  });
 }
 
 export { initialize, load, resolve };

package/dist/index.d.ts

@@ -449,6 +449,21 @@ declare function extractSnowflakeId(input: string): string | null;
 
 declare function getTopLevelDirectory(path: string, entryDir: string): string | null;
 
+interface PostMessage<Data> {
+    id: number;
+    type: string;
+    data: Data;
+}
+interface ResponseMessage<Data> {
+    id: number;
+    error?: string;
+    data?: Data;
+}
+declare function $initLoader(): void;
+declare function $postLoaderMessage<Data>(type: string, data: Data, wait?: false): void;
+declare function $postLoaderMessage<Data, Output = unknown>(type: string, data: Data, wait: true): Promise<Output>;
+declare function $unloadFile(path: string): Promise<boolean>;
+
 declare const messageCommandHandler: Listener<Events.MessageCreate>;
 declare const chatInputCommandHandler: Listener<Events.InteractionCreate>;
 declare const registerCommandsHandler: Listener<Events.ClientReady>;
@@ -479,4 +494,4 @@ declare function loadConfig(cwd?: string): Promise<ProjectConfig>;
  */
 declare function getConfig(): ProjectConfig;
 
-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, 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, ProjectCacheManager, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };
+export { $initLoader, $postLoaderMessage, $unloadFile, 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 PostMessage, ProjectCacheManager, type ProjectConfig, type ProjectConfigInput, ProjectConfigSchema, type ResponseMessage, type StringOptions, StringParam, StringParamSchema, type UserOptions, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };

package/dist/index.js

@@ -1,8 +1,10 @@
 import { GatewayIntentBits, Events, Client, Collection, IntentsBitField, SlashCommandBuilder, SlashCommandStringOption, SlashCommandNumberOption, SlashCommandUserOption, ChatInputCommandInteraction, Message } from 'discord.js';
 import { inspect } from 'util';
-import { posix, relative, sep, join, dirname } from 'path';
+import { posix, resolve, relative, sep, join, dirname } from 'path';
 import glob from 'tiny-glob';
 import z4 from 'zod';
+import { register } from 'module';
+import { MessageChannel } from 'worker_threads';
 import { pathToFileURL } from 'url';
 import { existsSync, mkdirSync, rmSync } from 'fs';
 import { mkdir, writeFile, readFile, rm } from 'fs/promises';
@@ -162,6 +164,35 @@ function extractSnowflakeId(input) {
 function getTopLevelDirectory(path, entryDir) {
   return relative(entryDir, path).split(sep)[0] ?? null;
 }
+var port1, port2, messageId = 0, pending = /* @__PURE__ */ new Map();
+function $initLoader() {
+  let channel = new MessageChannel();
+  port1 = channel.port1, port2 = channel.port2;
+  let hookPath = new URL("./hooks.js", import.meta.url).href;
+  register(hookPath, import.meta.url, {
+    data: { port: port1 },
+    transferList: [port1]
+  }), port2.on("message", onMessage), port2.unref();
+}
+function onMessage(message) {
+  let { id, error, data } = message, request = pending.get(id);
+  request && (pending.delete(id), error ? request.reject(new Error(error)) : request.resolve(data));
+}
+function $postLoaderMessage(type, data, wait = false) {
+  let id = messageId++, message = { id, type, data };
+  if (!wait) {
+    port2?.postMessage(message);
+    return;
+  }
+  return new Promise((resolve4, reject) => {
+    if (!port2)
+      return reject(new Error("Loader is not initialized"));
+    pending.set(id, { resolve: resolve4, reject }), port2.postMessage(message);
+  });
+}
+function $unloadFile(path) {
+  return $postLoaderMessage("unload", resolve(path), true);
+}
 
 // src/core/structures/param/Param.ts
 var BaseParam = class {
@@ -457,6 +488,7 @@ var CommandManager = class extends BaseClientManager {
    * @returns The command object if added successfully.
    */
   async load(path) {
+    path = resolve(path);
     let command = (await import(pathToFileURL(path).href)).default;
     if (!command) {
       console.warn(`[Loader] File has no default export: ${path}`);
@@ -474,12 +506,13 @@ var CommandManager = class extends BaseClientManager {
    * @returns The command object if unloaded successfully.
    */
   async unload(path) {
+    path = resolve(path);
     let command = this.entries.get(path);
-    if (this.entries.delete(path), (await import('bakit/loader/register')).unload(path), !!command)
+    if (this.entries.delete(path), await $unloadFile(path), !!command)
       return this.remove(command);
   }
   async reload(path) {
-    await this.unload(path);
+    path = resolve(path), await this.unload(path);
     let command = await this.load(path);
     if (command)
       return console.log(`[Loader] Reloaded command '${command.options.name}' at '${path}'`), command;
@@ -554,6 +587,7 @@ var ListenerManager = class extends BaseClientManager {
    * @returns The listener object if added successfully.
    */
   async load(path) {
+    path = resolve(path);
     let listener = (await import(pathToFileURL(path).href)).default;
     if (!listener) {
       console.warn(`[Loader] File has no default export: ${path}`);
@@ -571,12 +605,13 @@ var ListenerManager = class extends BaseClientManager {
    * @returns The listener object if unloaded successfully.
    */
   async unload(path) {
+    path = resolve(path);
     let listener = this.entries.get(path);
-    if (this.entries.delete(path), (await import('bakit/loader/register')).unload(path), !!listener)
+    if (this.entries.delete(path), await $unloadFile(path), !!listener)
       return this.remove(listener)?.[0];
   }
   async reload(path) {
-    await this.unload(path);
+    path = resolve(path), await this.unload(path);
     let listener = await this.load(path);
     if (listener)
       return console.log(`[Loader] Reloaded listener '${listener.options.name}' at '${path}'`), listener;
@@ -903,16 +938,16 @@ var Instance = class {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async onProcessMessage(message) {
-    let { type, url } = message;
+    let { type, path } = message;
     if (!type.startsWith("hmr:"))
       return;
     let target = type.split(":")[1], { listeners, commands } = this.client.managers;
     switch (target) {
       case "listeners":
-        await listeners.reload(url);
+        await listeners.reload(path);
         break;
       case "commands":
-        await commands.reload(url);
+        await commands.reload(path);
         break;
     }
   }
@@ -931,4 +966,4 @@ var Params = {
   user: createFactory(UserParam)
 };
 
-export { 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, StringParam, StringParamSchema, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };
+export { $initLoader, $postLoaderMessage, $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, StringParam, StringParamSchema, UserParam, UserParamSchema, chatInputCommandHandler, defineCommand, defineConfig, defineListener, extractSnowflakeId, getConfig, getTopLevelDirectory, loadConfig, messageCommandHandler, registerCommandsHandler, tokenize, useApp, validateParamsOrder };

package/dist/register.js

@@ -0,0 +1,4 @@
+import { $initLoader } from 'bakit';
+
+// src/lib/loader/register.ts
+$initLoader();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bakit",
-	"version": "2.0.0-alpha.22",
+	"version": "2.0.0-alpha.24",
 	"description": "A framework for discord.js",
 	"type": "module",
 	"exports": {
@@ -8,7 +8,7 @@
 			"import": "./dist/index.js",
 			"types": "./dist/index.d.ts"
 		},
-		"./loader/*": "./dist/loader/*.js"
+		"./register": "./dist/register.js"
 	},
 	"scripts": {
 		"build": "tsup",

package/dist/loader/register.js

@@ -1,14 +0,0 @@
-import { register } from 'module';
-import { MessageChannel } from 'worker_threads';
-
-// src/loader/register.ts
-var { port1, port2 } = new MessageChannel(), hookPath = new URL("./hooks.js", import.meta.url).href;
-register(hookPath, import.meta.url, {
-  data: { port: port1 },
-  transferList: [port1]
-});
-function unload(module) {
-  port2.postMessage({ type: "unload", target: module });
-}
-
-export { unload };