@forge/cli 6.5.0 → 6.6.0-next.3

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

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/command-line/environment.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,sBAAsB,cAAe,MAAM,KAAG,MAE1D,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/command-line/environment.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB,cAAe,MAAM,KAAG,MAK7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,KAAG,MAE1D,CAAC"}

package/out/command-line/environment.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkEnvironmentOption = void 0;
+exports.checkEnvironmentOption = exports.validateEnvironmentOption = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-const cli_shared_2 = require("@forge/cli-shared");
-const cli_shared_3 = require("@forge/cli-shared");
-function validateEnvironmentOption(userValue) {
-    if (!cli_shared_1.VALID_ENVIRONMENT_OPTIONS.includes(userValue)) {
-        throw new cli_shared_3.ValidationError(cli_shared_2.Text.env.invalid(cli_shared_1.VALID_ENVIRONMENT_OPTIONS));
+const ENVIRONMENT_KEY_PATTERN = /^[a-zA-Z0-9-_]+$/;
+const validateEnvironmentOption = (userValue) => {
+    if (!ENVIRONMENT_KEY_PATTERN.test(userValue)) {
+        throw new cli_shared_1.ValidationError(cli_shared_1.Text.env.invalid);
     }
     return userValue;
-}
+};
+exports.validateEnvironmentOption = validateEnvironmentOption;
 const checkEnvironmentOption = (userValue) => {
-    return (0, cli_shared_1.optionToEnvironment)(validateEnvironmentOption(userValue));
+    return (0, cli_shared_1.optionToEnvironment)((0, exports.validateEnvironmentOption)(userValue));
 };
 exports.checkEnvironmentOption = checkEnvironmentOption;

package/out/command-line/register-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAwFjC;AA0CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAwFjC;AA0CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

package/out/command-line/register-app-commands.js

@@ -15,12 +15,12 @@ var TemplateCategory;
 })(TemplateCategory || (TemplateCategory = {}));
 function ensureDirectoryDoesntExist(directory) {
     if (fs_1.default.existsSync(directory)) {
-        throw new cli_shared_1.ValidationError(cli_shared_1.Text.create.error.directory.exists(directory));
+        throw new cli_shared_2.ValidationError(cli_shared_2.Text.create.error.directory.exists(directory));
     }
 }
 function ensureValidNameLength(name) {
     if (name.length <= 0 || name.length > 50) {
-        throw new cli_shared_1.ValidationError(cli_shared_1.Text.create.error.name.tooLong());
+        throw new cli_shared_2.ValidationError(cli_shared_2.Text.create.error.name.tooLong());
     }
 }
 function directoryNameFromAppName(appName) {
@@ -36,7 +36,7 @@ exports.directoryNameFromAppName = directoryNameFromAppName;
 async function createCommandHandler(ui, createAppCommand, name, { template, directory }) {
     if (directory) {
         ensureDirectoryDoesntExist(directory);
-        ui.info(cli_shared_1.Text.create.intro(directory));
+        ui.info(cli_shared_2.Text.create.intro(directory));
     }
     else {
         directory = directoryNameFromAppName(name) || template;
@@ -44,12 +44,12 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
             ensureDirectoryDoesntExist(directory);
         }
         const currentDirectory = process.cwd();
-        ui.info(cli_shared_1.Text.create.introWithCurrentDirectory(currentDirectory));
+        ui.info(cli_shared_2.Text.create.introWithCurrentDirectory(currentDirectory));
     }
-    ui.info(cli_shared_1.Text.ctrlC);
+    ui.info(cli_shared_2.Text.ctrlC);
     if (!name) {
-        ui.info(cli_shared_1.Text.create.overviewAppName);
-        name = await ui.promptForText(cli_shared_1.Text.create.promptName);
+        ui.info(cli_shared_2.Text.create.overviewAppName);
+        name = await ui.promptForText(cli_shared_2.Text.create.promptName);
         if (!directory) {
             directory = directoryNameFromAppName(name) || template;
             if (directory) {
@@ -59,9 +59,9 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
     }
     ensureValidNameLength(name);
     if (!template) {
-        ui.info(cli_shared_1.Text.create.overviewTemplates);
-        const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_1.Text.create.waitTemplates);
-        const type = await ui.promptForList(cli_shared_1.Text.create.promptCategory, Object.values(TemplateCategory));
+        ui.info(cli_shared_2.Text.create.overviewTemplates);
+        const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_2.Text.create.waitTemplates);
+        const type = await ui.promptForList(cli_shared_2.Text.create.promptCategory, Object.values(TemplateCategory));
         const filteredTemplates = type === TemplateCategory.SHOW_ALL
             ? templates
             : templates
@@ -76,7 +76,7 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
                 }
             })
                 .map((name) => name.replace('-ui-kit', '').replace('-custom-ui', ''));
