yargs 8.0.0-candidate.0 → 8.0.2

package/lib/apply-extends.js

@@ -15,22 +15,33 @@ function getPathToDefaultConfig (cwd, pathToExtend) {
   return path.resolve(cwd, pathToExtend)
 }
 
-function applyExtends (config, cwd, subKey) {
+function applyExtends (config, cwd) {
   var defaultConfig = {}
 
   if (config.hasOwnProperty('extends')) {
-    var pathToDefault = getPathToDefaultConfig(cwd, config.extends)
+    if (typeof config.extends !== 'string') return defaultConfig
+    var isPath = /\.json$/.test(config.extends)
+    var pathToDefault = null
+    if (!isPath) {
+      try {
+        pathToDefault = require.resolve(config.extends)
+      } catch (err) {
+        // most likely this simply isn't a module.
+      }
+    } else {
+      pathToDefault = getPathToDefaultConfig(cwd, config.extends)
+    }
+    // maybe the module uses key for some other reason,
+    // err on side of caution.
+    if (!pathToDefault && !isPath) return config
 
     checkForCircularExtends(pathToDefault)
 
     previouslyVisitedConfigs.push(pathToDefault)
-    delete config.extends
 
-    defaultConfig = JSON.parse(fs.readFileSync(pathToDefault, 'utf8'))
-    if (subKey) {
-      defaultConfig = defaultConfig[subKey] || {}
-    }
-    defaultConfig = applyExtends(defaultConfig, path.dirname(pathToDefault), subKey)
+    defaultConfig = isPath ? JSON.parse(fs.readFileSync(pathToDefault, 'utf8')) : require(config.extends)
+    delete config.extends
+    defaultConfig = applyExtends(defaultConfig, path.dirname(pathToDefault))
   }
 
   previouslyVisitedConfigs = []

package/lib/command.js

@@ -15,6 +15,8 @@ module.exports = function (yargs, usage, validation) {
   var defaultCommand
   self.addHandler = function (cmd, description, builder, handler) {
     var aliases = []
+    handler = handler || function () {}
+
     if (Array.isArray(cmd)) {
       aliases = cmd.slice(1)
       cmd = cmd[0]

package/lib/validation.js

@@ -1,4 +1,5 @@
 const objFilter = require('./obj-filter')
+const specialKeys = ['$0', '--', '_']
 
 // validation-type-stuff, missing params,
 // bad implications, custom checks.
@@ -131,7 +132,7 @@ module.exports = function (yargs, usage, y18n) {
     })
 
     Object.keys(argv).forEach(function (key) {
-      if (key !== '$0' && key !== '_' &&
+      if (specialKeys.indexOf(key) === -1 &&
         !descriptions.hasOwnProperty(key) &&
         !demandedOptions.hasOwnProperty(key) &&
         !positionalMap.hasOwnProperty(key) &&
@@ -167,7 +168,7 @@ module.exports = function (yargs, usage, y18n) {
     if (!Object.keys(options.choices).length) return
 
     Object.keys(argv).forEach(function (key) {
-      if (key !== '$0' && key !== '_' &&
+      if (specialKeys.indexOf(key) === -1 &&
         options.choices.hasOwnProperty(key)) {
         [].concat(argv[key]).forEach(function (value) {
           // TODO case-insensitive configurability

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "8.0.0-candidate.0",
+  "version": "8.0.2",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.js",
   "files": [
@@ -12,19 +12,19 @@
     "LICENSE"
   ],
   "dependencies": {
-    "camelcase": "^3.0.0",
+    "camelcase": "^4.1.0",
     "cliui": "^3.2.0",
     "decamelize": "^1.1.1",
     "get-caller-file": "^1.0.1",
-    "os-locale": "^1.4.0",
-    "read-pkg-up": "^1.0.1",
+    "os-locale": "^2.0.0",
+    "read-pkg-up": "^2.0.0",
     "require-directory": "^2.1.1",
     "require-main-filename": "^1.0.1",
     "set-blocking": "^2.0.0",
-    "string-width": "^1.0.2",
-    "which-module": "^1.0.0",
+    "string-width": "^2.0.0",
+    "which-module": "^2.0.0",
     "y18n": "^3.2.1",
-    "yargs-parser": "^5.0.0"
+    "yargs-parser": "^7.0.0"
   },
   "devDependencies": {
     "chai": "^3.4.1",
@@ -35,11 +35,12 @@
     "es6-promise": "^4.0.2",
     "hashish": "0.0.4",
     "mocha": "^3.0.1",
-    "nyc": "^10.0.0",
+    "nyc": "^10.3.0",
     "rimraf": "^2.5.0",
     "standard": "^8.6.0",
-    "standard-version": "^3.0.0",
-    "which": "^1.2.9"
+    "standard-version": "^4.2.0",
+    "which": "^1.2.9",
+    "yargs-test-extends": "^1.0.1"
   },
   "scripts": {
     "pretest": "standard",
@@ -69,12 +70,5 @@
   "license": "MIT",
   "engine": {
     "node": ">=0.10"
-  },
-  "greenkeeper": {
-    "ignore": [
-      "string-width",
-      "read-pkg-up",
-      "camelcase"
-    ]
   }
 }

package/yargs.js

@@ -126,7 +126,6 @@ function Yargs (processArgs, cwd, parentRequire) {
     command = command ? command.reset() : Command(self, usage, validation)
     if (!completion) completion = Completion(self, usage, command)
 
-    if (!strictGlobal) strict = false
     completionCommand = null
     output = ''
     exitError = null
@@ -479,7 +478,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
     // If an object exists in the key, add it to options.configObjects
     if (obj[key] && typeof obj[key] === 'object') {
-      conf = applyExtends(obj[key], path || cwd, key)
+      conf = applyExtends(obj[key], path || cwd)
       options.configObjects = (options.configObjects || []).concat(conf)
     }
 
@@ -695,11 +694,9 @@ function Yargs (processArgs, cwd, parentRequire) {
   }
 
   var strict = false
-  var strictGlobal = false
-  self.strict = function (global) {
-    argsert('[boolean]', [global], arguments.length)
-    strict = true
-    strictGlobal = global !== false
+  self.strict = function (enabled) {
+    argsert('[boolean]', [enabled], arguments.length)
+    strict = enabled !== false
     return self
   }
   self.getStrict = function () {
@@ -1005,7 +1002,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
           // recommend a command if recommendCommands() has
           // been enabled, and no commands were found to execute
-          if (recommendCommands && firstUnknownCommand) {
+          if (recommendCommands && firstUnknownCommand && !argv[helpOpt]) {
             validation.recommendCommands(firstUnknownCommand, handlerKeys)
           }
         }