@hubspot/cli 7.8.12-experimental.0 → 7.8.12-experimental.1

package/commands/project/upload.js

@@ -1,36 +1,34 @@
 import chalk from 'chalk';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
-import { uiCommandReference } from '../../lib/ui/index.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { loadAndValidateProfile } from '../../lib/projectProfiles.js';
 import { displayWarnLogs, pollProjectBuildAndDeploy, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'upload';
-const describe = i18n(`commands.project.subcommands.upload.describe`);
+const describe = commands.project.upload.describe;
 async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
     let targetAccountId;
-    if (useV3Api(projectConfig.platformVersion)) {
-        targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile, args.useEnv);
+    if (isV2Project(projectConfig.platformVersion)) {
+        targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
     }
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getAccountConfig(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, targetAccountId);
+    trackCommandUsage('project-upload', { type: accountType, assetType: projectConfig.platformVersion }, targetAccountId);
     try {
         const { result, uploadError } = await handleProjectUpload({
             accountId: targetAccountId,
@@ -40,7 +38,7 @@ async function handler(args) {
             uploadMessage: message,
             forceCreate,
             isUploadCommand: true,
-            sendIR: useV3Api(projectConfig.platformVersion),
+            sendIR: isV2Project(projectConfig.platformVersion),
             skipValidation,
             profile: args.profile,
         });
@@ -48,9 +46,9 @@ async function handler(args) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
             })) {
-                logger.log();
-                logger.error(i18n(`commands.project.subcommands.upload.errors.projectLockedError`));
-                logger.log();
+                uiLogger.log('');
+                uiLogger.error(commands.project.upload.errors.projectLockedError);
+                uiLogger.log('');
             }
             else {
                 logError(uploadError, new ApiErrorContext({
@@ -61,12 +59,8 @@ async function handler(args) {
             process.exit(EXIT_CODES.ERROR);
         }
         if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-            logger.log(chalk.bold(i18n(`commands.project.subcommands.upload.logs.buildSucceeded`, {
-                buildId: result.buildId,
-            })));
-            logger.log(i18n(`commands.project.subcommands.upload.logs.autoDeployDisabled`, {
-                deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
-            }));
+            uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
+            uiLogger.log(commands.project.upload.logs.autoDeployDisabled(`hs project deploy --build=${result.buildId}`));
             logFeedbackMessage(result.buildId);
             await displayWarnLogs(targetAccountId, projectConfig.name, result.buildId);
         }
@@ -92,13 +86,13 @@ async function handler(args) {
 function projectUploadBuilder(yargs) {
     yargs.options({
         'force-create': {
-            describe: i18n(`commands.project.subcommands.upload.options.forceCreate.describe`),
+            describe: commands.project.upload.options.forceCreate.describe,
             type: 'boolean',
             default: false,
         },
         message: {
             alias: 'm',
-            describe: i18n(`commands.project.subcommands.upload.options.message.describe`),
+            describe: commands.project.upload.options.message.describe,
             type: 'string',
             default: '',
         },
@@ -110,16 +104,13 @@ function projectUploadBuilder(yargs) {
         profile: {
             type: 'string',
             alias: 'p',
-            describe: i18n(`commands.project.subcommands.upload.options.profile.describe`),
+            describe: commands.project.upload.options.profile.describe,
             hidden: true,
         },
     });
     yargs.conflicts('profile', 'account');
     yargs.example([
-        [
-            '$0 project upload',
-            i18n(`commands.project.subcommands.upload.examples.default`),
-        ],
+        ['$0 project upload', commands.project.upload.examples.default],
     ]);
     return yargs;
 }

package/commands/project/validate.js

@@ -1,12 +1,12 @@
 import path from 'path';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getProjectConfig, validateProjectConfig as validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { validateSourceDirectory as validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
+import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
 import { loadAndValidateProfile } from '../../lib/projectProfiles.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -15,11 +15,11 @@ const describe = commands.project.validate.describe;
 async function handler(args) {
     const { derivedAccountId, profile } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig) {
+    if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.validate.mustBeRanWithinAProject);
         process.exit(EXIT_CODES.ERROR);
     }
-    if (!useV3Api(projectConfig?.platformVersion)) {
+    if (!isV2Project(projectConfig?.platformVersion)) {
         uiLogger.error(commands.project.validate.badVersion);
         process.exit(EXIT_CODES.ERROR);
     }
@@ -31,7 +31,7 @@ async function handler(args) {
     trackCommandUsage('project-validate', { type: accountType }, targetAccountId);
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     try {
-        validateSourceDirectory(srcDir, projectConfig);
+        await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);

package/commands/project/watch.js

@@ -1,11 +1,10 @@
 import { cancelStagedBuild, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { useV3Api } from '../../lib/projects/platformVersion.js';
-import { uiCommandReference, uiLink } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { isV2Project } from '../../lib/projects/platformVersion.js';
+import { commands } from '../../lang/en.js';
 import { createWatcher } from '../../lib/projects/watch.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
@@ -16,7 +15,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { handleKeypress, handleExit } from '../../lib/process.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'watch';
-const describe = i18n(`commands.project.subcommands.watch.describe`);
+const describe = commands.project.watch.describe;
 async function handleBuildStatus(accountId, projectName, buildId) {
     const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
@@ -26,7 +25,7 @@ async function handleBuildStatus(accountId, projectName, buildId) {
 }
 function handleUserInput(accountId, projectName, currentBuildId) {
     const onTerminate = async () => {
-        logger.log(i18n(`commands.project.subcommands.watch.logs.processExited`));
+        uiLogger.log(commands.project.watch.logs.processExited);
         if (currentBuildId) {
             try {
                 await cancelStagedBuild(accountId, projectName);
@@ -61,16 +60,11 @@ async function handler(args) {
     const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
     if (!projectConfig || !projectDir) {
-        logger.error(i18n(`commands.project.subcommands.watch.errors.projectConfigNotFound`));
+        uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
         return process.exit(EXIT_CODES.ERROR);
     }
-    if (useV3Api(projectConfig.platformVersion)) {
-        logger.error(i18n(`commands.project.subcommands.watch.errors.v3ApiError`, {
-            command: uiCommandReference('hs project watch'),
-            newCommand: uiCommandReference('hs project dev'),
-            platformVersion: projectConfig.platformVersion,
-            linkToDocs: uiLink('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
-        }));
+    if (isV2Project(projectConfig.platformVersion)) {
+        uiLogger.error(projectConfig.platformVersion);
         return process.exit(EXIT_CODES.ERROR);
     }
     validateProjectConfig(projectConfig, projectDir);
@@ -93,9 +87,9 @@ async function handler(args) {
                 if (isSpecifiedError(uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
-                    logger.log();
-                    logger.error(i18n(`commands.project.subcommands.watch.errors.projectLockedError`));
-                    logger.log();
+                    uiLogger.log('');
+                    uiLogger.error(commands.project.watch.errors.projectLockedError);
+                    uiLogger.log('');
                 }
                 else {
                     logError(uploadError, new ApiErrorContext({
@@ -117,14 +111,11 @@ async function handler(args) {
 function projectWatchBuilder(yargs) {
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`commands.project.subcommands.watch.options.initialUpload.describe`),
+        describe: commands.project.watch.options.initialUpload.describe,
         type: 'boolean',
     });
     yargs.example([
-        [
-            '$0 project watch',
-            i18n(`commands.project.subcommands.watch.examples.default`),
-        ],
+        ['$0 project watch', commands.project.watch.examples.default],
     ]);
     return yargs;
 }

package/commands/project.js

@@ -1,4 +1,4 @@
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import deploy from './project/deploy.js';
 import create from './project/create.js';
 import upload from './project/upload.js';
@@ -17,7 +17,7 @@ import profile from './project/profile.js';
 import projectValidate from './project/validate.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['project', 'projects'];
-const describe = i18n(`commands.project.describe`);
+const describe = commands.project.describe;
 function projectBuilder(yargs) {
     yargs
         .command(create)

package/commands/sandbox/__tests__/create.test.js

@@ -10,11 +10,11 @@ import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import * as buildAccount from '../../../lib/buildAccount.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import * as sandboxesLib from '../../../lib/sandboxes.js';
 import * as sandboxSync from '../../../lib/sandboxSync.js';
 import { vi } from 'vitest';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../lib/ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
 vi.mock('../../../lib/hasFeature');
@@ -207,7 +207,7 @@ describe('commands/sandbox/create', () => {
                 type: 'invalid',
                 force: true,
             });
-            expect(logger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -217,7 +217,7 @@ describe('commands/sandbox/create', () => {
                 type: 'standard',
                 force: true,
             });
-            expect(logger.error).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -230,7 +230,7 @@ describe('commands/sandbox/create', () => {
                 ...args,
                 type: 'developer',
             });
-            expect(logger.error).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });

package/commands/sandbox/create.js

@@ -1,12 +1,12 @@
 import { getAccountConfig, getEnv } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { i18n } from '../../lib/lang.js';
+import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { uiFeatureHighlight, uiBetaTag, uiCommandReference, } from '../../lib/ui/index.js';
+import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
 import { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { sandboxTypePrompt } from '../../lib/prompts/sandboxesPrompt.js';
@@ -19,7 +19,7 @@ import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 const command = 'create';
-const describe = uiBetaTag(i18n(`commands.sandbox.subcommands.create.describe`), false);
+const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
     const accountConfig = getAccountConfig(derivedAccountId);
@@ -27,19 +27,13 @@ async function handler(args) {
     trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
-            accountId: derivedAccountId,
-            authCommand: uiCommandReference('hs auth'),
-        }));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.noAccountConfig(derivedAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
-            accountType: HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
-            accountName: accountConfig.name || '',
-        }));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.invalidAccountType(HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]], accountConfig.name || ''));
         process.exit(EXIT_CODES.ERROR);
     }
     let typePrompt;
@@ -49,7 +43,7 @@ async function handler(args) {
             typePrompt = await sandboxTypePrompt();
         }
         else {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.type);
             process.exit(EXIT_CODES.ERROR);
         }
     }
@@ -62,15 +56,14 @@ async function handler(args) {
     }
     catch (err) {
         if (isMissingScopeError(err)) {
-            logger.error(i18n('lib.sandbox.create.failure.scopes.message', {
-                accountName: accountConfig.name || derivedAccountId,
-            }));
+            uiLogger.error(sandboxType === 'DEVELOPMENT_SANDBOX'
+                ? lib.sandbox.create.developer.failure.scopes.message
+                : lib.sandbox.create.standard.failure.scopes.message);
             const websiteOrigin = getHubSpotWebsiteOrigin(env);
             const url = `${websiteOrigin}/personal-access-key/${derivedAccountId}`;
-            logger.info(i18n('lib.sandbox.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || derivedAccountId,
-                url,
-            }));
+            uiLogger.info(sandboxType === 'DEVELOPMENT_SANDBOX'
+                ? lib.sandbox.create.developer.failure.scopes.instructions(accountConfig.name || derivedAccountId, url)
+                : lib.sandbox.create.standard.failure.scopes.instructions(accountConfig.name || derivedAccountId, url));
         }
         else {
             logError(err);
@@ -82,13 +75,13 @@ async function handler(args) {
             namePrompt = await hubspotAccountNamePrompt({ accountType: sandboxType });
         }
         else {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxName = name || (namePrompt && namePrompt.name);
     if (!sandboxName) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
         process.exit(EXIT_CODES.ERROR);
     }
     let contactRecordsSyncPromptResult = false;
@@ -100,7 +93,7 @@ async function handler(args) {
                 {
                     name: 'contactRecordsSyncPrompt',
                     type: 'confirm',
-                    message: i18n('lib.sandbox.sync.confirm.syncContactRecords.standard'),
+                    message: commands.sandbox.sync.confirm.syncContactRecords.standard,
                 },
             ]);
             contactRecordsSyncPromptResult = contactRecordsSyncPrompt;
@@ -121,10 +114,7 @@ async function handler(args) {
         const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
-                accountId: result.sandbox.sandboxHubId,
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.noSandboxAccountConfig(result.sandbox.sandboxHubId));
             process.exit(EXIT_CODES.ERROR);
         }
         if (result && !canCreateV2Sandbox) {
@@ -160,20 +150,20 @@ function sandboxCreateBuilder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: i18n(`commands.sandbox.subcommands.create.options.force.describe`),
+        describe: commands.sandbox.subcommands.create.options.force.describe,
     });
     yargs.option('name', {
-        describe: i18n(`commands.sandbox.subcommands.create.options.name.describe`),
+        describe: commands.sandbox.subcommands.create.options.name.describe,
         type: 'string',
     });
     yargs.option('type', {
-        describe: i18n(`commands.sandbox.subcommands.create.options.type.describe`),
+        describe: commands.sandbox.subcommands.create.options.type.describe,
         choices: Object.keys(SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
-            '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            i18n(`commands.sandbox.subcommands.create.examples.default`),
+            '$0 sandbox create --name=MySandboxAccount --type=standard',
+            commands.sandbox.subcommands.create.examples.default,
         ],
     ]);
     return yargs;

package/commands/sandbox/delete.js

@@ -1,4 +1,4 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
@@ -7,15 +7,15 @@ import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { logError, debugError } from '../../lib/errorHandlers/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { deleteSandboxPrompt } from '../../lib/prompts/sandboxesPrompt.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { uiAccountDescription, uiBetaTag, uiCommandReference, } from '../../lib/ui/index.js';
+import { uiAuthCommandReference, uiBetaTag } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete';
-const describe = uiBetaTag(i18n(`commands.sandbox.subcommands.delete.describe`), false);
+const describe = uiBetaTag(commands.sandbox.subcommands.delete.describe, false);
 async function handler(args) {
     const { userProvidedAccount, derivedAccountId, force } = args;
     trackCommandUsage('sandbox-delete', {}, derivedAccountId);
@@ -26,21 +26,19 @@ async function handler(args) {
         }
         else {
             // Account is required, throw error if force flag is present and no account is specified
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noAccount`));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.noAccount);
             process.exit(EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noSandboxAccounts`, {
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccounts);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxAccountId = getAccountId(userProvidedAccount || accountPrompt.account);
     if (!sandboxAccountId) {
-        logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
+        uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
         process.exit(EXIT_CODES.ERROR);
     }
     const isDefaultAccount = sandboxAccountId === getAccountId();
@@ -55,41 +53,32 @@ async function handler(args) {
             else if (!force) {
                 const parentAccountPrompt = await deleteSandboxPrompt(true);
                 if (!parentAccountPrompt) {
-                    logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
-                        authCommand: uiCommandReference('hs auth'),
-                    }));
+                    uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                     process.exit(EXIT_CODES.ERROR);
                 }
                 parentAccountId = getAccountId(parentAccountPrompt.account);
             }
             else {
-                logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
-                    authCommand: uiCommandReference('hs auth'),
-                }));
+                uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                 process.exit(EXIT_CODES.ERROR);
             }
         }
     }
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
-    const command = `hs auth ${getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
+    const command = uiAuthCommandReference({
+        accountId: parentAccountId || undefined,
+        qa: getEnv(sandboxAccountId) === 'qa',
+    });
     if (parentAccountId && !getAccountId(parentAccountId)) {
-        logger.log('');
-        logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentPortalAvailable`, {
-            parentAccountId,
-            url,
-            command,
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
+        uiLogger.log('');
         process.exit(EXIT_CODES.ERROR);
     }
-    logger.debug(i18n(`commands.sandbox.subcommands.delete.debug.deleting`, {
-        account: uiAccountDescription(sandboxAccountId),
-    }));
+    uiLogger.debug(commands.sandbox.subcommands.delete.debug.deleting(sandboxAccountId));
     if (isDefaultAccount) {
-        logger.info(i18n(`commands.sandbox.subcommands.delete.defaultAccountWarning`, {
-            account: uiAccountDescription(sandboxAccountId),
-        }));
-        logger.log('');
+        uiLogger.info(commands.sandbox.subcommands.delete.defaultAccountWarning(sandboxAccountId));
+        uiLogger.log('');
     }
     try {
         if (!force) {
@@ -97,9 +86,7 @@ async function handler(args) {
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: i18n(`commands.sandbox.subcommands.delete.confirm`, {
-                        account: uiAccountDescription(sandboxAccountId),
-                    }),
+                    message: commands.sandbox.subcommands.delete.confirm(sandboxAccountId),
                 },
             ]);
             if (!confirmed) {
@@ -107,15 +94,11 @@ async function handler(args) {
             }
         }
         await deleteSandbox(parentAccountId, sandboxAccountId);
-        const deleteKey = isDefaultAccount
-            ? `commands.sandbox.subcommands.delete.success.deleteDefault`
-            : `commands.sandbox.subcommands.delete.success.delete`;
-        logger.log('');
-        logger.success(i18n(deleteKey, {
-            account: userProvidedAccount || accountPrompt.account,
-            sandboxHubId: sandboxAccountId || '',
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.success(isDefaultAccount
+            ? commands.sandbox.subcommands.delete.success.deleteDefault(userProvidedAccount || accountPrompt.account, sandboxAccountId)
+            : commands.sandbox.subcommands.delete.success.delete(userProvidedAccount || accountPrompt.account, sandboxAccountId));
+        uiLogger.log('');
         const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
         if (promptDefaultAccount && !force) {
             const newDefaultAccount = await selectAccountFromConfig();
@@ -132,34 +115,26 @@ async function handler(args) {
         if (isSpecifiedError(err, { statusCode: 401 })) {
             // 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.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.invalidKey`, {
-                account: uiAccountDescription(parentAccountId),
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.invalidKey(parentAccountId));
         }
         else if (isSpecifiedError(err, {
             statusCode: 403,
             category: 'BANNED',
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.invalidUser`, {
-                accountName: uiAccountDescription(sandboxAccountId),
-                parentAccountName: uiAccountDescription(parentAccountId),
-            }));
-            logger.log('');
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.invalidUser(sandboxAccountId, parentAccountId));
+            uiLogger.log('');
         }
         else if (isSpecifiedError(err, {
             statusCode: 404,
             category: 'OBJECT_NOT_FOUND',
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
-            logger.log('');
-            logger.warn(i18n(`commands.sandbox.subcommands.delete.failure.objectNotFound`, {
-                account: uiAccountDescription(sandboxAccountId),
-            }));
-            logger.log('');
+            uiLogger.log('');
+            uiLogger.warn(commands.sandbox.subcommands.delete.failure.objectNotFound(sandboxAccountId));
+            uiLogger.log('');
             const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
             if (promptDefaultAccount && !force) {
                 const newDefaultAccount = await selectAccountFromConfig();
@@ -179,18 +154,18 @@ async function handler(args) {
 }
 function sandboxDeleteBuilder(yargs) {
     yargs.option('account', {
-        describe: i18n(`commands.sandbox.subcommands.delete.options.account.describe`),
+        describe: commands.sandbox.subcommands.delete.options.account.describe,
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: i18n(`commands.sandbox.subcommands.delete.options.force.describe`),
+        describe: commands.sandbox.subcommands.delete.options.force.describe,
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            i18n(`commands.sandbox.subcommands.delete.examples.default`),
+            commands.sandbox.subcommands.delete.examples.default,
         ],
     ]);
     return yargs;

package/commands/sandbox.js

@@ -1,10 +1,10 @@
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import { uiBetaTag } from '../lib/ui/index.js';
 import create from './sandbox/create.js';
 import del from './sandbox/delete.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['sandbox', 'sandboxes'];
-const describe = uiBetaTag(i18n(`commands.sandbox.describe`), false);
+const describe = uiBetaTag(commands.sandbox.describe, false);
 function sandboxBuilder(yargs) {
     yargs.command(create).command(del).demandCommand(1, '');
     return yargs;