@hubspot/cli 7.7.16-experimental.2 → 7.7.16-experimental.4

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/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;
+}

package/lib/prompts/selectProjectTemplatePrompt.d.ts

@@ -0,0 +1,26 @@
+import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplate } from '../../types/Projects';
+export type SelectProjectTemplatePromptResponse = {
+    projectTemplate?: ProjectTemplate;
+    componentTemplates?: ComponentTemplate[];
+};
+type SelectProjectTemplatePromptResponseProjectTemplate = {
+    projectTemplate: ProjectTemplate;
+    componentTemplates: undefined;
+};
+type SelectProjectTemplatePromptResponseComponentTemplates = {
+    projectTemplate?: undefined;
+    componentTemplates?: ComponentTemplate[];
+};
+export type ProjectNameAndDestPromptResponse = {
+    name: string;
+    dest: string;
+};
+export type PromptOptionsArg = {
+    name?: string;
+    dest?: string;
+    template?: string;
+    features?: string[];
+};
+export declare function selectProjectTemplatePrompt(promptOptions: PromptOptionsArg, projectTemplates?: ProjectTemplate[], componentTemplates?: undefined): Promise<SelectProjectTemplatePromptResponseProjectTemplate>;
+export declare function selectProjectTemplatePrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined, componentTemplates?: ComponentTemplateChoice[]): Promise<SelectProjectTemplatePromptResponseComponentTemplates>;
+export {};

package/lib/prompts/{createProjectPrompt.js → selectProjectTemplatePrompt.js}

@@ -1,31 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectPrompt = createProjectPrompt;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const path_2 = require("@hubspot/local-dev-lib/path");
+exports.selectProjectTemplatePrompt = selectProjectTemplatePrompt;
 const promptUtils_1 = require("./promptUtils");
-const constants_1 = require("../constants");
 const en_1 = require("../../lang/en");
-function validateProjectDirectory(input) {
-    if (!input) {
-        return en_1.lib.prompts.createProjectPrompt.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.createProjectPrompt.errors.invalidDest;
-    }
-    if (!(0, path_2.isValidPath)(input)) {
-        return en_1.lib.prompts.createProjectPrompt.errors.invalidCharacters;
-    }
-    return true;
-}
 function findTemplateByNameOrLabel(projectTemplates, templateNameOrLabel) {
     return projectTemplates.find(t => t.name === templateNameOrLabel || t.label === templateNameOrLabel);
 }
-async function createProjectPrompt(promptOptions, projectTemplates, componentTemplates) {
+async function selectProjectTemplatePrompt(promptOptions, projectTemplates, componentTemplates) {
     const createProjectFromTemplate = !!projectTemplates && projectTemplates.length > 0;
     const createProjectFromComponents = Array.isArray(componentTemplates) && componentTemplates?.length > 0;
     const selectedComponents = [];
@@ -46,36 +27,12 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
         !!promptOptions.template &&
         !!findTemplateByNameOrLabel(projectTemplates, promptOptions.template);
     const result = await (0, promptUtils_1.promptUser)([
-        {
-            name: 'name',
-            message: en_1.lib.prompts.createProjectPrompt.enterName,
-            when: !promptOptions.name,
-            validate: (input) => {
-                if (!input) {
-                    return en_1.lib.prompts.createProjectPrompt.errors.nameRequired;
-                }
-                return true;
-            },
-        },
-        {
-            name: 'dest',
-            message: en_1.lib.prompts.createProjectPrompt.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);
-            },
-        },
         {
             name: 'projectTemplate',
             message: () => {
                 return promptOptions.template && !providedTemplateIsValid
-                    ? en_1.lib.prompts.createProjectPrompt.errors.invalidTemplate(promptOptions.template)
-                    : en_1.lib.prompts.createProjectPrompt.selectTemplate;
+                    ? en_1.lib.prompts.selectProjectTemplatePrompt.errors.invalidTemplate(promptOptions.template)
+                    : en_1.lib.prompts.selectProjectTemplatePrompt.selectTemplate;
             },
             when: createProjectFromTemplate && !providedTemplateIsValid,
             type: 'list',
@@ -90,7 +47,7 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
         },
         {
             name: 'componentTemplates',
-            message: en_1.lib.prompts.createProjectPrompt.features,
+            message: en_1.lib.prompts.selectProjectTemplatePrompt.features,
             when: !promptOptions.features &&
                 createProjectFromComponents &&
                 selectedComponents.length === 0,
@@ -98,12 +55,6 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
             choices: componentTemplates,
         },
     ]);
