fix: merge config bug

If you didn't set any bools, then version and help would work, but if you added any bools, it would strip the free defaults.

Author: remy

.jshintrc

@@ -7,6 +7,7 @@
   "forin": true,
   "indent": 2,
   "noarg": true,
+  "esversion": 6,
   "node": true,
   "quotmark": "single",
   "undef": true,

lib/args.js

@@ -32,7 +32,6 @@ function args(argv, config) {
 
   let override = false;
 
-
   if (res.help) {
     override = 'help';
     if (res._.length) {

lib/settings.js

@@ -1,18 +1,24 @@
 module.exports = getSettings;
 
 const debug = require('debug')('clite');
-const defaultsDeep = require('lodash.defaultsdeep');
+const mergeWith = require('lodash.mergewith');
 
 function getSettings(options) {
   var settings = {};
   var defaults = require('./defaults')();
   checkFor('version', options, defaults);
   checkFor('help', options, defaults);
 
-  defaultsDeep(settings, options, defaults); // clone
+  mergeWith(settings, defaults, options, customizer);
   return settings;
 }
 
+function customizer(obj, src) {
+  if (Array.isArray(obj)) {
+    return obj.concat(src);
+  }
+}
+
 function checkFor(key, config, defaults) {
   if (!config) {
     config = {};
@@ -22,7 +28,7 @@ function checkFor(key, config, defaults) {
     return;
   }
 
-  debug('stripping internal command');
+  debug('stripping internal command: %s', key);
 
   delete defaults.commands[key];
   defaults.booleans.splice(defaults.booleans.indexOf(key), 1);

package.json

@@ -36,7 +36,8 @@
     "debug": "^2.2.0",
     "es6-promise": "^3.1.2",
     "lodash.defaults": "^4.0.1",
-    "lodash.defaultsdeep": "^4.1.0",
+    "lodash.defaultsdeep": "^4.3.1",
+    "lodash.mergewith": "^4.3.1",
     "minimist": "^1.2.0",
     "then-fs": "^2.0.0",
     "update-notifier": "^0.6.0"

test/unit/args.test.js

@@ -31,6 +31,15 @@ test('bools', function (t) {
   t.end();
 });
 
+test('bools don\'t lose internal defaults', function (t) {
+  var res = args(sampleArgs.concat('-v'), {
+    booleans: ['foo', 'bar']
+  });
+  t.equal(res.foo, false, 'foo is true');
+  t.equal(res.version, true, 'version is true');
+  t.end();
+});
+
 test('mixed args', function (t) {
   var res = args(sampleArgs.concat('--foo=10', '--bar=20'), {
     booleans: ['foo'] // expect true/false
@@ -49,6 +58,7 @@ test('flag shortcuts', function (t) {
 
 test('alias have precedence', function (t) {
   var res = args(sampleArgs.concat('-f=10'), { booleans: ['foo'], alias: { f: 'far' } });
+
   t.equal(res.foo, false, 'foo is false');
   t.equal(res.far, 10, 'alias won the value');
   t.end();