-        template = await ui.promptForList(cli_shared_1.Text.create.promptTemplate, filteredTemplates);
+        template = await ui.promptForList(cli_shared_2.Text.create.promptTemplate, filteredTemplates);
         if (type === TemplateCategory.UI_KIT) {
             template = `${template}-ui-kit`;
         }
@@ -91,35 +91,35 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
     ui.emptyLine();
     directory = directory;
     const args = { name, template, directory };
-    const result = await ui.displayProgress(() => createAppCommand.execute(args), cli_shared_1.Text.create.cmd.start, cli_shared_1.Text.create.cmd.success(name));
-    ui.info(cli_shared_1.Text.create.cmd.successDetails(directory, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
+    const result = await ui.displayProgress(() => createAppCommand.execute(args), cli_shared_2.Text.create.cmd.start, cli_shared_2.Text.create.cmd.success(name));
+    ui.info(cli_shared_2.Text.create.cmd.successDetails(directory, result.environments, cli_shared_1.environmentToOption));
     return result;
 }
 exports.createCommandHandler = createCommandHandler;
 function registerCreateCommands({ cmd, ui, commands: { createAppCommand } }) {
     cmd
         .command('create [name]')
-        .description(cli_shared_1.Text.create.cmd.desc)
-        .option('-t, --template <template name>', cli_shared_1.Text.create.optionTemplate)
-        .option('-d, --directory <directory name>', cli_shared_1.Text.create.optionDirectory)
+        .description(cli_shared_2.Text.create.cmd.desc)
+        .option('-t, --template <template name>', cli_shared_2.Text.create.optionTemplate)
+        .option('-d, --directory <directory name>', cli_shared_2.Text.create.optionDirectory)
         .action((name, options) => createCommandHandler(ui, createAppCommand, name, options));
 }
 function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand } }) {
     cmd
         .command('register [name]')
-        .description(cli_shared_1.Text.register.cmd.desc)
+        .description(cli_shared_2.Text.register.cmd.desc)
         .requireManifestFile()
         .action(async (name) => {
-        ui.info(cli_shared_1.Text.register.intro);
-        ui.info(cli_shared_1.Text.ctrlC);
+        ui.info(cli_shared_2.Text.register.intro);
+        ui.info(cli_shared_2.Text.ctrlC);
         ui.emptyLine();
         if (!name) {
-            ui.info(cli_shared_1.Text.create.overviewAppName);
-            name = await ui.promptForText(cli_shared_1.Text.create.promptName);
+            ui.info(cli_shared_2.Text.create.overviewAppName);
+            name = await ui.promptForText(cli_shared_2.Text.create.promptName);
             ui.emptyLine();
         }
-        const result = await ui.displayProgress(() => registerAppCommand.execute({ name }), cli_shared_1.Text.register.cmd.start, cli_shared_1.Text.register.cmd.success(name));
-        ui.info(cli_shared_1.Text.register.cmd.successDetails(cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
+        const result = await ui.displayProgress(() => registerAppCommand.execute({ name }), cli_shared_2.Text.register.cmd.start, cli_shared_2.Text.register.cmd.success(name));
+        ui.info(cli_shared_2.Text.register.cmd.successDetails(result.environments, cli_shared_1.environmentToOption));
         return result;
     });
 }

package/out/command-line/register-environment-commands.d.ts

@@ -1,6 +1,8 @@
-import { CommandLineUI } from '@forge/cli-shared';
+import { UI } from '@forge/cli-shared';
 import { Dependencies } from './dependency-injection';
 import { CreateEnvironmentCommand } from '../environment/create-environment';
-export declare const createEnvironmentHandler: (ui: CommandLineUI, createEnvironmentCommand: CreateEnvironmentCommand, environmentKey?: string) => Promise<void>;
+import { ListEnvironmentCommand } from '../environment/list-environment';
+export declare const createEnvironmentHandler: (ui: UI, createEnvironmentCommand: CreateEnvironmentCommand, listEnvironmentCommand: ListEnvironmentCommand, environmentKey?: string) => Promise<void>;
+export declare const listEnvironmentHandler: (ui: UI, listEnvironmentCommand: ListEnvironmentCommand) => Promise<void>;
 export declare const registerCommands: (deps: Dependencies) => void;
 //# sourceMappingURL=register-environment-commands.d.ts.map

package/out/command-line/register-environment-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-environment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAI7E,eAAO,MAAM,wBAAwB,OAC/B,aAAa,4BACS,wBAAwB,mBACjC,MAAM,kBAmBxB,CAAC;AAiBF,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAKrD,CAAC"}
+{"version":3,"file":"register-environment-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-environment-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAQ,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,eAAO,MAAM,wBAAwB,OAC/B,EAAE,4BACoB,wBAAwB,0BAC1B,sBAAsB,mBAC7B,MAAM,kBAmBxB,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAAc,EAAE,0BAA0B,sBAAsB,kBA8BlG,CAAC;AA8BF,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAMrD,CAAC"}

package/out/command-line/register-environment-commands.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = exports.createEnvironmentHandler = void 0;
+exports.registerCommands = exports.listEnvironmentHandler = exports.createEnvironmentHandler = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const COMMAND_NAME = 'environment';
-const createEnvironmentHandler = async (ui, createEnvironmentCommand, environmentKey) => {
+const createEnvironmentHandler = async (ui, createEnvironmentCommand, listEnvironmentCommand, environmentKey) => {
     ui.info(cli_shared_1.Text.createEnvironment.overview);
     ui.emptyLine();
     if (!environmentKey) {
@@ -16,7 +16,32 @@ const createEnvironmentHandler = async (ui, createEnvironmentCommand, environmen
     ui.info(cli_shared_1.Text.createEnvironment.successMessage);
 };
 exports.createEnvironmentHandler = createEnvironmentHandler;
-const registerCreateEnvironmentCommand = (parent, { ui, commands: { createEnvironmentCommand } }) => {
+const listEnvironmentHandler = async (ui, listEnvironmentCommand) => {
+    const envOrder = {
+        PRODUCTION: 1,
+        STAGING: 2,
+        DEVELOPMENT: 3
+    };
+    const environments = (await listEnvironmentCommand.execute()).sort((a, b) => a.type === b.type ? Number(a.lastDeployedAt) - Number(b.lastDeployedAt) : envOrder[a.type] - envOrder[b.type]);
+    ui.table([
+        ['type', 'Type'],
+        ['name', 'Name'],
+        ['lastDeployedAt', 'Last deployed at']
+    ], environments.map(({ type, key: name, lastDeployedAt }) => {
+        return {
+            type,
+            name,
+            lastDeployedAt
+        };
+    }), {
+        preMessage: cli_shared_1.Text.listEnvironment.overview,
+        format: {
+            lastDeployedAt: (value) => new Date(Number(value)).toISOString()
+        }
+    });
+};
+exports.listEnvironmentHandler = listEnvironmentHandler;
+const registerCreateEnvironmentCommand = (parent, { ui, commands: { createEnvironmentCommand, listEnvironmentCommand } }) => {
     parent
         .command('create')
         .requireAppId()
@@ -24,12 +49,22 @@ const registerCreateEnvironmentCommand = (parent, { ui, commands: { createEnviro
         .option('-e, --environment [environment]', cli_shared_1.Text.createEnvironment.optionEnvironmentKey)
         .nonInteractiveOption('--environment')
         .action(async ({ environment }) => {
-        await (0, exports.createEnvironmentHandler)(ui, createEnvironmentCommand, environment);
+        await (0, exports.createEnvironmentHandler)(ui, createEnvironmentCommand, listEnvironmentCommand, environment);
+    });
+};
+const registerListEnvironmentCommand = (parent, { ui, commands: { listEnvironmentCommand } }) => {
+    parent
+        .command('list')
+        .requireAppId()
+        .description(cli_shared_1.Text.listEnvironment.cmd.desc)
+        .action(async () => {
+        await (0, exports.listEnvironmentHandler)(ui, listEnvironmentCommand);
     });
 };
 const registerCommands = (deps) => {
     const { cmd } = deps;
     const environment = cmd.command(COMMAND_NAME).description(cli_shared_1.Text.environment.desc);
     registerCreateEnvironmentCommand(environment, deps);
+    registerListEnvironmentCommand(environment, deps);
 };
 exports.registerCommands = registerCommands;

package/out/command-line/register-tunnel-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAS/F,CAAC"}
+{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAU/F,CAAC"}

package/out/command-line/register-tunnel-commands.js

@@ -7,6 +7,7 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
         .command('tunnel')
         .requireAppId()
         .description(cli_shared_1.Text.tunnel.cmd)
+        .environmentOption()
         .option('-d, --debug', cli_shared_1.Text.tunnel.optionDebugger)
         .action(async (options) => {
         await tunnelController.run(options, ui);

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

@@ -1,4 +1,4 @@
-import { UI } from '@forge/cli-shared';
+import { AppEnvironmentDetails, UI } from '@forge/cli-shared';
 import { LintResult } from '@forge/lint';
 import { DeploymentResult } from '../register-deployment-commands';
 export declare class DeployView {
@@ -16,6 +16,6 @@ export declare class DeployView {
     displayMPACAppConnectKeyChangeError(mpacAppKey: string, connectKey: string): void;
     promptToContinueDeletingConnectKey(): Promise<boolean>;
     promptToContinueChangingConnectKey(): Promise<boolean>;
-    reportDeploymentProgress(id: string, environment: string, showDistributionPageLink: boolean, deployCallback: () => Promise<DeploymentResult>): Promise<DeploymentResult>;
+    reportDeploymentProgress({ appAri, name, environmentKey, environmentType }: AppEnvironmentDetails, showDistributionPageLink: boolean, deployCallback: () => Promise<DeploymentResult>): Promise<DeploymentResult>;
 }
 //# sourceMappingURL=deploy-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/deploy-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAuC,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAqB,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,SAAS,IAAI,EAAE;IAIf,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIvC,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAKlD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3C,qBAAqB,IAAI,IAAI;IAI7B,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAInG,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzD,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3E,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,wBAAwB,CACnC,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EACnB,wBAAwB,EAAE,OAAO,EACjC,cAAc,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAC9C,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}
+{"version":3,"file":"deploy-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/deploy-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA2D,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,SAAS,IAAI,EAAE;IAIf,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIvC,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAKlD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3C,qBAAqB,IAAI,IAAI;IAI7B,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAInG,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzD,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3E,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,wBAAwB,CACnC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,qBAAqB,EACxE,wBAAwB,EAAE,OAAO,EACjC,cAAc,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAC9C,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}

package/out/command-line/view/deploy-view.js

@@ -46,11 +46,11 @@ class DeployView {
     async promptToContinueChangingConnectKey() {
         return await this.ui.confirm(cli_shared_1.Text.deploy.connectKeyChange.continueChange);
     }
-    async reportDeploymentProgress(id, environment, showDistributionPageLink, deployCallback) {
-        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(environment, cli_shared_1.environmentToOption), cli_shared_1.Text.deploy.cmd.success);
-        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(environment, cli_shared_1.environmentToOption));
-        if (environment === 'production' && showDistributionPageLink) {
-            this.ui.info(cli_shared_1.Text.deploy.cmd.distributePageLink((0, cs_ari_1.parseAppAri)((0, cs_ari_1.parse)(id)).appId));
+    async reportDeploymentProgress({ appAri, name, environmentKey, environmentType }, showDistributionPageLink, deployCallback) {
+        const result = await this.ui.displayProgress(() => deployCallback(), cli_shared_1.Text.deploy.cmd.start2(name, environmentKey, environmentType, cli_shared_1.environmentToOption), cli_shared_1.Text.deploy.cmd.success);
+        this.ui.info(cli_shared_1.Text.deploy.cmd.successDetails(name, environmentKey, environmentType, cli_shared_1.environmentToOption));
+        if (environmentType === cli_shared_1.AppEnvironmentType.Production && showDistributionPageLink) {
+            this.ui.info(cli_shared_1.Text.deploy.cmd.distributePageLink((0, cs_ari_1.parseAppAri)((0, cs_ari_1.parse)(appAri)).appId));
         }
         return result;
     }

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

@@ -11,7 +11,7 @@ export declare class TunnelViewError extends UserError {
 export declare class TunnelView {
     private readonly ui;
     constructor(ui: CommandLineUI);
-    dockerPreamble(): void;
+    dockerPreamble(environmentKey?: string): void;
     getTunnelErrorHandler(exitFn: typeof exitOnError): (err: Error) => Promise<void>;
     updatePullPercent(dataBuffer: Buffer, dockerPullPercent: number): number;
     calculateProgress(progress: string, regex: RegExp, dockerPullPercent: number, clamp: number): number;

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAkB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,aAAa;IAEvC,cAAc,IAAI,IAAI;IAMtB,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAyCjB"}
+{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAGb,WAAW,EAGX,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,aAAa;IAEvC,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAW7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAyCjB"}

package/out/command-line/view/tunnel-view.js

@@ -11,8 +11,13 @@ class TunnelView {
     constructor(ui) {
         this.ui = ui;
     }
-    dockerPreamble() {
+    dockerPreamble(environmentKey) {
         this.ui.info(cli_shared_1.Text.tunnel.preamble);
+        if (environmentKey && environmentKey !== cli_shared_1.DEFAULT_ENVIRONMENT_KEY) {
+            this.ui.emptyLine();
+            this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, cli_shared_1.environmentToOption));
+            this.ui.emptyLine();
+        }
         this.ui.info(cli_shared_1.Text.ctrlC);
         this.ui.emptyLine();
     }

package/out/environment/graphql-client.d.ts

@@ -1,8 +1,16 @@
-import { GraphQLClient } from '@forge/cli-shared';
+import { AppEnvironmentType, GraphQLClient, UserError } from '@forge/cli-shared';
 import { AppEnvironmentDetails, CreateEnvironmentClient } from './create-environment';
-export declare class GraphqlClient implements CreateEnvironmentClient {
+import { ListEnvironmentClient, ListEnvironmentDetails } from './list-environment';
+export declare class MissingAppError extends UserError {
+}
+export declare class GraphqlClient implements CreateEnvironmentClient, ListEnvironmentClient {
     private readonly graphqlClient;
     constructor(graphqlClient: GraphQLClient);
     createEnvironment(details: AppEnvironmentDetails): Promise<void>;
+    listEnvironment(details: ListEnvironmentDetails): Promise<{
+        type: AppEnvironmentType;
+        key: string;
+        lastDeployedAt: string;
+    }[]>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/environment/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEtF,qBAAa,aAAc,YAAW,uBAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;CA+C9D"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/environment/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAGb,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEnF,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,aAAc,YAAW,uBAAuB,EAAE,qBAAqB;IACtE,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,iBAAiB,CAAC,OAAO,EAAE,qBAAqB;IAgDhD,eAAe,CAAC,OAAO,EAAE,sBAAsB;;;;;CAkC7D"}

package/out/environment/graphql-client.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphqlClient = void 0;
+exports.GraphqlClient = exports.MissingAppError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
+class MissingAppError extends cli_shared_1.UserError {
+}
+exports.MissingAppError = MissingAppError;
 class GraphqlClient {
     constructor(graphqlClient) {
         this.graphqlClient = graphqlClient;
@@ -43,5 +46,37 @@ class GraphqlClient {
             });
         }
     }
+    async listEnvironment(details) {
+        const query = `
+      query forge_cli_listEnvironment($id: ID!) {
+        app(id: $id) {
+          environments {
+            key
+            type
+            createdAt
+            versions(first: 1) {
+              nodes {
+                updatedAt
+              }
+            }
+          }
+        }
+      }
+    `;
+        const { app } = await this.graphqlClient.query(query, {
+            id: details.appId
+        });
+        if (!app) {
+            throw new MissingAppError();
+        }
+        return app.environments.map((environment) => {
+            var _a, _b, _c;
+            return {
+                type: environment.type,
+                key: environment.key,
+                lastDeployedAt: ((_c = (_b = (_a = environment.versions) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.updatedAt) || environment.createdAt
+            };
+        });
+    }
 }
 exports.GraphqlClient = GraphqlClient;

package/out/environment/list-environment.d.ts

@@ -0,0 +1,17 @@
+import { AppConfigProvider, AppEnvironment } from '@forge/cli-shared';
+export interface ListEnvironmentDetails {
+    appId: string;
+}
+export interface ListEnvironmentOutput extends Pick<AppEnvironment, 'key' | 'type'> {
+    lastDeployedAt: string;
+}
+export interface ListEnvironmentClient {
+    listEnvironment(details: ListEnvironmentDetails): Promise<ListEnvironmentOutput[]>;
+}
+export declare class ListEnvironmentCommand {
+    private readonly client;
+    private readonly getAppConfig;
+    constructor(client: ListEnvironmentClient, getAppConfig: AppConfigProvider);
+    execute(): Promise<ListEnvironmentOutput[]>;
+}
+//# sourceMappingURL=list-environment.d.ts.map

package/out/environment/list-environment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-environment.d.ts","sourceRoot":"","sources":["../../src/environment/list-environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC;IACjF,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;CACpF;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAyB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAA5D,MAAM,EAAE,qBAAqB,EAAmB,YAAY,EAAE,iBAAiB;IAE/F,OAAO;CAMrB"}

package/out/environment/list-environment.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ListEnvironmentCommand = void 0;
+class ListEnvironmentCommand {
+    constructor(client, getAppConfig) {
+        this.client = client;
+        this.getAppConfig = getAppConfig;
+    }
+    async execute() {
+        const { id: appId } = await this.getAppConfig();
+        return this.client.listEnvironment({
+            appId
+        });
+    }
+}
+exports.ListEnvironmentCommand = ListEnvironmentCommand;

package/out/installations/graphql-client.d.ts

@@ -1,6 +1,6 @@
-import { AppEnvironment, AppUninstallationInput, GraphQLClient, GraphQlMutationError, Pause, BaseError, UserError } from '@forge/cli-shared';
+import { AppUninstallationInput, GraphQLClient, GraphQlMutationError, Pause, BaseError, UserError } from '@forge/cli-shared';
 import { AppInstallSiteDetails, InstallAppClient } from './install-app-site';
-import { Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
+import { AppEnvironmentVersionData, Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
 import { UninstallAppClient, UninstallAppOutput } from './uninstall-app';
 import { SiteTranslator } from './site-translation';
 export declare const UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
@@ -25,7 +25,8 @@ export declare class UpgradeError extends GraphQlMutationError {
         statusCode: number | undefined;
     });
 }
-export declare class EnvironmentNotFoundError extends Error {
+export declare class EnvironmentNotFoundError extends UserError {
+    constructor(environmentKey: string);
 }
 export declare class MissingTaskIdError extends Error {
 }
@@ -70,6 +71,6 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
     private getCombinedHostnameMap;
     private resolveInstallationsHostnames;
     private getAllInstallations;
-    getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironment['versions']>;
+    getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironmentVersionData>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/installations/graphql-client.d.ts.map

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

package/out/installations/graphql-client.js

@@ -35,7 +35,10 @@ class UpgradeError extends cli_shared_1.GraphQlMutationError {
     }
 }
 exports.UpgradeError = UpgradeError;
-class EnvironmentNotFoundError extends Error {
+class EnvironmentNotFoundError extends cli_shared_1.UserError {
+    constructor(environmentKey) {
+        super(cli_shared_1.Text.env.error.envNotExist(environmentKey, cli_shared_1.environmentToOption));
+    }
 }
 exports.EnvironmentNotFoundError = EnvironmentNotFoundError;
 class MissingTaskIdError extends Error {
@@ -314,12 +317,13 @@ class InstallationsGraphqlClient {
         });
         const combinedAriToHostname = await this.getCombinedHostnameMap(installationContexts);
         return installationContexts.map((context, i) => {
-            const { environment, installation } = installations[i];
+            const { environment, environmentType, installation } = installations[i];
             const site = combinedAriToHostname[context.toString()];
             return {
                 id: installation.id,
                 product: context.resourceOwner,
                 environmentKey: environment,
+                environmentType,
                 context: installation.installationContext,
                 site,
                 version: installation.version || {
@@ -342,6 +346,7 @@ class InstallationsGraphqlClient {
               }
               appEnvironment {
                 key
+                type
               }
             }
             pageInfo {
@@ -376,6 +381,7 @@ class InstallationsGraphqlClient {
                     }
                     output.push({
                         environment: node.appEnvironment.key,
+                        environmentType: node.appEnvironment.type,
                         installation: node
                     });
                 }
@@ -386,10 +392,12 @@ class InstallationsGraphqlClient {
         return output;
     }
     async getVersions(appId, environmentKey, firstN = 1) {
+        var _a;
         const query = `
       query forge_cli_getApplicationEnvironmentLatestVersions($appId: ID!, $environmentKey: String!, $firstN: Int!) {
         app(id: $appId) {
           environmentByKey(key: $environmentKey) {
+            type
             versions(first: $firstN) {
               nodes {
                 permissions {
@@ -415,9 +423,12 @@ class InstallationsGraphqlClient {
             throw new MissingAppError();
         }
         if (!result.app.environmentByKey) {
-            throw new EnvironmentNotFoundError();
+            throw new EnvironmentNotFoundError(environmentKey);
         }
-        return result.app.environmentByKey.versions;
+        return {
+            nodes: (_a = result.app.environmentByKey.versions) === null || _a === void 0 ? void 0 : _a.nodes,
+            environmentType: result.app.environmentByKey.type
+        };
     }
 }
 exports.InstallationsGraphqlClient = InstallationsGraphqlClient;

package/out/migration-keys/graphql-client.js

@@ -39,7 +39,7 @@ class GraphqlClient {
             throw new cli_shared_1.MissingAppError();
         }
         if (!result.app.environmentByKey) {
-            throw new cli_shared_1.MissingAppEnvironmentError();
+            throw new cli_shared_1.MissingAppEnvironmentError(environmentKey);
         }
         const mpacAppKey = (_a = result.app.marketplaceApp) === null || _a === void 0 ? void 0 : _a.appKey;
         const versions = result.app.environmentByKey.versions;

package/out/service/installation-service.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AppConfigProvider, AppEnvironment } from '@forge/cli-shared';
+import { AppConfigProvider, AppEnvironmentType, AppEnvironmentVersion, Maybe } from '@forge/cli-shared';
 import { URL } from 'url';
 import { AppInstallSiteDetails } from '../installations/install-app-site';
 export interface Installation {
@@ -7,6 +7,7 @@ export interface Installation {
     product: string;
     site: string;
     environmentKey: string;
+    environmentType: AppEnvironmentType;
     context: string;
     version: {
         isLatest: boolean;
@@ -21,15 +22,20 @@ export interface AppEnvironmentVersionPermissions {
 }
 export interface AppEnvironmentPermissions extends AppEnvironmentVersionPermissions {
     addedScopes: string[];
+    environmentType: AppEnvironmentType;
 }
 interface InstallationFilterOptions {
     site?: string;
     product?: 'Jira' | 'Confluence';
     environment?: string;
 }
+export interface AppEnvironmentVersionData {
+    nodes?: Array<Maybe<AppEnvironmentVersion>> | null;
+    environmentType: AppEnvironmentType;
+}
 export interface ListAppInstallationsClient {
     listInstallations(appId: string): Promise<Installation[]>;
-    getVersions(appId: string, environmentKey: string, firstN: number): Promise<AppEnvironment['versions']>;
+    getVersions(appId: string, environmentKey: string, firstN: number): Promise<AppEnvironmentVersionData>;
 }
 export interface UpgradeAppInstallationsClient {
     upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;

package/out/service/installation-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EAQf,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAA0B,SAAQ,gCAAgC;IACjF,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;CACzG;AAED,MAAM,WAAW,6BAA6B;IAC5C,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAKD,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAF7B,YAAY,EAAE,iBAAiB,EAC/B,uBAAuB,EAAE,0BAA0B,EACnD,6BAA6B,EAAE,6BAA6B;IAG/E,OAAO,CAAC,mBAAmB;IAiBd,oBAAoB,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlF,gCAAgC,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAU9F,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,mBAAmB,CAC9B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAkBnB,OAAO,CAAC,uCAAuC;IAgBlC,4BAA4B,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;CA2BlD"}
+{"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EAKrB,KAAK,EAEN,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,yBAA0B,SAAQ,gCAAgC;IACjF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,kBAAkB,CAAC;CACrC;AAED,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,GAAG,IAAI,CAAC;IACnD,eAAe,EAAE,kBAAkB,CAAC;CACrC;AAED,MAAM,WAAW,0BAA0B;IACzC,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACxG;AAED,MAAM,WAAW,6BAA6B;IAC5C,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrG;AAKD,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,6BAA6B;gBAF7B,YAAY,EAAE,iBAAiB,EAC/B,uBAAuB,EAAE,0BAA0B,EACnD,6BAA6B,EAAE,6BAA6B;IAG/E,OAAO,CAAC,mBAAmB;IAiBd,oBAAoB,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAOlF,gCAAgC,CAAC,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IAU9F,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,mBAAmB,CAC9B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAkBnB,OAAO,CAAC,uCAAuC;IAgBlC,4BAA4B,CACvC,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;CAiClD"}