fix: Fix project creation happening when there is a validation error

commands/project/upload.ts

@@ -10,7 +10,6 @@ import {
   getProjectConfig,
   validateProjectConfig,
 } from '../../lib/projects/config';
-import { ensureProjectExists } from '../../lib/projects/ensureProjectExists';
 import { logFeedbackMessage } from '../../lib/projects/ui';
 import { handleProjectUpload } from '../../lib/projects/upload';
 import {
@@ -51,22 +50,19 @@ async function handler(
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await ensureProjectExists(derivedAccountId, projectConfig.name, {
-    forceCreate,
-    uploadCommand: true,
-  });
-
   try {
     const { result, uploadError } =
-      await handleProjectUpload<ProjectPollResult>(
-        derivedAccountId,
+      await handleProjectUpload<ProjectPollResult>({
+        accountId: derivedAccountId,
         projectConfig,
-        projectDir!,
-        pollProjectBuildAndDeploy,
-        message,
-        useV3Api(projectConfig.platformVersion),
-        skipValidation
-      );
+        projectDir: projectDir!,
+        callbackFunc: pollProjectBuildAndDeploy,
+        uploadMessage: message,
+        forceCreate,
+        isUploadCommand: true,
+        sendIR: useV3Api(projectConfig.platformVersion),
+        skipValidation,
+      });
 
     if (uploadError) {
       if (

commands/project/watch.ts

@@ -17,7 +17,6 @@ import {
   validateProjectConfig,
 } from '../../lib/projects/config';
 import { logFeedbackMessage } from '../../lib/projects/ui';
-import { ensureProjectExists } from '../../lib/projects/ensureProjectExists';
 import { handleProjectUpload } from '../../lib/projects/upload';
 import {
   pollBuildStatus,
@@ -137,7 +136,7 @@ async function handler(
     return process.exit(EXIT_CODES.ERROR);
   }
 
-  await ensureProjectExists(derivedAccountId, projectConfig.name);
+  validateProjectConfig(projectConfig, projectDir);
 
   try {
     const {
@@ -157,12 +156,13 @@ async function handler(
 
     // Upload all files if no build exists for this project yet
     if (initialUpload || hasNoBuilds) {
-      const { uploadError } = await handleProjectUpload(
-        derivedAccountId,
+      const { uploadError } = await handleProjectUpload({
+        accountId: derivedAccountId,
         projectConfig,
         projectDir,
-        startWatching
-      );
+        callbackFunc: startWatching,
+        isUploadCommand: false,
+      });
 
       if (uploadError) {
         if (

lib/projects/localDev/helpers.ts

@@ -447,17 +447,21 @@ export async function createInitialBuildForNewProject(
   projectConfig: ProjectConfig,
   projectDir: string,
   targetAccountId: number,
-  sendIr?: boolean
+  sendIR?: boolean
 ): Promise<Build> {
   const { result: initialUploadResult, uploadError } =
-    await handleProjectUpload<ProjectPollResult>(
-      targetAccountId,
+    await handleProjectUpload<ProjectPollResult>({
+      accountId: targetAccountId,
       projectConfig,
       projectDir,
-      projectUploadCallback,
-      lib.localDevHelpers.createInitialBuildForNewProject.initialUploadMessage,
-      sendIr
-    );
+      callbackFunc: projectUploadCallback,
+      uploadMessage:
+        lib.localDevHelpers.createInitialBuildForNewProject
+          .initialUploadMessage,
+      forceCreate: true,
+      skipValidation: true,
+      sendIR,
+    });
 
   if (uploadError) {
     if (

lib/projects/upload.ts

@@ -14,6 +14,7 @@ import { isTranslationError, translate } from '@hubspot/project-parsing-lib';
 import { logError } from '../errorHandlers';
 import util from 'node:util';
 import { lib } from '../../lang/en';
+import { ensureProjectExists } from './ensureProjectExists';
 
 async function uploadProjectFiles(
   accountId: number,
@@ -87,15 +88,29 @@ type ProjectUploadResult<T> = {
   uploadError?: unknown;
 };
 
-export async function handleProjectUpload<T>(
-  accountId: number,
-  projectConfig: ProjectConfig,
-  projectDir: string,
-  callbackFunc: ProjectUploadCallbackFunction<T>,
-  uploadMessage: string = '',
-  sendIR: boolean = false,
-  skipValidation: boolean = false
-): Promise<ProjectUploadResult<T>> {
+type HandleProjectUploadArg<T> = {
+  accountId: number;
+  projectConfig: ProjectConfig;
+  projectDir: string;
+  callbackFunc: ProjectUploadCallbackFunction<T>;
+  uploadMessage?: string;
+  forceCreate?: boolean;
+  isUploadCommand?: boolean;
+  sendIR?: boolean;
+  skipValidation?: boolean;
+};
+
+export async function handleProjectUpload<T>({
+  accountId,
+  projectConfig,
+  projectDir,
+  callbackFunc,
+  uploadMessage = '',
+  forceCreate = false,
+  isUploadCommand = false,
+  sendIR = false,
+  skipValidation = false,
+}: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>> {
   const srcDir = path.resolve(projectDir, projectConfig.srcDir);
 
   const filenames = fs.readdirSync(srcDir);
@@ -147,6 +162,11 @@ export async function handleProjectUpload<T>(
         }
       }
 
+      await ensureProjectExists(accountId, projectConfig.name, {
+        forceCreate,
+        uploadCommand: isUploadCommand,
+      });
+
       const { buildId, error } = await uploadProjectFiles(
         accountId,
         projectConfig.name,