@hubspot/cli 7.7.16-experimental.0 → 7.7.16-experimental.10

package/commands/init.js

@@ -13,13 +13,11 @@ const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const commonOpts_1 = require("../lib/commonOpts");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const process_1 = require("../lib/process");
 const index_1 = require("../lib/errorHandlers/index");
-const lang_1 = require("../lib/lang");
 const usageTracking_1 = require("../lib/usageTracking");
 const promptUtils_1 = require("../lib/prompts/promptUtils");
 const personalAccessKeyPrompt_1 = require("../lib/prompts/personalAccessKeyPrompt");
@@ -27,6 +25,9 @@ const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
 const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
+const logger_1 = require("../lib/ui/logger");
+const en_1 = require("../lang/en");
+const parsing_1 = require("../lib/parsing");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -61,9 +62,19 @@ const AUTH_TYPE_NAMES = {
     [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
 };
 const command = 'init';
-const describe = (0, lang_1.i18n)(`commands.init.describe`);
+const describe = en_1.commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, useHiddenConfig, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = (0, parsing_1.parseStringToNumber)(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.init.errors.invalidAccountIdProvided);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     const configPath = (configFlagValue && path_1.default.join((0, path_2.getCwd)(), configFlagValue)) ||
@@ -76,28 +87,24 @@ async function handler(args) {
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
     if ((0, config_1.configFileExists)(true)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
-            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.globalConfigFileExists);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
+        logger_1.uiLogger.error(en_1.commands.init.errors.configFileExists(configPath));
+        logger_1.uiLogger.info(en_1.commands.init.logs.updateConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
-        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
     const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
         const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.bothConfigFilesNotAllowed(path));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     (0, config_1.createEmptyConfigFile)({ path: configPath }, useHiddenConfig);
     //Needed to load deprecated config
     (0, config_1.loadConfig)(configPath, args);
@@ -106,7 +113,7 @@ async function handler(args) {
         let accountId;
         let name;
         if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, providedAccountId);
+            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, parsedUserProvidedAccountId);
             if (personalAccessKeyResult) {
                 accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(personalAccessKeyResult);
                 name = personalAccessKeyResult.name;
@@ -124,15 +131,15 @@ async function handler(args) {
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
-            authType: AUTH_TYPE_NAMES[authType],
-            account: name || accountId,
-        }));
-        (0, ui_1.uiFeatureHighlight)(['helpCommand', 'authCommand', 'accountsListCommand']);
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileCreated(configPath));
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileUpdated(AUTH_TYPE_NAMES[authType], name || accountId));
+        (0, ui_1.uiFeatureHighlight)([
+            'getStartedCommand',
+            'helpCommand',
+            'authCommand',
+            'accountsListCommand',
+        ]);
         if (!disableTracking) {
             await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.COMPLETE, accountId);
         }
