@valbuild/core 0.79.3 → 0.80.0

package/dist/{index-1d5e4912.esm.js → index-bcc230b2.esm.js}

@@ -188,6 +188,53 @@ var Schema = /*#__PURE__*/function () {
     _classCallCheck(this, Schema);
   }
   return _createClass(Schema, [{
+    key: "executeCustomValidateFunctions",
+    value: function executeCustomValidateFunctions(src, customValidateFunctions) {
+      var errors = [];
+      var _iterator = _createForOfIteratorHelper(customValidateFunctions),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var customValidateFunction = _step.value;
+          try {
+            var result = customValidateFunction(src);
+            if (result) {
+              errors.push({
+                message: result,
+                value: src
+              });
+            }
+          } catch (err) {
+            errors.push({
+              message: "Error in custom validate function: ".concat(err instanceof Error ? err.message : String(err)),
+              value: src,
+              schemaError: true
+            });
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return errors;
+    }
+    /**
+     * Check if the **root** **type** of source is correct.
+     *
+     * The difference between assert and validate is:
+     * - assert verifies that the root **type** of the source is correct (it does not recurse down). Therefore, assert can be used as a runtime type check.
+     * - validate checks the **value** of the source in addition to the type. It recurses down the source.
+     *
+     * For example assert fails for a StringSchema if the source is not a string,
+     * it will not fail if the length is not correct.
+     * Validate will check the length and all other constraints.
+     *
+     * Assert is useful if you have a generic schema and need to make sure the root type is valid.
+     * When using assert, you must assert recursively if you want to verify the entire source.
+     * For example, if you have an object schema, you must assert each key / value pair manually.
+     */
+  }, {
     key: "appendValidationError",
     value:
     // remote(): Src extends RemoteCompatibleSource
@@ -198,24 +245,27 @@ var Schema = /*#__PURE__*/function () {
     // }
 
     /** MUTATES! since internal and perf sensitive */
-    function appendValidationError(current, path, message, value) {
+    function appendValidationError(current, path, message, value, schemaError) {
       if (current) {
         if (current[path]) {
           current[path].push({
             message: message,
-            value: value
+            value: value,
+            schemaError: schemaError
           });
         } else {
           current[path] = [{
             message: message,
-            value: value
+            value: value,
+            schemaError: schemaError
           }];
         }
         return current;
       } else {
         return _defineProperty({}, path, [{
           message: message,
-          value: value
+          value: value,
+          schemaError: schemaError
         }]);
       }
     }
@@ -330,11 +380,13 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var isRemote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     _classCallCheck(this, FileSchema);
     _this = _callSuper(this, FileSchema);
     _this.options = options;
     _this.opt = opt;
     _this.isRemote = isRemote;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(FileSchema, _Schema);
@@ -345,60 +397,66 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
     }
   }, {
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new FileSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (src === null || src === undefined) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Non-optional file was null or undefined.",
           value: src
-        }]);
+        }]));
       }
       if (typeof src[FILE_REF_PROP] !== "string") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "File did not have a file reference string. Got: ".concat(_typeof(src[FILE_REF_PROP])),
           value: src
-        }]);
+        }]));
       }
       if (this.isRemote && src[VAL_EXTENSION] !== "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected a remote file, but got a local file.",
           value: src,
           fixes: ["file:upload-remote"]
-        }]);
+        }]));
       }
       if (this.isRemote && src[VAL_EXTENSION] === "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Remote file was not checked.",
           value: src,
           fixes: ["file:check-remote"]
-        }]);
+        }]));
       }
       if (!this.isRemote && src[VAL_EXTENSION] === "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected locale file, but found remote.",
           value: src,
           fixes: ["file:download-remote"]
-        }]);
+        }]));
       }
       if (src[VAL_EXTENSION] !== "file") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "File did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
           value: src,
           fixes: ["file:change-extension", "file:check-metadata"]
-        }]);
+        }]));
       }
-      var _ref7 = this.options || {},
-        accept = _ref7.accept;
-      var _ref8 = src.metadata || {},
-        mimeType = _ref8.mimeType;
+      var _ref8 = this.options || {},
+        accept = _ref8.accept;
+      var _ref9 = src.metadata || {},
+        mimeType = _ref9.mimeType;
       if (accept && mimeType && !mimeType.includes("/")) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Invalid mime type format. Got: ".concat(mimeType),
           value: src,
           fixes: ["file:change-extension", "file:check-metadata"]
-        }]);
+        }]));
       }
       if (accept && mimeType && mimeType.includes("/")) {
         var acceptedTypes = accept.split(",").map(function (type) {
@@ -415,45 +473,45 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
           return acceptedType === mimeType;
         });
         if (!isValidMimeType) {
-          return _defineProperty({}, path, [{
+          return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Mime type mismatch. Found '".concat(mimeType, "' but schema accepts '").concat(accept, "'"),
             value: src,
             fixes: ["file:change-extension", "file:check-metadata"]
-          }]);
+          }]));
         }
       }
       var fileMimeType = Internal.filenameToMimeType(src[FILE_REF_PROP]);
       if (!fileMimeType) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Could not determine mime type from file extension. Got: ".concat(src[FILE_REF_PROP]),
           value: src,
           fixes: ["file:change-extension", "file:check-metadata"]
-        }]);
+        }]));
       }
       if (fileMimeType !== mimeType) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
           value: src,
           fixes: ["file:change-extension", "file:check-metadata"]
-        }]);
+        }]));
       }
       if (src.metadata) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Found metadata, but it could not be validated. File metadata must be an object with the mimeType.",
           // These validation errors will have to be picked up by logic outside of this package and revalidated. Reasons: 1) we have to read files to verify the metadata, which is handled differently in different runtimes (Browser, QuickJS, Node.js); 2) we want to keep this package dependency free.
           value: src,
           fixes: ["file:check-metadata"]
-        }]);
+        }]));
       }
