@pikokr/command.ts 4.0.6 → 5.0.0-dev.84d717c

package/test/index.ts

@@ -1,30 +1,53 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
+import { ApplicationCommandOptionType } from 'discord.js'
+import { applicationCommand, getComponentStore, moduleHook, option, Registry } from '../src'
 
-import { Client, Intents, IntentsString } from 'discord.js'
-import { CommandClient } from '../src'
+class Test {
+  @applicationCommand({
+    name: 'test',
+    description: 'wow this is test',
+  })
+  async testCommand(
+    @option({
+      name: 'hello',
+      description: '와아',
+      type: ApplicationCommandOptionType.String,
+    })
+    hello: string,
+    world: string,
+  ) {}
 
-const config = require('./config.json')
+  @applicationCommand({
+    name: 'test2',
+    description: 'wow this is test wow',
+  })
+  async test2(
+    @option({
+      name: 'sans',
+      description: '와',
+      type: ApplicationCommandOptionType.String,
+    })
+    wa: string,
+  ) {}
 
-const client = new Client({
-  intents: Object.keys(Intents.FLAGS) as IntentsString[],
-})
+  @moduleHook('load')
+  load() {
+    console.log('load')
+  }
 
-const cts = new CommandClient({
-  owners: 'auto',
-  client,
-  command: {
-    prefix: '!',
-  },
-  applicationCommands: {
-    autoSync: true,
-    guild: '832938554438844438',
-  },
-})
+  @moduleHook('unload')
+  unload() {
+    console.log('unload')
+  }
+}
 
-require('./modules/test')
+const ext = new Test()
 
-cts.registry.loadModulesIn('modules')
+const registry = new Registry()
 
-client.login(config.token)
+const run = async () => {
+  await registry.registerModule(ext)
+
+  await registry.unregisterModule(ext)
+}
+
+run()

package/tsconfig.json

@@ -79,5 +79,5 @@
     "forceConsistentCasingInFileNames": true
     /* Disallow inconsistently-cased references to the same file. */
   },
-  "exclude": ["test", "node_modules", "dist", "tsup.config.ts", "scripts"]
+  "exclude": ["node_modules"]
 }

package/tsconfig.prod.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "scripts", "test", "tsup.config.ts"]
+}

package/tsup.config.ts

