@forge/cli 0.0.0-experimental-383053a → 0.0.0-experimental-3b4aabe

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

@@ -1,9 +1,10 @@
-import commander, { CommanderError } from 'commander';
+import commander, { CommanderError, OutputConfiguration } from 'commander';
 import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
 import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
 import { UI } from '@forge/cli-shared';
 import { CLIDetails } from '@forge/cli-shared';
 import { PreCommandController } from './controller/pre-command-controller';
+import { StubController } from './controller/stubController';
 declare type PreconditionCallback = (...args: any[]) => any;
 declare type ActionResult = Promise<{
     creds?: PersonalApiCredentialsValidated;
@@ -23,17 +24,28 @@ export declare class Command {
     private readonly preCommandController;
     private readonly cliDetails;
     private readonly expectsArguments;
+    private readonly analyticsName?;
     get verbose(): boolean;
-    static reportHelp: (program: Command, cmdError: WrapperError) => Promise<Error | undefined>;
+    static reportHelp: (cmd: Command, cmdError: WrapperError) => Promise<undefined>;
     private static isError;
     private static isHelpTriggered;
+    private static isVersionTriggered;
+    private static isUnknownCommand;
+    private static isExcessCommands;
+    private static concatenateNames;
     private readonly cmd;
     private newCommand;
     private requiresAuthentication;
+    private requiresAnalyticsConsent;
+    private requiredOptionFlags;
     private preconditionFn;
-    constructor(ui: UI, analyticsClient: AnalyticsClientReporter, preCommandController: PreCommandController, cliDetails: CLIDetails | undefined, cmd?: commander.Command, expectsArguments?: boolean);
+    private options;
+    private commands;
+    constructor(ui: UI, analyticsClient: AnalyticsClientReporter, preCommandController: PreCommandController, cliDetails: CLIDetails | undefined, cmd?: commander.Command, expectsArguments?: boolean, analyticsName?: string | undefined);
     version(str: string, flags?: string): this;
-    command(name: string): Command;
+    command(name: string, opts?: commander.CommandOptions): Command;
+    deprecatedCommand(oldName: string, newName: string, stubController: StubController): void;
+    getAnalyticsName(): string | undefined;
     deprecate(newCommand: string): this;
     description(desc: string): this;
     option(flags: string, description: string, defaultValue?: any): this;
@@ -41,21 +53,29 @@ export declare class Command {
     precondition(fn: PreconditionCallback): this;
     requireManifestFile(): this;
     requireAppId(): this;
+    nonInteractiveOption(...args: string[]): this;
     action(fn: (...args: any[]) => ActionResult): this;
-    parse(argv: string[]): boolean;
-    onUnknownCommand(listener: ([command]: string[]) => void): this;
+    parse(argv: string[]): Promise<undefined>;
     exitOverride: (listener: (err: any) => void) => this;
-    help(): void;
     getDefinedCommands(): commander.Command[];
+    getDefinedOptions(): commander.Option[];
+    getCmdName(): string;
+    getCommands(): Command[];
     environmentOption(): this;
     siteAndProductOption(): this;
     requireNoAuthentication(): this;
+    requireNoAnalyticsConsent(): this;
+    private satisfiesNonInteractiveOptions;
     actionProcessor: (cb: (...cbArgs: any[]) => ActionResult, ...args: any[]) => Promise<void>;
-    private hasArguments;
+    configureOutput(obj: OutputConfiguration): this;
     private checkPreconditions;
     private checkAuthentication;
     private checkVersion;
     private validateContext;
+    private findLastValidCommand;
+    private outputRelevantHelp;
+    private unknownCommand;
+    private assertValidArgs;
 }
 export {};
 //# sourceMappingURL=command.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}

package/out/command-line/command.js

@@ -12,6 +12,7 @@ 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");
+const command_suggestion_service_1 = tslib_1.__importDefault(require("../service/command-suggestion-service"));
 class WrapperError extends commander_1.CommanderError {
     constructor(error, commandName) {
         super(error.exitCode, error.code, error.message);
@@ -24,19 +25,25 @@ const isErrorWithAnalytics = (e) => {
     return e.getAttributes !== undefined;
 };
 class Command {
-    constructor(ui, analyticsClient, preCommandController, cliDetails, cmd, expectsArguments = false) {
+    constructor(ui, analyticsClient, preCommandController, cliDetails, cmd, expectsArguments = false, analyticsName) {
         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.requiredOptionFlags = [];
         this.preconditionFn = [];
+        this.options = [];
+        this.commands = [];
         this.exitOverride = (listener) => {
             this.cmd.exitOverride((err) => listener(err));
             return this;
         };
         this.actionProcessor = async (cb, ...args) => {
+            var _a, _b, _c;
             if (this.newCommand) {
                 this.ui.error(new Error(cli_shared_3.Text.deprecate(this.newCommand)));
             }
@@ -44,9 +51,18 @@ class Command {
             let cred = anon_user_id_1.getAnonId(true);
             let attributes = {};
             try {
-                if (!this.expectsArguments && args.length > 1) {
+                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) {
+                    if (!this.satisfiesNonInteractiveOptions(options)) {
+                        throw new cli_shared_3.ValidationError(cli_shared_3.Text.nonInteractive.error.missingRequiredOption(cmdName, this.requiredOptionFlags));
+                    }
+                }
+                if (this.requiresAnalyticsConsent) {
+                    await this.preCommandController.verifyAnalyticsPreferences((_a = options === null || options === void 0 ? void 0 : options.nonInteractive) !== null && _a !== void 0 ? _a : false)();
+                }
                 this.checkVersion();
                 if (this.cliDetails) {
                     attributes = { version: this.cliDetails.version, latest: this.cliDetails.latest };
@@ -64,47 +80,61 @@ class Command {
                         cred = result.creds;
                     }
                 }
-                this.analyticsClient.reportSuccess(cmdName, cred, attributes);
+                this.analyticsClient.reportSuccess((_b = this.analyticsName) !== null && _b !== void 0 ? _b : cmdName, cred, attributes);
             }
             catch (e) {
                 if (isErrorWithAnalytics(e)) {
                     attributes = Object.assign(Object.assign({}, e.getAttributes()), attributes);
                 }
                 if (e instanceof errors_1.DeferredErrors) {
-                    e.getErrors().forEach((error) => this.analyticsClient.reportFailure(cmdName, cred, attributes, error));
+                    e.getErrors().forEach((error) => { var _a; return this.analyticsClient.reportFailure((_a = this.analyticsName) !== null && _a !== void 0 ? _a : cmdName, cred, attributes, error); });
                     process.exit(1);
                 }
                 else {
-                    this.analyticsClient.reportFailure(cmdName, cred, attributes, e);
+                    this.analyticsClient.reportFailure((_c = this.analyticsName) !== null && _c !== void 0 ? _c : cmdName, cred, attributes, e);
                     cli_shared_4.exitOnError(this.ui)(e);
                 }
             }
         };
-        this.hasArguments = () => {
-            return this.cmd.rawArgs && this.cmd.rawArgs.length > 2;
+        this.outputRelevantHelp = (argv) => {
+            this.findLastValidCommand(argv).command.outputHelp();
         };
         this.cmd = cmd || new commander_1.default.Command();
     }
     get verbose() {
-        return this.cmd.verbose;
+        return this.cmd.opts().verbose;
     }
     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) {
+    command(name, opts) {
         const cmd = this.cmd
-            .command(name)
+            .command(name, opts)
             .allowUnknownOption(false)
-            .option('--verbose', cli_shared_3.Text.optionVerbose);
+            .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);
+        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);
         return subCommand;
     }
+    deprecatedCommand(oldName, newName, stubController) {
+        this.command(oldName, { hidden: true })
+            .requireNoAuthentication()
+            .requireNoAnalyticsConsent()
+            .action(() => stubController.run({ oldName, newName }));
+    }
+    getAnalyticsName() {
+        return this.analyticsName;
+    }
     deprecate(newCommand) {
         this.newCommand = newCommand;
         return this;
@@ -115,6 +145,14 @@ class Command {
     }
     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);
         return this;
     }
     precondition(fn) {
@@ -129,35 +167,60 @@ class Command {
         this.precondition(this.preCommandController.verifyManifestExistsWithAppConfig());
         return this;
     }
-    action(fn) {
-        this.cmd.action((...args) => this.actionProcessor(fn, ...args));
+    nonInteractiveOption(...args) {
+        this.requiredOptionFlags = args;
+        this.cmd.option('--non-interactive', cli_shared_3.Text.nonInteractive.description);
         return this;
     }
-    parse(argv) {
-        this.cmd.parse(argv);
-        return this.hasArguments();
-    }
-    onUnknownCommand(listener) {
-        this.cmd.on('command:*', listener);
+    action(fn) {
+        this.cmd.action((...args) => this.actionProcessor(fn, ...args));
         return this;
     }
-    help() {
-        this.cmd.help();
+    async parse(argv) {
+        try {
+            this.assertValidArgs(argv);
+            this.cmd.parse(argv);
+        }
+        catch (err) {
+            if (Command.isHelpTriggered(err)) {
+                if (Command.isError(err)) {
+                    this.outputRelevantHelp(argv);
+                }
+                return Command.reportHelp(this, err);
+            }
+            if (Command.isVersionTriggered(err)) {
+                return;
+            }
+            if (Command.isUnknownCommand(err) || Command.isExcessCommands(err)) {
+                this.unknownCommand(argv);
+                return;
+            }
+            return cli_shared_4.exitOnError(this.ui)(err);
+        }
     }
     getDefinedCommands() {
         return this.cmd.commands;
     }
+    getDefinedOptions() {
+        return this.options;
+    }
+    getCmdName() {
+        return this.cmd.name();
+    }
+    getCommands() {
+        return this.commands;
+    }
     environmentOption() {
-        this.cmd.option('-e, --environment [environment]', cli_shared_3.Text.env.option(cli_shared_2.DEFAULT_ENVIRONMENT_OPTION, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
+        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.environment = environment_1.checkEnvironmentOption(this.cmd.environment || cli_shared_2.DEFAULT_ENVIRONMENT_OPTION);
-            return { appEnv: this.cmd.environment };
+            this.cmd.opts().environment = environment_1.checkEnvironmentOption(this.cmd.opts().environment || cli_shared_2.DEFAULT_ENVIRONMENT_OPTION);
+            return { appEnv: this.cmd.opts().environment };
         });
         return this;
     }
     siteAndProductOption() {
-        this.cmd.option('-s, --site [site]', cli_shared_3.Text.optionSite);
-        this.cmd.option('-p, --product [product]', cli_shared_3.Text.optionProduct(cli_shared_2.SUPPORTED_PRODUCTS));
+        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();
         });
@@ -167,6 +230,19 @@ class Command {
         this.requiresAuthentication = false;
         return this;
     }
+    requireNoAnalyticsConsent() {
+        this.requiresAnalyticsConsent = false;
+        return this;
+    }
+    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) {
@@ -197,41 +273,94 @@ class Command {
         }
     }
     async validateContext() {
-        if (this.cmd.product) {
-            const capitalizedProduct = cli_shared_2.capitalizeProduct(this.cmd.product);
+        if (this.cmd.opts().product) {
+            const capitalizedProduct = cli_shared_2.capitalizeProduct(this.cmd.opts().product);
             if (!cli_shared_2.isSuppportedProduct(capitalizedProduct)) {
                 throw new cli_shared_3.ValidationError(cli_shared_3.Text.error.invalidProduct);
             }
-            this.cmd.product = capitalizedProduct;
+            this.cmd.opts().product = capitalizedProduct;
         }
         let trySite;
-        if (this.cmd.site) {
-            trySite = this.cmd.site;
+        if (this.cmd.opts().site) {
+            trySite = this.cmd.opts().site;
         }
-        this.cmd.site = trySite ? cli_shared_2.validateSite(trySite) : undefined;
-        return { product: this.cmd.product };
+        this.cmd.opts().site = trySite ? cli_shared_2.validateSite(trySite) : undefined;
+        return { product: this.cmd.opts().product };
     }
-}
-exports.Command = Command;
-Command.reportHelp = async (program, cmdError) => {
-    if (Command.isError(cmdError)) {
-        return cmdError;
+    findLastValidCommand(argv) {
+        let command = this.cmd;
+        for (const [index, arg] of argv.slice(2).entries()) {
+            const commandMatch = command.commands.find((cmd) => cmd.name() === arg);
+            if (!commandMatch) {
+                return {
+                    command,
+                    index: index + 1
+                };
+            }
+            command = commandMatch;
+        }
+        return {
+            command,
+            index: 1
+        };
     }
-    if (Command.isHelpTriggered(cmdError)) {
-        try {
-            let cred = anon_user_id_1.getAnonId(true);
-            try {
-                const credentialsGetter = cli_shared_1.getCredentialsStoreProvider(program.ui);
-                cred = await credentialsGetter.getCredentials();
+    unknownCommand(argv) {
+        const errorMessage = [];
+        const { command: lastCommand, index: lastCommandIndex } = this.findLastValidCommand(argv);
+        const badLastArg = argv[lastCommandIndex + 1];
+        const suggestionService = new command_suggestion_service_1.default();
+        const suggestions = suggestionService.getSuggestions(badLastArg, lastCommand.commands
+            .filter((cmd) => {
+            return cmd._hidden !== true;
+        })
+            .map((cmd) => cmd.name()));
+        errorMessage.push(cli_shared_3.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);
+            this.ui.info(errorMessage.join('\n\n'));
+        }
+        else {
+            errorMessage.push(cli_shared_3.Text.invalidCmdHelp);
+            this.ui.error(new Error(errorMessage.join(' ')));
+        }
+    }
+    assertValidArgs(argv) {
+        const args = argv.slice(2);
+        let commands = this.cmd.commands;
+        while (args[0] && !args[0].startsWith('-')) {
+            if (args[0] === 'help') {
+                return;
             }
-            catch (noTokenError) {
+            const commandMatch = commands.find((cmd) => cmd.name() === args[0]);
+            if (!commandMatch) {
+                throw new commander_1.default.CommanderError(1, 'commander.unknownCommand', `error: unknown command '${args[0]}'.`);
+            }
+            commands = commandMatch.commands;
+            args.shift();
+            if (commands.length === 0) {
+                break;
             }
-            program.analyticsClient.reportSuccess('help', cred, { command: cmdError.getCommandName() });
         }
-        catch (err) {
+    }
+}
+exports.Command = Command;
+Command.reportHelp = async (cmd, cmdError) => {
+    try {
+        let cred = anon_user_id_1.getAnonId(true);
+        try {
+            const credentialsGetter = cli_shared_1.getCredentialsStoreProvider(cmd.ui);
+            cred = await credentialsGetter.getCredentials();
         }
+        catch (noTokenError) {
+        }
+        cmd.analyticsClient.reportSuccess('help', cred, { command: cmdError.getCommandName() });
+    }
+    catch (err) {
     }
-    return undefined;
+    return;
 };
 Command.isError = (cmdError) => {
     return cmdError.exitCode === 1;
@@ -239,3 +368,15 @@ Command.isError = (cmdError) => {
 Command.isHelpTriggered = (cmdError) => {
     return ['commander.helpDisplayed', 'commander.help'].includes(cmdError.code);
 };
+Command.isVersionTriggered = (cmdError) => {
+    return 'commander.version' === cmdError.code;
+};
+Command.isUnknownCommand = (cmdError) => {
+    return cmdError.code === 'commander.unknownCommand';
+};
+Command.isExcessCommands = (cmdError) => {
+    return cmdError.code === 'commander.excessArguments';
+};
+Command.concatenateNames = (parent, subcommand) => {
+    return parent ? `${parent}:${subcommand}` : subcommand;
+};

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

@@ -0,0 +1,2 @@
+export declare function assertUnreachable(x: never): never;
+//# sourceMappingURL=assertUnreachable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"assertUnreachable.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/assertUnreachable.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAEjD"}

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

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertUnreachable = void 0;
+function assertUnreachable(x) {
+    throw new Error("Didn't expect to get here");
+}
+exports.assertUnreachable = assertUnreachable;

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

@@ -3,9 +3,10 @@ export declare enum Argument {
     install = "install",
     uninstall = "uninstall"
 }
+export declare function assertNodeVersionSupported(version?: string): void;
 export declare class AutocompleteController {
     private readonly ui;
     constructor(ui: UI);
-    run(arg: Argument): Promise<void>;
+    run(arg: string): Promise<void>;
 }
 //# sourceMappingURL=autocomplete-controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"autocomplete-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/autocomplete-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAG7C,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAW/C"}
+{"version":3,"file":"autocomplete-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/autocomplete-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAK9D,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,SAAS,cAAc;CACxB;AAQD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,MAAyB,GAAG,IAAI,CAInF;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAwB7C"}

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

@@ -1,28 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutocompleteController = exports.Argument = void 0;
+exports.AutocompleteController = exports.assertNodeVersionSupported = exports.Argument = void 0;
+const tslib_1 = require("tslib");
+const semver_1 = tslib_1.__importDefault(require("semver"));
 const cli_shared_1 = require("@forge/cli-shared");
 const autocomplete_1 = require("../../autocomplete");
+const assertUnreachable_1 = require("./assertUnreachable");
+const getNodeVersion_1 = require("./getNodeVersion");
 var Argument;
 (function (Argument) {
     Argument["install"] = "install";
     Argument["uninstall"] = "uninstall";
 })(Argument = exports.Argument || (exports.Argument = {}));
+function assertIsValidArgument(arg) {
+    if (!(arg in Argument)) {
+        throw new cli_shared_1.ValidationError(cli_shared_1.Text.autocomplete.error.badArg(arg));
+    }
+}
+function assertNodeVersionSupported(version = getNodeVersion_1.getNodeVersion()) {
+    if (semver_1.default.eq(version, '12.5.0') || semver_1.default.eq(version, '12.6.0')) {
+        throw new Error(cli_shared_1.Text.autocomplete.error.unsupportedNodeVersion);
+    }
+}
+exports.assertNodeVersionSupported = assertNodeVersionSupported;
 class AutocompleteController {
     constructor(ui) {
         this.ui = ui;
     }
     async run(arg) {
+        assertIsValidArgument(arg);
         if (arg === Argument.install) {
-            if (await this.ui.confirm(cli_shared_1.Text.autocomplete.confirmInstalling)) {
-                this.ui.info(cli_shared_1.Text.autocomplete.installing);
+            assertNodeVersionSupported();
+            if (!(await this.ui.confirm(cli_shared_1.Text.autocomplete.confirmInstalling))) {
+                return;
+            }
+            this.ui.info(cli_shared_1.Text.autocomplete.installing);
+            try {
                 autocomplete_1.autocomplete.setupShellInitFile();
             }
+            catch (e) {
+                throw new Error(cli_shared_1.Text.autocomplete.error.unsupportedShell);
+            }
         }
         else if (arg === Argument.uninstall) {
             this.ui.info(cli_shared_1.Text.autocomplete.uninstalling);
             autocomplete_1.autocomplete.cleanupShellInitFile();
         }
+        else {
+            assertUnreachable_1.assertUnreachable(arg);
+        }
     }
 }
 exports.AutocompleteController = AutocompleteController;

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

@@ -2,6 +2,7 @@ import { AppConfigProvider, ConfigFile, HiddenError } from '@forge/cli-shared';
 import { LintService } from '../../service/lint-service';
 import { DeployView } from '../view/deploy-view';
 import { InstallationService } from '../../service/installation-service';
+import { MigrationKeysService } from '../../service/migration-keys-service';
 import { ResourcePackagingService } from '../../service/resource-packaging-service';
 import { ErrorWithAnalytics } from '../command';
 import { PackageUploadDeployCommand } from '../../deploy';
@@ -15,18 +16,28 @@ export declare class DeployLintFailureError extends HiddenError implements Error
     constructor(scopes: string[]);
     getAttributes(): Record<string, string[]>;
 }
+export declare class InvalidConnectKeyError extends HiddenError implements ErrorWithAnalytics {
+    private readonly reason;
+    constructor(reason: string);
+    getAttributes(): Record<string, string>;
+}
 export declare class DeployController {
     private readonly appConfigProvider;
     private readonly configFile;
     private readonly lintService;
     private readonly installationsService;
+    private readonly migrationKeysService;
     private readonly deployView;
     private readonly packageUploadDeployCommand;
     private readonly resourcePackagingService;
-    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, resourcePackagingService: ResourcePackagingService);
+    constructor(appConfigProvider: AppConfigProvider, configFile: ConfigFile, lintService: LintService, installationsService: InstallationService, migrationKeysService: MigrationKeysService, deployView: DeployView, packageUploadDeployCommand: PackageUploadDeployCommand, resourcePackagingService: ResourcePackagingService);
+    private isMpacProductionApp;
+    private connectKeyDeleted;
+    private connectKeyChanged;
+    private validateConnectKeyChange;
     private verifyPreDeployment;
     private verifyPostDeployment;
-    run({ environment, verify }: DeployOptions): Promise<DeploymentResult>;
+    run({ environment, verify }: DeployOptions): Promise<DeploymentResult | void>;
 }
 export {};
 //# sourceMappingURL=deploy-controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBANxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;YAGvD,mBAAmB;YAkBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAsBpF"}
+{"version":3,"file":"deploy-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/deploy-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAQ,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAA+B,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE;IAItC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;CAKjD;AAED,qBAAa,sBAAuB,SAAQ,WAAY,YAAW,kBAAkB;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAGpC,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAK/C;AAED,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,0BAA0B;IAC3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB;gBAPxB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,oBAAoB,EAAE,mBAAmB,EACzC,oBAAoB,EAAE,oBAAoB,EAC1C,UAAU,EAAE,UAAU,EACtB,0BAA0B,EAAE,0BAA0B,EACtD,wBAAwB,EAAE,wBAAwB;IAGrE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;YAGX,wBAAwB;YAwBxB,mBAAmB;YAiBnB,oBAAoB;IAOrB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAsD3F"}