@pikokr/command.ts 3.0.4 → 3.0.6-dev.33d39ce

package/dist/builtinModules/BuiltinCommandConverters.d.ts

@@ -8,7 +8,7 @@ export declare class BuiltinCommandConverters extends BuiltInModule {
     message(msg: Message): Message;
     string(msg: Message, arg: string): string;
     getUserIDByMention(mention: string): `${bigint}` | undefined;
-    user(value: string): User | null;
-    member(value: string, msg: Message): GuildMember | undefined;
-    number(value: string): number | undefined;
+    user(msg: Message, value: string): User | null;
+    member(msg: Message, value: string): GuildMember | undefined;
+    number(msg: Message, value: string): number | undefined;
 }

package/dist/builtinModules/BuiltinCommandConverters.js

@@ -36,14 +36,14 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
             return mention;
         }
     }
-    user(value) {
+    user(msg, value) {
         const id = this.getUserIDByMention(value);
         if (!id)
             return null;
         const user = this.client.users.cache.get(id);
         return user || null;
     }
-    member(value, msg) {
+    member(msg, value) {
         var _a;
         const id = this.getUserIDByMention(value);
         if (!id)
@@ -51,7 +51,7 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
         const user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(id);
         return user || undefined;
     }
-    number(value) {
+    number(msg, value) {
         const n = Number(value);
         return isNaN(n) ? undefined : n;
     }
@@ -71,19 +71,19 @@ __decorate([
 __decorate([
     command_1.argumentConverter(discord_js_1.User),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [discord_js_1.Message, String]),
     __metadata("design:returntype", Object)
 ], BuiltinCommandConverters.prototype, "user", null);
 __decorate([
     command_1.argumentConverter(discord_js_1.GuildMember),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, discord_js_1.Message]),
+    __metadata("design:paramtypes", [discord_js_1.Message, String]),
     __metadata("design:returntype", Object)
 ], BuiltinCommandConverters.prototype, "member", null);
 __decorate([
     command_1.argumentConverter(Number),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [discord_js_1.Message, String]),
     __metadata("design:returntype", void 0)
 ], BuiltinCommandConverters.prototype, "number", null);
 exports.BuiltinCommandConverters = BuiltinCommandConverters;

package/dist/builtinModules/CommandHandler.js

@@ -95,8 +95,11 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
                     }
                     if (!converter)
                         return error(new error_1.ArgumentConverterNotFound(argType, msg));
+                    const converterModule = this.registry.modules.find((x) => x.argumentConverters.includes(converter));
+                    if (!converterModule)
+                        return error(new error_1.ArgumentConverterNotFound(argType, msg));
                     if (converter.withoutParameter) {
-                        argList.push(yield converter.execute(module, msg));
+                        argList.push(yield converter.execute(converterModule, msg));
                         continue;
                     }
                     const arg = args.shift();
@@ -106,7 +109,7 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
                     if (!arg) {
                         return error(new error_1.ArgumentNotProvided(i, cmd, msg));
                     }
-                    const executed = yield converter.execute(module, msg, arg);
+                    const executed = yield converter.execute(converterModule, msg, arg);
                     if (!executed === undefined) {
                         return error(new error_1.ArgumentNotProvided(i, cmd, msg));
                     }

package/dist/command/decorator.js

@@ -75,9 +75,33 @@ const rest = (target, propertyKey, parameterIndex) => {
     Reflect.defineMetadata(constants_1.KRest, parameterIndex, target, propertyKey);
 };
 exports.rest = rest;