-    if (!result.name) {
-        result.name = promptOptions.name;
-    }
-    if (!result.dest) {
-        result.dest = promptOptions.dest;
-    }
     if (!result.componentTemplates) {
         result.componentTemplates = selectedComponents;
     }
@@ -112,7 +63,7 @@ async function createProjectPrompt(promptOptions, projectTemplates, componentTem
     }
     if (projectTemplates && projectTemplates.length > 0) {
         if (!result.projectTemplate) {
-            throw new Error(en_1.lib.prompts.createProjectPrompt.errors.projectTemplateRequired);
+            throw new Error(en_1.lib.prompts.selectProjectTemplatePrompt.errors.projectTemplateRequired);
         }
         return result;
     }

package/lib/validation.d.ts

@@ -4,7 +4,7 @@ export declare function validateAccount(options: Arguments<{
     account?: string;
     accountId?: string;
     derivedAccountId?: number;
-    providedAccountId?: string;
+    userProvidedAccount?: string;
 }>): Promise<boolean>;
 export declare function validateCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;

package/lib/validation.js

@@ -50,18 +50,18 @@ const path_1 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("./commonOpts");
 const index_1 = require("./errorHandlers/index");
 async function validateAccount(options) {
-    const { derivedAccountId, providedAccountId } = options;
+    const { derivedAccountId, userProvidedAccount } = options;
     const accountId = (0, config_1.getAccountId)(derivedAccountId);
     if (!accountId) {
-        if (providedAccountId) {
-            logger_1.logger.error(`The account "${providedAccountId}" could not be found in the config`);
+        if (userProvidedAccount) {
+            logger_1.logger.error(`The account "${userProvidedAccount}" could not be found in the config`);
         }
         else {
             logger_1.logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
         }
         return false;
     }
-    if (providedAccountId && (0, config_1.loadConfigFromEnvironment)()) {
+    if (userProvidedAccount && (0, config_1.loadConfigFromEnvironment)()) {
         throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
     }
     const accountConfig = (0, config_1.getAccountConfig)(accountId);

package/mcp-server/tools/project/CreateProjectTool.d.ts

@@ -14,17 +14,17 @@ declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.16-experimental.2",
+    "version": "7.7.16-experimental.4",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.10.0",
-        "@hubspot/project-parsing-lib": "0.3.2",
+        "@hubspot/local-dev-lib": "3.11.0",
+        "@hubspot/project-parsing-lib": "0.5.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",

package/types/LocalDev.d.ts

@@ -8,6 +8,7 @@ import { APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../lib/
 export type LocalDevStateConstructorOptions = {
     targetProjectAccountId: number;
     targetTestingAccountId: number;
+    profile?: string;
     projectConfig: ProjectConfig;
     projectDir: string;
     projectId: number;

package/types/Yargs.d.ts

@@ -2,7 +2,7 @@ import { Options, CommandModule, Argv } from 'yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 export type CommonArgs = {
     derivedAccountId: number;
-    providedAccountId?: number;
+    userProvidedAccount?: string;
     d: boolean;
     debug: boolean;
 };

package/lib/prompts/createProjectPrompt.d.ts

@@ -1,28 +0,0 @@
-import { ComponentTemplate, ComponentTemplateChoice, ProjectTemplate } from '../../types/Projects';
-export type CreateProjectPromptResponse = {
-    name: string;
-    dest: string;
-    projectTemplate?: ProjectTemplate;
-    componentTemplates?: ComponentTemplate[];
-};
-type CreateProjectPromptResponseProjectTemplate = {
-    name: string;
-    dest: string;
-    projectTemplate: ProjectTemplate;
-    componentTemplates: undefined;
-};
-type CreateProjectPromptResponseComponentTemplates = {
-    name: string;
-    dest: string;
-    projectTemplate?: undefined;
-    componentTemplates?: ComponentTemplate[];
-};
-type PromptOptionsArg = {
-    name?: string;
-    dest?: string;
-    template?: string;
-    features?: string[];
-};
-export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: ProjectTemplate[], componentTemplates?: undefined): Promise<CreateProjectPromptResponseProjectTemplate>;
-export declare function createProjectPrompt(promptOptions: PromptOptionsArg, projectTemplates?: undefined, componentTemplates?: ComponentTemplateChoice[]): Promise<CreateProjectPromptResponseComponentTemplates>;
-export {};