@hubspot/cli 7.7.35-experimental.0 → 7.8.0-beta.0

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -1,51 +1,66 @@
 import { WebSocketServer } from 'ws';
 import { isPortManagerServerRunning, requestPorts, } from '@hubspot/local-dev-lib/portManager';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../ui/logger.js';
 import { addLocalStateFlag } from '@hubspot/local-dev-lib/config';
-import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG_LOCAL_STATE_FLAGS, } from '../../constants.js';
+import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG_LOCAL_STATE_FLAGS, } from '../../constants.js';
 import { lib } from '../../../lang/en.js';
 import { removeAnsiCodes } from '../../ui/removeAnsiCodes.js';
+import { isDeployWebsocketMessage, isViewedWelcomeScreenWebsocketMessage, isUploadWebsocketMessage, } from './localDevWebsocketServerUtils.js';
+import pkg from '../../../package.json' with { type: 'json' };
 const SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
+const LOCAL_DEV_WEBSOCKET_SERVER_VERSION = 1;
 const LOG_PREFIX = '[LocalDevWebsocketServer]';
+const DOMAINS = ['hubspot.com', 'hubspotqa.com'];
+const SUBDOMAINS = ['local', 'app', 'app-na2', 'app-na3', 'app-ap1', 'app-eu1'];
+const ALLOWED_ORIGIN_REGEX = new RegExp(`^https://(${SUBDOMAINS.join('|')})\\.(${DOMAINS.join('|')})$`);
 class LocalDevWebsocketServer {
     server;
     debug;
     localDevProcess;
-    ALLOWED_ORIGINS = [
-        'https://app.hubspot.com',
-        'https://app.hubspotqa.com',
-        'https://local.hubspot.com',
-        'https://local.hubspotqa.com',
-    ];
     constructor(localDevProcess, debug) {
         this.localDevProcess = localDevProcess;
         this.debug = debug;
     }
     log(message) {
         if (this.debug) {
-            logger.log(LOG_PREFIX, message);
+            uiLogger.log(`${LOG_PREFIX} ${message}`);
         }
     }
     logError(message) {
         if (this.debug) {
-            logger.error(LOG_PREFIX, message);
+            uiLogger.error(`${LOG_PREFIX} ${message}`);
         }
     }
     sendMessage(websocket, message) {
         websocket.send(JSON.stringify(message));
     }
     async handleUpload(websocket) {
-        const uploadSuccess = await this.localDevProcess.uploadProject();
-        if (uploadSuccess) {
-            this.sendMessage(websocket, {
-                type: LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPLOAD_SUCCESS,
-            });
-        }
-        else {
-            this.sendMessage(websocket, {
-                type: LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPLOAD_FAILURE,
-            });
-        }
+        const { uploadSuccess, buildSuccess, deploySuccess, deployId } = await this.localDevProcess.uploadProject();
+        this.sendMessage(websocket, {
+            type: uploadSuccess
+                ? LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPLOAD_SUCCESS
+                : LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPLOAD_FAILURE,
+            data: {
+                latestBuild: this.localDevProcess.projectData.latestBuild,
+                deployedBuild: this.localDevProcess.projectData.deployedBuild,
+                buildSuccess,
+                deploySuccess,
+                deployId,
+            },
+        });
+    }
+    async handleDeploy(websocket, force) {
+        const { success, deployId } = await this.localDevProcess.deployLatestBuild(force);
+        this.sendMessage(websocket, {
+            type: success
+                ? LOCAL_DEV_UI_MESSAGE_SEND_TYPES.DEPLOY_SUCCESS
+                : LOCAL_DEV_UI_MESSAGE_SEND_TYPES.DEPLOY_FAILURE,
+            data: {
+                latestBuild: this.localDevProcess.projectData.latestBuild,
+                deployedBuild: this.localDevProcess.projectData.deployedBuild,
+                latestDeployId: deployId,
+            },
+        });
     }
     setupMessageHandlers(websocket) {
         websocket.on('message', data => {
@@ -55,15 +70,17 @@ class LocalDevWebsocketServer {
                     this.logError(lib.LocalDevWebsocketServer.errors.missingTypeField(data.toString()));
                     return;
                 }
-                switch (message.type) {
-                    case LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.UPLOAD:
-                        this.handleUpload(websocket);
-                        break;
-                    case LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.VIEWED_WELCOME_SCREEN:
-                        addLocalStateFlag(CONFIG_LOCAL_STATE_FLAGS.LOCAL_DEV_UI_WELCOME);
-                        break;
-                    default:
-                        this.logError(lib.LocalDevWebsocketServer.errors.unknownMessageType(message.type));
+                if (isUploadWebsocketMessage(message)) {
+                    this.handleUpload(websocket);
+                }
+                else if (isDeployWebsocketMessage(message)) {
+                    this.handleDeploy(websocket, message.data.force);
+                }
+                else if (isViewedWelcomeScreenWebsocketMessage(message)) {
+                    addLocalStateFlag(CONFIG_LOCAL_STATE_FLAGS.LOCAL_DEV_UI_WELCOME);
+                }
+                else {
+                    this.logError(lib.LocalDevWebsocketServer.errors.unknownMessageType(message.type));
                 }
             }
             catch (e) {
@@ -71,12 +88,23 @@ class LocalDevWebsocketServer {
             }
         });
     }
+    sendCliMetadata(websocket) {
+        this.sendMessage(websocket, {
+            type: LOCAL_DEV_UI_MESSAGE_SEND_TYPES.CLI_METADATA,
+            data: {
+                cliVersion: pkg.version,
+                localDevWebsocketServerVersion: LOCAL_DEV_WEBSOCKET_SERVER_VERSION,
+            },
+        });
+    }
     sendProjectData(websocket) {
         this.sendMessage(websocket, {
             type: LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPDATE_PROJECT_DATA,
             data: {
-                projectName: this.localDevProcess.projectName,
-                projectId: this.localDevProcess.projectId,
+                projectName: this.localDevProcess.projectData.name,
+                projectId: this.localDevProcess.projectData.id,
+                latestBuild: this.localDevProcess.projectData.latestBuild,
+                deployedBuild: this.localDevProcess.projectData.deployedBuild,
                 targetProjectAccountId: this.localDevProcess.targetProjectAccountId,
                 targetTestingAccountId: this.localDevProcess.targetTestingAccountId,
             },
@@ -135,10 +163,11 @@ class LocalDevWebsocketServer {
         this.log(lib.LocalDevWebsocketServer.logs.startup(port));
         this.server.on('connection', (ws, req) => {
             const origin = req.headers.origin;
-            if (!origin || !this.ALLOWED_ORIGINS.includes(origin)) {
+            if (!origin || !ALLOWED_ORIGIN_REGEX.test(origin)) {
                 ws.close(1008, lib.LocalDevWebsocketServer.errors.originNotAllowed(origin));
                 return;
             }
+            this.sendCliMetadata(ws);
             this.sendProjectData(ws);
             this.setupMessageHandlers(ws);
             this.setupStateListeners(ws);

package/lib/projects/localDev/helpers/project.d.ts

@@ -10,3 +10,4 @@ export declare function compareLocalProjectToDeployed(projectConfig: ProjectConf
 export declare function isDeployedProjectUpToDateWithLocal(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
 }, profile?: string): Promise<boolean>;
+export declare function checkAndInstallDependencies(): Promise<void>;

package/lib/projects/localDev/helpers/project.js

@@ -18,8 +18,9 @@ import SpinniesManager from '../../../ui/SpinniesManager.js';
 import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { handleProjectUpload } from '../../upload.js';
 import { pollProjectBuildAndDeploy } from '../../pollProjectBuildAndDeploy.js';
-import { logError } from '../../../errorHandlers/index.js';
+import { debugError, logError } from '../../../errorHandlers/index.js';
 import { ApiErrorContext } from '../../../errorHandlers/index.js';
+import { getProjectPackageJsonLocations, hasMissingPackages, installPackages, } from '../../../dependencyManagement.js';
 // Prompt the user to create a new project if one doesn't exist on their target account
 export async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps) {
     // Create the project without prompting if this is a newly created sandbox
@@ -163,6 +164,10 @@ export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountI
         }, { profile });
         return isDeepEqual(localProjectNodes, deployedProjectNodes, ['localDev']);
     }
+    catch (err) {
+        debugError(err);
+        return false;
+    }
     finally {
         // Clean up temporary directory
         if (tempDir && (await fs.pathExists(tempDir))) {
@@ -170,3 +175,39 @@ export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountI
         }
     }
 }
+export async function checkAndInstallDependencies() {
+    SpinniesManager.init();
+    uiLogger.log('');
+    SpinniesManager.add('checkingDependencies', {
+        text: lib.localDevHelpers.project.checkAndInstallDependencies
+            .checkingDependencies,
+    });
+    try {
+        const installLocations = await getProjectPackageJsonLocations();
+        const locationsToInstall = [];
+        for (const location of installLocations) {
+            if (await hasMissingPackages(location)) {
+                locationsToInstall.push(location);
+            }
+        }
+        if (locationsToInstall.length > 0) {
+            SpinniesManager.remove('checkingDependencies');
+            await installPackages({ installLocations: locationsToInstall });
+        }
+        else {
+            SpinniesManager.succeed('checkingDependencies', {
+                text: lib.localDevHelpers.project.checkAndInstallDependencies
+                    .dependenciesUpToDate,
+            });
+        }
+        uiLogger.log('');
+    }
+    catch (e) {
+        logError(e);
+        SpinniesManager.fail('checkingDependencies', {
+            text: lib.localDevHelpers.project.checkAndInstallDependencies
+                .dependenciesFailure,
+        });
+        process.exit(EXIT_CODES.ERROR);
+    }
+}

package/lib/projects/localDev/localDevWebsocketServerUtils.d.ts

@@ -0,0 +1,4 @@
+import { LocalDevDeployWebsocketMessage, LocalDevWebsocketMessage } from '../../../types/LocalDev.js';
+export declare function isUploadWebsocketMessage(message: LocalDevWebsocketMessage): boolean;
+export declare function isDeployWebsocketMessage(message: LocalDevWebsocketMessage): message is LocalDevDeployWebsocketMessage;
+export declare function isViewedWelcomeScreenWebsocketMessage(message: LocalDevWebsocketMessage): boolean;

package/lib/projects/localDev/localDevWebsocketServerUtils.js

@@ -0,0 +1,10 @@
+import { LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES } from '../../constants.js';
+export function isUploadWebsocketMessage(message) {
+    return message.type === LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.UPLOAD;
+}
+export function isDeployWebsocketMessage(message) {
+    return message.type === LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.DEPLOY;
+}
+export function isViewedWelcomeScreenWebsocketMessage(message) {
+    return (message.type === LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES.VIEWED_WELCOME_SCREEN);
+}

package/lib/projects/platformVersion.d.ts

@@ -1 +1 @@
-export declare function useV3Api(platformVersion?: string | null): boolean;
+export declare function isV2Project(platformVersion?: string | null): boolean;

package/lib/projects/platformVersion.js

@@ -1,4 +1,4 @@
-export function useV3Api(platformVersion) {
+export function isV2Project(platformVersion) {
     if (!platformVersion || typeof platformVersion !== 'string') {
         return false;
     }

package/lib/projects/pollProjectBuildAndDeploy.js

@@ -278,10 +278,10 @@ export async function displayWarnLogs(accountId, projectName, taskId, isDeploy =
         }
     }
     if (result && result.logs) {
-        const logLength = result.logs.length;
-        result.logs.forEach((log, i) => {
-            uiLogger.warn(log.message);
-            if (i < logLength - 1) {
+        const dedupedLogs = result.logs.reduce((acc, log) => acc.add(log.message), new Set());
+        Array.from(dedupedLogs).forEach((log, i) => {
+            uiLogger.warn(log);
+            if (i < dedupedLogs.size - 1) {
                 uiLogger.log('');
             }
         });

package/lib/projects/structure.js

@@ -1,14 +1,14 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { walk } from '@hubspot/local-dev-lib/fs';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { logError } from '../errorHandlers/index.js';
 import { ComponentTypes, } from '../../types/Projects.js';
-import { IR_COMPONENT_TYPES } from '../constants.js';
+import { IR_COMPONENT_TYPES, LEGACY_PRIVATE_APP_FILE, LEGACY_PUBLIC_APP_FILE, THEME_FILE, } from '../constants.js';
 export const CONFIG_FILES = {
-    [ComponentTypes.PrivateApp]: 'app.json',
-    [ComponentTypes.PublicApp]: 'public-app.json',
-    [ComponentTypes.HublTheme]: 'theme.json',
+    [ComponentTypes.PrivateApp]: LEGACY_PRIVATE_APP_FILE,
+    [ComponentTypes.PublicApp]: LEGACY_PUBLIC_APP_FILE,
+    [ComponentTypes.HublTheme]: THEME_FILE,
 };
 export function getComponentTypeFromConfigFile(configFile) {
     let key;
@@ -27,7 +27,7 @@ export function loadConfigFile(configPath) {
             return parsedConfig;
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     return null;

package/lib/projects/upload.d.ts

@@ -18,7 +18,7 @@ type HandleProjectUploadArg<T> = {
     profile?: string;
 };
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
-export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
+export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig, projectDir: string): Promise<void>;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
 export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -12,9 +12,11 @@ import util from 'node:util';
 import { lib } from '../../lang/en.js';
 import { ensureProjectExists } from './ensureProjectExists.js';
 import { uiLogger } from '../ui/logger.js';
-import { useV3Api } from './platformVersion.js';
+import { isV2Project } from './platformVersion.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import ProjectValidationError from '../errors/ProjectValidationError.js';
+import { walk } from '@hubspot/local-dev-lib/fs';
+import { LEGACY_CONFIG_FILES } from '../constants.js';
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager.init({});
     const accountIdentifier = uiAccountDescription(accountId) || `${accountId}`;
@@ -45,7 +47,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
 export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     try {
-        validateSourceDirectory(srcDir, projectConfig);
+        await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);
@@ -70,8 +72,7 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
                 intermediateRepresentation = await handleTranslate(projectDir, projectConfig, accountId, skipValidation, profile);
             }
             catch (e) {
-                logError(e);
-                process.exit(EXIT_CODES.ERROR);
+                resolve({ uploadError: e });
             }
         }
         await ensureProjectExists(accountId, projectConfig.name, {
@@ -105,15 +106,23 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
     archive.finalize();
     return result;
 }
-export function validateSourceDirectory(srcDir, projectConfig) {
-    const filenames = fs.readdirSync(srcDir);
-    if (!filenames || filenames.length === 0) {
+export async function validateSourceDirectory(srcDir, projectConfig, projectDir) {
+    const projectFilePaths = await walk(srcDir, ['node_modules']);
+    if (!projectFilePaths || projectFilePaths.length === 0) {
         throw new ProjectValidationError(lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
     }
+    if (isV2Project(projectConfig.platformVersion)) {
+        projectFilePaths.forEach(filePath => {
+            const filename = path.basename(filePath);
+            if (LEGACY_CONFIG_FILES.includes(filename)) {
+                uiLogger.warn(lib.projectUpload.handleProjectUpload.legacyFileDetected(path.relative(projectDir, filePath), projectConfig.platformVersion));
+            }
+        });
+    }
 }
 export async function validateNoHSMetaMismatch(srcDir, projectConfig) {
     const hasHsMetaFiles = await projectContainsHsMetaFiles(srcDir);
-    if (!useV3Api(projectConfig.platformVersion) && hasHsMetaFiles) {
+    if (!isV2Project(projectConfig.platformVersion) && hasHsMetaFiles) {
         throw new ProjectValidationError(lib.projectUpload.wrongPlatformVersionMetaFiles);
     }
 }

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;
     },