@hubspot/cli 7.7.16-experimental.1 → 7.7.16-experimental.10

package/lib/app/migrate_legacy.js

@@ -18,7 +18,7 @@ const ui_1 = require("../ui");
 const lang_1 = require("../lang");
 const accountTypes_1 = require("../accountTypes");
 const selectPublicAppForMigrationPrompt_1 = require("../prompts/selectPublicAppForMigrationPrompt");
-const createProjectPrompt_1 = require("../prompts/createProjectPrompt");
+const projectNameAndDestPrompt_1 = require("../prompts/projectNameAndDestPrompt");
 const ensureProjectExists_1 = require("../projects/ensureProjectExists");
 const usageTracking_1 = require("../usageTracking");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
@@ -58,8 +58,7 @@ async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
         (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
-    const { name: projectName, dest: projectDest } = createProjectPromptResponse;
+    const { name: projectName, dest: projectDest } = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(options);
     const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectName, {
         allowCreate: false,
         noLogs: true,

package/lib/app/urls.d.ts

@@ -2,7 +2,7 @@ import { Environment } from '@hubspot/local-dev-lib/types/Config';
 type PrivateAppInstallUrlArgs = {
     targetAccountId: number;
     env: Environment;
-    appId: string;
+    appId: number;
 };
 type PublicAppInstallUrlArgs = {
     targetAccountId: number;

package/lib/commonOpts.js

@@ -136,7 +136,7 @@ async function addCustomHelpOutput(yargs, command, describe) {
 function setLogLevel(options) {
     const { debug, networkDebug, json } = options;
     if (json) {
-        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.NONE);
+        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.ERROR);
     }
     else if (debug) {
         (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.DEBUG);

package/lib/middleware/__test__/configMiddleware.test.js

@@ -109,7 +109,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBeUndefined();
+            expect(argv.userProvidedAccount).toBeUndefined();
             expect(argv.derivedAccountId).toBe(123);
             expect(getAccountIdSpy).not.toHaveBeenCalled();
             process.env = originalEnv;
@@ -123,7 +123,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBe('test-account');
+            expect(argv.userProvidedAccount).toBe('test-account');
             expect(argv.derivedAccountId).toBe(456);
             expect(getAccountIdSpy).toHaveBeenCalledWith('test-account');
         });

package/lib/middleware/configMiddleware.js

@@ -11,6 +11,9 @@ const exitCodes_1 = require("../enums/exitCodes");
 const lang_1 = require("../lang");
 const ui_1 = require("../ui");
 const utils_1 = require("./utils");
+const parsing_1 = require("../parsing");
+const logger_2 = require("../ui/logger");
+const en_1 = require("../../lang/en");
 function handleDeprecatedEnvVariables(argv) {
     // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
     // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
@@ -29,9 +32,14 @@ function handleDeprecatedEnvVariables(argv) {
 async function injectAccountIdMiddleware(argv) {
     const { account } = argv;
     // Preserves the original --account flag for certain commands.
-    argv.providedAccountId = account;
+    argv.userProvidedAccount = account;
     if (argv.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
-        argv.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+        try {
+            argv.derivedAccountId = (0, parsing_1.parseStringToNumber)(process.env.HUBSPOT_ACCOUNT_ID);
+        }
+        catch (err) {
+            logger_2.uiLogger.error(en_1.lib.configMiddleWare.invalidAccountIdEnvironmentVariable);
+        }
     }
     else {
         argv.derivedAccountId = (0, config_1.getAccountId)(account);

package/lib/parsing.d.ts

@@ -0,0 +1 @@
+export declare function parseStringToNumber(maybeNumber: string): number;

package/lib/parsing.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStringToNumber = parseStringToNumber;
+const en_1 = require("../lang/en");
+function parseStringToNumber(maybeNumber) {
+    const result = parseInt(maybeNumber, 10);
+    if (Number.isNaN(result) || !/^-?\d+$/.test(maybeNumber)) {
+        throw new Error(en_1.lib.parsing.unableToParseStringToNumber);
+    }
+    return result;
+}

package/lib/polling.d.ts

@@ -17,5 +17,5 @@ type PollingCallback<T extends GenericPollingResponse> = () => HubSpotPromise<T>
 export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, statusLookup?: {
     successStates: string[];
     errorStates: string[];
-}): Promise<T>;
+}, timeoutMs?: number): Promise<T>;
 export {};

package/lib/polling.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_POLLING_STATUS_LOOKUP = exports.DEFAULT_POLLING_STATES = void 0;
 exports.poll = poll;
 const constants_1 = require("./constants");
+const en_1 = require("../lang/en");
 exports.DEFAULT_POLLING_STATES = {
     STARTED: 'STARTED',
     SUCCESS: 'SUCCESS',
@@ -18,7 +19,8 @@ exports.DEFAULT_POLLING_STATUS_LOOKUP = {
         exports.DEFAULT_POLLING_STATES.FAILURE,
     ],
 };
-function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
+function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP, timeoutMs = 60000 // Default 60 second timeout
+) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {
@@ -26,17 +28,25 @@ function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
                 const { status } = pollResp;
                 if (statusLookup.successStates.includes(status)) {
                     clearInterval(pollInterval);
+                    clearTimeout(timeoutId);
                     resolve(pollResp);
                 }
                 else if (statusLookup.errorStates.includes(status)) {
                     clearInterval(pollInterval);
+                    clearTimeout(timeoutId);
                     reject(pollResp);
                 }
             }
             catch (error) {
                 clearInterval(pollInterval);
+                clearTimeout(timeoutId);
                 reject(error);
             }
         }, constants_1.DEFAULT_POLLING_DELAY);
