Comparing version 15.3.1 to 15.3.2-beta.0
@@ -6,3 +6,3 @@ 'use strict' | ||
const yargs = require('./yargs') | ||
const processArgv = require('./lib/process-argv') | ||
const processArgv = require('./build/lib/process-argv') | ||
@@ -9,0 +9,0 @@ Argv(processArgv.getProcessArgvWithoutBin()) |
'use strict' | ||
const inspect = require('util').inspect | ||
const isPromise = require('./is-promise') | ||
const { isPromise } = require('../build/lib/is-promise') | ||
const { applyMiddleware, commandMiddlewareFactory } = require('./middleware') | ||
const { parseCommand } = require('../build/lib/parse-command') | ||
const path = require('path') | ||
@@ -43,6 +44,6 @@ const Parser = require('yargs-parser') | ||
// parse positionals out of cmd string | ||
const parsedCommand = self.parseCommand(cmd) | ||
const parsedCommand = parseCommand(cmd) | ||
// remove positional args from aliases only | ||
aliases = aliases.map(alias => self.parseCommand(alias).cmd) | ||
aliases = aliases.map(alias => parseCommand(alias).cmd) | ||
@@ -137,30 +138,2 @@ // check for default and filter out '*'' | ||
self.parseCommand = function parseCommand (cmd) { | ||
const extraSpacesStrippedCommand = cmd.replace(/\s{2,}/g, ' ') | ||
const splitCommand = extraSpacesStrippedCommand.split(/\s+(?![^[]*]|[^<]*>)/) | ||
const bregex = /\.*[\][<>]/g | ||
const parsedCommand = { | ||
cmd: (splitCommand.shift()).replace(bregex, ''), | ||
demanded: [], | ||
optional: [] | ||
} | ||
splitCommand.forEach((cmd, i) => { | ||
let variadic = false | ||
cmd = cmd.replace(/\s/g, '') | ||
if (/\.+[\]>]/.test(cmd) && i === splitCommand.length - 1) variadic = true | ||
if (/^\[/.test(cmd)) { | ||
parsedCommand.optional.push({ | ||
cmd: cmd.replace(bregex, '').split('|'), | ||
variadic | ||
}) | ||
} else { | ||
parsedCommand.demanded.push({ | ||
cmd: cmd.replace(bregex, '').split('|'), | ||
variadic | ||
}) | ||
} | ||
}) | ||
return parsedCommand | ||
} | ||
self.getCommands = () => Object.keys(handlers).concat(Object.keys(aliasMap)) | ||
@@ -408,3 +381,3 @@ | ||
const parsed = self.parseCommand(cmdString) | ||
const parsed = parseCommand(cmdString) | ||
parsed.demanded.forEach((d) => { | ||
@@ -411,0 +384,0 @@ const cmds = d.cmd.slice(0) |
@@ -9,4 +9,4 @@ 'use strict' | ||
} | ||
const isPromise = require('./is-promise') | ||
const argsert = require('./argsert') | ||
const { isPromise } = require('../build/lib/is-promise') | ||
const { argsert } = require('../build/lib/argsert') | ||
@@ -13,0 +13,0 @@ function globalMiddlewareFactory (globalMiddleware, context) { |
@@ -25,4 +25,4 @@ { | ||
"Missing argument value: %s": { | ||
"one": "引数が見つかりません: %s", | ||
"other": "引数が見つかりません: %s" | ||
"one": "引数の値が見つかりません: %s", | ||
"other": "引数の値が見つかりません: %s" | ||
}, | ||
@@ -38,3 +38,3 @@ "Missing required argument: %s": { | ||
"Invalid values:": "不正な値です:", | ||
"Argument: %s, Given: %s, Choices: %s": "引数は %s です。指定できるのは %s つです。選択してください: %s", | ||
"Argument: %s, Given: %s, Choices: %s": "引数は %s です。与えられた値: %s, 選択してください: %s", | ||
"Argument check failed: %s": "引数のチェックに失敗しました: %s", | ||
@@ -50,3 +50,5 @@ "Implications failed:": "オプションの組み合わせで不正が生じました:", | ||
"Positionals:": "位置:", | ||
"command": "コマンド" | ||
"command": "コマンド", | ||
"deprecated": "非推奨", | ||
"deprecated: %s": "非推奨: %s" | ||
} |
{ | ||
"name": "yargs", | ||
"version": "15.3.1", | ||
"version": "15.3.2-beta.0", | ||
"description": "yargs the modern, pirate-themed, successor to optimist.", | ||
@@ -15,3 +15,4 @@ "main": "./index.js", | ||
"yargs.js", | ||
"lib", | ||
"build", | ||
"lib/**/*.js", | ||
"locales", | ||
@@ -24,3 +25,3 @@ "completion.sh.hbs", | ||
"cliui": "^6.0.0", | ||
"decamelize": "^1.2.0", | ||
"decamelize": "^3.2.0", | ||
"find-up": "^4.1.0", | ||
@@ -34,8 +35,14 @@ "get-caller-file": "^2.0.1", | ||
"y18n": "^4.0.0", | ||
"yargs-parser": "^18.1.1" | ||
"yargs-parser": "^18.1.2" | ||
}, | ||
"devDependencies": { | ||
"@types/chai": "^4.2.11", | ||
"@types/mocha": "^7.0.2", | ||
"@types/node": "^10.0.3", | ||
"@types/yargs-parser": "^15.0.0", | ||
"@typescript-eslint/eslint-plugin": "^2.25.0", | ||
"@typescript-eslint/parser": "^2.25.0", | ||
"c8": "^7.0.0", | ||
"chai": "^4.2.0", | ||
"chalk": "^3.0.0", | ||
"chalk": "^4.0.0", | ||
"coveralls": "^3.0.9", | ||
@@ -45,6 +52,11 @@ "cpr": "^3.0.1", | ||
"es6-promise": "^4.2.5", | ||
"eslint": "^6.8.0", | ||
"eslint-plugin-import": "^2.20.1", | ||
"eslint-plugin-node": "^11.0.0", | ||
"gts": "^2.0.0-alpha.4", | ||
"hashish": "0.0.4", | ||
"mocha": "^7.0.0", | ||
"rimraf": "^3.0.0", | ||
"standard": "^14.0.0", | ||
"rimraf": "^3.0.2", | ||
"standardx": "^5.0.0", | ||
"typescript": "^3.7.0", | ||
"which": "^2.0.0", | ||
@@ -54,6 +66,10 @@ "yargs-test-extends": "^1.0.1" | ||
"scripts": { | ||
"fix": "standard --fix", | ||
"posttest": "standard", | ||
"fix": "standardx --fix && standardx --fix **/*.ts", | ||
"posttest": "npm run check", | ||
"test": "c8 mocha --require ./test/before.js --timeout=12000 --check-leaks", | ||
"coverage": "c8 report --check-coverage" | ||
"coverage": "c8 report --check-coverage", | ||
"check": "standardx && standardx **/*.ts", | ||
"compile": "rimraf build && tsc", | ||
"prepare": "npm run compile", | ||
"pretest": "npm run compile -- -p tsconfig.test.json" | ||
}, | ||
@@ -65,4 +81,5 @@ "repository": { | ||
"homepage": "https://yargs.js.org/", | ||
"standard": { | ||
"standardx": { | ||
"ignore": [ | ||
"build", | ||
"**/example/**" | ||
@@ -69,0 +86,0 @@ ] |
@@ -139,3 +139,3 @@ <p align="center"> | ||
[type-definitions]: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs | ||
[coverage-image]: https://img.shields.io/badge/dynamic/json?color=brightgreen&label=coverage&query=branches&suffix=%25&url=https%3A%2F%2Fraw.githubusercontent.com%2Fyargs%2Fyargs%2Fmaster%2F.nycrc&cacheSeconds=3600 | ||
[coverage-image]: https://img.shields.io/nycrc/yargs/yargs | ||
[coverage-url]: https://github.com/yargs/yargs/blob/master/.nycrc |
18
yargs.js
@@ -7,17 +7,17 @@ 'use strict' | ||
const argsert = require('./lib/argsert') | ||
const { argsert } = require('./build/lib/argsert') | ||
const fs = require('fs') | ||
const Command = require('./lib/command') | ||
const Completion = require('./lib/completion') | ||
const { completion: Completion } = require('./build/lib/completion') | ||
const Parser = require('yargs-parser') | ||
const path = require('path') | ||
const Usage = require('./lib/usage') | ||
const Validation = require('./lib/validation') | ||
const { usage: Usage } = require('./build/lib/usage') | ||
const { validation: Validation } = require('./build/lib/validation') | ||
const Y18n = require('y18n') | ||
const objFilter = require('./lib/obj-filter') | ||
const { objFilter } = require('./build/lib/obj-filter') | ||
const setBlocking = require('set-blocking') | ||
const applyExtends = require('./lib/apply-extends') | ||
const { applyExtends } = require('./build/lib/apply-extends') | ||
const { globalMiddlewareFactory } = require('./lib/middleware') | ||
const YError = require('./lib/yerror') | ||
const processArgv = require('./lib/process-argv') | ||
const { YError } = require('./build/lib/yerror') | ||
const processArgv = require('./build/lib/process-argv') | ||
@@ -1271,3 +1271,3 @@ exports = module.exports = Yargs | ||
if (strictCommands) { | ||
failedStrictCommands = validation.unknownCommands(argv, aliases, positionalMap) | ||
failedStrictCommands = validation.unknownCommands(argv) | ||
} | ||
@@ -1274,0 +1274,0 @@ if (strict && !failedStrictCommands) { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Filesystem access
Supply chain riskAccesses the file system, and could potentially read sensitive data.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
205706
106
4331
24
1
+ Added@babel/runtime-corejs3@7.25.6(transitive)
+ Addedcore-js-pure@3.38.1(transitive)
+ Addeddecamelize@3.2.0(transitive)
+ Addedregenerator-runtime@0.14.1(transitive)
+ Addedxregexp@4.4.1(transitive)
Updateddecamelize@^3.2.0
Updatedyargs-parser@^18.1.2