@hubspot/cli 7.4.3-beta.0 → 7.4.4-beta.0

package/api/migrate.d.ts

@@ -10,10 +10,14 @@ interface BaseMigrationApp {
 }
 export interface MigratableApp extends BaseMigrationApp {
     isMigratable: true;
+    unmigratableReason?: undefined;
 }
+export declare const CLI_UNMIGRATABLE_REASONS: {
+    readonly PART_OF_PROJECT_ALREADY: "PART_OF_PROJECT_ALREADY";
+};
 export interface UnmigratableApp extends BaseMigrationApp {
     isMigratable: false;
-    unmigratableReason: keyof typeof UNMIGRATABLE_REASONS;
+    unmigratableReason: keyof typeof UNMIGRATABLE_REASONS | keyof typeof CLI_UNMIGRATABLE_REASONS;
 }
 export type MigrationApp = MigratableApp | UnmigratableApp;
 export interface ListAppsResponse {
@@ -48,10 +52,15 @@ export interface MigrationSuccess extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.SUCCESS;
     buildId: number;
 }
+interface ComponentError {
+    componentType: string;
+    developerSymbol?: string;
+    errorMessage: string;
+}
 export interface MigrationFailed extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.FAILURE;
     projectErrorDetail: string;
-    componentErrorDetails: Record<string, string>;
+    componentErrors: ComponentError[];
 }
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
 export declare function isMigrationStatus(error: unknown): error is MigrationStatus;

package/api/migrate.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLI_UNMIGRATABLE_REASONS = void 0;
 exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
 exports.initializeMigration = initializeMigration;
