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

package/commands/cms/function/server.js

@@ -1,18 +1,25 @@
 import { uiLogger } from '../../../lib/ui/logger.js';
-// This package is not typed, so we need to use require
-import { start as startTestServer } from '@hubspot/serverless-dev-runtime';
 import { commands } from '../../../lang/en.js';
+import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { startServerlessDevRuntime } from '../../../lib/cms/serverlessDevRuntime.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'server <path>';
 const describe = undefined;
 async function handler(args) {
-    const { path: functionPath, derivedAccountId } = args;
+    const { path: functionPath, derivedAccountId, exit } = args;
     uiLogger.debug(commands.cms.subcommands.function.subcommands.server.debug.startingServer(functionPath));
-    startTestServer({
-        accountId: derivedAccountId,
-        ...args,
-    });
+    try {
+        await startServerlessDevRuntime({
+            accountId: derivedAccountId,
+            ...args,
+        });
+    }
+    catch (e) {
+        logError(e);
+        return exit(EXIT_CODES.ERROR);
+    }
 }
 function functionServerBuilder(yargs) {
     yargs.positional('path', {

package/commands/cms/theme/preview.js

@@ -35,7 +35,14 @@ function validateSrcPath(src) {
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await getProjectConfig();
+    let projectDir;
+    let projectConfig;
+    try {
+        ({ projectDir, projectConfig } = getProjectConfig());
+    }
+    catch {
+        // Not in a project (handled below)
+    }
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
         const previewPromptAnswers = await previewPrompt(args);

package/commands/getStarted.js

@@ -7,7 +7,7 @@ import { commands } from '../lang/en.js';
 import { GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, PROJECT_CONFIG_FILE, } from '../lib/constants.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { debugError, logError } from '../lib/errorHandlers/index.js';
-import { getProjectConfig, validateProjectConfig, writeProjectConfig, } from '../lib/projects/config.js';
+import { getProjectConfig, writeProjectConfig, ProjectConfigValidationError, } from '../lib/projects/config.js';
 import { handleProjectUpload } from '../lib/projects/upload.js';
 import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
@@ -20,7 +20,6 @@ import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDe
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
-import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
 import { openLink } from '../lib/links.js';
 import { runGetStartedV2 } from '../lib/getStarted/getStartedV2.js';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
@@ -98,10 +97,14 @@ async function handler(args) {
         uiLogger.log(commands.getStarted.logs.appSelected);
         const { dest, name } = await projectNameAndDestPrompt(args);
         const projectDest = path.resolve(getCwd(), dest);
-        const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
-        if (existingProjectConfig &&
-            existingProjectDir &&
-            projectDest.startsWith(existingProjectDir)) {
+        let existingProjectDir;
+        try {
+            existingProjectDir = getProjectConfig(projectDest).projectDir;
+        }
+        catch {
+            // Not in a project directory
+        }
+        if (existingProjectDir && projectDest.startsWith(existingProjectDir)) {
             // Track nested project error
             await trackCommandMetadataUsage('get-started', {
                 successful: false,
@@ -167,29 +170,21 @@ async function handler(args) {
         if (shouldUpload) {
             try {
                 // Get the project config for the newly created project
-                const { projectConfig: newProjectConfig, projectDir: newProjectDir } = await getProjectConfig(projectDest);
-                if (!newProjectConfig || !newProjectDir) {
-                    // Track config file not found error
-                    await trackCommandMetadataUsage('get-started', {
-                        successful: false,
-                        step: 'config-file-not-found',
-                    }, derivedAccountId);
-                    uiLogger.log(' ');
-                    uiLogger.error(commands.getStarted.errors.configFileNotFound);
-                    return exit(EXIT_CODES.ERROR);
-                }
+                let newProjectConfig;
+                let newProjectDir;
                 try {
-                    validateProjectConfig(newProjectConfig, newProjectDir);
+                    ({ projectConfig: newProjectConfig, projectDir: newProjectDir } =
+                        getProjectConfig(projectDest));
                 }
                 catch (error) {
-                    if (error instanceof ProjectValidationError) {
+                    if (error instanceof ProjectConfigValidationError) {
                         // Track validation error
                         await trackCommandMetadataUsage('get-started', {
                             successful: false,
                             step: 'project-validation-failed',
                         }, derivedAccountId);
                         uiLogger.log(' ');
-                        uiLogger.error(error.message);
+                        uiLogger.error(error.message || commands.getStarted.errors.configFileNotFound);
                         return exit(EXIT_CODES.ERROR);
                     }
                     throw error;

package/commands/project/add.js

@@ -1,5 +1,5 @@
 import { logError } from '../../lib/errorHandlers/index.js';
-import { getProjectConfig } from '../../lib/projects/config.js';
+import { getIsInProject, getProjectConfig } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
@@ -14,12 +14,13 @@ const command = 'add';
 const describe = commands.project.add.describe;
 async function handler(args) {
     const { derivedAccountId, exit } = args;
+    const isInProjectDir = getIsInProject();
+    if (!isInProjectDir) {
+        uiLogger.error(commands.project.add.error.locationInProject);
+        return exit(EXIT_CODES.ERROR);
+    }
     try {
-        const { projectConfig, projectDir } = await getProjectConfig();
-        if (!projectDir || !projectConfig) {
-            uiLogger.error(commands.project.add.error.locationInProject);
-            return exit(EXIT_CODES.ERROR);
-        }
+        const { projectConfig, projectDir } = getProjectConfig();
         const isLegacyProjectCreate = isLegacyProject(projectConfig.platformVersion);
         if (!isLegacyProjectCreate) {
             await v2AddComponent(args, projectDir, projectConfig, derivedAccountId);

package/commands/project/appInstallStatus.js

@@ -18,9 +18,13 @@ const command = 'app-install-status';
 const describe = commands.project.installStatus.describe;
 async function handler(args) {
     const { derivedAccountId, formatOutputAsJson, exit, addJsonOutput } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.installStatus.errors.noProjectConfig);
+    let projectConfig;
+    let projectDir;
+    try {
+        ({ projectConfig, projectDir } = getProjectConfig());
+    }
+    catch (error) {
+        logError(error);
         return exit(EXIT_CODES.ERROR);
     }
     if (isLegacyProject(projectConfig.platformVersion)) {

package/commands/project/create.js

@@ -51,13 +51,16 @@ async function handler(args) {
                 .join(','),
     });
     const projectDest = path.resolve(getCwd(), projectNameAndDestPromptResponse.dest);
-    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
     // Exit if the target destination is within an existing project
-    if (existingProjectConfig &&
-        existingProjectDir &&
-        projectDest.startsWith(existingProjectDir)) {
-        uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
-        return exit(EXIT_CODES.ERROR);
+    try {
+        const { projectDir: existingProjectDir } = getProjectConfig(projectDest);
+        if (projectDest.startsWith(existingProjectDir)) {
+            uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    catch {
+        // Not in a project directory, which is the expected case for create
     }
     const components = generateComponentPaths({
         selectProjectTemplatePromptResponse,

package/commands/project/deploy.js

@@ -3,7 +3,7 @@ import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
 import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
@@ -25,22 +25,24 @@ async function handler(args) {
     const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     let targetAccountId;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let loadedConfig;
     let isInProjectDirectory = false;
-    // Validate project config, but it's valid to run this command from outside a project dir
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        loadedConfig = getProjectConfig();
         isInProjectDirectory = true;
     }
-    catch (e) { }
+    catch (e) {
+        // Do nothing, it's valid to run this command from outside a project dir
+    }
     if (isInProjectDirectory &&
-        !isLegacyProject(projectConfig?.platformVersion)) {
+        loadedConfig &&
+        !isLegacyProject(loadedConfig.projectConfig.platformVersion)) {
         try {
-            const profileName = await projectProfilePrompt(projectDir, projectConfig, profileOption, !!useEnvOption);
+            const profileName = await projectProfilePrompt(loadedConfig.projectDir, loadedConfig.projectConfig, profileOption, !!useEnvOption);
             if (profileName) {
                 // Use loadProfile instead of loadAndValidateProfile because the local
                 // profile does not need to be valid to successfully deploy
-                const profile = loadProfile(projectConfig, projectDir, profileName);
+                const profile = loadProfile(loadedConfig.projectConfig, loadedConfig.projectDir, profileName);
                 targetAccountId = profile.accountId;
                 uiLogger.log(commands.project.deploy.profileMessage(profileName, targetAccountId));
                 uiLogger.log('');
@@ -58,8 +60,8 @@ async function handler(args) {
         addUsageMetadata({ type: accountType });
     }
     let projectName = projectOption;
-    if (!projectOption && projectConfig) {
-        projectName = projectConfig.name;
+    if (!projectOption && loadedConfig) {
+        projectName = loadedConfig.projectConfig.name;
     }
     const namePromptResponse = await projectNamePrompt(targetAccountId, {
         project: projectName,
@@ -116,7 +118,7 @@ async function handler(args) {
         catch {
             return exit(EXIT_CODES.ERROR);
         }
-        const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, isLegacyProject(projectConfig?.platformVersion), forceOption);
+        const deployResult = await handleProjectDeploy(targetAccountId, projectName, buildIdToDeploy, isLegacyProject(loadedConfig?.projectConfig.platformVersion), forceOption);
         if (!deployResult) {
             return exit(EXIT_CODES.ERROR);
         }

package/commands/project/dev/index.js

@@ -1,5 +1,5 @@
 import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
 import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
@@ -17,18 +17,15 @@ const command = 'dev';
 const describe = commands.project.dev.describe;
 async function handler(args) {
     const { derivedAccountId, testingAccount, projectAccount, profile: profileOption, exit, addUsageMetadata, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
         return exit(EXIT_CODES.ERROR);
     }
-    if (!projectDir) {
-        uiLogger.error(commands.project.dev.errors.noProjectConfig);
-        return exit(EXIT_CODES.ERROR);
-    }
     if (isLegacyProject(projectConfig.platformVersion)) {
         uiLogger.error(commands.project.dev.errors.unsupportedPlatformVersion(projectConfig.platformVersion));
         return exit(EXIT_CODES.ERROR);
@@ -110,6 +107,11 @@ function projectDevBuilder(yargs) {
         description: commands.project.dev.options.port,
         default: LOCAL_DEV_DEFAULT_PORT,
     });
+    yargs.option('auto-upload', {
+        type: 'boolean',
+        description: commands.project.dev.options.autoUpload,
+        default: false,
+    });
     yargs.example([['$0 project dev', commands.project.dev.examples.default]]);
     yargs.conflicts('profile', 'testing-account');
     yargs.conflicts('profile', 'project-account');

package/commands/project/dev/unifiedFlow.js

@@ -155,6 +155,13 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         noLogs: true,
     });
     let project = uploadedProject;
+    // Fail fast before the slower project checks below.
+    const autoDeployEnabled = (project?.deployedBuild ?? project?.latestBuild)?.isAutoDeployEnabled ??
+        true;
+    if (args.autoUpload && !autoDeployEnabled) {
+        uiLogger.error(commands.project.dev.errors.autoUploadRequiresAutoDeploy);
+        return exit(EXIT_CODES.ERROR);
+    }
     if (projectExists && project) {
         await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, exit, args.profile);
     }
@@ -189,6 +196,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         projectData: project,
         env,
         actions: { exit },
+        autoUploadEnabled: Boolean(args.autoUpload) && autoDeployEnabled,
     });
     const websocketServer = new LocalDevWebsocketServer(localDevProcess, args.debug);
     const watcher = new LocalDevWatcher(localDevProcess);

package/commands/project/download.js

@@ -4,7 +4,7 @@ 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 { isPromptExitError } from '../../lib/errors/PromptExitError.js';
-import { getProjectConfig } from '../../lib/projects/config.js';
+import { getIsInProject } 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';
@@ -15,8 +15,8 @@ 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) {
+    const isInProjectDir = getIsInProject();
+    if (isInProjectDir) {
         uiLogger.error(commands.project.download.warnings.cannotDownloadWithinProject);
         return exit(EXIT_CODES.ERROR);
     }

package/commands/project/info.js

@@ -1,7 +1,7 @@
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
-import { debugError } from '../../lib/errorHandlers/index.js';
+import { debugError, logError } 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';
@@ -14,9 +14,12 @@ const describe = commands.project.info.describe;
 const verboseDescribe = commands.project.info.verboseDescribe;
 async function handler(args) {
     const { derivedAccountId, formatOutputAsJson, exit, addJsonOutput } = args;
-    const { projectConfig } = await getProjectConfig();
-    if (!projectConfig) {
-        uiLogger.error(commands.project.info.errors.noProjectConfig);
+    let projectConfig;
+    try {
+        ({ projectConfig } = getProjectConfig());
+    }
+    catch (error) {
+        logError(error);
         return exit(EXIT_CODES.ERROR);
     }
     if (isLegacyProject(projectConfig.platformVersion)) {

package/commands/project/installApp.js

@@ -4,6 +4,7 @@ import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler
 import { InstallAppSchema, } from '../../lib/jsonOutput.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { commands } from '../../lang/en.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
@@ -15,9 +16,13 @@ const describe = commands.project.installApp.describe;
 const verboseDescribe = commands.project.installApp.verboseDescribe;
 async function handler(args) {
     const { derivedAccountId, formatOutputAsJson, force, profile: profileOption, useEnv: useEnvOption, exit, addJsonOutput, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.installApp.errors.noProjectConfig);
+    let projectConfig;
+    let projectDir;
+    try {
+        ({ projectConfig, projectDir } = getProjectConfig());
+    }
+    catch (error) {
+        logError(error);
         return exit(EXIT_CODES.ERROR);
     }
     if (isLegacyProject(projectConfig.platformVersion)) {

package/commands/project/installDeps.js

@@ -5,7 +5,6 @@ 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 { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -15,12 +14,14 @@ const describe = commands.project.installDeps.help.describe;
 async function handler(args) {
     const { packages, exit } = args;
     try {
-        const projectConfig = await getProjectConfig();
-        if (!projectConfig || !projectConfig.projectDir) {
-            uiLogger.error(commands.project.installDeps.noProjectConfig);
+        let projectDir;
+        try {
+            ({ projectDir } = getProjectConfig());
+        }
+        catch (error) {
+            logError(error);
             return exit(EXIT_CODES.ERROR);
         }
-        const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
         if (packages) {
             const { selectedInstallLocations } = await promptUser([

package/commands/project/lint.js

@@ -17,16 +17,23 @@ const describe = commands.project.lint.help.describe;
 async function handler(args) {
     const { installMissingDeps, exit } = args;
     try {
-        const projectConfig = await getProjectConfig();
-        if (!projectConfig || !projectConfig.projectDir) {
-            uiLogger.error(commands.project.lint.noProjectConfig);
+        let projectConfig;
+        let projectDir;
+        try {
+            ({ projectConfig, projectDir } = getProjectConfig());
+        }
+        catch (error) {
+            logError(error);
             return exit(EXIT_CODES.ERROR);
         }
         SpinniesManager.init({ succeedColor: 'white' });
         SpinniesManager.add('lintCheck', {
             text: commands.project.lint.loading.checking,
         });
-        const lintLocations = await getUieLintablePackageJsonLocations(projectConfig);
+        const lintLocations = await getUieLintablePackageJsonLocations({
+            projectConfig,
+            projectDir,
+        });
         const locationsReadyToLint = [];
         const locationsNeedingPackages = new Map();
         let skippedDirectoryCount = 0;
@@ -44,7 +51,7 @@ async function handler(args) {
         SpinniesManager.succeed('lintCheck');
         if (locationsNeedingPackages.size > 0) {
             const locationsArray = Array.from(locationsNeedingPackages.keys());
-            const relativeLocations = locationsArray.map(loc => path.relative(projectConfig.projectDir, loc));
+            const relativeLocations = locationsArray.map(loc => path.relative(projectDir, loc));
             const allMissingPackages = [];
             for (const packages of locationsNeedingPackages.values()) {
                 allMissingPackages.push(...packages);
@@ -94,7 +101,7 @@ async function handler(args) {
                 const hasModernConfig = hasEslintConfig(location);
                 const hasDeprecatedConfig = hasDeprecatedEslintConfig(location);
                 if (hasDeprecatedConfig) {
-                    const relativePath = path.relative(projectConfig.projectDir, location);
+                    const relativePath = path.relative(projectDir, location);
                     const deprecatedFiles = getDeprecatedEslintConfigFiles(location);
                     deprecatedConfigDetails.push({
                         path: relativePath,
@@ -110,7 +117,7 @@ async function handler(args) {
                 uiLogger.warn(commands.project.lint.deprecatedEslintConfigWarning(deprecatedConfigDetails));
             }
             if (locationsNeedingConfig.length > 0) {
-                const relativeLocations = locationsNeedingConfig.map(loc => path.relative(projectConfig.projectDir, loc));
+                const relativeLocations = locationsNeedingConfig.map(loc => path.relative(projectDir, loc));
                 const { shouldCreateConfig } = await promptUser([
                     {
                         name: 'shouldCreateConfig',
@@ -123,7 +130,7 @@ async function handler(args) {
                     SpinniesManager.add('lintConfigCreate', {
                         text: commands.project.lint.loading.creatingConfig,
                     });
-                    const platformVersion = projectConfig.projectConfig?.platformVersion ?? null;
+                    const platformVersion = projectConfig.platformVersion ?? null;
                     const createdConfigs = [];
                     for (const location of locationsNeedingConfig) {
                         const configPath = await createEslintConfig(location, platformVersion);
@@ -159,7 +166,7 @@ async function handler(args) {
             SpinniesManager.add('lintRun', {
                 text: commands.project.lint.loading.linting,
             });
-            const { success, results } = await lintPackages(locationsReadyToLint, projectConfig.projectDir);
+            const { success, results } = await lintPackages(locationsReadyToLint, projectDir);
             SpinniesManager.succeed('lintRun');
             displayLintResults(results);
             if (!success) {

package/commands/project/listBuilds.d.ts

@@ -1,5 +1,6 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
-export type ProjectListBuildsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+import { ProjectBuildsListJsonOutput } from '../../lib/jsonOutput.js';
+export type ProjectListBuildsArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<ProjectBuildsListJsonOutput> & {
     project?: string;
     limit?: number;
 };

package/commands/project/listBuilds.js

@@ -1,10 +1,11 @@
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { fetchProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { uiLink } from '../../lib/ui/index.js';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
@@ -12,6 +13,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { renderTable } from '../../ui/render.js';
+import { ProjectBuildsListSchema, mapBuildToJsonOutput, } from '../../lib/jsonOutput.js';
 const command = 'list-builds';
 const describe = commands.project.listBuilds.describe;
 async function fetchAndDisplayBuilds(accountId, project, options) {
@@ -40,7 +42,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
         });
         renderTable(['Build ID', 'Status', 'Completed', 'Duration', 'Details'], builds);
     }
-    if (options && options.after) {
+    if (options.after) {
         if (results.length > 0) {
             uiLogger.log(commands.project.listBuilds.showingNextBuilds(results.length, project.name));
         }
@@ -48,7 +50,8 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     else {
         uiLogger.log(commands.project.listBuilds.showingRecentBuilds(results.length, project.name, uiLink(commands.project.listBuilds.viewAllBuildsLink, getProjectDetailUrl(project.name, accountId))));
     }
-    if (paging && paging.next) {
+    const canPromptForMore = options.limit === undefined && Boolean(process.stdin.isTTY);
+    if (paging?.next?.after && canPromptForMore) {
         await promptUser({
             name: 'more',
             message: commands.project.listBuilds.continueOrExitPrompt,
@@ -60,27 +63,39 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     }
 }
 async function handler(args) {
-    const { project: projectFlagValue, limit, derivedAccountId, exit } = args;
+    const { project: projectFlagValue, limit, derivedAccountId, exit, json: formatOutputAsJson, addJsonOutput, } = args;
     let projectName = projectFlagValue;
     if (!projectName) {
-        const { projectConfig, projectDir } = await getProjectConfig();
         try {
-            validateProjectConfig(projectConfig, projectDir);
+            const { projectConfig } = getProjectConfig();
+            projectName = projectConfig.name;
         }
         catch (error) {
             logError(error);
             return exit(EXIT_CODES.ERROR);
         }
-        if (!projectConfig) {
-            return exit(EXIT_CODES.ERROR);
-        }
-        projectName = projectConfig.name;
     }
     try {
         const { data: project } = await fetchProject(derivedAccountId, projectName);
-        await fetchAndDisplayBuilds(derivedAccountId, project, { limit });
+        if (formatOutputAsJson) {
+            const { data: { results, paging }, } = await fetchProjectBuilds(derivedAccountId, project.name, { limit });
+            addJsonOutput({
+                projectName: project.name,
+                deployedBuildId: project.deployedBuildId,
+                results: results.map(build => mapBuildToJsonOutput(build, project.deployedBuildId)),
+                paging: paging?.next?.after
+                    ? { next: { after: paging.next.after } }
+                    : undefined,
+            });
+        }
+        else {
+            await fetchAndDisplayBuilds(derivedAccountId, project, { limit });
+        }
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            return exit(e.exitCode);
+        }
         if (isHubSpotHttpError(e) && e.status === 404) {
             uiLogger.error(commands.project.listBuilds.errors.projectNotFound(projectName));
         }
@@ -90,6 +105,7 @@ async function handler(args) {
                 projectName,
             }));
         }
+        return exit(EXIT_CODES.ERROR);
     }
     return exit(EXIT_CODES.SUCCESS);
 }
@@ -101,11 +117,19 @@ function projectListBuildsBuilder(yargs) {
         },
         limit: {
             describe: commands.project.listBuilds.options.limit.describe,
-            type: 'string',
+            type: 'number',
         },
     });
     yargs.example([
         ['$0 project list-builds', commands.project.listBuilds.examples.default],
+        [
+            '$0 project list-builds --limit=5',
+            commands.project.listBuilds.examples.withLimit,
+        ],
+        [
+            '$0 project list-builds --json',
+            commands.project.listBuilds.examples.json,
+        ],
     ]);
     return yargs;
 }
@@ -114,11 +138,14 @@ const builder = makeYargsBuilder(projectListBuildsBuilder, command, describe, {
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
 });
 const projectListBuildsCommand = {
     command,
     describe,
-    handler: makeWrappedYargsHandler('project-list-builds', handler),
+    handler: makeWrappedYargsHandler('project-list-builds', handler, {
+        jsonOutputSchema: ProjectBuildsListSchema,
+    }),
     builder,
 };
 export default projectListBuildsCommand;