@hubspot/cli 7.4.7-experimental.0 → 7.4.7

package/lib/commonOpts.js

@@ -23,34 +23,39 @@ const lang_1 = require("./lang");
 const errorHandlers_1 = require("./errorHandlers");
 const exitCodes_1 = require("./enums/exitCodes");
 const ui_1 = require("./ui");
-const i18nKey = 'lib.commonOpts';
 function addGlobalOptions(yargs) {
     yargs.version(false);
-    return yargs.option('debug', {
+    yargs.option('debug', {
         alias: 'd',
         default: false,
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.debug.describe`),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.debug.describe`),
         type: 'boolean',
     });
+    yargs.option('network-debug', {
+        default: false,
+        type: 'boolean',
+        hidden: true,
+    });
+    return yargs;
 }
 function addAccountOptions(yargs) {
     return yargs.option('account', {
         alias: 'a',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.account.describe`),
         type: 'string',
     });
 }
 function addConfigOptions(yargs) {
     return yargs.option('config', {
         alias: 'c',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.config.describe`),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.config.describe`),
         type: 'string',
     });
 }
 function addOverwriteOptions(yargs) {
     return yargs.option('overwrite', {
         alias: 'o',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.overwrite.describe`),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.overwrite.describe`),
         type: 'boolean',
         default: false,
     });
@@ -59,39 +64,58 @@ function addCmsPublishModeOptions(yargs, { read, write }) {
     const cmsPublishModes = `<${Object.values(files_1.CMS_PUBLISH_MODE).join(' | ')}>`;
     return yargs.option('cms-publish-mode', {
         alias: 'm',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
         type: 'string',
     });
 }
 function addTestingOptions(yargs) {
     return yargs.option('qa', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.qa.describe`),
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.qa.describe`),
         type: 'boolean',
         default: false,
         hidden: true,
     });
 }
 function addUseEnvironmentOptions(yargs) {
-    return yargs
-        .option('use-env', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.useEnv.describe`),
+    yargs.option('use-env', {
+        describe: (0, lang_1.i18n)(`lib.commonOpts.options.useEnv.describe`),
         type: 'boolean',
-    })
-        .conflicts('use-env', 'account');
+    });
+    yargs.conflicts('use-env', 'account');
+    return yargs;
 }
 async function addCustomHelpOutput(yargs, command, describe) {
     try {
         const parsedArgv = (0, yargs_parser_1.default)(process.argv.slice(2));
         if (parsedArgv && parsedArgv.help) {
-            // Construct the full command, including positional arguments
             const commandBase = `hs ${parsedArgv._.slice(0, -1).join(' ')}`;
-            const fullCommand = `${commandBase.trim()} ${command}`;
+            // Make sure we are targeting the correct command by confirming that
+            // "command" matches the last part of the user's input command
+            const checkIsTargetCommand = (command) => {
+                const targetBaseCommand = command.split(' ')[0];
+                return targetBaseCommand === parsedArgv._[parsedArgv._.length - 1];
+            };
+            const isTargetedCommand = Array.isArray(command)
+                ? command.some(checkIsTargetCommand)
+                : checkIsTargetCommand(command);
+            if (!isTargetedCommand) {
+                return;
+            }
+            // Construct the full command, including positional arguments
+            const commandString = Array.isArray(command) ? command[0] : command;
+            const fullCommand = `${commandBase.trim()} ${commandString}`;
             // Format the original help output to be more readable
             let commandHelp = await yargs.getHelp();
-            ['Options:', 'Examples:', 'Positionals:'].forEach(header => {
+            ['Options:', 'Commands:', 'Examples:', 'Positionals:'].forEach(header => {
                 commandHelp = commandHelp.replace(header, chalk_1.default.bold(header));
             });
-            logger_1.logger.log(`${(0, ui_1.uiCommandReference)(fullCommand, false)}\n\n${describe}\n\n${commandHelp}`);
+            // Remove "hs <command>" from the help output (this shows up for command buckets)
+            commandHelp = commandHelp.replace('hs <command>\n', '');
+            // Remove the first line of the help output if it's empty
+            if (commandHelp.startsWith('\n')) {
+                commandHelp = commandHelp.slice(1);
+            }
+            logger_1.logger.log(`${(0, ui_1.uiCommandReference)(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     }
@@ -101,13 +125,17 @@ async function addCustomHelpOutput(yargs, command, describe) {
     }
 }
 function setLogLevel(options) {
-    const { debug } = options;
+    const { debug, networkDebug } = options;
     if (debug) {
         (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.DEBUG);
     }
     else {
         (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.LOG);
     }
+    if (networkDebug) {
+        process.env.HUBSPOT_NETWORK_LOGGING = 'true';
+        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.DEBUG);
+    }
 }
 function getCommandName(argv) {
     return (argv && argv._ && argv._[0]) || '';

package/lib/configMigrate.d.ts

@@ -0,0 +1,2 @@
+export declare function handleMigration(accountId: number | undefined, configPath?: string): Promise<boolean>;
+export declare function handleMerge(accountId: number | undefined, configPath?: string, force?: boolean): Promise<boolean>;

package/lib/configMigrate.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleMigration = handleMigration;
+exports.handleMerge = handleMerge;
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const promptUtils_1 = require("./prompts/promptUtils");
+const lang_1 = require("./lang");
+const usageTracking_1 = require("./usageTracking");
+async function handleMigration(accountId, configPath) {
+    const { shouldMigrateConfig } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldMigrateConfig',
+        type: 'confirm',
+        message: (0, lang_1.i18n)('lib.configMigrate.migrateConfigPrompt', {
+            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
+                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+        }),
+    });
+    if (!shouldMigrateConfig) {
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            type: 'migration',
+            step: 'Reject migration via prompt',
+        }, accountId);
+        return false;
+    }
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    (0, migrate_1.migrateConfig)(deprecatedConfig);
+    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+        command: 'hs config migrate',
+        type: 'migration',
+        step: 'Confirm migration via prompt',
+        successful: true,
+    }, accountId);
+    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.migrationSuccess', {
+        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+    }));
+    return true;
+}
+async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
+    const { initialConfig, conflicts, } = (0, migrate_1.mergeConfigProperties)(globalConfig, deprecatedConfig, force);
+    if (conflicts.length > 0) {
+        for (const conflict of conflicts) {
+            const { property, newValue, oldValue } = conflict;
+            const { shouldOverwrite } = await (0, promptUtils_1.promptUser)({
+                name: 'shouldOverwrite',
+                type: 'confirm',
+                message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigConflictPrompt', {
+                    property,
+                    oldValue: `${oldValue}`,
+                    newValue: `${newValue}`,
+                }),
+            });
+            if (shouldOverwrite) {
+                // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED
+                initialConfig[property] = oldValue;
+            }
+        }
+    }
+    return initialConfig;
+}
+async function handleMerge(accountId, configPath, force) {
+    const { shouldMergeConfigs } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldMergeConfigs',
+        type: 'confirm',
+        message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigsPrompt', {
+            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
+                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+        }),
+    });
+    if (!shouldMergeConfigs) {
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            type: 'merge',
+            step: 'Reject merge via prompt',
+        }, accountId);
+        return false;
+    }
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!deprecatedConfig || !globalConfig) {
+        return true;
+    }
+    const mergedConfig = await mergeConfigProperties(globalConfig, deprecatedConfig, force);
+    const { skippedAccountIds } = (0, migrate_1.mergeExistingConfigs)(mergedConfig, deprecatedConfig);
+    if (skippedAccountIds.length > 0) {
+        logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.skippedExistingAccounts', {
+            skippedAccountIds: skippedAccountIds.join(', '),
+        }));
+    }
+    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.mergeSuccess', {
+        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+    }));
+    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+        command: 'hs config migrate',
+        type: 'merge',
+        step: 'Confirm merge via prompt',
+        successful: true,
+    }, accountId);
+    return true;
+}

package/lib/configOptions.js

@@ -10,21 +10,20 @@ const text_1 = require("@hubspot/local-dev-lib/text");
 const usageTracking_1 = require("./usageTracking");
 const promptUtils_1 = require("./prompts/promptUtils");
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.config.subcommands.set.options';
 async function enableOrDisableUsageTracking() {
     const { isEnabled } = await (0, promptUtils_1.promptUser)([
         {
             type: 'list',
             name: 'isEnabled',
             pageSize: 20,
-            message: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.promptMessage`),
+            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.promptMessage`),
             choices: [
                 {
-                    name: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.labels.enabled`),
+                    name: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.labels.enabled`),
                     value: true,
                 },
                 {
-                    name: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.labels.disabled`),
+                    name: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.labels.disabled`),
                     value: false,
                 },
             ],
@@ -43,7 +42,7 @@ async function setAllowUsageTracking({ accountId, allowUsageTracking, }) {
         isEnabled = await enableOrDisableUsageTracking();
     }
     (0, config_1.updateAllowUsageTracking)(isEnabled);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.success`, {
+    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.success`, {
         isEnabled: isEnabled.toString(),
     }));
 }
@@ -54,7 +53,7 @@ async function selectCmsPublishMode() {
             type: 'list',
             name: 'cmsPublishMode',
             pageSize: 20,
-            message: (0, lang_1.i18n)(`${i18nKey}.defaultMode.promptMessage`),
+            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.promptMessage`),
             choices: ALL_CMS_PUBLISH_MODES,
             default: files_1.CMS_PUBLISH_MODE.publish,
         },
@@ -72,13 +71,13 @@ async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }) {
         newDefault = defaultCmsPublishMode;
     }
     else {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.defaultMode.error`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.error`, {
             validModes: (0, text_1.commaSeparatedValues)(ALL_CMS_PUBLISH_MODES),
         }));
         newDefault = await selectCmsPublishMode();
     }
     (0, config_1.updateDefaultCmsPublishMode)(newDefault);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.defaultMode.success`, {
+    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.success`, {
         mode: newDefault,
     }));
 }