-exports.ownerOnly = utils_2.createCheckDecorator((msg) => msg.data.cts.owners.includes(msg.author.id), (i) => i.data.cts.owners.includes(i.user.id));
-exports.guildOnly = utils_2.createCheckDecorator((msg) => !!msg.guild, (i) => !!i.guildId);
-exports.dmOnly = utils_2.createCheckDecorator((msg) => !msg.guild, (i) => !i.guildId);
+exports.ownerOnly = utils_2.createCheckDecorator((msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+}, (i) => {
+    if (i.data.cts.owners.includes(i.user.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+});
+exports.guildOnly = utils_2.createCheckDecorator((msg) => {
+    if (!!msg.guild)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+}, (i) => {
+    if (!!i.guildId)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+});
+exports.dmOnly = utils_2.createCheckDecorator((msg) => {
+    if (!msg.guild)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+}, (i) => {
+    if (!i.guildId)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+});
 const requireUserPermissions = (permission) => utils_2.createCheckDecorator((msg) => {
     if (!msg.guild || !msg.member)
         throw new Error('This command must be used in guild.');
@@ -87,7 +111,7 @@ const requireUserPermissions = (permission) => utils_2.createCheckDecorator((msg
     throw new error_1.UserPermissionRequired(msg.member, new discord_js_1.Permissions(permission));
 }, (i) => {
     if (!i.guild || !i.member)
-        throw new Error('This command must be used in serer.');
+        throw new Error('This command must be used in guild.');
     if (!(i.member instanceof discord_js_1.GuildMember) || i.member.permissionsIn(i.channel).has(permission)) {
         return true;
     }

package/dist/error/checks/DMOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class DMOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/DMOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DMOnlyCommandError = void 0;
+class DMOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.DMOnlyCommandError = DMOnlyCommandError;

package/dist/error/checks/GuildOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class GuildOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/GuildOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GuildOnlyCommandError = void 0;
+class GuildOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.GuildOnlyCommandError = GuildOnlyCommandError;

package/dist/error/checks/OwnerOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class OwnerOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/OwnerOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnerOnlyCommandError = void 0;
+class OwnerOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.OwnerOnlyCommandError = OwnerOnlyCommandError;

package/dist/error/checks/index.d.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand';
+export * from './GuildOnlyCommand';
+export * from './DMOnlyCommand';

package/dist/{defaultModules → error/checks}/index.js

@@ -10,5 +10,6 @@ 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("./CommandHandler"), exports);
-__exportStar(require("./BuiltInConverters"), exports);
+__exportStar(require("./OwnerOnlyCommand"), exports);
+__exportStar(require("./GuildOnlyCommand"), exports);
+__exportStar(require("./DMOnlyCommand"), exports);

package/dist/error/index.d.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided';
 export * from './ArgumentConverterNotFound';
 export * from './CommandCheckFailed';
 export * from './PermissionRequired';
+export * from './checks';

package/dist/error/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./ArgumentNotProvided"), exports);
 __exportStar(require("./ArgumentConverterNotFound"), exports);
 __exportStar(require("./CommandCheckFailed"), exports);
 __exportStar(require("./PermissionRequired"), exports);
+__exportStar(require("./checks"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.0.4",
+  "version": "3.0.6-dev.33d39ce",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -31,4 +31,4 @@
     "docs:dev": "typedoc",
     "docs:build": "typedoc"
   }
-}
+}

package/src/builtinModules/BuiltinCommandConverters.ts

@@ -33,7 +33,7 @@ export class BuiltinCommandConverters extends BuiltInModule {
   }
 
   @argumentConverter(User)
-  user(value: string): User | null {
+  user(msg: Message, value: string): User | null {
     const id = this.getUserIDByMention(value)
     if (!id) return null
     const user = this.client.users.cache.get(id)
@@ -41,7 +41,7 @@ export class BuiltinCommandConverters extends BuiltInModule {
   }
 
   @argumentConverter(GuildMember)
-  member(value: string, msg: Message): GuildMember | undefined {
+  member(msg: Message, value: string): GuildMember | undefined {
     const id = this.getUserIDByMention(value)
     if (!id) return
     const user = msg.guild?.members.cache.get(id)
@@ -49,7 +49,7 @@ export class BuiltinCommandConverters extends BuiltInModule {
   }
 
   @argumentConverter(Number)
-  number(value: string) {
+  number(msg: Message, value: string) {
     const n = Number(value)
     return isNaN(n) ? undefined : n
   }

package/src/builtinModules/CommandHandler.ts

@@ -90,8 +90,12 @@ export class CommandHandler extends BuiltInModule {
 
         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(module, msg))
+          argList.push(await converter.execute(converterModule, msg))
           continue
         }
         const arg = args.shift()
@@ -101,7 +105,7 @@ export class CommandHandler extends BuiltInModule {
         if (!arg) {
           return error(new ArgumentNotProvided(i, cmd, msg))
         }
-        const executed = await converter.execute(module, msg, arg)
+        const executed = await converter.execute(converterModule, msg, arg)
         if (!executed === undefined) {
           return error(new ArgumentNotProvided(i, cmd, msg))
         }

package/src/command/cooldown/adapter.ts

@@ -1,4 +1,4 @@
-import { Collection, Guild, GuildChannel, GuildMember, Message, Role, TextChannel, ThreadChannel, User } from 'discord.js'
+import { Collection } from 'discord.js'
 
 export interface CoolDownAdapter {
   get(id: string): Promise<number | undefined>

package/src/command/decorator.ts

@@ -5,7 +5,7 @@ import { ArgumentConverter, SlashArgumentConverter } from './ArgumentConverter'
 import { Module } from '../structures'
 import { createCheckDecorator } from './utils'
 import { GuildMember, Message, PermissionResolvable, Permissions, TextChannel } from 'discord.js'
-import { ClientPermissionRequired, UserPermissionRequired } from '../error'
+import { ClientPermissionRequired, DMOnlyCommandError, GuildOnlyCommandError, OwnerOnlyCommandError, UserPermissionRequired } from '../error'
 
 type CommandOptions = {
   name: string
@@ -111,18 +111,36 @@ export const rest: ParameterDecorator = (target, propertyKey, parameterIndex) =>
 }
 
 export const ownerOnly = createCheckDecorator(
-  (msg) => msg.data.cts.owners.includes(msg.author.id),
-  (i) => i.data.cts.owners.includes(i.user.id),
+  (msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
+  (i) => {
+    if (i.data.cts.owners.includes(i.user.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
 )
 
 export const guildOnly = createCheckDecorator(
-  (msg) => !!msg.guild,
-  (i) => !!i.guildId,
+  (msg) => {
+    if (!!msg.guild) return true
+    throw new GuildOnlyCommandError()
+  },
+  (i) => {
+    if (!!i.guildId) return true
+    throw new GuildOnlyCommandError()
+  },
 )
 
 export const dmOnly = createCheckDecorator(
-  (msg) => !msg.guild,
-  (i) => !i.guildId,
+  (msg) => {
+    if (!msg.guild) return true
+    throw new DMOnlyCommandError()
+  },
+  (i) => {
+    if (!i.guildId) return true
+    throw new DMOnlyCommandError()
+  },
 )
 
 export const requireUserPermissions = (permission: PermissionResolvable) =>
@@ -135,7 +153,7 @@ export const requireUserPermissions = (permission: PermissionResolvable) =>
       throw new UserPermissionRequired(msg.member, new Permissions(permission))
     },
     (i) => {
-      if (!i.guild || !i.member) throw new Error('This command must be used in serer.')
+      if (!i.guild || !i.member) throw new Error('This command must be used in guild.')
       if (!(i.member instanceof GuildMember) || i.member.permissionsIn(i.channel as TextChannel).has(permission)) {
         return true
       }

package/src/error/checks/DMOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class DMOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/GuildOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class GuildOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/OwnerOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class OwnerOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/index.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand'
+export * from './GuildOnlyCommand'
+export * from './DMOnlyCommand'

package/src/error/index.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided'
 export * from './ArgumentConverterNotFound'
 export * from './CommandCheckFailed'
 export * from './PermissionRequired'
+export * from './checks'

package/dist/argumentConverter/decorator.d.ts

@@ -1,5 +0,0 @@
-/**
- * Argument Converter decorator
- * @param type
- */
-export declare function argConverter(type: Function): MethodDecorator;

package/dist/argumentConverter/decorator.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.argConverter = void 0;
-const structures_1 = require("../structures");
-const constants_1 = require("../constants");
-/**
- * Argument Converter decorator
- * @param type
- */
-function argConverter(type) {
-    return (target, propertyKey) => {
-        if (!(target instanceof structures_1.Module)) {
-            throw new TypeError('Class does not extend `Module` class.');
-        }
-        const meta = {
-            type,
-            key: propertyKey,
-        };
-        const metas = Reflect.getMetadata(constants_1.ARG_CONVERTER_KEY, target) || [];
-        metas.push(meta);
-        Reflect.defineMetadata(constants_1.ARG_CONVERTER_KEY, metas, target);
-    };
-}
-exports.argConverter = argConverter;

package/dist/argumentConverter/index.d.ts

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

package/dist/argumentConverter/index.js

@@ -1,13 +0,0 @@
-"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("./decorator"), exports);

package/dist/command/CommandManager.d.ts

@@ -1,16 +0,0 @@
-import { Module } from '../structures';
-import { Collection } from 'discord.js';
-import { ArgConverter, Command } from '../types';
-/**
- * Command Manager
- */
-export declare class CommandManager {
-    commands: Collection<Module, Command[]>;
-    argumentConverters: Collection<Module, ArgConverter[]>;
-    get commandList(): Command[];
-    get argConverterList(): ArgConverter[];
-    private registerCommands;
-    registerArgConverter(module: Module): void;
-    register(module: Module): void;
-    unregister(module: Module): void;
-}

package/dist/command/CommandManager.js

@@ -1,69 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandManager = void 0;
-const discord_js_1 = require("discord.js");
-const constants_1 = require("../constants");
-/**
- * Command Manager
- */
-class CommandManager {
-    constructor() {
-        this.commands = new discord_js_1.Collection();
-        this.argumentConverters = new discord_js_1.Collection();
-    }
-    get commandList() {
-        const result = [];
-        this.commands.forEach((x) => result.push(...x));
-        return result;
-    }
-    get argConverterList() {
-        const result = [];
-        this.argumentConverters.forEach((x) => result.push(...x));
-        return result;
-    }
-    registerCommands(module) {
-        const decorators = Reflect.getMetadata(constants_1.COMMANDS_KEY, module);
-        const ownerOnlyKeys = Reflect.getMetadata(constants_1.COMMANDS_OWNER_ONLY_KEY, module) || new Set();
-        if (!decorators)
-            return;
-        const commands = decorators.map((v) => {
-            const checks = Reflect.getMetadata(constants_1.COMMANDS_CHECK_KEY, module, v.key) || [];
-            const userPerms = Reflect.getMetadata(constants_1.COMMANDS_USER_PERMISSIONS_KEY, module, v.key) || { permissions: [] };
-            const clientPerms = Reflect.getMetadata(constants_1.COMMANDS_CLIENT_PERMISSIONS_KEY, module, v.key) || { permissions: [] };
-            return {
-                usesCtx: v.usesCtx,
-                args: v.args,
-                brief: v.brief,
-                description: v.description,
-                module: module,
-                name: v.name,
-                execute: Reflect.get(module, v.key),
-                aliases: v.aliases,
-                ownerOnly: ownerOnlyKeys.has(v.key),
-                checks,
-                userPermissions: userPerms.permissions,
-                clientPermissions: clientPerms.permissions,
-            };
-        });
-        this.commands.set(module, commands);
-    }
-    registerArgConverter(module) {
-        const decorators = Reflect.getMetadata(constants_1.ARG_CONVERTER_KEY, module);
-        if (!decorators)
-            return;
-        const converters = decorators.map((v) => ({
-            convert: Reflect.get(module, v.key),
-            type: v.type,
-            module: module,
-        }));
-        this.argumentConverters.set(module, converters);
-    }
-    register(module) {
-        this.registerArgConverter(module);
-        this.registerCommands(module);
-    }
-    unregister(module) {
-        this.commands.delete(module);
-    }
-}
-exports.CommandManager = CommandManager;

package/dist/debugTool/DebugModule.d.ts

@@ -1,7 +0,0 @@
-import { Context } from '../index';
-/**
- * Debug Module
- */
-export declare class DebugModule {
-    static run(ctx: Context): Promise<void>;
-}

package/dist/debugTool/DebugModule.js

@@ -1,56 +0,0 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebugModule = void 0;
-const commands_1 = __importStar(require("./commands"));
-/**
- * Debug Module
- */
-class DebugModule {
-    static run(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = ctx.msg.content.slice(ctx.prefix.length).split(' ');
-            args.shift();
-            const commandName = args.shift();
-            const command = commands_1.default.find((x) => x.name === commandName);
-            if (!commandName || !command) {
-                yield commands_1.Default.execute(ctx.msg);
-                return;
-            }
-            try {
-                yield command.execute(ctx.msg, args);
-            }
-            catch (_a) {
-                yield ctx.msg.reply('Command failed.');
-            }
-        });
-    }
-}
-exports.DebugModule = DebugModule;

package/dist/debugTool/commands/default.d.ts

@@ -1,7 +0,0 @@
-import { Message } from 'discord.js';
-/**
- * Show available commands in debug module
- */
-export declare const Default: {
-    execute: (msg: Message) => Promise<Message>;
-};

package/dist/debugTool/commands/default.js

@@ -1,17 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Default = void 0;
-const index_1 = __importDefault(require("./index"));
-/**
- * Show available commands in debug module
- */
-exports.Default = {
-    execute: (msg) => {
-        let str = 'Available commands: ' +
-            index_1.default.map((x) => '`' + x.name + '`').join(', ');
-        return msg.reply(str);
-    },
-};

package/dist/debugTool/commands/eval.d.ts

@@ -1,9 +0,0 @@
-import { Message } from 'discord.js';
-declare const _default: {
-    name: string;
-    execute: (msg: Message, args: string[]) => Promise<void>;
-};
-/**
- * Evaluate javascript/typescript code
- */
-export default _default;