@hubspot/local-dev-lib 3.5.6 → 3.6.0-beta.0

package/config/CLIConfiguration.d.ts

@@ -54,6 +54,10 @@ declare class _CLIConfiguration {
      * @throws {Error}
      */
     updateHttpTimeout(timeout: string): CLIConfig_NEW | null;
+    /**
+     * @throws {Error}
+     */
+    updateAllowAutoUpdates(enabled: boolean): CLIConfig_NEW | null;
     /**
      * @throws {Error}
      */

package/config/CLIConfiguration.js

@@ -157,22 +157,24 @@ class _CLIConfiguration {
         if (!nameOrIdToCheck) {
             return null;
         }
-        if (typeof nameOrIdToCheck === 'number') {
-            accountId = nameOrIdToCheck;
-        }
-        else if (/^\d+$/.test(nameOrIdToCheck)) {
-            accountId = parseInt(nameOrIdToCheck, 10);
-        }
-        else {
+        if (typeof nameOrIdToCheck === 'string') {
             name = nameOrIdToCheck;
+            if (/^\d+$/.test(nameOrIdToCheck)) {
+                accountId = parseInt(nameOrIdToCheck, 10);
+            }
+        }
+        else if (typeof nameOrIdToCheck === 'number') {
+            accountId = nameOrIdToCheck;
         }
+        let account = null;
         if (name) {
-            return this.config.accounts.find(a => a.name === name) || null;
+            account = this.config.accounts.find(a => a.name === name) || null;
         }
-        else if (accountId) {
-            return this.config.accounts.find(a => accountId === a.accountId) || null;
+        if (accountId && !account) {
+            account =
+                this.config.accounts.find(a => accountId === a.accountId) || null;
         }
-        return null;
+        return account;
     }
     isConfigFlagEnabled(flag, defaultValue = false) {
         if (this.config && typeof this.config[flag] !== 'undefined') {
@@ -477,6 +479,16 @@ class _CLIConfiguration {
         this.config.httpTimeout = parsedTimeout;
         return this.write();
     }
+    /**
+     * @throws {Error}
+     */
+    updateAllowAutoUpdates(enabled) {
+        if (!this.config) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.noConfigLoaded`));
+        }
+        this.config.allowAutoUpdates = enabled;
+        return this.write();
+    }
     /**
      * @throws {Error}
      */

package/config/config_DEPRECATED.d.ts

@@ -14,6 +14,7 @@ export declare function accountNameExistsInConfig(name: string): boolean;
 export declare function getOrderedAccount(unorderedAccount: CLIAccount_DEPRECATED): CLIAccount_DEPRECATED;
 export declare function getOrderedConfig(unorderedConfig: CLIConfig_DEPRECATED): {
     portals: CLIAccount_DEPRECATED[];
+    allowAutoUpdates?: boolean | undefined;
     defaultMode?: CmsPublishMode | undefined;
     env?: Environment | undefined;
     httpUseLocalhost?: boolean | undefined;
@@ -51,6 +52,10 @@ export declare function updateDefaultCmsPublishMode(defaultCmsPublishMode: CmsPu
  * @throws {Error}
  */
 export declare function updateHttpTimeout(timeout: string): void;
+/**
+ * @throws {Error}
+ */
+export declare function updateAllowAutoUpdates(enabled: boolean): void;
 /**
  * @throws {Error}
  */

package/config/config_DEPRECATED.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.isConfigFlagEnabled = exports.loadConfigFromEnvironment = exports.deleteConfigFile = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.deleteAccount = exports.renameAccount = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.updateDefaultCmsPublishMode = exports.updateDefaultAccount = exports.updateAccountConfig = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.getAccountConfig = exports.getAccountType = exports.getEnv = exports.findConfig = exports.getAndLoadConfigIfNeeded = exports.isTrackingAllowed = exports.loadConfig = exports.writeConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.accountNameExistsInConfig = exports.validateConfig = exports.getConfigPath = exports.setConfigPath = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.setConfig = exports.getConfig = void 0;
+exports.isConfigFlagEnabled = exports.loadConfigFromEnvironment = exports.deleteConfigFile = exports.deleteEmptyConfigFile = exports.createEmptyConfigFile = exports.deleteAccount = exports.renameAccount = exports.updateAllowUsageTracking = exports.updateAllowAutoUpdates = exports.updateHttpTimeout = exports.updateDefaultCmsPublishMode = exports.updateDefaultAccount = exports.updateAccountConfig = exports.removeSandboxAccountFromConfig = exports.getAccountId = exports.getAccountConfig = exports.getAccountType = exports.getEnv = exports.findConfig = exports.getAndLoadConfigIfNeeded = exports.isTrackingAllowed = exports.loadConfig = exports.writeConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.accountNameExistsInConfig = exports.validateConfig = exports.getConfigPath = exports.setConfigPath = exports.getConfigAccountId = exports.getConfigDefaultAccount = exports.getConfigAccounts = exports.setConfig = exports.getConfig = 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"));
@@ -331,14 +331,14 @@ function getAccountId(nameOrId) {
     let accountId = undefined;
     let account = undefined;
     function setNameOrAccountFromSuppliedValue(suppliedValue) {
-        if (typeof suppliedValue === 'number') {
-            accountId = suppliedValue;
-        }
-        else if (/^\d+$/.test(suppliedValue)) {
-            accountId = parseInt(suppliedValue, 10);
-        }
-        else {
+        if (typeof suppliedValue === 'string') {
             name = suppliedValue;
+            if (/^\d+$/.test(suppliedValue)) {
+                accountId = parseInt(suppliedValue, 10);
+            }
+        }
+        else if (typeof suppliedValue === 'number') {
+            accountId = suppliedValue;
         }
     }
     if (!nameOrId) {
@@ -351,14 +351,16 @@ function getAccountId(nameOrId) {
         setNameOrAccountFromSuppliedValue(nameOrId);
     }
     const accounts = getConfigAccounts(config);
-    if (name && accounts) {
-        account = accounts.find(p => p.name === name);
-    }
-    else if (accountId && accounts) {
-        account = accounts.find(p => accountId === p.portalId);
-    }
-    if (account) {
-        return account.portalId;
+    if (accounts) {
+        if (name) {
+            account = accounts.find(p => p.name === name);
+        }
+        if (accountId && !account) {
+            account = accounts.find(p => accountId === p.portalId);
+        }
+        if (account) {
+            return account.portalId;
+        }
     }
     return undefined;
 }
@@ -492,6 +494,16 @@ function updateHttpTimeout(timeout) {
     writeConfig();
 }
 exports.updateHttpTimeout = updateHttpTimeout;
+/**
+ * @throws {Error}
+ */
+function updateAllowAutoUpdates(enabled) {
+    const config = getAndLoadConfigIfNeeded();
+    config.allowAutoUpdates = enabled;
+    setDefaultConfigPathIfUnset();
+    writeConfig();
+}
+exports.updateAllowAutoUpdates = updateAllowAutoUpdates;
 /**
  * @throws {Error}
  */

package/config/index.d.ts

@@ -24,6 +24,7 @@ export declare function getAccountId(nameOrId?: string | number): number | null;
 export declare function removeSandboxAccountFromConfig(nameOrId: string | number): boolean;
 export declare function deleteAccount(accountName: string): Promise<void | boolean>;
 export declare function updateHttpTimeout(timeout: string): void;
+export declare function updateAllowAutoUpdates(enabled: boolean): void;
 export declare function updateAllowUsageTracking(isEnabled: boolean): void;
 export declare function deleteConfigFile(): void;
 export declare function isConfigFlagEnabled(flag: keyof CLIConfig): boolean;

package/config/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getDefaultAccountOverrideFilePath = exports.getCWDAccountOverride = exports.updateDefaultCmsPublishMode = exports.getConfigAccounts = exports.getDisplayDefaultAccount = 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;
+exports.findConfig = exports.setConfigPath = exports.setConfig = exports.getOrderedConfig = exports.getOrderedAccount = exports.getConfigAccountId = exports.getDefaultAccountOverrideFilePath = exports.getCWDAccountOverride = exports.updateDefaultCmsPublishMode = exports.getConfigAccounts = exports.getDisplayDefaultAccount = exports.getConfigDefaultAccount = exports.getAccountType = exports.getEnv = exports.isTrackingAllowed = exports.isConfigFlagEnabled = exports.deleteConfigFile = exports.updateAllowUsageTracking = exports.updateAllowAutoUpdates = 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 = require("./CLIConfiguration");
 const configFile_1 = require("./configFile");
@@ -184,6 +184,15 @@ function updateHttpTimeout(timeout) {
     }
 }
 exports.updateHttpTimeout = updateHttpTimeout;
+function updateAllowAutoUpdates(enabled) {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        CLIConfiguration_1.CLIConfiguration.updateAllowAutoUpdates(enabled);
+    }
+    else {
+        config_DEPRECATED.updateAllowAutoUpdates(enabled);
+    }
+}
+exports.updateAllowAutoUpdates = updateAllowAutoUpdates;
 function updateAllowUsageTracking(isEnabled) {
     if (CLIConfiguration_1.CLIConfiguration.isActive()) {
         CLIConfiguration_1.CLIConfiguration.updateAllowUsageTracking(isEnabled);

package/config/migrate.js

@@ -22,6 +22,9 @@ 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.mergeExistingConfigs = exports.mergeConfigProperties = exports.migrateConfig = exports.getConfigPath = exports.configFileExists = exports.getGlobalConfig = exports.getDeprecatedConfig = void 0;
 const config_DEPRECATED = __importStar(require("./config_DEPRECATED"));
@@ -30,6 +33,8 @@ const index_1 = require("./index");
 const configFile_1 = require("./configFile");
 const config_1 = require("../constants/config");
 const lang_1 = require("../utils/lang");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const i18nKey = 'config.migrate';
 function getDeprecatedConfig(configPath) {
     return config_DEPRECATED.loadConfig(configPath);
@@ -63,7 +68,12 @@ function writeGlobalConfigFile(updatedConfig, isMigrating = false) {
     (0, index_1.loadConfig)('');
     try {
         (0, index_1.writeConfig)({ source: updatedConfigJson });
-        config_DEPRECATED.deleteConfigFile();
+        const oldConfigPath = config_DEPRECATED.getConfigPath();
+        if (oldConfigPath) {
+            const dir = path_1.default.dirname(oldConfigPath);
+            const newConfigPath = path_1.default.join(dir, config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME);
+            fs_1.default.renameSync(oldConfigPath, newConfigPath);
+        }
     }
     catch (error) {
         (0, index_1.deleteEmptyConfigFile)();

package/constants/config.d.ts

@@ -1,4 +1,5 @@
 export declare const DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = "hubspot.config.yml";
+export declare const ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = "archived.hubspot.config.yml";
 export declare const HUBSPOT_CONFIGURATION_FOLDER = ".hscli";
 export declare const HUBSPOT_CONFIGURATION_FILE = "config.yml";
 export declare const GLOBAL_CONFIG_PATH: string;

package/constants/config.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.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;
+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.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 const lang_1 = require("../utils/lang");
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = 'hubspot.config.yml';
+exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = 'archived.hubspot.config.yml';
 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);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "3.5.6",
+    "version": "3.6.0-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",

package/types/Config.d.ts

@@ -5,6 +5,7 @@ import { ValueOf } from './Utils';
 export interface CLIConfig_NEW {
     accounts: Array<CLIAccount_NEW>;
     allowUsageTracking?: boolean;
+    allowAutoUpdates?: boolean;
     defaultAccount?: string | number;
     defaultMode?: CmsPublishMode;
     defaultCmsPublishMode?: CmsPublishMode;
@@ -15,6 +16,7 @@ export interface CLIConfig_NEW {
 export interface CLIConfig_DEPRECATED {
     portals: Array<CLIAccount_DEPRECATED>;
     allowUsageTracking?: boolean;
+    allowAutoUpdates?: boolean;
     defaultPortal?: string | number;
     defaultMode?: CmsPublishMode;
     defaultCmsPublishMode?: CmsPublishMode;