👽️ feat: use new decorator

Author: Helloyunho

src/client/client.ts

@@ -10,7 +10,7 @@ import { ChannelsManager } from '../managers/channels.ts'
 import { ClientPresence } from '../structures/presence.ts'
 import { EmojisManager } from '../managers/emojis.ts'
 import { ActivityGame, ClientActivity } from '../types/presence.ts'
-import type { Extension } from '../commands/extension.ts'
+import { Extension } from '../commands/extension.ts'
 import { InteractionsClient } from '../interactions/client.ts'
 import { ShardManager } from './shard.ts'
 import { Application } from '../structures/application.ts'
@@ -217,16 +217,6 @@ export class Client extends HarmonyEventEmitter<ClientEvents> {
     }
     if (options.compress !== undefined) this.compress = options.compress
 
-    if (
-      (this as any)._decoratedEvents !== undefined &&
-      Object.keys((this as any)._decoratedEvents).length !== 0
-    ) {
-      Object.entries((this as any)._decoratedEvents).forEach((entry) => {
-        this.on(entry[0] as keyof ClientEvents, (entry as any)[1].bind(this))
-      })
-      ;(this as any)._decoratedEvents = undefined
-    }
-
     Object.defineProperty(this, 'clientProperties', {
       value:
         options.clientProperties === undefined
@@ -499,23 +489,24 @@ export class Client extends HarmonyEventEmitter<ClientEvents> {
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function event(name?: keyof ClientEvents) {
   return function (
-    client: Client | Extension,
-    prop: keyof ClientEvents | string
+    original: (...args: any[]) => any,
+    {
+      name: prop,
+      addInitializer,
+      private: _private
+    }: ClassMethodDecoratorContext<Client | Extension>
   ) {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const c = client as any
-    const listener = (
-      client as unknown as {
-        [name in keyof ClientEvents]: (...args: ClientEvents[name]) => any
+    if (_private === true)
+      throw new TypeError('Not supported on private methods.')
+
+    addInitializer(function () {
+      const key = name === undefined ? prop.toString() : name
+      if (this instanceof Client) {
+        this.on(key as keyof ClientEvents, original.bind(this))
+      } else if (this instanceof Extension) {
+        this.listen(key as keyof ClientEvents, original.bind(this))
       }
-    )[prop as unknown as keyof ClientEvents]
-    if (typeof listener !== 'function') {
-      throw new Error('@event decorator requires a function')
-    }
-
-    if (c._decoratedEvents === undefined) c._decoratedEvents = {}
-    const key = name === undefined ? prop : name
-
-    c._decoratedEvents[key] = listener
+    })
+    return original
   }
 }

src/commands/client.ts

@@ -151,14 +151,6 @@ export class CommandClient extends Client implements CommandClientOptions {
     this.globalCommandCooldown = options.globalCommandCooldown ?? 0
     this.globalCooldown = options.globalCooldown ?? 0
 
-    const self = this as any
-    if (self._decoratedCommands !== undefined) {
-      Object.values(self._decoratedCommands).forEach((entry: any) => {
-        this.commands.add(entry)
-      })
-      self._decoratedCommands = undefined
-    }
-
     this.on(
       'messageCreate',
       async (msg: Message) => await this.processMessage(msg)
@@ -527,49 +519,62 @@ export class CommandClient extends Client implements CommandClientOptions {
  * Command decorator. Decorates the function with optional metadata as a Command registered upon constructing class.
  */
 export function command(options?: CommandOptions) {
-  return function (target: CommandClient | Extension, name: string) {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const c = target as any
-    if (c._decoratedCommands === undefined) c._decoratedCommands = {}
-
-    const prop = c[name]
-
-    if (typeof prop !== 'function')
-      throw new Error('@command decorator can only be used on class methods')
-
-    const command = new Command()
-
-    command.name = name
-    command.execute = prop
-
-    if (options !== undefined) Object.assign(command, options)
+  return function (
+    original: (...args: any[]) => any,
+    {
+      name,
+      addInitializer,
+      private: _private
+    }: ClassMethodDecoratorContext<CommandClient | Extension>
+  ) {
+    if (_private === true)
+      throw new TypeError('Not supported on private methods.')
+
+    addInitializer(function () {
+      const command = new Command()
+
+      command.name = name.toString()
+      command.execute = original.bind(this)
+
+      if (options !== undefined) Object.assign(command, options)
+
+      if (this instanceof Extension) {
+        command.extension = this
+      }
 
-    if (target instanceof Extension) command.extension = target
+      this.commands.add(command)
+    })
 
-    c._decoratedCommands[command.name] = command
+    return original
   }
 }
 
 /**
  * Sub Command decorator. Decorates the function with optional metadata as a Sub Command registered upon constructing class.
  */
 export function subcommand(options?: CommandOptions) {
-  return function (target: Command, name: string) {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const c = target as any
-    if (c._decoratedSubCommands === undefined) c._decoratedSubCommands = []
-
-    const prop = c[name]
-
-    if (typeof prop !== 'function')
-      throw new Error('@command decorator can only be used on class methods')
-
-    const command = new Command()
-
-    command.name = name
-    command.execute = prop
-
-    if (options !== undefined) Object.assign(command, options)
-    c._decoratedSubCommands.push(command)
+  return function (
+    original: (...args: any[]) => any,
+    {
+      name,
+      addInitializer,
+      private: _private
+    }: ClassMethodDecoratorContext<Command>
+  ) {
+    if (_private === true)
+      throw new TypeError('Not supported on private methods.')
+
+    addInitializer(function () {
+      const command = new Command()
+
+      command.name = name.toString()
+      command.execute = original.bind(this)
+
+      if (options !== undefined) Object.assign(command, options)
+      if (this.subCommands === undefined) this.subCommands = []
+      this.subCommands.push(command)
+    })
+
+    return original
   }
 }

src/commands/command.ts

@@ -111,8 +111,6 @@ export class Command implements CommandOptions {
   /** Global command cooldown in MS */
   globalCooldown?: number
 
-  declare readonly _decoratedSubCommands?: Command[]
-
   /** Method called when the command errors */
   onError(ctx: CommandContext, error: Error): unknown | Promise<unknown> {
     return
@@ -153,24 +151,9 @@ export class Command implements CommandOptions {
     }`
   }
 
-  constructor() {
-    if (
-      this._decoratedSubCommands !== undefined &&
-      this._decoratedSubCommands.length > 0
-    ) {
-      if (this.subCommands === undefined) this.subCommands = []
-      const commands = this._decoratedSubCommands
-      delete (this as unknown as Record<string, unknown>)._decoratedSubCommands
-      Object.defineProperty(this, '_decoratedSubCommands', {
-        value: commands,
-        enumerable: false
-      })
-    }
-  }
-
   /** Get an Array of Sub Commands, including decorated ones */
   getSubCommands(): Command[] {
-    return [...(this._decoratedSubCommands ?? []), ...(this.subCommands ?? [])]
+    return this.subCommands ?? []
   }
 }
 

src/interactions/client.ts

@@ -131,60 +131,6 @@ export class InteractionsClient extends HarmonyEventEmitter<InteractionsClientEv
 
     this.enabled = options.enabled ?? true
 
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const client = this.client as unknown as {
-      _decoratedAppCmd: ApplicationCommandHandler[]
-      _decoratedAutocomplete: AutocompleteHandler[]
-      _decoratedComponents: ComponentInteractionHandler[]
-    }
-    if (client?._decoratedAppCmd !== undefined) {
-      client._decoratedAppCmd.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        this.handlers.push(e)
-      })
-    }
-
-    if (client?._decoratedAutocomplete !== undefined) {
-      client._decoratedAutocomplete.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        this.autocompleteHandlers.push(e)
-      })
-    }
-
-    if (client?._decoratedComponents !== undefined) {
-      client._decoratedComponents.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        this.componentHandlers.push(e)
-      })
-    }
-
-    const self = this as unknown as InteractionsClient & {
-      _decoratedAppCmd: ApplicationCommandHandler[]
-      _decoratedAutocomplete: AutocompleteHandler[]
-      _decoratedComponents: ComponentInteractionHandler[]
-    }
-
-    if (self._decoratedAppCmd !== undefined) {
-      self._decoratedAppCmd.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        self.handlers.push(e)
-      })
-    }
-
-    if (self._decoratedAutocomplete !== undefined) {
-      self._decoratedAutocomplete.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        self.autocompleteHandlers.push(e)
-      })
-    }
-
-    if (self._decoratedComponents !== undefined) {
-      self._decoratedComponents.forEach((e) => {
-        e.handler = e.handler.bind(this.client)
-        self.componentHandlers.push(e)
-      })
-    }
-
     Object.defineProperty(this, 'rest', {
       value:
         options.client === undefined
@@ -540,9 +486,9 @@ export class InteractionsClient extends HarmonyEventEmitter<InteractionsClientEv
     ])
 
     return edverify(
-      decodeHex(encodeText(this.publicKey)),
+      decodeHex(this.publicKey),
       decodeHex(
-        signature instanceof Uint8Array ? signature : encodeText(signature)
+        signature instanceof Uint8Array ? decodeText(signature) : signature
       ),
       fullBody
     )

src/interactions/commandModule.ts

@@ -10,20 +10,6 @@ export class ApplicationCommandsModule {
   autocomplete: AutocompleteHandler[] = []
   components: ComponentInteractionHandler[] = []
 
-  constructor() {
-    if ((this as any)._decoratedAppCmd !== undefined) {
-      this.commands = (this as any)._decoratedAppCmd
-    }
-
-    if ((this as any)._decoratedAutocomplete !== undefined) {
-      this.autocomplete = (this as any)._decoratedAutocomplete
-    }
-
-    if ((this as any)._decoratedComponents !== undefined) {
-      this.components = (this as any)._decoratedComponents
-    }
-  }
-
   add(handler: ApplicationCommandHandler): this {
     this.commands.push(handler)
     return this