fix: address bug with handling of arrays of implications

moimikey · Sep 3, 2017 · c240661 · c240661
1 parent abdc7da
commit c240661
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 55 deletions.
diff --git a/lib/validation.js b/lib/validation.js
@@ -255,44 +255,42 @@ module.exports = function validation (yargs, usage, y18n) {
     const implyFail = []
 
     Object.keys(implied).forEach((key) => {
-      if (implied[key]) {
-        implied[key].forEach((value) => {
-          let num
-          const origKey = key
-
-          // convert string '1' to number 1
-          num = Number(key)
-          key = isNaN(num) ? key : num
-
-          if (typeof key === 'number') {
-            // check length of argv._
-            key = argv._.length >= key
-          } else if (key.match(/^--no-.+/)) {
-            // check if key doesn't exist
-            key = key.match(/^--no-(.+)/)[1]
-            key = !argv[key]
-          } else {
-            // check if key exists
-            key = argv[key]
-          }
-
-          num = Number(value)
-          value = isNaN(num) ? value : num
+      const origKey = key
+      ;(implied[key] || []).forEach((value) => {
+        let num
+        let key = origKey
+
+        // convert string '1' to number 1
+        num = Number(key)
+        key = isNaN(num) ? key : num
+
+        if (typeof key === 'number') {
+          // check length of argv._
+          key = argv._.length >= key
+        } else if (key.match(/^--no-.+/)) {
+          // check if key doesn't exist
+          key = key.match(/^--no-(.+)/)[1]
+          key = !argv[key]
+        } else {
+          // check if key exists
+          key = argv[key]
+        }
 
-          if (typeof value === 'number') {
-            value = argv._.length >= value
-          } else if (value.match(/^--no-.+/)) {
-            value = value.match(/^--no-(.+)/)[1]
-            value = !argv[value]
-          } else {
-            value = argv[value]
-          }
+        num = Number(value)
+        value = isNaN(num) ? value : num
 
-          if (key && !value) {
-            implyFail.push(origKey)
-          }
-        })
-      }
+        if (typeof value === 'number') {
+          value = argv._.length >= value
+        } else if (value.match(/^--no-.+/)) {
+          value = value.match(/^--no-(.+)/)[1]
+          value = !argv[value]
+        } else {
+          value = argv[value]
+        }
+        if (key && !value) {
+          implyFail.push(origKey)
+        }
+      })
     })
 
     if (implyFail.length) {

diff --git a/test/validation.js b/test/validation.js
@@ -39,32 +39,19 @@ describe('validation tests', () => {
     })
 
     it('fails if either implied argument is not set', (done) => {
-      let fail1 = false
-      let fail2 = false
-      yargs(['--foo', '-a'])
-          .boolean('foo')
-          .implies({
-            'foo': ['a', 'b']
-          })
+      yargs(['-f', '-b'])
+          .implies('f', ['b', 'c'])
           .fail((msg1) => {
-            fail1 = true
-            yargs(['--foo', '-b'])
-                .boolean('foo')
-                .implies({
-                  'foo': ['a', 'b']
-                })
+            yargs(['-f', '-c'])
+                .implies('f', ['b', 'c'])
                 .fail((msg2) => {
-                  fail2 = true
-                  msg1.should.match(/Implications failed/)
-                  msg2.should.match(/Implications failed/)
+                  msg1.should.match(/f -> b f -> c/)
+                  msg2.should.match(/f -> b f -> c/)
                   return done()
                 })
                 .argv
           })
           .argv
-      // Prevent timeouts
-      fail1.should.be.true
-      fail2.should.be.true
     })
 
     it("fails if --no-foo's implied argument is not set", (done) => {