@hubspot/cli 7.3.0-experimental.2 → 7.3.0

package/bin/cli.js

@@ -16,8 +16,6 @@ const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { UI_COLORS, uiCommandReference, uiDeprecatedTag } = require('../lib/ui');
 const { checkAndWarnGitInclusion } = require('../lib/ui/git');
-const SpinniesManager = require('../lib/ui/SpinniesManager');
-const { isGloballyInstalled, executeInstall } = require('../lib/npm');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -50,31 +48,28 @@ const notifier = updateNotifier({
     distTag: 'latest',
     shouldNotifyInNpmScript: true,
 });
-const i18nKey = 'commands.generalErrors';
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-const showUpdateNotification = () => {
-    notifier.notify({
-        message: pkg.name === CMS_CLI_PACKAGE_NAME
-            ? i18n(`${i18nKey}.updateNotify.cmsUpdateNotification`, {
-                packageName: CMS_CLI_PACKAGE_NAME,
-                updateCommand: uiCommandReference('{updateCommand}'),
-            })
-            : i18n(`${i18nKey}.updateNotify.cliUpdateNotification`, {
-                updateCommand: uiCommandReference('{updateCommand}'),
-            }),
-        defer: false,
-        boxenOptions: {
-            borderColor: UI_COLORS.MARIGOLD_DARK,
-            margin: 1,
-            padding: 1,
-            textAlignment: 'center',
-            borderStyle: 'round',
-            title: pkg.name === CMS_CLI_PACKAGE_NAME
-                ? null
-                : chalk.bold(i18n(`${i18nKey}.updateNotify.notifyTitle`)),
-        },
-    });
-};
+notifier.notify({
+    message: pkg.name === CMS_CLI_PACKAGE_NAME
+        ? i18n(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
+            packageName: CMS_CLI_PACKAGE_NAME,
+            updateCommand: uiCommandReference('{updateCommand}'),
+        })
+        : i18n(`commands.generalErrors.updateNotify.cliUpdateNotification`, {
+            updateCommand: uiCommandReference('{updateCommand}'),
+        }),
+    defer: false,
+    boxenOptions: {
+        borderColor: UI_COLORS.MARIGOLD_DARK,
+        margin: 1,
+        padding: 1,
+        textAlignment: 'center',
+        borderStyle: 'round',
+        title: pkg.name === CMS_CLI_PACKAGE_NAME
+            ? null
+            : chalk.bold(i18n(`commands.generalErrors.updateNotify.notifyTitle`)),
+    },
+});
 const getTerminalWidth = () => {
     const width = yargs.terminalWidth();
     if (width >= 100)
@@ -101,13 +96,13 @@ const performChecks = argv => {
     if (argv._[0] === 'config' &&
         argv._[1] === 'set' &&
         argv._[2] === 'default-account') {
-        logger.error(i18n(`${i18nKey}.setDefaultAccountMoved`));
+        logger.error(i18n(`commands.generalErrors.setDefaultAccountMoved`));
         process.exit(EXIT_CODES.ERROR);
     }
     // Require "project" command when running upload/watch inside of a project
     if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
         if (getIsInProject(argv.src)) {
-            logger.error(i18n(`${i18nKey}.srcIsProject`, {
+            logger.error(i18n(`commands.generalErrors.srcIsProject`, {
                 src: argv.src || './',
                 command: argv._.join(' '),
             }));
@@ -124,58 +119,6 @@ const performChecks = argv => {
 const setRequestHeaders = () => {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 };
-const updateCLIVersion = async () => {
-    logger.debug('Checking for CLI updates', notifier);
-    if (!process.env.SKIP_HUBSPOT_CLI_AUTO_UPDATES &&
-        notifier &&
-        notifier.update) {
-        let updateInfo;
-        try {
-            updateInfo = await notifier.fetchInfo();
-        }
-        catch (e) {
-            logger.debug('Error fetching update info', e);
-            return;
-        }
-        // Update if the current version is not the latest version.
-        // Don't auto-update if the current version is a pre-release
-        // or if this would be a major version update
-        if (!updateInfo.current.includes('-') &&
-            !['major', 'latest'].includes(updateInfo.type)) {
-            SpinniesManager.init({
-                succeedColor: 'white',
-            });
-            SpinniesManager.add('cliAutoUpdate', {
-                text: `New HubSpot CLI version available. Updating to version ${updateInfo.latest}`,
-            });
-            let showManualInstallHelp = false;
-            try {
-                if (await isGloballyInstalled()) {
-                    await executeInstall(['@hubspot/cli@latest'], '-g');
-                    SpinniesManager.succeed('cliAutoUpdate', {
-                        text: `Successfully updated HubSpot CLI to version ${updateInfo.latest}`,
-                    });
-                }
-                else {
-                    SpinniesManager.fail('cliAutoUpdate', {
-                        text: `Cannot auto-update the HubSpot CLI if it is not globall installed with NPM`,
-                    });
-                    showManualInstallHelp = true;
-                }
-            }
-            catch (e) {
-                logger.debug('Error updating CLI', e);
-                SpinniesManager.fail('cliAutoUpdate', {
-                    text: `Failed to update HubSpot CLI to version ${updateInfo.latest}`,
-                });
-                showManualInstallHelp = true;
-            }
-            if (showManualInstallHelp) {
-                showUpdateNotification();
-            }
-        }
-    }
-};
 const isTargetedCommand = (options, commandMap) => {
     const checkCommand = (options, commandMap) => {
         const currentCommand = options._[0];
@@ -203,7 +146,7 @@ const handleDeprecatedEnvVariables = options => {
     if (options.useEnv &&
         process.env.HUBSPOT_PORTAL_ID &&
         !process.env.HUBSPOT_ACCOUNT_ID) {
-        uiDeprecatedTag(i18n(`${i18nKey}.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
+        uiDeprecatedTag(i18n(`commands.generalErrors.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
             configPath: getConfigPath(),
         }));
         process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
@@ -235,7 +178,7 @@ const loadConfigMiddleware = async (options) => {
         }
     };
     if (configFileExists(true) && options.config) {
-        logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
+        logger.error(i18n(`commands.generalErrors.loadConfigMiddleware.configFileExists`, {
             configPath: getConfigPath(),
         }));
         process.exit(EXIT_CODES.ERROR);
@@ -299,7 +242,6 @@ const argv = yargs
     // loadConfigMiddleware loads the new hidden config for all commands
     .middleware([
     setLogLevel,
-    updateCLIVersion,
     setRequestHeaders,
     handleDeprecatedEnvVariables,
     loadConfigMiddleware,

package/commands/account/clean.js

@@ -19,16 +19,15 @@ const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const table_1 = require("../../lib/ui/table");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const ui_1 = require("../../lib/ui");
-const i18nKey = 'commands.account.subcommands.clean';
 exports.command = 'clean';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
     const { qa } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-clean');
     const accountsList = (0, config_1.getConfigAccounts)() || [];
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.noResults`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const accountsToRemove = [];
@@ -36,7 +35,7 @@ async function handler(args) {
         succeedColor: 'white',
     });
     SpinniesManager_1.default.add('accountsClean', {
-        text: (0, lang_1.i18n)(`${i18nKey}.loading.add`),
+        text: (0, lang_1.i18n)(`commands.account.subcommands.clean.loading.add`),
     });
     for (const account of filteredTestAccounts) {
         try {
@@ -62,8 +61,8 @@ async function handler(args) {
         const oneAccountFound = accountsToRemove.length === 1;
         SpinniesManager_1.default.succeed('accountsClean', {
             text: (0, lang_1.i18n)(oneAccountFound
-                ? `${i18nKey}.inactiveAccountsFound.one`
-                : `${i18nKey}.inactiveAccountsFound.other`, {
+                ? `commands.account.subcommands.clean.inactiveAccountsFound.one`
+                : `commands.account.subcommands.clean.inactiveAccountsFound.other`, {
                 count: accountsToRemove.length,
             }),
         });
@@ -75,8 +74,8 @@ async function handler(args) {
                 name: 'accountsCleanPrompt',
                 type: 'confirm',
                 message: (0, lang_1.i18n)(oneAccountFound
-                    ? `${i18nKey}.confirm.one`
-                    : `${i18nKey}.confirm.other`, {
+                    ? `commands.account.subcommands.clean.confirm.one`
+                    : `commands.account.subcommands.clean.confirm.other`, {
                     count: accountsToRemove.length,
                 }),
             },
@@ -85,7 +84,7 @@ async function handler(args) {
             logger_1.logger.log('');
             for (const accountToRemove of accountsToRemove) {
                 await (0, config_1.deleteAccount)(accountToRemove.name);
-                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.removeSuccess`, {
+                logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.removeSuccess`, {
                     accountName: accountToRemove.name,
                 }));
             }
@@ -93,7 +92,7 @@ async function handler(args) {
     }
     else {
         SpinniesManager_1.default.succeed('accountsClean', {
-            text: (0, lang_1.i18n)(`${i18nKey}.noResults`),
+            text: (0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`),
         });
     }
     logger_1.logger.log('');

package/commands/account/info.js

@@ -8,8 +8,7 @@ const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const lang_1 = require("../../lib/lang");
 const table_1 = require("../../lib/ui/table");
-const i18nKey = 'commands.account.subcommands.info';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
 exports.command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
@@ -20,25 +19,24 @@ async function handler(args) {
         let scopeGroups = [];
         const response = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.name`, { name: name }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.scopeGroups`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.name`, { name: name }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.accountId`, { accountId: derivedAccountId }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.scopeGroups`));
         logger_1.logger.log((0, table_1.getTableContents)(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.notUsingPersonalAccessKey`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.errors.notUsingPersonalAccessKey`));
     }
-    logger_1.logger.debug('Some debug log that only shows on this version of the CLI');
 }
 function accountInfoBuilder(yargs) {
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.info.options.account.describe`),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts info', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts info 1234567', (0, lang_1.i18n)(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts info', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.default`)],
+        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.nameBased`)],
+        ['$0 accounts info 1234567', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.idBased`)],
     ]);
     return yargs;
 }

package/commands/account/list.js

@@ -12,9 +12,8 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const accountTypes_1 = require("../../lib/accountTypes");
 const lang_1 = require("../../lib/lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const i18nKey = 'commands.account.subcommands.list';
 exports.command = ['list', 'ls'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -77,15 +76,15 @@ async function handler(args) {
     const mappedAccountData = sortAndMapAccounts(accountsList);
     const accountData = getAccountData(mappedAccountData);
     accountData.unshift((0, table_1.getTableHeader)([
-        (0, lang_1.i18n)(`${i18nKey}.labels.name`),
-        (0, lang_1.i18n)(`${i18nKey}.labels.accountId`),
-        (0, lang_1.i18n)(`${i18nKey}.labels.authType`),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.name'),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.accountId'),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.authType'),
     ]));
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.configPath`, { configPath: configPath }));
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.defaultAccount`, {
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.configPath', { configPath: configPath }));
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.defaultAccount', {
         account: (0, config_1.getConfigDefaultAccount)(),
     }));
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accounts`));
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.accounts'));
     logger_1.logger.log((0, table_1.getTableContents)(accountData, { border: { bodyLeft: '  ' } }));
 }
 function builder(yargs) {

package/commands/account/remove.js

@@ -9,32 +9,31 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const commonOpts_1 = require("../../lib/commonOpts");
-const i18nKey = 'commands.account.subcommands.remove';
 exports.command = 'remove [account]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
 async function handler(args) {
     const { account } = args;
     let accountToRemove = account;
     if (accountToRemove && !(0, config_1.getAccountId)(accountToRemove)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.account.subcommands.remove.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
             configPath: (0, config_1.getConfigPath)(),
         }));
     }
     if (!accountToRemove || !(0, config_1.getAccountId)(accountToRemove)) {
-        accountToRemove = await (0, accountsPrompt_1.selectAccountFromConfig)((0, lang_1.i18n)(`${i18nKey}.prompts.selectAccountToRemove`));
+        accountToRemove = await (0, accountsPrompt_1.selectAccountFromConfig)((0, lang_1.i18n)(`commands.account.subcommands.remove.prompts.selectAccountToRemove`));
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-remove', undefined, (0, config_1.getAccountId)(accountToRemove));
     const currentDefaultAccount = (0, config_1.getConfigDefaultAccount)();
     await (0, config_1.deleteAccount)(accountToRemove);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.accountRemoved`, {
+    logger_1.logger.success((0, lang_1.i18n)(`commands.account.subcommands.remove.success.accountRemoved`, {
         accountName: accountToRemove,
     }));
     // Get updated version of the config
     (0, config_1.loadConfig)((0, config_1.getConfigPath)());
     if (accountToRemove === currentDefaultAccount) {
         logger_1.logger.log();
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.replaceDefaultAccount`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
         const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
         (0, config_1.updateDefaultAccount)(newDefaultAccount);
     }
@@ -42,12 +41,12 @@ async function handler(args) {
 function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.remove.options.account.describe`),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts remove', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts remove MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.byName`)],
+        ['$0 accounts remove', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.default`)],
+        ['$0 accounts remove MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.byName`)],
     ]);
     return yargs;
 }

package/commands/account/rename.js

@@ -10,9 +10,8 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.account.subcommands.rename';
 exports.command = 'rename <account-name> <new-name>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-rename', undefined, derivedAccountId);
@@ -23,7 +22,7 @@ async function handler(args) {
         (0, errorHandlers_1.logError)(error);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.success.renamed`, {
+    logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.rename.success.renamed`, {
         name: accountName,
         newName,
     }));
