@forge/cli 11.0.0 → 11.1.0-next.24

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

@@ -43,7 +43,7 @@ class InstallController {
         }
     }
     async installOrUpgrade(upgrade, environment, environmentType, site, product, appId, text, license, overrides) {
-        const isWorkspaceProduct = !!product && (await this.supportedProductsService.isWorkspaceProduct(product));
+        const isWorkspaceProduct = !!product && this.supportedProductsService.isWorkspaceProduct(product);
         return this.ui.displayProgress(async () => {
             if (upgrade) {
                 const isAlreadyUpdated = await this.installationService.upgradeInstallation(site, product, environment, appId);
@@ -59,23 +59,31 @@ class InstallController {
                 });
                 return false;
             }
-        }, text.cmd.start(environment, environmentType), (alreadyUpdated) => {
+        }, text.cmd.start(environment, environmentType, (0, cli_shared_1.productDisplayName)(product)), (alreadyUpdated) => {
             if (alreadyUpdated) {
                 return isWorkspaceProduct
                     ? cli_shared_1.Text.upgrade.alreadyUpdated.spinnerWorkspace
                     : cli_shared_1.Text.upgrade.alreadyUpdated.spinnerSite;
             }
             else {
-                return text.cmd.end(false);
+                return text.cmd.end(false, product);
             }
         });
     }
-    async promptForProduct() {
+    async promptForProducts(requiredProducts) {
+        if (requiredProducts?.length) {
+            const supportedProducts = this.supportedProductsService.getSupportedSecondaryProductsForXPA(requiredProducts) ?? [];
+            const choices = supportedProducts.map((product) => ({ names: [product] }));
+            const selected = await this.ui.promptForTable(cli_shared_1.Text.installationContext.promptOptionalProducts, '', [], choices, true);
+            return selected.map((index) => supportedProducts[index]);
+        }
         this.ui.info(cli_shared_1.Text.installationContext.overviewProduct);
-        return await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, await this.supportedProductsService.getSupportedProducts());
+        return [
+            await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, this.supportedProductsService.getSupportedProducts())
+        ];
     }