@@ -86,7 +85,7 @@ async function enterTimeout() {
     const { timeout } = await (0, promptUtils_1.promptUser)([
         {
             name: 'timeout',
-            message: (0, lang_1.i18n)(`${i18nKey}.httpTimeout.promptMessage`),
+            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.promptMessage`),
             type: 'input',
             default: 30000,
         },
@@ -103,5 +102,7 @@ async function setHttpTimeout({ accountId, httpTimeout, }) {
         newHttpTimeout = httpTimeout;
     }
     (0, config_1.updateHttpTimeout)(newHttpTimeout);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.httpTimeout.success`, { timeout: newHttpTimeout }));
+    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.success`, {
+        timeout: newHttpTimeout,
+    }));
 }

package/lib/constants.d.ts

@@ -74,3 +74,7 @@ export declare const APP_AUTH_TYPES: {
     readonly OAUTH: "oauth";
     readonly STATIC: "static";
 };
+export declare const FEATURES: {
+    readonly UNIFIED_THEME_PREVIEW: "cms:react:unifiedThemePreview";
+    readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
+};

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.FEATURES = exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -69,3 +69,7 @@ exports.APP_AUTH_TYPES = {
     OAUTH: 'oauth',
     STATIC: 'static',
 };
+exports.FEATURES = {
+    UNIFIED_THEME_PREVIEW: 'cms:react:unifiedThemePreview',
+    UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
+};

package/lib/dependencyManagement.js

@@ -9,7 +9,7 @@ exports.installPackages = installPackages;
 exports.getProjectPackageJsonLocations = getProjectPackageJsonLocations;
 exports.hasMissingPackages = hasMissingPackages;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const projects_1 = require("./projects");
+const config_1 = require("./projects/config");
 const child_process_1 = require("child_process");
 const fs_1 = require("@hubspot/local-dev-lib/fs");
 const path_1 = __importDefault(require("path"));
@@ -92,7 +92,7 @@ async function installPackagesInDirectory(directory, packages) {
     }
 }
 async function getProjectPackageJsonLocations() {
-    const projectConfig = await (0, projects_1.getProjectConfig)();
+    const projectConfig = await (0, config_1.getProjectConfig)();
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {

package/lib/doctor/Diagnosis.d.ts

@@ -11,16 +11,15 @@ interface Section {
 export declare class Diagnosis {
     private readonly prefixes;
     private readonly diagnosis;
-    private readonly indentation;
     private errorCount;
     private warningCount;
     constructor({ diagnosticInfo, accountId }: DiagnosisOptions);
-    private indent;
     getErrorCount(): number;
     getWarningCount(): number;
     addCliSection(section: Section): void;
     addProjectSection(section: Section): void;
     addCLIConfigSection(section: Section): void;
+    addDefaultAccountOverrideFileSection(section: Section): void;
     toString(): string;
     private generateSections;
 }

package/lib/doctor/Diagnosis.js

@@ -5,12 +5,11 @@ const spinniesUtils_1 = require("../ui/spinniesUtils");
 const chalk_1 = require("chalk");
 const interpolation_1 = require("../interpolation");
 const ui_1 = require("../ui");
+const index_1 = require("../ui/index");
 const { i18n } = require('../lang');
-const i18nKey = `lib.doctor.diagnosis`;
 class Diagnosis {
     prefixes;
     diagnosis;
-    indentation = '  ';
     errorCount = 0;
     warningCount = 0;
     constructor({ diagnosticInfo, accountId }) {
@@ -22,20 +21,24 @@ class Diagnosis {
         };
         this.diagnosis = {
             cli: {
-                header: i18n(`${i18nKey}.cli.header`),
+                header: i18n(`lib.doctor.diagnosis.cli.header`),
                 sections: [],
             },
             cliConfig: {
-                header: i18n(`${i18nKey}.cliConfig.header`),
+                header: i18n(`lib.doctor.diagnosis.cliConfig.header`),
+                sections: [],
+            },
+            defaultAccountOverrideFile: {
+                header: i18n(`lib.doctor.diagnosis.defaultAccountOverrideFile.header`),
                 sections: [],
             },
             project: {
-                header: i18n(`${i18nKey}.projectConfig.header`),
+                header: i18n(`lib.doctor.diagnosis.projectConfig.header`),
                 subheaders: [
-                    i18n(`${i18nKey}.projectConfig.projectDirSubHeader`, {
+                    i18n(`lib.doctor.diagnosis.projectConfig.projectDirSubHeader`, {
                         projectDir: diagnosticInfo.project?.config?.projectDir,
                     }),
-                    i18n(`${i18nKey}.projectConfig.projectNameSubHeader`, {
+                    i18n(`lib.doctor.diagnosis.projectConfig.projectNameSubHeader`, {
                         projectName: diagnosticInfo.project?.config?.projectConfig?.name,
                     }),
                 ],
@@ -44,18 +47,15 @@ class Diagnosis {
         };
         if (diagnosticInfo.config) {
             this.diagnosis.cliConfig.subheaders = [
-                i18n(`${i18nKey}.cliConfig.configFileSubHeader`, {
+                i18n(`lib.doctor.diagnosis.cliConfig.configFileSubHeader`, {
                     filename: diagnosticInfo.config,
                 }),
-                i18n(`${i18nKey}.cliConfig.defaultAccountSubHeader`, {
+                i18n(`lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader`, {
                     accountDetails: (0, ui_1.uiAccountDescription)(accountId),
                 }),
             ];
         }
     }
-    indent(level) {
-        return this.indentation.repeat(level);
-    }
     getErrorCount() {
         return this.errorCount;
     }
@@ -71,6 +71,9 @@ class Diagnosis {
     addCLIConfigSection(section) {
         this.diagnosis.cliConfig.sections.push(section);
     }
+    addDefaultAccountOverrideFileSection(section) {
+        this.diagnosis.defaultAccountOverrideFile.sections.push(section);
+    }
     toString() {
         const output = [];
         for (const value of Object.values(this.diagnosis)) {
@@ -83,10 +86,10 @@ class Diagnosis {
             return '';
         }
         output.push('');
-        output.push(i18n(`${i18nKey}.counts.errors`, {
+        output.push(i18n(`lib.doctor.diagnosis.counts.errors`, {
             count: this.errorCount,
         }));
-        output.push(i18n(`${i18nKey}.counts.warnings`, {
+        output.push(i18n(`lib.doctor.diagnosis.counts.warnings`, {
             count: this.warningCount,
         }));
         output.push('');
@@ -108,9 +111,9 @@ class Diagnosis {
             else if (section.type === 'warning') {
                 this.warningCount++;
             }
-            output.push(`${this.indent(1)}${this.prefixes[section.type]} ${section.message}`);
+            output.push(`${(0, index_1.indent)(1)}${this.prefixes[section.type]} ${section.message}`);
             if (section.secondaryMessaging) {
-                output.push(`${this.indent(2)}- ${section.secondaryMessaging}`);
+                output.push(`${(0, index_1.indent)(2)}- ${section.secondaryMessaging}`);
             }
         });
         return output.join('\n');

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -1,4 +1,4 @@
-import { getProjectConfig } from '../projects';
+import { getProjectConfig } from '../projects/config';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { AccessToken, AccountType, AuthType } from '@hubspot/local-dev-lib/types/Accounts';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
@@ -21,6 +21,7 @@ export interface DiagnosticInfo extends FilesInfo {
         npm: string | null;
     };
     config: string | null;
+    defaultAccountOverrideFile: string | null | undefined;
     configSettings: {
         [key: string]: unknown;
     };

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagnosticInfoBuilder = void 0;
-const projects_1 = require("../projects");
-const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const config_1 = require("../projects/config");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const path_1 = __importDefault(require("path"));
 const package_json_1 = __importDefault(require("../../package.json"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const config_1 = require("@hubspot/local-dev-lib/config");
 const config_2 = require("@hubspot/local-dev-lib/config");
+const config_3 = require("@hubspot/local-dev-lib/config");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const fs_1 = require("@hubspot/local-dev-lib/fs");
 const util_1 = __importDefault(require("util"));
@@ -38,10 +38,10 @@ class DiagnosticInfoBuilder {
     files;
     processInfo;
     constructor(processInfo) {
-        this.accountId = (0, config_1.getAccountId)();
-        const accountConfig = (0, config_2.getAccountConfig)(this.accountId);
+        this.accountId = (0, config_2.getAccountId)();
+        const accountConfig = (0, config_3.getAccountConfig)(this.accountId);
         this.configSettings = {
-            httpUseLocalhost: (0, config_1.isConfigFlagEnabled)('httpUseLocalhost'),
+            httpUseLocalhost: (0, config_2.isConfigFlagEnabled)('httpUseLocalhost'),
         };
         this.env = accountConfig?.env;
         this.authType = accountConfig?.authType;
@@ -50,7 +50,7 @@ class DiagnosticInfoBuilder {
         this.processInfo = processInfo;
     }
     async generateDiagnosticInfo() {
-        this._projectConfig = await (0, projects_1.getProjectConfig)();
+        this._projectConfig = await (0, config_1.getProjectConfig)();
         if (this._projectConfig?.projectConfig) {
             await this.fetchProjectDetails();
             await this.fetchAccessToken();
@@ -63,7 +63,8 @@ class DiagnosticInfoBuilder {
             platform,
             arch,
             path: mainModule?.path,
-            config: (0, config_2.getConfigPath)(),
+            config: (0, config_3.getConfigPath)(),
+            defaultAccountOverrideFile: (0, config_2.getDefaultAccountOverrideFilePath)(),
             configSettings: this.configSettings,
             versions: {
                 [hubspotCli]: package_json_1.default.version,
@@ -88,7 +89,7 @@ class DiagnosticInfoBuilder {
     }
     async fetchProjectDetails() {
         try {
-            const { data } = await (0, projects_2.fetchProject)(this.accountId, 
+            const { data } = await (0, projects_1.fetchProject)(this.accountId, 
             // We check that config exists before running this function
             this._projectConfig.projectConfig.name);
             this.projectDetails = data;

package/lib/doctor/Doctor.d.ts

@@ -10,6 +10,7 @@ export declare class Doctor {
     private performCliChecks;
     private performProjectChecks;
     private performCliConfigChecks;
+    private performDefaultAccountOverrideFileChecks;
     private performCliConfigSettingsChecks;
     private checkIfAccessTokenValid;
     private checkIfNodeIsInstalled;