@valbuild/server 0.93.0 → 0.94.0

package/dist/declarations/src/ValFS.d.ts

@@ -4,10 +4,11 @@
  *
  */
 export interface ValFS {
-    readDirectory(rootDir: string, extensions: readonly string[], excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined): readonly string[];
+    readDirectory(rootDir: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined): readonly string[];
     writeFile(filePath: string, data: string | Buffer, encoding: "binary" | "utf8"): void;
     fileExists(filePath: string): boolean;
     readFile(filePath: string): string | undefined;
+    readBuffer(filePath: string): Buffer | undefined;
     rmFile(filePath: string): void;
     realpath(path: string): string;
 }

package/dist/declarations/src/ValFSHost.d.ts

@@ -7,20 +7,23 @@ import { Buffer } from "buffer";
  */
 export interface IValFSHost extends ts.ParseConfigHost, ts.ModuleResolutionHost {
     useCaseSensitiveFileNames: boolean;
+    readDirectory(rootDir: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined): readonly string[];
     writeFile(fileName: string, data: string | Buffer, encoding: "binary" | "utf8"): void;
     rmFile(fileName: string): void;
+    readBuffer(fileName: string): Buffer | undefined;
 }
 export declare class ValFSHost implements IValFSHost {
     protected readonly valFS: ValFS;
     protected readonly currentDirectory: string;
     constructor(valFS: ValFS, currentDirectory: string);
     useCaseSensitiveFileNames: boolean;
-    readDirectory(rootDir: string, extensions: readonly string[], excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined): readonly string[];
+    readDirectory(rootDir: string, extensions: readonly string[] | undefined, excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined): readonly string[];
     rmFile(fileName: string): void;
     writeFile(fileName: string, text: string | Buffer, encoding: "binary" | "utf8"): void;
     getCurrentDirectory(): string;
     getCanonicalFileName(fileName: string): string;
     fileExists(fileName: string): boolean;
     readFile(fileName: string): string | undefined;
+    readBuffer(fileName: string): Buffer | undefined;
     realpath(path: string): string;
 }

package/dist/valbuild-server.cjs.dev.js

@@ -659,7 +659,7 @@ function removeFromNode(document, node, key) {
   } else if (ts__default["default"].isObjectLiteralExpression(node)) {
     return fp.pipe(findObjectPropertyAssignment(node, key), fp.result.flatMap(assignment => {
       if (!assignment) {
-        return fp.result.err(new patch.PatchError("Cannot replace object element which does not exist"));
+        return fp.result.err(new patch.PatchError("Cannot remove object element which does not exist"));
       }
       return fp.result.ok(assignment);
     }), fp.result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
@@ -1026,7 +1026,14 @@ class ValSourceFileHandler {
       });
       fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs__default["default"].rmSync
+    rmFile: fs__default["default"].rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs__default["default"].readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1074,7 +1081,14 @@ class ValModuleLoader {
       });
       fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs__default["default"].rmSync
+    rmFile: fs__default["default"].rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs__default["default"].readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }, disableCache = false) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1367,7 +1381,14 @@ async function createService(projectRoot, opts, host = {
     });
     fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
   },
