@valbuild/server 0.72.1 → 0.72.2

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

@@ -1682,6 +1682,33 @@ class ValOps {
 
   // #region validateSources
   async validateSources(schemas, sources, patchesByModule) {
+    const checkKeyIsValid = async (key, sourcePath) => {
+      var _schemas$moduleFilePa;
+      const [moduleFilePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
+      const keyOfModuleSource = sources[moduleFilePath];
+      const keyOfModuleSchema = (_schemas$moduleFilePa = schemas[moduleFilePath]) === null || _schemas$moduleFilePa === void 0 ? void 0 : _schemas$moduleFilePa.serialize();
+      if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
+        return {
+          error: true,
+          message: `Expected key at ${sourcePath} to be of type 'record'`
+        };
+      }
+      if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
+        return {
+          error: false
+        };
+      }
+      if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
+        return {
+          error: true,
+          message: `Expected ${sourcePath} to be a truthy object`
+        };
+      }
+      return {
+        error: true,
+        message: `Key '${key}' does not exist in ${sourcePath}.`
+      };
+    };
     const errors = {};
     const files = {};
     const entries = Object.entries(schemas);
@@ -1712,8 +1739,20 @@ class ValOps {
       }
       for (const [sourcePathS, validationErrors] of Object.entries(res)) {
         const sourcePath = sourcePathS;
+        const addError = validationError => {
+          if (!errors[path]) {
+            errors[path] = {
+              validations: {}
+            };
+          }
+          if (!errors[path].validations[sourcePath]) {
+            errors[path].validations[sourcePath] = [];
+          }
+          errors[path].validations[sourcePath].push(validationError);
+        };
         if (validationErrors) {
           for (const validationError of validationErrors) {
+            var _validationError$fixe;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -1722,16 +1761,48 @@ class ValOps {
               if (isFileSource(value)) {
                 files[sourcePath] = value;
               }
-            } else {
-              if (!errors[path]) {
-                errors[path] = {
-                  validations: {}
-                };
-              }
-              if (!errors[path].validations[sourcePath]) {
-                errors[path].validations[sourcePath] = [];
+            } else if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.includes("keyof:check-keys")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value) {
+                addError({
+                  message: `Could not find a value for keyOf at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                  typeError: true
+                });
+              } else {
+                if (typeof validationError.value !== "object") {
+                  addError({
+                    message: `Expected keyOf validation error to have a 'value' property of type 'object'. Found: ${typeof validationError.value}. ${TYPE_ERROR_MESSAGE}`,
+                    // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                    typeError: true
+                  });
+                } else {
+                  const key = "key" in validationError.value && validationError.value.key;
+                  const validationErrorSourcePath = "sourcePath" in validationError.value && validationError.value.sourcePath;
+                  if (typeof key !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'key' of type 'string'. Found: ${typeof key}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else if (typeof validationErrorSourcePath !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'sourcePath' of type 'string'. Found: ${typeof validationErrorSourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else {
+                    const res = await checkKeyIsValid(key, validationErrorSourcePath);
+                    if (res.error) {
+                      addError({
+                        message: res.message
+                      });
+                    }
+                  }
+                }
               }
-              errors[path].validations[sourcePath].push(validationError);
+            } else {
+              addError(validationError);
             }
           }
         }
@@ -2229,8 +2300,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe;
-  if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe2;
+  if ((_validationError$fixe2 = validationError.fixes) !== null && _validationError$fixe2 !== void 0 && _validationError$fixe2.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;

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

@@ -1682,6 +1682,33 @@ class ValOps {
 
   // #region validateSources
   async validateSources(schemas, sources, patchesByModule) {
+    const checkKeyIsValid = async (key, sourcePath) => {
+      var _schemas$moduleFilePa;
+      const [moduleFilePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
+      const keyOfModuleSource = sources[moduleFilePath];
+      const keyOfModuleSchema = (_schemas$moduleFilePa = schemas[moduleFilePath]) === null || _schemas$moduleFilePa === void 0 ? void 0 : _schemas$moduleFilePa.serialize();
+      if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
+        return {
+          error: true,
+          message: `Expected key at ${sourcePath} to be of type 'record'`
+        };
+      }
+      if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
+        return {
+          error: false
+        };
+      }
+      if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
+        return {
+          error: true,
+          message: `Expected ${sourcePath} to be a truthy object`
+        };
+      }
+      return {
+        error: true,
+        message: `Key '${key}' does not exist in ${sourcePath}.`
+      };
+    };
     const errors = {};
     const files = {};
     const entries = Object.entries(schemas);
@@ -1712,8 +1739,20 @@ class ValOps {
       }
       for (const [sourcePathS, validationErrors] of Object.entries(res)) {
         const sourcePath = sourcePathS;
+        const addError = validationError => {
+          if (!errors[path]) {
+            errors[path] = {
+              validations: {}
+            };
+          }
+          if (!errors[path].validations[sourcePath]) {
+            errors[path].validations[sourcePath] = [];
+          }
+          errors[path].validations[sourcePath].push(validationError);
+        };
         if (validationErrors) {
           for (const validationError of validationErrors) {
+            var _validationError$fixe;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -1722,16 +1761,48 @@ class ValOps {
               if (isFileSource(value)) {
                 files[sourcePath] = value;
               }
-            } else {
-              if (!errors[path]) {
-                errors[path] = {
-                  validations: {}
-                };
-              }
-              if (!errors[path].validations[sourcePath]) {
-                errors[path].validations[sourcePath] = [];
+            } else if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.includes("keyof:check-keys")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value) {
+                addError({
+                  message: `Could not find a value for keyOf at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                  typeError: true
+                });
+              } else {
+                if (typeof validationError.value !== "object") {
+                  addError({
+                    message: `Expected keyOf validation error to have a 'value' property of type 'object'. Found: ${typeof validationError.value}. ${TYPE_ERROR_MESSAGE}`,
+                    // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                    typeError: true
+                  });
+                } else {
+                  const key = "key" in validationError.value && validationError.value.key;
+                  const validationErrorSourcePath = "sourcePath" in validationError.value && validationError.value.sourcePath;
+                  if (typeof key !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'key' of type 'string'. Found: ${typeof key}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else if (typeof validationErrorSourcePath !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'sourcePath' of type 'string'. Found: ${typeof validationErrorSourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else {
+                    const res = await checkKeyIsValid(key, validationErrorSourcePath);
+                    if (res.error) {
+                      addError({
+                        message: res.message
+                      });
+                    }
+                  }
+                }
               }
-              errors[path].validations[sourcePath].push(validationError);
+            } else {
+              addError(validationError);
             }
           }
         }
@@ -2229,8 +2300,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe;
-  if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe2;
+  if ((_validationError$fixe2 = validationError.fixes) !== null && _validationError$fixe2 !== void 0 && _validationError$fixe2.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;

package/dist/valbuild-server.esm.js

@@ -1653,6 +1653,33 @@ class ValOps {
 
   // #region validateSources
   async validateSources(schemas, sources, patchesByModule) {
+    const checkKeyIsValid = async (key, sourcePath) => {
+      var _schemas$moduleFilePa;
+      const [moduleFilePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
+      const keyOfModuleSource = sources[moduleFilePath];
+      const keyOfModuleSchema = (_schemas$moduleFilePa = schemas[moduleFilePath]) === null || _schemas$moduleFilePa === void 0 ? void 0 : _schemas$moduleFilePa.serialize();
+      if (keyOfModuleSchema && keyOfModuleSchema.type !== "record") {
+        return {
+          error: true,
+          message: `Expected key at ${sourcePath} to be of type 'record'`
+        };
+      }
+      if (keyOfModuleSource && typeof keyOfModuleSource === "object" && key in keyOfModuleSource) {
+        return {
+          error: false
+        };
+      }
+      if (!keyOfModuleSource || typeof keyOfModuleSource !== "object") {
+        return {
+          error: true,
+          message: `Expected ${sourcePath} to be a truthy object`
+        };
+      }
+      return {
+        error: true,
+        message: `Key '${key}' does not exist in ${sourcePath}.`
+      };
+    };
     const errors = {};
     const files = {};
     const entries = Object.entries(schemas);
@@ -1683,8 +1710,20 @@ class ValOps {
       }
       for (const [sourcePathS, validationErrors] of Object.entries(res)) {
         const sourcePath = sourcePathS;
+        const addError = validationError => {
+          if (!errors[path]) {
+            errors[path] = {
+              validations: {}
+            };
+          }
+          if (!errors[path].validations[sourcePath]) {
+            errors[path].validations[sourcePath] = [];
+          }
+          errors[path].validations[sourcePath].push(validationError);
+        };
         if (validationErrors) {
           for (const validationError of validationErrors) {
+            var _validationError$fixe;
             if (isOnlyFileCheckValidationError(validationError)) {
               if (files[sourcePath]) {
                 throw new Error("Cannot have multiple files with same path. Path: " + sourcePath + "; Module: " + path);
@@ -1693,16 +1732,48 @@ class ValOps {
               if (isFileSource(value)) {
                 files[sourcePath] = value;
               }
-            } else {
-              if (!errors[path]) {
-                errors[path] = {
-                  validations: {}
-                };
-              }
-              if (!errors[path].validations[sourcePath]) {
-                errors[path].validations[sourcePath] = [];
+            } else if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.includes("keyof:check-keys")) {
+              const TYPE_ERROR_MESSAGE = `This is most likely a Val version mismatch or Val bug.`;
+              if (!validationError.value) {
+                addError({
+                  message: `Could not find a value for keyOf at ${sourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                  // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                  typeError: true
+                });
+              } else {
+                if (typeof validationError.value !== "object") {
+                  addError({
+                    message: `Expected keyOf validation error to have a 'value' property of type 'object'. Found: ${typeof validationError.value}. ${TYPE_ERROR_MESSAGE}`,
+                    // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                    typeError: true
+                  });
+                } else {
+                  const key = "key" in validationError.value && validationError.value.key;
+                  const validationErrorSourcePath = "sourcePath" in validationError.value && validationError.value.sourcePath;
+                  if (typeof key !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'key' of type 'string'. Found: ${typeof key}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else if (typeof validationErrorSourcePath !== "string") {
+                    addError({
+                      message: `Expected keyOf validation error 'value' to have property 'sourcePath' of type 'string'. Found: ${typeof validationErrorSourcePath}. ${TYPE_ERROR_MESSAGE}`,
+                      // Not sure this is a type error, but it shouldn't happen in a normally functioning Val system
+                      typeError: true
+                    });
+                  } else {
+                    const res = await checkKeyIsValid(key, validationErrorSourcePath);
+                    if (res.error) {
+                      addError({
+                        message: res.message
+                      });
+                    }
+                  }
+                }
               }
-              errors[path].validations[sourcePath].push(validationError);
+            } else {
+              addError(validationError);
             }
           }
         }
@@ -2200,8 +2271,8 @@ class ValOps {
   // #region abstract ops
 }
 function isOnlyFileCheckValidationError(validationError) {
-  var _validationError$fixe;
-  if ((_validationError$fixe = validationError.fixes) !== null && _validationError$fixe !== void 0 && _validationError$fixe.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
+  var _validationError$fixe2;
+  if ((_validationError$fixe2 = validationError.fixes) !== null && _validationError$fixe2 !== void 0 && _validationError$fixe2.every(f => f === "file:check-metadata" || f === "image:check-metadata")) {
     return true;
   }
   return false;

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.72.1",
+  "version": "0.72.2",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -23,9 +23,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.72.1",
-    "@valbuild/shared": "~0.72.1",
-    "@valbuild/ui": "~0.72.1",
+    "@valbuild/core": "~0.72.2",
+    "@valbuild/shared": "~0.72.2",
+    "@valbuild/ui": "~0.72.2",
     "chokidar": "^4.0.1",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",