@hubspot/cli 7.0.9-experimental.0 → 7.0.10-experimental.0

package/bin/cli.js

@@ -6,7 +6,6 @@ const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
 const { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
-const { DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID, DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND, } = require('@hubspot/local-dev-lib/constants/config');
 const { logError } = require('../lib/errorHandlers/index');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { validateAccount } = require('../lib/validation');
@@ -165,24 +164,7 @@ const injectAccountIdMiddleware = async (options) => {
         options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
     }
     else {
-        try {
-            options.derivedAccountId = getAccountId(account);
-        }
-        catch (error) {
-            logError(error);
-            if (error.cause === DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID) {
-                logger.log(i18n(`${i18nKey}.injectAccountIdMiddleware.invalidAccountId`, {
-                    overrideCommand: uiCommandReference('hs account create-override'),
-                }));
-            }
-            if (error.cause === DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND) {
-                logger.log(i18n(`${i18nKey}.injectAccountIdMiddleware.accountNotFound`, {
-                    configPath: getConfigPath(),
-                    authCommand: uiCommandReference('hs account auth'),
-                }));
-            }
-            process.exit(EXIT_CODES.ERROR);
-        }
+        options.derivedAccountId = getAccountId(account);
     }
 };
 const loadConfigMiddleware = async (options) => {
@@ -202,9 +184,14 @@ const loadConfigMiddleware = async (options) => {
         }));
         process.exit(EXIT_CODES.ERROR);
     }
-    else if (!options._.includes('init')) {
+    else if (!isTargetedCommand(options, { init: { target: true } })) {
         const { config: configPath } = options;
-        loadConfig(configPath, options);
+        const config = loadConfig(configPath, options);
+        // We don't run validateConfig() for auth because users should be able to run it when
+        // no accounts are configured, but we still want to exit if the config file is not found
+        if (isTargetedCommand(options, { auth: { target: true } }) && !config) {
+            process.exit(EXIT_CODES.ERROR);
+        }
     }
     maybeValidateConfig();
 };

package/commands/account/list.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfigPath, getConfigDefaultAccount, getConfigAccounts, getDefaultAccountOverrideFilePath, } = require('@hubspot/local-dev-lib/config');
+const { getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { addConfigOptions } = require('../../lib/commonOpts');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
@@ -64,7 +64,6 @@ exports.handler = async (options) => {
     const { derivedAccountId } = options;
     trackCommandUsage('accounts-list', null, derivedAccountId);
     const configPath = getConfigPath();
-    const overrideFilePath = getDefaultAccountOverrideFilePath();
     const accountsList = getConfigAccounts();
     const mappedPortalData = sortAndMapPortals(accountsList);
     const portalData = getPortalData(mappedPortalData);
@@ -74,9 +73,6 @@ exports.handler = async (options) => {
         i18n(`${i18nKey}.labels.authType`),
     ]));
     logger.log(i18n(`${i18nKey}.configPath`, { configPath }));
-    if (overrideFilePath) {
-        logger.log(i18n(`${i18nKey}.overrideFilePath`, { overrideFilePath }));
-    }
     logger.log(i18n(`${i18nKey}.defaultAccount`, {
         account: getConfigDefaultAccount(),
     }));

package/commands/account.js

@@ -9,7 +9,6 @@ const use = require('./account/use');
 const info = require('./account/info');
 const remove = require('./account/remove');
 const clean = require('./account/clean');
-const createOverride = require('./account/createOverride');
 const i18nKey = 'commands.account';
 exports.command = ['account', 'accounts'];
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -22,7 +21,6 @@ exports.builder = yargs => {
         .command(info)
         .command(remove)
         .command(clean)
-        .command(createOverride)
         .demandCommand(1, '');
     return yargs;
 };

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/init.js

