@hubspot/cli 7.7.0-experimental.3 → 7.7.0

package/lib/middleware/configMiddleware.js

@@ -1,24 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleDeprecatedEnvVariables = handleDeprecatedEnvVariables;
-exports.injectAccountIdMiddleware = injectAccountIdMiddleware;
-exports.loadConfigMiddleware = loadConfigMiddleware;
-exports.validateAccountOptions = validateAccountOptions;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const validation_1 = require("../validation");
-const exitCodes_1 = require("../enums/exitCodes");
-const lang_1 = require("../lang");
-const ui_1 = require("../ui");
-const utils_1 = require("./utils");
-function handleDeprecatedEnvVariables(argv) {
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } from '@hubspot/local-dev-lib/config';
+import { validateAccount } from '../validation.js';
+import { EXIT_CODES } from '../enums/exitCodes.js';
+import { i18n } from '../lang.js';
+import { uiDeprecatedTag } from '../ui/index.js';
+import { isTargetedCommand } from './utils.js';
+import { parseStringToNumber } from '../parsing.js';
+import { uiLogger } from '../ui/logger.js';
+import { lib } from '../../lang/en.js';
+export 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
     if (argv.useEnv &&
         process.env.HUBSPOT_PORTAL_ID &&
         !process.env.HUBSPOT_ACCOUNT_ID) {
-        (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.generalErrors.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
-            configPath: (0, config_1.getConfigPath)(),
+        uiDeprecatedTag(i18n(`commands.generalErrors.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
+            configPath: getConfigPath(),
         }));
         process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
     }
@@ -26,55 +23,67 @@ function handleDeprecatedEnvVariables(argv) {
 /**
  * Auto-injects the derivedAccountId flag into all commands
  */
-async function injectAccountIdMiddleware(argv) {
+export 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 = parseStringToNumber(process.env.HUBSPOT_ACCOUNT_ID);
+        }
+        catch (err) {
+            uiLogger.error(lib.configMiddleWare.invalidAccountIdEnvironmentVariable);
+        }
     }
     else {
-        argv.derivedAccountId = (0, config_1.getAccountId)(account);
+        argv.derivedAccountId = getAccountId(account);
     }
 }
 const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
+    mcp: {
+        target: false,
+        subCommands: {
+            setup: { target: true },
+            start: { target: true },
+        },
+    },
 };
-async function loadConfigMiddleware(argv) {
+export async function loadConfigMiddleware(argv) {
     // Skip this when no command is provided
     if (!argv._.length || argv.help) {
         return;
     }
     const maybeValidateConfig = () => {
-        if (!(0, utils_1.isTargetedCommand)(argv._, SKIP_CONFIG_VALIDATION) &&
-            !(0, config_1.validateConfig)()) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        if (!isTargetedCommand(argv._, SKIP_CONFIG_VALIDATION) &&
+            !validateConfig()) {
+            process.exit(EXIT_CODES.ERROR);
         }
     };
-    if (!(0, config_1.configFileExists)(true) &&
-        (0, utils_1.isTargetedCommand)(argv._, {
+    if (!configFileExists(true) &&
+        isTargetedCommand(argv._, {
             account: { target: false, subCommands: { auth: { target: true } } },
             config: { target: false, subCommands: { migrate: { target: true } } },
         })) {
         return;
     }
-    if ((0, config_1.configFileExists)(true) &&
+    if (configFileExists(true) &&
         argv.config &&
-        !(0, utils_1.isTargetedCommand)(argv._, {
+        !isTargetedCommand(argv._, {
             config: { target: false, subCommands: { migrate: { target: true } } },
         })) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.generalErrors.loadConfigMiddleware.configFileExists`, {
-            configPath: (0, config_1.getConfigPath)(),
+        logger.error(i18n(`commands.generalErrors.loadConfigMiddleware.configFileExists`, {
+            configPath: getConfigPath(),
         }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
-    else if (!(0, utils_1.isTargetedCommand)(argv._, { init: { target: true } })) {
-        const config = (0, config_1.loadConfig)(argv.config, argv);
+    else if (!isTargetedCommand(argv._, { init: { target: true } })) {
+        const config = loadConfig(argv.config, argv);
         // 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 ((0, utils_1.isTargetedCommand)(argv._, { auth: { target: true } }) && !config) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        if (isTargetedCommand(argv._, { auth: { target: true } }) && !config) {
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     maybeValidateConfig();
@@ -87,6 +96,7 @@ const accountsSubCommands = {
         list: { target: true },
         ls: { target: true },
         remove: { target: true },
+        use: { target: true },
     },
 };
 const sandboxesSubCommands = {
@@ -104,21 +114,28 @@ const configSubCommands = {
 const SKIP_ACCOUNT_VALIDATION = {
     init: { target: true },
     auth: { target: true },
+    mcp: {
+        target: false,
+        subCommands: {
+            setup: { target: true },
+            start: { target: true },
+        },
+    },
     account: accountsSubCommands,
     accounts: accountsSubCommands,
     sandbox: sandboxesSubCommands,
     sandboxes: sandboxesSubCommands,
     config: configSubCommands,
 };
-async function validateAccountOptions(argv) {
+export async function validateAccountOptions(argv) {
     // Skip this when no command is provided
     if (argv._.length && !argv.help) {
         let validAccount = true;
-        if (!(0, utils_1.isTargetedCommand)(argv._, SKIP_ACCOUNT_VALIDATION)) {
-            validAccount = await (0, validation_1.validateAccount)(argv);
+        if (!isTargetedCommand(argv._, SKIP_ACCOUNT_VALIDATION)) {
+            validAccount = await validateAccount(argv);
         }
         if (!validAccount) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
     }
 }

package/lib/middleware/fireAlarmMiddleware.d.ts

@@ -1,4 +1,4 @@
 import { Arguments } from 'yargs';
-export declare function checkFireAlarms(args: Arguments<{
-    derivedAccountId: number;
+export declare function checkFireAlarms(argv: Arguments<{
+    derivedAccountId?: number;
 }>): Promise<void>;

package/lib/middleware/fireAlarmMiddleware.js

@@ -1,14 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFireAlarms = checkFireAlarms;
-const chalk_1 = __importDefault(require("chalk"));
-const fireAlarm_1 = require("@hubspot/local-dev-lib/api/fireAlarm");
-const errorHandlers_1 = require("../errorHandlers");
-const package_json_1 = __importDefault(require("../../package.json"));
-const boxen_1 = require("../ui/boxen");
+import chalk from 'chalk';
+import { fetchFireAlarms } from '@hubspot/local-dev-lib/api/fireAlarm';
+import { debugError } from '../errorHandlers/index.js';
+import pkg from '../../package.json' with { type: 'json' };
+import { logInBox } from '../ui/boxen.js';
+import { renderInline } from '../../ui/index.js';
+import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
 /*
  * Versions can be formatted like this:
  * =7.2.2 -> targets the exact version 7.2.2
@@ -86,11 +82,11 @@ function filterFireAlarm(fireAlarm, command, version) {
 async function getFireAlarms(accountId, command, version) {
     let relevantAlarms = [];
     try {
-        const { data: fireAlarms } = await (0, fireAlarm_1.fetchFireAlarms)(accountId);
+        const { data: fireAlarms } = await fetchFireAlarms(accountId);
         relevantAlarms = fireAlarms.filter(fireAlarm => filterFireAlarm(fireAlarm, command, version));
     }
     catch (error) {
-        (0, errorHandlers_1.debugError)(error);
+        debugError(error);
     }
     return relevantAlarms;
 }
@@ -100,24 +96,34 @@ async function logFireAlarms(accountId, command, version) {
         const notifications = alarms.reduce((acc, alarm) => {
             if (alarm.title && alarm.message) {
                 return (acc +
-                    `${acc.length > 0 ? '\n\n' : ''}${chalk_1.default.bold(alarm.title)}\n${alarm.message}`);
+                    `${acc.length > 0 ? '\n\n' : ''}${chalk.bold(alarm.title)}\n${alarm.message}`);
             }
             return acc;
         }, '');
-        await (0, boxen_1.logInBox)({
-            contents: notifications,
-            options: {
+        if (!process.env.HUBSPOT_ENABLE_INK) {
+            await logInBox({
+                contents: notifications,
+                options: {
+                    title: 'Notifications',
+                },
+            });
+        }
+        else {
+            await renderInline(getWarningBox({
                 title: 'Notifications',
-            },
-        });
+                message: notifications,
+            }));
+        }
     }
 }
-async function checkFireAlarms(args) {
-    const { derivedAccountId } = args;
+export async function checkFireAlarms(argv) {
+    const { derivedAccountId } = argv;
     try {
-        await logFireAlarms(derivedAccountId, args._.join(' '), package_json_1.default.version);
+        if (derivedAccountId) {
+            await logFireAlarms(derivedAccountId, argv._.join(' '), pkg.version);
+        }
     }
     catch (error) {
-        (0, errorHandlers_1.debugError)(error);
+        debugError(error);
     }
 }

package/lib/middleware/gitMiddleware.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndWarnGitInclusionMiddleware = checkAndWarnGitInclusionMiddleware;
-const config_1 = require("@hubspot/local-dev-lib/config");
-const git_1 = require("../ui/git");
-function checkAndWarnGitInclusionMiddleware(argv) {
+import { getConfigPath } from '@hubspot/local-dev-lib/config';
+import { checkAndWarnGitInclusion } from '../ui/git.js';
+export function checkAndWarnGitInclusionMiddleware(argv) {
     // Skip this when no command is provided
     if (argv._.length) {
-        const configPath = (0, config_1.getConfigPath)();
+        const configPath = getConfigPath();
         if (configPath) {
-            (0, git_1.checkAndWarnGitInclusion)(configPath);
+            checkAndWarnGitInclusion(configPath);
         }
     }
 }

package/lib/middleware/notificationsMiddleware.js

@@ -1,19 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyAboutUpdates = notifyAboutUpdates;
-// Update-notifier is CommonJS, so we need to use require
-const updateNotifier = require('update-notifier');
-const chalk = require('chalk');
-const pkg = require('../../package.json');
-const { UI_COLORS, uiCommandReference } = require('../ui');
-const { i18n } = require('../lang');
+import updateNotifier from 'update-notifier';
+import chalk from 'chalk';
+import pkg from '../../package.json' with { type: 'json' };
+import { UI_COLORS, uiCommandReference } from '../ui/index.js';
+import { i18n } from '../lang.js';
 const notifier = updateNotifier({
     pkg: { ...pkg, name: '@hubspot/cli' },
     distTag: 'latest',
     shouldNotifyInNpmScript: true,
 });
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-function notifyAboutUpdates() {
+export function notifyAboutUpdates() {
     notifier.notify({
         message: pkg.name === CMS_CLI_PACKAGE_NAME
             ? i18n(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
@@ -31,7 +27,7 @@ function notifyAboutUpdates() {
             textAlignment: 'center',
             borderStyle: 'round',
             title: pkg.name === CMS_CLI_PACKAGE_NAME
-                ? null
+                ? undefined
                 : chalk.bold(i18n(`commands.generalErrors.updateNotify.notifyTitle`)),
         },
     });

package/lib/middleware/requestMiddleware.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setRequestHeaders = setRequestHeaders;
-const http_1 = require("@hubspot/local-dev-lib/http");
-const package_json_1 = __importDefault(require("../../package.json"));
-function setRequestHeaders() {
-    (0, http_1.addUserAgentHeader)('HubSpot CLI', package_json_1.default.version);
+import { addUserAgentHeader } from '@hubspot/local-dev-lib/http';
+import pkg from '../../package.json' with { type: 'json' };
+export function setRequestHeaders() {
+    addUserAgentHeader('HubSpot CLI', pkg.version);
 }

package/lib/middleware/utils.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTargetedCommand = isTargetedCommand;
-function isTargetedCommand(commandParts, targetCommandMap) {
+export function isTargetedCommand(commandParts, targetCommandMap) {
     const currentCommand = commandParts[0];
     if (!targetCommandMap[currentCommand]) {
         return false;

package/lib/middleware/yargsChecksMiddleware.js

@@ -1,24 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.performChecks = performChecks;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const exitCodes_1 = require("../enums/exitCodes");
-const lang_1 = require("../lang");
-const config_1 = require("../projects/config");
-const utils_1 = require("./utils");
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { EXIT_CODES } from '../enums/exitCodes.js';
+import { i18n } from '../lang.js';
+import { getIsInProject } from '../projects/config.js';
+import { isTargetedCommand } from './utils.js';
 const UPLOAD_AND_WATCH_COMMANDS = {
     upload: { target: true },
     watch: { target: true },
 };
-function performChecks(argv) {
+export function performChecks(argv) {
     // Require "project" command when running upload/watch inside of a project
-    if ((0, utils_1.isTargetedCommand)(argv._, UPLOAD_AND_WATCH_COMMANDS) &&
-        (0, config_1.getIsInProject)(argv.src)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.generalErrors.srcIsProject`, {
+    if (isTargetedCommand(argv._, UPLOAD_AND_WATCH_COMMANDS) &&
+        getIsInProject(argv.src)) {
+        logger.error(i18n(`commands.generalErrors.srcIsProject`, {
             src: argv.src || './',
             command: argv._.join(' '),
         }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        process.exit(EXIT_CODES.ERROR);
     }
     return true;
 }

package/lib/npm.js

@@ -1,19 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PACKAGE_MANAGER = void 0;
-exports.isGloballyInstalled = isGloballyInstalled;
-exports.getLatestCliVersion = getLatestCliVersion;
-exports.executeInstall = executeInstall;
-const child_process_1 = require("child_process");
-const util_1 = __importDefault(require("util"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const package_json_1 = __importDefault(require("../package.json"));
-exports.DEFAULT_PACKAGE_MANAGER = 'npm';
-async function isGloballyInstalled(packageName) {
-    const exec = util_1.default.promisify(child_process_1.exec);
+import { exec as execAsync } from 'node:child_process';
+import util from 'util';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import pkg from '../package.json' with { type: 'json' };
+export const DEFAULT_PACKAGE_MANAGER = 'npm';
+export async function isGloballyInstalled(packageName) {
+    const exec = util.promisify(execAsync);
     try {
         await exec(`${packageName} --version`);
         return true;
@@ -22,15 +13,15 @@ async function isGloballyInstalled(packageName) {
         return false;
     }
 }
-async function getLatestCliVersion() {
-    const exec = util_1.default.promisify(child_process_1.exec);
-    const { stdout } = await exec(`npm info ${package_json_1.default.name} dist-tags --json`);
+export async function getLatestCliVersion() {
+    const exec = util.promisify(execAsync);
+    const { stdout } = await exec(`npm info ${pkg.name} dist-tags --json`);
     const { latest, next } = JSON.parse(stdout);
     return { latest, next };
 }
-async function executeInstall(packages = [], flags, options) {
-    const installCommand = `${exports.DEFAULT_PACKAGE_MANAGER} install${flags ? ` ${flags}` : ''} ${packages.join(' ')}`;
-    logger_1.logger.debug('Running ', installCommand);
-    const exec = util_1.default.promisify(child_process_1.exec);
+export async function executeInstall(packages = [], flags, options) {
+    const installCommand = `${DEFAULT_PACKAGE_MANAGER} install${flags ? ` ${flags}` : ''} ${packages.join(' ')}`;
+    logger.debug('Running ', installCommand);
+    const exec = util.promisify(execAsync);
     await exec(installCommand, options);
 }

package/lib/oauth.js

@@ -1,33 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.authenticateWithOauth = authenticateWithOauth;
-const express_1 = __importDefault(require("express"));
-const open_1 = __importDefault(require("open"));
-const OAuth2Manager_1 = require("@hubspot/local-dev-lib/models/OAuth2Manager");
-const config_1 = require("@hubspot/local-dev-lib/config");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const oauth_1 = require("@hubspot/local-dev-lib/oauth");
-const urls_1 = require("@hubspot/local-dev-lib/urls");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const process_1 = require("./process");
-const lang_1 = require("./lang");
-const exitCodes_1 = require("./enums/exitCodes");
+import express from 'express';
+import open from 'open';
+import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
+import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
+import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { DEFAULT_OAUTH_SCOPES } from '@hubspot/local-dev-lib/constants/auth';
+import { handleExit } from './process.js';
+import { i18n } from './lang.js';
+import { EXIT_CODES } from './enums/exitCodes.js';
 const PORT = 3000;
 const redirectUri = `http://localhost:${PORT}/oauth-callback`;
 function buildAuthUrl(oauthManager) {
     const { env: accountEnv, clientId, scopes: accountScopes, } = oauthManager.account;
-    const env = accountEnv || environments_1.ENVIRONMENTS.PROD;
-    const scopes = accountScopes || auth_1.DEFAULT_OAUTH_SCOPES;
+    const env = accountEnv || ENVIRONMENTS.PROD;
+    const scopes = accountScopes || DEFAULT_OAUTH_SCOPES;
     if (!clientId) {
-        logger_1.logger.error((0, lang_1.i18n)(`lib.oauth.missingClientId`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        logger.error(i18n(`lib.oauth.missingClientId`));
+        process.exit(EXIT_CODES.ERROR);
     }
-    return (`${(0, urls_1.getHubSpotWebsiteOrigin)(env)}/oauth/${oauthManager.account.accountId}/authorize` +
+    return (`${getHubSpotWebsiteOrigin(env)}/oauth/${oauthManager.account.accountId}/authorize` +
         `?client_id=${encodeURIComponent(clientId)}` + // app's client ID
         `&scope=${encodeURIComponent(scopes.join(' '))}` + // scopes being requested by the app
         `&redirect_uri=${encodeURIComponent(redirectUri)}` // where to send the user after the consent page
@@ -37,16 +31,16 @@ function handleServerOnProcessEnd(server) {
     const shutdownServerIfRunning = () => {
         server?.close();
     };
-    (0, process_1.handleExit)(shutdownServerIfRunning);
+    handleExit(shutdownServerIfRunning);
 }
 async function authorize(oauthManager) {
     if (process.env.BROWSER !== 'none') {
-        (0, open_1.default)(buildAuthUrl(oauthManager), { url: true });
+        open(buildAuthUrl(oauthManager), { url: true });
     }
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
         let server;
-        const app = (0, express_1.default)();
+        const app = express();
         app.get('/oauth-callback', async (req, res) => {
             if (req.query.code) {
                 const authCodeProof = {
@@ -83,21 +77,21 @@ async function authorize(oauthManager) {
                 reject();
             }
         });
-        server = app.listen(PORT, () => logger_1.logger.log(`Waiting for authorization...`));
+        server = app.listen(PORT, () => logger.log(`Waiting for authorization...`));
         handleServerOnProcessEnd(server);
     });
 }
 function setupOauth(accountConfig) {
-    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
-    const config = (0, config_1.getAccountConfig)(accountId);
-    return new OAuth2Manager_1.OAuth2Manager({
+    const accountId = getAccountIdentifier(accountConfig);
+    const config = getAccountConfig(accountId);
+    return new OAuth2Manager({
         ...accountConfig,
-        env: accountConfig.env || config?.env || environments_1.ENVIRONMENTS.PROD,
+        env: accountConfig.env || config?.env || ENVIRONMENTS.PROD,
     });
 }
-async function authenticateWithOauth(accountConfig) {
+export async function authenticateWithOauth(accountConfig) {
     const oauthManager = setupOauth(accountConfig);
-    logger_1.logger.log('Authorizing');
+    logger.log('Authorizing');
     await authorize(oauthManager);
-    (0, oauth_1.addOauthToAccountConfig)(oauthManager);
+    addOauthToAccountConfig(oauthManager);
 }

package/lib/parsing.d.ts

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

package/lib/parsing.js

@@ -0,0 +1,8 @@
+import { lib } from '../lang/en.js';
+export function parseStringToNumber(maybeNumber) {
+    const result = parseInt(maybeNumber, 10);
+    if (Number.isNaN(result) || !/^-?\d+$/.test(maybeNumber)) {
+        throw new Error(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

@@ -1,24 +1,22 @@
-"use strict";
-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");
-exports.DEFAULT_POLLING_STATES = {
+import { DEFAULT_POLLING_DELAY } from './constants.js';
+import { lib } from '../lang/en.js';
+export const DEFAULT_POLLING_STATES = {
     STARTED: 'STARTED',
     SUCCESS: 'SUCCESS',
     ERROR: 'ERROR',
     REVERTED: 'REVERTED',
     FAILURE: 'FAILURE',
 };
-exports.DEFAULT_POLLING_STATUS_LOOKUP = {
-    successStates: [exports.DEFAULT_POLLING_STATES.SUCCESS],
+export const DEFAULT_POLLING_STATUS_LOOKUP = {
+    successStates: [DEFAULT_POLLING_STATES.SUCCESS],
     errorStates: [
-        exports.DEFAULT_POLLING_STATES.ERROR,
-        exports.DEFAULT_POLLING_STATES.REVERTED,
-        exports.DEFAULT_POLLING_STATES.FAILURE,
+        DEFAULT_POLLING_STATES.ERROR,
+        DEFAULT_POLLING_STATES.REVERTED,
+        DEFAULT_POLLING_STATES.FAILURE,
     ],
 };
-function poll(callback, statusLookup = exports.DEFAULT_POLLING_STATUS_LOOKUP) {
+export function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP, timeoutMs = 60000 // Default 60 second timeout
+) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {
@@ -26,17 +24,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);
+        }, DEFAULT_POLLING_DELAY);
+        // Set a timeout to stop polling after specified duration
+        const timeoutId = setTimeout(() => {
+            clearInterval(pollInterval);
+            reject(new Error(lib.polling.timeoutError(timeoutMs)));
+        }, timeoutMs);
     });
 }