fix: context menu type

Author: davidabou

src/define.ts

@@ -4,9 +4,8 @@ import type {
   CommandExecute,
   ContextMenuCallback,
   ContextMenuConfig,
+  ContextMenuType,
   DefineButton,
-  DefineContextMenu,
-  DefineContextMenuWithOptions,
   DefineEvent,
   DefineEventWithOptions,
   DefinePrecondition,
@@ -68,26 +67,25 @@ export const defineCommand = <T extends OptionsDef = OptionsDef>(
   return { config, execute }
 }
 
-export const defineContextMenu: DefineContextMenu &
-  DefineContextMenuWithOptions = <Type extends 'message' | 'user'>(
+export const defineContextMenu = <T extends ContextMenuType = 'Message'>(
   ...args: [
-    ContextMenuConfig | ContextMenuCallback<Type>,
-    ContextMenuCallback<Type>?
+    (ContextMenuConfig & { type?: T }) | ContextMenuCallback<T>,
+    ContextMenuCallback<T>?
   ]
 ): HarmonixContextMenu => {
   let config: ContextMenuConfig = {}
 
   if (args.length === 1) {
-    const [callback] = args as [ContextMenuCallback<Type>]
+    const [callback] = args as [ContextMenuCallback<T>]
 
     return {
       config,
       callback
     }
   } else {
     const [cfg, callback] = args as [
-      ContextMenuConfig,
-      ContextMenuCallback<Type>
+      ContextMenuConfig<T>,
+      ContextMenuCallback<T>
     ]
 
     config = cfg

src/types/context-menus.ts

@@ -4,31 +4,29 @@ import type {
   UserContextMenuCommandInteraction
 } from 'discord.js'
 
-export type ContextMenuCallback<Type extends 'message' | 'user'> = (
-  interaction: Type extends 'message'
+export type ContextMenuType = 'Message' | 'User'
+
+export type ContextMenuCallback<T extends ContextMenuType = ContextMenuType> = (
+  interaction: T extends 'Message'
     ? MessageContextMenuCommandInteraction
     : UserContextMenuCommandInteraction
 ) => void
 
-export interface ContextMenuConfig {
+export interface ContextMenuConfig<
+  T extends ContextMenuType = ContextMenuType
+> {
   name?: string
-  type?: 'message' | 'user'
+  type?: T
   userPermissions?: PermissionsString[]
   guildOnly?: boolean
   preconditions?: string[]
 }
 
-export type DefineContextMenu = <Type extends 'message' | 'user'>(
-  callback: ContextMenuCallback<Type>
-) => HarmonixContextMenu
-export type DefineContextMenuWithOptions = <Type extends 'message' | 'user'>(
-  config: ContextMenuConfig,
-  callback: ContextMenuCallback<Type>
-) => HarmonixContextMenu
-
 export type HarmonixContextMenuInput = string | HarmonixContextMenu
 
-export interface HarmonixContextMenu {
-  config: ContextMenuConfig
-  callback: ContextMenuCallback<'message' | 'user'>
+export interface HarmonixContextMenu<
+  T extends ContextMenuType = ContextMenuType
+> {
+  config: ContextMenuConfig<T>
+  callback: ContextMenuCallback<T>
 }