Updating NPM dependencies
This commit is contained in:
523
node_modules/yargs-parser/index.js
generated
vendored
523
node_modules/yargs-parser/index.js
generated
vendored
@@ -1,61 +1,63 @@
|
||||
var camelCase = require('camelcase')
|
||||
var decamelize = require('decamelize')
|
||||
var path = require('path')
|
||||
var tokenizeArgString = require('./lib/tokenize-arg-string')
|
||||
var util = require('util')
|
||||
const camelCase = require('camelcase')
|
||||
const decamelize = require('decamelize')
|
||||
const path = require('path')
|
||||
const tokenizeArgString = require('./lib/tokenize-arg-string')
|
||||
const util = require('util')
|
||||
|
||||
function parse (args, opts) {
|
||||
if (!opts) opts = {}
|
||||
opts = Object.assign(Object.create(null), opts)
|
||||
// allow a string argument to be passed in rather
|
||||
// than an argv array.
|
||||
args = tokenizeArgString(args)
|
||||
|
||||
// aliases might have transitive relationships, normalize this.
|
||||
var aliases = combineAliases(opts.alias || {})
|
||||
var configuration = Object.assign({
|
||||
'short-option-groups': true,
|
||||
'camel-case-expansion': true,
|
||||
'dot-notation': true,
|
||||
'parse-numbers': true,
|
||||
const aliases = combineAliases(Object.assign(Object.create(null), opts.alias))
|
||||
const configuration = Object.assign({
|
||||
'boolean-negation': true,
|
||||
'negation-prefix': 'no-',
|
||||
'camel-case-expansion': true,
|
||||
'combine-arrays': false,
|
||||
'dot-notation': true,
|
||||
'duplicate-arguments-array': true,
|
||||
'flatten-duplicate-arrays': true,
|
||||
'populate--': false,
|
||||
'combine-arrays': false,
|
||||
'set-placeholder-key': false,
|
||||
'greedy-arrays': true,
|
||||
'halt-at-non-option': false,
|
||||
'nargs-eats-options': false,
|
||||
'negation-prefix': 'no-',
|
||||
'parse-numbers': true,
|
||||
'populate--': false,
|
||||
'set-placeholder-key': false,
|
||||
'short-option-groups': true,
|
||||
'strip-aliased': false,
|
||||
'strip-dashed': false
|
||||
'strip-dashed': false,
|
||||
'unknown-options-as-args': false
|
||||
}, opts.configuration)
|
||||
var defaults = opts.default || {}
|
||||
var configObjects = opts.configObjects || []
|
||||
var envPrefix = opts.envPrefix
|
||||
var notFlagsOption = configuration['populate--']
|
||||
var notFlagsArgv = notFlagsOption ? '--' : '_'
|
||||
var newAliases = {}
|
||||
const defaults = Object.assign(Object.create(null), opts.default)
|
||||
const configObjects = opts.configObjects || []
|
||||
const envPrefix = opts.envPrefix
|
||||
const notFlagsOption = configuration['populate--']
|
||||
const notFlagsArgv = notFlagsOption ? '--' : '_'
|
||||
const newAliases = Object.create(null)
|
||||
const defaulted = Object.create(null)
|
||||
// allow a i18n handler to be passed in, default to a fake one (util.format).
|
||||
var __ = opts.__ || util.format
|
||||
var error = null
|
||||
var flags = {
|
||||
aliases: {},
|
||||
arrays: {},
|
||||
bools: {},
|
||||
strings: {},
|
||||
numbers: {},
|
||||
counts: {},
|
||||
normalize: {},
|
||||
configs: {},
|
||||
defaulted: {},
|
||||
nargs: {},
|
||||
coercions: {},
|
||||
const __ = opts.__ || util.format
|
||||
const flags = {
|
||||
aliases: Object.create(null),
|
||||
arrays: Object.create(null),
|
||||
bools: Object.create(null),
|
||||
strings: Object.create(null),
|
||||
numbers: Object.create(null),
|
||||
counts: Object.create(null),
|
||||
normalize: Object.create(null),
|
||||
configs: Object.create(null),
|
||||
nargs: Object.create(null),
|
||||
coercions: Object.create(null),
|
||||
keys: []
|
||||
}
|
||||
var negative = /^-[0-9]+(\.[0-9]+)?/
|
||||
var negatedBoolean = new RegExp('^--' + configuration['negation-prefix'] + '(.+)')
|
||||
const negative = /^-([0-9]+(\.[0-9]+)?|\.[0-9]+)$/
|
||||
const negatedBoolean = new RegExp('^--' + configuration['negation-prefix'] + '(.+)')
|
||||
|
||||
;[].concat(opts.array).filter(Boolean).forEach(function (opt) {
|
||||
var key = opt.key || opt
|
||||
const key = opt.key || opt
|
||||
|
||||
// assign to flags[bools|strings|numbers]
|
||||
const assignment = Object.keys(opt).map(function (key) {
|
||||
@@ -131,28 +133,31 @@ function parse (args, opts) {
|
||||
})
|
||||
})
|
||||
|
||||
var argv = { _: [] }
|
||||
let error = null
|
||||
checkConfiguration()
|
||||
|
||||
Object.keys(flags.bools).forEach(function (key) {
|
||||
if (Object.prototype.hasOwnProperty.call(defaults, key)) {
|
||||
setArg(key, defaults[key])
|
||||
setDefaulted(key)
|
||||
}
|
||||
})
|
||||
let notFlags = []
|
||||
|
||||
var notFlags = []
|
||||
const argv = Object.assign(Object.create(null), { _: [] })
|
||||
// TODO(bcoe): for the first pass at removing object prototype we didn't
|
||||
// remove all prototypes from objects returned by this API, we might want
|
||||
// to gradually move towards doing so.
|
||||
const argvReturn = {}
|
||||
|
||||
for (var i = 0; i < args.length; i++) {
|
||||
var arg = args[i]
|
||||
var broken
|
||||
var key
|
||||
var letters
|
||||
var m
|
||||
var next
|
||||
var value
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i]
|
||||
let broken
|
||||
let key
|
||||
let letters
|
||||
let m
|
||||
let next
|
||||
let value
|
||||
|
||||
// any unknown option (except for end-of-options, "--")
|
||||
if (arg !== '--' && isUnknownOptionAsArg(arg)) {
|
||||
argv._.push(arg)
|
||||
// -- separated by =
|
||||
if (arg.match(/^--.+=/) || (
|
||||
} else if (arg.match(/^--.+=/) || (
|
||||
!configuration['short-option-groups'] && arg.match(/^-.+=/)
|
||||
)) {
|
||||
// Using [\s\S] instead of . because js doesn't support the
|
||||
@@ -160,35 +165,34 @@ function parse (args, opts) {
|
||||
// http://stackoverflow.com/a/1068308/13216
|
||||
m = arg.match(/^--?([^=]+)=([\s\S]*)$/)
|
||||
|
||||
// nargs format = '--f=monkey washing cat'
|
||||
if (checkAllAliases(m[1], flags.nargs)) {
|
||||
args.splice(i + 1, 0, m[2])
|
||||
i = eatNargs(i, m[1], args)
|
||||
// arrays format = '--f=a b c'
|
||||
} else if (checkAllAliases(m[1], flags.arrays) && args.length > i + 1) {
|
||||
args.splice(i + 1, 0, m[2])
|
||||
i = eatArray(i, m[1], args)
|
||||
if (checkAllAliases(m[1], flags.arrays)) {
|
||||
i = eatArray(i, m[1], args, m[2])
|
||||
} else if (checkAllAliases(m[1], flags.nargs) !== false) {
|
||||
// nargs format = '--f=monkey washing cat'
|
||||
i = eatNargs(i, m[1], args, m[2])
|
||||
} else {
|
||||
setArg(m[1], m[2])
|
||||
}
|
||||
} else if (arg.match(negatedBoolean) && configuration['boolean-negation']) {
|
||||
key = arg.match(negatedBoolean)[1]
|
||||
setArg(key, false)
|
||||
setArg(key, checkAllAliases(key, flags.arrays) ? [false] : false)
|
||||
|
||||
// -- seperated by space.
|
||||
// -- separated by space.
|
||||
} else if (arg.match(/^--.+/) || (
|
||||
!configuration['short-option-groups'] && arg.match(/^-[^-]+/)
|
||||
)) {
|
||||
key = arg.match(/^--?(.+)/)[1]
|
||||
|
||||
// nargs format = '--foo a b c'
|
||||
if (checkAllAliases(key, flags.nargs)) {
|
||||
i = eatNargs(i, key, args)
|
||||
// array format = '--foo a b c'
|
||||
} else if (checkAllAliases(key, flags.arrays) && args.length > i + 1) {
|
||||
if (checkAllAliases(key, flags.arrays)) {
|
||||
// array format = '--foo a b c'
|
||||
i = eatArray(i, key, args)
|
||||
} else if (checkAllAliases(key, flags.nargs) !== false) {
|
||||
// nargs format = '--foo a b c'
|
||||
// should be truthy even if: flags.nargs[key] === 0
|
||||
i = eatNargs(i, key, args)
|
||||
} else {
|
||||
next = flags.nargs[key] === 0 ? undefined : args[i + 1]
|
||||
next = args[i + 1]
|
||||
|
||||
if (next !== undefined && (!next.match(/^-/) ||
|
||||
next.match(negative)) &&
|
||||
@@ -204,13 +208,13 @@ function parse (args, opts) {
|
||||
}
|
||||
}
|
||||
|
||||
// dot-notation flag seperated by '='.
|
||||
// dot-notation flag separated by '='.
|
||||
} else if (arg.match(/^-.\..+=/)) {
|
||||
m = arg.match(/^-([^=]+)=([\s\S]*)$/)
|
||||
setArg(m[1], m[2])
|
||||
|
||||
// dot-notation flag seperated by space.
|
||||
} else if (arg.match(/^-.\..+/)) {
|
||||
// dot-notation flag separated by space.
|
||||
} else if (arg.match(/^-.\..+/) && !arg.match(negative)) {
|
||||
next = args[i + 1]
|
||||
key = arg.match(/^-(.\..+)/)[1]
|
||||
|
||||
@@ -226,21 +230,19 @@ function parse (args, opts) {
|
||||
letters = arg.slice(1, -1).split('')
|
||||
broken = false
|
||||
|
||||
for (var j = 0; j < letters.length; j++) {
|
||||
for (let j = 0; j < letters.length; j++) {
|
||||
next = arg.slice(j + 2)
|
||||
|
||||
if (letters[j + 1] && letters[j + 1] === '=') {
|
||||
value = arg.slice(j + 3)
|
||||
key = letters[j]
|
||||
|
||||
// nargs format = '-f=monkey washing cat'
|
||||
if (checkAllAliases(key, flags.nargs)) {
|
||||
args.splice(i + 1, 0, value)
|
||||
i = eatNargs(i, key, args)
|
||||
// array format = '-f=a b c'
|
||||
} else if (checkAllAliases(key, flags.arrays) && args.length > i + 1) {
|
||||
args.splice(i + 1, 0, value)
|
||||
i = eatArray(i, key, args)
|
||||
if (checkAllAliases(key, flags.arrays)) {
|
||||
// array format = '-f=a b c'
|
||||
i = eatArray(i, key, args, value)
|
||||
} else if (checkAllAliases(key, flags.nargs) !== false) {
|
||||
// nargs format = '-f=monkey washing cat'
|
||||
i = eatNargs(i, key, args, value)
|
||||
} else {
|
||||
setArg(key, value)
|
||||
}
|
||||
@@ -274,12 +276,13 @@ function parse (args, opts) {
|
||||
key = arg.slice(-1)[0]
|
||||
|
||||
if (!broken && key !== '-') {
|
||||
// nargs format = '-f a b c'
|
||||
if (checkAllAliases(key, flags.nargs)) {
|
||||
i = eatNargs(i, key, args)
|
||||
// array format = '-f a b c'
|
||||
} else if (checkAllAliases(key, flags.arrays) && args.length > i + 1) {
|
||||
if (checkAllAliases(key, flags.arrays)) {
|
||||
// array format = '-f a b c'
|
||||
i = eatArray(i, key, args)
|
||||
} else if (checkAllAliases(key, flags.nargs) !== false) {
|
||||
// nargs format = '-f a b c'
|
||||
// should be truthy even if: flags.nargs[key] === 0
|
||||
i = eatNargs(i, key, args)
|
||||
} else {
|
||||
next = args[i + 1]
|
||||
|
||||
@@ -297,6 +300,12 @@ function parse (args, opts) {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (arg.match(/^-[0-9]$/) &&
|
||||
arg.match(negative) &&
|
||||
checkAllAliases(arg.slice(1), flags.bools)) {
|
||||
// single-digit boolean alias, e.g: xargs -0
|
||||
key = arg.slice(1)
|
||||
setArg(key, defaultValue(key))
|
||||
} else if (arg === '--') {
|
||||
notFlags = args.slice(i + 1)
|
||||
break
|
||||
@@ -318,7 +327,7 @@ function parse (args, opts) {
|
||||
applyEnvVars(argv, false)
|
||||
setConfig(argv)
|
||||
setConfigObjects()
|
||||
applyDefaultsAndAliases(argv, flags.aliases, defaults)
|
||||
applyDefaultsAndAliases(argv, flags.aliases, defaults, true)
|
||||
applyCoercions(argv)
|
||||
if (configuration['set-placeholder-key']) setPlaceholderKeys(argv)
|
||||
|
||||
@@ -340,7 +349,6 @@ function parse (args, opts) {
|
||||
}
|
||||
|
||||
if (configuration['strip-aliased']) {
|
||||
// XXX Switch to [].concat(...Object.values(aliases)) once node.js 6 is dropped
|
||||
;[].concat(...Object.keys(aliases).map(k => aliases[k])).forEach(alias => {
|
||||
if (configuration['camel-case-expansion']) {
|
||||
delete argv[alias.split('.').map(prop => camelCase(prop)).join('.')]
|
||||
@@ -352,21 +360,43 @@ function parse (args, opts) {
|
||||
|
||||
// how many arguments should we consume, based
|
||||
// on the nargs option?
|
||||
function eatNargs (i, key, args) {
|
||||
var ii
|
||||
const toEat = checkAllAliases(key, flags.nargs)
|
||||
function eatNargs (i, key, args, argAfterEqualSign) {
|
||||
let ii
|
||||
let toEat = checkAllAliases(key, flags.nargs)
|
||||
// NaN has a special meaning for the array type, indicating that one or
|
||||
// more values are expected.
|
||||
toEat = isNaN(toEat) ? 1 : toEat
|
||||
|
||||
// nargs will not consume flag arguments, e.g., -abc, --foo,
|
||||
// and terminates when one is observed.
|
||||
var available = 0
|
||||
for (ii = i + 1; ii < args.length; ii++) {
|
||||
if (!args[ii].match(/^-[^0-9]/)) available++
|
||||
else break
|
||||
if (toEat === 0) {
|
||||
if (!isUndefined(argAfterEqualSign)) {
|
||||
error = Error(__('Argument unexpected for: %s', key))
|
||||
}
|
||||
setArg(key, defaultValue(key))
|
||||
return i
|
||||
}
|
||||
|
||||
if (available < toEat) error = Error(__('Not enough arguments following: %s', key))
|
||||
let available = isUndefined(argAfterEqualSign) ? 0 : 1
|
||||
if (configuration['nargs-eats-options']) {
|
||||
// classic behavior, yargs eats positional and dash arguments.
|
||||
if (args.length - (i + 1) + available < toEat) {
|
||||
error = Error(__('Not enough arguments following: %s', key))
|
||||
}
|
||||
available = toEat
|
||||
} else {
|
||||
// nargs will not consume flag arguments, e.g., -abc, --foo,
|
||||
// and terminates when one is observed.
|
||||
for (ii = i + 1; ii < args.length; ii++) {
|
||||
if (!args[ii].match(/^-[^0-9]/) || args[ii].match(negative) || isUnknownOptionAsArg(args[ii])) available++
|
||||
else break
|
||||
}
|
||||
if (available < toEat) error = Error(__('Not enough arguments following: %s', key))
|
||||
}
|
||||
|
||||
const consumed = Math.min(available, toEat)
|
||||
let consumed = Math.min(available, toEat)
|
||||
if (!isUndefined(argAfterEqualSign) && consumed > 0) {
|
||||
setArg(key, argAfterEqualSign)
|
||||
consumed--
|
||||
}
|
||||
for (ii = i + 1; ii < (consumed + i + 1); ii++) {
|
||||
setArg(key, args[ii])
|
||||
}
|
||||
@@ -377,47 +407,59 @@ function parse (args, opts) {
|
||||
// if an option is an array, eat all non-hyphenated arguments
|
||||
// following it... YUM!
|
||||
// e.g., --foo apple banana cat becomes ["apple", "banana", "cat"]
|
||||
function eatArray (i, key, args) {
|
||||
var start = i + 1
|
||||
var argsToSet = []
|
||||
var multipleArrayFlag = i > 0
|
||||
for (var ii = i + 1; ii < args.length; ii++) {
|
||||
if (/^-/.test(args[ii]) && !negative.test(args[ii])) {
|
||||
if (ii === start) {
|
||||
setArg(key, defaultForType('array'))
|
||||
}
|
||||
multipleArrayFlag = true
|
||||
break
|
||||
function eatArray (i, key, args, argAfterEqualSign) {
|
||||
let argsToSet = []
|
||||
let next = argAfterEqualSign || args[i + 1]
|
||||
// If both array and nargs are configured, enforce the nargs count:
|
||||
const nargsCount = checkAllAliases(key, flags.nargs)
|
||||
|
||||
if (checkAllAliases(key, flags.bools) && !(/^(true|false)$/.test(next))) {
|
||||
argsToSet.push(true)
|
||||
} else if (isUndefined(next) ||
|
||||
(isUndefined(argAfterEqualSign) && /^-/.test(next) && !negative.test(next) && !isUnknownOptionAsArg(next))) {
|
||||
// for keys without value ==> argsToSet remains an empty []
|
||||
// set user default value, if available
|
||||
if (defaults[key] !== undefined) {
|
||||
const defVal = defaults[key]
|
||||
argsToSet = Array.isArray(defVal) ? defVal : [defVal]
|
||||
}
|
||||
i = ii
|
||||
argsToSet.push(args[ii])
|
||||
}
|
||||
if (multipleArrayFlag) {
|
||||
setArg(key, argsToSet.map(function (arg) {
|
||||
return processValue(key, arg)
|
||||
}))
|
||||
} else {
|
||||
argsToSet.forEach(function (arg) {
|
||||
setArg(key, arg)
|
||||
})
|
||||
// value in --option=value is eaten as is
|
||||
if (!isUndefined(argAfterEqualSign)) {
|
||||
argsToSet.push(processValue(key, argAfterEqualSign))
|
||||
}
|
||||
for (let ii = i + 1; ii < args.length; ii++) {
|
||||
if ((!configuration['greedy-arrays'] && argsToSet.length > 0) ||
|
||||
(nargsCount && argsToSet.length >= nargsCount)) break
|
||||
next = args[ii]
|
||||
if (/^-/.test(next) && !negative.test(next) && !isUnknownOptionAsArg(next)) break
|
||||
i = ii
|
||||
argsToSet.push(processValue(key, next))
|
||||
}
|
||||
}
|
||||
|
||||
// If both array and nargs are configured, create an error if less than
|
||||
// nargs positionals were found. NaN has special meaning, indicating
|
||||
// that at least one value is required (more are okay).
|
||||
if ((nargsCount && argsToSet.length < nargsCount) ||
|
||||
(isNaN(nargsCount) && argsToSet.length === 0)) {
|
||||
error = Error(__('Not enough arguments following: %s', key))
|
||||
}
|
||||
|
||||
setArg(key, argsToSet)
|
||||
return i
|
||||
}
|
||||
|
||||
function setArg (key, val) {
|
||||
unsetDefaulted(key)
|
||||
|
||||
if (/-/.test(key) && configuration['camel-case-expansion']) {
|
||||
var alias = key.split('.').map(function (prop) {
|
||||
const alias = key.split('.').map(function (prop) {
|
||||
return camelCase(prop)
|
||||
}).join('.')
|
||||
addNewAlias(key, alias)
|
||||
}
|
||||
|
||||
var value = processValue(key, val)
|
||||
|
||||
var splitKey = key.split('.')
|
||||
const value = processValue(key, val)
|
||||
const splitKey = key.split('.')
|
||||
setKey(argv, splitKey, value)
|
||||
|
||||
// handle populating aliases of the full key
|
||||
@@ -434,24 +476,30 @@ function parse (args, opts) {
|
||||
x = x.split('.')
|
||||
|
||||
// expand alias with nested objects in key
|
||||
var a = [].concat(splitKey)
|
||||
const a = [].concat(splitKey)
|
||||
a.shift() // nuke the old key.
|
||||
x = x.concat(a)
|
||||
|
||||
setKey(argv, x, value)
|
||||
// populate alias only if is not already an alias of the full key
|
||||
// (already populated above)
|
||||
if (!(flags.aliases[key] || []).includes(x.join('.'))) {
|
||||
setKey(argv, x, value)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Set normalize getter and setter when key is in 'normalize' but isn't an array
|
||||
if (checkAllAliases(key, flags.normalize) && !checkAllAliases(key, flags.arrays)) {
|
||||
var keys = [key].concat(flags.aliases[key] || [])
|
||||
const keys = [key].concat(flags.aliases[key] || [])
|
||||
keys.forEach(function (key) {
|
||||
argv.__defineSetter__(key, function (v) {
|
||||
val = path.normalize(v)
|
||||
})
|
||||
|
||||
argv.__defineGetter__(key, function () {
|
||||
return typeof val === 'string' ? path.normalize(val) : val
|
||||
Object.defineProperty(argvReturn, key, {
|
||||
enumerable: true,
|
||||
get () {
|
||||
return val
|
||||
},
|
||||
set (value) {
|
||||
val = typeof value === 'string' ? path.normalize(value) : value
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
@@ -481,7 +529,9 @@ function parse (args, opts) {
|
||||
if (typeof val === 'string') val = val === 'true'
|
||||
}
|
||||
|
||||
var value = maybeCoerceNumber(key, val)
|
||||
let value = Array.isArray(val)
|
||||
? val.map(function (v) { return maybeCoerceNumber(key, v) })
|
||||
: maybeCoerceNumber(key, val)
|
||||
|
||||
// increment a count given as arg (either no value or value parsed as boolean)
|
||||
if (checkAllAliases(key, flags.counts) && (isUndefined(value) || typeof value === 'boolean')) {
|
||||
@@ -497,7 +547,7 @@ function parse (args, opts) {
|
||||
}
|
||||
|
||||
function maybeCoerceNumber (key, value) {
|
||||
if (!checkAllAliases(key, flags.strings) && !checkAllAliases(key, flags.coercions)) {
|
||||
if (!checkAllAliases(key, flags.strings) && !checkAllAliases(key, flags.bools) && !Array.isArray(value)) {
|
||||
const shouldCoerceNumber = isNumber(value) && configuration['parse-numbers'] && (
|
||||
Number.isSafeInteger(Math.floor(value))
|
||||
)
|
||||
@@ -509,18 +559,18 @@ function parse (args, opts) {
|
||||
// set args from config.json file, this should be
|
||||
// applied last so that defaults can be applied.
|
||||
function setConfig (argv) {
|
||||
var configLookup = {}
|
||||
const configLookup = Object.create(null)
|
||||
|
||||
// expand defaults/aliases, in-case any happen to reference
|
||||
// the config.json file.
|
||||
applyDefaultsAndAliases(configLookup, flags.aliases, defaults)
|
||||
|
||||
Object.keys(flags.configs).forEach(function (configKey) {
|
||||
var configPath = argv[configKey] || configLookup[configKey]
|
||||
const configPath = argv[configKey] || configLookup[configKey]
|
||||
if (configPath) {
|
||||
try {
|
||||
var config = null
|
||||
var resolvedConfigPath = path.resolve(process.cwd(), configPath)
|
||||
let config = null
|
||||
const resolvedConfigPath = path.resolve(process.cwd(), configPath)
|
||||
|
||||
if (typeof flags.configs[configKey] === 'function') {
|
||||
try {
|
||||
@@ -548,8 +598,8 @@ function parse (args, opts) {
|
||||
// it recursively checks nested objects.
|
||||
function setConfigObject (config, prev) {
|
||||
Object.keys(config).forEach(function (key) {
|
||||
var value = config[key]
|
||||
var fullKey = prev ? prev + '.' + key : key
|
||||
const value = config[key]
|
||||
const fullKey = prev ? prev + '.' + key : key
|
||||
|
||||
// if the value is an inner object and we have dot-notation
|
||||
// enabled, treat inner objects in config the same as
|
||||
@@ -560,7 +610,7 @@ function parse (args, opts) {
|
||||
} else {
|
||||
// setting arguments via CLI takes precedence over
|
||||
// values within the config file.
|
||||
if (!hasKey(argv, fullKey.split('.')) || (flags.defaulted[fullKey]) || (flags.arrays[fullKey] && configuration['combine-arrays'])) {
|
||||
if (!hasKey(argv, fullKey.split('.')) || (checkAllAliases(fullKey, flags.arrays) && configuration['combine-arrays'])) {
|
||||
setArg(fullKey, value)
|
||||
}
|
||||
}
|
||||
@@ -578,18 +628,18 @@ function parse (args, opts) {
|
||||
function applyEnvVars (argv, configOnly) {
|
||||
if (typeof envPrefix === 'undefined') return
|
||||
|
||||
var prefix = typeof envPrefix === 'string' ? envPrefix : ''
|
||||
const prefix = typeof envPrefix === 'string' ? envPrefix : ''
|
||||
Object.keys(process.env).forEach(function (envVar) {
|
||||
if (prefix === '' || envVar.lastIndexOf(prefix, 0) === 0) {
|
||||
// get array of nested keys and convert them to camel case
|
||||
var keys = envVar.split('__').map(function (key, i) {
|
||||
const keys = envVar.split('__').map(function (key, i) {
|
||||
if (i === 0) {
|
||||
key = key.substring(prefix.length)
|
||||
}
|
||||
return camelCase(key)
|
||||
})
|
||||
|
||||
if (((configOnly && flags.configs[keys.join('.')]) || !configOnly) && (!hasKey(argv, keys) || flags.defaulted[keys.join('.')])) {
|
||||
if (((configOnly && flags.configs[keys.join('.')]) || !configOnly) && !hasKey(argv, keys)) {
|
||||
setArg(keys.join('.'), process.env[envVar])
|
||||
}
|
||||
}
|
||||
@@ -597,16 +647,17 @@ function parse (args, opts) {
|
||||
}
|
||||
|
||||
function applyCoercions (argv) {
|
||||
var coerce
|
||||
var applied = {}
|
||||
let coerce
|
||||
const applied = new Set()
|
||||
Object.keys(argv).forEach(function (key) {
|
||||
if (!applied.hasOwnProperty(key)) { // If we haven't already coerced this option via one of its aliases
|
||||
if (!applied.has(key)) { // If we haven't already coerced this option via one of its aliases
|
||||
coerce = checkAllAliases(key, flags.coercions)
|
||||
if (typeof coerce === 'function') {
|
||||
try {
|
||||
var value = coerce(argv[key])
|
||||
const value = maybeCoerceNumber(key, coerce(argv[key]))
|
||||
;([].concat(flags.aliases[key] || [], key)).forEach(ali => {
|
||||
applied[ali] = argv[ali] = value
|
||||
applied.add(ali)
|
||||
argv[ali] = value
|
||||
})
|
||||
} catch (err) {
|
||||
error = err
|
||||
@@ -625,10 +676,11 @@ function parse (args, opts) {
|
||||
return argv
|
||||
}
|
||||
|
||||
function applyDefaultsAndAliases (obj, aliases, defaults) {
|
||||
function applyDefaultsAndAliases (obj, aliases, defaults, canLog = false) {
|
||||
Object.keys(defaults).forEach(function (key) {
|
||||
if (!hasKey(obj, key.split('.'))) {
|
||||
setKey(obj, key.split('.'), defaults[key])
|
||||
if (canLog) defaulted[key] = true
|
||||
|
||||
;(aliases[key] || []).forEach(function (x) {
|
||||
if (hasKey(obj, x.split('.'))) return
|
||||
@@ -639,7 +691,7 @@ function parse (args, opts) {
|
||||
}
|
||||
|
||||
function hasKey (obj, keys) {
|
||||
var o = obj
|
||||
let o = obj
|
||||
|
||||
if (!configuration['dot-notation']) keys = [keys.join('.')]
|
||||
|
||||
@@ -647,18 +699,22 @@ function parse (args, opts) {
|
||||
o = (o[key] || {})
|
||||
})
|
||||
|
||||
var key = keys[keys.length - 1]
|
||||
const key = keys[keys.length - 1]
|
||||
|
||||
if (typeof o !== 'object') return false
|
||||
else return key in o
|
||||
}
|
||||
|
||||
function setKey (obj, keys, value) {
|
||||
var o = obj
|
||||
let o = obj
|
||||
|
||||
if (!configuration['dot-notation']) keys = [keys.join('.')]
|
||||
|
||||
keys.slice(0, -1).forEach(function (key, index) {
|
||||
// TODO(bcoe): in the next major version of yargs, switch to
|
||||
// Object.create(null) for dot notation:
|
||||
key = sanitizeKey(key)
|
||||
|
||||
if (typeof o === 'object' && o[key] === undefined) {
|
||||
o[key] = {}
|
||||
}
|
||||
@@ -678,11 +734,13 @@ function parse (args, opts) {
|
||||
}
|
||||
})
|
||||
|
||||
var key = keys[keys.length - 1]
|
||||
// TODO(bcoe): in the next major version of yargs, switch to
|
||||
// Object.create(null) for dot notation:
|
||||
const key = sanitizeKey(keys[keys.length - 1])
|
||||
|
||||
var isTypeArray = checkAllAliases(keys.join('.'), flags.arrays)
|
||||
var isValueArray = Array.isArray(value)
|
||||
var duplicate = configuration['duplicate-arguments-array']
|
||||
const isTypeArray = checkAllAliases(keys.join('.'), flags.arrays)
|
||||
const isValueArray = Array.isArray(value)
|
||||
let duplicate = configuration['duplicate-arguments-array']
|
||||
|
||||
// nargs has higher priority than duplicate
|
||||
if (!duplicate && checkAllAliases(key, flags.nargs)) {
|
||||
@@ -704,8 +762,12 @@ function parse (args, opts) {
|
||||
}
|
||||
} else if (o[key] === undefined && isTypeArray) {
|
||||
o[key] = isValueArray ? value : [value]
|
||||
} else if (duplicate && !(o[key] === undefined || checkAllAliases(key, flags.bools) || checkAllAliases(keys.join('.'), flags.bools) || checkAllAliases(key, flags.counts))) {
|
||||
o[key] = [ o[key], value ]
|
||||
} else if (duplicate && !(
|
||||
o[key] === undefined ||
|
||||
checkAllAliases(key, flags.counts) ||
|
||||
checkAllAliases(key, flags.bools)
|
||||
)) {
|
||||
o[key] = [o[key], value]
|
||||
} else {
|
||||
o[key] = value
|
||||
}
|
||||
@@ -724,7 +786,7 @@ function parse (args, opts) {
|
||||
// For "--option-name", also set argv.optionName
|
||||
flags.aliases[key].concat(key).forEach(function (x) {
|
||||
if (/-/.test(x) && configuration['camel-case-expansion']) {
|
||||
var c = camelCase(x)
|
||||
const c = camelCase(x)
|
||||
if (c !== key && flags.aliases[key].indexOf(c) === -1) {
|
||||
flags.aliases[key].push(c)
|
||||
newAliases[c] = true
|
||||
@@ -734,7 +796,7 @@ function parse (args, opts) {
|
||||
// For "--optionName", also set argv['option-name']
|
||||
flags.aliases[key].concat(key).forEach(function (x) {
|
||||
if (x.length > 1 && /[A-Z]/.test(x) && configuration['camel-case-expansion']) {
|
||||
var c = decamelize(x, '-')
|
||||
const c = decamelize(x, '-')
|
||||
if (c !== key && flags.aliases[key].indexOf(c) === -1) {
|
||||
flags.aliases[key].push(c)
|
||||
newAliases[c] = true
|
||||
@@ -750,30 +812,77 @@ function parse (args, opts) {
|
||||
})
|
||||
}
|
||||
|
||||
// check if a flag is set for any of a key's aliases.
|
||||
// return the 1st set flag for any of a key's aliases (or false if no flag set)
|
||||
function checkAllAliases (key, flag) {
|
||||
var isSet = false
|
||||
var toCheck = [].concat(flags.aliases[key] || [], key)
|
||||
|
||||
toCheck.forEach(function (key) {
|
||||
if (flag[key]) isSet = flag[key]
|
||||
})
|
||||
|
||||
return isSet
|
||||
const toCheck = [].concat(flags.aliases[key] || [], key)
|
||||
const keys = Object.keys(flag)
|
||||
const setAlias = toCheck.find(key => keys.includes(key))
|
||||
return setAlias ? flag[setAlias] : false
|
||||
}
|
||||
|
||||
function setDefaulted (key) {
|
||||
[].concat(flags.aliases[key] || [], key).forEach(function (k) {
|
||||
flags.defaulted[k] = true
|
||||
function hasAnyFlag (key) {
|
||||
const toCheck = [].concat(Object.keys(flags).map(k => flags[k]))
|
||||
return toCheck.some(function (flag) {
|
||||
return Array.isArray(flag) ? flag.includes(key) : flag[key]
|
||||
})
|
||||
}
|
||||
|
||||
function unsetDefaulted (key) {
|
||||
[].concat(flags.aliases[key] || [], key).forEach(function (k) {
|
||||
delete flags.defaulted[k]
|
||||
function hasFlagsMatching (arg, ...patterns) {
|
||||
const toCheck = [].concat(...patterns)
|
||||
return toCheck.some(function (pattern) {
|
||||
const match = arg.match(pattern)
|
||||
return match && hasAnyFlag(match[1])
|
||||
})
|
||||
}
|
||||
|
||||
// based on a simplified version of the short flag group parsing logic
|
||||
function hasAllShortFlags (arg) {
|
||||
// if this is a negative number, or doesn't start with a single hyphen, it's not a short flag group
|
||||
if (arg.match(negative) || !arg.match(/^-[^-]+/)) { return false }
|
||||
let hasAllFlags = true
|
||||
let next
|
||||
const letters = arg.slice(1).split('')
|
||||
for (let j = 0; j < letters.length; j++) {
|
||||
next = arg.slice(j + 2)
|
||||
|
||||
if (!hasAnyFlag(letters[j])) {
|
||||
hasAllFlags = false
|
||||
break
|
||||
}
|
||||
|
||||
if ((letters[j + 1] && letters[j + 1] === '=') ||
|
||||
next === '-' ||
|
||||
(/[A-Za-z]/.test(letters[j]) && /^-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) ||
|
||||
(letters[j + 1] && letters[j + 1].match(/\W/))) {
|
||||
break
|
||||
}
|
||||
}
|
||||
return hasAllFlags
|
||||
}
|
||||
|
||||
function isUnknownOptionAsArg (arg) {
|
||||
return configuration['unknown-options-as-args'] && isUnknownOption(arg)
|
||||
}
|
||||
|
||||
function isUnknownOption (arg) {
|
||||
// ignore negative numbers
|
||||
if (arg.match(negative)) { return false }
|
||||
// if this is a short option group and all of them are configured, it isn't unknown
|
||||
if (hasAllShortFlags(arg)) { return false }
|
||||
// e.g. '--count=2'
|
||||
const flagWithEquals = /^-+([^=]+?)=[\s\S]*$/
|
||||
// e.g. '-a' or '--arg'
|
||||
const normalFlag = /^-+([^=]+?)$/
|
||||
// e.g. '-a-'
|
||||
const flagEndingInHyphen = /^-+([^=]+?)-$/
|
||||
// e.g. '-abc123'
|
||||
const flagEndingInDigits = /^-+([^=]+?\d+)$/
|
||||
// e.g. '-a/usr/local'
|
||||
const flagEndingInNonWordCharacters = /^-+([^=]+?)\W+.*$/
|
||||
// check the different types of flag styles, including negatedBoolean, a pattern defined near the start of the parse method
|
||||
return !hasFlagsMatching(arg, flagWithEquals, negatedBoolean, normalFlag, flagEndingInHyphen, flagEndingInDigits, flagEndingInNonWordCharacters)
|
||||
}
|
||||
|
||||
// make a best effor to pick a default value
|
||||
// for an option based on name and type.
|
||||
function defaultValue (key) {
|
||||
@@ -789,7 +898,7 @@ function parse (args, opts) {
|
||||
// return a default value, given the type of a flag.,
|
||||
// e.g., key of type 'string' will default to '', rather than 'true'.
|
||||
function defaultForType (type) {
|
||||
var def = {
|
||||
const def = {
|
||||
boolean: true,
|
||||
string: '',
|
||||
number: undefined,
|
||||
@@ -801,12 +910,11 @@ function parse (args, opts) {
|
||||
|
||||
// given a flag, enforce a default type.
|
||||
function guessType (key) {
|
||||
var type = 'boolean'
|
||||
|
||||
let type = 'boolean'
|
||||
if (checkAllAliases(key, flags.strings)) type = 'string'
|
||||
else if (checkAllAliases(key, flags.numbers)) type = 'number'
|
||||
else if (checkAllAliases(key, flags.bools)) type = 'boolean'
|
||||
else if (checkAllAliases(key, flags.arrays)) type = 'array'
|
||||
|
||||
return type
|
||||
}
|
||||
|
||||
@@ -825,11 +933,26 @@ function parse (args, opts) {
|
||||
return num === undefined
|
||||
}
|
||||
|
||||
// check user configuration settings for inconsistencies
|
||||
function checkConfiguration () {
|
||||
// count keys should not be set as array/narg
|
||||
Object.keys(flags.counts).find(key => {
|
||||
if (checkAllAliases(key, flags.arrays)) {
|
||||
error = Error(__('Invalid configuration: %s, opts.count excludes opts.array.', key))
|
||||
return true
|
||||
} else if (checkAllAliases(key, flags.nargs)) {
|
||||
error = Error(__('Invalid configuration: %s, opts.count excludes opts.narg.', key))
|
||||
return true
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
argv: argv,
|
||||
argv: Object.assign(argvReturn, argv),
|
||||
error: error,
|
||||
aliases: flags.aliases,
|
||||
newAliases: newAliases,
|
||||
aliases: Object.assign({}, flags.aliases),
|
||||
newAliases: Object.assign({}, newAliases),
|
||||
defaulted: Object.assign({}, defaulted),
|
||||
configuration: configuration
|
||||
}
|
||||
}
|
||||
@@ -837,9 +960,9 @@ function parse (args, opts) {
|
||||
// if any aliases reference each other, we should
|
||||
// merge them together.
|
||||
function combineAliases (aliases) {
|
||||
var aliasArrays = []
|
||||
var change = true
|
||||
var combined = {}
|
||||
const aliasArrays = []
|
||||
const combined = Object.create(null)
|
||||
let change = true
|
||||
|
||||
// turn alias lookup hash {key: ['alias1', 'alias2']} into
|
||||
// a simple array ['key', 'alias1', 'alias2']
|
||||
@@ -853,9 +976,9 @@ function combineAliases (aliases) {
|
||||
// made in an iteration.
|
||||
while (change) {
|
||||
change = false
|
||||
for (var i = 0; i < aliasArrays.length; i++) {
|
||||
for (var ii = i + 1; ii < aliasArrays.length; ii++) {
|
||||
var intersect = aliasArrays[i].filter(function (v) {
|
||||
for (let i = 0; i < aliasArrays.length; i++) {
|
||||
for (let ii = i + 1; ii < aliasArrays.length; ii++) {
|
||||
const intersect = aliasArrays[i].filter(function (v) {
|
||||
return aliasArrays[ii].indexOf(v) !== -1
|
||||
})
|
||||
|
||||
@@ -889,8 +1012,7 @@ function increment (orig) {
|
||||
}
|
||||
|
||||
function Parser (args, opts) {
|
||||
var result = parse(args.slice(), opts)
|
||||
|
||||
const result = parse(args.slice(), opts)
|
||||
return result.argv
|
||||
}
|
||||
|
||||
@@ -900,4 +1022,11 @@ Parser.detailed = function (args, opts) {
|
||||
return parse(args.slice(), opts)
|
||||
}
|
||||
|
||||
// TODO(bcoe): in the next major version of yargs, switch to
|
||||
// Object.create(null) for dot notation:
|
||||
function sanitizeKey (key) {
|
||||
if (key === '__proto__') return '___proto___'
|
||||
return key
|
||||
}
|
||||
|
||||
module.exports = Parser
|
||||
|
||||
Reference in New Issue
Block a user