@hubspot/cli 7.10.0 → 7.11.0-experimental.0

package/lib/sandboxes.js

@@ -1,9 +1,8 @@
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { fetchTypes } from '@hubspot/local-dev-lib/api/sandboxSync';
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
 import { uiLogger } from './ui/logger.js';
 import { lib } from '../lang/en.js';
@@ -33,9 +32,8 @@ export function getSandboxTypeAsString(accountType) {
     return 'standard';
 }
 export function getHasSandboxesByType(parentAccountConfig, type) {
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(id);
-    const accountsList = getConfigAccounts() || [];
+    const parentPortalId = parentAccountConfig.accountId;
+    const accountsList = getAllConfigAccounts();
     for (const portal of accountsList) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
@@ -49,10 +47,8 @@ export function getHasSandboxesByType(parentAccountConfig, type) {
 }
 // Fetches available sync types for a given sandbox portal
 export async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(parentId);
-    const id = getAccountIdentifier(config);
-    const portalId = getAccountId(id);
+    const parentPortalId = parentAccountConfig.accountId;
+    const portalId = config.accountId;
     if (!parentPortalId || !portalId) {
         throw new Error(lib.sandbox.sync.failure.syncTypeFetch);
     }
@@ -63,8 +59,7 @@ export async function getAvailableSyncTypes(parentAccountConfig, config) {
     return syncTypes.map(t => ({ type: t.name }));
 }
 export async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
+    const accountId = accountConfig.accountId;
     if (!accountId) {
         throw new Error(lib.sandbox.create.failure.usageLimitsFetch);
     }

package/lib/serverlessLogs.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { uiLogger } from './ui/logger.js';
 import { isHubSpotHttpError, isMissingScopeError, } from '@hubspot/local-dev-lib/errors/index';
 import { SCOPE_GROUPS, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { fetchScopeData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { outputLogs } from './ui/serverlessFunctionLogs.js';
 import { logError, ApiErrorContext } from './errorHandlers/index.js';
@@ -33,7 +33,7 @@ function handleUserInput() {
     });
 }
 async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = getConfigAccountById(accountId);
     if (!accountConfig) {
         return;
     }

package/lib/theme/__tests__/migrate.test.js

@@ -1,4 +1,5 @@
 import { getProjectThemeDetails, migrateThemes, } from '@hubspot/project-parsing-lib';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { confirmPrompt } from '../../prompts/promptUtils.js';
 import { writeProjectConfig, } from '../../projects/config.js';
 import { ensureProjectExists } from '../../projects/ensureProjectExists.js';
@@ -13,6 +14,7 @@ vi.mock('../../projects/config');
 vi.mock('../../projects/ensureProjectExists');
 vi.mock('../../projects/platformVersion');
 vi.mock('../../app/migrate');
+vi.mock('@hubspot/local-dev-lib/config');
 const mockedGetProjectThemeDetails = getProjectThemeDetails;
 const mockedMigrateThemes = migrateThemes;
 const mockedConfirmPrompt = confirmPrompt;
@@ -20,6 +22,7 @@ const mockedWriteProjectConfig = writeProjectConfig;
 const mockedEnsureProjectExists = ensureProjectExists;
 const mockedUseV2Api = isV2Project;
 const mockedFetchMigrationApps = fetchMigrationApps;
+const mockedGetConfigAccountById = getConfigAccountById;
 const ACCOUNT_ID = 123;
 const PROJECT_NAME = 'Test Project';
 const PLATFORM_VERSION = '2025.2';
@@ -31,6 +34,18 @@ const createLoadedProjectConfig = (name) => ({
 describe('lib/theme/migrate', () => {
     beforeEach(() => {
         mockedUseV2Api.mockReturnValue(false);
+        // Mock account config for the test account ID
+        mockedGetConfigAccountById.mockReturnValue({
+            accountId: ACCOUNT_ID,
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            auth: {
+                tokenInfo: {
+                    accessToken: 'test-token',
+                },
+            },
+            env: 'prod',
+        });
     });
     describe('getHasMigratableThemes', () => {
         it('should return false when no projectConfig is provided', async () => {

package/lib/ui/SpinniesManager.d.ts

@@ -17,13 +17,11 @@ declare class SpinniesManager {
     private resetState;
     setDisableOutput(disableOutput: boolean): void;
     pick(name: string): SpinnerState | undefined;
-    add(name: string, options?: Partial<SpinnerState>): SpinnerState & {
-        name: string;
-    };
-    update(name: string, options?: Partial<SpinnerState>): SpinnerState;
-    succeed(name: string, options?: Partial<SpinnerState>): SpinnerState;
-    fail(name: string, options?: Partial<SpinnerState>): SpinnerState;
-    remove(name: string): SpinnerState;
+    add(name: string, options?: Partial<SpinnerState>): void;
+    update(name: string, options?: Partial<SpinnerState>): void;
+    succeed(name: string, options?: Partial<SpinnerState>): void;
+    fail(name: string, options?: Partial<SpinnerState>): void;
+    remove(name: string): void;
     stopAll(newStatus?: (typeof VALID_STATUSES)[number]): {
         [key: string]: SpinnerState;
     };

package/lib/ui/SpinniesManager.js

@@ -10,7 +10,8 @@ The above copyright notice and this permission notice shall be included in all c
 import readline from 'readline';
 import chalk from 'chalk';
 import cliCursor from 'cli-cursor';
-import { breakText, cleanStream, colorOptions, getLinesLength, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, prefixOptions, } from './spinniesUtils.js';
+import { breakText, cleanStream, colorOptions, getLinesLength, prefixOptions, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, } from './spinniesUtils.js';
+import { uiLogger } from './logger.js';
 function safeColor(text, color) {
     const chalkFn = chalk[color];
     if (typeof chalkFn === 'function') {
@@ -74,40 +75,34 @@ class SpinniesManager {
         if (!options.text) {
             options.text = resolvedName;
         }
-        const spinnerProperties = {
+        this.spinners[resolvedName] = {
             ...colorOptions(this.options),
             succeedPrefix: this.options.succeedPrefix,
             failPrefix: this.options.failPrefix,
             status: 'spinning',
             ...purgeSpinnerOptions(options),
         };
-        this.spinners[resolvedName] = spinnerProperties;
         this.updateSpinnerState();
-        return { name: resolvedName, ...spinnerProperties };
     }
     update(name, options = {}) {
         const { status } = options;
         this.setSpinnerProperties(name, options, status);
         this.updateSpinnerState();
-        return this.spinners[name];
     }
     succeed(name, options = {}) {
         this.setSpinnerProperties(name, options, 'succeed');
         this.updateSpinnerState();
-        return this.spinners[name];
     }
     fail(name, options = {}) {
         this.setSpinnerProperties(name, options, 'fail');
         this.updateSpinnerState();
-        return this.spinners[name];
     }
     remove(name) {
         if (typeof name !== 'string') {
-            throw Error('A spinner reference name must be specified');
+            uiLogger.debug('A spinner reference name must be specified');
+            return;
         }
-        const spinner = this.spinners[name];
         delete this.spinners[name];
-        return spinner;
     }
     stopAll(newStatus = 'stopped') {
         Object.keys(this.spinners).forEach(name => {
@@ -136,10 +131,12 @@ class SpinniesManager {
     }
     setSpinnerProperties(name, options, status) {
         if (typeof name !== 'string') {
-            throw Error('A spinner reference name must be specified');
+            uiLogger.debug('A spinner reference name must be specified');
+            return;
         }
         if (!this.spinners[name]) {
-            throw Error(`No spinner initialized with name ${name}`);
+            uiLogger.debug(`No spinner initialized with name ${name}`);
+            return;
         }
         options = purgeSpinnerOptions(options);
         status = status || 'spinning';

package/lib/ui/__tests__/SpinniesManager.test.d.ts

@@ -0,0 +1 @@
+export {};