@hubspot/cli 8.2.0 → 8.2.1-experimental.1

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

@@ -3,7 +3,7 @@ import type { HSProfileVariables } from '@hubspot/project-parsing-lib/profiles';
 import { Environment } from '@hubspot/local-dev-lib/types/Accounts';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from '../../../types/Projects.js';
-import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData, LocalDevServerMessage } from '../../../types/LocalDev.js';
+import { LocalDevStateConstructorOptions, LocalDevStateListener, LocalDevActions, AppLocalDevData, LocalDevServerMessage } from '../../../types/LocalDev.js';
 declare class LocalDevState {
     private _targetProjectAccountId;
     private _targetTestingAccountId;
@@ -21,7 +21,10 @@ declare class LocalDevState {
     private _devServerMessage;
     private _uploadWarnings;
     private _devServersStarted;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, }: LocalDevStateConstructorOptions);
+    private _autoUploadEnabled;
+    private _uploadInProgress;
+    actions: LocalDevActions;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, actions, autoUploadEnabled, }: LocalDevStateConstructorOptions);
     private runListeners;
     get targetProjectAccountId(): number;
     get targetTestingAccountId(): number;
@@ -55,6 +58,10 @@ declare class LocalDevState {
     get uploadWarnings(): Set<string>;
     get devServersStarted(): boolean;
     set devServersStarted(started: boolean);
+    get autoUploadEnabled(): boolean;
+    set autoUploadEnabled(autoUploadEnabled: boolean);
+    get uploadInProgress(): boolean;
+    set uploadInProgress(inProgress: boolean);
     addUploadWarning(warning: string): void;
     clearUploadWarnings(): void;
     addListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;

package/lib/projects/localDev/LocalDevState.js

@@ -16,7 +16,10 @@ class LocalDevState {
     _devServerMessage;
     _uploadWarnings;
     _devServersStarted;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, }) {
+    _autoUploadEnabled;
+    _uploadInProgress;
+    actions;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, actions, autoUploadEnabled, }) {
         this._targetProjectAccountId = targetProjectAccountId;
         this._targetTestingAccountId = targetTestingAccountId;
         this._profile = profile;
@@ -32,6 +35,9 @@ class LocalDevState {
         this._devServerMessage = LOCAL_DEV_SERVER_MESSAGE_TYPES.INITIAL;
         this._uploadWarnings = new Set();
         this._devServersStarted = false;
+        this._autoUploadEnabled = autoUploadEnabled || false;
+        this._uploadInProgress = false;
+        this.actions = actions;
         this._listeners = {};
     }
     runListeners(key) {
@@ -115,6 +121,20 @@ class LocalDevState {
         this._devServersStarted = started;
         this.runListeners('devServersStarted');
     }
+    get autoUploadEnabled() {
+        return this._autoUploadEnabled;
+    }
+    set autoUploadEnabled(autoUploadEnabled) {
+        this._autoUploadEnabled = autoUploadEnabled;
+        this.runListeners('autoUploadEnabled');
+    }
+    get uploadInProgress() {
+        return this._uploadInProgress;
+    }
+    set uploadInProgress(inProgress) {
+        this._uploadInProgress = inProgress;
+        this.runListeners('uploadInProgress');
+    }
     addUploadWarning(warning) {
         this.uploadWarnings.add(warning);
         this.runListeners('uploadWarnings');

package/lib/projects/localDev/LocalDevWatcher.js

@@ -16,7 +16,7 @@ class LocalDevWatcher {
     }
     handleWatchEvent(filePath, event, configPaths) {
         if (configPaths.includes(filePath)) {
-            return this.localDevProcess.handleConfigFileChange();
+            return this.localDevProcess.handleConfigFileChange(filePath);
         }
         return this.localDevProcess.handleFileChange(filePath, event);
     }

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

@@ -14,6 +14,7 @@ declare class LocalDevWebsocketServer {
     private setupAppDataListener;
     private setupUploadWarningsListener;
     private setupDevServersStartedListener;
+    private setupUploadInProgressListener;
     private setupStateListeners;
     start(): Promise<void>;
     shutdown(): void;

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -1,7 +1,7 @@
 import { addLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG_LOCAL_STATE_FLAGS, LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID, } from '../../constants.js';
 import { removeAnsiCodes } from '../../ui/removeAnsiCodes.js';
-import { isDeployWebsocketMessage, isViewedWelcomeScreenWebsocketMessage, isUploadWebsocketMessage, isAppInstallFailureWebsocketMessage, isAppInstallSuccessWebsocketMessage, isAppInstallInitiatedWebsocketMessage, } from './localDevWebsocketServerUtils.js';
+import { isDeployWebsocketMessage, isViewedWelcomeScreenWebsocketMessage, isUploadWebsocketMessage, isAppInstallFailureWebsocketMessage, isAppInstallSuccessWebsocketMessage, isAppInstallInitiatedWebsocketMessage, isSetAutoUploadWebsocketMessage, } from './localDevWebsocketServerUtils.js';
 import CLIWebSocketServer from '../../CLIWebSocketServer.js';
 const LOCAL_DEV_WEBSOCKET_SERVER_VERSION = 2;
 const LOG_PREFIX = '[LocalDevWebsocketServer]';
@@ -78,6 +78,12 @@ class LocalDevWebsocketServer {
             this.handleAppInstallInitiated();
             return true;
         }
+        else if (isSetAutoUploadWebsocketMessage(message)) {
+            if (this.localDevProcess.autoUploadAvailable) {
+                this.localDevProcess.setAutoUploadEnabled(message.data.enabled);
+            }
+            return true;
+        }
         return false;
     }
     sendProjectData(websocket) {
@@ -90,6 +96,9 @@ class LocalDevWebsocketServer {
                 deployedBuild: this.localDevProcess.projectData.deployedBuild,
                 targetProjectAccountId: this.localDevProcess.targetProjectAccountId,
                 targetTestingAccountId: this.localDevProcess.targetTestingAccountId,
+                autoUploadEnabled: this.localDevProcess.autoUploadAvailable
+                    ? this.localDevProcess.autoUploadEnabled
+                    : undefined,
             },
         });
     }
@@ -143,14 +152,27 @@ class LocalDevWebsocketServer {
             this.localDevProcess.removeStateListener('devServersStarted', listener);
         });
     }
