fix(schematype): handle passing message function to `SchemaType#val…

…idate()` as positional arg Fix #8360
Automattic · Dec 4, 2019 · 491b9cc · 491b9cc
1 parent 253e054
commit 491b9cc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/schematype.js b/lib/schematype.js
@@ -676,21 +676,24 @@ SchemaType.prototype.get = function(fn) {
 SchemaType.prototype.validate = function(obj, message, type) {
   if (typeof obj === 'function' || obj && utils.getFunctionName(obj.constructor) === 'RegExp') {
     let properties;
-    if (message instanceof Object && !type) {
+    if (typeof message === 'function') {
+      properties = { validator: obj, message: message };
+      properties.type = type || 'user defined';
+    } else if (message instanceof Object && !type) {
       properties = utils.clone(message);
       if (!properties.message) {
         properties.message = properties.msg;
       }
       properties.validator = obj;
       properties.type = properties.type || 'user defined';
     } else {
-      if (!message) {
+      if (message == null) {
         message = MongooseError.messages.general.default;
       }
       if (!type) {
         type = 'user defined';
       }
-      properties = {message: message, type: type, validator: obj};
+      properties = { message: message, type: type, validator: obj };
     }
 
     if (properties.isAsync) {