@@ -8,6 +9,9 @@ exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
+exports.CLI_UNMIGRATABLE_REASONS = {
+    PART_OF_PROJECT_ALREADY: 'PART_OF_PROJECT_ALREADY',
+};
 function isMigrationStatus(error) {
     return (typeof error === 'object' &&
         error !== null &&

package/commands/app/migrate.d.ts

@@ -1,6 +1,5 @@
 import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
 import { MigrateAppArgs } from '../../lib/app/migrate';
-export declare const validMigrationTargets: string[];
 export declare function handler(options: ArgumentsCamelCase<MigrateAppArgs>): Promise<never>;
 export declare function builder(yargs: Argv): Argv<MigrateAppArgs>;
 declare const migrateCommand: CommandModule<unknown, MigrateAppArgs>;

package/commands/app/migrate.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validMigrationTargets = void 0;
 exports.handler = handler;
 exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -15,12 +14,11 @@ const migrate_1 = require("../../lib/app/migrate");
 const ui_1 = require("../../lib/ui");
 const migrate_legacy_1 = require("../../lib/app/migrate_legacy");
 const projects_2 = require("../../lib/projects");
-const { v2023_2, v2025_2, unstable } = projects_1.PLATFORM_VERSIONS;
-exports.validMigrationTargets = [v2023_2, v2025_2, unstable];
+const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
 async function handler(options) {
-    const { derivedAccountId, platformVersion } = options;
+    const { derivedAccountId, platformVersion, unstable } = options;
     await (0, usageTracking_1.trackCommandUsage)('migrate-app', {}, derivedAccountId);
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     if (!accountConfig) {
@@ -32,11 +30,14 @@ async function handler(options) {
     logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.header.link`), 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'));
     logger_1.logger.log('');
     try {
-        if (platformVersion === v2025_2 || platformVersion === unstable) {
+        if (platformVersion === v2025_2 || unstable) {
             if ((0, projects_2.getIsInProject)()) {
                 logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.notAllowedWithinProject`, { command: (0, ui_1.uiCommandReference)('hs project migrate') }));
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
+            options.platformVersion = unstable
+                ? projects_1.PLATFORM_VERSIONS.unstable
+                : platformVersion;
             await (0, migrate_1.migrateApp2025_2)(derivedAccountId, options);
         }
         else {
@@ -54,7 +55,7 @@ async function handler(options) {
             (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
         }
         await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { successful: false }, derivedAccountId);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { successful: true }, derivedAccountId);
     return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -78,9 +79,14 @@ function builder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: exports.validMigrationTargets,
+            choices: [v2023_2, v2025_2],
+            hidden: true,
+            default: v2025_2,
+        },
+        unstable: {
+            type: 'boolean',
+            default: false,
             hidden: true,
-            default: '2023.2',
         },
     });
     yargs.example([

package/commands/auth.js

@@ -22,7 +22,6 @@ const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
 const index_1 = require("../lib/errorHandlers/index");
-const i18nKey = 'commands.auth';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -34,7 +33,7 @@ const ALLOWED_AUTH_METHODS = [
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
 exports.command = 'auth';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.auth.describe');
 async function handler(args) {
     const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -49,7 +48,7 @@ async function handler(args) {
     }
     if ((0, config_2.configFileExists)(true)) {
         const globalConfigPath = (0, config_2.getConfigPath)('', true);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.globalConfigFileExists`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
             configPath: globalConfigPath,
             authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
         }));
@@ -103,7 +102,7 @@ async function handler(args) {
             successAuthMethod = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.unsupportedAuthType`, {
+            logger_1.logger.error((0, lang_1.i18n)('commands.auth.errors.unsupportedAuthType', {
                 supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
                 type: authType,
             }));
@@ -118,16 +117,16 @@ async function handler(args) {
     const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
     logger_1.logger.log('');
     if (setAsDefault) {
-        logger_1.logger.success((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+        logger_1.logger.success((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount', {
             accountName,
         }));
     }
     else {
-        logger_1.logger.info((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+        logger_1.logger.info((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault', {
             accountName: (0, config_2.getConfigDefaultAccount)(),
         }));
     }
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileUpdated`, {
+    logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
         configFilename: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
         authType: successAuthMethod,
         accountName,
@@ -144,7 +143,7 @@ async function handler(args) {
 function authBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.authType.describe`),
+            describe: (0, lang_1.i18n)('commands.auth.options.authType.describe'),
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -153,14 +152,14 @@ function authBuilder(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.auth.options.account.describe'),
             type: 'string',
             alias: 'a',
         },
     });
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.command, (0, lang_1.i18n)(`${i18nKey}.verboseDescribe`, {
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
     authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
     configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 }), {

package/commands/cms.js

@@ -6,9 +6,8 @@ const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../l
 const lighthouseScore = require('./cms/lighthouseScore');
 const convertFields = require('./cms/convertFields');
 const getReactModule = require('./cms/getReactModule');
-const i18nKey = 'commands.cms';
 exports.command = 'cms';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.cms.describe`);
 exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);

package/commands/completion.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const yargsParser = require('yargs-parser');
 const { i18n } = require('../lib/lang');
 const { trackCommandUsage } = require('../lib/usageTracking');
-const i18nKey = 'commands.completion';
 exports.command = 'completion';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n('commands.completion.describe');
 exports.handler = async () => {
     await trackCommandUsage('completion');
 };
@@ -16,7 +15,7 @@ exports.builder = yargs => {
         yargs.completion();
     }
     yargs.example([
-        ['$0 completion >> ~/.zshrc', i18n(`${i18nKey}.examples.default`)],
+        ['$0 completion >> ~/.zshrc', i18n('commands.completion.examples.default')],
     ]);
     return yargs;
 };

package/commands/create.js

@@ -32,12 +32,11 @@ const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.create';
 const SUPPORTED_ASSET_TYPES = Object.keys(assets)
     .filter(t => !assets[t].hidden)
     .join(', ');
 exports.command = 'create <type> [name] [dest]';
-exports.describe = i18n(`${i18nKey}.describe`, {
+exports.describe = i18n(`commands.create.describe`, {
     supportedAssetTypes: SUPPORTED_ASSET_TYPES,
 });
 exports.handler = async (options) => {
@@ -46,7 +45,7 @@ exports.handler = async (options) => {
     setLogLevel(options);
     assetType = typeof assetType === 'string' && assetType.toLowerCase();
     if (assetType === 'global-partial') {
-        logger.error(i18n(`${i18nKey}.errors.deprecatedAssetType`, {
+        logger.error(i18n(`commands.create.errors.deprecatedAssetType`, {
             assetType,
             newCommand: 'hs create template',
             type: 'global partial',
@@ -54,7 +53,7 @@ exports.handler = async (options) => {
         return;
     }
     if (!assetType || !assets[assetType]) {
-        logger.error(i18n(`${i18nKey}.errors.unsupportedAssetType`, {
+        logger.error(i18n(`commands.create.errors.unsupportedAssetType`, {
             assetType,
             supportedAssetTypes: SUPPORTED_ASSET_TYPES,
         }));
@@ -69,7 +68,7 @@ exports.handler = async (options) => {
         await fs.ensureDir(dest);
     }
     catch (e) {
-        logger.error(i18n(`${i18nKey}.errors.unusablePath`, {
+        logger.error(i18n(`commands.create.errors.unusablePath`, {
             path: dest,
         }));
         logError(e, {
@@ -84,15 +83,15 @@ exports.handler = async (options) => {
 };
 exports.builder = yargs => {
     yargs.positional('type', {
-        describe: i18n(`${i18nKey}.positionals.type.describe`),
+        describe: i18n(`commands.create.positionals.type.describe`),
         type: 'string',
     });
     yargs.positional('name', {
-        describe: i18n(`${i18nKey}.positionals.name.describe`),
+        describe: i18n(`commands.create.positionals.name.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`${i18nKey}.positionals.dest.describe`),
+        describe: i18n(`commands.create.positionals.dest.describe`),
         type: 'string',
     });
     yargs.option('internal', {

package/commands/customObject.js

@@ -41,12 +41,11 @@ const createCommand = __importStar(require("./customObject/create"));
 const lang_1 = require("../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const ui_1 = require("../lib/ui");
-const i18nKey = 'commands.customObject';
 exports.command = ['custom-object', 'custom-objects', 'co'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.customObject.describe`), false);
 function logBetaMessage() {
-    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.betaMessage`));
-    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.seeMoreLink`), 'https://developers.hubspot.com/docs/api/crm/crm-custom-objects'));
+    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.customObject.betaMessage`));
+    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.customObject.seeMoreLink`), 'https://developers.hubspot.com/docs/api/crm/crm-custom-objects'));
     logger_1.logger.log();
 }
 function builder(yargs) {

package/commands/doctor.js

@@ -13,9 +13,8 @@ const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("../lib/commonOpts");
 const { i18n } = require('../lib/lang');
-const i18nKey = 'commands.doctor';
 exports.command = 'doctor';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`commands.doctor.describe`);
 const handler = async ({ outputDir, }) => {
     const doctor = new Doctor_1.Doctor();
     (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId || undefined);
@@ -29,7 +28,7 @@ const handler = async ({ outputDir, }) => {
             logger_1.logger.log(output.diagnosis);
         }
         else {
-            logger_1.logger.error(i18n(`${i18nKey}.errors.generatingDiagnosis`));
+            logger_1.logger.error(i18n(`commands.doctor.errors.generatingDiagnosis`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -40,10 +39,10 @@ const handler = async ({ outputDir, }) => {
     const outputFile = path_1.default.join(outputDir, `hubspot-doctor-${new Date().toISOString()}.json`);
     try {
         fs_1.default.writeFileSync(outputFile, JSON.stringify(output, null, 4));
-        logger_1.logger.success(i18n(`${i18nKey}.outputWritten`, { filename: outputFile }));
+        logger_1.logger.success(i18n(`commands.doctor.outputWritten`, { filename: outputFile }));
     }
     catch (e) {
-        logger_1.logger.error(i18n(`${i18nKey}.errors.unableToWriteOutputFile`, {
+        logger_1.logger.error(i18n(`commands.doctor.errors.unableToWriteOutputFile`, {
             file: outputFile,
             errorMessage: e instanceof Error ? e.message : e,
         }));
@@ -54,7 +53,7 @@ const handler = async ({ outputDir, }) => {
 exports.handler = handler;
 const builder = yargs => {
     yargs.option('output-dir', {
-        describe: i18n(`${i18nKey}.options.outputDir`),
+        describe: i18n(`commands.doctor.options.outputDir`),
         type: 'string',
     });
     (0, commonOpts_1.addGlobalOptions)(yargs);

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;