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

package/config/index.d.ts

@@ -2,6 +2,8 @@ import { HubSpotConfigAccount } from '../types/Accounts';
 import { HubSpotConfig, ConfigFlag } from '../types/Config';
 import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
+export declare function getGlobalConfigFilePath(): string;
+export declare function getLocalConfigFilePathIfExists(): string | null;
 export declare function localConfigFileExists(): boolean;
 export declare function globalConfigFileExists(): boolean;
 export declare function configFileExists(): boolean;
@@ -9,7 +11,7 @@ export declare function getConfigFilePath(): string;
 export declare function getConfig(): HubSpotConfig;
 export declare function isConfigValid(): boolean;
 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.isConfigValid = 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() {
+    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.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);
     }
@@ -107,16 +122,19 @@ exports.isConfigValid = isConfigValid;
 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 +143,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 +171,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 +193,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;

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) {
@@ -98,7 +98,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

@@ -2,8 +2,6 @@ import { ACCOUNT_IDENTIFIERS } from '../constants/config';
 import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType } from '../types/Config';
 import { HubSpotConfigAccount, AccountType, TokenInfo } from '../types/Accounts';
 import { ValueOf } from '../types/Utils';
-export declare function getGlobalConfigFilePath(): string;
-export declare function getLocalConfigFilePath(): string | null;
 export declare function getLocalConfigDefaultFilePath(): string;
 export declare function getConfigPathEnvironmentVariables(): {
     useEnvironmentConfig: boolean;

package/config/utils.js

@@ -3,10 +3,9 @@ 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.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 = 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");
@@ -16,17 +15,6 @@ 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}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.10",
+    "version": "0.5.0-experimental.11",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",