@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/lib/prompts/accountNamePrompt.js

@@ -1,26 +1,24 @@
 import { accountNameExistsInConfig } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 export function getCliAccountNamePromptConfig(defaultName) {
     return {
         name: 'name',
-        message: i18n(`lib.prompts.accountNamePrompt.enterAccountName`),
+        message: lib.prompts.accountNamePrompt.enterAccountName,
         default: defaultName,
         validate(val) {
             if (typeof val !== 'string') {
-                return i18n(`lib.prompts.accountNamePrompt.errors.invalidName`);
+                return lib.prompts.accountNamePrompt.errors.invalidName;
             }
             else if (!val.length) {
-                return i18n(`lib.prompts.accountNamePrompt.errors.nameRequired`);
+                return lib.prompts.accountNamePrompt.errors.nameRequired;
             }
             else if (val.indexOf(' ') >= 0) {
-                return i18n(`lib.prompts.accountNamePrompt.errors.spacesInName`);
+                return lib.prompts.accountNamePrompt.errors.spacesInName;
             }
             return accountNameExistsInConfig(val)
-                ? i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
-                    name: val,
-                })
+                ? lib.prompts.accountNamePrompt.errors.accountNameExists(val)
                 : true;
         },
     };
@@ -37,14 +35,13 @@ export function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0,
     let defaultName;
     if (isSandbox) {
         promptMessageString = isDevelopmentSandbox
-            ? i18n(`lib.prompts.accountNamePrompt.enterDevelopmentSandboxName`)
-            : i18n(`lib.prompts.accountNamePrompt.enterStandardSandboxName`);
+            ? lib.prompts.accountNamePrompt.enterDevelopmentSandboxName
+            : lib.prompts.accountNamePrompt.enterStandardSandboxName;
     }
     else if (isDeveloperTestAccount) {
-        promptMessageString = i18n(`lib.prompts.accountNamePrompt.enterDeveloperTestAccountName`);
-        defaultName = i18n(`lib.prompts.accountNamePrompt.developerTestAccountDefaultName`, {
-            count: currentPortalCount + 1,
-        });
+        promptMessageString =
+            lib.prompts.accountNamePrompt.enterDeveloperTestAccountName;
+        defaultName = lib.prompts.accountNamePrompt.developerTestAccountDefaultName(currentPortalCount + 1);
     }
     return promptUser([
         {
@@ -52,15 +49,13 @@ export function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0,
             message: promptMessageString,
             validate(val) {
                 if (typeof val !== 'string') {
-                    return i18n(`lib.prompts.accountNamePrompt.errors.invalidName`);
+                    return lib.prompts.accountNamePrompt.errors.invalidName;
                 }
                 else if (!val.trim().length) {
-                    return i18n(`lib.prompts.accountNamePrompt.errors.nameRequired`);
+                    return lib.prompts.accountNamePrompt.errors.nameRequired;
                 }
                 return accountNameExistsInConfig(val)
-                    ? i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
-                        name: val,
-                    })
+                    ? lib.prompts.accountNamePrompt.errors.accountNameExists(val)
                     : true;
             },
             default: defaultName,

package/lib/prompts/accountsPrompt.js

@@ -1,7 +1,7 @@
 import { getConfigDefaultAccount, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { commands } from '../../lang/en.js';
 import { uiAccountDescription } from '../ui/index.js';
 function mapAccountChoices(portals) {
     return (portals?.map(p => ({
@@ -17,7 +17,7 @@ export async function selectAccountFromConfig(prompt = '') {
             type: 'list',
             name: 'default',
             pageSize: 20,
-            message: prompt || i18n(`commands.account.subcommands.use.promptMessage`),
+            message: prompt || commands.account.subcommands.use.promptMessage,
             choices: mapAccountChoices(accountsList),
             default: defaultAccount ?? undefined,
         },

package/lib/prompts/cmsFieldPrompt.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 import { escapeRegExp } from '@hubspot/local-dev-lib/escapeRegExp';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 export async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
@@ -26,7 +26,7 @@ export async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
     }));
     const promptVal = await promptUser([
         {
-            message: i18n(`lib.prompts.uploadPrompt.fieldsPrompt`, { dir: fileDir }),
+            message: lib.prompts.uploadPrompt.fieldsPrompt(fileDir),
             type: 'list',
             name: 'filePathChoice',
             choices: selection,

package/lib/prompts/createApiSamplePrompt.js

@@ -1,10 +1,10 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 function getSampleTypesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleType',
-        message: i18n(`lib.prompts.createApiSamplePrompt.selectApiSampleApp`),
+        message: lib.prompts.createApiSamplePrompt.selectApiSampleApp,
         choices: choices.map(choice => ({
             name: `${choice.name} - ${choice.description}`,
             value: choice.id,
@@ -15,7 +15,7 @@ function getSampleTypesPrompt(choices) {
                     resolve(true);
                 }
                 else {
-                    reject(i18n(`lib.prompts.createApiSamplePrompt.errors.apiSampleAppRequired`));
+                    reject(lib.prompts.createApiSamplePrompt.errors.apiSampleAppRequired);
                 }
             });
         },
@@ -25,7 +25,7 @@ function getLanguagesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleLanguage',
-        message: i18n(`lib.prompts.createApiSamplePrompt.selectLanguage`),
+        message: lib.prompts.createApiSamplePrompt.selectLanguage,
         choices: choices.map(choice => ({
             name: choice,
             value: choice,
@@ -35,7 +35,7 @@ function getLanguagesPrompt(choices) {
                 if (input && input.length > 0) {
                     resolve(true);
                 }
-                reject(i18n(`lib.prompts.createApiSamplePrompt.errors.languageRequired`));
+                reject(lib.prompts.createApiSamplePrompt.errors.languageRequired);
             });
         },
     };

package/lib/prompts/createDeveloperTestAccountConfigPrompt.js

@@ -94,7 +94,16 @@ export async function createDeveloperTestAccountConfigPrompt(args = {}, supportF
             },
         ],
     });
-    if (useDefaultAccountLevelsPromptResult.useDefaultAccountLevels === 'manual') {
+    if (useDefaultAccountLevelsPromptResult.useDefaultAccountLevels === 'default') {
+        accountLevelsArray = [
+            { hub: 'MARKETING', tier: AccountTiers.ENTERPRISE },
+            { hub: 'OPS', tier: AccountTiers.ENTERPRISE },
+            { hub: 'SERVICE', tier: AccountTiers.ENTERPRISE },
+            { hub: 'SALES', tier: AccountTiers.ENTERPRISE },
+            { hub: 'CONTENT', tier: AccountTiers.ENTERPRISE },
+        ];
+    }
+    else {
         const accountLevelsPromptResult = await promptUser({
             name: 'testAccountLevels',
             message: lib.prompts.createDeveloperTestAccountConfigPrompt.tiersPrompt,

package/lib/prompts/createFunctionPrompt.js

@@ -1,33 +1,33 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 const FUNCTIONS_FOLDER_PROMPT = {
     name: 'functionsFolder',
-    message: i18n(`lib.prompts.createFunctionPrompt.enterFolder`),
+    message: lib.prompts.createFunctionPrompt.enterFolder,
     validate(val) {
         if (typeof val !== 'string') {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.invalid`);
+            return lib.prompts.createFunctionPrompt.errors.invalid;
         }
         else if (!val.length) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.blank`);
+            return lib.prompts.createFunctionPrompt.errors.blank;
         }
         else if (val.indexOf(' ') >= 0) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.space`);
+            return lib.prompts.createFunctionPrompt.errors.space;
         }
         return true;
     },
 };
 const FUNCTION_FILENAME_PROMPT = {
     name: 'filename',
-    message: i18n(`lib.prompts.createFunctionPrompt.enterFilename`),
+    message: lib.prompts.createFunctionPrompt.enterFilename,
     validate(val) {
         if (typeof val !== 'string') {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.invalid`);
+            return lib.prompts.createFunctionPrompt.errors.invalid;
         }
         else if (!val.length) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.blank`);
+            return lib.prompts.createFunctionPrompt.errors.blank;
         }
         else if (val.indexOf(' ') >= 0) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.space`);
+            return lib.prompts.createFunctionPrompt.errors.space;
         }
         return true;
     },
@@ -35,22 +35,22 @@ const FUNCTION_FILENAME_PROMPT = {
 const ENDPOINT_METHOD_PROMPT = {
     type: 'list',
     name: 'endpointMethod',
-    message: i18n(`lib.prompts.createFunctionPrompt.selectEndpointMethod`),
+    message: lib.prompts.createFunctionPrompt.selectEndpointMethod,
     default: 'GET',
     choices: ['DELETE', 'GET', 'PATCH', 'POST', 'PUT'],
 };
 const ENDPOINT_PATH_PROMPT = {
     name: 'endpointPath',
-    message: i18n(`lib.prompts.createFunctionPrompt.enterEndpointPath`),
+    message: lib.prompts.createFunctionPrompt.enterEndpointPath,
     validate(val) {
         if (typeof val !== 'string') {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.invalid`);
+            return lib.prompts.createFunctionPrompt.errors.invalid;
         }
         else if (!val.length) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.blank`);
+            return lib.prompts.createFunctionPrompt.errors.blank;
         }
         else if (val.indexOf(' ') >= 0) {
-            return i18n(`lib.prompts.createFunctionPrompt.errors.space`);
+            return lib.prompts.createFunctionPrompt.errors.space;
         }
         return true;
     },

package/lib/prompts/createModulePrompt.js

@@ -1,14 +1,14 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 const MODULE_LABEL_PROMPT = {
     name: 'moduleLabel',
-    message: i18n(`lib.prompts.createModulePrompt.enterLabel`),
+    message: lib.prompts.createModulePrompt.enterLabel,
     validate(val) {
         if (typeof val !== 'string') {
-            return i18n(`lib.prompts.createModulePrompt.errors.invalidLabel`);
+            return lib.prompts.createModulePrompt.errors.invalidLabel;
         }
         else if (!val.length) {
-            return i18n(`lib.prompts.createModulePrompt.errors.labelRequired`);
+            return lib.prompts.createModulePrompt.errors.labelRequired;
         }
         return true;
     },
@@ -16,13 +16,13 @@ const MODULE_LABEL_PROMPT = {
 const REACT_TYPE_PROMPT = {
     type: 'confirm',
     name: 'reactType',
-    message: i18n(`lib.prompts.createModulePrompt.selectReactType`),
+    message: lib.prompts.createModulePrompt.selectReactType,
     default: false,
 };
 const CONTENT_TYPES_PROMPT = {
     type: 'checkbox',
     name: 'contentTypes',
-    message: i18n(`lib.prompts.createModulePrompt.selectContentType`),
+    message: lib.prompts.createModulePrompt.selectContentType,
     choices: [
         { name: 'Any', value: 'ANY', checked: true },
         { name: 'Landing page', value: 'LANDING_PAGE' },
@@ -42,20 +42,20 @@ const CONTENT_TYPES_PROMPT = {
             if (input.length > 0) {
                 resolve(true);
             }
-            reject(i18n(`lib.prompts.createModulePrompt.errors.contentTypeRequired`));
+            reject(lib.prompts.createModulePrompt.errors.contentTypeRequired);
         });
     },
 };
 const GLOBAL_PROMPT = {
     type: 'confirm',
     name: 'global',
-    message: i18n(`lib.prompts.createModulePrompt.confirmGlobal`),
+    message: lib.prompts.createModulePrompt.confirmGlobal,
     default: false,
 };
 const AVAILABLE_FOR_NEW_CONTENT = {
     type: 'confirm',
     name: 'availableForNewContent',
-    message: i18n(`lib.prompts.createModulePrompt.availableForNewContent`),
+    message: lib.prompts.createModulePrompt.availableForNewContent,
     default: true,
 };
 export function createModulePrompt(commandArgs = {}) {

package/lib/prompts/createTemplatePrompt.js

@@ -1,5 +1,5 @@
 import { promptUser } from './promptUtils.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 const templateTypeChoices = [
     { name: 'page', value: 'page-template' },
     { name: 'email', value: 'email-template' },
@@ -13,7 +13,7 @@ const templateTypeChoices = [
 const TEMPLATE_TYPE_PROMPT = {
     type: 'list',
     name: 'templateType',
-    message: i18n(`lib.prompts.createTemplatePrompt.selectTemplate`),
+    message: lib.prompts.createTemplatePrompt.selectTemplate,
     default: 'page',
     choices: templateTypeChoices,
 };

package/lib/prompts/downloadProjectPrompt.js

@@ -2,16 +2,16 @@ import { promptUser } from './promptUtils.js';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../errorHandlers/index.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 async function createProjectsList(accountId) {
     try {
         if (accountId) {
             const { data: projects } = await fetchProjects(accountId);
             return projects.results;
         }
-        logger.error(i18n(`lib.prompts.downloadProjectPrompt.errors.accountIdRequired`));
+        uiLogger.error(lib.prompts.downloadProjectPrompt.errors.accountIdRequired);
         process.exit(EXIT_CODES.ERROR);
     }
     catch (e) {
@@ -28,11 +28,8 @@ export async function downloadProjectPrompt(promptOptions) {
             message: () => {
                 return promptOptions.project &&
                     !projectsList.find(p => p.name === promptOptions.name)
-                    ? i18n(`lib.prompts.downloadProjectPrompt.errors.projectNotFound`, {
-                        projectName: promptOptions.project,
-                        accountId: accountId || '',
-                    })
-                    : i18n(`lib.prompts.downloadProjectPrompt.selectProject`);
+                    ? lib.prompts.downloadProjectPrompt.errors.projectNotFound(promptOptions.project, accountId || 0)
+                    : lib.prompts.downloadProjectPrompt.selectProject;
             },
             when: !promptOptions.project ||
                 !projectsList.find(p => p.name === promptOptions.project),

package/lib/prompts/installAppPrompt.d.ts

@@ -1,7 +1,2 @@
-export declare function installAppBrowserPrompt(installUrl: string, isReinstall?: boolean, staticAuthInstallOptions?: {
-    testingAccountId: number;
-    projectAccountId: number;
-    projectName: string;
-    appUid: string;
-}): Promise<void>;
+export declare function installAppBrowserPrompt(installUrl: string, isReinstall?: boolean): Promise<void>;
 export declare function installAppAutoPrompt(): Promise<boolean>;

package/lib/prompts/installAppPrompt.js

@@ -3,7 +3,7 @@ import { promptUser } from './promptUtils.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { lib } from '../../lang/en.js';
 import { uiLogger } from '../ui/logger.js';
-export async function installAppBrowserPrompt(installUrl, isReinstall = false, staticAuthInstallOptions) {
+export async function installAppBrowserPrompt(installUrl, isReinstall = false) {
     uiLogger.log('');
     if (isReinstall) {
         uiLogger.log(lib.prompts.installAppPrompt.reinstallExplanation);
@@ -11,11 +11,6 @@ export async function installAppBrowserPrompt(installUrl, isReinstall = false, s
     else {
         uiLogger.log(lib.prompts.installAppPrompt.explanation);
     }
-    if (staticAuthInstallOptions) {
-        const { testingAccountId, projectAccountId, projectName, appUid } = staticAuthInstallOptions;
-        uiLogger.log(lib.prompts.installAppPrompt.staticAuthExplanation(projectAccountId, testingAccountId, projectName, appUid));
-        uiLogger.log('');
-    }
     const { shouldOpenBrowser } = await promptUser({
         name: 'shouldOpenBrowser',
         type: 'confirm',

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,13 +60,19 @@ 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',
-            message: lib.prompts.projectAddPrompt.selectType,
+            message: lib.prompts.projectAddPrompt.selectFeatures,
             when: !selectedFeatures && selectedComponents.length === 0,
             type: 'checkbox',
             choices: components,
+            pageSize: components.length,
         },
     ]);
     if (!result.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;