@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/commands/feedback.js

@@ -6,7 +6,6 @@ const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { confirmPrompt, listPrompt } = require('../lib/prompts/promptUtils');
 const { addGlobalOptions } = require('../lib/commonOpts');
-const i18nKey = 'commands.project.subcommands.feedback';
 const FEEDBACK_OPTIONS = {
     BUG: 'bug',
     GENERAL: 'general',
@@ -16,35 +15,35 @@ const FEEDBACK_URLS = {
     GENERAL: 'https://docs.google.com/forms/d/e/1FAIpQLSejZZewYzuH3oKBU01tseX-cSWOUsTHLTr-YsiMGpzwcvgIMg/viewform?usp=sf_link',
 };
 exports.command = 'feedback';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.project.subcommands.feedback.describe`);
 exports.handler = async (options) => {
     const { bug: bugFlag, general: generalFlag } = options;
     const usedTypeFlag = bugFlag !== generalFlag;
-    await listPrompt(i18n(`${i18nKey}.feedbackType.prompt`), {
+    await listPrompt(i18n(`commands.project.subcommands.feedback.feedbackType.prompt`), {
         choices: Object.values(FEEDBACK_OPTIONS).map(option => ({
-            name: i18n(`${i18nKey}.feedbackType.${option}`),
+            name: i18n(`commands.project.subcommands.feedback.feedbackType.${option}`),
             value: option,
         })),
         when: !usedTypeFlag,
     });
-    const shouldOpen = await confirmPrompt(i18n(`${i18nKey}.openPrompt`), {
+    const shouldOpen = await confirmPrompt(i18n(`commands.project.subcommands.feedback.openPrompt`), {
         when: !usedTypeFlag,
     });
     if (shouldOpen || usedTypeFlag) {
         // NOTE: for now, all feedback should go to the hubspot-cli repository
         const url = FEEDBACK_URLS.BUG;
         open(url, { url: true });
-        logger.success(i18n(`${i18nKey}.success`, { url }));
+        logger.success(i18n(`commands.project.subcommands.feedback.success`, { url }));
     }
 };
 exports.builder = yargs => {
     yargs.options({
         bug: {
-            describe: i18n(`${i18nKey}.options.bug.describe`),
+            describe: i18n(`commands.project.subcommands.feedback.options.bug.describe`),
             type: 'boolean',
         },
         general: {
-            describe: i18n(`${i18nKey}.options.general.describe`),
+            describe: i18n(`commands.project.subcommands.feedback.options.general.describe`),
             type: 'boolean',
         },
     });

package/commands/fetch.js

@@ -8,18 +8,17 @@ const { resolveLocalPath } = require('../lib/filesystem');
 const { validateCmsPublishMode } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.fetch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { logError } = require('../lib/errorHandlers/index');
 exports.command = 'fetch <src> [dest]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n('commands.fetch.describe');
 exports.handler = async (options) => {
     const { src, dest } = options;
     if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.ERROR);
     }
     if (typeof src !== 'string') {
-        logger.error(i18n(`${i18nKey}.errors.sourceRequired`));
+        logger.error(i18n('commands.fetch.errors.sourceRequired'));
         process.exit(EXIT_CODES.ERROR);
     }
     const { derivedAccountId } = options;
@@ -36,16 +35,16 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: i18n('commands.fetch.positionals.src.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: i18n('commands.fetch.positionals.dest.describe'),
         type: 'string',
     });
     yargs.options({
         staging: {
-            describe: i18n(`${i18nKey}.options.staging.describe`),
+            describe: i18n('commands.fetch.options.staging.describe'),
             type: 'boolean',
             default: false,
             hidden: true,
@@ -54,7 +53,7 @@ exports.builder = yargs => {
     yargs.options({
         assetVersion: {
             type: 'number',
-            describe: i18n(`${i18nKey}.options.assetVersion.describe`),
+            describe: i18n('commands.fetch.options.assetVersion.describe'),
         },
     });
     addConfigOptions(yargs);

package/commands/filemanager.js

@@ -38,9 +38,8 @@ exports.builder = builder;
 const upload = __importStar(require("./filemanager/upload"));
 const fetch = __importStar(require("./filemanager/fetch"));
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.filemanager';
 exports.command = 'filemanager';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.filemanager.describe`);
 function builder(yargs) {
     yargs.command(upload).command(fetch).demandCommand(1, '');
     return yargs;

package/commands/function.js

@@ -6,9 +6,8 @@ const list = require('./function/list');
 const deploy = require('./function/deploy');
 const server = require('./function/server');
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.function';
 exports.command = ['function', 'functions'];
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.function.describe`);
 exports.builder = yargs => {
     addGlobalOptions(yargs);
     yargs.command(list).command(deploy).command(server).demandCommand(1, '');

package/commands/hubdb/clear.js

@@ -11,9 +11,8 @@ const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTableProm
 const usageTracking_1 = require("../../lib/usageTracking");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.clear';
 exports.command = 'clear [table-id]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.hubdb.subcommands.clear.describe');
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-clear', {}, derivedAccountId);
@@ -26,18 +25,18 @@ async function handler(args) {
             });
         const { deletedRowCount } = await (0, hubdb_1.clearHubDbTableRows)(derivedAccountId, tableId);
         if (deletedRowCount > 0) {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.removedRows`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.removedRows', {
                 deletedRowCount,
                 tableId,
             }));
             const { data: { rowCount }, } = await (0, hubdb_2.publishTable)(derivedAccountId, tableId);
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.rowCount`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.rowCount', {
                 rowCount,
                 tableId,
             }));
         }
         else {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.emptyTable`, {
+            logger_1.logger.log((0, lang_1.i18n)('commands.hubdb.subcommands.clear.logs.emptyTable', {
                 tableId,
             }));
         }
