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

package/lang/en.lyaml

@@ -2,7 +2,7 @@ en:
   commands:
     generalErrors:
       updateNotify:
-        notifyTitle: "Update available"
+        notifyTitle: "CLI update available"
         cmsUpdateNotification: "{{#bold}}The CMS CLI is now the HubSpot CLI{{/bold}}\n\nTo upgrade, uninstall {{#bold}}{{ packageName }}{{/bold}}\nand then run {{ updateCommand }}"
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
@@ -801,7 +801,7 @@ en:
             uploadFailed: "Failed to upload file \"{{ filePath }}\" to \"{{ remotePath }}\""
             deleteFileFailed: "Failed to delete file \"{{ remotePath }}\""
             deleteFolderFailed: "Failed to delete folder \"{{ remotePath }}\""
-            v3ApiError: "{{ command }} is not supported for platform version '{{ platformVersion}}', use {{ newCommand }} instead to develop locally. {{ linkToDocs }}"
+            v2ApiError: "{{ command }} is not supported for platform version '{{ platformVersion}}', use {{ newCommand }} instead to develop locally. {{ linkToDocs }}"
         download:
           describe: "Download your project files from HubSpot."
           examples:

package/lib/__tests__/buildAccount.test.js

@@ -102,7 +102,7 @@ describe('lib/buildAccount', () => {
             expect(result).toBe('test-account-with-new-name');
         });
     });
