@hubspot/local-dev-lib 0.7.4-experimental.1 → 0.7.4-experimental.3

package/config/hsSettings.d.ts

@@ -1,4 +1,4 @@
 import { HsSettingsFile } from '../types/HsSettings.js';
 export declare function getHsSettingsFilePath(): string | null;
-export declare function getHsSettingsFile(): HsSettingsFile | null;
+export declare function getHsSettingsFileIfExists(): HsSettingsFile | null;
 export declare function writeHsSettingsFile(settingsFile: HsSettingsFile): void;

package/config/hsSettings.js

@@ -20,7 +20,7 @@ export function getHsSettingsFilePath() {
         cwd: getCwd(),
     });
 }
-export function getHsSettingsFile() {
+export function getHsSettingsFileIfExists() {
     const hsSettingsFilePath = getHsSettingsFilePath();
     if (!hsSettingsFilePath) {
         return null;

package/config/index.d.ts

@@ -17,7 +17,8 @@ export declare function getConfigAccountByName(accountName: string): HubSpotConf
 export declare function getConfigAccountIfExists(identifier: number | string): HubSpotConfigAccount | undefined;
 export declare function getConfigDefaultAccount(): HubSpotConfigAccount;
 export declare function getConfigDefaultAccountIfExists(): HubSpotConfigAccount | undefined;
-export declare function getAllConfigAccounts(showAll?: boolean): HubSpotConfigAccount[];
+export declare function getAllConfigAccounts(): HubSpotConfigAccount[];
+export declare function getLinkedOrAllConfigAccounts(): HubSpotConfigAccount[];
 export declare function getConfigAccountEnvironment(identifier: number | string): Environment;
 export declare function addConfigAccount(accountToAdd: HubSpotConfigAccount): void;
 export declare function updateConfigAccount(updatedAccount: HubSpotConfigAccount): void;

package/config/index.js

@@ -11,7 +11,7 @@ import { HubSpotConfigError } from '../models/HubSpotConfigError.js';
 import { HUBSPOT_CONFIG_ERROR_TYPES } from '../constants/config.js';
 import { isDeepEqual } from '../lib/isDeepEqual.js';
 import { getCwd } from '../lib/path.js';
-import { getHsSettingsFile } from './hsSettings.js';
+import { getHsSettingsFileIfExists } from './hsSettings.js';
 const EMPTY_CONFIG = { accounts: [] };
 export function getGlobalConfigFilePath() {
     return GLOBAL_CONFIG_PATH;
@@ -153,11 +153,17 @@ export function getConfigAccountIfExists(identifier) {
 export function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    const currentConfigPath = getConfigFilePath();
-    const globalConfigPath = getGlobalConfigFilePath();
-    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
-        const defaultAccountOverrideAccountId = getDefaultAccountOverrideAccountId(accounts);
-        defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
+    const hsSettingsFile = getHsSettingsFileIfExists();
+    if (hsSettingsFile && hsSettingsFile.localDefaultAccount) {
+        defaultAccountToUse = hsSettingsFile.localDefaultAccount;
+    }
+    else {
+        const currentConfigPath = getConfigFilePath();
+        const globalConfigPath = getGlobalConfigFilePath();
+        if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
+            const defaultAccountOverrideAccountId = getDefaultAccountOverrideAccountId(accounts);
+            defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
+        }
     }
     if (!defaultAccountToUse) {
         throw new HubSpotConfigError(i18n('config.getConfigDefaultAccount.fieldMissingError'), HUBSPOT_CONFIG_ERROR_TYPES.NO_DEFAULT_ACCOUNT, HUBSPOT_CONFIG_OPERATIONS.READ);
@@ -173,33 +179,36 @@ export function getConfigDefaultAccount() {
 export function getConfigDefaultAccountIfExists() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    // Only check for default account override if we're using the global config
-    const currentConfigPath = getConfigFilePath();
-    const globalConfigPath = getGlobalConfigFilePath();
-    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
-        const defaultAccountOverrideAccountId = getDefaultAccountOverrideAccountId(accounts);
-        defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
-    }
-    // Use the default account if .hs/settings.json is present
-    const hsSettingsFile = getHsSettingsFile();
+    const hsSettingsFile = getHsSettingsFileIfExists();
     if (hsSettingsFile && hsSettingsFile.localDefaultAccount) {
         defaultAccountToUse = hsSettingsFile.localDefaultAccount;
     }
+    else {
+        const currentConfigPath = getConfigFilePath();
+        const globalConfigPath = getGlobalConfigFilePath();
+        if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
+            const defaultAccountOverrideAccountId = getDefaultAccountOverrideAccountId(accounts);
+            defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
+        }
+    }
     if (!defaultAccountToUse) {
         return;
     }
     const account = getConfigAccountByInferredIdentifier(accounts, defaultAccountToUse);
     return account;
 }
-export function getAllConfigAccounts(showAll) {
-    let { accounts } = getConfig();
-    // Show only accounts in the .hs/settings.json file
-    if (!showAll) {
-        const hsSettingsFile = getHsSettingsFile();
-        accounts = accounts.filter(a => hsSettingsFile ? hsSettingsFile.accounts.includes(a.accountId) : true);
-    }
+export function getAllConfigAccounts() {
+    const { accounts } = getConfig();
     return accounts;
 }
+export function getLinkedOrAllConfigAccounts() {
+    const { accounts } = getConfig();
+    const hsSettingsFile = getHsSettingsFileIfExists();
+    if (!hsSettingsFile) {
+        return accounts;
+    }
+    return accounts.filter(a => hsSettingsFile.accounts.includes(a.accountId));
+}
 export function getConfigAccountEnvironment(identifier) {
     const config = getConfig();
     const account = getConfigAccountByInferredIdentifier(config.accounts, identifier);

package/lib/gitignore.d.ts

@@ -1,4 +1,4 @@
 import { GitInclusionResult } from '../types/Config.js';
 export declare function checkAndAddConfigToGitignore(configPath: string): void;
-export declare function checkAndAddSettingsToGitignore(settingsPath: string): void;
+export declare function checkAndAddHsFolderToGitignore(settingsPath: string): void;
 export declare function checkGitInclusion(configPath: string): GitInclusionResult;

package/lib/gitignore.js

@@ -23,7 +23,7 @@ export function checkAndAddConfigToGitignore(configPath) {
         throw new Error(i18n(`${i18nKey}.errors.configIgnore`), { cause: e });
     }
 }
-export function checkAndAddSettingsToGitignore(settingsPath) {
+export function checkAndAddHsFolderToGitignore(settingsPath) {
     try {
         const hsDirPath = path.resolve(path.dirname(settingsPath));
         const { configIgnored, gitignoreFiles } = checkGitInclusion(hsDirPath);

package/package.json

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