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

package/api/fireAlarm.d.ts

@@ -1,3 +1,4 @@
 import { FireAlarm } from '../types/FireAlarm';
 import { HubSpotPromise } from '../types/Http';
+export declare const FIREALARM_API_AUTH_PATH = "firealarm/v4/alarm";
 export declare function fetchFireAlarms(accountId: number): HubSpotPromise<Array<FireAlarm>>;

package/api/fireAlarm.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchFireAlarms = void 0;
+exports.fetchFireAlarms = exports.FIREALARM_API_AUTH_PATH = void 0;
 const http_1 = require("../http");
-const FIREALARM_API_AUTH_PATH = 'firealarm/v4/alarm';
+exports.FIREALARM_API_AUTH_PATH = 'firealarm/v4/alarm';
 function fetchFireAlarms(accountId) {
     return http_1.http.get(accountId, {
-        url: `${FIREALARM_API_AUTH_PATH}/hubspot-cli/${accountId}`,
+        url: `${exports.FIREALARM_API_AUTH_PATH}/hubspot-cli/${accountId}`,
     });
 }
 exports.fetchFireAlarms = fetchFireAlarms;

package/api/projects.d.ts

@@ -4,7 +4,7 @@ import { HubSpotPromise, QueryParams } from '../types/Http';
 import { Project, FetchProjectResponse, UploadProjectResponse, ProjectSettings, FetchPlatformVersionResponse, WarnLogsResponse, UploadIRResponse } from '../types/Project';
 import { Build, FetchProjectBuildsResponse } from '../types/Build';
 import { ComponentStructureResponse, ProjectComponentsMetadata } from '../types/ComponentStructure';
-import { Deploy, ProjectDeployResponse } from '../types/Deploy';
+import { Deploy, ProjectDeployResponse, ProjectDeployResponseV1 } from '../types/Deploy';
 import { MigrateAppResponse, CloneAppResponse, PollAppResponse } from '../types/Migration';
 export declare function fetchProjects(accountId: number): HubSpotPromise<FetchProjectResponse>;
 export declare function createProject(accountId: number, name: string): HubSpotPromise<Project>;
@@ -17,7 +17,12 @@ export declare function fetchPlatformVersions(accountId: number): HubSpotPromise
 export declare function fetchProjectBuilds(accountId: number, projectName: string, params?: QueryParams): HubSpotPromise<FetchProjectBuildsResponse>;
 export declare function getBuildStatus(accountId: number, projectName: string, buildId: number): HubSpotPromise<Build>;
 export declare function getBuildStructure(accountId: number, projectName: string, buildId: number): HubSpotPromise<ComponentStructureResponse>;
+/**
+ * @deprecated Use the separate deployProjectV1 and deployProjectV2
+ */
 export declare function deployProject(accountId: number, projectName: string, buildId: number, useNewDeployApi?: boolean, force?: boolean): HubSpotPromise<ProjectDeployResponse>;
+export declare function deployProjectV1(accountId: number, projectName: string, buildId: number, force?: boolean): HubSpotPromise<ProjectDeployResponseV1>;
+export declare function deployProjectV2(accountId: number, projectName: string, buildId: number, force?: boolean): HubSpotPromise<ProjectDeployResponse>;
 export declare function getDeployStatus(accountId: number, projectName: string, deployId: number): HubSpotPromise<Deploy>;
 export declare function getDeployStructure(accountId: number, projectName: string, deployId: number): HubSpotPromise<ComponentStructureResponse>;
 export declare function fetchProjectSettings(accountId: number, projectName: string): HubSpotPromise<ProjectSettings>;

package/api/projects.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.downloadClonedProject = exports.checkCloneStatus = exports.cloneApp = exports.checkMigrationStatus = exports.migrateApp = exports.fetchDeployWarnLogs = exports.fetchBuildWarnLogs = exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProjectComponentsMetadata = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
+exports.downloadClonedProject = exports.checkCloneStatus = exports.cloneApp = exports.checkMigrationStatus = exports.migrateApp = exports.fetchDeployWarnLogs = exports.fetchBuildWarnLogs = exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProjectV2 = exports.deployProjectV1 = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProjectComponentsMetadata = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
 const http_1 = require("../http");
 const fs_1 = __importDefault(require("fs"));
 const PROJECTS_API_PATH = 'dfs/v1/projects';
@@ -116,6 +116,9 @@ function getBuildStructure(accountId, projectName, buildId) {
     });
 }
 exports.getBuildStructure = getBuildStructure;
