chore: inline i18nkeys part 3

commands/hubdb/clear.ts

@@ -18,10 +18,8 @@ import {
   EnvironmentArgs,
 } from '../../types/Yargs';
 
-const i18nKey = 'commands.hubdb.subcommands.clear';
-
 export const command = 'clear [table-id]';
-export const describe = i18n(`${i18nKey}.describe`);
+export const describe = i18n('commands.hubdb.subcommands.clear.describe');
 
 type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
 type HubdbClearArgs = CommonArgs &
@@ -48,7 +46,7 @@ export async function handler(
     );
     if (deletedRowCount > 0) {
       logger.log(
-        i18n(`${i18nKey}.logs.removedRows`, {
+        i18n('commands.hubdb.subcommands.clear.logs.removedRows', {
           deletedRowCount,
           tableId,
         })
@@ -57,14 +55,14 @@ export async function handler(
         data: { rowCount },
       } = await publishTable(derivedAccountId, tableId);
       logger.log(
-        i18n(`${i18nKey}.logs.rowCount`, {
+        i18n('commands.hubdb.subcommands.clear.logs.rowCount', {
           rowCount,
           tableId,
         })
       );
     } else {
       logger.log(
-        i18n(`${i18nKey}.logs.emptyTable`, {
+        i18n('commands.hubdb.subcommands.clear.logs.emptyTable', {
           tableId,
         })
       );
@@ -80,7 +78,9 @@ export function builder(yargs: Argv): Argv<HubdbClearArgs> {
   addUseEnvironmentOptions(yargs);
 
   yargs.positional('table-id', {
-    describe: i18n(`${i18nKey}.positionals.tableId.describe`),
+    describe: i18n(
+      'commands.hubdb.subcommands.clear.positionals.tableId.describe'
+    ),
     type: 'string',
   });
 

commands/hubdb/create.ts

@@ -21,10 +21,8 @@ import {
   EnvironmentArgs,
 } from '../../types/Yargs';
 
-const i18nKey = 'commands.hubdb.subcommands.create';
-
 export const command = 'create';
-export const describe = i18n(`${i18nKey}.describe`);
+export const describe = i18n(`commands.hubdb.subcommands.create.describe`);
 
 type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
 type HubdbCreateArgs = CommonArgs & CombinedArgs & { path?: string };
@@ -33,14 +31,16 @@ function selectPathPrompt(options: HubdbCreateArgs): Promise<{ path: string }> {
   return promptUser([
     {
       name: 'path',
-      message: i18n(`${i18nKey}.enterPath`),
+      message: i18n(`commands.hubdb.subcommands.create.enterPath`),
       when: !options.path,
       validate: (input: string) => {
         if (!input) {
-          return i18n(`${i18nKey}.errors.pathRequired`);
+          return i18n(`commands.hubdb.subcommands.create.errors.pathRequired`);
         }
         if (!isValidPath(input)) {
-          return i18n(`${i18nKey}.errors.invalidCharacters`);
+          return i18n(
+            `commands.hubdb.subcommands.create.errors.invalidCharacters`
+          );
         }
         return true;
       },
@@ -73,15 +73,15 @@ export async function handler(
       path.resolve(getCwd(), filePath)
     );
     logger.success(
-      i18n(`${i18nKey}.success.create`, {
+      i18n(`commands.hubdb.subcommands.create.success.create`, {
         accountId: derivedAccountId,
         rowCount: table.rowCount,
         tableId: table.tableId,
       })
     );
   } catch (e) {
     logger.error(
-      i18n(`${i18nKey}.errors.create`, {
+      i18n(`commands.hubdb.subcommands.create.errors.create`, {
         filePath: filePath || '',
       })
     );
@@ -95,7 +95,7 @@ export function builder(yargs: Argv): Argv<HubdbCreateArgs> {
   addUseEnvironmentOptions(yargs);
 
   yargs.options('path', {
-    describe: i18n(`${i18nKey}.options.path.describe`),
+    describe: i18n(`commands.hubdb.subcommands.create.options.path.describe`),
     type: 'string',
   });
 

commands/hubdb/delete.ts

@@ -19,10 +19,8 @@ import {
   EnvironmentArgs,
 } from '../../types/Yargs';
 
-const i18nKey = 'commands.hubdb.subcommands.delete';
-
 export const command = 'delete [table-id]';
-export const describe = i18n(`${i18nKey}.describe`);
+export const describe = i18n('commands.hubdb.subcommands.delete.describe');
 
 type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
 type HubdbDeleteArgs = CommonArgs & CombinedArgs & { tableId?: number };
@@ -47,7 +45,9 @@ export async function handler(
       const { shouldDeleteTable } = await promptUser({
         name: 'shouldDeleteTable',
         type: 'confirm',
-        message: i18n(`${i18nKey}.shouldDeleteTable`, { tableId }),
+        message: i18n('commands.hubdb.subcommands.delete.shouldDeleteTable', {
+          tableId,
+        }),
       });
 
       if (!shouldDeleteTable) {
@@ -57,15 +57,15 @@ export async function handler(
 
     await deleteTable(derivedAccountId, tableId);
     logger.success(
-      i18n(`${i18nKey}.success.delete`, {
+      i18n('commands.hubdb.subcommands.delete.success.delete', {
         accountId: derivedAccountId,
         tableId,
       })
     );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (e) {
     logger.error(
-      i18n(`${i18nKey}.errors.delete`, {
+      i18n('commands.hubdb.subcommands.delete.errors.delete', {
         tableId: args.tableId || '',
       })
     );
@@ -79,12 +79,14 @@ export function builder(yargs: Argv): Argv<HubdbDeleteArgs> {
   addUseEnvironmentOptions(yargs);
 
   yargs.positional('table-id', {
-    describe: i18n(`${i18nKey}.positionals.tableId.describe`),
+    describe: i18n(
+      'commands.hubdb.subcommands.delete.positionals.tableId.describe'
+    ),
     type: 'string',
   });
 
   yargs.option('force', {
-    describe: i18n(`${i18nKey}.options.force.describe`),
+    describe: i18n('commands.hubdb.subcommands.delete.options.force.describe'),
     type: 'boolean',
   });
 

commands/hubdb/fetch.ts

@@ -17,10 +17,8 @@ import {
   EnvironmentArgs,
 } from '../../types/Yargs';
 
-const i18nKey = 'commands.hubdb.subcommands.fetch';
-
 export const command = 'fetch [table-id] [dest]';
-export const describe = i18n(`${i18nKey}.describe`);
+export const describe = i18n('commands.hubdb.subcommands.fetch.describe');
 
 type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
 type HubdbFetchArgs = CommonArgs &
@@ -49,7 +47,7 @@ export async function handler(
     );
 
     logger.success(
-      i18n(`${i18nKey}.success.fetch`, {
+      i18n('commands.hubdb.subcommands.fetch.success.fetch', {
         path: filePath,
         tableId,
       })
@@ -65,12 +63,16 @@ export function builder(yargs: Argv): Argv<HubdbFetchArgs> {
   addUseEnvironmentOptions(yargs);
 
   yargs.positional('table-id', {
-    describe: i18n(`${i18nKey}.positionals.tableId.describe`),
+    describe: i18n(
+      'commands.hubdb.subcommands.fetch.positionals.tableId.describe'
+    ),
     type: 'string',
   });
 
   yargs.positional('dest', {
-    describe: i18n(`${i18nKey}.positionals.dest.describe`),
+    describe: i18n(
+      'commands.hubdb.subcommands.fetch.positionals.dest.describe'
+    ),
     type: 'string',
   });
 

commands/module/marketplace-validate.ts

@@ -15,10 +15,10 @@ const {
 } = 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;
@@ -28,9 +28,12 @@ exports.handler = async options => {
   SpinniesManager.init();
 
   SpinniesManager.add('marketplaceValidation', {
-    text: i18n(`${i18nKey}.logs.validatingModule`, {
-      path: src,
-    }),
+    text: i18n(
+      `commands.module.subcommands.marketplaceValidate.logs.validatingModule`,
+      {
+        path: src,
+      }
+    ),
   });
 
   const assetType = 'MODULE';
@@ -47,8 +50,14 @@ exports.handler = async options => {
     derivedAccountId,
     validationId
   );
-  processValidationErrors(i18nKey, validationResults);
-  displayValidationResults(i18nKey, validationResults);
+  processValidationErrors(
+    'commands.module.subcommands.marketplaceValidate',
+    validationResults
+  );
+  displayValidationResults(
+    'commands.module.subcommands.marketplaceValidate',
+    validationResults
+  );
 
   process.exit();
 };
@@ -59,7 +68,9 @@ exports.builder = 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;

commands/project/add.ts

@@ -19,10 +19,11 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes';
 import { CommonArgs } from '../../types/Yargs';
 import { makeYargsBuilder } from '../../lib/yargsUtils';
 
-const i18nKey = 'commands.project.subcommands.add';
-
 export const command = 'add';
-export const describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+export const describe = uiBetaTag(
+  i18n(`commands.project.subcommands.add.describe`),
+  false
+);
 
 type ProjectAddArgs = CommonArgs & {
   type: string;
@@ -39,7 +40,9 @@ export async function handler(
   const { projectConfig, projectDir } = await getProjectConfig();
 
   if (!projectDir || !projectConfig) {
-    logger.error(i18n(`${i18nKey}.error.locationInProject`));
+    logger.error(
+      i18n(`commands.project.subcommands.add.error.locationInProject`)
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -55,13 +58,15 @@ export async function handler(
   }
 
   if (projectContainsPublicApp) {
-    logger.error(i18n(`${i18nKey}.error.projectContainsPublicApp`));
+    logger.error(
+      i18n(`commands.project.subcommands.add.error.projectContainsPublicApp`)
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
   logger.log('');
   logger.log(
-    i18n(`${i18nKey}.creatingComponent`, {
+    i18n(`commands.project.subcommands.add.creatingComponent`, {
       projectName: projectConfig.name,
     })
   );
@@ -81,15 +86,19 @@ export async function handler(
   }
 
   if (!latestRepoReleaseTag) {
-    logger.error(i18n(`${i18nKey}.error.failedToFetchComponentList`));
+    logger.error(
+      i18n(`commands.project.subcommands.add.error.failedToFetchComponentList`)
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
   const components =
     await getProjectComponentListFromRepo(latestRepoReleaseTag);
 
   if (!components.length) {
-    logger.error(i18n(`${i18nKey}.error.failedToFetchComponentList`));
+    logger.error(
+      i18n(`commands.project.subcommands.add.error.failedToFetchComponentList`)
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -115,13 +124,15 @@ export async function handler(
 
     logger.log('');
     logger.success(
-      i18n(`${i18nKey}.success`, {
+      i18n(`commands.project.subcommands.add.success`, {
         componentName: projectAddPromptResponse.name,
       })
     );
   } catch (error) {
     debugError(error);
-    logger.error(i18n(`${i18nKey}.error.failedToDownloadComponent`));
+    logger.error(
+      i18n(`commands.project.subcommands.add.error.failedToDownloadComponent`)
+    );
     process.exit(EXIT_CODES.ERROR);
   }
   process.exit(EXIT_CODES.SUCCESS);
@@ -130,20 +141,25 @@ export async function handler(
 function projectAddBuilder(yargs: Argv): Argv<ProjectAddArgs> {
   yargs.options({
     type: {
-      describe: i18n(`${i18nKey}.options.type.describe`),
+      describe: i18n(`commands.project.subcommands.add.options.type.describe`),
       type: 'string',
     },
     name: {
-      describe: i18n(`${i18nKey}.options.name.describe`),
+      describe: i18n(`commands.project.subcommands.add.options.name.describe`),
       type: 'string',
     },
   });
 
-  yargs.example([['$0 project add', i18n(`${i18nKey}.examples.default`)]]);
+  yargs.example([
+    [
+      '$0 project add',
+      i18n(`commands.project.subcommands.add.examples.default`),
+    ],
+  ]);
   yargs.example([
     [
       '$0 project add --name="my-component" --type="components/example-app"',
-      i18n(`${i18nKey}.examples.withFlags`),
+      i18n(`commands.project.subcommands.add.examples.withFlags`),
     ],
   ]);