Fix Loader

Sheweny · Jun 6, 2022 · 7b2d691 · 7b2d691
1 parent 42dccc7
commit 7b2d691
Show file tree

Hide file tree

Showing 31 changed files with 13 additions and 645 deletions.
diff --git a/src/structures/BaseStructure.ts b/src/structures/BaseStructure.ts
@@ -11,6 +11,12 @@ export abstract class BaseStructure {
    */
   public client: ShewenyClient;
 
+  /**
+   * The structure is loadable by the Loader
+   * @internal
+   * @type {string} 
+   */
+  static readonly _id: string = "ShewenyLoadable";
   /**
    * Path to file
    * @type {string}

diff --git a/src/utils/Loader.ts b/src/utils/Loader.ts
@@ -16,7 +16,7 @@ import type { Class, Manager, Structure } from '../typescript/index.js';
 }*/
 type WithMainProperty<K extends string, V> = { [P in K]: V };
 type StructureConstructed<MKN extends string, MKV, V> = V & WithMainProperty<MKN, MKV>;
-type StructureConstructable<MKN extends string, MKV, S> = new (client: ShewenyClient) => S & WithMainProperty<MKN, MKV>;
+type StructureConstructable<MKN extends string, MKV, S> = {_id:string} & (new (client: ShewenyClient) => S & WithMainProperty<MKN, MKV>);
 type StructureType<MKN extends string, MKV> = BaseStructure & WithMainProperty<MKN, MKV>;
 
 interface LoaderOptions {
@@ -94,6 +94,7 @@ export class Loader<MKN extends string, MKV, V extends StructureType<MKN, MKV>>
   }
   private async loadStructure(StructureToLoad: StructureConstructable<MKN, MKV, V>, path: string) {
     try {
+      if(StructureToLoad["_id"] != "ShewenyLoadable") return;
       const instance: StructureConstructed<MKN, MKV, V> = new StructureToLoad(this.client);
       if (!instance) return;
       // Bad instance
@@ -102,7 +103,7 @@ export class Loader<MKN extends string, MKV, V extends StructureType<MKN, MKV>>
         return new ShewenyWarning(this.client, 'MISSING_PROPERTY_CLASS', this.mainKey, path);
       }
       if (this.collection.get(instance[this.mainKey])) {
-        return new ShewenyWarning(this.client, 'DUPLICATE_CLASS', path);
+        return new ShewenyWarning(this.client, 'DUPLICATE_CLASS', `${instance[this.mainKey]}`, path);
       }
 
       // Set data on structure

diff --git a/test/build/commands/autocomplete/autocomplete.js b/test/build/commands/autocomplete/autocomplete.js
diff --git a/test/build/commands/buttons/buttons-regex.js b/test/build/commands/buttons/buttons-regex.js
diff --git a/test/build/commands/buttons/buttons.js b/test/build/commands/buttons/buttons.js
diff --git a/test/build/commands/context-menus/msg.js b/test/build/commands/context-menus/msg.js
diff --git a/test/build/commands/context-menus/user.js b/test/build/commands/context-menus/user.js
diff --git a/test/build/commands/eval.js b/test/build/commands/eval.js
diff --git a/test/build/commands/modals/modal.js b/test/build/commands/modals/modal.js
diff --git a/test/build/commands/msg-commands/arguments.js b/test/build/commands/msg-commands/arguments.js
diff --git a/test/build/commands/msg-commands/test-msg.js b/test/build/commands/msg-commands/test-msg.js
diff --git a/test/build/commands/permissions.js b/test/build/commands/permissions.js