@hubspot/cli 7.0.4-experimental.0 → 7.0.6-experimental.0

package/commands/function/deploy.js

@@ -38,7 +38,7 @@ exports.handler = async (options) => {
     });
     try {
         const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
-        const successResp = await poll(getBuildStatus, derivedAccountId, buildId);
+        const successResp = await poll(() => getBuildStatus(derivedAccountId, buildId));
         const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
         SpinniesManager.succeed('loading');
         await outputBuildLog(successResp.cdnUrl);

package/commands/project/cloneApp.js

@@ -68,7 +68,7 @@ exports.handler = async (options) => {
             text: i18n(`${i18nKey}.cloneStatus.inProgress`),
         });
         const { data: { exportId }, } = await cloneApp(derivedAccountId, appId);
-        const { status } = await poll(checkCloneStatus, derivedAccountId, exportId);
+        const { status } = await poll(() => checkCloneStatus(derivedAccountId, exportId));
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path.resolve(getCwd(), projectDest);

package/commands/project/deploy.js

@@ -83,7 +83,7 @@ exports.handler = async (options) => {
             logger.error(i18n(`${i18nKey}.errors.noBuildId`));
             return process.exit(EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy);
+        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy, options.useV3);
         if (!deployResp || deployResp.error) {
             logger.error(i18n(`${i18nKey}.errors.deploy`, {
                 details: deployResp.error.message,
@@ -123,6 +123,11 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.build.describe`),
             type: 'number',
         },
+        'use-v3': {
+            hidden: true,
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([
         ['$0 project deploy', i18n(`${i18nKey}.examples.default`)],

package/commands/project/migrateApp.js

@@ -126,7 +126,7 @@ exports.handler = async (options) => {
         });
         const { data: migrateResponse } = await migrateApp(derivedAccountId, appId, projectName);
         const { id } = migrateResponse;
-        const pollResponse = await poll(checkMigrationStatus, derivedAccountId, id);
+        const pollResponse = await poll(() => checkMigrationStatus(derivedAccountId, id));
         const { status, project } = pollResponse;
         if (status === 'SUCCESS') {
             const absoluteDestPath = path.resolve(getCwd(), projectDest);

package/commands/project/upload.js

@@ -22,15 +22,15 @@ exports.handler = async (options) => {
     const { forceCreate, message, derivedAccountId } = options;
     const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
+    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     validateProjectConfig(projectConfig, projectDir);
     await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, options.translate);
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -80,6 +80,11 @@ exports.builder = yargs => {
             type: 'string',
             default: '',
         },
+        translate: {
+            hidden: true,
+            type: 'boolean',
+            default: false,
+        },
     });
     yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
     addConfigOptions(yargs);

package/lang/en.lyaml

@@ -1113,7 +1113,6 @@ en:
         notFound: "Your project {{#bold}}{{ projectName }}{{/bold}} could not be found in {{#bold}}{{ accountIdentifier }}{{/bold}}."
       pollFetchProject:
         checkingProject: "Checking if project exists in {{ accountIdentifier }}"
-        unableToFindAutodeployStatus: "Unable to find the auto deploy for build #{{ buildId }}. This deploy may have been skipped. {{ viewDeploysLink }}."
       logFeedbackMessage:
         feedbackHeader: "We'd love to hear your feedback!"
         feedbackMessage: "How are you liking the new projects and developer tools? \n > Run `{{#yellow}}hs feedback{{/yellow}}` to let us know what you think!\n"
@@ -1129,6 +1128,7 @@ en:
         buildSucceededAutomaticallyDeploying: "Build #{{ buildId }} succeeded. {{#bold}}Automatically deploying{{/bold}} to {{ accountIdentifier }}\n"
         cleanedUpTempFile: "Cleaned up temporary file {{ path }}"
         viewDeploys: "View all deploys for this project in HubSpot"
+        unableToFindAutodeployStatus: "Unable to find the auto deploy for build #{{ buildId }}. This deploy may have been skipped. {{ viewDeploysLink }}."
     projectUpload:
       uploadProjectFiles:
         add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"

package/lib/constants.d.ts

@@ -6,13 +6,7 @@ export declare const MARKETPLACE_FOLDER: "@marketplace";
 export declare const CONFIG_FLAGS: {
     readonly USE_CUSTOM_OBJECT_HUBFILE: "useCustomObjectHubfile";
 };
-export declare const POLLING_DELAY = 2000;
-export declare const POLLING_STATUS: {
-    readonly SUCCESS: "SUCCESS";
-    readonly ERROR: "ERROR";
-    readonly REVERTED: "REVERTED";
-    readonly FAILURE: "FAILURE";
-};
+export declare const DEFAULT_POLLING_DELAY = 2000;
 export declare const PROJECT_CONFIG_FILE: "hsproject.json";
 export declare const PROJECT_BUILD_STATES: {
     readonly BUILDING: "BUILDING";

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.POLLING_STATUS = exports.POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -9,13 +9,7 @@ exports.MARKETPLACE_FOLDER = '@marketplace';
 exports.CONFIG_FLAGS = {
     USE_CUSTOM_OBJECT_HUBFILE: 'useCustomObjectHubfile',
 };
-exports.POLLING_DELAY = 2000;
-exports.POLLING_STATUS = {
-    SUCCESS: 'SUCCESS',
-    ERROR: 'ERROR',
-    REVERTED: 'REVERTED',
-    FAILURE: 'FAILURE',
-};
+exports.DEFAULT_POLLING_DELAY = 2000;
 exports.PROJECT_CONFIG_FILE = 'hsproject.json';
 exports.PROJECT_BUILD_STATES = {
     BUILDING: 'BUILDING',

package/lib/polling.d.ts

@@ -1,9 +1,17 @@
 import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
-import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
-import { POLLING_STATUS } from './constants';
+export declare const DEFAULT_POLLING_STATES: {
+    readonly STARTED: "STARTED";
+    readonly SUCCESS: "SUCCESS";
+    readonly ERROR: "ERROR";
+    readonly REVERTED: "REVERTED";
+    readonly FAILURE: "FAILURE";
+};
 type GenericPollingResponse = {
-    status: ValueOf<typeof POLLING_STATUS>;
+    status: string;
 };
-type PollingCallback<T extends GenericPollingResponse> = (accountId: number, taskId: number | string) => HubSpotPromise<T>;
-export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, accountId: number, taskId: number | string): Promise<T>;
+type PollingCallback<T extends GenericPollingResponse> = () => HubSpotPromise<T>;
+export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, statusLookup?: {
+    successStates: string[];
+    errorStates: string[];
+}): Promise<T>;
 export {};

package/lib/polling.js

@@ -1,20 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_POLLING_STATES = void 0;
 exports.poll = poll;
 const constants_1 = require("./constants");
-function poll(callback, accountId, taskId) {
+exports.DEFAULT_POLLING_STATES = {
+    STARTED: 'STARTED',
+    SUCCESS: 'SUCCESS',
+    ERROR: 'ERROR',
+    REVERTED: 'REVERTED',
+    FAILURE: 'FAILURE',
+};
+const DEFAULT_POLLING_STATUS_LOOKUP = {
+    successStates: [exports.DEFAULT_POLLING_STATES.SUCCESS],
+    errorStates: [
+        exports.DEFAULT_POLLING_STATES.ERROR,
+        exports.DEFAULT_POLLING_STATES.REVERTED,
+        exports.DEFAULT_POLLING_STATES.FAILURE,
+    ],
+};
+function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {
-                const { data: pollResp } = await callback(accountId, taskId);
+                const { data: pollResp } = await callback();
                 const { status } = pollResp;
-                if (status === constants_1.POLLING_STATUS.SUCCESS) {
+                if (statusLookup.successStates.includes(status)) {
                     clearInterval(pollInterval);
                     resolve(pollResp);
                 }
-                else if (status === constants_1.POLLING_STATUS.ERROR ||
-                    status === constants_1.POLLING_STATUS.REVERTED ||
-                    status === constants_1.POLLING_STATUS.FAILURE) {
+                else if (statusLookup.errorStates.includes(status)) {
                     clearInterval(pollInterval);
                     reject(pollResp);
                 }
@@ -23,6 +37,6 @@ function poll(callback, accountId, taskId) {
                 clearInterval(pollInterval);
                 reject(error);
             }
-        }, constants_1.POLLING_DELAY);
+        }, constants_1.DEFAULT_POLLING_DELAY);
     });
 }

package/lib/projects/buildAndDeploy.js

@@ -197,13 +197,13 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         resolve(taskStatus);
                     }
                 }
-            }, constants_1.POLLING_DELAY);
+            }, constants_1.DEFAULT_POLLING_DELAY);
         });
     };
 }
 function pollBuildAutodeployStatus(accountId, taskName, buildId) {
     return new Promise((resolve, reject) => {
-        let maxIntervals = (30 * 1000) / constants_1.POLLING_DELAY; // Num of intervals in ~30s
+        let maxIntervals = (30 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~30s
         const pollInterval = setInterval(async () => {
             let build;
             try {
@@ -224,7 +224,7 @@ function pollBuildAutodeployStatus(accountId, taskName, buildId) {
             else {
                 maxIntervals -= 1;
             }
-        }, constants_1.POLLING_DELAY);
+        }, constants_1.DEFAULT_POLLING_DELAY);
     });
 }
 exports.pollBuildStatus = makePollTaskStatusFunc({

package/lib/projects/index.js

@@ -171,7 +171,7 @@ async function pollFetchProject(accountId, projectName) {
                     reject(err);
                 }
             }
-        }, constants_1.POLLING_DELAY);
+        }, constants_1.DEFAULT_POLLING_DELAY);
     });
 }
 async function ensureProjectExists(accountId, projectName, { forceCreate = false, allowCreate = true, noLogs = false, withPolling = false, uploadCommand = false, } = {}) {

package/lib/projects/upload.d.ts

@@ -5,5 +5,5 @@ type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage: string, sendIR?: boolean): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -15,8 +15,11 @@ const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
 const lang_1 = require("../lang");
 const exitCodes_1 = require("../enums/exitCodes");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+const errorHandlers_1 = require("../errorHandlers");
