fix: replace precondition object by name

Author: davidabou

src/define.ts

@@ -18,6 +18,7 @@ import type {
   DefineEvent,
   DefineEventWithOptions,
   DefinePrecondition,
+  DefinePreconditionWithName,
   EmbedOptions,
   EmbedSetters,
   EventCallback,
@@ -101,10 +102,25 @@ export const defineContextMenu: DefineContextMenu &
   }
 }
 
-export const definePrecondition: DefinePrecondition = (
-  callback: PreconditionCallback
+export const definePrecondition: DefinePrecondition &
+  DefinePreconditionWithName = (
+  ...args: [PreconditionCallback | string, PreconditionCallback?]
 ) => {
-  return { options: {}, callback }
+  let name = ''
+  let callback: PreconditionCallback
+
+  if (args.length === 1) {
+    const [cb] = args as [PreconditionCallback]
+
+    callback = cb
+  } else {
+    const [nm, cb] = args as [string, PreconditionCallback]
+
+    name = nm
+    callback = cb
+  }
+
+  return { name, callback }
 }
 
 export const defineModal = (options: ModalOptions): ModalBuilder => {

src/load.ts

@@ -35,6 +35,6 @@ export const loadPreconditions = (
   preconditions: HarmonixPrecondition[]
 ) => {
   for (const prc of preconditions) {
-    harmonix.preconditions.set(prc.options.name!, prc)
+    harmonix.preconditions.set(prc.name!, prc)
   }
 }

src/resolve.ts

@@ -13,8 +13,7 @@ import type {
   HarmonixEvent,
   HarmonixEventInput,
   HarmonixPrecondition,
-  HarmonixPreconditionInput,
-  PreconditionOptions
+  HarmonixPreconditionInput
 } from './types'
 
 export const resolveEvent = (
@@ -96,11 +95,9 @@ export const resolvePrecondition = (
     })
     const _prcPath = _jiti.resolve(prc)
     const precondition = _jiti(_prcPath) as HarmonixPrecondition
-    const options: PreconditionOptions = {
-      name: precondition.options.name || filename(_prcPath).split('.')[0]
-    }
+    const name = precondition.name || filename(_prcPath).split('.')[0]
 
-    return { options, callback: precondition.callback }
+    return { name, callback: precondition.callback }
   } else {
     return prc
   }

src/types/preconditions.ts

@@ -20,17 +20,18 @@ export type PreconditionCallback = (
   entity: SlashEntity | ContextMenuEntity
 ) => boolean
 
-export interface PreconditionOptions {
-  name?: string
-}
-
 export type DefinePrecondition = (
   callback: PreconditionCallback
 ) => HarmonixPrecondition
 
+export type DefinePreconditionWithName = (
+  name: string,
+  callback: PreconditionCallback
+) => HarmonixPrecondition
+
 export type HarmonixPreconditionInput = string | HarmonixPrecondition
 
 export interface HarmonixPrecondition {
-  options: PreconditionOptions
+  name: string
   callback: PreconditionCallback
 }