@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/commands/customObject/schema/delete.js

@@ -1,13 +1,13 @@
 import { fetchObjectSchemas, deleteObjectSchema, } from '@hubspot/local-dev-lib/api/customObjects';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'delete [name]';
-const describe = i18n(`commands.customObject.subcommands.schema.subcommands.delete.describe`);
+const describe = commands.customObject.subcommands.schema.subcommands.delete.describe;
 async function handler(args) {
     const { name: providedName, force, derivedAccountId } = args;
     trackCommandUsage('custom-object-schema-delete', {}, derivedAccountId);
@@ -18,41 +18,41 @@ async function handler(args) {
         name =
             providedName && typeof providedName === 'string'
                 ? providedName
-                : await listPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.delete.selectSchema`), {
+                : await listPrompt(commands.customObject.subcommands.schema.subcommands.delete
+                    .selectSchema, {
                     choices: schemaNames,
                 });
         const shouldDelete = force ||
-            (await confirmPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.delete.confirmDelete`, { name })));
+            (await confirmPrompt(commands.customObject.subcommands.schema.subcommands.delete.confirmDelete(name)));
         if (!shouldDelete) {
-            logger.info(i18n(`commands.customObject.subcommands.schema.subcommands.delete.deleteCancelled`, { name }));
+            uiLogger.info(commands.customObject.subcommands.schema.subcommands.delete.deleteCancelled(name));
             return process.exit(EXIT_CODES.SUCCESS);
         }
         await deleteObjectSchema(derivedAccountId, name);
