Changed the execution order of validations - conform, format, enum

Author: Ali Yousuf

lib/revalidator.js

@@ -275,27 +275,6 @@
       }
     }
 
-    if (schema.format && options.validateFormats) {
-      format = schema.format;
-
-      if (options.validateFormatExtensions) { spec = validate.formatExtensions[format] }
-      if (!spec) { spec = validate.formats[format] }
-      if (!spec) {
-        if (options.validateFormatsStrict) {
-          return error('format', property, value, schema, errors);
-        }
-      }
-      else {
-        if (!spec.test(value)) {
-          return error('format', property, value, schema, errors);
-        }
-      }
-    }
-
-    if (schema['enum'] && schema['enum'].indexOf(value) === -1) {
-      error('enum', property, value, schema, errors);
-    }
-
     // Dependencies (see 5.8)
     if (typeof schema.dependencies === 'string' &&
         object[schema.dependencies] === undefined) {
@@ -317,8 +296,6 @@
     checkType(value, schema.type, function(err, type) {
       if (err) return error('type', property, typeof value, schema, errors);
 
-      constrain('conform', value, function (a, e) { return e(a, object) });
-
       switch (type || (isArray(value) ? 'array' : typeof value)) {
         case 'string':
           constrain('allowEmpty', value,        function (a, e) { return e ? e : a !== '' });
@@ -389,7 +366,30 @@
           }
           break;
       }
+
+      constrain('conform', value, function (a, e) { return e(a, object) });
     });
+
+    if (schema.format && options.validateFormats) {
+      format = schema.format;
+
+      if (options.validateFormatExtensions) { spec = validate.formatExtensions[format] }
+      if (!spec) { spec = validate.formats[format] }
+      if (!spec) {
+        if (options.validateFormatsStrict) {
+          return error('format', property, value, schema, errors);
+        }
+      }
+      else {
+        if (!spec.test(value)) {
+          return error('format', property, value, schema, errors);
+        }
+      }
+    }
+
+    if (schema['enum'] && schema['enum'].indexOf(value) === -1) {
+      error('enum', property, value, schema, errors);
+    }
   }
 
   function checkType(val, type, callback) {