-    async promptForSite(product) {
-        const isWorkspaceBased = product && (await this.supportedProductsService.isWorkspaceProduct(product));
+    async promptForSite(products) {
+        const isWorkspaceBased = products.length > 0 && this.supportedProductsService.isWorkspaceProduct(products[0]);
         const overviewText = isWorkspaceBased
             ? cli_shared_1.Text.installationContext.overviewWorkspace
             : cli_shared_1.Text.installationContext.overviewSite;
@@ -88,7 +96,7 @@ class InstallController {
         if (!trySite) {
             throw new cli_shared_1.ValidationError(invalidText);
         }
-        return this.supportedProductsService.validateSite(trySite, product);
+        return this.supportedProductsService.validateSite(trySite, products[0]);
     }
     async promptForUpgrade(siteOption, productOption, environmentOption) {
         const { installations } = await this.installationService.listNonTechnicalAppInstallations({
@@ -99,7 +107,7 @@ class InstallController {
         const { site, product, environmentKey, environmentType } = await this.installView.promptForUpgrade(installations);
         const productName = (0, cli_shared_1.productDisplayName)(product);
         return {
-            site: await this.supportedProductsService.validateSite(site, productName),
+            site: this.supportedProductsService.validateSite(site, productName),
             product: productName,
             environment: environmentKey,
             environmentType
@@ -143,27 +151,36 @@ class InstallController {
             this.installView.displayUIKit1DeprecationMessage(uiKit1Modules);
         }
     };
-    async run({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }) {
+    async run({ environment, site, products, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }) {
         const { id } = await this.appConfigProvider();
         const text = upgrade ? cli_shared_1.Text.upgrade : cli_shared_1.Text.install;
         const validLicense = this.validateLicenseOption(license, environment);
         const overrides = await this.validateEcosystemAppInstallationOverridesInput(licenseModes, usersWithAccess, environment);
-        if (upgrade && (!site || !product)) {
-            const upgradeResult = await this.promptForUpgrade(site, product, environment);
+        const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
+        const requiredProducts = environmentPermissions?.requiredProducts;
+        if (upgrade && (!site || !products?.length)) {
+            const upgradeResult = await this.promptForUpgrade(site, products?.[0], environment);
             environment = upgradeResult.environment;
             site = upgradeResult.site;
-            product = upgradeResult.product;
+            products = [upgradeResult.product];
+        }
+        if (!requiredProducts?.length) {
+            products = products?.length ? products : await this.promptForProducts();
+            site = site ? site : await this.promptForSite(products);
+            const bannerText = (await this.supportedProductsService.isWorkspaceProduct(products[0]))
+                ? text.bannerWorkspace
+                : text.bannerSite;
+            this.ui.info(bannerText);
+        }
+        else {
+            const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site);
+            site = result.site;
+            products = result.products;
+            this.ui.info(cli_shared_1.Text.install.installConfirmation(products.join(', '), site.host));
         }
-        product = product ? product : await this.promptForProduct();
-        site = site ? site : await this.promptForSite(product);
-        const bannerText = product && (await this.supportedProductsService.isWorkspaceProduct(product))
-            ? text.bannerWorkspace
-            : text.bannerSite;
-        this.ui.info(bannerText);
         if ((0, cli_shared_1.isSecureSite)(site)) {
             await this.securityPrompt(site);
         }
-        const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
         if (!environmentPermissions?.hasDeployments) {
             this.ui.error(new NoDeploymentError(environment), { pad: false });
             return;
@@ -185,30 +202,82 @@ class InstallController {
         const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, addedScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
         if (!scopesConfirmationResult)
             return;
-        const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, environmentType, site, product, id, text, validLicense, overrides);
-        if (isAlreadyUpdated) {
-            this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, product, site.host));
+        const successfulProducts = [];
+        const failedProducts = [];
+        for (const product of products) {
+            try {
+                const isAlreadyUpdated = await this.installOrUpgrade(upgrade, environment, environmentType, site, product, id, text, validLicense, overrides);
+                if (isAlreadyUpdated) {
+                    this.ui.info(cli_shared_1.Text.upgrade.alreadyUpdated.banner(environment, (0, cli_shared_1.productDisplayName)(product), site.host));
+                }
+                else {
+                    this.ui.clearSpinner();
+                    this.ui.emptyLine();
+                    successfulProducts.push(product);
+                }
+            }
+            catch (error) {
+                this.ui.clearSpinner();
+                this.ui.error(error);
+                failedProducts.push(product);
+            }
+            await this.checkForMultiProductScopes(environmentScopes, site, environment);
+        }
+        if (successfulProducts.length) {
+            this.ui.info(text.success.banner(environment, environmentType, (0, cli_shared_1.productDisplayName)(successfulProducts.join(', ')), site.host));
         }
         else {
-            this.ui.emptyLine();
-            this.ui.info(text.success.banner(environment, environmentType, product, site.host));
-            const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
-            if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
-                return;
-            const { installations } = await this.installationService.listNonTechnicalAppInstallations({
-                site,
-                environment
-            });
-            const productsToUpgrade = installations
-                .filter((installation) => !installation.version.isLatest)
-                .map((installation) => installation.product);
-            const installedProducts = installations.map((installation) => installation.product);
-            const productsToInstall = uniqueProductsFromScopes.filter((product) => !installedProducts.includes(product));
-            if (productsToInstall.length === 0 && productsToUpgrade.length === 0)
-                return;
-            this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
+            this.ui.info(cli_shared_1.Text.install.failedAll(site, environment));
+        }
+        if (failedProducts.length) {
+            throw new cli_shared_1.PartialInstallationError(cli_shared_1.Text.error.partialInstallation(failedProducts));
         }
     }
+    getXPAProductsAndSite = async (requiredProducts, products, site) => {
+        const { installations } = (await this.installationService.listAppInstallations()) ?? [];
+        site = site ? site : await this.promptForSite([]);
+        if (!products?.length) {
+            const hasRequiredInstallations = this.checkRequiredInstallationExists(installations, site.host, requiredProducts);
+            if (hasRequiredInstallations) {
+                this.ui.info(cli_shared_1.Text.install.alreadyInstalledInRequiredProduct(requiredProducts[0]));
+                products = products?.length ? products : await this.promptForProducts(requiredProducts);
+            }
+            else {
+                this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(requiredProducts[0]));
+                products = requiredProducts;
+            }
+        }
+        else {
+            const allowedProducts = this.supportedProductsService.getSupportedSecondaryProductsForXPA([]);
+            if (products.some((product) => !allowedProducts.includes(product))) {
+                throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidProduct);
+            }
+            if (requiredProducts.includes(products[0])) {
+                this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(products[0]));
+            }
+            else {
+                this.ui.info(cli_shared_1.Text.install.installingToOptionalProduct(products[0]));
+            }
+        }
+        return { site, products };
+    };
+    checkForMultiProductScopes = async (environmentScopes, site, environment) => {
+        const uniqueProductsFromScopes = this.getUniqueInstallationProductsFromScopes(environmentScopes);
+        if (!uniqueProductsFromScopes || uniqueProductsFromScopes.length <= 1)
+            return;
+        const { installations: nonTechnicalInstallations } = await this.installationService.listNonTechnicalAppInstallations({
+            site,
+            environment
+        });
+        const productsToUpgrade = nonTechnicalInstallations
+            .filter((installation) => !installation.version.isLatest)
+            .map((installation) => installation.product);
+        const installedProducts = nonTechnicalInstallations.map((installation) => installation.product);
+        const productsToInstall = uniqueProductsFromScopes.filter((product) => !installedProducts.includes(product));
+        if (productsToInstall.length === 0 && productsToUpgrade.length === 0)
+            return;
+        this.ui.warn(cli_shared_1.Text.install.multiProductScopesDetected(productsToInstall, productsToUpgrade, site.host, environment));
+    };
     async extractAddedScopes({ addedScopes }) {
         const scopesWithInteractiveConsent = (0, manifest_1.getScopesWithInteractiveConsent)();
         return addedScopes.map((scope) => ({
@@ -265,5 +334,8 @@ class InstallController {
             ? { licenseModes: ecosystemLicenseModes, usersWithAccess }
             : undefined;
     }
+    checkRequiredInstallationExists = (installations, site, requiredProducts) => {
+        return requiredProducts.every((requiredProduct) => installations.some((installation) => installation.site.includes(site) && installation.product.toLowerCase() === requiredProduct.toLowerCase()));
+    };
 }
 exports.InstallController = InstallController;

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":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,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,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,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;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,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;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8XvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,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":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,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,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,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;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,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;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoYvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

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

@@ -97,7 +97,7 @@ const getDependencies = async (cliDetails) => {
     const credentialStore = (0, cli_shared_1.getCredentialStore)(ui, userRepository);
     const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
     const statsigService = new cli_shared_1.StatsigService(ui, cliDetails, credentialStore, appConfigReader);
-    const supportedProductsService = new cli_shared_1.SupportedProductsService(statsigService);
+    const supportedProductsService = new cli_shared_1.SupportedProductsService();
     const settingsView = new settings_view_1.SettingsView(ui);
     const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService, assertiveAppConfigReader);
     const liteLintView = new lite_lint_view_1.LiteLintView(ui);
@@ -199,6 +199,7 @@ const getDependencies = async (cliDetails) => {
     const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
     const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
     cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, featureFlagService, supportedProductsService);
+    await supportedProductsService.initializeWithSupportedProducts(statsigService);
     return {
         ui,
         cmd,

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

@@ -1,4 +1,4 @@
 import { Dependencies } from './dependency-injection';
-export declare function registerCommands(deps: Dependencies): Promise<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":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBAkBxD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAkBlD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}

package/out/command-line/index.js

@@ -21,18 +21,18 @@ const register_environments_commands_1 = require("./register-environments-comman
 const register_storage_commands_1 = require("./register-storage-commands");
 const register_eligibility_commands_1 = require("./register-eligibility-commands");
 const register_version_commands_1 = require("./register-version-commands");
-async function registerCommands(deps) {
+function registerCommands(deps) {
     (0, register_autocomplete_commands_1.registerCommands)(deps);
     (0, register_authentication_command_1.registerCommands)(deps);
     (0, register_app_commands_1.registerCommands)(deps);
     (0, register_deployment_commands_1.registerCommands)(deps);
-    await (0, register_installation_commands_1.registerCommands)(deps);
+    (0, register_installation_commands_1.registerCommands)(deps);
     (0, register_environments_commands_1.registerCommands)(deps);
     (0, register_environment_variables_commands_1.registerCommands)(deps);
     (0, register_lint_command_1.registerCommands)(deps);
     (0, register_log_commands_1.registerCommands)(deps);
     (0, register_tunnel_commands_1.registerCommands)(deps);
-    await (0, register_webtrigger_commands_1.registerCommands)(deps);
+    (0, register_webtrigger_commands_1.registerCommands)(deps);
     (0, register_feedback_commands_1.registerCommands)(deps);
     (0, register_settings_commands_1.registerCommands)(deps);
     (0, register_providers_commands_1.registerCommands)(deps);
@@ -50,7 +50,7 @@ const main = async () => {
     const cliDetails = (0, version_info_1.getCLIDetails)();
     const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
     registerEvents(deps);
-    await registerCommands(deps);
+    registerCommands(deps);
     await deps.controllers.prerequisitesController.check();
     await deps.cmd.parse(process.argv);
 };

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

@@ -1,7 +1,4 @@
 import { Dependencies } from './dependency-injection';
-import { Installation } from '../service/installation-service';
 export declare const registerListInstallationsCommand: ({ cmd, ui, services: { installationsService } }: Dependencies) => void;
-export declare const performSingleUninstall: (installId: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
-export declare const performMultipleUninstalls: (appsToUninstall: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
-export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => Promise<void>;
+export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
 //# sourceMappingURL=register-installation-commands.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAqD/D,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAmC7G,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBACnB,YAAY,EAAE,6CACY,YAAY,kBA8CxD,CAAC;AAsEF,eAAO,MAAM,gBAAgB,qBAA4B,YAAY,KAAG,QAAQ,IAAI,CAenF,CAAC"}
+{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAmC7G,CAAC;AA2EF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}

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

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = exports.registerListInstallationsCommand = void 0;
+exports.registerCommands = exports.registerListInstallationsCommand = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const shared_1 = require("../installations/shared");
-const errors_1 = require("./errors");
+const uninstall_command_helpers_1 = require("./uninstall-command-helpers");
 const semver_1 = require("semver");
 const COMMAND_NAME = 'install';
-const registerInstallAppCommand = async ({ cmd, controllers: { installController }, services: { supportedProductsService } }) => {
-    const supportedProducts = await supportedProductsService.getSupportedProducts();
+const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
     cmd
         .requireAppId()
         .environmentOption()
-        .contextOption(supportedProducts)
+        .contextOption()
         .option('--upgrade', cli_shared_1.Text.install.optionUpgrade, false)
         .option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes, false)
         .option('-l, --license [license]', cli_shared_1.Text.install.optionLicense)
@@ -23,7 +22,7 @@ const registerInstallAppCommand = async ({ cmd, controllers: { installController
         await installController.run({
             environment,
             site,
-            product,
+            products: product ? [product] : [],
             upgrade,
             confirmScopes,
             license,
@@ -65,58 +64,11 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
     });
 };
 exports.registerListInstallationsCommand = registerListInstallationsCommand;
-const performSingleUninstall = async (installId, { ui, commands: { uninstallAppCommand } }) => {
-    const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
-        successful: !!result.successful,
-        message: cli_shared_1.Text.uninstall.cmd.success(false)
-    }));
-    const uninstallMessageFormat = installation.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
-    const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(installation.product), installation.site, installation.environmentKey, false);
-    if (installation.successful) {
-        ui.info(uninstallMessage);
-    }
-    else {
-        ui.error(new shared_1.UninstallAppError(uninstallMessage));
-    }
-};
-exports.performSingleUninstall = performSingleUninstall;
-const performMultipleUninstalls = async (appsToUninstall, { ui, commands: { uninstallAppCommand } }) => {
-    const filteredInstallations = appsToUninstall.filter(({ product }) => product !== 'identity');
-    const hasMultipleNonIdentityApps = filteredInstallations.length > 1;
-    const uninstalledApps = await ui.displayProgress(() => uninstallAppCommand.batchExecute([], appsToUninstall), cli_shared_1.Text.uninstall.cmd.start, (result) => {
-        const isSuccessful = !result.some(({ successful }) => successful === false);
-        return {
-            successful: isSuccessful,
-            message: cli_shared_1.Text.uninstall.cmd.success(hasMultipleNonIdentityApps)
-        };
-    });
-    const deferredErrors = [];
-    uninstalledApps.forEach((uninstall) => {
-        const uninstallMessageFormat = uninstall.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
-        const formattedMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(uninstall.product), uninstall.site, uninstall.environmentKey, hasMultipleNonIdentityApps);
-        if (uninstall.successful && uninstall.product !== 'identity') {
-            ui.info(formattedMessage);
-        }
-        else if (!uninstall.successful) {
-            const uninstallError = new shared_1.UninstallAppError(formattedMessage);
-            ui.error(uninstallError);
-            deferredErrors.push(uninstallError);
-        }
-    });
-    if (uninstalledApps.some(({ successful }) => successful === false)) {
-        throw new errors_1.DeferredErrors(deferredErrors);
-    }
-    if (hasMultipleNonIdentityApps) {
-        ui.info(cli_shared_1.Text.uninstall.interactive.done);
-    }
-};
-exports.performMultipleUninstalls = performMultipleUninstalls;
-const registerUninstallCommand = async (deps) => {
-    const { cmd, ui, services: { installationsService, supportedProductsService } } = deps;
-    const supportedProducts = await supportedProductsService.getSupportedProducts();
+const registerUninstallCommand = (deps) => {
+    const { cmd, ui, services: { installationsService } } = deps;
     cmd
         .command('uninstall')
-        .contextOption(supportedProducts)
+        .contextOption()
         .environmentOption()
         .requireAppId()
         .description(cli_shared_1.Text.uninstall.cmd.desc)
@@ -135,33 +87,33 @@ const registerUninstallCommand = async (deps) => {
             ui.info(cli_shared_1.Text.uninstall.info);
             ui.info(cli_shared_1.Text.ctrlC);
             ui.emptyLine();
-            await (0, exports.performSingleUninstall)(installation.id, deps);
+            await (0, uninstall_command_helpers_1.performSingleUninstall)(installation.id, deps);
         }
         else {
             const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
-            const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Product'], filteredInstallations.map(({ id, environmentKey, product, site }) => ({
-                names: [(0, cli_shared_1.environmentToOption)(environmentKey), site, (0, cli_shared_1.productDisplayName)(product)],
-                value: id
-            })));
-            const appsToUninstall = filteredInstallations.filter((_, index) => selectedSitesIndexes.includes(index));
-            const selectedSites = new Set(appsToUninstall.map(({ site }) => site));
-            const remainingApps = filteredInstallations.filter((_, index) => !selectedSitesIndexes.includes(index));
-            appsToUninstall.push(...(0, shared_1.getHangingIdentityInstallationsFromSite)(installations, remainingApps, selectedSites));
-            if (appsToUninstall.length > 1) {
-                await (0, exports.performMultipleUninstalls)(appsToUninstall, deps);
+            const options = (0, uninstall_command_helpers_1.getMultiChoiceOptionsForUninstall)(filteredInstallations);
+            const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Product'], options);
+            const [firstUninstall, secondUninstall] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
+            const selectedSites = new Set(firstUninstall.map(({ site }) => site).concat(secondUninstall.map(({ site }) => site)));
+            const remainingApps = options
+                .filter((_, index) => !selectedSitesIndexes.includes(index))
+                .map(({ extra }) => filteredInstallations[extra.installationIdx]);
+            firstUninstall.push(...(0, shared_1.getHangingIdentityInstallationsFromSite)(installations, remainingApps, selectedSites));
+            if (firstUninstall.length > 1 || secondUninstall.length > 0) {
+                await (0, uninstall_command_helpers_1.performMultipleUninstalls)(firstUninstall, secondUninstall, deps);
             }
-            else {
-                await (0, exports.performSingleUninstall)(appsToUninstall[0].id, deps);
+            else if (firstUninstall.length === 1) {
+                await (0, uninstall_command_helpers_1.performSingleUninstall)(firstUninstall[0].id, deps);
             }
         }
     });
 };
 const DEPRECATED_LIST_COMMAND = 'install:list';
-const registerCommands = async ({ cmd, ...deps }) => {
+const registerCommands = ({ cmd, ...deps }) => {
     const install = cmd.command(COMMAND_NAME).description(cli_shared_1.Text.variables.description);
-    await registerUninstallCommand({ cmd, ...deps });
+    registerUninstallCommand({ cmd, ...deps });
     cmd.deprecatedCommand(DEPRECATED_LIST_COMMAND, `${COMMAND_NAME} ${LIST_COMMAND_NAME}`, deps.controllers.stubController);
-    await registerInstallAppCommand({ cmd: install, ...deps });
+    registerInstallAppCommand({ cmd: install, ...deps });
     (0, exports.registerListInstallationsCommand)({ cmd: install, ...deps });
 };
 exports.registerCommands = registerCommands;

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

@@ -1,3 +1,3 @@
 import { Dependencies } from './dependency-injection';
-export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => Promise<void>;
+export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => void;
 //# sourceMappingURL=register-webtrigger-commands.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,iIAM1B,YAAY,kBAyDd,CAAC"}
+{"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,uGAM1B,YAAY,SAsDd,CAAC"}

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

@@ -26,7 +26,7 @@ function manifestDefinesTriggers(configFile) {
         await getValidWebtriggers(configFile);
     };
 }
-const registerCommands = async ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }) => {
+const registerCommands = ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }) => {
     const validateWebtriggerKey = async (functionKey) => {
         const availableWebTriggers = await getValidWebtriggers(configFile);
         if (functionKey) {
@@ -40,13 +40,12 @@ const registerCommands = async ({ cmd, ui, configFile, services: { installations
             return await ui.promptForList(cli_shared_1.Text.webtrigger.promptFuncKey, options);
         }
     };
-    const supportedProducts = await supportedProductsService.getSupportedProducts();
     cmd
         .command('webtrigger')
         .requireAppId()
         .description(cli_shared_1.Text.webtrigger.cmd)
         .option('-f, --functionKey [function]', cli_shared_1.Text.webtrigger.optionFuncKey)
-        .contextOption(supportedProducts)
+        .contextOption()
         .environmentOption()
         .precondition(manifestDefinesTriggers(configFile))
         .action(async ({ functionKey, site, environment, product }) => {

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

@@ -0,0 +1,18 @@
+import { Installation } from '../service/installation-service';
+import { Dependencies } from './dependency-injection';
+export interface Option {
+    names: string[];
+    value: string;
+    extra: {
+        primary?: boolean;
+        secondary?: boolean;
+        contextAri?: string;
+        installationIdx: number;
+        product: string;
+    };
+}
+export declare const getMultiChoiceOptionsForUninstall: (filteredInstallations: Installation[]) => Option[];
+export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[]];
+export declare const performSingleUninstall: (installId: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
+export declare const performMultipleUninstalls: (appsToUninstallFirst: Installation[], appsToUninstallSecond: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
+//# sourceMappingURL=uninstall-command-helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"uninstall-command-helpers.d.ts","sourceRoot":"","sources":["../../src/command-line/uninstall-command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClH;AAMD,eAAO,MAAM,iCAAiC,0BAA2B,YAAY,EAAE,KAAG,MAAM,EA8B/F,CAAC;AAEF,eAAO,MAAM,6BAA6B,YAC/B,MAAM,EAAE,wBACK,MAAM,EAAE,yBACP,YAAY,EAAE,KACpC,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,CAiBjC,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,yBACd,YAAY,EAAE,yBACb,YAAY,EAAE,6CACM,YAAY,kBAsDxD,CAAC"}

package/out/command-line/uninstall-command-helpers.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.performMultipleUninstalls = exports.performSingleUninstall = exports.getInstallationsFromSelection = exports.getMultiChoiceOptionsForUninstall = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+const shared_1 = require("../installations/shared");
+const errors_1 = require("./errors");
+function addPrimarySuffix(productDisplayName, secondaryCount) {
+    return secondaryCount ? `${productDisplayName} (Primary)` : productDisplayName;
+}
+const getMultiChoiceOptionsForUninstall = (filteredInstallations) => {
+    return filteredInstallations.reduce((acc, { id, environmentKey, site, product, secondaryProducts, secondaryContexts }, idx) => {
+        acc.push({
+            names: [
+                (0, cli_shared_1.environmentToOption)(environmentKey),
+                site,
+                addPrimarySuffix((0, cli_shared_1.productDisplayName)(product), secondaryProducts?.length)
+            ],
+            value: id,
+            extra: {
+                installationIdx: idx,
+                product: product,
+                primary: !!secondaryProducts?.length
+            }
+        });
+        if (secondaryProducts) {
+            secondaryProducts.forEach((secondaryProduct, secondaryIdx) => {
+                const contextAri = secondaryContexts?.[secondaryIdx];
+                acc.push({
+                    names: [(0, cli_shared_1.environmentToOption)(environmentKey), site, (0, cli_shared_1.productDisplayName)(secondaryProduct)],
+                    value: id,
+                    extra: { secondary: true, contextAri, installationIdx: idx, product: secondaryProduct }
+                });
+            });
+        }
+        return acc;
+    }, []);
+};
+exports.getMultiChoiceOptionsForUninstall = getMultiChoiceOptionsForUninstall;
+const getInstallationsFromSelection = (options, selectedSitesIndexes, filteredInstallations) => {
+    const firstUninstall = options
+        .filter((_, idx) => selectedSitesIndexes.includes(idx))
+        .filter(({ extra }) => !extra?.primary)
+        .map(({ extra }) => ({
+        ...filteredInstallations[extra.installationIdx],
+        ...(extra.secondary && { context: extra.contextAri, product: extra.product })
+    }));
+    const secondUninstall = options
+        .filter((_, idx) => selectedSitesIndexes.includes(idx))
+        .filter(({ extra }) => extra?.primary)
+        .map(({ extra }) => filteredInstallations[extra.installationIdx]);
+    return [firstUninstall, secondUninstall];
+};
+exports.getInstallationsFromSelection = getInstallationsFromSelection;
+const performSingleUninstall = async (installId, { ui, commands: { uninstallAppCommand } }) => {
+    const installation = await ui.displayProgress(() => uninstallAppCommand.execute(installId), cli_shared_1.Text.uninstall.cmd.start, (result) => ({
+        successful: !!result.successful,
+        message: cli_shared_1.Text.uninstall.cmd.success(false)
+    }));
+    const uninstallMessageFormat = installation.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
+    const uninstallMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(installation.product), installation.site, installation.environmentKey, false);
+    if (installation.successful) {
+        ui.info(uninstallMessage);
+    }
+    else {
+        ui.error(new shared_1.UninstallAppError(uninstallMessage));
+    }
+};
+exports.performSingleUninstall = performSingleUninstall;
+const performMultipleUninstalls = async (appsToUninstallFirst, appsToUninstallSecond, { ui, commands: { uninstallAppCommand } }) => {
+    const filteredInstallations = appsToUninstallFirst.filter(({ product }) => product !== 'identity');
+    const hasMultipleNonIdentityApps = filteredInstallations.length > 1;
+    const uninstalledApps = await ui.displayProgress(async () => {
+        const result1 = await uninstallAppCommand.batchExecute([], appsToUninstallFirst);
+        if (result1.some(({ successful }) => successful === false)) {
+            return result1;
+        }
+        const result2 = await uninstallAppCommand.batchExecute([], appsToUninstallSecond);
+        return result1.concat(result2);
+    }, cli_shared_1.Text.uninstall.cmd.start, (result) => {
+        const isSuccessful = !result.some(({ successful }) => successful === false);
+        return {
+            successful: isSuccessful,
+            message: cli_shared_1.Text.uninstall.cmd.success(hasMultipleNonIdentityApps)
+        };
+    });
+    const deferredErrors = [];
+    uninstalledApps.forEach((uninstall) => {
+        const uninstallMessageFormat = uninstall.successful ? cli_shared_1.Text.uninstall.done : cli_shared_1.Text.uninstall.failed;
+        const formattedMessage = uninstallMessageFormat((0, cli_shared_1.productDisplayName)(uninstall.product), uninstall.site, uninstall.environmentKey, hasMultipleNonIdentityApps);
+        if (uninstall.successful && uninstall.product !== 'identity') {
+            ui.info(formattedMessage);
+        }
+        else if (!uninstall.successful) {
+            const uninstallError = new shared_1.UninstallAppError(formattedMessage);
+            ui.error(uninstallError);
+            deferredErrors.push(uninstallError);
+        }
+    });
+    if (uninstalledApps.some(({ successful }) => successful === false)) {
+        throw new errors_1.DeferredErrors(deferredErrors);
+    }
+    if (hasMultipleNonIdentityApps) {
+        ui.info(cli_shared_1.Text.uninstall.interactive.done);
+    }
+};
+exports.performMultipleUninstalls = performMultipleUninstalls;

package/out/command-line/version-info.js

@@ -21,7 +21,7 @@ const getCLIDetails = () => {
     }
 };
 exports.getCLIDetails = getCLIDetails;
-const supportedNodeMajorVersions = [18, 20];
+const supportedNodeMajorVersions = [18, 20, 22];
 exports.semverSupportedNodeVersion = supportedNodeMajorVersions.map((v) => `${v}.x`).join(' || ');
 exports.humanReadableSupportedNodeVersion = supportedNodeMajorVersions
     .map((v) => `${v}.x`)