@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/lib/DevServerManager.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { COMPONENT_TYPES } = require('./projectStructure');
+const { COMPONENT_TYPES } = require('./projects/structure');
 const { i18n } = require('./lang');
 const { promptUser } = require('./prompts/promptUtils');
 const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');

package/lib/LocalDevManager.js

@@ -14,9 +14,9 @@ const { PROJECT_CONFIG_FILE } = require('./constants');
 const SpinniesManager = require('./ui/SpinniesManager');
 const DevServerManager = require('./DevServerManager');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { getProjectDetailUrl } = require('./projects');
+const { getProjectDetailUrl } = require('./projects/urls');
 const { getAccountHomeUrl } = require('./localDev');
-const { CONFIG_FILES, COMPONENT_TYPES, getAppCardConfigs, } = require('./projectStructure');
+const { CONFIG_FILES, COMPONENT_TYPES, getAppCardConfigs, } = require('./projects/structure');
 const { UI_COLORS, uiCommandReference, uiAccountDescription, uiBetaTag, uiLink, uiLine, } = require('./ui');
 const { logError } = require('./errorHandlers/index');
 const { installPublicAppPrompt } = require('./prompts/installPublicAppPrompt');
@@ -77,7 +77,7 @@ class LocalDevManager {
         if (!this.activeApp) {
             return;
         }
-        const { data: portalPublicApps } = await fetchPublicAppsForPortal(this.targetProjectAccountId);
+        const { data: { results: portalPublicApps }, } = await fetchPublicAppsForPortal(this.targetProjectAccountId);
         const activePublicAppData = portalPublicApps.find(({ sourceId }) => sourceId === this.activeApp.config.uid);
         // TODO: Update to account for new API with { data }
         const { data: { uniquePortalInstallCount }, } = await fetchPublicAppProductionInstallCounts(activePublicAppData.id, this.targetProjectAccountId);
@@ -175,7 +175,7 @@ class LocalDevManager {
         return data;
     }
     async checkPublicAppInstallation() {
-        const { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups, } = await this.getActiveAppInstallationData();
+        const { isInstalledWithScopeGroups, previouslyAuthorizedScopeGroups } = await this.getActiveAppInstallationData();
         const isReinstall = previouslyAuthorizedScopeGroups.length > 0;
         if (!isInstalledWithScopeGroups) {
             await installPublicAppPrompt(this.env, this.targetAccountId, this.activePublicAppData.clientId, this.activeApp.config.auth.requiredScopes, this.activeApp.config.auth.redirectUrls, isReinstall);

package/lib/buildAccount.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { personalAccessKeyPrompt, } = require('./prompts/personalAccessKeyPrompt');
 const { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 const { cliAccountNamePrompt } = require('./prompts/accountNamePrompt');
@@ -26,10 +27,7 @@ async function saveAccountToConfig({ env, personalAccessKey, accountName, accoun
     const updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env);
     let validName = updatedConfig.name;
     if (!updatedConfig.name) {
-        const nameForConfig = accountName
-            .toLowerCase()
-            .split(' ')
-            .join('-');
+        const nameForConfig = accountName.toLowerCase().split(' ').join('-');
         validName = nameForConfig;
         const invalidAccountName = accountNameExistsInConfig(nameForConfig);
         if (invalidAccountName) {
@@ -62,7 +60,8 @@ force = false, }) {
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    const accountId = getAccountId(accountConfig.portalId);
+    const id = getAccountIdentifier(accountConfig);
+    const accountId = getAccountId(id);
     const isSandbox = accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
         accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
     const isDeveloperTestAccount = accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
@@ -116,12 +115,7 @@ force = false, }) {
             handleSandboxCreateError({ err, env, accountConfig, name, accountId });
         }
         if (isDeveloperTestAccount) {
-            handleDeveloperTestAccountCreateError({
-                err,
-                env,
-                accountId,
-                portalLimit,
-            });
+            handleDeveloperTestAccountCreateError(err, env, accountId, portalLimit);
         }
     }
     let configAccountName;

package/lib/commonOpts.d.ts

@@ -1,9 +1,12 @@
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 import { Argv, Arguments } from 'yargs';
-import { Mode } from '@hubspot/local-dev-lib/types/Files';
+export declare function addGlobalOptions(yargs: Argv): Argv<{
+    debug: boolean;
+}>;
 export declare function addAccountOptions(yargs: Argv): Argv;
 export declare function addConfigOptions(yargs: Argv): Argv;
 export declare function addOverwriteOptions(yargs: Argv): Argv;
-export declare function addModeOptions(yargs: Argv, { read, write }: {
+export declare function addCmsPublishModeOptions(yargs: Argv, { read, write }: {
     read?: boolean;
     write?: boolean;
 }): Argv;
@@ -19,9 +22,15 @@ export declare function getCommandName(argv: Arguments<{
  * Obtains accountId using supplied --account flag or from environment variables
  */
 export declare function getAccountId(options: Arguments<{
-    portal?: number | string;
     account?: number | string;
 }>): number | null;
-export declare function getMode(options: Arguments<{
-    mode?: Mode;
-}>): Mode;
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+export declare function injectAccountIdMiddleware(options: Arguments<{
+    derivedAccountId?: number | null;
+    account?: number | string;
+}>): Promise<void>;
+export declare function getCmsPublishMode(options: Arguments<{
+    cmsPublishMode?: CmsPublishMode;
+}>): CmsPublishMode;

package/lib/commonOpts.js

@@ -1,24 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addGlobalOptions = addGlobalOptions;
 exports.addAccountOptions = addAccountOptions;
 exports.addConfigOptions = addConfigOptions;
 exports.addOverwriteOptions = addOverwriteOptions;
-exports.addModeOptions = addModeOptions;
+exports.addCmsPublishModeOptions = addCmsPublishModeOptions;
 exports.addTestingOptions = addTestingOptions;
 exports.addUseEnvironmentOptions = addUseEnvironmentOptions;
 exports.setLogLevel = setLogLevel;
 exports.getCommandName = getCommandName;
 exports.getAccountId = getAccountId;
-exports.getMode = getMode;
+exports.injectAccountIdMiddleware = injectAccountIdMiddleware;
+exports.getCmsPublishMode = getCmsPublishMode;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const lang_1 = require("./lang");
 const i18nKey = 'lib.commonOpts';
+function addGlobalOptions(yargs) {
+    yargs.version(false);
+    return yargs.option('debug', {
+        alias: 'd',
+        default: false,
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.debug.describe`),
+        type: 'boolean',
+    });
+}
 function addAccountOptions(yargs) {
-    return yargs.option('portal', {
-        alias: ['p', 'account', 'a'],
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.portal.describe`),
+    return yargs.option('account', {
+        alias: 'a',
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
         type: 'string',
     });
 }
@@ -37,11 +48,11 @@ function addOverwriteOptions(yargs) {
         default: false,
     });
 }
-function addModeOptions(yargs, { read, write }) {
-    const modes = `<${Object.values(files_1.MODE).join(' | ')}>`;
-    return yargs.option('mode', {
+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 }),
+        describe: (0, lang_1.i18n)(`${i18nKey}.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
         type: 'string',
     });
 }
@@ -54,11 +65,12 @@ function addTestingOptions(yargs) {
     });
 }
 function addUseEnvironmentOptions(yargs) {
-    return yargs.option('use-env', {
+    return yargs
+        .option('use-env', {
         describe: (0, lang_1.i18n)(`${i18nKey}.options.useEnv.describe`),
         type: 'boolean',
-        default: false,
-    });
+    })
+        .conflicts('use-env', 'account');
 }
 function setLogLevel(options) {
     const { debug } = options;
@@ -76,40 +88,42 @@ function getCommandName(argv) {
  * Obtains accountId using supplied --account flag or from environment variables
  */
 function getAccountId(options) {
-    const { portal, account } = options || {};
-    if (options?.useEnv && process.env.HUBSPOT_PORTAL_ID) {
-        return parseInt(process.env.HUBSPOT_PORTAL_ID, 10);
+    const { account } = options || {};
+    if (options?.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
+        return parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+    }
+    return (0, config_1.getAccountId)(account);
+}
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+async function injectAccountIdMiddleware(options) {
+    const { account } = options;
+    // Preserves the original --account flag for certain commands.
+    options.providedAccountId = account;
+    if (options.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
+        options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+        return;
     }
-    return (0, config_1.getAccountId)(portal || account);
+    options.derivedAccountId = (0, config_1.getAccountId)(account);
 }
-function getMode(options) {
-    // 1. --mode
-    const { mode } = options;
-    if (mode && typeof mode === 'string') {
-        return mode.toLowerCase();
+function getCmsPublishMode(options) {
+    // 1. --cmsPublishMode
+    const { cmsPublishMode } = options;
+    if (cmsPublishMode && typeof cmsPublishMode === 'string') {
+        return cmsPublishMode.toLowerCase();
     }
-    // 2. config[portal].defaultMode
+    // 2. config[account].defaultCmsPublishMode
     const accountId = getAccountId(options);
     if (accountId) {
         const accountConfig = (0, config_1.getAccountConfig)(accountId);
-        if (accountConfig && accountConfig.defaultMode) {
-            return accountConfig.defaultMode;
+        if (accountConfig && accountConfig.defaultCmsPublishMode) {
+            return accountConfig.defaultCmsPublishMode;
         }
     }
-    // 3. config.defaultMode
-    // 4. DEFAULT_MODE
+    // 3. config.defaultCmsPublishMode
+    // 4. DEFAULT_CMS_PUBLISH_MODE
     const config = (0, config_1.getAndLoadConfigIfNeeded)();
-    return (config && config.defaultMode) || files_1.DEFAULT_MODE;
+    return ((config && config.defaultCmsPublishMode) ||
+        files_1.DEFAULT_CMS_PUBLISH_MODE);
 }
-module.exports = {
-    addAccountOptions,
-    addConfigOptions,
-    addOverwriteOptions,
-    addModeOptions,
-    addTestingOptions,
-    addUseEnvironmentOptions,
-    getCommandName,
-    getMode,
-    getAccountId,
-    setLogLevel,
-};

package/lib/configOptions.d.ts

@@ -1 +1,13 @@
-export {};
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
+export declare function setAllowUsageTracking({ accountId, allowUsageTracking, }: {
+    accountId: number;
+    allowUsageTracking?: boolean;
+}): Promise<void>;
+export declare function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }: {
+    accountId: number;
+    defaultCmsPublishMode?: CmsPublishMode;
+}): Promise<void>;
+export declare function setHttpTimeout({ accountId, httpTimeout, }: {
+    accountId: number;
+    httpTimeout?: string;
+}): Promise<void>;

package/lib/configOptions.js

@@ -1,29 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { updateAllowUsageTracking, updateDefaultMode, updateHttpTimeout, } = require('@hubspot/local-dev-lib/config');
-const { MODE } = require('@hubspot/local-dev-lib/constants/files');
-const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
-const { trackCommandUsage } = require('./usageTracking');
-const { promptUser } = require('./prompts/promptUtils');
-const { i18n } = require('../lib/lang');
+exports.setAllowUsageTracking = setAllowUsageTracking;
+exports.setDefaultCmsPublishMode = setDefaultCmsPublishMode;
+exports.setHttpTimeout = setHttpTimeout;
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const files_1 = require("@hubspot/local-dev-lib/constants/files");
+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';
-const enableOrDisableUsageTracking = async () => {
-    const { isEnabled } = await promptUser([
+async function enableOrDisableUsageTracking() {
+    const { isEnabled } = await (0, promptUtils_1.promptUser)([
         {
             type: 'list',
-            look: false,
             name: 'isEnabled',
             pageSize: 20,
-            message: i18n(`${i18nKey}.allowUsageTracking.promptMessage`),
+            message: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.promptMessage`),
             choices: [
                 {
-                    name: i18n(`${i18nKey}.allowUsageTracking.labels.enabled`),
+                    name: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.labels.enabled`),
                     value: true,
                 },
                 {
-                    name: i18n(`${i18nKey}.allowUsageTracking.labels.disabled`),
+                    name: (0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.labels.disabled`),
                     value: false,
                 },
             ],
@@ -31,9 +32,9 @@ const enableOrDisableUsageTracking = async () => {
         },
     ]);
     return isEnabled;
-};
-const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
-    trackCommandUsage('config-set-allow-usage-tracking', null, accountId);
+}
+async function setAllowUsageTracking({ accountId, allowUsageTracking, }) {
+    (0, usageTracking_1.trackCommandUsage)('config-set-allow-usage-tracking', undefined, accountId);
     let isEnabled;
     if (typeof allowUsageTracking === 'boolean') {
         isEnabled = allowUsageTracking;
@@ -41,58 +42,59 @@ const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
     else {
         isEnabled = await enableOrDisableUsageTracking();
     }
-    updateAllowUsageTracking(isEnabled);
-    return logger.log(i18n(`${i18nKey}.allowUsageTracking.success`, { isEnabled }));
-};
-const ALL_MODES = Object.values(MODE);
-const selectMode = async () => {
-    const { mode } = await promptUser([
+    (0, config_1.updateAllowUsageTracking)(isEnabled);
+    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.allowUsageTracking.success`, {
+        isEnabled: isEnabled.toString(),
+    }));
+}
+const ALL_CMS_PUBLISH_MODES = Object.values(files_1.CMS_PUBLISH_MODE);
+async function selectCmsPublishMode() {
+    const { cmsPublishMode } = await (0, promptUtils_1.promptUser)([
         {
             type: 'list',
-            look: false,
-            name: 'mode',
+            name: 'cmsPublishMode',
             pageSize: 20,
-            message: i18n(`${i18nKey}.defaultMode.promptMessage`),
-            choices: ALL_MODES,
-            default: MODE.publish,
+            message: (0, lang_1.i18n)(`${i18nKey}.defaultMode.promptMessage`),
+            choices: ALL_CMS_PUBLISH_MODES,
+            default: files_1.CMS_PUBLISH_MODE.publish,
         },
     ]);
-    return mode;
-};
-const setDefaultMode = async ({ accountId, defaultMode }) => {
-    trackCommandUsage('config-set-default-mode', null, accountId);
+    return cmsPublishMode;
+}
+async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }) {
+    (0, usageTracking_1.trackCommandUsage)('config-set-default-mode', undefined, accountId);
     let newDefault;
-    if (!defaultMode) {
-        newDefault = await selectMode();
+    if (!defaultCmsPublishMode) {
+        newDefault = await selectCmsPublishMode();
     }
-    else if (defaultMode && ALL_MODES.find(m => m === defaultMode)) {
-        newDefault = defaultMode;
+    else if (defaultCmsPublishMode &&
+        ALL_CMS_PUBLISH_MODES.find(m => m === defaultCmsPublishMode)) {
+        newDefault = defaultCmsPublishMode;
     }
     else {
-        logger.error(i18n(`${i18nKey}.defaultMode.errors`, {
-            mode: newDefault,
-            validModes: commaSeparatedValues(ALL_MODES),
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.defaultMode.error`, {
+            validModes: (0, text_1.commaSeparatedValues)(ALL_CMS_PUBLISH_MODES),
         }));
-        newDefault = await selectMode();
+        newDefault = await selectCmsPublishMode();
     }
-    updateDefaultMode(newDefault);
-    return logger.success(i18n(`${i18nKey}.defaultMode.success`, {
+    (0, config_1.updateDefaultCmsPublishMode)(newDefault);
+    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.defaultMode.success`, {
         mode: newDefault,
     }));
-};
-const enterTimeout = async () => {
-    const { timeout } = await promptUser([
+}
+async function enterTimeout() {
+    const { timeout } = await (0, promptUtils_1.promptUser)([
         {
             name: 'timeout',
-            message: i18n(`${i18nKey}.httpTimeout.promptMessage`),
+            message: (0, lang_1.i18n)(`${i18nKey}.httpTimeout.promptMessage`),
             type: 'input',
             default: 30000,
         },
     ]);
     return timeout;
-};
-const setHttpTimeout = async ({ accountId, httpTimeout }) => {
-    trackCommandUsage('config-set-http-timeout', null, accountId);
+}
+async function setHttpTimeout({ accountId, httpTimeout, }) {
+    (0, usageTracking_1.trackCommandUsage)('config-set-http-timeout', undefined, accountId);
     let newHttpTimeout;
     if (!httpTimeout) {
         newHttpTimeout = await enterTimeout();
@@ -100,11 +102,6 @@ const setHttpTimeout = async ({ accountId, httpTimeout }) => {
     else {
         newHttpTimeout = httpTimeout;
     }
-    updateHttpTimeout(newHttpTimeout);
-    return logger.success(i18n(`${i18nKey}.httpTimeout.success`, { timeout: newHttpTimeout }));
-};
-module.exports = {
-    setAllowUsageTracking,
-    setDefaultMode,
-    setHttpTimeout,
-};
+    (0, config_1.updateHttpTimeout)(newHttpTimeout);
+    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.httpTimeout.success`, { timeout: newHttpTimeout }));
+}

package/lib/constants.d.ts

@@ -60,10 +60,7 @@ export declare const PROJECT_ERROR_TYPES: {
     readonly SUBDEPLOY_FAILED: "DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED";
 };
 export declare const PROJECT_TASK_TYPES: {
-    readonly PRIVATE_APP: "private app";
-    readonly PUBLIC_APP: "public app";
-    readonly APP_FUNCTION: "function";
-    readonly CRM_CARD_V2: "card";
+    [key: string]: string;
 };
 export declare const PROJECT_COMPONENT_TYPES: {
     readonly PROJECTS: "projects";

package/lib/dependencyManagement.d.ts

@@ -1,3 +1,6 @@
 export declare function isGloballyInstalled(command: any): Promise<boolean>;
-export declare function getLatestCliVersion(): string;
+export declare function getLatestCliVersion(): {
+    latest: string;
+    next: string;
+};
 export declare function hasMissingPackages(directory: any): Promise<boolean>;

package/lib/dependencyManagement.js

@@ -38,8 +38,8 @@ async function isGloballyInstalled(command) {
 async function getLatestCliVersion() {
     const exec = util.promisify(execAsync);
     const { stdout } = await exec(`npm info ${pkg.name} dist-tags --json`);
-    const { latest } = JSON.parse(stdout);
-    return latest;
+    const { latest, next } = JSON.parse(stdout);
+    return { latest, next };
 }
 async function installPackages({ packages, installLocations }) {
     const installDirs = installLocations || (await getProjectPackageJsonLocations());

package/lib/developerTestAccounts.d.ts

@@ -1 +1,5 @@
-export {};
+import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { FetchDeveloperTestAccountsResponse } from '@hubspot/local-dev-lib/types/developerTestAccounts';
+import { Environment } from '@hubspot/local-dev-lib/types/Config';
+export declare function validateDevTestAccountUsageLimits(accountConfig: CLIAccount): Promise<FetchDeveloperTestAccountsResponse | null>;
+export declare function handleDeveloperTestAccountCreateError(err: unknown, accountId: number, env: Environment, portalLimit: number): never;

package/lib/developerTestAccounts.js

@@ -1,30 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountId, getConfig } = require('@hubspot/local-dev-lib/config');
-const { i18n } = require('./lang');
-const { fetchDeveloperTestAccounts, } = require('@hubspot/local-dev-lib/api/developerTestAccounts');
-const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { uiAccountDescription } = require('./ui');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logError } = require('./errorHandlers/index');
-const getHasDevTestAccounts = appDeveloperAccountConfig => {
-    const config = getConfig();
-    const parentPortalId = getAccountId(appDeveloperAccountConfig.portalId);
-    for (const portal of config.portals) {
+exports.validateDevTestAccountUsageLimits = validateDevTestAccountUsageLimits;
+exports.handleDeveloperTestAccountCreateError = handleDeveloperTestAccountCreateError;
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
+const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
+const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const urls_1 = require("@hubspot/local-dev-lib/urls");
+const lang_1 = require("./lang");
+const ui_1 = require("./ui");
+const index_2 = require("./errorHandlers/index");
+function getHasDevTestAccounts(appDeveloperAccountConfig) {
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(appDeveloperAccountConfig);
+    const parentPortalId = (0, config_2.getAccountId)(id);
+    const accountsList = (0, config_2.getConfigAccounts)();
+    if (!accountsList) {
+        return false;
+    }
+    for (const portal of accountsList) {
         if (Boolean(portal.parentAccountId) &&
             portal.parentAccountId === parentPortalId &&
-            portal.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
+            portal.accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
             return true;
         }
     }
     return false;
-};
-const validateDevTestAccountUsageLimits = async (accountConfig) => {
-    const accountId = getAccountId(accountConfig.portalId);
-    const { data } = await fetchDeveloperTestAccounts(accountId);
+}
+async function validateDevTestAccountUsageLimits(accountConfig) {
+    const id = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+    const accountId = (0, config_2.getAccountId)(id);
+    if (!accountId) {
+        return null;
+    }
+    const { data } = await (0, developerTestAccounts_1.fetchDeveloperTestAccounts)(accountId);
     if (!data) {
         return null;
     }
@@ -33,49 +43,45 @@ const validateDevTestAccountUsageLimits = async (accountConfig) => {
     if (count >= limit) {
         const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
         if (hasDevTestAccounts) {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
+            throw new Error((0, lang_1.i18n)('lib.developerTestAccount.create.failure.alreadyInConfig', {
                 accountName: accountConfig.name || accountId,
                 limit,
             }));
         }
         else {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.limit', {
+            throw new Error((0, lang_1.i18n)('lib.developerTestAccount.create.failure.limit', {
                 accountName: accountConfig.name || accountId,
                 limit,
             }));
         }
     }
     return data;
-};
-function handleDeveloperTestAccountCreateError({ err, accountId, env, portalLimit, }) {
-    if (isMissingScopeError(err)) {
-        logger.error(i18n('lib.developerTestAccount.create.failure.scopes.message', {
-            accountName: uiAccountDescription(accountId),
+}
+function handleDeveloperTestAccountCreateError(err, accountId, env, portalLimit) {
+    if ((0, index_1.isMissingScopeError)(err)) {
+        logger_1.logger.error((0, lang_1.i18n)('lib.developerTestAccount.create.failure.scopes.message', {
+            accountName: (0, ui_1.uiAccountDescription)(accountId),
         }));
-        const websiteOrigin = getHubSpotWebsiteOrigin(env);
+        const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger.info(i18n('lib.developerTestAccount.create.failure.scopes.instructions', {
-            accountName: uiAccountDescription(accountId),
+        logger_1.logger.info((0, lang_1.i18n)('lib.developerTestAccount.create.failure.scopes.instructions', {
+            accountName: (0, ui_1.uiAccountDescription)(accountId),
             url,
         }));
     }
-    else if (isSpecifiedError(err, {
+    else if ((0, index_1.isSpecifiedError)(err, {
         statusCode: 400,
         errorType: 'TEST_PORTAL_LIMIT_REACHED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.developerTestAccount.create.failure.limit', {
-            accountName: uiAccountDescription(accountId),
+        logger_1.logger.log('');
+        logger_1.logger.error((0, lang_1.i18n)('lib.developerTestAccount.create.failure.limit', {
+            accountName: (0, ui_1.uiAccountDescription)(accountId),
             limit: portalLimit,
         }));
-        logger.log('');
+        logger_1.logger.log('');
     }
     else {
-        logError(err);
+        (0, index_2.logError)(err);
     }
     throw err;
 }
-module.exports = {
-    validateDevTestAccountUsageLimits,
-    handleDeveloperTestAccountCreateError,
-};

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -46,11 +46,12 @@ class DiagnosticInfoBuilder {
         this.processInfo = processInfo;
     }
     async generateDiagnosticInfo() {
-        // @ts-expect-error getProjectConfig not typed yet
         this._projectConfig = await (0, projects_1.getProjectConfig)();
         if (this._projectConfig?.projectConfig) {
             await this.fetchProjectDetails();
             await this.fetchAccessToken();
+        }
+        if (this._projectConfig?.projectDir) {
             await this.fetchProjectFilenames();
         }
         const { platform, arch, versions: { node }, mainModule, } = this.processInfo;
@@ -82,7 +83,9 @@ class DiagnosticInfoBuilder {
     }
     async fetchProjectDetails() {
         try {
-            const { data } = await (0, projects_2.fetchProject)(this.accountId, this._projectConfig?.projectConfig?.name);
+            const { data } = await (0, projects_2.fetchProject)(this.accountId, 
+            // We check that config exists before running this function
+            this._projectConfig.projectConfig.name);
             this.projectDetails = data;
         }
         catch (e) {
@@ -100,9 +103,10 @@ class DiagnosticInfoBuilder {
     }
     async fetchProjectFilenames() {
         try {
-            this.files = (await (0, fs_1.walk)(this._projectConfig?.projectDir))
+            // We check that projectDir exists before running this function
+            this.files = (await (0, fs_1.walk)(this._projectConfig.projectDir))
                 .filter(file => !path_1.default.dirname(file).includes('node_modules'))
-                .map(filename => path_1.default.relative(this._projectConfig?.projectDir, filename));
+                .map(filename => path_1.default.relative(this._projectConfig.projectDir, filename));
         }
         catch (e) {
             logger_1.logger.debug(e);