improved error reporting for "required" keyword with large size schema,

#18
ajv-validator · Jun 30, 2015 · 5fc0b18 · 5fc0b18
1 parent fd61168
commit 5fc0b18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lib/dot/required.jst b/lib/dot/required.jst
@@ -21,6 +21,7 @@
     } else {
   {{??}}
     var schema{{=$lvl}} = validate.schema{{=$schemaPath}};
+    {{ it.errorPath = ($currentErrorPath + ' + "[\'" + schema' + $lvl + '[i] + "\']"').replace('" + "', ''); }}
 
     for (var i = 0; i < schema{{=$lvl}}.length; i++) {
       var {{=$valid}} = data[schema{{=$lvl}}[i]] !== undefined;
@@ -43,13 +44,14 @@
     {{~}}
   {{??}}
     var schema{{=$lvl}} = validate.schema{{=$schemaPath}};
+    {{ it.errorPath = ($currentErrorPath + ' + "[\'" + schema' + $lvl + '[i] + "\']"').replace('" + "', ''); }}
 
     for (var i = 0; i < schema{{=$lvl}}.length; i++) {
       var {{=$valid}} = data[schema{{=$lvl}}[i]] !== undefined;
-      if (!{{=$valid}}) break;
+      if (!{{=$valid}}) {
+        {{# def.error:'required' }}
+      }
     }
-
-    {{# def.checkError:'required' }}
   {{?}}
 {{?}}
 

diff --git a/lib/dotjs/required.js b/lib/dotjs/required.js
@@ -55,7 +55,9 @@ module.exports = function anonymous(it) {
       }
       out += ' } else { ';
     } else {
-      out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + '; for (var i = 0; i < schema' + ($lvl) + '.length; i++) { var ' + ($valid) + ' = data[schema' + ($lvl) + '[i]] !== undefined; if (!' + ($valid) + ') break; }  if (!' + ($valid) + ') {  ';
+      out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + '; ';
+      it.errorPath = ($currentErrorPath + ' + "[\'" + schema' + $lvl + '[i] + "\']"').replace('" + "', '');
+      out += ' for (var i = 0; i < schema' + ($lvl) + '.length; i++) { var ' + ($valid) + ' = data[schema' + ($lvl) + '[i]] !== undefined; if (!' + ($valid) + ') break; }  if (!' + ($valid) + ') {  ';
       if (it.wasTop && $breakOnError) {
         out += ' validate.errors = [ { keyword: \'' + ('required') + '\', dataPath: (dataPath || \'\') + ' + (it.errorPath) + ', message: \'properties ' + ($schema.slice(0, 7).join(", "));
         if ($schema.length > 7) {
@@ -115,7 +117,9 @@ module.exports = function anonymous(it) {
         }
       }
     } else {
-      out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + '; for (var i = 0; i < schema' + ($lvl) + '.length; i++) { var ' + ($valid) + ' = data[schema' + ($lvl) + '[i]] !== undefined; if (!' + ($valid) + ') break; }  if (!' + ($valid) + ') {  ';
+      out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + '; ';
+      it.errorPath = ($currentErrorPath + ' + "[\'" + schema' + $lvl + '[i] + "\']"').replace('" + "', '');
+      out += ' for (var i = 0; i < schema' + ($lvl) + '.length; i++) { var ' + ($valid) + ' = data[schema' + ($lvl) + '[i]] !== undefined; if (!' + ($valid) + ') {  ';
       if (it.wasTop && $breakOnError) {
         out += ' validate.errors = [ { keyword: \'' + ('required') + '\', dataPath: (dataPath || \'\') + ' + (it.errorPath) + ', message: \'properties ' + ($schema.slice(0, 7).join(", "));
         if ($schema.length > 7) {
@@ -137,7 +141,7 @@ module.exports = function anonymous(it) {
         }
         out += ' }; if (validate.errors === null) validate.errors = [err]; else validate.errors.push(err); errors++; ';
       }
-      out += ' } ';
+      out += ' } } ';
     }
   }
   it.errorPath = $currentErrorPath;

diff --git a/spec/errors.spec.js b/spec/errors.spec.js
@@ -91,7 +91,7 @@ describe('Validation errors', function () {
   });
 
 
-  it.skip('required validation and errors for large data/schemas', function() {
+  it('required validation and errors for large data/schemas', function() {
     var schema = { required: [] }
       , data = {}
       , invalidData1 = {}