@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/bin/cli.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { logError } from '../lib/errorHandlers/index.js';
-import { setLogLevel, getCommandName } from '../lib/commonOpts.js';
+import { setCLILogLevel, getCommandName } from '../lib/commonOpts.js';
 import { trackHelpUsage, trackConvertFieldsUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { loadConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } from '../lib/middleware/configMiddleware.js';
+import { loadAndValidateConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } from '../lib/middleware/configMiddleware.js';
 import { autoUpdateCLI } from '../lib/middleware/autoUpdateMiddleware.js';
 import { checkAndWarnGitInclusionMiddleware } from '../lib/middleware/gitMiddleware.js';
 import { performChecks } from '../lib/middleware/yargsChecksMiddleware.js';
@@ -42,7 +41,7 @@ import appCommand from '../commands/app.js';
 import testAccountCommands from '../commands/testAccount.js';
 import getStartedCommand from '../commands/getStarted.js';
 import mcpCommand from '../commands/mcp.js';
-import getStartedV2Command from '../commands/getStartedV2.js';
+import { uiLogger } from '../lib/ui/logger.js';
 function getTerminalWidth() {
     const width = yargs().terminalWidth();
     if (width >= 100)
@@ -51,7 +50,7 @@ function getTerminalWidth() {
 }
 function handleFailure(msg, err, yargs) {
     if (msg) {
-        logger.error(msg);
+        uiLogger.error(msg);
     }
     else if (err) {
         logError(err);
@@ -68,10 +67,10 @@ const argv = yargs(process.argv.slice(2))
     .usage('The command line interface to interact with HubSpot.')
     // loadConfigMiddleware loads the new hidden config for all commands
     .middleware([
-    setLogLevel,
+    setCLILogLevel,
     setRequestHeaders,
     handleDeprecatedEnvVariables,
-    loadConfigMiddleware,
+    loadAndValidateConfigMiddleware,
     injectAccountIdMiddleware,
     autoUpdateCLI,
     checkAndWarnGitInclusionMiddleware,
@@ -93,37 +92,42 @@ const argv = yargs(process.argv.slice(2))
     type: 'boolean',
 })
     .check(performChecks)
-    .command(getStartedV2Command)
+    // Getting started / important
+    .command(getStartedCommand)
+    .command(feedbackCommand)
+    // Config/Account management
     .command(authCommand)
     .command(initCommand)
-    .command(logsCommand)
+    .command(configCommand)
+    .command(accountCommands)
+    .command(testAccountCommands)
+    .command(sandboxesCommand)
+    .command(secretCommands)
+    .command(openCommand)
+    // Project commands
+    .command(projectCommands)
+    .command(appCommand)
+    // CMS Design Manager
+    .command(watchCommand)
+    .command(listCommand)
+    .command(uploadCommand)
+    .command(fetchCommand)
+    .command(removeCommand)
+    .command(mvCommand)
+    // CMS Commands
     .command(cmsCommand)
+    .command(logsCommand)
     .command(lintCommand)
     .command(hubdbCommand)
-    .command(watchCommand)
-    .command(removeCommand)
-    .command(uploadCommand)
     .command(createCommand)
-    .command(fetchCommand)
     .command(filemanagerCommand)
-    .command(secretCommands)
-    .command(customObjectCommand)
     .command(functionCommands)
-    .command(listCommand)
-    .command(openCommand)
-    .command(mvCommand)
-    .command(projectCommands)
     .command(themeCommand)
     .command(moduleCommand)
-    .command(configCommand)
-    .command(accountCommands)
-    .command(sandboxesCommand)
-    .command(feedbackCommand)
-    .command(doctorCommand)
+    // Misc commands
+    .command(customObjectCommand)
     .command(completionCommand)
-    .command(appCommand)
-    .command(testAccountCommands)
-    .command(getStartedCommand)
+    .command(doctorCommand)
     .command(mcpCommand)
     .help()
     .alias('h', 'help')

package/commands/__tests__/auth.test.js

@@ -28,6 +28,11 @@ describe('commands/auth', () => {
                 }),
                 account: expect.objectContaining({ type: 'string' }),
                 'personal-access-key': expect.objectContaining({ type: 'string' }),
+                'disable-tracking': expect.objectContaining({
+                    type: 'boolean',
+                    hidden: true,
+                    default: false,
+                }),
             });
             expect(addConfigOptions).toHaveBeenCalledTimes(1);
             expect(addConfigOptions).toHaveBeenCalledWith(yargs);

package/commands/__tests__/doctor.test.js

@@ -3,12 +3,12 @@ import yargs from 'yargs';
 import doctorCommand from '../doctor.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { Doctor } from '../../lib/doctor/Doctor.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import fs from 'fs';
 import { getCwd as __getCwd } from '@hubspot/local-dev-lib/path';
 vi.mock('../../lib/usageTracking');
 vi.mock('../../lib/doctor/Doctor');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../lib/ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/path');
 vi.mock('fs');
 // @ts-expect-error Doesn't match the actual signature because then the linter complains about unused variables
@@ -65,8 +65,8 @@ describe('doctor', () => {
         });
         it('should log the diagnosis if it is defined', async () => {
             await doctorCommand.handler({});
-            expect(logger.log).toHaveBeenCalledTimes(1);
-            expect(logger.log).toHaveBeenCalledWith(diagnosis);
+            expect(uiLogger.log).toHaveBeenCalledTimes(1);
+            expect(uiLogger.log).toHaveBeenCalledWith(diagnosis);
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
         });
@@ -78,8 +78,8 @@ describe('doctor', () => {
                 };
             });
             await doctorCommand.handler({});
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith('Error generating diagnosis');
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith('Error generating diagnosis');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -89,12 +89,12 @@ describe('doctor', () => {
             await doctorCommand.handler({
                 outputDir: '/foo',
             });
-            expect(logger.log).not.toHaveBeenCalled();
-            expect(logger.error).not.toHaveBeenCalled();
+            expect(uiLogger.log).not.toHaveBeenCalled();
+            expect(uiLogger.error).not.toHaveBeenCalled();
             expect(mockedFs.writeFileSync).toHaveBeenCalledTimes(1);
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith(expectedOutputFile, expect.stringContaining(diagnosis));
-            expect(logger.success).toHaveBeenCalledTimes(1);
-            expect(logger.success).toHaveBeenCalledWith(expect.stringMatching(/Output written to /));
+            expect(uiLogger.success).toHaveBeenCalledTimes(1);
+            expect(uiLogger.success).toHaveBeenCalledWith(expect.stringMatching(/Output written to /));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
         });
@@ -106,12 +106,12 @@ describe('doctor', () => {
             await doctorCommand.handler({
                 outputDir: './foo',
             });
-            expect(logger.log).not.toHaveBeenCalled();
-            expect(logger.error).not.toHaveBeenCalled();
+            expect(uiLogger.log).not.toHaveBeenCalled();
+            expect(uiLogger.error).not.toHaveBeenCalled();
             expect(mockedFs.writeFileSync).toHaveBeenCalledTimes(1);
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith(expectedOutputFile, expect.stringContaining(diagnosis));
-            expect(logger.success).toHaveBeenCalledTimes(1);
-            expect(logger.success).toHaveBeenCalledWith(expect.stringMatching(/Output written to /));
+            expect(uiLogger.success).toHaveBeenCalledTimes(1);
+            expect(uiLogger.success).toHaveBeenCalledWith(expect.stringMatching(/Output written to /));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
         });
@@ -123,8 +123,8 @@ describe('doctor', () => {
             await doctorCommand.handler({
                 outputDir: '/foo',
             });
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to write output to/));
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to write output to/));
             expect(mockedFs.writeFileSync).toHaveBeenCalledTimes(1);
             expect(mockedFs.writeFileSync).toHaveBeenCalledWith(`/foo/hubspot-doctor-${date.toISOString()}.json`, expect.stringContaining(diagnosis));
             expect(processExitSpy).toHaveBeenCalledTimes(1);