-      return _defineProperty({}, path, [{
+      return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
         message: "Missing File metadata.",
         value: src,
         fixes: ["file:add-metadata"]
-      }]);
+      }]));
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -507,13 +565,15 @@ var FileSchema = /*#__PURE__*/function (_Schema) {
       return new FileSchema(this.options, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "file",
         options: this.options,
         opt: this.opt,
-        remote: this.isRemote
+        remote: this.isRemote,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -610,22 +670,27 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
   function ObjectSchema(items) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, ObjectSchema);
     _this = _callSuper(this, ObjectSchema);
     _this.items = items;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(ObjectSchema, _Schema);
   return _createClass(ObjectSchema, [{
     key: "validate",
-    value: function validate(path, src) {
-      var _this2 = this;
+    value: function validate(validationFunction) {
+      return new ObjectSchema(this.items, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
       var error = false;
-
-      // TODO: src should never be undefined
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (src === null) {
         return _defineProperty({}, path, [{
@@ -641,29 +706,41 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
           message: "Expected 'object', got 'array'"
         }]);
       }
-      Object.entries(this.items).forEach(function (_ref4) {
-        var _ref5 = _slicedToArray(_ref4, 2),
-          key = _ref5[0],
-          schema = _ref5[1];
-        var subPath = createValPathOfItem(path, key);
+      var _iterator = _createForOfIteratorHelper(customValidationErrors),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var customValidationError = _step.value;
+          error = this.appendValidationError(error, path, customValidationError.message, src, customValidationError.schemaError);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      for (var _i = 0, _Object$entries = Object.entries(this.items); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+          _key = _Object$entries$_i[0],
+          schema = _Object$entries$_i[1];
+        var subPath = createValPathOfItem(path, _key);
         if (!subPath) {
-          error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(key),
+          error = this.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(_key),
           // Should! never happen
           src);
         } else {
-          var subError = schema.validate(subPath, src[key]);
+          var subError = schema["executeValidate"](subPath, src[_key]);
           if (subError && error) {
             error = _objectSpread2(_objectSpread2({}, subError), error);
           } else if (subError) {
             error = subError;
           }
         }
-      });
+      }
       return error;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -697,18 +774,18 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       var errorsAtPath = [];
-      for (var _i = 0, _Object$keys = Object.keys(this.items); _i < _Object$keys.length; _i++) {
-        var _key = _Object$keys[_i];
-        var subPath = createValPathOfItem(path, _key);
+      for (var _i2 = 0, _Object$keys = Object.keys(this.items); _i2 < _Object$keys.length; _i2++) {
+        var _key2 = _Object$keys[_i2];
+        var subPath = createValPathOfItem(path, _key2);
         if (!subPath) {
           errorsAtPath.push({
-            message: "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(_key),
+            message: "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(_key2),
             // Should! never happen
             internalError: true
           });
-        } else if (!(_key in src)) {
+        } else if (!(_key2 in src)) {
           errorsAtPath.push({
-            message: "Expected key '".concat(_key, "' not found in object"),
+            message: "Expected key '".concat(_key2, "' not found in object"),
             typeError: true
           });
         }
@@ -730,17 +807,19 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
       return new ObjectSchema(this.items, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "object",
-        items: Object.fromEntries(Object.entries(this.items).map(function (_ref6) {
-          var _ref7 = _slicedToArray(_ref6, 2),
-            key = _ref7[0],
-            schema = _ref7[1];
-          return [key, schema.serialize()];
+        items: Object.fromEntries(Object.entries(this.items).map(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 2),
+            key = _ref6[0],
+            schema = _ref6[1];
+          return [key, schema["executeSerialize"]()];
         })),
-        opt: this.opt
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -750,16 +829,16 @@ var ObjectSchema = /*#__PURE__*/function (_Schema) {
       if (src === null) {
         return res;
       }
-      for (var _key2 in this.items) {
-        var itemSrc = src[_key2];
+      for (var _key3 in this.items) {
+        var itemSrc = src[_key3];
         if (itemSrc === null || itemSrc === undefined) {
           continue;
         }
-        var subPath = unsafeCreateSourcePath(sourcePath, _key2);
-        var itemResult = this.items[_key2]["executePreview"](subPath, itemSrc);
+        var subPath = unsafeCreateSourcePath(sourcePath, _key3);
+        var itemResult = this.items[_key3]["executePreview"](subPath, itemSrc);
         for (var keyS in itemResult) {
-          var _key3 = keyS;
-          res[_key3] = itemResult[_key3];
+          var _key4 = keyS;
+          res[_key4] = itemResult[_key4];
         }
       }
       return res;
@@ -774,18 +853,25 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
   function ArraySchema(item) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, ArraySchema);
     _this = _callSuper(this, ArraySchema);
     _defineProperty(_this, "previewInput", null);
     _this.item = item;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(ArraySchema, _Schema);
   return _createClass(ArraySchema, [{
     key: "validate",
-    value: function validate(path, src) {
-      var assertRes = this.assert(path, src);
+    value: function validate(validationFunction) {
+      return new ArraySchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var assertRes = this.executeAssert(path, src);
       if (!assertRes.success) {
         return assertRes.errors;
       }
@@ -799,7 +885,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
           i = _Object$entries$_i[1];
         var subPath = unsafeCreateSourcePath(path, Number(idx));
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        var subError = this.item.validate(subPath, i);
+        var subError = this.item["executeValidate"](subPath, i);
         if (subError) {
           error = _objectSpread2(_objectSpread2({}, subError), error);
         }
@@ -810,8 +896,8 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       return error;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (src === null && this.opt) {
         return {
           success: true,
@@ -855,12 +941,14 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
       return new ArraySchema(this.item, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "array",
-        item: this.item.serialize(),
-        opt: this.opt
+        item: this.item["executeSerialize"](),
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -940,36 +1028,47 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
   function LiteralSchema(value) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, LiteralSchema);
     _this = _callSuper(this, LiteralSchema);
     _this.value = value;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(LiteralSchema, _Schema);
   return _createClass(LiteralSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new LiteralSchema(this.value, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (typeof src !== "string") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'string', got '".concat(_typeof(src), "'"),
           value: src
-        }]);
+        }]));
       }
       if (src !== this.value) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected literal '".concat(this.value, "', got '").concat(src, "'"),
           value: src
-        }]);
+        }]));
+      }
+      if (customValidationErrors.length > 0) {
+        return _defineProperty({}, path, customValidationErrors);
       }
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -1005,12 +1104,14 @@ var LiteralSchema = /*#__PURE__*/function (_Schema) {
       return new LiteralSchema(this.value, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "literal",
         value: this.value,
-        opt: this.opt
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -1028,80 +1129,87 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
   function UnionSchema(key, items) {
     var _this;
     var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     _classCallCheck(this, UnionSchema);
     _this = _callSuper(this, UnionSchema);
     _this.key = key;
     _this.items = items;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(UnionSchema, _Schema);
   return _createClass(UnionSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new UnionSchema(this.key, this.items, this.opt, this.customValidateFunctions.concat(validationFunction));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       var unknownSrc = src;
-      var errors = false;
       if (this.opt && unknownSrc === null) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (!this.key) {
-        return _defineProperty({}, path, [{
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Missing required first argument in union",
           schemaError: true
-        }]);
+        }]));
       }
       var key = this.key;
       if (!Array.isArray(this.items)) {
-        return _defineProperty({}, path, [{
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "A union schema must take more than 1 schema arguments",
           schemaError: true
-        }]);
+        }]));
       }
       if (typeof key === "string") {
         // tagged union
         if (this.items.some(function (item) {
           return !(item instanceof ObjectSchema);
         })) {
-          return _defineProperty({}, path, [{
+          return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Key is a string, so all schema items must be objects",
             schemaError: true
-          }]);
+          }]));
         }
         var objectSchemas = this.items;
         var serializedSchemas = objectSchemas.map(function (schema) {
-          return schema.serialize();
+          return schema["executeSerialize"]();
         });
         var illegalSchemas = serializedSchemas.filter(function (schema) {
           return !(schema.type === "object") || !(schema.items[key].type === "literal");
         });
         if (illegalSchemas.length > 0) {
-          return _defineProperty({}, path, [{
+          return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "All schema items must be objects with a key: ".concat(key, " that is a literal schema. Found: ").concat(JSON.stringify(illegalSchemas, null, 2)),
             schemaError: true
-          }]);
+          }]));
         }
         var serializedObjectSchemas = serializedSchemas;
         var optionalLiterals = serializedObjectSchemas.filter(function (schema) {
           return schema.items[key].opt;
         });
         if (optionalLiterals.length > 1) {
-          return _defineProperty({}, path, [{
+          return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Schema cannot have an optional keys: ".concat(key),
             schemaError: true
-          }]);
+          }]));
         }
         if (_typeof(unknownSrc) !== "object") {
-          return _defineProperty({}, path, [{
+          return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Expected an object",
             typeError: true
-          }]);
+          }]));
         }
         var objectSrc = unknownSrc;
         if (objectSrc[key] === undefined) {
-          return _defineProperty({}, path, [{
+          return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Missing required key: ".concat(key),
             typeError: true
-          }]);
+          }]));
         }
         var foundSchemaLiterals = [];
         var _iterator = _createForOfIteratorHelper(serializedObjectSchemas),
