@hubspot/local-dev-lib 0.2.3 → 0.2.4-experimental.0

package/config/index.js

@@ -22,48 +22,45 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDefaultMode = exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.getEnv = exports.isTrackingAllowed = exports.isConfigFlagEnabled = exports.deleteConfigFile = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.deleteAccount = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.renameAccount = exports.updateDefaultAccount = exports.updateAccountConfig = exports.accountNameExistsInConfig = exports.getAccountConfig = exports.getConfigPath = exports.writeConfig = exports.getConfig = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.loadConfigFromEnvironment = exports.validateConfig = exports.getAndLoadConfigIfNeeded = exports.loadConfig = void 0;
+exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getDefaultAccountOverrideFilePath = exports.getCWDAccountOverride = exports.updateDefaultCmsPublishMode = exports.getConfigAccounts = exports.getConfigDefaultAccount = exports.getAccountType = exports.getEnv = exports.isTrackingAllowed = exports.isConfigFlagEnabled = exports.deleteConfigFile = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.deleteAccount = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.renameAccount = exports.updateDefaultAccount = exports.updateAccountConfig = exports.accountNameExistsInConfig = exports.getAccountConfig = exports.configFileExists = exports.getConfigPath = exports.writeConfig = exports.getConfig = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.loadConfigFromEnvironment = exports.validateConfig = exports.getAndLoadConfigIfNeeded = exports.loadConfig = void 0;
 const config_DEPRECATED = __importStar(require("./config_DEPRECATED"));
-const CLIConfiguration_1 = __importDefault(require("./CLIConfiguration"));
+const CLIConfiguration_1 = require("./CLIConfiguration");
 const configFile_1 = require("./configFile");
-const getAccountIdentifier_1 = require("../utils/getAccountIdentifier");
+const getAccountIdentifier_1 = require("./getAccountIdentifier");
 // Use new config if it exists
 function loadConfig(path, options = {}) {
     // Attempt to load the root config
     if ((0, configFile_1.configFileExists)()) {
-        return CLIConfiguration_1.default.init(options);
+        return CLIConfiguration_1.CLIConfiguration.init(options);
     }
     return config_DEPRECATED.loadConfig(path, options);
 }
 exports.loadConfig = loadConfig;
 function getAndLoadConfigIfNeeded(options) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.config;
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.config;
     }
     return config_DEPRECATED.getAndLoadConfigIfNeeded(options);
 }
 exports.getAndLoadConfigIfNeeded = getAndLoadConfigIfNeeded;
 function validateConfig() {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.validate();
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.validate();
     }
     return config_DEPRECATED.validateConfig();
 }
 exports.validateConfig = validateConfig;
 function loadConfigFromEnvironment() {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.useEnvConfig;
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.useEnvConfig;
     }
     return Boolean(config_DEPRECATED.loadConfigFromEnvironment());
 }
 exports.loadConfigFromEnvironment = loadConfigFromEnvironment;
