sern/handler
1
0
Fork 0
mirror of https://github.com/sern-handler/handler synced 2026-06-18 05:42:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix return type of sernModule

Browse Source
This commit is contained in:
Jacob Nguyen
2022-05-17 18:57:01 -05:00
parent 82f1bad8ff
commit cf85a5db64
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/handler/plugins/plugin.ts
View File

@@ -15,8 +15,8 @@ import type { Awaitable, Client } from 'discord.js';
import type { Err, Ok, Result } from 'ts-results';
import type { Module, Override } from '../..';
import type { BaseModule, ModuleDefs } from '../structures/module';
import type { CommandType } from '../structures/enums';
import { PluginType } from '../structures/enums';
import type { PluginType } from '../structures/enums';
import type { ValueOf } from 'ts-pattern/dist/types/helpers';
export interface Controller {
@@ -24,11 +24,8 @@ export interface Controller {
stop: () => Err<void>;
}
type executeCmdPlugin = (controller: Controller) => Result<void, void> ;
type BasePlugin = Override<BaseModule, {
type : PluginType,
execute : executeCmdPlugin
}>;
export type CommandPlugin = Override<BasePlugin, {
@@ -38,25 +35,25 @@ export type CommandPlugin = Override<BasePlugin, {
//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> = Override<BasePlugin, {
type: PluginType.Event;
export type EventPlugin<T extends keyof ModuleDefs> = Override<BasePlugin, {
modType: T;
type: PluginType.Event;
execute: (event: Parameters<ModuleDefs[T]['execute']>, controller: Controller) => Awaitable<Result<void, void>>;
}>;
export function plugins<T extends CommandType>(...plug: (CommandPlugin | EventPlugin<T>)[]) {
export function plugins(...plug: CommandPlugin[]) {
return plug;
}
export function sernModule<T extends CommandType>(
plugs: (CommandPlugin | EventPlugin<T>)[], mod : ModuleDefs[T]
) : ModuleDefs[T] {
const plugins = plugs.filter(el => el.type === PluginType.Command);
const onEvent = plugs.filter(el => el.type === PluginType.Event);
type ModuleNoPlugins = ValueOf<{
[T in keyof ModuleDefs] : Omit<ModuleDefs[T], 'plugins'>
}>
export function sernModule(
plugins: (CommandPlugin)[], mod : ModuleNoPlugins
) : Module {
return {
plugins,
onEvent,
...mod
};
}

6
src/handler/structures/module.ts
View File

@@ -30,14 +30,14 @@ export type TextCommand = Override<BaseModule, {
export type SlashCommand = Override<BaseModule, {
type: CommandType.Slash;
onEvent?: EventPlugin<CommandType.Slash>[]
plugins?: (CommandPlugin)[];
plugins?: CommandPlugin[];
options?: ApplicationCommandOptionData[];
}>;
export type BothCommand = Override<BaseModule, {
type: CommandType.Both;
onEvent?: EventPlugin<CommandType.Both>[]
plugins?: (CommandPlugin)[]
plugins?: CommandPlugin[]
alias?: string[];
options?: ApplicationCommandOptionData[];
}>;
@@ -45,7 +45,7 @@ export type BothCommand = Override<BaseModule, {
export type ContextMenuUser = Override<BaseModule, {
type: CommandType.MenuUser;
onEvent?: EventPlugin<CommandType.MenuUser>[];
plugins?: (CommandPlugin)[];
plugins?: CommandPlugin[];
execute: (ctx: UserContextMenuCommandInteraction) => Awaitable<void>
}>