@pikokr/command.ts 5.0.0-dev.a0bc517 → 5.0.0-dev.c0902b8

package/src/core/structures/Registry.ts

@@ -1,17 +1,37 @@
+/*
+* File: Registry.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+import chalk from 'chalk'
 import { Collection } from 'discord.js'
 import EventEmitter from 'events'
 import _ from 'lodash'
-import { BaseComponent, getComponentStore } from '../components'
+import { Logger } from 'tslog'
+import { getComponentStore } from '../components'
+import type { BaseComponent } from '../components'
 import { getModuleHookStore } from '../hooks'
 import { ListenerComponent } from '../listener'
-import { ListenersSymbol } from '../symbols'
+import { CommandClientSymbol } from '../symbols'
+import { CommandClient } from './CommandClient'
 
 export class Registry {
   extensions: object[] = []
 
   emitters: Collection<string, EventEmitter> = new Collection()
 
-  getComponentsWithTypeGlobal<T extends typeof BaseComponent<Config, RequiredConfig>, Config, RequiredConfig>(type: T): InstanceType<T>[] {
+  logger: Logger
+
+  constructor(logger: Logger, public client: CommandClient) {
+    this.logger = logger.getChildLogger({
+      prefix: [chalk.green('[Registry]')],
+    })
+  }
+
+  getComponentsWithTypeGlobal<T extends typeof BaseComponent<Config>, Config>(type: T): InstanceType<T>[] {
     const result: InstanceType<T>[] = []
 
     for (const ext of this.extensions) {
@@ -21,7 +41,7 @@ export class Registry {
     return result
   }
 
-  getComponentsWithType<T extends typeof BaseComponent<Config, RequiredConfig>, Config, RequiredConfig>(ext: object, type: T): InstanceType<T>[] {
+  getComponentsWithType<T extends typeof BaseComponent<Config>, Config>(ext: object, type: T): InstanceType<T>[] {
     const componentStore = getComponentStore(ext)
 
     return Array.from(componentStore.filter((x) => (x.constructor as unknown) === type).values() as Iterable<InstanceType<T>>)
@@ -57,15 +77,19 @@ export class Registry {
   }
 
   async registerModule(ext: object) {
+    Reflect.defineMetadata(CommandClientSymbol, this.client, ext)
+
     this.registerEventListeners(ext)
     await this.runModuleHook(ext, 'load')
     this.extensions.push(ext)
+    this.logger.info(`Module registered: ${chalk.green(ext.constructor.name)}`)
   }
 
   async unregisterModule(ext: object) {
     this.unregisterEventListeners(ext)
     await this.runModuleHook(ext, 'unload')
     _.remove(this.extensions, (x) => x === ext)
+    this.logger.info(`Module unregistered: ${chalk.green(ext.constructor.name)}`)
   }
 
   runModuleHook(ext: object, hookName: string, ...args: unknown[]) {
@@ -75,7 +99,7 @@ export class Registry {
 
     if (functions) {
       for (const fn of functions) {
-        fn.apply(ext, args)
+        fn.call(ext, ...args)
       }
     }
   }

package/src/core/structures/index.ts

@@ -1,2 +1,10 @@
+/*
+* File: index.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
 export * from './Registry'
 export * from './CommandClient'

package/src/core/symbols.ts

@@ -1,4 +1,13 @@
-export const ComponentStoreSymbol = Symbol()
-export const ComponentArgStoreSymbol = Symbol()
-export const ModuleHookStoreSymbol = Symbol()
-export const ListenersSymbol = Symbol()
+/*
+* File: symbols.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+export const ComponentStoreSymbol = Symbol()
+export const ComponentArgStoreSymbol = Symbol()
+export const ModuleHookStoreSymbol = Symbol()
+export const CommandClientSymbol = Symbol()
+export const ComponentHookSymbol = Symbol()

package/src/core/utils/checks.ts

@@ -0,0 +1,27 @@
+/*
+* File: checks.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+import { BaseInteraction, Interaction, Message } from 'discord.js'
+import { createComponentHook } from '../hooks'
+import { ComponentHookFn } from '../hooks/componentHook'
+import { CommandClient } from '../structures'
+import { OwnerOnlyError } from './errors'
+
+export const createCheckDecorator = (fn: ComponentHookFn) => createComponentHook('beforeCall', fn)
+
+export const ownerOnly = createCheckDecorator(async (client: CommandClient, i: Interaction | Message) => {
+  let isOwner = false
+
+  if (i instanceof BaseInteraction) {
+    isOwner = client.owners.has(i.user.id)
+  } else if (i instanceof Message) {
+    isOwner = client.owners.has(i.author.id)
+  }
+
+  if (!isOwner) throw new OwnerOnlyError()
+})

package/src/core/utils/errors.ts

@@ -0,0 +1,9 @@
+/*
+* File: errors.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+export class OwnerOnlyError {}

package/src/core/utils/index.ts

@@ -0,0 +1,10 @@
+/*
+* File: index.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+export * from './checks'
+export * from './errors'

package/src/index.ts

@@ -1,10 +1,11 @@
-/*
- * File: index.ts
- *
- * Copyright (c) 2022-2022 pikokr
- *
- * Licensed under MIT License. Please see more defails in LICENSE file.
- */
-
-export * from './core'
-export * from './applicationCommand'
+/*
+* File: index.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+export * from './core'
+export * from './applicationCommand'
+export * from './textCommand'

package/src/textCommand/TextCommand.ts

@@ -0,0 +1,20 @@
+/*
+* File: TextCommand.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+import { createComponentDecorator } from '../core/components/decoratorCreator'
+import { BaseComponent } from '../core/components/BaseComponent'
+
+type TextCommandOptions = {
+  name: string
+  aliases?: string
+  description?: string
+}
+
+export class TextCommandComponent extends BaseComponent<TextCommandOptions> {}
+
+export const command = createComponentDecorator(TextCommandComponent)

package/src/textCommand/TextCommandExtension.ts

@@ -0,0 +1,128 @@
+/*
+* File: TextCommandExtension.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+import { listener } from '../core/listener'
+import { Message } from 'discord.js'
+import { CTSExtension } from '../core/extensions/CTSExtension'
+import { TextCommandComponent } from './TextCommand'
+import { TextCommandRestOption } from './parameters'
+import { argConverter } from '../core'
+
+export type TextCommandConfig = {
+  prefix: string | string[] | ((msg: Message) => Promise<string | string[]> | string | string[])
+}
+
+export class TextCommandExtension extends CTSExtension {
+  constructor(private config: TextCommandConfig) {
+    super()
+  }
+
+  private async processPrefix(msg: Message): Promise<number | null> {
+    const content = msg.content
+    let prefix = this.config.prefix
+
+    if (typeof prefix === 'function') {
+      prefix = await prefix(msg)
+    }
+
+    if (typeof prefix === 'string') {
+      if (content.startsWith(prefix)) return prefix.length
+      return null
+    }
+
+    if (prefix instanceof Array) {
+      const p = prefix.find((x) => content.startsWith(x))
+
+      if (p) return p.length
+      return null
+    }
+
+    return null
+  }
+
+  @listener({ event: 'messageCreate', emitter: 'discord' })
+  private async messageCreate(msg: Message) {
+    const startIndex = await this.processPrefix(msg)
+
+    if (!startIndex) return
+
+    const content = msg.content.slice(startIndex)
+
+    const commands: TextCommandComponent[] = []
+
+    const extensions = new Map<TextCommandComponent, object>()
+
+    for (const ext of this.commandClient.registry.extensions) {
+      for (const cmd of this.commandClient.registry.getComponentsWithType(ext, TextCommandComponent)) {
+        commands.push(cmd)
+        extensions.set(cmd, ext)
+      }
+    }
+
+    let commandNameLength = 0
+
+    const command = commands.find((x) => {
+      const names = [x.options.name]
+
+      if (x.options.aliases) {
+        names.push(...x.options.aliases)
+      }
+
+      for (const name of names) {
+        if (content.startsWith(name)) {
+          if (content.length === name.length) {
+            commandNameLength = name.length
+            return true
+          }
+          commandNameLength = name.length
+          return content.startsWith(name + ' ')
+        }
+      }
+
+      return false
+    })
+
+    if (!command) return
+
+    const ext = extensions.get(command)
+
+    if (!ext) return
+
+    const args: unknown[] = []
+
+    let argStrings = content.slice(commandNameLength + 1).split(/ /g)
+
+    await this.convertArguments(TextCommandComponent, args, command.argTypes, async (arg, i, converter) => {
+      if (converter.options.parameterless) return [msg]
+
+      if (arg.decorators.find((x) => x.constructor === TextCommandRestOption)) {
+        const text = argStrings.join(' ')
+        argStrings = []
+        return [text, msg]
+      }
+      return [argStrings.shift(), msg]
+    })
+
+    await command.execute(ext, args, [msg])
+  }
+
+  @argConverter({ component: TextCommandComponent, type: Message, parameterless: true })
+  async mesage(msg: Message) {
+    return msg
+  }
+
+  @argConverter({ component: TextCommandComponent, type: String })
+  async str(value: string) {
+    return value
+  }
+
+  @argConverter({ component: TextCommandComponent, type: Number })
+  async num(value: string) {
+    return Number(value)
+  }
+}

package/src/textCommand/index.ts

@@ -0,0 +1,11 @@
+/*
+* File: index.ts
+* 
+* Copyright (c) 2022-2022 pikokr
+* 
+* Licensed under MIT License. Please see more defails in LICENSE file.
+*/
+
+export * from './TextCommand'
+export type { TextCommandConfig } from './TextCommandExtension'
+export * from './parameters'

