@valbuild/server 0.48.0 → 0.49.0

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

@@ -31,7 +31,7 @@ export declare class LocalValServer implements ValServer {
     private badRequest;
     postCommit(): Promise<ValServerJsonResult<{}>>;
     authorize(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE>>;
-    callback(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    callback(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE | VAL_ENABLE_COOKIE_NAME>>;
     logout(): Promise<ValServerResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
     getFiles(): Promise<ValServerResult<never, ReadableStream<Uint8Array>>>;
     getPatches(): Promise<ValServerJsonResult<ApiGetPatchResponse>>;

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

@@ -22,7 +22,7 @@ export interface ValServer {
     callback(query: {
         code?: string;
         state?: string;
-    }, cookies: ValCookies<VAL_STATE_COOKIE>): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    }, cookies: ValCookies<VAL_STATE_COOKIE>): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE | VAL_ENABLE_COOKIE_NAME>>;
     enable(query: {
         redirect_to?: string;
     }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;

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

@@ -731,19 +731,16 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
-      if (!valModule) {
-        fatalErrors.push(`Could not find any modules at: ${id}`);
-      } else if (valModule.defaultExport) {
+      if (
+      // if one of these are set it is a Val module, so must validate
+      (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
-        }
-        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+        } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
           fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
-        }
-        if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
-        }
-        if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a source`);
         }
       }
@@ -1425,12 +1422,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1438,7 +1435,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1545,6 +1542,7 @@ class ProxyValServer {
         [internal.VAL_STATE_COOKIE]: {
           value: null
         },
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_SESSION_COOKIE]: {
           value: cookie,
           options: {
@@ -1599,7 +1597,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1631,8 +1629,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1649,7 +1648,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1693,7 +1692,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1708,7 +1707,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1729,7 +1728,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1757,7 +1756,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2276,7 +2275,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
-    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (internal.MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = internal.filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2297,6 +2306,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
+    let mimeType = internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch$1 = [];
   for (const fix of validationError.fixes || []) {
@@ -2382,6 +2411,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch$1.push({
+              op: "replace",
+              path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch$1.push({
+          op: "add",
+          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

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

@@ -731,19 +731,16 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
-      if (!valModule) {
-        fatalErrors.push(`Could not find any modules at: ${id}`);
-      } else if (valModule.defaultExport) {
+      if (
+      // if one of these are set it is a Val module, so must validate
+      (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
-        }
-        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+        } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
           fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
-        }
-        if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
-        }
-        if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a source`);
         }
       }
@@ -1425,12 +1422,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1438,7 +1435,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1545,6 +1542,7 @@ class ProxyValServer {
         [internal.VAL_STATE_COOKIE]: {
           value: null
         },
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_SESSION_COOKIE]: {
           value: cookie,
           options: {
@@ -1599,7 +1597,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1631,8 +1629,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1649,7 +1648,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1693,7 +1692,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1708,7 +1707,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1729,7 +1728,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1757,7 +1756,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2276,7 +2275,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
-    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (internal.MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = internal.filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2297,6 +2306,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
+    let mimeType = internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch$1 = [];
   for (const fix of validationError.fixes || []) {
@@ -2382,6 +2411,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch$1.push({
+              op: "replace",
+              path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch$1.push({
+          op: "add",
+          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

package/dist/valbuild-server.esm.js

@@ -8,7 +8,7 @@ import path__default from 'path';
 import fs, { promises } from 'fs';
 import { transform } from 'sucrase';
 import z, { z as z$1 } from 'zod';
-import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1, imageTypeToMimeType, filenameToMimeType } from '@valbuild/shared/internal';
+import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1, MIME_TYPES_TO_EXT, filenameToMimeType } from '@valbuild/shared/internal';
 import crypto from 'crypto';
 import { createUIRequestHandler } from '@valbuild/ui/server';
 import sizeOf from 'image-size';
@@ -701,19 +701,16 @@ globalThis.valModule = {
     } else {
       result.value.dispose();
       const valModule = context.getProp(context.global, "valModule").consume(context.dump);
-      if (!valModule) {
-        fatalErrors.push(`Could not find any modules at: ${id}`);
-      } else if (valModule.defaultExport) {
+      if (
+      // if one of these are set it is a Val module, so must validate
+      (valModule === null || valModule === void 0 ? void 0 : valModule.id) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.schema) !== undefined || (valModule === null || valModule === void 0 ? void 0 : valModule.source) !== undefined) {
         if (valModule.id !== id) {
           fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
-        }
-        if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
+        } else if (encodeURIComponent(valModule.id).replace(/%2F/g, "/") !== valModule.id) {
           fatalErrors.push(`Invalid val.content id! Must be a web-safe path without escape characters, found: '${valModule.id}', which was encoded as: '${encodeURIComponent(valModule.id).replace("%2F", "/")}'`);
-        }
-        if (!(valModule !== null && valModule !== void 0 && valModule.schema)) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.schema) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a schema`);
-        }
-        if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
+        } else if ((valModule === null || valModule === void 0 ? void 0 : valModule.source) === undefined) {
           fatalErrors.push(`Expected val id: '${id}' to have a source`);
         }
       }
@@ -1395,12 +1392,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1408,7 +1405,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1515,6 +1512,7 @@ class ProxyValServer {
         [VAL_STATE_COOKIE$1]: {
           value: null
         },
+        [VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [VAL_SESSION_COOKIE$1]: {
           value: cookie,
           options: {
@@ -1569,7 +1567,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1601,8 +1599,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1619,7 +1618,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1663,7 +1662,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1678,7 +1677,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1699,7 +1698,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1727,7 +1726,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2246,7 +2245,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__default.join(config.projectRoot, maybeRef);
     const buffer = fs.readFileSync(filename);
     const imageSize = sizeOf(buffer);
-    const mimeType = imageSize.type ? imageTypeToMimeType(imageSize.type) : filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2267,6 +2276,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && FILE_REF_PROP in validationError.value && typeof validationError.value[FILE_REF_PROP] === "string" ? validationError.value[FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__default.join(config.projectRoot, maybeRef);
+    const buffer = fs.readFileSync(filename);
+    let mimeType = filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch = [];
   for (const fix of validationError.fixes || []) {
@@ -2352,6 +2381,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch.push({
+              op: "replace",
+              path: sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch.push({
+          op: "add",
+          path: sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.48.0",
-    "@valbuild/shared": "~0.48.0",
-    "@valbuild/ui": "~0.48.0",
+    "@valbuild/core": "~0.49.0",
+    "@valbuild/shared": "~0.49.0",
+    "@valbuild/ui": "~0.49.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",