fix(command): subcommands via commandDir() now supported for parse(ms…

…g, cb) (#678)

* fix: context must be reset or nested sub-commands fail on second invocation

* fix(command): splice context.files when popping context.commands

so context is maintained for multiple command executions

lib/command.js

@@ -134,6 +134,7 @@ module.exports = function (yargs, usage, validation) {
     var commandHandler = handlers[command] || handlers[aliasMap[command]]
     var innerArgv = argv
     var currentContext = yargs.getContext()
+    var numFiles = currentContext.files.length
     var parentCommands = currentContext.commands.slice()
     currentContext.commands.push(command)
     if (typeof commandHandler.builder === 'function') {
@@ -168,6 +169,8 @@ module.exports = function (yargs, usage, validation) {
       commandHandler.handler(innerArgv)
     }
     currentContext.commands.pop()
+    numFiles = currentContext.files.length - numFiles
+    if (numFiles > 0) currentContext.files.splice(numFiles * -1, numFiles)
     return innerArgv
   }
 

test/fixtures/cmddir/deep/within-a-dream.js

@@ -12,6 +12,7 @@ module.exports = {
   },
   handler: function (argv) {
     var factor = 7
+    if (argv.context) argv.context.counter++ // keep track of how many times we've invoked this handler.
     if (argv.extract) {
       if (!argv.withKick) factor -= 2
       if (!chancesLevel2(factor)) throw new Error('Something went wrong at level 2! Check your options for increased chance of success.')

test/yargs.js

@@ -954,6 +954,21 @@ describe('yargs dsl tests', function () {
         argv.what.should.equal(true)
       })
 
+      it('allows nested sub-commands to be invoked multiple times', function () {
+        var context = {counter: 0}
+
+        checkOutput(function () {
+          var parser = yargs()
+            .commandDir('fixtures/cmddir')
+
+          parser.parse('dream within-a-dream --what', {context: context}, function (_err, argv, _output) {})
+          parser.parse('dream within-a-dream --what', {context: context}, function (_err, argv, _output) {})
+          parser.parse('dream within-a-dream --what', {context: context}, function (_err, argv, _output) {})
+        })
+
+        context.counter.should.equal(3)
+      })
+
       it('overwrites the prior context object, when parse is called multiple times', function () {
         var argv = null
         var parser = yargs()