-        logger.success(i18n(`commands.customObject.subcommands.schema.subcommands.delete.success.delete`, {
-            name,
-        }));
+        uiLogger.success(commands.customObject.subcommands.schema.subcommands.delete.success.delete(name));
     }
     catch (e) {
         logError(e);
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.delete.errors.delete`, {
-            name: name || '',
-        }));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.delete.errors.delete(name || ''));
     }
 }
 function schemaDeleteBuilder(yargs) {
     yargs
         .example([
         [
-            '$0 schema delete schemaName',
-            i18n(`commands.customObject.subcommands.schema.subcommands.delete.examples.default`),
+            '$0 custom-object schema delete schemaName',
+            commands.customObject.subcommands.schema.subcommands.delete.examples
+                .default,
         ],
     ])
         .positional('name', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.delete.positionals.name.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.delete.positionals
+            .name.describe,
         type: 'string',
     })
         .option('force', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.delete.options.force.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.delete.options
+            .force.describe,
         type: 'boolean',
     });
     return yargs;

package/commands/customObject/schema/fetch-all.js

@@ -1,28 +1,26 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { downloadSchemas, getResolvedPath, } from '@hubspot/local-dev-lib/customObjects';
 import { inputPrompt } from '../../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
 import { logSchemas } from '../../../lib/schema.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'fetch-all [dest]';
-const describe = i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.describe`);
+const describe = commands.customObject.subcommands.schema.subcommands.fetchAll.describe;
 async function handler(args) {
     const { derivedAccountId, dest: providedDest } = args;
     trackCommandUsage('custom-object-schema-fetch-all', {}, derivedAccountId);
     try {
         const dest = providedDest ||
-            (await inputPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.inputDest`)));
+            (await inputPrompt(commands.customObject.subcommands.schema.subcommands.fetchAll.inputDest));
         const schemas = await downloadSchemas(derivedAccountId, dest);
         logSchemas(schemas);
-        logger.success(i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.success.fetch`, {
-            path: getResolvedPath(dest),
-        }));
+        uiLogger.success(commands.customObject.subcommands.schema.subcommands.fetchAll.success.fetch(getResolvedPath(dest)));
     }
     catch (e) {
         logError(e);
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.errors.fetch`));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.fetchAll.errors.fetch);
     }
 }
 function schemaFetchAllBuilder(yargs) {
@@ -30,15 +28,18 @@ function schemaFetchAllBuilder(yargs) {
         .example([
         [
             '$0 custom-object schema fetch-all',
-            i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.examples.default`),
+            commands.customObject.subcommands.schema.subcommands.fetchAll.examples
+                .default,
         ],
         [
             '$0 custom-object schema fetch-all my/folder',
-            i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.examples.specifyPath`),
+            commands.customObject.subcommands.schema.subcommands.fetchAll.examples
+                .specifyPath,
         ],
     ])
         .positional('dest', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.fetchAll.positionals.dest.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.fetchAll
+            .positionals.dest.describe,
         type: 'string',
     });
     return yargs;

package/commands/customObject/schema/fetch.js

@@ -1,13 +1,13 @@
 import { fetchObjectSchemas } from '@hubspot/local-dev-lib/api/customObjects';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { downloadSchema, getResolvedPath, } from '@hubspot/local-dev-lib/customObjects';
 import { inputPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'fetch [name] [dest]';
-const describe = i18n(`commands.customObject.subcommands.schema.subcommands.fetch.describe`);
+const describe = commands.customObject.subcommands.schema.subcommands.fetch.describe;
 async function handler(args) {
     const { name: providedName, dest: providedDest, derivedAccountId } = args;
     trackCommandUsage('custom-object-schema-fetch', {}, derivedAccountId);
@@ -17,21 +17,17 @@ async function handler(args) {
         const schemaNames = results?.map(({ name: schemaName }) => schemaName);
         name =
             providedName ||
-                (await listPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.fetch.selectSchema`), {
+                (await listPrompt(commands.customObject.subcommands.schema.subcommands.fetch.selectSchema, {
                     choices: schemaNames,
                 }));
         const dest = providedDest ||
-            (await inputPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.fetch.inputDest`)));
+            (await inputPrompt(commands.customObject.subcommands.schema.subcommands.fetch.inputDest));
         await downloadSchema(derivedAccountId, name, dest);
-        logger.success(i18n(`commands.customObject.subcommands.schema.subcommands.fetch.success.savedToPath`, {
-            path: getResolvedPath(dest, name),
-        }));
+        uiLogger.success(commands.customObject.subcommands.schema.subcommands.fetch.success.savedToPath(getResolvedPath(dest, name)));
     }
     catch (e) {
         logError(e);
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.fetch.errors.fetch`, {
-            name: name || '',
-        }));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.fetch.errors.fetch(name || ''));
     }
 }
 function schemaFetchBuilder(yargs) {
@@ -39,19 +35,23 @@ function schemaFetchBuilder(yargs) {
         .example([
         [
             '$0 custom-object schema fetch schemaName',
-            i18n(`commands.customObject.subcommands.schema.subcommands.fetch.examples.default`),
+            commands.customObject.subcommands.schema.subcommands.fetch.examples
+                .default,
         ],
         [
             '$0 custom-object schema fetch schemaName my/folder',
-            i18n(`commands.customObject.subcommands.schema.subcommands.fetch.examples.specifyPath`),
+            commands.customObject.subcommands.schema.subcommands.fetch.examples
+                .specifyPath,
         ],
     ])
         .positional('name', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.fetch.positionals.name.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.fetch.positionals
+            .name.describe,
         type: 'string',
     })
         .positional('dest', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.fetch.positionals.dest.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.fetch.positionals
+            .dest.describe,
         type: 'string',
     });
     return yargs;

package/commands/customObject/schema/list.js