-function createEmptyConfigFile(options = {}, useRootConfig = false) {
-    if (useRootConfig) {
-        CLIConfiguration_1.default.write({ accounts: [] });
+function createEmptyConfigFile(options = {}, useHiddenConfig = false) {
+    if (useHiddenConfig) {
+        CLIConfiguration_1.CLIConfiguration.write({ accounts: [] });
     }
     else {
         return config_DEPRECATED.createEmptyConfigFile(options);
@@ -71,56 +68,62 @@ function createEmptyConfigFile(options = {}, useRootConfig = false) {
 }
 exports.createEmptyConfigFile = createEmptyConfigFile;
 function deleteEmptyConfigFile() {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.delete();
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.delete();
     }
     return config_DEPRECATED.deleteEmptyConfigFile();
 }
 exports.deleteEmptyConfigFile = deleteEmptyConfigFile;
 function getConfig() {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.config;
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.config;
     }
     return config_DEPRECATED.getConfig();
 }
 exports.getConfig = getConfig;
 function writeConfig(options = {}) {
-    if (CLIConfiguration_1.default.isActive()) {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
         const config = options.source
             ? JSON.parse(options.source)
             : undefined;
-        CLIConfiguration_1.default.write(config);
+        CLIConfiguration_1.CLIConfiguration.write(config);
     }
     else {
         config_DEPRECATED.writeConfig(options);
     }
 }
 exports.writeConfig = writeConfig;
-function getConfigPath(path) {
-    if (CLIConfiguration_1.default.isActive()) {
+function getConfigPath(path, useHiddenConfig = false) {
+    if (useHiddenConfig || CLIConfiguration_1.CLIConfiguration.isActive()) {
         return (0, configFile_1.getConfigFilePath)();
     }
     return config_DEPRECATED.getConfigPath(path);
 }
 exports.getConfigPath = getConfigPath;
+function configFileExists(useHiddenConfig) {
+    return useHiddenConfig
+        ? (0, configFile_1.configFileExists)()
+        : Boolean(config_DEPRECATED.getConfigPath());
+}
+exports.configFileExists = configFileExists;
 function getAccountConfig(accountId) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.getConfigForAccount(accountId);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getConfigForAccount(accountId);
     }
     return config_DEPRECATED.getAccountConfig(accountId) || null;
 }
 exports.getAccountConfig = getAccountConfig;
 function accountNameExistsInConfig(name) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.isAccountInConfig(name);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.isAccountInConfig(name);
     }
     return config_DEPRECATED.accountNameExistsInConfig(name);
 }
 exports.accountNameExistsInConfig = accountNameExistsInConfig;
 function updateAccountConfig(configOptions) {
     const accountIdentifier = (0, getAccountIdentifier_1.getAccountIdentifier)(configOptions);
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.updateAccount({
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.addOrUpdateAccount({
             ...configOptions,
             accountId: accountIdentifier,
         });
@@ -132,8 +135,8 @@ function updateAccountConfig(configOptions) {
 }
 exports.updateAccountConfig = updateAccountConfig;
 function updateDefaultAccount(nameOrId) {
-    if (CLIConfiguration_1.default.isActive()) {
-        CLIConfiguration_1.default.updateDefaultAccount(nameOrId);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        CLIConfiguration_1.CLIConfiguration.updateDefaultAccount(nameOrId);
     }
     else {
         config_DEPRECATED.updateDefaultAccount(nameOrId);
@@ -141,40 +144,40 @@ function updateDefaultAccount(nameOrId) {
 }
 exports.updateDefaultAccount = updateDefaultAccount;
 async function renameAccount(currentName, newName) {
-    if (CLIConfiguration_1.default.isActive()) {
-        CLIConfiguration_1.default.renameAccount(currentName, newName);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.renameAccount(currentName, newName);
     }
     else {
-        config_DEPRECATED.renameAccount(currentName, newName);
+        return config_DEPRECATED.renameAccount(currentName, newName);
     }
 }
 exports.renameAccount = renameAccount;
 function getAccountId(nameOrId) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.getAccountId(nameOrId);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getAccountId(nameOrId);
     }
     return config_DEPRECATED.getAccountId(nameOrId) || null;
 }
 exports.getAccountId = getAccountId;
 function removeSandboxAccountFromConfig(nameOrId) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.removeAccountFromConfig(nameOrId);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.removeAccountFromConfig(nameOrId);
     }
     return config_DEPRECATED.removeSandboxAccountFromConfig(nameOrId);
 }
 exports.removeSandboxAccountFromConfig = removeSandboxAccountFromConfig;
 async function deleteAccount(accountName) {
-    if (CLIConfiguration_1.default.isActive()) {
-        CLIConfiguration_1.default.removeAccountFromConfig(accountName);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.removeAccountFromConfig(accountName);
     }
     else {
-        config_DEPRECATED.deleteAccount(accountName);
+        return config_DEPRECATED.deleteAccount(accountName);
     }
 }
 exports.deleteAccount = deleteAccount;
 function updateHttpTimeout(timeout) {
-    if (CLIConfiguration_1.default.isActive()) {
-        CLIConfiguration_1.default.updateHttpTimeout(timeout);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        CLIConfiguration_1.CLIConfiguration.updateHttpTimeout(timeout);
     }
     else {
         config_DEPRECATED.updateHttpTimeout(timeout);
@@ -182,8 +185,8 @@ function updateHttpTimeout(timeout) {
 }
 exports.updateHttpTimeout = updateHttpTimeout;
 function updateAllowUsageTracking(isEnabled) {
-    if (CLIConfiguration_1.default.isActive()) {
-        CLIConfiguration_1.default.updateAllowUsageTracking(isEnabled);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        CLIConfiguration_1.CLIConfiguration.updateAllowUsageTracking(isEnabled);
     }
     else {
         config_DEPRECATED.updateAllowUsageTracking(isEnabled);
@@ -191,7 +194,7 @@ function updateAllowUsageTracking(isEnabled) {
 }
 exports.updateAllowUsageTracking = updateAllowUsageTracking;
 function deleteConfigFile() {
-    if (CLIConfiguration_1.default.isActive()) {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
         (0, configFile_1.deleteConfigFile)();
     }
     else {
@@ -200,33 +203,70 @@ function deleteConfigFile() {
 }
 exports.deleteConfigFile = deleteConfigFile;
 function isConfigFlagEnabled(flag) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.isConfigFlagEnabled(flag);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.isConfigFlagEnabled(flag);
     }
     return config_DEPRECATED.isConfigFlagEnabled(flag);
 }
 exports.isConfigFlagEnabled = isConfigFlagEnabled;
 function isTrackingAllowed() {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.isTrackingAllowed();
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.isTrackingAllowed();
     }
     return config_DEPRECATED.isTrackingAllowed();
 }
 exports.isTrackingAllowed = isTrackingAllowed;
 function getEnv(nameOrId) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.getEnv(nameOrId);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getEnv(nameOrId);
     }
     return config_DEPRECATED.getEnv(nameOrId);
 }
 exports.getEnv = getEnv;
-// These functions are either not supported or have breaking changes with the new config setup
-exports.getConfigAccounts = config_DEPRECATED.getConfigAccounts;
-exports.getConfigDefaultAccount = config_DEPRECATED.getConfigDefaultAccount;
+function getAccountType(accountType, sandboxAccountType) {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getAccountType(accountType, sandboxAccountType);
+    }
+    return config_DEPRECATED.getAccountType(accountType, sandboxAccountType);
+}
+exports.getAccountType = getAccountType;
+function getConfigDefaultAccount() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getDefaultAccount();
+    }
+    return config_DEPRECATED.getConfigDefaultAccount();
+}
+exports.getConfigDefaultAccount = getConfigDefaultAccount;
+function getConfigAccounts() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getConfigAccounts();
+    }
+    return config_DEPRECATED.getConfigAccounts();
+}
+exports.getConfigAccounts = getConfigAccounts;
+function updateDefaultCmsPublishMode(cmsPublishMode) {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.updateDefaultCmsPublishMode(cmsPublishMode);
+    }
+    return config_DEPRECATED.updateDefaultCmsPublishMode(cmsPublishMode);
+}
+exports.updateDefaultCmsPublishMode = updateDefaultCmsPublishMode;
+function getCWDAccountOverride() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getCWDAccountOverride();
+    }
+}
+exports.getCWDAccountOverride = getCWDAccountOverride;
+function getDefaultAccountOverrideFilePath() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getDefaultAccountOverrideFilePath();
+    }
+}
+exports.getDefaultAccountOverrideFilePath = getDefaultAccountOverrideFilePath;
+// These functions are not supported with the new config setup
 exports.getConfigAccountId = config_DEPRECATED.getConfigAccountId;
 exports.getOrderedAccount = config_DEPRECATED.getOrderedAccount;
 exports.getOrderedConfig = config_DEPRECATED.getOrderedConfig;
 exports.setConfig = config_DEPRECATED.setConfig;
 exports.setConfigPath = config_DEPRECATED.setConfigPath;
 exports.findConfig = config_DEPRECATED.findConfig;
