projen 0.71.38 → 0.71.39

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

@@ -3,68 +3,52 @@ import { assertNotStrictEqual } from './typings/common-types.js';
 import * as templates from './completion-templates.js';
 import { isPromise } from './utils/is-promise.js';
 import { parseCommand } from './parse-command.js';
-export function completion(yargs, usage, command, shim) {
-    const self = {
-        completionKey: 'get-yargs-completions',
-    };
-    let aliases;
-    self.setParsed = function setParsed(parsed) {
-        aliases = parsed.aliases;
-    };
-    const zshShell = (shim.getEnv('SHELL') && shim.getEnv('SHELL').indexOf('zsh') !== -1) ||
-        (shim.getEnv('ZSH_NAME') && shim.getEnv('ZSH_NAME').indexOf('zsh') !== -1);
-    self.getCompletion = function getCompletion(args, done) {
-        const completions = [];
-        const current = args.length ? args[args.length - 1] : '';
-        const argv = yargs.parse(args, true);
-        const parentCommands = yargs.getContext().commands;
-        function runCompletionFunction(argv) {
-            assertNotStrictEqual(completionFunction, null, 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 done(result);
-            }
-            else {
-                return completionFunction(current, argv, completions => {
-                    done(completions);
-                });
-            }
-        }
-        if (completionFunction) {
-            return isPromise(argv)
-                ? argv.then(runCompletionFunction)
-                : runCompletionFunction(argv);
-        }
-        const handlers = command.getCommandHandlers();
+export class Completion {
+    constructor(yargs, usage, command, shim) {
+        var _a, _b, _c;
+        this.yargs = yargs;
+        this.usage = usage;
+        this.command = command;
+        this.shim = shim;
+        this.completionKey = 'get-yargs-completions';
+        this.aliases = null;
+        this.customCompletionFunction = null;
+        this.indexAfterLastReset = 0;
+        this.zshShell =
+            (_c = (((_a = this.shim.getEnv('SHELL')) === null || _a === void 0 ? void 0 : _a.includes('zsh')) ||
+                ((_b = this.shim.getEnv('ZSH_NAME')) === null || _b === void 0 ? void 0 : _b.includes('zsh')))) !== null && _c !== void 0 ? _c : false;
+    }
+    defaultCompletion(args, argv, current, done) {
+        const handlers = this.command.getCommandHandlers();
         for (let i = 0, ii = args.length; i < ii; ++i) {
             if (handlers[args[i]] && handlers[args[i]].builder) {
                 const builder = handlers[args[i]].builder;
                 if (isCommandBuilderCallback(builder)) {
-                    const y = yargs.reset();
-                    builder(y);
+                    this.indexAfterLastReset = i + 1;
+                    const y = this.yargs.getInternalMethods().reset();
+                    builder(y, true);
                     return y.argv;
                 }
             }
         }
+        const completions = [];
+        this.commandCompletions(completions, args, current);
+        this.optionCompletions(completions, args, argv, current);
+        this.choicesFromOptionsCompletions(completions, args, argv, current);
+        this.choicesFromPositionalsCompletions(completions, args, argv, current);
+        done(null, completions);
+    }
+    commandCompletions(completions, args, current) {
+        const parentCommands = this.yargs
+            .getInternalMethods()
+            .getContext().commands;
         if (!current.match(/^-/) &&
-            parentCommands[parentCommands.length - 1] !== current) {
-            usage.getCommands().forEach(usageCommand => {
+            parentCommands[parentCommands.length - 1] !== current &&
+            !this.previousArgHasChoices(args)) {
+            this.usage.getCommands().forEach(usageCommand => {
                 const commandName = parseCommand(usageCommand[0]).cmd;
                 if (args.indexOf(commandName) === -1) {
-                    if (!zshShell) {
+                    if (!this.zshShell) {
                         completions.push(commandName);
                     }
                     else {
@@ -74,55 +58,186 @@ export function completion(yargs, usage, command, shim) {
                 }
             });
         }
-        if (current.match(/^-/) || (current === '' && completions.length === 0)) {
-            const descs = usage.getDescriptions();
-            const options = yargs.getOptions();
+    }
+    optionCompletions(completions, args, argv, current) {
+        if ((current.match(/^-/) || (current === '' && completions.length === 0)) &&
+            !this.previousArgHasChoices(args)) {
+            const options = this.yargs.getOptions();
+            const positionalKeys = this.yargs.getGroups()[this.usage.getPositionalGroupName()] || [];
             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}`));
-                function completeOptionKey(key) {
-                    const notInArgs = keyAndAliases.every(val => args.indexOf(`--${val}`) === -1);
-                    if (notInArgs) {
-                        const startsByTwoDashes = (s) => /^--/.test(s);
-                        const isShortOption = (s) => /^[^0-9]$/.test(s);
-                        const dashes = !startsByTwoDashes(current) && isShortOption(key) ? '-' : '--';
-                        if (!zshShell) {
-                            completions.push(dashes + key);
-                        }
-                        else {
-                            const desc = descs[key] || '';
-                            completions.push(dashes +
-                                `${key.replace(/:/g, '\\:')}:${desc.replace('__yargsString__:', '')}`);
-                        }
-                    }
+                const isPositionalKey = positionalKeys.includes(key);
+                if (!isPositionalKey &&
+                    !options.hiddenOptions.includes(key) &&
+                    !this.argsContainKey(args, key, negable)) {
+                    this.completeOptionKey(key, completions, current, negable && !!options.default[key]);
                 }
-                completeOptionKey(key);
-                if (negable && !!options.default[key])
-                    completeOptionKey(`no-${key}`);
             });
         }
-        done(completions);
-    };
-    self.generateCompletionScript = function generateCompletionScript($0, cmd) {
-        let script = zshShell
+    }
+    choicesFromOptionsCompletions(completions, args, argv, current) {
+        if (this.previousArgHasChoices(args)) {
+            const choices = this.getPreviousArgChoices(args);
+            if (choices && choices.length > 0) {
+                completions.push(...choices.map(c => c.replace(/:/g, '\\:')));
+            }
+        }
+    }
+    choicesFromPositionalsCompletions(completions, args, argv, current) {
+        if (current === '' &&
+            completions.length > 0 &&
+            this.previousArgHasChoices(args)) {
+            return;
+        }
+        const positionalKeys = this.yargs.getGroups()[this.usage.getPositionalGroupName()] || [];
+        const offset = Math.max(this.indexAfterLastReset, this.yargs.getInternalMethods().getContext().commands.length +
+            1);
+        const positionalKey = positionalKeys[argv._.length - offset - 1];
+        if (!positionalKey) {
+            return;
+        }
+        const choices = this.yargs.getOptions().choices[positionalKey] || [];
+        for (const choice of choices) {
+            if (choice.startsWith(current)) {
+                completions.push(choice.replace(/:/g, '\\:'));
+            }
+        }
+    }
+    getPreviousArgChoices(args) {
+        if (args.length < 1)
+            return;
+        let previousArg = args[args.length - 1];
+        let filter = '';
+        if (!previousArg.startsWith('-') && args.length > 1) {
+            filter = previousArg;
+            previousArg = args[args.length - 2];
+        }
+        if (!previousArg.startsWith('-'))
+            return;
+        const previousArgKey = previousArg.replace(/^-+/, '');
+        const options = this.yargs.getOptions();
+        const possibleAliases = [
+            previousArgKey,
+            ...(this.yargs.getAliases()[previousArgKey] || []),
+        ];
+        let choices;
+        for (const possibleAlias of possibleAliases) {
+            if (Object.prototype.hasOwnProperty.call(options.key, possibleAlias) &&
+                Array.isArray(options.choices[possibleAlias])) {
+                choices = options.choices[possibleAlias];
+                break;
+            }
+        }
+        if (choices) {
+            return choices.filter(choice => !filter || choice.startsWith(filter));
+        }
+    }
+    previousArgHasChoices(args) {
+        const choices = this.getPreviousArgChoices(args);
+        return choices !== undefined && choices.length > 0;
+    }
+    argsContainKey(args, key, negable) {
+        const argsContains = (s) => args.indexOf((/^[^0-9]$/.test(s) ? '-' : '--') + s) !== -1;
+        if (argsContains(key))
+            return true;
+        if (negable && argsContains(`no-${key}`))
+            return true;
+        if (this.aliases) {
+            for (const alias of this.aliases[key]) {
+                if (argsContains(alias))
+                    return true;
+            }
+        }
+        return false;
+    }
+    completeOptionKey(key, completions, current, negable) {
+        var _a, _b, _c, _d;
+        let keyWithDesc = key;
+        if (this.zshShell) {
+            const descs = this.usage.getDescriptions();
+            const aliasKey = (_b = (_a = this === null || this === void 0 ? void 0 : this.aliases) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.find(alias => {
+                const desc = descs[alias];
+                return typeof desc === 'string' && desc.length > 0;
+            });
+            const descFromAlias = aliasKey ? descs[aliasKey] : undefined;
+            const desc = (_d = (_c = descs[key]) !== null && _c !== void 0 ? _c : descFromAlias) !== null && _d !== void 0 ? _d : '';
+            keyWithDesc = `${key.replace(/:/g, '\\:')}:${desc
+                .replace('__yargsString__:', '')
+                .replace(/(\r\n|\n|\r)/gm, ' ')}`;
+        }
+        const startsByTwoDashes = (s) => /^--/.test(s);
+        const isShortOption = (s) => /^[^0-9]$/.test(s);
+        const dashes = !startsByTwoDashes(current) && isShortOption(key) ? '-' : '--';
+        completions.push(dashes + keyWithDesc);
+        if (negable) {
+            completions.push(dashes + 'no-' + keyWithDesc);
+        }
+    }
+    customCompletion(args, argv, current, done) {
+        assertNotStrictEqual(this.customCompletionFunction, null, this.shim);
+        if (isSyncCompletionFunction(this.customCompletionFunction)) {
+            const result = this.customCompletionFunction(current, argv);
+            if (isPromise(result)) {
+                return result
+                    .then(list => {
+                    this.shim.process.nextTick(() => {
+                        done(null, list);
+                    });
+                })
+                    .catch(err => {
+                    this.shim.process.nextTick(() => {
+                        done(err, undefined);
+                    });
+                });
+            }
+            return done(null, result);
+        }
+        else if (isFallbackCompletionFunction(this.customCompletionFunction)) {
+            return this.customCompletionFunction(current, argv, (onCompleted = done) => this.defaultCompletion(args, argv, current, onCompleted), completions => {
+                done(null, completions);
+            });
+        }
+        else {
+            return this.customCompletionFunction(current, argv, completions => {
+                done(null, completions);
+            });
+        }
+    }
+    getCompletion(args, done) {
+        const current = args.length ? args[args.length - 1] : '';
+        const argv = this.yargs.parse(args, true);
+        const completionFunction = this.customCompletionFunction
+            ? (argv) => this.customCompletion(args, argv, current, done)
+            : (argv) => this.defaultCompletion(args, argv, current, done);
+        return isPromise(argv)
+            ? argv.then(completionFunction)
+            : completionFunction(argv);
+    }
+    generateCompletionScript($0, cmd) {
+        let script = this.zshShell
             ? templates.completionZshTemplate
             : templates.completionShTemplate;
-        const name = shim.path.basename($0);
+        const name = this.shim.path.basename($0);
         if ($0.match(/\.js$/))
             $0 = `./${$0}`;
         script = script.replace(/{{app_name}}/g, name);
         script = script.replace(/{{completion_command}}/g, cmd);
         return script.replace(/{{app_path}}/g, $0);
-    };
-    let completionFunction = null;
-    self.registerFunction = fn => {
-        completionFunction = fn;
-    };
-    return self;
+    }
+    registerFunction(fn) {
+        this.customCompletionFunction = fn;
+    }
+    setParsed(parsed) {
+        this.aliases = parsed.aliases;
+    }
+}
+export function completion(yargs, usage, command, shim) {
+    return new Completion(yargs, usage, command, shim);
 }
 function isSyncCompletionFunction(completionFunction) {
     return completionFunction.length < 3;
 }
+function isFallbackCompletionFunction(completionFunction) {
+    return completionFunction.length > 3;
+}

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

@@ -1,23 +1,59 @@
 import { argsert } from './argsert.js';
 import { isPromise } from './utils/is-promise.js';
-export function globalMiddlewareFactory(globalMiddleware, context) {
-    return function (callback, applyBeforeValidation = false) {
-        argsert('<array|function> [boolean]', [callback, applyBeforeValidation], arguments.length);
+export class GlobalMiddleware {
+    constructor(yargs) {
+        this.globalMiddleware = [];
+        this.frozens = [];
+        this.yargs = yargs;
+    }
+    addMiddleware(callback, applyBeforeValidation, global = true, mutates = false) {
+        argsert('<array|function> [boolean] [boolean] [boolean]', [callback, applyBeforeValidation, global], arguments.length);
         if (Array.isArray(callback)) {
             for (let i = 0; i < callback.length; i++) {
                 if (typeof callback[i] !== 'function') {
                     throw Error('middleware must be a function');
                 }
-                callback[i].applyBeforeValidation = applyBeforeValidation;
+                const m = callback[i];
+                m.applyBeforeValidation = applyBeforeValidation;
+                m.global = global;
             }
-            Array.prototype.push.apply(globalMiddleware, callback);
+            Array.prototype.push.apply(this.globalMiddleware, callback);
         }
         else if (typeof callback === 'function') {
-            callback.applyBeforeValidation = applyBeforeValidation;
-            globalMiddleware.push(callback);
+            const m = callback;
+            m.applyBeforeValidation = applyBeforeValidation;
+            m.global = global;
+            m.mutates = mutates;
+            this.globalMiddleware.push(callback);
         }
-        return context;
-    };
+        return this.yargs;
+    }
+    addCoerceMiddleware(callback, option) {
+        const aliases = this.yargs.getAliases();
+        this.globalMiddleware = this.globalMiddleware.filter(m => {
+            const toCheck = [...(aliases[option] || []), option];
+            if (!m.option)
+                return true;
+            else
+                return !toCheck.includes(m.option);
+        });
+        callback.option = option;
+        return this.addMiddleware(callback, true, true, true);
+    }
+    getMiddleware() {
+        return this.globalMiddleware;
+    }
+    freeze() {
+        this.frozens.push([...this.globalMiddleware]);
+    }
+    unfreeze() {
+        const frozen = this.frozens.pop();
+        if (frozen !== undefined)
+            this.globalMiddleware = frozen;
+    }
+    reset() {
+        this.globalMiddleware = this.globalMiddleware.filter(m => m.global);
+    }
 }
 export function commandMiddlewareFactory(commandMiddleware) {
     if (!commandMiddleware)
@@ -28,23 +64,22 @@ export function commandMiddlewareFactory(commandMiddleware) {
     });
 }
 export function applyMiddleware(argv, yargs, middlewares, beforeValidation) {
-    const beforeValidationError = new Error('middleware cannot return a promise when applyBeforeValidation is true');
     return middlewares.reduce((acc, middleware) => {
         if (middleware.applyBeforeValidation !== beforeValidation) {
             return acc;
         }
+        if (middleware.mutates) {
+            if (middleware.applied)
+                return acc;
+            middleware.applied = true;
+        }
         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 {
             const result = middleware(acc, yargs);
-            if (beforeValidation && isPromise(result))
-                throw beforeValidationError;
             return isPromise(result)
                 ? result.then(middlewareObj => Object.assign(acc, middlewareObj))
                 : Object.assign(acc, result);