@valbuild/cli 0.93.0 → 0.95.0

package/cli/dist/valbuild-cli-cli.esm.js

@@ -1,17 +1,17 @@
 import meow from 'meow';
 import chalk from 'chalk';
 import path from 'path';
-import { createService, createFixPatch, getPersonalAccessTokenPath, parsePersonalAccessTokenFile, getSettings, uploadRemoteFile } from '@valbuild/server';
-import { DEFAULT_VAL_REMOTE_HOST, DEFAULT_CONTENT_HOST, Internal, FILE_REF_PROP, VAL_EXTENSION } from '@valbuild/core';
-import { filterRoutesByPatterns, validateRoutePatterns } from '@valbuild/shared/internal';
-import { glob } from 'fast-glob';
-import picocolors from 'picocolors';
+import pc from 'picocolors';
 import fs from 'fs/promises';
+import { glob } from 'fast-glob';
+import { Internal, FILE_REF_PROP, DEFAULT_VAL_REMOTE_HOST, DEFAULT_CONTENT_HOST, VAL_EXTENSION } from '@valbuild/core';
+import { createService, createFixPatch, getPersonalAccessTokenPath, parsePersonalAccessTokenFile, getSettings, uploadRemoteFile } from '@valbuild/server';
 import vm from 'node:vm';
 import ts from 'typescript';
 import z from 'zod';
 import { createRequire } from 'node:module';