@@ -1114,10 +1222,10 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
               if (!foundSchemaLiterals.includes(schemaKey.value)) {
                 foundSchemaLiterals.push(schemaKey.value);
               } else {
-                return _defineProperty({}, path, [{
+                return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
                   message: "Found duplicate key in schema: ".concat(schemaKey.value),
                   schemaError: true
-                }]);
+                }]));
               }
             }
           }
@@ -1127,7 +1235,7 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
           _iterator.f();
         }
         var objectSchemaAtKey = objectSchemas.find(function (schema) {
-          return !schema.items[key].validate(path, objectSrc[key]);
+          return !schema["items"][key]["executeValidate"](path, objectSrc[key]);
         });
         if (!objectSchemaAtKey) {
           var keyPath = createValPathOfItem(path, key);
@@ -1146,7 +1254,7 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
             }).join(", "))
           }]);
         }
-        var error = objectSchemaAtKey.validate(path, objectSrc);
+        var error = objectSchemaAtKey["executeValidate"](path, objectSrc);
         if (error) {
           return error;
         }
@@ -1162,26 +1270,26 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         var literalItems = [key].concat(_toConsumableArray(this.items));
         if (typeof unknownSrc === "string") {
           var isMatch = literalItems.some(function (item) {
-            return !item.validate(path, unknownSrc);
+            return !item["executeValidate"](path, unknownSrc);
           });
           if (!isMatch) {
-            return _defineProperty({}, path, [{
+            return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
               message: "Union must match one of the following: ".concat(literalItems.map(function (item) {
-                return "\"".concat(item.value, "\"");
+                return "\"".concat(item["value"], "\"");
               }).join(", "))
-            }]);
+            }]));
           }
         }
       } else {
-        return _defineProperty({}, path, [{
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected a string or literal"
-        }]);
+        }]));
       }
-      return errors;
+      return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -1216,10 +1324,10 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         };
       }
       if (this.key instanceof LiteralSchema) {
-        var _ref13;
+        var _ref25;
         var success = false;
         var errors = {};
-        var _iterator2 = _createForOfIteratorHelper((_ref13 = [this.key]).concat.apply(_ref13, _toConsumableArray(this.items))),
+        var _iterator2 = _createForOfIteratorHelper((_ref25 = [this.key]).concat.apply(_ref25, _toConsumableArray(this.items))),
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -1240,7 +1348,7 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
               }];
               continue;
             }