@@ -141,7 +148,7 @@ async function handler(args) {
     catch (err) {
         (0, index_1.logError)(err);
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, providedAccountId);
+            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
@@ -149,7 +156,7 @@ async function handler(args) {
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
+            describe: en_1.commands.init.options.authType.describe,
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -158,7 +165,7 @@ function initBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`commands.init.options.account.describe`),
+            describe: en_1.commands.init.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -171,11 +178,7 @@ function initBuilder(yargs) {
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
-    command: (0, ui_1.uiCommandReference)('hs auth'),
-    configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, en_1.commands.init.verboseDescribe(config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, (0, ui_1.uiCommandReference)('hs auth'), auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,

package/commands/mcp/setup.d.ts

@@ -1,5 +1,5 @@
-import { YargsCommandModule } from '../../types/Yargs';
-interface MCPSetupArgs {
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+interface MCPSetupArgs extends CommonArgs {
     client?: string[];
     addDocsSearch?: boolean;
 }

package/commands/mcp/setup.js

@@ -5,6 +5,7 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 const en_1 = require("../../lang/en");
 const logger_1 = require("../../lib/ui/logger");
 const setup_1 = require("../../lib/mcp/setup");
+const usageTracking_1 = require("../../lib/usageTracking");
 const command = ['setup', 'update'];
 const describe = undefined; // Leave hidden for now
 async function handler(args) {
@@ -15,6 +16,7 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.mcp.setup.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    (0, usageTracking_1.trackCommandUsage)('mcp-setup', {}, args.derivedAccountId);
     try {
         const derivedTargets = await (0, setup_1.addMcpServerToConfig)(args.client);
         if (args.addDocsSearch) {

package/commands/mcp/start.d.ts

@@ -1,3 +1,3 @@
-import { YargsCommandModule } from '../../types/Yargs';
-declare const mcpStartCommand: YargsCommandModule<unknown, unknown>;
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+declare const mcpStartCommand: YargsCommandModule<unknown, CommonArgs>;
 export default mcpStartCommand;

package/commands/mcp/start.js

@@ -12,9 +12,10 @@ const logger_1 = require("../../lib/ui/logger");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const en_1 = require("../../lang/en");
 const process_1 = require("../../lib/process");
+const usageTracking_1 = require("../../lib/usageTracking");
 const command = 'start';
 const describe = undefined; // Leave hidden for now
-async function handler() {
+async function handler(args) {
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
     }
@@ -22,6 +23,7 @@ async function handler() {
         logger_1.uiLogger.error(en_1.commands.mcp.start.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    (0, usageTracking_1.trackCommandUsage)('mcp-start', {}, args.derivedAccountId);
     await startMcpServer();
 }
 async function startMcpServer() {

package/commands/project/cloneApp.js

@@ -8,7 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const selectPublicAppForMigrationPrompt_1 = require("../../lib/prompts/selectPublicAppForMigrationPrompt");
-const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
+const projectNameAndDestPrompt_1 = require("../../lib/prompts/projectNameAndDestPrompt");
 const polling_1 = require("../../lib/polling");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
@@ -53,9 +53,9 @@ async function handler(args) {
             });
             appId = appIdResponse.appId;
         }
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args);
-        projectName = createProjectPromptResponse.name;
-        projectDest = createProjectPromptResponse.dest;
+        const projectNameAndDestPromptResponse = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(args);
+        projectName = projectNameAndDestPromptResponse.name;
+        projectDest = projectNameAndDestPromptResponse.dest;
     }
     catch (error) {
         (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));

package/commands/project/create.js

@@ -39,15 +39,15 @@ async function handler(args) {
         (0, errorHandlers_1.logError)(error);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const { authType, distribution, repoConfig, projectContents, createProjectPromptResponse, } = handleResult;
+    const { authType, distribution, repoConfig, projectContents, selectProjectTemplatePromptResponse, projectNameAndDestPromptResponse, } = handleResult;
     (0, usageTracking_1.trackCommandUsage)('project-create', {
-        type: createProjectPromptResponse.projectTemplate?.name ||
-            (createProjectPromptResponse.componentTemplates || [])
+        type: selectProjectTemplatePromptResponse.projectTemplate?.name ||
+            (selectProjectTemplatePromptResponse.componentTemplates || [])
                 // @ts-expect-error
                 .map((item) => item.label)
                 .join(','),
     }, derivedAccountId);
-    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), createProjectPromptResponse.dest);
+    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), projectNameAndDestPromptResponse.dest);
     const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await (0, config_1.getProjectConfig)(projectDest);
     // Exit if the target destination is within an existing project
     if (existingProjectConfig &&
@@ -57,7 +57,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const components = (0, v3_2.generateComponentPaths)({
-        createProjectPromptResponse,
+        selectProjectTemplatePromptResponse,
         platformVersion,
         repoConfig,
         projectContents,
@@ -66,7 +66,7 @@ async function handler(args) {
     });
     try {
         await (0, github_1.cloneGithubRepo)(repo, projectDest, {
-            sourceDir: createProjectPromptResponse.projectTemplate?.path || components,
+            sourceDir: selectProjectTemplatePromptResponse.projectTemplate?.path || components,
             hideLogs: true,
             branch: 'main',
         });
@@ -80,15 +80,15 @@ async function handler(args) {
     const parsedConfigFile = JSON.parse(fs_extra_1.default.readFileSync(projectConfigPath).toString());
     (0, config_1.writeProjectConfig)(projectConfigPath, {
         ...parsedConfigFile,
-        name: createProjectPromptResponse.name,
+        name: projectNameAndDestPromptResponse.name,
     });
     // If the template is 'no-template', we need to manually create a src directory
-    if (createProjectPromptResponse.projectTemplate?.name ===
+    if (selectProjectTemplatePromptResponse.projectTemplate?.name ===
         legacy_1.EMPTY_PROJECT_TEMPLATE_NAME ||
         projectContents === v3_1.EMPTY_PROJECT) {
         fs_extra_1.default.ensureDirSync(path_1.default.join(projectDest, 'src'));
     }
-    logger_1.uiLogger.success(en_1.commands.project.create.logs.success(createProjectPromptResponse.name, projectDest));
+    logger_1.uiLogger.success(en_1.commands.project.create.logs.success(projectNameAndDestPromptResponse.name, projectDest));
     logger_1.uiLogger.log(en_1.commands.project.create.logs.welcomeMessage);
     (0, ui_1.uiFeatureHighlight)([
         'projectCommandTip',

package/commands/project/deploy.d.ts

@@ -4,6 +4,7 @@ export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & Environm
     build?: number;
     buildId?: number;
     profile?: string;
+    force: boolean;
 };
 declare const projectDeployCommand: YargsCommandModule<unknown, ProjectDeployArgs>;
 export default projectDeployCommand;

package/commands/project/deploy.js

@@ -22,6 +22,7 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const projectProfiles_1 = require("../../lib/projectProfiles");
+const constants_1 = require("../../lib/constants");
 const command = 'deploy';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
 function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
@@ -40,8 +41,22 @@ function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, a
     }
     return true;
 }
+function logDeployErrors(errorData) {
+    logger_1.logger.error(errorData.message);
+    errorData.errors.forEach(err => {
+        if (err.subCategory === constants_1.PROJECT_ERROR_TYPES.DEPLOY_CONTAINS_REMOVALS) {
+            logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deployContainsRemovals`, {
+                componentName: err.context.COMPONENT_NAME,
+                forceFlag: (0, ui_2.uiCommandReference)('--force'),
+            }));
+        }
+        else {
+            logger_1.logger.log(err.message);
+        }
+    });
+}
 async function handler(args) {
-    const { derivedAccountId, project: projectOption, buildId: buildIdOption, } = args;
+    const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     let targetAccountId;
@@ -103,7 +118,7 @@ async function handler(args) {
             logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuildId`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await (0, projects_1.deployProject)(targetAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
+        const { data: deployResp } = await (0, projects_1.deployProject)(targetAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion), forceOption);
         if (!deployResp) {
             logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deploy`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -119,7 +134,12 @@ async function handler(args) {
             }));
         }
         else if ((0, index_1.isHubSpotHttpError)(e) && e.status === 400) {
-            logger_1.logger.error(e.message);
+            if (e.data?.message && e.data?.errors) {
+                logDeployErrors(e.data);
+            }
+            else {
+                logger_1.logger.error(e.message);
+            }
         }
         else {
             (0, index_2.logError)(e, new index_2.ApiErrorContext({
@@ -147,6 +167,12 @@ function projectDeployBuilder(yargs) {
             type: 'string',
             hidden: true,
         },
+        force: {
+            alias: ['f'],
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.force.describe`),
+            default: false,
+            type: 'boolean',
+        },
     });
     yargs.conflicts('profile', 'project');
     yargs.conflicts('profile', 'account');

package/commands/project/dev/deprecatedFlow.js

@@ -19,7 +19,7 @@ const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
 async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
-    const { providedAccountId, derivedAccountId } = args;
+    const { userProvidedAccount, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
     const components = await (0, structure_1.findProjectComponents)(projectDir);
     const runnableComponents = components.filter(component => component.runnable);
@@ -65,11 +65,11 @@ async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projec
     }
     // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
     // By setting them to null, we can later check if they need to be assigned based on the default account configuration and the type of app.
-    let targetProjectAccountId = providedAccountId ? derivedAccountId : null;
+    let targetProjectAccountId = userProvidedAccount ? derivedAccountId : null;
     // The account that we are locally testing against
-    let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
+    let targetTestingAccountId = userProvidedAccount ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
-    if (providedAccountId) {
+    if (userProvidedAccount) {
         (0, helpers_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId || null;

package/commands/project/dev/index.js

@@ -15,19 +15,19 @@ const en_1 = require("../../../lang/en");
 const logger_1 = require("../../../lib/ui/logger");
 const command = 'dev';
 const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.dev.describe, false);
-function validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3) {
+function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3) {
     // Legacy projects do not support targetTestingAccount and targetProjectAccount
     if (testingAccount && projectAccount && !useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagLegacy);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    if (providedAccountId && useV3) {
+    if (userProvidedAccount && useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagV3);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
 async function handler(args) {
-    const { derivedAccountId, providedAccountId, testingAccount, projectAccount, } = args;
+    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
     const useV3 = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
@@ -35,9 +35,9 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.noProjectConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3);
+    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3);
     let targetProjectAccountId = (projectAccount && (0, config_1.getAccountId)(projectAccount)) ||
-        (providedAccountId && derivedAccountId);
+        (userProvidedAccount && derivedAccountId);
     let profile;
     if (!targetProjectAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         if (args.profile) {

package/commands/project/dev/unifiedFlow.js

@@ -58,6 +58,7 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
     }
     const accounts = (0, config_2.getConfigAccounts)();
     const accountIsCombined = await (0, accountTypes_1.isUnifiedAccount)(targetProjectAccountConfig);
+    const targetProjectAccountIsTestAccountOrSandbox = (0, accountTypes_1.isTestAccountOrSandbox)(targetProjectAccountConfig);
     if (!accountIsCombined && !profileConfig) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.accountNotCombined);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -67,6 +68,12 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
         // Bypass the prompt for the testing account if the user has a profile configured
         targetTestingAccountId = profileConfig.accountId;
     }
+    else if (
+    // Bypass the prompt for the testing account if default account is already a test account
+    !targetTestingAccountId &&
+        targetProjectAccountIsTestAccountOrSandbox) {
+        targetTestingAccountId = targetProjectAccountId;
+    }
     else if (!targetTestingAccountId) {
         logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
@@ -121,6 +128,7 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
         debug: args.debug,
         deployedBuild,
         isGithubLinked,
+        profile: args.profile,
         targetProjectAccountId,
         targetTestingAccountId: targetTestingAccountId,
         projectConfig,

package/commands/project/upload.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
-type ProjectUploadArgs = CommonArgs & {
+import { CommonArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectUploadArgs = CommonArgs & JSONOutputArgs & {
     forceCreate: boolean;
     message: string;
     m: string;

package/commands/project/upload.js

@@ -13,40 +13,26 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const config_2 = require("../../lib/projects/config");
 const ui_2 = require("../../lib/projects/ui");
 const upload_1 = require("../../lib/projects/upload");
+const projectProfiles_1 = require("../../lib/projectProfiles");
 const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
 const lang_1 = require("../../lib/lang");
 const constants_1 = require("../../lib/constants");
 const index_2 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const projectProfiles_1 = require("../../lib/projectProfiles");
+const logger_2 = require("../../lib/ui/logger");
 const command = 'upload';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.upload.describe`), false);
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, providedAccountId, skipValidation, } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
+    const jsonOutput = {};
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
-    let targetAccountId = providedAccountId;
-    if (!targetAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
-        if (args.profile) {
-            (0, projectProfiles_1.logProfileHeader)(args.profile);
-            const profile = (0, projectProfiles_1.loadProfile)(projectConfig, projectDir, args.profile);
-            if (!profile) {
-                (0, ui_1.uiLine)();
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
-            }
-            targetAccountId = profile.accountId;
-            (0, projectProfiles_1.logProfileFooter)(profile, true);
-        }
-        else {
-            // A profile must be specified if this project has profiles configured
-            await (0, projectProfiles_1.exitIfUsingProfiles)(projectConfig, projectDir);
-        }
-    }
-    if (!targetAccountId) {
-        // The user is not using profiles, so we can use the derived accountId
-        targetAccountId = derivedAccountId;
+    let targetAccountId;
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        targetAccountId = await (0, projectProfiles_1.loadAndValidateProfile)(projectConfig, projectDir, profile);
     }
+    targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = (0, config_1.getAccountConfig)(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     (0, usageTracking_1.trackCommandUsage)('project-upload', { type: accountType }, targetAccountId);
@@ -88,7 +74,12 @@ async function handler(args) {
             }));
             (0, ui_2.logFeedbackMessage)(result.buildId);
             await (0, buildAndDeploy_2.displayWarnLogs)(targetAccountId, projectConfig.name, result.buildId);
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        if (result && result.succeeded && formatOutputAsJson) {
+            jsonOutput.buildId = result.buildId;
+            if (result.deployResult) {
+                jsonOutput.deployId = result.deployResult.deployId;
+            }
         }
     }
     catch (e) {
@@ -98,6 +89,9 @@ async function handler(args) {
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    if (formatOutputAsJson) {
+        logger_2.uiLogger.json(jsonOutput);
+    }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function projectUploadBuilder(yargs) {
@@ -139,6 +133,7 @@ const builder = (0, yargsUtils_1.makeYargsBuilder)(projectUploadBuilder, command
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
 });
 const projectUploadCommand = {
     command,

package/commands/project/validate.d.ts

@@ -0,0 +1,6 @@
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectValidateArgs = CommonArgs & {
+    profile?: string;
+};
+declare const projectValidateCommand: YargsCommandModule<unknown, ProjectValidateArgs>;
+export default projectValidateCommand;

package/commands/project/validate.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const config_1 = require("@hubspot/local-dev-lib/config");
+const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const usageTracking_1 = require("../../lib/usageTracking");
+const logger_1 = require("../../lib/ui/logger");
+const config_2 = require("../../lib/projects/config");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const upload_1 = require("../../lib/projects/upload");
+const en_1 = require("../../lang/en");
+const projectProfiles_1 = require("../../lib/projectProfiles");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const command = 'validate';
+const describe = undefined;
+async function handler(args) {
+    const { derivedAccountId, profile } = args;
+    const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
+    if (!projectConfig) {
+        logger_1.uiLogger.error(en_1.commands.project.validate.mustBeRanWithinAProject);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if (!(0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion)) {
+        logger_1.uiLogger.error(en_1.commands.project.validate.badVersion);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    (0, config_2.validateProjectConfig)(projectConfig, projectDir);
+    let targetAccountId = await (0, projectProfiles_1.loadAndValidateProfile)(projectConfig, projectDir, profile);
+    targetAccountId = targetAccountId || derivedAccountId;
+    const accountConfig = (0, config_1.getAccountConfig)(targetAccountId);
+    const accountType = accountConfig && accountConfig.accountType;
+    (0, usageTracking_1.trackCommandUsage)('project-validate', { type: accountType }, targetAccountId);
+    const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
+    try {
+        (0, upload_1.validateSourceDirectory)(srcDir, projectConfig);
+    }
+    catch (e) {
+        (0, errorHandlers_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    try {
+        await (0, upload_1.handleTranslate)(projectDir, projectConfig, targetAccountId, false, profile);
+    }
+    catch (e) {
+        (0, errorHandlers_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    logger_1.uiLogger.success(en_1.commands.project.validate.success(projectConfig.name));
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function projectValidateBuilder(yargs) {
+    yargs.options({
+        profile: {
+            type: 'string',
+            alias: 'p',
+            describe: en_1.commands.project.validate.options.profile.describe,
+            hidden: true,
+        },
+    });
+    yargs.conflicts('profile', 'account');
+    yargs.example([
+        ['$0 project validate', en_1.commands.project.validate.examples.default],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectValidateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectValidateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = projectValidateCommand;

package/commands/project.js

@@ -20,6 +20,7 @@ const migrateApp_1 = __importDefault(require("./project/migrateApp"));
 const cloneApp_1 = __importDefault(require("./project/cloneApp"));
 const installDeps_1 = __importDefault(require("./project/installDeps"));
 const profile_1 = __importDefault(require("./project/profile"));
+const validate_1 = __importDefault(require("./project/validate"));
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = ['project', 'projects'];
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.describe`), false);
@@ -40,6 +41,7 @@ function projectBuilder(yargs) {
         .command(cloneApp_1.default)
         .command(installDeps_1.default)
         .command(profile_1.default)
+        .command(validate_1.default)
         .demandCommand(1, '');
     return yargs;
 }