-exports.updateDefaultMode = config_DEPRECATED.updateDefaultMode;

package/config/migrate.d.ts

@@ -0,0 +1,22 @@
+import { CLIConfig_DEPRECATED, CLIConfig_NEW, Environment } from '../types/Config';
+import { CmsPublishMode } from '../types/Files';
+export declare function getDeprecatedConfig(configPath?: string): CLIConfig_DEPRECATED | null;
+export declare function getGlobalConfig(): CLIConfig_NEW | null;
+export declare function configFileExists(useHiddenConfig?: boolean, configPath?: string): boolean;
+export declare function getConfigPath(configPath?: string, useHiddenConfig?: boolean): string | null;
+export declare function migrateConfig(deprecatedConfig: CLIConfig_DEPRECATED | null): void;
+type ConflictValue = boolean | string | number | CmsPublishMode | Environment;
+export type ConflictProperty = {
+    property: keyof CLIConfig_NEW;
+    oldValue: ConflictValue;
+    newValue: ConflictValue;
+};
+export declare function mergeConfigProperties(globalConfig: CLIConfig_NEW, deprecatedConfig: CLIConfig_DEPRECATED, force?: boolean): {
+    initialConfig: CLIConfig_NEW;
+    conflicts: Array<ConflictProperty>;
+};
+export declare function mergeExistingConfigs(globalConfig: CLIConfig_NEW, deprecatedConfig: CLIConfig_DEPRECATED): {
+    finalConfig: CLIConfig_NEW;
+    skippedAccountIds: Array<string | number>;
+};
+export {};

