yargs 4.6.0-candidate → 4.7.1

package/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="4.7.1"></a>
+## [4.7.1](https://github.com/yargs/yargs/compare/v4.7.0...v4.7.1) (2016-05-15)
+
+
+### Bug Fixes
+
+* switch to using `const` rather than `var` ([#499](https://github.com/yargs/yargs/pull/499))
+* make stdout flush on newer versions of Node.js ([#501](https://github.com/yargs/yargs/issues/501)) ([9f8c6f4](https://github.com/yargs/yargs/commit/9f8c6f4))
+
+
+
+<a name="4.7.0"></a>
+# [4.7.0](https://github.com/yargs/yargs/compare/v4.6.0...v4.7.0) (2016-05-02)
+
+
+### Bug Fixes
+
+* **pkgConf:** fix aliases issues in .pkgConf() ([#478](https://github.com/yargs/yargs/issues/478))([b900502](https://github.com/yargs/yargs/commit/b900502))
+
+
+### Features
+
+* **completion:** allow to get completions for any string, not just process.argv ([#470](https://github.com/yargs/yargs/issues/470))([74fcfbc](https://github.com/yargs/yargs/commit/74fcfbc))
+* **configuration:** Allow to directly pass a configuration object to .config() ([#480](https://github.com/yargs/yargs/issues/480))([e0a7e05](https://github.com/yargs/yargs/commit/e0a7e05))
+* **validation:** Add .skipValidation() method ([#471](https://github.com/yargs/yargs/issues/471))([d72badb](https://github.com/yargs/yargs/commit/d72badb))
+
+
+
 <a name="4.6.0"></a>
 # [4.6.0](https://github.com/yargs/yargs/compare/v4.5.0...v4.6.0) (2016-04-11)
 

package/README.md

@@ -29,8 +29,7 @@ var argv = require('yargs').argv;
 
 if (argv.ships > 3 && argv.distance < 53.5) {
     console.log('Plunder more riffiwobbles!');
-}
-else {
+} else {
     console.log('Retreat from the xupptumblers!');
 }
 ````
@@ -651,7 +650,9 @@ var argv = require('yargs')
 ```
 
 <a name="config"></a>.config([key], [description], [parseFn])
-------------
+-------------------------------------------------------------
+.config(object)
+---------------
 
 Tells the parser that if the option specified by `key` is passed in, it
 should be interpreted as a path to a JSON config file. The file is loaded
@@ -674,6 +675,24 @@ var argv = require('yargs')
   .argv
 ```
 
+You can also pass an explicit configuration `object`, it will be parsed 
+and its properties will be set as arguments.
+             
+```js
+var argv = require('yargs')
+  .config({foo: 1, bar: 2})
+  .argv
+console.log(argv)
+```
+ 
+```
+$ node test.js
+{ _: [],
+  foo: 1,
+  bar: 2,
+  '$0': 'test.js' }
+```
+
 <a name="count"></a>.count(key)
 ------------
 
@@ -681,7 +700,12 @@ Interpret `key` as a boolean flag, but set its parsed value to the number of
 flag occurrences rather than `true` or `false`. Default value is thus `0`.
 
 <a name="default"></a>.default(key, value, [description])
---------------------
+---------------------------------------------------------
+.defaults(key, value, [description])
+------------------------------------
+
+**Note:** The `.defaults()` alias is deprecated. It will be 
+removed in the next major version.
 
 Set `argv[key]` to `value` if no option was specified in `process.argv`.
 
@@ -762,6 +786,9 @@ Should yargs attempt to detect the os' locale? Defaults to `true`.
 Tell yargs to parse environment variables matching the given prefix and apply
 them to argv as though they were command line arguments.
 
+Use the "__" separator in the environment variable to indicate nested options.
+(e.g. prefix_nested__foo => nested.foo)
+
 If this method is called with no argument or with an empty string or with `true`,
 then all env vars will be applied to argv.
 
@@ -860,6 +887,29 @@ var argv = require('yargs')
   .argv
 ```
 
+.getCompletion(args, done);
+---------------------------
+
+Allows to programmatically get completion choices for any line.
+
+`args`: An array of the words in the command line to complete.
+
+`done`: The callback to be called with the resulting completions.
+
+For example:
+
+```js
+require('yargs')
+  .option('foobar', {})
+  .option('foobaz', {})
+  .completion()
+  .getCompletion(['./test.js', '--foo'], function (completions) {
+    console.log(completions)
+  })
+```
+
+Outputs the same completion choices as `./test.js --foo`<kbd>TAB</kbd>: `--foobar` and `--foobaz`
+
 <a name="global"></a>.global(globals)
 ------------
 
@@ -1134,6 +1184,7 @@ Valid `opt` keys include:
 - `normalize`: boolean, apply `path.normalize()` to the option, see [`normalize()`](#normalize)
 - `number`: boolean, interpret option as a number, [`number()`](#number)
 - `requiresArg`: boolean, require the option be specified with a value, see [`requiresArg()`](#requiresArg)
+- `skipValidation`: boolean, skips validation if the option is present, see [`skipValidation()`](#skipValidation)
 - `string`: boolean, interpret option as a string, see [`string()`](#string)
 - `type`: one of the following strings
     - `'array'`: synonymous for `array: true`, see [`array()`](#array)
@@ -1152,8 +1203,8 @@ Parse `args` instead of `process.argv`. Returns the `argv` object.
 .pkgConf(key, [cwd])
 ------------
 
-Similar to [`config()`](#config), indicates that yargs should read
-default argument values from the specified key in package.json.
+Similar to [`config()`](#config), indicates that yargs should interpret the object from the specified key in package.json
+as a configuration object.
 
 `cwd` can optionally be provided, the package.json will be read
 from this location.
@@ -1274,6 +1325,12 @@ Missing argument value: f
 Specify --help for available options
 ```
 
+<a name="skipValidation"></a>.skipValidation(key)
+-----------------
+
+Specifies either a single option key (string), or an array of options.
+If any of the options is present, yargs validation is skipped.
+
 .strict()
 ---------
 

package/index.js

@@ -1,14 +1,14 @@
 // classic singleton yargs API, to use yargs
 // without running as a singleton do:
 // require('yargs/yargs')(process.argv.slice(2))
-var yargs = require('./yargs')
+const yargs = require('./yargs')
 
 Argv(process.argv.slice(2))
 
 module.exports = Argv
 
 function Argv (processArgs, cwd) {
-  var argv = yargs(processArgs, cwd, require)
+  const argv = yargs(processArgs, cwd, require)
   singletonify(argv)
   return argv
 }

package/lib/command.js

@@ -2,7 +2,7 @@
 // and populating argv with said positional
 // arguments.
 module.exports = function (yargs, usage, validation) {
-  var self = {}
+  const self = {}
 
   var handlers = {}
   self.addHandler = function (cmd, description, builder, handler) {

package/lib/completion.js

@@ -1,20 +1,20 @@
-var fs = require('fs')
-var path = require('path')
+const fs = require('fs')
+const path = require('path')
 
 // add bash completions to your
 //  yargs-powered applications.
 module.exports = function (yargs, usage, command) {
-  var self = {
+  const self = {
     completionKey: 'get-yargs-completions'
   }
 
   // get a list of completion commands.
-  self.getCompletion = function (done) {
-    var completions = []
-    var current = process.argv[process.argv.length - 1]
-    var previous = process.argv.slice(process.argv.indexOf('--' + self.completionKey) + 1)
-    var argv = yargs.parse(previous)
-    var aliases = yargs.parsed.aliases
+  // 'args' is the array of strings from the line to be completed
+  self.getCompletion = function (args, done) {
+    const completions = []
+    const current = args.length ? args[args.length - 1] : ''
+    const argv = yargs.parse(args, true)
+    const aliases = yargs.parsed.aliases
 
     // a custom completion function can be provided
     // to completion().
@@ -42,15 +42,15 @@ module.exports = function (yargs, usage, command) {
     }
 
     var handlers = command.getCommandHandlers()
-    for (var i = 0, ii = previous.length; i < ii; ++i) {
-      if (handlers[previous[i]] && handlers[previous[i]].builder) {
-        return handlers[previous[i]].builder(yargs.reset()).argv
+    for (var i = 0, ii = args.length; i < ii; ++i) {
+      if (handlers[args[i]] && handlers[args[i]].builder) {
+        return handlers[args[i]].builder(yargs.reset()).argv
       }
     }
 
     if (!current.match(/^-/)) {
       usage.getCommands().forEach(function (command) {
-        if (previous.indexOf(command[0]) === -1) {
+        if (args.indexOf(command[0]) === -1) {
           completions.push(command[0])
         }
       })
@@ -58,12 +58,12 @@ module.exports = function (yargs, usage, command) {
 
     if (current.match(/^-/)) {
       Object.keys(yargs.getOptions().key).forEach(function (key) {
-        // If the key and its aliases aren't in 'previous', add the key to 'completions'
+        // If the key and its aliases aren't in 'args', add the key to 'completions'
         var keyAndAliases = [key].concat(aliases[key] || [])
-        var notInPrevious = keyAndAliases.every(function (val) {
-          return previous.indexOf('--' + val) === -1
+        var notInArgs = keyAndAliases.every(function (val) {
+          return args.indexOf('--' + val) === -1
         })
-        if (notInPrevious) {
+        if (notInArgs) {
           completions.push('--' + key)
         }
       })

package/lib/obj-filter.js

@@ -1,5 +1,5 @@
 module.exports = function (original, filter) {
-  var obj = {}
+  const obj = {}
   filter = filter || function (k, v) { return true }
   Object.keys(original || {}).forEach(function (key) {
     if (filter(key, original[key])) {

package/lib/usage.js

@@ -1,14 +1,15 @@
 // this file handles outputting usage instructions,
 // failures, etc. keeps logging in one place.
-var cliui = require('cliui')
-var decamelize = require('decamelize')
-var stringWidth = require('string-width')
-var wsize = require('window-size')
-var objFilter = require('./obj-filter')
+const cliui = require('cliui')
+const decamelize = require('decamelize')
+const stringWidth = require('string-width')
+const wsize = require('window-size')
+const objFilter = require('./obj-filter')
+const setBlocking = require('set-blocking')
 
 module.exports = function (yargs, y18n) {
-  var __ = y18n.__
-  var self = {}
+  const __ = y18n.__
+  const self = {}
 
   // methods for ouputting/building failure message.
   var fails = []
@@ -37,6 +38,8 @@ module.exports = function (yargs, y18n) {
         f(msg, err)
       })
     } else {
+      if (yargs.getExitProcess()) setBlocking(true)
+
       // don't output failure message more than once
       if (!failureOutput) {
         failureOutput = true

package/lib/validation.js

@@ -1,17 +1,17 @@
-var objFilter = require('./obj-filter')
+const objFilter = require('./obj-filter')
 
 // validation-type-stuff, missing params,
 // bad implications, custom checks.
 module.exports = function (yargs, usage, y18n) {
-  var __ = y18n.__
-  var __n = y18n.__n
-  var self = {}
+  const __ = y18n.__
+  const __n = y18n.__n
+  const self = {}
 
   // validate appropriate # of non-option
   // arguments were provided, i.e., '_'.
   self.nonOptionCount = function (argv) {
-    var demanded = yargs.getDemanded()
-    var _s = argv._.length
+    const demanded = yargs.getDemanded()
+    const _s = argv._.length
 
     if (demanded._ && (_s < demanded._.count || _s > demanded._.max)) {
       if (demanded._.msg !== undefined) {
@@ -41,14 +41,14 @@ module.exports = function (yargs, usage, y18n) {
   // make sure that any args that require an
   // value (--foo=bar), have a value.
   self.missingArgumentValue = function (argv) {
-    var defaultValues = [true, false, '']
-    var options = yargs.getOptions()
+    const defaultValues = [true, false, '']
+    const options = yargs.getOptions()
 
     if (options.requiresArg.length > 0) {
-      var missingRequiredArgs = []
+      const missingRequiredArgs = []
 
       options.requiresArg.forEach(function (key) {
-        var value = argv[key]
+        const value = argv[key]
 
         // if a value is explicitly requested,
         // flag argument as missing if it does not
@@ -72,7 +72,7 @@ module.exports = function (yargs, usage, y18n) {
 
   // make sure all the required arguments are present.
   self.requiredArguments = function (argv) {
-    var demanded = yargs.getDemanded()
+    const demanded = yargs.getDemanded()
     var missing = null
 
     Object.keys(demanded).forEach(function (key) {
@@ -83,15 +83,15 @@ module.exports = function (yargs, usage, y18n) {
     })
 
     if (missing) {
-      var customMsgs = []
+      const customMsgs = []
       Object.keys(missing).forEach(function (key) {
-        var msg = missing[key].msg
+        const msg = missing[key].msg
         if (msg && customMsgs.indexOf(msg) < 0) {
           customMsgs.push(msg)
         }
       })
 
-      var customMsg = customMsgs.length ? '\n' + customMsgs.join('\n') : ''
+      const customMsg = customMsgs.length ? '\n' + customMsgs.join('\n') : ''
 
       usage.fail(__n(
         'Missing required argument: %s',
@@ -104,12 +104,12 @@ module.exports = function (yargs, usage, y18n) {
 
   // check for unknown arguments (strict-mode).
   self.unknownArguments = function (argv, aliases) {
-    var aliasLookup = {}
-    var descriptions = usage.getDescriptions()
-    var demanded = yargs.getDemanded()
-    var commandKeys = yargs.getCommandInstance().getCommands()
-    var unknown = []
-    var currentContext = yargs.getContext()
+    const aliasLookup = {}
+    const descriptions = usage.getDescriptions()
+    const demanded = yargs.getDemanded()
+    const commandKeys = yargs.getCommandInstance().getCommands()
+    const unknown = []
+    const currentContext = yargs.getContext()
 
     Object.keys(aliases).forEach(function (key) {
       aliases[key].forEach(function (alias) {
@@ -146,8 +146,8 @@ module.exports = function (yargs, usage, y18n) {
 
   // validate arguments limited to enumerated choices
   self.limitedChoices = function (argv) {
-    var options = yargs.getOptions()
-    var invalid = {}
+    const options = yargs.getOptions()
+    const invalid = {}
 
     if (!Object.keys(options.choices).length) return
 
@@ -163,7 +163,7 @@ module.exports = function (yargs, usage, y18n) {
       }
     })
 
-    var invalidKeys = Object.keys(invalid)
+    const invalidKeys = Object.keys(invalid)
 
     if (!invalidKeys.length) return
 
@@ -188,7 +188,7 @@ module.exports = function (yargs, usage, y18n) {
   self.customChecks = function (argv, aliases) {
     checks.forEach(function (f) {
       try {
-        var result = f(argv, aliases)
+        const result = f(argv, aliases)
         if (!result) {
           usage.fail(__('Argument check failed: %s', f.toString()))
         } else if (typeof result === 'string') {
@@ -216,11 +216,11 @@ module.exports = function (yargs, usage, y18n) {
   }
 
   self.implications = function (argv) {
-    var implyFail = []
+    const implyFail = []
 
     Object.keys(implied).forEach(function (key) {
       var num
-      var origKey = key
+      const origKey = key
       var value = implied[key]
 
       // convert string '1' to number 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "4.6.0-candidate",
+  "version": "4.7.1",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.js",
   "files": [
@@ -12,7 +12,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "camelcase": "^2.0.1",
+    "camelcase": "^3.0.0",
     "cliui": "^3.2.0",
     "decamelize": "^1.1.1",
     "lodash.assign": "^4.0.3",
@@ -20,6 +20,7 @@
     "pkg-conf": "^1.1.2",
     "read-pkg-up": "^1.0.1",
     "require-main-filename": "^1.0.1",
+    "set-blocking": "^1.0.0",
     "string-width": "^1.0.1",
     "window-size": "^0.2.0",
     "y18n": "^3.2.1",
@@ -34,15 +35,15 @@
     "es6-promise": "^3.0.2",
     "hashish": "0.0.4",
     "mocha": "^2.4.5",
-    "nyc": "^6.1.1",
+    "nyc": "^6.4.2",
     "rimraf": "^2.5.0",
-    "standard": "^6.0.5",
-    "standard-version": "^2.1.2",
+    "standard": "^7.0.0",
+    "standard-version": "^2.2.1",
     "which": "^1.1.2"
   },
   "scripts": {
     "pretest": "standard",
-    "test": "nyc --cache mocha --require ./test/before.js --timeout=4000 --check-leaks",
+    "test": "nyc --cache mocha --require ./test/before.js --timeout=8000 --check-leaks",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "version": "standard-version"
   },
@@ -69,4 +70,4 @@
   "engine": {
     "node": ">=0.10"
   }
-}
+}

package/yargs.js

@@ -1,29 +1,30 @@
-var assert = require('assert')
-var assign = require('lodash.assign')
-var Command = require('./lib/command')
-var Completion = require('./lib/completion')
-var Parser = require('yargs-parser')
-var path = require('path')
-var Usage = require('./lib/usage')
-var Validation = require('./lib/validation')
-var Y18n = require('y18n')
-var readPkgUp = require('read-pkg-up')
-var pkgConf = require('pkg-conf')
-var requireMainFilename = require('require-main-filename')
-var objFilter = require('./lib/obj-filter')
+const assert = require('assert')
+const assign = require('lodash.assign')
+const Command = require('./lib/command')
+const Completion = require('./lib/completion')
+const Parser = require('yargs-parser')
+const path = require('path')
+const Usage = require('./lib/usage')
+const Validation = require('./lib/validation')
+const Y18n = require('y18n')
+const readPkgUp = require('read-pkg-up')
+const pkgConf = require('pkg-conf')
+const requireMainFilename = require('require-main-filename')
+const objFilter = require('./lib/obj-filter')
+const setBlocking = require('set-blocking')
 
 var exports = module.exports = Yargs
 function Yargs (processArgs, cwd, parentRequire) {
   processArgs = processArgs || [] // handle calling yargs().
 
-  var self = {}
+  const self = {}
   var command = null
   var completion = null
   var groups = {}
   var preservedGroups = {}
   var usage = null
   var validation = null
-  var y18n = Y18n({
+  const y18n = Y18n({
     directory: path.resolve(__dirname, './locales'),
     updateFiles: false
   })
@@ -49,7 +50,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
   // use context object to keep track of resets, subcommand execution, etc
   // submodules should modify and check the state of context as necessary
-  var context = { resets: -1, commands: [] }
+  const context = { resets: -1, commands: [] }
   self.getContext = function () {
     return context
   }
@@ -92,7 +93,7 @@ function Yargs (processArgs, cwd, parentRequire) {
     groups = {}
 
     var arrayOptions = [
-      'array', 'boolean', 'string', 'requiresArg',
+      'array', 'boolean', 'string', 'requiresArg', 'skipValidation',
       'count', 'normalize', 'number'
     ]
 
@@ -175,6 +176,13 @@ function Yargs (processArgs, cwd, parentRequire) {
   }
 
   self.config = function (key, msg, parseFn) {
+    // allow to pass a configuration object
+    if (typeof key === 'object') {
+      options.configObjects = (options.configObjects || []).concat(key)
+      return self
+    }
+
+    // allow to provide a parsing function
     if (typeof msg === 'function') {
       parseFn = msg
       msg = null
@@ -203,7 +211,8 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
-  self.default = function (key, value, defaultDescription) {
+  // The 'defaults' alias is deprecated. It will be removed in the next major version.
+  self.default = self.defaults = function (key, value, defaultDescription) {
     if (typeof key === 'object') {
       Object.keys(key).forEach(function (k) {
         self.default(k, key[k])
@@ -278,6 +287,11 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
+  self.skipValidation = function (skipValidations) {
+    options.skipValidation.push.apply(options.skipValidation, [].concat(skipValidations))
+    return self
+  }
+
   self.implies = function (key, value) {
     validation.implies(key, value)
     return self
@@ -311,8 +325,6 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
-  self.defaults = self.default
-
   self.describe = function (key, desc) {
     options.key[key] = true
     usage.describe(key, desc)
@@ -331,18 +343,17 @@ function Yargs (processArgs, cwd, parentRequire) {
       cwd: path || requireMainFilename(parentRequire || require)
     })
 
+    // If an object exists in the key, add it to options.configObjects
     if (obj.pkg && obj.pkg[key] && typeof obj.pkg[key] === 'object') {
       conf = obj.pkg[key]
-      Object.keys(conf).forEach(function (k) {
-        self.default(k, conf[k])
-      })
+      options.configObjects = (options.configObjects || []).concat(conf)
     }
 
     return self
   }
 
-  self.parse = function (args) {
-    return parseArgs(args)
+  self.parse = function (args, shortCircuit) {
+    return parseArgs(args, shortCircuit)
   }
 
   self.option = self.options = function (key, opt) {
@@ -391,6 +402,8 @@ function Yargs (processArgs, cwd, parentRequire) {
         self.count(key)
       } if (opt.defaultDescription) {
         options.defaultDescription[key] = opt.defaultDescription
+      } if (opt.skipValidation) {
+        self.skipValidation(key)
       }
 
       var desc = opt.describe || opt.description || opt.desc
@@ -543,6 +556,10 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
+  self.getCompletion = function (args, done) {
+    completion.getCompletion(args, done)
+  }
+
   self.locale = function (locale) {
     if (arguments.length === 0) {
       guessLocale()
@@ -599,14 +616,14 @@ function Yargs (processArgs, cwd, parentRequire) {
     enumerable: true
   })
 
-  function parseArgs (args) {
+  function parseArgs (args, shortCircuit) {
     options.__ = y18n.__
     options.configuration = pkgConf.sync('yargs', {
       defaults: {},
       cwd: requireMainFilename(require)
     })
-    var parsed = Parser.detailed(args, options)
-    var argv = parsed.argv
+    const parsed = Parser.detailed(args, options)
+    const argv = parsed.argv
     var aliases = parsed.aliases
 
     argv.$0 = self.$0
@@ -617,9 +634,7 @@ function Yargs (processArgs, cwd, parentRequire) {
     // while building up the argv object, there
     // are two passes through the parser. If completion
     // is being performed short-circuit on the first pass.
-    if (completionCommand &&
-      (process.argv.join(' ')).indexOf(completion.completionKey) !== -1 &&
-      !argv[completion.completionKey]) {
+    if (shortCircuit) {
       return argv
     }
 
@@ -635,6 +650,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
     // generate a completion script for adding to ~/.bashrc.
     if (completionCommand && ~argv._.indexOf(completionCommand) && !argv[completion.completionKey]) {
+      if (exitProcess) setBlocking(true)
       self.showCompletionScript()
       if (exitProcess) {
         process.exit(0)
@@ -644,9 +660,12 @@ function Yargs (processArgs, cwd, parentRequire) {
     // we must run completions first, a user might
     // want to complete the --help or --version option.
     if (completion.completionKey in argv) {
+      if (exitProcess) setBlocking(true)
+
       // we allow for asynchronous completions,
       // e.g., loading in a list of commands from an API.
-      completion.getCompletion(function (completions) {
+      var completionArgs = args.slice(args.indexOf('--' + completion.completionKey) + 1)
+      completion.getCompletion(completionArgs, function (completions) {
         ;(completions || []).forEach(function (completion) {
           console.log(completion)
         })
@@ -658,16 +677,22 @@ function Yargs (processArgs, cwd, parentRequire) {
       return
     }
 
-    var helpOrVersion = false
+    var skipValidation = false
+
+    // Handle 'help' and 'version' options
     Object.keys(argv).forEach(function (key) {
       if (key === helpOpt && argv[key]) {
-        helpOrVersion = true
+        if (exitProcess) setBlocking(true)
+
+        skipValidation = true
         self.showHelp('log')
         if (exitProcess) {
           process.exit(0)
         }
       } else if (key === versionOpt && argv[key]) {
-        helpOrVersion = true
+        if (exitProcess) setBlocking(true)
+
+        skipValidation = true
         usage.showVersion()
         if (exitProcess) {
           process.exit(0)
@@ -675,9 +700,16 @@ function Yargs (processArgs, cwd, parentRequire) {
       }
     })
 
+    // Check if any of the options to skip validation were provided
+    if (!skipValidation && options.skipValidation.length > 0) {
+      skipValidation = Object.keys(argv).some(function (key) {
+        return options.skipValidation.indexOf(key) >= 0
+      })
+    }
+
     // If the help or version options where used and exitProcess is false,
-    // we won't run validations
-    if (!helpOrVersion) {
+    // or if explicitly skipped, we won't run validations
+    if (!skipValidation) {
       if (parsed.error) throw parsed.error
 
       // if we're executed via bash completion, don't
@@ -702,7 +734,7 @@ function Yargs (processArgs, cwd, parentRequire) {
     if (!detectLocale) return
 
     try {
-      var osLocale = require('os-locale')
+      const osLocale = require('os-locale')
       self.locale(osLocale.sync({ spawn: false }))
     } catch (err) {
       // if we explode looking up locale just noop