-            var res = itemSchema.assert(path, src);
+            var res = itemSchema["executeAssert"](path, src);
             if (res.success) {
               success = true;
               break;
@@ -1280,7 +1388,7 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _itemSchema = _step3.value;
-            var _res = _itemSchema.assert(path, src);
+            var _res = _itemSchema["executeAssert"](path, src);
             if (_res.success) {
               _success = true;
               break;
@@ -1328,25 +1436,29 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
       return new UnionSchema(this.key, this.items, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF2;
       if (typeof this.key === "string") {
+        var _this$customValidateF;
         return {
           type: "union",
           key: this.key,
           items: this.items.map(function (o) {
-            return o.serialize();
+            return o["executeSerialize"]();
           }),
-          opt: this.opt
+          opt: this.opt,
+          customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
         };
       }
       return {
         type: "union",
-        key: this.key.serialize(),
+        key: this.key["executeSerialize"](),
         items: this.items.map(function (o) {
-          return o.serialize();
+          return o["executeSerialize"]();
         }),
-        opt: this.opt
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF2 = this.customValidateFunctions) === null || _this$customValidateF2 === void 0 ? void 0 : _this$customValidateF2.length) > 0
       };
     }
   }, {
@@ -1365,9 +1477,9 @@ var UnionSchema = /*#__PURE__*/function (_Schema) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         function (item) {
           if (item instanceof ObjectSchema) {
-            var itemKey = item.items[unionKey];
+            var itemKey = item["items"][unionKey];
             if (itemKey instanceof LiteralSchema) {
-              return _typeof(src) === "object" && unionKey in src && itemKey.value === src[unionKey];
+              return _typeof(src) === "object" && unionKey in src && itemKey["value"] === src[unionKey];
             }
           }
           return false;
@@ -1405,11 +1517,13 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var isRemote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     _classCallCheck(this, ImageSchema);
     _this = _callSuper(this, ImageSchema);
     _this.options = options;
     _this.opt = opt;
     _this.isRemote = isRemote;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(ImageSchema, _Schema);
@@ -1420,60 +1534,66 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
     }
   }, {
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new ImageSchema(this.options, this.opt, this.isRemote, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (src === null || src === undefined) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Non-optional image was null or undefined.",
           value: src
-        }]);
+        }]));
       }
       if (this.isRemote && src[VAL_EXTENSION] !== "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected a remote image, but got a local image.",
           value: src,
           fixes: ["image:upload-remote"]
-        }]);
+        }]));
       }
       if (this.isRemote && src[VAL_EXTENSION] === "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Remote image was not checked.",
           value: src,
           fixes: ["image:check-remote"]
-        }]);
+        }]));
       }
       if (!this.isRemote && src[VAL_EXTENSION] === "remote") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected locale image, but found remote.",
           value: src,
           fixes: ["image:download-remote"]
-        }]);
+        }]));
       }
       if (typeof src[FILE_REF_PROP] !== "string") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Image did not have a file reference string. Got: ".concat(_typeof(src[FILE_REF_PROP])),
           value: src
-        }]);
+        }]));
       }
       if (src[VAL_EXTENSION] !== "file") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Image did not have the valid file extension type. Got: ".concat(src[VAL_EXTENSION]),
           value: src,
           fixes: ["image:change-extension", "image:check-metadata"]
-        }]);
+        }]));
       }
-      var _ref7 = this.options || {},
-        accept = _ref7.accept;
-      var _ref8 = src.metadata || {},
-        mimeType = _ref8.mimeType;
+      var _ref8 = this.options || {},
+        accept = _ref8.accept;
+      var _ref9 = src.metadata || {},
+        mimeType = _ref9.mimeType;
       if (accept && mimeType && !mimeType.includes("/")) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Invalid mime type format. Got: '".concat(mimeType, "'"),
           value: src,
           fixes: ["image:check-metadata"]
-        }]);
+        }]));
       }
       if (accept && mimeType && mimeType.includes("/")) {
         var acceptedTypes = accept.split(",").map(function (type) {
@@ -1490,53 +1610,53 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
           return acceptedType === mimeType;
         });
         if (!isValidMimeType) {
-          return _defineProperty({}, path, [{
+          return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Mime type mismatch. Found '".concat(mimeType, "' but schema accepts '").concat(accept, "'"),
             value: src,
             fixes: ["image:check-metadata"]
-          }]);
+          }]));
         }
       }
       var fileMimeType = Internal.filenameToMimeType(src[FILE_REF_PROP]);
       if (!fileMimeType) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Could not determine mime type from file extension. Got: ".concat(src[FILE_REF_PROP]),
           value: src,
           fixes: ["image:check-metadata"]
-        }]);
+        }]));
       }
       if (fileMimeType && mimeType && fileMimeType !== mimeType) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Mime type and file extension not matching. Mime type is '".concat(mimeType, "' but file extension is '").concat(fileMimeType, "'"),
           value: src,
           fixes: ["image:check-metadata"]
-        }]);
+        }]));
       }
       if (src.metadata) {
         if (src.metadata.hotspot) {
           if (_typeof(src.metadata.hotspot) !== "object" || typeof src.metadata.hotspot.x !== "number" || typeof src.metadata.hotspot.y !== "number") {
-            return _defineProperty({}, path, [{
+            return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
               message: "Hotspot must be an object with x and y as numbers.",
               value: src
-            }]);
+            }]));
           }
         }
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Found metadata, but it could not be validated. Image metadata must be an object with the required props: width (positive number), height (positive number) and the mime type.",
           // These validation errors will have to be picked up by logic outside of this package and revalidated. Reasons: 1) we have to read files to verify the metadata, which is handled differently in different runtimes (Browser, QuickJS, Node.js); 2) we want to keep this package dependency free.
           value: src,
           fixes: ["image:check-metadata"]
-        }]);
+        }]));
       }
-      return _defineProperty({}, path, [{
+      return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
         message: "Could not validate Image metadata.",
         value: src,
         fixes: ["image:add-metadata"]
-      }]);
+      }]));
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -1590,13 +1710,15 @@ var ImageSchema = /*#__PURE__*/function (_Schema) {
       return new ImageSchema(this.options, true, this.isRemote);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "image",
         options: this.options,
         opt: this.opt,
-        remote: this.isRemote
+        remote: this.isRemote,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -1614,10 +1736,12 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
   function RichTextSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, RichTextSchema);
     _this = _callSuper(this, RichTextSchema);
     _this.options = options;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(RichTextSchema, _Schema);
@@ -1637,28 +1761,37 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
     }
   }, {
     key: "validate",
-    value: function validate(path, src) {
-      var assertRes = this.assert(path, src);
+    value: function validate(validationFunction) {
+      return new RichTextSchema(this.options, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
+      var assertRes = this.executeAssert(path, src);
       if (!assertRes.success) {
-        return _defineProperty({}, path, assertRes.errors[path]);
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : assertRes.errors;
       }
       var nodes = assertRes.data;
       if (nodes === null && this.opt) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (nodes === null) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'array', got 'null'",
           typeError: true
-        }]);
+        }]));
       }
       var current = {};
       var typeErrorRes = this.internalValidate(path, nodes, current);
       if (typeErrorRes) {
-        return typeErrorRes;
+        return customValidationErrors.length > 0 ? _objectSpread2(_defineProperty({}, path, customValidationErrors), typeErrorRes) : typeErrorRes;
       }
       if (Object.keys(current).length > 0) {
-        return current;
+        return customValidationErrors.length > 0 ? _objectSpread2(_defineProperty({}, path, customValidationErrors), current) : current;
+      }
+      if (customValidationErrors.length > 0) {
+        return _defineProperty({}, path, customValidationErrors);
       }
       return false;
     }