package/config/migrate.js

@@ -0,0 +1,166 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeExistingConfigs = exports.mergeConfigProperties = exports.migrateConfig = exports.getConfigPath = exports.configFileExists = exports.getGlobalConfig = exports.getDeprecatedConfig = void 0;
+const fs_1 = __importDefault(require("fs"));
+const config_DEPRECATED = __importStar(require("./config_DEPRECATED"));
+const CLIConfiguration_1 = require("./CLIConfiguration");
+const index_1 = require("./index");
+const configFile_1 = require("./configFile");
+const config_1 = require("../constants/config");
+const lang_1 = require("../utils/lang");
+const i18nKey = 'config.migrate';
+function getDeprecatedConfig(configPath) {
+    return config_DEPRECATED.loadConfig(configPath);
+}
+exports.getDeprecatedConfig = getDeprecatedConfig;
+function getGlobalConfig() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.config;
+    }
+    return null;
+}
+exports.getGlobalConfig = getGlobalConfig;
+function configFileExists(useHiddenConfig = false, configPath) {
+    return useHiddenConfig
+        ? (0, configFile_1.configFileExists)()
+        : Boolean(configPath && fs_1.default.existsSync(configPath)) ||
+            Boolean(config_DEPRECATED.loadConfig(configPath));
+}
+exports.configFileExists = configFileExists;
+function getConfigPath(configPath, useHiddenConfig = false) {
+    if (useHiddenConfig) {
+        return (0, configFile_1.getConfigFilePath)();
+    }
+    return config_DEPRECATED.getConfigPath(configPath);
+}
+exports.getConfigPath = getConfigPath;
+function writeGlobalConfigFile(updatedConfig, isMigrating = false) {
+    const updatedConfigJson = JSON.stringify(updatedConfig);
+    if (isMigrating) {
+        (0, index_1.createEmptyConfigFile)({}, true);
+    }
+    (0, index_1.loadConfig)('');
+    try {
+        (0, index_1.writeConfig)({ source: updatedConfigJson });
+        config_DEPRECATED.deleteConfigFile();
+    }
+    catch (error) {
+        (0, index_1.deleteEmptyConfigFile)();
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.writeConfig`, { configPath: config_1.GLOBAL_CONFIG_PATH }), { cause: error });
+    }
+}
+function migrateConfig(deprecatedConfig) {
+    if (!deprecatedConfig) {
+        throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.noDeprecatedConfig`));
+    }
+    const { defaultPortal, portals, ...rest } = deprecatedConfig;
+    const updatedConfig = {
+        ...rest,
+        defaultAccount: defaultPortal,
+        accounts: portals
+            .filter(({ portalId }) => portalId !== undefined)
+            .map(({ portalId, ...rest }) => ({
+            ...rest,
+            accountId: portalId,
+        })),
+    };
+    writeGlobalConfigFile(updatedConfig, true);
+}
+exports.migrateConfig = migrateConfig;
+function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
+    const propertiesToCheck = [
+        config_1.DEFAULT_CMS_PUBLISH_MODE,
+        config_1.HTTP_TIMEOUT,
+        config_1.ENV,
+        config_1.HTTP_USE_LOCALHOST,
+        config_1.ALLOW_USAGE_TRACKING,
+    ];
+    const conflicts = [];
+    propertiesToCheck.forEach(prop => {
+        if (prop in globalConfig && prop in deprecatedConfig) {
+            if (force || globalConfig[prop] === deprecatedConfig[prop]) {
+                // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED types
+                globalConfig[prop] = deprecatedConfig[prop];
+            }
+            else {
+                conflicts.push({
+                    property: prop,
+                    oldValue: deprecatedConfig[prop],
+                    newValue: globalConfig[prop],
+                });
+            }
+        }
+    });
+    if (config_1.DEFAULT_ACCOUNT in globalConfig &&
+        config_1.DEFAULT_PORTAL in deprecatedConfig &&
+        globalConfig.defaultAccount !== deprecatedConfig.defaultPortal) {
+        conflicts.push({
+            property: config_1.DEFAULT_ACCOUNT,
+            oldValue: deprecatedConfig.defaultPortal,
+            newValue: globalConfig.defaultAccount,
+        });
+    }
+    else if (config_1.DEFAULT_PORTAL in deprecatedConfig) {
+        globalConfig.defaultAccount = deprecatedConfig.defaultPortal;
+    }
+    return { initialConfig: globalConfig, conflicts };
+}
+exports.mergeConfigProperties = mergeConfigProperties;
+function mergeAccounts(globalConfig, deprecatedConfig) {
+    let existingAccountIds = [];
+    const skippedAccountIds = [];
+    if (globalConfig.accounts && deprecatedConfig.portals) {
+        existingAccountIds = globalConfig.accounts.map(account => account.accountId);
+        const newAccounts = deprecatedConfig.portals
+            .filter(portal => {
+            const isExisting = existingAccountIds.includes(portal.portalId);
+            if (isExisting) {
+                skippedAccountIds.push(portal.portalId);
+            }
+            return !isExisting;
+        })
+            .map(({ portalId, ...rest }) => ({
+            ...rest,
+            accountId: portalId,
+        }));
+        if (newAccounts.length > 0) {
+            globalConfig.accounts.push(...newAccounts);
+        }
+    }
+    return {
+        finalConfig: globalConfig,
+        skippedAccountIds,
+    };
+}
+function mergeExistingConfigs(globalConfig, deprecatedConfig) {
+    const { finalConfig, skippedAccountIds } = mergeAccounts(globalConfig, deprecatedConfig);
+    writeGlobalConfigFile(finalConfig);
+    return { finalConfig, skippedAccountIds };
+}
+exports.mergeExistingConfigs = mergeExistingConfigs;

