Merge pull request #161 from ghostdevv/totalist

Author: ghostdevv

.changeset/wise-needles-look.md

@@ -0,0 +1,5 @@
+---
+'jellycommands': patch
+---
+
+change command/event file resolution logic

packages/jellycommands/package.json

@@ -47,8 +47,8 @@
   "dependencies": {
     "axios": "^1.3.3",
     "discord-api-types": "^0.37.35",
-    "ghoststools": "^0.6.3",
-    "joi": "^17.8.3"
+    "joi": "^17.8.3",
+    "totalist": "^3.0.0"
   },
   "repository": {
     "type": "git",

packages/jellycommands/src/commands/resolve.ts

@@ -1,13 +1,20 @@
 import { GuildCommands, GlobalCommands } from './types.d';
-import { resolveItems } from '../utils/resolveItems';
 import { BaseCommand } from './types/BaseCommand';
 import { JellyCommands } from '../JellyCommands';
+import { read } from '../utils/files';
 
 export const resolveCommands = async (
     client: JellyCommands,
     items: string | Array<string | BaseCommand>,
 ) => {
-    const commands = await resolveItems(items);
+    const commands = new Set<BaseCommand>();
+
+    await read(items, (command) => {
+        if (!(command instanceof BaseCommand))
+            throw new Error(`Found invalid item "${command}" in options.commands`);
+
+        commands.add(command);
+    });
 
     const globalCommands: GlobalCommands = new Set();
     const guildCommands: GuildCommands = new Map();

packages/jellycommands/src/events/register.ts

@@ -1,12 +1,19 @@
-import { resolveItems } from '../utils/resolveItems';
 import { JellyCommands } from '../JellyCommands';
+import { read } from '../utils/files';
 import { Event } from './Event';
 
 export const registerEvents = async (
     client: JellyCommands,
     items: string | Array<string | Event<any>>,
 ) => {
-    const events = await resolveItems(items);
+    const events = new Set<Event>();
+
+    await read(items, (event) => {
+        if (!(event instanceof Event))
+            throw new Error(`Found invalid item "${event}" in options.events`);
+
+        events.add(event);
+    });
 
     for (const event of events) {
         if (event.options.disabled) continue;

packages/jellycommands/src/utils/files.ts

@@ -0,0 +1,25 @@
+import { totalist } from 'totalist';
+
+// Takes in file/folder paths and T and will resolve all to T
+// When T is found callback is called
+export async function read<T>(things: string | Array<string | T>, callback: (item: T) => void) {
+    const thingsArray = Array.isArray(things) ? things : [things];
+
+    for (const item of thingsArray) {
+        if (typeof item != 'string') {
+            callback(item);
+            continue;
+        }
+
+        await totalist(item, async (name, path) => {
+            // If it starts with an _ we ignore it
+            if (name.startsWith('_')) return;
+
+            // Import the file
+            const data = await import(path);
+
+            // Call add with the default export
+            callback(data.default);
+        });
+    }
+}