@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/commands/secret/deleteSecret.js

@@ -13,9 +13,8 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.delete';
 exports.command = 'delete [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.delete.describe`);
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -23,30 +22,34 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSecret`, { secretName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.noSecret`, {
+                secretName,
+            }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`${i18nKey}.selectSecret`));
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`commands.secret.subcommands.delete.selectSecret`));
             secretName = secretToModify;
         }
         const confirmDelete = force ||
-            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`${i18nKey}.confirmDelete`, { secretName }), {
+            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`commands.secret.subcommands.delete.confirmDelete`, {
+                secretName,
+            }), {
                 defaultAnswer: false,
             }));
         if (!confirmDelete) {
-            logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.deleteCanceled`));
+            logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.deleteCanceled`));
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         await (0, secrets_1.deleteSecret)(derivedAccountId, secretName);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.delete`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.success.delete`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
         if (secretName) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.delete`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.delete`, {
                 secretName,
             }));
         }
@@ -62,7 +65,7 @@ function builder(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.delete.positionals.name.describe`),
         type: 'string',
     })
         .options('force', {

package/commands/secret/listSecret.js

@@ -10,15 +10,14 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.list';
 exports.command = 'list';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.list.describe`);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('secrets-list', {}, derivedAccountId);
     try {
         const { data: { results }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
-        const groupLabel = (0, lang_1.i18n)(`${i18nKey}.groupLabel`, {
+        const groupLabel = (0, lang_1.i18n)(`commands.secret.subcommands.list.groupLabel`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
         });
         logger_1.logger.group(groupLabel);
@@ -26,7 +25,7 @@ async function handler(args) {
         logger_1.logger.groupEnd();
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.list`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.list.errors.list`));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
             request: 'add secret',
             accountId: derivedAccountId,

package/commands/secret/updateSecret.js

@@ -12,9 +12,8 @@ const ui_1 = require("../../lib/ui");
 const commonOpts_1 = require("../../lib/commonOpts");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.update';
 exports.command = 'update [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.update.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -22,23 +21,25 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSecret`, { secretName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.update.errors.noSecret`, {
+                secretName,
+            }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`${i18nKey}.selectSecret`));
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`commands.secret.subcommands.update.selectSecret`));
             secretName = secretToModify;
         }
         const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
         await (0, secrets_1.updateSecret)(derivedAccountId, secretName, secretValue);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.update`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.update.success.update`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.success.updateExplanation`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.secret.subcommands.update.success.updateExplanation`));
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.update`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.update.errors.update`, {
             secretName: secretName || '',
         }));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
@@ -52,7 +53,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.update.positionals.name.describe`),
         type: 'string',
     });
     return yargs;

package/commands/secret.js

@@ -41,9 +41,8 @@ const listSecretCommand = __importStar(require("./secret/listSecret"));
 const deleteSecretCommand = __importStar(require("./secret/deleteSecret"));
 const updateSecretCommand = __importStar(require("./secret/updateSecret"));
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.secret';
 exports.command = ['secret', 'secrets'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.describe`);
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs

package/commands/theme/generate-selectors.js

@@ -20,14 +20,13 @@ const CSS_VARS_NAME_REGEX = new RegExp(/(--[\w.(,\d\-)]*)/, 'g');
 const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
-const i18nKey = 'commands.theme.subcommands.generateSelectors';
 exports.command = 'generate-selectors <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.describe');
 async function handler(args) {
     const { path } = args;
     const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
     if (!fieldsJsonPath) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.fieldsNotFound`));
+        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.errors.fieldsNotFound'));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     let fieldsJson = JSON.parse(fs_1.default.readFileSync(fieldsJsonPath, 'utf-8'));
@@ -137,7 +136,7 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSelectorsFound`));
+        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.errors.noSelectorsFound'));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     Object.keys(finalMap).forEach(themeFieldKey => {
@@ -154,14 +153,14 @@ async function handler(args) {
     const selectorsMap = (0, generateSelectors_1.generateSelectorsMap)(fieldsJson);
     const selectorsPath = `${path}/editor-preview.json`;
     fs_1.default.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, {
+    logger_1.logger.success((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.success', {
         themePath: path,
         selectorsPath,
     }));
 }
 function builder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.positionals.path.describe'),
         type: 'string',
         required: true,
     });

package/commands/theme/marketplace-validate.js