package/constants/config.d.ts

@@ -1,4 +1,29 @@
 export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml";
-export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hubspot";
+export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hscli";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
+export declare const GLOBAL_CONFIG_PATH: string;
+export declare const DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = ".hsaccount";
+export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID";
+export declare const DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = "DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND";
+export declare const DEFAULT_CMS_PUBLISH_MODE = "defaultCmsPublishMode";
+export declare const HTTP_TIMEOUT = "httpTimeout";
+export declare const ENV = "env";
+export declare const HTTP_USE_LOCALHOST = "httpUseLocalhost";
+export declare const ALLOW_USAGE_TRACKING = "allowUsageTracking";
+export declare const DEFAULT_ACCOUNT = "defaultAccount";
+export declare const DEFAULT_PORTAL = "defaultPortal";
 export declare const MIN_HTTP_TIMEOUT = 3000;
+export declare const HUBSPOT_ACCOUNT_TYPES: {
+    readonly DEVELOPMENT_SANDBOX: "DEVELOPMENT_SANDBOX";
+    readonly DEVELOPER_TEST: "DEVELOPER_TEST";
+    readonly APP_DEVELOPER: "APP_DEVELOPER";
+    readonly STANDARD_SANDBOX: "STANDARD_SANDBOX";
+    readonly STANDARD: "STANDARD";
+};
+export declare const HUBSPOT_ACCOUNT_TYPE_STRINGS: {
+    readonly DEVELOPMENT_SANDBOX: string;
+    readonly STANDARD_SANDBOX: string;
+    readonly DEVELOPER_TEST: string;
+    readonly APP_DEVELOPER: string;
+    readonly STANDARD: string;
+};

