seyfert 2.2.1-dev-12970267967.0 → 2.2.1-dev-13217777411.0

package/lib/deps/mixer.js

@@ -26,11 +26,8 @@ function getNodeDescriptors(c) {
     const result = [];
     while (proto) {
         const descriptors = Object.getOwnPropertyDescriptors(proto);
-        // @ts-expect-error this is not a function in all cases
-        if (descriptors.valueOf.configurable)
-            break;
         result.push(descriptors);
-        proto = proto.__proto__;
+        proto = Object.getPrototypeOf(proto);
     }
     return result;
 }
@@ -45,32 +42,29 @@ function getDescriptors(c) {
  * @returns The mixed class.
  */
 function Mixin(...args) {
-    const ignoreOverwriteToString = Object.keys(Object.getOwnPropertyDescriptors(args[0].prototype)).includes('toString');
-    function MixedClass(...constructorArgs) {
-        for (const i of args) {
-            const descriptors = getDescriptors(i).reverse();
-            for (const j of descriptors) {
-                // @ts-expect-error
-                Object.assign(this, new j.constructor.value(...constructorArgs));
-                for (const descriptorK in j) {
-                    if (descriptorK === 'constructor')
-                        continue;
-                    if (descriptorK in MixedClass.prototype && descriptorK !== 'toString')
-                        continue;
-                    const descriptor = j[descriptorK];
-                    if (descriptor.value) {
-                        if (descriptorK === 'toString' && ignoreOverwriteToString) {
-                            MixedClass.prototype[descriptorK] = args[0].prototype.toString;
+    const Base = args[0];
+    class MixedClass extends Base {
+        constructor(...constructorArgs) {
+            super(...constructorArgs);
+            for (const mixin of args.slice(1)) {
+                const descriptors = getDescriptors(mixin).reverse();
+                for (const desc of descriptors) {
+                    for (const key in desc) {
+                        if (key === 'constructor')
                             continue;
+                        if (key in mixin.prototype)
+                            continue;
+                        const descriptor = desc[key];
+                        if (descriptor.value) {
+                            // @ts-expect-error
+                            MixedClass.prototype[key] = descriptor.value;
+                        }
+                        else if (descriptor.get || descriptor.set) {
+                            Object.defineProperty(MixedClass.prototype, key, {
+                                get: descriptor.get,
+                                set: descriptor.set,
+                            });
                         }
-                        MixedClass.prototype[descriptorK] = descriptor.value;
-                        continue;
-                    }
-                    if (descriptor.get || descriptor.set) {
-                        Object.defineProperty(MixedClass.prototype, descriptorK, {
-                            get: descriptor.get,
-                            set: descriptor.set,
-                        });
                     }
                 }
             }

package/lib/langs/handler.d.ts

@@ -13,13 +13,20 @@ export declare class LangsHandler extends BaseHandler {
         get(locale?: string): import("..").DefaultLocale;
     };
     load(dir: string): Promise<void>;
-    parse(file: EventInstance): void;
-    set(instances: EventInstance[]): void;
-    reload(lang: string): Promise<false | Record<string, any> | null>;
+    parse(file: LangInstance): void;
+    set(instances: LangInstance[]): void;
+    reload(lang: string): Promise<false | {
+        file: Record<string, any>;
+        locale: string;
+    } | null>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
-    onFile(_locale: string, file: FileLoaded<Record<string, any>>): Record<string, any> | false;
+    onFile(locale: string, file: FileLoaded<Record<string, any>>): {
+        file: Record<string, any>;
+        locale: string;
+    } | false;
 }
-export type EventInstance = {
+export type LangInstance = {
     name: string;
     file: Record<string, any>;
+    path: string;
 };

package/lib/langs/handler.js

@@ -38,12 +38,13 @@ class LangsHandler extends common_1.BaseHandler {
         }
     }
     parse(file) {
-        const locale = file.name.split('.').slice(0, -1).join('.') || file.name;
-        const result = this.onFile(locale, file.file);
+        const oldLocale = file.name.split('.').slice(0, -1).join('.') || file.name;
+        const result = this.onFile(oldLocale, file.file);
+        if (!result)
+            return;
         if ('path' in file)
-            this.__paths[locale] = file.path;
-        if (result)
-            this.values[locale] = result;
+            this.__paths[result.locale] = file.path;
+        this.values[result.locale] = result.file;
     }
     set(instances) {
         for (const i of instances) {
@@ -71,8 +72,13 @@ class LangsHandler extends common_1.BaseHandler {
             }
         }
     }
-    onFile(_locale, file) {
-        return file.default ?? false;
+    onFile(locale, file) {
+        return file.default
+            ? {
+                file: file.default,
+                locale,
+            }
+            : false;
     }
 }
 exports.LangsHandler = LangsHandler;

package/package.json

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