feat: make combining arrays a configurable option (yargs#111)

Mike111177 · Dec 20, 2017 · c8bf536 · c8bf536
1 parent 806ddd6
commit c8bf536
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -212,6 +212,14 @@ node example.js --no-foo
 { _: [], "no-foo": true }
 ```
 
+### combine arrays
+
+* default: `false`
+* key: `combine-arrays`
+
+Should arrays be combined when provided by both command line arguments and
+a configuration file.
+
 ### duplicate arguments array
 
 * default: `true`

diff --git a/index.js b/index.js
@@ -19,7 +19,8 @@ function parse (args, opts) {
     'negation-prefix': 'no-',
     'duplicate-arguments-array': true,
     'flatten-duplicate-arrays': true,
-    'populate--': false
+    'populate--': false,
+    'combine-arrays': false
   }, opts.configuration)
   var defaults = opts.default || {}
   var configObjects = opts.configObjects || []
@@ -487,7 +488,7 @@ function parse (args, opts) {
       } else {
         // setting arguments via CLI takes precedence over
         // values within the config file.
-        if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey]) || (flags.arrays[fullKey])) {
+        if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey]) || (flags.arrays[fullKey] && configuration['combine-arrays'])) {
           setArg(fullKey, value)
         }
       }

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "chai": "^3.5.0",
     "coveralls": "^2.11.12",
     "mocha": "^3.0.1",
-    "nyc": "^11.2.1",
+    "nyc": "^11.4.1",
     "standard": "^10.0.2",
     "standard-version": "^4.0.0"
   },

diff --git a/test/yargs-parser.js b/test/yargs-parser.js
@@ -456,6 +456,9 @@ describe('yargs-parser', function () {
         array: ['foo'],
         default: {
           settings: jsonPath
+        },
+        configuration: {
+          'combine-arrays': true
         }
       })