projen 0.71.37 → 0.71.39

package/node_modules/yargs/build/lib/command.js

@@ -3,14 +3,41 @@ import { isPromise } from './utils/is-promise.js';
 import { applyMiddleware, commandMiddlewareFactory, } from './middleware.js';
 import { parseCommand } from './parse-command.js';
 import { isYargsInstance, } from './yargs-factory.js';
+import { maybeAsyncResult } from './utils/maybe-async-result.js';
 import whichModule from './utils/which-module.js';
 const DEFAULT_MARKER = /(^\*)|(^\$0)/;
-export function command(yargs, usage, validation, globalMiddleware = [], shim) {
-    const self = {};
-    let handlers = {};
-    let aliasMap = {};
-    let defaultCommand;
-    self.addHandler = function addHandler(cmd, description, builder, handler, commandMiddleware, deprecated) {
+export class CommandInstance {
+    constructor(usage, validation, globalMiddleware, shim) {
+        this.requireCache = new Set();
+        this.handlers = {};
+        this.aliasMap = {};
+        this.frozens = [];
+        this.shim = shim;
+        this.usage = usage;
+        this.globalMiddleware = globalMiddleware;
+        this.validation = validation;
+    }
+    addDirectory(dir, req, callerFile, opts) {
+        opts = opts || {};
+        if (typeof opts.recurse !== 'boolean')
+            opts.recurse = false;
+        if (!Array.isArray(opts.extensions))
+            opts.extensions = ['js'];
+        const parentVisit = typeof opts.visit === 'function' ? opts.visit : (o) => o;
+        opts.visit = (obj, joined, filename) => {
+            const visited = parentVisit(obj, joined, filename);
+            if (visited) {
+                if (this.requireCache.has(joined))
+                    return visited;
+                else
+                    this.requireCache.add(joined);
+                this.addHandler(visited);
+            }
+            return visited;
+        };
+        this.shim.requireDirectory({ require: req, filename: callerFile }, dir, opts);
+    }
+    addHandler(cmd, description, builder, handler, commandMiddleware, deprecated) {
         let aliases = [];
         const middlewares = commandMiddlewareFactory(commandMiddleware);
         handler = handler || (() => { });
@@ -20,21 +47,21 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
             }
             else {
                 for (const command of cmd) {
-                    self.addHandler(command);
+                    this.addHandler(command);
                 }
             }
         }
         else if (isCommandHandlerDefinition(cmd)) {
             let command = Array.isArray(cmd.command) || typeof cmd.command === 'string'
                 ? cmd.command
-                : moduleName(cmd);
+                : this.moduleName(cmd);
             if (cmd.aliases)
                 command = [].concat(command).concat(cmd.aliases);
-            self.addHandler(command, extractDesc(cmd), cmd.builder, cmd.handler, cmd.middlewares, cmd.deprecated);
+            this.addHandler(command, this.extractDesc(cmd), cmd.builder, cmd.handler, cmd.middlewares, cmd.deprecated);
             return;
         }
         else if (isCommandBuilderDefinition(builder)) {
-            self.addHandler([cmd].concat(aliases), description, builder.builder, builder.handler, builder.middlewares, builder.deprecated);
+            this.addHandler([cmd].concat(aliases), description, builder.builder, builder.handler, builder.middlewares, builder.deprecated);
             return;
         }
         if (typeof cmd === 'string') {
@@ -56,12 +83,12 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
                 cmd = cmd.replace(DEFAULT_MARKER, parsedCommand.cmd);
             }
             aliases.forEach(alias => {
-                aliasMap[alias] = parsedCommand.cmd;
+                this.aliasMap[alias] = parsedCommand.cmd;
             });
             if (description !== false) {
-                usage.command(cmd, description, isDefault, aliases, deprecated);
+                this.usage.command(cmd, description, isDefault, aliases, deprecated);
             }
-            handlers[parsedCommand.cmd] = {
+            this.handlers[parsedCommand.cmd] = {
                 original: cmd,
                 description,
                 handler,
@@ -72,193 +99,170 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
                 optional: parsedCommand.optional,
             };
             if (isDefault)
-                defaultCommand = handlers[parsedCommand.cmd];
+                this.defaultCommand = this.handlers[parsedCommand.cmd];
         }
-    };
-    self.addDirectory = function addDirectory(dir, context, req, callerFile, opts) {
-        opts = opts || {};
-        if (typeof opts.recurse !== 'boolean')
-            opts.recurse = false;
-        if (!Array.isArray(opts.extensions))
-            opts.extensions = ['js'];
-        const parentVisit = typeof opts.visit === 'function' ? opts.visit : (o) => o;
-        opts.visit = function visit(obj, joined, filename) {
-            const visited = parentVisit(obj, joined, filename);
-            if (visited) {
-                if (~context.files.indexOf(joined))
-                    return visited;
-                context.files.push(joined);
-                self.addHandler(visited);
-            }
-            return visited;
-        };
-        shim.requireDirectory({ require: req, filename: callerFile }, dir, opts);
-    };
-    function moduleName(obj) {
-        const mod = whichModule(obj);
-        if (!mod)
-            throw new Error(`No command name given for module: ${shim.inspect(obj)}`);
-        return commandFromFilename(mod.filename);
     }
-    function commandFromFilename(filename) {
-        return shim.path.basename(filename, shim.path.extname(filename));
+    getCommandHandlers() {
+        return this.handlers;
     }
-    function extractDesc({ describe, description, desc, }) {
-        for (const test of [describe, description, desc]) {
-            if (typeof test === 'string' || test === false)
-                return test;
-            assertNotStrictEqual(test, true, shim);
-        }
-        return false;
+    getCommands() {
+        return Object.keys(this.handlers).concat(Object.keys(this.aliasMap));
+    }
+    hasDefaultCommand() {
+        return !!this.defaultCommand;
     }
-    self.getCommands = () => Object.keys(handlers).concat(Object.keys(aliasMap));
-    self.getCommandHandlers = () => handlers;
-    self.hasDefaultCommand = () => !!defaultCommand;
-    self.runCommand = function runCommand(command, yargs, parsed, commandIndex) {
-        let aliases = parsed.aliases;
-        const commandHandler = handlers[command] || handlers[aliasMap[command]] || defaultCommand;
-        const currentContext = yargs.getContext();
-        let numFiles = currentContext.files.length;
+    runCommand(command, yargs, parsed, commandIndex, helpOnly, helpOrVersionSet) {
+        const commandHandler = this.handlers[command] ||
+            this.handlers[this.aliasMap[command]] ||
+            this.defaultCommand;
+        const currentContext = yargs.getInternalMethods().getContext();
         const parentCommands = currentContext.commands.slice();
-        let innerArgv = parsed.argv;
-        let positionalMap = {};
+        const isDefaultCommand = !command;
         if (command) {
             currentContext.commands.push(command);
             currentContext.fullCommands.push(commandHandler.original);
         }
+        const builderResult = this.applyBuilderUpdateUsageAndParse(isDefaultCommand, commandHandler, yargs, parsed.aliases, parentCommands, commandIndex, helpOnly, helpOrVersionSet);
+        return isPromise(builderResult)
+            ? builderResult.then(result => this.applyMiddlewareAndGetResult(isDefaultCommand, commandHandler, result.innerArgv, currentContext, helpOnly, result.aliases, yargs))
+            : this.applyMiddlewareAndGetResult(isDefaultCommand, commandHandler, builderResult.innerArgv, currentContext, helpOnly, builderResult.aliases, yargs);
+    }
+    applyBuilderUpdateUsageAndParse(isDefaultCommand, commandHandler, yargs, aliases, parentCommands, commandIndex, helpOnly, helpOrVersionSet) {
         const builder = commandHandler.builder;
+        let innerYargs = yargs;
         if (isCommandBuilderCallback(builder)) {
-            const builderOutput = builder(yargs.reset(parsed.aliases));
-            const innerYargs = isYargsInstance(builderOutput) ? builderOutput : yargs;
-            if (shouldUpdateUsage(innerYargs)) {
-                innerYargs
-                    .getUsageInstance()
-                    .usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
+            yargs.getInternalMethods().getUsageInstance().freeze();
+            const builderOutput = builder(yargs.getInternalMethods().reset(aliases), helpOrVersionSet);
+            if (isPromise(builderOutput)) {
+                return builderOutput.then(output => {
+                    innerYargs = isYargsInstance(output) ? output : yargs;
+                    return this.parseAndUpdateUsage(isDefaultCommand, commandHandler, innerYargs, parentCommands, commandIndex, helpOnly);
+                });
             }
-            innerArgv = innerYargs._parseArgs(null, null, true, commandIndex);
-            aliases = innerYargs.parsed.aliases;
         }
         else if (isCommandBuilderOptionDefinitions(builder)) {
-            const innerYargs = yargs.reset(parsed.aliases);
-            if (shouldUpdateUsage(innerYargs)) {
-                innerYargs
-                    .getUsageInstance()
-                    .usage(usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
-            }
+            yargs.getInternalMethods().getUsageInstance().freeze();
+            innerYargs = yargs.getInternalMethods().reset(aliases);
             Object.keys(commandHandler.builder).forEach(key => {
                 innerYargs.option(key, builder[key]);
             });
-            innerArgv = innerYargs._parseArgs(null, null, true, commandIndex);
-            aliases = innerYargs.parsed.aliases;
         }
-        if (!yargs._hasOutput()) {
-            positionalMap = populatePositionals(commandHandler, innerArgv, currentContext);
+        return this.parseAndUpdateUsage(isDefaultCommand, commandHandler, innerYargs, parentCommands, commandIndex, helpOnly);
+    }
+    parseAndUpdateUsage(isDefaultCommand, commandHandler, innerYargs, parentCommands, commandIndex, helpOnly) {
+        if (isDefaultCommand)
+            innerYargs.getInternalMethods().getUsageInstance().unfreeze(true);
+        if (this.shouldUpdateUsage(innerYargs)) {
+            innerYargs
+                .getInternalMethods()
+                .getUsageInstance()
+                .usage(this.usageFromParentCommandsCommandHandler(parentCommands, commandHandler), commandHandler.description);
         }
-        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);
+        const innerArgv = innerYargs
+            .getInternalMethods()
+            .runYargsParserAndExecuteCommands(null, undefined, true, commandIndex, helpOnly);
+        return isPromise(innerArgv)
+            ? innerArgv.then(argv => ({
+                aliases: innerYargs.parsed.aliases,
+                innerArgv: argv,
+            }))
+            : {
+                aliases: innerYargs.parsed.aliases,
+                innerArgv: innerArgv,
+            };
+    }
+    shouldUpdateUsage(yargs) {
+        return (!yargs.getInternalMethods().getUsageInstance().getUsageDisabled() &&
+            yargs.getInternalMethods().getUsageInstance().getUsage().length === 0);
+    }
+    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);
+        });
+        pc.push(c);
+        return `$0 ${pc.join(' ')}`;
+    }
+    handleValidationAndGetResult(isDefaultCommand, commandHandler, innerArgv, currentContext, aliases, yargs, middlewares, positionalMap) {
+        if (!yargs.getInternalMethods().getHasOutput()) {
+            const validation = yargs
+                .getInternalMethods()
+                .runValidation(aliases, positionalMap, yargs.parsed.error, isDefaultCommand);
+            innerArgv = maybeAsyncResult(innerArgv, result => {
+                validation(result);
+                return result;
+            });
         }
-        if (commandHandler.handler && !yargs._hasOutput()) {
-            yargs._setHasOutput();
+        if (commandHandler.handler && !yargs.getInternalMethods().getHasOutput()) {
+            yargs.getInternalMethods().setHasOutput();
             const populateDoubleDash = !!yargs.getOptions().configuration['populate--'];
-            yargs._postProcess(innerArgv, populateDoubleDash);
+            yargs
+                .getInternalMethods()
+                .postProcess(innerArgv, populateDoubleDash, false, false);
             innerArgv = applyMiddleware(innerArgv, yargs, middlewares, false);
-            let handlerResult;
-            if (isPromise(innerArgv)) {
-                handlerResult = innerArgv.then(argv => commandHandler.handler(argv));
-            }
-            else {
-                handlerResult = commandHandler.handler(innerArgv);
+            innerArgv = maybeAsyncResult(innerArgv, result => {
+                const handlerResult = commandHandler.handler(result);
+                return isPromise(handlerResult)
+                    ? handlerResult.then(() => result)
+                    : result;
+            });
+            if (!isDefaultCommand) {
+                yargs.getInternalMethods().getUsageInstance().cacheHelpMessage();
             }
-            const handlerFinishCommand = yargs.getHandlerFinishCommand();
-            if (isPromise(handlerResult)) {
-                yargs.getUsageInstance().cacheHelpMessage();
-                handlerResult
-                    .then(value => {
-                    if (handlerFinishCommand) {
-                        handlerFinishCommand(value);
-                    }
-                })
-                    .catch(error => {
+            if (isPromise(innerArgv) &&
+                !yargs.getInternalMethods().hasParseCallback()) {
+                innerArgv.catch(error => {
                     try {
-                        yargs.getUsageInstance().fail(null, error);
+                        yargs.getInternalMethods().getUsageInstance().fail(null, error);
                     }
-                    catch (err) {
+                    catch (_err) {
                     }
-                })
-                    .then(() => {
-                    yargs.getUsageInstance().clearCachedHelpMessage();
                 });
             }
-            else {
-                if (handlerFinishCommand) {
-                    handlerFinishCommand(handlerResult);
-                }
-            }
         }
-        if (command) {
+        if (!isDefaultCommand) {
             currentContext.commands.pop();
             currentContext.fullCommands.pop();
         }
-        numFiles = currentContext.files.length - numFiles;
-        if (numFiles > 0)
-            currentContext.files.splice(numFiles * -1, numFiles);
         return innerArgv;
-    };
-    function shouldUpdateUsage(yargs) {
-        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);
-        });
-        pc.push(c);
-        return `$0 ${pc.join(' ')}`;
-    }
-    self.runDefaultBuilderOn = function (yargs) {
-        assertNotStrictEqual(defaultCommand, undefined, shim);
-        if (shouldUpdateUsage(yargs)) {
-            const commandString = DEFAULT_MARKER.test(defaultCommand.original)
-                ? defaultCommand.original
-                : defaultCommand.original.replace(/^[^[\]<>]*/, '$0 ');
-            yargs.getUsageInstance().usage(commandString, defaultCommand.description);
-        }
-        const builder = defaultCommand.builder;
-        if (isCommandBuilderCallback(builder)) {
-            builder(yargs);
-        }
-        else if (!isCommandBuilderDefinition(builder)) {
-            Object.keys(builder).forEach(key => {
-                yargs.option(key, builder[key]);
-            });
+    applyMiddlewareAndGetResult(isDefaultCommand, commandHandler, innerArgv, currentContext, helpOnly, aliases, yargs) {
+        let positionalMap = {};
+        if (helpOnly)
+            return innerArgv;
+        if (!yargs.getInternalMethods().getHasOutput()) {
+            positionalMap = this.populatePositionals(commandHandler, innerArgv, currentContext, yargs);
         }
-    };
-    function populatePositionals(commandHandler, argv, context) {
+        const middlewares = this.globalMiddleware
+            .getMiddleware()
+            .slice(0)
+            .concat(commandHandler.middlewares);
+        const maybePromiseArgv = applyMiddleware(innerArgv, yargs, middlewares, true);
+        return isPromise(maybePromiseArgv)
+            ? maybePromiseArgv.then(resolvedInnerArgv => this.handleValidationAndGetResult(isDefaultCommand, commandHandler, resolvedInnerArgv, currentContext, aliases, yargs, middlewares, positionalMap))
+            : this.handleValidationAndGetResult(isDefaultCommand, commandHandler, maybePromiseArgv, currentContext, aliases, yargs, middlewares, positionalMap);
+    }
+    populatePositionals(commandHandler, argv, context, yargs) {
         argv._ = argv._.slice(context.commands.length);
         const demanded = commandHandler.demanded.slice(0);
         const optional = commandHandler.optional.slice(0);
         const positionalMap = {};
-        validation.positionalCount(demanded.length, argv._.length);
+        this.validation.positionalCount(demanded.length, argv._.length);
         while (demanded.length) {
             const demand = demanded.shift();
-            populatePositional(demand, argv, positionalMap);
+            this.populatePositional(demand, argv, positionalMap);
         }
         while (optional.length) {
             const maybe = optional.shift();
-            populatePositional(maybe, argv, positionalMap);
+            this.populatePositional(maybe, argv, positionalMap);
         }
         argv._ = context.commands.concat(argv._.map(a => '' + a));
-        postProcessPositionals(argv, positionalMap, self.cmdToParseOptions(commandHandler.original));
+        this.postProcessPositionals(argv, positionalMap, this.cmdToParseOptions(commandHandler.original), yargs);
         return positionalMap;
     }
-    function populatePositional(positional, argv, positionalMap) {
+    populatePositional(positional, argv, positionalMap) {
         const cmd = positional.cmd[0];
         if (positional.variadic) {
             positionalMap[cmd] = argv._.splice(0).map(String);
@@ -268,7 +272,34 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
                 positionalMap[cmd] = [String(argv._.shift())];
         }
     }
-    function postProcessPositionals(argv, positionalMap, parseOptions) {
+    cmdToParseOptions(cmdString) {
+        const parseOptions = {
+            array: [],
+            default: {},
+            alias: {},
+            demand: {},
+        };
+        const parsed = parseCommand(cmdString);
+        parsed.demanded.forEach(d => {
+            const [cmd, ...aliases] = d.cmd;
+            if (d.variadic) {
+                parseOptions.array.push(cmd);
+                parseOptions.default[cmd] = [];
+            }
+            parseOptions.alias[cmd] = aliases;
+            parseOptions.demand[cmd] = true;
+        });
+        parsed.optional.forEach(o => {
+            const [cmd, ...aliases] = o.cmd;
+            if (o.variadic) {
+                parseOptions.array.push(cmd);
+                parseOptions.default[cmd] = [];
+            }
+            parseOptions.alias[cmd] = aliases;
+        });
+        return parseOptions;
+    }
+    postProcessPositionals(argv, positionalMap, parseOptions, yargs) {
         const options = Object.assign({}, yargs.getOptions());
         options.default = Object.assign(parseOptions.default, options.default);
         for (const key of Object.keys(parseOptions.alias)) {
@@ -288,13 +319,16 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
         if (!unparsed.length)
             return;
         const config = Object.assign({}, options.configuration, {
-            'populate--': true,
+            'populate--': false,
         });
-        const parsed = shim.Parser.detailed(unparsed, Object.assign({}, options, {
+        const parsed = this.shim.Parser.detailed(unparsed, Object.assign({}, options, {
             configuration: config,
         }));
         if (parsed.error) {
-            yargs.getUsageInstance().fail(parsed.error.message, parsed.error);
+            yargs
+                .getInternalMethods()
+                .getUsageInstance()
+                .fail(parsed.error.message, parsed.error);
         }
         else {
             const positionalKeys = Object.keys(positionalMap);
@@ -302,61 +336,99 @@ export function command(yargs, usage, validation, globalMiddleware = [], shim) {
                 positionalKeys.push(...parsed.aliases[key]);
             });
             Object.keys(parsed.argv).forEach(key => {
-                if (positionalKeys.indexOf(key) !== -1) {
+                if (positionalKeys.includes(key)) {
                     if (!positionalMap[key])
                         positionalMap[key] = parsed.argv[key];
-                    argv[key] = parsed.argv[key];
+                    if (!this.isInConfigs(yargs, key) &&
+                        !this.isDefaulted(yargs, key) &&
+                        Object.prototype.hasOwnProperty.call(argv, key) &&
+                        Object.prototype.hasOwnProperty.call(parsed.argv, key) &&
+                        (Array.isArray(argv[key]) || Array.isArray(parsed.argv[key]))) {
+                        argv[key] = [].concat(argv[key], parsed.argv[key]);
+                    }
+                    else {
+                        argv[key] = parsed.argv[key];
+                    }
                 }
             });
         }
     }
-    self.cmdToParseOptions = function (cmdString) {
-        const parseOptions = {
-            array: [],
-            default: {},
-            alias: {},
-            demand: {},
-        };
-        const parsed = parseCommand(cmdString);
-        parsed.demanded.forEach(d => {
-            const [cmd, ...aliases] = d.cmd;
-            if (d.variadic) {
-                parseOptions.array.push(cmd);
-                parseOptions.default[cmd] = [];
-            }
-            parseOptions.alias[cmd] = aliases;
-            parseOptions.demand[cmd] = true;
-        });
-        parsed.optional.forEach(o => {
-            const [cmd, ...aliases] = o.cmd;
-            if (o.variadic) {
-                parseOptions.array.push(cmd);
-                parseOptions.default[cmd] = [];
-            }
-            parseOptions.alias[cmd] = aliases;
-        });
-        return parseOptions;
-    };
-    self.reset = () => {
-        handlers = {};
-        aliasMap = {};
-        defaultCommand = undefined;
-        return self;
-    };
-    const frozens = [];
-    self.freeze = () => {
-        frozens.push({
-            handlers,
-            aliasMap,
-            defaultCommand,
+    isDefaulted(yargs, key) {
+        const { default: defaults } = yargs.getOptions();
+        return (Object.prototype.hasOwnProperty.call(defaults, key) ||
+            Object.prototype.hasOwnProperty.call(defaults, this.shim.Parser.camelCase(key)));
+    }
+    isInConfigs(yargs, key) {
+        const { configObjects } = yargs.getOptions();
+        return (configObjects.some(c => Object.prototype.hasOwnProperty.call(c, key)) ||
+            configObjects.some(c => Object.prototype.hasOwnProperty.call(c, this.shim.Parser.camelCase(key))));
+    }
+    runDefaultBuilderOn(yargs) {
+        if (!this.defaultCommand)
+            return;
+        if (this.shouldUpdateUsage(yargs)) {
+            const commandString = DEFAULT_MARKER.test(this.defaultCommand.original)
+                ? this.defaultCommand.original
+                : this.defaultCommand.original.replace(/^[^[\]<>]*/, '$0 ');
+            yargs
+                .getInternalMethods()
+                .getUsageInstance()
+                .usage(commandString, this.defaultCommand.description);
+        }
+        const builder = this.defaultCommand.builder;
+        if (isCommandBuilderCallback(builder)) {
+            return builder(yargs, true);
+        }
+        else if (!isCommandBuilderDefinition(builder)) {
+            Object.keys(builder).forEach(key => {
+                yargs.option(key, builder[key]);
+            });
+        }
+        return undefined;
+    }
+    moduleName(obj) {
+        const mod = whichModule(obj);
+        if (!mod)
+            throw new Error(`No command name given for module: ${this.shim.inspect(obj)}`);
+        return this.commandFromFilename(mod.filename);
+    }
+    commandFromFilename(filename) {
+        return this.shim.path.basename(filename, this.shim.path.extname(filename));
+    }
+    extractDesc({ describe, description, desc }) {
+        for (const test of [describe, description, desc]) {
+            if (typeof test === 'string' || test === false)
+                return test;
+            assertNotStrictEqual(test, true, this.shim);
+        }
+        return false;
+    }
+    freeze() {
+        this.frozens.push({
+            handlers: this.handlers,
+            aliasMap: this.aliasMap,
+            defaultCommand: this.defaultCommand,
         });
-    };
-    self.unfreeze = () => {
-        const frozen = frozens.pop();
-        assertNotStrictEqual(frozen, undefined, shim);
-        ({ handlers, aliasMap, defaultCommand } = frozen);
-    };
-    return self;
+    }
+    unfreeze() {
+        const frozen = this.frozens.pop();
+        assertNotStrictEqual(frozen, undefined, this.shim);
+        ({
+            handlers: this.handlers,
+            aliasMap: this.aliasMap,
+            defaultCommand: this.defaultCommand,
+        } = frozen);
+    }
+    reset() {
+        this.handlers = {};
+        this.aliasMap = {};
+        this.defaultCommand = undefined;
+        this.requireCache = new Set();
+        return this;
+    }
+}
+export function command(usage, validation, globalMiddleware, shim) {
+    return new CommandInstance(usage, validation, globalMiddleware, shim);
 }
 export function isCommandBuilderDefinition(builder) {
     return (typeof builder === 'object' &&
@@ -364,12 +436,7 @@ export function isCommandBuilderDefinition(builder) {
         typeof builder.handler === 'function');
 }
 function isCommandAndAliases(cmd) {
-    if (cmd.every(c => typeof c === 'string')) {
-        return true;
-    }
-    else {
-        return false;
-    }
+    return cmd.every(c => typeof c === 'string');
 }
 export function isCommandBuilderCallback(builder) {
     return typeof builder === 'function';

package/node_modules/yargs/build/lib/completion-templates.js

@@ -5,7 +5,7 @@ export const completionShTemplate = `###-begin-{{app_name}}-completions-###
 # Installation: {{app_path}} {{completion_command}} >> ~/.bashrc
 #    or {{app_path}} {{completion_command}} >> ~/.bash_profile on OSX.
 #
-_yargs_completions()
+_{{app_name}}_yargs_completions()
 {
     local cur_word args type_list
 
@@ -24,15 +24,16 @@ _yargs_completions()
 
     return 0
 }
-complete -o default -F _yargs_completions {{app_name}}
+complete -o bashdefault -o default -F _{{app_name}}_yargs_completions {{app_name}}
 ###-end-{{app_name}}-completions-###
 `;
-export const completionZshTemplate = `###-begin-{{app_name}}-completions-###
+export const completionZshTemplate = `#compdef {{app_name}}
+###-begin-{{app_name}}-completions-###
 #
 # yargs command completion script
 #
 # Installation: {{app_path}} {{completion_command}} >> ~/.zshrc
-#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.
+#    or {{app_path}} {{completion_command}} >> ~/.zprofile on OSX.
 #
 _{{app_name}}_yargs_completions()
 {