@pikokr/command.ts 4.0.0 → 4.0.1

package/publish-version.js

@@ -1,9 +1,13 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 // DO NOT RUN THIS ON DEV ENVIRONMENT
 // **CI ONLY**
 
-const package = require('./package.json')
+const pkg = require('./package.json')
 const fs = require('fs')
 
-package.version = package.version + '-dev.' + process.env.COMMIT_ID
+pkg.version = pkg.version + '-dev.' + process.env.COMMIT_ID
 
-fs.writeFileSync('package.json', JSON.stringify(package, null, 2))
+fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2))

package/src/applicationCommand/AppCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from '../structures'
 import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js'
 import { KApplicationCommandChecks } from '../constants'

package/src/applicationCommand/decorator.ts

@@ -1,3 +1,7 @@
+/*
+ * 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'

package/src/applicationCommand/index.ts

@@ -1,2 +1,6 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './decorator'
 export * from './AppCommand'

package/src/builtinModules/BuiltInModule.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from '../structures'
 import { KBuiltInModule } from '../constants'
 

package/src/builtinModules/BuiltinApplicationCommandConverters.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { BuiltInModule } from './BuiltInModule'
 import { Client } from 'discord.js'
 import { CommandClient } from '../structures'

package/src/builtinModules/BuiltinCommandConverters.ts

@@ -1,3 +1,7 @@
+/*
+ * 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'

package/src/builtinModules/CommandHandler.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { BuiltInModule } from './BuiltInModule'
 import { Registry } from '../structures'
 import { listener } from '../listener'

package/src/builtinModules/index.ts

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

package/src/command/ArgumentConverter.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from '../structures'
 import { CommandInteraction, ContextMenuInteraction, Message } from 'discord.js'
 

package/src/command/Command.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from '../structures'
 import { CommandInteraction, ContextMenuInteraction, Message, MessageComponentInteraction } from 'discord.js'
 import { KCommandChecks } from '../constants'

package/src/command/cooldown/adapter.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Collection } from 'discord.js'
 
 export interface CoolDownAdapter {

package/src/command/cooldown/decorator.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { createCheckDecorator } from '../utils'
 import { CoolDownType } from './type'
 import { DMChannel, GuildMember, TextChannel } from 'discord.js'

package/src/command/cooldown/error.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class CoolDownError extends Error {
   constructor(public endsAt: Date) {
     super()

package/src/command/cooldown/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './decorator'
 export * from './adapter'
 export * from './decorator'

package/src/command/cooldown/type.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export enum CoolDownType {
   USER,
   CHANNEL,

package/src/command/decorator.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { KArgumentConverters, KCommands, KOptionals, KRest, KSlashArgumentConverters } from '../constants'
 import { Command } from './Command'
 import { checkTarget } from '../utils'

package/src/command/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './Command'
 export * from './decorator'
 export * from './ArgumentConverter'

package/src/command/utils.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandInteraction, ContextMenuInteraction, Message, MessageComponentInteraction } from 'discord.js'
 import type { CheckFunction, ApplicationCommandCheckFunction } from './Command'
 import { KCommandChecks, KApplicationCommandChecks } from '../constants'

package/src/constants.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export const KCommands = Symbol('Command.TS Commands')
 
 export const KApplicationCommands = Symbol('Command.TS Slash Commands')

package/src/error/ArgumentConverterNotFound.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandInteraction, ContextMenuInteraction, Message } from 'discord.js'
 import type { Argument } from '../command'
 import type { AppCommandArgument } from '../applicationCommand'

package/src/error/ArgumentNotProvided.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Message } from 'discord.js'
 import { Command } from '../command'
 

package/src/error/CommandCheckFailed.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandInteraction, ContextMenuInteraction, Message, MessageComponentInteraction } from 'discord.js'
 import { Command } from '../command'
 import { AppCommand } from '../applicationCommand'

package/src/error/CommandNotFound.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Message } from 'discord.js'
 
 export class CommandNotFound extends Error {

package/src/error/InvalidTargetError.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class InvalidTargetError extends Error {
   constructor() {
     super('Class does not extend "Module" class.')

package/src/error/ModuleError.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class ModuleLoadError extends Error {
   constructor(file: string, public error: Error) {
     super('Failed to load module ' + file)

package/src/error/PermissionRequired.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { GuildMember, Permissions } from 'discord.js'
 
 export class UserPermissionRequired extends Error {

package/src/error/checks/DMOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class DMOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/GuildOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class GuildOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/OwnerOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class OwnerOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/SlashCommandGlobalCheckError.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandInteraction } from 'discord.js'
 
 export class SlashCommandGlobalCheckError extends Error {

package/src/error/checks/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './OwnerOnlyCommand'
 export * from './GuildOnlyCommand'
 export * from './DMOnlyCommand'

package/src/error/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './InvalidTargetError'
 export * from './ModuleError'
 export * from './ArgumentNotProvided'

package/src/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import 'reflect-metadata'
 import './typings'
 

package/src/interface/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 // export type { HandlerAdapter } from './HandlerAdapter'
 
 export {}

package/src/listener/Listener.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class Listener {
   constructor(public name: string, public execute: Function) {}
 }

package/src/listener/decorator.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { checkTarget } from '../utils'
 import { KListeners } from '../constants'
 import { Listener } from './Listener'

package/src/listener/index.ts

@@ -1,2 +1,6 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './Listener'
 export * from './decorator'

package/src/messageComponents/base.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { MessageComponentInteraction, MessageComponentType } from 'discord.js'
 import { Module } from '../structures'
 

package/src/messageComponents/button.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { MessageComponentExecutor, MessageComponentHandler } from './base'
 import { checkTarget } from '../utils'
 import { KMessageComponentHandlers } from '../constants'

package/src/messageComponents/index.ts

@@ -1,2 +1,6 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './button'
 export * from './selectMenu'

package/src/messageComponents/selectMenu.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { MessageComponentExecutor, MessageComponentHandler } from './base'
 import { checkTarget } from '../utils'
 import { KMessageComponentHandlers } from '../constants'

package/src/structures/CommandClient.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import _ from 'lodash'
 import { Registry } from './Registry'
 import { Client, CommandInteraction, Interaction, Message, Snowflake, User } from 'discord.js'

package/src/structures/Module.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { KArgumentConverters, KCommands, KListeners, KMessageComponentHandlers, KModulePath, KSlashArgumentConverters, KApplicationCommands } from '../constants'
 import type { Command } from '../command'
 import { Listener } from '../listener'

package/src/structures/Registry.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandClient } from './CommandClient'
 import { Module } from './Module'
 import { Command, ApplicationCommandArgumentConverter } from '../command'
@@ -140,28 +144,49 @@ export class Registry {
     this.logger.debug(`Syncing commands...`)
     const commands = this.applicationCommands.filter((x) => !x.guild)
     const guild = this.client.options.applicationCommands.guild
+    const syncForGuild = async (g: Guild, commands: AppCommand[]) => {
+      this.logger.debug(`Syncing for guild ${g.name}(${g.id})`)
+      const commandsToRegister = [
+        ...commands.map((x) => x.command),
+        ...this.applicationCommands.filter((y) => y.guild === g.id || y.guild?.includes(g.id) || false).map((x) => x.command),
+      ]
+      this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`)
+      await g.commands.set(commandsToRegister)
+    }
     if (guild) {
-      const syncForGuild = async (g: Guild) => {
-        this.logger.debug(`Syncing for guild ${g.name}(${g.id})`)
-        const commandsToRegister = [
-          ...commands.map((x) => x.command),
-          ...this.applicationCommands.filter((y) => y.guild === g.id || y.guild?.includes(g.id) || false).map((x) => x.command),
-        ]
-        this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`)
-        await g.commands.set(commandsToRegister)
-      }
-
       if (typeof guild === 'string') {
-        await syncForGuild(await this.client.client.guilds.fetch(guild))
+        await syncForGuild(await this.client.client.guilds.fetch(guild), commands)
       } else {
         for (const g of guild) {
-          await syncForGuild(await this.client.client.guilds.fetch(g))
+          await syncForGuild(await this.client.client.guilds.fetch(g), commands)
         }
       }
     } else {
       this.logger.debug('Syncing global...')
       await this.client.client.application?.commands.set(commands.map((x) => x.command))
     }
+    const commandsWithGuild = this.applicationCommands.filter((x) => x.guild)
+
+    const guilds = new Set<string>()
+
+    for (const command of commandsWithGuild) {
+      if (!command.guild) continue
+      if (typeof command.guild === 'string') {
+        guilds.add(command.guild)
+      } else {
+        for (const guild of command.guild) {
+          guilds.add(guild)
+        }
+      }
+    }
+
+    for (const guild of guilds) {
+      await syncForGuild(
+        await this.client.client.guilds.fetch(guild),
+        commandsWithGuild.filter((x) => x.guild && typeof (x.guild === 'string' ? guild === x.guild : x.guild.includes(guild))),
+      )
+    }
+
     this.logger.debug('Syncing ended.')
   }
 

package/src/structures/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './Module'
 export * from './CommandClient'
 export * from './Registry'

package/src/typings.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import type { Command } from './command'
 import { CommandClient } from './structures'
 import { AppCommand } from './applicationCommand'

package/src/utils.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from './structures'
 import { InvalidTargetError } from './error'
 

package/test/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Client, Intents, IntentsString } from 'discord.js'
 import { CommandClient } from '../src'
 

package/test/modules/dev.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { BuiltInModule, CommandClient, ownerOnly, applicationCommand, listener, ApplicationCommandCheckFailed } from '../../src'
 import { CommandInteraction } from 'discord.js'
 

package/test/modules/test.ts

@@ -1,4 +1,8 @@
-import { command, CommandClient, coolDown, CoolDownError, CoolDownType, listener, messageButton, messageSelectMenu, Module, option, rest, applicationCommand } from '../../src'
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { CommandClient, coolDown, CoolDownError, CoolDownType, listener, messageButton, messageSelectMenu, Module, option, applicationCommand } from '../../src'
 import {
   ButtonInteraction,
   CommandInteraction,

package/tsup.config.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  entry: ['src/index.ts'],
+  sourcemap: true,
+  splitting: false,
+  clean: true,
+  dts: true,
+  minify: true,
+})

package/dist/applicationCommand/AppCommand.d.ts

@@ -1,18 +0,0 @@
-import { Module } from '../structures';
-import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js';
-import { ApplicationCommandCheckFunction } from '../command';
-export declare type AppCommandArgument = {
-    type: any;
-    name?: string;
-};
-export declare class AppCommand {
-    command: ApplicationCommandDataResolvable;
-    private run;
-    module: Module;
-    params: AppCommandArgument[];
-    guild: Snowflake | Snowflake[] | undefined;
-    private key;
-    get checks(): ApplicationCommandCheckFunction[];
-    execute(module: Module, args: any[]): any;
-    constructor(command: ApplicationCommandDataResolvable, run: Function, module: Module, params: AppCommandArgument[], guild: Snowflake | Snowflake[] | undefined, key: string | symbol);
-}

package/dist/applicationCommand/AppCommand.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppCommand = void 0;
-const constants_1 = require("../constants");
-class AppCommand {
-    constructor(command, run, module, params, guild, key) {
-        this.command = command;
-        this.run = run;
-        this.module = module;
-        this.params = params;
-        this.guild = guild;
-        this.key = key;
-    }
-    get checks() {
-        return Reflect.getMetadata(constants_1.KApplicationCommandChecks, this.module, this.key) || [];
-    }
-    execute(module, args) {
-        return this.run.apply(module, args);
-    }
-}
-exports.AppCommand = AppCommand;
-//# sourceMappingURL=AppCommand.js.map

package/dist/applicationCommand/AppCommand.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AppCommand.js","sourceRoot":"","sources":["../../src/applicationCommand/AppCommand.ts"],"names":[],"mappings":";;;AAEA,4CAAwD;AAQxD,MAAa,UAAU;IASrB,YACS,OAAyC,EACxC,GAAa,EACd,MAAc,EACd,MAA4B,EAC5B,KAA0C,EACzC,GAAoB;QALrB,YAAO,GAAP,OAAO,CAAkC;QACxC,QAAG,GAAH,GAAG,CAAU;QACd,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAsB;QAC5B,UAAK,GAAL,KAAK,CAAqC;QACzC,QAAG,GAAH,GAAG,CAAiB;IAC3B,CAAC;IAfJ,IAAI,MAAM;QACR,OAAO,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IACpF,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,IAAW;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACrC,CAAC;CAUF;AAjBD,gCAiBC"}

package/dist/applicationCommand/decorator.d.ts

@@ -1,10 +0,0 @@
-import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js';
-declare type ApplicationCommandOptions = {
-    guild: Snowflake | Snowflake[];
-    optionTypes?: any[];
-};
-export declare const applicationCommand: (opt: Partial<ApplicationCommandOptions> & {
-    command: ApplicationCommandDataResolvable;
-}) => (target: Object, propertyKey: string) => void;
-export declare const option: (key: string) => ParameterDecorator;
-export {};

package/dist/applicationCommand/decorator.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.option = exports.applicationCommand = void 0;
-const discord_js_1 = require("discord.js");
-const utils_1 = require("../utils");
-const constants_1 = require("../constants");
-const AppCommand_1 = require("./AppCommand");
-const applicationCommand = (opt) => {
-    return (target, propertyKey) => {
-        var _a;
-        utils_1.checkTarget(target);
-        let properties = Reflect.getMetadata(constants_1.KApplicationCommands, target);
-        const params = (_a = opt.optionTypes) !== null && _a !== void 0 ? _a : Reflect.getMetadata('design:paramtypes', target, propertyKey);
-        const options = Reflect.getMetadata(constants_1.KSlashCommandOptions, target, propertyKey) || new discord_js_1.Collection();
-        const command = new AppCommand_1.AppCommand(opt.command, Reflect.get(target, propertyKey), target, params.map((x, i) => ({
-            type: x,
-            name: options.get(i),
-        })), opt.guild, propertyKey);
-        if (properties) {
-            properties.push(command);
-        }
-        else {
-            properties = [command];
-            Reflect.defineMetadata(constants_1.KApplicationCommands, properties, target);
-        }
-    };
-};
-exports.applicationCommand = applicationCommand;
-const option = (key) => (target, propertyKey, parameterIndex) => {
-    utils_1.checkTarget(target);
-    let properties = Reflect.getMetadata(constants_1.KSlashCommandOptions, target, propertyKey);
-    if (!properties) {
-        properties = new discord_js_1.Collection();
-        Reflect.defineMetadata(constants_1.KSlashCommandOptions, properties, target, propertyKey);
-    }
-    properties.set(parameterIndex, key);
-};
-exports.option = option;
-//# sourceMappingURL=decorator.js.map