@@ -51,7 +50,7 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.clear.positionals.tableId.describe'),
         type: 'string',
     });
     return yargs;

package/commands/hubdb/create.js

@@ -17,21 +17,20 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.hubdb.subcommands.create';
 exports.command = 'create';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.hubdb.subcommands.create.describe`);
 function selectPathPrompt(options) {
     return (0, promptUtils_1.promptUser)([
         {
             name: 'path',
-            message: (0, lang_1.i18n)(`${i18nKey}.enterPath`),
+            message: (0, lang_1.i18n)(`commands.hubdb.subcommands.create.enterPath`),
             when: !options.path,
             validate: (input) => {
                 if (!input) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.pathRequired`);
+                    return (0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.pathRequired`);
                 }
                 if (!(0, path_2.isValidPath)(input)) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidCharacters`);
+                    return (0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.invalidCharacters`);
                 }
                 return true;
             },
@@ -54,14 +53,14 @@ async function handler(args) {
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const table = await (0, hubdb_1.createHubDbTable)(derivedAccountId, path_1.default.resolve((0, path_2.getCwd)(), filePath));
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.create`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.hubdb.subcommands.create.success.create`, {
             accountId: derivedAccountId,
             rowCount: table.rowCount,
             tableId: table.tableId,
         }));
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.create`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.hubdb.subcommands.create.errors.create`, {
             filePath: filePath || '',
         }));
         (0, index_1.logError)(e);
@@ -72,7 +71,7 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.options('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.path.describe`),
+        describe: (0, lang_1.i18n)(`commands.hubdb.subcommands.create.options.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/hubdb/delete.js

@@ -12,9 +12,8 @@ const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTableProm
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.delete';
 exports.command = 'delete [table-id]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.hubdb.subcommands.delete.describe');
 async function handler(args) {
     const { force, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-delete', {}, derivedAccountId);
@@ -29,21 +28,23 @@ async function handler(args) {
             const { shouldDeleteTable } = await (0, promptUtils_1.promptUser)({
                 name: 'shouldDeleteTable',
                 type: 'confirm',
-                message: (0, lang_1.i18n)(`${i18nKey}.shouldDeleteTable`, { tableId }),
+                message: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.shouldDeleteTable', {
+                    tableId,
+                }),
             });
             if (!shouldDeleteTable) {
                 process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
             }
         }
         await (0, hubdb_1.deleteTable)(derivedAccountId, tableId);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.delete`, {
+        logger_1.logger.success((0, lang_1.i18n)('commands.hubdb.subcommands.delete.success.delete', {
             accountId: derivedAccountId,
             tableId,
         }));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.delete`, {
+        logger_1.logger.error((0, lang_1.i18n)('commands.hubdb.subcommands.delete.errors.delete', {
             tableId: args.tableId || '',
         }));
         (0, index_1.logError)(e);
@@ -54,11 +55,11 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.positionals.tableId.describe'),
         type: 'string',
     });
     yargs.option('force', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.delete.options.force.describe'),
         type: 'boolean',
     });
     return yargs;

package/commands/hubdb/fetch.js

@@ -10,9 +10,8 @@ const selectHubDBTablePrompt_1 = require("../../lib/prompts/selectHubDBTableProm
 const usageTracking_1 = require("../../lib/usageTracking");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.hubdb.subcommands.fetch';
 exports.command = 'fetch [table-id] [dest]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.describe');
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('hubdb-fetch', {}, derivedAccountId);
@@ -25,7 +24,7 @@ async function handler(args) {
         const tableId = args.tableId || promptAnswers.tableId;
         const dest = args.dest || promptAnswers.dest;
         const { filePath } = await (0, hubdb_1.downloadHubDbTable)(derivedAccountId, tableId, dest);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.fetch`, {
+        logger_1.logger.success((0, lang_1.i18n)('commands.hubdb.subcommands.fetch.success.fetch', {
             path: filePath,
             tableId,
         }));
@@ -39,11 +38,11 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('table-id', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.tableId.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.positionals.tableId.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.dest.describe`),
+        describe: (0, lang_1.i18n)('commands.hubdb.subcommands.fetch.positionals.dest.describe'),
         type: 'string',
     });
     return yargs;

package/commands/hubdb.js

@@ -41,9 +41,8 @@ const fetchCommand = __importStar(require("./hubdb/fetch"));
 const deleteCommand = __importStar(require("./hubdb/delete"));
 const clearCommand = __importStar(require("./hubdb/clear"));
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.hubdb';
 exports.command = 'hubdb';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.hubdb.describe');
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs

package/commands/init.js

@@ -29,7 +29,6 @@ const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
 const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
-const i18nKey = 'commands.init';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -64,7 +63,7 @@ const AUTH_TYPE_NAMES = {
     [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
 };
 exports.command = 'init';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.init.describe`);
 async function handler(args) {
     const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -78,11 +77,18 @@ async function handler(args) {
         });
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+    if ((0, config_1.configFileExists)(true)) {
+        const globalConfigPath = (0, config_1.getConfigPath)('', true);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
+            configPath: globalConfigPath,
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.configFileExists`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
             configPath: configPath,
         }));
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.logs.updateConfig`));
+        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
@@ -91,7 +97,7 @@ async function handler(args) {
     const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
         const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.bothConfigFilesNotAllowed`, { path: path }));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
@@ -114,21 +120,18 @@ async function handler(args) {
             accountId = oauthResult.accountId;
             name = oauthResult.name;
         }
+        const configPath = (0, config_1.getConfigPath)();
         try {
             (0, gitignore_1.checkAndAddConfigToGitignore)(configPath);
         }
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        let newConfigPath = configPath;
-        if (!newConfigPath && !useHiddenConfig) {
-            newConfigPath = `${(0, path_2.getCwd)()}/${config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
-        }
         logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileCreated`, {
-            configPath: newConfigPath,
+        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
+            configPath: configPath,
         }));
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileUpdated`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
             authType: AUTH_TYPE_NAMES[authType],
             account: name || accountId,
         }));
