@forge/cli 0.0.0-experimental-4529dd0 → 0.0.0-experimental-f85f9b1

package/out/command-line/command.js

@@ -1,15 +1,11 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Command = exports.WrapperError = void 0;
+exports.getAutocompleteConfig = exports.Command = exports.WrapperError = void 0;
 const tslib_1 = require("tslib");
 const commander_1 = tslib_1.__importStar(require("commander"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const cli_shared_1 = require("@forge/cli-shared");
-const cli_shared_2 = require("@forge/cli-shared");
-const cli_shared_3 = require("@forge/cli-shared");
 const environment_1 = require("./environment");
-const cli_shared_4 = require("@forge/cli-shared");
 const version_info_1 = require("./version-info");
 const anon_user_id_1 = require("./anon-user-id");
 const errors_1 = require("./errors");
@@ -25,30 +21,22 @@ exports.WrapperError = WrapperError;
 const isErrorWithAnalytics = (e) => {
     return e.getAttributes !== undefined;
 };
+function last(arg) {
+    return arg[arg.length - 1];
+}
 class Command {
-    constructor(ui, analyticsClient, preCommandController, cliDetails, cmd, expectsArguments = false, analyticsName) {
+    constructor(ui, analyticsClient, preCommandController, cliDetails, credentialStore, { cmd, analyticsName, requiresAuthentication, requiresAnalyticsConsent, requiredOptionFlags, preconditionFn }) {
         this.ui = ui;
         this.analyticsClient = analyticsClient;
         this.preCommandController = preCommandController;
         this.cliDetails = cliDetails;
-        this.expectsArguments = expectsArguments;
-        this.analyticsName = analyticsName;
-        this.requiresAuthentication = true;
-        this.requiresAnalyticsConsent = true;
+        this.credentialStore = credentialStore;
         this.requiredOptionFlags = [];
         this.preconditionFn = [];
-        this.options = [];
-        this.commands = [];
-        this.exitOverride = (listener) => {
-            this.cmd.exitOverride((err) => listener(err));
-            return this;
-        };
         this.actionProcessor = async (cb, ...args) => {
-            var _b, _c, _d, _e, _f;
-            if (this.newCommand) {
-                this.ui.error(new Error(cli_shared_3.Text.deprecate(this.newCommand)));
-            }
+            var _a, _b, _c;
             const cmdName = this.cmd.name();
+            const analyticsName = (_a = this.analyticsName) !== null && _a !== void 0 ? _a : cmdName;
             let cred = (0, anon_user_id_1.getAnonId)(true);
             let attributes = {};
             try {
@@ -59,24 +47,35 @@ class Command {
                         isLatest: this.isLatestVersion()
                     };
                 }
-                this.analyticsClient.reportCommandInvoke((_b = this.analyticsName) !== null && _b !== void 0 ? _b : cmdName, cred, attributes);
-                if (!this.expectsArguments && args.length > 2) {
-                    throw new cli_shared_3.ValidationError(cli_shared_3.Text.extraArguments(cmdName));
-                }
-                const [options] = args;
-                if (options === null || options === void 0 ? void 0 : options.nonInteractive) {
+                this.analyticsClient.reportCommandInvoke(analyticsName, cred, attributes);
+                const options = last(args);
+                const nonInteractive = (_b = options.nonInteractive) !== null && _b !== void 0 ? _b : false;
+                const json = (_c = options.json) !== null && _c !== void 0 ? _c : false;
+                if (nonInteractive) {
                     if (!this.satisfiesNonInteractiveOptions(options)) {
-                        throw new cli_shared_3.ValidationError(cli_shared_3.Text.nonInteractive.error.missingRequiredOption(cmdName, this.requiredOptionFlags));
+                        throw new cli_shared_1.ValidationError(cli_shared_1.Text.nonInteractive.error.missingRequiredOption(cmdName, this.requiredOptionFlags));
                     }
                 }
                 if (this.requiresAnalyticsConsent) {
-                    await this.preCommandController.verifyAnalyticsPreferences((_c = options === null || options === void 0 ? void 0 : options.nonInteractive) !== null && _c !== void 0 ? _c : false)();
+                    await this.preCommandController.verifyAnalyticsPreferences(nonInteractive)();
                 }
-                if (!(options === null || options === void 0 ? void 0 : options.json)) {
+                if (!json) {
                     this.checkVersion();
                 }
                 const preconditionCheckAttributes = await this.checkPreconditions(...args);
-                attributes = Object.assign(Object.assign({}, attributes), preconditionCheckAttributes);
+                Object.assign(options, preconditionCheckAttributes);
+                const preconditionAnalyticsAttributes = [
+                    ['appId'],
+                    ['environment', 'appEnv'],
+                    ['siteURL', 'site'],
+                    ['product']
+                ];
+                for (const [preconditionAttribute, analyticsAttribute] of preconditionAnalyticsAttributes) {
+                    const value = preconditionCheckAttributes[preconditionAttribute];
+                    if (value) {
+                        attributes[analyticsAttribute !== null && analyticsAttribute !== void 0 ? analyticsAttribute : preconditionAttribute] = value;
+                    }
+                }
                 const actualCred = await this.checkAuthentication();
                 if (actualCred) {
                     cred = actualCred;
@@ -88,7 +87,7 @@ class Command {
                         cred = result.creds;
                     }
                 }
-                this.analyticsClient.reportSuccess((_d = this.analyticsName) !== null && _d !== void 0 ? _d : cmdName, cred, attributes);
+                this.analyticsClient.reportSuccess(analyticsName, cred, attributes);
             }
             catch (e) {
                 if (isErrorWithAnalytics(e)) {
@@ -97,30 +96,43 @@ class Command {
                 if (attributes.isUserError === undefined) {
                     attributes = Object.assign(Object.assign({}, attributes), { isUserError: false });
                 }
-                this.analyticsClient.reportInvokeFailure((_e = this.analyticsName) !== null && _e !== void 0 ? _e : cmdName, cred, attributes, e);
+                this.analyticsClient.reportInvokeFailure(analyticsName, cred, attributes, e);
                 if (e instanceof errors_1.DeferredErrors) {
-                    e.getErrors().forEach((error) => { var _b; return this.analyticsClient.reportFailure((_b = this.analyticsName) !== null && _b !== void 0 ? _b : cmdName, cred, attributes, error); });
+                    e.getErrors().forEach((error) => this.analyticsClient.reportFailure(analyticsName, cred, attributes, error));
                     process.exit(1);
                 }
                 else {
-                    this.analyticsClient.reportFailure((_f = this.analyticsName) !== null && _f !== void 0 ? _f : cmdName, cred, attributes, e);
-                    await (0, cli_shared_4.exitOnError)(this.ui, e);
+                    this.analyticsClient.reportFailure(analyticsName, cred, attributes, e);
+                    await (0, cli_shared_1.exitOnError)(this.ui, e);
                 }
             }
         };
-        this.outputRelevantHelp = (argv) => {
-            this.findLastValidCommand(argv).command.outputHelp();
-        };
         this.cmd = cmd || new commander_1.default.Command();
+        this.analyticsName = analyticsName;
+        this.requiresAuthentication = requiresAuthentication !== null && requiresAuthentication !== void 0 ? requiresAuthentication : true;
+        this.requiresAnalyticsConsent = requiresAnalyticsConsent !== null && requiresAnalyticsConsent !== void 0 ? requiresAnalyticsConsent : true;
+        this.requiredOptionFlags = requiredOptionFlags !== null && requiredOptionFlags !== void 0 ? requiredOptionFlags : [];
+        this.preconditionFn = preconditionFn !== null && preconditionFn !== void 0 ? preconditionFn : [];
+        this.cmd.exitOverride((err) => {
+            throw new WrapperError(err, this.cmd.name());
+        });
+        this.cmd.configureOutput({
+            writeErr: () => { }
+        });
     }
     get verbose() {
         return this.cmd.opts().verbose;
     }
+    static program(ui, analyticsClient, preCommandController, cliDetails, credentialStore) {
+        var _a;
+        const cmd = new Command(ui, analyticsClient, preCommandController, cliDetails, credentialStore, {});
+        return cmd.version((_a = cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== null && _a !== void 0 ? _a : 'unknown', '--version').option('--verbose', cli_shared_1.Text.optionVerbose);
+    }
+    clone(overrides) {
+        return new Command(this.ui, this.analyticsClient, this.preCommandController, this.cliDetails, this.credentialStore, Object.assign({ cmd: this.cmd, analyticsName: this.analyticsName, requiresAuthentication: this.requiresAuthentication, requiresAnalyticsConsent: this.requiresAnalyticsConsent, requiredOptionFlags: this.requiredOptionFlags, preconditionFn: this.preconditionFn }, overrides));
+    }
     version(str, flags) {
         this.cmd.version(str, flags);
-        flags = flags || '-V, --version';
-        const versionOption = new commander_1.Option(flags, 'output the version number');
-        this.options.push(versionOption);
         return this;
     }
     command(name, opts) {
@@ -128,14 +140,11 @@ class Command {
             .command(name, opts)
             .allowUnknownOption(false)
             .allowExcessArguments(false);
-        const trimmedName = name.trim();
-        const expectsArguments = trimmedName.endsWith(']') || trimmedName.endsWith('>');
-        const subCommand = new Command(this.ui, this.analyticsClient, this.preCommandController, this.cliDetails, cmd, expectsArguments, Command.concatenateNames(this.analyticsName, cmd.name()));
-        subCommand.option('--verbose', cli_shared_3.Text.optionVerbose);
-        subCommand.exitOverride((err) => {
-            throw new WrapperError(err, subCommand.cmd.name());
-        });
-        this.commands.push(subCommand);
+        const subCommand = new Command(this.ui, this.analyticsClient, this.preCommandController, this.cliDetails, this.credentialStore, {
+            cmd,
+            analyticsName: Command.concatenateNames(this.analyticsName, cmd.name())
+        }).option('--verbose', cli_shared_1.Text.optionVerbose);
+        this.cmd.commands.sort((a, b) => a.name().localeCompare(b.name()));
         return subCommand;
     }
     deprecatedCommand(oldName, newName, stubController) {
@@ -144,61 +153,44 @@ class Command {
             .requireNoAnalyticsConsent()
             .action(() => stubController.run({ oldName, newName }));
     }
-    getAnalyticsName() {
-        return this.analyticsName;
-    }
-    deprecate(newCommand) {
-        this.newCommand = newCommand;
-        return this;
-    }
     description(desc) {
         this.cmd.description(desc);
         return this;
     }
-    option(flags, description, fn, defaultValue) {
-        this.cmd.option(flags, description, fn, defaultValue);
-        const option = new commander_1.Option(flags, description);
-        if (typeof fn === 'function') {
-            option.default(defaultValue).argParser(fn);
-        }
-        else {
-            option.default(fn);
-        }
-        this.options.push(option);
+    option(flags, description, defaultValue) {
+        this.cmd.option(flags, description, defaultValue);
         return this;
     }
     precondition(fn) {
-        this.preconditionFn.push(fn);
-        return this;
+        return this.clone({ preconditionFn: [...this.preconditionFn, fn] });
     }
     requireManifestFile() {
-        this.precondition(this.preCommandController.verifyManifestExists());
-        return this;
+        return this.precondition(this.preCommandController.verifyManifestExists());
     }
     requireAppId() {
-        this.precondition(this.preCommandController.verifyManifestExistsWithAppConfig());
-        return this;
+        return this.precondition(this.preCommandController.verifyManifestExistsWithAppConfig());
     }
     nonInteractiveOption(...args) {
-        this.requiredOptionFlags = args;
-        this.cmd.option('--non-interactive', cli_shared_3.Text.nonInteractive.description);
-        return this;
+        return this.clone({ requiredOptionFlags: args }).option('--non-interactive', cli_shared_1.Text.nonInteractive.description);
     }
     action(fn) {
-        this.cmd.action((...args) => this.actionProcessor(fn, ...args));
+        this.cmd.action((...args) => {
+            args.pop();
+            return this.actionProcessor(fn, ...args);
+        });
         return this;
     }
     async parse(argv) {
         try {
             this.assertValidArgs(argv);
-            this.cmd.parse(argv);
+            await this.cmd.parseAsync(argv);
         }
         catch (err) {
             if (Command.isHelpTriggered(err)) {
                 if (Command.isError(err)) {
                     this.outputRelevantHelp(argv);
                 }
-                return Command.reportHelp(this, err);
+                return this.reportHelp(err);
             }
             if (Command.isVersionTriggered(err)) {
                 return;
@@ -206,58 +198,29 @@ class Command {
             if (Command.isUnknownCommand(err) || Command.isExcessCommands(err)) {
                 return this.unknownCommand(argv);
             }
-            return await (0, cli_shared_4.exitOnError)(this.ui, err);
+            return await (0, cli_shared_1.exitOnError)(this.ui, err);
         }
     }
-    getDefinedCommands() {
-        return this.cmd.commands;
-    }
-    getDefinedOptions() {
-        return this.options;
-    }
-    getCmdName() {
-        return this.cmd.name();
-    }
-    getCommands() {
-        return this.commands;
-    }
     environmentOption() {
-        this.option('-e, --environment [environment]', cli_shared_3.Text.env.option(cli_shared_2.DEFAULT_ENVIRONMENT_OPTION, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
-        this.precondition(() => {
-            this.cmd.opts().environment = (0, environment_1.checkEnvironmentOption)(this.cmd.opts().environment || cli_shared_2.DEFAULT_ENVIRONMENT_OPTION);
-            return { appEnv: this.cmd.opts().environment };
+        return this.option('-e, --environment [environment]', cli_shared_1.Text.env.option(cli_shared_1.DEFAULT_ENVIRONMENT_OPTION, cli_shared_1.VALID_ENVIRONMENT_OPTIONS)).precondition(async (...args) => {
+            const environment = (0, environment_1.checkEnvironmentOption)(last(args).environment || cli_shared_1.DEFAULT_ENVIRONMENT_OPTION);
+            return { environment };
         });
-        return this;
-    }
-    siteAndProductOption() {
-        this.option('-s, --site [site]', cli_shared_3.Text.optionSite);
-        this.option('-p, --product [product]', cli_shared_3.Text.optionProduct(cli_shared_2.SUPPORTED_PRODUCTS));
-        this.precondition(() => {
-            return this.validateContext();
-        });
-        return this;
     }
     jsonOption() {
-        this.option('--json', cli_shared_3.Text.optionJson);
-        return this;
+        return this.option('--json', cli_shared_1.Text.optionJson, false);
     }
     requireNoAuthentication() {
-        this.requiresAuthentication = false;
-        return this;
+        return this.clone({ requiresAuthentication: false });
     }
     requireNoAnalyticsConsent() {
-        this.requiresAnalyticsConsent = false;
-        return this;
+        return this.clone({ requiresAnalyticsConsent: false });
     }
     satisfiesNonInteractiveOptions(options) {
         const optionKeys = Object.keys(options);
         const requiredOptionKeys = [...this.requiredOptionFlags.map((arg) => new commander_1.Option(arg).attributeName())];
         return requiredOptionKeys.every((requiredOption) => optionKeys.includes(requiredOption));
     }
-    configureOutput(obj) {
-        this.cmd.configureOutput(obj);
-        return this;
-    }
     async checkPreconditions(...args) {
         let attributes = {};
         for (const precondition of this.preconditionFn) {
@@ -268,8 +231,7 @@ class Command {
     }
     async checkAuthentication() {
         if (this.requiresAuthentication) {
-            const credentialsGetter = (0, cli_shared_1.getCredentialStore)(this.ui);
-            return credentialsGetter.getCredentials();
+            return this.credentialStore.getCredentials();
         }
         return undefined;
     }
@@ -281,40 +243,20 @@ class Command {
             return;
         }
         if (semver_1.default.gt(this.cliDetails.latest, this.cliDetails.version)) {
-            this.ui.warn(cli_shared_3.Text.error.outdatedCLIVersion(this.cliDetails.version, this.cliDetails.latest));
+            this.ui.warn(cli_shared_1.Text.error.outdatedCLIVersion(this.cliDetails.version, this.cliDetails.latest));
         }
         else if (semver_1.default.gt(this.cliDetails.version, this.cliDetails.latest)) {
             (0, version_info_1.clearVersionCache)(this.cliDetails.name);
         }
     }
     isLatestVersion() {
-        if (!this.cliDetails ||
-            !this.cliDetails.latest ||
-            !semver_1.default.valid(this.cliDetails.version) ||
-            !semver_1.default.valid(this.cliDetails.latest)) {
+        var _a, _b;
+        const version = semver_1.default.valid((_a = this.cliDetails) === null || _a === void 0 ? void 0 : _a.version);
+        const latest = semver_1.default.valid((_b = this.cliDetails) === null || _b === void 0 ? void 0 : _b.latest);
+        if (!version || !latest) {
             return false;
         }
-        if (semver_1.default.eq(this.cliDetails.version, this.cliDetails.latest)) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    async validateContext() {
-        if (this.cmd.opts().product) {
-            const capitalizedProduct = (0, cli_shared_2.capitalizeProduct)(this.cmd.opts().product);
-            if (!(0, cli_shared_2.isSupportedProduct)(capitalizedProduct)) {
-                throw new cli_shared_3.ValidationError(cli_shared_3.Text.error.invalidProduct);
-            }
-            this.cmd.opts().product = capitalizedProduct;
-        }
-        let trySite;
-        if (this.cmd.opts().site) {
-            trySite = this.cmd.opts().site;
-        }
-        this.cmd.opts().site = trySite ? (0, cli_shared_2.validateSite)(trySite, this.cmd.opts().product) : undefined;
-        return { product: this.cmd.opts().product };
+        return semver_1.default.eq(version, latest);
     }
     findLastValidCommand(argv) {
         let command = this.cmd;
@@ -333,6 +275,22 @@ class Command {
             index: 1
         };
     }
+    outputRelevantHelp(argv) {
+        this.findLastValidCommand(argv).command.outputHelp();
+    }
+    async reportHelp(cmdError) {
+        try {
+            let cred = (0, anon_user_id_1.getAnonId)(true);
+            try {
+                cred = await this.credentialStore.getCredentials();
+            }
+            catch (noTokenError) {
+            }
+            this.analyticsClient.reportSuccess('help', cred, { command: cmdError.getCommandName() });
+        }
+        catch (err) {
+        }
+    }
     async unknownCommand(argv) {
         const errorMessage = [];
         const { command: lastCommand, index: lastCommandIndex } = this.findLastValidCommand(argv);
@@ -343,14 +301,14 @@ class Command {
             return cmd._hidden !== true;
         })
             .map((cmd) => cmd.name()));
-        const errorText = cli_shared_3.Text.invalidCmd(argv.slice(2, lastCommandIndex + 2).join(' '));
+        const errorText = cli_shared_1.Text.invalidCmd(argv.slice(2, lastCommandIndex + 2).join(' '));
         if (suggestions.length) {
             errorMessage.push(`Did you mean:`);
             const suggestionsPrefixed = suggestions.map((suggestion) => [...argv.slice(2, lastCommandIndex + 1), suggestion].join(' '));
             errorMessage.push(suggestionsPrefixed.join('\n'));
         }
-        errorMessage.push(cli_shared_3.Text.invalidCmdHelp);
-        return await (0, cli_shared_4.exitOnError)(this.ui, new Error(errorText), errorMessage.join('\n\n'));
+        errorMessage.push(cli_shared_1.Text.invalidCmdHelp);
+        return await (0, cli_shared_1.exitOnError)(this.ui, new Error(errorText), errorMessage.join('\n\n'));
     }
     assertValidArgs(argv) {
         const args = argv.slice(2);
@@ -370,24 +328,11 @@ class Command {
             }
         }
     }
+    getAutocompleteConfig() {
+        return getAutocompleteConfig(this.cmd);
+    }
 }
 exports.Command = Command;
-_a = Command;
-Command.reportHelp = async (cmd, cmdError) => {
-    try {
-        let cred = (0, anon_user_id_1.getAnonId)(true);
-        try {
-            const credentialsGetter = (0, cli_shared_1.getCredentialStore)(cmd.ui);
-            cred = await credentialsGetter.getCredentials();
-        }
-        catch (noTokenError) {
-        }
-        cmd.analyticsClient.reportSuccess('help', cred, { command: cmdError.getCommandName() });
-    }
-    catch (err) {
-    }
-    return;
-};
 Command.isError = (cmdError) => {
     return cmdError.exitCode === 1;
 };
@@ -406,3 +351,37 @@ Command.isExcessCommands = (cmdError) => {
 Command.concatenateNames = (parent, subcommand) => {
     return parent ? `${parent}:${subcommand}` : subcommand;
 };
+const help = new commander_1.default.Help();
+function getOptionData(option) {
+    let requireUserArg = false;
+    if (/<*>/.test(option.flags) || /\[*\]/.test(option.flags)) {
+        requireUserArg = true;
+    }
+    return {
+        requireUserArg
+    };
+}
+function getOptionsData(command) {
+    const commandOptions = {};
+    for (const opt of help.visibleOptions(command)) {
+        if (opt.long !== undefined) {
+            commandOptions[opt.long] = getOptionData(opt);
+        }
+    }
+    commandOptions['--help'] = {
+        requireUserArg: false
+    };
+    return commandOptions;
+}
+function getAutocompleteConfig(cmd) {
+    const commands = {};
+    for (const command of help.visibleCommands(cmd)) {
+        if (command.name() === 'help') {
+            continue;
+        }
+        commands[command.name()] = getOptionsData(command);
+    }
+    const options = getOptionsData(cmd);
+    return { commands, options };
+}
+exports.getAutocompleteConfig = getAutocompleteConfig;

package/out/command-line/controller/feedback-controller.d.ts

@@ -1,9 +1,9 @@
-import { UI, FeedbackPostClient } from '@forge/cli-shared';
+import { FeedbackPostClient, CredentialGetter } from '@forge/cli-shared';
 import { Response } from 'node-fetch';
 export declare class FeedbackController {
-    private readonly ui;
+    private readonly credentialStore;
     private readonly feedbackPostClient;
-    constructor(ui: UI, feedbackPostClient: FeedbackPostClient);
+    constructor(credentialStore: CredentialGetter, feedbackPostClient: FeedbackPostClient);
     sendFeedback(feedback: string): Promise<Response>;
 }
 //# sourceMappingURL=feedback-controller.d.ts.map

package/out/command-line/controller/feedback-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feedback-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/feedback-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,kBAAkB,EAAsB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAA3C,EAAE,EAAE,EAAE,EAAmB,kBAAkB,EAAE,kBAAkB;IAE/E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAQ/D"}
+{"version":3,"file":"feedback-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/feedback-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBADlB,eAAe,EAAE,gBAAgB,EACjC,kBAAkB,EAAE,kBAAkB;IAG5C,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAQ/D"}

package/out/command-line/controller/feedback-controller.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeedbackController = void 0;
-const cli_shared_1 = require("@forge/cli-shared");
 class FeedbackController {
-    constructor(ui, feedbackPostClient) {
-        this.ui = ui;
+    constructor(credentialStore, feedbackPostClient) {
+        this.credentialStore = credentialStore;
         this.feedbackPostClient = feedbackPostClient;
     }
     async sendFeedback(feedback) {
-        const { email } = await (0, cli_shared_1.getCredentialStore)(this.ui).getCredentials();
+        const { email } = await this.credentialStore.getCredentials();
         return this.feedbackPostClient.sendFeedback({
             summary: feedback.length <= 50 ? feedback : feedback.slice(0, 50) + '...',
             description: feedback,

package/out/command-line/controller/install-controller.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AppConfigProvider, ConfigFile, UI } from '@forge/cli-shared';
+import { AppConfigProvider, ConfigFile, UI, FeatureFlagReader } from '@forge/cli-shared';
 import { URL } from 'url';
 import { InstallAppSiteCommand } from '../../installations/install-app-site';
 import { InstallationService } from '../../service/installation-service';
@@ -22,7 +22,8 @@ export declare class InstallController {
     private readonly installAppSiteCommand;
     private readonly installationService;
     private readonly installView;
-    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, ui: UI, installAppSiteCommand: InstallAppSiteCommand, installationService: InstallationService, installView: InstallView);
+    private readonly featureFlags;
+    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, ui: UI, installAppSiteCommand: InstallAppSiteCommand, installationService: InstallationService, installView: InstallView, featureFlags: FeatureFlagReader);
     private securityPrompt;
     private installOrUpgrade;
     private promptForProduct;

package/out/command-line/controller/install-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EAUH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAiBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAQD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBALX,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW;YAG7B,cAAc;YAmBd,gBAAgB;YAsChB,gBAAgB;YAKhB,aAAa;YAeb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAuFpC"}
+{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EAUF,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAiBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAQD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBANZ,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,iBAAiB;YAGpC,cAAc;YAmBd,gBAAgB;YAsChB,gBAAgB;YAKhB,aAAa;YAeb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAsGpC"}

package/out/command-line/controller/install-controller.js

@@ -9,13 +9,14 @@ class NoDeploymentError extends Error {
 }
 exports.NoDeploymentError = NoDeploymentError;
 class InstallController {
-    constructor(appConfigProvider, configFile, ui, installAppSiteCommand, installationService, installView) {
+    constructor(appConfigProvider, configFile, ui, installAppSiteCommand, installationService, installView, featureFlags) {
         this.appConfigProvider = appConfigProvider;
         this.configFile = configFile;
         this.ui = ui;
         this.installAppSiteCommand = installAppSiteCommand;
         this.installationService = installationService;
         this.installView = installView;
+        this.featureFlags = featureFlags;
     }
     async securityPrompt(site) {
         this.ui.info(cli_shared_1.Text.install.security.banner(site.host));
@@ -114,11 +115,17 @@ class InstallController {
         if ((0, cli_shared_1.isSecureSite)(site)) {
             await this.securityPrompt(site);
         }
+        const hasDefaultReadMeScope = await this.featureFlags.readMeScopeAddedByXLS();
+        this.ui.debug(`appId ${id} has read:me scope added by default?: ${hasDefaultReadMeScope}`);
         const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
-        if (!(environmentPermissions === null || environmentPermissions === void 0 ? void 0 : environmentPermissions.scopes) || environmentPermissions.scopes.length === 0) {
+        if (!environmentPermissions ||
+            (hasDefaultReadMeScope && (!(environmentPermissions === null || environmentPermissions === void 0 ? void 0 : environmentPermissions.scopes) || environmentPermissions.scopes.length === 0))) {
             this.ui.error(new NoDeploymentError(environment), { pad: false });
             return;
         }
+        if (environmentPermissions.scopes === undefined) {
+            environmentPermissions.scopes = [];
+        }
         const { scopes: environmentScopes } = environmentPermissions;
         const [{ permissions }, manifestEgressEntries] = await Promise.all([
             this.configFile.readConfig(),

package/out/command-line/dependency-injection.d.ts

@@ -27,7 +27,7 @@ import { StubController } from './controller/stubController';
 import { PrerequisitesController } from './controller/prerequisites-controller';
 export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Promise<{
     ui: CommandLineUI;
-    cmd: Command;
+    cmd: Command<[], import("./command").DefaultOpts>;
     configFile: ConfigFile;
     appConfigProvider: import("@forge/cli-shared").AppConfigProvider;
     graphqlGateway: string;

package/out/command-line/dependency-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAMA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAMhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAKhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiSvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAMA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAMhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAKhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkSvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

package/out/command-line/dependency-injection.js

@@ -83,10 +83,10 @@ const getDependencies = async (cliDetails) => {
     const liteLintService = new lite_lint_service_1.LiteLintService();
     const analyticsSettingsView = new analytics_settings_view_1.AnalyticsSettingsView(ui);
     const preCommandController = new pre_command_controller_1.PreCommandController(liteLintService, liteLintView, configFile, cachedConfigService, analyticsSettingsView, settingsView);
-    cmd = new command_1.Command(ui, analyticsClientReporter, preCommandController, cliDetails);
     const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
     const credentialStore = (0, cli_shared_1.getCredentialStore)(ui);
     const authenticator = new cli_shared_1.PersonalTokenAuthenticator(credentialStore);
+    cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore);
     const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
     await (0, sentry_1.initialiseSentry)(featureFlagService, cachedConfigService);
     const createGraphQLClient = (auth) => {
@@ -144,9 +144,9 @@ const getDependencies = async (cliDetails) => {
     const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
     const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
     const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient);
-    const installView = new install_view_1.InstallView(ui);
-    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView);
-    const feedbackController = new feedback_controller_1.FeedbackController(ui, feedbackPostClient);
+    const installView = new install_view_1.InstallView(ui, featureFlagService);
+    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView, featureFlagService);
+    const feedbackController = new feedback_controller_1.FeedbackController(credentialStore, feedbackPostClient);
     const lintService = new lint_service_1.LintService(configFile, fileReader);
     const lintView = new lint_view_1.LintView(ui);
     const lintController = new lint_controller_1.LintController(lintService, lintView);

package/out/command-line/index.d.ts

@@ -1,5 +1,4 @@
-import { CLIDetails } from '@forge/cli-shared';
 import { Dependencies } from './dependency-injection';
-export declare const registerCommands: (deps: Dependencies, cliDetails?: CLIDetails) => void;
+export declare function registerCommands(deps: Dependencies): void;
 export declare const main: () => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/out/command-line/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwBvE,eAAO,MAAM,gBAAgB,SAAU,YAAY,eAAe,UAAU,KAAG,IAyB9E,CAAC;AAiBF,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAezC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAkBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAclD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAczC,CAAC"}