@hubspot/cli 7.10.0-beta.2 → 7.10.0-experimental.0

package/commands/sandbox/delete.js

@@ -1,8 +1,7 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
-import { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountEnvironment, removeAccountFromConfig, setConfigAccountAsDefault, getAllConfigAccounts, getConfigAccountIfExists, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -36,17 +35,20 @@ async function handler(args) {
             process.exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = getAccountId(userProvidedAccount || accountPrompt.account);
-    if (!sandboxAccountId) {
+    const accountIdentifier = userProvidedAccount || accountPrompt.account;
+    const sandboxAccount = getConfigAccountIfExists(accountIdentifier);
+    if (!sandboxAccount) {
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
         process.exit(EXIT_CODES.ERROR);
     }
-    const isDefaultAccount = sandboxAccountId === getAccountId();
-    const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
+    const sandboxAccountId = sandboxAccount.accountId;
+    const defaultAccount = getConfigDefaultAccountIfExists();
+    const isDefaultAccount = sandboxAccountId === defaultAccount?.accountId;
+    const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getConfigAccountEnvironment(sandboxAccountId)));
     let parentAccountId;
-    const accountsList = getConfigAccounts() || [];
+    const accountsList = getAllConfigAccounts() || [];
     for (const portal of accountsList) {
-        if (getAccountIdentifier(portal) === sandboxAccountId) {
+        if (portal.accountId === sandboxAccountId) {
             if (portal.parentAccountId) {
                 parentAccountId = portal.parentAccountId;
             }
@@ -56,7 +58,8 @@ async function handler(args) {
                     uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                     process.exit(EXIT_CODES.ERROR);
                 }
-                parentAccountId = getAccountId(parentAccountPrompt.account);
+                const parentAccount = getConfigAccountIfExists(parentAccountPrompt.account);
+                parentAccountId = parentAccount?.accountId;
             }
             else {
                 uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
@@ -67,9 +70,9 @@ async function handler(args) {
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
     const command = uiAuthCommandReference({
         accountId: parentAccountId || undefined,
-        qa: getEnv(sandboxAccountId) === 'qa',
+        qa: getConfigAccountEnvironment(sandboxAccountId) === 'qa',
     });
-    if (parentAccountId && !getAccountId(parentAccountId)) {
+    if (parentAccountId && !getConfigAccountIfExists(parentAccountId)) {
         uiLogger.log('');
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
         uiLogger.log('');
@@ -99,14 +102,14 @@ async function handler(args) {
             ? commands.sandbox.subcommands.delete.success.deleteDefault(userProvidedAccount || accountPrompt.account, sandboxAccountId)
             : commands.sandbox.subcommands.delete.success.delete(userProvidedAccount || accountPrompt.account, sandboxAccountId));
         uiLogger.log('');
-        const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
-        if (promptDefaultAccount && !force) {
+        removeAccountFromConfig(sandboxAccountId);
+        if (isDefaultAccount && !force) {
             const newDefaultAccount = await selectAccountFromConfig();
-            updateDefaultAccount(newDefaultAccount);
+            setConfigAccountAsDefault(newDefaultAccount);
         }
         else if (isDefaultAccount && force) {
             // If force is specified, skip prompt and set the parent account id as the default account
-            updateDefaultAccount(parentAccountId);
+            setConfigAccountAsDefault(parentAccountId);
         }
         process.exit(EXIT_CODES.SUCCESS);
     }
@@ -135,14 +138,14 @@ async function handler(args) {
             uiLogger.log('');
             uiLogger.warn(commands.sandbox.subcommands.delete.failure.objectNotFound(sandboxAccountId));
             uiLogger.log('');
-            const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
-            if (promptDefaultAccount && !force) {
+            removeAccountFromConfig(sandboxAccountId);
+            if (isDefaultAccount && !force) {
                 const newDefaultAccount = await selectAccountFromConfig();
-                updateDefaultAccount(newDefaultAccount);
+                setConfigAccountAsDefault(newDefaultAccount);
             }
-            else {
+            else if (isDefaultAccount) {
                 // If force is specified, skip prompt and set the parent account id as the default account
-                updateDefaultAccount(parentAccountId);
+                setConfigAccountAsDefault(parentAccountId);
             }
             process.exit(EXIT_CODES.SUCCESS);
         }

package/commands/testAccount/create.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.js';
@@ -89,7 +89,7 @@ async function buildTestAccountConfig(args) {
 async function handler(args) {
     const { derivedAccountId, formatOutputAsJson } = args;
     trackCommandUsage('test-account-create', {}, derivedAccountId);
-    const env = getValidEnv(getEnv(derivedAccountId));
+    const env = getValidEnv(getConfigAccountEnvironment(derivedAccountId));
     const testAccountConfig = await buildTestAccountConfig(args);
     const resultJson = {};
     SpinniesManager.init({

package/commands/testAccount/delete.js

@@ -4,7 +4,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
-import { deleteAccount, getAccountConfig, getAccountId, getConfigPath, loadConfig, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { removeAccountFromConfig, getConfigAccountById, getConfigAccountIfExists, setConfigAccountAsDefault, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { debugError } from '../../lib/errorHandlers/index.js';
 const command = 'delete [test-account]';
@@ -64,12 +64,12 @@ async function deleteTestAccountFromConfig(testAccountId, parentAccountName, acc
         // If the account isn't in the local config then it wasn't auth'd on the local machine
         if (account && account.name && account.accountType) {
             // If the deleted test account was the default account, replace the default account with the parent account
-            loadConfig(getConfigPath()); // Get updated version of the config
-            const defaultAccountId = getAccountId(); // We need to get the current default accountId before delete the test account
-            await deleteAccount(account.name);
+            const defaultAccount = getConfigDefaultAccountIfExists();
+            const defaultAccountId = defaultAccount?.accountId;
+            removeAccountFromConfig(account.accountId);
             uiLogger.success(commands.testAccount.delete.success.testAccountDeletedFromConfig(testAccountId));
             if (testAccountId === defaultAccountId) {
-                updateDefaultAccount(parentAccountName);
+                setConfigAccountAsDefault(parentAccountName);
                 uiLogger.info(commands.testAccount.delete.info.replaceDefaultAccount(testAccountId, parentAccountName));
             }
         }
@@ -84,12 +84,12 @@ async function validateTestAccountConfigs(testAccountId) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const testAccountConfig = getAccountConfig(testAccountId);
+    const testAccountConfig = getConfigAccountById(testAccountId);
     if (!testAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const parentAccountConfig = getAccountConfig(testAccountConfig.parentAccountId);
+    const parentAccountConfig = getConfigAccountById(testAccountConfig.parentAccountId);
     if (!parentAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
@@ -103,7 +103,8 @@ async function handler(args) {
     let testAccountIdToDelete = 0;
     // See if the account exists
     if (testAccount) {
-        const accountId = getAccountId(testAccount);
+        const account = getConfigAccountIfExists(testAccount);
+        const accountId = account?.accountId || null;
         await validateTestAccountConfigs(accountId);
         if (accountId) {
             testAccountIdToDelete = accountId;

package/lang/en.d.ts

@@ -1,12 +1,13 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 export declare const commands: {
     generalErrors: {
         srcIsProject: (src: string, command: string) => string;
         handleDeprecatedEnvVariables: {
             portalEnvVarDeprecated: string;
         };
-        loadConfigMiddleware: {
-            configFileExists: (configPath: string) => string;
+        validateConfigMiddleware: {
+            missingConfigFile: string;
+            configValidationFailed: (errors: string[]) => string;
         };
     };
     getStarted: {
@@ -86,12 +87,11 @@ export declare const commands: {
             list: {
                 accounts: string;
                 defaultAccountTitle: string;
-                defaultAccount: (account: string) => string;
+                currentResolvedDefaultAccount: (accountId: number) => string;
                 describe: string;
                 configPath: (configPath: string) => string;
                 overrideFilePathTitle: string;
                 overrideFilePath: (overrideFilePath: string) => string;
-                overrideAccount: (account: string) => string;
                 labels: {
                     accountId: string;
                     authType: string;
@@ -1752,6 +1752,32 @@ export declare const commands: {
             noPackageJsonInProject: (projectName: string) => string;
             packageManagerNotInstalled: (packageManager: string) => string;
         };
+        lint: {
+            help: {
+                describe: string;
+                lintProjectExample: string;
+                lintProjectWithInstallExample: string;
+                lintProjectWithoutInstallExample: string;
+                installMissingDeps: string;
+            };
+            loading: {
+                checking: string;
+                creatingConfig: string;
+                linting: string;
+            };
+            noProjectConfig: string;
+            failedToReadPackageJson: (packageJsonPath: string) => string;
+            installLintPackagesPrompt: (directories: string[], missingPackages: string[]) => string;
+            skippingDirectoriesWarning: (directories: string[]) => string;
+            deprecatedEslintConfigWarning: (details: {
+                path: string;
+                files: string[];
+            }[]) => string;
+            createEslintConfigPrompt: (directories: string[]) => string;
+            eslintConfigCreated: (configPath: string) => string;
+            failedToCreateEslintConfig: (configPath: string) => string;
+            eslintConfigRequired: string;
+        };
         updateDeps: {
             help: {
                 describe: string;
@@ -2818,6 +2844,11 @@ export declare const lib: {
             startError: (message: string) => string;
             fileChangeError: (message: string) => string;
         };
+        devSession: {
+            registrationError: (message: string) => string;
+            heartbeatError: (message: string) => string;
+            deletionError: (message: string) => string;
+        };
     };
     AppDevModeInterface: {
         autoInstallStaticAuthApp: {
@@ -3237,6 +3268,9 @@ export declare const lib: {
             skippedExistingAccounts: (accountIds: (string | number)[]) => string;
             success: string;
         };
+        errors: {
+            archive: (deprecatedConfigPath: string) => string;
+        };
     };
     prompts: {
         promptUtils: {
@@ -3249,7 +3283,7 @@ export declare const lib: {
             promptMessage: string;
         };
         confirmImportDataPrompt: {
-            message: (dataFileNames: string[], cliAccount: CLIAccount | null) => string;
+            message: (dataFileNames: string[], cliAccount: HubSpotConfigAccount | null) => string;
         };
         importDataTestAccountSelectPrompt: {
             errors: {

package/lang/en.js

@@ -7,15 +7,15 @@ import { uiAccountDescription, uiBetaTag, uiCommandReference, uiLink, UI_COLORS,
 import { getProjectDetailUrl, getProjectSettingsUrl, getLocalDevUiUrl, } from '../lib/projects/urls.js';
 import { getProductUpdatesUrl } from '../lib/links.js';
 import { APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, PROJECT_CONFIG_FILE, PROJECT_WITH_APP, LEGACY_PUBLIC_APP_FILE, } from '../lib/constants.js';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 export const commands = {
     generalErrors: {
         srcIsProject: (src, command) => `"${src}" is in a project folder. Did you mean "hs project ${command}"?`,
         handleDeprecatedEnvVariables: {
             portalEnvVarDeprecated: 'The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.',
         },
-        loadConfigMiddleware: {
-            configFileExists: (configPath) => `A configuration file already exists at ${configPath}. To specify a new configuration file, delete the existing one and try again.`,
+        validateConfigMiddleware: {
+            missingConfigFile: `A HubSpot config file is required to run this command, but none was found. To create a new config file and authenticate a HubSpot account, run ${uiCommandReference('hs account auth')}`,
+            configValidationFailed: (errors) => `Your HubSpot config file is invalid. Please fix the following errors:\n - ${errors.join('\n- ')}`,
         },
     },
     getStarted: {
@@ -95,12 +95,11 @@ export const commands = {
             list: {
                 accounts: `${chalk.bold('Accounts')}:`,
                 defaultAccountTitle: `${chalk.bold('Default Account')}`,
-                defaultAccount: (account) => `Account: ${account}`,
+                currentResolvedDefaultAccount: (accountId) => `Account: ${uiAccountDescription(accountId)}`,
                 describe: 'List names of accounts defined in config.',
                 configPath: (configPath) => `Source: ${configPath}`,
                 overrideFilePathTitle: `${chalk.bold('Default Account Override')}`,
                 overrideFilePath: (overrideFilePath) => `Source: ${overrideFilePath}`,
-                overrideAccount: (account) => `Account: ${account}`,
                 labels: {
                     accountId: 'Account ID',
                     authType: 'Auth Type',
@@ -1552,7 +1551,7 @@ export const commands = {
                 noBuilds: 'Deploy error: no builds for this project were found.',
                 noBuildId: 'You must specify a build to deploy',
                 projectNotFound: (accountId, projectName) => `The project ${chalk.bold(projectName)} does not exist in account ${uiAccountDescription(accountId)}. Run ${uiCommandReference('hs project upload')} to upload your project files to HubSpot.`,
-                buildIdDoesNotExist: (accountId, buildId, projectName) => `Build ${buildId} does not exist for project ${chalk.bold(projectName)}. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
+                buildIdDoesNotExist: (accountId, buildId, projectName) => `Build ${buildId} does not exist for project ${chalk.bold(projectName)}. Run ${uiCommandReference('hs project list-builds')} to view existing builds for this project.`,
                 buildAlreadyDeployed: (accountId, buildId, projectName) => `Build ${buildId} is already deployed. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
                 deployContainsRemovals: (componentName) => `- This deploy would remove the ${chalk.bold(componentName)} component. To proceed, run the deploy command with the ${uiCommandReference('--force')} flag`,
                 deployBlockedHeader: "This build couldn't be deployed because it will be too disruptive for existing users. Fix the following issues and try again:",
@@ -1768,6 +1767,39 @@ export const commands = {
             noPackageJsonInProject: (projectName) => `No dependencies to install. The project ${projectName} folder might be missing component or subcomponent files. ${uiLink('Learn how to create a project from scratch', 'https://developers.hubspot.com/docs/apps/developer-platform/build-apps/create-an-app#customize-a-new-project-using-the-cli')}`,
             packageManagerNotInstalled: (packageManager) => `This command depends on ${packageManager}, install ${uiLink(packageManager, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm')}`,
         },
+        lint: {
+            help: {
+                describe: 'Lint the UI Extensions components in your project.',
+                lintProjectExample: 'Lint the UI Extensions components in your project.',
+                lintProjectWithInstallExample: 'Lint the UI Extensions components in the project and automatically install missing dependencies.',
+                lintProjectWithoutInstallExample: 'Lint the UI Extensions components in the project without installing missing dependencies.',
+                installMissingDeps: 'Automatically install missing linting dependencies for the UI Extensions components in the project without prompting.',
+            },
+            loading: {
+                checking: 'Checking lint packages and configuration…',
+                creatingConfig: 'Creating ESLint configuration files…',
+                linting: 'Linting…',
+            },
+            noProjectConfig: 'No project detected. Run this command from a project directory.',
+            failedToReadPackageJson: (packageJsonPath) => `Failed to read package.json at ${packageJsonPath}`,
+            installLintPackagesPrompt: (directories, missingPackages) => {
+                const uniquePackages = Array.from(new Set(missingPackages)).sort();
+                return `The dependencies required for linting are missing or outdated.\n\nDependencies:\n${uniquePackages.map(p => `  - ${p}`).join('\n')}\n\n${directories.length === 1 ? 'Directory' : 'Directories'}:\n${directories.map(d => `  - ${d}`).join('\n')}\n\nWould you like to install the required dependencies?`;
+            },
+            skippingDirectoriesWarning: (directories) => `Skipping linting for the following ${directories.length === 1 ? 'directory' : 'directories'}:\n${directories.map(d => `  - ${d}`).join('\n')}`,
+            deprecatedEslintConfigWarning: (details) => {
+                const dirCount = details.length;
+                const header = `Deprecated ESLint configuration file${dirCount === 1 ? '' : 's'} detected in the following ${dirCount === 1 ? 'directory' : 'directories'}:`;
+                const dirList = details
+                    .map(d => `  - ${d.path}: ${d.files.join(', ')}`)
+                    .join('\n');
+                return `${header}\n${dirList}\n`;
+            },
+            createEslintConfigPrompt: (directories) => `ESLint configuration file not found in the following ${directories.length === 1 ? 'directory' : 'directories'}:\n${directories.map(d => `  - ${d}`).join('\n')}\n\nWould you like to set up the required ESLint configuration?`,
+            eslintConfigCreated: (configPath) => `ESLint configuration created at ${configPath}`,
+            failedToCreateEslintConfig: (configPath) => `Failed to create ESLint configuration at ${configPath}`,
+            eslintConfigRequired: 'ESLint configuration is required to run the lint command. Run the command again to create the configuration.',
+        },
         updateDeps: {
             help: {
                 describe: 'Update the npm dependencies for your project, or update specific dependencies in a subcomponent of a project.',
@@ -2834,6 +2866,11 @@ export const lib = {
             startError: (message) => `Failed to start local dev server: ${message}`,
             fileChangeError: (message) => `Failed to notify local dev server of file change: ${message}`,
         },
+        devSession: {
+            registrationError: (message) => `Failed to register dev session: ${message}`,
+            heartbeatError: (message) => `Failed to send dev session heartbeat: ${message}`,
+            deletionError: (message) => `Failed to delete dev session: ${message}`,
+        },
     },
     AppDevModeInterface: {
         autoInstallStaticAuthApp: {
@@ -3253,6 +3290,9 @@ export const lib = {
             skippedExistingAccounts: (accountIds) => `The following accounts were not merged because they already exist in the global config:${accountIds.map(id => `\n- ${uiAccountDescription(Number(id))}`).join('')}`,
             success: 'Your deprecated config file has been successfully merged with the global config file.',
         },
+        errors: {
+            archive: (deprecatedConfigPath) => `The config migration was successful, but an error occurred when archiving config file at ${deprecatedConfigPath}. You may need to manually delete or rename this config file.`,
+        },
     },
     prompts: {
         promptUtils: {
@@ -3265,7 +3305,7 @@ export const lib = {
             promptMessage: '[--file-path] Select the JSON file that will be used to import your data.',
         },
         confirmImportDataPrompt: {
-            message: (dataFileNames, cliAccount) => `You are importing [${dataFileNames.join(', ')}] into ${uiAccountDescription(getAccountIdentifier(cliAccount))}. Continue?`,
+            message: (dataFileNames, cliAccount) => `You are importing [${dataFileNames.join(', ')}] into ${uiAccountDescription(cliAccount?.accountId)}. Continue?`,
         },
         importDataTestAccountSelectPrompt: {
             errors: {
@@ -3617,7 +3657,7 @@ export const lib = {
             },
             failure: {
                 syncTypeFetch: 'Unable to fetch available sandbox sync types. Please try again.',
-                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                invalidUser: (accountName, parentAccountName) => `Couldn't sync sandbox ${chalk.bold(accountName)} because your account has been removed from parent account${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 syncInProgress: (url) => `Couldn't run the sync because there's another sync in progress. Wait for the current sync to finish and then try again. To check the sync status, visit the sync activity log: ${url}.`,
                 notSuperAdmin: (accountId) => `Couldn't run the sync because you are not a super admin in ${uiAccountDescription(accountId)}. Ask the account owner for super admin access to the sandbox.`,
                 objectNotFound: (accountId) => `Couldn't sync the sandbox because ${uiAccountDescription(accountId)} may have been deleted through the UI. Run ${uiCommandReference('hs sandbox delete')} to remove this account from the config.`,
@@ -3745,7 +3785,7 @@ export const lib = {
     },
     validation: {
         accountNotFoundInConfig: (userProvidedAccount) => `The account "${userProvidedAccount}" could not be found in the config`,
-        accountRequired: 'An account needs to be supplied either via "--account" or through setting a "defaultPortal"',
+        accountRequired: 'An account needs to be supplied either via "--account" or through setting a "defaultAccount"',
         userProvidedAccount: 'Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.',
         accountNotConfigured: (accountId) => `The account ${uiAccountDescription(accountId)} has not been configured`,
         invalidAuthType: (authType, accountId, configPath, validValues) => `Invalid "authType" value "${authType}" for account "${uiAccountDescription(accountId)}" in config file: ${configPath}. Valid values are ${validValues}.`,

package/lib/__tests__/buildAccount.test.js

@@ -1,11 +1,12 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
-import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists, updateConfigAccount, } from '@hubspot/local-dev-lib/config';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { createSandbox, createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { personalAccessKeyPrompt } from '../prompts/personalAccessKeyPrompt.js';
 import { cliAccountNamePrompt } from '../prompts/accountNamePrompt.js';
 import * as buildAccount from '../buildAccount.js';
+import { poll } from '../polling.js';
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
@@ -14,6 +15,7 @@ vi.mock('../ui/logger.js');
 vi.mock('../errorHandlers/index.js');
 vi.mock('../prompts/personalAccessKeyPrompt');
 vi.mock('../prompts/accountNamePrompt');
+vi.mock('../polling.js');
 vi.mock('../ui/SpinniesManager', () => ({
     default: {
         init: vi.fn(),
@@ -25,17 +27,16 @@ vi.mock('../ui/SpinniesManager', () => ({
 const mockedPersonalAccessKeyPrompt = personalAccessKeyPrompt;
 const mockedGetAccessToken = getAccessToken;
 const mockedUpdateConfigWithAccessToken = updateConfigWithAccessToken;
-const mockedAccountNameExistsInConfig = accountNameExistsInConfig;
-const mockedUpdateAccountConfig = updateAccountConfig;
-const mockedWriteConfig = writeConfig;
+const mockedGetConfigAccountIfExists = getConfigAccountIfExists;
+const mockedUpdateConfigAccount = updateConfigAccount;
 const mockedCliAccountNamePrompt = cliAccountNamePrompt;
-const mockedGetAccountId = getAccountId;
 const mockedCreateDeveloperTestAccount = createDeveloperTestAccount;
 const mockedFetchDeveloperTestAccountGateSyncStatus = fetchDeveloperTestAccountGateSyncStatus;
 const mockedGenerateDeveloperTestAccountPersonalAccessKey = generateDeveloperTestAccountPersonalAccessKey;
 const mockedCreateSandbox = createSandbox;
 const mockedCreateV2Sandbox = createV2Sandbox;
 const mockedGetPersonalAccessKey = getSandboxPersonalAccessKey;
+const mockedPoll = poll;
 describe('lib/buildAccount', () => {
     describe('saveAccountToConfig()', () => {
         const mockAccountConfig = {
@@ -61,9 +62,8 @@ describe('lib/buildAccount', () => {
             });
             mockedGetAccessToken.mockResolvedValue(accessToken);
             mockedUpdateConfigWithAccessToken.mockResolvedValue(mockAccountConfig);
-            mockedAccountNameExistsInConfig.mockResolvedValue(false);
-            mockedUpdateAccountConfig.mockReturnValue(undefined);
-            mockedWriteConfig.mockReturnValue(undefined);
+            mockedGetConfigAccountIfExists.mockResolvedValue(undefined);
+            mockedUpdateConfigAccount.mockReturnValue(undefined);
         });
         afterEach(() => {
             vi.clearAllMocks();
@@ -72,8 +72,7 @@ describe('lib/buildAccount', () => {
             const result = await buildAccount.saveAccountToConfig(mockAccountConfig.accountId, mockAccountConfig.name, mockAccountConfig.env, 'test-key');
             expect(mockedPersonalAccessKeyPrompt).not.toHaveBeenCalled();
             expect(mockedUpdateConfigWithAccessToken).toHaveBeenCalledWith(accessToken, 'test-key', mockAccountConfig.env);
-            expect(mockedUpdateAccountConfig).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
-            expect(mockedWriteConfig).toHaveBeenCalled();
+            expect(mockedUpdateConfigAccount).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
             expect(result).toBe(mockAccountConfig.name);
         });
         it('should prompt for personal access key if not provided', async () => {
@@ -83,8 +82,7 @@ describe('lib/buildAccount', () => {
                 account: mockAccountConfig.accountId,
             });
             expect(mockedUpdateConfigWithAccessToken).toHaveBeenCalledWith(accessToken, 'test-key', mockAccountConfig.env);
-            expect(mockedUpdateAccountConfig).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
-            expect(mockedWriteConfig).toHaveBeenCalled();
+            expect(mockedUpdateConfigAccount).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
             expect(result).toBe(mockAccountConfig.name);
         });
         it('should handle duplicate account names', async () => {
@@ -93,7 +91,7 @@ describe('lib/buildAccount', () => {
                 name: undefined,
             };
             mockedUpdateConfigWithAccessToken.mockResolvedValue(mockAccountConfigWithNoName);
-            mockedAccountNameExistsInConfig.mockResolvedValue(true);
+            mockedGetConfigAccountIfExists.mockResolvedValue({ accountId: 123 });
             mockedCliAccountNamePrompt.mockResolvedValue({
                 name: 'test-account-with-new-name',
             });
@@ -109,6 +107,7 @@ describe('lib/buildAccount', () => {
             description: 'Test Account created by the HubSpot CLI',
         };
         beforeEach(() => {
+            vi.useFakeTimers();
             mockedCreateDeveloperTestAccount.mockResolvedValue({
                 data: { id: 123456 },
             });
@@ -118,15 +117,23 @@ describe('lib/buildAccount', () => {
             mockedGenerateDeveloperTestAccountPersonalAccessKey.mockResolvedValue({
                 data: { personalAccessKey: 'test-key' },
             });
+            // Mock poll to resolve immediately with the success status
+            mockedPoll.mockResolvedValue({ status: 'SUCCESS' });
+        });
+        afterEach(() => {
+            vi.useRealTimers();
         });
         it('should create a developer test account successfully', async () => {
-            const result = await buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
+            const resultPromise = buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
+            // Fast-forward the 5 second setTimeout
+            await vi.advanceTimersByTimeAsync(5000);
+            const result = await resultPromise;
             expect(result).toEqual({
                 accountName: mockDeveoperTestAccountConfig.accountName,
                 accountId: 123456,
                 personalAccessKey: 'test-key',
             });
-        }, 10000);
+        });
     });
     describe('buildDeveloperTestAccount()', () => {
         const mockParentAccountConfig = {
@@ -146,7 +153,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateDeveloperTestAccount.mockResolvedValue({
                 data: mockDeveloperTestAccount,
             });
@@ -158,10 +164,6 @@ describe('lib/buildAccount', () => {
             const result = await buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10);
             expect(result).toEqual(mockDeveloperTestAccount.id);
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10)).rejects.toThrow();
-        });
         it('should handle API errors when creating developer test account', async () => {
             mockedCreateDeveloperTestAccount.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10)).rejects.toThrow();
@@ -192,7 +194,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateSandbox.mockResolvedValue({
                 data: { sandbox: mockSandbox, personalAccessKey: 'test-key' },
             });
@@ -216,10 +217,6 @@ describe('lib/buildAccount', () => {
                 sandbox: mockSandbox,
             });
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildSandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, mockParentAccountConfig.env)).rejects.toThrow();
-        });
         it('should handle API errors when creating sandbox', async () => {
             mockedCreateSandbox.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildSandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, mockParentAccountConfig.env, false)).rejects.toThrow();
@@ -250,7 +247,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateV2Sandbox.mockResolvedValue({
                 data: mockSandbox,
             });
@@ -271,10 +267,6 @@ describe('lib/buildAccount', () => {
             expect(result).toEqual({ sandbox: mockSandbox });
             expect(mockedGetPersonalAccessKey).toHaveBeenCalledWith(mockParentAccountConfig.accountId, mockSandbox.sandboxHubId);
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildV2Sandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, false, mockParentAccountConfig.env, false)).rejects.toThrow();
-        });
         it('should handle API errors when creating sandbox', async () => {
             mockedCreateV2Sandbox.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildV2Sandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, false, mockParentAccountConfig.env, false)).rejects.toThrow();

package/lib/__tests__/commonOpts.test.js

@@ -1,9 +1,8 @@
 import { CMS_PUBLISH_MODE, DEFAULT_CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
-import { getAndLoadConfigIfNeeded, getAccountConfig, loadConfigFromEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getConfig, getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { getCmsPublishMode } from '../commonOpts.js';
-const mockedGetAccountConfig = getAccountConfig;
-const mockedGetAndLoadConfigIfNeeded = getAndLoadConfigIfNeeded;
-const mockedLoadConfigFromEnvironment = loadConfigFromEnvironment;
+const mockedGetConfigAccountById = getConfigAccountById;
+const mockedGetConfig = getConfig;
 function buildArguments(args) {
     return {
         _: [],
@@ -42,8 +41,8 @@ describe('lib/commonOpts', () => {
         describe('cms publish mode option precedence', () => {
             describe('1. --cmsPublishMode', () => {
                 it('should return the cms publish mode specified by the command option if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         cmsPublishMode: CMS_PUBLISH_MODE.draft,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -54,9 +53,8 @@ describe('lib/commonOpts', () => {
             });
             describe('2. hubspot.config.yml -> config.accounts[x].defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the account specific config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.DEV,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -64,9 +62,8 @@ describe('lib/commonOpts', () => {
             });
             describe('3. hubspot.config.yml -> config.defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(prodAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(prodAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.PROD,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -74,7 +71,6 @@ describe('lib/commonOpts', () => {
             });
             describe('4. DEFAULT_CMS_PUBLISH_MODE', () => {
                 it('should return the defaultCmsPubishMode specified by the config if present.', () => {
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
                     expect(getCmsPublishMode(buildArguments({
                         account: 'xxxxx',
                     }))).toBe(DEFAULT_CMS_PUBLISH_MODE);