-  rmFile: fs__default["default"].rmSync
+  rmFile: fs__default["default"].rmSync,
+  readBuffer: fileName => {
+    try {
+      return fs__default["default"].readFileSync(fileName);
+    } catch {
+      return undefined;
+    }
+  }
 }, loader) {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
@@ -1700,8 +1721,10 @@ class ValOps {
           const filePath = op.filePath;
           fileLastUpdatedByPatchId[filePath] = {
             patchId: patch.patchId,
-            remote: op.remote
+            remote: op.remote,
+            isDelete: op.value === null
           };
+          continue;
         }
         const path = patch.path;
         if (!patchesByModule[path]) {
@@ -1776,15 +1799,19 @@ class ValOps {
         const fileFixOps = {};
         for (const op of patchData.patch) {
           if (op.op === "file") {
-            // NOTE: We insert the last patch_id that modify a file
-            // when constructing the url we use the patch id (and the file path)
-            // to fetch the right file
-            // NOTE: overwrite and use last patch_id if multiple patches modify the same file
-            fileFixOps[op.path.join("/")] = [{
-              op: "add",
-              path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
-              value: patchId
-            }];
+            if (op.value !== null) {
+              // NOTE: We insert the last patch_id that modify a file
+              // when constructing the url we use the patch id (and the file path)
+              // to fetch the right file
+              // NOTE: overwrite and use last patch_id if multiple patches modify the same file
+              fileFixOps[op.path.join("/")] = [{
+                op: "add",
+                path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
+                value: patchId
+              }];
+            }
+            // null value = delete: no patch_id to inject; the "remove" op in
+            // the patch already removes the metadata entry from the source
           } else {
             applicableOps.push(op);
           }
@@ -1897,6 +1924,21 @@ class ValOps {
     const files = {};
     const remoteFiles = {};
     const entries = Object.entries(schemas);
+    // Build a map of gallery directory → [ModuleFilePath, ...] across ALL modules
+    // (must include all modules, not just those being validated, since conflicts can come from any module)
+    const galleryDirectoryToModules = new Map();
+    for (const [moduleFilePathS, schema] of entries) {
+      const serialized = schema["executeSerialize"]();
+      if (serialized.type === "record" && serialized.mediaType && serialized.directory) {
+        const dir = serialized.directory;
+        const existing = galleryDirectoryToModules.get(dir);
+        if (existing) {
+          existing.push(moduleFilePathS);
+        } else {
+          galleryDirectoryToModules.set(dir, [moduleFilePathS]);
+        }
+      }
+    }
     const modulePathsToValidate = patchesByModule && Object.keys(patchesByModule);
     for (const [pathS, schema] of entries) {
       if (modulePathsToValidate && !modulePathsToValidate.includes(pathS)) {
@@ -1937,7 +1979,7 @@ class ValOps {
         };
         if (validationErrors) {
           for (const validationError of validationErrors) {
-            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4;
+            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4, _validationError$fixe5, _validationError$fixe6, _validationError$fixe7, _validationError$fixe8;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -2020,7 +2062,32 @@ class ValOps {
                   }
                 }
               }
-            } else {
+            } else if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.includes("images:check-unique-folder") || (_validationError$fixe6 = validationError.fixes) !== null && _validationError$fixe6 !== void 0 && _validationError$fixe6.includes("files:check-unique-folder")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value || typeof validationError.value !== "object") {
+                addError({
+                  message: `Could not find a directory value for gallery at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  typeError: true
+                });
+              } else {
+                const directory = "directory" in validationError.value && validationError.value.directory;
+                if (typeof directory !== "string") {
+                  addError({
+                    message: `Expected gallery validation error 'value' to have property 'directory' of type 'string'. Found: ${typeof directory}. ${TYPE_ERROR_MESSAGE}`,
+                    typeError: true
+                  });
+                } else {
+                  const modulesUsingDir = galleryDirectoryToModules.get(directory) ?? [];
+                  const conflictingModules = modulesUsingDir.filter(m => m !== path);
+                  if (conflictingModules.length > 0) {
+                    addError({
+                      message: `Gallery directory '${directory}' in ${path} conflicts with: ${conflictingModules.join(", ")}. Each gallery must use a unique directory.`
+                    });
+                  }
+                  // If conflictingModules is empty, directory is unique — silently drop the error.
+                }
+              }
+            } else if ((_validationError$fixe7 = validationError.fixes) !== null && _validationError$fixe7 !== void 0 && _validationError$fixe7.includes("images:check-all-files") || (_validationError$fixe8 = validationError.fixes) !== null && _validationError$fixe8 !== void 0 && _validationError$fixe8.includes("files:check-all-files")) ; else {
               addError(validationError);
             }
           }
@@ -2300,16 +2367,22 @@ class ValOps {
     await Promise.all(Object.entries(fileLastUpdatedByPatchId).map(async ([filePath, patchData]) => {
       const {
         patchId,
-        remote
+        remote,
+        isDelete
       } = patchData;
       if (globalAppliedPatches.includes(patchId)) {
-        // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
-        // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
-        // or is that the case? We are picking the latest file by path so, that should be enough?
-        patchedBinaryFilesDescriptors[filePath] = {
-          patchId,
-          remote
-        };
+        if (isDelete) {
+          // Signal file deletion via patchedSourceFiles null entry
+          patchedSourceFiles[filePath] = null;
+        } else {
+          // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
+          // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
+          // or is that the case? We are picking the latest file by path so, that should be enough?
+          patchedBinaryFilesDescriptors[filePath] = {
+            patchId,
+            remote
+          };
+        }
       } else {
         hasErrors = true;
         binaryFilePatchErrors[filePath] = {
@@ -2355,8 +2428,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe5;
-  if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe9;
+  if ((_validationError$fixe9 = validationError.fixes) !== null && _validationError$fixe9 !== void 0 && _validationError$fixe9.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;
@@ -2987,6 +3060,14 @@ class ValOpsFS extends ValOps {
     const patchFilePath = this.getBinaryFilePath(filePath, patchDir);
     const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDir);
     try {
+      if (data === null) {
+        this.host.deleteFile(patchFilePath);
+        this.host.deleteFile(metadataFilePath);
+        return {
+          patchId,
+          filePath
+        };
+      }
       const buffer = bufferFromDataUrl(data);
       if (!buffer) {
         return {
@@ -3247,7 +3328,11 @@ class ValOpsFS extends ValOps {
     for (const [filePath, data] of Object.entries(preparedCommit.patchedSourceFiles)) {
       const absPath = path__namespace["default"].join(this.rootDir, ...filePath.split("/"));
       try {
-        this.host.writeUf8File(absPath, data);
+        if (data === null) {
+          this.host.deleteFile(absPath);
+        } else {
+          this.host.writeUf8File(absPath, data);
+        }
         updatedFiles.push(absPath);
       } catch (err) {
         errors[absPath] = {
@@ -3373,6 +3458,11 @@ class FSOpsHost {
       });
     }
   }
+  deleteFile(path) {
+    if (this.fileExists(path)) {
+      fs__default["default"].rmSync(path);
+    }
+  }
   moveDir(from, to) {
     fs__default["default"].renameSync(from, to);
   }
@@ -6769,6 +6859,9 @@ class ValFSHost {
   readFile(fileName) {
     return this.valFS.readFile(fileName);
   }
+  readBuffer(fileName) {
+    return this.valFS.readBuffer(fileName);
+  }
   realpath(path) {
     return this.valFS.realpath(path);
   }
@@ -7243,6 +7336,88 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           metadata: v.metadata
         } : value
       });
+    } else if (fix === "images:check-all-files" || fix === "files:check-all-files") {
+      if (!moduleSource || typeof moduleSource !== "object") {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking gallery metadata (no moduleSource)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const gallerySource = moduleSource;
+      for (const [entryKey, storedEntry] of Object.entries(gallerySource)) {
+        const filename = path__namespace["default"].join(config.projectRoot, entryKey);
+        let buffer;
+        try {
+          buffer = fs__default["default"].readFileSync(filename);
+        } catch {
+          if (apply) {
+            const removePath = patch.sourceToPatchPath(sourcePath).concat([entryKey]);
+            if (patch.isNotRoot(removePath)) {
+              patch$1.push({
+                op: "remove",
+                path: removePath
+              });
+            }
+          } else {
+            remainingErrors.push({
+              ...validationError,
+              message: `Could not read file: ${filename} - file might not exist or can not be accessed`,
+              fixes: undefined
+            });
+          }
+          continue;
+        }
+        if (fix === "images:check-all-files") {
+          const actualMetadata = await extractImageMetadata(filename, buffer);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.width === actualMetadata.width && stored.height === actualMetadata.height && stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch$1.push({
+                op: "replace",
+                path: patch.sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  width: actualMetadata.width ?? 0,
+                  height: actualMetadata.height ?? 0,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `Image metadata for '${entryKey}' is incorrect (width: ${stored.width ?? "<empty>"} vs ${actualMetadata.width}, height: ${stored.height ?? "<empty>"} vs ${actualMetadata.height}, mimeType: ${stored.mimeType ?? "<empty>"} vs ${actualMetadata.mimeType}). Use --fix to update.`
+              });
+            }
+          }
+        } else if (fix === "files:check-all-files") {
+          const actualMetadata = await extractFileMetadata(filename);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch$1.push({
+                op: "replace",
+                path: patch.sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `File metadata for '${entryKey}' has incorrect mimeType: '${stored.mimeType ?? "<empty>"}' vs '${actualMetadata.mimeType}'. Use --fix to update.`
+              });
+            }
+          }
+        } else {
+          const exhaustiveCheck = fix;
+          throw new Error(`Internal error: unhandled fix type ${exhaustiveCheck}`);
+        }
+      }
     } else if (fix === "file:check-remote" || fix === "image:check-remote") {
       const v = getRemoteValueFromValidationError(validationError);
       if (!v.success) {

package/dist/valbuild-server.cjs.prod.js

@@ -659,7 +659,7 @@ function removeFromNode(document, node, key) {
   } else if (ts__default["default"].isObjectLiteralExpression(node)) {
     return fp.pipe(findObjectPropertyAssignment(node, key), fp.result.flatMap(assignment => {
       if (!assignment) {
-        return fp.result.err(new patch.PatchError("Cannot replace object element which does not exist"));
+        return fp.result.err(new patch.PatchError("Cannot remove object element which does not exist"));
       }
       return fp.result.ok(assignment);
     }), fp.result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
@@ -1026,7 +1026,14 @@ class ValSourceFileHandler {
       });
       fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs__default["default"].rmSync
+    rmFile: fs__default["default"].rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs__default["default"].readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1074,7 +1081,14 @@ class ValModuleLoader {
       });
       fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs__default["default"].rmSync
+    rmFile: fs__default["default"].rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs__default["default"].readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }, disableCache = false) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1367,7 +1381,14 @@ async function createService(projectRoot, opts, host = {
     });
     fs__default["default"].writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
   },
-  rmFile: fs__default["default"].rmSync
+  rmFile: fs__default["default"].rmSync,
+  readBuffer: fileName => {
+    try {
+      return fs__default["default"].readFileSync(fileName);
+    } catch {
+      return undefined;
+    }
+  }
 }, loader) {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
@@ -1700,8 +1721,10 @@ class ValOps {
           const filePath = op.filePath;
           fileLastUpdatedByPatchId[filePath] = {
             patchId: patch.patchId,
-            remote: op.remote
+            remote: op.remote,
+            isDelete: op.value === null
           };
+          continue;
         }
         const path = patch.path;
         if (!patchesByModule[path]) {
@@ -1776,15 +1799,19 @@ class ValOps {
         const fileFixOps = {};
         for (const op of patchData.patch) {
           if (op.op === "file") {
-            // NOTE: We insert the last patch_id that modify a file
-            // when constructing the url we use the patch id (and the file path)
-            // to fetch the right file
-            // NOTE: overwrite and use last patch_id if multiple patches modify the same file
-            fileFixOps[op.path.join("/")] = [{
-              op: "add",
-              path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
-              value: patchId
-            }];
+            if (op.value !== null) {
+              // NOTE: We insert the last patch_id that modify a file
+              // when constructing the url we use the patch id (and the file path)
+              // to fetch the right file
+              // NOTE: overwrite and use last patch_id if multiple patches modify the same file
+              fileFixOps[op.path.join("/")] = [{
+                op: "add",
+                path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
+                value: patchId
+              }];
+            }
+            // null value = delete: no patch_id to inject; the "remove" op in
+            // the patch already removes the metadata entry from the source
           } else {
             applicableOps.push(op);
           }
@@ -1897,6 +1924,21 @@ class ValOps {
     const files = {};
     const remoteFiles = {};
     const entries = Object.entries(schemas);
+    // Build a map of gallery directory → [ModuleFilePath, ...] across ALL modules
+    // (must include all modules, not just those being validated, since conflicts can come from any module)
+    const galleryDirectoryToModules = new Map();
+    for (const [moduleFilePathS, schema] of entries) {
+      const serialized = schema["executeSerialize"]();
+      if (serialized.type === "record" && serialized.mediaType && serialized.directory) {
+        const dir = serialized.directory;
+        const existing = galleryDirectoryToModules.get(dir);
+        if (existing) {
+          existing.push(moduleFilePathS);
+        } else {
+          galleryDirectoryToModules.set(dir, [moduleFilePathS]);
+        }
+      }
+    }
     const modulePathsToValidate = patchesByModule && Object.keys(patchesByModule);
     for (const [pathS, schema] of entries) {
       if (modulePathsToValidate && !modulePathsToValidate.includes(pathS)) {
@@ -1937,7 +1979,7 @@ class ValOps {
         };
         if (validationErrors) {
           for (const validationError of validationErrors) {
-            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4;
+            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4, _validationError$fixe5, _validationError$fixe6, _validationError$fixe7, _validationError$fixe8;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -2020,7 +2062,32 @@ class ValOps {
                   }
                 }
               }
-            } else {
+            } else if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.includes("images:check-unique-folder") || (_validationError$fixe6 = validationError.fixes) !== null && _validationError$fixe6 !== void 0 && _validationError$fixe6.includes("files:check-unique-folder")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value || typeof validationError.value !== "object") {
+                addError({
+                  message: `Could not find a directory value for gallery at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  typeError: true
+                });
+              } else {
+                const directory = "directory" in validationError.value && validationError.value.directory;
+                if (typeof directory !== "string") {
+                  addError({
+                    message: `Expected gallery validation error 'value' to have property 'directory' of type 'string'. Found: ${typeof directory}. ${TYPE_ERROR_MESSAGE}`,
+                    typeError: true
+                  });
+                } else {
+                  const modulesUsingDir = galleryDirectoryToModules.get(directory) ?? [];
+                  const conflictingModules = modulesUsingDir.filter(m => m !== path);
+                  if (conflictingModules.length > 0) {
+                    addError({
+                      message: `Gallery directory '${directory}' in ${path} conflicts with: ${conflictingModules.join(", ")}. Each gallery must use a unique directory.`
+                    });
+                  }
+                  // If conflictingModules is empty, directory is unique — silently drop the error.
+                }
+              }
+            } else if ((_validationError$fixe7 = validationError.fixes) !== null && _validationError$fixe7 !== void 0 && _validationError$fixe7.includes("images:check-all-files") || (_validationError$fixe8 = validationError.fixes) !== null && _validationError$fixe8 !== void 0 && _validationError$fixe8.includes("files:check-all-files")) ; else {
               addError(validationError);
             }
           }
@@ -2300,16 +2367,22 @@ class ValOps {
     await Promise.all(Object.entries(fileLastUpdatedByPatchId).map(async ([filePath, patchData]) => {
       const {
         patchId,
-        remote
+        remote,
+        isDelete
       } = patchData;
       if (globalAppliedPatches.includes(patchId)) {
-        // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
-        // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
-        // or is that the case? We are picking the latest file by path so, that should be enough?
-        patchedBinaryFilesDescriptors[filePath] = {
-          patchId,
-          remote
-        };
+        if (isDelete) {
+          // Signal file deletion via patchedSourceFiles null entry
+          patchedSourceFiles[filePath] = null;
+        } else {
+          // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
+          // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
+          // or is that the case? We are picking the latest file by path so, that should be enough?
+          patchedBinaryFilesDescriptors[filePath] = {
+            patchId,
+            remote
+          };
+        }
       } else {
         hasErrors = true;
         binaryFilePatchErrors[filePath] = {
@@ -2355,8 +2428,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe5;
-  if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe9;
+  if ((_validationError$fixe9 = validationError.fixes) !== null && _validationError$fixe9 !== void 0 && _validationError$fixe9.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;
@@ -2987,6 +3060,14 @@ class ValOpsFS extends ValOps {
     const patchFilePath = this.getBinaryFilePath(filePath, patchDir);
     const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDir);
     try {
+      if (data === null) {
+        this.host.deleteFile(patchFilePath);
+        this.host.deleteFile(metadataFilePath);
+        return {
+          patchId,
+          filePath
+        };
+      }
       const buffer = bufferFromDataUrl(data);
       if (!buffer) {
         return {
@@ -3247,7 +3328,11 @@ class ValOpsFS extends ValOps {
     for (const [filePath, data] of Object.entries(preparedCommit.patchedSourceFiles)) {
       const absPath = path__namespace["default"].join(this.rootDir, ...filePath.split("/"));
       try {
-        this.host.writeUf8File(absPath, data);
+        if (data === null) {
+          this.host.deleteFile(absPath);
+        } else {
+          this.host.writeUf8File(absPath, data);
+        }
         updatedFiles.push(absPath);
       } catch (err) {
         errors[absPath] = {
@@ -3373,6 +3458,11 @@ class FSOpsHost {
       });
     }
   }
+  deleteFile(path) {
+    if (this.fileExists(path)) {
+      fs__default["default"].rmSync(path);
+    }
+  }
   moveDir(from, to) {
     fs__default["default"].renameSync(from, to);
   }
@@ -6769,6 +6859,9 @@ class ValFSHost {
   readFile(fileName) {
     return this.valFS.readFile(fileName);
   }
+  readBuffer(fileName) {
+    return this.valFS.readBuffer(fileName);
+  }
   realpath(path) {
     return this.valFS.realpath(path);
   }
@@ -7243,6 +7336,88 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           metadata: v.metadata
         } : value
       });
+    } else if (fix === "images:check-all-files" || fix === "files:check-all-files") {
+      if (!moduleSource || typeof moduleSource !== "object") {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking gallery metadata (no moduleSource)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const gallerySource = moduleSource;
+      for (const [entryKey, storedEntry] of Object.entries(gallerySource)) {
+        const filename = path__namespace["default"].join(config.projectRoot, entryKey);
+        let buffer;
+        try {
+          buffer = fs__default["default"].readFileSync(filename);
+        } catch {
+          if (apply) {
+            const removePath = patch.sourceToPatchPath(sourcePath).concat([entryKey]);
+            if (patch.isNotRoot(removePath)) {
+              patch$1.push({
+                op: "remove",
+                path: removePath
+              });
+            }
+          } else {
+            remainingErrors.push({
+              ...validationError,
+              message: `Could not read file: ${filename} - file might not exist or can not be accessed`,
+              fixes: undefined
+            });
+          }
+          continue;
+        }
+        if (fix === "images:check-all-files") {
+          const actualMetadata = await extractImageMetadata(filename, buffer);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.width === actualMetadata.width && stored.height === actualMetadata.height && stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch$1.push({
+                op: "replace",
+                path: patch.sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  width: actualMetadata.width ?? 0,
+                  height: actualMetadata.height ?? 0,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `Image metadata for '${entryKey}' is incorrect (width: ${stored.width ?? "<empty>"} vs ${actualMetadata.width}, height: ${stored.height ?? "<empty>"} vs ${actualMetadata.height}, mimeType: ${stored.mimeType ?? "<empty>"} vs ${actualMetadata.mimeType}). Use --fix to update.`
+              });
+            }
+          }
+        } else if (fix === "files:check-all-files") {
+          const actualMetadata = await extractFileMetadata(filename);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch$1.push({
+                op: "replace",
+                path: patch.sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `File metadata for '${entryKey}' has incorrect mimeType: '${stored.mimeType ?? "<empty>"}' vs '${actualMetadata.mimeType}'. Use --fix to update.`
+              });
+            }
+          }
+        } else {
+          const exhaustiveCheck = fix;
+          throw new Error(`Internal error: unhandled fix type ${exhaustiveCheck}`);
+        }
+      }
     } else if (fix === "file:check-remote" || fix === "image:check-remote") {
       const v = getRemoteValueFromValidationError(validationError);
       if (!v.success) {

package/dist/valbuild-server.esm.js

@@ -628,7 +628,7 @@ function removeFromNode(document, node, key) {
   } else if (ts.isObjectLiteralExpression(node)) {
     return pipe(findObjectPropertyAssignment(node, key), result.flatMap(assignment => {
       if (!assignment) {
-        return result.err(new PatchError("Cannot replace object element which does not exist"));
+        return result.err(new PatchError("Cannot remove object element which does not exist"));
       }
       return result.ok(assignment);
     }), result.map(assignment => [removeAt(document, node.properties, node.properties.indexOf(assignment))[0], assignment.initializer]));
@@ -995,7 +995,14 @@ class ValSourceFileHandler {
       });
       fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs.rmSync
+    rmFile: fs.rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs.readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1043,7 +1050,14 @@ class ValModuleLoader {
       });
       fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
     },
-    rmFile: fs.rmSync
+    rmFile: fs.rmSync,
+    readBuffer: fileName => {
+      try {
+        return fs.readFileSync(fileName);
+      } catch {
+        return undefined;
+      }
+    }
   }, disableCache = false) {
     this.projectRoot = projectRoot;
     this.compilerOptions = compilerOptions;
@@ -1336,7 +1350,14 @@ async function createService(projectRoot, opts, host = {
     });
     fs.writeFileSync(fileName, typeof data === "string" ? data : new Uint8Array(data), encoding);
   },
-  rmFile: fs.rmSync
+  rmFile: fs.rmSync,
+  readBuffer: fileName => {
+    try {
+      return fs.readFileSync(fileName);
+    } catch {
+      return undefined;
+    }
+  }
 }, loader) {
   const compilerOptions = getCompilerOptions(projectRoot, host);
   const sourceFileHandler = new ValSourceFileHandler(projectRoot, compilerOptions, host);
@@ -1669,8 +1690,10 @@ class ValOps {
           const filePath = op.filePath;
           fileLastUpdatedByPatchId[filePath] = {
             patchId: patch.patchId,
-            remote: op.remote
+            remote: op.remote,
+            isDelete: op.value === null
           };
+          continue;
         }
         const path = patch.path;
         if (!patchesByModule[path]) {
@@ -1745,15 +1768,19 @@ class ValOps {
         const fileFixOps = {};
         for (const op of patchData.patch) {
           if (op.op === "file") {
-            // NOTE: We insert the last patch_id that modify a file
-            // when constructing the url we use the patch id (and the file path)
-            // to fetch the right file
-            // NOTE: overwrite and use last patch_id if multiple patches modify the same file
-            fileFixOps[op.path.join("/")] = [{
-              op: "add",
-              path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
-              value: patchId
-            }];
+            if (op.value !== null) {
+              // NOTE: We insert the last patch_id that modify a file
+              // when constructing the url we use the patch id (and the file path)
+              // to fetch the right file
+              // NOTE: overwrite and use last patch_id if multiple patches modify the same file
+              fileFixOps[op.path.join("/")] = [{
+                op: "add",
+                path: op.path.concat(...(op.nestedFilePath || [])).concat("patch_id"),
+                value: patchId
+              }];
+            }
+            // null value = delete: no patch_id to inject; the "remove" op in
+            // the patch already removes the metadata entry from the source
           } else {
             applicableOps.push(op);
           }
@@ -1866,6 +1893,21 @@ class ValOps {
     const files = {};
     const remoteFiles = {};
     const entries = Object.entries(schemas);
+    // Build a map of gallery directory → [ModuleFilePath, ...] across ALL modules
+    // (must include all modules, not just those being validated, since conflicts can come from any module)
+    const galleryDirectoryToModules = new Map();
+    for (const [moduleFilePathS, schema] of entries) {
+      const serialized = schema["executeSerialize"]();
+      if (serialized.type === "record" && serialized.mediaType && serialized.directory) {
+        const dir = serialized.directory;
+        const existing = galleryDirectoryToModules.get(dir);
+        if (existing) {
+          existing.push(moduleFilePathS);
+        } else {
+          galleryDirectoryToModules.set(dir, [moduleFilePathS]);
+        }
+      }
+    }
     const modulePathsToValidate = patchesByModule && Object.keys(patchesByModule);
     for (const [pathS, schema] of entries) {
       if (modulePathsToValidate && !modulePathsToValidate.includes(pathS)) {
@@ -1906,7 +1948,7 @@ class ValOps {
         };
         if (validationErrors) {
           for (const validationError of validationErrors) {
-            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4;
+            var _validationError$fixe, _validationError$fixe2, _validationError$fixe3, _validationError$fixe4, _validationError$fixe5, _validationError$fixe6, _validationError$fixe7, _validationError$fixe8;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -1989,7 +2031,32 @@ class ValOps {
                   }
                 }
               }
-            } else {
+            } else if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.includes("images:check-unique-folder") || (_validationError$fixe6 = validationError.fixes) !== null && _validationError$fixe6 !== void 0 && _validationError$fixe6.includes("files:check-unique-folder")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value || typeof validationError.value !== "object") {
+                addError({
+                  message: `Could not find a directory value for gallery at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  typeError: true
+                });
+              } else {
+                const directory = "directory" in validationError.value && validationError.value.directory;
+                if (typeof directory !== "string") {
+                  addError({
+                    message: `Expected gallery validation error 'value' to have property 'directory' of type 'string'. Found: ${typeof directory}. ${TYPE_ERROR_MESSAGE}`,
+                    typeError: true
+                  });
+                } else {
+                  const modulesUsingDir = galleryDirectoryToModules.get(directory) ?? [];
+                  const conflictingModules = modulesUsingDir.filter(m => m !== path);
+                  if (conflictingModules.length > 0) {
+                    addError({
+                      message: `Gallery directory '${directory}' in ${path} conflicts with: ${conflictingModules.join(", ")}. Each gallery must use a unique directory.`
+                    });
+                  }
+                  // If conflictingModules is empty, directory is unique — silently drop the error.
+                }
+              }
+            } else if ((_validationError$fixe7 = validationError.fixes) !== null && _validationError$fixe7 !== void 0 && _validationError$fixe7.includes("images:check-all-files") || (_validationError$fixe8 = validationError.fixes) !== null && _validationError$fixe8 !== void 0 && _validationError$fixe8.includes("files:check-all-files")) ; else {
               addError(validationError);
             }
           }
@@ -2269,16 +2336,22 @@ class ValOps {
     await Promise.all(Object.entries(fileLastUpdatedByPatchId).map(async ([filePath, patchData]) => {
       const {
         patchId,
-        remote
+        remote,
+        isDelete
       } = patchData;
       if (globalAppliedPatches.includes(patchId)) {
-        // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
-        // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
-        // or is that the case? We are picking the latest file by path so, that should be enough?
-        patchedBinaryFilesDescriptors[filePath] = {
-          patchId,
-          remote
-        };
+        if (isDelete) {
+          // Signal file deletion via patchedSourceFiles null entry
+          patchedSourceFiles[filePath] = null;
+        } else {
+          // TODO: do we want to make sure the file is there? Then again, it should be rare that it happens (unless there's a Val bug) so it might be enough to fail later (at commit)
+          // TODO: include sha256? This way we can make sure we pick the right file since theoretically there could be multiple files with the same path in the same patch
+          // or is that the case? We are picking the latest file by path so, that should be enough?
+          patchedBinaryFilesDescriptors[filePath] = {
+            patchId,
+            remote
+          };
+        }
       } else {
         hasErrors = true;
         binaryFilePatchErrors[filePath] = {
@@ -2324,8 +2397,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe5;
-  if ((_validationError$fixe5 = validationError.fixes) !== null && _validationError$fixe5 !== void 0 && _validationError$fixe5.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe9;
+  if ((_validationError$fixe9 = validationError.fixes) !== null && _validationError$fixe9 !== void 0 && _validationError$fixe9.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;
@@ -2956,6 +3029,14 @@ class ValOpsFS extends ValOps {
     const patchFilePath = this.getBinaryFilePath(filePath, patchDir);
     const metadataFilePath = this.getBinaryFileMetadataPath(filePath, patchDir);
     try {
+      if (data === null) {
+        this.host.deleteFile(patchFilePath);
+        this.host.deleteFile(metadataFilePath);
+        return {
+          patchId,
+          filePath
+        };
+      }
       const buffer = bufferFromDataUrl(data);
       if (!buffer) {
         return {
@@ -3216,7 +3297,11 @@ class ValOpsFS extends ValOps {
     for (const [filePath, data] of Object.entries(preparedCommit.patchedSourceFiles)) {
       const absPath = path__default.join(this.rootDir, ...filePath.split("/"));
       try {
-        this.host.writeUf8File(absPath, data);
+        if (data === null) {
+          this.host.deleteFile(absPath);
+        } else {
+          this.host.writeUf8File(absPath, data);
+        }
         updatedFiles.push(absPath);
       } catch (err) {
         errors[absPath] = {
@@ -3342,6 +3427,11 @@ class FSOpsHost {
       });
     }
   }
+  deleteFile(path) {
+    if (this.fileExists(path)) {
+      fs.rmSync(path);
+    }
+  }
   moveDir(from, to) {
     fs.renameSync(from, to);
   }
@@ -6738,6 +6828,9 @@ class ValFSHost {
   readFile(fileName) {
     return this.valFS.readFile(fileName);
   }
+  readBuffer(fileName) {
+    return this.valFS.readBuffer(fileName);
+  }
   realpath(path) {
     return this.valFS.realpath(path);
   }
@@ -7212,6 +7305,88 @@ async function createFixPatch(config, apply, sourcePath, validationError, remote
           metadata: v.metadata
         } : value
       });
+    } else if (fix === "images:check-all-files" || fix === "files:check-all-files") {
+      if (!moduleSource || typeof moduleSource !== "object") {
+        remainingErrors.push({
+          ...validationError,
+          message: "Unexpected error while checking gallery metadata (no moduleSource)",
+          fixes: undefined
+        });
+        continue;
+      }
+      const gallerySource = moduleSource;
+      for (const [entryKey, storedEntry] of Object.entries(gallerySource)) {
+        const filename = path__default.join(config.projectRoot, entryKey);
+        let buffer;
+        try {
+          buffer = fs.readFileSync(filename);
+        } catch {
+          if (apply) {
+            const removePath = sourceToPatchPath(sourcePath).concat([entryKey]);
+            if (isNotRoot(removePath)) {
+              patch.push({
+                op: "remove",
+                path: removePath
+              });
+            }
+          } else {
+            remainingErrors.push({
+              ...validationError,
+              message: `Could not read file: ${filename} - file might not exist or can not be accessed`,
+              fixes: undefined
+            });
+          }
+          continue;
+        }
+        if (fix === "images:check-all-files") {
+          const actualMetadata = await extractImageMetadata(filename, buffer);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.width === actualMetadata.width && stored.height === actualMetadata.height && stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch.push({
+                op: "replace",
+                path: sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  width: actualMetadata.width ?? 0,
+                  height: actualMetadata.height ?? 0,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `Image metadata for '${entryKey}' is incorrect (width: ${stored.width ?? "<empty>"} vs ${actualMetadata.width}, height: ${stored.height ?? "<empty>"} vs ${actualMetadata.height}, mimeType: ${stored.mimeType ?? "<empty>"} vs ${actualMetadata.mimeType}). Use --fix to update.`
+              });
+            }
+          }
+        } else if (fix === "files:check-all-files") {
+          const actualMetadata = await extractFileMetadata(filename);
+          const stored = storedEntry;
+          const metadataIsCorrect = stored.mimeType === actualMetadata.mimeType;
+          if (!metadataIsCorrect) {
+            if (apply) {
+              patch.push({
+                op: "replace",
+                path: sourceToPatchPath(sourcePath).concat([entryKey]),
+                value: {
+                  ...stored,
+                  mimeType: actualMetadata.mimeType ?? "application/octet-stream"
+                }
+              });
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: `File metadata for '${entryKey}' has incorrect mimeType: '${stored.mimeType ?? "<empty>"}' vs '${actualMetadata.mimeType}'. Use --fix to update.`
+              });
+            }
+          }
+        } else {
+          const exhaustiveCheck = fix;
+          throw new Error(`Internal error: unhandled fix type ${exhaustiveCheck}`);
+        }
+      }
     } else if (fix === "file:check-remote" || fix === "image:check-remote") {
       const v = getRemoteValueFromValidationError(validationError);
       if (!v.success) {

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.93.0",
+  "version": "0.94.0",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0"
@@ -30,9 +30,9 @@
     "typescript": "^5.9.3",
     "zod": "^4.3.5",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.93.0",
-    "@valbuild/shared": "0.93.0",
-    "@valbuild/ui": "0.93.0"
+    "@valbuild/core": "0.94.0",
+    "@valbuild/shared": "0.94.0",
+    "@valbuild/ui": "0.94.0"
   },
   "engines": {
     "node": ">=18.17.0"