@@ -1755,7 +1888,7 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
                   }]);
                 }
                 var srcPath = unsafeCreateSourcePath(path, "src");
-                var imageValidationErrors = _typeof((_this2$options$inline4 = _this2.options.inline) === null || _this2$options$inline4 === void 0 ? void 0 : _this2$options$inline4.img) === "object" ? (_this2$options$inline5 = _this2.options.inline) === null || _this2$options$inline5 === void 0 ? void 0 : _this2$options$inline5.img.validate(srcPath, node.src) : new ImageSchema({}, false, false).validate(srcPath, node.src);
+                var imageValidationErrors = _typeof((_this2$options$inline4 = _this2.options.inline) === null || _this2$options$inline4 === void 0 ? void 0 : _this2$options$inline4.img) === "object" ? (_this2$options$inline5 = _this2.options.inline) === null || _this2$options$inline5 === void 0 ? void 0 : _this2$options$inline5.img["executeValidate"](srcPath, node.src) : new ImageSchema({}, false, false)["executeValidate"](srcPath, node.src);
                 if (imageValidationErrors) {
                   for (var validationErrorPathS in imageValidationErrors) {
                     var _current$validationEr;
@@ -1878,8 +2011,8 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -2026,8 +2159,9 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
       return new RichTextSchema(this.options, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       var serializedOptions = {
         maxLength: this.options.maxLength,
         minLength: this.options.minLength,
@@ -2035,13 +2169,14 @@ var RichTextSchema = /*#__PURE__*/function (_Schema) {
         block: this.options.block,
         inline: this.options.inline && {
           a: this.options.inline.a,
-          img: this.options.inline.img && _typeof(this.options.inline.img) === "object" ? this.options.inline.img.serialize() : this.options.inline.img
+          img: this.options.inline.img && _typeof(this.options.inline.img) === "object" ? this.options.inline.img["executeSerialize"]() : this.options.inline.img
         }
       };
       return {
         type: "richtext",
         opt: this.opt,
-        options: serializedOptions
+        options: serializedOptions,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -2059,48 +2194,68 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   function RecordSchema(item) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
     _defineProperty(_this, "previewInput", null);
     _this.item = item;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(RecordSchema, _Schema);
   return _createClass(RecordSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
       var _this2 = this;
       var error = false;
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (src === null) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'object', got 'null'"
-        }]);
+        }]));
       }
       if (_typeof(src) !== "object") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'object', got '".concat(_typeof(src), "'")
-        }]);
+        }]));
       }
       if (Array.isArray(src)) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'object', got 'array'"
-        }]);
+        }]));
       }