@@ -1,7 +1,11 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
+/*
+* File: tsup.config.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
 import { defineConfig } from 'tsup'
 
 export default defineConfig({

package/src/applicationCommand/AppCommand.ts

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { Module } from '../structures'
-import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js'
-import { KApplicationCommandChecks } from '../constants'
-import { ApplicationCommandCheckFunction } from '../command'
-
-export type AppCommandArgument = {
-  type: any
-  name?: string
-}
-
-export class AppCommand {
-  get checks(): ApplicationCommandCheckFunction[] {
-    return Reflect.getMetadata(KApplicationCommandChecks, this.module, this.key) || []
-  }
-
-  execute(module: Module, args: any[]) {
-    return this.run.apply(module, args)
-  }
-
-  constructor(
-    public command: ApplicationCommandDataResolvable,
-    private run: Function,
-    public module: Module,
-    public params: AppCommandArgument[],
-    public guild: Snowflake | Snowflake[] | undefined,
-    private key: string | symbol,
-  ) {}
-}

package/src/applicationCommand/decorator.ts

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { ApplicationCommandDataResolvable, Collection, Snowflake } from 'discord.js'
-import { checkTarget } from '../utils'
-import { KSlashCommandOptions, KApplicationCommands } from '../constants'
-import { Module } from '../structures'
-import { AppCommand } from './AppCommand'
-
-type ApplicationCommandOptions = {
-  guild: Snowflake | Snowflake[]
-  optionTypes?: any[]
-}
-
-export const applicationCommand = (opt: Partial<ApplicationCommandOptions> & { command: ApplicationCommandDataResolvable }) => {
-  return (
-    target: Object,
-    propertyKey: string,
-    // descriptor: TypedPropertyDescriptor<any>,
-  ) => {
-    checkTarget(target)
-
-    let properties: AppCommand[] = Reflect.getMetadata(KApplicationCommands, target)
-
-    const params: any[] = opt.optionTypes ?? Reflect.getMetadata('design:paramtypes', target, propertyKey)
-
-    const options: Collection<number, string> = Reflect.getMetadata(KSlashCommandOptions, target, propertyKey) || new Collection<number, string>()
-
-    const command = new AppCommand(
-      opt.command,
-      Reflect.get(target, propertyKey),
-      target as Module,
-      params.map((x, i) => ({
-        type: x,
-        name: options.get(i),
-      })),
-      opt.guild,
-      propertyKey,
-    )
-
-    if (properties) {
-      properties.push(command)
-    } else {
-      properties = [command]
-      Reflect.defineMetadata(KApplicationCommands, properties, target)
-    }
-  }
-}
-
-export const option = (key: string): ParameterDecorator => (target, propertyKey, parameterIndex) => {
-  checkTarget(target)
-
-  let properties: Collection<number, string> = Reflect.getMetadata(KSlashCommandOptions, target, propertyKey)
-
-  if (!properties) {
-    properties = new Collection<number, string>()
-    Reflect.defineMetadata(KSlashCommandOptions, properties, target, propertyKey)
-  }
-
-  properties.set(parameterIndex, key)
-}

package/src/builtinModules/BuiltInModule.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { Module } from '../structures'
-import { KBuiltInModule } from '../constants'
-
-export class BuiltInModule extends Module {
-  constructor() {
-    super()
-    Reflect.defineMetadata(KBuiltInModule, true, this)
-  }
-}

package/src/builtinModules/BuiltinApplicationCommandConverters.ts

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { BuiltInModule } from './BuiltInModule'
-import { Client } from 'discord.js'
-import { CommandClient } from '../structures'
-
-export class BuiltinApplicationCommandConverters extends BuiltInModule {
-  client: Client
-
-  constructor(private cts: CommandClient) {
-    super()
-    this.client = cts.client
-  }
-}

package/src/builtinModules/BuiltinCommandConverters.ts

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { BuiltInModule } from './BuiltInModule'
-import { argumentConverter } from '../command'
-import { Client, GuildMember, Message, User, Role } from 'discord.js'
-import { CommandClient } from '../structures'
-
-export class BuiltinCommandConverters extends BuiltInModule {
-  client: Client
-
-  constructor(private cts: CommandClient) {
-    super()
-    this.client = cts.client
-  }
-
-  @argumentConverter(Message, false)
-  message(msg: Message) {
-    return msg
-  }
-
-  @argumentConverter(String)
-  string(msg: Message, arg: string) {
-    return arg
-  }
-
-  getUserIDByMention(mention: string): `${bigint}` | undefined {
-    if (!mention) return
-    if (mention.startsWith('<@') && mention.endsWith('>')) {
-      mention = mention.slice(2, -1)
-      if (mention.startsWith('!')) {
-        mention = mention.slice(1)
-      }
-      return mention as `${bigint}`
-    }
-  }
-
-  @argumentConverter(User)
-  user(msg: Message, value: string): User | null {
-    let user = this.client.users.cache.get(value)
-    if (user) return user
-    user = this.client.users.cache.find((x) => x.tag === value || x.username === value)
-    if (user) return user
-    const id = this.getUserIDByMention(value)
-    if (!id) return null
-    user = this.client.users.cache.get(id)
-    return user || null
-  }
-
-  @argumentConverter(GuildMember)
-  member(msg: Message, value: string): GuildMember | undefined {
-    let user = msg.guild?.members.cache.get(value)
-    if (!user) return user
-    user = msg.guild?.members.cache.find((x) => x.user.tag === value)
-    if (user) return user
-    const id = this.getUserIDByMention(value)
-    if (!id) return
-    user = msg.guild?.members.cache.get(id)
-    return user || undefined
-  }
-
-  @argumentConverter(Number)
-  number(msg: Message, value: string) {
-    const n = Number(value)
-    return isNaN(n) ? undefined : n
-  }
-
-  getRoleIDByMention(mention: string): `${bigint}` | undefined {
-    if (!mention) return
-    if (mention.startsWith('<@') && mention.endsWith('>')) {
-      mention = mention.slice(2, -1)
-      if (mention.startsWith('&')) {
-        mention = mention.slice(1)
-      }
-      return mention as `${bigint}`
-    }
-  }
-
-  @argumentConverter(Role)
-  role(msg: Message, value: string): Role | undefined {
-    const id = this.getRoleIDByMention(value)
-    if (!id) return
-    const role = msg.guild?.roles.cache.get(id)
-    return role || undefined
-  }
-}

package/src/builtinModules/CommandHandler.ts

@@ -1,363 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-import { BuiltInModule } from './BuiltInModule'
-import { Registry } from '../structures'
-import { listener } from '../listener'
-import {
-  CommandInteraction,
-  CommandInteractionOptionResolver,
-  GuildMember,
-  Interaction,
-  Message,
-  MessageComponentInteraction,
-  MessageContextMenuInteraction,
-  Role,
-  User,
-  UserContextMenuInteraction,
-} from 'discord.js'
-import { CommandClient } from '../structures'
-import { Command } from '../command'
-import { ArgumentConverterNotFound, ArgumentNotProvided, CommandCheckFailed, ApplicationCommandArgumentConverterNotFound, ApplicationCommandCheckFailed } from '../error'
-import { CommandNotFound } from '../error/CommandNotFound'
-import { SlashCommandGlobalCheckError } from '../error/checks/SlashCommandGlobalCheckError'
-import { MessageComponentHandler } from '../messageComponents/base'
-
-export class CommandHandler extends BuiltInModule {
-  private readonly client: CommandClient
-
-  constructor(private registry: Registry) {
-    super()
-    this.client = registry.client
-  }
-
-  // region message command handler
-  @listener('messageCreate')
-  async message(msg: Message) {
-    const error = (error: Error) => this.client.client.emit('commandError', error, msg)
-
-    try {
-      const prefixList: string[] | string =
-        typeof this.client.options.command.prefix === 'string'
-          ? this.client.options.command.prefix
-          : typeof this.client.options.command.prefix === 'function'
-          ? await this.client.options.command.prefix(msg)
-          : this.client.options.command.prefix
-      let prefix: string
-      if (typeof prefixList === 'object') {
-        const res = prefixList.find((x) => msg.content.includes(x))
-
-        if (!res) return
-
-        prefix = res
-      } else {
-        if (!msg.content.includes(prefixList)) return
-        prefix = prefixList
-      }
-
-      if (!msg.content.startsWith(prefix)) return
-
-      const args = msg.content.slice(prefix.length).split(' ')
-
-      const command = args.shift()
-
-      if (!command) return
-
-      let cmd: Command | null = null
-
-      for (const c of this.registry.commands) {
-        const aliases = typeof c.aliases === 'function' ? await c.aliases(msg) : c.aliases
-        if ([...aliases, c.name].some((x) => x === command)) {
-          cmd = c
-          break
-        }
-      }
-
-      msg.data = {
-        cts: this.client,
-        command: cmd,
-        prefix: prefix,
-      }
-
-      if (!(await this.client.options.command.check(msg))) {
-        return
-      }
-
-      if (!cmd) return error(new CommandNotFound(command, msg, args))
-
-      const module = this.registry.modules.find((x) => x.commands.includes(cmd!))
-
-      if (!module) return
-
-      const argList: any[] = []
-
-      for (const check of cmd.checks) {
-        if (!(await check(msg))) return error(new CommandCheckFailed(msg, cmd))
-      }
-
-      for (let i = 0; i < cmd.argTypes.length; i++) {
-        const argType = cmd.argTypes[i]
-        const converter = this.registry.argumentConverters.find((x) => x.type === argType.type)
-
-        if (argType.rest) {
-          const i = args.join(' ')
-          argList.push(i)
-          break
-        }
-
-        if (!converter) return error(new ArgumentConverterNotFound(argType, msg))
-
-        const converterModule = this.registry.modules.find((x) => x.argumentConverters.includes(converter))
-
-        if (!converterModule) return error(new ArgumentConverterNotFound(argType, msg))
-
-        if (converter.withoutParameter) {
-          argList.push(await converter.execute(converterModule, msg))
-          continue
-        }
-        const arg = args.shift()
-        if (argType.optional && !arg) {
-          break
-        }
-        if (!arg) {
-          return error(new ArgumentNotProvided(i, cmd, msg))
-        }
-        const executed = await converter.execute(converterModule, msg, arg)
-        if ((executed === undefined || executed === null) && !argType.optional) {
-          return error(new ArgumentNotProvided(i, cmd, msg))
-        }
-        argList.push(executed)
-      }
-
-      try {
-        await cmd.execute(module, argList)
-      } catch (e: any) {
-        return error(e)
-      }
-    } catch (e) {
-      return error(e)
-    }
-  }
-  // endregion
-
-  // region slash command handler
-  private async command(i: CommandInteraction) {
-    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
-    try {
-      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'CHAT_INPUT' && x.command.name === i.commandName)
-
-      if (!cmd) return
-
-      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
-
-      if (!module) return
-
-      const argList: any[] = []
-
-      i.data = {
-        cts: this.client,
-        command: cmd,
-      }
-
-      if (!(await this.client.options.slashCommands.check(i))) {
-        return error(new SlashCommandGlobalCheckError(i))
-      }
-      for (const check of cmd.checks) {
-        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
-      }
-
-      for (let j = 0; j < cmd.params.length; j++) {
-        const argType = cmd.params[j]
-        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
-
-        if (argType.type === CommandInteraction) {
-          argList.push(i)
-          continue
-        }
-
-        if (argType.type === CommandInteractionOptionResolver) {
-          argList.push(i.options)
-          continue
-        }
-
-        if (argType.name) {
-          switch (argType.type) {
-            case String:
-              argList.push(i.options.getString(argType.name, false) || undefined)
-              break
-            case Role:
-              argList.push(i.options.getRole(argType.name, false) || undefined)
-              break
-            case User:
-              argList.push(i.options.getUser(argType.name, false) || undefined)
-              break
-            case GuildMember:
-              argList.push(i.options.getMember(argType.name, false) || undefined)
-              break
-            case Boolean:
-              argList.push(i.options.getBoolean(argType.name, false) || undefined)
-              break
-            case Number:
-              const opt = i.options.get(argType.name, false)
-              if (!opt) {
-                argList.push(undefined)
-                break
-              }
-              if (opt.type == 'NUMBER') {
-                argList.push(i.options.getNumber(argType.name, false) ?? undefined)
-                break
-              }
-              if (opt.type == 'INTEGER') {
-                argList.push(i.options.getInteger(argType.name, false) ?? undefined)
-                break
-              }
-          }
-          continue
-        }
-
-        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
-
-        argList.push(await converter.execute(module, i))
-      }
-
-      await cmd.execute(module, argList)
-    } catch (e) {
-      return error(e)
-    }
-  }
-  // endregion
-
-  private async messageComponent(i: MessageComponentInteraction) {
-    const error = (e: any) => this.client.client.emit('messageComponentError', e)
-
-    try {
-      const handlers: MessageComponentHandler[] = []
-
-      for (const handler of this.registry.messageComponentHandlers) {
-        if (handler.componentId === handler.componentId && handler.componentType === i.componentType) {
-          handlers.push(handler)
-        }
-      }
-
-      for (const handler of handlers) {
-        const module = this.registry.modules.find((x) => x.messageComponentHandlers.includes(handler))
-        if (!module) continue
-        await handler.run(module, i)
-      }
-    } catch (e) {
-      error(e)
-    }
-  }
-
-  private async userContextMenu(i: UserContextMenuInteraction) {
-    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
-    try {
-      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'USER' && x.command.name === i.commandName)
-
-      if (!cmd) return
-
-      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
-
-      if (!module) return
-
-      i.data = {
-        cts: this.client,
-        command: cmd,
-      }
-
-      for (const check of cmd.checks) {
-        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
-      }
-
-      let argList: any[] = []
-
-      for (let j = 0; j < cmd.params.length; j++) {
-        const argType = cmd.params[j]
-        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
-
-        if (argType.type === UserContextMenuInteraction) {
-          argList.push(i)
-          continue
-        }
-
-        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
-
-        argList.push(await converter.execute(module, i))
-      }
-
-      await cmd.execute(module, argList)
-    } catch (e) {
-      return error(e)
-    }
-  }
-
-  private async messageContextMenu(i: MessageContextMenuInteraction) {
-    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
-    try {
-      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'MESSAGE' && x.command.name === i.commandName)
-
-      if (!cmd) return
-
-      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
-
-      if (!module) return
-
-      i.data = {
-        cts: this.client,
-        command: cmd,
-      }
-
-      for (const check of cmd.checks) {
-        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
-      }
-
-      let argList: any[] = []
-
-      for (let j = 0; j < cmd.params.length; j++) {
-        const argType = cmd.params[j]
-        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
-
-        if (argType.type === MessageContextMenuInteraction) {
-          argList.push(i)
-          continue
-        }
-
-        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
-
-        argList.push(await converter.execute(module, i))
-      }
-
-      await cmd.execute(module, argList)
-    } catch (e) {
-      return error(e)
-    }
-  }
-
-  @listener('interactionCreate')
-  async interaction(i: Interaction) {
-    const error = (e: any) => this.client.client.emit('interactionError', e, i)
-
-    try {
-      await this.client.options.applicationCommands.beforeRunCheck(i)
-      if (i.isCommand()) {
-        await this.command(i)
-        return
-      }
-      if (i.isMessageComponent()) {
-        await this.messageComponent(i)
-        return
-      }
-      if (i.isMessageContextMenu()) {
-        await this.messageContextMenu(i)
-        return
-      }
-      if (i.isUserContextMenu()) {
-        await this.userContextMenu(i)
-        return
-      }
-    } catch (e) {
-      return error(e)
-    }
-  }
-}

package/src/builtinModules/index.ts

@@ -1,7 +0,0 @@
-/*
- * Copyright (c) 2022 pikokr. Licensed under the MIT license
- */
-
-export * from './CommandHandler'
-export * from './BuiltinCommandConverters'
-export * from './BuiltinApplicationCommandConverters'