@hubspot/cli 7.8.12-experimental.0 → 7.9.0-beta.0

package/lib/prompts/personalAccessKeyPrompt.js

@@ -2,7 +2,7 @@ import open from 'open';
 import { OAUTH_SCOPES, DEFAULT_OAUTH_SCOPES, } from '@hubspot/local-dev-lib/constants/auth';
 import { deleteEmptyConfigFile } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { promptUser } from './promptUtils.js';
 import { getCliAccountNamePromptConfig, } from './accountNamePrompt.js';
 import { uiInfoSection } from '../ui/index.js';
@@ -17,7 +17,7 @@ export async function personalAccessKeyPrompt({ env, account, }) {
     let url = `${websiteOrigin}/l/personal-access-key`;
     if (process.env.BROWSER !== 'none') {
         uiInfoSection(lib.prompts.personalAccessKeyPrompt.personalAccessKeySetupTitle, () => {
-            logger.log(lib.prompts.personalAccessKeyPrompt.personalAccessKeyBrowserOpenPrep);
+            uiLogger.log(lib.prompts.personalAccessKeyPrompt.personalAccessKeyBrowserOpenPrep);
         });
         if (account) {
             url = `${websiteOrigin}/personal-access-key/${account}`;
@@ -33,7 +33,7 @@ export async function personalAccessKeyPrompt({ env, account, }) {
             lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices
                 .OPEN_BROWSER) {
             open(url, { url: true });
-            logger.log(lib.prompts.personalAccessKeyPrompt.logs.openingWebBrowser(url));
+            uiLogger.log(lib.prompts.personalAccessKeyPrompt.logs.openingWebBrowser(url));
         }
     }
     const { personalAccessKey } = await promptUser(PERSONAL_ACCESS_KEY);

package/lib/prompts/previewPrompt.js

@@ -1,29 +1,29 @@
 import path from 'path';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 export async function previewPrompt(promptOptions = {}) {
     return promptUser([
         {
             name: 'src',
-            message: i18n(`lib.prompts.previewPrompt.enterSrc`),
+            message: lib.prompts.previewPrompt.enterSrc,
             when: !promptOptions.src,
             default: '.',
             validate: (input) => {
                 if (!input) {
-                    return i18n(`lib.prompts.previewPrompt.errors.srcRequired`);
+                    return lib.prompts.previewPrompt.errors.srcRequired;
                 }
                 return true;
             },
         },
         {
             name: 'dest',
-            message: i18n(`lib.prompts.previewPrompt.enterDest`),
+            message: lib.prompts.previewPrompt.enterDest,
             when: !promptOptions.dest,
             default: path.basename(getCwd()),
             validate: (input) => {
                 if (!input) {
-                    return i18n(`lib.prompts.previewPrompt.errors.destRequired`);
+                    return lib.prompts.previewPrompt.errors.destRequired;
                 }
                 return true;
             },
@@ -34,7 +34,7 @@ export async function previewProjectPrompt(themeComponents) {
     return promptUser([
         {
             name: 'themeComponentPath',
-            message: i18n(`lib.prompts.previewPrompt.themeProjectSelect`),
+            message: lib.prompts.previewPrompt.themeProjectSelect,
             type: 'list',
             choices: themeComponents.map(t => {
                 const themeName = path.basename(t.path);

package/lib/prompts/projectAddPrompt.d.ts

@@ -4,12 +4,12 @@ type ProjectAddPromptResponse = {
     componentTemplate: ComponentTemplate;
     name: string;
 };
-type ProjectAddPromptResponseV3 = {
+type ProjectAddPromptResponseV2 = {
     componentTemplate: ComponentTemplate[];
 };
 export declare function projectAddPrompt(components: ComponentTemplate[], promptOptions?: {
     name?: string;
     type?: string;
 }): Promise<ProjectAddPromptResponse>;
-export declare function projectAddPromptV3(components: (ComponentTemplateChoice | Separator)[], selectedFeatures: string[] | undefined): Promise<ProjectAddPromptResponseV3>;
+export declare function projectAddPromptV2(components: (ComponentTemplateChoice | Separator)[], selectedFeatures: string[] | undefined): Promise<ProjectAddPromptResponseV2>;
 export {};

package/lib/prompts/projectAddPrompt.js

@@ -1,6 +1,7 @@
 import { Separator } from '@inquirer/prompts';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
 function findComponentByPathOrLabel(components, componentPathOrLabel) {
     return components.find(c => c.path === componentPathOrLabel || c.label === componentPathOrLabel);
 }
@@ -44,7 +45,7 @@ export async function projectAddPrompt(components, promptOptions = {}) {
     }
     return result;
 }
-export async function projectAddPromptV3(components, selectedFeatures) {
+export async function projectAddPromptV2(components, selectedFeatures) {
     const selectedComponents = [];
     if (selectedFeatures) {
         components.forEach(template => {
@@ -59,6 +60,11 @@ export async function projectAddPromptV3(components, selectedFeatures) {
             }
         });
     }
+    if (!components?.length) {
+        uiLogger.error(lib.prompts.projectAddPrompt.errors.noSelectableChoices);
+        uiLogger.log('');
+        return { componentTemplate: [] };
+    }
     const result = await promptUser([
         {
             name: 'componentTemplate',

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -2,11 +2,11 @@ import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
-import { uiAccountDescription, uiCommandReference } from '../ui/index.js';
+import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
+import { uiAccountDescription } from '../ui/index.js';
 import { isSandbox } from '../accountTypes.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 function mapNestedAccount(accountConfig) {
@@ -36,12 +36,12 @@ export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountC
             sandboxUsage = data.usage;
         }
         else {
-            logger.error(i18n(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`));
+            uiLogger.error(lib.prompts.projectDevTargetAccountPrompt.noAccountId);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     catch (err) {
-        logger.debug('Unable to fetch sandbox usage limits: ', err);
+        uiLogger.debug('Unable to fetch sandbox usage limits: ', err);
     }
     const sandboxAccounts = accounts
         .reverse()
@@ -49,15 +49,11 @@ export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountC
     let disabledMessage = false;
     if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
         if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
-            disabledMessage = i18n(`lib.prompts.projectDevTargetAccountPrompt.sandboxLimitWithSuggestion`, {
-                authCommand: uiCommandReference('hs auth'),
-                limit: sandboxUsage['DEVELOPER'].limit,
-            });
+            disabledMessage =
+                lib.prompts.projectDevTargetAccountPrompt.sandboxLimitWithSuggestion(sandboxUsage['DEVELOPER'].limit);
         }
         else {
-            disabledMessage = i18n(`lib.prompts.projectDevTargetAccountPrompt.sandboxLimit`, {
-                limit: sandboxUsage['DEVELOPER'].limit,
-            });
+            disabledMessage = lib.prompts.projectDevTargetAccountPrompt.sandboxLimit(sandboxUsage['DEVELOPER'].limit);
         }
     }
     // Order choices by Developer Sandbox -> Standard Sandbox
@@ -69,7 +65,7 @@ export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountC
             .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX)
             .map(mapNestedAccount),
         {
-            name: i18n(`lib.prompts.projectDevTargetAccountPrompt.createNewSandboxOption`),
+            name: lib.prompts.projectDevTargetAccountPrompt.createNewSandboxOption,
             value: {
                 targetAccountId: null,
                 createNestedAccount: true,
@@ -77,7 +73,8 @@ export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountC
             disabled: disabledMessage,
         },
         {
-            name: i18n(`lib.prompts.projectDevTargetAccountPrompt.chooseDefaultAccountOption`),
+            name: lib.prompts.projectDevTargetAccountPrompt
+                .chooseDefaultAccountOption,
             value: {
                 targetAccountId: defaultAccountId,
                 createNestedAccount: false,
@@ -95,21 +92,19 @@ export async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAc
             devTestAccountsResponse = data;
         }
         else {
-            logger.error(i18n(`lib.prompts.projectDevTargetAccountPrompt.noAccountId`));
+            uiLogger.error(lib.prompts.projectDevTargetAccountPrompt.noAccountId);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     catch (err) {
-        logger.debug('Unable to fetch developer test account usage limits: ', err);
+        uiLogger.debug('Unable to fetch developer test account usage limits: ', err);
     }
     let disabledMessage = false;
     if (devTestAccountsResponse &&
         devTestAccountsResponse.results.length >=
             devTestAccountsResponse.maxTestPortals) {
-        disabledMessage = i18n(`lib.prompts.projectDevTargetAccountPrompt.developerTestAccountLimit`, {
-            authCommand: uiCommandReference('hs auth'),
-            limit: devTestAccountsResponse.maxTestPortals,
-        });
+        disabledMessage =
+            lib.prompts.projectDevTargetAccountPrompt.developerTestAccountLimit(devTestAccountsResponse.maxTestPortals);
     }
     const devTestAccounts = [];
     if (devTestAccountsResponse && devTestAccountsResponse.results) {
@@ -130,7 +125,8 @@ export async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAc
     const choices = [
         ...devTestAccounts,
         {
-            name: i18n(`lib.prompts.projectDevTargetAccountPrompt.createNewDeveloperTestAccountOption`),
+            name: lib.prompts.projectDevTargetAccountPrompt
+                .createNewDeveloperTestAccountOption,
             value: {
                 targetAccountId: null,
                 createNestedAccount: true,
@@ -146,10 +142,7 @@ async function selectTargetAccountPrompt(defaultAccountId, accountType, choices)
         {
             name: 'targetAccountInfo',
             type: 'list',
-            message: i18n(`lib.prompts.projectDevTargetAccountPrompt.promptMessage`, {
-                accountIdentifier: uiAccountDescription(accountId),
-                accountType,
-            }),
+            message: lib.prompts.projectDevTargetAccountPrompt.promptMessage(accountType, uiAccountDescription(accountId)),
             choices,
             loop: false,
         },
@@ -161,10 +154,7 @@ export async function confirmDefaultAccountPrompt(accountName, accountType) {
         {
             name: 'useDefaultAccount',
             type: 'confirm',
-            message: i18n(`lib.prompts.projectDevTargetAccountPrompt.confirmDefaultAccount`, {
-                accountName,
-                accountType,
-            }),
+            message: lib.prompts.projectDevTargetAccountPrompt.confirmDefaultAccount(accountName, accountType),
         },
     ]);
     return useDefaultAccount;
@@ -174,9 +164,7 @@ export async function confirmUseExistingDeveloperTestAccountPrompt(account) {
         {
             name: 'confirmUseExistingDeveloperTestAccount',
             type: 'confirm',
-            message: i18n(`lib.prompts.projectDevTargetAccountPrompt.confirmUseExistingDeveloperTestAccount`, {
-                accountName: getNonConfigDeveloperTestAccountName(account),
-            }),
+            message: lib.prompts.projectDevTargetAccountPrompt.confirmUseExistingDeveloperTestAccount(getNonConfigDeveloperTestAccountName(account)),
         },
     ]);
     return confirmUseExistingDeveloperTestAccount;

package/lib/prompts/projectNamePrompt.js

@@ -1,25 +1,21 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { ensureProjectExists } from '../projects/ensureProjectExists.js';
-import { uiAccountDescription } from '../ui/index.js';
 export async function projectNamePrompt(accountId, options = {}) {
     const result = await promptUser({
         name: 'projectName',
-        message: i18n(`lib.prompts.projectNamePrompt.enterName`),
+        message: lib.prompts.projectNamePrompt.enterName,
         when: !options.project,
         validate: async (val) => {
             if (typeof val !== 'string' || !val) {
-                return i18n(`lib.prompts.projectNamePrompt.errors.invalidName`);
+                return lib.prompts.projectNamePrompt.errors.invalidName;
             }
             const { projectExists } = await ensureProjectExists(accountId, val, {
                 allowCreate: false,
                 noLogs: true,
             });
             if (!projectExists) {
-                return i18n(`lib.prompts.projectNamePrompt.errors.projectDoesNotExist`, {
-                    projectName: val,
-                    accountIdentifier: uiAccountDescription(accountId),
-                });
+                return lib.prompts.projectNamePrompt.errors.projectDoesNotExist(val, accountId);
             }
             return true;
         },

package/lib/prompts/projectsLogsPrompt.js

@@ -1,4 +1,4 @@
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { promptUser } from './promptUtils.js';
 export async function projectLogsPrompt({ functionChoices, promptOptions, projectName = '', }) {
     if (!functionChoices) {
@@ -11,9 +11,7 @@ export async function projectLogsPrompt({ functionChoices, promptOptions, projec
         {
             name: 'functionName',
             type: 'list',
-            message: i18n(`lib.prompts.projectLogsPrompt.functionName`, {
-                projectName,
-            }),
+            message: lib.prompts.projectLogsPrompt.functionName(projectName),
             when: () => (!promptOptions || !promptOptions.function) &&
                 functionChoices.length > 0,
             choices: functionChoices,

package/lib/prompts/promptUtils.js

@@ -1,11 +1,29 @@
 import { confirm, Separator as _Separator, select, input, checkbox, password, number, } from '@inquirer/prompts';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import chalk from 'chalk';
+import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
 export const Separator = new _Separator();
 export const PROMPT_THEME = { prefix: { idle: chalk.green('?') } };
 function isUserCancellationError(error) {
     return error instanceof Error && error.name === 'ExitPromptError';
 }
+function isNoSelectableChoicesError(error) {
+    return (error instanceof Error && error.message?.includes('No selectable choices'));
+}
+function handlePromptError(config, error) {
+    if (isUserCancellationError(error)) {
+        process.exit(EXIT_CODES.SUCCESS);
+    }
+    if (isNoSelectableChoicesError(error)) {
+        if (!Array.isArray(config)) {
+            uiLogger.log(config.message);
+        }
+        uiLogger.error(lib.prompts.promptUtils.errors.noSelectableChoices);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    throw error;
+}
 function mapPromptChoicesToChoices(choices) {
     return (choices?.map(choice => {
         if (typeof choice === 'string') {
@@ -86,10 +104,7 @@ export async function promptUser(config) {
         }
     }
     catch (error) {
-        if (isUserCancellationError(error)) {
-            process.exit(EXIT_CODES.SUCCESS);
-        }
-        throw error;
+        handlePromptError(config, error);
     }
 }
 function handleRawListPrompt(config) {
@@ -139,8 +154,10 @@ function handleCheckboxPrompt(config) {
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleConfirmPrompt(config) {
-    return confirmPrompt(config.message, {
-        defaultAnswer: config.default,
+    return confirm({
+        message: config.message,
+        default: config.default,
+        theme: PROMPT_THEME,
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleInputPrompt(config) {
@@ -165,12 +182,13 @@ function handleSelectPrompt(config) {
 }
 export async function confirmPrompt(message, options = {}) {
     const { defaultAnswer = true } = options;
-    const choice = await confirm({
+    const { confirm: result } = await promptUser({
+        name: 'confirm',
+        type: 'confirm',
         message,
         default: defaultAnswer,
-        theme: PROMPT_THEME,
     });
-    return choice;
+    return result;
 }
 export async function listPrompt(message, { choices, when, defaultAnswer, validate, loop, }) {
     const { choice } = await promptUser({

package/lib/prompts/sandboxesPrompt.js

@@ -1,5 +1,5 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { uiAccountDescription } from '../ui/index.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
@@ -25,15 +25,15 @@ export async function sandboxTypePrompt() {
     return promptUser([
         {
             name: 'type',
-            message: i18n(`lib.prompts.sandboxesPrompt.type.message`),
+            message: lib.prompts.sandboxesPrompt.type.message,
             type: 'list',
             choices: [
                 {
-                    name: i18n(`lib.prompts.sandboxesPrompt.type.developer`),
+                    name: lib.prompts.sandboxesPrompt.type.developer,
                     value: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
                 },
                 {
-                    name: i18n(`lib.prompts.sandboxesPrompt.type.standard`),
+                    name: lib.prompts.sandboxesPrompt.type.standard,
                     value: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
                 },
             ],
@@ -52,9 +52,9 @@ export function deleteSandboxPrompt(promptParentAccount = false) {
     return promptUser([
         {
             name: 'account',
-            message: i18n(promptParentAccount
-                ? `lib.prompts.sandboxesPrompt.selectParentAccountName`
-                : `lib.prompts.sandboxesPrompt.selectAccountName`),
+            message: promptParentAccount
+                ? lib.prompts.sandboxesPrompt.selectParentAccountName
+                : lib.prompts.sandboxesPrompt.selectAccountName,
             type: 'list',
             pageSize: 20,
             choices,

package/lib/prompts/secretPrompt.js

@@ -1,12 +1,12 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 export function secretValuePrompt() {
     return promptUser([
         {
             name: 'secretValue',
             type: 'password',
             mask: '*',
-            message: i18n(`lib.prompts.secretPrompt.enterValue`),
+            message: lib.prompts.secretPrompt.enterValue,
         },
     ]);
 }
@@ -15,7 +15,7 @@ export function secretNamePrompt() {
         {
             name: 'secretName',
             type: 'input',
-            message: i18n(`lib.prompts.secretPrompt.enterName`),
+            message: lib.prompts.secretPrompt.enterName,
         },
     ]);
 }

package/lib/prompts/selectAppPrompt.js

@@ -1,4 +1,4 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
 import { debugError } from '../errorHandlers/index.js';
 import { lib } from '../../lang/en.js';
@@ -15,7 +15,7 @@ export async function selectAppPrompt(accountId, appId) {
         debugError(err);
     }
     if (availableApps.length === 0) {
-        logger.error(lib.prompts.selectAppPrompt.errors.noApps);
+        uiLogger.error(lib.prompts.selectAppPrompt.errors.noApps);
         return null;
     }
     if (appId) {
@@ -24,7 +24,7 @@ export async function selectAppPrompt(accountId, appId) {
             return targetApp;
         }
         else {
-            logger.error(lib.prompts.selectAppPrompt.errors.invalidAppId);
+            uiLogger.error(lib.prompts.selectAppPrompt.errors.invalidAppId);
         }
     }
     const appPromptValue = await listPrompt(lib.prompts.selectAppPrompt.selectAppId, {

package/lib/prompts/selectHubDBTablePrompt.js

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { debugError } from '../errorHandlers/index.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { isValidPath, untildify } from '@hubspot/local-dev-lib/path';
@@ -10,18 +10,14 @@ async function fetchHubDBOptions(accountId) {
     try {
         const { data: { results: tables }, } = await fetchTables(accountId);
         if (tables.length === 0) {
-            logger.log(i18n(`lib.prompts.selectHubDBTablePrompt.errors.noTables`, {
-                accountId,
-            }));
+            uiLogger.log(lib.prompts.selectHubDBTablePrompt.errors.noTables(accountId.toString()));
             process.exit(EXIT_CODES.SUCCESS);
         }
         return tables;
     }
     catch (error) {
         debugError(error, { accountId });
-        logger.error(i18n(`lib.prompts.selectHubDBTablePrompt.errors.errorFetchingTables`, {
-            accountId,
-        }));
+        uiLogger.error(lib.prompts.selectHubDBTablePrompt.errors.errorFetchingTables(accountId.toString()));
         process.exit(EXIT_CODES.ERROR);
     }
 }
@@ -32,7 +28,7 @@ export async function selectHubDBTablePrompt({ accountId, options, skipDestPromp
     return promptUser([
         {
             name: 'tableId',
-            message: i18n(`lib.prompts.selectHubDBTablePrompt.selectTable`),
+            message: lib.prompts.selectHubDBTablePrompt.selectTable,
             when: !id && !isValidTable,
             type: 'list',
             choices: hubdbTables.map(table => {
@@ -44,17 +40,17 @@ export async function selectHubDBTablePrompt({ accountId, options, skipDestPromp
         },
         {
             name: 'dest',
-            message: i18n(`lib.prompts.selectHubDBTablePrompt.enterDest`),
+            message: lib.prompts.selectHubDBTablePrompt.enterDest,
             when: !options.dest && !skipDestPrompt,
             validate: (input) => {
                 if (!input) {
-                    return i18n(`lib.prompts.selectHubDBTablePrompt.errors.destRequired`);
+                    return lib.prompts.selectHubDBTablePrompt.errors.destRequired;
                 }
                 if (fs.existsSync(input)) {
-                    return i18n(`lib.prompts.selectHubDBTablePrompt.errors.invalidDest`);
+                    return lib.prompts.selectHubDBTablePrompt.errors.invalidDest;
                 }
                 if (!isValidPath(input)) {
-                    return i18n(`lib.prompts.selectHubDBTablePrompt.errors.invalidCharacters`);
+                    return lib.prompts.selectHubDBTablePrompt.errors.invalidCharacters;
                 }
                 return true;
             },

package/lib/prompts/selectPublicAppForMigrationPrompt.js

@@ -1,14 +1,14 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { uiLine } from '../ui/index.js';
 import { logError } from '../errorHandlers/index.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = false) {
     try {
         if (!accountId) {
-            logger.error(i18n(`lib.prompts.selectPublicAppForMigrationPrompt.errors.noAccountId`));
+            uiLogger.error(lib.prompts.selectPublicAppForMigrationPrompt.errors.noAccountId);
             process.exit(EXIT_CODES.ERROR);
         }
         const { data: { results: publicApps }, } = await fetchPublicAppsForPortal(accountId);
@@ -16,15 +16,13 @@ async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = fa
         if (!filteredPublicApps.length ||
             (isMigratingApp &&
                 !filteredPublicApps.some(app => !app.preventProjectMigrations || !app.listingInfo))) {
-            const headerTranslationKey = isMigratingApp
-                ? 'noAppsMigration'
-                : 'noAppsClone';
-            const messageTranslationKey = isMigratingApp
-                ? 'noAppsMigrationMessage'
-                : 'noAppsCloneMessage';
             uiLine();
-            logger.error(i18n(`lib.prompts.selectPublicAppForMigrationPrompt.errors.${headerTranslationKey}`));
-            logger.log(i18n(`lib.prompts.selectPublicAppForMigrationPrompt.errors.${messageTranslationKey}`, { accountName }));
+            if (isMigratingApp) {
+                uiLogger.error(`${lib.prompts.selectPublicAppForMigrationPrompt.errors.noAppsMigration}\n${lib.prompts.selectPublicAppForMigrationPrompt.errors.noAppsMigrationMessage(accountName)}`);
+            }
+            else {
+                uiLogger.error(`${lib.prompts.selectPublicAppForMigrationPrompt.errors.noAppsClone}\n${lib.prompts.selectPublicAppForMigrationPrompt.errors.noAppsCloneMessage(accountName)}`);
+            }
             uiLine();
             process.exit(EXIT_CODES.SUCCESS);
         }
@@ -32,28 +30,26 @@ async function fetchPublicAppOptions(accountId, accountName, isMigratingApp = fa
     }
     catch (error) {
         logError(error, accountId ? { accountId } : undefined);
-        logger.error(i18n(`lib.prompts.selectPublicAppForMigrationPrompt.errors.errorFetchingApps`));
+        uiLogger.error(lib.prompts.selectPublicAppForMigrationPrompt.errors.errorFetchingApps);
         process.exit(EXIT_CODES.ERROR);
     }
 }
 export async function selectPublicAppForMigrationPrompt({ accountId, accountName, isMigratingApp = false, }) {
     const publicApps = await fetchPublicAppOptions(accountId, accountName, isMigratingApp);
-    const translationKey = isMigratingApp
-        ? 'selectAppIdMigrate'
-        : 'selectAppIdClone';
     return promptUser([
         {
             name: 'appId',
-            message: i18n(`lib.prompts.selectPublicAppForMigrationPrompt.${translationKey}`, {
-                accountName,
-            }),
+            message: isMigratingApp
+                ? lib.prompts.selectPublicAppForMigrationPrompt.selectAppIdMigrate(accountName)
+                : lib.prompts.selectPublicAppForMigrationPrompt.selectAppIdClone(accountName),
             type: 'list',
             choices: publicApps.map(app => {
                 const { preventProjectMigrations, listingInfo } = app;
                 if (isMigratingApp && preventProjectMigrations && listingInfo) {
                     return {
                         name: `${app.name} (${app.id})`,
-                        disabled: i18n(`lib.prompts.selectPublicAppForMigrationPrompt.errors.cannotBeMigrated`),
+                        disabled: lib.prompts.selectPublicAppForMigrationPrompt.errors
+                            .cannotBeMigrated,
                     };
                 }
                 return {

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,6 +1,6 @@
 import { updateDefaultAccount, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { uiLogger } from '../ui/logger.js';
 export async function setAsDefaultAccountPrompt(accountName) {
     // Accounts for deprecated and new config
@@ -10,20 +10,16 @@ export async function setAsDefaultAccountPrompt(accountName) {
             name: 'setAsDefault',
             type: 'confirm',
             when: defaultAccount !== accountName,
-            message: i18n(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccountMessage`),
+            message: lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccountMessage,
         },
     ]);
     uiLogger.log('');
     if (setAsDefault) {
         updateDefaultAccount(accountName);
-        uiLogger.success(i18n('lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount', {
-            accountName,
-        }));
+        uiLogger.success(lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount(accountName));
     }
     else {
-        uiLogger.log(i18n('lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault', {
-            accountName: getConfigDefaultAccount(),
-        }));
+        uiLogger.log(lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault(getConfigDefaultAccount()));
     }
     return setAsDefault;
 }