From 61faf08fd1c33a4ec19e041d92b6c01abdfacd16 Mon Sep 17 00:00:00 2001 From: juergba Date: Mon, 10 Jun 2019 15:53:44 +0200 Subject: [PATCH] type "array" precedes "duplicate-arguments-array" --- README.md | 2 +- index.js | 5 +++++ test/yargs-parser.js | 44 +++++++++++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index dde9f84d..99e19304 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,7 @@ a configuration file. * default: `true` * key: `duplicate-arguments-array` -Should arguments be coerced into an array when duplicated: +Should arguments be coerced into an array when duplicated? This option has no effect on `opts.array`. ```sh node example.js -x 1 -x 2 diff --git a/index.js b/index.js index aaf69f25..83e1a0e3 100644 --- a/index.js +++ b/index.js @@ -686,6 +686,11 @@ function parse (args, opts) { var isValueArray = Array.isArray(value) var duplicate = configuration['duplicate-arguments-array'] + // array has higher priority than duplicate + if (!duplicate && isTypeArray) { + duplicate = true + } + // nargs has higher priority than duplicate if (!duplicate && checkAllAliases(key, flags.nargs)) { duplicate = true diff --git a/test/yargs-parser.js b/test/yargs-parser.js index 83b3d4d0..6d20eda3 100644 --- a/test/yargs-parser.js +++ b/test/yargs-parser.js @@ -2200,25 +2200,33 @@ describe('yargs-parser', function () { parsed['x'].should.equal('b') }) - it('array[string]: keeps only last argument', function () { - var parsed = parser('-x a -x b', { - array: [{ key: 'x', string: true }], + it('array[string]: keeps all arguments - ignores configuration', function () { + var parsed = parser('-x a -x b -y c', { + array: [ + { key: 'x', string: true }, + { key: 'y', string: true } + ], configuration: { 'duplicate-arguments-array': false } }) - parsed['x'].should.equal('b') - }) - it('array[number]: keeps only last argument', function () { - var parsed = parser('-x 1 -x 2', { - array: [{ key: 'x', number: true }], + parsed['x'].should.deep.equal(['a', 'b']) + parsed['y'].should.deep.equal(['c']) + }) + it('array[number]: keeps all arguments - ignores configuration', function () { + var parsed = parser('-x 1 -x 2 -y 3', { + array: [ + { key: 'x', number: true }, + { key: 'y', number: true } + ], configuration: { 'duplicate-arguments-array': false } }) - parsed['x'].should.equal(2) + parsed['x'].should.deep.equal([1, 2]) + parsed['y'].should.deep.equal([3]) }) it('does not interfere with nargs', function () { var parsed = parser('-x a b c -x o p q', { @@ -2327,15 +2335,16 @@ describe('yargs-parser', function () { }) parsed['x'].should.deep.equal([1, 2, 3]) }) - it('[-x 1 2 3 -x 2 3 4] => [2, 3, 4]', function () { - var parsed = parser('-x 1 2 3 -x 2 3 4', { - array: ['x'], + it('[-x 1 2 3 -x 2 3 4] => [[1, 2, 3], [2, 3, 4]]', function () { + var parsed = parser('-x 1 2 3 -x 2 3 4 -y 7', { + array: ['x', 'y'], configuration: { 'duplicate-arguments-array': false, 'flatten-duplicate-arrays': false } }) - parsed['x'].should.deep.equal([2, 3, 4]) + parsed['x'].should.deep.equal([[1, 2, 3], [2, 3, 4]]) + parsed['y'].should.deep.equal([7]) }) }) describe('type=number', function () { @@ -2363,15 +2372,16 @@ describe('yargs-parser', function () { }) parsed['x'].should.deep.equal([1, 2, 3]) }) - it('[-x 1 2 3 -x 2 3 4] => [2, 3, 4]', function () { - var parsed = parser('-x 1 2 3 -x 2 3 4', { - array: ['x'], + it('[-x 1 2 3 -x 2 3 4] => [1, 2, 3, 2, 3, 4]', function () { + var parsed = parser('-x 1 2 3 -x 2 3 4 -y 7', { + array: ['x', 'y'], configuration: { 'duplicate-arguments-array': false, 'flatten-duplicate-arrays': true } }) - parsed['x'].should.deep.equal([2, 3, 4]) + parsed['x'].should.deep.equal([1, 2, 3, 2, 3, 4]) + parsed['y'].should.deep.equal([7]) }) }) describe('type=number', function () {