popii-framework 0.6.1-beta.1 → 0.6.1-beta.2

package/dist/index.js

@@ -29,7 +29,8 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/loader/index.ts
 import { readdir } from "node:fs/promises";
-import { join, dirname, relative } from "node:path";
+import { join, dirname, relative, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 import { ApplicationCommandOptionType } from "discord.js";
 function propagateProperties(parent) {
   if (!parent.options)
@@ -57,9 +58,10 @@ function propagateProperties(parent) {
 async function loadCommands(baseDir, useFolderRouting = true) {
   const commands = new Map;
   const rawModules = new Map;
+  const absBaseDir = resolve(baseDir);
   let entries;
   try {
-    entries = await readdir(baseDir, { recursive: true, withFileTypes: true });
+    entries = await readdir(absBaseDir, { recursive: true, withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT")
       return commands;
@@ -70,10 +72,9 @@ async function loadCommands(baseDir, useFolderRouting = true) {
       continue;
     }
     const fullPath = join(entry.parentPath, entry.name);
-    const relPath = relative(baseDir, fullPath).replace(/\\/g, "/").replace(/\.(ts|js)$/, "");
+    const relPath = relative(absBaseDir, fullPath).replace(/\\/g, "/").replace(/\.(ts|js)$/, "");
     let module;
-    delete __require.cache[__require.resolve(fullPath)];
-    module = __require(fullPath);
+    module = await import(pathToFileURL(fullPath).href);
     const cmd = module.default;
     if (!cmd || typeof cmd !== "object") {
       throw new Error(`[Popii] Invalid command export in ${fullPath}. MUST export a default command definition.`);
@@ -200,12 +201,14 @@ var init_error = __esm(() => {
 
 // src/loader/fizz.ts
 import { readdir as readdir2 } from "node:fs/promises";
-import { join as join2, parse } from "node:path";
+import { join as join2, parse, resolve as resolve2 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 async function loadFizz(baseDir) {
   const events = new Map;
+  const absBaseDir = resolve2(baseDir);
   let entries;
   try {
-    entries = await readdir2(baseDir, { recursive: true, withFileTypes: true });
+    entries = await readdir2(absBaseDir, { recursive: true, withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT")
       return events;
@@ -218,8 +221,7 @@ async function loadFizz(baseDir) {
     const fullPath = join2(entry.parentPath, entry.name);
     const { name } = parse(entry.name);
     let module;
-    delete __require.cache[__require.resolve(fullPath)];
-    module = __require(fullPath);
+    module = await import(pathToFileURL2(fullPath).href);
     const handler = module.default;
     if (typeof handler !== "function") {
       throw new PopiiError("Invalid event export. MUST export a default function.", "INVALID_EVENT", "Ensure your event file exports a default async function.", fullPath);
@@ -234,12 +236,14 @@ var init_fizz = __esm(() => {
 
 // src/loader/snaps.ts
 import { readdir as readdir3 } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join as join3, resolve as resolve3 } from "node:path";
+import { pathToFileURL as pathToFileURL3 } from "node:url";
 async function loadSnaps(baseDir) {
   const snaps = new Map;
+  const absBaseDir = resolve3(baseDir);
   let entries;
   try {
-    entries = await readdir3(baseDir, { recursive: true, withFileTypes: true });
+    entries = await readdir3(absBaseDir, { recursive: true, withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT")
       return snaps;
@@ -251,8 +255,7 @@ async function loadSnaps(baseDir) {
     }
     const fullPath = join3(entry.parentPath, entry.name);
     let module;
-    delete __require.cache[__require.resolve(fullPath)];
-    module = __require(fullPath);
+    module = await import(pathToFileURL3(fullPath).href);
     const snap = module.default;
     if (!snap || typeof snap !== "object") {
       throw new PopiiError("Invalid snap export. MUST export a default component definition.", "INVALID_SNAP", "Ensure your snap file exports a default snap() definition.", fullPath);
@@ -293,12 +296,14 @@ var init_locales = () => {};
 
 // src/loader/middleware.ts
 import { readdir as readdir5 } from "node:fs/promises";
-import { join as join5 } from "node:path";
+import { join as join5, resolve as resolve4 } from "node:path";
+import { pathToFileURL as pathToFileURL4 } from "node:url";
 async function loadMiddlewares(baseDir) {
   const middlewares = [];
+  const absBaseDir = resolve4(baseDir);
   let entries;
   try {
-    entries = await readdir5(baseDir, { recursive: true, withFileTypes: true });
+    entries = await readdir5(absBaseDir, { recursive: true, withFileTypes: true });
     entries.sort((a, b) => a.name.localeCompare(b.name));
   } catch (err) {
     if (err.code === "ENOENT")
@@ -310,8 +315,7 @@ async function loadMiddlewares(baseDir) {
       continue;
     }
     const fullPath = join5(entry.parentPath, entry.name);
-    delete __require.cache[__require.resolve(fullPath)];
-    const module = __require(fullPath);
+    const module = await import(pathToFileURL4(fullPath).href);
     if (typeof module.default === "function")
       middlewares.push(module.default);
   }
@@ -324,12 +328,14 @@ var init_middleware = () => {};
 
 // src/loader/tasks.ts
 import { readdir as readdir6 } from "node:fs/promises";
-import { join as join6, parse as parse3 } from "node:path";
+import { join as join6, parse as parse3, resolve as resolve5 } from "node:path";
+import { pathToFileURL as pathToFileURL5 } from "node:url";
 async function loadTasks(baseDir) {
   const tasks = new Map;
+  const absBaseDir = resolve5(baseDir);
   let entries;
   try {
-    entries = await readdir6(baseDir, { recursive: true, withFileTypes: true });
+    entries = await readdir6(absBaseDir, { recursive: true, withFileTypes: true });
   } catch (err) {
     if (err.code === "ENOENT")
       return tasks;
@@ -340,8 +346,7 @@ async function loadTasks(baseDir) {
       continue;
     }
     const fullPath = join6(entry.parentPath, entry.name);
-    delete __require.cache[__require.resolve(fullPath)];
-    const module = __require(fullPath);
+    const module = await import(pathToFileURL5(fullPath).href);
     if (module.default && typeof module.default.run === "function") {
       const name = module.default.name || parse3(entry.name).name;
       tasks.set(name, module.default);
@@ -671,13 +676,13 @@ var init_middleware2 = __esm(() => {
 import { createWriteStream, existsSync, mkdirSync } from "node:fs";
 import { join as join7 } from "node:path";
 function closeLogWriter() {
-  return new Promise((resolve) => {
+  return new Promise((resolve6) => {
     if (logWriter) {
-      logWriter.end(resolve);
+      logWriter.end(resolve6);
       logWriter = null;
       currentLogDate = "";
     } else {
-      resolve();
+      resolve6();
     }
   });
 }
@@ -3519,27 +3524,27 @@ function uiPlugin(options = {}) {
         }
         if (step.type === "text") {
           let msgCollector = null;
-          const replyPromise = !this.channel || typeof this.channel.createMessageCollector !== "function" ? new Promise(() => {}) : new Promise((resolve) => {
+          const replyPromise = !this.channel || typeof this.channel.createMessageCollector !== "function" ? new Promise(() => {}) : new Promise((resolve6) => {
             msgCollector = this.channel.createMessageCollector({ filter: (m) => m.author.id === this.user.id, time: timeoutMs, max: 1 });
             msgCollector.on("collect", (m) => {
               msgCollector.stop();
-              resolve(m);
+              resolve6(m);
             });
             msgCollector.on("end", (collected, reason) => {
               if (reason === "time")
-                resolve(null);
+                resolve6(null);
             });
           });
           let collector = null;
-          const componentPromise = !lastMessage || typeof lastMessage.awaitMessageComponent !== "function" ? new Promise(() => {}) : new Promise((resolve) => {
+          const componentPromise = !lastMessage || typeof lastMessage.awaitMessageComponent !== "function" ? new Promise(() => {}) : new Promise((resolve6) => {
             collector = lastMessage.createMessageComponentCollector({ time: timeoutMs, filter: (int) => int.user.id === this.user.id });
             collector.on("collect", (int) => {
               collector.stop();
-              resolve(int);
+              resolve6(int);
             });
             collector.on("end", (collected, reason) => {
               if (reason === "time")
-                resolve(null);
+                resolve6(null);
             });
           });
           const result = await Promise.race([replyPromise, componentPromise]);
@@ -7451,12 +7456,12 @@ class Semaphore {
       this.current++;
       return;
     }
-    return new Promise((resolve) => this.queue.push(resolve));
+    return new Promise((resolve6) => this.queue.push(resolve6));
   }
   release() {
     if (this.queue.length > 0) {
-      const resolve = this.queue.shift();
-      resolve();
+      const resolve6 = this.queue.shift();
+      resolve6();
     } else {
       this.current--;
     }
@@ -7509,7 +7514,7 @@ function createYtdlpUtils(options, state) {
       proc.kill();
     } catch {}
   };
-  const spawnYtdlp = (args, timeoutMs) => new Promise((resolve, reject) => {
+  const spawnYtdlp = (args, timeoutMs) => new Promise((resolve6, reject) => {
     const proc = nodeSpawn("yt-dlp", buildYtdlpArgs(args), { detached: process.platform !== "win32" });
     state.activeProcesses.add(proc);
     let out = "";
@@ -7521,7 +7526,7 @@ function createYtdlpUtils(options, state) {
     proc.on("close", () => {
       clearTimeout(timer);
       state.activeProcesses.delete(proc);
-      resolve(out);
+      resolve6(out);
     });
     proc.on("error", (e) => {
       clearTimeout(timer);
@@ -7809,7 +7814,7 @@ function createResolver(options, state, utils, sb) {
                 } catch {}
               }
             });
-            const procDone = new Promise((resolve) => {
+            const procDone = new Promise((resolve6) => {
               proc.on("close", () => {
                 clearTimeout(timer);
                 state.activeProcesses.delete(proc);
@@ -7817,7 +7822,7 @@ function createResolver(options, state, utils, sb) {
                   firstEntryResolve(null);
                   firstEntryResolve = null;
                 }
-                resolve();
+                resolve6();
               });
               proc.on("error", () => {
                 clearTimeout(timer);
@@ -7826,7 +7831,7 @@ function createResolver(options, state, utils, sb) {
                   firstEntryResolve(null);
                   firstEntryResolve = null;
                 }
-                resolve();
+                resolve6();
               });
             });
             const firstEntry = await firstEntryPromise;
@@ -7844,7 +7849,7 @@ function createResolver(options, state, utils, sb) {
             return { ...first, extraTracks };
           }
           pop.log.info(`Using yt-dlp to extract stream...`);
-          const { stdout, stderr } = await new Promise((resolve, reject) => {
+          const { stdout, stderr } = await new Promise((resolve6, reject) => {
             const args = ["--dump-json", "-f", "bestaudio/best", "--no-warnings"];
             if (!isPlaylist)
               args.push("--no-playlist");
@@ -7864,7 +7869,7 @@ function createResolver(options, state, utils, sb) {
             proc.on("close", () => {
               clearTimeout(timer);
               state.activeProcesses.delete(proc);
-              resolve({ stdout: out, stderr: err });
+              resolve6({ stdout: out, stderr: err });
             });
             proc.on("error", (e) => {
               clearTimeout(timer);

package/dist/loader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loader/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AA6BvD,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAiIzH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loader/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AA6BvD,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAkIzH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "popii-framework",
-  "version": "0.6.1-beta.1",
+  "version": "0.6.1-beta.2",
   "description": "A convention-first Discord bot framework",
   "license": "MIT",
   "homepage": "https://docs.loveyourmaid.moe",