-import fs$1 from 'fs';
+import { filterRoutesByPatterns, validateRoutePatterns } from '@valbuild/shared/internal';
+import nodeFs from 'fs';
 
 function error(message) {
   console.error(chalk.red("❌Error: ") + message);
@@ -98,6 +98,7 @@ const textEncoder = new TextEncoder();
 
 // Handler functions
 async function handleFileMetadata(ctx) {
+  var _fileSource$source;
   const [, modulePath] = Internal.splitModuleFilePathAndModulePath(ctx.sourcePath);
   if (!ctx.valModule.source || !ctx.valModule.schema) {
     return {
@@ -106,24 +107,21 @@ async function handleFileMetadata(ctx) {
     };
   }
   const fileSource = Internal.resolvePath(modulePath, ctx.valModule.source, ctx.valModule.schema);
-  let filePath = null;
-  try {
-    var _fileSource$source;
-    filePath = path.join(ctx.projectRoot, // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (_fileSource$source = fileSource.source) === null || _fileSource$source === void 0 ? void 0 : _fileSource$source[FILE_REF_PROP]);
-    await fs.access(filePath);
-  } catch {
-    if (filePath) {
-      return {
-        success: false,
-        errorMessage: `File ${filePath} does not exist`
-      };
-    } else {
-      return {
-        success: false,
-        errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
-      };
-    }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const fileRefProp = (_fileSource$source = fileSource.source) === null || _fileSource$source === void 0 ? void 0 : _fileSource$source[FILE_REF_PROP];
+  if (!fileRefProp) {
+    return {
+      success: false,
+      errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
+    };
+  }
+  const filePath = path.join(ctx.projectRoot, fileRefProp);
+  if (!ctx.fs.fileExists(filePath)) {
+    return {
+      success: false,
+      errorMessage: `File ${filePath} does not exist`
+    };
   }
   return {
     success: true,
@@ -165,7 +163,7 @@ async function handleKeyOfCheck(ctx) {
   };
 }
 async function handleRemoteFileUpload(ctx) {
-  var _ctx$valConfigFile2;
+  var _resolvedRemoteFileAt;
   if (!ctx.fix) {
     return {
       success: false,
@@ -180,35 +178,37 @@ async function handleRemoteFileUpload(ctx) {
     };
   }
   const resolvedRemoteFileAtSourcePath = Internal.resolvePath(modulePath, ctx.valModule.source, ctx.valModule.schema);
-  let filePath = null;
-  try {
-    var _resolvedRemoteFileAt;
-    filePath = path.join(ctx.projectRoot, // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (_resolvedRemoteFileAt = resolvedRemoteFileAtSourcePath.source) === null || _resolvedRemoteFileAt === void 0 ? void 0 : _resolvedRemoteFileAt[FILE_REF_PROP]);
-    await fs.access(filePath);
-  } catch {
-    if (filePath) {
-      return {
-        success: false,
-        errorMessage: `File ${filePath} does not exist`
-      };
-    } else {
-      return {
-        success: false,
-        errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
-      };
-    }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const fileRefProp = (_resolvedRemoteFileAt = resolvedRemoteFileAtSourcePath.source) === null || _resolvedRemoteFileAt === void 0 ? void 0 : _resolvedRemoteFileAt[FILE_REF_PROP];
+  if (!fileRefProp) {
+    return {
+      success: false,
+      errorMessage: `Expected file to be defined at: ${ctx.sourcePath} but no file was found`
+    };
+  }
+  const filePath = path.join(ctx.projectRoot, fileRefProp);
+  if (!ctx.fs.fileExists(filePath)) {
+    return {
+      success: false,
+      errorMessage: `File ${filePath} does not exist`
+    };
   }
   const patFile = getPersonalAccessTokenPath(ctx.projectRoot);
-  try {
-    await fs.access(patFile);
-  } catch {
+  if (!ctx.fs.fileExists(patFile)) {
     return {
       success: false,
       errorMessage: `File: ${path.join(ctx.projectRoot, ctx.file)} has remote images that are not uploaded and you are not logged in.\n\nFix this error by logging in:\n\t"npx val login"\n`
     };
   }
-  const parsedPatFile = parsePersonalAccessTokenFile(await fs.readFile(patFile, "utf-8"));
+  const patFileContent = ctx.fs.readFile(patFile);
+  if (patFileContent === undefined) {
+    return {
+      success: false,
+      errorMessage: `Could not read personal access token file at ${patFile}`
+    };
+  }
+  const parsedPatFile = parsePersonalAccessTokenFile(patFileContent);
   if (!parsedPatFile.success) {
     return {
       success: false,
@@ -219,9 +219,12 @@ async function handleRemoteFileUpload(ctx) {
     pat
   } = parsedPatFile.data;
   if (ctx.remoteFiles[ctx.sourcePath]) {
-    console.log(picocolors.yellow("⚠"), `Remote file ${filePath} already uploaded`);
     return {
-      success: true
+      success: true,
+      events: [{
+        type: "remote-already-uploaded",
+        filePath
+      }]
     };
   }
   if (!resolvedRemoteFileAtSourcePath.schema) {
@@ -239,22 +242,18 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Could not resolve schema for remote file: ${ctx.sourcePath}`
     };
   }
+  const projectName = ctx.project;
   let publicProjectId = ctx.publicProjectId;
   let remoteFileBuckets = ctx.remoteFileBuckets;
   let remoteFilesCounter = ctx.remoteFilesCounter;
   if (!publicProjectId || !remoteFileBuckets) {
-    let projectName = process.env.VAL_PROJECT;
-    if (!projectName) {
-      var _ctx$valConfigFile;
-      projectName = (_ctx$valConfigFile = ctx.valConfigFile) === null || _ctx$valConfigFile === void 0 ? void 0 : _ctx$valConfigFile.project;
-    }
     if (!projectName) {
       return {
         success: false,
-        errorMessage: "Project name not found. Set VAL_PROJECT environment variable or add project name to val.config"
+        errorMessage: "Project name not found. Add project name to val.config or set the VAL_PROJECT environment variable"
       };
     }
-    const settingsRes = await getSettings(projectName, {
+    const settingsRes = await ctx.remote.getSettings(projectName, {
       pat
     });
     if (!settingsRes.success) {
@@ -272,7 +271,7 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: "Could not get public project id"
     };
   }
-  if (!((_ctx$valConfigFile2 = ctx.valConfigFile) !== null && _ctx$valConfigFile2 !== void 0 && _ctx$valConfigFile2.project)) {
+  if (!projectName) {
     return {
       success: false,
       errorMessage: `Could not get project. Check that your val.config has the 'project' field set, or set it using the VAL_PROJECT environment variable`
@@ -292,13 +291,11 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Internal error: could not allocate a bucket for the remote file located at ${ctx.sourcePath}`
     };
   }
-  let fileBuffer;
-  try {
-    fileBuffer = await fs.readFile(filePath);
-  } catch (e) {
+  const fileBuffer = ctx.fs.readBuffer(filePath);
+  if (fileBuffer === undefined) {
     return {
       success: false,
-      errorMessage: `Error reading file: ${e}`
+      errorMessage: `Error reading file: ${filePath}`
     };
   }
   const relativeFilePath = path.relative(ctx.projectRoot, filePath).split(path.sep).join("/");
@@ -313,7 +310,7 @@ async function handleRemoteFileUpload(ctx) {
   const fileExt = getFileExt(filePath);
   const schema = resolveRemoteFileSchema;
   const metadata = fileSourceMetadata;
-  const ref = Internal.remote.createRemoteRef(ctx.valRemoteHost, {
+  const ref = Internal.remote.createRemoteRef(ctx.remote.remoteHost, {
     publicProjectId,
     coreVersion,
     bucket,
@@ -321,8 +318,7 @@ async function handleRemoteFileUpload(ctx) {
     fileHash,
     filePath: relativeFilePath
   });
-  console.log(picocolors.yellow("⚠"), `Uploading remote file: '${ref}'...`);
-  const remoteFileUpload = await uploadRemoteFile(ctx.contentHostUrl, ctx.valConfigFile.project, bucket, fileHash, fileExt, fileBuffer, {
+  const remoteFileUpload = await ctx.remote.uploadFile(projectName, bucket, fileHash, fileExt, fileBuffer, {
     pat
   });
   if (!remoteFileUpload.success) {
@@ -331,7 +327,6 @@ async function handleRemoteFileUpload(ctx) {
       errorMessage: `Could not upload remote file: '${ref}'. Error: ${remoteFileUpload.error}`
     };
   }
-  console.log(picocolors.green("✔"), `Completed upload of remote file: '${ref}'`);
   ctx.remoteFiles[ctx.sourcePath] = {
     ref,
     metadata: fileSourceMetadata
@@ -341,15 +336,25 @@ async function handleRemoteFileUpload(ctx) {
     shouldApplyPatch: true,
     publicProjectId,
     remoteFileBuckets,
-    remoteFilesCounter
+    remoteFilesCounter,
+    events: [{
+      type: "remote-uploading",
+      ref
+    }, {
+      type: "remote-uploaded",
+      ref
+    }]
   };
 }
 async function handleRemoteFileDownload(ctx) {
   if (ctx.fix) {
-    console.log(picocolors.yellow("⚠"), `Downloading remote file in ${ctx.sourcePath}...`);
     return {
       success: true,
-      shouldApplyPatch: true
+      shouldApplyPatch: true,
+      events: [{
+        type: "remote-downloading",
+        sourcePath: ctx.sourcePath
+      }]
     };
   } else {
     return {
@@ -514,6 +519,103 @@ async function handleRouteCheck(ctx) {
     success: true
   };
 }
+async function handleUniqueFolderCheck(ctx) {
+  const value = ctx.validationError.value;
+  if (!value || typeof value.directory !== "string") {
+    return {
+      success: false,
+      errorMessage: `Unexpected value in unique folder check for ${ctx.sourcePath}`
+    };
+  }
+  const {
+    directory
+  } = value;
+  const conflicts = [];
+  for (const file of ctx.valFiles) {
+    const otherModuleFilePath = `/${file}`;
+    if (otherModuleFilePath === ctx.moduleFilePath) continue;
+    const otherModule = await ctx.service.get(otherModuleFilePath, "", {
+      source: false,
+      schema: true,
+      validate: false
+    });
+    const schema = otherModule.schema;
+    if ((schema === null || schema === void 0 ? void 0 : schema.type) === "record" && schema.directory === directory && schema.mediaType) {
+      conflicts.push(otherModuleFilePath);
+    }
+  }
+  if (conflicts.length > 0) {
+    return {
+      success: false,
+      errorMessage: `Gallery directory '${directory}' in ${ctx.moduleFilePath} is also used by: ${conflicts.join(", ")}. Each gallery must use a unique directory.`
+    };
+  }
+  return {
+    success: true
+  };
+}
+async function handleCheckAllFiles(ctx) {
+  const value = ctx.validationError.value;
+  if (!value || typeof value.directory !== "string") {
+    return {
+      success: false,
+      errorMessage: `Unexpected value in check-all-files for ${ctx.sourcePath}`
+    };
+  }
+  const {
+    directory
+  } = value;
+  const source = ctx.valModule.source;
+  if (!source || typeof source !== "object" || Array.isArray(source)) {
+    return {
+      success: false,
+      errorMessage: `Could not get source for ${ctx.sourcePath}`
+    };
+  }
+  const trackedFiles = new Set(Object.keys(source));
+
+  // Check that all tracked files exist on disk
+  const missingTrackedFiles = [...trackedFiles].filter(f => {
+    return !ctx.fs.fileExists(path.join(ctx.projectRoot, f));
+  });
+  if (missingTrackedFiles.length > 0) {
+    if (!ctx.fix) {
+      return {
+        success: false,
+        errorMessage: `Gallery in ${ctx.moduleFilePath} has tracked files that do not exist on disk: ${missingTrackedFiles.join(", ")}. Add the files or remove them from the gallery.`
+      };
+    }
+    // fix: true — let createFixPatch remove the missing entries
+    return {
+      success: true,
+      shouldApplyPatch: true
+    };
+  }
+  const dirPath = path.join(ctx.projectRoot, directory);
+  const filesInDir = [];
+  try {
+    const entries = ctx.fs.readDirectory(dirPath, undefined, undefined, ["**/*"]);
+    for (const entry of entries) {
+      const relPath = "/" + path.relative(ctx.projectRoot, entry).split(path.sep).join("/");
+      filesInDir.push(relPath);
+    }
+  } catch {
+    // directory doesn't exist — no untracked files possible
+  }
+  const untrackedFiles = filesInDir.filter(f => !trackedFiles.has(f));
+  if (untrackedFiles.length > 0) {
+    return {
+      success: false,
+      errorMessage: `Gallery in ${ctx.moduleFilePath} has files not tracked: ${untrackedFiles.join(", ")}. Add these files to the gallery or remove them from the directory.`
+    };
+  }
+
+  // All files accounted for — trigger metadata verification via createFixPatch
+  return {
+    success: true,
+    shouldApplyPatch: true
+  };
+}
 
 // Fix handler registry
 const currentFixHandlers = {
@@ -528,7 +630,13 @@ const currentFixHandlers = {
   "image:download-remote": handleRemoteFileDownload,
   "file:download-remote": handleRemoteFileDownload,
   "image:check-remote": handleRemoteFileCheck,
-  "file:check-remote": handleRemoteFileCheck
+  "images:check-remote": handleRemoteFileCheck,
+  "file:check-remote": handleRemoteFileCheck,
+  "files:check-remote": handleRemoteFileCheck,
+  "images:check-unique-folder": handleUniqueFolderCheck,
+  "files:check-unique-folder": handleUniqueFolderCheck,
+  "images:check-all-files": handleCheckAllFiles,
+  "files:check-all-files": handleCheckAllFiles
 };
 const deprecatedFixHandlers = {
   "image:replace-metadata": handleFileMetadata
@@ -537,30 +645,36 @@ const fixHandlers = {
   ...deprecatedFixHandlers,
   ...currentFixHandlers
 };
-async function validate({
+function createDefaultValFSHost() {
+  return {
+    ...ts.sys,
+    writeFile: (fileName, data, encoding) => {
+      nodeFs.mkdirSync(path.dirname(fileName), {
+        recursive: true
+      });
+      nodeFs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
+    },
+    rmFile: nodeFs.rmSync,
+    readBuffer: fileName => {
+      try {
+        return nodeFs.readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
+  };
+}
+async function* runValidation({
   root,
-  fix
+  fix,
+  valFiles,
+  project,
+  remote,
+  fs
 }) {
-  const valRemoteHost = process.env.VAL_REMOTE_HOST || DEFAULT_VAL_REMOTE_HOST;
-  const contentHostUrl = process.env.VAL_CONTENT_URL || DEFAULT_CONTENT_HOST;
-  const projectRoot = root ? path.resolve(root) : process.cwd();
-  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
-  console.log(picocolors.greenBright(`Validating project${valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project ? ` '${picocolors.inverse(valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project)}'` : ""}...`));
-  const service = await createService(projectRoot, {});
-  let prettier;
-  try {
-    prettier = (await import('prettier')).default;
-  } catch {
-    console.log("Prettier not found, skipping formatting");
-  }
-  const valFiles = await glob("**/*.val.{js,ts}", {
-    ignore: ["node_modules/**"],
-    cwd: projectRoot
-  });
+  const projectRoot = path.resolve(root);
+  const service = await createService(projectRoot, {}, fs);
   let errors = 0;
-  console.log(picocolors.greenBright(`Found ${valFiles.length} files...`));
-  let publicProjectId;
-  let didFix = false;
 
   // Create caches that persist across all file validations
   const keyOfCache = new Map();
@@ -568,7 +682,7 @@ async function validate({
     loaded: false,
     modules: {}
   };
-  async function validateFile(file) {
+  async function* validateFile(file) {
     const moduleFilePath = `/${file}`; // TODO: check if this always works? (Windows?)
     const start = Date.now();
     const valModule = await service.get(moduleFilePath, "", {
@@ -580,10 +694,14 @@ async function validate({
     let remoteFileBuckets = undefined;
     let remoteFilesCounter = 0;
     if (!valModule.errors) {
-      console.log(picocolors.green("✔"), moduleFilePath, "is valid (" + (Date.now() - start) + "ms)");
-      return 0;
+      yield {
+        type: "file-valid",
+        file: moduleFilePath,
+        durationMs: Date.now() - start
+      };
+      return;
     } else {
-      let errors = 0;
+      let fileErrors = 0;
       let fixedErrors = 0;
       if (valModule.errors) {
         if (valModule.errors.validation) {
@@ -591,8 +709,12 @@ async function validate({
             for (const v of validationErrors) {
               if (!v.fixes || v.fixes.length === 0) {
                 // No fixes available - just report error
-                errors += 1;
-                console.log(picocolors.red("✘"), "Got error in", `${sourcePath}:`, v.message);
+                fileErrors += 1;
+                yield {
+                  type: "validation-error",
+                  sourcePath,
+                  message: v.message
+                };
                 continue;
               }
 
@@ -600,8 +722,12 @@ async function validate({
               const fixType = v.fixes[0]; // Take first fix
               const handler = fixHandlers[fixType];
               if (!handler) {
-                console.log(picocolors.red("✘"), "Unknown fix", v.fixes, "for", sourcePath);
-                errors += 1;
+                yield {
+                  type: "unknown-fix",
+                  sourcePath,
+                  fixes: v.fixes
+                };
+                fileErrors += 1;
                 continue;
               }
 
@@ -616,21 +742,25 @@ async function validate({
                 valFiles,
                 moduleFilePath,
                 file,
+                fs,
                 remoteFiles,
-                publicProjectId,
+                publicProjectId: undefined,
                 remoteFileBuckets,
                 remoteFilesCounter,
-                valRemoteHost,
-                contentHostUrl,
-                valConfigFile: valConfigFile ?? undefined,
+                remote,
+                project,
                 keyOfCache,
                 routerModulesCache
               });
 
-              // Update shared state from handler result
-              if (result.publicProjectId !== undefined) {
-                publicProjectId = result.publicProjectId;
+              // Yield any events from handler
+              if (result.events) {
+                for (const event of result.events) {
+                  yield event;
+                }
               }
+
+              // Update shared state from handler result
               if (result.remoteFileBuckets !== undefined) {
                 remoteFileBuckets = result.remoteFileBuckets;
               }
@@ -638,69 +768,98 @@ async function validate({
                 remoteFilesCounter = result.remoteFilesCounter;
               }
               if (!result.success) {
-                console.log(picocolors.red("✘"), result.errorMessage);
-                errors += 1;
+                yield {
+                  type: "validation-error",
+                  sourcePath,
+                  message: result.errorMessage ?? "Unknown error"
+                };
+                fileErrors += 1;
                 continue;
               }
 
               // Apply patch if needed
               if (result.shouldApplyPatch) {
-                var _fixPatch$remainingEr;
                 const fixPatch = await createFixPatch({
                   projectRoot,
-                  remoteHost: valRemoteHost
+                  remoteHost: remote.remoteHost
                 }, !!fix, sourcePath, v, remoteFiles, valModule.source, valModule.schema);
                 if (fix && fixPatch !== null && fixPatch !== void 0 && fixPatch.patch && (fixPatch === null || fixPatch === void 0 ? void 0 : fixPatch.patch.length) > 0) {
                   await service.patch(moduleFilePath, fixPatch.patch);
-                  didFix = true;
                   fixedErrors += 1;
-                  console.log(picocolors.yellow("⚠"), "Applied fix for", sourcePath);
+                  yield {
+                    type: "fix-applied",
+                    file,
+                    sourcePath
+                  };
+                } else if (!fix && fixPatch !== null && fixPatch !== void 0 && fixPatch.patch && (fixPatch === null || fixPatch === void 0 ? void 0 : fixPatch.patch.length) > 0) {
+                  fileErrors += 1;
+                  yield {
+                    type: "validation-fixable-error",
+                    sourcePath,
+                    message: v.message,
+                    fixable: true
+                  };
+                }
+                for (const e of (fixPatch === null || fixPatch === void 0 ? void 0 : fixPatch.remainingErrors) ?? []) {
+                  fileErrors += 1;
+                  yield {
+                    type: "validation-fixable-error",
+                    sourcePath,
+                    message: e.message,
+                    fixable: !!(e.fixes && e.fixes.length)
+                  };
                 }
-                fixPatch === null || fixPatch === void 0 || (_fixPatch$remainingEr = fixPatch.remainingErrors) === null || _fixPatch$remainingEr === void 0 || _fixPatch$remainingEr.forEach(e => {
-                  errors += 1;
-                  console.log(e.fixes && e.fixes.length ? picocolors.yellow("⚠") : picocolors.red("✘"), `Got ${e.fixes && e.fixes.length ? "fixable " : ""}error in`, `${sourcePath}:`, e.message);
-                });
               }
             }
           }
         }
-        if (fixedErrors === errors && (!valModule.errors.fatal || valModule.errors.fatal.length == 0)) {
-          console.log(picocolors.green("✔"), moduleFilePath, "is valid (" + (Date.now() - start) + "ms)");
+        if (fixedErrors === fileErrors && (!valModule.errors.fatal || valModule.errors.fatal.length == 0)) {
+          yield {
+            type: "file-valid",
+            file: moduleFilePath,
+            durationMs: Date.now() - start
+          };
         }
         for (const fatalError of valModule.errors.fatal || []) {
-          errors += 1;
-          console.log(picocolors.red("✘"), moduleFilePath, "is invalid:", fatalError.message);
+          fileErrors += 1;
+          yield {
+            type: "fatal-error",
+            file: moduleFilePath,
+            message: fatalError.message
+          };
         }
       } else {
-        console.log(picocolors.green("✔"), moduleFilePath, "is valid (" + (Date.now() - start) + "ms)");
+        yield {
+          type: "file-valid",
+          file: moduleFilePath,
+          durationMs: Date.now() - start
+        };
       }
-      if (errors > 0) {
-        console.log(picocolors.red("✘"), `${`/${file}`} contains ${errors} error${errors > 1 ? "s" : ""}`, " (" + (Date.now() - start) + "ms)");
+      if (fileErrors > 0) {
+        yield {
+          type: "file-error-count",
+          file: `/${file}`,
+          errorCount: fileErrors,
+          durationMs: Date.now() - start
+        };
       }
-      return errors;
+      errors += fileErrors;
     }
   }
   for (const file of valFiles.sort()) {
-    didFix = false;
-    errors += await validateFile(file);
-    if (prettier && didFix) {
-      var _prettier;
-      const filePath = path.join(projectRoot, file);
-      const fileContent = await fs.readFile(filePath, "utf-8");
-      const formattedContent = await ((_prettier = prettier) === null || _prettier === void 0 ? void 0 : _prettier.format(fileContent, {
-        filepath: filePath
-      }));
-      await fs.writeFile(filePath, formattedContent);
-    }
+    yield* validateFile(file);
   }
+  service.dispose();
   if (errors > 0) {
-    console.log(picocolors.red("✘"), "Got", errors, "error" + (errors > 1 ? "s" : ""));
-    process.exit(1);
+    yield {
+      type: "summary-errors",
+      count: errors
+    };
   } else {
-    console.log(picocolors.green("✔"), "No validation errors found");
+    yield {
+      type: "summary-success"
+    };
   }
-  service.dispose();
-  return;
 }
 
 // GPT generated levenshtein distance algorithm:
@@ -728,6 +887,102 @@ function findSimilar(key, targets) {
   })).sort((a, b) => a.distance - b.distance);
 }
 
+async function validate({
+  root,
+  fix
+}) {
+  const projectRoot = root ? path.resolve(root) : process.cwd();
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  const resolvedValConfigFile = valConfigFile ? {
+    ...valConfigFile,
+    project: process.env.VAL_PROJECT || valConfigFile.project
+  } : process.env.VAL_PROJECT ? {
+    project: process.env.VAL_PROJECT
+  } : undefined;
+  console.log(pc.greenBright(`Validating project${resolvedValConfigFile !== null && resolvedValConfigFile !== void 0 && resolvedValConfigFile.project ? ` '${pc.inverse(resolvedValConfigFile.project)}'` : ""}...`));
+  const valFiles = await glob("**/*.val.{js,ts}", {
+    ignore: ["node_modules/**"],
+    cwd: projectRoot
+  });
+  console.log(pc.greenBright(`Found ${valFiles.length} files...`));
+  let prettier;
+  try {
+    prettier = (await import('prettier')).default;
+  } catch {
+    console.log("Prettier not found, skipping formatting");
+  }
+  const fixedFiles = new Set();
+  let totalErrors = 0;
+  for await (const event of runValidation({
+    root: projectRoot,
+    fix: !!fix,
+    valFiles,
+    project: resolvedValConfigFile === null || resolvedValConfigFile === void 0 ? void 0 : resolvedValConfigFile.project,
+    remote: {
+      remoteHost: process.env.VAL_REMOTE_HOST || DEFAULT_VAL_REMOTE_HOST,
+      getSettings: (projectName, options) => getSettings(projectName, options),
+      uploadFile: (project, bucket, fileHash, fileExt, fileBuffer, options) => uploadRemoteFile(process.env.VAL_CONTENT_URL || DEFAULT_CONTENT_HOST, project, bucket, fileHash, fileExt ?? "", fileBuffer, options)
+    },
+    fs: createDefaultValFSHost()
+  })) {
+    switch (event.type) {
+      case "file-valid":
+        console.log(pc.green("✔"), event.file, "is valid (" + event.durationMs + "ms)");
+        break;
+      case "file-error-count":
+        console.log(pc.red("✘"), `${event.file} contains ${event.errorCount} error${event.errorCount > 1 ? "s" : ""}`, " (" + event.durationMs + "ms)");
+        totalErrors += event.errorCount;
+        break;
+      case "validation-error":
+        console.log(pc.red("✘"), "Got error in", `${event.sourcePath}:`, event.message);
+        break;
+      case "validation-fixable-error":
+        console.log(event.fixable ? pc.yellow("⚠") : pc.red("✘"), `Got ${event.fixable ? "fixable " : ""}error in`, `${event.sourcePath}:`, event.message);
+        break;
+      case "unknown-fix":
+        console.log(pc.red("✘"), "Unknown fix", event.fixes, "for", event.sourcePath);
+        break;
+      case "fix-applied":
+        console.log(pc.yellow("⚠"), "Applied fix for", event.sourcePath);
+        fixedFiles.add(event.file);
+        break;
+      case "fatal-error":
+        console.log(pc.red("✘"), event.file, "is invalid:", event.message);
+        break;
+      case "remote-uploading":
+        console.log(pc.yellow("⚠"), `Uploading remote file: '${event.ref}'...`);
+        break;
+      case "remote-uploaded":
+        console.log(pc.green("✔"), `Completed upload of remote file: '${event.ref}'`);
+        break;
+      case "remote-already-uploaded":
+        console.log(pc.yellow("⚠"), `Remote file ${event.filePath} already uploaded`);
+        break;
+      case "remote-downloading":
+        console.log(pc.yellow("⚠"), `Downloading remote file in ${event.sourcePath}...`);
+        break;
+    }
+  }
+
+  // Run prettier on files that had fixes applied
+  if (prettier) {
+    for (const file of fixedFiles) {
+      const filePath = path.join(projectRoot, file);
+      const fileContent = await fs.readFile(filePath, "utf-8");
+      const formattedContent = await prettier.format(fileContent, {
+        filepath: filePath
+      });
+      await fs.writeFile(filePath, formattedContent);
+    }
+  }
+  if (totalErrors > 0) {
+    console.log(pc.red("✘"), "Got", totalErrors, "error" + (totalErrors > 1 ? "s" : ""));
+    process.exit(1);
+  } else {
+    console.log(pc.green("✔"), "No validation errors found");
+  }
+}
+
 async function listUnusedFiles({
   root
 }) {
@@ -835,7 +1090,7 @@ async function connect(options) {
     params.set("github_repo", [maybeGitOwnerAndRepo.owner, maybeGitOwnerAndRepo.repo].join("/"));
   }
   const url = `${host$1}/connect?${params.toString()}`;
-  console.log(picocolors.dim(`\nFollow the instructions in your browser to complete the setup:\n${picocolors.cyan(url)}\n`));
+  console.log(pc.dim(`\nFollow the instructions in your browser to complete the setup:\n${pc.cyan(url)}\n`));
 }
 async function tryGetProject(projectRoot) {
   const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
@@ -847,7 +1102,7 @@ async function tryGetProject(projectRoot) {
         projectName: parts[1]
       };
     } else {
-      console.error(picocolors.red(`Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`));
+      console.error(pc.red(`Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`));
       process.exit(1);
     }
   }
@@ -882,7 +1137,7 @@ async function tryGetGitRemote(root) {
     }
     return null;
   } catch (error) {
-    console.error(picocolors.red("Failed to read .git/config file."), error);
+    console.error(pc.red("Failed to read .git/config file."), error);
     return null;
   }
 }
@@ -891,8 +1146,8 @@ function tryGetGitConfig(root) {
   let lastDir = null;
   while (currentDir !== lastDir) {
     const gitConfigPath = path.join(currentDir, ".git", "config");
-    if (fs$1.existsSync(gitConfigPath)) {
-      return fs$1.readFileSync(gitConfigPath, "utf-8");
+    if (nodeFs.existsSync(gitConfigPath)) {
+      return nodeFs.readFileSync(gitConfigPath, "utf-8");
     }
     lastDir = currentDir;
     currentDir = path.dirname(currentDir);
@@ -907,7 +1162,7 @@ const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
 async function login(options) {
   try {
     var _response$headers$get;
-    console.log(picocolors.cyan("\nStarting login process...\n"));
+    console.log(pc.cyan("\nStarting login process...\n"));
 
     // Step 1: Initiate login and get token and URL
     const response = await fetch(`${host}/api/login`, {
@@ -920,7 +1175,7 @@ async function login(options) {
     let url;
     if (!((_response$headers$get = response.headers.get("content-type")) !== null && _response$headers$get !== void 0 && _response$headers$get.includes("application/json"))) {
       const text = await response.text();
-      console.error(picocolors.red("Unexpected failure while trying to login (content type was not JSON). "), text ? `Server response: ${text} (status: ${response.status})` : `Status: ${response.status}`);
+      console.error(pc.red("Unexpected failure while trying to login (content type was not JSON). "), text ? `Server response: ${text} (status: ${response.status})` : `Status: ${response.status}`);
       process.exit(1);
     }
     const json = await response.json();
@@ -929,12 +1184,12 @@ async function login(options) {
       url = json.url;
     }
     if (!token || !url) {
-      console.error(picocolors.red("Unexpected response from the server."), json);
+      console.error(pc.red("Unexpected response from the server."), json);
       process.exit(1);
     }
-    console.log(picocolors.green("Open the following URL in your browser to log in:"));
-    console.log(picocolors.underline(picocolors.blue(url)));
-    console.log(picocolors.dim("\nWaiting for login confirmation...\n"));
+    console.log(pc.green("Open the following URL in your browser to log in:"));
+    console.log(pc.underline(pc.blue(url)));
+    console.log(pc.dim("\nWaiting for login confirmation...\n"));
 
     // Step 2: Poll for login confirmation
     const result = await pollForConfirmation(token);
@@ -943,7 +1198,7 @@ async function login(options) {
     const filePath = getPersonalAccessTokenPath(options.root || process.cwd());
     saveToken(result, filePath);
   } catch (error) {
-    console.error(picocolors.red("An error occurred during the login process. Check your internet connection. Details:"), error instanceof Error ? error.message : JSON.stringify(error, null, 2));
+    console.error(pc.red("An error occurred during the login process. Check your internet connection. Details:"), error instanceof Error ? error.message : JSON.stringify(error, null, 2));
     process.exit(1);
   }
 }
@@ -956,7 +1211,7 @@ async function pollForConfirmation(token) {
       method: "POST"
     });
     if (response.status === 500) {
-      console.error(picocolors.red("An error occurred on the server."));
+      console.error(pc.red("An error occurred on the server."));
       process.exit(1);
     }
     if (response.status === 200) {
@@ -965,21 +1220,21 @@ async function pollForConfirmation(token) {
         if (typeof json.profile.email === "string" && typeof json.pat === "string") {
           return json;
         } else {
-          console.error(picocolors.red("Unexpected response from the server."));
+          console.error(pc.red("Unexpected response from the server."));
           process.exit(1);
         }
       }
     }
   }
-  console.error(picocolors.red("Login confirmation timed out."));
+  console.error(pc.red("Login confirmation timed out."));
   process.exit(1);
 }
 function saveToken(result, filePath) {
-  fs$1.mkdirSync(path.dirname(filePath), {
+  nodeFs.mkdirSync(path.dirname(filePath), {
     recursive: true
   });
-  fs$1.writeFileSync(filePath, JSON.stringify(result, null, 2));
-  console.log(picocolors.green(`Token for ${picocolors.cyan(result.profile.email)} saved to ${picocolors.cyan(filePath)}`));
+  nodeFs.writeFileSync(filePath, JSON.stringify(result, null, 2));
+  console.log(pc.green(`Token for ${pc.cyan(result.profile.email)} saved to ${pc.cyan(filePath)}`));
 }
 
 async function main() {