package/src/textCommand/parameters.ts

@@ -0,0 +1,14 @@
+/*
+ * File: parameters.ts
+ *
+ * Copyright (c) 2022-2022 pikokr
+ *
+ * Licensed under MIT License. Please see more defails in LICENSE file.
+ */
+
+import { ComponentArgumentDecorator } from '../core'
+import { createArgumentDecorator } from '../core'
+
+export class TextCommandRestOption extends ComponentArgumentDecorator<void> {}
+
+export const rest = createArgumentDecorator(TextCommandRestOption)

package/test/index.ts

@@ -1,23 +1,30 @@
-import { ApplicationCommandOptionType, Client } from 'discord.js'
-import { applicationCommand, ApplicationCommandComponent, CommandClient, moduleHook, option, Registry } from '../src'
-import { listener } from '../src/core/listener'
+/*
+ * File: index.ts
+ *
+ * Copyright (c) 2022-2022 pikokr
+ *
+ * Licensed under MIT License. Please see more defails in LICENSE file.
+ */
 
-class Test {
+import { ApplicationCommandOptionType, ApplicationCommandType, ChatInputCommandInteraction, Client, Message } from 'discord.js'
+import { applicationCommand, CommandClient, moduleHook, option, ownerOnly, listener, Extension, command, rest } from '../src'
+import 'dotenv/config'
+import { Logger } from 'tslog'
+import chalk from 'chalk'
+
+class Test extends Extension {
   @applicationCommand({
+    type: ApplicationCommandType.ChatInput,
     name: 'test',
     description: 'wow this is test',
   })
-  async testCommand(
-    @option({
-      name: 'hello',
-      description: '와아',
-      type: ApplicationCommandOptionType.String,
-    })
-    hello: string,
-    world: string,
-  ) {}
+  async testCommand(i: ChatInputCommandInteraction) {
+    i.reply('Wow')
+  }
 
+  @ownerOnly
   @applicationCommand({
+    type: ApplicationCommandType.ChatInput,
     name: 'test2',
     description: 'wow this is test wow',
   })
@@ -26,44 +33,61 @@ class Test {
       name: 'sans',
       description: '와',
       type: ApplicationCommandOptionType.String,
+      required: true,
     })
     wa: string,
-  ) {}
+    i: ChatInputCommandInteraction,
+  ) {
+    i.reply(wa)
+  }
 
   @moduleHook('load')
   load() {
-    console.log('load')
+    this.logger.info('Load')
   }
 
   @moduleHook('unload')
   unload() {
-    console.log('unload')
+    this.logger.info('Unload')
+  }
+
+  @listener({ event: 'ready' })
+  async testEvent() {
+    this.logger.info(`Login: ${chalk.green(client.user!.tag)}`)
+    await this.commandClient.fetchOwners()
   }
 
