seyfert 2.2.1-dev-13340711253.0 → 2.2.1-dev-13380910405.0

package/lib/common/it/utils.js

@@ -261,17 +261,7 @@ exports.ReplaceRegex = {
     },
 };
 async function magicImport(path) {
-    try {
-        if ('Deno' in globalThis)
-            throw new Error('https://github.com/denoland/deno/issues/26136');
-        return require(path);
-    }
-    catch (e) {
-        // (bun)dows moment
-        if (!('Bun' in globalThis) || e.message.includes('is unsupported. use "await import()" instead.'))
-            return new Function('path', 'return import(`file:///${path}?update=${Date.now()}`)')(path.split('\\').join('\\\\'));
-        throw new Error(`Cannot import ${path}`, { cause: e });
-    }
+    return new Function('path', 'return import(`file:///${path}?update=${Date.now()}`)')(path);
 }
 function fakePromise(value) {
     if (value instanceof Promise)

package/lib/components/componentcommand.d.ts

@@ -10,7 +10,8 @@ export interface ComponentCommand {
 export declare abstract class ComponentCommand {
     type: 0;
     abstract componentType: keyof ContextComponentCommandInteractionMap;
-    abstract filter(context: ComponentContext<typeof this.componentType>): Promise<boolean> | boolean;
+    customId?: string;
+    filter?(context: ComponentContext<typeof this.componentType>): Promise<boolean> | boolean;
     abstract run(context: ComponentContext<typeof this.componentType>): any;
     middlewares: (keyof RegisteredMiddlewares)[];
     props: ExtraProps;

package/lib/components/componentcommand.js

@@ -8,6 +8,14 @@ exports.InteractionCommandType = {
 };
 class ComponentCommand {
     type = exports.InteractionCommandType.COMPONENT;
+    customId;
+    /** @internal */
+    async _filter(context) {
+        const old = (await this.filter?.(context)) ?? true;
+        if (this.customId)
+            return this.customId === context.customId && old;
+        return old;
+    }
     middlewares = [];
     props;
     get cType() {

package/lib/components/handler.js

@@ -257,7 +257,7 @@ class ComponentHandler extends common_1.BaseHandler {
             try {
                 if (i.type === componentcommand_1.InteractionCommandType.COMPONENT &&
                     i.cType === context.interaction.componentType &&
-                    (await i.filter(context))) {
+                    (await i._filter(context))) {
                     context.command = i;
                     await this.execute(i, context);
                 }
@@ -270,7 +270,7 @@ class ComponentHandler extends common_1.BaseHandler {
     async executeModal(context) {
         for (const i of this.commands) {
             try {
-                if (i.type === componentcommand_1.InteractionCommandType.MODAL && (await i.filter(context))) {
+                if (i.type === componentcommand_1.InteractionCommandType.MODAL && (await i._filter(context))) {
                     context.command = i;
                     await this.execute(i, context);
                 }

package/lib/components/modalcommand.d.ts

@@ -5,7 +5,8 @@ export interface ModalCommand {
 }
 export declare abstract class ModalCommand {
     type: 1;
-    abstract filter(context: ModalContext): Promise<boolean> | boolean;
+    filter?(context: ModalContext): Promise<boolean> | boolean;
+    customId?: string;
     abstract run(context: ModalContext): any;
     middlewares: (keyof RegisteredMiddlewares)[];
     props: ExtraProps;

package/lib/components/modalcommand.js

@@ -4,6 +4,14 @@ exports.ModalCommand = void 0;
 const componentcommand_1 = require("./componentcommand");
 class ModalCommand {
     type = componentcommand_1.InteractionCommandType.MODAL;
+    customId;
+    /** @internal */
+    async _filter(context) {
+        const old = (await this.filter?.(context)) ?? true;
+        if (this.customId)
+            return this.customId === context.customId && old;
+        return old;
+    }
     middlewares = [];
     props;
 }

package/lib/langs/handler.d.ts

@@ -15,10 +15,7 @@ export declare class LangsHandler extends BaseHandler {
     load(dir: string): Promise<void>;
     parse(file: LangInstance): void;
     set(instances: LangInstance[]): void;
-    reload(lang: string): Promise<false | {
-        file: Record<string, any>;
-        locale: string;
-    } | null>;
+    reload(lang: string): Promise<Record<string, any> | null>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
     onFile(locale: string, { file }: LangInstance): {
         file: Record<string, any>;

package/lib/langs/handler.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LangsHandler = void 0;
+const node_path_1 = require("node:path");
 const common_1 = require("../common");
 const router_1 = require("./router");
 class LangsHandler extends common_1.BaseHandler {
@@ -55,11 +56,18 @@ class LangsHandler extends common_1.BaseHandler {
         if ((0, common_1.isCloudfareWorker)()) {
             throw new Error('Reload in cloudfare worker is not supported');
         }
-        const value = this.__paths[lang];
+        const path = this.__paths[lang];
+        if (!path)
+            return null;
+        delete require.cache[path];
+        const value = await (0, common_1.magicImport)(path).then(x => this.onFile(lang, {
+            file: x,
+            name: (0, node_path_1.basename)(path),
+            path,
+        }));
         if (!value)
             return null;
-        delete require.cache[value];
-        return (this.values[lang] = await (0, common_1.magicImport)(value).then(x => this.onFile(lang, x)));
+        return (this.values[lang] = value.file);
     }
     async reloadAll(stopIfFail = true) {
         for (const i in this.__paths) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.2.1-dev-13340711253.0",
+	"version": "2.2.1-dev-13380910405.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",