feat(core): optimize error messages

koishijs · Mar 19, 2021 · a4498ea · a4498ea
1 parent 36b3890
commit a4498ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/koishi-core/src/command.ts b/packages/koishi-core/src/command.ts
@@ -171,6 +171,11 @@ export class Command<U extends User.Field = never, G extends Channel.Field = nev
     return this.context.match(session) && this.config.authority <= authority && !disable.includes(this.name)
   }
 
+  getConfig<K extends keyof Command.Config>(key: K, session: Session): Exclude<Command.Config[K], (user: User) => any> {
+    const value = this.config[key] as any
+    return typeof value === 'function' ? value(session.user) : value
+  }
+
   check(callback: Command.Action<U, G, A, O>, prepend = false) {
     if (prepend) {
       this._checkers.unshift(callback)
@@ -180,11 +185,6 @@ export class Command<U extends User.Field = never, G extends Channel.Field = nev
     return this
   }
 
-  getConfig<K extends keyof Command.Config>(key: K, session: Session): Exclude<Command.Config[K], (user: User) => any> {
-    const value = this.config[key] as any
-    return typeof value === 'function' ? value(session.user) : value
-  }
-
   action(callback: Command.Action<U, G, A, O>, append = false) {
     if (append) {
       this._actions.push(callback)

diff --git a/packages/koishi-core/src/context.ts b/packages/koishi-core/src/context.ts
@@ -370,7 +370,7 @@ export class Context {
       if (command) {
         if (parent) {
           if (command === parent) {
-            throw new Error('cannot set a command as its own subcommand')
+            throw new Error(`cannot set a command (${command.name}) as its own subcommand`)
           }
           if (command.parent) {
             if (command.parent !== parent) {

diff --git a/packages/koishi-core/src/parser.ts b/packages/koishi-core/src/parser.ts
@@ -249,7 +249,7 @@ export namespace Domain {
     private _assignOption(option: OptionDeclaration, names: readonly string[], optionMap: OptionDeclarationMap) {
       for (const name of names) {
         if (name in optionMap) {
-          throw new Error(format('duplicate option names: "%s"', name))
+          throw new Error(format('duplicate option name "%s" for command "%s"', name, this.name))
         }
         optionMap[name] = option
       }