feat: merge array from arguments with array from config (#83)

markbirbeck · bcoe · commit 806ddd6cacac · 2017-12-19T21:16:46.000-08:00
diff --git a/index.js b/index.js
@@ -487,7 +487,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])) {
+        if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey]) || (flags.arrays[fullKey])) {
           setArg(fullKey, value)
         }
       }
diff --git a/test/yargs-parser.js b/test/yargs-parser.js
@@ -450,6 +450,18 @@ describe('yargs-parser', function () {
       argv.should.have.property('foo').and.deep.equal('baz')
     })
 
+    it('should combine values from config file and argv, if argv value is an array', function () {
+      var argv = parser(['--foo', 'bar'], {
+        config: ['settings'],
+        array: ['foo'],
+        default: {
+          settings: jsonPath
+        }
+      })
+
+      argv.should.have.property('foo').and.deep.equal(['bar', 'baz'])
+    })
+
     it('should use value from config file, if argv key is a boolean', function () {
       var argv = parser([], {
         config: ['settings'],

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ function parse (args, opts) {`
`487`	`487`	`} else {`
`488`	`488`	`// setting arguments via CLI takes precedence over`
`489`	`489`	`// values within the config file.`
`490`		`- if (!hasKey(argv, fullKey.split('.')) \|\| (flags.defaulted[fullKey])) {`
	`490`	`+ if (!hasKey(argv, fullKey.split('.')) \|\| (flags.defaulted[fullKey]) \|\| (flags.arrays[fullKey])) {`
`491`	`491`	`setArg(fullKey, value)`
`492`	`492`	`}`
`493`	`493`	`}`