yargs 12.0.1 → 12.0.5

package/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 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="12.0.5"></a>
+## [12.0.5](https://github.com/yargs/yargs/compare/v12.0.4...v12.0.5) (2018-11-19)
+
+
+### Bug Fixes
+
+* allows camel-case, variadic arguments, and strict mode to be combined ([#1247](https://github.com/yargs/yargs/issues/1247)) ([eacc035](https://github.com/yargs/yargs/commit/eacc035))
+
+
+
+<a name="12.0.4"></a>
+## [12.0.4](https://github.com/yargs/yargs/compare/v12.0.3...v12.0.4) (2018-11-10)
+
+
+### Bug Fixes
+
+* don't load config when processing positionals ([5d0dc92](https://github.com/yargs/yargs/commit/5d0dc92))
+
+
+
+<a name="12.0.3"></a>
+## [12.0.3](https://github.com/yargs/yargs/compare/v12.0.2...v12.0.3) (2018-10-06)
+
+
+### Bug Fixes
+
+* $0 contains first arg in bundled electron apps ([#1206](https://github.com/yargs/yargs/issues/1206)) ([567820b](https://github.com/yargs/yargs/commit/567820b))
+* accept single function for middleware ([66fd6f7](https://github.com/yargs/yargs/commit/66fd6f7)), closes [#1214](https://github.com/yargs/yargs/issues/1214) [#1214](https://github.com/yargs/yargs/issues/1214)
+* hide `hidden` options from help output even if they are in a group ([#1221](https://github.com/yargs/yargs/issues/1221)) ([da54028](https://github.com/yargs/yargs/commit/da54028))
+* improve Norwegian Bokmål translations ([#1208](https://github.com/yargs/yargs/issues/1208)) ([a458fa4](https://github.com/yargs/yargs/commit/a458fa4))
+* improve Norwegian Nynorsk translations ([#1207](https://github.com/yargs/yargs/issues/1207)) ([d422eb5](https://github.com/yargs/yargs/commit/d422eb5))
+
+
+
+<a name="12.0.2"></a>
+## [12.0.2](https://github.com/yargs/yargs/compare/v12.0.1...v12.0.2) (2018-09-04)
+
+
+### Bug Fixes
+
+* middleware should work regardless of when method is called  ([664b265](https://github.com/yargs/yargs/commit/664b265)), closes [#1178](https://github.com/yargs/yargs/issues/1178)
+* translation not working when using __ with a single parameter ([#1183](https://github.com/yargs/yargs/issues/1183)) ([f449aea](https://github.com/yargs/yargs/commit/f449aea))
+* upgrade os-locale to version that addresses license issue ([#1195](https://github.com/yargs/yargs/issues/1195)) ([efc0970](https://github.com/yargs/yargs/commit/efc0970))
+
+
+
 <a name="12.0.1"></a>
 ## [12.0.1](https://github.com/yargs/yargs/compare/v12.0.0...v12.0.1) (2018-06-29)
 

package/README.md

@@ -10,7 +10,6 @@
 [![Build Status][travis-image]][travis-url]
 [![Coverage Status][coveralls-image]][coveralls-url]
 [![NPM version][npm-image]][npm-url]
-[![Windows Tests][windows-image]][windows-url]
 [![js-standard-style][standard-image]][standard-url]
 [![Conventional Commits][conventional-commits-image]][conventional-commits-url]
 [![Slack][slack-image]][slack-url]
@@ -115,8 +114,6 @@ Having problems? want to contribute? join our [community slack](http://devtoolsc
 [coveralls-image]: https://img.shields.io/coveralls/yargs/yargs.svg
 [npm-url]: https://www.npmjs.com/package/yargs
 [npm-image]: https://img.shields.io/npm/v/yargs.svg
-[windows-url]: https://ci.appveyor.com/project/bcoe/yargs-ljwvf
-[windows-image]: https://img.shields.io/appveyor/ci/bcoe/yargs-ljwvf/master.svg?label=Windows%20Tests
 [standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg
 [standard-url]: http://standardjs.com/
 [conventional-commits-image]: https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg

package/lib/command.js

@@ -19,7 +19,8 @@ module.exports = function command (yargs, usage, validation, globalMiddleware) {
     let aliases = []
     handler = handler || (() => {})
     middlewares = middlewares || []
-    middlewares = globalMiddleware.concat(middlewares)
+    globalMiddleware.push(...middlewares)
+    middlewares = globalMiddleware
     if (Array.isArray(cmd)) {
       aliases = cmd.slice(1)
       cmd = cmd[0]
@@ -330,6 +331,7 @@ module.exports = function command (yargs, usage, validation, globalMiddleware) {
     options.default = Object.assign(parseOptions.default, options.default)
     options.alias = Object.assign(parseOptions.alias, options.alias)
     options.array = options.array.concat(parseOptions.array)
+    delete options.config //  don't load config when processing positionals.
 
     const unparsed = []
     Object.keys(positionalMap).forEach((key) => {
@@ -356,6 +358,9 @@ module.exports = function command (yargs, usage, validation, globalMiddleware) {
 
       Object.keys(parsed.argv).forEach((key) => {
         if (positionalKeys.indexOf(key) !== -1) {
+          // any new aliases need to be placed in positionalMap, which
+          // is used for validation.
+          if (!positionalMap[key]) positionalMap[key] = parsed.argv[key]
           argv[key] = parsed.argv[key]
         }
       })

package/lib/middleware.js

@@ -2,7 +2,7 @@ module.exports = function (globalMiddleware, context) {
   return function (callback) {
     if (Array.isArray(callback)) {
       Array.prototype.push.apply(globalMiddleware, callback)
-    } else if (typeof callback === 'object') {
+    } else if (typeof callback === 'function') {
       globalMiddleware.push(callback)
     }
     return context

package/lib/usage.js

@@ -161,13 +161,7 @@ module.exports = function usage (yargs, y18n) {
     keys = keys.concat(Object.keys(demandedOptions))
     keys = keys.concat(Object.keys(demandedCommands))
     keys = keys.concat(Object.keys(options.default))
-    keys = keys.filter(key => {
-      if (options.hiddenOptions.indexOf(key) < 0) {
-        return true
-      } else if (yargs.parsed.argv[options.showHiddenOpt]) {
-        return true
-      }
-    })
+    keys = keys.filter(filterHiddenOptions)
     keys = Object.keys(keys.reduce((acc, key) => {
       if (key !== '_') acc[key] = true
       return acc
@@ -251,11 +245,9 @@ module.exports = function usage (yargs, y18n) {
     Object.keys(groups).forEach((groupName) => {
       if (!groups[groupName].length) return
 
-      ui.div(__(groupName))
-
       // if we've grouped the key 'f', but 'f' aliases 'foobar',
       // normalizedKeys should contain only 'foobar'.
-      const normalizedKeys = groups[groupName].map((key) => {
+      const normalizedKeys = groups[groupName].filter(filterHiddenOptions).map((key) => {
         if (~aliasKeys.indexOf(key)) return key
         for (let i = 0, aliasKey; (aliasKey = aliasKeys[i]) !== undefined; i++) {
           if (~(options.alias[aliasKey] || []).indexOf(key)) return aliasKey
@@ -263,6 +255,10 @@ module.exports = function usage (yargs, y18n) {
         return key
       })
 
+      if (normalizedKeys.length < 1) return
+
+      ui.div(__(groupName))
+
       // actually generate the switches string --foo, -f, --bar.
       const switches = normalizedKeys.reduce((acc, key) => {
         acc[key] = [ key ].concat(options.alias[key] || [])
@@ -420,6 +416,10 @@ module.exports = function usage (yargs, y18n) {
     return groupedKeys
   }
 
+  function filterHiddenOptions (key) {
+    return yargs.getOptions().hiddenOptions.indexOf(key) < 0 || yargs.parsed.argv[yargs.getOptions().showHiddenOpt]
+  }
+
   self.showHelp = (level) => {
     const logger = yargs._getLoggerInstance()
     if (!level) level = 'error'

package/lib/validation.js

@@ -292,7 +292,7 @@ module.exports = function validation (yargs, usage, y18n) {
           // we default keys to 'undefined' that have been configured, we should not
           // apply conflicting check unless they are a value other than 'undefined'.
           if (value && argv[key] !== undefined && argv[value] !== undefined) {
-            usage.fail(__(`Arguments ${key} and ${value} are mutually exclusive`))
+            usage.fail(__('Arguments %s and %s are mutually exclusive', key, value))
           }
         })
       }

package/locales/nb.json

@@ -27,7 +27,7 @@
   },
   "Invalid values:": "Ugyldige verdier:",
   "Argument: %s, Given: %s, Choices: %s": "Argument: %s, Gitt: %s, Valg: %s",
-  "Argument check failed: %s": "Argument sjekk mislyktes: %s",
+  "Argument check failed: %s": "Argumentsjekk mislyktes: %s",
   "Implications failed:": "Konsekvensene mislyktes:",
   "Not enough arguments following: %s": "Ikke nok følgende argumenter: %s",
   "Invalid JSON config file: %s": "Ugyldig JSON konfigurasjonsfil: %s",

package/locales/nn.json

@@ -29,9 +29,9 @@
   },
   "Invalid values:": "Ugyldige verdiar:",
   "Argument: %s, Given: %s, Choices: %s": "Argument: %s, Gjeve: %s, Val: %s",
-  "Argument check failed: %s": "Argument sjekk mislukkast: %s",
+  "Argument check failed: %s": "Argumentsjekk mislukkast: %s",
   "Implications failed:": "Konsekvensane mislukkast:",
-  "Not enough arguments following: %s": "Ikkje nok fylgande argument: %s",
+  "Not enough arguments following: %s": "Ikkje nok fylgjande argument: %s",
   "Invalid JSON config file: %s": "Ugyldig JSON konfigurasjonsfil: %s",
   "Path to JSON config file": "Bane til JSON konfigurasjonsfil",
   "Show help": "Vis hjelp",

package/locales/pirate.json

@@ -8,5 +8,6 @@
     "other": "Ye be havin' to set the followin' arguments land lubber: %s"
   },
   "Show help": "Parlay this here code of conduct",
-  "Show version number": "'Tis the version ye be askin' fer"
+  "Show version number": "'Tis the version ye be askin' fer",
+  "Arguments %s and %s are mutually exclusive" : "Yon scurvy dogs %s and %s be as bad as rum and a prudish wench"
 }

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "yargs",
-  "version": "12.0.1",
+  "version": "12.0.5",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.js",
+  "contributors": [
+    {
+      "name": "Yargs Contributors",
+      "url": "https://github.com/yargs/yargs/graphs/contributors"
+    }
+  ],
   "files": [
     "index.js",
     "yargs.js",
@@ -13,22 +19,22 @@
   ],
   "dependencies": {
     "cliui": "^4.0.0",
-    "decamelize": "^2.0.0",
+    "decamelize": "^1.2.0",
     "find-up": "^3.0.0",
     "get-caller-file": "^1.0.1",
-    "os-locale": "^2.0.0",
+    "os-locale": "^3.0.0",
     "require-directory": "^2.1.1",
     "require-main-filename": "^1.0.1",
     "set-blocking": "^2.0.0",
     "string-width": "^2.0.0",
     "which-module": "^2.0.0",
     "y18n": "^3.2.1 || ^4.0.0",
-    "yargs-parser": "^10.1.0"
+    "yargs-parser": "^11.1.1"
   },
   "devDependencies": {
     "chai": "^4.1.2",
     "chalk": "^1.1.3",
-    "coveralls": "^3.0.1",
+    "coveralls": "^3.0.2",
     "cpr": "^2.0.0",
     "cross-spawn": "^6.0.4",
     "es6-promise": "^4.0.2",
@@ -49,9 +55,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://github.com/yargs/yargs.git"
+    "url": "https://github.com/yargs/yargs.git"
   },
-  "homepage": "http://yargs.js.org/",
+  "homepage": "https://yargs.js.org/",
   "standard": {
     "ignore": [
       "**/example/**"

package/yargs.js

@@ -42,12 +42,16 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
-  self.$0 = process.argv
-    .slice(0, 2)
+  // ignore the node bin, specify this in your
+  // bin file with #!/usr/bin/env node
+  if (/\b(node|iojs|electron)(\.exe)?$/.test(process.argv[0])) {
+    self.$0 = process.argv.slice(1, 2)
+  } else {
+    self.$0 = process.argv.slice(0, 1)
+  }
+
+  self.$0 = self.$0
     .map((x, i) => {
-      // ignore the node bin, specify this in your
-      // bin file with #!/usr/bin/env node
-      if (i === 0 && /\b(node|iojs)(\.exe)?$/.test(x)) return
       const b = rebase(cwd, x)
       return x.match(/^(\/|([a-zA-Z]:)?\\)/) && b.length < x.length ? b : x
     })