@hubspot/cli 8.6.0-beta.0 → 8.6.0

package/bin/cli.js

@@ -36,6 +36,7 @@ import { uiLogger } from '../lib/ui/logger.js';
 import { initializeSpinniesManager } from '../lib/middleware/spinniesMiddleware.js';
 import { addCommandSuggestions } from '../lib/commandSuggestion.js';
 import { pkg } from '../lib/jsonLoader.js';
+import { parseYargsOrExit } from '../lib/yargs/parseYargsOrExit.js';
 function getTerminalWidth() {
     const width = yargs().terminalWidth();
     if (width >= 100)
@@ -74,7 +75,6 @@ const argv = yargs(process.argv.slice(2))
     initializeSpinniesManager,
 ])
     .exitProcess(false)
-    .fail(handleFailure)
     .option('noHyperlinks', {
     default: false,
     describe: 'prevent hyperlinks from displaying in the ui',
@@ -119,7 +119,7 @@ const argv = yargs(process.argv.slice(2))
     .command(doctorCommand)
     .command(mcpCommand)
     .command(upgradeCommand);
-const argvWithSuggestions = addCommandSuggestions(argv)
+const parser = addCommandSuggestions(argv)
     .help()
     .alias('h', 'help')
     .version(pkg.version)
@@ -127,7 +127,8 @@ const argvWithSuggestions = addCommandSuggestions(argv)
     .recommendCommands()
     .demandCommand(1, '')
     .wrap(getTerminalWidth())
-    .strict().argv;
+    .strict();
+const argvWithSuggestions = await parseYargsOrExit(parser, handleFailure);
 if ('help' in argvWithSuggestions && argvWithSuggestions.help !== undefined) {
     (async () => {
         await trackHelpUsage(getCommandName(argvWithSuggestions));

package/commands/project/dev/unifiedFlow.js

@@ -3,13 +3,13 @@ import util from 'util';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { isTranslationError, translateForLocalDev, } from '@hubspot/project-parsing-lib/translate';
-import { getConfigAccountEnvironment, getLinkedOrAllConfigAccounts, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment, getLinkedOrAllConfigAccounts, getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
 import { createInitialBuildForNewProject, createNewProjectForLocalDev, compareLocalProjectToDeployed, checkAndInstallDependencies, } from '../../../lib/projects/localDev/helpers/project.js';
 import { useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, createSandboxForLocalDev, } from '../../../lib/projects/localDev/helpers/account.js';
-import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
+import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, confirmLinkExistingDeveloperTestAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
 import LocalDevProcess from '../../../lib/projects/localDev/LocalDevProcess.js';
 import LocalDevWatcher from '../../../lib/projects/localDev/LocalDevWatcher.js';
 import { handleExit, handleKeypress } from '../../../lib/process.js';
@@ -89,17 +89,26 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         const accountType = await selectAccountTypePrompt(targetProjectAccountConfig);
         if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
             const devAccountPromptResponse = await selectDeveloperTestTargetAccountPrompt(accounts, targetProjectAccountConfig);
+            const { notInConfigAccount } = devAccountPromptResponse;
             targetTestingAccountId =
                 devAccountPromptResponse.targetAccountId || undefined;
-            if (!!devAccountPromptResponse.notInConfigAccount) {
-                // When the developer test account isn't configured in the CLI config yet
-                // Walk the user through adding the account's PAK to the config
-                const accountAdded = await useExistingDevTestAccount(env, devAccountPromptResponse.notInConfigAccount);
-                if (!accountAdded) {
-                    return exit(EXIT_CODES.SUCCESS);
+            if (notInConfigAccount) {
+                const existingGlobalConfig = getConfigAccountIfExists(notInConfigAccount.id);
+                if (directoryIsLinked && existingGlobalConfig) {
+                    const shouldLink = await confirmLinkExistingDeveloperTestAccountPrompt(notInConfigAccount.accountName);
+                    if (!shouldLink) {
+                        return exit(EXIT_CODES.SUCCESS);
+                    }
+                    addAccountToLinkedSettings(notInConfigAccount.id);
                 }
-                if (directoryIsLinked) {
-                    addAccountToLinkedSettings(devAccountPromptResponse.notInConfigAccount.id);
+                else {
+                    const accountAdded = await useExistingDevTestAccount(env, notInConfigAccount);
+                    if (!accountAdded) {
+                        return exit(EXIT_CODES.SUCCESS);
+                    }
+                    if (directoryIsLinked) {
+                        addAccountToLinkedSettings(notInConfigAccount.id);
+                    }
                 }
             }
             else if (devAccountPromptResponse.createNestedAccount) {

package/lang/en.d.ts

@@ -3623,6 +3623,7 @@ export declare const lib: {
             developerTestAccountLimit: (limit: number) => string;
             confirmDefaultAccount: (accountName: string, accountType: string) => string;
             confirmUseExistingDeveloperTestAccount: (accountName: string) => string;
+            confirmLinkExistingDeveloperTestAccount: (accountName: string) => string;
             noAccountId: string;
         };
         projectLogsPrompt: {

package/lang/en.js

@@ -3649,6 +3649,7 @@ export const lib = {
             developerTestAccountLimit: (limit) => `Your account reached the limit of ${limit} developer test accounts.`,
             confirmDefaultAccount: (accountName, accountType) => `Continue testing on ${chalk.bold(`${accountName} (${accountType})`)}? (Y/n)`,
             confirmUseExistingDeveloperTestAccount: (accountName) => `Continue with ${accountName}? This account isn't currently connected to the HubSpot CLI. By continuing, you'll be prompted to generate a personal access key and connect it.`,
+            confirmLinkExistingDeveloperTestAccount: (accountName) => `${accountName} is not linked to this directory. Would you like to link it?`,
             noAccountId: 'No account ID found for the selected account. Please try again.',
         },
         projectLogsPrompt: {

package/lib/prompts/projectDevTargetAccountPrompt.d.ts

@@ -10,3 +10,4 @@ export declare function selectSandboxTargetAccountPrompt(accounts: HubSpotConfig
 export declare function selectDeveloperTestTargetAccountPrompt(accounts: HubSpotConfigAccount[], defaultAccountConfig: HubSpotConfigAccount): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function confirmDefaultAccountPrompt(accountName: string, accountType: string): Promise<boolean>;
 export declare function confirmUseExistingDeveloperTestAccountPrompt(account: DeveloperTestAccount): Promise<boolean>;
+export declare function confirmLinkExistingDeveloperTestAccountPrompt(accountName: string): Promise<boolean>;

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -164,3 +164,13 @@ export async function confirmUseExistingDeveloperTestAccountPrompt(account) {
     ]);
     return confirmUseExistingDeveloperTestAccount;
 }
+export async function confirmLinkExistingDeveloperTestAccountPrompt(accountName) {
+    const { confirmLinkExistingDeveloperTestAccount } = await promptUser([
+        {
+            name: 'confirmLinkExistingDeveloperTestAccount',
+            type: 'confirm',
+            message: lib.prompts.projectDevTargetAccountPrompt.confirmLinkExistingDeveloperTestAccount(accountName),
+        },
+    ]);
+    return confirmLinkExistingDeveloperTestAccount;
+}

package/lib/yargs/parseYargsOrExit.d.ts

@@ -0,0 +1,4 @@
+import { ArgumentsCamelCase, Argv } from 'yargs';
+type YargsFailureHandler<T> = (message: string | null, error: unknown, parser: Argv<T>) => never;
+export declare function parseYargsOrExit<T>(parser: Argv<T>, handleFailure: YargsFailureHandler<T>): Promise<ArgumentsCamelCase<T>>;
+export {};

package/lib/yargs/parseYargsOrExit.js

@@ -0,0 +1,25 @@
+function getYargsErrorMessage(error) {
+    return error instanceof Error && error.name === 'YError' ? error.message : '';
+}
+function getYargsFailureMessage(message, error) {
+    if (message) {
+        return message;
+    }
+    return getYargsErrorMessage(error) || message;
+}
+export async function parseYargsOrExit(parser, handleFailure) {
+    let failureHandled = false;
+    const parserWithFailureHandler = parser.fail((message, error, yargs) => {
+        failureHandled = true;
+        return handleFailure(getYargsFailureMessage(message, error), error, yargs);
+    });
+    try {
+        return await parserWithFailureHandler.parseAsync();
+    }
+    catch (error) {
+        if (failureHandled) {
+            throw error;
+        }
+        return handleFailure(getYargsErrorMessage(error), error, parserWithFailureHandler);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.6.0-beta.0",
+    "version": "8.6.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",