@@ -11,15 +11,14 @@ const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.describe');
 async function handler(args) {
     const { path, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('validate', {}, derivedAccountId);
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add('marketplaceValidation', {
-        text: (0, lang_1.i18n)(`${i18nKey}.logs.validatingTheme`, {
+        text: (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.logs.validatingTheme', {
             path,
         }),
     });
@@ -28,8 +27,8 @@ async function handler(args) {
     await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
     SpinniesManager_1.default.remove('marketplaceValidation');
     const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
-    (0, marketplaceValidate_1.processValidationErrors)(i18nKey, validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)(i18nKey, validationResults);
+    (0, marketplaceValidate_1.processValidationErrors)('commands.theme.subcommands.marketplaceValidate', validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)('commands.theme.subcommands.marketplaceValidate', validationResults);
     process.exit();
 }
 function builder(yargs) {
@@ -37,7 +36,7 @@ function builder(yargs) {
     (0, commonOpts_1.addAccountOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.positionals.path.describe'),
         type: 'string',
         required: true,
     });

package/commands/theme/preview.js

@@ -22,16 +22,16 @@ const previewPrompt_1 = require("../../lib/prompts/previewPrompt");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
 const process_1 = require("../../lib/process");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
 const hasFeature_1 = require("../../lib/hasFeature");
-const i18nKey = 'commands.theme.subcommands.preview';
+const constants_1 = require("../../lib/constants");
 exports.command = 'preview [--src] [--dest]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.preview.describe');
 function validateSrcPath(src) {
     const logInvalidPath = () => {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidPath`, {
+        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.invalidPath', {
             path: src,
         }));
     };
@@ -50,7 +50,7 @@ function validateSrcPath(src) {
 }
 function handleUserInput() {
     const onTerminate = () => {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.processExited`));
+        logger_1.logger.log((0, lang_1.i18n)('commands.theme.subcommands.preview.logs.processExited'));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
     (0, process_1.handleExit)(onTerminate);
@@ -63,7 +63,7 @@ function handleUserInput() {
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await (0, projects_1.getProjectConfig)();
+    const { projectDir, projectConfig } = await (0, config_1.getProjectConfig)();
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
         const previewPromptAnswers = await (0, previewPrompt_1.previewPrompt)(args);
@@ -81,7 +81,7 @@ async function determineSrcAndDest(args) {
             const projectComponents = await (0, structure_1.findProjectComponents)(projectDir);
             const themeComponents = projectComponents.filter(c => c.type === Projects_1.ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noThemeComponents`));
+                logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.noThemeComponents'));
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
             const answer = await (0, previewPrompt_1.previewProjectPrompt)(themeComponents);
@@ -105,7 +105,7 @@ async function handler(args) {
             hideCursor: true,
         }, cli_progress_1.default.Presets.rect);
         initialUploadProgressBar.start(numFiles, 0, {
-            label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.start`),
+            label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.start'),
         });
         let uploadsHaveStarted = false;
         const uploadOptions = {
@@ -117,7 +117,7 @@ async function handler(args) {
                 if (!uploadsHaveStarted) {
                     uploadsHaveStarted = true;
                     initialUploadProgressBar.update(0, {
-                        label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.uploading`),
+                        label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.uploading'),
                     });
                 }
             },
@@ -130,7 +130,7 @@ async function handler(args) {
             onFinalErrorCallback: () => initialUploadProgressBar.increment(),
             onFinishCallback: (results) => {
                 initialUploadProgressBar.update(numFiles, {
-                    label: (0, lang_1.i18n)(`${i18nKey}.initialUploadProgressBar.finish`),
+                    label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.finish'),
                 });
                 initialUploadProgressBar.stop();
                 results.forEach(result => {
@@ -159,7 +159,7 @@ async function handler(args) {
     catch (e) {
         logger_1.logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
     }
-    const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, 'cms:react:unifiedThemePreview');
+    const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, constants_1.FEATURES.UNIFIED_THEME_PREVIEW);
     if (isUngatedForUnified && createUnifiedDevServer) {
         if (port) {
             process.env['PORT'] = port.toString();
@@ -188,27 +188,27 @@ function builder(yargs) {
     (0, commonOpts_1.addAccountOptions)(yargs);
     yargs
         .option('src', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.src.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.src.describe'),
         type: 'string',
         requiresArg: true,
     })
         .option('dest', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.dest.describe'),
         type: 'string',
         requiresArg: true,
     })
         .option('notify', {
         alias: 'n',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.notify.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.notify.describe'),
         type: 'string',
         requiresArg: true,
     })
         .option('no-ssl', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.noSsl.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.noSsl.describe'),
         type: 'boolean',
     })
         .option('port', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.port.describe`),
+        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.port.describe'),
         type: 'number',
     })
         .option('resetSession', {

package/commands/theme.js

@@ -40,9 +40,8 @@ const generateSelectors = __importStar(require("./theme/generate-selectors"));
 const previewCommand = __importStar(require("./theme/preview"));
 const commonOpts_1 = require("../lib/commonOpts");
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.theme';
 exports.command = ['theme', 'themes'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.theme.describe');
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs

package/commands/upload.js

@@ -19,16 +19,15 @@ const { validateCmsPublishMode } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getUploadableFileList } = require('../lib/upload');
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { FieldsJs, isConvertableFieldJs, cleanupTmpDirSync, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 exports.command = 'upload [src] [dest]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n('commands.upload.describe');
 const logThemePreview = (filePath, accountId) => {
     const previewUrl = getThemePreviewUrl(filePath, accountId);
     // Only log if we are actually in a theme
     if (previewUrl) {
-        logger.log(i18n(`${i18nKey}.previewUrl`, {
+        logger.log(i18n('commands.upload.previewUrl', {
             previewUrl,
         }));
     }
@@ -45,7 +44,7 @@ exports.handler = async (options) => {
     let dest = options.dest || uploadPromptAnswers.dest;
     let absoluteSrcPath = path.resolve(getCwd(), src);
     if (!dest) {
-        logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
+        logger.error(i18n('commands.upload.errors.destinationRequired'));
         return;
     }
     // Check for theme.json file and determine the root path for the project based on it if it exists
@@ -68,14 +67,14 @@ exports.handler = async (options) => {
     try {
         stats = fs.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+            logger.error(i18n('commands.upload.errors.invalidPath', {
                 path: src,
             }));
             return;
         }
     }
     catch (e) {
-        logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+        logger.error(i18n('commands.upload.errors.invalidPath', {
             path: src,
         }));
         return;
@@ -89,20 +88,20 @@ exports.handler = async (options) => {
     }
     if (stats.isFile()) {
         if (!isAllowedExtension(src) && !convertFields) {
-            logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+            logger.error(i18n('commands.upload.errors.invalidPath', {
                 path: src,
             }));
             return;
         }
         if (shouldIgnoreFile(absoluteSrcPath)) {
-            logger.error(i18n(`${i18nKey}.errors.fileIgnored`, {
+            logger.error(i18n('commands.upload.errors.fileIgnored', {
                 path: src,
             }));
             return;
         }
         upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode, options))
             .then(() => {
-            logger.success(i18n(`${i18nKey}.success.fileUploaded`, {
+            logger.success(i18n('commands.upload.success.fileUploaded', {
                 accountId: derivedAccountId,
                 dest: normalizedDest,
                 src,
@@ -110,7 +109,7 @@ exports.handler = async (options) => {
             logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
-            logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
+            logger.error(i18n('commands.upload.errors.uploadFailed', {
                 dest: normalizedDest,
                 src,
             }));
@@ -131,7 +130,7 @@ exports.handler = async (options) => {
         });
     }
     else {
-        logger.log(i18n(`${i18nKey}.uploading`, {
+        logger.log(i18n('commands.upload.uploading', {
             accountId: derivedAccountId,
             dest,
             src,
@@ -142,7 +141,7 @@ exports.handler = async (options) => {
             //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
             let cleanUpload = options.force;
             if (!options.force) {
-                cleanUpload = await confirmPrompt(i18n(`${i18nKey}.confirmCleanUpload`, {
+                cleanUpload = await confirmPrompt(i18n('commands.upload.confirmCleanUpload', {
                     accountId: derivedAccountId,
                     path: dest,
                 }), { defaultAnswer: false });
@@ -150,13 +149,13 @@ exports.handler = async (options) => {
             if (cleanUpload) {
                 try {
                     await deleteFile(derivedAccountId, dest);
-                    logger.log(i18n(`${i18nKey}.cleaning`, {
+                    logger.log(i18n('commands.upload.cleaning', {
                         accountId: derivedAccountId,
                         filePath: dest,
                     }));
                 }
                 catch (error) {
-                    logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
+                    logger.error(i18n('commands.upload.errors.deleteFailed', {
                         accountId: derivedAccountId,
                         path: dest,
                     }));
@@ -168,20 +167,20 @@ exports.handler = async (options) => {
         }, options, filePaths)
             .then(results => {
             if (!hasUploadErrors(results)) {
-                logger.success(i18n(`${i18nKey}.success.uploadComplete`, {
+                logger.success(i18n('commands.upload.success.uploadComplete', {
                     dest,
                 }));
                 logThemePreview(src, derivedAccountId);
             }
             else {
-                logger.error(i18n(`${i18nKey}.errors.someFilesFailed`, {
+                logger.error(i18n('commands.upload.errors.someFilesFailed', {
                     dest,
                 }));
                 process.exit(EXIT_CODES.WARNING);
             }
         })
             .catch(error => {
-            logger.error(i18n(`${i18nKey}.errors.uploadFailed`, {
+            logger.error(i18n('commands.upload.errors.uploadFailed', {
                 dest,
                 src,
             }));
@@ -194,36 +193,36 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: i18n('commands.upload.positionals.src.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: i18n('commands.upload.positionals.dest.describe'),
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: i18n(`${i18nKey}.options.options.describe`),
+        describe: i18n('commands.upload.options.options.describe'),
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('saveOutput', {
-        describe: i18n(`${i18nKey}.options.saveOutput.describe`),
+        describe: i18n('commands.upload.options.saveOutput.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('convertFields', {
-        describe: i18n(`${i18nKey}.options.convertFields.describe`),
+        describe: i18n('commands.upload.options.convertFields.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('clean', {
-        describe: i18n(`${i18nKey}.options.clean.describe`),
+        describe: i18n('commands.upload.options.clean.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('force', {
-        describe: i18n(`${i18nKey}.options.force.describe`),
+        describe: i18n('commands.upload.options.force.describe'),
         type: 'boolean',
         default: false,
     });