@forge/cli 10.13.6 → 11.0.0-next.18

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

@@ -69,6 +69,10 @@ const graphql_client_8 = require("../eligibility/graphql-client");
 const roa_service_1 = require("../service/roa-service");
 const eligibility_controller_1 = require("./controller/eligibility-controller");
 const eligibility_view_1 = require("./view/eligibility-view");
+const version_controller_1 = require("./controller/version-controller");
+const version_service_1 = require("../service/version-service");
+const version_view_1 = require("./view/version-view");
+const graphql_client_9 = require("../version/graphql-client");
 const getDependencies = async (cliDetails) => {
     let cmd;
     const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
@@ -93,6 +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 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);
@@ -139,7 +144,7 @@ const getDependencies = async (cliDetails) => {
     const customEntitiesService = new custom_entities_service_1.CustomEntitiesService(assertiveAppConfigReader, appOauthClientGraphql, entitiesClient);
     const listEntitiesIndexesCommand = new list_indexes_1.ListEntitiesIndexesCommand(customEntitiesService);
     const bitbucketTranslation = new site_translation_1.BitbucketTranslator();
-    const cloudProductTranslation = new site_translation_1.CloudIdTranslator(graphQLClient);
+    const cloudProductTranslation = new site_translation_1.SitedProductTranslator(graphQLClient);
     const installationsClient = new graphql_client_6.InstallationsGraphqlClient(graphQLClient, cloudProductTranslation, bitbucketTranslation, cli_shared_1.pause);
     const installAppSiteCommand = new install_app_site_1.InstallAppSiteCommand(assertiveAppConfigReader, installationsClient);
     const uninstallAppCommand = new uninstall_app_1.UninstallAppCommand(assertiveAppConfigReader, installationsClient);
@@ -159,11 +164,12 @@ const getDependencies = async (cliDetails) => {
     const nodeAppPackager = new deploy_1.AppPackager(nodeRuntimeBundler, nativeUiBundler, ui);
     const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
     const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
-    const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient);
+    const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient, installationsClient);
     const installView = new install_view_1.InstallView(ui);
-    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView, statsigService);
+    const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView, supportedProductsService);
     const feedbackController = new feedback_controller_1.FeedbackController(credentialStore, feedbackPostClient);
     const eligibilityController = new eligibility_controller_1.EligibilityController(new roa_service_1.RoaService(assertiveAppConfigReader, new graphql_client_8.RoaEligibilityClient(graphQLClient)), new eligibility_view_1.EligibilityView(ui));
+    const versionController = new version_controller_1.VersionController(new version_service_1.VersionService(assertiveAppConfigReader, new graphql_client_9.AppVersionDetailsClient(graphQLClient)), new version_view_1.VersionView(ui));
     const lintService = new lint_service_1.LintService(configFile, fileReader);
     const lintView = new lint_view_1.LintView(ui);
     const lintController = new lint_controller_1.LintController(lintService, lintView);
@@ -192,7 +198,7 @@ const getDependencies = async (cliDetails) => {
     const stubController = new stubController_1.StubController();
     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);
+    cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, featureFlagService, supportedProductsService);
     return {
         ui,
         cmd,
@@ -228,7 +234,8 @@ const getDependencies = async (cliDetails) => {
             migrationKeysService,
             customEntitiesService,
             credentialStore,
-            userRepository
+            userRepository,
+            supportedProductsService
         },
         controllers: {
             autocompleteController,
@@ -242,7 +249,8 @@ const getDependencies = async (cliDetails) => {
             settingsController,
             stubController,
             prerequisitesController,
-            defaultEnvironmentController
+            defaultEnvironmentController,
+            versionController
         }
     };
 };

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

@@ -1,4 +1,4 @@
 import { Dependencies } from './dependency-injection';
-export declare function registerCommands(deps: Dependencies): void;
+export declare function registerCommands(deps: Dependencies): Promise<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;AAoBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAiBlD;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,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBAkBxD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}

package/out/command-line/index.js

@@ -20,23 +20,25 @@ const register_providers_commands_1 = require("./register-providers-commands");
 const register_environments_commands_1 = require("./register-environments-commands");
 const register_storage_commands_1 = require("./register-storage-commands");
 const register_eligibility_commands_1 = require("./register-eligibility-commands");
-function registerCommands(deps) {
+const register_version_commands_1 = require("./register-version-commands");
+async 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);
-    (0, register_installation_commands_1.registerCommands)(deps);
+    await (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);
-    (0, register_webtrigger_commands_1.registerCommands)(deps);
+    await (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);
     (0, register_storage_commands_1.registerCommands)(deps);
     (0, register_eligibility_commands_1.registerCommands)(deps);
