@valbuild/server 0.45.0 → 0.47.0

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

@@ -77,13 +77,11 @@ type ValServerOverrides = Partial<{
      */
     valContentUrl: string;
     /**
-     * The full name of this Val project.
-     *
-     * Typically this is set using the VAL_NAME env var.
+     * The cloud name of this Val project.
      *
      * @example "myorg/my-project"
      */
-    valName: string;
+    valCloud: string;
     /**
      * After Val is enabled, redirect to this url.
      *

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

@@ -737,7 +737,7 @@ globalThis.valModule = {
         fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
         }
         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", "/")}'`);
@@ -1108,6 +1108,8 @@ class Service {
         errors: valModule.errors && valModule.errors.validation ? {
           validation: valModule.errors.validation || undefined,
           fatal: valModule.errors.fatal || undefined
+        } : valModule.errors ? {
+          fatal: valModule.errors.fatal || undefined
         } : false
       };
     } else {
@@ -2017,9 +2019,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2318,7 +2320,9 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
         // width is correct
         "width" in currentValue.metadata && currentValue.metadata.width === imageMetadata.width &&
         // height is correct
-        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height;
+        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === imageMetadata.mimeType;
 
         // skips if the metadata is already correct
         if (!metadataIsCorrect) {
@@ -2353,6 +2357,12 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
                   fixes: undefined
                 });
               }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== imageMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "Image metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + imageMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
             } else {
               remainingErrors.push({
                 ...validationError,
@@ -2369,7 +2379,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           value: {
             width: imageMetadata.width,
             height: imageMetadata.height,
-            sha256: imageMetadata.sha256
+            sha256: imageMetadata.sha256,
+            mimeType: imageMetadata.mimeType
           }
         });
       }

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

@@ -737,7 +737,7 @@ globalThis.valModule = {
         fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
         }
         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", "/")}'`);
@@ -1108,6 +1108,8 @@ class Service {
         errors: valModule.errors && valModule.errors.validation ? {
           validation: valModule.errors.validation || undefined,
           fatal: valModule.errors.fatal || undefined
+        } : valModule.errors ? {
+          fatal: valModule.errors.fatal || undefined
         } : false
       };
     } else {
@@ -2017,9 +2019,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2318,7 +2320,9 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
         // width is correct
         "width" in currentValue.metadata && currentValue.metadata.width === imageMetadata.width &&
         // height is correct
-        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height;
+        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === imageMetadata.mimeType;
 
         // skips if the metadata is already correct
         if (!metadataIsCorrect) {
@@ -2353,6 +2357,12 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
                   fixes: undefined
                 });
               }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== imageMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "Image metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + imageMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
             } else {
               remainingErrors.push({
                 ...validationError,
@@ -2369,7 +2379,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           value: {
             width: imageMetadata.width,
             height: imageMetadata.height,
-            sha256: imageMetadata.sha256
+            sha256: imageMetadata.sha256,
+            mimeType: imageMetadata.mimeType
           }
         });
       }

package/dist/valbuild-server.esm.js

@@ -707,7 +707,7 @@ globalThis.valModule = {
         fatalErrors.push(`Could not find a default export in: ${id}. Check if file has a export default val.content(...)`);
       } else {
         if (valModule.id !== id) {
-          fatalErrors.push(`Wrong val.content id! In the file of with: '${id}', found: '${valModule.id}'`);
+          fatalErrors.push(`Wrong val.content id! Expected: '${id}', found: '${valModule.id}'`);
         }
         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", "/")}'`);
@@ -1078,6 +1078,8 @@ class Service {
         errors: valModule.errors && valModule.errors.validation ? {
           validation: valModule.errors.validation || undefined,
           fatal: valModule.errors.fatal || undefined
+        } : valModule.errors ? {
+          fatal: valModule.errors.fatal || undefined
         } : false
       };
     } else {
@@ -1987,9 +1989,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2288,7 +2290,9 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
         // width is correct
         "width" in currentValue.metadata && currentValue.metadata.width === imageMetadata.width &&
         // height is correct
-        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height;
+        "height" in currentValue.metadata && currentValue.metadata.height === imageMetadata.height &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === imageMetadata.mimeType;
 
         // skips if the metadata is already correct
         if (!metadataIsCorrect) {
@@ -2323,6 +2327,12 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
                   fixes: undefined
                 });
               }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== imageMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "Image metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + imageMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
             } else {
               remainingErrors.push({
                 ...validationError,
@@ -2339,7 +2349,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           value: {
             width: imageMetadata.width,
             height: imageMetadata.height,
-            sha256: imageMetadata.sha256
+            sha256: imageMetadata.sha256,
+            mimeType: imageMetadata.mimeType
           }
         });
       }

package/package.json

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