package/constants/config.js

@@ -1,8 +1,38 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIN_HTTP_TIMEOUT = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
-// NOTE this is the legacy config file name (We still need to keep it around though)
+exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = 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.GLOBAL_CONFIG_PATH = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = 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"));
 exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
-exports.HUBSPOT_CONFIGURATION_FOLDER = '.hubspot';
+exports.HUBSPOT_CONFIGURATION_FOLDER = '.hscli';
 exports.HUBSPOT_CONFIGURATION_FILE = 'config.yml';
+exports.GLOBAL_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), exports.HUBSPOT_CONFIGURATION_FOLDER, exports.HUBSPOT_CONFIGURATION_FILE);
+exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = '.hsaccount';
+exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID';
+exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = 'DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND';
+exports.DEFAULT_CMS_PUBLISH_MODE = 'defaultCmsPublishMode';
+exports.HTTP_TIMEOUT = 'httpTimeout';
+exports.ENV = 'env';
+exports.HTTP_USE_LOCALHOST = 'httpUseLocalhost';
+exports.ALLOW_USAGE_TRACKING = 'allowUsageTracking';
+exports.DEFAULT_ACCOUNT = 'defaultAccount';
+exports.DEFAULT_PORTAL = 'defaultPortal';
 exports.MIN_HTTP_TIMEOUT = 3000;
+exports.HUBSPOT_ACCOUNT_TYPES = {
+    DEVELOPMENT_SANDBOX: 'DEVELOPMENT_SANDBOX',
+    DEVELOPER_TEST: 'DEVELOPER_TEST',
+    APP_DEVELOPER: 'APP_DEVELOPER',
+    STANDARD_SANDBOX: 'STANDARD_SANDBOX',
+    STANDARD: 'STANDARD',
+};
+exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = {
+    DEVELOPMENT_SANDBOX: (0, lang_1.i18n)('lib.accountTypes.developmentSandbox'),
+    STANDARD_SANDBOX: (0, lang_1.i18n)('lib.accountTypes.standardSandbox'),
+    DEVELOPER_TEST: (0, lang_1.i18n)('lib.accountTypes.developerTest'),
+    APP_DEVELOPER: (0, lang_1.i18n)('lib.accountTypes.appDeveloper'),
+    STANDARD: (0, lang_1.i18n)('lib.accountTypes.standard'),
+};

package/constants/environments.d.ts

@@ -11,4 +11,5 @@ export declare const ENVIRONMENT_VARIABLES: {
     readonly HUBSPOT_PORTAL_ID: "HUBSPOT_PORTAL_ID";
     readonly HUBSPOT_REFRESH_TOKEN: "HUBSPOT_REFRESH_TOKEN";
     readonly HUBSPOT_ENVIRONMENT: "HUBSPOT_ENVIRONMENT";
+    readonly HTTP_TIMEOUT: "HTTP_TIMEOUT";
 };

package/constants/environments.js

@@ -14,4 +14,5 @@ exports.ENVIRONMENT_VARIABLES = {
     HUBSPOT_PORTAL_ID: 'HUBSPOT_PORTAL_ID',
     HUBSPOT_REFRESH_TOKEN: 'HUBSPOT_REFRESH_TOKEN',
     HUBSPOT_ENVIRONMENT: 'HUBSPOT_ENVIRONMENT',
+    HTTP_TIMEOUT: 'HTTP_TIMEOUT',
 };

