fix: context variables are now recognized in strict() mode (#796)

bcoe · bcoe · commit 48575cd50d53 · 2017-02-26T09:53:21.000-06:00
diff --git a/lib/validation.js b/lib/validation.js
@@ -135,6 +135,7 @@ module.exports = function (yargs, usage, y18n) {
         !descriptions.hasOwnProperty(key) &&
         !demandedOptions.hasOwnProperty(key) &&
         !positionalMap.hasOwnProperty(key) &&
+        !yargs._getParseContext().hasOwnProperty(key) &&
         !aliasLookup.hasOwnProperty(key)) {
         unknown.push(key)
       }
diff --git a/test/validation.js b/test/validation.js
@@ -233,6 +233,43 @@ describe('validation tests', function () {
       argv._[0].should.equal('koala')
     })
 
+    // addresses: https://github.com/yargs/yargs/issues/791
+    it('should recognize context variables in strict mode', function (done) {
+      yargs()
+        .command('foo <y>')
+        .strict()
+        .parse('foo 99', {x: 33}, function (err, argv, output) {
+          expect(err).to.equal(null)
+          expect(output).to.equal('')
+          argv.y.should.equal(99)
+          argv.x.should.equal(33)
+          argv._.should.include('foo')
+          return done()
+        })
+    })
+
+    // addresses: https://github.com/yargs/yargs/issues/791
+    it('should recognize context variables in strict mode, when running sub-commands', function (done) {
+      yargs()
+        .command('request', 'request command', function (yargs) {
+          yargs
+            .command('get', 'sub-command')
+            .option('y', {
+              describe: 'y inner option'
+            })
+        })
+        .strict()
+        .parse('request get --y=22', {x: 33}, function (err, argv, output) {
+          expect(err).to.equal(null)
+          expect(output).to.equal('')
+          argv.y.should.equal(22)
+          argv.x.should.equal(33)
+          argv._.should.include('request')
+          argv._.should.include('get')
+          return done()
+        })
+    })
+
     it('fails when a required argument is missing', function (done) {
       yargs('-w 10 marsupial')
         .demand(1, ['w', 'b'])
diff --git a/yargs.js b/yargs.js
@@ -537,6 +537,10 @@ function Yargs (processArgs, cwd, parentRequire) {
     return parsed
   }
 
+  self._getParseContext = function () {
+    return parseContext || {}
+  }
+
   self._hasParseCallback = function () {
     return !!parseFn
   }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ module.exports = function (yargs, usage, y18n) {`
`135`	`135`	`!descriptions.hasOwnProperty(key) &&`
`136`	`136`	`!demandedOptions.hasOwnProperty(key) &&`
`137`	`137`	`!positionalMap.hasOwnProperty(key) &&`
	`138`	`+ !yargs._getParseContext().hasOwnProperty(key) &&`
`138`	`139`	`!aliasLookup.hasOwnProperty(key)) {`
`139`	`140`	`unknown.push(key)`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,10 @@ function Yargs (processArgs, cwd, parentRequire) {`
`537`	`537`	`return parsed`
`538`	`538`	`}`
`539`	`539`
	`540`	`+ self._getParseContext = function () {`
	`541`	`+ return parseContext \|\| {}`
	`542`	`+ }`
	`543`	`+`
`540`	`544`	`self._hasParseCallback = function () {`
`541`	`545`	`return !!parseFn`
`542`	`546`	`}`