@@ -1,11 +1,11 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { listSchemas } from '../../../lib/schema.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'list';
-const describe = i18n(`commands.customObject.subcommands.schema.subcommands.list.describe`);
+const describe = commands.customObject.subcommands.schema.subcommands.list.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('custom-object-schema-list', {}, derivedAccountId);
@@ -14,7 +14,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e);
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.list.errors.list`));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.list.errors.list);
     }
 }
 function schemaListBuilder(yargs) {

package/commands/customObject/schema/update.js

@@ -1,5 +1,5 @@
 import { fetchObjectSchemas, updateObjectSchema, } from '@hubspot/local-dev-lib/api/customObjects';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { getEnv } from '@hubspot/local-dev-lib/config';
@@ -8,19 +8,20 @@ import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { checkAndConvertToJson } from '../../../lib/validation.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { isSchemaDefinition } from '../../../lib/customObject.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'update [name]';
-const describe = i18n(`commands.customObject.subcommands.schema.subcommands.update.describe`);
+const describe = commands.customObject.subcommands.schema.subcommands.update.describe;
 async function handler(args) {
     const { path, name: providedName, derivedAccountId } = args;
     trackCommandUsage('custom-object-schema-update', {}, derivedAccountId);
     const filePath = getAbsoluteFilePath(path);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!isSchemaDefinition(schemaJson)) {
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.update.errors.invalidSchema`));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.update.errors
+            .invalidSchema);
         process.exit(EXIT_CODES.ERROR);
     }
     let name = providedName;