+        // Set a timeout to stop polling after specified duration
+        const timeoutId = setTimeout(() => {
+            clearInterval(pollInterval);
+            reject(new Error(en_1.lib.polling.timeoutError(timeoutMs)));
+        }, timeoutMs);
     });
 }

package/lib/projects/add/v3AddComponent.js

@@ -66,6 +66,10 @@ async function v3AddComponent(args, projectDir, projectConfig) {
                 components.push(path_1.default.join(projectConfig.platformVersion, parentComponent.path));
             }
         }
+        if (components.length === 0) {
+            logger_1.uiLogger.log(en_1.lib.projects.add.nothingAdded);
+            return;
+        }
         await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDir, {
             sourceDir: components,
             hideLogs: true,

package/lib/projects/create/index.d.ts

@@ -1,6 +1,6 @@
 import { ArgumentsCamelCase } from 'yargs';
 import { ProjectTemplateRepoConfig } from '../../../types/Projects';
-import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+import { SelectProjectTemplatePromptResponse, ProjectNameAndDestPromptResponse } from '../../prompts/selectProjectTemplatePrompt';
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../../types/Yargs';
 import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
 export type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
@@ -19,5 +19,6 @@ export declare function handleProjectCreationFlow(args: ArgumentsCamelCase<Proje
     distribution?: string;
     repoConfig?: ProjectTemplateRepoConfig;
     projectContents?: string;
-    createProjectPromptResponse: CreateProjectPromptResponse;
+    selectProjectTemplatePromptResponse: SelectProjectTemplatePromptResponse;
+    projectNameAndDestPromptResponse: ProjectNameAndDestPromptResponse;
 }>;

package/lib/projects/create/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleProjectCreationFlow = handleProjectCreationFlow;
-const createProjectPrompt_1 = require("../../prompts/createProjectPrompt");
+const selectProjectTemplatePrompt_1 = require("../../prompts/selectProjectTemplatePrompt");
+const projectNameAndDestPrompt_1 = require("../../prompts/projectNameAndDestPrompt");
 const constants_1 = require("../../constants");
 const buildAndDeploy_1 = require("../buildAndDeploy");
 const v3_1 = require("./v3");
@@ -12,15 +13,17 @@ const exitCodes_1 = require("../../enums/exitCodes");
 async function handleProjectCreationFlow(args) {
     const { platformVersion, templateSource, projectBase, auth: providedAuth, distribution: providedDistribution, } = args;
     const repo = templateSource || constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+    const projectNameAndDestPromptResponse = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(args);
     if ((0, buildAndDeploy_1.useV3Api)(platformVersion)) {
         const { componentTemplateChoices, authType, distribution, repoConfig, projectContents, } = await (0, v3_1.v3ComponentFlow)(platformVersion, projectBase, providedAuth, providedDistribution);
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, undefined, projectContents !== v3_1.EMPTY_PROJECT ? componentTemplateChoices : undefined);
+        const selectProjectTemplatePromptResponse = await (0, selectProjectTemplatePrompt_1.selectProjectTemplatePrompt)(args, undefined, projectContents !== v3_1.EMPTY_PROJECT ? componentTemplateChoices : undefined);
         return {
             authType,
             distribution,
             repoConfig,
             projectContents,
-            createProjectPromptResponse,
+            selectProjectTemplatePromptResponse,
+            projectNameAndDestPromptResponse,
         };
     }
     const projectTemplates = await (0, legacy_1.getProjectTemplateListFromRepo)(repo, 'main');
@@ -28,6 +31,9 @@ async function handleProjectCreationFlow(args) {
         logger_1.uiLogger.error(en_1.commands.project.create.errors.failedToFetchProjectList);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, projectTemplates);
-    return { createProjectPromptResponse };
+    const selectProjectTemplatePromptResponse = await (0, selectProjectTemplatePrompt_1.selectProjectTemplatePrompt)(args, projectTemplates);
+    return {
+        selectProjectTemplatePromptResponse,
+        projectNameAndDestPromptResponse,
+    };
 }

