feat: include errors from properties/items

ajv-validator · Apr 15, 2017 · f9fbcf5 · f9fbcf5
1 parent 38214a8
commit f9fbcf5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,8 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+# Compiled templates
+lib/dotjs/*.js
+
+.DS_Store
diff --git a/lib/dot/errorMessage.jst b/lib/dot/errorMessage.jst
@@ -10,17 +10,25 @@
         , $i = 'errorMessage_i' + $lvl
         , $err = 'errorMessage_err' + $lvl
         , $errors = 'errorMessage_errors' + $lvl
+        , $nextChar = 'errorMessage_nextChar' + $lvl
         , $errSchemaPathString = it.util.toQuotedString(it.errSchemaPath);
     }}
     var {{=$dataPath}} = (dataPath || '') + {{= it.errorPath }};
     {{? typeof $schema == 'string' }}
       var {{=$i}} = 0;
-      var {{=$err}};
+      var {{=$err}}, {{=$nextChar}};
       var {{=$errors}} = undefined;
       while ({{=$i}}<errors) {
         {{=$err}} = vErrors[{{=$i}}];
         if ({{=$err}}.keyword != '{{=$keyword}}'
-            && {{=$err}}.dataPath == {{=$dataPath}}
+            && ({{=$err}}.dataPath == {{=$dataPath}} ||
+              ({{=$err}}.dataPath.indexOf({{=$dataPath}}) == 0 &&
+               {{? it.opts.jsonPointers }}
+                 {{=$err}}.dataPath[{{=$dataPath}}.length] == '/'
+               {{??}}
+                 ({{=$nextChar}} = {{=$err}}.dataPath[{{=$dataPath}}.length]) == '.'
+                  || {{=$nextChar}} == '['
+               {{?}}))
             && {{=$err}}.schemaPath.indexOf({{=$errSchemaPathString}}) == 0
             && {{=$err}}.schemaPath[{{=it.errSchemaPath.length}}] == '/') {
           if ({{=$errors}}) {{=$errors}}.push({{=$err}});

diff --git a/lib/dotjs/README.md b/lib/dotjs/README.md
@@ -0,0 +1,3 @@
+These files are compiled dot templates from dot folder.
+
+Do NOT edit them directly, edit the templates and run `npm run build` from main ajv-keywords folder.
diff --git a/lib/dotjs/errorMessage.js b/lib/dotjs/errorMessage.js
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "eslint": "eslint *.js spec",
     "test-spec": "mocha spec/*.spec.js -R spec",
     "test-cov": "nyc npm run test-spec",
-    "test": "npm run eslint && npm run test-cov"
+    "test": "npm run eslint && npm run build && npm run test-cov"
   },
   "repository": {
     "type": "git",

diff --git a/spec/string.spec.js b/spec/string.spec.js
@@ -14,7 +14,7 @@ describe('errorMessage value is a string', function() {
       type: 'object',
       required: ['foo'],
       properties: {
-        foo: true/*{ type: 'integer' }*/
+        foo: { type: 'integer' }
       },
       additionalProperties: false,
       errorMessage: 'should be an object with an integer property foo only'
@@ -25,8 +25,8 @@ describe('errorMessage value is a string', function() {
     testInvalid({}, ['required']);
     testInvalid({bar: 2}, ['required', 'additionalProperties']);
     testInvalid({foo: 1, bar: 2}, ['additionalProperties']);
-    // testInvalid({foo: 'a'}, ['type']);
-    // testInvalid({foo: 'a', bar: 2}, ['type', 'additionalProperties']);
+    testInvalid({foo: 'a'}, ['type']);
+    testInvalid({foo: 'a', bar: 2}, ['type', 'additionalProperties']);
     testInvalid(1, ['type']);
 
     function testInvalid(data, expectedReplacedKeywords) {