yargs 16.0.2 → 16.1.1

package/build/lib/usage.js

@@ -1,4 +1,4 @@
-import { assertNotStrictEqual } from './typings/common-types.js';
+import { assertNotStrictEqual, } from './typings/common-types.js';
 import { objFilter } from './utils/obj-filter.js';
 import { YError } from './yerror.js';
 import setBlocking from './utils/set-blocking.js';
@@ -85,7 +85,7 @@ export 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;
             });
@@ -96,12 +96,12 @@ export 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]);
             });
         }
@@ -111,12 +111,12 @@ export 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;
     };
@@ -133,7 +133,9 @@ export 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();
@@ -153,11 +155,11 @@ export 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] });
@@ -179,16 +181,18 @@ export 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])
@@ -205,7 +209,11 @@ export 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();
@@ -213,9 +221,9 @@ export 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] = [];
@@ -224,7 +232,9 @@ export 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++) {
@@ -238,17 +248,26 @@ export 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;
             }, {});
@@ -270,7 +289,7 @@ export 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;
@@ -292,13 +311,23 @@ export 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
@@ -308,30 +337,32 @@ export 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*$/, '');
@@ -341,7 +372,7 @@ export 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)
@@ -351,8 +382,8 @@ export 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)
@@ -382,10 +413,10 @@ export 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);
@@ -394,7 +425,8 @@ export 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();
@@ -403,8 +435,10 @@ export 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) {
@@ -413,7 +447,7 @@ export 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);
@@ -451,7 +485,7 @@ export function usage(yargs, y18n, shim) {
         }
     }
     let version = null;
-    self.version = (ver) => {
+    self.version = ver => {
         version = ver;
     };
     self.showVersion = () => {
@@ -479,7 +513,7 @@ export function usage(yargs, y18n, shim) {
             epilogs,
             examples,
             commands,
-            descriptions
+            descriptions,
         });
     };
     self.unfreeze = function unfreeze() {
@@ -493,7 +527,7 @@ export function usage(yargs, y18n, shim) {
             epilogs,
             examples,
             commands,
-            descriptions
+            descriptions,
         } = frozen);
     };
     return self;

package/build/lib/utils/apply-extends.js

@@ -13,24 +13,25 @@ export 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) {

package/build/lib/utils/is-promise.js

@@ -1,5 +1,5 @@
 export function isPromise(maybePromise) {
-    return !!maybePromise &&
+    return (!!maybePromise &&
         !!maybePromise.then &&
-        (typeof maybePromise.then === 'function');
+        typeof maybePromise.then === 'function');
 }

package/build/lib/utils/obj-filter.js

@@ -1,7 +1,7 @@
 import { objectKeys } from '../typings/common-types.js';
 export function objFilter(original = {}, filter = () => true) {
     const obj = {};
-    objectKeys(original).forEach((key) => {
+    objectKeys(original).forEach(key => {
         if (filter(key, original[key])) {
             obj[key] = original[key];
         }

package/build/lib/utils/set-blocking.js

@@ -1,9 +1,11 @@
 export default 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);
         }
     });

package/build/lib/utils/which-module.js

@@ -1,7 +1,7 @@
 export default 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;

package/build/lib/validation.js

@@ -1,5 +1,5 @@
 import { argsert } from './argsert.js';
-import { assertNotStrictEqual } from './typings/common-types.js';
+import { assertNotStrictEqual, } from './typings/common-types.js';
 import { levenshtein as distance } from './utils/levenshtein.js';
 import { objFilter } from './utils/obj-filter.js';
 const specialKeys = ['$0', '--', '_'];
@@ -9,12 +9,16 @@ export 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 {
@@ -24,7 +28,9 @@ export 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 {
@@ -42,7 +48,8 @@ export 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];
             }
@@ -63,7 +70,7 @@ export 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) &&
@@ -71,8 +78,11 @@ export 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);
                 }
@@ -86,8 +96,8 @@ export 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);
                 }
@@ -107,7 +117,8 @@ export 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;
             }
         }
@@ -118,10 +129,10 @@ export 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);
@@ -133,7 +144,7 @@ export 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);
@@ -142,7 +153,7 @@ export function validation(yargs, usage, y18n, shim) {
     self.check = function check(f, global) {
         checks.push({
             func: f,
-            global
+            global,
         });
     };
     self.customChecks = function customChecks(argv, aliases) {
@@ -168,7 +179,7 @@ export 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]);
             });
         }
@@ -178,7 +189,7 @@ export 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);
@@ -206,9 +217,9 @@ export 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);
@@ -220,8 +231,8 @@ export 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);
         }
@@ -230,7 +241,7 @@ export 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]);
             });
         }
@@ -240,7 +251,7 @@ export 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);
@@ -249,9 +260,9 @@ export 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));
                     }
@@ -285,17 +296,13 @@ export 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;
 }