+const node_util_1 = __importDefault(require("node:util"));
 const i18nKey = 'lib.projectUpload';
-async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion) {
+async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
     SpinniesManager_1.default.add('upload', {
@@ -29,7 +32,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     let buildId;
     let error;
     try {
-        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion);
+        const { data: upload } = await (0, projects_1.uploadProject)(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
         buildId = upload.buildId;
         SpinniesManager_1.default.succeed('upload', {
             text: (0, lang_1.i18n)(`${i18nKey}.uploadProjectFiles.succeed`, {
@@ -55,7 +58,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage) {
+async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage, sendIR = false) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
@@ -74,7 +77,27 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.handleProjectUpload.compressed`, {
             byteCount: archive.pointer(),
         }));
-        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion);
+        let intermediateRepresentation;
+        if (sendIR) {
+            try {
+                intermediateRepresentation = await (0, project_parsing_lib_1.translate)({
+                    projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
+                    platformVersion: projectConfig.platformVersion,
+                    accountId,
+                });
+                logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+            }
+            catch (e) {
+                if ((0, project_parsing_lib_1.isTranslationError)(e)) {
+                    logger_1.logger.error(e.toString());
+                }
+                else {
+                    (0, errorHandlers_1.logError)(e);
+                }
+                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+        }
+        const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             resolve({ uploadError: error });
         }

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.4-experimental.0",
+    "version": "7.0.6-experimental.0",
     "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.1.3",
+        "@hubspot/local-dev-lib": "0.1.1-experimental.0",
+        "@hubspot/project-parsing-lib": "^0.0.2-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.40",
@@ -55,6 +56,9 @@
         "ts-node": "^10.9.2",
         "typescript": "^5.6.2"
     },
+    "optionalDependencies": {
+        "@hubspot/cms-dev-server": "^0.18.10"
+    },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",
         "lint": "eslint . && prettier --list-different ./**/*.{js,json}",