@hubspot/local-dev-lib 0.7.6-experimental.4 → 0.7.7-experimental.0

package/config/defaultAccountOverride.d.ts

@@ -1,4 +1,3 @@
 import { HubSpotConfigAccount } from '../types/Accounts.js';
 export declare function getDefaultAccountOverrideAccountId(accounts: Array<HubSpotConfigAccount>): number | null;
-export declare function removeDefaultAccountOverrideFile(): void;
 export declare function getDefaultAccountOverrideFilePath(): string | null;

package/config/defaultAccountOverride.js

@@ -40,21 +40,6 @@ export function getDefaultAccountOverrideAccountId(accounts) {
     }
     return account.accountId;
 }
-export function removeDefaultAccountOverrideFile() {
-    const filePath = getDefaultAccountOverrideFilePath();
-    if (!filePath) {
-        return;
-    }
-    try {
-        fs.unlinkSync(filePath);
-    }
-    catch (e) {
-        throw new FileSystemError({ cause: e }, {
-            filepath: filePath,
-            operation: 'write',
-        });
-    }
-}
 export function getDefaultAccountOverrideFilePath() {
     return findup([DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME], {
         cwd: getCwd(),

package/config/index.d.ts

@@ -18,7 +18,6 @@ export declare function getConfigAccountIfExists(identifier: number | string): H
 export declare function getConfigDefaultAccount(): HubSpotConfigAccount;
 export declare function getConfigDefaultAccountIfExists(): HubSpotConfigAccount | undefined;
 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,6 @@ 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 { getHsSettingsFileIfExists } from './hsSettings.js';
 const EMPTY_CONFIG = { accounts: [] };
 export function getGlobalConfigFilePath() {
     return GLOBAL_CONFIG_PATH;
@@ -153,17 +152,11 @@ export function getConfigAccountIfExists(identifier) {
 export function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = 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;
-        }
+    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);
@@ -179,17 +172,12 @@ export function getConfigDefaultAccount() {
 export function getConfigDefaultAccountIfExists() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = 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;
-        }
+    // 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;
     }
     if (!defaultAccountToUse) {
         return;
@@ -201,14 +189,6 @@ export function getAllConfigAccounts() {
     const { accounts } = getConfig();
     return accounts;
 }
-export function getLinkedOrAllConfigAccounts() {
-    const { accounts } = getConfig();
-    const hsSettingsFile = getHsSettingsFileIfExists();
-    if (!hsSettingsFile || hsSettingsFile.accounts.length === 0) {
-        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/constants/config.d.ts

@@ -102,11 +102,3 @@ export declare const HUBSPOT_CONFIG_OPERATIONS: {
     readonly WRITE: "WRITE";
     readonly DELETE: "DELETE";
 };
-export declare const HS_FOLDER = ".hs";
-export declare const HS_SETTINGS_FILENAME = "settings.json";
-export declare const HS_README_FILENAME = "README.txt";
-export declare const DEFAULT_HS_SETTINGS_PATH = ".hs/settings.json";
-export declare const EMPTY_HS_SETTINGS_FILE: {
-    localDefaultAccount: undefined;
-    accounts: never[];
-};

package/constants/config.js

@@ -105,11 +105,3 @@ export const HUBSPOT_CONFIG_OPERATIONS = {
     WRITE: 'WRITE',
     DELETE: 'DELETE',
 };
-export const HS_FOLDER = '.hs';
-export const HS_SETTINGS_FILENAME = 'settings.json';
-export const HS_README_FILENAME = 'README.txt';
-export const DEFAULT_HS_SETTINGS_PATH = `${HS_FOLDER}/${HS_SETTINGS_FILENAME}`;
-export const EMPTY_HS_SETTINGS_FILE = {
-    localDefaultAccount: undefined,
-    accounts: [],
-};

package/lib/gitignore.d.ts

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

package/lib/gitignore.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { isConfigPathInGitRepo, getGitignoreFiles, configFilenameIsIgnoredByGitignore, } from '../utils/git.js';
-import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, HS_FOLDER, } from '../constants/config.js';
+import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME } from '../constants/config.js';
 import { i18n } from '../utils/lang.js';
 const i18nKey = 'lib.gitignore';
 const GITIGNORE_FILE = '.gitignore';
@@ -23,27 +23,6 @@ export function checkAndAddConfigToGitignore(configPath) {
         throw new Error(i18n(`${i18nKey}.errors.configIgnore`), { cause: e });
     }
 }
-export function checkAndAddHsFolderToGitignore(settingsPath) {
-    try {
-        const hsDirPath = path.resolve(path.dirname(settingsPath));
-        const { configIgnored, gitignoreFiles } = checkGitInclusion(hsDirPath);
-        if (configIgnored)
-            return;
-        let gitignoreFilePath = gitignoreFiles && gitignoreFiles.length ? gitignoreFiles[0] : null;
-        if (!gitignoreFilePath) {
-            gitignoreFilePath = path.join(path.dirname(hsDirPath), GITIGNORE_FILE);
-            fs.writeFileSync(gitignoreFilePath, '');
-        }
-        const gitignoreContents = fs.readFileSync(gitignoreFilePath).toString();
-        if (gitignoreContents.includes(HS_FOLDER))
-            return;
-        const updatedContents = `${gitignoreContents.trim()}\n\n# HubSpot link folder\n${HS_FOLDER}\n`;
-        fs.writeFileSync(gitignoreFilePath, updatedContents);
-    }
-    catch (e) {
-        throw new Error(i18n(`${i18nKey}.errors.configIgnore`), { cause: e });
-    }
-}
 export function checkGitInclusion(configPath) {
     const result = {
         inGit: false,

package/lib/logger.d.ts

@@ -14,6 +14,7 @@ interface LogLabels {
     debug: string;
 }
 export declare function getLabels(): LogLabels;
+export declare function getSymbols(): LogLabels;
 /**
  * Chalk styles for logger strings.
  */

package/lib/logger.js

@@ -13,7 +13,14 @@ const UNICODE_LABELS = {
     warning: '⚠ WARNING',
     error: '✖ ERROR',
     info: 'ℹ INFO',
-    debug: 'DEBUG',
+    debug: '⚙ DEBUG',
+};
+const UNICODE_SYMBOLS = {
+    success: '✔',
+    warning: '⚠',
+    error: '✖',
+    info: 'ℹ',
+    debug: '⚙',
 };
 const ASCII_LABELS = {
     success: '[SUCCESS]',
@@ -25,14 +32,17 @@ const ASCII_LABELS = {
 export function getLabels() {
     return isUnicodeSupported() ? UNICODE_LABELS : ASCII_LABELS;
 }
+export function getSymbols() {
+    return isUnicodeSupported() ? UNICODE_SYMBOLS : ASCII_LABELS;
+}
 /**
  * Chalk styles for logger strings.
  */
 export const Styles = {
-    debug: chalk.reset.blue,
+    debug: chalk.reset.grey,
     log: chalk.reset.white,
     success: chalk.reset.green,
-    info: chalk.reset.white,
+    info: chalk.reset.blue,
     warn: chalk.reset.yellow,
     error: chalk.reset.red,
 };
@@ -66,7 +76,7 @@ export class Logger {
     }
     debug(...args) {
         const labels = getLabels();
-        console.debug(...stylize(labels.debug, Styles.log, args));
+        console.debug(...stylize(labels.debug, Styles.debug, args));
     }
     group(...args) {
         console.group(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.7.6-experimental.4",
+    "version": "0.7.7-experimental.0",
     "type": "module",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "files": [
@@ -59,7 +59,6 @@
         "./config/defaultAccountOverride": "./config/defaultAccountOverride.js",
         "./config/migrate": "./config/migrate.js",
         "./config/state": "./config/state.js",
-        "./config/hsSettings": "./config/hsSettings.js",
         "./config": "./config/index.js",
         "./constants/*": "./constants/*.js",
         "./enums/*": "./enums/*.js",

package/config/hsSettings.d.ts

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

package/config/hsSettings.js

@@ -1,55 +0,0 @@
-import findupSync from 'findup-sync';
-import fs from 'fs';
-import path from 'path';
-import { HS_FOLDER, HS_README_FILENAME, HS_SETTINGS_FILENAME, } from '../constants/config.js';
-import { getCwd } from '../lib/path.js';
-import { FileSystemError } from '../models/FileSystemError.js';
-const HS_README_CONTENTS = `Why do I have a folder named ".hs" in my project?
-The ".hs" folder is created when you link a directory to a HubSpot project.
-
-What does the "settings.json" file contain?
-The "settings.json" file contains:
-- The ID(s) of the HubSpot account(s) that you linked ("accounts")
-- The ID of the HubSpot account that you set as the default for this directory ("linkedDefaultAccount")
-
-Should I commit the ".hs" folder?
-No, the ".hs" folder should not be committed to version control. It is automatically added to your .gitignore file when the directory is linked.
-`;
-export function getHsSettingsFilePath() {
-    return findupSync([`${HS_FOLDER}/${HS_SETTINGS_FILENAME}`], {
-        cwd: getCwd(),
-    });
-}
-export function getHsSettingsFileIfExists() {
-    const hsSettingsFilePath = getHsSettingsFilePath();
-    if (!hsSettingsFilePath) {
-        return null;
-    }
-    try {
-        return JSON.parse(fs.readFileSync(hsSettingsFilePath, 'utf-8'));
-    }
-    catch (e) {
-        throw new FileSystemError({ cause: e }, {
-            filepath: hsSettingsFilePath,
-            operation: 'read',
-        });
-    }
-}
-export function writeHsSettingsFile(settingsFile) {
-    const dir = getCwd();
-    const hsFolderPath = path.join(dir, HS_FOLDER);
-    const isFirstScaffold = !fs.existsSync(hsFolderPath);
-    try {
-        fs.mkdirSync(hsFolderPath, { recursive: true });
-        fs.writeFileSync(path.join(dir, HS_FOLDER, HS_SETTINGS_FILENAME), JSON.stringify(settingsFile, null, 2), 'utf8');
-        if (isFirstScaffold) {
-            fs.writeFileSync(path.join(hsFolderPath, HS_README_FILENAME), HS_README_CONTENTS, 'utf8');
-        }
-    }
-    catch (err) {
-        throw new FileSystemError({ cause: err }, {
-            filepath: dir,
-            operation: 'write',
-        });
-    }
-}

package/types/HsSettings.d.ts

@@ -1,4 +0,0 @@
-export type HsSettingsFile = {
-    localDefaultAccount: number | undefined;
-    accounts: number[];
-};

package/types/HsSettings.js

@@ -1 +0,0 @@
-export {};