-      Object.entries(src).forEach(function (_ref4) {
-        var _ref5 = _slicedToArray(_ref4, 2),
-          key = _ref5[0],
-          elem = _ref5[1];
+      var _iterator = _createForOfIteratorHelper(customValidationErrors),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var customValidationError = _step.value;
+          error = this.appendValidationError(error, path, customValidationError.message, src, customValidationError.schemaError);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      Object.entries(src).forEach(function (_ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          elem = _ref6[1];
         var subPath = createValPathOfItem(path, key);
         if (!subPath) {
           error = _this2.appendValidationError(error, path, "Internal error: could not create path at ".concat(!path && typeof path === "string" ? "<empty string>" : path, " at key ").concat(elem),
           // Should! never happen
           src);
         } else {
-          var subError = _this2.item.validate(subPath, elem);
+          var subError = _this2.item["executeValidate"](subPath, elem);
           if (subError && error) {
             error = _objectSpread2(_objectSpread2({}, subError), error);
           } else if (subError) {
@@ -2111,8 +2266,8 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       return error;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -2148,12 +2303,14 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
       return new RecordSchema(this.item, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "record",
-        item: this.item.serialize(),
-        opt: this.opt
+        item: this.item["executeSerialize"](),
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -2191,10 +2348,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
             data: {
               layout: "list",
               parent: "record",
-              items: Object.entries(src).map(function (_ref6) {
-                var _ref7 = _slicedToArray(_ref6, 2),
-                  key = _ref7[0],
-                  val = _ref7[1];
+              items: Object.entries(src).map(function (_ref7) {
+                var _ref8 = _slicedToArray(_ref7, 2),
+                  key = _ref8[0],
+                  val = _ref8[1];
                 // NB NB: display is actually defined by the user
                 var _prepare = prepare({
                     key: key,
@@ -2314,6 +2471,7 @@ function resolvePath(path, valModule, schema) {
         throw Error("Unexpected undefined part");
       }
       if (isArraySchema(resolvedSchema)) {
+        var _resolvedSchema;
         if (Number.isNaN(Number(part))) {
           throw Error("Invalid path: array schema ".concat(JSON.stringify(resolvedSchema), " must have a number as path, but got ").concat(part, ". Path: ").concat(path));
         }
@@ -2321,8 +2479,9 @@ function resolvePath(path, valModule, schema) {
           throw Error("Schema type error: expected source to be type of array, but got ".concat(_typeof(resolvedSource)));
         }
         resolvedSource = resolvedSource[part];
-        resolvedSchema = resolvedSchema.item;
+        resolvedSchema = resolvedSchema instanceof ArraySchema ? (_resolvedSchema = resolvedSchema) === null || _resolvedSchema === void 0 ? void 0 : _resolvedSchema["item"] : resolvedSchema.item;
       } else if (isRecordSchema(resolvedSchema)) {
+        var _resolvedSchema2;
         if (typeof part !== "string") {
           throw Error("Invalid path: record schema ".concat(resolvedSchema, " must have path: ").concat(part, " as string"));
         }
@@ -2333,7 +2492,7 @@ function resolvePath(path, valModule, schema) {
           throw Error("Invalid path: record source did not have key ".concat(part, " from path: ").concat(path));
         }
         resolvedSource = resolvedSource[part];
-        resolvedSchema = resolvedSchema.item;
+        resolvedSchema = resolvedSchema instanceof RecordSchema ? (_resolvedSchema2 = resolvedSchema) === null || _resolvedSchema2 === void 0 ? void 0 : _resolvedSchema2["item"] : resolvedSchema.item;
       } else if (isObjectSchema(resolvedSchema)) {
         if (_typeof(resolvedSource) !== "object") {
           throw Error("Schema type error: expected source to be type of object, but got ".concat(_typeof(resolvedSource)));
@@ -2342,7 +2501,7 @@ function resolvePath(path, valModule, schema) {
           throw Error("Invalid path: object source did not have key ".concat(part, " from path: ").concat(path));
         }
         resolvedSource = resolvedSource === null ? resolvedSource : resolvedSource[part];
-        resolvedSchema = resolvedSchema.items[part];
+        resolvedSchema = resolvedSchema instanceof ObjectSchema ? resolvedSchema["items"][part] : resolvedSchema.items[part];
         // } else if (isI18nSchema(resolvedSchema)) {
         //   if (!resolvedSchema.locales.includes(part)) {
         //     throw Error(
@@ -2408,7 +2567,7 @@ function resolvePath(path, valModule, schema) {
       } else if (isRichTextSchema(resolvedSchema)) {
         if ("src" in resolvedSource && "tag" in resolvedSource && resolvedSource.tag === "img" && parts.length === 0) {
           var _resolvedSchema$optio, _resolvedSchema$optio2;
-          resolvedSchema = (_resolvedSchema$optio = resolvedSchema.options) !== null && _resolvedSchema$optio !== void 0 && (_resolvedSchema$optio = _resolvedSchema$optio.inline) !== null && _resolvedSchema$optio !== void 0 && _resolvedSchema$optio.img && typeof ((_resolvedSchema$optio2 = resolvedSchema.options) === null || _resolvedSchema$optio2 === void 0 || (_resolvedSchema$optio2 = _resolvedSchema$optio2.inline) === null || _resolvedSchema$optio2 === void 0 ? void 0 : _resolvedSchema$optio2.img) !== "boolean" ? resolvedSchema.options.inline.img : resolvedSchema;
+          resolvedSchema = resolvedSchema instanceof RichTextSchema ? (_resolvedSchema$optio = resolvedSchema["options"]) !== null && _resolvedSchema$optio !== void 0 && (_resolvedSchema$optio = _resolvedSchema$optio.inline) !== null && _resolvedSchema$optio !== void 0 && _resolvedSchema$optio.img && typeof ((_resolvedSchema$optio2 = resolvedSchema["options"]) === null || _resolvedSchema$optio2 === void 0 || (_resolvedSchema$optio2 = _resolvedSchema$optio2.inline) === null || _resolvedSchema$optio2 === void 0 ? void 0 : _resolvedSchema$optio2.img) !== "boolean" ? resolvedSchema["options"].inline.img : resolvedSchema : resolvedSchema;
         }
         resolvedSource = resolvedSource[part];
       } else {
@@ -2455,6 +2614,7 @@ function safeResolvePath(path, valModule, schema) {
         };
       }
       if (isArraySchema(resolvedSchema)) {
+        var _resolvedSchema3;
         if (Number.isNaN(Number(part))) {
           return {
             v: {
@@ -2482,8 +2642,9 @@ function safeResolvePath(path, valModule, schema) {
           };
         }
         resolvedSource = resolvedSource[part];
-        resolvedSchema = resolvedSchema.item;
+        resolvedSchema = resolvedSchema instanceof ArraySchema ? (_resolvedSchema3 = resolvedSchema) === null || _resolvedSchema3 === void 0 ? void 0 : _resolvedSchema3["item"] : resolvedSchema.item;
       } else if (isRecordSchema(resolvedSchema)) {
+        var _resolvedSchema4;
         if (typeof part !== "string") {
           return {
             v: {
@@ -2519,7 +2680,7 @@ function safeResolvePath(path, valModule, schema) {
           };
         }
         resolvedSource = resolvedSource[part];
-        resolvedSchema = resolvedSchema.item;
+        resolvedSchema = resolvedSchema instanceof RecordSchema ? (_resolvedSchema4 = resolvedSchema) === null || _resolvedSchema4 === void 0 ? void 0 : _resolvedSchema4["item"] : resolvedSchema.item;
       } else if (isObjectSchema(resolvedSchema)) {
         if (resolvedSource === undefined) {
           return {
@@ -2548,7 +2709,7 @@ function safeResolvePath(path, valModule, schema) {
           };
         }
         resolvedSource = resolvedSource === null ? resolvedSource : resolvedSource[part];
-        resolvedSchema = resolvedSchema.items[part];
+        resolvedSchema = resolvedSchema instanceof ObjectSchema ? resolvedSchema["items"][part] : resolvedSchema.items[part];
         // } else if (isI18nSchema(resolvedSchema)) {
         //   if (!resolvedSchema.locales.includes(part)) {
         //     throw Error(
@@ -2626,7 +2787,7 @@ function safeResolvePath(path, valModule, schema) {
       } else if (isRichTextSchema(resolvedSchema)) {
         if ("src" in resolvedSource && "tag" in resolvedSource && resolvedSource.tag === "img" && parts.length === 0) {
           var _resolvedSchema$optio3, _resolvedSchema$optio4;
-          resolvedSchema = (_resolvedSchema$optio3 = resolvedSchema.options) !== null && _resolvedSchema$optio3 !== void 0 && (_resolvedSchema$optio3 = _resolvedSchema$optio3.inline) !== null && _resolvedSchema$optio3 !== void 0 && _resolvedSchema$optio3.img && typeof ((_resolvedSchema$optio4 = resolvedSchema.options) === null || _resolvedSchema$optio4 === void 0 || (_resolvedSchema$optio4 = _resolvedSchema$optio4.inline) === null || _resolvedSchema$optio4 === void 0 ? void 0 : _resolvedSchema$optio4.img) !== "boolean" ? resolvedSchema.options.inline.img : resolvedSchema;
+          resolvedSchema = resolvedSchema instanceof RichTextSchema ? (_resolvedSchema$optio3 = resolvedSchema["options"]) !== null && _resolvedSchema$optio3 !== void 0 && (_resolvedSchema$optio3 = _resolvedSchema$optio3.inline) !== null && _resolvedSchema$optio3 !== void 0 && _resolvedSchema$optio3.img && typeof ((_resolvedSchema$optio4 = resolvedSchema["options"]) === null || _resolvedSchema$optio4 === void 0 || (_resolvedSchema$optio4 = _resolvedSchema$optio4.inline) === null || _resolvedSchema$optio4 === void 0 ? void 0 : _resolvedSchema$optio4.img) !== "boolean" ? resolvedSchema["options"].inline.img : resolvedSchema : resolvedSchema;
         }
         resolvedSource = resolvedSource[part];
       } else {
@@ -2732,30 +2893,54 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
   function NumberSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, NumberSchema);
     _this = _callSuper(this, NumberSchema);
     _this.options = options;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(NumberSchema, _Schema);
   return _createClass(NumberSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new NumberSchema(this.options, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var _this$options, _this$options2;
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (typeof src !== "number") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Expected 'number', got '".concat(_typeof(src), "'"),
           value: src
-        }]);
+        }]));
+      }
+      if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.max && src > this.options.max) {
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
+          message: "Expected 'number' less than ".concat(this.options.max),
+          value: src
+        }]));
+      }
+      if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.min && src < this.options.min) {
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
+          message: "Expected 'number' greater than ".concat(this.options.min),
+          value: src
+        }]));
+      }
+      if (customValidationErrors.length > 0) {
+        return _defineProperty({}, path, customValidationErrors);
       }
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -2791,12 +2976,28 @@ var NumberSchema = /*#__PURE__*/function (_Schema) {
       return new NumberSchema(this.options, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "max",
+    value: function max(_max) {
+      return new NumberSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        max: _max
+      }), this.opt);
+    }
+  }, {
+    key: "min",
+    value: function min(_min) {
+      return new NumberSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
+        min: _min
+      }), this.opt);
+    }
+  }, {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "number",
         options: this.options,
-        opt: this.opt
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -2815,11 +3016,13 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
     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;
   }
 
@@ -2857,17 +3060,24 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
     }
   }, {
     key: "regexp",
-    value: function regexp(_regexp) {
+    value: function regexp(_regexp, message) {
       return new StringSchema(_objectSpread2(_objectSpread2({}, this.options), {}, {
-        regexp: _regexp
+        regexp: _regexp,
+        regExpMessage: message
       }), this.opt, this.isRaw);
     }
   }, {
     key: "validate",
-    value: function validate(path, src) {
+    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 false;
+        return errors.length > 0 ? _defineProperty({}, path, errors) : false;
       }
       if (typeof src !== "string") {
         return _defineProperty({}, path, [{
@@ -2875,7 +3085,6 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
           value: src
         }]);
       }
-      var errors = [];
       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),
@@ -2890,7 +3099,7 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
       }
       if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.regexp && !this.options.regexp.test(src)) {
         errors.push({
-          message: "Expected string to match reg exp: ".concat(this.options.regexp.toString(), ", got '").concat(src, "'"),
+          message: this.options.regExpMessage || "Expected string to match reg exp: ".concat(this.options.regexp.toString(), ", got '").concat(src, "'"),
           value: src
         });
       }