+    (0, register_version_commands_1.registerCommands)(deps);
 }
 exports.registerCommands = registerCommands;
 const registerEvents = ({ ui }) => {
@@ -48,7 +50,7 @@ const main = async () => {
     const cliDetails = (0, version_info_1.getCLIDetails)();
     const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
     registerEvents(deps);
-    registerCommands(deps);
+    await registerCommands(deps);
     await deps.controllers.prerequisitesController.check();
     await deps.cmd.parse(process.argv);
 };

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;AAetD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AA6CD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;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,CAuBjC;AAuJD,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,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAuBtD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrD;AA6CD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,GAC1B,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;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,CAuBjC;AAuJD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

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

@@ -13,7 +13,15 @@ var TemplateCategory;
     TemplateCategory["CUSTOM_UI"] = "Custom UI";
     TemplateCategory["BACKEND"] = "Triggers and Validators";
 })(TemplateCategory || (TemplateCategory = {}));
-const PRODUCT_OPTIONS = ['show-all', 'bitbucket', 'compass', 'confluence', 'jira', 'jira-service-management'];
+const PRODUCT_OPTIONS = [
+    'show-all',
+    'bitbucket',
+    'compass',
+    'confluence',
+    'jira',
+    'jira-service-management',
+    'teamwork-graph'
+];
 const MAX_NAME_LENGTH = 60;
 function formatProduct(product) {
     return product

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

@@ -1,15 +1,7 @@
-/// <reference types="node" />
-import { URL } from 'url';
 import { Dependencies } from './dependency-injection';
 import { Installation } from '../service/installation-service';
-export declare function validateContext({ site, product }: {
-    site?: string;
-    product?: string;
-}): Promise<{
-    siteURL?: URL;
-    product?: string;
-}>;
+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) => void;
+export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => Promise<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":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAY1B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAM/D,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,OAAO,EACR,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAW/C;AA+ED,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBACnB,YAAY,EAAE,6CACY,YAAY,kBA8CxD,CAAC;AAgEF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,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;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"}

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

@@ -1,29 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = exports.validateContext = void 0;
+exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = exports.registerListInstallationsCommand = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const shared_1 = require("../installations/shared");
 const errors_1 = require("./errors");
 const semver_1 = require("semver");
 const COMMAND_NAME = 'install';
-async function validateContext({ site, product }) {
-    if (product) {
-        product = (0, cli_shared_1.productDisplayName)(product);
-        if (!(0, cli_shared_1.isSupportedProduct)(product)) {
-            throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidProduct);
-        }
-    }
-    const siteURL = site ? (0, cli_shared_1.validateSite)(site, product) : undefined;
-    return { siteURL, product };
-}
-exports.validateContext = validateContext;
-const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
+const registerInstallAppCommand = async ({ cmd, controllers: { installController }, services: { supportedProductsService } }) => {
+    const supportedProducts = await supportedProductsService.getSupportedProducts();
     cmd
         .requireAppId()
         .environmentOption()
-        .option('-s, --site [site]', cli_shared_1.Text.optionSite)
-        .option('-p, --product [product]', cli_shared_1.Text.optionProduct((0, cli_shared_1.getSupportedProducts)()))
-        .precondition(validateContext)
+        .contextOption(supportedProducts)
         .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)
@@ -31,10 +19,10 @@ const registerInstallAppCommand = ({ cmd, controllers: { installController } })
         .option('--users-with-access [user...]', cli_shared_1.Text.install.optionUsersWithAccess)
         .nonInteractiveOption('--site', '--product', '--environment')
         .description(cli_shared_1.Text.install.cmd.description)