+/**
+ * @deprecated Use the separate deployProjectV1 and deployProjectV2
+ */
 function deployProject(accountId, projectName, buildId, useNewDeployApi = false, force = false) {
     if (useNewDeployApi) {
         return http_1.http.post(accountId, {
@@ -137,6 +140,28 @@ function deployProject(accountId, projectName, buildId, useNewDeployApi = false,
     });
 }
 exports.deployProject = deployProject;
+function deployProjectV1(accountId, projectName, buildId, force = false) {
+    return http_1.http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/deploys/queue/async`,
+        data: {
+            projectName,
+            buildId,
+            skipRemovalWarning: force,
+        },
+    });
+}
+exports.deployProjectV1 = deployProjectV1;
+function deployProjectV2(accountId, projectName, buildId, force = false) {
+    return http_1.http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH_V3}/deploys/queue/async`,
+        data: {
+            projectName,
+            targetBuildId: buildId,
+            ignoreWarnings: force,
+        },
+    });
+}
+exports.deployProjectV2 = deployProjectV2;
 function getDeployStatus(accountId, projectName, deployId) {
     return http_1.http.get(accountId, {
         url: `${PROJECTS_DEPLOY_API_PATH}/deploy-status/projects/${encodeURIComponent(projectName)}/deploys/${deployId}`,

package/config/index.d.ts

@@ -1,15 +1,17 @@
 import { HubSpotConfigAccount } from '../types/Accounts';
-import { HubSpotConfig, ConfigFlag } from '../types/Config';
+import { HubSpotConfig, ConfigFlag, HubSpotConfigValidationResult } from '../types/Config';
 import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
+export declare function getGlobalConfigFilePath(): string;
+export declare function getLocalConfigFilePathIfExists(cwd?: string): string | null;
 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;
+export declare function validateConfig(): HubSpotConfigValidationResult;
 export declare function createEmptyConfigFile(useGlobalConfig?: boolean): void;
-export declare function deleteConfigFile(): void;
+export declare function deleteConfigFileIfEmpty(): void;
 export declare function getConfigAccountById(accountId: number): HubSpotConfigAccount;
 export declare function getConfigAccountByName(accountName: string): HubSpotConfigAccount;
 export declare function getConfigAccountIfExists(identifier: number | string): HubSpotConfigAccount | undefined;

package/config/index.js

@@ -3,8 +3,9 @@ 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.configFileExists = 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.deleteConfigFileIfEmpty = exports.createEmptyConfigFile = exports.validateConfig = exports.getConfig = exports.getConfigFilePath = exports.configFileExists = exports.globalConfigFileExists = exports.localConfigFileExists = exports.getLocalConfigFilePathIfExists = exports.getGlobalConfigFilePath = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const findup_sync_1 = __importDefault(require("findup-sync"));
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
 const utils_1 = require("./utils");
@@ -14,12 +15,26 @@ const defaultAccountOverride_1 = require("./defaultAccountOverride");
 const environment_1 = require("../lib/environment");
 const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
 const config_2 = require("../constants/config");
+const isDeepEqual_1 = require("../lib/isDeepEqual");
+const path_1 = require("../lib/path");
+const EMPTY_CONFIG = { accounts: [] };
+function getGlobalConfigFilePath() {
+    return config_1.GLOBAL_CONFIG_PATH;
+}
+exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
+function getLocalConfigFilePathIfExists(cwd) {
+    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: cwd || (0, path_1.getCwd)() });
+}
+exports.getLocalConfigFilePathIfExists = getLocalConfigFilePathIfExists;
 function localConfigFileExists() {
-    return Boolean((0, utils_1.getLocalConfigFilePath)());
+    return Boolean(getLocalConfigFilePathIfExists());
 }
 exports.localConfigFileExists = localConfigFileExists;
 function globalConfigFileExists() {
-    return (0, utils_1.doesConfigFileExistAtPath)((0, utils_1.getGlobalConfigFilePath)());
+    return (0, utils_1.doesConfigFileExistAtPath)(getGlobalConfigFilePath());
 }
 exports.globalConfigFileExists = globalConfigFileExists;
 function configFileExists() {
@@ -32,11 +47,11 @@ function configFileExists() {
 }
 exports.configFileExists = configFileExists;
 function getConfigDefaultFilePath() {
-    const globalConfigFilePath = (0, utils_1.getGlobalConfigFilePath)();
+    const globalConfigFilePath = getGlobalConfigFilePath();
     if ((0, utils_1.doesConfigFileExistAtPath)(globalConfigFilePath)) {
         return globalConfigFilePath;
     }
-    const localConfigFilePath = (0, utils_1.getLocalConfigFilePath)();
+    const localConfigFilePath = getLocalConfigFilePathIfExists();
     if (!localConfigFilePath) {
         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);
     }
@@ -66,57 +81,61 @@ function getConfig() {
     }
 }
 exports.getConfig = getConfig;
-function isConfigValid() {
+function validateConfig() {
     const config = getConfig();
     if (config.accounts.length === 0) {
-        logger_1.logger.debug((0, lang_1.i18n)('config.isConfigValid.missingAccounts'));
-        return false;
+        return {
+            isValid: false,
+            errors: [(0, lang_1.i18n)('config.validateConfig.missingAccounts')],
+        };
     }
     const accountIdsMap = {};
     const accountNamesMap = {};
-    return config.accounts.every(account => {
-        if (!(0, utils_1.isConfigAccountValid)(account)) {
-            return false;
+    const validationErrors = [];
+    config.accounts.forEach(account => {
+        const accountValidationResult = (0, utils_1.validateConfigAccount)(account);
+        if (!accountValidationResult.isValid) {
+            validationErrors.push(...accountValidationResult.errors);
         }
         if (accountIdsMap[account.accountId]) {
-            logger_1.logger.debug((0, lang_1.i18n)('config.isConfigValid.duplicateAccountIds', {
+            validationErrors.push((0, lang_1.i18n)('config.validateConfig.duplicateAccountIds', {
                 accountId: account.accountId,
             }));
-            return false;
         }
         if (account.name) {
             if (accountNamesMap[account.name.toLowerCase()]) {
-                logger_1.logger.debug((0, lang_1.i18n)('config.isConfigValid.duplicateAccountNames', {
+                validationErrors.push((0, lang_1.i18n)('config.validateConfig.duplicateAccountNames', {
                     accountName: account.name,
                 }));
-                return false;
             }
             if (/\s+/.test(account.name)) {
-                logger_1.logger.debug((0, lang_1.i18n)('config.isConfigValid.invalidAccountName', {
+                validationErrors.push((0, lang_1.i18n)('config.validateConfig.invalidAccountName', {
                     accountName: account.name,
                 }));
-                return false;
             }
             accountNamesMap[account.name] = true;
         }
         accountIdsMap[account.accountId] = true;
-        return true;
     });
+    return { isValid: validationErrors.length === 0, errors: validationErrors };
 }
-exports.isConfigValid = isConfigValid;
+exports.validateConfig = validateConfig;
 function createEmptyConfigFile(useGlobalConfig = false) {
     const { configFilePathFromEnvironment } = (0, utils_1.getConfigPathEnvironmentVariables)();
     const defaultPath = useGlobalConfig
-        ? (0, utils_1.getGlobalConfigFilePath)()
+        ? getGlobalConfigFilePath()
         : (0, utils_1.getLocalConfigDefaultFilePath)();
     const pathToWrite = configFilePathFromEnvironment || defaultPath;
-    (0, utils_1.writeConfigFile)({ accounts: [] }, pathToWrite);
+    (0, utils_1.writeConfigFile)(EMPTY_CONFIG, pathToWrite);
 }
 exports.createEmptyConfigFile = createEmptyConfigFile;
-function deleteConfigFile() {
+function deleteConfigFileIfEmpty() {
     const pathToDelete = getConfigFilePath();
     try {
-        fs_extra_1.default.unlinkSync(pathToDelete);
+        const config = getConfig();
+        if ((0, isDeepEqual_1.isDeepEqual)(config, EMPTY_CONFIG)) {
+            fs_extra_1.default.unlinkSync(pathToDelete);
+        }
     }
     catch (error) {
         const { message, type } = (0, utils_1.handleConfigFileSystemError)(error, pathToDelete);
@@ -125,7 +144,7 @@ function deleteConfigFile() {
         });
     }
 }
-exports.deleteConfigFile = deleteConfigFile;
+exports.deleteConfigFileIfEmpty = deleteConfigFileIfEmpty;
 function getConfigAccountById(accountId) {
     const { accounts } = getConfig();
     const account = (0, utils_1.getConfigAccountByIdentifier)(accounts, config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID, accountId);
@@ -153,7 +172,7 @@ function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
     const currentConfigPath = getConfigFilePath();
-    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    const globalConfigPath = getGlobalConfigFilePath();
     if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
@@ -175,7 +194,7 @@ function getConfigDefaultAccountIfExists() {
     let defaultAccountToUse = defaultAccount;
     // Only check for default account override if we're using the global config
     const currentConfigPath = getConfigFilePath();
-    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    const globalConfigPath = getGlobalConfigFilePath();
     if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
@@ -204,7 +223,7 @@ function getConfigAccountEnvironment(identifier) {
 }
 exports.getConfigAccountEnvironment = getConfigAccountEnvironment;
 function addConfigAccount(accountToAdd) {
-    if (!(0, utils_1.isConfigAccountValid)(accountToAdd)) {
+    if (!(0, utils_1.validateConfigAccount)(accountToAdd)) {
         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();
@@ -219,7 +238,7 @@ function addConfigAccount(accountToAdd) {
 }
 exports.addConfigAccount = addConfigAccount;
 function updateConfigAccount(updatedAccount) {
-    if (!(0, utils_1.isConfigAccountValid)(updatedAccount)) {
+    if (!(0, utils_1.validateConfigAccount)(updatedAccount)) {
         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);
@@ -240,7 +259,7 @@ function setConfigAccountAsDefault(identifier) {
     const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
     if (!account) {
         throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.setConfigAccountAsDefault.accountNotFound', {
-            accountId: identifier,
+            identifier,
         }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE);
     }
     config.defaultAccount = account.accountId;

package/config/migrate.d.ts

@@ -15,3 +15,4 @@ export declare function mergeConfigAccounts(toConfig: HubSpotConfig, fromConfig:
     configWithMergedAccounts: HubSpotConfig;
     skippedAccountIds: Array<string | number>;
 };
+export declare function archiveConfigAtPath(configPath: string): void;

package/config/migrate.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeConfigAccounts = exports.mergeConfigProperties = exports.migrateConfigAtPath = exports.getConfigAtPath = void 0;
+exports.archiveConfigAtPath = exports.mergeConfigAccounts = exports.mergeConfigProperties = exports.migrateConfigAtPath = exports.getConfigAtPath = void 0;
 const fs_1 = __importDefault(require("fs"));
 const index_1 = require("./index");
 const config_1 = require("../constants/config");
 const utils_1 = require("./utils");
+const path_1 = __importDefault(require("path"));
 function getConfigAtPath(path) {
     const configFileSource = (0, utils_1.readConfigFile)(path);
     return (0, utils_1.parseConfig)(configFileSource, path);
@@ -16,8 +17,7 @@ exports.getConfigAtPath = getConfigAtPath;
 function migrateConfigAtPath(path) {
     (0, index_1.createEmptyConfigFile)(true);
     const configToMigrate = getConfigAtPath(path);
-    (0, utils_1.writeConfigFile)(configToMigrate, (0, utils_1.getGlobalConfigFilePath)());
-    fs_1.default.unlinkSync(path);
+    (0, utils_1.writeConfigFile)(configToMigrate, (0, index_1.getGlobalConfigFilePath)());
 }
 exports.migrateConfigAtPath = migrateConfigAtPath;
 function mergeConfigProperties(toConfig, fromConfig, force) {
@@ -64,7 +64,9 @@ function mergeConfigProperties(toConfig, fromConfig, force) {
             config_1.DEFAULT_ACCOUNT,
         ];
         propertiesToCheck.forEach(prop => {
-            if (toConfig[prop] !== undefined && toConfig[prop] !== fromConfig[prop]) {
+            if (toConfig[prop] !== undefined &&
+                fromConfig[prop] !== undefined &&
+                toConfig[prop] !== fromConfig[prop]) {
                 conflicts.push({
                     property: prop,
                     oldValue: fromConfig[prop],
@@ -98,7 +100,13 @@ function buildConfigWithMergedAccounts(toConfig, fromConfig) {
 }
 function mergeConfigAccounts(toConfig, fromConfig) {
     const { configWithMergedAccounts, skippedAccountIds } = buildConfigWithMergedAccounts(toConfig, fromConfig);
-    (0, utils_1.writeConfigFile)(configWithMergedAccounts, (0, utils_1.getGlobalConfigFilePath)());
+    (0, utils_1.writeConfigFile)(configWithMergedAccounts, (0, index_1.getGlobalConfigFilePath)());
     return { configWithMergedAccounts, skippedAccountIds };
 }
 exports.mergeConfigAccounts = mergeConfigAccounts;
+function archiveConfigAtPath(configPath) {
+    const dir = path_1.default.dirname(configPath);
+    const archivedConfigPath = path_1.default.join(dir, config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME);
+    fs_1.default.renameSync(configPath, archivedConfigPath);
+}
+exports.archiveConfigAtPath = archiveConfigAtPath;

package/config/utils.d.ts

@@ -1,9 +1,7 @@
 import { ACCOUNT_IDENTIFIERS } from '../constants/config';
-import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType } from '../types/Config';
-import { HubSpotConfigAccount, AccountType, TokenInfo } from '../types/Accounts';
+import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType, HubSpotConfigValidationResult } from '../types/Config';
+import { HubSpotConfigAccount } from '../types/Accounts';
 import { ValueOf } from '../types/Utils';
-export declare function getGlobalConfigFilePath(): string;
-export declare function getLocalConfigFilePath(): string | null;
 export declare function getLocalConfigDefaultFilePath(): string;
 export declare function getConfigPathEnvironmentVariables(): {
     useEnvironmentConfig: boolean;
@@ -12,57 +10,10 @@ export declare function getConfigPathEnvironmentVariables(): {
 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): {
-    accounts: ({
-        personalAccessKey: string;
-        auth: {
-            tokenInfo: TokenInfo;
-        };
-        accountType?: AccountType | undefined;
-        defaultCmsPublishMode?: import("../types/Files").CmsPublishMode | undefined;
-        parentAccountId?: number | undefined;
-        name: string;
-        accountId: number;
-        env: import("../types/Config").Environment;
-        authType: "apikey" | "oauth2" | "personalaccesskey";
-    } | {
-        auth: {
-            clientId: string;
-            clientSecret: string;
-            scopes: string[];
-            tokenInfo: TokenInfo;
-        };
-        accountType?: AccountType | undefined;
-        defaultCmsPublishMode?: import("../types/Files").CmsPublishMode | undefined;
-        parentAccountId?: number | undefined;
-        name: string;
-        accountId: number;
-        env: import("../types/Config").Environment;
-        authType: "apikey" | "oauth2" | "personalaccesskey";
-    } | {
-        apiKey: string;
-        accountType?: AccountType | undefined;
-        defaultCmsPublishMode?: import("../types/Files").CmsPublishMode | undefined;
-        parentAccountId?: number | undefined;
-        name: string;
-        accountId: number;
-        env: import("../types/Config").Environment;
-        authType: "apikey" | "oauth2" | "personalaccesskey";
-    })[];
-    allowAutoUpdates?: boolean | undefined;
-    defaultMode?: import("../types/Files").CmsPublishMode | undefined;
-    env?: import("../types/Config").Environment | undefined;
-    httpUseLocalhost?: boolean | undefined;
-    autoOpenBrowser?: boolean | undefined;
-    useCustomObjectHubfile?: boolean | undefined;
-    flags?: string[] | undefined;
-    defaultCmsPublishMode: import("../types/Files").CmsPublishMode | undefined;
-    httpTimeout: number | undefined;
-    allowUsageTracking: boolean | undefined;
-    defaultAccount?: number | undefined;
-};
+export declare function formatConfigForWrite(config: HubSpotConfig): HubSpotConfig;
 export declare function writeConfigFile(config: HubSpotConfig, configPath: string): void;
 export declare function normalizeParsedConfig(parsedConfig: HubSpotConfig & DeprecatedHubSpotConfigFields): HubSpotConfig;
+export declare function convertToDeprecatedConfig(config: HubSpotConfig): Partial<HubSpotConfig> & Partial<DeprecatedHubSpotConfigFields>;
 export declare function parseConfig(configSource: string, configPath: string): HubSpotConfig;
 export declare function buildConfigFromEnvironment(): HubSpotConfig;
 export declare function getAccountIdentifierAndType(accountIdentifier: string | number): {
@@ -72,7 +23,7 @@ export declare function getAccountIdentifierAndType(accountIdentifier: string |
 export declare function getConfigAccountByIdentifier(accounts: Array<HubSpotConfigAccount>, identifierFieldName: ValueOf<typeof ACCOUNT_IDENTIFIERS>, identifier: string | number): HubSpotConfigAccount | undefined;
 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 validateConfigAccount(account: Partial<HubSpotConfigAccount>): HubSpotConfigValidationResult;
 export declare function handleConfigFileSystemError(error: unknown, path: string): {
     message?: string;
     type: HubSpotConfigErrorType;

package/config/utils.js

@@ -3,30 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.handleConfigFileSystemError = exports.validateConfigAccount = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.convertToDeprecatedConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.doesConfigFileExistAtPath = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = 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"));
 const config_1 = require("../constants/config");
 const auth_1 = require("../constants/auth");
 const FileSystemError_1 = require("../models/FileSystemError");
-const logger_1 = require("../lib/logger");
 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;
-}
-exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
-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() {
     return `${(0, path_1.getCwd)()}/${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
 }
@@ -104,20 +91,26 @@ function formatConfigForWrite(config) {
         ...rest,
         accounts: accounts.map(account => {
             const { name, accountId, env, authType, ...rest } = account;
-            return {
+            const orderedAccount = {
                 name,
                 accountId,
                 env,
                 authType,
                 ...rest,
+                // using ...rest messes with the typing
             };
+            return removeUndefinedFieldsFromConfigAccount(orderedAccount);
         }),
     };
-    return removeUndefinedFieldsFromConfigAccount(orderedConfig);
+    return orderedConfig;
 }
 exports.formatConfigForWrite = formatConfigForWrite;
 function writeConfigFile(config, configPath) {
-    const source = js_yaml_1.default.dump(formatConfigForWrite(config));
+    const formattedConfig = formatConfigForWrite(config);
+    const configToWrite = configPath == config_1.GLOBAL_CONFIG_PATH
+        ? formattedConfig
+        : convertToDeprecatedConfig(formattedConfig);
+    const source = js_yaml_1.default.dump(configToWrite);
     try {
         fs_extra_1.default.ensureFileSync(configPath);
         fs_extra_1.default.writeFileSync(configPath, source);
@@ -173,6 +166,30 @@ function normalizeParsedConfig(parsedConfig) {
     return parsedConfig;
 }
 exports.normalizeParsedConfig = normalizeParsedConfig;
+function convertToDeprecatedConfig(config) {
+    const deprecatedConfig = structuredClone(config);
+    if (config.defaultAccount) {
+        const defaultAccount = getConfigAccountByIdentifier(config.accounts, config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID, config.defaultAccount);
+        if (defaultAccount) {
+            deprecatedConfig.defaultPortal = defaultAccount.name;
+            delete deprecatedConfig.defaultAccount;
+        }
+    }
+    const portals = config.accounts.map(account => {
+        if (account.accountId) {
+            const deprecatedAccount = structuredClone(account);
+            deprecatedAccount.portalId = account.accountId;
+            // @ts-expect-error deleting accountId is intential since using deprecated config format
+            delete deprecatedAccount.accountId;
+            return deprecatedAccount;
+        }
+        return account;
+    });
+    deprecatedConfig.portals = portals;
+    delete deprecatedConfig.accounts;
+    return deprecatedConfig;
+}
+exports.convertToDeprecatedConfig = convertToDeprecatedConfig;
 function parseConfig(configSource, configPath) {
     let parsedYaml;
     try {
@@ -283,57 +300,61 @@ function getConfigAccountByIdentifier(accounts, identifierFieldName, identifier)
 exports.getConfigAccountByIdentifier = getConfigAccountByIdentifier;
 function getConfigAccountByInferredIdentifier(accounts, accountIdentifier) {
     const { identifier, identifierType } = getAccountIdentifierAndType(accountIdentifier);
-    return accounts.find(account => account[identifierType] === identifier);
+    const account = getConfigAccountByIdentifier(accounts, identifierType, identifier);
+    if (account) {
+        return account;
+    }
+    // Fallback to handle accounts with numbers as names
+    return getConfigAccountByIdentifier(accounts, config_1.ACCOUNT_IDENTIFIERS.NAME, String(accountIdentifier));
 }
 exports.getConfigAccountByInferredIdentifier = getConfigAccountByInferredIdentifier;
 function getConfigAccountIndexById(accounts, id) {
     return accounts.findIndex(account => account.accountId === id);
 }
 exports.getConfigAccountIndexById = getConfigAccountIndexById;
-function isConfigAccountValid(account) {
+function validateConfigAccount(account) {
+    const validationErrors = [];
     if (!account || typeof account !== 'object') {
-        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAccount'));
-        return false;
+        validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingAccount'));
+        return { isValid: false, errors: validationErrors };
     }
     if (!account.accountId) {
-        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAccountId'));
-        return false;
+        validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingAccountId'));
+        return { isValid: false, errors: validationErrors };
     }
     if (!account.authType) {
-        logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAuthType', {
+        validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingAuthType', {
             accountId: account.accountId,
         }));
-        return false;
+        return { isValid: false, errors: validationErrors };
     }
-    let valid = false;
     if (account.authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-        valid =
-            'personalAccessKey' in account && Boolean(account.personalAccessKey);
-        if (!valid) {
-            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingPersonalAccessKey', {
+        const isValidPersonalAccessKeyAccount = 'personalAccessKey' in account && Boolean(account.personalAccessKey);
+        if (!isValidPersonalAccessKeyAccount) {
+            validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingPersonalAccessKey', {
                 accountId: account.accountId,
             }));
         }
     }
     if (account.authType === auth_1.OAUTH_AUTH_METHOD.value) {
-        valid = 'auth' in account && Boolean(account.auth);
-        if (!valid) {
-            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingAuth', {
+        const isValidOAuthAccount = 'auth' in account && Boolean(account.auth);
+        if (!isValidOAuthAccount) {
+            validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingAuth', {
                 accountId: account.accountId,
             }));
         }
     }
     if (account.authType === auth_1.API_KEY_AUTH_METHOD.value) {
-        valid = 'apiKey' in account && Boolean(account.apiKey);
-        if (!valid) {
-            logger_1.logger.debug((0, lang_1.i18n)('config.utils.isConfigAccountValid.missingApiKey', {
+        const isValidAPIKeyAccount = 'apiKey' in account && Boolean(account.apiKey);
+        if (!isValidAPIKeyAccount) {
+            validationErrors.push((0, lang_1.i18n)('config.utils.validateConfigAccount.missingApiKey', {
                 accountId: account.accountId,
             }));
         }
     }
-    return valid;
+    return { isValid: validationErrors.length === 0, errors: validationErrors };
 }
-exports.isConfigAccountValid = isConfigAccountValid;
+exports.validateConfigAccount = validateConfigAccount;
 function handleConfigFileSystemError(error, path) {
     let message;
     let type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.UNKNOWN;

package/errors/index.d.ts

@@ -13,9 +13,9 @@ export declare function isMissingScopeError(err: unknown): err is HubSpotHttpErr
 export declare function isGatingError(err: unknown): err is HubSpotHttpError;
 export declare function isTimeoutError(err: unknown): err is HubSpotHttpError;
 export declare function isAuthError(err: unknown): err is HubSpotHttpError;
-export declare function isValidationError(err: unknown): boolean;
+export declare function isValidationError(err: unknown): err is HubSpotHttpError;
 export declare function isHubSpotHttpError(error?: unknown): error is HubSpotHttpError;
-export declare function isGithubRateLimitError(err: unknown): boolean;
+export declare function isGithubRateLimitError(err: unknown): err is HubSpotHttpError;
 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

@@ -45,7 +45,7 @@ function isValidationError(err) {
 }
 exports.isValidationError = isValidationError;
 function isHubSpotHttpError(error) {
-    return !!error && error instanceof HubSpotHttpError_1.HubSpotHttpError;
+    return (!!error && error instanceof Error && error.name === HubSpotHttpError_1.HubSpotHttpErrorName);
 }
 exports.isHubSpotHttpError = isHubSpotHttpError;
 function isGithubRateLimitError(err) {
@@ -68,7 +68,7 @@ function isSystemError(err) {
 }
 exports.isSystemError = isSystemError;
 function isFileSystemError(err) {
-    return err instanceof FileSystemError_1.FileSystemError;
+    return err instanceof Error && err.name === FileSystemError_1.FilerSystemErrorName;
 }
 exports.isFileSystemError = isFileSystemError;
 function isHubSpotConfigError(err) {

package/http/getAxiosConfig.d.ts

@@ -6,4 +6,6 @@ export declare const USER_AGENTS: {
 export declare function getDefaultUserAgentHeader(): {
     'User-Agent': string;
 };
+export declare function hostnameMatchesNoProxyPattern(hostname: string, pattern: string): boolean;
+export declare function shouldUseProxy(baseURL: string): boolean;
 export declare function getAxiosConfig(options: HttpOptions): AxiosRequestConfig;

package/http/getAxiosConfig.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxiosConfig = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
+exports.getAxiosConfig = exports.shouldUseProxy = exports.hostnameMatchesNoProxyPattern = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
 const package_json_1 = require("../package.json");
 const config_1 = require("../config");
 const urls_1 = require("../lib/urls");
-const https_1 = __importDefault(require("https"));
 const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
+const http_proxy_agent_1 = require("http-proxy-agent");
+const https_proxy_agent_1 = require("https-proxy-agent");
 // Total number of sockets across all hosts
 const MAX_TOTAL_SOCKETS = 25;
 // Total number of sockets per each host
@@ -23,6 +25,39 @@ const httpsAgent = new https_1.default.Agent({
     maxTotalSockets: MAX_TOTAL_SOCKETS,
     maxSockets: MAX_SOCKETS_PER_HOST,
 });
+function getHttpProxyEnvVariable() {
+    return process.env.HTTP_PROXY || process.env.http_proxy;
+}
+function getHttpsProxyEnvVariable() {
+    return process.env.HTTPS_PROXY || process.env.https_proxy;
+}
+function getAllProxyEnvVariable() {
+    return process.env.ALL_PROXY || process.env.all_proxy;
+}
+function getHttpProxyAgent() {
+    const proxyUrl = getHttpProxyEnvVariable() || getAllProxyEnvVariable();
+    if (!proxyUrl) {
+        return httpAgent;
+    }
+    return new http_proxy_agent_1.HttpProxyAgent(proxyUrl, {
+        keepAlive: true,
+        maxTotalSockets: MAX_TOTAL_SOCKETS,
+        maxSockets: MAX_SOCKETS_PER_HOST,
+    });
+}
+function getHttpsProxyAgent() {
+    const proxyUrl = getHttpProxyEnvVariable() ||
+        getHttpsProxyEnvVariable() ||
+        getAllProxyEnvVariable();
+    if (!proxyUrl) {
+        return httpsAgent;
+    }
+    return new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, {
+        keepAlive: true,
+        maxTotalSockets: MAX_TOTAL_SOCKETS,
+        maxSockets: MAX_SOCKETS_PER_HOST,
+    });
+}
 exports.USER_AGENTS = {
     'HubSpot Local Dev Lib': package_json_1.version,
 };
@@ -39,6 +74,37 @@ exports.getDefaultUserAgentHeader = getDefaultUserAgentHeader;
 const DEFAULT_TRANSITIONAL = {
     clarifyTimeoutError: true,
 };
+function hostnameMatchesNoProxyPattern(hostname, pattern) {
+    const hostnameNormalized = hostname.toLowerCase();
+    const patternNormalized = pattern.trim().toLowerCase();
+    if (patternNormalized === '*') {
+        return true;
+    }
+    if (patternNormalized.startsWith('.')) {
+        return hostnameNormalized.endsWith(patternNormalized);
+    }
+    return (hostnameNormalized === patternNormalized || // exact match (e.g. "api.hubapi.com" matches "api.hubapi.com")
+        hostnameNormalized.endsWith(`.${patternNormalized}`) // domain suffix match (e.g. "api.hubapi.com" matches ".hubapi.com")
+    );
+}
+exports.hostnameMatchesNoProxyPattern = hostnameMatchesNoProxyPattern;
+function shouldUseProxy(baseURL) {
+    if (!getHttpProxyEnvVariable() &&
+        !getHttpsProxyEnvVariable() &&
+        !getAllProxyEnvVariable()) {
+        return false;
+    }
+    const noProxy = process.env.NO_PROXY || process.env.no_proxy;
+    if (noProxy) {
+        const hostname = new URL(baseURL).hostname;
+        const noProxyList = noProxy.split(',').filter(Boolean);
+        if (noProxyList.some(pattern => hostnameMatchesNoProxyPattern(hostname, pattern))) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.shouldUseProxy = shouldUseProxy;
 function getAxiosConfig(options) {
     const { env, localHostOverride, headers, ...rest } = options;
     let config;
@@ -56,16 +122,19 @@ function getAxiosConfig(options) {
     if (config && config.httpUseLocalhost) {
         httpUseLocalhost = config.httpUseLocalhost;
     }
+    const baseURL = (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost);
     return {
-        baseURL: (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost),
+        baseURL,
         headers: {
             ...getDefaultUserAgentHeader(),
             ...(headers || {}),
         },
         timeout: httpTimeout,
         transitional: DEFAULT_TRANSITIONAL,
-        httpAgent,
-        httpsAgent,
+        // Disable axios's built-in proxy handling - we use custom agents instead
+        proxy: false,
+        httpAgent: shouldUseProxy(baseURL) ? getHttpProxyAgent() : httpAgent,
+        httpsAgent: shouldUseProxy(baseURL) ? getHttpsProxyAgent() : httpsAgent,
         ...rest,
     };
 }

package/http/index.js

@@ -41,6 +41,7 @@ const lang_1 = require("../utils/lang");
 const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const auth_1 = require("../constants/auth");
 const localDevAuth_1 = require("../api/localDevAuth");
+const fireAlarm_1 = require("../api/fireAlarm");
 const util = __importStar(require("util"));
 const trackUsage_1 = require("../lib/trackUsage");
 const i18nKey = 'http.index';
@@ -48,14 +49,15 @@ const IGNORE_URLS_NETWORK_DEBUG = [
     localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
     trackUsage_1.CMS_CLI_USAGE_PATH,
     trackUsage_1.VSCODE_USAGE_PATH,
+    fireAlarm_1.FIREALARM_API_AUTH_PATH,
 ];
 function logRequest(response) {
     try {
         if (!process.env.HUBSPOT_NETWORK_LOGGING) {
             return;
         }
-        if (response?.config?.url &&
-            IGNORE_URLS_NETWORK_DEBUG.includes(response.config.url)) {
+        if (!process.env.HUBSPOT_DEBUG_LOGGING_VERBOSE &&
+            IGNORE_URLS_NETWORK_DEBUG.some(url => response?.config?.url && response.config.url.includes(url))) {
             return;
         }
         logger_1.logger.debug(util.inspect({
@@ -82,6 +84,13 @@ axios_1.default.interceptors.response.use((response) => {
     catch (e) {
         // Ignore any errors that occur while logging the response
     }
+    // Don't re-wrap if already a HubSpotHttpError. This can happen when
+    // multiple copies of local-dev-lib are loaded and share the same axios
+    // instance, causing multiple interceptors to be registered.
+    if (error instanceof HubSpotHttpError_1.HubSpotHttpError ||
+        error?.name === HubSpotHttpError_1.HubSpotHttpErrorName) {
+        return Promise.reject(error);
+    }
     // Wrap all axios errors in our own Error class.  Attach the error
     // as the cause for the new error, so we maintain the stack trace
     return Promise.reject(new HubSpotHttpError_1.HubSpotHttpError(error.message, { cause: error }));

package/lang/en.json

@@ -251,11 +251,11 @@
       "error": "No config file found.",
       "errorWithPath": "No config file found at {{ path }}."
     },
-    "isConfigValid": {
-      "missingAccounts": "Invalid config: no accounts found",
-      "duplicateAccountIds": "Invalid config: multiple accounts with accountId: {{ accountId }}",
-      "duplicateAccountNames": "Invalid config: multiple accounts with name: {{ accountName }}",
-      "invalidAccountName": "Invalid config: account name {{ accountName }} contains spaces"
+    "validateConfig": {
+      "missingAccounts": "No accounts found",
+      "duplicateAccountIds": "Multiple accounts with accountId: {{ accountId }}",
+      "duplicateAccountNames": "Multiple accounts with name: {{ accountName }}",
+      "invalidAccountName": "Account name {{ accountName }} contains spaces"
     },
     "getConfigAccountById": {
       "error": "No account with id {{ accountId }} exists in config"
@@ -276,7 +276,7 @@
       "accountNotFound": "Attempting to update account with id {{ id }}, but that account was not found in config"
     },
     "setConfigAccountAsDefault": {
-      "accountNotFound": "Attempted to set account with id {{ accountId }} as default, but that account was not found in config"
+      "accountNotFound": "Attempted to set account with identifier {{ identifier }} as default, but that account was not found in config"
     },
     "renameConfigAccount": {
       "accountNotFound": "Attempted to rename account with name {{ currentName }}, but that account was not found in config",
@@ -299,13 +299,13 @@
         "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",
-        "missingAccountId": "Invalid config: at least one account in config is missing accountId",
-        "missingApiKey": "Invalid config: account {{ accountId }} has authType of apikey but is missing the apiKey field",
-        "missingAuth": "Invalid config: account {{ accountId }} has authtype of oauth2 but is missing auth data",
-        "missingPersonalAccessKey": "Invalid config: account {{ accountId }} has authType of personalAccessKey but is missing the personalAccessKey field"
+      "validateConfigAccount": {
+        "missingAccount": "At least one account in config is missing data",
+        "missingAuthType": "Account {{ accountId }} has no authType",
+        "missingAccountId": "At least one account in config is missing accountId",
+        "missingApiKey": "Account {{ accountId }} has authType of apikey but is missing the apiKey field",
+        "missingAuth": "Account {{ accountId }} has authtype of oauth2 but is missing auth data",
+        "missingPersonalAccessKey": "Account {{ accountId }} has authType of personalAccessKey but is missing the personalAccessKey field"
       },
       "getConfigPathEnvironmentVariables": {
         "invalidEnvironmentVariables": "USE_ENVIRONMENT_HUBSPOT_CONFIG and HUBSPOT_CONFIG_PATH cannot both be set simultaneously"

package/lib/personalAccessKey.js

@@ -121,7 +121,7 @@ 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.getConfigAccountIfExists)(name) : undefined;
+    const account = (0, config_1.getConfigAccountIfExists)(portalId);
     const accountEnv = env || account?.env || environments_1.ENVIRONMENTS.PROD;
     let parentAccountId;
     try {
@@ -159,12 +159,12 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
         accountId: portalId,
         accountType,
         personalAccessKey,
-        name: name || account?.name || token.hubName,
+        name: name || account?.name,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         auth: { tokenInfo: { accessToken, expiresAt } },
         parentAccountId,
         env: accountEnv,
-    };
+    }; // Account may temporarily not have a name before prompted to add one in the CLI
     // Add new account if it doesn't exist, otherwise update existing account
     if (account) {
         (0, config_1.updateConfigAccount)(updatedAccount);

package/lib/portManager.d.ts

@@ -1,4 +1,4 @@
-import { RequestPortsData } from '../types/PortManager';
+import { RequestPortsData, ServerPortMap } from '../types/PortManager';
 export declare const BASE_URL: string;
 export declare function isPortManagerPortAvailable(): Promise<boolean>;
 export declare function isPortManagerServerRunning(): Promise<boolean>;
@@ -7,6 +7,7 @@ export declare function stopPortManagerServer(): Promise<void>;
 export declare function requestPorts(portData: Array<RequestPortsData>): Promise<{
     [instanceId: string]: number;
 }>;
+export declare function getActiveServers(): Promise<ServerPortMap>;
 export declare function getServerPortByInstanceId(serverInstanceId: string): Promise<number>;
 export declare function deleteServerInstance(serverInstanceId: string): Promise<void>;
 export declare function portManagerHasActiveServers(): Promise<boolean>;

package/lib/portManager.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.portManagerHasActiveServers = exports.deleteServerInstance = exports.getServerPortByInstanceId = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.isPortManagerPortAvailable = exports.BASE_URL = void 0;
+exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.getServerPortByInstanceId = exports.getActiveServers = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.isPortManagerPortAvailable = exports.BASE_URL = void 0;
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
 const ports_1 = require("../constants/ports");
@@ -45,6 +45,11 @@ async function requestPorts(portData) {
     return data.ports;
 }
 exports.requestPorts = requestPorts;
+async function getActiveServers() {
+    const { data } = await axios_1.default.get(`${exports.BASE_URL}/servers`);
+    return data.servers;
+}
+exports.getActiveServers = getActiveServers;
 async function getServerPortByInstanceId(serverInstanceId) {
     const { data } = await axios_1.default.get(`${exports.BASE_URL}/servers/${serverInstanceId}`);
     return data.port;

package/models/FileSystemError.d.ts

@@ -1,4 +1,5 @@
 import { FileSystemErrorContext } from '../types/Error';
+export declare const FilerSystemErrorName = "FilerSystemError";
 export declare class FileSystemError extends Error {
     private context;
     constructor(options?: ErrorOptions, context?: FileSystemErrorContext);

package/models/FileSystemError.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileSystemError = void 0;
+exports.FileSystemError = exports.FilerSystemErrorName = void 0;
 const lang_1 = require("../utils/lang");
 const errors_1 = require("../errors");
 const i18nKey = 'errors.fileSystemErrors';
+exports.FilerSystemErrorName = 'FilerSystemError';
 class FileSystemError extends Error {
     context;
     constructor(options, context) {
         super('', options);
-        this.name = 'FileSystemError';
+        this.name = exports.FilerSystemErrorName;
         this.context = context;
         if (context) {
             let fileAction = '';

package/models/HubSpotHttpError.d.ts

@@ -1,4 +1,5 @@
 import { HubSpotHttpErrorContext } from '../types/Error';
+export declare const HubSpotHttpErrorName = "HubSpotHttpError";
 export declare class HubSpotHttpError<T = any> extends Error {
     status?: number;
     code?: string;
@@ -17,7 +18,7 @@ export declare class HubSpotHttpError<T = any> extends Error {
     timeout?: number;
     correlationId?: string;
     constructor(message?: string, options?: ErrorOptions, context?: HubSpotHttpErrorContext);
-    updateContext(context: Partial<HubSpotHttpErrorContext>): void;
+    updateContext(context: Partial<HubSpotHttpErrorContext>, additionalDebugContext?: string): void;
     toString(): string;
     formattedValidationErrors(): string;
     private extractDerivedContext;

package/models/HubSpotHttpError.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HubSpotHttpError = void 0;
+exports.HubSpotHttpError = exports.HubSpotHttpErrorName = void 0;
 const axios_1 = require("axios");
 const api_1 = require("../constants/api");
 const lang_1 = require("../utils/lang");
+exports.HubSpotHttpErrorName = 'HubSpotHttpError';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 class HubSpotHttpError extends Error {
     status;
@@ -22,7 +23,7 @@ class HubSpotHttpError extends Error {
     correlationId;
     constructor(message, options, context) {
         super(message, options);
-        this.name = 'HubSpotHttpError';
+        this.name = exports.HubSpotHttpErrorName;
         this.context = context;
         this.cause = options?.cause;
         if (options && (0, axios_1.isAxiosError)(options.cause)) {
@@ -60,11 +61,11 @@ class HubSpotHttpError extends Error {
             this.message = messages.join(' ');
         }
     }
-    updateContext(context) {
+    updateContext(context, additionalDebugContext) {
         this.context = { ...this.context, ...context };
         // Update the error messages when the context is updated
         if ((0, axios_1.isAxiosError)(this.cause)) {
-            this.message = this.joinErrorMessages(this.cause, this.context);
+            this.message = this.joinErrorMessages(this.cause, this.context, additionalDebugContext);
         }
     }
     toString() {
@@ -137,8 +138,7 @@ class HubSpotHttpError extends Error {
         }
         this.validationErrors = errorMessages;
     }
-    joinErrorMessages(error, context = {}) {
-        const i18nKey = 'errors.apiErrors';
+    joinErrorMessages(error, context = {}, additionalDebugContext) {
         const status = error.response?.status;
         const method = error.config?.method;
         let messageDetail;
@@ -149,48 +149,68 @@ class HubSpotHttpError extends Error {
             const requestName = context.request
                 ? `${action} ${preposition} '${context.request}'`
                 : action;
-            messageDetail = (0, lang_1.i18n)(`${i18nKey}.messageDetail`, {
+            messageDetail = (0, lang_1.i18n)(`errors.apiErrors.messageDetail`, {
                 accountId: context.accountId,
                 requestName,
             });
         }
         else {
-            messageDetail = (0, lang_1.i18n)(`${i18nKey}.genericMessageDetail`);
+            messageDetail = (0, lang_1.i18n)(`errors.apiErrors.genericMessageDetail`);
         }
         const errorMessage = [];
         if ((method === 'put' || method === 'post') && context.payload) {
-            errorMessage.push((0, lang_1.i18n)(`${i18nKey}.unableToUpload`, { payload: context.payload }));
+            errorMessage.push((0, lang_1.i18n)(`errors.apiErrors.unableToUpload`, { payload: context.payload }));
         }
+        let statusBasedMessage;
         switch (status) {
             case 400:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.400`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.400`, {
+                    messageDetail,
+                });
                 break;
             case 401:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.401`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.401`, {
+                    messageDetail,
+                });
                 break;
             case 403:
                 break;
             case 404:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.404`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.404`, {
+                    messageDetail,
+                });
                 break;
             case 429:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.429`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.429`, {
+                    messageDetail,
+                });
                 break;
             case 503:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.503`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.503`, {
+                    messageDetail,
+                });
                 break;
             default:
                 if (status && status >= 500 && status < 600) {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.500Generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.500Generic`, {
+                        messageDetail,
+                    });
                 }
                 else if (status && status >= 400 && status < 500) {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.400Generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.400Generic`, {
+                        messageDetail,
+                    });
                 }
                 else {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.generic`, {
+                        messageDetail,
+                    });
                 }
                 break;
         }
+        if (statusBasedMessage) {
+            errorMessage.push(`${statusBasedMessage}${additionalDebugContext ? ` ${additionalDebugContext}` : ''}`);
+        }
         if (error?.response?.data) {
             const { message, errors } = error.response.data;
             if (message) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.9",
+    "version": "0.6.1-experimental.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -11,11 +11,11 @@
         "access": "public"
     },
     "scripts": {
-        "build": "ts-node ./scripts/build.ts",
+        "build": "tsx ./scripts/build.ts",
         "lint": "eslint --max-warnings=0 . && prettier . --check",
         "local-dev": "yarn build && cd dist && yarn link && cd .. && tsc --watch --rootDir . --outdir dist",
         "prettier:write": "prettier . --write",
-        "release": "ts-node ./scripts/release.ts release",
+        "release": "tsx ./scripts/release.ts release",
         "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ./node_modules/.bin/jest"
     },
     "license": "Apache-2.0",
@@ -39,7 +39,7 @@
         "jest": "^29.5.0",
         "open": "^8.4.2",
         "ts-jest": "^29.0.5",
-        "ts-node": "^10.9.2",
+        "tsx": "^4.20.6",
         "typescript": "^4.9.5",
         "yargs": "^17.7.2"
     },
@@ -73,6 +73,8 @@
         "findup-sync": "5.0.0",
         "form-data": "^4.0.4",
         "fs-extra": "11.2.0",
+        "http-proxy-agent": "7.0.2",
+        "https-proxy-agent": "7.0.6",
         "ignore": "5.3.1",
         "js-yaml": "4.1.0",
         "moment": "2.30.1",

package/types/Config.d.ts

@@ -34,3 +34,7 @@ export type HubSpotState = {
 };
 export type HubSpotConfigErrorType = ValueOf<typeof HUBSPOT_CONFIG_ERROR_TYPES>;
 export type HubSpotConfigOperation = ValueOf<typeof HUBSPOT_CONFIG_OPERATIONS>;
+export type HubSpotConfigValidationResult = {
+    isValid: boolean;
+    errors: Array<string>;
+};

package/types/Deploy.d.ts

@@ -35,13 +35,6 @@ export type DeployStatusTaskLocator = {
         status: string;
     }>;
 };
-export type ProjectDeployResponseQueued = {
-    id: string;
-    buildResultType: 'DEPLOY_QUEUED';
-    links: {
-        status: string;
-    };
-};
 export type SubdeployValidationIssue = {
     uid: string;
     componentTypeName: string;
@@ -51,8 +44,20 @@ export type SubdeployValidationIssue = {
         isWarning: boolean;
     }[];
 };
+export type DeployResponseLinks = {
+    status: string;
+};
+export type ProjectDeployResponseQueued = {
+    id: string;
+    buildResultType: 'DEPLOY_QUEUED';
+    links: DeployResponseLinks;
+};
 export type ProjectDeployResponseBlocked = {
     buildResultType: 'DEPLOY_BLOCKED';
     issues: SubdeployValidationIssue[];
 };
 export type ProjectDeployResponse = ProjectDeployResponseQueued | ProjectDeployResponseBlocked;
+export type ProjectDeployResponseV1 = {
+    id: string;
+    links: DeployResponseLinks;
+};

package/utils/git.js

@@ -12,8 +12,9 @@ const GITIGNORE_FILE = '.gitignore';
 function makeComparisonDir(filepath) {
     if (typeof filepath !== 'string')
         return null;
+    let dir = path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase();
     // Append sep to make comparisons easier e.g. 'foos'.startsWith('foo')
-    return path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase() + path_1.default.sep;
+    return dir + (!dir.endsWith(path_1.default.sep) ? path_1.default.sep : '');
 }
 function getGitComparisonDir() {
     return makeComparisonDir((0, findup_sync_1.default)('.git'));