@@ -2900,8 +3109,8 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -2933,21 +3142,24 @@ var StringSchema = /*#__PURE__*/function (_Schema) {
       return new StringSchema(this.options, this.opt, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
-      var _this$options4, _this$options5, _this$options6;
+    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
+        raw: this.isRaw,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF2 = this.customValidateFunctions) === null || _this$customValidateF2 === void 0 ? void 0 : _this$customValidateF2.length) > 0
       };
     }
   }, {
@@ -2965,15 +3177,22 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
   function BooleanSchema() {
     var _this;
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var customValidateFunctions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     _classCallCheck(this, BooleanSchema);
     _this = _callSuper(this, BooleanSchema);
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(BooleanSchema, _Schema);
   return _createClass(BooleanSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new BooleanSchema(this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
       if (this.opt && (src === null || src === undefined)) {
         return false;
       }
@@ -2986,8 +3205,8 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -3023,11 +3242,13 @@ var BooleanSchema = /*#__PURE__*/function (_Schema) {
       return new BooleanSchema(true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "boolean",
-        opt: this.opt
+        opt: this.opt,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -3045,67 +3266,78 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
   function KeyOfSchema(schema, sourcePath) {
     var _this;
     var opt = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var customValidateFunctions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     _classCallCheck(this, KeyOfSchema);
     _this = _callSuper(this, KeyOfSchema);
     _this.schema = schema;
     _this.sourcePath = sourcePath;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(KeyOfSchema, _Schema);
   return _createClass(KeyOfSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new KeyOfSchema(this.schema, this.sourcePath, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
+      var customValidationErrors = this.executeCustomValidateFunctions(src, this.customValidateFunctions);
       if (this.opt && (src === null || src === undefined)) {
-        return false;
+        return customValidationErrors.length > 0 ? _defineProperty({}, path, customValidationErrors) : false;
       }
       if (!this.schema) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Schema not found for module. keyOf must be used with a Val Module"
-        }]);
+        }]));
       }
       var serializedSchema = this.schema;
       if (!(serializedSchema.type === "object" || serializedSchema.type === "record")) {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Schema in keyOf must be an 'object' or 'record'. Found '".concat(serializedSchema.type, "'")
-        }]);
+        }]));
       }
       if (serializedSchema.opt && (src === null || src === undefined)) {
         return false;
       }
       if (serializedSchema.type === "record" && typeof src !== "string") {
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           message: "Type of value in keyof (record) must be 'string'"
-        }]);
+        }]));
       }
       if (serializedSchema.type === "object") {
         var keys = Object.keys(serializedSchema.items);
         if (!keys.includes(src)) {
-          return _defineProperty({}, path, [{
+          return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Value of keyOf (object) must be: ".concat(keys.join(", "), ". Found: ").concat(src)
-          }]);
+          }]));
         }
       }
       if (serializedSchema.type === "record") {
         if (typeof src !== "string") {
-          return _defineProperty({}, path, [{
+          return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
             message: "Value of keyOf (record) must be 'string'. Found: ".concat(_typeof(src))
-          }]);
+          }]));
         }