package/constants/extensions.d.ts

@@ -1,4 +1,6 @@
 export declare const ALLOWED_EXTENSIONS: Set<string>;
+export declare const JSR_ALLOWED_EXTENSIONS: Set<string>;
 export declare const HUBL_EXTENSIONS: Set<string>;
 export declare const MODULE_EXTENSION = "module";
 export declare const FUNCTIONS_EXTENSION = "functions";
+export declare const FOLDER_DOT_EXTENSIONS: string[];

package/constants/extensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FUNCTIONS_EXTENSION = exports.MODULE_EXTENSION = exports.HUBL_EXTENSIONS = exports.ALLOWED_EXTENSIONS = void 0;
+exports.FOLDER_DOT_EXTENSIONS = exports.FUNCTIONS_EXTENSION = exports.MODULE_EXTENSION = exports.HUBL_EXTENSIONS = exports.JSR_ALLOWED_EXTENSIONS = exports.ALLOWED_EXTENSIONS = void 0;
 exports.ALLOWED_EXTENSIONS = new Set([
     'css',
     'js',
@@ -21,6 +21,8 @@ exports.ALLOWED_EXTENSIONS = new Set([
     'woff2',
     'graphql',
 ]);
+exports.JSR_ALLOWED_EXTENSIONS = new Set(['jsx', 'tsx', 'ts']);
 exports.HUBL_EXTENSIONS = new Set(['css', 'html', 'js']);
 exports.MODULE_EXTENSION = 'module';
 exports.FUNCTIONS_EXTENSION = 'functions';
+exports.FOLDER_DOT_EXTENSIONS = [exports.FUNCTIONS_EXTENSION, exports.MODULE_EXTENSION];

package/constants/files.d.ts

@@ -3,11 +3,11 @@ export declare const STAT_TYPES: {
     readonly SYMBOLIC_LINK: "symlink";
     readonly DIRECTORY: "dir";
 };
-export declare const MODE: {
+export declare const CMS_PUBLISH_MODE: {
     readonly draft: "draft";
     readonly publish: "publish";
 };
-export declare const DEFAULT_MODE: "publish";
+export declare const DEFAULT_CMS_PUBLISH_MODE: "publish";
 export declare const FILE_UPLOAD_RESULT_TYPES: {
     readonly SUCCESS: "SUCCESS";
     readonly FAILURE: "FAILURE";

package/constants/files.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FILE_TYPES = exports.FILE_UPLOAD_RESULT_TYPES = exports.DEFAULT_MODE = exports.MODE = exports.STAT_TYPES = void 0;
+exports.FILE_TYPES = exports.FILE_UPLOAD_RESULT_TYPES = exports.DEFAULT_CMS_PUBLISH_MODE = exports.CMS_PUBLISH_MODE = exports.STAT_TYPES = void 0;
 exports.STAT_TYPES = {
     FILE: 'file',
     SYMBOLIC_LINK: 'symlink',
     DIRECTORY: 'dir',
 };
-exports.MODE = {
+exports.CMS_PUBLISH_MODE = {
     draft: 'draft',
     publish: 'publish',
 };
-exports.DEFAULT_MODE = exports.MODE.publish;
+exports.DEFAULT_CMS_PUBLISH_MODE = exports.CMS_PUBLISH_MODE.publish;
 exports.FILE_UPLOAD_RESULT_TYPES = {
     SUCCESS: 'SUCCESS',
     FAILURE: 'FAILURE',

package/errors/errors_DEPRECATED.d.ts

@@ -1,7 +1,3 @@
-import { BaseError, FileSystemErrorContext } from '../types/Error';
-type ErrorContext = {
-    accountId?: number;
-};
+import { BaseError, FileSystemErrorContext, ErrorContext } from '../types/Error';
 export declare function logErrorInstance(error: BaseError, context?: ErrorContext): void;
 export declare function logFileSystemErrorInstance(error: BaseError, context: FileSystemErrorContext): void;
-export {};