@@ -149,7 +152,7 @@ async function handler(args) {
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.authType.describe`),
+            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -158,7 +161,7 @@ function initBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+            describe: (0, lang_1.i18n)(`commands.init.options.account.describe`),
             type: 'string',
             alias: 'a',
         },
@@ -167,16 +170,11 @@ function initBuilder(yargs) {
             hidden: true,
             default: false,
         },
-        'use-hidden-config': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.useHiddenConfig.describe`),
-            hidden: true,
-            type: 'boolean',
-        },
     });
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.command, (0, lang_1.i18n)(`${i18nKey}.verboseDescribe`, {
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, exports.command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
     command: (0, ui_1.uiCommandReference)('hs auth'),
     configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
     authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,

package/commands/lint.js

@@ -9,7 +9,6 @@ const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../l
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.lint';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 exports.command = 'lint <path>';
 // Hiding since this command is still experimental
@@ -46,7 +45,7 @@ const handler = async (options) => {
     const { path: lintPath } = options;
     const { derivedAccountId } = options;
     const localPath = resolveLocalPath(lintPath);
-    const groupName = i18n(`${i18nKey}.groupName`, {
+    const groupName = i18n(`commands.lint.groupName`, {
         path: localPath,
     });
     trackCommandUsage('lint', null, derivedAccountId);
@@ -63,7 +62,7 @@ const handler = async (options) => {
         process.exit(EXIT_CODES.ERROR);
     }
     logger.groupEnd(groupName);
-    logger.log(i18n(`${i18nKey}.issuesFound`, {
+    logger.log(i18n(`commands.lint.issuesFound`, {
         count,
     }));
 };
@@ -73,7 +72,7 @@ const builder = yargs => {
     addAccountOptions(yargs);
     addGlobalOptions(yargs);
     yargs.positional('path', {
-        describe: i18n(`${i18nKey}.positionals.path.describe`),
+        describe: i18n(`commands.lint.positionals.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/list.js

@@ -16,7 +16,6 @@ const fileMapper_1 = require("@hubspot/local-dev-lib/api/fileMapper");
 const constants_1 = require("../lib/constants");
 const lang_1 = require("../lib/lang");
 const exitCodes_1 = require("../lib/enums/exitCodes");
-const i18nKey = 'commands.list';
 function addColorToContents(fileOrFolder) {
     if (!(0, filesystem_1.isPathFolder)(fileOrFolder)) {
         return chalk_1.default.reset.cyan(fileOrFolder);
@@ -44,13 +43,13 @@ function sortContents(a, b) {
     return a.localeCompare(b);
 }
 exports.command = 'list [path]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.list.describe`);
 async function handler(args) {
     const { path, derivedAccountId } = args;
     const directoryPath = path || '/';
     let contentsResp;
     (0, usageTracking_1.trackCommandUsage)('list', undefined, derivedAccountId);
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.gettingPathContents`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.list.gettingPathContents`, {
         path: directoryPath,
     }));
     try {
@@ -62,7 +61,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!contentsResp.folder) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.noFilesFoundAtPath`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -72,7 +71,7 @@ async function handler(args) {
         ? ['@hubspot', ...contentsResp.children]
         : contentsResp.children;
     if (contents.length === 0) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.noFilesFoundAtPath`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.list.noFilesFoundAtPath`, {
             path: directoryPath,
         }));
         return;
@@ -90,7 +89,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.list.positionals.path.describe`),
         type: 'string',
     });
     yargs.example([['$0 list'], ['$0 list /'], ['$0 list my-modules']]);

package/commands/logs.js

@@ -11,10 +11,9 @@ const { i18n } = require('../lib/lang');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
-const i18nKey = 'commands.logs';
 const handleLogsError = (e, accountId, functionPath) => {
     if (isHubSpotHttpError(e) && (e.status === 404 || e.status == 400)) {
-        logger.error(i18n(`${i18nKey}.errors.noLogsFound`, {
+        logger.error(i18n(`commands.logs.errors.noLogsFound`, {
             accountId,
             functionPath,
         }));
@@ -29,7 +28,7 @@ const endpointLog = async (accountId, functionPath, options) => {
         compact,
         endpoint: functionPath,
     };
-    logger.debug(i18n(`${i18nKey}.gettingLogs`, {
+    logger.debug(i18n(`commands.logs.gettingLogs`, {
         latest,
         functionPath,
     }));
@@ -71,48 +70,48 @@ const endpointLog = async (accountId, functionPath, options) => {
     }
 };
 exports.command = 'logs [endpoint]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.logs.describe`);
 exports.handler = async (options) => {
     const { endpoint: endpointArgValue, latest, derivedAccountId } = options;
     trackCommandUsage('logs', { latest }, derivedAccountId);
     const { endpointPromptValue } = await promptUser({
         name: 'endpointPromptValue',
-        message: i18n(`${i18nKey}.endpointPrompt`),
+        message: i18n(`commands.logs.endpointPrompt`),
         when: !endpointArgValue,
     });
     endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
 };
 exports.builder = yargs => {
     yargs.positional('endpoint', {
-        describe: i18n(`${i18nKey}.positionals.endpoint.describe`),
+        describe: i18n(`commands.logs.positionals.endpoint.describe`),
         type: 'string',
     });
     yargs
         .options({
         latest: {
             alias: 'l',
-            describe: i18n(`${i18nKey}.options.latest.describe`),
+            describe: i18n(`commands.logs.options.latest.describe`),
             type: 'boolean',
         },
         compact: {
-            describe: i18n(`${i18nKey}.options.compact.describe`),
+            describe: i18n(`commands.logs.options.compact.describe`),
             type: 'boolean',
         },
         follow: {
             alias: ['f'],
-            describe: i18n(`${i18nKey}.options.follow.describe`),
+            describe: i18n(`commands.logs.options.follow.describe`),
             type: 'boolean',
         },
         limit: {
-            describe: i18n(`${i18nKey}.options.limit.describe`),
+            describe: i18n(`commands.logs.options.limit.describe`),
             type: 'number',
         },
     })
         .conflicts('follow', 'limit');
     yargs.example([
-        ['$0 logs my-endpoint', i18n(`${i18nKey}.examples.default`)],
-        ['$0 logs my-endpoint --limit=10', i18n(`${i18nKey}.examples.limit`)],
-        ['$0 logs my-endpoint --follow', i18n(`${i18nKey}.examples.follow`)],
+        ['$0 logs my-endpoint', i18n(`commands.logs.examples.default`)],
+        ['$0 logs my-endpoint --limit=10', i18n(`commands.logs.examples.limit`)],
+        ['$0 logs my-endpoint --follow', i18n(`commands.logs.examples.follow`)],
     ]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);

package/commands/module/marketplace-validate.js

@@ -6,15 +6,14 @@ const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = requi
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
 const { i18n } = require('../../lib/lang');
-const i18nKey = 'commands.module.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.module.subcommands.marketplaceValidate.describe`);
 exports.handler = async (options) => {
     const { src, derivedAccountId } = options;
     trackCommandUsage('validate', null, derivedAccountId);
     SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
-        text: i18n(`${i18nKey}.logs.validatingModule`, {
+        text: i18n(`commands.module.subcommands.marketplaceValidate.logs.validatingModule`, {
             path: src,
         }),
     });
@@ -23,8 +22,8 @@ exports.handler = async (options) => {
     await pollForValidationFinish(derivedAccountId, validationId);
     SpinniesManager.remove('marketplaceValidation');
     const validationResults = await fetchValidationResults(derivedAccountId, validationId);
-    processValidationErrors(i18nKey, validationResults);
-    displayValidationResults(i18nKey, validationResults);
+    processValidationErrors('commands.module.subcommands.marketplaceValidate', validationResults);
+    displayValidationResults('commands.module.subcommands.marketplaceValidate', validationResults);
     process.exit();
 };
 exports.builder = yargs => {
@@ -32,7 +31,7 @@ exports.builder = yargs => {
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);
     yargs.positional('src', {
-        describe: i18n(`${i18nKey}.positionals.src.describe`),
+        describe: i18n(`commands.module.subcommands.marketplaceValidate.positionals.src.describe`),
         type: 'string',
     });
     return yargs;

package/commands/module.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const marketplaceValidate = require('./module/marketplace-validate');
 const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
-// const { i18n } = require('../lib/lang');
-// const i18nKey = 'commands.module';
 exports.command = 'module';
-exports.describe = false; //i18n(`${i18nKey}.describe`);
+exports.describe = false;
 exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);