address review comments

Author: dcodeIO

cli/util/options.d.ts

@@ -42,7 +42,7 @@ interface Result {
 }
 
 /** Parses the specified command line arguments according to the given configuration. */
-export function parse(argv: string[], config: Config, populateDefaults?: boolean): Result;
+export function parse(argv: string[], config: Config, propagateDefaults?: boolean): Result;
 
 /** Help formatting options. */
 interface HelpOptions {
@@ -57,8 +57,8 @@ interface HelpOptions {
 /** Generates the help text for the specified configuration. */
 export function help(config: Config, options?: HelpOptions): string;
 
+/** Merges two sets of options into one, preferring the current over the parent set. */
+export function merge(config: Config, currentOptions: OptionSet, parentOptions: OptionSet): OptionSet;
+
 /** Populates default values on a parsed options result. */
 export function addDefaults(config: Config, options: OptionSet): OptionSet;
-
-/** Merges two sets of options into one, preferring the newer set. */
-export function merge(config: Config, currentOptions: OptionSet, parentOptions: OptionSet): OptionSet;

cli/util/options.js

@@ -16,7 +16,7 @@ const colorsUtil = require("./colors");
 // S    | string array
 
 /** Parses the specified command line arguments according to the given configuration. */
-function parse(argv, config, populateDefaults = true) {
+function parse(argv, config, propagateDefaults = true) {
   var options = {};
   var unknown = [];
   var args = [];
@@ -87,7 +87,7 @@ function parse(argv, config, populateDefaults = true) {
     } else unknown.push(arg);
   }
   while (i < k) trailing.push(argv[i++]); // trailing
-  if (populateDefaults) addDefaults(config, options);
+  if (propagateDefaults) addDefaults(config, options);
 
   return { options, unknown, arguments: args, trailing };
 }
@@ -149,13 +149,9 @@ function merge(config, currentOptions, parentOptions) {
       if (parentOptions[key] != null) {
         // only parent value present
         if (Array.isArray(parentOptions[key])) {
-          if (mutuallyExclusive) {
-            const exclude = currentOptions[mutuallyExclusive];
-            if (exclude) {
-              mergedOptions[key] = parentOptions[key].filter(value => !exclude.includes(value));
-            } else {
-              mergedOptions[key] = parentOptions[key].slice();
-            }
+          let exclude;
+          if (mutuallyExclusive != null && (exclude = currentOptions[mutuallyExclusive])) {
+            mergedOptions[key] = parentOptions[key].filter(value => !exclude.includes(value));
           } else {
             mergedOptions[key] = parentOptions[key].slice();
           }
@@ -173,19 +169,12 @@ function merge(config, currentOptions, parentOptions) {
     } else {
       // both current and parent values present
       if (Array.isArray(currentOptions[key])) {
-        if (mutuallyExclusive) {
-          const exclude = currentOptions[mutuallyExclusive];
-          if (exclude) {
-            mergedOptions[key] = [
-              ...currentOptions[key],
-              ...parentOptions[key].filter(value => !currentOptions[key].includes(value) && !exclude.includes(value))
-            ];
-          } else {
-            mergedOptions[key] = [
-              ...currentOptions[key],
-              ...parentOptions[key].filter(value => !currentOptions[key].includes(value)) // dedup
-            ];
-          }
+        let exclude;
+        if (mutuallyExclusive != null && (exclude = currentOptions[mutuallyExclusive])) {
+          mergedOptions[key] = [
+            ...currentOptions[key],
+            ...parentOptions[key].filter(value => !currentOptions[key].includes(value) && !exclude.includes(value))
+          ];
         } else {
           mergedOptions[key] = [
             ...currentOptions[key],