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

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 getLinkedConfigAccounts(): 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

@@ -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 = getHsSettingsFile();
+    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();
     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 getLinkedConfigAccounts() {
+    const { accounts } = getConfig();
+    const hsSettingsFile = getHsSettingsFile();
+    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/package.json

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