@pikokr/command.ts 3.0.5-dev.3776bc1 → 3.0.6-dev.92a9148

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.');

package/dist/error/ModuleError.d.ts

@@ -1,5 +1,6 @@
 export declare class ModuleLoadError extends Error {
-    constructor(file: string);
+    error: Error;
+    constructor(file: string, error: Error);
 }
 export declare class InvalidModuleError extends Error {
 }

package/dist/error/ModuleError.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidModuleError = exports.ModuleLoadError = void 0;
 class ModuleLoadError extends Error {
-    constructor(file) {
+    constructor(file, error) {
         super('Failed to load module ' + file);
+        this.error = error;
     }
 }
 exports.ModuleLoadError = ModuleLoadError;

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/error/checks/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("./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/dist/structures/Registry.js

@@ -102,7 +102,7 @@ class Registry {
                 m = require(p);
             }
             catch (e) {
-                throw new error_1.ModuleLoadError(p);
+                throw new error_1.ModuleLoadError(p, e);
             }
             if (m.loaded)
                 throw new Error('MODULE_ALREADY_LOADED');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.0.5-dev.3776bc1",
+  "version": "3.0.6-dev.92a9148",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",

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) =>

package/src/error/ModuleError.ts

@@ -1,5 +1,5 @@
 export class ModuleLoadError extends Error {
-  constructor(file: string) {
+  constructor(file: string, public error: Error) {
     super('Failed to load module ' + file)
   }
 }

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/src/structures/Registry.ts

@@ -95,7 +95,7 @@ export class Registry {
     try {
       m = require(p)
     } catch (e: any) {
-      throw new ModuleLoadError(p)
+      throw new ModuleLoadError(p, e)
     }
 
     if (m.loaded) throw new Error('MODULE_ALREADY_LOADED')