@@ -67,7 +67,7 @@ exports.describe = i18n(`${i18nKey}.describe`, {
     configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
 exports.handler = async (options) => {
-    const { auth: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = options;
+    const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = options;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     const configPath = (configFlagValue && path.join(getCwd(), configFlagValue)) ||

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

@@ -11,9 +11,6 @@ en:
         portalEnvVarDeprecated: "The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead."
       loadConfigMiddleware:
         configFileExists: "A configuration file already exists at {{ configPath }}. To specify a new configuration file, delete the existing one and try again."
-      injectAccountIdMiddleware:
-        invalidAccountId: "In the default override file (.hsaccount), the account ID must be a number. Please delete the current file and generate a new one using {{ overrideCommand }}."
-        accountNotFound: "The account in the default override file (.hsaccount) wasn't found in your configured accounts. You can authorize this account using {{ authCommand }}."
     completion:
       describe: "Enable bash completion shortcuts for commands. Concat the generated script to your .bashrc, .bash_profile, or .zshrc file."
       examples:
@@ -21,24 +18,11 @@ en:
     account:
       describe: "Commands for managing configured accounts."
       subcommands:
-        createOverride:
-          describe: "Create a new default account override file (.hs-account) in the current working directory."
-          success: "Default account override file created at {{ overrideFilePath }}"
-          errors:
-            accountNotFound: "The specified account could not be found in the config file {{ configPath }}"
-          options:
-            account:
-              describe: "Name or ID of the account to create an override file for."
-          examples:
-            default: "Create a new default account override file (.hs-account) in the current working directory"
-            idBased: "Create a new default account override file (.hs-account) in the current working directory, using the account with accountId \"1234567\""
-            nameBased: "Create a new default account override file (.hs-account) in the current working directory, using the account with name \"MyAccount\""
         list:
           accounts: "{{#bold}}Accounts{{/bold}}:"
           defaultAccount: "{{#bold}}Default account{{/bold}}: {{ account }}"
           describe: "List names of accounts defined in config."
           configPath: "{{#bold}}Config path{{/bold}}: {{ configPath }}"
-          overrideFilePath: "{{#bold}}Default account override file path{{/bold}}: {{ overrideFilePath }}"
           labels:
             accountId: "Account ID"
             authType: "Auth Type"
@@ -1129,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"
@@ -1145,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 }}"
@@ -1527,9 +1511,6 @@ en:
     doctor:
       runningDiagnostics: "Running diagnostics..."
       diagnosticsComplete: "Diagnostics complete"
-      defaultAccountOverrideFileChecks:
-        overrideActive: "Default account override file active: {{ defaultAccountOverrideFile }}"
-        overrideAccountId: "Active account ID: {{ overrideAccountId }}"
       accountChecks:
         active: "Default account active"
         inactive: "Default account isn't active"
@@ -1576,8 +1557,6 @@ en:
           defaultAccountSubHeader: "Default Account: {{accountDetails}}"
           noConfigFile: "CLI configuration not found"
           noConfigFileSecondary: "Run {{command}} and follow the prompts to create your CLI configuration file and connect it to your HubSpot account"
-        defaultAccountOverrideFile:
-          header: "Default account override file path:"
         projectConfig:
           header: "Project configuration"
           projectDirSubHeader: "Project dir: {{#bold}}{{ projectDir }}{{/bold}}"

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/doctor/Diagnosis.d.ts

@@ -21,7 +21,6 @@ export declare class Diagnosis {
     addCliSection(section: Section): void;
     addProjectSection(section: Section): void;
     addCLIConfigSection(section: Section): void;
-    addDefaultAccountOverrideFileSection(section: Section): void;
     toString(): string;
     private generateSections;
 }

package/lib/doctor/Diagnosis.js

@@ -29,10 +29,6 @@ class Diagnosis {
                 header: i18n(`${i18nKey}.cliConfig.header`),
                 sections: [],
             },
-            defaultAccountOverrideFile: {
-                header: i18n(`${i18nKey}.defaultAccountOverrideFile.header`),
-                sections: [],
-            },
             project: {
                 header: i18n(`${i18nKey}.projectConfig.header`),
                 subheaders: [
@@ -75,9 +71,6 @@ class Diagnosis {
     addCLIConfigSection(section) {
         this.diagnosis.cliConfig.sections.push(section);
     }
-    addDefaultAccountOverrideFileSection(section) {
-        this.diagnosis.defaultAccountOverrideFile.sections.push(section);
-    }
     toString() {
         const output = [];
         for (const value of Object.values(this.diagnosis)) {

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -21,7 +21,6 @@ export interface DiagnosticInfo extends FilesInfo {
         npm: string | null;
     };
     config: string | null;
-    defaultAccountOverrideFile: string | null | undefined;
     project: {
         details?: Project;
         config?: ProjectConfig;

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -60,7 +60,6 @@ class DiagnosticInfoBuilder {
             arch,
             path: mainModule?.path,
             config: (0, config_2.getConfigPath)(),
-            defaultAccountOverrideFile: (0, config_1.getDefaultAccountOverrideFilePath)(),
             versions: {
                 [hubspotCli]: package_json_1.default.version,
                 node,

package/lib/doctor/Doctor.d.ts

@@ -10,7 +10,6 @@ export declare class Doctor {
     private performCliChecks;
     private performProjectChecks;
     private performCliConfigChecks;
-    private performDefaultAccountOverrideFileChecks;
     private checkIfAccessTokenValid;
     private checkIfNodeIsInstalled;
     private checkIfNpmIsInstalled;

package/lib/doctor/Doctor.js

@@ -49,7 +49,6 @@ class Doctor {
         await Promise.all([
             ...this.performCliChecks(),
             ...this.performCliConfigChecks(),
-            ...this.performDefaultAccountOverrideFileChecks(),
             ...(this.projectConfig?.projectConfig ? this.performProjectChecks() : []),
         ]);
         SpinniesManager_1.default.succeed('runningDiagnostics', {
@@ -88,24 +87,6 @@ class Doctor {
         }
         return [this.checkIfAccessTokenValid()];
     }
-    performDefaultAccountOverrideFileChecks() {
-        const localI18nKey = `${i18nKey}.defaultAccountOverrideFileChecks`;
-        if (this.diagnosticInfo?.defaultAccountOverrideFile) {
-            this.diagnosis?.addDefaultAccountOverrideFileSection({
-                type: 'warning',
-                message: i18n(`${localI18nKey}.overrideActive`, {
-                    defaultAccountOverrideFile: this.diagnosticInfo.defaultAccountOverrideFile,
-                }),
-            });
-            this.diagnosis?.addDefaultAccountOverrideFileSection({
-                type: 'warning',
-                message: i18n(`${localI18nKey}.overrideAccountId`, {
-                    overrideAccountId: (0, config_1.getCWDAccountOverride)(),
-                }),
-            });
-        }
-        return [];
-    }
     async checkIfAccessTokenValid() {
         const localI18nKey = `${i18nKey}.accountChecks`;
         try {

package/lib/errorHandlers/index.js

@@ -53,7 +53,7 @@ function debugError(error, context) {
     if (error instanceof Error && error.cause) {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.errorCause`, {
             cause: (0, axios_1.isAxiosError)(error.cause)
-                ? `${error.cause}`
+                ? `${error.cause.message}`
                 : util_1.default.inspect(error.cause, false, null, true),
         }));
     }

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,9 +77,28 @@ 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) {
-            console.log(error);
             resolve({ uploadError: error });
         }
         else if (callbackFunc) {

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.9-experimental.0",
+    "version": "7.0.10-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": "0.1.2-experimental.0",
+        "@hubspot/local-dev-lib": "0.1.1-experimental.0",
+        "@hubspot/project-parsing-lib": "0.0.3-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",

package/commands/account/createOverride.d.ts

@@ -1,10 +0,0 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: null;
-export declare const command = "create-override [account]";
-type AccountInfoArgs = CommonArgs & ConfigArgs & {
-    account: string | number;
-};
-export declare function handler(args: ArgumentsCamelCase<AccountInfoArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountInfoArgs>;
-export {};

package/commands/account/createOverride.js

@@ -1,64 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.describe = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const path_2 = require("@hubspot/local-dev-lib/path");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const config_1 = require("@hubspot/local-dev-lib/constants/config");
-const config_2 = require("@hubspot/local-dev-lib/config");
-const commonOpts_1 = require("../../lib/commonOpts");
-const lang_1 = require("../../lib/lang");
-const exitCodes_1 = require("../../lib/enums/exitCodes");
-const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const index_1 = require("../../lib/errorHandlers/index");
-const i18nKey = 'commands.account.subcommands.createOverride';
-exports.describe = null; // i18n(`${i18nKey}.describe`);
-exports.command = 'create-override [account]';
-async function handler(args) {
-    let overrideDefaultAccount = args.account;
-    if (!overrideDefaultAccount) {
-        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-    }
-    else if (!(0, config_2.getAccountId)(overrideDefaultAccount)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, {
-            configPath: (0, config_2.getConfigPath)() || '',
-        }));
-        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-    }
-    const accountId = (0, config_2.getAccountId)(overrideDefaultAccount);
-    try {
-        const overrideFilePath = path_1.default.join((0, path_2.getCwd)(), config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
-        await fs_extra_1.default.writeFile(overrideFilePath, accountId.toString(), 'utf8');
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, { overrideFilePath }));
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-    }
-    catch (e) {
-        (0, index_1.logError)(e);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-}
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
-        type: 'string',
-    });
-    yargs.example([
-        ['$0 account create-override', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        [
-            '$0 account create-override 12345678',
-            (0, lang_1.i18n)(`${i18nKey}.examples.idBased`),
-        ],
-        [
-            '$0 account create-override MyAccount',
-            (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`),
-        ],
-    ]);
-    return yargs;
-}