Refactoring

lahmatiy · Jan 9, 2020 · 41bdd93 · 41bdd93
1 parent 5484e17
commit 41bdd93
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/lib/command.js b/lib/command.js
@@ -198,7 +198,7 @@ module.exports = class Command {
                 }
 
                 const oldValue = obj[option.name];
-                const newValue = option.params.maxCount ? option.normalize(value, oldValue) : Boolean(value);
+                const newValue = option.normalize(value, oldValue);
                 const retValue = Reflect.set(obj, option.name, newValue);
 
                 if (option.shortcut) {

diff --git a/lib/option.js b/lib/option.js
@@ -12,7 +12,7 @@ module.exports = class Option {
                 : { default: opt1 };
 
         return {
-            default: !ensureFunction(raw.action) ? raw.default : undefined,
+            default: raw.default,
             normalize: ensureFunction(raw.normalize, self),
             shortcut: ensureFunction(raw.shortcut),
             action: ensureFunction(raw.action),
@@ -22,44 +22,43 @@ module.exports = class Option {
 
     static parseUsage(usage) {
         const [m, short, long = ''] = usage.trim()
-            .match(/^(?:(-[a-z\d])(?:\s*,\s*|\s+))?(--[a-z][a-z\d\-\_]*)?\s*/i) || [];
+            .match(/^(?:(-[a-z\d])(?:\s*,\s*|\s+))?(--[a-z][a-z\d\-\_]*)\s*/i) || [];
 
-        if (!long) {
+        if (!m) {
             throw new Error(`Usage has no long name: ${usage}`);
         }
 
-        let name = long.replace(/^--(no-)?/, ''); // --no-flag - invert value if flag is boolean
-        let defValue = /--no-/.test(long);
         let params = new Params(usage.slice(m.length), `option usage: ${usage}`);
 
-        if (params.maxCount > 0) {
-            name = long.slice(2);
-            defValue = undefined;
-        }
-
-        return { short, long, name, params, defValue };
+        return { short, long, params };
     }
 
-    constructor(usage, description, ...options) {
-        const { short, long, name, params, defValue } = Option.parseUsage(usage);
+    constructor(usage, description, ...rawOptions) {
+        const { short, long, params } = Option.parseUsage(usage);
+        const options = Option.normalizeOptions(...rawOptions);
+
+        const isBool = params.maxCount === 0 && !options.action;
+        let name = camelcase(long.replace(isBool ? /^--(no-)?/ : /^--/, '')); // --no-flag - invert value if flag is boolean
+
+        if (options.action) {
+            options.default = undefined;
+        } else if (isBool) {
+            options.normalize = Boolean;
+            options.default = long.startsWith('--no-');
+        }
 
         // names
         this.short = short;
         this.long = long;
-        this.name = camelcase(name);
+        this.name = name;
 
         // meta
         this.usage = usage.trim();
         this.description = description || '';
 
         // attributes
         this.params = params;
-        Object.assign(this, Option.normalizeOptions(...options));
-
-        // ignore defValue from config for boolean options
-        if (typeof defValue === 'boolean' && !this.action) {
-            this.default = defValue;
-        }
+        Object.assign(this, options);
     }
 
     messageRef() {

diff --git a/test/option-bool.js b/test/option-bool.js
@@ -38,7 +38,7 @@ describe('boolean options', function() {
             );
         });
 
-        it('process function result should be ignored', function() {
+        it('normalize function result should be ignored', function() {
             const command = cli.command()
                 .option('--bool', 'description', () => false);
 
@@ -84,7 +84,7 @@ describe('boolean options', function() {
             );
         });
 
-        it('process function result should be ignored', function() {
+        it('normalize function result should be ignored', function() {
             const command = cli.command()
                 .option('--no-bool', 'description', () => true);