fix: add default type for slash generic type

Author: davidabou

src/define.ts

@@ -59,12 +59,12 @@ export const defineEvent: DefineEvent & DefineEventWithOptions = <
 }
 
 export const defineCommand = <
-  Slash extends boolean,
+  K extends boolean = boolean,
   T extends ArgsDef = ArgsDef
 >(
-  options: CommandOptions<Slash> & { slash?: Slash; args?: T },
-  execute: CommandExecute<Slash, T>
-): HarmonixCommand<Slash, T> => {
+  options: CommandOptions<K> & { slash?: K; args?: T },
+  execute: CommandExecute<K, T>
+): HarmonixCommand<K, T> => {
   return { options, execute }
 }
 

src/resolve.ts

@@ -2,7 +2,6 @@ import jiti from 'jiti'
 import { dirname } from 'pathe'
 import { filename } from 'pathe/utils'
 import type {
-  ArgsDef,
   CommandOptions,
   ContextMenuOptions,
   EventOptions,
@@ -46,14 +45,14 @@ export const resolveEvent = (
 export const resolveMessageCommand = (
   cmd: HarmonixCommandInput,
   harmonixOptions: Harmonix['options']
-): HarmonixCommand<boolean, ArgsDef> => {
+): HarmonixCommand => {
   if (typeof cmd === 'string') {
     const _jiti = jiti(harmonixOptions.rootDir, {
       interopDefault: true
     })
     const _cmdPath = _jiti.resolve(cmd)
-    const command = _jiti(_cmdPath) as HarmonixCommand<boolean, ArgsDef>
-    const options: CommandOptions<boolean> = {
+    const command = _jiti(_cmdPath) as HarmonixCommand
+    const options: CommandOptions = {
       name: command.options.name || filename(_cmdPath).split('.')[0],
       category: command.options.category || filename(dirname(_cmdPath)),
       slash: command.options.slash || filename(_cmdPath).endsWith('.slash'),

src/types/commands.ts

@@ -138,13 +138,11 @@ interface CommandContext<T extends ArgsDef = ArgsDef> {
   args: ParsedArgs<T>
 }
 
-export type CommandOptions<Slash extends boolean> = Slash extends true
+export type CommandOptions<K extends boolean = boolean> = K extends true
   ? SlashCommandOptions
   : MessageCommandOptions
 
-export type MessageOrInteraction =
-  | Message
-  | ChatInputCommandInteraction
+export type MessageOrInteraction = Message | ChatInputCommandInteraction
 
 type ExecuteArgument<Slash extends boolean> = Slash extends true
   ? ChatInputCommandInteraction
@@ -161,12 +159,12 @@ export type CommandExecute<
   context: CommandContext<T>
 ) => void
 
-export type HarmonixCommandInput = string | HarmonixCommand<boolean, ArgsDef>
+export type HarmonixCommandInput = string | HarmonixCommand
 
 export interface HarmonixCommand<
-  Slash extends boolean,
+  K extends boolean = boolean,
   T extends ArgsDef = ArgsDef
 > {
-  options: CommandOptions<Slash>
-  execute: CommandExecute<Slash, T>
+  options: CommandOptions<K>
+  execute: CommandExecute<K, T>
 }