@hubspot/local-dev-lib 0.3.0 → 0.3.1-experimental.0

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.updateDefaultMode = 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.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"));
@@ -13,10 +13,10 @@ const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const files_1 = require("../constants/files");
 const environment_1 = require("../lib/environment");
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const git_1 = require("../utils/git");
 const errors_DEPRECATED_1 = require("../errors/errors_DEPRECATED");
-const ALL_MODES = Object.values(files_1.MODE);
+const ALL_CMS_PUBLISH_MODES = Object.values(files_1.CMS_PUBLISH_MODE);
 let _config;
 let _configPath;
 let environmentVariableConfigLoaded = false;
@@ -78,6 +78,10 @@ function validateConfig() {
         logger_1.logger.error('config.portals[] is not defined');
         return false;
     }
+    if (accounts.length === 0) {
+        logger_1.logger.error('There are no accounts defined in the configuration file');
+        return false;
+    }
     const accountIdsHash = {};
     const accountNamesHash = {};
     return accounts.every(cfg => {
@@ -105,6 +109,14 @@ function validateConfig() {
             }
             accountNamesHash[cfg.name] = cfg;
         }
+        if (!cfg.accountType) {
+            updateAccountConfig({
+                ...cfg,
+                portalId: accountId,
+                accountType: getAccountType(undefined, cfg.sandboxAccountType),
+            });
+            writeConfig();
+        }
         accountIdsHash[accountId] = cfg;
         return true;
     });
