refactor: drop lodash some, castArray and omitBy (#42)

Author: coreyfarrell

index.js

@@ -2,19 +2,22 @@
 
 const yargs = require('yargs/yargs');
 const flatten = require('flat');
-const { castArray, some, isPlainObject, camelCase, kebabCase, omitBy } = require('lodash');
+const camelcase = require('camelcase');
+const decamelize = require('decamelize');
+const isPlainObj = require('is-plain-obj');
 
 function isAlias(key, alias) {
-    return some(alias, (aliases) => castArray(aliases).indexOf(key) !== -1);
+    // TODO Switch to Object.values one Node.js 6 is dropped
+    return Object.keys(alias).some((id) => [].concat(alias[id]).indexOf(key) !== -1);
 }
 
 function hasDefaultValue(key, value, defaults) {
     return value === defaults[key];
 }
 
 function isCamelCased(key, argv) {
-    return /[A-Z]/.test(key) && camelCase(key) === key && // Is it camel case?
-        argv[kebabCase(key)] != null; // Is the standard version defined?
+    return /[A-Z]/.test(key) && camelcase(key) === key && // Is it camel case?
+        argv[decamelize(key, '-')] != null; // Is the standard version defined?
 }
 
 function keyToFlag(key) {
@@ -30,7 +33,7 @@ function unparseOption(key, value, unparsed) {
         unparsed.push(`--no-${key}`);
     } else if (Array.isArray(value)) {
         value.forEach((item) => unparseOption(key, item, unparsed));
-    } else if (isPlainObject(value)) {
+    } else if (isPlainObj(value)) {
         const flattened = flatten(value, { safe: true });
 
         for (const flattenedKey in flattened) {
@@ -78,20 +81,25 @@ function unparsePositional(argv, options, unparsed) {
 }
 
 function unparseOptions(argv, options, knownPositional, unparsed) {
-    const optionsArgv = omitBy(argv, (value, key) =>
-        // Remove positional arguments
-        knownPositional.includes(key) ||
-        // Remove special _, -- and $0
-        ['_', '--', '$0'].includes(key) ||
-        // Remove aliases
-        isAlias(key, options.alias) ||
-        // Remove default values
-        hasDefaultValue(key, value, options.default) ||
-        // Remove camel-cased
-        isCamelCased(key, argv));
-
-    for (const key in optionsArgv) {
-        unparseOption(key, optionsArgv[key], unparsed);
+    for (const key of Object.keys(argv)) {
+        const value = argv[key];
+
+        if (
+            // Remove positional arguments
+            knownPositional.includes(key) ||
+            // Remove special _, -- and $0
+            ['_', '--', '$0'].includes(key) ||
+            // Remove aliases
+            isAlias(key, options.alias) ||
+            // Remove default values
+            hasDefaultValue(key, value, options.default) ||
+            // Remove camel-cased
+            isCamelCased(key, argv)
+        ) {
+            continue;
+        }
+
+        unparseOption(key, argv[key], unparsed);
     }
 }
 

package-lock.json

@@ -58,8 +58,10 @@
     "yargs-parser": "^13.1.1"
   },
   "dependencies": {
+    "camelcase": "^5.3.1",
+    "decamelize": "^1.2.0",
     "flat": "^4.1.0",
-    "lodash": "^4.17.15",
+    "is-plain-obj": "^1.1.0",
     "yargs": "^13.3.0"
   }
 }

package.json

@@ -130,10 +130,15 @@ describe('options', () => {
         const alias = {
             string: 's', // Single alias
             number: ['n', 'no'], // Multiple aliases
+            substr: 'substring',
         };
-        const argv = parse(['--string', 'foo', '--number', '1'], { alias });
+        const argv = parse(['--string', 'foo', '--number', '1', '--substr', 'a'], { alias });
 
-        expect(unparse(argv, { alias })).toEqual(['--string', 'foo', '--number', '1']);
+        expect(unparse(argv, { alias })).toEqual([
+            '--string', 'foo',
+            '--number', '1',
+            '--substr', 'a',
+        ]);
     });
 
     it('should filter flags with default values via `options.defaults`', () => {