From c40b75d333700f2158eb9f22c08bac90fbf6a4e8 Mon Sep 17 00:00:00 2001
From: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com>
Date: Tue, 17 May 2022 16:05:35 -0500
Subject: [PATCH] refactor: Simplify sernModule handler signature

---
 src/handler/plugins/plugin.ts | 47 ++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/handler/plugins/plugin.ts b/src/handler/plugins/plugin.ts
index 52ed9a9..3abaec4 100644
--- a/src/handler/plugins/plugin.ts
+++ b/src/handler/plugins/plugin.ts
@@ -28,40 +28,41 @@ export enum PluginType {
     Event = 0b10,
 }
 
-type executeCmdPlugin = { execute: (wrapper: Wrapper, controller: Controller) => Result<void, void> };
+type executeCmdPlugin =  (controller: Controller) => Result<void, void> ;
 
-interface BasePlugin extends Override<BaseModule, executeCmdPlugin> {
-    type: PluginType;
-}
+type BasePlugin = Override<BaseModule, {
+    type : PluginType,
+    execute : executeCmdPlugin
+}>;
 
-export type CommandPlugin = {
+export type CommandPlugin = Override<BasePlugin, {
     type: PluginType.Command;
-} & Override<BasePlugin,
-    {
-        execute: (wrapper: Client, module: Module, controller: Controller) => Awaitable<Result<void, void>>;
-    }>;
+    execute: (wrapper: Client, module: Module, controller: Controller) => Awaitable<Result<void, void>>;
+}>;
 
 //TODO: rn adding the modType check a little hackish. Find better way to determine the
 // module type of the event plugin
-export type EventPlugin<T extends CommandType> = {
+export type EventPlugin<T extends CommandType> = Override<BasePlugin, {
     type: PluginType.Event;
     modType: T;
-} & Override<BasePlugin,
-    {
-        execute: (event: Parameters<ModuleDefs[T]['execute']>, controller: Controller) => Awaitable<Result<void, void>>;
-    }>;
+    execute: (event: Parameters<ModuleDefs[T]['execute']>, controller: Controller) => Awaitable<Result<void, void>>;
+}>;
 
-export function plugins(...plug: CommandPlugin[]): CommandPlugin[];
-export function plugins<T extends CommandType>(...plug: EventPlugin<T>[]): EventPlugin<T>[];
 
-export function plugins<T extends CommandType>(...plug: CommandPlugin[] | EventPlugin<T>[]) {
+export function plugins<T extends CommandType>(...plug: (CommandPlugin | EventPlugin<T>)[]) {
     return plug;
 }
 
-export function sernModule<T extends CommandType>(plugins : CommandPlugin[], onEvent: EventPlugin<T>[], mod: Omit<ModuleDefs[T], 'onEvent' | 'plugins' >) {
-    // return {
-    //     plugins,
-    //     onEvent,
-    //     ...mod,
-    // };
+export function sernModule<T extends CommandType>(
+    plugs: (CommandPlugin | EventPlugin<T>)[], mod : ModuleDefs[T]
+) : ModuleDefs[T] {
+    //mod.plugins if defined, warn user to use first parameter
+    //mod.onEvent if defined, warn user to use first parameter
+    const plugins = plugs.filter(el => el.type === PluginType.Command);
+    const onEvent = plugs.filter(el => el.type === PluginType.Event);
+    return {
+        plugins,
+        onEvent,
+        ...mod
+    } as unknown as ModuleDefs[T];
 }