From cccfecc32517fd5dbe59145c48f7c387254c6a67 Mon Sep 17 00:00:00 2001
From: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>
Date: Tue, 14 Jun 2022 09:39:29 -0500
Subject: [PATCH] feat: add generic to readFile.ts buildData, adding different
 event loading strategies

---
 src/handler/events/readyEvent.ts  | 2 +-
 src/handler/structures/wrapper.ts | 5 ++++-
 src/handler/utilities/readFile.ts | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/handler/events/readyEvent.ts b/src/handler/events/readyEvent.ts
index 033c7f6..078eb94 100644
--- a/src/handler/events/readyEvent.ts
+++ b/src/handler/events/readyEvent.ts
@@ -28,7 +28,7 @@ import { errTap } from './observableHandling';
 export const onReady = (wrapper: Wrapper) => {
     const { client, commands } = wrapper;
     const ready$ = fromEvent(client, 'ready').pipe(take(1), skip(1));
-    const processCommandFiles$ = Files.buildData(commands).pipe(
+    const processCommandFiles$ = Files.buildData<Module>(commands).pipe(
         errTap(reason => {
             wrapper.sernEmitter?.emit('module.register', {
                 type: 'failure',
diff --git a/src/handler/structures/wrapper.ts b/src/handler/structures/wrapper.ts
index 2343940..c110dff 100644
--- a/src/handler/structures/wrapper.ts
+++ b/src/handler/structures/wrapper.ts
@@ -16,7 +16,10 @@ interface Wrapper {
     readonly sernEmitter?: SernEmitter;
     readonly defaultPrefix?: string;
     readonly commands: string;
-    readonly events?: (DiscordEvent | EventEmitterRegister | SernEvent)[];
+    readonly events?:
+        | (DiscordEvent | EventEmitterRegister | SernEvent)[]
+        | string
+        | (() => (DiscordEvent | EventEmitterRegister | SernEvent)[]);
 }
 
 export default Wrapper;
diff --git a/src/handler/utilities/readFile.ts b/src/handler/utilities/readFile.ts
index d7591fe..74bbd22 100644
--- a/src/handler/utilities/readFile.ts
+++ b/src/handler/utilities/readFile.ts
@@ -48,10 +48,10 @@ export const fmtFileName = (n: string) => n.substring(0, n.length - 3);
  * @param commandDir
  */
 
-export function buildData(commandDir: string): Observable<
+export function buildData<T>(commandDir: string): Observable<
     Result<
         {
-            mod: Module;
+            mod: T;
             absPath: string;
         },
         SernError.UndefinedModule
@@ -60,7 +60,7 @@ export function buildData(commandDir: string): Observable<
     return from(
         getCommands(commandDir).map(absPath => {
             // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const mod = <Module | undefined>require(absPath).default;
+            const mod = <T | undefined>require(absPath).default;
             if (mod !== undefined) {
                 return Ok({ mod, absPath });
             } else return Err(SernError.UndefinedModule as const);