package/commands/__tests__/getStarted.test.js

@@ -34,8 +34,8 @@ describe('commands/get-started', () => {
         });
     });
     describe('describe', () => {
-        it('should have undefined describe property', () => {
-            expect(getStartedCommand.describe).toBeUndefined();
+        it('should have a defined describe property', () => {
+            expect(getStartedCommand.describe).toBeDefined();
         });
     });
     describe('command structure', () => {

package/commands/__tests__/mcp.test.js

@@ -19,7 +19,7 @@ describe('commands/mcp', () => {
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(mcpCommand.describe).toBeUndefined();
+            expect(mcpCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {

package/commands/__tests__/project.test.js

@@ -15,6 +15,7 @@ import cloneApp from '../project/cloneApp.js';
 import installDeps from '../project/installDeps.js';
 import validate from '../project/validate.js';
 import profileCommands from '../project/profile.js';
+import list from '../project/list.js';
 import projectCommand from '../project.js';
 vi.mock('../project/deploy');
 vi.mock('../project/create');
@@ -51,9 +52,6 @@ describe('commands/project', () => {
         });
     });
     describe('describe', () => {
-        it('should contain the beta tag', () => {
-            expect(projectCommand.describe).toContain('[BETA]');
-        });
         it('should provide a description', () => {
             expect(projectCommand.describe).toBeDefined();
         });
@@ -76,6 +74,7 @@ describe('commands/project', () => {
             installDeps,
             profileCommands,
             validate,
+            list,
         ];
         it('should demand the command takes one positional argument', () => {
             projectCommand.builder(yargs);

package/commands/account/auth.js

@@ -141,6 +141,7 @@ async function handler(args) {
         await setAsDefaultAccountPrompt(updatedConfig.name);
     }
     uiFeatureHighlight([
+        'getStartedCommand',
         'helpCommand',
         'accountAuthCommand',
         'accountsListCommand',

package/commands/account/clean.js

@@ -1,12 +1,10 @@
 import fs from 'fs';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personalAccessKey';
 import { loadConfig, getConfigPath, deleteAccount, getConfigAccounts, getConfigDefaultAccount, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
@@ -15,15 +13,17 @@ import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'clean';
-const describe = i18n(`commands.account.subcommands.clean.describe`);
+const describe = commands.account.subcommands.clean.describe;
 async function handler(args) {
     const { qa } = args;
     trackCommandUsage('accounts-clean');
     const accountsList = getConfigAccounts() || [];
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
-        logger.log(i18n(`commands.account.subcommands.clean.noResults`));
+        uiLogger.log(commands.account.subcommands.clean.noResults);
         process.exit(EXIT_CODES.SUCCESS);
     }
     const accountsToRemove = [];
@@ -31,7 +31,7 @@ async function handler(args) {
         succeedColor: 'white',
     });
     SpinniesManager.add('accountsClean', {
-        text: i18n(`commands.account.subcommands.clean.loading.add`),
+        text: commands.account.subcommands.clean.loading.add,
     });
     for (const account of filteredTestAccounts) {
         try {
@@ -56,29 +56,23 @@ async function handler(args) {
     if (accountsToRemove.length > 0) {
         const oneAccountFound = accountsToRemove.length === 1;
         SpinniesManager.succeed('accountsClean', {
-            text: i18n(oneAccountFound
-                ? `commands.account.subcommands.clean.inactiveAccountsFound.one`
-                : `commands.account.subcommands.clean.inactiveAccountsFound.other`, {
-                count: accountsToRemove.length,
-            }),
+            text: oneAccountFound
+                ? commands.account.subcommands.clean.inactiveAccountsFound.one
+                : commands.account.subcommands.clean.inactiveAccountsFound.other(accountsToRemove.length),
         });
-        logger.log(getTableContents(accountsToRemove.map(p => [
+        uiLogger.log(getTableContents(accountsToRemove.map(p => [
             uiAccountDescription(getAccountIdentifier(p)),
         ]), { border: { bodyLeft: '  ' } }));
-        let promptMessage = i18n(oneAccountFound
-            ? `commands.account.subcommands.clean.confirm.one`
-            : `commands.account.subcommands.clean.confirm.other`, {
-            count: accountsToRemove.length,
-        });
+        let promptMessage = oneAccountFound
+            ? commands.account.subcommands.clean.confirm.one
+            : commands.account.subcommands.clean.confirm.other(accountsToRemove.length);
         const accountOverride = getCWDAccountOverride();
         const overrideFilePath = getDefaultAccountOverrideFilePath();
         const accountOverrideMatches = accountsToRemove.some(account => account.name === accountOverride ||
             // @ts-expect-error: Default account override files can only exist with global config
             account.accountId === accountOverride);
         if (overrideFilePath && accountOverride && accountOverrideMatches) {
-            promptMessage = `${promptMessage}${i18n(`commands.account.subcommands.clean.defaultAccountOverride`, {
-                overrideFilePath,
-            })}`;
+            promptMessage = `${promptMessage}${commands.account.subcommands.clean.defaultAccountOverride(overrideFilePath)}`;
         }
         const { accountsCleanPrompt } = await promptUser([
             {
@@ -88,7 +82,7 @@ async function handler(args) {
             },
         ]);
         if (accountsCleanPrompt) {
-            logger.log('');
+            uiLogger.log('');
             try {
                 if (overrideFilePath) {
                     fs.unlinkSync(overrideFilePath);
@@ -99,17 +93,14 @@ async function handler(args) {
             }
             for (const accountToRemove of accountsToRemove) {
                 await deleteAccount(accountToRemove.name);
-                logger.log(i18n(`commands.account.subcommands.clean.removeSuccess`, {
-                    accountName: accountToRemove.name,
-                }));
+                uiLogger.log(commands.account.subcommands.clean.removeSuccess(accountToRemove.name));
             }
             // Get updated version of the config
             loadConfig(getConfigPath());
             const defaultAccount = getConfigDefaultAccount();
             if (defaultAccount &&
                 accountsToRemove.some(p => p.name === defaultAccount)) {
-                logger.log();
-                logger.log(i18n(`commands.account.subcommands.clean.replaceDefaultAccount`));
+                uiLogger.log(commands.account.subcommands.clean.replaceDefaultAccount);
                 const newDefaultAccount = await selectAccountFromConfig();
                 updateDefaultAccount(newDefaultAccount);
             }
@@ -117,10 +108,10 @@ async function handler(args) {
     }
     else {
         SpinniesManager.succeed('accountsClean', {
-            text: i18n(`commands.account.subcommands.clean.noResults`),
+            text: commands.account.subcommands.clean.noResults,
         });
     }
-    logger.log('');
+    uiLogger.log('');
     process.exit(EXIT_CODES.SUCCESS);
 }
 function accountCleanBuilder(yargs) {

package/commands/account/createOverride.js

@@ -1,44 +1,36 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, getConfigPath, getAccountId, } from '@hubspot/local-dev-lib/config';
 import { getGlobalConfig } from '@hubspot/local-dev-lib/config/migrate';
-import { i18n } from '../../lib/lang.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { uiCommandReference } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'create-override [account]';
-const describe = i18n('commands.account.subcommands.createOverride.describe', {
-    hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-});
+const describe = commands.account.subcommands.createOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
     let overrideDefaultAccount = args.account;
     const globalConfig = getGlobalConfig();
     if (!globalConfig) {
-        logger.error(i18n('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
-            authCommand: uiCommandReference('hs account auth'),
-        }));
+        uiLogger.error(commands.account.subcommands.createOverride.errors.globalConfigNotFound);
         process.exit(EXIT_CODES.ERROR);
     }
     const accountOverride = getCWDAccountOverride();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
-        logger.log(i18n('commands.account.subcommands.createOverride.accountOverride', {
-            accountOverride,
-            overrideFilePath,
-        }));
+        uiLogger.log(commands.account.subcommands.createOverride.accountOverride(overrideFilePath, accountOverride.toString()));
         const { replaceOverrideFile } = await promptUser({
             type: 'confirm',
             name: 'replaceOverrideFile',
-            message: i18n('commands.account.subcommands.createOverride.prompts.replaceOverrideFile'),
+            message: commands.account.subcommands.createOverride.prompts.replaceOverrideFile,
         });
-        logger.log('');
+        uiLogger.log('');
         if (!replaceOverrideFile) {
             const accountId = getAccountId(accountOverride) || undefined;
             trackCommandMetadataUsage('account-createOverride', {
@@ -52,18 +44,14 @@ async function handler(args) {
         overrideDefaultAccount = await selectAccountFromConfig();
     }
     else if (!getAccountId(overrideDefaultAccount)) {
-        logger.error(i18n('commands.account.subcommands.createOverride.errors.accountNotFound', {
-            configPath: getConfigPath() || '',
-        }));
+        uiLogger.error(commands.account.subcommands.createOverride.errors.accountNotFound(getConfigPath() || ''));
         overrideDefaultAccount = await selectAccountFromConfig();
     }
     const accountId = getAccountId(overrideDefaultAccount);
     try {
         const overrideFilePath = path.join(getCwd(), DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
         await fs.writeFile(overrideFilePath, accountId.toString(), 'utf8');
-        logger.success(i18n('commands.account.subcommands.createOverride.success', {
-            overrideFilePath,
-        }));
+        uiLogger.success(commands.account.subcommands.createOverride.success(overrideFilePath));
         const trackingId = accountId || undefined;
         trackCommandMetadataUsage('config-migrate', {
             command: 'hs config migrate',
@@ -79,27 +67,21 @@ async function handler(args) {
 }
 function accountCreateOverrideBuilder(yargs) {
     yargs.positional('account', {
-        describe: i18n('commands.account.subcommands.createOverride.options.account.describe'),
+        describe: commands.account.subcommands.createOverride.options.account.describe,
         type: 'string',
     });
     yargs.example([
         [
             '$0 account create-override',
-            i18n('commands.account.subcommands.createOverride.examples.default', {
-                hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-            }),
+            commands.account.subcommands.createOverride.examples.default(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME),
         ],
         [
             '$0 account create-override 12345678',
-            i18n('commands.account.subcommands.createOverride.examples.idBased', {
-                hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-            }),
+            commands.account.subcommands.createOverride.examples.idBased(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME),
         ],
         [
             '$0 account create-override MyAccount',
-            i18n('commands.account.subcommands.createOverride.examples.nameBased', {
-                hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-            }),
+            commands.account.subcommands.createOverride.examples.nameBased(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME),
         ],
     ]);
     return yargs;

package/commands/account/info.js

@@ -1,11 +1,11 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getAccountConfig, getDisplayDefaultAccount, getConfigDefaultAccount, getDefaultAccountOverrideFilePath, getConfigPath, } from '@hubspot/local-dev-lib/config';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { i18n } from '../../lib/lang.js';
 import { indent } from '../../lib/ui/index.js';
 import { getTableContents } from '../../lib/ui/table.js';
-const describe = i18n(`commands.account.subcommands.info.describe`);
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+const describe = commands.account.subcommands.info.describe;
 const command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
@@ -19,53 +19,42 @@ async function handler(args) {
         // If a default account is present in the config, display it
         const configPath = getConfigPath();
         if (configPath) {
-            logger.log(i18n(`commands.account.subcommands.info.defaultAccountTitle`));
-            logger.log(`${indent(1)}${i18n(`commands.account.subcommands.info.configPath`, {
-                configPath,
-            })}`);
-            logger.log(`${indent(1)}${i18n(`commands.account.subcommands.info.defaultAccount`, {
-                account: getDisplayDefaultAccount(),
-            })}`);
+            uiLogger.log(commands.account.subcommands.info.defaultAccountTitle);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.configPath(configPath)}`);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.defaultAccount(getDisplayDefaultAccount().toString())}`);
         }
         // If a default account override is present, display it
         const overrideFilePath = getDefaultAccountOverrideFilePath();
         if (overrideFilePath) {
-            logger.log('');
-            logger.log(i18n(`commands.account.subcommands.info.overrideFilePathTitle`));
-            logger.log(`${indent(1)}${i18n(`commands.account.subcommands.info.overrideFilePath`, { overrideFilePath })}`);
-            logger.log(`${indent(1)}${i18n(`commands.account.subcommands.info.overrideAccount`, {
-                account: getConfigDefaultAccount(),
-            })}`);
+            uiLogger.log('');
+            uiLogger.log(commands.account.subcommands.info.overrideFilePathTitle);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideFilePath(overrideFilePath)}`);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideAccount(getConfigDefaultAccount().toString())}`);
         }
-        logger.log('');
-        logger.log(i18n(`commands.account.subcommands.info.name`, { name: name }));
-        logger.log(i18n(`commands.account.subcommands.info.accountId`, {
-            accountId: derivedAccountId,
-        }));
-        logger.log(i18n(`commands.account.subcommands.info.scopeGroups`));
-        logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.info.name(name));
+        uiLogger.log(commands.account.subcommands.info.accountId(derivedAccountId));
+        uiLogger.log(commands.account.subcommands.info.scopeGroups);
+        uiLogger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
     else {
-        logger.log(i18n(`commands.account.subcommands.info.errors.notUsingPersonalAccessKey`));
+        uiLogger.log(commands.account.subcommands.info.errors.notUsingPersonalAccessKey);
     }
 }
 function accountInfoBuilder(yargs) {
     yargs.positional('account', {
-        describe: i18n(`commands.account.subcommands.info.options.account.describe`),
+        describe: commands.account.subcommands.info.options.account.describe,
         type: 'string',
     });
     yargs.example([
-        [
-            '$0 accounts info',
-            i18n(`commands.account.subcommands.info.examples.default`),
-        ],
+        ['$0 accounts info', commands.account.subcommands.info.examples.default],
         [
             '$0 accounts info MyAccount',
-            i18n(`commands.account.subcommands.info.examples.nameBased`),
+            commands.account.subcommands.info.examples.nameBased,
         ],
         [
             '$0 accounts info 1234567',
-            i18n(`commands.account.subcommands.info.examples.idBased`),
+            commands.account.subcommands.info.examples.idBased,
         ],
     ]);
     return yargs;

package/commands/account/list.js

@@ -1,15 +1,15 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getConfigPath, getConfigAccounts, getDefaultAccountOverrideFilePath, getDisplayDefaultAccount, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { indent } from '../../lib/ui/index.js';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { isSandbox, isDeveloperTestAccount } from '../../lib/accountTypes.js';
-import { i18n } from '../../lib/lang.js';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
 const command = ['list', 'ls'];
-const describe = i18n('commands.account.subcommands.list.describe');
+const describe = commands.account.subcommands.list.describe;
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -72,33 +72,27 @@ async function handler(args) {
     const mappedAccountData = sortAndMapAccounts(accountsList);
     const accountData = getAccountData(mappedAccountData);
     accountData.unshift(getTableHeader([
-        i18n('commands.account.subcommands.list.labels.name'),
-        i18n('commands.account.subcommands.list.labels.accountId'),
-        i18n('commands.account.subcommands.list.labels.authType'),
+        commands.account.subcommands.list.labels.name,
+        commands.account.subcommands.list.labels.accountId,
+        commands.account.subcommands.list.labels.authType,
     ]));
     // If a default account is present in the config, display it
     if (configPath) {
-        logger.log(i18n(`commands.account.subcommands.list.defaultAccountTitle`));
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.configPath`, {
-            configPath,
-        })}`);
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.defaultAccount`, {
-            account: getDisplayDefaultAccount(),
-        })}`);
-        logger.log('');
+        uiLogger.log(commands.account.subcommands.list.defaultAccountTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.configPath(configPath)}`);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.defaultAccount(getDisplayDefaultAccount().toString())}`);
+        uiLogger.log('');
     }
     // If a default account override is present, display it
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (overrideFilePath) {
-        logger.log(i18n(`commands.account.subcommands.list.overrideFilePathTitle`));
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.overrideFilePath`, { overrideFilePath })}`);
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.overrideAccount`, {
-            account: getConfigDefaultAccount(),
-        })}`);
-        logger.log('');
+        uiLogger.log(commands.account.subcommands.list.overrideFilePathTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideFilePath(overrideFilePath)}`);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideAccount(getConfigDefaultAccount().toString())}`);
+        uiLogger.log('');
     }
-    logger.log(i18n(`commands.account.subcommands.list.accounts`));
-    logger.log(getTableContents(accountData, { border: { bodyLeft: '  ' } }));
+    uiLogger.log(commands.account.subcommands.list.accounts);
+    uiLogger.log(getTableContents(accountData, { border: { bodyLeft: '  ' } }));
 }
 function accountListBuilder(yargs) {
     yargs.example([['$0 accounts list']]);