-  @listener({ event: 'test', emitter: 'discord' })
-  testEvent() {
-    console.log('test')
+  @command({ name: 'test' })
+  async test(msg: Message, @rest() sans: string) {
+    console.log(sans)
+    await msg.reply('Wow')
   }
 }
 
 const ext = new Test()
 
-const client = new Client({ intents: [] })
+const client = new Client({ intents: ['GuildMessages', 'MessageContent', 'DirectMessages', 'Guilds'] })
+
+const logger = new Logger({ dateTimeTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone })
 
-const cc = new CommandClient(client)
+const cc = new CommandClient(client, logger)
 
 const registry = cc.registry
 
 const run = async () => {
-  await registry.registerModule(ext)
+  await cc.enableApplicationCommandsExtension({
+    guilds: ['832938554438844438'],
+  })
 
-  // listener test
-  client.emit('test')
+  await cc.enableTextCommandsExtension({
+    prefix: '.',
+  })
+
+  await registry.registerModule(ext)
 
-  await registry.unregisterModule(ext)
+  await client.login(process.env.TOKEN)
 
-  // shold not work
-  client.emit('test')
+  await cc.getApplicationCommandsExtension()!.sync()
 }
 
 run()

package/tsconfig.prod.json

@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "exclude": ["node_modules", "scripts", "test", "tsup.config.ts"],
+  "include": ["src"],
   "compilerOptions": {
     "rootDir": "./src",
   }

package/tsup.config.ts

@@ -1,11 +1,11 @@
-/*
- * File: tsup.config.ts
- *
- * Copyright (c) 2022-2022 pikokr
- *
- * Licensed under MIT License. Please see more defails in LICENSE file.
- */
-
+/*
+* 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({