fix(core): fix param missing with valued options, fix #1109

koishijs · Jun 9, 2023 · c0593b4 · c0593b4
1 parent 7fa8e76
commit c0593b4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/packages/core/src/command/parser.ts b/packages/core/src/command/parser.ts
@@ -556,15 +556,18 @@ export namespace Argv {
         // get parameter from next token
         quoted = false
         if (!param) {
-          const { type } = option || {}
+          const { type, values } = option || {}
           if (resolveConfig(type).greedy) {
             param = Argv.stringify(argv)
             quoted = true
             argv.tokens = []
-          } else if (type !== 'boolean' && argv.tokens.length && (type || argv.tokens[0]?.content !== '-')) {
-            const token = argv.tokens.shift()
-            param = token.content
-            quoted = token.quoted
+          } else {
+            const isValued = names[names.length - 1] in (values || {})
+            if (!isValued && type !== 'boolean' && argv.tokens.length && (type || argv.tokens[0]?.content !== '-')) {
+              const token = argv.tokens.shift()
+              param = token.content
+              quoted = token.quoted
+            }
           }
         }
 

diff --git a/packages/core/tests/parser.spec.ts b/packages/core/tests/parser.spec.ts
@@ -97,6 +97,14 @@ describe('Parser API', () => {
       expect(cmd.parse('-C')).to.have.shape({ options: { gamma: 1 } })
       expect(cmd.parse('')).to.have.shape({ options: { gamma: 0 }, args: [] })
     })
+
+    it('valued override', () => {
+      cmd = app.command('test <msg>')
+      cmd.option('writer', '-w <id>')
+      cmd.option('writer', '-W, --anonymous', { value: 0 })
+      expect(cmd.parse('foo -w 1 bar')).to.have.shape({ args: ['foo', 'bar'], options: { writer: 1 } })
+      expect(cmd.parse('foo -W bar')).to.have.shape({ args: ['foo', 'bar'], options: { writer: 0 } })
+    })
   })
 
   describe('Advanced Features', () => {