@@ -33,11 +32,11 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addAccountOptions)(yargs);
     yargs.positional('account-name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.accountName.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.accountName.describe`),
         type: 'string',
     });
     yargs.positional('new-name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.newName.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.newName.describe`),
         type: 'string',
     });
     yargs.example([

package/commands/account/use.js

@@ -8,16 +8,15 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const i18nKey = 'commands.account.subcommands.use';
 exports.command = 'use [account]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
 async function handler(args) {
     let newDefaultAccount = args.account;
     if (!newDefaultAccount) {
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     else if (!(0, config_1.getAccountId)(newDefaultAccount)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.use.errors.accountNotFound', {
             specifiedAccount: newDefaultAccount,
             configPath: (0, config_1.getConfigPath)(),
         }));
@@ -25,19 +24,19 @@ async function handler(args) {
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-use', undefined, (0, config_1.getAccountId)(newDefaultAccount));
     (0, config_1.updateDefaultAccount)(newDefaultAccount);
-    return logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.defaultAccountUpdated`, {
+    return logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.use.success.defaultAccountUpdated', {
         accountName: newDefaultAccount,
     }));
 }
 function builder(yargs) {
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)('commands.account.subcommands.use.options.account.describe'),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts use', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts use MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts use 1234567', (0, lang_1.i18n)(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts use', (0, lang_1.i18n)('commands.account.subcommands.use.examples.default')],
+        ['$0 accounts use MyAccount', (0, lang_1.i18n)('commands.account.subcommands.use.examples.nameBased')],
+        ['$0 accounts use 1234567', (0, lang_1.i18n)('commands.account.subcommands.use.examples.idBased')],
     ]);
     return yargs;
 }

package/commands/cms/convertFields.js

@@ -13,11 +13,10 @@ const { FieldsJs, isConvertableFieldJs, } = require('@hubspot/local-dev-lib/cms/
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logError } = require('../../lib/errorHandlers/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const i18nKey = 'commands.convertFields';
 exports.command = 'convert-fields';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.convertFields.describe`);
 const invalidPath = src => {
-    logger.error(i18n(`${i18nKey}.errors.invalidPath`, {
+    logger.error(i18n(`commands.convertFields.errors.invalidPath`, {
         path: src,
     }));
     process.exit(EXIT_CODES.ERROR);
@@ -76,12 +75,12 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     yargs.option('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: i18n(`commands.convertFields.positionals.src.describe`),
         type: 'string',
-        demandOption: i18n(`${i18nKey}.errors.missingSrc`),
+        demandOption: i18n(`commands.convertFields.errors.missingSrc`),
     });
     yargs.option('fieldOptions', {
-        describe: i18n(`${i18nKey}.options.options.describe`),
+        describe: i18n(`commands.convertFields.options.options.describe`),
         type: 'array',
         default: [''],
     });

package/commands/cms/getReactModule.js

@@ -11,9 +11,8 @@ const { logError } = require('../../lib/errorHandlers/index');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { listPrompt } = require('../../lib/prompts/promptUtils');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const i18nKey = 'commands.cms.subcommands.getReactModule';
 exports.command = 'get-react-module [name] [dest]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.cms.subcommands.getReactModule.describe`);
 exports.handler = async (options) => {
     const { name, dest } = options;
     trackCommandUsage('get-react-modules');
@@ -26,7 +25,7 @@ exports.handler = async (options) => {
         catch (e) {
             logError(e);
         }
-        const moduleChoice = await listPrompt(i18n(`${i18nKey}.selectModulePrompt`), {
+        const moduleChoice = await listPrompt(i18n(`commands.cms.subcommands.getReactModule.selectModulePrompt`), {
             choices: availableModules.map(module => module.name),
         });
         moduleToRetrieve = moduleChoice;
@@ -35,21 +34,21 @@ exports.handler = async (options) => {
         ? path.join(path.resolve(getCwd(), dest), `${moduleToRetrieve}`)
         : path.join(getCwd(), `${moduleToRetrieve}`);
     if (fs.existsSync(destPath)) {
-        logger.error(i18n(`${i18nKey}.errors.pathExists`, {
+        logger.error(i18n(`commands.cms.subcommands.getReactModule.errors.pathExists`, {
             path: destPath,
         }));
         return;
     }
     try {
         await retrieveDefaultModule(moduleToRetrieve, destPath);
-        logger.success(i18n(`${i18nKey}.success.moduleDownloaded`, {
+        logger.success(i18n(`commands.cms.subcommands.getReactModule.success.moduleDownloaded`, {
             moduleName: moduleToRetrieve,
             path: destPath,
         }));
     }
     catch (e) {
         if (e.cause && e.cause.code === 'ERR_BAD_REQUEST') {
-            logger.error(i18n(`${i18nKey}.errors.invalidName`));
+            logger.error(i18n(`commands.cms.subcommands.getReactModule.errors.invalidName`));
         }
         else {
             logError(e);
@@ -59,11 +58,11 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     yargs.positional('name', {
-        describe: i18n(`${i18nKey}.positionals.name.describe`),
+        describe: i18n(`commands.cms.subcommands.getReactModule.positionals.name.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: i18n(`commands.cms.subcommands.getReactModule.positionals.dest.describe`),
         type: 'string',
     });
     return yargs;