-        return _defineProperty({}, path, [{
+        return _defineProperty({}, path, [].concat(_toConsumableArray(customValidationErrors), [{
           fixes: ["keyof:check-keys"],
           message: "Did not validate keyOf (record). This error (keyof:check-keys) should typically be processed by Val internally. Seeing this error most likely means you have a Val version mismatch.",
           value: {
             key: src,
             sourcePath: this.sourcePath
           }
-        }]);
+        }]));
+      }
+      if (customValidationErrors.length > 0) {
+        return _defineProperty({}, path, customValidationErrors);
       }
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -3176,8 +3408,9 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
       return new KeyOfSchema(this.schema, this.sourcePath, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       var path = this.sourcePath;
       if (!path) {
         throw new Error("Cannot serialize keyOf schema with empty selector. TIP: keyOf must be used with a Val Module of record schema.");
@@ -3202,7 +3435,8 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
         path: path,
         schema: serializedSchema,
         opt: this.opt,
-        values: values
+        values: values,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -3214,23 +3448,30 @@ 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.serialize(), getValPath(valModule));
+  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 DateSchema = /*#__PURE__*/function (_Schema) {
   function DateSchema(options) {
     var _this;
     var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var customValidateFunctions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     _classCallCheck(this, DateSchema);
     _this = _callSuper(this, DateSchema);
     _this.options = options;
     _this.opt = opt;
+    _this.customValidateFunctions = customValidateFunctions;
     return _this;
   }
   _inherits(DateSchema, _Schema);
   return _createClass(DateSchema, [{
     key: "validate",
-    value: function validate(path, src) {
+    value: function validate(validationFunction) {
+      return new DateSchema(this.options, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]));
+    }
+  }, {
+    key: "executeValidate",
+    value: function executeValidate(path, src) {
       var _this$options, _this$options2, _this$options3, _this$options4;
       if (this.opt && (src === null || src === undefined)) {
         return false;
@@ -3280,8 +3521,8 @@ var DateSchema = /*#__PURE__*/function (_Schema) {
       return false;
     }
   }, {
-    key: "assert",
-    value: function assert(path, src) {
+    key: "executeAssert",
+    value: function executeAssert(path, src) {
       if (this.opt && src === null) {
         return {
           success: true,
@@ -3331,12 +3572,14 @@ var DateSchema = /*#__PURE__*/function (_Schema) {
       return new DateSchema(this.options, true);
     }
   }, {
-    key: "serialize",
-    value: function serialize() {
+    key: "executeSerialize",
+    value: function executeSerialize() {
+      var _this$customValidateF;
       return {
         type: "date",
         opt: this.opt,
-        options: this.options
+        options: this.options,
+        customValidate: this.customValidateFunctions && ((_this$customValidateF = this.customValidateFunctions) === null || _this$customValidateF === void 0 ? void 0 : _this$customValidateF.length) > 0
       };
     }
   }, {
@@ -4779,11 +5022,12 @@ function getFileHash(text) {
 }
 
 function deserializeSchema(serialized) {
-  var _serialized$options;
+  var _serialized$options, _serialized$options2;
   switch (serialized.type) {
     case "string":
       return new StringSchema(_objectSpread2(_objectSpread2({}, serialized.options), {}, {
-        regexp: ((_serialized$options = serialized.options) === null || _serialized$options === void 0 ? void 0 : _serialized$options.regexp) && new RegExp(serialized.options.regexp.source, serialized.options.regexp.flags)
+        regexp: ((_serialized$options = serialized.options) === null || _serialized$options === void 0 ? void 0 : _serialized$options.regexp) && new RegExp(serialized.options.regexp.source, serialized.options.regexp.flags),
+        regExpMessage: (_serialized$options2 = serialized.options) === null || _serialized$options2 === void 0 || (_serialized$options2 = _serialized$options2.regexp) === null || _serialized$options2 === void 0 ? void 0 : _serialized$options2.message
       }), serialized.opt);
     case "literal":
       return new LiteralSchema(serialized.value, serialized.opt);
@@ -4811,12 +5055,12 @@ function deserializeSchema(serialized) {
       serialized.opt);
     case "richtext":
       {
-        var _serialized$options2, _serialized$options3;
+        var _serialized$options3, _serialized$options4;
         var deserializedOptions = _objectSpread2(_objectSpread2({}, serialized.options || {}), {}, {
-          inline: _typeof((_serialized$options2 = serialized.options) === null || _serialized$options2 === void 0 || (_serialized$options2 = _serialized$options2.inline) === null || _serialized$options2 === void 0 ? void 0 : _serialized$options2.img) === "object" ? {
+          inline: _typeof((_serialized$options3 = serialized.options) === null || _serialized$options3 === void 0 || (_serialized$options3 = _serialized$options3.inline) === null || _serialized$options3 === void 0 ? void 0 : _serialized$options3.img) === "object" ? {
             a: serialized.options.inline.a,
             img: deserializeSchema(serialized.options.inline.img)
-          } : (_serialized$options3 = serialized.options) === null || _serialized$options3 === void 0 ? void 0 : _serialized$options3.inline
+          } : (_serialized$options4 = serialized.options) === null || _serialized$options4 === void 0 ? void 0 : _serialized$options4.inline
         });
         return new RichTextSchema(deserializedOptions, serialized.opt);
       }
@@ -4875,6 +5119,10 @@ var Internal = {
     hashToRemoteFileHash: hashToRemoteFileHash,
     splitRemoteRef: splitRemoteRef
   },
+  validate: function validate(val, path, src) {
+    var _getSchema;
+    return val && ((_getSchema = getSchema(val)) === null || _getSchema === void 0 ? void 0 : _getSchema["executeValidate"](path, src));
+  },
   isVal: isVal,
   isFile: isFile,
   createValPathOfItem: createValPathOfItem,