-        .action(async ({ environment, siteURL, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }) => {
+        .action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }) => {
         await installController.run({
             environment,
-            site: siteURL,
+            site,
             product,
             upgrade,
             confirmScopes,
@@ -54,18 +42,19 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
         .description(cli_shared_1.Text.installList.cmd)
         .action(async ({ json }) => {
         const { installations } = await installationsService.listAppInstallations();
+        const hasSecondaryInstallations = installations.some(({ secondaryProducts }) => secondaryProducts?.length);
         ui.table([
             ['id', 'Installation ID'],
             ['environment', 'Environment'],
             ['site', 'Site'],
-            ['product', 'Product'],
+            ['product', hasSecondaryInstallations ? 'Product(s)' : 'Product'],
             ['version', 'Version'],
             ['majorVersion', 'Major Version']
-        ], installations.map(({ id, environmentKey, product, site, version: { isLatest, version } }) => ({
+        ], installations.map(({ id, environmentKey, product, secondaryProducts, site, version: { isLatest, version } }) => ({
             id,
             environment: (0, cli_shared_1.environmentToOption)(environmentKey),
             site,
-            product: (0, cli_shared_1.productDisplayName)(product),
+            product: (0, cli_shared_1.productsDisplayName)(product, secondaryProducts),
             version: cli_shared_1.Text.install.booleanToScope(isLatest),
             majorVersion: (0, semver_1.major)(version).toString()
         })), {
@@ -75,6 +64,7 @@ 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,
@@ -121,24 +111,31 @@ const performMultipleUninstalls = async (appsToUninstall, { ui, commands: { unin
     }
 };
 exports.performMultipleUninstalls = performMultipleUninstalls;
-const registerUninstallCommand = (deps) => {
-    const { cmd, ui, services: { installationsService } } = deps;
+const registerUninstallCommand = async (deps) => {
+    const { cmd, ui, services: { installationsService, supportedProductsService } } = deps;
+    const supportedProducts = await supportedProductsService.getSupportedProducts();
     cmd
-        .command('uninstall [installationId]')
+        .command('uninstall')
+        .contextOption(supportedProducts)
+        .environmentOption()
         .requireAppId()
         .description(cli_shared_1.Text.uninstall.cmd.desc)
-        .action(async (installationId) => {
+        .action(async ({ site, environment, product }) => {
         const { installations } = await installationsService.listAppInstallations();
         if (!installations.length) {
             ui.info(cli_shared_1.Text.installList.noInstallations);
             return;
         }
-        const installId = installationId?.trim();
-        if (installId && installId.length > 0) {
+        if (site && product) {
+            const installation = await installationsService.findOnlyMatchingInstallation({
+                site,
+                product,
+                environment
+            });
             ui.info(cli_shared_1.Text.uninstall.info);
             ui.info(cli_shared_1.Text.ctrlC);
             ui.emptyLine();
-            await (0, exports.performSingleUninstall)(installId, deps);
+            await (0, exports.performSingleUninstall)(installation.id, deps);
         }
         else {
             const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
@@ -160,11 +157,11 @@ const registerUninstallCommand = (deps) => {
     });
 };
 const DEPRECATED_LIST_COMMAND = 'install:list';
-const registerCommands = ({ cmd, ...deps }) => {
+const registerCommands = async ({ cmd, ...deps }) => {
     const install = cmd.command(COMMAND_NAME).description(cli_shared_1.Text.variables.description);
-    registerUninstallCommand({ cmd, ...deps });
+    await registerUninstallCommand({ cmd, ...deps });
     cmd.deprecatedCommand(DEPRECATED_LIST_COMMAND, `${COMMAND_NAME} ${LIST_COMMAND_NAME}`, deps.controllers.stubController);
-    registerInstallAppCommand({ cmd: install, ...deps });
-    registerListInstallationsCommand({ cmd: install, ...deps });
+    await registerInstallAppCommand({ cmd: install, ...deps });
+    (0, exports.registerListInstallationsCommand)({ cmd: install, ...deps });
 };
 exports.registerCommands = registerCommands;

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

@@ -0,0 +1,4 @@
+import { Dependencies } from './dependency-injection';
+export declare function parseMajorVersion(majorVersionStr: string, property?: string): number;
+export declare const registerCommands: (deps: Dependencies) => void;
+//# sourceMappingURL=register-version-commands.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"register-version-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-version-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CASpF;AA2DD,eAAO,MAAM,gBAAgB,SAAU,YAAY,SAMlD,CAAC"}

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

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCommands = exports.parseMajorVersion = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+function parseMajorVersion(majorVersionStr, property) {
+    if (!/^\d+$/.test(majorVersionStr)) {
+        throw new cli_shared_1.ValidationError(cli_shared_1.Text.version.check.error.invalidMajorVersion(property));
+    }
+    const version = parseInt(majorVersionStr, 10);
+    if (version < 1) {
+        throw new cli_shared_1.ValidationError(cli_shared_1.Text.version.check.error.invalidMajorVersion(property));
+    }
+    return version;
+}
+exports.parseMajorVersion = parseMajorVersion;
+const registerDetailsCommands = (parent, { controllers: { versionController } }) => {
+    parent
+        .command(cli_shared_1.Text.version.check.cmdName)
+        .description(cli_shared_1.Text.version.check.desc)
+        .requireAppId()
+        .environmentOption()
+        .nonInteractiveOption()
+        .option('-v, --major-version [version]', cli_shared_1.Text.version.check.option.majorVersion)
+        .option('--json', cli_shared_1.Text.version.check.option.json)
+        .option('-f, --out-file [outFile]', cli_shared_1.Text.version.check.option.outFile)
+        .action(async ({ environment, majorVersion, json, outFile, nonInteractive }) => {
+        const majorVersionInt = majorVersion ? parseMajorVersion(majorVersion) : undefined;
+        await versionController.getAppVersionDetails({
+            environment,
+            majorVersion: majorVersionInt,
+            json,
+            outFile,
+            nonInteractive
+        });
+    });
+};
+const registerListCommands = (parent, { controllers: { versionController } }) => {
+    parent
+        .command(cli_shared_1.Text.version.list.cmdName)
+        .description(cli_shared_1.Text.version.list.desc)
+        .requireAppId()
+        .environmentOption()
+        .nonInteractiveOption()
+        .option('--json', cli_shared_1.Text.version.list.option.json)
+        .option('-f, --out-file [outFile]', cli_shared_1.Text.version.list.option.outFile)
+        .action(async ({ environment, json, outFile, nonInteractive }) => {
+        await versionController.getVersionList({ environment, json, outFile, nonInteractive });
+    });
+};
+const registerDiffCommands = (parent, { controllers: { versionController } }) => {
+    parent
+        .command(cli_shared_1.Text.version.diff.cmdName)
+        .description(cli_shared_1.Text.version.diff.desc)
+        .requireAppId()
+        .environmentOption()
+        .nonInteractiveOption()
+        .option('-v1, --version1 [version]', cli_shared_1.Text.version.diff.option.version1)
+        .option('-v2, --version2 [version]', cli_shared_1.Text.version.diff.option.version2)
+        .option('-f, --out-file [outFile]', cli_shared_1.Text.version.diff.option.outFile)
+        .action(async ({ environment, version1, version2, outFile }) => {
+        if (!version1 || !version2) {
+            throw new cli_shared_1.ValidationError(cli_shared_1.Text.version.diff.error.noVersionProvided);
+        }
+        const version1Int = parseMajorVersion(version1, '--version1');
+        const version2Int = parseMajorVersion(version2, '--version2');
+        await versionController.getAppVersionDiff({ environment, version1: version1Int, version2: version2Int, outFile });
+    });
+};
+const registerCommands = (deps) => {
+    const { cmd } = deps;
+    const version = cmd.command(cli_shared_1.Text.version.cmd.cmdName).description(cli_shared_1.Text.version.cmd.desc);
+    registerDetailsCommands(version, deps);
+    registerDiffCommands(version, deps);
+    registerListCommands(version, 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, graphqlGateway, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => void;
+export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => Promise<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,uHAO1B,YAAY,SA6Cd,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,iIAM1B,YAAY,kBAyDd,CAAC"}

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

@@ -26,7 +26,7 @@ function manifestDefinesTriggers(configFile) {
         await getValidWebtriggers(configFile);
     };
 }
-const registerCommands = ({ cmd, ui, graphqlGateway, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }) => {
+const registerCommands = async ({ cmd, ui, configFile, services: { installationsService, supportedProductsService }, commands: { getWebTriggerURLCommand } }) => {
     const validateWebtriggerKey = async (functionKey) => {
         const availableWebTriggers = await getValidWebtriggers(configFile);
         if (functionKey) {
@@ -40,17 +40,25 @@ const registerCommands = ({ cmd, ui, graphqlGateway, configFile, services: { ins
             return await ui.promptForList(cli_shared_1.Text.webtrigger.promptFuncKey, options);
         }
     };
+    const supportedProducts = await supportedProductsService.getSupportedProducts();
     cmd
-        .command('webtrigger [installationId]')
+        .command('webtrigger')
         .requireAppId()
         .description(cli_shared_1.Text.webtrigger.cmd)
         .option('-f, --functionKey [function]', cli_shared_1.Text.webtrigger.optionFuncKey)
+        .contextOption(supportedProducts)
+        .environmentOption()
         .precondition(manifestDefinesTriggers(configFile))
-        .action(async (argInstallationId, { functionKey }) => {
+        .action(async ({ functionKey, site, environment, product }) => {
         let selectedInstallationId = '';
-        if (argInstallationId) {
+        if (site && product) {
             ui.info(cli_shared_1.Text.webtrigger.overviewFuncKey);
-            selectedInstallationId = (0, installation_helper_1.validateInstallationId)(argInstallationId);
+            const installation = await installationsService.findOnlyMatchingInstallation({
+                site,
+                environment,
+                product
+            });
+            selectedInstallationId = (0, installation_helper_1.validateInstallationId)(installation?.id);
         }
         else {
             const appInstallation = await installationsService.listNonTechnicalAppInstallations();

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

@@ -6,7 +6,7 @@ export declare class DeployView {
     constructor(ui: UI);
     getLogger(): UI;
     displayStart(environment: string, environmentType: AppEnvironmentType): void;
-    displayListAppInstallationsError(): void;
+    displayHasNoAppInstallationsForEnvError(): void;
     displayLintRunning(): void;
     displayOutdatedInstallationsMessage(): void;
     displayRoaEligibilityFailureMessage(appVersion: string, envKey: string, envType: AppEnvironmentType): void;

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,qBAAqB,EAAE,kBAAkB,EAAkB,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAClG,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,EAAE,eAAe,EAAE,kBAAkB,GAAG,IAAI;IAI5E,gCAAgC,IAAI,IAAI;IAIxC,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAK1G,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAK1G,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjD,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;IAIjF,0CAA0C,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAIrF,iCAAiC,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAM5D,wCAAwC,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAK7D,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAI5D,wCAAwC,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAI9D,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,yBAAyB,IAAI,OAAO,CAAC,OAAO,CAAC;IAM7C,yCAAyC,IAAI,OAAO,CAAC,OAAO,CAAC;IAKnE,0CAA0C,IAAI,IAAI;IAKlD,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMlD,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"}
+{"version":3,"file":"deploy-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/deploy-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAkB,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAClG,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,EAAE,eAAe,EAAE,kBAAkB,GAAG,IAAI;IAI5E,uCAAuC,IAAI,IAAI;IAI/C,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAK1G,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAK1G,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjD,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;IAIjF,0CAA0C,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAIrF,iCAAiC,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAM5D,wCAAwC,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAK7D,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAI5D,wCAAwC,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAI9D,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,yBAAyB,IAAI,OAAO,CAAC,OAAO,CAAC;IAM7C,yCAAyC,IAAI,OAAO,CAAC,OAAO,CAAC;IAKnE,0CAA0C,IAAI,IAAI;IAKlD,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMlD,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

@@ -15,8 +15,8 @@ class DeployView {
     displayStart(environment, environmentType) {
         this.ui.info(cli_shared_1.Text.deploy.cmd.start1(environment, environmentType));
     }
-    displayListAppInstallationsError() {
-        this.ui.info(cli_shared_1.Text.deploy.taskListInstallation.listInstallationError);
+    displayHasNoAppInstallationsForEnvError() {
+        this.ui.info(cli_shared_1.Text.deploy.hasNoAppInstallationsForEnv.hasNoAppInstallationsForEnvError);
     }
     displayLintRunning() {
         this.ui.info(cli_shared_1.Text.lint.running);

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

@@ -0,0 +1,26 @@
+import { AppEnvironmentType, UI } from '@forge/cli-shared';
+import { VersionDetails, VersionOverview } from '../../service/version-service';
+import { Change } from 'diff';
+export declare class VersionView {
+    private readonly ui;
+    constructor(ui: UI);
+    displayDetailsProgress(progress: () => Promise<VersionDetails>): Promise<VersionDetails>;
+    displayDiffProgress(progress: () => Promise<VersionDetails[]>): Promise<VersionDetails[]>;
+    displayListProgress(progress: () => Promise<VersionOverview[]>): Promise<VersionOverview[]>;
+    promptVersionDetailsProperties(): Promise<(keyof VersionDetails)[]>;
+    displayVersionDetailsBanner(appVersion: number, envKey: string, envType: AppEnvironmentType): void;
+    displayDetailsAsTable(details: Partial<VersionDetails>): void;
+    displayDataInJson(data: VersionDetails): void;
+    displayDiffBanner(version1: number, version2: number, envKey: string, envType: AppEnvironmentType): void;
+    displayDiffAsTable(versions: {
+        v1: number;
+        v2: number;
+    }, input: {
+        key: string;
+        diff: Change[];
+    }[]): void;
+    displayListBanner(versions: number, envKey: string, envType: AppEnvironmentType): void;
+    displayWriteToFile(outFile: string): void;
+    displayVersionList(data: VersionOverview[]): void;
+}
+//# sourceMappingURL=version-view.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"version-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/version-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAG9B,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIzF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3F,8BAA8B,IAAI,OAAO,CAAC,CAAC,MAAM,cAAc,CAAC,EAAE,CAAC;IAmDzE,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMlG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAuE7D,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAI7C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMxG,kBAAkB,CAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,IAAI;IAkCxG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMtF,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzC,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,IAAI;CAwBzD"}