@valbuild/core 0.83.0 → 0.84.1

package/dist/{index-6b263f20.cjs.prod.js → index-0bd0c826.cjs.prod.js}

@@ -191,7 +191,7 @@ var Schema = /*#__PURE__*/function () {
   }
   return _createClass(Schema, [{
     key: "executeCustomValidateFunctions",
-    value: function executeCustomValidateFunctions(src, customValidateFunctions) {
+    value: function executeCustomValidateFunctions(src, customValidateFunctions, ctx) {
       var errors = [];
       var _iterator = result._createForOfIteratorHelper(customValidateFunctions),
         _step;
@@ -199,7 +199,7 @@ var Schema = /*#__PURE__*/function () {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var customValidateFunction = _step.value;
           try {
-            var result$1 = customValidateFunction(src);
+            var result$1 = customValidateFunction(src, ctx);
             if (result$1) {
               errors.push({
                 message: result$1,
@@ -405,7 +405,9 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -668,6 +670,170 @@ function unsafeCreateSourcePath(path, itemKey) {
   return "".concat(path).concat(Internal.ModuleFilePathSep).concat(JSON.stringify(itemKey));
 }
 
+var StringSchema = /*#__PURE__*/function (_Schema) {
+  function StringSchema(options) {
+    var _this;
+    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var isRaw = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+    _classCallCheck(this, StringSchema);
+    _this = _callSuper(this, StringSchema);
+    _this.options = options;
+    _this.opt = opt;
+    _this.isRaw = isRaw;
+    _this.customValidateFunctions = customValidateFunctions;
+    return _this;
+  }
+
+  /**
+   * @deprecated Use `minLength` instead
+   */
+  _inherits(StringSchema, _Schema);
+  return _createClass(StringSchema, [{
+    key: "min",
+    value: function min(minLength) {
+      return this.minLength(minLength);
+    }
+  }, {
+    key: "minLength",
+    value: function minLength(_minLength) {
+      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        minLength: _minLength
+      }), this.opt, this.isRaw);
+    }
+
+    /**
+     * @deprecated Use `maxLength` instead
+     */
+  }, {
+    key: "max",
+    value: function max(maxLength) {
+      return this.maxLength(maxLength);
+    }
+  }, {
+    key: "maxLength",
+    value: function maxLength(_maxLength) {
+      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        maxLength: _maxLength
+      }), this.opt, this.isRaw);
+    }
+  }, {
+    key: "regexp",
+    value: function regexp(_regexp, message) {
+      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        regexp: _regexp,
+        regExpMessage: message
+      }), this.opt, this.isRaw);
+    }
+  }, {
+    key: "validate",
+    value: function validate(validationFunction) {
+      return new StringSchema(this.options, this.opt, this.isRaw, this.customValidateFunctions.concat(validationFunction));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var _this$options, _this$options2, _this$options3;
+      var errors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
+      if (this.opt && (src === null || src === undefined)) {
+        return errors.length > 0 ? _defineProperty({}, path, errors) : false;
+      }
+      if (typeof src !== "string") {
+        return _defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(_typeof(src), "'"),
+          value: src
+        }]);
+      }
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.maxLength && src.length > this.options.maxLength) {
+        errors.push({
+          message: "Expected string to be at most ".concat(this.options.maxLength, " characters long, got ").concat(src.length),
+          value: src
+        });
+      }
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.minLength && src.length < this.options.minLength) {
+        errors.push({
+          message: "Expected string to be at least ".concat(this.options.minLength, " characters long, got ").concat(src.length),
+          value: src
+        });
+      }
+      if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.regexp && !this.options.regexp.test(src)) {
+        errors.push({
+          message: this.options.regExpMessage || "Expected string to match reg exp: ".concat(this.options.regexp.toString(), ", got '").concat(src, "'"),
+          value: src
+        });
+      }
+      if (errors.length > 0) {
+        return _defineProperty({}, path, errors);
+      }
+      return false;
+    }
+  }, {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
+      if (this.opt && src === null) {
+        return {
+          success: true,
+          data: src
+        };
+      }
+      if (typeof src === "string") {
+        return {
+          success: true,
+          data: src
+        };
+      }
+      return {
+        success: false,
+        errors: _defineProperty({}, path, [{
+          message: "Expected 'string', got '".concat(_typeof(src), "'"),
+          typeError: true
+        }])
+      };
+    }
+  }, {
+    key: "nullable",
+    value: function nullable() {
+      return new StringSchema(this.options, true, this.isRaw);
+    }
+  }, {
+    key: "raw",
+    value: function raw() {
+      return new StringSchema(this.options, this.opt, true);
+    }
+  }, {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$options4, _this$options5, _this$options6, _this$customValidateF, _this$customValidateF2;
+      return {
+        type: "string",
+        options: {
+          maxLength: (_this$options4 = this.options) === null || _this$options4 === void 0 ? void 0 : _this$options4.maxLength,
+          minLength: (_this$options5 = this.options) === null || _this$options5 === void 0 ? void 0 : _this$options5.minLength,
+          regexp: ((_this$options6 = this.options) === null || _this$options6 === void 0 ? void 0 : _this$options6.regexp) && {
+            message: this.options.regExpMessage,
+            source: this.options.regexp.source,
+            flags: this.options.regexp.flags
+          },
+          customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
+        },
+        opt: this.opt,
+        raw: this.isRaw,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF2 = this.customValidateFunctions) === null || _this$customValidateF2 === void 0 ? void 0 : _this$customValidateF2.length) > 0
+      };
+    }
+  }, {
+    key: "executeRender",
+    value: function executeRender() {
+      return {};
+    }
+  }]);
+}(Schema);
+var string = function string(options) {
+  return new StringSchema(options);
+};
+
 var ObjectSchema = /*#__PURE__*/function (_Schema) {
   function ObjectSchema(items) {
     var _this;
@@ -690,7 +856,9 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
     key: "executeValidate",
     value: function executeValidate(path, src) {
       var error = false;
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -850,6 +1018,11 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
 var object = function object(schema) {
   return new ObjectSchema(schema);
 };
+object({
+  get test() {
+    return string();
+  }
+});
 
 var ArraySchema = /*#__PURE__*/function (_Schema) {
   function ArraySchema(item) {
@@ -1047,7 +1220,9 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -1149,7 +1324,9 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       var unknownSrc = src;
       if (this.opt && unknownSrc === null) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
@@ -1542,7 +1719,9 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -1769,7 +1948,9 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       var assertRes = this.executeAssert(path, src);
       if (!assertRes.success) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : assertRes.errors;
@@ -2197,12 +2378,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var currentRouter = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "renderInput", null);
     _this.item = item;
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
+    _this.currentRouter = currentRouter;
     return _this;
   }
   _inherits(RecordSchema, _Schema);
@@ -2216,7 +2399,9 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     value: function executeValidate(path, src) {
       var _this2 = this;
       var error = false;
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -2235,6 +2420,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
           message: "Expected 'object', got 'array'"
         }]));
       }
