Merge pull request #199 from ghostdevv/fix-command-event-type

ghostdevv · Apr 21, 2024 · 3e7e26b · 3e7e26b
2 parents fb8b173 + dc3caf6
commit 3e7e26b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/.changeset/clean-jobs-play.md b/.changeset/clean-jobs-play.md
@@ -0,0 +1,5 @@
+---
+"jellycommands": patch
+---
+
+fix: type error when manually adding command/event
diff --git a/packages/jellycommands/src/commands/resolve.ts b/packages/jellycommands/src/commands/resolve.ts
@@ -1,13 +1,14 @@
 import { GuildCommands, GlobalCommands } from './types.d';
 import { BaseCommand } from './types/BaseCommand';
 import { JellyCommands } from '../JellyCommands';
+import { AnyCommand } from './types/types';
 import { read } from '../utils/files';
 
 export const resolveCommands = async (
     client: JellyCommands,
-    items: string | Array<string | BaseCommand>,
+    items: string | Array<string | AnyCommand>,
 ) => {
-    const commands = new Set<BaseCommand>();
+    const commands = new Set<AnyCommand>();
 
     await read(items, (command) => {
         if (!(command instanceof BaseCommand))

diff --git a/packages/jellycommands/src/commands/types.d.ts b/packages/jellycommands/src/commands/types.d.ts
@@ -1,12 +1,12 @@
-import { BaseCommand } from './types/BaseCommand';
+import { AnyCommand } from './types/types';
 
-export type GlobalCommands = Set<BaseCommand>;
-export type GuildCommands = Map<string, Set<BaseCommand>>;
+export type GlobalCommands = Set<AnyCommand>;
+export type GuildCommands = Map<string, Set<AnyCommand>>;
 
-export type CommandIDMap = Map<string, BaseCommand>;
+export type CommandIDMap = Map<string, AnyCommand>;
 
 export interface ResolvedCommands {
     guildCommands: GuildCommands;
     globalCommands: GlobalCommands;
-    commands: Set<BaseCommand>;
+    commands: Set<AnyCommand>;
 }
diff --git a/packages/jellycommands/src/commands/types/types.d.ts b/packages/jellycommands/src/commands/types/types.d.ts
@@ -0,0 +1,6 @@
+import type { MessageCommand } from './messageCommands/MessageCommand';
+import type { UserCommand } from './userCommands/UserCommand';
+import type { Command } from './commands/Command';
+import type { BaseCommand } from './BaseCommand';
+
+export type AnyCommand = BaseCommand | Command | UserCommand | MessageCommand;
diff --git a/packages/jellycommands/src/options.ts b/packages/jellycommands/src/options.ts
@@ -1,5 +1,6 @@
 import type { ClientOptions, InteractionReplyOptions, MessagePayload } from 'discord.js';
 import { BaseCommand } from './commands/types/BaseCommand.js';
+import type { AnyCommand } from './commands/types/types';
 import { snowflakeSchema } from './utils/zod.js';
 import { Button } from './buttons/buttons';
 import { Event } from './events/Event';
@@ -38,12 +39,12 @@ export interface JellyCommandsOptions {
     /**
      * Either an array of commands, or path(s) to commands
      */
-    commands?: string | Array<string | BaseCommand>;
+    commands?: string | Array<string | AnyCommand>;
 
     /**
      * Either an array of events, or path(s) to events
      */
-    events?: string | Array<string | Event>;
+    events?: string | Array<string | Event<any>>;
 
     /**
      * Either an array of buttons, or path(s) to buttons