package/lib/projects/create/v3.d.ts

@@ -1,6 +1,6 @@
 import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplateRepoConfig } from '../../../types/Projects';
 import { ProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project';
-import { CreateProjectPromptResponse } from '../../prompts/createProjectPrompt';
+import { SelectProjectTemplatePromptResponse } from '../../prompts/selectProjectTemplatePrompt';
 export declare const EMPTY_PROJECT = "empty";
 export declare const PROJECT_WITH_APP = "app";
 export declare function createV3App(providedAuth: string | undefined, providedDistribution: string | undefined): Promise<{
@@ -16,8 +16,8 @@ type V3ComponentInfo = {
     componentTemplateChoices?: ComponentTemplateChoice[];
 };
 export declare function v3ComponentFlow(platformVersion: string, projectBase: string | undefined, providedAuth: string | undefined, providedDistribution: string | undefined): Promise<V3ComponentInfo>;
-export declare function generateComponentPaths({ createProjectPromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {
-    createProjectPromptResponse: CreateProjectPromptResponse;
+export declare function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }: {
+    selectProjectTemplatePromptResponse: SelectProjectTemplatePromptResponse;
     platformVersion: string;
     repoConfig?: ProjectTemplateRepoConfig;
     projectContents?: string;

package/lib/projects/create/v3.js

@@ -134,11 +134,11 @@ async function v3ComponentFlow(platformVersion, projectBase, providedAuth, provi
         repoConfig,
     };
 }
-function generateComponentPaths({ createProjectPromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }) {
+function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }) {
     if (!(0, buildAndDeploy_1.useV3Api)(platformVersion)) {
         return [];
     }
-    const components = createProjectPromptResponse.componentTemplates?.map((componentTemplate) => {
+    const components = selectProjectTemplatePromptResponse.componentTemplates?.map((componentTemplate) => {
         return path_1.default.join(platformVersion, componentTemplate.path);
     }) || [];
     if (projectContents && projectContents !== exports.EMPTY_PROJECT) {

package/lib/projects/localDev/AppDevModeInterface.js

@@ -84,7 +84,7 @@ class AppDevModeInterface {
         return (0, urls_1.getStaticAuthAppInstallUrl)({
             targetAccountId: this.localDevState.targetTestingAccountId,
             env: this.localDevState.env,
-            appId: `${app.id}`,
+            appId: app.id,
         });
     }
     async fetchAppData() {

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

@@ -16,15 +16,16 @@ declare class LocalDevProcess {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     };
     get logger(): LocalDevLogger;
-    get configFilesUpdatedSinceLastUpload(): Set<string>;
     private setupDevServers;
     private startDevServers;
     private cleanupDevServers;
     private compareLocalProjectToDeployed;
     private projectConfigValidForUpload;
+    private getIntermediateRepresentation;
     private updateProjectNodes;
+    private updateProjectNodesAfterUpload;
     handleFileChange(filePath: string, event: string): Promise<void>;
-    handleConfigFileChange(filePath: string, event: string): Promise<void>;
+    handleConfigFileChange(): Promise<void>;
     start(): Promise<void>;
     stop(showProgress?: boolean): Promise<void>;
     uploadProject(): Promise<boolean>;

package/lib/projects/localDev/LocalDevProcess.js

@@ -46,9 +46,6 @@ class LocalDevProcess {
     get logger() {
         return this._logger;
     }
-    get configFilesUpdatedSinceLastUpload() {
-        return this.state.configFilesUpdatedSinceLastUpload;
-    }
     async setupDevServers() {
         try {
             await this.devServerManager.setup();
@@ -105,17 +102,28 @@ class LocalDevProcess {
         });
         return true;
     }
-    async updateProjectNodes() {
-        const intermediateRepresentation = await (0, project_parsing_lib_1.translateForLocalDev)({
+    getIntermediateRepresentation(projectNodesAtLastUpload) {
+        return (0, project_parsing_lib_1.translateForLocalDev)({
             projectSourceDir: path_1.default.join(this.state.projectDir, this.state.projectConfig.srcDir),
             platformVersion: this.state.projectConfig.platformVersion,
             accountId: this.state.targetProjectAccountId,
         }, {
-            configFilesUpdatedSinceLastUpload: this.state.configFilesUpdatedSinceLastUpload,
+            projectNodesAtLastUpload,
+            profile: this.state.profile,
         });
+    }
+    async updateProjectNodes() {
+        const intermediateRepresentation = await this.getIntermediateRepresentation(this.state.projectNodesAtLastUpload);
         this.state.projectNodes =
             intermediateRepresentation.intermediateNodesIndexedByUid;
     }
+    async updateProjectNodesAfterUpload() {
+        const intermediateRepresentation = await this.getIntermediateRepresentation();
+        this.state.projectNodes =
+            intermediateRepresentation.intermediateNodesIndexedByUid;
+        this.state.projectNodesAtLastUpload =
+            intermediateRepresentation.intermediateNodesIndexedByUid;
+    }
     async handleFileChange(filePath, event) {
         await this.updateProjectNodes();
         try {
@@ -125,10 +133,7 @@ class LocalDevProcess {
             this.logger.fileChangeError(e);
         }
     }
-    async handleConfigFileChange(filePath, event) {
-        if (event === 'add' || event === 'change') {
-            this.state.addUpdatedConfigFileUpdatedSinceLastUpload(filePath);
-        }
+    async handleConfigFileChange() {
         await this.updateProjectNodes();
         this.logger.uploadWarning();
     }
@@ -185,8 +190,7 @@ class LocalDevProcess {
             this.logger.uploadError(uploadError);
             return false;
         }
-        this.state.resetConfigFilesUpdatedSinceLastUpload();
-        this.updateProjectNodes();
+        await this.updateProjectNodesAfterUpload();
         this.logger.uploadSuccess();
         this.logger.clearUploadWarnings();
         return true;

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

@@ -6,6 +6,7 @@ import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData
 declare class LocalDevState {
     private _targetProjectAccountId;
     private _targetTestingAccountId;
+    private _profile?;
     private _projectConfig;
     private _projectDir;
     private _projectId;
@@ -14,15 +15,16 @@ declare class LocalDevState {
     private _deployedBuild?;
     private _isGithubLinked;
     private _projectNodes;
+    private _projectNodesAtLastUpload;
     private _env;
     private _listeners;
-    private _configFilesUpdatedSinceLastUpload;
     private _appData;
     private _devServerMessage;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }: LocalDevStateConstructorOptions);
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, profile, env, }: LocalDevStateConstructorOptions);
     private runListeners;
     get targetProjectAccountId(): number;
     get targetTestingAccountId(): number;
+    get profile(): string | undefined;
     get projectConfig(): ProjectConfig;
     get projectDir(): string;
     get projectId(): number;
@@ -36,10 +38,13 @@ declare class LocalDevState {
     set projectNodes(nodes: {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     });
+    get projectNodesAtLastUpload(): {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    };
+    set projectNodesAtLastUpload(nodes: {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    });
     get env(): Environment;
-    get configFilesUpdatedSinceLastUpload(): Set<string>;
-    addUpdatedConfigFileUpdatedSinceLastUpload(filePath: string): void;
-    resetConfigFilesUpdatedSinceLastUpload(): void;
     get appData(): Record<string, AppLocalDevData>;
     getAppDataByUid(uid: string): AppLocalDevData | undefined;
     setAppDataForUid(uid: string, appData: AppLocalDevData): void;

package/lib/projects/localDev/LocalDevState.js

@@ -4,6 +4,7 @@ const constants_1 = require("../../constants");
 class LocalDevState {
     _targetProjectAccountId;
     _targetTestingAccountId;
+    _profile;
     _projectConfig;
     _projectDir;
     _projectId;
@@ -12,14 +13,15 @@ class LocalDevState {
     _deployedBuild;
     _isGithubLinked;
     _projectNodes;
+    _projectNodesAtLastUpload;
     _env;
     _listeners;
-    _configFilesUpdatedSinceLastUpload;
     _appData;
     _devServerMessage;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }) {
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, profile, env, }) {
         this._targetProjectAccountId = targetProjectAccountId;
         this._targetTestingAccountId = targetTestingAccountId;
+        this._profile = profile;
         this._projectConfig = projectConfig;
         this._projectDir = projectDir;
         this._projectId = projectId;
@@ -28,8 +30,8 @@ class LocalDevState {
         this._deployedBuild = deployedBuild;
         this._isGithubLinked = isGithubLinked;
         this._projectNodes = initialProjectNodes;
+        this._projectNodesAtLastUpload = initialProjectNodes;
         this._env = env;
-        this._configFilesUpdatedSinceLastUpload = new Set();
         this._appData = {};
         this._devServerMessage = constants_1.LOCAL_DEV_SERVER_MESSAGE_TYPES.INITIAL;
         this._listeners = {};
@@ -45,10 +47,11 @@ class LocalDevState {
     get targetTestingAccountId() {
         return this._targetTestingAccountId;
     }
+    get profile() {
+        return this._profile;
+    }
     get projectConfig() {
-        return {
-            ...this._projectConfig,
-        };
+        return structuredClone(this._projectConfig);
     }
     get projectDir() {
         return this._projectDir;
@@ -63,34 +66,29 @@ class LocalDevState {
         return this._debug;
     }
     get deployedBuild() {
-        return (this._deployedBuild && {
-            ...this._deployedBuild,
-        });
+        return this._deployedBuild && structuredClone(this._deployedBuild);
     }
     get isGithubLinked() {
         return this._isGithubLinked;
     }
     get projectNodes() {
-        return { ...this._projectNodes };
+        return structuredClone(this._projectNodes);
     }
     set projectNodes(nodes) {
         this._projectNodes = nodes;
         this.runListeners('projectNodes');
     }
-    get env() {
-        return this._env;
-    }
-    get configFilesUpdatedSinceLastUpload() {
-        return this._configFilesUpdatedSinceLastUpload;
+    get projectNodesAtLastUpload() {
+        return structuredClone(this._projectNodesAtLastUpload);
     }
-    addUpdatedConfigFileUpdatedSinceLastUpload(filePath) {
-        this._configFilesUpdatedSinceLastUpload.add(filePath);
+    set projectNodesAtLastUpload(nodes) {
+        this._projectNodesAtLastUpload = nodes;
     }
-    resetConfigFilesUpdatedSinceLastUpload() {
-        this._configFilesUpdatedSinceLastUpload.clear();
+    get env() {
+        return this._env;
     }
     get appData() {
-        return { ...this._appData };
+        return structuredClone(this._appData);
     }
     getAppDataByUid(uid) {
         return { ...this._appData[uid] };

package/lib/projects/localDev/LocalDevWatcher.js

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

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
-import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
 import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;

package/lib/projects/upload.d.ts

@@ -1,4 +1,5 @@
 import { FileResult } from 'tmp';
+import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -20,5 +21,5 @@ type HandleProjectUploadArg<T> = {
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
-export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<IntermediateRepresentation | undefined>;
 export {};

package/lib/projects/upload.js

@@ -149,4 +149,5 @@ async function handleTranslate(projectDir, projectConfig, accountId, skipValidat
             (0, errorHandlers_1.logError)(e);
         }
     }
+    return undefined;
 }

package/lib/prompts/personalAccessKeyPrompt.js

@@ -29,7 +29,7 @@ async function personalAccessKeyPrompt({ env, account, }) {
         if (account) {
             url = `${websiteOrigin}/personal-access-key/${account}`;
         }
-        const { personalAcessKeyBrowserOpenPrep: choice } = await (0, promptUtils_1.promptUser)([
+        const { personalAccessKeyBrowserOpenPrep: choice } = await (0, promptUtils_1.promptUser)([
             PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP,
         ]);
         if (!choice) {
@@ -94,7 +94,7 @@ const CLIENT_SECRET = {
     },
 };
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
-    name: 'personalAcessKeyBrowserOpenPrep',
+    name: 'personalAccessKeyBrowserOpenPrep',
     type: 'list',
     message: 'Choose your preferred method of authentication',
     choices: Object.values(en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices),

package/lib/prompts/projectNameAndDestPrompt.d.ts

@@ -0,0 +1,3 @@
+import { PromptOptionsArg, ProjectNameAndDestPromptResponse } from './selectProjectTemplatePrompt';
+export declare function projectNameAndDestPrompt(promptOptions: PromptOptionsArg): Promise<ProjectNameAndDestPromptResponse>;
+export declare function validateProjectDirectory(input?: string): string | boolean;

package/lib/prompts/projectNameAndDestPrompt.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.projectNameAndDestPrompt = projectNameAndDestPrompt;
+exports.validateProjectDirectory = validateProjectDirectory;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const en_1 = require("../../lang/en");
+const promptUtils_1 = require("./promptUtils");
+const constants_1 = require("../constants");
+async function projectNameAndDestPrompt(promptOptions) {
+    const result = await (0, promptUtils_1.promptUser)([
+        {
+            name: 'name',
+            message: en_1.lib.prompts.projectNameAndDestPrompt.enterName,
+            when: !promptOptions.name,
+            validate: (input) => {
+                if (!input) {
+                    return en_1.lib.prompts.projectNameAndDestPrompt.errors.nameRequired;
+                }
+                return true;
+            },
+        },
+        {
+            name: 'dest',
+            message: en_1.lib.prompts.projectNameAndDestPrompt.enterDest,
+            when: !promptOptions.dest,
+            default: answers => {
+                const projectName = (0, path_2.sanitizeFileName)(promptOptions.name || answers.name);
+                return path_1.default.resolve((0, path_2.getCwd)(), projectName);
+            },
+            validate: validateProjectDirectory,
+            filter: input => {
+                return (0, path_2.untildify)(input);
+            },
+        },
+    ]);
+    if (!result.name) {
+        result.name = promptOptions.name;
+    }
+    if (!result.dest) {
+        result.dest = promptOptions.dest;
+    }
+    return result;
+}
+function validateProjectDirectory(input) {
+    if (!input) {
+        return en_1.lib.prompts.projectNameAndDestPrompt.errors.destRequired;
+    }
+    if (fs_1.default.existsSync(path_1.default.resolve((0, path_2.getCwd)(), path_1.default.join(input, constants_1.PROJECT_CONFIG_FILE)))) {
+        return en_1.lib.prompts.projectNameAndDestPrompt.errors.invalidDest;
+    }
+    if (!(0, path_2.isValidPath)(input)) {
+        return en_1.lib.prompts.projectNameAndDestPrompt.errors.invalidCharacters;
+    }
+    return true;
+}