+    setupUploadInProgressListener(websocket) {
+        const listener = (uploadInProgress) => {
+            this.cliWebSocketServer.sendMessage(websocket, {
+                type: LOCAL_DEV_UI_MESSAGE_SEND_TYPES.UPLOAD_IN_PROGRESS,
+                data: { uploadInProgress },
+            });
+        };
+        this.localDevProcess.addStateListener('uploadInProgress', listener);
+        websocket.on('close', () => {
+            this.localDevProcess.removeStateListener('uploadInProgress', listener);
+        });
+    }
     setupStateListeners(websocket) {
         this.setupProjectNodesListener(websocket);
         this.setupAppDataListener(websocket);
         this.setupUploadWarningsListener(websocket);
         this.setupDevServersStartedListener(websocket);
+        this.setupUploadInProgressListener(websocket);
     }
     async start() {
-        return this.cliWebSocketServer.start({
+        await this.cliWebSocketServer.start({
             metadata: {
                 localDevWebsocketServerVersion: LOCAL_DEV_WEBSOCKET_SERVER_VERSION,
             },

package/lib/projects/localDev/UIExtensionsDevModeInterface.js

@@ -20,11 +20,13 @@ class UIExtensionsDevModeInterface {
         });
     }
     async start() {
+        const appId = Object.values(this.localDevState.appData)[0]?.id;
         return UIEDevModeInterface.start({
             accountId: this.localDevState.targetTestingAccountId,
             // @ts-expect-error TODO: reconcile types between CLI and UIE Dev Server
             projectConfig: this.localDevState.projectConfig,
             requestPorts,
+            appId,
         });
     }
     async fileChange(filePath, event) {

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

@@ -1,14 +1,8 @@
 import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Accounts';
 import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
-import { ProjectDevTargetAccountPromptResponse } from '../../../prompts/projectDevTargetAccountPrompt.js';
-export declare function confirmDefaultAccountIsTarget(accountConfig: HubSpotConfigAccount): Promise<void>;
-export declare function checkIfDefaultAccountIsSupported(accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): Promise<void>;
-export declare function checkIfParentAccountIsAuthed(accountConfig: HubSpotConfigAccount): void;
-export declare function checkIfAccountFlagIsSupported(accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): void;
-export declare function suggestRecommendedNestedAccount(accounts: HubSpotConfigAccount[], accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function createSandboxForLocalDev(accountId: number, accountConfig: HubSpotConfigAccount, env: Environment): Promise<number>;
 export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: HubSpotConfigAccount, env: Environment, useV2?: boolean): Promise<number>;
-export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<void>;
+export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<boolean>;
 export declare function hasSandboxes(account: HubSpotConfigAccount): Promise<boolean>;
 export declare function selectAccountTypePrompt(accountConfig: HubSpotConfigAccount): Promise<string | null>;

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

@@ -1,5 +1,3 @@
-import { HUBSPOT_ACCOUNT_TYPE_STRINGS } from '@hubspot/local-dev-lib/constants/config';
-import { getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
@@ -7,96 +5,15 @@ import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constant
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { uiLogger } from '../../../ui/logger.js';
 import { lib } from '../../../../lang/en.js';
-import { EXIT_CODES } from '../../../enums/exitCodes.js';
-import { confirmDefaultAccountPrompt } from '../../../prompts/projectDevTargetAccountPrompt.js';
-import { isUnifiedAccount } from '../../../accountTypes.js';
-import { isAppDeveloperAccount } from '../../../accountTypes.js';
-import { isDeveloperTestAccount } from '../../../accountTypes.js';
-import { uiAccountDescription } from '../../../ui/index.js';
-import { uiLine } from '../../../ui/index.js';
-import { selectDeveloperTestTargetAccountPrompt } from '../../../prompts/projectDevTargetAccountPrompt.js';
-import { selectSandboxTargetAccountPrompt } from '../../../prompts/projectDevTargetAccountPrompt.js';
 import { validateSandboxUsageLimits } from '../../../sandboxes.js';
 import { logError } from '../../../errorHandlers/index.js';
-import { syncSandbox } from '../../../sandboxSync.js';
-import { getAvailableSyncTypes } from '../../../sandboxes.js';
 import { hubspotAccountNamePrompt } from '../../../prompts/accountNamePrompt.js';
 import { trackCommandMetadataUsage } from '../../../usageTracking.js';
 import { validateDevTestAccountUsageLimits } from '../../../developerTestAccounts.js';
-import { buildSandbox, buildDeveloperTestAccount, saveAccountToConfig, } from '../../../buildAccount.js';
+import { buildDeveloperTestAccount, saveAccountToConfig, buildV2Sandbox, } from '../../../buildAccount.js';
 import { debugError } from '../../../errorHandlers/index.js';
 import { listPrompt } from '../../../prompts/promptUtils.js';
 import { confirmUseExistingDeveloperTestAccountPrompt } from '../../../prompts/projectDevTargetAccountPrompt.js';
-// If the user passed in the --account flag, confirm they want to use that account as
-// their target account, otherwise exit
-export async function confirmDefaultAccountIsTarget(accountConfig) {
-    if (!accountConfig.name || !accountConfig.accountType) {
-        uiLogger.error(lib.localDevHelpers.account.confirmDefaultAccountIsTarget.configError);
-        process.exit(EXIT_CODES.ERROR);
-    }
-    uiLogger.log('');
-    const useDefaultAccount = await confirmDefaultAccountPrompt(accountConfig.name, HUBSPOT_ACCOUNT_TYPE_STRINGS[accountConfig.accountType]);
-    if (!useDefaultAccount) {
-        uiLogger.log(lib.localDevHelpers.account.confirmDefaultAccountIsTarget
-            .declineDefaultAccountExplanation);
-        process.exit(EXIT_CODES.SUCCESS);
-    }
-}
-// Confirm the default account is supported for the type of apps being developed
-export async function checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps) {
-    const defaultAccountIsUnified = await isUnifiedAccount(accountConfig);
-    if (hasPublicApps &&
-        !(isAppDeveloperAccount(accountConfig) ||
-            isDeveloperTestAccount(accountConfig) ||
-            defaultAccountIsUnified)) {
-        uiLogger.error(lib.localDevHelpers.account.checkIfDefaultAccountIsSupported.publicApp);
-        process.exit(EXIT_CODES.SUCCESS);
-    }
-    else if (!hasPublicApps && isAppDeveloperAccount(accountConfig)) {
-        uiLogger.error(lib.localDevHelpers.account.checkIfDefaultAccountIsSupported.privateApp);
-        process.exit(EXIT_CODES.SUCCESS);
-    }
-}
-export function checkIfParentAccountIsAuthed(accountConfig) {
-    if (!accountConfig.parentAccountId ||
-        !getConfigAccountIfExists(accountConfig.parentAccountId)?.accountId) {
-        uiLogger.error(lib.localDevHelpers.account.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', uiAccountDescription(accountConfig.accountId)));
-        process.exit(EXIT_CODES.SUCCESS);
-    }
-}
-// Confirm the default account is a developer account if developing public apps
-export function checkIfAccountFlagIsSupported(accountConfig, hasPublicApps) {
-    if (hasPublicApps) {
-        if (!isDeveloperTestAccount(accountConfig)) {
-            uiLogger.error(lib.localDevHelpers.account.validateAccountOption
-                .invalidPublicAppAccount);
-            process.exit(EXIT_CODES.SUCCESS);
-        }
-        checkIfParentAccountIsAuthed(accountConfig);
-    }
-    else if (isAppDeveloperAccount(accountConfig)) {
-        uiLogger.error(lib.localDevHelpers.account.validateAccountOption.invalidPrivateAppAccount);
-        process.exit(EXIT_CODES.SUCCESS);
-    }
-}
-// If the user isn't using the recommended account type, prompt them to use or create one
-export async function suggestRecommendedNestedAccount(accounts, accountConfig, hasPublicApps) {
-    uiLogger.log('');
-    uiLine();
-    if (hasPublicApps) {
-        uiLogger.log(lib.localDevHelpers.account.validateAccountOption
-            .publicAppNonDeveloperTestAccountWarning);
-    }
-    else {
-        uiLogger.log(lib.localDevHelpers.account.validateAccountOption.nonSandboxWarning);
-    }
-    uiLine();
-    uiLogger.log('');
-    const targetAccountPrompt = hasPublicApps
-        ? selectDeveloperTestTargetAccountPrompt
-        : selectSandboxTargetAccountPrompt;
-    return targetAccountPrompt(accounts, accountConfig);
-}
 // Create a new sandbox and return its accountId
 export async function createSandboxForLocalDev(accountId, accountConfig, env) {
     try {
@@ -112,24 +29,20 @@ export async function createSandboxForLocalDev(accountId, accountConfig, env) {
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        throw err;
     }
     try {
         const { name } = await hubspotAccountNamePrompt({
             accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
         });
         trackCommandMetadataUsage('sandbox-create', { step: 'project-dev' }, accountId);
-        const result = await buildSandbox(name, accountConfig, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, env);
-        const targetAccountId = result.sandbox.sandboxHubId;
-        const sandboxAccountConfig = getConfigAccountById(result.sandbox.sandboxHubId);
-        const syncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
-        // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
-        await syncSandbox(sandboxAccountConfig, accountConfig, env, syncTasks, true);
-        return targetAccountId;
+        const result = await buildV2Sandbox(name, accountConfig, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, false, // syncObjectRecords
+        env);
+        return result.sandbox.sandboxHubId;
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        throw err;
     }
 }
 // Create a developer test account and return its accountId
@@ -155,7 +68,7 @@ export async function createDeveloperTestAccountForLocalDev(accountId, accountCo
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        throw err;
     }
     try {
         const { name } = await hubspotAccountNamePrompt({
@@ -163,12 +76,11 @@ export async function createDeveloperTestAccountForLocalDev(accountId, accountCo
             accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
         });
         trackCommandMetadataUsage('developer-test-account-create', { step: 'project-dev' }, accountId);
-        const result = await buildDeveloperTestAccount(name, accountConfig, env, maxTestPortals, useV2);
-        return result;
+        return await buildDeveloperTestAccount(name, accountConfig, env, maxTestPortals, useV2);
     }
     catch (err) {
         logError(err);
-        process.exit(EXIT_CODES.ERROR);
+        throw err;
     }
 }
 // Prompt user to confirm usage of an existing developer test account that is not currently in the config
@@ -176,13 +88,13 @@ export async function useExistingDevTestAccount(env, account) {
     const useExistingDevTestAcct = await confirmUseExistingDeveloperTestAccountPrompt(account);
     if (!useExistingDevTestAcct) {
         uiLogger.log('');
-        uiLogger.log(lib.localDevHelpers.account.confirmDefaultAccountIsTarget
-            .declineDefaultAccountExplanation);
+        uiLogger.log(lib.localDevHelpers.account.declineDefaultAccountExplanation);
         uiLogger.log('');
-        process.exit(EXIT_CODES.SUCCESS);
+        return false;
     }
     const devTestAcctConfigName = await saveAccountToConfig(account.id, account.accountName, env);
     uiLogger.success(lib.developerTestAccount.create.success.configFileUpdated(devTestAcctConfigName, PERSONAL_ACCESS_KEY_AUTH_METHOD.name));
+    return true;
 }
 export async function hasSandboxes(account) {
     const accountId = account.accountId;

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

@@ -1 +1 @@
-export declare function confirmLocalDevIsNotRunning(): Promise<void>;
+export declare function isLocalDevRunning(): Promise<boolean>;

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

@@ -1,17 +1,11 @@
 import { LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID } from '../../../constants.js';
-import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { getServerPortByInstanceId } from '@hubspot/local-dev-lib/portManager';
-import { uiLogger } from '../../../ui/logger.js';
-import { commands } from '../../../../lang/en.js';
-export async function confirmLocalDevIsNotRunning() {
+export async function isLocalDevRunning() {
     try {
         const existingPortInUse = await getServerPortByInstanceId(LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID);
-        if (existingPortInUse) {
-            uiLogger.error(commands.project.dev.errors.localDevAlreadyRunning);
-            process.exit(EXIT_CODES.ERROR);
-        }
+        return Boolean(existingPortInUse);
     }
-    catch (error) {
-        return;
+    catch {
+        return false;
     }
 }

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

@@ -1,16 +1,18 @@
 import { type IntermediateRepresentationNode, type IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/translate';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
-import { ProjectConfig } from '../../../../types/Projects.js';
-export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean): Promise<Project>;
-export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, sendIR?: boolean, profile?: string): Promise<Build>;
+import { LocallyChangedComponents, ProjectConfig } from '../../../../types/Projects.js';
+import { ExitFunction } from '../../../../types/Yargs.js';
+export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean, exit: ExitFunction): Promise<Project>;
+export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, exit: ExitFunction, sendIR?: boolean, profile?: string): Promise<Build>;
 export declare function compareLocalProjectToDeployed(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number | undefined, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
-}, profile?: string): Promise<void>;
+}, exit: ExitFunction, profile?: string): Promise<void>;
 export declare function getDeployedProjectNodes(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, profile?: string): Promise<{
     [key: string]: IntermediateRepresentationNode;
 }>;
-export declare function isDeployedProjectUpToDateWithLocal(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
+export declare function hasLocalComponentChanges(changed: LocallyChangedComponents): boolean;
+export declare function getLocallyChangedComponents(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
-}, profile?: string): Promise<boolean>;
+}, profile?: string): Promise<LocallyChangedComponents>;
 export declare function checkAndInstallDependencies(): Promise<void>;

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

@@ -1,28 +1,27 @@
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
-import { createProject } from '@hubspot/local-dev-lib/api/projects';
-import { downloadProject } from '@hubspot/local-dev-lib/api/projects';
+import { createProject, downloadProject, } from '@hubspot/local-dev-lib/api/projects';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { isDeepEqual } from '@hubspot/local-dev-lib/isDeepEqual';
 import { translate, } from '@hubspot/project-parsing-lib/translate';
+import { AUTO_GENERATED_COMPONENT_TYPES } from '@hubspot/project-parsing-lib/constants';
+import { mapToUserFacingType } from '@hubspot/project-parsing-lib/transform';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { PROJECT_ERROR_TYPES, PROJECT_BUILD_TEXT, PROJECT_DEPLOY_TEXT, } from '../../../constants.js';
+import { PROJECT_BUILD_TEXT, PROJECT_CONFIG_FILE, PROJECT_DEPLOY_TEXT, PROJECT_ERROR_TYPES, } from '../../../constants.js';
 import { lib } from '../../../../lang/en.js';
 import { uiLogger } from '../../../ui/logger.js';
-import { uiLine } from '../../../ui/index.js';
+import { uiAccountDescription, uiLine } from '../../../ui/index.js';
 import { confirmPrompt } from '../../../prompts/promptUtils.js';
-import { uiAccountDescription } from '../../../ui/index.js';
 import SpinniesManager from '../../../ui/SpinniesManager.js';
 import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { handleProjectUpload } from '../../upload.js';
 import { pollProjectBuildAndDeploy } from '../../pollProjectBuildAndDeploy.js';
-import { debugError, logError } from '../../../errorHandlers/index.js';
-import { ApiErrorContext } from '../../../errorHandlers/index.js';
+import { ApiErrorContext, debugError, logError, } 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) {
+export async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps, exit) {
     // Create the project without prompting if this is a newly created sandbox
     let shouldCreateProject = shouldCreateWithoutConfirmation;
     if (!shouldCreateProject) {
@@ -54,7 +53,7 @@ export async function createNewProjectForLocalDev(projectConfig, targetAccountId
             SpinniesManager.fail('createProject');
             uiLogger.log(lib.localDevHelpers.project.createNewProjectForLocalDev
                 .failedToCreateProject);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else {
@@ -62,30 +61,31 @@ export async function createNewProjectForLocalDev(projectConfig, targetAccountId
         uiLogger.log('');
         uiLogger.log(lib.localDevHelpers.project.createNewProjectForLocalDev
             .choseNotToCreateProject);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
 }
-function projectUploadCallback(accountId, projectConfig, tempFile, buildId) {
+function projectUploadCallback(accountId, projectConfig, tempFile, exit, buildId) {
     if (!buildId) {
         uiLogger.error(lib.localDevHelpers.project.createInitialBuildForNewProject.genericError);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    return pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, true);
+    return pollProjectBuildAndDeploy(accountId, projectConfig, tempFile, buildId, { silenceLogs: true });
 }
 // Create an initial build if the project was newly created in the account
 // Return the newly deployed build
-export async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIR, profile) {
+export async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, exit, sendIR, profile) {
     const { result: initialUploadResult, uploadError } = await handleProjectUpload({
         accountId: targetAccountId,
         projectConfig,
         projectDir,
-        callbackFunc: projectUploadCallback,
+        callbackFunc: (accountId, config, tempFile, buildId) => projectUploadCallback(accountId, config, tempFile, exit, buildId),
         uploadMessage: lib.localDevHelpers.project.createInitialBuildForNewProject
             .initialUploadMessage,
         forceCreate: true,
         skipValidation: true,
         sendIR,
         profile,
+        force: true,
     });
     if (uploadError) {
         if (isSpecifiedError(uploadError, {
@@ -102,7 +102,7 @@ export async function createInitialBuildForNewProject(projectConfig, projectDir,
                 projectName: projectConfig.name,
             }));
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!initialUploadResult?.succeeded) {
         let subTasks = [];
@@ -120,21 +120,21 @@ export async function createInitialBuildForNewProject(projectConfig, projectDir,
             uiLogger.error(failedSubTask.errorMessage);
         });
         uiLogger.log('');
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     return initialUploadResult.buildResult;
 }
-export async function compareLocalProjectToDeployed(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+export async function compareLocalProjectToDeployed(projectConfig, accountId, deployedBuildId, localProjectNodes, exit, profile) {
     uiLogger.log('');
     if (!deployedBuildId) {
         uiLogger.error(lib.localDevHelpers.project.compareLocalProjectToDeployed.noDeployedBuild(projectConfig.name, uiAccountDescription(accountId)));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     SpinniesManager.add('compareLocalProjectToDeployed', {
         text: lib.localDevHelpers.project.compareLocalProjectToDeployed.checking,
     });
-    const isUpToDate = await isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile);
-    if (isUpToDate) {
+    const changedComponents = await getLocallyChangedComponents(projectConfig, accountId, deployedBuildId, localProjectNodes, profile);
+    if (!hasLocalComponentChanges(changedComponents)) {
         SpinniesManager.succeed('compareLocalProjectToDeployed', {
             text: lib.localDevHelpers.project.compareLocalProjectToDeployed.upToDate,
         });
@@ -145,8 +145,10 @@ export async function compareLocalProjectToDeployed(projectConfig, accountId, de
                 .notUpToDate,
         });
         uiLogger.log('');
+        uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed.changedFiles(changedComponents));
+        uiLogger.log('');
         uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed.notUpToDateExplanation(profile));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
 }
 export async function getDeployedProjectNodes(projectConfig, accountId, deployedBuildId, profile) {
@@ -155,13 +157,29 @@ export async function getDeployedProjectNodes(projectConfig, accountId, deployed
         tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'hubspot-project-compare-'));
         const { data: zippedProject } = await downloadProject(accountId, projectConfig.name, deployedBuildId);
         await extractZipArchive(zippedProject, sanitizeFileName(projectConfig.name), tempDir, { hideLogs: true });
-        const deployedProjectSourceDir = path.join(tempDir, projectConfig.srcDir);
-        const { intermediateNodesIndexedByUid } = await translate({
+        // Read the deployed project's hsproject.json to get its srcDir
+        // Deployed projects always use "src" as the srcDir
+        const possibleProjectPaths = [
+            path.join(tempDir, PROJECT_CONFIG_FILE),
+            path.join(tempDir, sanitizeFileName(projectConfig.name), PROJECT_CONFIG_FILE),
+        ];
+        let deployedSrcDir = 'src';
+        for (const projectJsonPath of possibleProjectPaths) {
+            if (await fs.pathExists(projectJsonPath)) {
+                const deployedProjectConfig = await fs.readJson(projectJsonPath);
+                if (deployedProjectConfig.srcDir) {
+                    deployedSrcDir = deployedProjectConfig.srcDir;
+                }
+                break;
+            }
+        }
+        const deployedProjectSourceDir = path.join(tempDir, deployedSrcDir);
+        const { intermediateRepresentation } = await translate({
             projectSourceDir: deployedProjectSourceDir,
             platformVersion: projectConfig.platformVersion,
             accountId: accountId,
         }, { profile });
-        return intermediateNodesIndexedByUid;
+        return intermediateRepresentation.intermediateNodesIndexedByUid;
     }
     finally {
         if (tempDir && (await fs.pathExists(tempDir))) {
@@ -169,14 +187,47 @@ export async function getDeployedProjectNodes(projectConfig, accountId, deployed
         }
     }
 }
-export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+function filterAutoGeneratedNodes(nodes) {
+    return Object.fromEntries(Object.entries(nodes).filter(([, node]) => !AUTO_GENERATED_COMPONENT_TYPES.includes(mapToUserFacingType(node.componentType))));
+}
+export function hasLocalComponentChanges(changed) {
+    return (changed.added.length > 0 ||
+        changed.updated.length > 0 ||
+        changed.removed.length > 0);
+}
+export async function getLocallyChangedComponents(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+    const result = {
+        added: [],
+        updated: [],
+        removed: [],
+    };
     try {
         const deployedProjectNodes = await getDeployedProjectNodes(projectConfig, accountId, deployedBuildId, profile);
-        return isDeepEqual(localProjectNodes, deployedProjectNodes, ['localDev']);
+        const filteredLocal = filterAutoGeneratedNodes(localProjectNodes);
+        const filteredDeployed = filterAutoGeneratedNodes(deployedProjectNodes);
+        const allUids = new Set([
+            ...Object.keys(filteredLocal),
+            ...Object.keys(filteredDeployed),
+        ]);
+        for (const uid of allUids) {
+            const local = filteredLocal[uid];
+            const deployed = filteredDeployed[uid];
+            if (!local) {
+                result.removed.push(path.join(projectConfig.srcDir, deployed.metaFilePath));
+            }
+            else if (!deployed) {
+                result.added.push(path.join(projectConfig.srcDir, local.metaFilePath));
+            }
+            else if (!isDeepEqual(local, deployed, ['localDev', 'componentDeps'])) {
+                result.updated.push(path.join(projectConfig.srcDir, local.metaFilePath));
+            }
+        }
+        return result;
     }
     catch (err) {
         debugError(err);
-        return false;
+        uiLogger.warn(lib.localDevHelpers.project.compareLocalProjectToDeployed.unableToCompare);
+        return result;
     }
 }
 export async function checkAndInstallDependencies() {
@@ -211,6 +262,6 @@ export async function checkAndInstallDependencies() {
             text: lib.localDevHelpers.project.checkAndInstallDependencies
                 .dependenciesFailure,
         });
-        process.exit(EXIT_CODES.ERROR);
+        throw e;
     }
 }

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

@@ -1,7 +1,8 @@
-import { LocalDevDeployWebsocketMessage } from '../../../types/LocalDev.js';
+import { LocalDevDeployWebsocketMessage, LocalDevSetAutoUploadWebsocketMessage } from '../../../types/LocalDev.js';
 import { CLIWebSocketMessage } from '../../CLIWebSocketServer.js';
 export declare function isUploadWebsocketMessage(message: CLIWebSocketMessage): boolean;
 export declare function isDeployWebsocketMessage(message: CLIWebSocketMessage): message is LocalDevDeployWebsocketMessage;
+export declare function isSetAutoUploadWebsocketMessage(message: CLIWebSocketMessage): message is LocalDevSetAutoUploadWebsocketMessage;
 export declare function isViewedWelcomeScreenWebsocketMessage(message: CLIWebSocketMessage): boolean;
 export declare function isAppInstallSuccessWebsocketMessage(message: CLIWebSocketMessage): boolean;
 export declare function isAppInstallInitiatedWebsocketMessage(message: CLIWebSocketMessage): boolean;