@pikokr/command.ts 3.2.4-dev.434c22e → 3.2.4-dev.535de3c

package/dist/messageComponents/base.d.ts

@@ -0,0 +1,10 @@
+import { MessageComponentInteraction, MessageComponentType } from 'discord.js';
+import { Module } from '../structures';
+export declare type MessageComponentExecutor = (i: MessageComponentInteraction) => void | Promise<void>;
+export declare class MessageComponentHandler {
+    componentId: string;
+    componentType: Exclude<MessageComponentType, 'ACTION_ROW'>;
+    execute: MessageComponentExecutor;
+    constructor(componentId: string, componentType: Exclude<MessageComponentType, 'ACTION_ROW'>, execute: MessageComponentExecutor);
+    run(module: Module, i: MessageComponentInteraction): void | Promise<void>;
+}

package/dist/messageComponents/base.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageComponentHandler = void 0;
+class MessageComponentHandler {
+    constructor(componentId, componentType, execute) {
+        this.componentId = componentId;
+        this.componentType = componentType;
+        this.execute = execute;
+    }
+    run(module, i) {
+        return this.execute.apply(module, [i]);
+    }
+}
+exports.MessageComponentHandler = MessageComponentHandler;
+//# sourceMappingURL=base.js.map

package/dist/messageComponents/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/messageComponents/base.ts"],"names":[],"mappings":";;;AAKA,MAAa,uBAAuB;IAClC,YAAmB,WAAmB,EAAS,aAA0D,EAAS,OAAiC;QAAhI,gBAAW,GAAX,WAAW,CAAQ;QAAS,kBAAa,GAAb,aAAa,CAA6C;QAAS,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAEvJ,GAAG,CAAC,MAAc,EAAE,CAA8B;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC;CACF;AAND,0DAMC"}

package/dist/messageComponents/button.d.ts

@@ -0,0 +1,5 @@
+import { MessageComponentExecutor, MessageComponentHandler } from './base';
+export declare class ButtonInteractionHandler extends MessageComponentHandler {
+    constructor(id: string, execute: MessageComponentExecutor);
+}
+export declare const messageButton: (id: string) => MethodDecorator;

package/dist/messageComponents/button.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.messageButton = exports.ButtonInteractionHandler = void 0;
+const base_1 = require("./base");
+const utils_1 = require("../utils");
+const constants_1 = require("../constants");
+class ButtonInteractionHandler extends base_1.MessageComponentHandler {
+    constructor(id, execute) {
+        super(id, 'BUTTON', execute);
+    }
+}
+exports.ButtonInteractionHandler = ButtonInteractionHandler;
+const messageButton = (id) => {
+    return (target, propertyKey) => {
+        utils_1.checkTarget(target);
+        const handler = new ButtonInteractionHandler(id, Reflect.get(target, propertyKey));
+        let properties = Reflect.getMetadata(constants_1.KMessageComponentHandlers, target);
+        if (properties) {
+            properties.push(handler);
+        }
+        else {
+            properties = [handler];
+            Reflect.defineMetadata(constants_1.KMessageComponentHandlers, properties, target);
+        }
+    };
+};
+exports.messageButton = messageButton;
+//# sourceMappingURL=button.js.map

package/dist/messageComponents/button.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"button.js","sourceRoot":"","sources":["../../src/messageComponents/button.ts"],"names":[],"mappings":";;;AAAA,iCAA0E;AAC1E,oCAAsC;AACtC,4CAAwD;AAExD,MAAa,wBAAyB,SAAQ,8BAAuB;IACnE,YAAY,EAAU,EAAE,OAAiC;QACvD,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;CACF;AAJD,4DAIC;AAEM,MAAM,aAAa,GAAG,CAAC,EAAU,EAAmB,EAAE;IAC3D,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC7B,mBAAW,CAAC,MAAM,CAAC,CAAA;QAEnB,MAAM,OAAO,GAAG,IAAI,wBAAwB,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAA;QAElF,IAAI,UAAU,GAA8B,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,MAAM,CAAC,CAAA;QAElG,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACzB;aAAM;YACL,UAAU,GAAG,CAAC,OAAO,CAAC,CAAA;YACtB,OAAO,CAAC,cAAc,CAAC,qCAAyB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;SACtE;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,aAAa,iBAezB"}

package/dist/messageComponents/index.d.ts

@@ -0,0 +1,2 @@
+export * from './button';
+export * from './selectMenu';

package/dist/messageComponents/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./button"), exports);
+__exportStar(require("./selectMenu"), exports);
+//# sourceMappingURL=index.js.map

