@hubspot/local-dev-lib 0.5.0-experimental.14 → 0.5.0-experimental.16

package/config/utils.d.ts

@@ -1,6 +1,6 @@
 import { ACCOUNT_IDENTIFIERS } from '../constants/config';
 import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType, HubSpotConfigValidationResult } from '../types/Config';
-import { HubSpotConfigAccount, AccountType, TokenInfo } from '../types/Accounts';
+import { HubSpotConfigAccount } from '../types/Accounts';
 import { ValueOf } from '../types/Utils';
 export declare function getLocalConfigDefaultFilePath(): string;
 export declare function getConfigPathEnvironmentVariables(): {
@@ -10,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): {

package/config/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleConfigFileSystemError = exports.validateConfigAccount = 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;
+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 config_1 = require("../constants/config");
@@ -91,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);
@@ -160,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 {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.14",
+    "version": "0.5.0-experimental.16",
     "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"
     },