Rename defValue to default

lahmatiy · Jan 4, 2020 · 1e0db9c · 1e0db9c
1 parent 0d250ad
commit 1e0db9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/lib/command.js b/lib/command.js
@@ -163,9 +163,9 @@ module.exports = class Command {
     createOptionValues(values) {
         const storage = Object.create(null);
 
-        for (const { name, normalize, defValue } of this.getOptions()) {
-            if (typeof defValue !== 'undefined') {
-                storage[name] = normalize(defValue);
+        for (const { name, normalize, default: value } of this.getOptions()) {
+            if (typeof value !== 'undefined') {
+                storage[name] = normalize(value);
             }
         }
 

diff --git a/lib/option.js b/lib/option.js
@@ -6,13 +6,13 @@ const self = value => value;
 module.exports = class Option {
     static normalizeOptions(opt1, opt2) {
         const raw = typeof opt1 === 'function'
-            ? { normalize: opt1, value: opt2 }
+            ? { normalize: opt1, default: opt2 }
             : opt1 && typeof opt1 === 'object'
                 ? opt1
-                : { value: opt1 };
+                : { default: opt1 };
 
         return {
-            defValue: !ensureFunction(raw.action) ? raw.value : undefined,
+            default: !ensureFunction(raw.action) ? raw.default : undefined,
             normalize: ensureFunction(raw.normalize, self),
             shortcut: ensureFunction(raw.shortcut),
             action: ensureFunction(raw.action),
@@ -58,7 +58,7 @@ module.exports = class Option {
 
         // ignore defValue from config for boolean options
         if (typeof defValue === 'boolean' && !this.action) {
-            this.defValue = defValue;
+            this.default = defValue;
         }
     }
 

diff --git a/lib/parse-argv.js b/lib/parse-argv.js
@@ -36,7 +36,7 @@ function consumeOptionParams(option, rawOptions, argv, index, suggestPoint) {
 
         value = option.params.maxCount === 1 ? tokens[0] : tokens;
     } else {
-        value = !option.defValue;
+        value = !option.default;
     }
 
     rawOptions.push({
@@ -115,7 +115,7 @@ module.exports = function parseArgv(command, argv, context, suggestMode) {
 
                     rawOptions.push({
                         option,
-                        value: !option.defValue
+                        value: !option.default
                     });
                 }
             }

diff --git a/test/command-createOptionValues.js b/test/command-createOptionValues.js
@@ -72,7 +72,7 @@ describe('createOptionValues()', function() {
         const command = cli.command()
             .option('--foo <value>', '', Number)
             .option('--bar [value]')
-            .option('--with-default [x]', '', { value: 'default' })
+            .option('--with-default [x]', '', { default: 'default' })
             .option('--bool');
 
         assert.deepStrictEqual(