package/dist/messageComponents/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/messageComponents/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwB;AACxB,+CAA4B"}

package/dist/messageComponents/selectMenu.d.ts

@@ -0,0 +1,5 @@
+import { MessageComponentExecutor, MessageComponentHandler } from './base';
+export declare class SelectMenuInteractionHandler extends MessageComponentHandler {
+    constructor(id: string, execute: MessageComponentExecutor);
+}
+export declare const messageSelectMenu: (id: string) => MethodDecorator;

package/dist/messageComponents/selectMenu.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.messageSelectMenu = exports.SelectMenuInteractionHandler = void 0;
+const base_1 = require("./base");
+const utils_1 = require("../utils");
+const constants_1 = require("../constants");
+class SelectMenuInteractionHandler extends base_1.MessageComponentHandler {
+    constructor(id, execute) {
+        super(id, 'SELECT_MENU', execute);
+    }
+}
+exports.SelectMenuInteractionHandler = SelectMenuInteractionHandler;
+const messageSelectMenu = (id) => {
+    return (target, propertyKey) => {
+        utils_1.checkTarget(target);
+        const handler = new SelectMenuInteractionHandler(id, Reflect.get(target, propertyKey));
+        let properties = Reflect.getMetadata(constants_1.KMessageComponentHandlers, target);
+        if (properties) {
+            properties.push(handler);
+        }
+        else {
+            properties = [handler];
+            Reflect.defineMetadata(constants_1.KMessageComponentHandlers, properties, target);
+        }
+    };
+};
+exports.messageSelectMenu = messageSelectMenu;
+//# sourceMappingURL=selectMenu.js.map

package/dist/messageComponents/selectMenu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selectMenu.js","sourceRoot":"","sources":["../../src/messageComponents/selectMenu.ts"],"names":[],"mappings":";;;AAAA,iCAA0E;AAC1E,oCAAsC;AACtC,4CAAwD;AAExD,MAAa,4BAA6B,SAAQ,8BAAuB;IACvE,YAAY,EAAU,EAAE,OAAiC;QACvD,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;IACnC,CAAC;CACF;AAJD,oEAIC;AAEM,MAAM,iBAAiB,GAAG,CAAC,EAAU,EAAmB,EAAE;IAC/D,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC7B,mBAAW,CAAC,MAAM,CAAC,CAAA;QAEnB,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAA;QAEtF,IAAI,UAAU,GAA8B,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,MAAM,CAAC,CAAA;QAElG,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACzB;aAAM;YACL,UAAU,GAAG,CAAC,OAAO,CAAC,CAAA;YACtB,OAAO,CAAC,cAAc,CAAC,qCAAyB,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;SACtE;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,iBAAiB,qBAe7B"}

package/dist/structures/CommandClient.d.ts

@@ -1,7 +1,6 @@
 import { Registry } from './Registry';
-import { Client, Message, Snowflake } from 'discord.js';
+import { Client, CommandInteraction, Interaction, Message, Snowflake } from 'discord.js';
 import { CoolDownAdapter } from '../command';
