yargs 16.0.2 → 16.1.1

package/build/index.cjs

@@ -24,24 +24,25 @@ function applyExtends(config, cwd, mergeExtends, _shim) {
             try {
                 pathToDefault = require.resolve(config.extends);
             }
-            catch (err) {
+            catch (_err) {
+                return config;
             }
         }
         else {
             pathToDefault = getPathToDefaultConfig(cwd, config.extends);
         }
-        if (!pathToDefault && !isPath)
-            return config;
-        if (!pathToDefault)
-            throw new YError(`Unable to find extended config '${config.extends}' in '${cwd}'.`);
         checkForCircularExtends(pathToDefault);
         previouslyVisitedConfigs.push(pathToDefault);
-        defaultConfig = isPath ? JSON.parse(shim.readFileSync(pathToDefault, 'utf8')) : require(config.extends);
+        defaultConfig = isPath
+            ? JSON.parse(shim.readFileSync(pathToDefault, 'utf8'))
+            : require(config.extends);
         delete config.extends;
         defaultConfig = applyExtends(defaultConfig, shim.path.dirname(pathToDefault), mergeExtends, shim);
     }
     previouslyVisitedConfigs = [];
-    return mergeExtends ? mergeDeep(defaultConfig, config) : Object.assign({}, defaultConfig, config);
+    return mergeExtends
+        ? mergeDeep(defaultConfig, config)
+        : Object.assign({}, defaultConfig, config);
 }
 function checkForCircularExtends(cfgPath) {
     if (previouslyVisitedConfigs.indexOf(cfgPath) > -1) {
@@ -78,7 +79,7 @@ function parseCommand(cmd) {
     const parsedCommand = {
         cmd: firstCommand.replace(bregex, ''),
         demanded: [],
-        optional: []
+        optional: [],
     };
     splitCommand.forEach((cmd, i) => {
         let variadic = false;
@@ -88,13 +89,13 @@ function parseCommand(cmd) {
         if (/^\[/.test(cmd)) {
             parsedCommand.optional.push({
                 cmd: cmd.replace(bregex, '').split('|'),
-                variadic
+                variadic,
             });
         }
         else {
             parsedCommand.demanded.push({
                 cmd: cmd.replace(bregex, '').split('|'),
-                variadic
+                variadic,
             });
         }
     });
@@ -106,15 +107,19 @@ function argsert(arg1, arg2, arg3) {
     function parseArgs() {
         return typeof arg1 === 'object'
             ? [{ demanded: [], optional: [] }, arg1, arg2]
-            : [parseCommand(`cmd ${arg1}`), arg2, arg3];
+            : [
+                parseCommand(`cmd ${arg1}`),
+                arg2,
+                arg3,
+            ];
     }
     try {
         let position = 0;
-        let [parsed, callerArguments, length] = parseArgs();
+        const [parsed, callerArguments, _length] = parseArgs();
         const args = [].slice.call(callerArguments);
         while (args.length && args[args.length - 1] === undefined)
             args.pop();
-        length = length || args.length;
+        const length = _length || args.length;
         if (length < parsed.demanded.length) {
             throw new YError(`Not enough arguments provided. Expected ${parsed.demanded.length} but received ${args.length}.`);
         }
@@ -122,7 +127,7 @@ function argsert(arg1, arg2, arg3) {
         if (length > totalCommands) {
             throw new YError(`Too many arguments provided. Expected max ${totalCommands} but received ${length}.`);
         }
-        parsed.demanded.forEach((demanded) => {
+        parsed.demanded.forEach(demanded => {
             const arg = args.shift();
             const observedType = guessType(arg);
             const matchingTypes = demanded.cmd.filter(type => type === observedType || type === '*');
@@ -130,7 +135,7 @@ function argsert(arg1, arg2, arg3) {
                 argumentTypeError(observedType, demanded.cmd, position);
             position += 1;
         });
-        parsed.optional.forEach((optional) => {
+        parsed.optional.forEach(optional => {
             if (args.length === 0)
                 return;
             const arg = args.shift();
@@ -159,9 +164,9 @@ function argumentTypeError(observedType, allowedTypes, position) {
 }
 
 function isPromise(maybePromise) {
-    return !!maybePromise &&
+    return (!!maybePromise &&
         !!maybePromise.then &&
-        (typeof maybePromise.then === 'function');
+        typeof maybePromise.then === 'function');
 }
 
 function assertNotStrictEqual(actual, expected, shim, message) {
@@ -176,7 +181,7 @@ function objectKeys(object) {
 
 function objFilter(original = {}, filter = () => true) {
     const obj = {};
-    objectKeys(original).forEach((key) => {
+    objectKeys(original).forEach(key => {
         if (filter(key, original[key])) {
             obj[key] = original[key];
         }
@@ -213,14 +218,16 @@ function commandMiddlewareFactory(commandMiddleware) {
 }
 function applyMiddleware(argv, yargs, middlewares, beforeValidation) {
     const beforeValidationError = new Error('middleware cannot return a promise when applyBeforeValidation is true');
-    return middlewares
-        .reduce((acc, middleware) => {
+    return middlewares.reduce((acc, middleware) => {
         if (middleware.applyBeforeValidation !== beforeValidation) {
             return acc;
         }
         if (isPromise(acc)) {
             return acc
-                .then(initialObj => Promise.all([initialObj, middleware(initialObj, yargs)]))
+                .then(initialObj => Promise.all([
+                initialObj,
+                middleware(initialObj, yargs),
+            ]))
                 .then(([initialObj, middlewareObj]) => Object.assign(initialObj, middlewareObj));
         }
         else {
@@ -261,7 +268,7 @@ var processArgv = /*#__PURE__*/Object.freeze({
 function whichModule(exported) {
     if (typeof require === 'undefined')
         return null;
-    for (var i = 0, files = Object.keys(require.cache), mod; i < files.length; i++) {
+    for (let i = 0, files = Object.keys(require.cache), mod; i < files.length; i++) {
         mod = require.cache[files[i]];
         if (mod.exports === exported)
             return mod;
@@ -284,7 +291,9 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             cmd = cmd[0];
         }
         else if (isCommandHandlerDefinition(cmd)) {
-            let command = (Array.isArray(cmd.command) || typeof cmd.command === 'string') ? cmd.command : moduleName(cmd);
+            let command = Array.isArray(cmd.command) || typeof cmd.command === 'string'
+                ? cmd.command
+                : moduleName(cmd);
             if (cmd.aliases)
                 command = [].concat(command).concat(cmd.aliases);
             self.addHandler(command, extractDesc(cmd), cmd.builder, cmd.handler, cmd.middlewares, cmd.deprecated);
@@ -297,7 +306,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         const parsedCommand = parseCommand(cmd);
         aliases = aliases.map(alias => parseCommand(alias).cmd);
         let isDefault = false;
-        const parsedAliases = [parsedCommand.cmd].concat(aliases).filter((c) => {
+        const parsedAliases = [parsedCommand.cmd].concat(aliases).filter(c => {
             if (DEFAULT_MARKER.test(c)) {
                 isDefault = true;
                 return false;
@@ -311,7 +320,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             aliases = parsedAliases.slice(1);
             cmd = cmd.replace(DEFAULT_MARKER, parsedCommand.cmd);
         }
-        aliases.forEach((alias) => {
+        aliases.forEach(alias => {
             aliasMap[alias] = parsedCommand.cmd;
         });
         if (description !== false) {
@@ -325,7 +334,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             middlewares,
             deprecated,
             demanded: parsedCommand.demanded,
-            optional: parsedCommand.optional
+            optional: parsedCommand.optional,
         };
         if (isDefault)
             defaultCommand = handlers[parsedCommand.cmd];
@@ -358,7 +367,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
     function commandFromFilename(filename) {
         return shim.path.basename(filename, shim.path.extname(filename));
     }
-    function extractDesc({ describe, description, desc }) {
+    function extractDesc({ describe, description, desc, }) {
         for (const test of [describe, description, desc]) {
             if (typeof test === 'string' || test === false)
                 return test;
@@ -386,7 +395,9 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             const builderOutput = builder(yargs.reset(parsed.aliases));
             const innerYargs = isYargsInstance(builderOutput) ? builderOutput : yargs;
             if (shouldUpdateUsage(innerYargs)) {
-                innerYargs.getUsageInstance().usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
+                innerYargs
+                    .getUsageInstance()
+                    .usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
             }
             innerArgv = innerYargs._parseArgs(null, null, true, commandIndex);
             aliases = innerYargs.parsed.aliases;
@@ -394,9 +405,11 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         else if (isCommandBuilderOptionDefinitions(builder)) {
             const innerYargs = yargs.reset(parsed.aliases);
             if (shouldUpdateUsage(innerYargs)) {
-                innerYargs.getUsageInstance().usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
+                innerYargs
+                    .getUsageInstance()
+                    .usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
             }
-            Object.keys(commandHandler.builder).forEach((key) => {
+            Object.keys(commandHandler.builder).forEach(key => {
                 innerYargs.option(key, builder[key]);
             });
             innerArgv = innerYargs._parseArgs(null, null, true, commandIndex);
@@ -405,7 +418,9 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         if (!yargs._hasOutput()) {
             positionalMap = populatePositionals(commandHandler, innerArgv, currentContext);
         }
-        const middlewares = globalMiddleware.slice(0).concat(commandHandler.middlewares);
+        const middlewares = globalMiddleware
+            .slice(0)
+            .concat(commandHandler.middlewares);
         applyMiddleware(innerArgv, yargs, middlewares, true);
         if (!yargs._hasOutput()) {
             yargs._runValidation(innerArgv, aliases, positionalMap, yargs.parsed.error, !command);
@@ -413,8 +428,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         if (commandHandler.handler && !yargs._hasOutput()) {
             yargs._setHasOutput();
             const populateDoubleDash = !!yargs.getOptions().configuration['populate--'];
-            if (!populateDoubleDash)
-                yargs._copyDoubleDash(innerArgv);
+            yargs._postProcess(innerArgv, populateDoubleDash);
             innerArgv = applyMiddleware(innerArgv, yargs, middlewares, false);
             let handlerResult;
             if (isPromise(innerArgv)) {
@@ -459,12 +473,16 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         return innerArgv;
     };
     function shouldUpdateUsage(yargs) {
-        return !yargs.getUsageInstance().getUsageDisabled() &&
-            yargs.getUsageInstance().getUsage().length === 0;
+        return (!yargs.getUsageInstance().getUsageDisabled() &&
+            yargs.getUsageInstance().getUsage().length === 0);
     }
     function usageFromParentCommandsCommandHandler(parentCommands, commandHandler) {
-        const c = DEFAULT_MARKER.test(commandHandler.original) ? commandHandler.original.replace(DEFAULT_MARKER, '').trim() : commandHandler.original;
-        const pc = parentCommands.filter((c) => { return !DEFAULT_MARKER.test(c); });
+        const c = DEFAULT_MARKER.test(commandHandler.original)
+            ? commandHandler.original.replace(DEFAULT_MARKER, '').trim()
+            : commandHandler.original;
+        const pc = parentCommands.filter(c => {
+            return !DEFAULT_MARKER.test(c);
+        });
         pc.push(c);
         return `$0 ${pc.join(' ')}`;
     }
@@ -472,7 +490,8 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         assertNotStrictEqual(defaultCommand, undefined, shim);
         if (shouldUpdateUsage(yargs)) {
             const commandString = DEFAULT_MARKER.test(defaultCommand.original)
-                ? defaultCommand.original : defaultCommand.original.replace(/^[^[\]<>]*/, '$0 ');
+                ? defaultCommand.original
+                : defaultCommand.original.replace(/^[^[\]<>]*/, '$0 ');
             yargs.getUsageInstance().usage(commandString, defaultCommand.description);
         }
         const builder = defaultCommand.builder;
@@ -480,7 +499,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             builder(yargs);
         }
         else {
-            Object.keys(builder).forEach((key) => {
+            Object.keys(builder).forEach(key => {
                 yargs.option(key, builder[key]);
             });
         }
@@ -522,8 +541,8 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         options.array = options.array.concat(parseOptions.array);
         options.config = {};
         const unparsed = [];
-        Object.keys(positionalMap).forEach((key) => {
-            positionalMap[key].map((value) => {
+        Object.keys(positionalMap).forEach(key => {
+            positionalMap[key].map(value => {
                 if (options.configuration['unknown-options-as-args'])
                     options.key[key] = true;
                 unparsed.push(`--${key}`);
@@ -533,20 +552,20 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         if (!unparsed.length)
             return;
         const config = Object.assign({}, options.configuration, {
-            'populate--': true
+            'populate--': true,
         });
         const parsed = shim.Parser.detailed(unparsed, Object.assign({}, options, {
-            configuration: config
+            configuration: config,
         }));
         if (parsed.error) {
             yargs.getUsageInstance().fail(parsed.error.message, parsed.error);
         }
         else {
             const positionalKeys = Object.keys(positionalMap);
-            Object.keys(positionalMap).forEach((key) => {
+            Object.keys(positionalMap).forEach(key => {
                 positionalKeys.push(...parsed.aliases[key]);
             });
-            Object.keys(parsed.argv).forEach((key) => {
+            Object.keys(parsed.argv).forEach(key => {
                 if (positionalKeys.indexOf(key) !== -1) {
                     if (!positionalMap[key])
                         positionalMap[key] = parsed.argv[key];
@@ -560,10 +579,10 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             array: [],
             default: {},
             alias: {},
-            demand: {}
+            demand: {},
         };
         const parsed = parseCommand(cmdString);
-        parsed.demanded.forEach((d) => {
+        parsed.demanded.forEach(d => {
             const [cmd, ...aliases] = d.cmd;
             if (d.variadic) {
                 parseOptions.array.push(cmd);
@@ -572,7 +591,7 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
             parseOptions.alias[cmd] = aliases;
             parseOptions.demand[cmd] = true;
         });
-        parsed.optional.forEach((o) => {
+        parsed.optional.forEach(o => {
             const [cmd, ...aliases] = o.cmd;
             if (o.variadic) {
                 parseOptions.array.push(cmd);
@@ -593,17 +612,13 @@ function command(yargs, usage, validation, globalMiddleware = [], shim) {
         frozens.push({
             handlers,
             aliasMap,
-            defaultCommand
+            defaultCommand,
         });
     };
     self.unfreeze = () => {
         const frozen = frozens.pop();
         assertNotStrictEqual(frozen, undefined, shim);
-        ({
-            handlers,
-            aliasMap,
-            defaultCommand
-        } = frozen);
+        ({ handlers, aliasMap, defaultCommand } = frozen);
     };
     return self;
 }
@@ -611,9 +626,9 @@ function isCommandHandlerDefinition(cmd) {
     return typeof cmd === 'object';
 }
 function isCommandBuilderDefinition(builder) {
-    return typeof builder === 'object' &&
+    return (typeof builder === 'object' &&
         !!builder.builder &&
-        typeof builder.handler === 'function';
+        typeof builder.handler === 'function');
 }
 function isCommandBuilderCallback(builder) {
     return typeof builder === 'function';
@@ -625,9 +640,11 @@ function isCommandBuilderOptionDefinitions(builder) {
 function setBlocking(blocking) {
     if (typeof process === 'undefined')
         return;
-    [process.stdout, process.stderr].forEach((_stream) => {
+    [process.stdout, process.stderr].forEach(_stream => {
         const stream = _stream;
-        if (stream._handle && stream.isTTY && typeof stream._handle.setBlocking === 'function') {
+        if (stream._handle &&
+            stream.isTTY &&
+            typeof stream._handle.setBlocking === 'function') {
             stream._handle.setBlocking(blocking);
         }
     });
@@ -716,7 +733,7 @@ function usage(yargs, y18n, shim) {
     let commands = [];
     self.command = function command(cmd, description, isDefault, aliases, deprecated = false) {
         if (isDefault) {
-            commands = commands.map((cmdArray) => {
+            commands = commands.map(cmdArray => {
                 cmdArray[2] = false;
                 return cmdArray;
             });
@@ -727,12 +744,12 @@ function usage(yargs, y18n, shim) {
     let descriptions = {};
     self.describe = function describe(keyOrKeys, desc) {
         if (Array.isArray(keyOrKeys)) {
-            keyOrKeys.forEach((k) => {
+            keyOrKeys.forEach(k => {
                 self.describe(k, desc);
             });
         }
         else if (typeof keyOrKeys === 'object') {
-            Object.keys(keyOrKeys).forEach((k) => {
+            Object.keys(keyOrKeys).forEach(k => {
                 self.describe(k, keyOrKeys[k]);
             });
         }
@@ -742,12 +759,12 @@ function usage(yargs, y18n, shim) {
     };
     self.getDescriptions = () => descriptions;
     let epilogs = [];
-    self.epilog = (msg) => {
+    self.epilog = msg => {
         epilogs.push(msg);
     };
     let wrapSet = false;
     let wrap;
-    self.wrap = (cols) => {
+    self.wrap = cols => {
         wrapSet = true;
         wrap = cols;
     };
@@ -764,7 +781,9 @@ function usage(yargs, y18n, shim) {
         if (cachedHelpMessage)
             return cachedHelpMessage;
         normalizeAliases();
-        const base$0 = yargs.customScriptName ? yargs.$0 : shim.path.basename(yargs.$0);
+        const base$0 = yargs.customScriptName
+            ? yargs.$0
+            : shim.path.basename(yargs.$0);
         const demandedOptions = yargs.getDemandedOptions();
         const demandedCommands = yargs.getDemandedCommands();
         const deprecatedOptions = yargs.getDeprecatedOptions();
@@ -784,11 +803,11 @@ function usage(yargs, y18n, shim) {
         const theWrap = getWrap();
         const ui = shim.cliui({
             width: theWrap,
-            wrap: !!theWrap
+            wrap: !!theWrap,
         });
         if (!usageDisabled) {
             if (usages.length) {
-                usages.forEach((usage) => {
+                usages.forEach(usage => {
                     ui.div(`${usage[0].replace(/\$0/g, base$0)}`);
                     if (usage[1]) {
                         ui.div({ text: `${usage[1]}`, padding: [1, 0, 0, 0] });
@@ -810,16 +829,18 @@ function usage(yargs, y18n, shim) {
         if (commands.length) {
             ui.div(__('Commands:'));
             const context = yargs.getContext();
-            const parentCommands = context.commands.length ? `${context.commands.join(' ')} ` : '';
+            const parentCommands = context.commands.length
+                ? `${context.commands.join(' ')} `
+                : '';
             if (yargs.getParserConfiguration()['sort-commands'] === true) {
                 commands = commands.sort((a, b) => a[0].localeCompare(b[0]));
             }
-            commands.forEach((command) => {
+            commands.forEach(command => {
                 const commandString = `${base$0} ${parentCommands}${command[0].replace(/^\$0 ?/, '')}`;
                 ui.span({
                     text: commandString,
                     padding: [0, 2, 0, 2],
-                    width: maxWidth(commands, theWrap, `${base$0}${parentCommands}`) + 4
+                    width: maxWidth(commands, theWrap, `${base$0}${parentCommands}`) + 4,
                 }, { text: command[1] });
                 const hints = [];
                 if (command[2])
@@ -836,7 +857,11 @@ function usage(yargs, y18n, shim) {
                     }
                 }
                 if (hints.length) {
-                    ui.div({ text: hints.join(' '), padding: [0, 0, 0, 2], align: 'right' });
+                    ui.div({
+                        text: hints.join(' '),
+                        padding: [0, 0, 0, 2],
+                        align: 'right',
+                    });
                 }
                 else {
                     ui.div();
@@ -844,9 +869,9 @@ function usage(yargs, y18n, shim) {
             });
             ui.div();
         }
-        const aliasKeys = (Object.keys(options.alias) || [])
-            .concat(Object.keys(yargs.parsed.newAliases) || []);
-        keys = keys.filter(key => !yargs.parsed.newAliases[key] && aliasKeys.every(alias => (options.alias[alias] || []).indexOf(key) === -1));
+        const aliasKeys = (Object.keys(options.alias) || []).concat(Object.keys(yargs.parsed.newAliases) || []);
+        keys = keys.filter(key => !yargs.parsed.newAliases[key] &&
+            aliasKeys.every(alias => (options.alias[alias] || []).indexOf(key) === -1));
         const defaultGroup = __('Options:');
         if (!groups[defaultGroup])
             groups[defaultGroup] = [];
@@ -855,7 +880,9 @@ function usage(yargs, y18n, shim) {
         const displayedGroups = Object.keys(groups)
             .filter(groupName => groups[groupName].length > 0)
             .map(groupName => {
-            const normalizedKeys = groups[groupName].filter(filterHiddenOptions).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++) {
@@ -869,17 +896,26 @@ function usage(yargs, y18n, shim) {
             .filter(({ normalizedKeys }) => normalizedKeys.length > 0)
             .map(({ groupName, normalizedKeys }) => {
             const switches = normalizedKeys.reduce((acc, key) => {
-                acc[key] = [key].concat(options.alias[key] || [])
+                acc[key] = [key]
+                    .concat(options.alias[key] || [])
                     .map(sw => {
                     if (groupName === self.getPositionalGroupName())
                         return sw;
                     else {
-                        return (/^[0-9]$/.test(sw)
-                            ? ~options.boolean.indexOf(key) ? '-' : '--'
-                            : sw.length > 1 ? '--' : '-') + sw;
+                        return ((/^[0-9]$/.test(sw)
+                            ? ~options.boolean.indexOf(key)
+                                ? '-'
+                                : '--'
+                            : sw.length > 1
+                                ? '--'
+                                : '-') + sw);
                     }
                 })
-                    .sort((sw1, sw2) => isLongSwitch(sw1) === isLongSwitch(sw2) ? 0 : (isLongSwitch(sw1) ? 1 : -1))
+                    .sort((sw1, sw2) => isLongSwitch(sw1) === isLongSwitch(sw2)
+                    ? 0
+                    : isLongSwitch(sw1)
+                        ? 1
+                        : -1)
                     .join(', ');
                 return acc;
             }, {});
@@ -901,7 +937,7 @@ function usage(yargs, y18n, shim) {
         }
         displayedGroups.forEach(({ groupName, normalizedKeys, switches }) => {
             ui.div(groupName);
-            normalizedKeys.forEach((key) => {
+            normalizedKeys.forEach(key => {
                 const kswitch = switches[key];
                 let desc = descriptions[key] || '';
                 let type = null;
@@ -923,13 +959,23 @@ function usage(yargs, y18n, shim) {
                     ? `[${__('deprecated: %s', deprecated)}]`
                     : `[${__('deprecated')}]`;
                 const extra = [
-                    (key in deprecatedOptions) ? deprecatedExtra(deprecatedOptions[key]) : null,
+                    key in deprecatedOptions
+                        ? deprecatedExtra(deprecatedOptions[key])
+                        : null,
                     type,
-                    (key in demandedOptions) ? `[${__('required')}]` : null,
-                    options.choices && options.choices[key] ? `[${__('choices:')} ${self.stringifiedValues(options.choices[key])}]` : null,
-                    defaultString(options.default[key], options.defaultDescription[key])
-                ].filter(Boolean).join(' ');
-                ui.span({ text: getText(kswitch), padding: [0, 2, 0, 2 + getIndentation(kswitch)], width: maxWidth(switches, theWrap) + 4 }, desc);
+                    key in demandedOptions ? `[${__('required')}]` : null,
+                    options.choices && options.choices[key]
+                        ? `[${__('choices:')} ${self.stringifiedValues(options.choices[key])}]`
+                        : null,
+                    defaultString(options.default[key], options.defaultDescription[key]),
+                ]
+                    .filter(Boolean)
+                    .join(' ');
+                ui.span({
+                    text: getText(kswitch),
+                    padding: [0, 2, 0, 2 + getIndentation(kswitch)],
+                    width: maxWidth(switches, theWrap) + 4,
+                }, desc);
                 if (extra)
                     ui.div({ text: extra, padding: [0, 0, 0, 2], align: 'right' });
                 else
@@ -939,30 +985,32 @@ function usage(yargs, y18n, shim) {
         });
         if (examples.length) {
             ui.div(__('Examples:'));
-            examples.forEach((example) => {
+            examples.forEach(example => {
                 example[0] = example[0].replace(/\$0/g, base$0);
             });
-            examples.forEach((example) => {
+            examples.forEach(example => {
                 if (example[1] === '') {
                     ui.div({
                         text: example[0],
-                        padding: [0, 2, 0, 2]
+                        padding: [0, 2, 0, 2],
                     });
                 }
                 else {
                     ui.div({
                         text: example[0],
                         padding: [0, 2, 0, 2],
-                        width: maxWidth(examples, theWrap) + 4
+                        width: maxWidth(examples, theWrap) + 4,
                     }, {
-                        text: example[1]
+                        text: example[1],
                     });
                 }
             });
             ui.div();
         }
         if (epilogs.length > 0) {
-            const e = epilogs.map(epilog => epilog.replace(/\$0/g, base$0)).join('\n');
+            const e = epilogs
+                .map(epilog => epilog.replace(/\$0/g, base$0))
+                .join('\n');
             ui.div(`${e}\n`);
         }
         return ui.toString().replace(/\s*$/, '');
@@ -972,7 +1020,7 @@ function usage(yargs, y18n, shim) {
         if (!Array.isArray(table)) {
             table = Object.values(table).map(v => [v]);
         }
-        table.forEach((v) => {
+        table.forEach(v => {
             width = Math.max(shim.stringWidth(modifier ? `${modifier} ${getText(v[0])}` : getText(v[0])) + getIndentation(v[0]), width);
         });
         if (theWrap)
@@ -982,8 +1030,8 @@ function usage(yargs, y18n, shim) {
     function normalizeAliases() {
         const demandedOptions = yargs.getDemandedOptions();
         const options = yargs.getOptions();
-        (Object.keys(options.alias) || []).forEach((key) => {
-            options.alias[key].forEach((alias) => {
+        (Object.keys(options.alias) || []).forEach(key => {
+            options.alias[key].forEach(alias => {
                 if (descriptions[alias])
                     self.describe(key, descriptions[alias]);
                 if (alias in demandedOptions)
@@ -1013,10 +1061,10 @@ function usage(yargs, y18n, shim) {
     function addUngroupedKeys(keys, aliases, groups, defaultGroup) {
         let groupedKeys = [];
         let toCheck = null;
-        Object.keys(groups).forEach((group) => {
+        Object.keys(groups).forEach(group => {
             groupedKeys = groupedKeys.concat(groups[group]);
         });
-        keys.forEach((key) => {
+        keys.forEach(key => {
             toCheck = [key].concat(aliases[key]);
             if (!toCheck.some(k => groupedKeys.indexOf(k) !== -1)) {
                 groups[defaultGroup].push(key);
@@ -1025,7 +1073,8 @@ function usage(yargs, y18n, shim) {
         return groupedKeys;
     }
     function filterHiddenOptions(key) {
-        return yargs.getOptions().hiddenOptions.indexOf(key) < 0 || yargs.parsed.argv[yargs.getOptions().showHiddenOpt];
+        return (yargs.getOptions().hiddenOptions.indexOf(key) < 0 ||
+            yargs.parsed.argv[yargs.getOptions().showHiddenOpt]);
     }
     self.showHelp = (level) => {
         const logger = yargs._getLoggerInstance();
@@ -1034,8 +1083,10 @@ function usage(yargs, y18n, shim) {
         const emit = typeof level === 'function' ? level : logger[level];
         emit(self.help());
     };
-    self.functionDescription = (fn) => {
-        const description = fn.name ? shim.Parser.decamelize(fn.name, '-') : __('generated-value');
+    self.functionDescription = fn => {
+        const description = fn.name
+            ? shim.Parser.decamelize(fn.name, '-')
+            : __('generated-value');
         return ['(', description, ')'].join('');
     };
     self.stringifiedValues = function stringifiedValues(values, separator) {
@@ -1044,7 +1095,7 @@ function usage(yargs, y18n, shim) {
         const array = [].concat(values);
         if (!values || !array.length)
             return string;
-        array.forEach((value) => {
+        array.forEach(value => {
             if (string.length)
                 string += sep;
             string += JSON.stringify(value);
@@ -1082,7 +1133,7 @@ function usage(yargs, y18n, shim) {
         }
     }
     let version = null;
-    self.version = (ver) => {
+    self.version = ver => {
         version = ver;
     };
     self.showVersion = () => {
@@ -1110,7 +1161,7 @@ function usage(yargs, y18n, shim) {
             epilogs,
             examples,
             commands,
-            descriptions
+            descriptions,
         });
     };
     self.unfreeze = function unfreeze() {
@@ -1124,7 +1175,7 @@ function usage(yargs, y18n, shim) {
             epilogs,
             examples,
             commands,
-            descriptions
+            descriptions,
         } = frozen);
     };
     return self;
@@ -1194,7 +1245,7 @@ compdef _{{app_name}}_yargs_completions {{app_name}}
 
 function completion(yargs, usage, command, shim) {
     const self = {
-        completionKey: 'get-yargs-completions'
+        completionKey: 'get-yargs-completions',
     };
     let aliases;
     self.setParsed = function setParsed(parsed) {
@@ -1212,22 +1263,30 @@ function completion(yargs, usage, command, shim) {
             if (isSyncCompletionFunction(completionFunction)) {
                 const result = completionFunction(current, argv);
                 if (isPromise(result)) {
-                    return result.then((list) => {
-                        shim.process.nextTick(() => { done(list); });
-                    }).catch((err) => {
-                        shim.process.nextTick(() => { throw err; });
+                    return result
+                        .then(list => {
+                        shim.process.nextTick(() => {
+                            done(list);
+                        });
+                    })
+                        .catch(err => {
+                        shim.process.nextTick(() => {
+                            throw err;
+                        });
                     });
                 }
                 return done(result);
             }
             else {
-                return completionFunction(current, argv, (completions) => {
+                return completionFunction(current, argv, completions => {
                     done(completions);
                 });
             }
         }
         if (completionFunction) {
-            return isPromise(argv) ? argv.then(runCompletionFunction) : runCompletionFunction(argv);
+            return isPromise(argv)
+                ? argv.then(runCompletionFunction)
+                : runCompletionFunction(argv);
         }
         const handlers = command.getCommandHandlers();
         for (let i = 0, ii = args.length; i < ii; ++i) {
@@ -1240,8 +1299,9 @@ function completion(yargs, usage, command, shim) {
                 }
             }
         }
-        if (!current.match(/^-/) && parentCommands[parentCommands.length - 1] !== current) {
-            usage.getCommands().forEach((usageCommand) => {
+        if (!current.match(/^-/) &&
+            parentCommands[parentCommands.length - 1] !== current) {
+            usage.getCommands().forEach(usageCommand => {
                 const commandName = parseCommand(usageCommand[0]).cmd;
                 if (args.indexOf(commandName) === -1) {
                     if (!zshShell) {
@@ -1257,8 +1317,9 @@ function completion(yargs, usage, command, shim) {
         if (current.match(/^-/) || (current === '' && completions.length === 0)) {
             const descs = usage.getDescriptions();
             const options = yargs.getOptions();
-            Object.keys(options.key).forEach((key) => {
-                const negable = !!options.configuration['boolean-negation'] && options.boolean.includes(key);
+            Object.keys(options.key).forEach(key => {
+                const negable = !!options.configuration['boolean-negation'] &&
+                    options.boolean.includes(key);
                 let keyAndAliases = [key].concat(aliases[key] || []);
                 if (negable)
                     keyAndAliases = keyAndAliases.concat(keyAndAliases.map(key => `no-${key}`));
@@ -1273,7 +1334,8 @@ function completion(yargs, usage, command, shim) {
                         }
                         else {
                             const desc = descs[key] || '';
-                            completions.push(dashes + `${key.replace(/:/g, '\\:')}:${desc.replace('__yargsString__:', '')}`);
+                            completions.push(dashes +
+                                `${key.replace(/:/g, '\\:')}:${desc.replace('__yargsString__:', '')}`);
                         }
                     }
                 }
@@ -1285,7 +1347,9 @@ function completion(yargs, usage, command, shim) {
         done(completions);
     };
     self.generateCompletionScript = function generateCompletionScript($0, cmd) {
-        let script = zshShell ? completionZshTemplate : completionShTemplate;
+        let script = zshShell
+            ? completionZshTemplate
+            : completionShTemplate;
         const name = shim.path.basename($0);
         if ($0.match(/\.js$/))
             $0 = `./${$0}`;
@@ -1294,7 +1358,7 @@ function completion(yargs, usage, command, shim) {
         return script.replace(/{{app_path}}/g, $0);
     };
     let completionFunction = null;
-    self.registerFunction = (fn) => {
+    self.registerFunction = fn => {
         completionFunction = fn;
     };
     return self;
@@ -1337,12 +1401,16 @@ function validation(yargs, usage, y18n, shim) {
     const self = {};
     self.nonOptionCount = function nonOptionCount(argv) {
         const demandedCommands = yargs.getDemandedCommands();
-        const _s = argv._.length - yargs.getContext().commands.length;
-        if (demandedCommands._ && (_s < demandedCommands._.min || _s > demandedCommands._.max)) {
+        const positionalCount = argv._.length + (argv['--'] ? argv['--'].length : 0);
+        const _s = positionalCount - yargs.getContext().commands.length;
+        if (demandedCommands._ &&
+            (_s < demandedCommands._.min || _s > demandedCommands._.max)) {
             if (_s < demandedCommands._.min) {
                 if (demandedCommands._.minMsg !== undefined) {
                     usage.fail(demandedCommands._.minMsg
-                        ? demandedCommands._.minMsg.replace(/\$0/g, _s.toString()).replace(/\$1/, demandedCommands._.min.toString())
+                        ? demandedCommands._.minMsg
+                            .replace(/\$0/g, _s.toString())
+                            .replace(/\$1/, demandedCommands._.min.toString())
                         : null);
                 }
                 else {
@@ -1352,7 +1420,9 @@ function validation(yargs, usage, y18n, shim) {
             else if (_s > demandedCommands._.max) {
                 if (demandedCommands._.maxMsg !== undefined) {
                     usage.fail(demandedCommands._.maxMsg
-                        ? demandedCommands._.maxMsg.replace(/\$0/g, _s.toString()).replace(/\$1/, demandedCommands._.max.toString())
+                        ? demandedCommands._.maxMsg
+                            .replace(/\$0/g, _s.toString())
+                            .replace(/\$1/, demandedCommands._.max.toString())
                         : null);
                 }
                 else {
@@ -1370,7 +1440,8 @@ function validation(yargs, usage, y18n, shim) {
         const demandedOptions = yargs.getDemandedOptions();
         let missing = null;
         for (const key of Object.keys(demandedOptions)) {
-            if (!Object.prototype.hasOwnProperty.call(argv, key) || typeof argv[key] === 'undefined') {
+            if (!Object.prototype.hasOwnProperty.call(argv, key) ||
+                typeof argv[key] === 'undefined') {
                 missing = missing || {};
                 missing[key] = demandedOptions[key];
             }
@@ -1391,7 +1462,7 @@ function validation(yargs, usage, y18n, shim) {
         const commandKeys = yargs.getCommandInstance().getCommands();
         const unknown = [];
         const currentContext = yargs.getContext();
-        Object.keys(argv).forEach((key) => {
+        Object.keys(argv).forEach(key => {
             if (specialKeys.indexOf(key) === -1 &&
                 !Object.prototype.hasOwnProperty.call(positionalMap, key) &&
                 !Object.prototype.hasOwnProperty.call(yargs._getParseContext(), key) &&
@@ -1399,8 +1470,11 @@ function validation(yargs, usage, y18n, shim) {
                 unknown.push(key);
             }
         });
-        if (checkPositionals && ((currentContext.commands.length > 0) || (commandKeys.length > 0) || isDefaultCommand)) {
-            argv._.slice(currentContext.commands.length).forEach((key) => {
+        if (checkPositionals &&
+            (currentContext.commands.length > 0 ||
+                commandKeys.length > 0 ||
+                isDefaultCommand)) {
+            argv._.slice(currentContext.commands.length).forEach(key => {
                 if (commandKeys.indexOf('' + key) === -1) {
                     unknown.push('' + key);
                 }
@@ -1414,8 +1488,8 @@ function validation(yargs, usage, y18n, shim) {
         const commandKeys = yargs.getCommandInstance().getCommands();
         const unknown = [];
         const currentContext = yargs.getContext();
-        if ((currentContext.commands.length > 0) || (commandKeys.length > 0)) {
-            argv._.slice(currentContext.commands.length).forEach((key) => {
+        if (currentContext.commands.length > 0 || commandKeys.length > 0) {
+            argv._.slice(currentContext.commands.length).forEach(key => {
                 if (commandKeys.indexOf('' + key) === -1) {
                     unknown.push('' + key);
                 }
@@ -1435,7 +1509,8 @@ function validation(yargs, usage, y18n, shim) {
         }
         const newAliases = yargs.parsed.newAliases;
         for (const a of [key, ...aliases[key]]) {
-            if (!Object.prototype.hasOwnProperty.call(newAliases, a) || !newAliases[key]) {
+            if (!Object.prototype.hasOwnProperty.call(newAliases, a) ||
+                !newAliases[key]) {
                 return true;
             }
         }
@@ -1446,10 +1521,10 @@ function validation(yargs, usage, y18n, shim) {
         const invalid = {};
         if (!Object.keys(options.choices).length)
             return;
-        Object.keys(argv).forEach((key) => {
+        Object.keys(argv).forEach(key => {
             if (specialKeys.indexOf(key) === -1 &&
                 Object.prototype.hasOwnProperty.call(options.choices, key)) {
-                [].concat(argv[key]).forEach((value) => {
+                [].concat(argv[key]).forEach(value => {
                     if (options.choices[key].indexOf(value) === -1 &&
                         value !== undefined) {
                         invalid[key] = (invalid[key] || []).concat(value);
@@ -1461,7 +1536,7 @@ function validation(yargs, usage, y18n, shim) {
         if (!invalidKeys.length)
             return;
         let msg = __('Invalid values:');
-        invalidKeys.forEach((key) => {
+        invalidKeys.forEach(key => {
             msg += `\n  ${__('Argument: %s, Given: %s, Choices: %s', key, usage.stringifiedValues(invalid[key]), usage.stringifiedValues(options.choices[key]))}`;
         });
         usage.fail(msg);
@@ -1470,7 +1545,7 @@ function validation(yargs, usage, y18n, shim) {
     self.check = function check(f, global) {
         checks.push({
             func: f,
-            global
+            global,
         });
     };
     self.customChecks = function customChecks(argv, aliases) {
@@ -1496,7 +1571,7 @@ function validation(yargs, usage, y18n, shim) {
     self.implies = function implies(key, value) {
         argsert('<string|object> [array|number|string]', [key, value], arguments.length);
         if (typeof key === 'object') {
-            Object.keys(key).forEach((k) => {
+            Object.keys(key).forEach(k => {
                 self.implies(k, key[k]);
             });
         }
@@ -1506,7 +1581,7 @@ function validation(yargs, usage, y18n, shim) {
                 implied[key] = [];
             }
             if (Array.isArray(value)) {
-                value.forEach((i) => self.implies(key, i));
+                value.forEach(i => self.implies(key, i));
             }
             else {
                 assertNotStrictEqual(value, undefined, shim);
@@ -1534,9 +1609,9 @@ function validation(yargs, usage, y18n, shim) {
     }
     self.implications = function implications(argv) {
         const implyFail = [];
-        Object.keys(implied).forEach((key) => {
+        Object.keys(implied).forEach(key => {
             const origKey = key;
-            (implied[key] || []).forEach((value) => {
+            (implied[key] || []).forEach(value => {
                 let key = origKey;
                 const origValue = value;
                 key = keyExists(argv, key);
@@ -1548,8 +1623,8 @@ function validation(yargs, usage, y18n, shim) {
         });
         if (implyFail.length) {
             let msg = `${__('Implications failed:')}\n`;
-            implyFail.forEach((value) => {
-                msg += (value);
+            implyFail.forEach(value => {
+                msg += value;
             });
             usage.fail(msg);
         }
@@ -1558,7 +1633,7 @@ function validation(yargs, usage, y18n, shim) {
     self.conflicts = function conflicts(key, value) {
         argsert('<string|object> [array|string]', [key, value], arguments.length);
         if (typeof key === 'object') {
-            Object.keys(key).forEach((k) => {
+            Object.keys(key).forEach(k => {
                 self.conflicts(k, key[k]);
             });
         }
@@ -1568,7 +1643,7 @@ function validation(yargs, usage, y18n, shim) {
                 conflicting[key] = [];
             }
             if (Array.isArray(value)) {
-                value.forEach((i) => self.conflicts(key, i));
+                value.forEach(i => self.conflicts(key, i));
             }
             else {
                 conflicting[key].push(value);
@@ -1577,9 +1652,9 @@ function validation(yargs, usage, y18n, shim) {
     };
     self.getConflicting = () => conflicting;
     self.conflicting = function conflictingFn(argv) {
-        Object.keys(argv).forEach((key) => {
+        Object.keys(argv).forEach(key => {
             if (conflicting[key]) {
-                conflicting[key].forEach((value) => {
+                conflicting[key].forEach(value => {
                     if (value && argv[key] !== undefined && argv[value] !== undefined) {
                         usage.fail(__('Arguments %s and %s are mutually exclusive', key, value));
                     }
@@ -1613,17 +1688,13 @@ function validation(yargs, usage, y18n, shim) {
         frozens.push({
             implied,
             checks,
-            conflicting
+            conflicting,
         });
     };
     self.unfreeze = function unfreeze() {
         const frozen = frozens.pop();
         assertNotStrictEqual(frozen, undefined, shim);
-        ({
-            implied,
-            checks,
-            conflicting
-        } = frozen);
+        ({ implied, checks, conflicting } = frozen);
     };
     return self;
 }
@@ -1663,23 +1734,52 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         const b = rebase(cwd, x);
         return x.match(/^(\/|([a-zA-Z]:)?\\)/) && b.length < x.length ? b : x;
     })
-        .join(' ').trim();
+        .join(' ')
+        .trim();
     if (shim$1.getEnv('_') && shim$1.getProcessArgvBin() === shim$1.getEnv('_')) {
-        self.$0 = shim$1.getEnv('_').replace(`${shim$1.path.dirname(shim$1.process.execPath())}/`, '');
+        self.$0 = shim$1
+            .getEnv('_')
+            .replace(`${shim$1.path.dirname(shim$1.process.execPath())}/`, '');
     }
     const context = { resets: -1, commands: [], fullCommands: [], files: [] };
     self.getContext = () => context;
+    let hasOutput = false;
+    let exitError = null;
+    self.exit = (code, err) => {
+        hasOutput = true;
+        exitError = err;
+        if (exitProcess)
+            shim$1.process.exit(code);
+    };
+    let completionCommand = null;
+    self.completion = function (cmd, desc, fn) {
+        argsert('[string] [string|boolean|function] [function]', [cmd, desc, fn], arguments.length);
+        if (typeof desc === 'function') {
+            fn = desc;
+            desc = undefined;
+        }
+        completionCommand = cmd || completionCommand || 'completion';
+        if (!desc && desc !== false) {
+            desc = 'generate completion script';
+        }
+        self.command(completionCommand, desc);
+        if (fn)
+            completion$1.registerFunction(fn);
+        return self;
+    };
     let options;
     self.resetOptions = self.reset = function resetOptions(aliases = {}) {
         context.resets++;
         options = options || {};
         const tmpOptions = {};
         tmpOptions.local = options.local ? options.local : [];
-        tmpOptions.configObjects = options.configObjects ? options.configObjects : [];
+        tmpOptions.configObjects = options.configObjects
+            ? options.configObjects
+            : [];
         const localLookup = {};
-        tmpOptions.local.forEach((l) => {
+        tmpOptions.local.forEach(l => {
             localLookup[l] = true;
-            (aliases[l] || []).forEach((a) => {
+            (aliases[l] || []).forEach(a => {
                 localLookup[a] = true;
             });
         });
@@ -1692,14 +1792,27 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         }, {}));
         groups = {};
         const arrayOptions = [
-            'array', 'boolean', 'string', 'skipValidation',
-            'count', 'normalize', 'number',
-            'hiddenOptions'
+            'array',
+            'boolean',
+            'string',
+            'skipValidation',
+            'count',
+            'normalize',
+            'number',
+            'hiddenOptions',
         ];
         const objectOptions = [
-            'narg', 'key', 'alias', 'default', 'defaultDescription',
-            'config', 'choices', 'demandedOptions', 'demandedCommands', 'coerce',
-            'deprecatedOptions'
+            'narg',
+            'key',
+            'alias',
+            'default',
+            'defaultDescription',
+            'config',
+            'choices',
+            'demandedOptions',
+            'demandedCommands',
+            'coerce',
+            'deprecatedOptions',
         ];
         arrayOptions.forEach(k => {
             tmpOptions[k] = (options[k] || []).filter((k) => !localLookup[k]);
@@ -1710,8 +1823,12 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         tmpOptions.envPrefix = options.envPrefix;
         options = tmpOptions;
         usage$1 = usage$1 ? usage$1.reset(localLookup) : usage(self, y18n, shim$1);
-        validation$1 = validation$1 ? validation$1.reset(localLookup) : validation(self, usage$1, y18n, shim$1);
-        command$1 = command$1 ? command$1.reset() : command(self, usage$1, validation$1, globalMiddleware, shim$1);
+        validation$1 = validation$1
+            ? validation$1.reset(localLookup)
+            : validation(self, usage$1, y18n, shim$1);
+        command$1 = command$1
+            ? command$1.reset()
+            : command(self, usage$1, validation$1, globalMiddleware, shim$1);
         if (!completion$1)
             completion$1 = completion(self, usage$1, command$1, shim$1);
         completionCommand = null;
@@ -1739,7 +1856,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             parsed: self.parsed,
             parseFn,
             parseContext,
-            handlerFinishCommand
+            handlerFinishCommand,
         });
         usage$1.freeze();
         validation$1.freeze();
@@ -1764,7 +1881,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             completionCommand,
             parseFn,
             parseContext,
-            handlerFinishCommand
+            handlerFinishCommand,
         } = frozen);
         options.configObjects = configObjects;
         usage$1.unfreeze();
@@ -1818,7 +1935,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     };
     function populateParserHintArray(type, keys) {
         keys = [].concat(keys);
-        keys.forEach((key) => {
+        keys.forEach(key => {
             key = sanitizeKey(key);
             options[type].push(key);
         });
@@ -1886,7 +2003,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     }
     function populateParserHintDictionary(builder, type, key, value, singleKeyHandler) {
         if (Array.isArray(key)) {
-            key.forEach((k) => {
+            key.forEach(k => {
                 builder(k, value);
             });
         }
@@ -1921,7 +2038,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     }
     self.config = function config(key = 'config', msg, parseFn) {
         argsert('[object|string] [string|function] [function]', [key, msg, parseFn], arguments.length);
-        if ((typeof key === 'object') && !Array.isArray(key)) {
+        if (typeof key === 'object' && !Array.isArray(key)) {
             key = applyExtends(key, cwd, self.getParserConfiguration()['deep-merge-config'] || false, shim$1);
             options.configObjects = (options.configObjects || []).concat(key);
             return self;
@@ -1931,7 +2048,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             msg = undefined;
         }
         self.describe(key, msg || usage$1.deferY18nLookup('Path to JSON config file'));
-        (Array.isArray(key) ? key : [key]).forEach((k) => {
+        (Array.isArray(key) ? key : [key]).forEach(k => {
             options.config[k] = parseFn || true;
         });
         return self;
@@ -1939,7 +2056,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     self.example = function (cmd, description) {
         argsert('<string|array> [string]', [cmd, description], arguments.length);
         if (Array.isArray(cmd)) {
-            cmd.forEach((exampleParams) => self.example(...exampleParams));
+            cmd.forEach(exampleParams => self.example(...exampleParams));
         }
         else {
             usage$1.example(cmd, description);
@@ -1959,7 +2076,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     };
     self.demand = self.required = self.require = function demand(keys, max, msg) {
         if (Array.isArray(max)) {
-            max.forEach((key) => {
+            max.forEach(key => {
                 assertNotStrictEqual(msg, true, shim$1);
                 demandOption(key, msg);
             });
@@ -1974,7 +2091,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             self.demandCommand(keys, max, msg, msg);
         }
         else if (Array.isArray(keys)) {
-            keys.forEach((key) => {
+            keys.forEach(key => {
                 assertNotStrictEqual(msg, true, shim$1);
                 demandOption(key, msg);
             });
@@ -2000,7 +2117,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             min,
             max,
             minMsg,
-            maxMsg
+            maxMsg,
         };
         return self;
     };
@@ -2075,7 +2192,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             options.local = options.local.filter(l => globals.indexOf(l) === -1);
         }
         else {
-            globals.forEach((g) => {
+            globals.forEach(g => {
                 if (options.local.indexOf(g) === -1)
                     options.local.push(g);
             });
@@ -2114,7 +2231,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             assertNotStrictEqual(pkgJsonPath, undefined, shim$1);
             obj = JSON.parse(shim$1.readFileSync(pkgJsonPath, 'utf8'));
         }
-        catch (noop) { }
+        catch (_noop) { }
         pkgs[npath] = obj || {};
         return pkgs[npath];
     }
@@ -2154,7 +2271,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     self.option = self.options = function option(key, opt) {
         argsert('<string|object> [object]', [key, opt], arguments.length);
         if (typeof key === 'object') {
-            Object.keys(key).forEach((k) => {
+            Object.keys(key).forEach(k => {
                 self.options(k, key[k]);
             });
         }
@@ -2252,9 +2369,20 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         if (context.resets === 0) {
             throw new YError(".positional() can only be called in a command's builder function");
         }
-        const supportedOpts = ['default', 'defaultDescription', 'implies', 'normalize',
-            'choices', 'conflicts', 'coerce', 'type', 'describe',
-            'desc', 'description', 'alias'];
+        const supportedOpts = [
+            'default',
+            'defaultDescription',
+            'implies',
+            'normalize',
+            'choices',
+            'conflicts',
+            'coerce',
+            'type',
+            'describe',
+            'desc',
+            'description',
+            'alias',
+        ];
         opts = objFilter(opts, (k, v) => {
             let accept = supportedOpts.indexOf(k) !== -1;
             if (k === 'type' && ['string', 'number', 'boolean'].indexOf(v) === -1)
@@ -2262,13 +2390,15 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             return accept;
         });
         const fullCommand = context.fullCommands[context.fullCommands.length - 1];
-        const parseOptions = fullCommand ? command$1.cmdToParseOptions(fullCommand) : {
-            array: [],
-            alias: {},
-            default: {},
-            demand: {}
-        };
-        objectKeys(parseOptions).forEach((pk) => {
+        const parseOptions = fullCommand
+            ? command$1.cmdToParseOptions(fullCommand)
+            : {
+                array: [],
+                alias: {},
+                default: {},
+                demand: {},
+            };
+        objectKeys(parseOptions).forEach(pk => {
             const parseOption = parseOptions[pk];
             if (Array.isArray(parseOption)) {
                 if (parseOption.indexOf(key) !== -1)
@@ -2289,7 +2419,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             delete preservedGroups[groupName];
         }
         const seen = {};
-        groups[groupName] = (existing || []).concat(opts).filter((key) => {
+        groups[groupName] = (existing || []).concat(opts).filter(key => {
             if (seen[key])
                 return false;
             return (seen[key] = true);
@@ -2425,29 +2555,13 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         usage$1.showHelpOnFail(enabled, message);
         return self;
     };
-    var exitProcess = true;
+    let exitProcess = true;
     self.exitProcess = function (enabled = true) {
         argsert('[boolean]', [enabled], arguments.length);
         exitProcess = enabled;
         return self;
     };
     self.getExitProcess = () => exitProcess;
-    var completionCommand = null;
-    self.completion = function (cmd, desc, fn) {
-        argsert('[string] [string|boolean|function] [function]', [cmd, desc, fn], arguments.length);
-        if (typeof desc === 'function') {
-            fn = desc;
-            desc = undefined;
-        }
-        completionCommand = cmd || completionCommand || 'completion';
-        if (!desc && desc !== false) {
-            desc = 'generate completion script';
-        }
-        self.command(completionCommand, desc);
-        if (fn)
-            completion$1.registerFunction(fn);
-        return self;
-    };
     self.showCompletionScript = function ($0, cmd) {
         argsert('[string] [string]', [$0, cmd], arguments.length);
         $0 = $0 || self.$0;
@@ -2481,14 +2595,6 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         return self;
     };
     self.getDetectLocale = () => detectLocale;
-    var hasOutput = false;
-    var exitError = null;
-    self.exit = (code, err) => {
-        hasOutput = true;
-        exitError = err;
-        if (exitProcess)
-            shim$1.process.exit(code);
-    };
     const _logger = {
         log(...args) {
             if (!self._hasParseCallback())
@@ -2505,7 +2611,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             if (output.length)
                 output += '\n';
             output += args.join(' ');
-        }
+        },
     };
     self._getLoggerInstance = () => _logger;
     self._hasOutput = () => hasOutput;
@@ -2527,7 +2633,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     };
     Object.defineProperty(self, 'argv', {
         get: () => self._parseArgs(processArgs),
-        enumerable: true
+        enumerable: true,
     });
     self._parseArgs = function parseArgs(args, shortCircuit, _calledFromCommand, commandIndex) {
         let skipValidation = !!_calledFromCommand;
@@ -2536,10 +2642,10 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         options.configuration = self.getParserConfiguration();
         const populateDoubleDash = !!options.configuration['populate--'];
         const config = Object.assign({}, options.configuration, {
-            'populate--': true
+            'populate--': true,
         });
         const parsed = shim$1.Parser.detailed(args, Object.assign({}, options, {
-            configuration: config
+            configuration: Object.assign({ 'parse-positional-numbers': false }, config),
         }));
         let argv = parsed.argv;
         if (parseContext)
@@ -2550,7 +2656,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         try {
             guessLocale();
             if (shortCircuit) {
-                return (populateDoubleDash || _calledFromCommand) ? argv : self._copyDoubleDash(argv);
+                return self._postProcess(argv, populateDoubleDash, _calledFromCommand);
             }
             if (helpOpt) {
                 const helpCmds = [helpOpt]
@@ -2564,15 +2670,16 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             const handlerKeys = command$1.getCommands();
             const requestCompletions = completion$1.completionKey in argv;
             const skipRecommendation = argv[helpOpt] || requestCompletions;
-            const skipDefaultCommand = skipRecommendation && (handlerKeys.length > 1 || handlerKeys[0] !== '$0');
+            const skipDefaultCommand = skipRecommendation &&
+                (handlerKeys.length > 1 || handlerKeys[0] !== '$0');
             if (argv._.length) {
                 if (handlerKeys.length) {
                     let firstUnknownCommand;
-                    for (let i = (commandIndex || 0), cmd; argv._[i] !== undefined; i++) {
+                    for (let i = commandIndex || 0, cmd; argv._[i] !== undefined; i++) {
                         cmd = String(argv._[i]);
                         if (~handlerKeys.indexOf(cmd) && cmd !== completionCommand) {
                             const innerArgv = command$1.runCommand(cmd, self, parsed, i + 1);
-                            return populateDoubleDash ? innerArgv : self._copyDoubleDash(innerArgv);
+                            return self._postProcess(innerArgv, populateDoubleDash);
                         }
                         else if (!firstUnknownCommand && cmd !== completionCommand) {
                             firstUnknownCommand = cmd;
@@ -2581,13 +2688,15 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
                     }
                     if (command$1.hasDefaultCommand() && !skipDefaultCommand) {
                         const innerArgv = command$1.runCommand(null, self, parsed);
-                        return populateDoubleDash ? innerArgv : self._copyDoubleDash(innerArgv);
+                        return self._postProcess(innerArgv, populateDoubleDash);
                     }
                     if (recommendCommands && firstUnknownCommand && !skipRecommendation) {
                         validation$1.recommendCommands(firstUnknownCommand, handlerKeys);
                     }
                 }
-                if (completionCommand && ~argv._.indexOf(completionCommand) && !requestCompletions) {
+                if (completionCommand &&
+                    ~argv._.indexOf(completionCommand) &&
+                    !requestCompletions) {
                     if (exitProcess)
                         setBlocking(true);
                     self.showCompletionScript();
@@ -2596,24 +2705,23 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             }
             else if (command$1.hasDefaultCommand() && !skipDefaultCommand) {
                 const innerArgv = command$1.runCommand(null, self, parsed);
-                return populateDoubleDash ? innerArgv : self._copyDoubleDash(innerArgv);
+                return self._postProcess(innerArgv, populateDoubleDash);
             }
             if (requestCompletions) {
                 if (exitProcess)
                     setBlocking(true);
                 args = [].concat(args);
                 const completionArgs = args.slice(args.indexOf(`--${completion$1.completionKey}`) + 1);
-                completion$1.getCompletion(completionArgs, (completions) => {
-                    ;
-                    (completions || []).forEach((completion) => {
+                completion$1.getCompletion(completionArgs, completions => {
+                    (completions || []).forEach(completion => {
                         _logger.log(completion);
                     });
                     self.exit(0);
                 });
-                return (populateDoubleDash || _calledFromCommand) ? argv : self._copyDoubleDash(argv);
+                return self._postProcess(argv, !populateDoubleDash, _calledFromCommand);
             }
             if (!hasOutput) {
-                Object.keys(argv).forEach((key) => {
+                Object.keys(argv).forEach(key => {
                     if (key === helpOpt && argv[key]) {
                         if (exitProcess)
                             setBlocking(true);
@@ -2647,10 +2755,25 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
             else
                 throw err;
         }
-        return (populateDoubleDash || _calledFromCommand) ? argv : self._copyDoubleDash(argv);
+        return self._postProcess(argv, populateDoubleDash, _calledFromCommand);
+    };
+    self._postProcess = function (argv, populateDoubleDash, calledFromCommand = false) {
+        if (isPromise(argv))
+            return argv;
+        if (calledFromCommand)
+            return argv;
+        if (!populateDoubleDash) {
+            argv = self._copyDoubleDash(argv);
+        }
+        const parsePositionalNumbers = self.getParserConfiguration()['parse-positional-numbers'] ||
+            self.getParserConfiguration()['parse-positional-numbers'] === undefined;
+        if (parsePositionalNumbers) {
+            argv = self._parsePositionalNumbers(argv);
+        }
+        return argv;
     };
     self._copyDoubleDash = function (argv) {
-        if (isPromise(argv) || !argv._ || !argv['--'])
+        if (!argv._ || !argv['--'])
             return argv;
         argv._.push.apply(argv._, argv['--']);
         try {
@@ -2659,6 +2782,16 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
         catch (_err) { }
         return argv;
     };
+    self._parsePositionalNumbers = function (argv) {
+        const args = argv['--'] ? argv['--'] : argv._;
+        for (let i = 0, arg; (arg = args[i]) !== undefined; i++) {
+            if (shim$1.Parser.looksLikeNumber(arg) &&
+                Number.isSafeInteger(Math.floor(parseFloat(`${arg}`)))) {
+                args[i] = Number(arg);
+            }
+        }
+        return argv;
+    };
     self._runValidation = function runValidation(argv, aliases, positionalMap, parseErrors, isDefaultCommand = false) {
         if (parseErrors)
             throw new YError(parseErrors.message);
@@ -2682,7 +2815,11 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
     function guessLocale() {
         if (!detectLocale)
             return;
-        const locale = shim$1.getEnv('LC_ALL') || shim$1.getEnv('LC_MESSAGES') || shim$1.getEnv('LANG') || shim$1.getEnv('LANGUAGE') || 'en_US';
+        const locale = shim$1.getEnv('LC_ALL') ||
+            shim$1.getEnv('LC_MESSAGES') ||
+            shim$1.getEnv('LANG') ||
+            shim$1.getEnv('LANGUAGE') ||
+            'en_US';
         self.locale(locale.replace(/[.:].*/, ''));
     }
     self.help();
@@ -2691,7 +2828,7 @@ function Yargs(processArgs = [], cwd = shim$1.process.cwd(), parentRequire) {
 }
 const rebase = (base, dir) => shim$1.path.relative(base, dir);
 function isYargsInstance(y) {
-    return !!y && (typeof y._parseArgs === 'function');
+    return !!y && typeof y._parseArgs === 'function';
 }
 
 var _a, _b;
@@ -2703,7 +2840,7 @@ const Parser = require('yargs-parser');
 var cjsPlatformShim = {
     assert: {
         notStrictEqual: assert.notStrictEqual,
-        strictEqual: assert.strictEqual
+        strictEqual: assert.strictEqual,
     },
     cliui: require('cliui'),
     findUp: require('escalade/sync'),
@@ -2724,7 +2861,9 @@ var cjsPlatformShim = {
             process.exit(code);
         },
         nextTick: process.nextTick,
-        stdColumns: typeof process.stdout.columns !== 'undefined' ? process.stdout.columns : null
+        stdColumns: typeof process.stdout.columns !== 'undefined'
+            ? process.stdout.columns
+            : null,
     },
     readFileSync,
     require: require,
@@ -2732,12 +2871,13 @@ var cjsPlatformShim = {
     stringWidth: require('string-width'),
     y18n: y18n({
         directory: resolve(__dirname, '../locales'),
-        updateFiles: false
-    })
+        updateFiles: false,
+    }),
 };
 
-const minNodeVersion = (process && process.env && process.env.YARGS_MIN_NODE_VERSION)
-    ? Number(process.env.YARGS_MIN_NODE_VERSION) : 10;
+const minNodeVersion = process && process.env && process.env.YARGS_MIN_NODE_VERSION
+    ? Number(process.env.YARGS_MIN_NODE_VERSION)
+    : 10;
 if (process && process.version) {
     const major = Number(process.version.match(/v([^.]+)/)[1]);
     if (major < minNodeVersion) {
@@ -2758,7 +2898,7 @@ var cjs = {
     Parser: Parser$1,
     processArgv,
     rebase,
-    YError
+    YError,
 };
 
 module.exports = cjs;