@@ -131,10 +143,10 @@ function getOrderedAccount(unorderedAccount) {
 }
 exports.getOrderedAccount = getOrderedAccount;
 function getOrderedConfig(unorderedConfig) {
-    const { defaultPortal, defaultMode, httpTimeout, allowUsageTracking, portals, ...rest } = unorderedConfig;
+    const { defaultPortal, defaultCmsPublishMode, httpTimeout, allowUsageTracking, portals, ...rest } = unorderedConfig;
     return {
         ...(defaultPortal && { defaultPortal }),
-        defaultMode,
+        defaultCmsPublishMode,
         httpTimeout,
         allowUsageTracking,
         ...rest,
@@ -167,7 +179,7 @@ function writeConfig(options = {}) {
     catch (err) {
         (0, errors_DEPRECATED_1.logFileSystemErrorInstance)(err, {
             filepath: configPath || '',
-            write: true,
+            operation: 'write',
         });
     }
 }
@@ -185,7 +197,10 @@ function readConfigFile() {
     catch (err) {
         error = err;
         logger_1.logger.error('Config file could not be read "%s"', _configPath);
-        (0, errors_DEPRECATED_1.logFileSystemErrorInstance)(error, { filepath: _configPath, read: true });
+        (0, errors_DEPRECATED_1.logFileSystemErrorInstance)(error, {
+            filepath: _configPath,
+            operation: 'read',
+        });
     }
     return { source: source && source.toString(), error };
 }
@@ -223,7 +238,7 @@ function loadConfigFromFile(path, options = {}) {
     const { parsed, error: parseError } = parseConfig(source);
     if (parseError)
         return;
-    setConfig(parsed);
+    setConfig(handleLegacyCmsPublishMode(parsed));
     if (!(0, exports.getConfig)()) {
         logger_1.logger.debug('The config file was empty config');
         logger_1.logger.debug('Initializing an empty config');
@@ -294,7 +309,7 @@ function getAccountType(accountType, sandboxAccountType) {
     }
     if (typeof sandboxAccountType === 'string') {
         if (sandboxAccountType.toUpperCase() === 'DEVELOPER') {
-            return config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX;
+            return config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
         }
         if (sandboxAccountType.toUpperCase() === 'STANDARD') {
             return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
@@ -360,7 +375,7 @@ function removeSandboxAccountFromConfig(nameOrId) {
     }
     const accountConfig = getAccountConfig(accountId);
     const accountType = getAccountType(accountConfig?.accountType, accountConfig?.sandboxAccountType);
-    const isSandboxAccount = accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_SANDBOX ||
+    const isSandboxAccount = accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX ||
         accountType === config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
     if (!isSandboxAccount)
         return promptDefaultAccount;
@@ -381,13 +396,13 @@ exports.removeSandboxAccountFromConfig = removeSandboxAccountFromConfig;
  * @throws {Error}
  */
 function updateAccountConfig(configOptions) {
-    const { accountType, apiKey, authType, clientId, clientSecret, defaultMode, environment, name, parentAccountId, personalAccessKey, portalId, sandboxAccountType, scopes, tokenInfo, } = configOptions;
+    const { accountType, apiKey, authType, clientId, clientSecret, defaultCmsPublishMode, environment, name, parentAccountId, personalAccessKey, portalId, sandboxAccountType, scopes, tokenInfo, } = configOptions;
     if (!portalId) {
         throw new Error('A portalId is required to update the config');
     }
     const config = getAndLoadConfigIfNeeded();
     const accountConfig = getAccountConfig(portalId);
-    let auth = undefined;
+    let auth = accountConfig && accountConfig.auth;
     if (clientId || clientSecret || scopes || tokenInfo) {
         auth = {
             ...(accountConfig ? accountConfig.auth : {}),
@@ -400,7 +415,7 @@ function updateAccountConfig(configOptions) {
     const env = (0, environment_1.getValidEnv)(environment ||
         (configOptions && configOptions.env) ||
         (accountConfig && accountConfig.env));
-    const mode = defaultMode && defaultMode.toLowerCase();
+    const cmsPublishMode = defaultCmsPublishMode?.toLowerCase();
     const nextAccountConfig = {
         ...accountConfig,
         name: name || (accountConfig && accountConfig.name),
@@ -410,7 +425,9 @@ function updateAccountConfig(configOptions) {
         auth,
         accountType: getAccountType(accountType, sandboxAccountType),
         apiKey,
-        defaultMode: mode && Object.hasOwn(files_1.MODE, mode) ? mode : undefined,
+        defaultCmsPublishMode: cmsPublishMode && Object.hasOwn(files_1.CMS_PUBLISH_MODE, cmsPublishMode)
+            ? cmsPublishMode
+            : undefined,
         personalAccessKey,
         sandboxAccountType,
         parentAccountId,
@@ -450,16 +467,17 @@ exports.updateDefaultAccount = updateDefaultAccount;
 /**
  * @throws {Error}
  */
-function updateDefaultMode(defaultMode) {
-    if (!defaultMode || !ALL_MODES.find(m => m === defaultMode)) {
-        throw new Error(`The mode ${defaultMode} is invalid. Valid values are ${commaSeparatedValues(ALL_MODES)}.`);
+function updateDefaultCmsPublishMode(defaultCmsPublishMode) {
+    if (!defaultCmsPublishMode ||
+        !ALL_CMS_PUBLISH_MODES.find(m => m === defaultCmsPublishMode)) {
+        throw new Error(`The mode ${defaultCmsPublishMode} is invalid. Valid values are ${commaSeparatedValues(ALL_CMS_PUBLISH_MODES)}.`);
     }
     const config = getAndLoadConfigIfNeeded();
-    config.defaultMode = defaultMode;
+    config.defaultCmsPublishMode = defaultCmsPublishMode;
     setDefaultConfigPathIfUnset();
     writeConfig();
 }
-exports.updateDefaultMode = updateDefaultMode;
+exports.updateDefaultCmsPublishMode = updateDefaultCmsPublishMode;
 /**
  * @throws {Error}
  */
@@ -570,12 +588,16 @@ function getConfigVariablesFromEnv() {
         clientId: env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_CLIENT_ID],
         clientSecret: env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_CLIENT_SECRET],
         personalAccessKey: env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_PERSONAL_ACCESS_KEY],
-        portalId: parseInt(env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_PORTAL_ID] || '', 10),
+        portalId: parseInt(env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_ACCOUNT_ID] || '', 10) ||
+            parseInt(env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_PORTAL_ID] || '', 10),
         refreshToken: env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_REFRESH_TOKEN],
+        httpTimeout: env[environments_1.ENVIRONMENT_VARIABLES.HTTP_TIMEOUT]
+            ? parseInt(env[environments_1.ENVIRONMENT_VARIABLES.HTTP_TIMEOUT])
+            : undefined,
         env: (0, environment_1.getValidEnv)(env[environments_1.ENVIRONMENT_VARIABLES.HUBSPOT_ENVIRONMENT]),
     };
 }
-function generatePersonalAccessKeyConfig(portalId, personalAccessKey, env) {
+function generatePersonalAccessKeyConfig(portalId, personalAccessKey, env, httpTimeout) {
     return {
         portals: [
             {
@@ -585,9 +607,10 @@ function generatePersonalAccessKeyConfig(portalId, personalAccessKey, env) {
                 env,
             },
         ],
+        httpTimeout,
     };
 }
-function generateOauthConfig(portalId, clientId, clientSecret, refreshToken, scopes, env) {
+function generateOauthConfig(portalId, clientId, clientSecret, refreshToken, scopes, env, httpTimeout) {
     return {
         portals: [
             {
@@ -604,6 +627,7 @@ function generateOauthConfig(portalId, clientId, clientSecret, refreshToken, sco
                 env,
             },
         ],
+        httpTimeout,
     };
 }
 function generateApiKeyConfig(portalId, apiKey, env) {
@@ -619,17 +643,20 @@ function generateApiKeyConfig(portalId, apiKey, env) {
     };
 }
 function loadConfigFromEnvironment({ useEnv = false, } = {}) {
-    const { apiKey, clientId, clientSecret, personalAccessKey, portalId, refreshToken, env, } = getConfigVariablesFromEnv();
+    const { apiKey, clientId, clientSecret, personalAccessKey, portalId, refreshToken, env, httpTimeout, } = getConfigVariablesFromEnv();
     const unableToLoadEnvConfigError = 'Unable to load config from environment variables.';
     if (!portalId) {
         useEnv && logger_1.logger.error(unableToLoadEnvConfigError);
         return;
     }
+    if (httpTimeout && httpTimeout < config_1.MIN_HTTP_TIMEOUT) {
+        throw new Error(`The HTTP timeout value ${httpTimeout} is invalid. The value must be a number greater than ${config_1.MIN_HTTP_TIMEOUT}.`);
+    }
     if (personalAccessKey) {
-        return generatePersonalAccessKeyConfig(portalId, personalAccessKey, env);
+        return generatePersonalAccessKeyConfig(portalId, personalAccessKey, env, httpTimeout);
     }
     else if (clientId && clientSecret && refreshToken) {
-        return generateOauthConfig(portalId, clientId, clientSecret, refreshToken, auth_1.OAUTH_SCOPES.map(scope => scope.value), env);
+        return generateOauthConfig(portalId, clientId, clientSecret, refreshToken, auth_1.OAUTH_SCOPES.map(scope => scope.value), env, httpTimeout);
     }
     else if (apiKey) {
         return generateApiKeyConfig(portalId, apiKey, env);
@@ -647,7 +674,7 @@ function loadEnvironmentVariableConfig(options) {
     }
     const { portalId } = getConfigVariablesFromEnv();
     logger_1.logger.debug(`Loaded config from environment variables for account ${portalId}`);
-    return setConfig(envConfig);
+    return setConfig(handleLegacyCmsPublishMode(envConfig));
 }
 function isConfigFlagEnabled(flag) {
     if (!configFileExists() || configFileIsBlank()) {
@@ -657,3 +684,10 @@ function isConfigFlagEnabled(flag) {
     return Boolean(config[flag] || false);
 }
 exports.isConfigFlagEnabled = isConfigFlagEnabled;
+function handleLegacyCmsPublishMode(config) {
+    if (config?.defaultMode) {
+        config.defaultCmsPublishMode = config.defaultMode;
+        delete config.defaultMode;
+    }
+    return config;
+}

package/config/environment.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigFromEnvironment = void 0;
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const configUtils_1 = require("./configUtils");

package/config/getAccountIdentifier.d.ts

@@ -0,0 +1,2 @@
+import { GenericAccount } from '../types/Accounts';
+export declare function getAccountIdentifier(account?: GenericAccount | null): number | undefined;

package/config/getAccountIdentifier.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccountIdentifier = void 0;
+function getAccountIdentifier(account) {
+    if (!account) {
+        return undefined;
+    }
+    else if (Object.hasOwn(account, 'portalId')) {
+        return account.portalId;
+    }
+    else if (Object.hasOwn(account, 'accountId')) {
+        return account.accountId;
+    }
+}
+exports.getAccountIdentifier = getAccountIdentifier;

package/config/index.d.ts

@@ -1,18 +1,20 @@
 import * as config_DEPRECATED from './config_DEPRECATED';
-import { CLIConfig } from '../types/Config';
+import { CLIConfig_NEW, CLIConfig } from '../types/Config';
 import { CLIOptions, WriteConfigOptions } from '../types/CLIOptions';
-import { AccountType, CLIAccount, FlatAccountFields } from '../types/Accounts';
+import { AccountType, CLIAccount, CLIAccount_NEW, CLIAccount_DEPRECATED, FlatAccountFields } from '../types/Accounts';
+import { CmsPublishMode } from '../types/Files';
 export declare function loadConfig(path: string, options?: CLIOptions): CLIConfig | null;
 export declare function getAndLoadConfigIfNeeded(options?: CLIOptions): Partial<CLIConfig> | null;
 export declare function validateConfig(): boolean;
 export declare function loadConfigFromEnvironment(): boolean;
 export declare function createEmptyConfigFile(options?: {
     path?: string;
-}, useRootConfig?: boolean): void;
+}, useHiddenConfig?: boolean): void;
 export declare function deleteEmptyConfigFile(): void;
 export declare function getConfig(): CLIConfig | null;
 export declare function writeConfig(options?: WriteConfigOptions): void;
-export declare function getConfigPath(path?: string): string | null;
+export declare function getConfigPath(path?: string, useHiddenConfig?: boolean): string | null;
+export declare function configFileExists(useHiddenConfig?: boolean): boolean;
 export declare function getAccountConfig(accountId?: number): CLIAccount | null;
 export declare function accountNameExistsInConfig(name: string): boolean;
 export declare function updateAccountConfig(configOptions: Partial<FlatAccountFields>): FlatAccountFields | null;
@@ -20,7 +22,7 @@ export declare function updateDefaultAccount(nameOrId: string | number): void;
 export declare function renameAccount(currentName: string, newName: string): Promise<void>;
 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>;
+export declare function deleteAccount(accountName: string): Promise<void | boolean>;
 export declare function updateHttpTimeout(timeout: string): void;
 export declare function updateAllowUsageTracking(isEnabled: boolean): void;
 export declare function deleteConfigFile(): void;
@@ -28,12 +30,15 @@ export declare function isConfigFlagEnabled(flag: keyof CLIConfig): boolean;
 export declare function isTrackingAllowed(): boolean;
 export declare function getEnv(nameOrId?: string | number): import("../types/Config").Environment;
 export declare function getAccountType(accountType?: AccountType, sandboxAccountType?: string | null): AccountType;
-export declare const getConfigAccounts: typeof config_DEPRECATED.getConfigAccounts;
-export declare const getConfigDefaultAccount: typeof config_DEPRECATED.getConfigDefaultAccount;
+export declare function getConfigDefaultAccount(): string | number | null | undefined;
+export declare function getDisplayDefaultAccount(): string | number | null | undefined;
+export declare function getConfigAccounts(): Array<CLIAccount_NEW> | Array<CLIAccount_DEPRECATED> | null | undefined;
+export declare function updateDefaultCmsPublishMode(cmsPublishMode: CmsPublishMode): void | CLIConfig_NEW | null;
+export declare function getCWDAccountOverride(): string | number | null | undefined;
+export declare function getDefaultAccountOverrideFilePath(): string | null | undefined;
 export declare const getConfigAccountId: typeof config_DEPRECATED.getConfigAccountId;
 export declare const getOrderedAccount: typeof config_DEPRECATED.getOrderedAccount;
 export declare const getOrderedConfig: typeof config_DEPRECATED.getOrderedConfig;
 export declare const setConfig: typeof config_DEPRECATED.setConfig;
 export declare const setConfigPath: typeof config_DEPRECATED.setConfigPath;
 export declare const findConfig: typeof config_DEPRECATED.findConfig;
-export declare const updateDefaultMode: typeof config_DEPRECATED.updateDefaultMode;

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.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.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.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,40 +203,77 @@ 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;
 function getAccountType(accountType, sandboxAccountType) {
-    if (CLIConfiguration_1.default.isActive()) {
-        return CLIConfiguration_1.default.getAccountType(accountType, sandboxAccountType);
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getAccountType(accountType, sandboxAccountType);
     }
     return config_DEPRECATED.getAccountType(accountType, sandboxAccountType);
 }
 exports.getAccountType = getAccountType;
-// 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 getConfigDefaultAccount() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.getDefaultAccount();
+    }
+    return config_DEPRECATED.getConfigDefaultAccount();
+}
+exports.getConfigDefaultAccount = getConfigDefaultAccount;
+function getDisplayDefaultAccount() {
+    if (CLIConfiguration_1.CLIConfiguration.isActive()) {
+        return CLIConfiguration_1.CLIConfiguration.config?.defaultAccount;
+    }
+    return config_DEPRECATED.getConfigDefaultAccount();
+}
+exports.getDisplayDefaultAccount = getDisplayDefaultAccount;
+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;