-    describe('createDeveloperTestAccountV3()', () => {
+    describe('createDeveloperTestAccountV2()', () => {
         const parentAccountId = 123456;
         const mockDeveoperTestAccountConfig = {
             accountName: 'Developer Test Account',
@@ -120,7 +120,7 @@ describe('lib/buildAccount', () => {
             });
         });
         it('should create a developer test account successfully', async () => {
-            const result = await buildAccount.createDeveloperTestAccountV3(parentAccountId, mockDeveoperTestAccountConfig);
+            const result = await buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
             expect(result).toEqual({
                 accountName: mockDeveoperTestAccountConfig.accountName,
                 accountId: 123456,

package/lib/buildAccount.d.ts

@@ -4,12 +4,12 @@ import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { SandboxResponse, V2Sandbox } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes.js';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
-export declare function createDeveloperTestAccountV3(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
+export declare function createDeveloperTestAccountV2(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
     accountName: string;
     accountId?: number;
     personalAccessKey?: string;
 }>;
-export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV3?: boolean): Promise<number>;
+export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV2?: boolean): Promise<number>;
 type SandboxAccount = SandboxResponse & {
     name: string;
 };

package/lib/buildAccount.js

@@ -52,7 +52,7 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
     uiLogger.log('');
     return validName;
 }
-export async function createDeveloperTestAccountV3(parentAccountId, testAccountConfig) {
+export async function createDeveloperTestAccountV2(parentAccountId, testAccountConfig) {
     const result = {
         accountName: testAccountConfig.accountName,
     };
@@ -66,7 +66,7 @@ export async function createDeveloperTestAccountV3(parentAccountId, testAccountC
     }
     catch (err) {
         debugError(err);
-        throw new Error(lib.buildAccount.createDeveloperTestAccountV3.syncFailure);
+        throw new Error(lib.buildAccount.createDeveloperTestAccountV2.syncFailure);
     }
     // HACK: The status endpoint sometimes returns an early success status.
     // Sleep for an extra 5 seconds to make sure the sync is actually complete.
@@ -78,11 +78,11 @@ export async function createDeveloperTestAccountV3(parentAccountId, testAccountC
     }
     catch (err) {
         debugError(err);
-        throw new Error(lib.buildAccount.createDeveloperTestAccountV3.pakFailure);
+        throw new Error(lib.buildAccount.createDeveloperTestAccountV2.pakFailure);
     }
     return result;
 }
-export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV3 = false) {
+export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV2 = false) {
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     let testAccountConfig = {
@@ -91,7 +91,7 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     if (!parentAccountId) {
         throw new Error(lib.developerTestAccount.create.loading.fail(''));
     }
-    if (useV3) {
+    if (useV2) {
         testAccountConfig = await createDeveloperTestAccountConfigPrompt({
             name: testAccountConfig.accountName,
             description: 'Test Account created by the HubSpot CLI',
@@ -107,8 +107,8 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     let developerTestAccountId;
     let developerTestAccountPersonalAccessKey;
     try {
-        if (useV3) {
-            const result = await createDeveloperTestAccountV3(parentAccountId, testAccountConfig);
+        if (useV2) {
+            const result = await createDeveloperTestAccountV2(parentAccountId, testAccountConfig);
             developerTestAccountId = result.accountId;
             developerTestAccountPersonalAccessKey = result.personalAccessKey;
         }

package/lib/configMigrate.js

@@ -3,6 +3,37 @@ import { ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/c
 import { promptUser } from './prompts/promptUtils.js';
 import { lib } from '../lang/en.js';
 import { uiLogger } from './ui/logger.js';
+async function promptRenameOrOmitAccount(accountName, accountId) {
+    const { shouldRename } = await promptUser({
+        name: 'shouldRename',
+        type: 'confirm',
+        message: lib.configMigrate.handleAccountNameConflicts.prompts.renameOrOmitAccountPrompt(accountName, accountId),
+    });
+    return shouldRename;
+}
+async function promptNewAccountName(account, globalConfig, renamedAccounts) {
+    const { newAccountName } = await promptUser({
+        name: 'newAccountName',
+        type: 'input',
+        default: `${account.name}_${account.portalId}`,
+        message: lib.configMigrate.handleAccountNameConflicts.prompts.newAccountNamePrompt(account.name, account.portalId),
+        validate: value => {
+            if (!value) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.nameRequired;
+            }
+            if (value === account.name) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.sameName;
+            }
+            const existingAccount = globalConfig.accounts.some(acc => acc.name === value);
+            const renamedAccount = renamedAccounts.some(acc => acc.name === value);
+            if (existingAccount || renamedAccount) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.nameAlreadyInConfig(value);
+            }
+            return true;
+        },
+    });
+    return newAccountName;
+}
 export async function handleMigration(deprecatedConfigPath, hideWarning) {
     if (!hideWarning) {
         uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
@@ -47,20 +78,67 @@ async function handleMergeConfigProperties(globalConfig, deprecatedConfig, force
     }
     return initialConfig;
 }
+async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force) {
+    if (!deprecatedConfig.portals?.length || !globalConfig.accounts?.length) {
+        return deprecatedConfig;
+    }
+    const accountsWithConflictsToRemove = new Set();
+    const renamedAccounts = [];
+    const accountsNotYetInGlobal = deprecatedConfig.portals.filter(portal => portal.portalId &&
+        !globalConfig.accounts.some(acc => acc.accountId === portal.portalId));
+    const accountsWithConflicts = accountsNotYetInGlobal.filter(localAccount => globalConfig.accounts.some(globalAccount => globalAccount.name === localAccount.name));
+    if (accountsWithConflicts.length > 0) {
+        uiLogger.log('');
+        uiLogger.warn(lib.configMigrate.handleAccountNameConflicts.warnings.accountNameConflictMessage(accountsWithConflicts.length));
+        if (force) {
+            const renameDetails = [];
+            for (const account of accountsWithConflicts) {
+                accountsWithConflictsToRemove.add(account);
+                const newAccountName = `${account.name}_${account.portalId}`;
+                renamedAccounts.push({
+                    ...account,
+                    name: newAccountName,
+                });
+                renameDetails.push(`  "${account.name}" → "${newAccountName}" (ID: ${account.portalId})`);
+            }
+            uiLogger.warn(lib.configMigrate.handleAccountNameConflicts.warnings.forceFlagDetected(accountsWithConflicts.length, renameDetails.join('\n')));
+            uiLogger.log('');
+        }
+        else {
+            for (const account of accountsWithConflicts) {
+                uiLogger.log('');
+                const shouldRename = await promptRenameOrOmitAccount(account.name, account.portalId);
+                accountsWithConflictsToRemove.add(account);
+                if (shouldRename) {
+                    const newAccountName = await promptNewAccountName(account, globalConfig, renamedAccounts);
+                    renamedAccounts.push({
+                        ...account,
+                        name: newAccountName,
+                    });
+                }
+            }
+        }
+        deprecatedConfig.portals.push(...renamedAccounts);
+    }
+    const cleanedPortals = deprecatedConfig.portals.filter(portal => !accountsWithConflictsToRemove.has(portal));
+    return { ...deprecatedConfig, portals: cleanedPortals };
+}
 export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
     if (!hideWarning) {
         uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
         uiLogger.log('');
     }
     uiLogger.log(lib.configMigrate.handleMerge.description(ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
-    uiLogger.log('');
-    const { shouldMergeConfigs } = await promptUser({
-        name: 'shouldMergeConfigs',
-        type: 'confirm',
-        message: lib.configMigrate.handleMerge.confirmPrompt,
-    });
-    if (!shouldMergeConfigs) {
-        return false;
+    if (!force) {
+        uiLogger.log('');
+        const { shouldMergeConfigs } = await promptUser({
+            name: 'shouldMergeConfigs',
+            type: 'confirm',
+            message: lib.configMigrate.handleMerge.confirmPrompt,
+        });
+        if (shouldMergeConfigs === false) {
+            return true; // exit with "true" so the user is shown a success message instead of an error
+        }
     }
     const deprecatedConfig = getDeprecatedConfig(deprecatedConfigPath);
     const globalConfig = getGlobalConfig();
@@ -68,7 +146,8 @@ export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
         return true;
     }
     const mergedConfig = await handleMergeConfigProperties(globalConfig, deprecatedConfig, force);
-    const { skippedAccountIds } = mergeExistingConfigs(mergedConfig, deprecatedConfig);
+    const cleanedDeprecatedConfig = await handleAccountNameConflicts(mergedConfig, deprecatedConfig, force);
+    const { skippedAccountIds } = mergeExistingConfigs(mergedConfig, cleanedDeprecatedConfig);
     if (skippedAccountIds.length > 0) {
         uiLogger.log('');
         uiLogger.log(lib.configMigrate.handleMerge.skippedExistingAccounts(skippedAccountIds));

package/lib/constants.d.ts

@@ -95,16 +95,21 @@ export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
     UPDATE_PROJECT_DATA: string;
     UPDATE_UPLOAD_WARNINGS: string;
     CLI_METADATA: string;
+    DEV_SERVERS_STARTED: string;
 };
 export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
     UPLOAD: string;
     DEPLOY: string;
     VIEWED_WELCOME_SCREEN: string;
+    APP_INSTALL_SUCCESS: string;
+    APP_INSTALL_INITIATED: string;
+    APP_INSTALL_FAILURE: string;
 };
 export declare const APP_INSTALLATION_STATES: {
     readonly NOT_INSTALLED: "NOT_INSTALLED";
     readonly INSTALLED: "INSTALLED";
     readonly INSTALLED_WITH_OUTDATED_SCOPES: "INSTALLED_WITH_OUTDATED_SCOPES";
+    readonly UNKNOWN: "UNKNOWN";
 };
 export declare const staticAuth = "static";
 export declare const oAuth = "oauth";
@@ -118,7 +123,11 @@ export declare const GET_STARTED_OPTIONS: {
 export declare const LOCAL_DEV_SERVER_MESSAGE_TYPES: {
     readonly INITIAL: "INITIAL";
     readonly WEBSOCKET_SERVER_CONNECTED: "WEBSOCKET_SERVER_CONNECTED";
+    readonly STATIC_AUTH_APP_INSTALL_SUCCESS: "APP_INSTALL_SUCCESS";
+    readonly STATIC_AUTH_APP_INSTALL_FAILURE: "APP_INSTALL_FAILURE";
+    readonly OAUTH_APP_INSTALL_INITIATED: "APP_INSTALL_INITIATED";
 };
+export declare const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = "local-dev-ui-websocket-server";
 export declare const CONFIG_LOCAL_STATE_FLAGS: {
     readonly LOCAL_DEV_UI_WELCOME: "LOCAL_DEV_UI_WELCOME";
 };

package/lib/constants.js

@@ -87,16 +87,21 @@ export const LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
     UPDATE_PROJECT_DATA: 'server:updateProjectData',
     UPDATE_UPLOAD_WARNINGS: 'server:updateUploadWarnings',
     CLI_METADATA: 'server:cliMetadata',
+    DEV_SERVERS_STARTED: 'server:devServersStarted',
 };
 export const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
     UPLOAD: 'client:upload',
     DEPLOY: 'client:deploy',
     VIEWED_WELCOME_SCREEN: 'client:viewedWelcomeScreen',
+    APP_INSTALL_SUCCESS: 'client:installSuccess',
+    APP_INSTALL_INITIATED: 'client:installInitiated',
+    APP_INSTALL_FAILURE: 'client:installFailure',
 };
 export const APP_INSTALLATION_STATES = {
     NOT_INSTALLED: 'NOT_INSTALLED',
     INSTALLED: 'INSTALLED',
     INSTALLED_WITH_OUTDATED_SCOPES: 'INSTALLED_WITH_OUTDATED_SCOPES',
+    UNKNOWN: 'UNKNOWN',
 };
 export const staticAuth = 'static';
 export const oAuth = 'oauth';
@@ -110,7 +115,11 @@ export const GET_STARTED_OPTIONS = {
 export const LOCAL_DEV_SERVER_MESSAGE_TYPES = {
     INITIAL: 'INITIAL',
     WEBSOCKET_SERVER_CONNECTED: 'WEBSOCKET_SERVER_CONNECTED',
+    STATIC_AUTH_APP_INSTALL_SUCCESS: 'APP_INSTALL_SUCCESS',
+    STATIC_AUTH_APP_INSTALL_FAILURE: 'APP_INSTALL_FAILURE',
+    OAUTH_APP_INSTALL_INITIATED: 'APP_INSTALL_INITIATED',
 };
+export const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
 export const CONFIG_LOCAL_STATE_FLAGS = {
     LOCAL_DEV_UI_WELCOME: 'LOCAL_DEV_UI_WELCOME',
 };

package/lib/generateSelectors.js

@@ -11,7 +11,7 @@ export function getMaxFieldsDepth() {
 export function findFieldsJsonPath(basePath) {
     const _path = basePath.endsWith('/') ? basePath.slice(0, -1) : basePath;
     if (!fs.existsSync(_path)) {
-        uiLogger.error(commands.theme.subcommands.generateSelectors.errors.invalidPath(basePath));
+        uiLogger.error(commands.cms.subcommands.theme.subcommands.generateSelectors.errors.invalidPath(basePath));
         process.exit(EXIT_CODES.ERROR);
     }
     const files = fs.readdirSync(_path);

package/lib/middleware/autoUpdateMiddleware.d.ts

@@ -1 +1,2 @@
-export declare function autoUpdateCLI(): Promise<void>;
+import { Arguments } from 'yargs';
+export declare function autoUpdateCLI(argv: Arguments): Promise<void>;

package/lib/middleware/autoUpdateMiddleware.js

@@ -7,6 +7,7 @@ import { lib } from '../../lang/en.js';
 import { DEFAULT_PACKAGE_MANAGER, isGloballyInstalled, executeInstall, } from '../npm.js';
 import { debugError } from '../errorHandlers/index.js';
 import { uiLogger } from '../ui/logger.js';
+import { isTargetedCommand } from './commandTargetingUtils.js';
 // Default behavior is to check for notifications at most once per day
 // update-notifier stores the last checked date in the user's home directory
 const notifier = updateNotifier({
@@ -33,13 +34,22 @@ function updateNotification() {
         },
     });
 }
-export async function autoUpdateCLI() {
+const SKIP_AUTO_UPDATE_COMMANDS = {
+    config: {
+        set: true,
+    },
+};
+const preventAutoUpdateForCommand = (commandParts) => {
+    return isTargetedCommand(commandParts, SKIP_AUTO_UPDATE_COMMANDS);
+};
+export async function autoUpdateCLI(argv) {
     // This lets us back to default update-notifier behavior
     let showManualInstallHelp = true;
     if (notifier &&
         notifier.update &&
         !process.env.SKIP_HUBSPOT_CLI_AUTO_UPDATES &&
-        isConfigFlagEnabled('allowAutoUpdates')) {
+        isConfigFlagEnabled('allowAutoUpdates') &&
+        !preventAutoUpdateForCommand(argv._)) {
         // Ignore all update notifications if the current version is a pre-release
         if (!notifier.update.current.includes('-')) {
             // Attempt auto-update if the current version is not the latest version

package/lib/middleware/commandTargetingUtils.d.ts

@@ -3,6 +3,6 @@ type TargetCommandMap = {
 };
 export declare function isTargetedCommand(commandParts: (string | number)[], targetCommandMap: TargetCommandMap): boolean;
 export declare function shouldLoadConfigForCommand(commandParts: (string | number)[]): boolean;
-export declare function shouldRunAccountValidationForCommand(commandParts: (string | number)[]): boolean;
 export declare function shouldRunConfigValidationForCommand(commandParts: (string | number)[]): boolean;
+export declare function shouldRunAccountValidationForCommand(commandParts: (string | number)[]): boolean;
 export {};

package/lib/middleware/commandTargetingUtils.js

@@ -33,6 +33,19 @@ export function shouldLoadConfigForCommand(commandParts) {
     return (!isGlobalConfigMigration &&
         !isTargetedCommand(commandParts, SKIP_CONFIG_LOADING_COMMANDS));
 }
+const SKIP_CONFIG_VALIDATION_COMMANDS = {
+    auth: true,
+    mcp: {
+        setup: true,
+        start: true,
+    },
+};
+// Returns true if the command requires a valid config file to be present
+// Should only run if config has been loaded
+export function shouldRunConfigValidationForCommand(commandParts) {
+    return (shouldLoadConfigForCommand(commandParts) &&
+        !isTargetedCommand(commandParts, SKIP_CONFIG_VALIDATION_COMMANDS));
+}
 const accountsSubCommands = {
     auth: true,
     clean: true,
@@ -45,12 +58,6 @@ const sandboxesSubCommands = {
     delete: true,
 };
 const SKIP_ACCOUNT_VALIDATION_COMMANDS = {
-    init: true,
-    auth: true,
-    mcp: {
-        setup: true,
-        start: true,
-    },
     account: accountsSubCommands,
     accounts: accountsSubCommands,
     sandbox: sandboxesSubCommands,
@@ -58,21 +65,10 @@ const SKIP_ACCOUNT_VALIDATION_COMMANDS = {
     config: {
         migrate: true,
     },
-    feedback: true,
 };
 // Returns true if the command requires a valid account to be set in the config
+// Should only run if config has been loaded and validated
 export function shouldRunAccountValidationForCommand(commandParts) {
-    return !isTargetedCommand(commandParts, SKIP_ACCOUNT_VALIDATION_COMMANDS);
-}
-const SKIP_CONFIG_VALIDATION_COMMANDS = {
-    init: true,
-    auth: true,
-    mcp: {
-        setup: true,
-        start: true,
-    },
-};
-// Returns true if the command requires a valid config file to be present
-export function shouldRunConfigValidationForCommand(commandParts) {
-    return !isTargetedCommand(commandParts, SKIP_CONFIG_VALIDATION_COMMANDS);
+    return (shouldRunConfigValidationForCommand(commandParts) &&
+        !isTargetedCommand(commandParts, SKIP_ACCOUNT_VALIDATION_COMMANDS));
 }