@@ -30,29 +31,28 @@ async function handler(args) {
         name =
             providedName && typeof providedName === 'string'
                 ? providedName
-                : await listPrompt(i18n(`commands.customObject.subcommands.schema.subcommands.update.selectSchema`), {
+                : await listPrompt(commands.customObject.subcommands.schema.subcommands.update
+                    .selectSchema, {
                     choices: schemaNames,
                 });
         const { data } = await updateObjectSchema(derivedAccountId, name, schemaJson);
-        logger.success(i18n(`commands.customObject.subcommands.schema.subcommands.update.success.viewAtUrl`, {
-            url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`,
-        }));
+        uiLogger.success(commands.customObject.subcommands.schema.subcommands.update.success.viewAtUrl(`${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
     }
     catch (e) {
         logError(e, { accountId: derivedAccountId });
-        logger.error(i18n(`commands.customObject.subcommands.schema.subcommands.update.errors.update`, {
-            definition: path,
-        }));
+        uiLogger.error(commands.customObject.subcommands.schema.subcommands.update.errors.update(path));
     }
 }
 function schemaUpdateBuilder(yargs) {
     yargs
         .positional('name', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.update.positionals.name.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.update.positionals
+            .name.describe,
         type: 'string',
     })
         .option('path', {
-        describe: i18n(`commands.customObject.subcommands.schema.subcommands.update.options.path.describe`),
+        describe: commands.customObject.subcommands.schema.subcommands.update.options.path
+            .describe,
         type: 'string',
         required: true,
     });

package/commands/customObject/schema.js

@@ -4,10 +4,10 @@ import fetchAllCommand from './schema/fetch-all.js';
 import deleteCommand from './schema/delete.js';
 import listCommand from './schema/list.js';
 import updateSchema from './schema/update.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = ['schema', 'schemas'];
-const describe = i18n(`commands.customObject.subcommands.schema.describe`);
+const describe = commands.customObject.subcommands.schema.describe;
 function customObjectSchemaBuilder(yargs) {
     yargs
         .command(listCommand)

package/commands/customObject.js

@@ -1,15 +1,14 @@
 import schemaCommand from './customObject/schema.js';
 import createCommand from './customObject/create.js';
-import { i18n } from '../lib/lang.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
-import { uiBetaTag, uiLink } from '../lib/ui/index.js';
+import { commands } from '../lang/en.js';
+import { uiBetaTag } from '../lib/ui/index.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
+import { uiLogger } from '../lib/ui/logger.js';
 const command = ['custom-object', 'custom-objects', 'co'];
-const describe = uiBetaTag(i18n(`commands.customObject.describe`), false);
+const describe = uiBetaTag(commands.customObject.describe, false);
 function logBetaMessage() {
-    uiBetaTag(i18n(`commands.customObject.betaMessage`));
-    logger.log(uiLink(i18n(`commands.customObject.seeMoreLink`), 'https://developers.hubspot.com/docs/api/crm/crm-custom-objects'));
-    logger.log();
+    uiBetaTag(commands.customObject.betaMessage);
+    uiLogger.log(commands.customObject.seeMoreLink);
 }
 function customObjectBuilder(yargs) {
     yargs.middleware([logBetaMessage]);

package/commands/doctor.js

@@ -1,14 +1,14 @@
 import path from 'path';
 import fs from 'fs';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { Doctor } from '../lib/doctor/Doctor.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { i18n } from '../lib/lang.js';
+import { uiLogger } from '../lib/ui/logger.js';
+import { commands } from '../lang/en.js';
 const command = 'doctor';
-const describe = i18n(`commands.doctor.describe`);
+const describe = commands.doctor.describe;
 const handler = async (args) => {
     const { outputDir } = args;
     const doctor = new Doctor();
@@ -20,10 +20,10 @@ const handler = async (args) => {
     }
     if (!outputDir) {
         if (output?.diagnosis) {
-            logger.log(output.diagnosis);
+            uiLogger.log(output.diagnosis);
         }
         else {
-            logger.error(i18n(`commands.doctor.errors.generatingDiagnosis`));
+            uiLogger.error(commands.doctor.errors.generatingDiagnosis);
             return process.exit(EXIT_CODES.ERROR);
         }
         return process.exit(EXIT_CODES.SUCCESS);
@@ -35,20 +35,17 @@ const handler = async (args) => {
     const outputFile = path.join(outputDirPath, `hubspot-doctor-${new Date().toISOString()}.json`);
     try {
         fs.writeFileSync(outputFile, JSON.stringify(output, null, 4));
-        logger.success(i18n(`commands.doctor.outputWritten`, { filename: outputFile }));
+        uiLogger.success(commands.doctor.outputWritten(outputFile));
     }
     catch (e) {
-        logger.error(i18n(`commands.doctor.errors.unableToWriteOutputFile`, {
-            file: outputFile,
-            errorMessage: e instanceof Error ? e.message : e,
-        }));
+        uiLogger.error(commands.doctor.errors.unableToWriteOutputFile(outputFile, e instanceof Error ? e.message : e));
         return process.exit(EXIT_CODES.ERROR);
     }
     return process.exit(EXIT_CODES.SUCCESS);
 };
 function doctorBuilder(yargs) {
     yargs.option('output-dir', {
-        describe: i18n(`commands.doctor.options.outputDir`),
+        describe: commands.doctor.options.outputDir,
         type: 'string',
     });
     return yargs;

package/commands/feedback.js

@@ -1,25 +1,20 @@
 import open from 'open';
-import { i18n } from '../lib/lang.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { confirmPrompt } from '../lib/prompts/promptUtils.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { uiLink } from '../lib/ui/index.js';
-const FEEDBACK_URL = 'https://developers.hubspot.com/feedback.js';
+import { commands } from '../lang/en.js';
+import { uiLogger } from '../lib/ui/logger.js';
+const FEEDBACK_URL = 'https://developers.hubspot.com/feedback';
 const command = 'feedback';
-const describe = i18n(`commands.project.subcommands.feedback.describe`);
+const describe = commands.project.feedback.describe;
 async function handler() {
-    const shouldOpen = await confirmPrompt(i18n(`commands.project.subcommands.feedback.openPrompt`));
+    const shouldOpen = await confirmPrompt(commands.project.feedback.openPrompt);
     if (!shouldOpen) {
-        logger.log(i18n(`commands.project.subcommands.feedback.error`, {
-            url: uiLink('the developer feedback form', FEEDBACK_URL),
-        }));
-        process.exit(EXIT_CODES.ERROR);
+        uiLogger.log(commands.project.feedback.error(FEEDBACK_URL));
+        process.exit(EXIT_CODES.SUCCESS);
     }
     open(FEEDBACK_URL, { url: true });
-    logger.success(i18n(`commands.project.subcommands.feedback.success`, {
-        url: uiLink('the developer feedback form', FEEDBACK_URL),
-    }));
+    uiLogger.success(commands.project.feedback.success(FEEDBACK_URL));
     process.exit(EXIT_CODES.SUCCESS);
 }
 function feedbackBuilder(yargs) {

package/commands/fetch.js

@@ -1,22 +1,22 @@
 import { downloadFileOrFolder } from '@hubspot/local-dev-lib/fileMapper';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { addCmsPublishModeOptions, addOverwriteOptions, getCmsPublishMode, } from '../lib/commonOpts.js';
 import { resolveLocalPath } from '../lib/filesystem.js';
 import { validateCmsPublishMode } from '../lib/validation.js';
 import { trackCommandUsage } from '../lib/usageTracking.js';
-import { i18n } from '../lib/lang.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { logError } from '../lib/errorHandlers/index.js';
+import { commands } from '../lang/en.js';
+import { uiLogger } from '../lib/ui/logger.js';
 const command = 'fetch <src> [dest]';
-const describe = i18n('commands.fetch.describe');
+const describe = commands.fetch.describe;
 const handler = async (options) => {
     const { src, dest } = options;
     if (!validateCmsPublishMode(options)) {
         process.exit(EXIT_CODES.ERROR);
     }
     if (typeof src !== 'string') {
-        logger.error(i18n('commands.fetch.errors.sourceRequired'));
+        uiLogger.error(commands.fetch.errors.sourceRequired);
         process.exit(EXIT_CODES.ERROR);
     }
     const { derivedAccountId } = options;
@@ -38,16 +38,16 @@ const handler = async (options) => {
 };
 const fetchBuilder = (yargs) => {
     yargs.positional('src', {
-        describe: i18n('commands.fetch.positionals.src.describe'),
+        describe: commands.fetch.positionals.src.describe,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n('commands.fetch.positionals.dest.describe'),
+        describe: commands.fetch.positionals.dest.describe,
         type: 'string',
     });
     yargs.options({
         staging: {
-            describe: i18n('commands.fetch.options.staging.describe'),
+            describe: commands.fetch.options.staging.describe,
             type: 'boolean',
             default: false,
             hidden: true,
@@ -56,7 +56,7 @@ const fetchBuilder = (yargs) => {
     yargs.options({
         assetVersion: {
             type: 'number',
-            describe: i18n('commands.fetch.options.assetVersion.describe'),
+            describe: commands.fetch.options.assetVersion.describe,
         },
     });
     addCmsPublishModeOptions(yargs, { read: true });

package/commands/filemanager/fetch.js

@@ -1,18 +1,18 @@
 import { downloadFileOrFolder } from '@hubspot/local-dev-lib/fileManager';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { resolveLocalPath } from '../../lib/filesystem.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { addOverwriteOptions } from '../../lib/commonOpts.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch <src> [dest]';
-const describe = i18n(`commands.filemanager.subcommands.fetch.describe`);
+const describe = commands.filemanager.subcommands.fetch.describe;
 async function handler(args) {
     const { src, includeArchived, derivedAccountId, overwrite } = args;
     if (typeof src !== 'string') {
-        logger.error(i18n(`commands.filemanager.subcommands.fetch.errors.sourceRequired`));
+        uiLogger.error(commands.filemanager.subcommands.fetch.errors.sourceRequired);
         process.exit(EXIT_CODES.ERROR);
     }
     const dest = resolveLocalPath(args.dest);
@@ -29,16 +29,16 @@ async function handler(args) {
 function fileManagerFetchBuilder(yargs) {
     addOverwriteOptions(yargs);
     yargs.positional('src', {
-        describe: i18n(`commands.filemanager.subcommands.fetch.positionals.src.describe`),
+        describe: commands.filemanager.subcommands.fetch.positionals.src.describe,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`commands.filemanager.subcommands.fetch.positionals.dest.describe`),
+        describe: commands.filemanager.subcommands.fetch.positionals.dest.describe,
         type: 'string',
     });
     yargs.option('include-archived', {
         alias: ['i'],
-        describe: i18n(`commands.filemanager.subcommands.fetch.options.includeArchived.describe`),
+        describe: commands.filemanager.subcommands.fetch.options.includeArchived.describe,
         type: 'boolean',
     });
     return yargs;

package/commands/filemanager/upload.js

@@ -3,16 +3,16 @@ import path from 'path';
 import { uploadFolder } from '@hubspot/local-dev-lib/fileManager';
 import { uploadFile } from '@hubspot/local-dev-lib/api/fileManager';
 import { getCwd, convertToUnixPath } from '@hubspot/local-dev-lib/path';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { validateSrcAndDestPaths } from '@hubspot/local-dev-lib/cms/modules';
 import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'upload <src> <dest>';
-const describe = i18n(`commands.filemanager.subcommands.upload.describe`);
+const describe = commands.filemanager.subcommands.upload.describe;
 async function handler(args) {
     const { src, dest, derivedAccountId } = args;
     const absoluteSrcPath = path.resolve(getCwd(), src);
@@ -20,49 +20,36 @@ async function handler(args) {
     try {
         stats = fs.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
-                path: src,
-            }));
+            uiLogger.error(commands.filemanager.subcommands.upload.errors.invalidPath(src));
             return;
         }
     }
     catch (e) {
-        logger.error(i18n(`commands.filemanager.subcommands.upload.errors.invalidPath`, {
-            path: src,
-        }));
+        uiLogger.error(commands.filemanager.subcommands.upload.errors.invalidPath(src));
         return;
     }
     if (!dest) {
-        logger.error(i18n(`commands.filemanager.subcommands.upload.errors.destinationRequired`));
+        uiLogger.error(commands.filemanager.subcommands.upload.errors.destinationRequired);
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
     trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger.error(message));
+        srcDestIssues.forEach(({ message }) => uiLogger.error(message));
         process.exit(EXIT_CODES.ERROR);
     }
     if (stats.isFile()) {
         if (shouldIgnoreFile(absoluteSrcPath)) {
-            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.fileIgnored`, {
-                path: src,
-            }));
+            uiLogger.error(commands.filemanager.subcommands.upload.errors.fileIgnored(src));
             return;
         }
         uploadFile(derivedAccountId, absoluteSrcPath, normalizedDest)
             .then(() => {
-            logger.success(i18n(`commands.filemanager.subcommands.upload.success.upload`, {
-                accountId: derivedAccountId,
-                dest: normalizedDest,
-                src,
-            }));
+            uiLogger.success(commands.filemanager.subcommands.upload.success.upload(src, normalizedDest, derivedAccountId));
         })
             .catch(error => {
-            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.upload`, {
-                dest: normalizedDest,
-                src,
-            }));
+            uiLogger.error(commands.filemanager.subcommands.upload.errors.upload(src, normalizedDest));
             logError(error, new ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
@@ -71,19 +58,13 @@ async function handler(args) {
         });
     }
     else {
-        logger.log(i18n(`commands.filemanager.subcommands.upload.logs.uploading`, {
-            accountId: derivedAccountId,
-            dest,
-            src,
-        }));
+        uiLogger.log(commands.filemanager.subcommands.upload.logs.uploading(src, dest, derivedAccountId));
         uploadFolder(derivedAccountId, absoluteSrcPath, dest)
             .then(() => {
-            logger.success(i18n(`commands.filemanager.subcommands.upload.success.uploadComplete`, {
-                dest,
-            }));
+            uiLogger.success(commands.filemanager.subcommands.upload.success.uploadComplete(dest));
         })
             .catch(error => {
-            logger.error(i18n(`commands.filemanager.subcommands.upload.errors.uploadingFailed`));
+            uiLogger.error(commands.filemanager.subcommands.upload.errors.uploadingFailed);
             logError(error, {
                 accountId: derivedAccountId,
             });
@@ -92,11 +73,11 @@ async function handler(args) {
 }
 function fileManagerUploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n(`commands.filemanager.subcommands.upload.positionals.src.describe`),
+        describe: commands.filemanager.subcommands.upload.positionals.src.describe,
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`commands.filemanager.subcommands.upload.positionals.dest.describe`),
+        describe: commands.filemanager.subcommands.upload.positionals.dest.describe,
         type: 'string',
     });
     return yargs;