-import { REST } from '@discordjs/rest';
 import { Logger } from 'tslog';
 export interface CommandOptions {
     prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[];
@@ -9,18 +8,24 @@ export interface CommandOptions {
     globalAliases: (cmd: string, msg: Message) => string[] | Promise<string[]>;
 }
 export interface SlashCommandOptions {
+    check: (i: CommandInteraction) => boolean | Promise<boolean>;
+}
+export interface ApplicationCommandOptions {
     guild?: Snowflake | Snowflake[];
     autoSync: boolean;
+    beforeRunCheck: (i: Interaction) => void | Promise<void>;
 }
 export interface CommandClientOptions {
     command: CommandOptions;
     owners: 'auto' | Snowflake[];
     slashCommands: SlashCommandOptions;
+    applicationCommands: ApplicationCommandOptions;
 }
 export interface CommandClientOptionsParam {
     command: Partial<CommandOptions>;
     owners: 'auto' | string[];
     slashCommands: Partial<SlashCommandOptions>;
+    applicationCommands: Partial<ApplicationCommandOptions>;
 }
 export declare class CommandClient {
     options: CommandClientOptions;
@@ -28,7 +33,6 @@ export declare class CommandClient {
     registry: Registry;
     client: Client;
     coolDownAdapter: CoolDownAdapter;
-    rest: REST;
     logger: Logger;
     private _isReady;
     private fetchOwners;

package/dist/structures/CommandClient.js

@@ -29,16 +29,12 @@ const Registry_1 = require("./Registry");
 const discord_js_1 = require("discord.js");
 const builtinModules_1 = require("../builtinModules");
 const command_1 = require("../command");
-const rest_1 = require("@discordjs/rest");
 const tslog_1 = require("tslog");
 class CommandClient {
     constructor(_a) {
         var { client, coolDownAdapter, logger } = _a, options = __rest(_a, ["client", "coolDownAdapter", "logger"]);
         this.owners = [];
         this.registry = new Registry_1.Registry(this);
-        this.rest = new rest_1.REST({
-            version: '9',
-        });
         this._isReady = false;
         this.client = client;
         this.coolDownAdapter = coolDownAdapter || new command_1.DefaultCoolDownAdapter();
@@ -50,7 +46,11 @@ class CommandClient {
             },
             owners: 'auto',
             slashCommands: {
-                autoSync: true,
+                check: () => true,
+            },
+            applicationCommands: {
+                autoSync: false,
+                beforeRunCheck: () => { },
             },
         }, options);
         this.logger = logger !== null && logger !== void 0 ? logger : new tslog_1.Logger({ name: 'Command.TS' });
@@ -79,13 +79,12 @@ class CommandClient {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._isReady)
                 return;
-            this.rest.setToken(this.client.token);
             this._isReady = true;
             if (this.options.owners === 'auto') {
                 const owners = yield this.fetchOwners();
                 this.owners.push(...owners);
             }
-            if (this.options.slashCommands.autoSync) {
+            if (this.options.applicationCommands.autoSync) {
                 yield this.registry.syncCommands();
             }
         });

package/dist/structures/CommandClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommandClient.js","sourceRoot":"","sources":["../../src/structures/CommandClient.ts"],"names":[],"mappings":"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"}

package/dist/structures/Module.d.ts

@@ -1,8 +1,9 @@
 import type { Command } from '../command';
 import { Listener } from '../listener';
 import { ArgumentConverter, SlashArgumentConverter } from '../command';
-import { SlashCommand } from '../slashCommand';
+import { AppCommand } from '../applicationCommand';
 import { CommandClient } from './CommandClient';
+import { MessageComponentHandler } from '../messageComponents/base';
 export declare abstract class Module {
     commandClient: CommandClient;
     get logger(): import("tslog").Logger;
@@ -10,7 +11,8 @@ export declare abstract class Module {
     get listeners(): Listener[];
     get argumentConverters(): ArgumentConverter[];
     get slashArgumentConverters(): SlashArgumentConverter[];
-    get slashCommands(): SlashCommand[];
+    get applicationCommands(): AppCommand[];
+    get messageComponentHandlers(): MessageComponentHandler[];
     get path(): string | undefined;
     load(): void;
     unload(): void;

package/dist/structures/Module.js

@@ -20,8 +20,11 @@ class Module {
     get slashArgumentConverters() {
         return Reflect.getMetadata(constants_1.KSlashArgumentConverters, this) || [];
     }
-    get slashCommands() {
-        return Reflect.getMetadata(constants_1.KSlashCommands, this) || [];
+    get applicationCommands() {
+        return Reflect.getMetadata(constants_1.KApplicationCommands, this) || [];
+    }
+    get messageComponentHandlers() {
+        return Reflect.getMetadata(constants_1.KMessageComponentHandlers, this) || [];
     }
     get path() {
         return Reflect.getMetadata(constants_1.KModulePath, this);

package/dist/structures/Module.js.map

@@ -1 +1 @@
-{"version":3,"file":"Module.js","sourceRoot":"","sources":["../../src/structures/Module.ts"],"names":[],"mappings":";;;AAAA,4CAAgI;AAOhI,MAAsB,MAAM;IAG1B,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC;YAC9C,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;SAC5B,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,OAAO,CAAC,WAAW,CAAC,qBAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACnD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,OAAO,CAAC,WAAW,CAAC,sBAAU,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACpD,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAC7D,CAAC;IAED,IAAI,uBAAuB;QACzB,OAAO,OAAO,CAAC,WAAW,CAAC,oCAAwB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAClE,CAAC;IAED,IAAI,aAAa;QACf,OAAO,OAAO,CAAC,WAAW,CAAC,0BAAc,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACxD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,OAAO,CAAC,WAAW,CAAC,uBAAW,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC;IAED,IAAI,KAAI,CAAC;IACT,MAAM,KAAI,CAAC;IACX,YAAY,KAAI,CAAC;IACjB,WAAW,KAAI,CAAC;CACjB;AArCD,wBAqCC"}
+{"version":3,"file":"Module.js","sourceRoot":"","sources":["../../src/structures/Module.ts"],"names":[],"mappings":";;;AAAA,4CAAiK;AAQjK,MAAsB,MAAM;IAG1B,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC;YAC9C,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;SAC5B,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,OAAO,CAAC,WAAW,CAAC,qBAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACnD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,OAAO,CAAC,WAAW,CAAC,sBAAU,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACpD,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAC7D,CAAC;IAED,IAAI,uBAAuB;QACzB,OAAO,OAAO,CAAC,WAAW,CAAC,oCAAwB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAClE,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,OAAO,CAAC,WAAW,CAAC,gCAAoB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IAC9D,CAAC;IAED,IAAI,wBAAwB;QAC1B,OAAO,OAAO,CAAC,WAAW,CAAC,qCAAyB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAA;IACnE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,OAAO,CAAC,WAAW,CAAC,uBAAW,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC;IAED,IAAI,KAAI,CAAC;IACT,MAAM,KAAI,CAAC;IACX,YAAY,KAAI,CAAC;IACjB,WAAW,KAAI,CAAC;CACjB;AAzCD,wBAyCC"}

package/dist/structures/Registry.d.ts

@@ -3,7 +3,8 @@ import { Module } from './Module';
 import { Command, SlashArgumentConverter } from '../command';
 import { Collection } from 'discord.js';
 import { ArgumentConverter } from '../command';
-import { SlashCommand } from '../slashCommand';
+import { AppCommand } from '../applicationCommand';
+import { MessageComponentHandler } from '../messageComponents/base';
 export declare class Registry {
     client: CommandClient;
     constructor(client: CommandClient);
@@ -12,7 +13,8 @@ export declare class Registry {
     get commands(): Command[];
     get argumentConverters(): ArgumentConverter[];
     get slashArgumentConverters(): SlashArgumentConverter[];
-    get slashCommands(): SlashCommand[];
+    get applicationCommands(): AppCommand[];
+    get messageComponentHandlers(): MessageComponentHandler[];
     registerModule(module: Module): Module;
     loadModulesIn(dir: string, absolute?: boolean): Promise<void>;
     loadModule(file: string, absolute?: boolean): Promise<Module>;

package/dist/structures/Registry.js

@@ -38,7 +38,6 @@ const path_1 = __importDefault(require("path"));
 const error_1 = require("../error");
 const discord_js_1 = require("discord.js");
 const walk_sync_1 = __importDefault(require("walk-sync"));
-const v9_1 = require("discord-api-types/v9");
 const fs = __importStar(require("fs"));
 class Registry {
     constructor(client) {
@@ -71,10 +70,17 @@ class Registry {
         }
         return result;
     }
-    get slashCommands() {
+    get applicationCommands() {
         const result = [];
         for (const [, module] of this.modules) {
-            result.push(...module.slashCommands);
+            result.push(...module.applicationCommands);
+        }
+        return result;
+    }
+    get messageComponentHandlers() {
+        const result = [];
+        for (const [, module] of this.modules) {
+            result.push(...module.messageComponentHandlers);
         }
         return result;
     }
@@ -127,21 +133,20 @@ class Registry {
         });
     }
     syncCommands() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.debug(`Syncing commands...`);
-            const commands = this.slashCommands.filter((x) => !x.guild);
-            const guild = this.client.options.slashCommands.guild;
+            const commands = this.applicationCommands.filter((x) => !x.guild);
+            const guild = this.client.options.applicationCommands.guild;
             if (guild) {
                 const syncForGuild = (g) => __awaiter(this, void 0, void 0, function* () {
                     this.logger.debug(`Syncing for guild ${g.name}(${g.id})`);
                     const commandsToRegister = [
-                        ...commands.map((x) => x.commandBuilder),
-                        ...this.slashCommands.filter((y) => { var _a; return y.guild === g.id || ((_a = y.guild) === null || _a === void 0 ? void 0 : _a.includes(g.id)) || false; }).map((x) => x.commandBuilder),
+                        ...commands.map((x) => x.command),
+                        ...this.applicationCommands.filter((y) => { var _a; return y.guild === g.id || ((_a = y.guild) === null || _a === void 0 ? void 0 : _a.includes(g.id)) || false; }).map((x) => x.command),
                     ];
                     this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`);
-                    yield this.client.rest.put(v9_1.Routes.applicationGuildCommands(this.client.client.application.id, g.id), {
-                        body: commandsToRegister.map((x) => x.toJSON()),
-                    });
+                    yield g.commands.set(commandsToRegister);
                 });
                 if (typeof guild === 'string') {
                     yield syncForGuild(yield this.client.client.guilds.fetch(guild));
@@ -154,9 +159,7 @@ class Registry {
             }
             else {
                 this.logger.debug('Syncing global...');
-                yield this.client.rest.put(v9_1.Routes.applicationCommands(this.client.client.application.id), {
-                    body: commands.map((x) => x.commandBuilder.toJSON()),
-                });
+                yield ((_a = this.client.client.application) === null || _a === void 0 ? void 0 : _a.commands.set(commands.map((x) => x.command)));
             }
             this.logger.debug('Syncing ended.');
         });

package/dist/structures/Registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../../src/structures/Registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../../src/structures/Registry.ts"],"names":[],"mappings":"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"}

package/dist/typings.d.ts

@@ -1,6 +1,6 @@
 import type { Command } from './command';
 import { CommandClient } from './structures';
-import { SlashCommand } from './slashCommand';
+import { AppCommand } from './applicationCommand';
 declare module 'discord.js' {
     interface Message {
         data: {
@@ -11,7 +11,19 @@ declare module 'discord.js' {
     }
     interface CommandInteraction {
         data: {
-            command: SlashCommand;
+            command: AppCommand;
+            cts: CommandClient;
+        };
+    }
+    interface MessageComponentInteraction {
+        data: {
+            command: AppCommand;
+            cts: CommandClient;
+        };
+    }
+    interface ContextMenuInteraction {
+        data: {
+            command: AppCommand;
             cts: CommandClient;
         };
     }

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.2.4-dev.434c22e",
+  "version": "3.2.4-dev.535de3c",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "devDependencies": {
-    "@discordjs/builders": "^0.6.0",
-    "@discordjs/rest": "^0.1.0-canary.0",
     "@types/lodash": "^4.14.172",
     "all-contributors-cli": "^6.20.0",
     "discord.js": "^13.6.0",

package/src/applicationCommand/AppCommand.ts

@@ -0,0 +1,28 @@
+import { Module } from '../structures'
+import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js'
+import { KApplicationCommandChecks } from '../constants'
+import { ApplicationCommandCheckFunction } from '../command'
+
+export type SlashArgument = {
+  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: SlashArgument[],
+    public guild: Snowflake | Snowflake[] | undefined,
+    private key: string | symbol,
+  ) {}
+}

package/src/{slashCommand → applicationCommand}/decorator.ts

@@ -1,15 +1,15 @@
-import { Collection, Snowflake } from 'discord.js'
+import { ApplicationCommandDataResolvable, Collection, Snowflake } from 'discord.js'
 import { checkTarget } from '../utils'
-import { KSlashCommandOptions, KSlashCommands } from '../constants'
+import { KSlashCommandOptions, KApplicationCommands } from '../constants'
 import { Module } from '../structures'
-import { SlashCommand } from './SlashCommand'
-import { SlashCommandBuilder } from '@discordjs/builders'
+import { AppCommand } from './AppCommand'
 
-type SlashOptions = {
+type ApplicationCommandOptions = {
   guild: Snowflake | Snowflake[]
+  optionTypes?: any[]
 }
 
-export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'> }) => {
+export const applicationCommand = (opt: Partial<ApplicationCommandOptions> & { command: ApplicationCommandDataResolvable }) => {
   return (
     target: Object,
     propertyKey: string,
@@ -17,13 +17,13 @@ export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashComman
   ) => {
     checkTarget(target)
 
-    let properties: SlashCommand[] = Reflect.getMetadata(KSlashCommands, target)
+    let properties: AppCommand[] = Reflect.getMetadata(KApplicationCommands, target)
 
-    const params: any[] = Reflect.getMetadata('design:paramtypes', target, propertyKey)
+    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 SlashCommand(
+    const command = new AppCommand(
       opt.command,
       Reflect.get(target, propertyKey),
       target as Module,
@@ -39,7 +39,7 @@ export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashComman
       properties.push(command)
     } else {
       properties = [command]
-      Reflect.defineMetadata(KSlashCommands, properties, target)
+      Reflect.defineMetadata(KApplicationCommands, properties, target)
     }
   }
 }

package/src/applicationCommand/index.ts

@@ -0,0 +1,2 @@
+export * from './decorator'
+export * from './AppCommand'