@hubspot/cli 7.4.3-beta.0 → 7.4.4-beta.0

package/commands/project/create.js

@@ -17,9 +17,8 @@ const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
 const { debugError } = require('../../lib/errorHandlers');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH, } = require('../../lib/constants');
-const i18nKey = 'commands.project.subcommands.create';
 exports.command = 'create';
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.describe = uiBetaTag(i18n(`commands.project.subcommands.create.describe`), false);
 exports.handler = async (options) => {
     const { derivedAccountId } = options;
     let latestRepoReleaseTag;
@@ -33,13 +32,13 @@ exports.handler = async (options) => {
             }
         }
         catch (err) {
-            logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+            logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const projectTemplates = await getProjectTemplateListFromRepo(templateSource, latestRepoReleaseTag || DEFAULT_PROJECT_TEMPLATE_BRANCH);
     if (!projectTemplates.length) {
-        logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+        logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
         process.exit(EXIT_CODES.ERROR);
     }
     const createProjectPromptResponse = await createProjectPrompt(options, projectTemplates);
@@ -48,7 +47,7 @@ exports.handler = async (options) => {
     const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
     // Exit if the target destination is within an existing project
     if (existingProjectConfig && projectDest.startsWith(existingProjectDir)) {
-        logger.error(i18n(`${i18nKey}.errors.cannotNestProjects`, {
+        logger.error(i18n(`commands.project.subcommands.create.errors.cannotNestProjects`, {
             projectDir: existingProjectDir,
         }));
         process.exit(EXIT_CODES.ERROR);
@@ -62,7 +61,7 @@ exports.handler = async (options) => {
     }
     catch (err) {
         debugError(err);
-        logger.error(i18n(`${i18nKey}.errors.failedToDownloadProject`));
+        logger.error(i18n(`commands.project.subcommands.create.errors.failedToDownloadProject`));
         process.exit(EXIT_CODES.ERROR);
     }
     const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
@@ -77,12 +76,12 @@ exports.handler = async (options) => {
         fs.ensureDirSync(path.join(projectDest, 'src'));
     }
     logger.log('');
-    logger.success(i18n(`${i18nKey}.logs.success`, {
+    logger.success(i18n(`commands.project.subcommands.create.logs.success`, {
         projectName: createProjectPromptResponse.name,
         projectDest,
     }));
     logger.log('');
-    logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
+    logger.log(chalk.bold(i18n(`commands.project.subcommands.create.logs.welcomeMessage`)));
     uiFeatureHighlight([
         'projectCommandTip',
         'projectUploadCommand',
@@ -97,27 +96,32 @@ exports.handler = async (options) => {
 exports.builder = yargs => {
     yargs.options({
         name: {
-            describe: i18n(`${i18nKey}.options.name.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.name.describe`),
             type: 'string',
         },
         dest: {
-            describe: i18n(`${i18nKey}.options.dest.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.dest.describe`),
             type: 'string',
         },
         template: {
-            describe: i18n(`${i18nKey}.options.template.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.template.describe`),
             type: 'string',
         },
         'template-source': {
-            describe: i18n(`${i18nKey}.options.templateSource.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.templateSource.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project create', i18n(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project create',
+            i18n(`commands.project.subcommands.create.examples.default`),
+        ],
+    ]);
     yargs.example([
         [
             '$0 project create --template-source HubSpot/ui-extensions-examples',
-            i18n(`${i18nKey}.examples.templateSource`),
+            i18n(`commands.project.subcommands.create.examples.templateSource`),
         ],
     ]);
     addConfigOptions(yargs);

package/commands/project/deploy.js

@@ -23,21 +23,20 @@ const ui_1 = require("../../lib/ui");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.deploy';
 exports.command = 'deploy';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
 function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
     if (Number(buildId) > latestBuildId) {
-        return (0, lang_1.i18n)(`${i18nKey}.errors.buildIdDoesNotExist`, {
+        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildIdDoesNotExist`, {
             buildId: buildId,
             projectName: projectName,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
+            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
         });
     }
     if (Number(buildId) === deployedBuildId) {
-        return (0, lang_1.i18n)(`${i18nKey}.errors.buildAlreadyDeployed`, {
+        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildAlreadyDeployed`, {
             buildId: buildId,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
+            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
         });
     }
     return true;
@@ -61,7 +60,7 @@ async function handler(args) {
     try {
         const { data: { latestBuild, deployedBuildId }, } = await (0, projects_1.fetchProject)(derivedAccountId, projectName);
         if (!latestBuild || !latestBuild.buildId) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuilds`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuilds`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
@@ -74,7 +73,7 @@ async function handler(args) {
         else {
             const deployBuildIdPromptResponse = await (0, promptUtils_1.promptUser)({
                 name: 'buildId',
-                message: (0, lang_1.i18n)(`${i18nKey}.deployBuildIdPrompt`),
+                message: (0, lang_1.i18n)(`commands.project.subcommands.deploy.deployBuildIdPrompt`),
                 default: latestBuild.buildId === deployedBuildId
                     ? undefined
                     : latestBuild.buildId,
@@ -83,19 +82,19 @@ async function handler(args) {
             buildIdToDeploy = deployBuildIdPromptResponse.buildId;
         }
         if (!buildIdToDeploy) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuildId`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuildId`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const { data: deployResp } = await (0, projects_1.deployProject)(derivedAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
         if (!deployResp) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.deploy`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deploy`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         await (0, buildAndDeploy_2.pollDeployStatus)(derivedAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
     }
     catch (e) {
         if ((0, index_1.isHubSpotHttpError)(e) && e.status === 404) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.projectNotFound`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.projectNotFound`, {
                 projectName: chalk_1.default.bold(projectName),
                 accountIdentifier: (0, ui_2.uiAccountDescription)(derivedAccountId),
                 command: (0, ui_2.uiCommandReference)('hs project upload'),
@@ -116,20 +115,23 @@ async function handler(args) {
 function projectDeployBuilder(yargs) {
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.project.describe`),
             type: 'string',
         },
         build: {
             alias: ['build-id'],
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.build.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.build.describe`),
             type: 'number',
         },
     });
     yargs.example([
-        ['$0 project deploy', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project deploy',
+            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.default`),
+        ],
         [
             '$0 project deploy --project="my-project" --build=5',
-            (0, lang_1.i18n)(`${i18nKey}.examples.withOptions`),
+            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.withOptions`),
         ],
     ]);
     return yargs;

package/commands/project/dev/deprecatedFlow.js

@@ -18,7 +18,6 @@ const localDev_1 = require("../../../lib/localDev");
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const projects_1 = require("../../../lib/projects");
-const i18nKey = 'commands.project.subcommands.dev';
 async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
     const { providedAccountId, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
@@ -28,25 +27,34 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     const hasPrivateApps = !!componentTypes[Projects_1.ComponentTypes.PrivateApp];
     const hasPublicApps = !!componentTypes[Projects_1.ComponentTypes.PublicApp];
     if (runnableComponents.length === 0) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noRunnableComponents`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noRunnableComponents`, {
             projectDir,
             command: (0, ui_1.uiCommandReference)('hs project add'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     else if (hasPrivateApps && hasPublicApps) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidProjectComponents`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.invalidProjectComponents`));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const accounts = (0, config_1.getConfigAccounts)();
     if (!accounts) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccountsInConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccountsInConfig`, {
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const defaultAccountIsRecommendedType = (0, accountTypes_1.isDeveloperTestAccount)(accountConfig) ||
-        (!hasPublicApps && (0, accountTypes_1.isSandbox)(accountConfig));
+    let bypassRecommendedAccountPrompt = false;
+    if ((0, accountTypes_1.isDeveloperTestAccount)(accountConfig)) {
+        bypassRecommendedAccountPrompt = true;
+    }
+    else if (!hasPublicApps && (0, accountTypes_1.isSandbox)(accountConfig)) {
+        bypassRecommendedAccountPrompt = true;
+    }
+    else if (!hasPublicApps) {
+        const defaultAccountHasSandboxes = await (0, localDev_1.hasSandboxes)(accountConfig);
+        bypassRecommendedAccountPrompt = !defaultAccountHasSandboxes;
+    }
     // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
     // By setting them to null, we can later check if they need to be assigned based on the default account configuration and the type of app.
     let targetProjectAccountId = providedAccountId ? derivedAccountId : null;
@@ -60,10 +68,10 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         }
     }
     else {
-        (0, localDev_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
+        await (0, localDev_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
     }
     // The user is targeting an account type that we recommend developing on
-    if (!targetProjectAccountId && defaultAccountIsRecommendedType) {
+    if (!targetProjectAccountId && bypassRecommendedAccountPrompt) {
         targetTestingAccountId = derivedAccountId;
         await (0, localDev_1.confirmDefaultAccountIsTarget)(accountConfig);
         if (hasPublicApps) {
@@ -86,9 +94,8 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         if (notInConfigAccount) {
             await (0, localDev_1.useExistingDevTestAccount)(env, notInConfigAccount);
         }
-        createNewSandbox = (0, accountTypes_1.isStandardAccount)(accountConfig) && createNestedAccount;
-        createNewDeveloperTestAccount =
-            (0, accountTypes_1.isAppDeveloperAccount)(accountConfig) && createNestedAccount;
+        createNewSandbox = hasPrivateApps && createNestedAccount;
+        createNewDeveloperTestAccount = hasPublicApps && createNestedAccount;
     }
     if (createNewSandbox) {
         targetProjectAccountId = await (0, localDev_1.createSandboxForLocalDev)(derivedAccountId, accountConfig, env);
@@ -100,7 +107,7 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         targetProjectAccountId = derivedAccountId;
     }
     if (!targetProjectAccountId || !targetTestingAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccount`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccount`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     // eslint-disable-next-line prefer-const

package/commands/project/dev/index.js

@@ -14,25 +14,24 @@ const ui_1 = require("../../../lib/ui");
 const deprecatedFlow_1 = require("./deprecatedFlow");
 const unifiedFlow_1 = require("./unifiedFlow");
 const buildAndDeploy_1 = require("../../../lib/projects/buildAndDeploy");
-const i18nKey = 'commands.project.subcommands.dev';
 exports.command = 'dev';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.describe`), false);
 async function handler(args) {
     const { derivedAccountId } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     (0, usageTracking_1.trackCommandUsage)('project-dev', {}, derivedAccountId);
     const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
-    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.logs.betaMessage`));
-    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
+    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.betaMessage`));
+    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
     if (!projectConfig || !projectDir) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noProjectConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noProjectConfig`, {
             accountId: derivedAccountId,
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccount`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccount`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, projects_1.validateProjectConfig)(projectConfig, projectDir);
@@ -47,6 +46,11 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addAccountOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    yargs.example([['$0 project dev', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project dev',
+            (0, lang_1.i18n)(`commands.project.subcommands.dev.examples.default`),
+        ],
+    ]);
     return yargs;
 }

package/commands/project/dev/unifiedFlow.js

@@ -22,7 +22,6 @@ const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
 const lang_1 = require("../../../lib/lang");
-const i18nKey = 'commands.project.subcommands.dev';
 async function unifiedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
     logger_1.logger.log('Unified Apps Local Dev');
     const targetProjectAccountId = args.derivedAccountId;
@@ -49,7 +48,7 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
     }
     // @TODO Do we need to do more than this or leave it to the dev servers?
     if (!Object.keys(projectNodes).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noRunnableComponents`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noRunnableComponents`, {
             projectDir,
             command: (0, ui_1.uiCommandReference)('hs project add'),
         }));
@@ -61,7 +60,7 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
     // For now, check if the account is either developer or standard
     const derivedAccountIsRecommendedType = (0, accountTypes_1.isAppDeveloperAccount)(accountConfig) || (0, accountTypes_1.isStandardAccount)(accountConfig);
     if (!derivedAccountIsRecommendedType) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidUnifiedAppsAccount`), {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.invalidUnifiedAppsAccount`), {
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         });
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);

package/commands/project/download.js

@@ -18,13 +18,12 @@ const ui_1 = require("../../lib/ui");
 const usageTracking_1 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.download';
 exports.command = 'download';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.download.describe`), false);
 async function handler(args) {
     const { projectConfig } = await (0, projects_2.getProjectConfig)();
     if (projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.warnings.cannotDownloadWithinProject`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.download.warnings.cannotDownloadWithinProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const { dest, build, derivedAccountId } = args;
@@ -41,13 +40,13 @@ async function handler(args) {
             }
         }
         if (!buildNumberToDownload) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuildIdToDownload`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.download.errors.noBuildIdToDownload`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const absoluteDestPath = dest ? path_1.default.resolve((0, path_2.getCwd)(), dest) : (0, path_2.getCwd)();
         const { data: zippedProject } = await (0, projects_1.downloadProject)(derivedAccountId, projectName, buildNumberToDownload);
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), path_1.default.resolve(absoluteDestPath), { includesRootDir: false });
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.downloadSucceeded`, {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.download.logs.downloadSucceeded`, {
             buildId: buildNumberToDownload,
             projectName,
         }));
@@ -64,15 +63,15 @@ async function handler(args) {
 function projectDownloadBuilder(yargs) {
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.project.describe`),
             type: 'string',
         },
         dest: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.dest.describe`),
             type: 'string',
         },
         build: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.build.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.build.describe`),
             alias: ['build-id'],
             type: 'number',
         },
@@ -80,7 +79,7 @@ function projectDownloadBuilder(yargs) {
     yargs.example([
         [
             '$0 project download --project=myProject --dest=myProjectFolder',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.project.subcommands.download.examples.default`),
         ],
     ]);
     return yargs;

package/commands/project/installDeps.js

@@ -16,16 +16,15 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = `commands.project.subcommands.installDeps`;
 exports.command = 'install-deps [packages..]';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.help.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.installDeps.help.describe`), false);
 async function handler(args) {
     const { derivedAccountId, packages } = args;
     try {
         (0, usageTracking_1.trackCommandUsage)('project-install-deps', undefined, derivedAccountId);
         const projectConfig = await (0, projects_1.getProjectConfig)();
         if (!projectConfig || !projectConfig.projectDir) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.noProjectConfig`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noProjectConfig`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
@@ -36,14 +35,14 @@ async function handler(args) {
                     name: 'selectedInstallLocations',
                     type: 'checkbox',
                     when: () => packages && packages.length > 0,
-                    message: (0, lang_1.i18n)(`${i18nKey}.installLocationPrompt`),
+                    message: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installLocationPrompt`),
                     choices: installLocations.map(dir => ({
                         name: path_1.default.relative(projectDir, dir),
                         value: dir,
                     })),
                     validate: choices => {
                         if (choices === undefined || choices.length === 0) {
-                            return (0, lang_1.i18n)(`${i18nKey}.installLocationPromptRequired`);
+                            return (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installLocationPromptRequired`);
                         }
                         return true;
                     },
@@ -65,10 +64,13 @@ async function handler(args) {
 }
 function projectInstallDepsBuilder(yargs) {
     yargs.example([
-        ['$0 project install-deps', (0, lang_1.i18n)(`${i18nKey}.help.installAppDepsExample`)],
+        [
+            '$0 project install-deps',
+            (0, lang_1.i18n)(`commands.project.subcommands.installDeps.help.installAppDepsExample`),
+        ],
         [
             '$0 project install-deps dependency1 dependency2',
-            (0, lang_1.i18n)(`${i18nKey}.help.addDepToSubComponentExample`),
+            (0, lang_1.i18n)(`commands.project.subcommands.installDeps.help.addDepToSubComponentExample`),
         ],
     ]);
     return yargs;

package/commands/project/listBuilds.js

@@ -20,27 +20,26 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const index_2 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.project.subcommands.listBuilds';
 exports.command = 'list-builds';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.describe`), false);
 async function fetchAndDisplayBuilds(accountId, project, options) {
     const { data: { results, paging }, } = await (0, projects_1.fetchProjectBuilds)(accountId, project.name, options);
     const currentDeploy = project.deployedBuildId;
     if (options && options.after) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.showingNextBuilds`, {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.logs.showingNextBuilds`, {
             count: results.length,
             projectName: project.name,
         }));
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.showingRecentBuilds`, {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.logs.showingRecentBuilds`, {
             count: results.length,
             projectName: project.name,
-            viewBuildsLink: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.logs.viewAllBuildsLink`), (0, urls_1.getProjectDetailUrl)(project.name, accountId)),
+            viewBuildsLink: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.logs.viewAllBuildsLink`), (0, urls_1.getProjectDetailUrl)(project.name, accountId)),
         }));
     }
     if (results.length === 0) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.noBuilds`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.errors.noBuilds`));
     }
     else {
         const builds = results.map(build => {
@@ -70,7 +69,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     if (paging && paging.next) {
         await (0, promptUtils_1.promptUser)({
             name: 'more',
-            message: (0, lang_1.i18n)(`${i18nKey}.continueOrExitPrompt`),
+            message: (0, lang_1.i18n)(`commands.project.subcommands.listBuilds.continueOrExitPrompt`),
         });
         await fetchAndDisplayBuilds(accountId, project, {
             limit: options.limit,
@@ -93,7 +92,9 @@ async function handler(args) {
     }
     catch (e) {
         if ((0, index_1.isHubSpotHttpError)(e) && e.status === 404) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.projectNotFound`, { projectName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.listBuilds.errors.projectNotFound`, {
+                projectName,
+            }));
         }
         else {
             (0, index_2.logError)(e, new index_2.ApiErrorContext({
@@ -110,16 +111,19 @@ function builder(yargs) {
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.listBuilds.options.project.describe`),
             type: 'string',
         },
         limit: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.limit.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.listBuilds.options.limit.describe`),
             type: 'string',
         },
     });
     yargs.example([
-        ['$0 project list-builds', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project list-builds',
+            (0, lang_1.i18n)(`commands.project.subcommands.listBuilds.examples.default`),
+        ],
     ]);
     return yargs;
 }

package/commands/project/logs.js

@@ -14,40 +14,39 @@ const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ProjectLogsManager_1 = require("../../lib/projects/ProjectLogsManager");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.logs';
 function getPrivateAppsUrl(accountId) {
     const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
     return `${baseUrl}/private-apps/${accountId}`;
 }
 function logTable(tableHeader, logsInfo) {
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.showingLogs`));
+    logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.logs.logs.showingLogs`));
     logger_1.logger.log((0, table_1.getTableContents)([tableHeader, logsInfo], { border: { bodyLeft: '  ' } }));
 }
 function logPreamble() {
     if (ProjectLogsManager_1.ProjectLogsManager.isPublicFunction) {
         logTable((0, table_1.getTableHeader)([
-            (0, lang_1.i18n)(`${i18nKey}.table.accountHeader`),
-            (0, lang_1.i18n)(`${i18nKey}.table.functionHeader`),
-            (0, lang_1.i18n)(`${i18nKey}.table.endpointHeader`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.table.accountHeader`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.table.functionHeader`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.table.endpointHeader`),
         ]), [
             ProjectLogsManager_1.ProjectLogsManager.accountId,
             ProjectLogsManager_1.ProjectLogsManager.functionName,
             ProjectLogsManager_1.ProjectLogsManager.endpointName,
         ]);
-        logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager_1.ProjectLogsManager.accountId)}/${ProjectLogsManager_1.ProjectLogsManager.appId}/logs/serverlessGatewayExecution?path=${ProjectLogsManager_1.ProjectLogsManager.endpointName}`));
+        logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.logs.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager_1.ProjectLogsManager.accountId)}/${ProjectLogsManager_1.ProjectLogsManager.appId}/logs/serverlessGatewayExecution?path=${ProjectLogsManager_1.ProjectLogsManager.endpointName}`));
     }
     else {
         logTable((0, table_1.getTableHeader)([
-            (0, lang_1.i18n)(`${i18nKey}.table.accountHeader`),
-            (0, lang_1.i18n)(`${i18nKey}.table.functionHeader`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.table.accountHeader`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.table.functionHeader`),
         ]), [ProjectLogsManager_1.ProjectLogsManager.accountId, ProjectLogsManager_1.ProjectLogsManager.functionName]);
-        logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager_1.ProjectLogsManager.accountId)}/${ProjectLogsManager_1.ProjectLogsManager.appId}/logs/crm?serverlessFunction=${ProjectLogsManager_1.ProjectLogsManager.functionName}`));
+        logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.logs.logs.hubspotLogsDirectLink`), `${getPrivateAppsUrl(ProjectLogsManager_1.ProjectLogsManager.accountId)}/${ProjectLogsManager_1.ProjectLogsManager.appId}/logs/crm?serverlessFunction=${ProjectLogsManager_1.ProjectLogsManager.functionName}`));
     }
     logger_1.logger.log();
     (0, ui_1.uiLine)();
 }
 exports.command = 'logs';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.logs.describe`), false);
 const handler = async (args) => {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-logs', undefined, derivedAccountId);
@@ -75,35 +74,38 @@ function projectLogsBuilder(yargs) {
     yargs.options({
         function: {
             alias: 'function',
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.function.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.logs.options.function.describe`),
             requiresArg: true,
             type: 'string',
         },
         latest: {
             alias: 'l',
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.latest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.logs.options.latest.describe`),
             type: 'boolean',
         },
         compact: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.compact.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.logs.options.compact.describe`),
             type: 'boolean',
         },
         tail: {
             alias: ['t', 'follow'],
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.tail.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.logs.options.tail.describe`),
             type: 'boolean',
         },
         limit: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.limit.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.logs.options.limit.describe`),
             type: 'number',
         },
     });
     yargs.conflicts('tail', 'limit');
     yargs.example([
-        ['$0 project logs', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project logs',
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.examples.default`),
+        ],
         [
             '$0 project logs --function=my-function',
-            (0, lang_1.i18n)(`${i18nKey}.examples.withOptions`),
+            (0, lang_1.i18n)(`commands.project.subcommands.logs.examples.withOptions`),
         ],
     ]);
     return yargs;