@hubspot/local-dev-lib 0.5.0-experimental.0 → 0.5.0-experimental.10

package/config/index.d.ts

@@ -4,6 +4,7 @@ import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
 export declare function localConfigFileExists(): boolean;
 export declare function globalConfigFileExists(): boolean;
+export declare function configFileExists(): boolean;
 export declare function getConfigFilePath(): string;
 export declare function getConfig(): HubSpotConfig;
 export declare function isConfigValid(): boolean;
@@ -15,7 +16,7 @@ export declare function getConfigAccountIfExists(identifier: number | string): H
 export declare function getConfigDefaultAccount(): HubSpotConfigAccount;
 export declare function getConfigDefaultAccountIfExists(): HubSpotConfigAccount | undefined;
 export declare function getAllConfigAccounts(): HubSpotConfigAccount[];
-export declare function getConfigAccountEnvironment(identifier?: number | string): Environment;
+export declare function getConfigAccountEnvironment(identifier: number | string): Environment;
 export declare function addConfigAccount(accountToAdd: HubSpotConfigAccount): void;
 export declare function updateConfigAccount(updatedAccount: HubSpotConfigAccount): void;
 export declare function setConfigAccountAsDefault(identifier: number | string): void;
@@ -23,7 +24,7 @@ export declare function renameConfigAccount(currentName: string, newName: string
 export declare function removeAccountFromConfig(accountId: number): void;
 export declare function updateHttpTimeout(timeout: string | number): void;
 export declare function updateAllowUsageTracking(isAllowed: boolean): void;
-export declare function updateAllowAutoUpdates(enabled: boolean): void;
+export declare function updateAllowAutoUpdates(isEnabled: boolean): void;
 export declare function updateAutoOpenBrowser(isEnabled: boolean): void;
 export declare function updateDefaultCmsPublishMode(cmsPublishMode: CmsPublishMode): void;
 export declare function isConfigFlagEnabled(flag: ConfigFlag, defaultValue?: boolean): boolean;

package/config/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFile = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.globalConfigFileExists = exports.localConfigFileExists = void 0;
+exports.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFile = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.configFileExists = exports.globalConfigFileExists = exports.localConfigFileExists = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
@@ -12,22 +12,33 @@ const files_1 = require("../constants/files");
 const lang_1 = require("../utils/lang");
 const defaultAccountOverride_1 = require("./defaultAccountOverride");
 const environment_1 = require("../lib/environment");
+const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
+const config_2 = require("../constants/config");
 function localConfigFileExists() {
     return Boolean((0, utils_1.getLocalConfigFilePath)());
 }
 exports.localConfigFileExists = localConfigFileExists;
 function globalConfigFileExists() {
-    return fs_extra_1.default.existsSync((0, utils_1.getGlobalConfigFilePath)());
+    return (0, utils_1.doesConfigFileExistAtPath)((0, utils_1.getGlobalConfigFilePath)());
 }
 exports.globalConfigFileExists = globalConfigFileExists;
+function configFileExists() {
+    try {
+        return (0, utils_1.doesConfigFileExistAtPath)(getConfigFilePath());
+    }
+    catch (error) {
+        return false;
+    }
+}
+exports.configFileExists = configFileExists;
 function getConfigDefaultFilePath() {
     const globalConfigFilePath = (0, utils_1.getGlobalConfigFilePath)();
-    if (fs_extra_1.default.existsSync(globalConfigFilePath)) {
+    if ((0, utils_1.doesConfigFileExistAtPath)(globalConfigFilePath)) {
         return globalConfigFilePath;
     }
     const localConfigFilePath = (0, utils_1.getLocalConfigFilePath)();
     if (!localConfigFilePath) {
-        throw new Error((0, lang_1.i18n)('config.getDefaultConfigFilePath.error'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getDefaultConfigFilePath.error'), config_2.HUBSPOT_CONFIG_ERROR_TYPES.CONFIG_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return localConfigFilePath;
 }
@@ -37,14 +48,22 @@ function getConfigFilePath() {
 }
 exports.getConfigFilePath = getConfigFilePath;
 function getConfig() {
-    const { useEnvironmentConfig } = (0, utils_1.getConfigPathEnvironmentVariables)();
-    if (useEnvironmentConfig) {
-        return (0, utils_1.buildConfigFromEnvironment)();
-    }
-    const pathToRead = getConfigFilePath();
-    logger_1.logger.debug((0, lang_1.i18n)('config.getConfig', { path: pathToRead }));
-    const configFileSource = (0, utils_1.readConfigFile)(pathToRead);
-    return (0, utils_1.parseConfig)(configFileSource);
+    let pathToRead;
+    try {
+        const { useEnvironmentConfig } = (0, utils_1.getConfigPathEnvironmentVariables)();
+        if (useEnvironmentConfig) {
+            return (0, utils_1.buildConfigFromEnvironment)();
+        }
+        pathToRead = getConfigFilePath();
+        logger_1.logger.debug((0, lang_1.i18n)('config.getConfig.reading', { path: pathToRead }));
+        const configFileSource = (0, utils_1.readConfigFile)(pathToRead);
+        return (0, utils_1.parseConfig)(configFileSource, pathToRead);
+    }
+    catch (err) {
+        throw new HubSpotConfigError_1.HubSpotConfigError(pathToRead
+            ? (0, lang_1.i18n)('config.getConfig.errorWithPath', { path: pathToRead })
+            : (0, lang_1.i18n)('config.getConfig.error'), config_2.HUBSPOT_CONFIG_ERROR_TYPES.CONFIG_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: err });
+    }
 }
 exports.getConfig = getConfig;
 function isConfigValid() {
@@ -96,14 +115,22 @@ function createEmptyConfigFile(useGlobalConfig = false) {
 exports.createEmptyConfigFile = createEmptyConfigFile;
 function deleteConfigFile() {
     const pathToDelete = getConfigFilePath();
-    fs_extra_1.default.unlinkSync(pathToDelete);
+    try {
+        fs_extra_1.default.unlinkSync(pathToDelete);
+    }
+    catch (error) {
+        const { message, type } = (0, utils_1.handleConfigFileSystemError)(error, pathToDelete);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.DELETE, {
+            cause: error,
+        });
+    }
 }
 exports.deleteConfigFile = deleteConfigFile;
 function getConfigAccountById(accountId) {
     const { accounts } = getConfig();
     const account = (0, utils_1.getConfigAccountByIdentifier)(accounts, config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID, accountId);
     if (!account) {
-        throw new Error((0, lang_1.i18n)('config.getConfigAccountById.error', { accountId }));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigAccountById.error', { accountId }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return account;
 }
@@ -112,7 +139,7 @@ function getConfigAccountByName(accountName) {
     const { accounts } = getConfig();
     const account = (0, utils_1.getConfigAccountByIdentifier)(accounts, config_1.ACCOUNT_IDENTIFIERS.NAME, accountName);
     if (!account) {
-        throw new Error((0, lang_1.i18n)('config.getConfigAccountByName.error', { accountName }));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigAccountByName.error', { accountName }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return account;
 }
@@ -125,18 +152,20 @@ exports.getConfigAccountIfExists = getConfigAccountIfExists;
 function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }
     if (!defaultAccountToUse) {
-        throw new Error((0, lang_1.i18n)('config.getConfigDefaultAccount.fieldMissingError'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigDefaultAccount.fieldMissingError'), config_2.HUBSPOT_CONFIG_ERROR_TYPES.NO_DEFAULT_ACCOUNT, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     const account = (0, utils_1.getConfigAccountByInferredIdentifier)(accounts, defaultAccountToUse);
     if (!account) {
-        throw new Error((0, lang_1.i18n)('config.getConfigDefaultAccount.accountMissingError', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigDefaultAccount.accountMissingError', {
             defaultAccountToUse,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return account;
 }
@@ -144,7 +173,10 @@ exports.getConfigDefaultAccount = getConfigDefaultAccount;
 function getConfigDefaultAccountIfExists() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    // Only check for default account override if we're using the global config
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }
@@ -161,27 +193,26 @@ function getAllConfigAccounts() {
 }
 exports.getAllConfigAccounts = getAllConfigAccounts;
 function getConfigAccountEnvironment(identifier) {
-    if (identifier) {
-        const config = getConfig();
-        const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
-        if (account) {
-            return (0, environment_1.getValidEnv)(account.env);
-        }
+    const config = getConfig();
+    const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
+    if (!account) {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigAccountEnvironment.accountNotFound', {
+            identifier,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
-    const defaultAccount = getConfigDefaultAccount();
-    return (0, environment_1.getValidEnv)(defaultAccount.env);
+    return (0, environment_1.getValidEnv)(account.env);
 }
 exports.getConfigAccountEnvironment = getConfigAccountEnvironment;
 function addConfigAccount(accountToAdd) {
     if (!(0, utils_1.isConfigAccountValid)(accountToAdd)) {
-        throw new Error((0, lang_1.i18n)('config.addConfigAccount.invalidAccount'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.addConfigAccount.invalidAccount'), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ACCOUNT, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const config = getConfig();
     const accountInConfig = (0, utils_1.getConfigAccountByIdentifier)(config.accounts, config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID, accountToAdd.accountId);
     if (accountInConfig) {
-        throw new Error((0, lang_1.i18n)('config.addConfigAccount.duplicateAccount', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.addConfigAccount.duplicateAccount', {
             accountId: accountToAdd.accountId,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ACCOUNT, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     config.accounts.push(accountToAdd);
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
@@ -189,14 +220,16 @@ function addConfigAccount(accountToAdd) {
 exports.addConfigAccount = addConfigAccount;
 function updateConfigAccount(updatedAccount) {
     if (!(0, utils_1.isConfigAccountValid)(updatedAccount)) {
-        throw new Error((0, lang_1.i18n)('config.updateConfigAccount.invalidAccount'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateConfigAccount.invalidAccount', {
+            name: updatedAccount.name,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ACCOUNT, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const config = getConfig();
     const accountIndex = (0, utils_1.getConfigAccountIndexById)(config.accounts, updatedAccount.accountId);
     if (accountIndex < 0) {
-        throw new Error((0, lang_1.i18n)('config.updateConfigAccount.accountNotFound', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateConfigAccount.accountNotFound', {
             accountId: updatedAccount.accountId,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     config.accounts[accountIndex] = updatedAccount;
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
@@ -206,9 +239,9 @@ function setConfigAccountAsDefault(identifier) {
     const config = getConfig();
     const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
     if (!account) {
-        throw new Error((0, lang_1.i18n)('config.setConfigAccountAsDefault.accountNotFound', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.setConfigAccountAsDefault.accountNotFound', {
             accountId: identifier,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     config.defaultAccount = account.accountId;
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
@@ -218,15 +251,16 @@ function renameConfigAccount(currentName, newName) {
     const config = getConfig();
     const account = (0, utils_1.getConfigAccountByIdentifier)(config.accounts, config_1.ACCOUNT_IDENTIFIERS.NAME, currentName);
     if (!account) {
-        throw new Error((0, lang_1.i18n)('config.renameConfigAccount.accountNotFound', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.renameConfigAccount.accountNotFound', {
             currentName,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const duplicateAccount = (0, utils_1.getConfigAccountByIdentifier)(config.accounts, config_1.ACCOUNT_IDENTIFIERS.NAME, newName);
     if (duplicateAccount) {
-        throw new Error((0, lang_1.i18n)('config.renameConfigAccount.duplicateAccount', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.renameConfigAccount.duplicateAccount', {
+            currentName,
             newName,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ACCOUNT, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     account.name = newName;
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
@@ -236,9 +270,9 @@ function removeAccountFromConfig(accountId) {
     const config = getConfig();
     const index = (0, utils_1.getConfigAccountIndexById)(config.accounts, accountId);
     if (index < 0) {
-        throw new Error((0, lang_1.i18n)('config.removeAccountFromConfig.accountNotFound', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.removeAccountFromConfig.accountNotFound', {
             accountId,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     config.accounts.splice(index, 1);
     if (config.defaultAccount === accountId) {
@@ -250,9 +284,10 @@ exports.removeAccountFromConfig = removeAccountFromConfig;
 function updateHttpTimeout(timeout) {
     const parsedTimeout = typeof timeout === 'string' ? parseInt(timeout) : timeout;
     if (isNaN(parsedTimeout) || parsedTimeout < config_1.MIN_HTTP_TIMEOUT) {
-        throw new Error((0, lang_1.i18n)('config.updateHttpTimeout.invalidTimeout', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateHttpTimeout.invalidTimeout', {
             minTimeout: config_1.MIN_HTTP_TIMEOUT,
-        }));
+            timeout: parsedTimeout,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_FIELD, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const config = getConfig();
     config.httpTimeout = parsedTimeout;
@@ -260,22 +295,32 @@ function updateHttpTimeout(timeout) {
 }
 exports.updateHttpTimeout = updateHttpTimeout;
 function updateAllowUsageTracking(isAllowed) {
+    if (typeof isAllowed !== 'boolean') {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateAllowUsageTracking.invalidInput', {
+            isAllowed: `${isAllowed}`,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_FIELD, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
+    }
     const config = getConfig();
     config.allowUsageTracking = isAllowed;
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
 }
 exports.updateAllowUsageTracking = updateAllowUsageTracking;
-function updateAllowAutoUpdates(enabled) {
+function updateAllowAutoUpdates(isEnabled) {
+    if (typeof isEnabled !== 'boolean') {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateAllowAutoUpdates.invalidInput', {
+            isEnabled: `${isEnabled}`,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_FIELD, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
+    }
     const config = getConfig();
-    config.allowAutoUpdates = enabled;
+    config.allowAutoUpdates = isEnabled;
     (0, utils_1.writeConfigFile)(config, getConfigFilePath());
 }
 exports.updateAllowAutoUpdates = updateAllowAutoUpdates;
 function updateAutoOpenBrowser(isEnabled) {
     if (typeof isEnabled !== 'boolean') {
-        throw new Error((0, lang_1.i18n)('config.updateAutoOpenBrowser.invalidInput', {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateAutoOpenBrowser.invalidInput', {
             isEnabled: `${isEnabled}`,
-        }));
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_FIELD, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const config = getConfig();
     config.autoOpenBrowser = isEnabled;
@@ -285,7 +330,9 @@ exports.updateAutoOpenBrowser = updateAutoOpenBrowser;
 function updateDefaultCmsPublishMode(cmsPublishMode) {
     if (!cmsPublishMode ||
         !Object.values(files_1.CMS_PUBLISH_MODE).includes(cmsPublishMode)) {
-        throw new Error((0, lang_1.i18n)('config.updateDefaultCmsPublishMode.invalidCmsPublishMode'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.updateDefaultCmsPublishMode.invalidCmsPublishMode', {
+            cmsPublishMode,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_FIELD, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     const config = getConfig();
     config.defaultCmsPublishMode = cmsPublishMode;

package/config/migrate.js

@@ -10,7 +10,7 @@ const config_1 = require("../constants/config");
 const utils_1 = require("./utils");
 function getConfigAtPath(path) {
     const configFileSource = (0, utils_1.readConfigFile)(path);
-    return (0, utils_1.parseConfig)(configFileSource);
+    return (0, utils_1.parseConfig)(configFileSource, path);
 }
 exports.getConfigAtPath = getConfigAtPath;
 function migrateConfigAtPath(path) {

package/config/state.d.ts

@@ -1,3 +1,3 @@
-import { CLIState } from '../types/Config';
-export declare function getStateValue<K extends keyof CLIState>(key: K): CLIState[K];
-export declare function setStateValue<K extends keyof CLIState>(key: K, value: CLIState[K]): void;
+import { HubSpotState } from '../types/Config';
+export declare function getStateValue<K extends keyof HubSpotState>(key: K): HubSpotState[K];
+export declare function setStateValue<K extends keyof HubSpotState>(key: K, value: HubSpotState[K]): void;

package/config/state.js

@@ -29,9 +29,10 @@ const path = __importStar(require("path"));
 const lang_1 = require("../utils/lang");
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
+const config_2 = require("../constants/config");
 const i18nKey = 'config.state';
 const DEFAULT_STATE = {
-    mcpTotalToolCalls: 0,
+    [config_2.MCP_TOTAL_TOOL_CALLS_STATE]: 0,
 };
 function ensureCLIDirectory() {
     try {
@@ -46,19 +47,41 @@ function ensureCLIDirectory() {
         }));
     }
 }
+function sanitizeAndMerge(parsed) {
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return structuredClone(DEFAULT_STATE);
+    }
+    const state = parsed;
+    const result = structuredClone(DEFAULT_STATE);
+    for (const key in DEFAULT_STATE) {
+        const typedKey = key;
+        if (key in state &&
+            typeof state[typedKey] === typeof DEFAULT_STATE[typedKey]) {
+            result[typedKey] = state[typedKey];
+        }
+        // keys not in parsed file remain as DEFAULT values
+    }
+    return result;
+}
 function getCurrentState() {
     try {
-        if (fs.existsSync(config_1.STATE_FILE_PATH)) {
-            const data = fs.readFileSync(config_1.STATE_FILE_PATH, 'utf-8');
-            return JSON.parse(data);
+        if (!fs.existsSync(config_1.STATE_FILE_PATH)) {
+            return structuredClone(DEFAULT_STATE);
         }
+        const data = fs.readFileSync(config_1.STATE_FILE_PATH, 'utf-8');
+        if (!data?.trim()) {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.getCurrentState.debug.emptyStateFile`));
+            return structuredClone(DEFAULT_STATE);
+        }
+        const parsed = JSON.parse(data);
+        return sanitizeAndMerge(parsed);
     }
     catch (error) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.getCurrentState.errors.errorReading`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.getCurrentState.errors.errorReading`, {
             error: error instanceof Error ? error.message : String(error),
         }));
+        return structuredClone(DEFAULT_STATE);
     }
-    return DEFAULT_STATE;
 }
 function getStateValue(key) {
     ensureCLIDirectory();
@@ -68,13 +91,7 @@ function getStateValue(key) {
 exports.getStateValue = getStateValue;
 function setStateValue(key, value) {
     ensureCLIDirectory();
-    let currentState = DEFAULT_STATE;
-    try {
-        currentState = getCurrentState();
-    }
-    catch (error) {
-        logger_1.logger.debug(error);
-    }
+    const currentState = getCurrentState();
     const newState = { ...currentState, [key]: value };
     try {
         fs.writeFileSync(config_1.STATE_FILE_PATH, JSON.stringify(newState, null, 2), 'utf-8');

package/config/utils.d.ts

@@ -1,5 +1,5 @@
 import { ACCOUNT_IDENTIFIERS } from '../constants/config';
-import { HubSpotConfig, DeprecatedHubSpotConfigFields } from '../types/Config';
+import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType } from '../types/Config';
 import { HubSpotConfigAccount, AccountType, TokenInfo } from '../types/Accounts';
 import { ValueOf } from '../types/Utils';
 export declare function getGlobalConfigFilePath(): string;
@@ -9,6 +9,7 @@ export declare function getConfigPathEnvironmentVariables(): {
     useEnvironmentConfig: boolean;
     configFilePathFromEnvironment: string | undefined;
 };
+export declare function doesConfigFileExistAtPath(path: string): boolean;
 export declare function readConfigFile(configPath: string): string;
 export declare function removeUndefinedFieldsFromConfigAccount<T extends HubSpotConfigAccount | Partial<HubSpotConfigAccount> = HubSpotConfigAccount>(account: T): T;
 export declare function formatConfigForWrite(config: HubSpotConfig): {
@@ -62,7 +63,7 @@ export declare function formatConfigForWrite(config: HubSpotConfig): {
 };
 export declare function writeConfigFile(config: HubSpotConfig, configPath: string): void;
 export declare function normalizeParsedConfig(parsedConfig: HubSpotConfig & DeprecatedHubSpotConfigFields): HubSpotConfig;
-export declare function parseConfig(configSource: string): HubSpotConfig;
+export declare function parseConfig(configSource: string, configPath: string): HubSpotConfig;
 export declare function buildConfigFromEnvironment(): HubSpotConfig;
 export declare function getAccountIdentifierAndType(accountIdentifier: string | number): {
     identifier: string | number;
@@ -72,3 +73,7 @@ export declare function getConfigAccountByIdentifier(accounts: Array<HubSpotConf
 export declare function getConfigAccountByInferredIdentifier(accounts: Array<HubSpotConfigAccount>, accountIdentifier: string | number): HubSpotConfigAccount | undefined;
 export declare function getConfigAccountIndexById(accounts: Array<HubSpotConfigAccount>, id: number): number;
 export declare function isConfigAccountValid(account: Partial<HubSpotConfigAccount>): boolean;
+export declare function handleConfigFileSystemError(error: unknown, path: string): {
+    message?: string;
+    type: HubSpotConfigErrorType;
+};

package/config/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConfigAccountValid = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = exports.getLocalConfigFilePath = exports.getGlobalConfigFilePath = void 0;
+exports.handleConfigFileSystemError = exports.isConfigAccountValid = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.doesConfigFileExistAtPath = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = exports.getLocalConfigFilePath = exports.getGlobalConfigFilePath = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
@@ -15,6 +15,7 @@ const environment_1 = require("../lib/environment");
 const path_1 = require("../lib/path");
 const files_1 = require("../constants/files");
 const lang_1 = require("../utils/lang");
+const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
 function getGlobalConfigFilePath() {
     return config_1.GLOBAL_CONFIG_PATH;
 }
@@ -23,7 +24,7 @@ function getLocalConfigFilePath() {
     return (0, findup_sync_1.default)([
         config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
         config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME.replace('.yml', '.yaml'),
-    ]);
+    ], { cwd: (0, path_1.getCwd)() });
 }
 exports.getLocalConfigFilePath = getLocalConfigFilePath;
 function getLocalConfigDefaultFilePath() {
@@ -35,7 +36,7 @@ function getConfigPathEnvironmentVariables() {
     const useEnvironmentConfig = process.env[config_1.ENVIRONMENT_VARIABLES.USE_ENVIRONMENT_HUBSPOT_CONFIG] ===
         'true';
     if (configFilePathFromEnvironment && useEnvironmentConfig) {
-        throw new Error((0, lang_1.i18n)('config.utils.getConfigPathEnvironmentVariables.invalidEnvironmentVariables'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.utils.getConfigPathEnvironmentVariables.invalidEnvironmentVariables'), config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return {
         configFilePathFromEnvironment,
@@ -43,18 +44,24 @@ function getConfigPathEnvironmentVariables() {
     };
 }
 exports.getConfigPathEnvironmentVariables = getConfigPathEnvironmentVariables;
+function doesConfigFileExistAtPath(path) {
+    try {
+        return fs_extra_1.default.existsSync(path);
+    }
+    catch (error) {
+        const { message, type } = handleConfigFileSystemError(error, path);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: error });
+    }
+}
+exports.doesConfigFileExistAtPath = doesConfigFileExistAtPath;
 function readConfigFile(configPath) {
-    let source = '';
     try {
-        source = fs_extra_1.default.readFileSync(configPath).toString();
+        return fs_extra_1.default.readFileSync(configPath).toString();
     }
     catch (err) {
-        throw new FileSystemError_1.FileSystemError({ cause: err }, {
-            filepath: configPath,
-            operation: 'read',
-        });
+        const { message, type } = handleConfigFileSystemError(err, configPath);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: err });
     }
-    return source;
 }
 exports.readConfigFile = readConfigFile;
 function removeUndefinedFieldsFromConfigAccount(account) {
@@ -110,7 +117,7 @@ function formatConfigForWrite(config) {
 }
 exports.formatConfigForWrite = formatConfigForWrite;
 function writeConfigFile(config, configPath) {
-    const source = js_yaml_1.default.dump(JSON.parse(JSON.stringify(formatConfigForWrite(config), null, 2)));
+    const source = js_yaml_1.default.dump(formatConfigForWrite(config));
     try {
         fs_extra_1.default.ensureFileSync(configPath);
         fs_extra_1.default.writeFileSync(configPath, source);
@@ -135,6 +142,9 @@ function getAccountType(sandboxAccountType) {
     return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD;
 }
 function normalizeParsedConfig(parsedConfig) {
+    if (!parsedConfig.portals && !parsedConfig.accounts) {
+        parsedConfig.accounts = [];
+    }
     if (parsedConfig.portals) {
         parsedConfig.accounts = parsedConfig.portals.map(account => {
             if (account.portalId) {
@@ -163,13 +173,13 @@ function normalizeParsedConfig(parsedConfig) {
     return parsedConfig;
 }
 exports.normalizeParsedConfig = normalizeParsedConfig;
-function parseConfig(configSource) {
+function parseConfig(configSource, configPath) {
     let parsedYaml;
     try {
         parsedYaml = js_yaml_1.default.load(configSource);
     }
     catch (err) {
-        throw new Error((0, lang_1.i18n)('config.utils.parseConfig.error'), { cause: err });
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.utils.parseConfig.error', { configPath: configPath }), config_1.HUBSPOT_CONFIG_ERROR_TYPES.YAML_PARSING, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: err });
     }
     return normalizeParsedConfig(parsedYaml);
 }
@@ -188,7 +198,7 @@ function buildConfigFromEnvironment() {
     const allowUsageTrackingVar = process.env[config_1.ENVIRONMENT_VARIABLES.ALLOW_USAGE_TRACKING];
     const defaultCmsPublishModeVar = process.env[config_1.ENVIRONMENT_VARIABLES.DEFAULT_CMS_PUBLISH_MODE];
     if (!accountIdVar) {
-        throw new Error((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.missingAccountId'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.missingAccountId'), config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     const accountId = parseInt(accountIdVar);
     const httpTimeout = httpTimeoutVar ? parseInt(httpTimeoutVar) : undefined;
@@ -242,7 +252,7 @@ function buildConfigFromEnvironment() {
         };
     }
     else {
-        throw new Error((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.invalidAuthType'));
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.utils.buildConfigFromEnvironment.invalidAuthType'), config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
     return {
         accounts: [account],
@@ -324,3 +334,19 @@ function isConfigAccountValid(account) {
     return valid;
 }
 exports.isConfigAccountValid = isConfigAccountValid;
+function handleConfigFileSystemError(error, path) {
+    let message;
+    let type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.UNKNOWN;
+    if (error instanceof Error && 'code' in error) {
+        if (error.code === 'ENOENT') {
+            message = (0, lang_1.i18n)('config.utils.handleConfigFileSystemError.configNotFoundError', { path });
+            type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.CONFIG_NOT_FOUND;
+        }
+        else if (error.code === 'EACCES') {
+            message = (0, lang_1.i18n)('config.utils.handleConfigFileSystemError.insufficientPermissionsError', { path });
+            type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.INSUFFICIENT_PERMISSIONS;
+        }
+    }
+    return { message, type };
+}
+exports.handleConfigFileSystemError = handleConfigFileSystemError;

package/constants/config.d.ts

@@ -18,6 +18,7 @@ export declare const ALLOW_AUTO_UPDATES = "allowAutoUpdates";
 export declare const DEFAULT_ACCOUNT = "defaultAccount";
 export declare const DEFAULT_PORTAL = "defaultPortal";
 export declare const MIN_HTTP_TIMEOUT = 3000;
+export declare const MCP_TOTAL_TOOL_CALLS_STATE = "mcpTotalToolCalls";
 export declare const HUBSPOT_ACCOUNT_TYPES: {
     readonly DEVELOPMENT_SANDBOX: "DEVELOPMENT_SANDBOX";
     readonly DEVELOPER_TEST: "DEVELOPER_TEST";
@@ -56,3 +57,19 @@ export declare const ACCOUNT_IDENTIFIERS: {
     readonly ACCOUNT_ID: "accountId";
     readonly NAME: "name";
 };
+export declare const HUBSPOT_CONFIG_ERROR_TYPES: {
+    readonly CONFIG_NOT_FOUND: "CONFIG_NOT_FOUND";
+    readonly INSUFFICIENT_PERMISSIONS: "INSUFFICIENT_PERMISSIONS";
+    readonly ACCOUNT_NOT_FOUND: "ACCOUNT_NOT_FOUND";
+    readonly NO_DEFAULT_ACCOUNT: "NO_DEFAULT_ACCOUNT";
+    readonly INVALID_ENVIRONMENT_VARIABLES: "ENVIRONMENT_VARIABLES";
+    readonly YAML_PARSING: "YAML_PARSING";
+    readonly INVALID_ACCOUNT: "INVALID_ACCOUNT";
+    readonly INVALID_FIELD: "INVALID_FIELD";
+    readonly UNKNOWN: "UNKNOWN";
+};
+export declare const HUBSPOT_CONFIG_OPERATIONS: {
+    readonly READ: "READ";
+    readonly WRITE: "WRITE";
+    readonly DELETE: "DELETE";
+};

package/constants/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_AUTO_UPDATES = exports.AUTO_OPEN_BROWSER = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.STATE_FILE_PATH = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_STATE_FILE = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
+exports.HUBSPOT_CONFIG_OPERATIONS = exports.HUBSPOT_CONFIG_ERROR_TYPES = exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MCP_TOTAL_TOOL_CALLS_STATE = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_AUTO_UPDATES = exports.AUTO_OPEN_BROWSER = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.STATE_FILE_PATH = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_STATE_FILE = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 const lang_1 = require("../utils/lang");
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -27,6 +27,7 @@ exports.ALLOW_AUTO_UPDATES = 'allowAutoUpdates';
 exports.DEFAULT_ACCOUNT = 'defaultAccount';
 exports.DEFAULT_PORTAL = 'defaultPortal';
 exports.MIN_HTTP_TIMEOUT = 3000;
+exports.MCP_TOTAL_TOOL_CALLS_STATE = 'mcpTotalToolCalls';
 exports.HUBSPOT_ACCOUNT_TYPES = {
     DEVELOPMENT_SANDBOX: 'DEVELOPMENT_SANDBOX',
     DEVELOPER_TEST: 'DEVELOPER_TEST',
@@ -65,3 +66,19 @@ exports.ACCOUNT_IDENTIFIERS = {
     ACCOUNT_ID: 'accountId',
     NAME: 'name',
 };
+exports.HUBSPOT_CONFIG_ERROR_TYPES = {
+    CONFIG_NOT_FOUND: 'CONFIG_NOT_FOUND',
+    INSUFFICIENT_PERMISSIONS: 'INSUFFICIENT_PERMISSIONS',
+    ACCOUNT_NOT_FOUND: 'ACCOUNT_NOT_FOUND',
+    NO_DEFAULT_ACCOUNT: 'NO_DEFAULT_ACCOUNT',
+    INVALID_ENVIRONMENT_VARIABLES: 'ENVIRONMENT_VARIABLES',
+    YAML_PARSING: 'YAML_PARSING',
+    INVALID_ACCOUNT: 'INVALID_ACCOUNT',
+    INVALID_FIELD: 'INVALID_FIELD',
+    UNKNOWN: 'UNKNOWN',
+};
+exports.HUBSPOT_CONFIG_OPERATIONS = {
+    READ: 'READ',
+    WRITE: 'WRITE',
+    DELETE: 'DELETE',
+};

package/errors/index.d.ts

@@ -1,6 +1,7 @@
 import { HubSpotHttpError } from '../models/HubSpotHttpError';
 import { BaseError } from '../types/Error';
 import { FileSystemError } from '../models/FileSystemError';
+import { HubSpotConfigError } from '../models/HubSpotConfigError';
 export declare function isSpecifiedError(err: unknown, { statusCode, category, subCategory, errorType, code, }: {
     statusCode?: number;
     category?: string;
@@ -17,3 +18,4 @@ export declare function isHubSpotHttpError(error?: unknown): error is HubSpotHtt
 export declare function isGithubRateLimitError(err: unknown): boolean;
 export declare function isSystemError(err: unknown): err is BaseError;
 export declare function isFileSystemError(err: unknown): err is FileSystemError;
+export declare function isHubSpotConfigError(err: unknown): err is HubSpotConfigError;

package/errors/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFileSystemError = exports.isSystemError = exports.isGithubRateLimitError = exports.isHubSpotHttpError = exports.isValidationError = exports.isAuthError = exports.isTimeoutError = exports.isGatingError = exports.isMissingScopeError = exports.isSpecifiedError = void 0;
+exports.isHubSpotConfigError = exports.isFileSystemError = exports.isSystemError = exports.isGithubRateLimitError = exports.isHubSpotHttpError = exports.isValidationError = exports.isAuthError = exports.isTimeoutError = exports.isGatingError = exports.isMissingScopeError = exports.isSpecifiedError = void 0;
 const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const FileSystemError_1 = require("../models/FileSystemError");
+const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
 function isSpecifiedError(err, { statusCode, category, subCategory, errorType, code, }) {
     if (!isHubSpotHttpError(err)) {
         return false;
@@ -70,3 +71,7 @@ function isFileSystemError(err) {
     return err instanceof FileSystemError_1.FileSystemError;
 }
 exports.isFileSystemError = isFileSystemError;
+function isHubSpotConfigError(err) {
+    return err instanceof HubSpotConfigError_1.HubSpotConfigError;
+}
+exports.isHubSpotConfigError = isHubSpotConfigError;

package/http/index.js

@@ -42,22 +42,29 @@ const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const auth_1 = require("../constants/auth");
 const localDevAuth_1 = require("../api/localDevAuth");
 const util = __importStar(require("util"));
+const trackUsage_1 = require("../lib/trackUsage");
 const i18nKey = 'http.index';
+const IGNORE_URLS_NETWORK_DEBUG = [
+    localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
+    trackUsage_1.CMS_CLI_USAGE_PATH,
+    trackUsage_1.VSCODE_USAGE_PATH,
+];
 function logRequest(response) {
     try {
-        if (process.env.HUBSPOT_NETWORK_LOGGING) {
-            if (response.config.url === localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH) {
-                // Don't log access tokens
-                return;
-            }
-            logger_1.logger.debug(util.inspect({
-                method: response.config.method,
-                baseURL: response.config.baseURL,
-                url: response.config.url,
-                data: response.data,
-                status: response.status,
-            }, false, null, true));
+        if (!process.env.HUBSPOT_NETWORK_LOGGING) {
+            return;
+        }
+        if (response?.config?.url &&
+            IGNORE_URLS_NETWORK_DEBUG.includes(response.config.url)) {
+            return;
         }
+        logger_1.logger.debug(util.inspect({
+            method: response.config.method,
+            baseURL: response.config.baseURL,
+            url: response.config.url,
+            data: response.data,
+            status: response.status,
+        }, false, null, true));
     }
     catch (error) {
         // Ignore any errors that occur while logging the response

package/lang/en.json

@@ -244,9 +244,13 @@
   },
   "config": {
     "getDefaultConfigFilePath": {
-      "error": "Error getting config file path: no config file found"
+      "error": "Attempted to get config file path, but no config file was found."
+    },
+    "getConfig": {
+      "reading": "Reading config from {{ path }}",
+      "error": "No config file found.",
+      "errorWithPath": "No config file found at {{ path }}."
     },
-    "getConfig": "Reading config from {{ path }}",
     "isConfigValid": {
       "missingAccounts": "Invalid config: no accounts found",
       "duplicateAccountIds": "Invalid config: multiple accounts with accountId: {{ accountId }}",
@@ -254,40 +258,47 @@
       "invalidAccountName": "Invalid config: account name {{ accountName }} contains spaces"
     },
     "getConfigAccountById": {
-      "error": "Error getting config account: no account with id {{ accountId }} exists in config"
+      "error": "No account with id {{ accountId }} exists in config"
     },
     "getConfigAccountByName": {
-      "error": "Error getting config account: no account with name {{ accountName }} exists in config"
+      "error": "No account with name {{ accountName }} exists in config"
     },
     "getConfigDefaultAccount": {
-      "fieldMissingError": "Error getting config default account: no default account field found in config",
-      "accountMissingError": "Error getting config default account: default account is set to {{ defaultAccount }} but no account with that id exists in config"
+      "fieldMissingError": "Attempted to get default account, but no default account was found in config",
+      "accountMissingError": "Default account is set to {{ defaultAccount }}, but no account with that id exists in config"
     },
     "addConfigAccount": {
-      "invalidAccount": "Error adding config account: account is invalid",
-      "duplicateAccount": "Error adding config account: account with id {{ accountId }} already exists in config"
+      "invalidAccount": "Attempting to add account, but account is invalid",
+      "duplicateAccount": "Attempting to add account, but account with id {{ accountId }} already exists in config"
     },
     "updateConfigAccount": {
-      "invalidAccount": "Error updating config account: account is invalid",
-      "accountNotFound": "Error updating config account: account with id {{ accountId }} not found in config"
+      "invalidAccount": "Attempting to update account {{ name }}, but account is invalid",
+      "accountNotFound": "Attempting to update account with id {{ id }}, but that account was not found in config"
     },
     "setConfigAccountAsDefault": {
-      "accountNotFound": "Error setting config default account: account with id {{ accountId }} not found in config"
+      "accountNotFound": "Attempted to set account with id {{ accountId }} as default, but that account was not found in config"
     },
     "renameConfigAccount": {
-      "accountNotFound": "Error renaming config account: account with name {{ currentName }} not found in config",
-      "duplicateAccount": "Error renaming config account: account with name {{ newName}} already exists in config"
+      "accountNotFound": "Attempted to rename account with name {{ currentName }}, but that account was not found in config",
+      "duplicateAccount": "Attempted to rename account {{ currentName }} to {{ newName }}, but an account with that name already exists in config"
     },
     "removeAccountFromConfig": {
-      "accountNotFound": "Error removing config account: account with id {{ accountId }} not found in config"
+      "accountNotFound": "Attempted to remove account with id {{ accountId }}, but that account was not found in config"
     },
     "updateHttpTimeout": {
-      "invalidTimeout": "Error updating config http timeout: timeout must be greater than {{ minTimeout }}"
+      "invalidTimeout": "HTTP timeout must be greater than {{ minTimeout }}. Received {{ timeout }}"
     },
     "updateDefaultCmsPublishMode": {
       "invalidCmsPublishMode": "Error updating config default CMS publish mode: CMS publish can only be set to 'draft' or 'publish'"
     },
+    "getConfigAccountEnvironment": {
+      "accountNotFound": "Attempted to get environment for account with identifier {{ identifier }}, but that account was not found in config"
+    },
     "utils": {
+      "handleConfigFileSystemError": {
+        "configNotFoundError": "No config file found at {{ path }}.",
+        "insufficientPermissionsError": "Insufficient permissions to access config file at {{ path }}"
+      },
       "isConfigAccountValid": {
         "missingAccount": "Invalid config: at least one account in config is missing data",
         "missingAuthType": "Invalid config: account {{ accountId }} has no authType",
@@ -297,14 +308,14 @@
         "missingPersonalAccessKey": "Invalid config: account {{ accountId }} has authType of personalAccessKey but is missing the personalAccessKey field"
       },
       "getConfigPathEnvironmentVariables": {
-        "invalidEnvironmentVariables": "Error loading config: USE_ENVIRONMENT_HUBSPOT_CONFIG and HUBSPOT_CONFIG_PATH cannot both be set simultaneously"
+        "invalidEnvironmentVariables": "USE_ENVIRONMENT_HUBSPOT_CONFIG and HUBSPOT_CONFIG_PATH cannot both be set simultaneously"
       },
       "parseConfig": {
-        "error": "An error occurred parsing the config file."
+        "error": "File could not be parsed. Confirm that your config file {{ configPath }} is valid YAML."
       },
       "buildConfigFromEnvironment": {
-        "missingAccountId": "Error loading config from environment: HUBSPOT_ACCOUNT_ID not set",
-        "invalidAuthType": "Error loading config from environment: auth is invalid. Use HUBSPOT_CLIENT_ID, HUBSPOT_CLIENT_SECRET, and HUBSPOT_REFRESH_TOKEN to authenticate with Oauth2, PERSONAL_ACCESS_KEY to authenticate with Personal Access Key, or API_KEY to authenticate with API Key."
+        "missingAccountId": "HUBSPOT_ACCOUNT_ID is required, but not currently set",
+        "invalidAuthType": "Auth type is invalid. Use HUBSPOT_CLIENT_ID, HUBSPOT_CLIENT_SECRET, and HUBSPOT_REFRESH_TOKEN to authenticate with Oauth2, PERSONAL_ACCESS_KEY to authenticate with Personal Access Key, or API_KEY to authenticate with API Key."
       }
     },
     "defaultAccountOverride": {
@@ -313,6 +324,12 @@
         "readFileError": "Error reading account override file."
       }
     },
+    "updateAllowUsageTracking": {
+      "invalidInput": "Unable to update allowUsageTracking. The value {{ isAllowed }} is invalid. The value must be a boolean."
+    },
+    "updateAllowAutoUpdates": {
+      "invalidInput": "Unable to update allowAutoUpdates. The value {{ isEnabled }} is invalid. The value must be a boolean."
+    },
     "updateAutoOpenBrowser": {
       "invalidInput": "Unable to update autoOpenBrowser. The value {{ isEnabled }} is invalid. The value must be a boolean."
     },
@@ -334,6 +351,9 @@
         }
       },
       "getCurrentState": {
+        "debug": {
+          "emptyStateFile": "State file is empty, using default state"
+        },
         "errors": {
           "errorReading": "Error reading CLI state, using defaults: {{ error }}"
         }
@@ -367,6 +387,9 @@
         "missingRefreshToken": "The account {{ accountId }} has not been authenticated with Oauth2",
         "auth": "Error while retrieving new token: {{ token }}"
       }
+    },
+    "HubSpotConfigError": {
+      "baseMessage": "An error occurred while {{ operation }} your HubSpot config {{ configType }}{{ message }}"
     }
   },
   "utils": {

package/lib/personalAccessKey.js

@@ -121,10 +121,8 @@ async function authorizedScopesForPortalAndUser(accountId) {
 exports.authorizedScopesForPortalAndUser = authorizedScopesForPortalAndUser;
 async function updateConfigWithAccessToken(token, personalAccessKey, env, name, makeDefault = false) {
     const { portalId, accessToken, expiresAt, accountType } = token;
-    const account = name
-        ? (0, config_1.getConfigAccountByName)(name)
-        : (0, config_1.getConfigDefaultAccount)();
-    const accountEnv = env || account.env;
+    const account = (0, config_1.getConfigAccountIfExists)(portalId);
+    const accountEnv = env || account?.env || environments_1.ENVIRONMENTS.PROD;
     let parentAccountId;
     try {
         if (accountType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
@@ -161,15 +159,21 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
         accountId: portalId,
         accountType,
         personalAccessKey,
-        name: name || account.name,
+        name: name || account?.name || token.hubName,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         auth: { tokenInfo: { accessToken, expiresAt } },
         parentAccountId,
         env: accountEnv,
     };
-    (0, config_1.updateConfigAccount)(updatedAccount);
-    if (makeDefault && name) {
-        (0, config_1.setConfigAccountAsDefault)(name);
+    // Add new account if it doesn't exist, otherwise update existing account
+    if (account) {
+        (0, config_1.updateConfigAccount)(updatedAccount);
+    }
+    else {
+        (0, config_1.addConfigAccount)(updatedAccount);
+    }
+    if (makeDefault) {
+        (0, config_1.setConfigAccountAsDefault)(updatedAccount.accountId);
     }
     return updatedAccount;
 }

package/lib/portManager.js

@@ -7,11 +7,10 @@ exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.get
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
 const ports_1 = require("../constants/ports");
-const detectPort_1 = require("../utils/detectPort");
 const logger_1 = require("./logger");
 exports.BASE_URL = `http://localhost:${ports_1.PORT_MANAGER_SERVER_PORT}`;
 async function isPortManagerPortAvailable() {
-    return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    return PortManagerServer_1.PortManagerServer.portAvailable();
 }
 exports.isPortManagerPortAvailable = isPortManagerPortAvailable;
 async function isPortManagerServerRunning() {

package/lib/trackUsage.d.ts

@@ -1 +1,3 @@
+export declare const CMS_CLI_USAGE_PATH: string;
+export declare const VSCODE_USAGE_PATH: string;
 export declare function trackUsage(eventName: string, eventClass: string, meta?: {}, accountId?: number): Promise<void>;

package/lib/trackUsage.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trackUsage = void 0;
+exports.trackUsage = exports.VSCODE_USAGE_PATH = exports.CMS_CLI_USAGE_PATH = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const logger_1 = require("./logger");
@@ -13,6 +13,8 @@ const fileMapper_1 = require("../api/fileMapper");
 const lang_1 = require("../utils/lang");
 const environment_1 = require("./environment");
 const i18nKey = 'lib.trackUsage';
+exports.CMS_CLI_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/cms-cli-usage`;
+exports.VSCODE_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/vscode-extension-usage`;
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
         accountId,
@@ -24,18 +26,17 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         VSCODE_EXTENSION_INTERACTION: 'vscode-extension-interaction',
         CLI_INTERACTION: 'cli-interaction',
     };
-    let analyticsEndpoint;
+    let path = fileMapper_1.FILE_MAPPER_API_PATH;
     switch (eventName) {
         case EVENT_TYPES.CLI_INTERACTION:
-            analyticsEndpoint = 'cms-cli-usage';
+            path = exports.CMS_CLI_USAGE_PATH;
             break;
         case EVENT_TYPES.VSCODE_EXTENSION_INTERACTION:
-            analyticsEndpoint = 'vscode-extension-usage';
+            path = exports.VSCODE_USAGE_PATH;
             break;
         default:
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.invalidEvent`, { eventName }));
     }
-    const path = `${fileMapper_1.FILE_MAPPER_API_PATH}/${analyticsEndpoint}`;
     const account = accountId && (0, config_1.getConfigAccountById)(accountId);
     if (account && account.authType === 'personalaccesskey') {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));

package/models/HubSpotConfigError.d.ts

@@ -0,0 +1,6 @@
+import { HubSpotConfigErrorType, HubSpotConfigOperation } from '../types/Config';
+export declare class HubSpotConfigError extends Error {
+    type: HubSpotConfigErrorType;
+    operation: HubSpotConfigOperation;
+    constructor(message: string | undefined, type: HubSpotConfigErrorType, operation: HubSpotConfigOperation, options?: ErrorOptions);
+}

package/models/HubSpotConfigError.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HubSpotConfigError = void 0;
+const config_1 = require("../constants/config");
+const lang_1 = require("../utils/lang");
+const NAME = 'HubSpotConfigError';
+const OPERATION_TEXT = {
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.READ]: 'reading',
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE]: 'writing to',
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.DELETE]: 'deleting',
+};
+function isEnvironmentError(type) {
+    return type === config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES;
+}
+class HubSpotConfigError extends Error {
+    type;
+    operation;
+    constructor(message, type, operation, options) {
+        const configType = isEnvironmentError(type)
+            ? 'environment variables'
+            : 'file';
+        const operationText = OPERATION_TEXT[operation];
+        const withBaseMessage = (0, lang_1.i18n)('models.HubSpotConfigError.baseMessage', {
+            configType,
+            message: message ? `: ${message}` : '',
+            operation: operationText,
+        });
+        super(withBaseMessage, options);
+        this.name = NAME;
+        this.type = type;
+        this.operation = operation;
+    }
+}
+exports.HubSpotConfigError = HubSpotConfigError;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.0",
+    "version": "0.5.0-experimental.10",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -21,7 +21,6 @@
     "license": "Apache-2.0",
     "devDependencies": {
         "@hubspot/npm-scripts": "0.0.4",
-        "@inquirer/prompts": "^7.0.1",
         "@types/content-disposition": "^0.5.5",
         "@types/cors": "^2.8.15",
         "@types/debounce": "^1.2.1",

package/types/Config.d.ts

@@ -1,4 +1,4 @@
-import { CONFIG_FLAGS } from '../constants/config';
+import { CONFIG_FLAGS, HUBSPOT_CONFIG_ERROR_TYPES, HUBSPOT_CONFIG_OPERATIONS } from '../constants/config';
 import { ENVIRONMENTS } from '../constants/environments';
 import { DeprecatedHubSpotConfigAccountFields, HubSpotConfigAccount } from './Accounts';
 import { CmsPublishMode } from './Files';
@@ -29,6 +29,8 @@ export type GitInclusionResult = {
     gitignoreFiles: Array<string>;
 };
 export type ConfigFlag = ValueOf<typeof CONFIG_FLAGS>;
-export type CLIState = {
+export type HubSpotState = {
     mcpTotalToolCalls: number;
 };
+export type HubSpotConfigErrorType = ValueOf<typeof HUBSPOT_CONFIG_ERROR_TYPES>;
+export type HubSpotConfigOperation = ValueOf<typeof HUBSPOT_CONFIG_OPERATIONS>;

package/utils/PortManagerServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Express, Request, Response } from 'express';
+import { Express } from 'express';
 import { Server } from 'http';
-import { RequestPortsData, ServerPortMap } from '../types/PortManager';
+import { ServerPortMap } from '../types/PortManager';
 export declare const HEALTH_CHECK_PATH = "/port-manager-health-check";
 export declare const SERVICE_HEALTHY = "OK";
 declare class _PortManagerServer {
@@ -10,19 +10,18 @@ declare class _PortManagerServer {
     serverPortMap: ServerPortMap;
     constructor();
     init(): Promise<void>;
-    reset(): void;
-    listen(): Promise<Server>;
-    setupRoutes(): void;
-    setPort(instanceId: string, port: number): void;
-    deletePort(instanceId: string): void;
-    send404(res: Response, instanceId: string): void;
-    getServers: (req: Request, res: Response) => Promise<void>;
-    getServerPortByInstanceId: (req: Request, res: Response) => void;
-    assignPortsToServers: (req: Request<never, never, {
-        portData: Array<RequestPortsData>;
-    }>, res: Response) => Promise<void>;
-    deleteServerInstance: (req: Request, res: Response) => void;
-    closeServer: (req: Request, res: Response) => void;
+    private reset;
+    portAvailable(): Promise<boolean>;
+    private listen;
+    private setupRoutes;
+    private setPort;
+    private deletePort;
+    private send404;
+    private getServers;
+    private getServerPortByInstanceId;
+    private assignPortsToServers;
+    private deleteServerInstance;
+    private closeServer;
 }
 export declare const PortManagerServer: _PortManagerServer;
 export {};

package/utils/PortManagerServer.js

@@ -8,7 +8,6 @@ const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
 const ports_1 = require("../constants/ports");
-const errors_1 = require("../errors");
 const logger_1 = require("../lib/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
@@ -22,6 +21,11 @@ class _PortManagerServer {
         this.serverPortMap = {};
     }
     async init() {
+        if (!(await this.portAvailable())) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
+                port: ports_1.PORT_MANAGER_SERVER_PORT,
+            }));
+        }
         if (this.app) {
             throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.duplicateInstance`));
         }
@@ -29,24 +33,17 @@ class _PortManagerServer {
         this.app.use(express_1.default.json());
         this.app.use((0, cors_1.default)());
         this.setupRoutes();
-        try {
-            this.server = await this.listen();
-            logger_1.logger.debug(this.server);
-        }
-        catch (e) {
-            if ((0, errors_1.isSystemError)(e) && e.code === 'EADDRINUSE') {
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
-                    port: ports_1.PORT_MANAGER_SERVER_PORT,
-                }), { cause: e });
-            }
-            throw e;
-        }
+        this.server = await this.listen();
+        logger_1.logger.debug(this.server);
     }
     reset() {
         this.app = undefined;
         this.server = undefined;
         this.serverPortMap = {};
     }
+    async portAvailable() {
+        return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    }
     listen() {
         return new Promise((resolve, reject) => {
             const server = this.app.listen(ports_1.PORT_MANAGER_SERVER_PORT, () => {