+      var routerValidations = this.getRouterValidations(path, src);
+      if (routerValidations) {
+        return routerValidations;
+      }
       var _iterator = result._createForOfIteratorHelper(customValidationErrors),
         _step;
       try {
@@ -2304,14 +2493,62 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     value: function nullable() {
       return new RecordSchema(this.item, true);
     }
+  }, {
+    key: "router",
+    value: function router(_router) {
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router);
+    }
+  }, {
+    key: "getRouterValidations",
+    value: function getRouterValidations(path, src) {
+      if (!this.currentRouter) {
+        return false;
+      }
+      if (src === null) {
+        return false;
+      }
+      var _splitModuleFilePathA = splitModuleFilePathAndModulePath(path),
+        _splitModuleFilePathA2 = _slicedToArray(_splitModuleFilePathA, 2),
+        moduleFilePath = _splitModuleFilePathA2[0],
+        modulePath = _splitModuleFilePathA2[1];
+      if (modulePath) {
+        return _defineProperty({}, path, [{
+          message: "This field was configured as a router, but it is not defined at the root of the module",
+          schemaError: true
+        }]);
+      }
+      var routerValidations = this.currentRouter.validate(moduleFilePath, Object.keys(src));
+      if (routerValidations.length > 0) {
+        return Object.fromEntries(routerValidations.map(function (validation) {
+          if (!validation.error.urlPath) {
+            return [path, [{
+              message: "Router validation error: ".concat(validation.error.message, " has no url path"),
+              schemaError: true
+            }]];
+          }
+          var subPath = createValPathOfItem(path, validation.error.urlPath);
+          if (!subPath) {
+            return [path, [{
+              message: "Could not create path for router validation error",
+              schemaError: true
+            }]];
+          }
+          return [subPath, [{
+            message: validation.error.message
+          }]];
+        }));
+      }
+      return false;
+    }
   }, {
     key: "executeSerialize",
     value: function executeSerialize() {
-      var _this$customValidateF;
+      var _this$currentRouter, _this$customValidateF;
       return {
         type: "record",
         item: this.item["executeSerialize"](),
         opt: this.opt,
+        router: (_this$currentRouter = this.currentRouter) === null || _this$currentRouter === void 0 ? void 0 : _this$currentRouter.getRouterId(),
         customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
@@ -2350,10 +2587,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
             data: {
               layout: "list",
               parent: "record",
-              items: Object.entries(src).map(function (_ref7) {
-                var _ref8 = _slicedToArray(_ref7, 2),
-                  key = _ref8[0],
-                  val = _ref8[1];
+              items: Object.entries(src).map(function (_ref8) {
+                var _ref9 = _slicedToArray(_ref8, 2),
+                  key = _ref9[0],
+                  val = _ref9[1];
                 // NB NB: display is actually defined by the user
                 var _prepare = prepare({
                     key: key,
@@ -2913,7 +3150,9 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
     key: "executeValidate",
     value: function executeValidate(path, src) {
       var _this$options, _this$options2;
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -3013,168 +3252,6 @@ var number = function number(options) {
   return new NumberSchema(options);
 };
 
-var StringSchema = /*#__PURE__*/function (_Schema) {
-  function StringSchema(options) {
-    var _this;
-    var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    var isRaw = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    _classCallCheck(this, StringSchema);
-    _this = _callSuper(this, StringSchema);
-    _this.options = options;
-    _this.opt = opt;
-    _this.isRaw = isRaw;
-    _this.customValidateFunctions = customValidateFunctions;
-    return _this;
-  }
-
-  /**
-   * @deprecated Use `minLength` instead
-   */
-  _inherits(StringSchema, _Schema);
-  return _createClass(StringSchema, [{
-    key: "min",
-    value: function min(minLength) {
-      return this.minLength(minLength);
-    }
-  }, {
-    key: "minLength",
-    value: function minLength(_minLength) {
-      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        minLength: _minLength
-      }), this.opt, this.isRaw);
-    }
-
-    /**
-     * @deprecated Use `maxLength` instead
-     */
-  }, {
-    key: "max",
-    value: function max(maxLength) {
-      return this.maxLength(maxLength);
-    }
-  }, {
-    key: "maxLength",
-    value: function maxLength(_maxLength) {
-      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        maxLength: _maxLength
-      }), this.opt, this.isRaw);
-    }
-  }, {
-    key: "regexp",
-    value: function regexp(_regexp, message) {
-      return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        regexp: _regexp,
-        regExpMessage: message
-      }), this.opt, this.isRaw);
-    }
-  }, {
-    key: "validate",
-    value: function validate(validationFunction) {
-      return new StringSchema(this.options, this.opt, this.isRaw, this.customValidateFunctions.concat(validationFunction));
-    }
-  }, {
-    key: "executeValidate",
-    value: function executeValidate(path, src) {
-      var _this$options, _this$options2, _this$options3;
-      var errors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
-      if (this.opt && (src === null || src === undefined)) {
-        return errors.length > 0 ? _defineProperty({}, path, errors) : false;
-      }
-      if (typeof src !== "string") {
-        return _defineProperty({}, path, [{
-          message: "Expected 'string', got '".concat(_typeof(src), "'"),
-          value: src
-        }]);
-      }
-      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.maxLength && src.length > this.options.maxLength) {
-        errors.push({
-          message: "Expected string to be at most ".concat(this.options.maxLength, " characters long, got ").concat(src.length),
-          value: src
-        });
-      }
-      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.minLength && src.length < this.options.minLength) {
-        errors.push({
-          message: "Expected string to be at least ".concat(this.options.minLength, " characters long, got ").concat(src.length),
-          value: src
-        });
-      }
-      if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.regexp && !this.options.regexp.test(src)) {
-        errors.push({
-          message: this.options.regExpMessage || "Expected string to match reg exp: ".concat(this.options.regexp.toString(), ", got '").concat(src, "'"),
-          value: src
-        });
-      }
-      if (errors.length > 0) {
-        return _defineProperty({}, path, errors);
-      }
-      return false;
-    }
-  }, {
-    key: "executeAssert",
-    value: function executeAssert(path, src) {
-      if (this.opt && src === null) {
-        return {
-          success: true,
-          data: src
-        };
-      }
-      if (typeof src === "string") {
-        return {
-          success: true,
-          data: src
-        };
-      }
-      return {
-        success: false,
-        errors: _defineProperty({}, path, [{
-          message: "Expected 'string', got '".concat(_typeof(src), "'"),
-          typeError: true
-        }])
-      };
-    }
-  }, {
-    key: "nullable",
-    value: function nullable() {
-      return new StringSchema(this.options, true, this.isRaw);
-    }
-  }, {
-    key: "raw",
-    value: function raw() {
-      return new StringSchema(this.options, this.opt, true);
-    }
-  }, {
-    key: "executeSerialize",
-    value: function executeSerialize() {
-      var _this$options4, _this$options5, _this$options6, _this$customValidateF, _this$customValidateF2;
-      return {
-        type: "string",
-        options: {
-          maxLength: (_this$options4 = this.options) === null || _this$options4 === void 0 ? void 0 : _this$options4.maxLength,
-          minLength: (_this$options5 = this.options) === null || _this$options5 === void 0 ? void 0 : _this$options5.minLength,
-          regexp: ((_this$options6 = this.options) === null || _this$options6 === void 0 ? void 0 : _this$options6.regexp) && {
-            message: this.options.regExpMessage,
-            source: this.options.regexp.source,
-            flags: this.options.regexp.flags
-          },
-          customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
-        },
-        opt: this.opt,
-        raw: this.isRaw,
-        customValidate: this.customValidateFunctions && ((_this$customValidateF2 = this.customValidateFunctions) === null || _this$customValidateF2 === void 0 ? void 0 : _this$customValidateF2.length) > 0
-      };
-    }
-  }, {
-    key: "executeRender",
-    value: function executeRender() {
-      return {};
-    }
-  }]);
-}(Schema);
-var string = function string(options) {
-  return new StringSchema(options);
-};
-
 var BooleanSchema = /*#__PURE__*/function (_Schema) {
   function BooleanSchema() {
     var _this;
@@ -3286,7 +3363,9 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "executeValidate",
     value: function executeValidate(path, src) {
-      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions, {
+        path: path
+      });
       if (this.opt && (src === null || src === undefined)) {
         return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
@@ -3298,7 +3377,8 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
       var serializedSchema = this.schema;
       if (!(serializedSchema.type === "object" || serializedSchema.type === "record")) {
         return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
-          message: "Schema in keyOf must be an 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          message: "Schema in keyOf must be an 'object' or 'record'. Found '".concat(serializedSchema.type || "unknown", "'")
         }]));
       }
       if (serializedSchema.opt && (src === null || src === undefined)) {
@@ -3310,7 +3390,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
         }]));
       }
       if (serializedSchema.type === "object") {
-        var keys = Object.keys(serializedSchema.items);
+        var keys = serializedSchema.keys;
         if (!keys.includes(src)) {
           return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Value of keyOf (object) must be: ".concat(keys.join(", "), ". Found: ").concat(src)
@@ -3370,7 +3450,8 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
         return {
           success: false,
           errors: _defineProperty({}, path, [{
-            message: "Schema of first argument must be either: 'array', 'object' or 'record'. Found '".concat(serializedSchema.type, "'"),
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            message: "Schema of first argument must be either: 'array', 'object' or 'record'. Found '".concat(serializedSchema.type || "unknown", "'"),
             typeError: true
           }])
         };
@@ -3388,7 +3469,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
       // and there it also makes sense to check the actual string values (i.e. that it is not just a string) since
       // missing one would lead to a runtime error. At least this is what we are thinking currently.
       if (serializedSchema.type === "object") {
-        var keys = Object.keys(serializedSchema.items);
+        var keys = serializedSchema.keys;
         if (!keys.includes(src)) {
           return {
             success: false,
@@ -3427,10 +3508,11 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
           values = "string";
           break;
         case "object":
-          values = Object.keys(serializedSchema.items);
+          values = serializedSchema.keys;
           break;
         default:
-          throw new Error("Cannot serialize keyOf schema with selector of type '".concat(serializedSchema.type, "'. keyOf must be used with a Val Module."));
+          throw new Error(// eslint-disable-next-line @typescript-eslint/no-explicit-any
+          "Cannot serialize keyOf schema with selector of type '".concat(serializedSchema.type || "unknown", "'"));
       }
       return {
         type: "keyOf",
@@ -3449,8 +3531,27 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
   }]);
 }(Schema);
 var keyOf = function keyOf(valModule) {
-  var _valModule$GetSchema;
-  return new KeyOfSchema(valModule === null || valModule === void 0 || (_valModule$GetSchema = valModule[GetSchema]) === null || _valModule$GetSchema === void 0 ? void 0 : _valModule$GetSchema["executeSerialize"](), getValPath(valModule));
+  var refSchema = valModule === null || valModule === void 0 ? void 0 : valModule[GetSchema];
+  var serializedRefSchema = undefined;
+  if (refSchema instanceof ObjectSchema) {
+    var keys = [];
+    try {
+      keys = Object.keys((refSchema === null || refSchema === void 0 ? void 0 : refSchema["items"]) || {});
+    } catch (e) {
+      // ignore this error here
+    }
+    serializedRefSchema = {
+      type: "object",
+      keys: keys,
+      opt: refSchema === null || refSchema === void 0 ? void 0 : refSchema["opt"]
+    };
+  } else if (refSchema instanceof RecordSchema) {
+    serializedRefSchema = {
+      type: "record",
+      opt: refSchema === null || refSchema === void 0 ? void 0 : refSchema["opt"]
+    };
+  }
+  return new KeyOfSchema(serializedRefSchema, getValPath(valModule));
 };
 
 var DateSchema = /*#__PURE__*/function (_Schema) {
@@ -4292,6 +4393,7 @@ var EXT_TO_MIME_TYPES = {
   aam: "application/x-authorware-map",
   aas: "application/x-authorware-seg",
   air: "application/vnd.adobe.air-application-installer-package+zip",
+  avif: "image/avif",
   swf: "application/x-shockwave-flash",
   fxp: "application/vnd.adobe.fxp",
   pdf: "application/pdf",
@@ -5089,6 +5191,193 @@ function deserializeSchema(serialized) {
   }
 }
 
+// Helper function to validate a URL path against a route pattern
+function validateUrlAgainstPattern(urlPath, routePattern) {
+  // Remove leading slash and split URL path
+  var urlSegments = urlPath.startsWith("/") ? urlPath.slice(1).split("/") : urlPath.split("/");
+
+  // Handle empty patterns (root route)
+  if (routePattern.length === 0) {
+    return {
+      isValid: urlSegments.length === 0 || urlSegments.length === 1 && urlSegments[0] === "",
+      expectedPath: "/"
+    };
+  }
+
+  // Check if segment counts match (accounting for optional segments and catch-all)
+  var minSegments = 0;
+  var maxSegments = 0;
+  var hasCatchAll = false;
+  var catchAllIndex = -1;
+  for (var i = 0; i < routePattern.length; i++) {
+    var segment = routePattern[i];
+    if (segment.startsWith("[[") && segment.endsWith("]]")) {
+      // Optional catch-all segment
+      hasCatchAll = true;
+      catchAllIndex = i;
+      maxSegments = Infinity;
+    } else if (segment.startsWith("[...") && segment.endsWith("]")) {
+      // Required catch-all segment
+      hasCatchAll = true;
+      catchAllIndex = i;
+      minSegments++;
+      maxSegments = Infinity;
+    } else if (segment.startsWith("[[") && segment.endsWith("]")) {
+      // Optional segment
+      maxSegments++;
+    } else if (segment.startsWith("[") && segment.endsWith("]")) {
+      // Required segment
+      minSegments++;
+      maxSegments++;
+    } else {
+      // Static segment
+      minSegments++;
+      maxSegments++;
+    }
+  }
+
+  // Check segment count
+  if (urlSegments.length < minSegments || !hasCatchAll && urlSegments.length > maxSegments) {
+    var expectedSegments = routePattern.map(function (seg) {
+      if (seg.startsWith("[[") && seg.endsWith("]]")) {
+        return "[optional:".concat(seg.slice(2, -2), "]");
+      } else if (seg.startsWith("[...") && seg.endsWith("]")) {
+        return "[...".concat(seg.slice(4, -1), "]");
+      } else if (seg.startsWith("[[") && seg.endsWith("]")) {
+        return "[optional:".concat(seg.slice(2, -1), "]");
+      } else if (seg.startsWith("[") && seg.endsWith("]")) {
+        return "[".concat(seg.slice(1, -1), "]");
+      }
+      return seg;
+    }).join("/");
+    return {
+      isValid: false,
+      expectedPath: "/".concat(expectedSegments)
+    };
+  }
+
+  // Validate each segment up to the catch-all or the end of the pattern
+  var segmentsToValidate = hasCatchAll ? catchAllIndex : routePattern.length;
+  for (var _i = 0; _i < segmentsToValidate; _i++) {
+    var patternSegment = routePattern[_i];
+    var urlSegment = urlSegments[_i];
+
+    // Handle optional segments
+    if (patternSegment.startsWith("[[") && patternSegment.endsWith("]]")) {
+      // Optional segment - can be empty or match
+      if (urlSegment !== "" && urlSegment !== undefined) {
+        // If provided, validate it's not empty
+        if (urlSegment === "") {
+          return {
+            isValid: false,
+            expectedPath: "/".concat(routePattern.join("/"))
+          };
+        }
+      }
+    } else if (patternSegment.startsWith("[") && patternSegment.endsWith("]")) {
+      // Required dynamic segment - just check it's not empty
+      if (urlSegment === "" || urlSegment === undefined) {
+        return {
+          isValid: false,
+          expectedPath: "/".concat(routePattern.join("/"))
+        };
+      }
+    } else {
+      // Static segment - must match exactly
+      if (patternSegment !== urlSegment) {
+        return {
+          isValid: false,
+          expectedPath: "/".concat(routePattern.join("/"))
+        };
+      }
+    }
+  }
+  return {
+    isValid: true
+  };
+}
+
+// This router should not be in core package
+var nextAppRouter = {
+  getRouterId: function getRouterId() {
+    return "next-app-router";
+  },
+  validate: function validate(moduleFilePath, urlPaths) {
+    var routePattern = parseNextJsRoutePattern(moduleFilePath);
+    var errors = [];
+    var _iterator = result._createForOfIteratorHelper(urlPaths),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var urlPath = _step.value;
+        var validation = validateUrlAgainstPattern(urlPath, routePattern);
+        if (!validation.isValid) {
+          errors.push({
+            error: {
+              message: "URL path \"".concat(urlPath, "\" does not match the route pattern for \"").concat(moduleFilePath, "\""),
+              urlPath: urlPath,
+              expectedPath: validation.expectedPath || null
+            }
+          });
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return errors;
+  }
+};
+
+/**
+ * Parse Next.js route pattern from file path
+ * Support multiple Next.js app directory structures:
+ * - /app/blogs/[blog]/page.val.ts -> ["blogs", "[blog]"]
+ * - /src/app/blogs/[blog]/page.val.ts -> ["blogs", "[blog]"]
+ * - /pages/blogs/[blog].tsx -> ["blogs", "[blog]"] (Pages Router)
+ * - /app/(group)/blogs/[blog]/page.val.ts -> ["blogs", "[blog]"] (with groups)
+ * - /app/(.)feed/page.val.ts -> ["feed"] (interception route)
+ * - /app/(..)(dashboard)/feed/page.val.ts -> ["feed"] (interception route)
+ */
+function parseNextJsRoutePattern(moduleFilePath) {
+  if (!moduleFilePath || typeof moduleFilePath !== "string") {
+    return [];
+  }
+
+  // Try App Router patterns first
+  var appRouterPatterns = [/\/app\/(.+)\/page\.val\.ts$/,
+  // /app/...
+  /\/src\/app\/(.+)\/page\.val\.ts$/,
+  // /src/app/...
+  /\/app\/(.+)\/page\.tsx?$/,
+  // /app/... with .tsx
+  /\/src\/app\/(.+)\/page\.tsx?$/ // /src/app/... with .tsx
+  ];
+  for (var _i2 = 0, _appRouterPatterns = appRouterPatterns; _i2 < _appRouterPatterns.length; _i2++) {
+    var pattern = _appRouterPatterns[_i2];
+    var match = moduleFilePath.match(pattern);
+    if (match) {
+      var routePath = match[1];
+      // Remove group and interception segments
+      // Group: (group), Interception: (.), (..), (..)(dashboard), etc.
+      return routePath.split("/").flatMap(function (segment) {
+        // Remove group segments (but not interception segments)
+        if (segment.startsWith("(") && segment.endsWith(")") && !segment.includes(".")) return [];
+        // Interception segments: (.)feed, (..)(dashboard)/feed, etc.
+        // If segment starts with (.) or (..), strip the interception marker and keep the rest
+        var interceptionMatch = segment.match(/^(\([.]+\)(\(.+\))?)(.*)$/);
+        if (interceptionMatch) {
+          var rest = interceptionMatch[3] || interceptionMatch[4];
+          return rest ? [rest] : [];
+        }
+        return [segment];
+      });
+    }
+  }
+  return [];
+}
+
 var ModuleFilePathSep = "?p=";
 var FATAL_ERROR_TYPES = ["no-schema", "no-source", "invalid-id", "no-module", "invalid-patch"];
 var DEFAULT_CONTENT_HOST = "https://content.val.build";
@@ -5113,6 +5402,7 @@ var Internal = {
   safeResolvePath: safeResolvePath,
   splitModuleFilePathAndModulePath: splitModuleFilePathAndModulePath,
   joinModuleFilePathAndModulePath: joinModuleFilePathAndModulePath,
+  nextAppRouter: nextAppRouter,
   remote: {
     createRemoteRef: createRemoteRef,
     getValidationBasis: getValidationBasis,