@hubspot/cli 8.0.11-experimental.0 → 8.0.11-experimental.1

package/commands/project/dev/index.js

@@ -1,49 +1,51 @@
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { getAllHsProfiles, } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
 import { isV2Project } from '../../../lib/projects/platformVersion.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { loadProfile } from '../../../lib/projects/projectProfiles.js';
+import { loadAndValidateProfile } from '../../../lib/projects/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../../lib/errors/PromptExitError.js';
-import path from 'path';
-import { listPrompt } from '../../../lib/prompts/promptUtils.js';
+import { projectProfilePrompt } from '../../../lib/prompts/projectProfilePrompt.js';
+import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
 function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
     // Legacy projects do not support targetTestingAccount and targetProjectAccount
     if (testingAccount && projectAccount && !useV2) {
-        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagLegacy);
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.project.dev.errors.unsupportedAccountFlagLegacy);
     }
     if (userProvidedAccount && useV2) {
-        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagV2);
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.project.dev.errors.unsupportedAccountFlagV2);
     }
 }
 async function handler(args) {
-    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
+    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, profile: profileOption, exit, addUsageMetadata, } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     try {
         validateProjectConfig(projectConfig, projectDir);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const useV2Projects = isV2Project(projectConfig.platformVersion);
     if (!projectDir) {
         uiLogger.error(commands.project.dev.errors.noProjectConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    try {
+        validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2Projects);
+    }
+    catch (error) {
+        logError(error);
+        return exit(EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2Projects);
     uiLogger.log(commands.project.dev.logs.header);
     if (useV2Projects) {
         uiLogger.log(commands.project.dev.logs.learnMoreMessageV2);
@@ -68,18 +70,10 @@ async function handler(args) {
     }
     // Determine profile name: from flag or prompt
     if (!targetProjectAccountId && isV2Project(projectConfig.platformVersion)) {
-        let profileName = args.profile;
-        if (!profileName) {
-            const existingProfiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
-            if (existingProfiles.length !== 0) {
-                profileName = await listPrompt(commands.project.dev.prompts.selectProfile, {
-                    choices: existingProfiles,
-                });
-            }
-        }
+        const profileName = await projectProfilePrompt(projectDir, projectConfig, profileOption);
         if (profileName) {
             try {
-                profile = loadProfile(projectConfig, projectDir, profileName);
+                profile = await loadAndValidateProfile(projectConfig, projectDir, profileName);
                 targetProjectAccountId = profile.accountId;
                 uiLogger.log('');
                 uiLogger.log(commands.project.dev.logs.profileProjectAccountExplanation(targetProjectAccountId, profileName));
@@ -87,7 +81,7 @@ async function handler(args) {
             catch (error) {
                 logError(error);
                 uiLine();
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
     }
@@ -99,7 +93,7 @@ async function handler(args) {
             uiLogger.log(commands.project.dev.logs.defaultProjectAccountExplanation(targetProjectAccountId));
         }
     }
-    trackCommandUsage('project-dev', {}, targetProjectAccountId);
+    addUsageMetadata({ accountId: targetProjectAccountId ?? undefined });
     try {
         if (isV2Project(projectConfig.platformVersion)) {
             const targetTestingAccountId = testingAccount
@@ -124,11 +118,11 @@ async function handler(args) {
         }
     }
     catch (e) {
-        if (e instanceof PromptExitError) {
-            process.exit(e.exitCode);
+        if (isPromptExitError(e)) {
+            throw e;
         }
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectDevBuilder(yargs) {
@@ -168,7 +162,7 @@ export const builder = makeYargsBuilder(projectDevBuilder, command, describe, {
 const projectDevCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-dev', handler),
     builder,
 };
 export default projectDevCommand;

package/commands/project/dev/unifiedFlow.js

@@ -17,9 +17,13 @@ import { isTestAccountOrSandbox, isUnifiedAccount, } from '../../../lib/accountT
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { commands } from '../../../lang/en.js';
 import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer.js';
-import { confirmLocalDevIsNotRunning } from '../../../lib/projects/localDev/helpers/process.js';
+import { isLocalDevRunning } from '../../../lib/projects/localDev/helpers/process.js';
 export async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, }) {
-    await confirmLocalDevIsNotRunning();
+    const { exit } = args;
+    if (await isLocalDevRunning()) {
+        uiLogger.error(commands.project.dev.errors.localDevAlreadyRunning);
+        return exit(EXIT_CODES.ERROR);
+    }
     const env = getConfigAccountEnvironment(targetProjectAccountId);
     let projectNodes;
     let projectProfileData;
@@ -41,23 +45,23 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         else {
             logError(e);
         }
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!Object.keys(projectNodes).length) {
         uiLogger.error(commands.project.dev.errors.noRunnableComponents);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     const targetProjectAccountConfig = getConfigAccountById(targetProjectAccountId);
     if (!targetProjectAccountConfig) {
         uiLogger.error(commands.project.dev.errors.noAccount(targetProjectAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const accounts = getAllConfigAccounts();
     const accountIsCombined = await isUnifiedAccount(targetProjectAccountConfig);
     const targetProjectAccountIsTestAccountOrSandbox = isTestAccountOrSandbox(targetProjectAccountConfig);
     if (!accountIsCombined) {
         uiLogger.error(commands.project.dev.errors.accountNotCombined);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let targetTestingAccountId = providedTargetTestingAccountId;
     // Temporarily removing logic to use profile account as testing account
@@ -82,11 +86,19 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             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
-                await useExistingDevTestAccount(env, devAccountPromptResponse.notInConfigAccount);
+                const accountAdded = await useExistingDevTestAccount(env, devAccountPromptResponse.notInConfigAccount);
+                if (!accountAdded) {
+                    return exit(EXIT_CODES.SUCCESS);
+                }
             }
             else if (devAccountPromptResponse.createNestedAccount) {
                 // Create a new developer test account and automatically add it to the CLI config
-                targetTestingAccountId = await createDeveloperTestAccountForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env, true);
+                try {
+                    targetTestingAccountId = await createDeveloperTestAccountForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env, true);
+                }
+                catch {
+                    return exit(EXIT_CODES.ERROR);
+                }
             }
         }
         else if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
@@ -94,7 +106,12 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             targetTestingAccountId =
                 sandboxAccountPromptResponse.targetAccountId || undefined;
             if (sandboxAccountPromptResponse.createNestedAccount) {
-                targetTestingAccountId = await createSandboxForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env);
+                try {
+                    targetTestingAccountId = await createSandboxForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env);
+                }
+                catch {
+                    return exit(EXIT_CODES.ERROR);
+                }
             }
         }
         else {
@@ -111,21 +128,26 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     });
     let project = uploadedProject;
     if (projectExists && project) {
-        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, args.profile);
+        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, exit, args.profile);
     }
     else {
-        project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false);
-        await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId, true, args.profile);
+        project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false, exit);
+        await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId, exit, true, args.profile);
     }
     // Check for missing/outdated dependencies
-    await checkAndInstallDependencies();
+    try {
+        await checkAndInstallDependencies();
+    }
+    catch {
+        return exit(EXIT_CODES.ERROR);
+    }
     // End setup, start local dev process
     try {
         await startPortManagerServer();
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const localDevProcess = new LocalDevProcess({
         initialProjectNodes: projectNodes,
@@ -138,6 +160,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         projectDir,
         projectData: project,
         env,
+        actions: { exit },
     });
     const websocketServer = new LocalDevWebsocketServer(localDevProcess, args.debug);
     const watcher = new LocalDevWatcher(localDevProcess);

package/commands/project/download.js

@@ -3,25 +3,24 @@ import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { downloadProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../lib/errors/PromptExitError.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { downloadProjectPrompt } from '../../lib/prompts/downloadProjectPrompt.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'download';
 const describe = commands.project.download.describe;
 async function handler(args) {
+    const { dest, build, derivedAccountId, exit } = args;
     const { projectConfig } = await getProjectConfig();
     if (projectConfig) {
         uiLogger.error(commands.project.download.warnings.cannotDownloadWithinProject);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    const { dest, build, derivedAccountId } = args;
     let buildNumberToDownload = build;
-    trackCommandUsage('project-download', undefined, derivedAccountId);
     try {
         const { project: projectName } = await downloadProjectPrompt(args);
         if (!buildNumberToDownload) {
@@ -34,7 +33,7 @@ async function handler(args) {
         }
         if (!buildNumberToDownload) {
             uiLogger.error(commands.project.download.errors.noBuildIdToDownload);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const sanitizedProjectName = sanitizeFileName(projectName);
         const absoluteDestPath = dest
@@ -43,17 +42,17 @@ async function handler(args) {
         const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, buildNumberToDownload);
         await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath));
         uiLogger.log(commands.project.download.logs.downloadSucceeded(buildNumberToDownload, projectName));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
-        if (e instanceof PromptExitError) {
-            process.exit(e.exitCode);
+        if (isPromptExitError(e)) {
+            throw e;
         }
         logError(e, new ApiErrorContext({
             accountId: derivedAccountId,
             request: 'project download',
         }));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectDownloadBuilder(yargs) {
@@ -89,7 +88,7 @@ const builder = makeYargsBuilder(projectDownloadBuilder, command, describe, {
 const projectDownloadCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-download', handler),
     builder,
 };
 export default projectDownloadCommand;

package/commands/project/info.js

@@ -1,26 +1,26 @@
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
-import { ApiErrorContext, debugError } from '../../lib/errorHandlers/index.js';
+import { debugError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { getProjectInfo, renderProjectInfo, } from '../../lib/projects/projectInfo.js';
+import { getProjectInfo, logProjectInfo, } from '../../lib/projects/projectInfo.js';
 const command = 'info';
 const describe = commands.project.info.describe;
+const verboseDescribe = commands.project.info.verboseDescribe;
 async function handler(args) {
-    const { derivedAccountId, formatOutputAsJson } = args;
-    trackCommandUsage('project-info', undefined, derivedAccountId);
+    const { derivedAccountId, formatOutputAsJson, exit } = args;
     const { projectConfig } = await getProjectConfig();
     if (!projectConfig) {
         uiLogger.error(commands.project.info.errors.noProjectConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!isV2Project(projectConfig.platformVersion)) {
         uiLogger.error(commands.project.info.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectName = projectConfig.name;
     let project;
@@ -29,30 +29,30 @@ async function handler(args) {
         project = response.data;
     }
     catch (error) {
-        debugError(error, new ApiErrorContext({
-            accountId: derivedAccountId,
-            request: 'fetch project',
-        }));
+        debugError(error);
         uiLogger.error(commands.project.info.errors.projectNotFound(projectName, derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const deployedBuild = project.deployedBuild;
     if (!deployedBuild) {
         uiLogger.error(commands.project.info.errors.noDeployedBuild);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectInfo = await getProjectInfo(project, projectConfig.platformVersion, derivedAccountId);
     if (formatOutputAsJson) {
         uiLogger.json(projectInfo);
         return;
     }
-    await renderProjectInfo(projectInfo);
+    logProjectInfo(projectInfo);
 }
 function projectInfoBuilder(yargs) {
-    yargs.example([['$0 project info']]);
+    yargs.example([
+        ['$0 project info', commands.project.info.examples.default],
+        ['$0 project info --json', commands.project.info.examples.json],
+    ]);
     return yargs;
 }
-const builder = makeYargsBuilder(projectInfoBuilder, command, describe, {
+const builder = makeYargsBuilder(projectInfoBuilder, command, verboseDescribe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
@@ -61,7 +61,7 @@ const builder = makeYargsBuilder(projectInfoBuilder, command, describe, {
 const projectInfoCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-info', handler),
     builder,
 };
 export default projectInfoCommand;

package/commands/project/installDeps.js

@@ -1,23 +1,23 @@
 import { installPackages, getProjectPackageJsonLocations, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'install-deps [packages..]';
 const describe = commands.project.installDeps.help.describe;
 async function handler(args) {
-    const { derivedAccountId, packages } = args;
+    const { packages, exit } = args;
     try {
-        trackCommandUsage('project-install-deps', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.installDeps.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
@@ -50,8 +50,11 @@ async function handler(args) {
         });
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectInstallDepsBuilder(yargs) {
@@ -74,7 +77,7 @@ const builder = makeYargsBuilder(projectInstallDepsBuilder, command, describe, {
 const projectInstallDepsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-install-deps', handler),
     builder,
 };
 export default projectInstallDepsCommand;

package/commands/project/lint.js

@@ -1,10 +1,11 @@
 import path from 'path';
 import { getProjectPackageJsonLocations, installPackages, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
@@ -13,13 +14,12 @@ import { areAllLintPackagesInstalled, getMissingLintPackages, lintPackages, disp
 const command = 'lint';
 const describe = commands.project.lint.help.describe;
 async function handler(args) {
-    const { derivedAccountId, installMissingDeps } = args;
+    const { installMissingDeps, exit } = args;
     try {
-        trackCommandUsage('project-lint', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.lint.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         SpinniesManager.init({ succeedColor: 'white' });
         SpinniesManager.add('lintCheck', {
@@ -129,7 +129,7 @@ async function handler(args) {
                 }
                 else {
                     uiLogger.error(commands.project.lint.eslintConfigRequired);
-                    return process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
             }
             SpinniesManager.add('lintRun', {
@@ -139,13 +139,16 @@ async function handler(args) {
             SpinniesManager.succeed('lintRun');
             displayLintResults(results);
             if (!success) {
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectLintBuilder(yargs) {
@@ -172,7 +175,7 @@ const builder = makeYargsBuilder(projectLintBuilder, command, describe, {
 const projectLintCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-lint', handler),
     builder,
 };
 export default projectLintCommand;

package/commands/project/list.js

@@ -1,4 +1,4 @@
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -9,14 +9,8 @@ import { renderTable } from '../../ui/render.js';
 const command = ['list', 'ls'];
 const describe = commands.project.list.describe;
 async function getProjectData(accountId) {
-    try {
-        const { data: projects } = await fetchProjects(accountId);
-        return projects.results;
-    }
-    catch (e) {
-        logError(e);
-        process.exit(EXIT_CODES.ERROR);
-    }
+    const { data: projects } = await fetchProjects(accountId);
+    return projects.results;
 }
 function formatProjectsAsTableRows(projects) {
     const projectListData = [];
@@ -29,12 +23,18 @@ function formatProjectsAsTableRows(projects) {
     return projectListData;
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('projects-list', undefined, derivedAccountId);
-    const projectData = await getProjectData(derivedAccountId);
+    const { derivedAccountId, exit } = args;
+    let projectData;
+    try {
+        projectData = await getProjectData(derivedAccountId);
+    }
+    catch (e) {
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
     if (projectData.length === 0) {
         uiLogger.error(commands.project.list.errors.noProjectsFound(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectListData = formatProjectsAsTableRows(projectData);
     const tableHeader = [
@@ -56,7 +56,7 @@ const builder = makeYargsBuilder(projectListBuilder, command, describe, {
 const projectListCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('projects-list', handler),
     builder,
 };
 export default projectListCommand;

package/commands/project/listBuilds.js

@@ -5,9 +5,9 @@ import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/con
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
@@ -58,8 +58,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     }
 }
 async function handler(args) {
-    const { project: projectFlagValue, limit, derivedAccountId } = args;
-    trackCommandUsage('project-list-builds', undefined, derivedAccountId);
+    const { project: projectFlagValue, limit, derivedAccountId, exit } = args;
     let projectName = projectFlagValue;
     if (!projectName) {
         const { projectConfig, projectDir } = await getProjectConfig();
@@ -68,7 +67,10 @@ async function handler(args) {
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
+        }
+        if (!projectConfig) {
+            return exit(EXIT_CODES.ERROR);
         }
         projectName = projectConfig.name;
     }
@@ -87,7 +89,7 @@ async function handler(args) {
             }));
         }
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectListBuildsBuilder(yargs) {
     yargs.options({
@@ -114,7 +116,7 @@ const builder = makeYargsBuilder(projectListBuildsBuilder, command, describe, {
 const projectListBuildsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-list-builds', handler),
     builder,
 };
 export default projectListBuildsCommand;