@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/commands/project/watch.d.ts

@@ -1 +1,6 @@
-export {};
+import { CommonArgs, AccountArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectWatchArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    initialUpload?: boolean;
+};
+declare const projectWatchCommand: YargsCommandModule<unknown, ProjectWatchArgs>;
+export default projectWatchCommand;

package/commands/project/watch.js

@@ -1,92 +1,111 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { i18n } = require('../../lib/lang');
-const { createWatcher } = require('../../lib/projects/watch');
-const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { uiBetaTag } = require('../../lib/ui');
-const { ensureProjectExists, getProjectConfig, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
-const { handleProjectUpload } = require('../../lib/projects/upload');
-const { pollBuildStatus, pollDeployStatus, } = require('../../lib/projects/buildAndDeploy');
-const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { handleKeypress, handleExit } = require('../../lib/process');
-const i18nKey = 'commands.project.subcommands.watch';
-exports.command = 'watch';
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-const handleBuildStatus = async (accountId, projectName, buildId) => {
-    const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId);
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const ui_1 = require("../../lib/ui");
+const lang_1 = require("../../lib/lang");
+const watch_1 = require("../../lib/projects/watch");
+const index_2 = require("../../lib/errorHandlers/index");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const constants_1 = require("../../lib/constants");
+const usageTracking_1 = require("../../lib/usageTracking");
+const config_1 = require("../../lib/projects/config");
+const ui_2 = require("../../lib/projects/ui");
+const upload_1 = require("../../lib/projects/upload");
+const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const process_1 = require("../../lib/process");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'watch';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.watch.describe`), false);
+async function handleBuildStatus(accountId, projectName, buildId) {
+    const { isAutoDeployEnabled, deployStatusTaskLocator } = await (0, buildAndDeploy_2.pollBuildStatus)(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
-        await pollDeployStatus(accountId, projectName, deployStatusTaskLocator.id, buildId);
+        await (0, buildAndDeploy_2.pollDeployStatus)(accountId, projectName, Number(deployStatusTaskLocator.id), buildId);
     }
-    logFeedbackMessage(buildId);
-};
-const handleUserInput = (accountId, projectName, currentBuildId) => {
+    (0, ui_2.logFeedbackMessage)(buildId);
+}
+function handleUserInput(accountId, projectName, currentBuildId) {
     const onTerminate = async () => {
-        logger.log(i18n(`${i18nKey}.logs.processExited`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.watch.logs.processExited`));
         if (currentBuildId) {
             try {
-                await cancelStagedBuild(accountId, projectName);
-                process.exit(EXIT_CODES.SUCCESS);
+                await (0, projects_1.cancelStagedBuild)(accountId, projectName);
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
             }
             catch (err) {
-                if (isSpecifiedError(err, {
-                    subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
+                if ((0, index_1.isSpecifiedError)(err, {
+                    subCategory: constants_1.PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
                 })) {
-                    process.exit(EXIT_CODES.SUCCESS);
+                    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
                 }
                 else {
-                    logError(err, new ApiErrorContext({ accountId }));
-                    process.exit(EXIT_CODES.ERROR);
+                    (0, index_2.logError)(err, new index_2.ApiErrorContext({ accountId }));
+                    process.exit(exitCodes_1.EXIT_CODES.ERROR);
                 }
             }
         }
         else {
-            process.exit(EXIT_CODES.SUCCESS);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     };
-    handleExit(onTerminate);
-    handleKeypress(key => {
+    (0, process_1.handleExit)(onTerminate);
+    (0, process_1.handleKeypress)(key => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             onTerminate();
         }
     });
-};
-exports.handler = async (options) => {
-    const { initialUpload, derivedAccountId } = options;
-    trackCommandUsage('project-watch', null, derivedAccountId);
-    const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(derivedAccountId, projectConfig.name);
+}
+async function handler(args) {
+    const { initialUpload, derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('project-watch', undefined, derivedAccountId);
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+    (0, config_1.validateProjectConfig)(projectConfig, projectDir);
+    if (!projectConfig || !projectDir) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.projectConfigNotFound`));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.v3ApiError`, {
+            command: (0, ui_1.uiCommandReference)('hs project watch'),
+            newCommand: (0, ui_1.uiCommandReference)('hs project dev'),
+            platformVersion: projectConfig.platformVersion,
+            linkToDocs: (0, ui_1.uiLink)('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
+        }));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    (0, config_1.validateProjectConfig)(projectConfig, projectDir);
     try {
-        const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name, options);
+        const { data: { results: builds }, } = await (0, projects_1.fetchProjectBuilds)(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;
         const startWatching = async () => {
-            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await (0, watch_1.createWatcher)(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const { uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
+            const { uploadError } = await (0, upload_1.handleProjectUpload)({
+                accountId: derivedAccountId,
+                projectConfig,
+                projectDir,
+                callbackFunc: startWatching,
+                isUploadCommand: false,
+            });
             if (uploadError) {
-                if (isSpecifiedError(uploadError, {
-                    subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+                if ((0, index_1.isSpecifiedError)(uploadError, {
+                    subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
-                    logger.log();
-                    logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
-                    logger.log();
+                    logger_1.logger.log();
+                    logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.watch.errors.projectLockedError`));
+                    logger_1.logger.log();
                 }
                 else {
-                    logError(uploadError, new ApiErrorContext({
+                    (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
                         accountId: derivedAccountId,
                         request: 'project upload',
                     }));
                 }
-                process.exit(EXIT_CODES.ERROR);
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
         else {
@@ -94,18 +113,33 @@ exports.handler = async (options) => {
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
+        (0, index_2.logError)(e, new index_2.ApiErrorContext({ accountId: derivedAccountId }));
     }
-};
-exports.builder = yargs => {
+}
+function projectWatchBuilder(yargs) {
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`${i18nKey}.options.initialUpload.describe`),
+        describe: (0, lang_1.i18n)(`commands.project.subcommands.watch.options.initialUpload.describe`),
         type: 'boolean',
     });
-    yargs.example([['$0 project watch', i18n(`${i18nKey}.examples.default`)]]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
+    yargs.example([
+        [
+            '$0 project watch',
+            (0, lang_1.i18n)(`commands.project.subcommands.watch.examples.default`),
+        ],
+    ]);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectWatchBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectWatchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = projectWatchCommand;

package/commands/project.d.ts

@@ -1 +1,3 @@
-export {};
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const projectCommand: YargsCommandModuleBucket;
+export default projectCommand;

package/commands/project.js

@@ -1,41 +1,53 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addGlobalOptions } = require('../lib/commonOpts');
-const { i18n } = require('../lib/lang');
-const { uiBetaTag } = require('../lib/ui');
-const deploy = require('./project/deploy');
-const create = require('./project/create');
-const upload = require('./project/upload');
-const listBuilds = require('./project/listBuilds');
-const logs = require('./project/logs');
-const watch = require('./project/watch');
-const download = require('./project/download');
-const open = require('./project/open');
-const dev = require('./project/dev');
-const add = require('./project/add');
-const migrateApp = require('./project/migrateApp');
-const cloneApp = require('./project/cloneApp');
-const installDeps = require('./project/installDeps');
-const i18nKey = 'commands.project';
-exports.command = ['project', 'projects'];
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-exports.builder = yargs => {
-    addGlobalOptions(yargs);
+const lang_1 = require("../lib/lang");
+const ui_1 = require("../lib/ui");
+const deploy_1 = __importDefault(require("./project/deploy"));
+const create_1 = __importDefault(require("./project/create"));
+const upload_1 = __importDefault(require("./project/upload"));
+const listBuilds_1 = __importDefault(require("./project/listBuilds"));
+const logs_1 = __importDefault(require("./project/logs"));
+const watch_1 = __importDefault(require("./project/watch"));
+const download_1 = __importDefault(require("./project/download"));
+const open_1 = __importDefault(require("./project/open"));
+const dev_1 = __importDefault(require("./project/dev"));
+const add_1 = __importDefault(require("./project/add"));
+const migrate_1 = __importDefault(require("./project/migrate"));
+const migrateApp_1 = __importDefault(require("./project/migrateApp"));
+const cloneApp_1 = __importDefault(require("./project/cloneApp"));
+const installDeps_1 = __importDefault(require("./project/installDeps"));
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['project', 'projects'];
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.describe`), false);
+function projectBuilder(yargs) {
     yargs
-        .command(create)
-        .command(add)
-        .command(watch)
-        .command(dev)
-        .command(upload)
-        .command(deploy)
-        .command(logs)
-        .command(listBuilds)
-        .command(download)
-        .command(open)
-        .command(migrateApp)
-        .command(cloneApp)
-        .command(installDeps)
+        .command(create_1.default)
+        .command(add_1.default)
+        .command(watch_1.default)
+        .command(dev_1.default)
+        .command(upload_1.default)
+        .command(deploy_1.default)
+        .command(logs_1.default)
+        .command(listBuilds_1.default)
+        .command(download_1.default)
+        .command(open_1.default)
+        .command(migrateApp_1.default)
+        .command(migrate_1.default)
+        .command(cloneApp_1.default)
+        .command(installDeps_1.default)
         .demandCommand(1, '');
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectBuilder, command, describe);
+const projectCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
 };
+exports.default = projectCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = projectCommand;

package/commands/remove.js

@@ -9,18 +9,20 @@ const index_1 = require("../lib/errorHandlers/index");
 const commonOpts_1 = require("../lib/commonOpts");
 const usageTracking_1 = require("../lib/usageTracking");
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.remove';
 exports.command = 'remove <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.remove.describe`);
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('remove', undefined, derivedAccountId);
     try {
         await (0, fileMapper_1.deleteFile)(derivedAccountId, hsPath);
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.deleted`, { accountId: derivedAccountId, path: hsPath }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.remove.deleted`, {
+            accountId: derivedAccountId,
+            path: hsPath,
+        }));
     }
     catch (error) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.deleteFailed`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.remove.errors.deleteFailed`, {
             accountId: derivedAccountId,
             path: hsPath,
         }));
@@ -36,7 +38,7 @@ function builder(yargs) {
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.i18n)(`commands.remove.positionals.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/sandbox/create.js

@@ -21,9 +21,8 @@ const sandboxSync_1 = require("../../lib/sandboxSync");
 const index_2 = require("../../lib/errorHandlers/index");
 const buildAccount_1 = require("../../lib/buildAccount");
 const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
-const i18nKey = 'commands.sandbox.subcommands.create';
 exports.command = 'create';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.create.describe`), false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -31,7 +30,7 @@ async function handler(args) {
     (0, usageTracking_1.trackCommandUsage)('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccountConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
             accountId: derivedAccountId,
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
@@ -40,7 +39,7 @@ async function handler(args) {
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidAccountType`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
             accountType: config_2.HUBSPOT_ACCOUNT_TYPE_STRINGS[config_2.HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
             accountName: accountConfig.name || '',
         }));
@@ -53,7 +52,7 @@ async function handler(args) {
             typePrompt = await (0, sandboxesPrompt_1.sandboxTypePrompt)();
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.type`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -86,7 +85,7 @@ async function handler(args) {
             namePrompt = await (0, accountNamePrompt_1.hubspotAccountNamePrompt)({ accountType: sandboxType });
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.name`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -111,7 +110,7 @@ async function handler(args) {
         const sandboxAccountConfig = (0, config_1.getAccountConfig)(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountConfig`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
                 accountId: result.sandbox.sandboxHubId,
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -151,20 +150,20 @@ function builder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.force.describe`),
     });
     yargs.option('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.name.describe`),
         type: 'string',
     });
     yargs.option('type', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.type.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.type.describe`),
         choices: Object.keys(sandboxes_1.SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
             '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.sandbox.subcommands.create.examples.default`),
         ],
     ]);
     (0, commonOpts_1.addConfigOptions)(yargs);

package/commands/sandbox/delete.js

@@ -19,9 +19,8 @@ const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const ui_1 = require("../../lib/ui");
-const i18nKey = 'commands.sandbox.subcommands.delete';
 exports.command = 'delete';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
 async function handler(args) {
     const { providedAccountId, force } = args;
     (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
@@ -33,12 +32,12 @@ async function handler(args) {
         else {
             // Account is required, throw error if force flag is present and no account is specified
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccount`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noAccount`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccounts`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccounts`, {
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -46,7 +45,7 @@ async function handler(args) {
     }
     const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
     if (!sandboxAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountId`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const isDefaultAccount = sandboxAccountId === (0, config_1.getAccountId)();
@@ -61,7 +60,7 @@ async function handler(args) {
             else if (!force) {
                 const parentAccountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)(true);
                 if (!parentAccountPrompt) {
-                    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                    logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                         authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                     }));
                     process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -69,7 +68,7 @@ async function handler(args) {
                 parentAccountId = (0, config_1.getAccountId)(parentAccountPrompt.account);
             }
             else {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                     authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                 }));
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -80,7 +79,7 @@ async function handler(args) {
     const command = `hs auth ${(0, config_1.getEnv)(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
     if (parentAccountId && !(0, config_1.getAccountId)(parentAccountId)) {
         logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentPortalAvailable`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentPortalAvailable`, {
             parentAccountId,
             url,
             command,
@@ -88,11 +87,11 @@ async function handler(args) {
         logger_1.logger.log('');
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.deleting`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.debug.deleting`, {
         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
     }));
     if (isDefaultAccount) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.defaultAccountWarning`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.defaultAccountWarning`, {
             account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
         }));
         logger_1.logger.log('');
@@ -103,7 +102,7 @@ async function handler(args) {
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: (0, lang_1.i18n)(`${i18nKey}.confirm`, {
+                    message: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.confirm`, {
                         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                     }),
                 },
@@ -114,8 +113,8 @@ async function handler(args) {
         }
         await (0, sandboxHubs_1.deleteSandbox)(parentAccountId, sandboxAccountId);
         const deleteKey = isDefaultAccount
-            ? `${i18nKey}.success.deleteDefault`
-            : `${i18nKey}.success.delete`;
+            ? `commands.sandbox.subcommands.delete.success.deleteDefault`
+            : `commands.sandbox.subcommands.delete.success.delete`;
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
             account: providedAccountId || accountPrompt.account,
@@ -139,7 +138,7 @@ async function handler(args) {
             // Intercept invalid key error
             // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidKey`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidKey`, {
                 account: (0, ui_1.uiAccountDescription)(parentAccountId),
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -150,7 +149,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidUser`, {
                 accountName: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                 parentAccountName: (0, ui_1.uiAccountDescription)(parentAccountId),
             }));
@@ -162,7 +161,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.failure.objectNotFound`, {
+            logger_1.logger.warn((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.objectNotFound`, {
                 account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
             }));
             logger_1.logger.log('');
@@ -185,18 +184,18 @@ async function handler(args) {
 }
 function builder(yargs) {
     yargs.option('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.account.describe`),
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.force.describe`),
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.examples.default`),
         ],
     ]);
     (0, commonOpts_1.addConfigOptions)(yargs);

package/commands/sandbox.js

@@ -40,9 +40,8 @@ const lang_1 = require("../lib/lang");
 const ui_1 = require("../lib/ui");
 const create = __importStar(require("./sandbox/create"));
 const del = __importStar(require("./sandbox/delete"));
-const i18nKey = 'commands.sandbox';
 exports.command = ['sandbox', 'sandboxes'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.describe`), false);
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs.command(create).command(del).demandCommand(1, '');

package/commands/secret/addSecret.js

@@ -13,9 +13,8 @@ const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
-const i18nKey = 'commands.secret.subcommands.add';
 exports.command = 'add [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.add.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -27,7 +26,7 @@ async function handler(args) {
         }
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.alreadyExists`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.alreadyExists`, {
                 secretName,
                 command: (0, ui_2.uiCommandReference)('hs secret update'),
             }));
@@ -35,13 +34,13 @@ async function handler(args) {
         }
         const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
         await (0, secrets_1.addSecret)(derivedAccountId, secretName, secretValue);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.add`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.add.success.add`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.add`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.add`, {
             secretName: secretName || '',
         }));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
@@ -55,7 +54,7 @@ function builder(yargs) {
     (0, commonOpts_1.addAccountOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.add.positionals.name.describe`),
         type: 'string',
     });
     return yargs;