Merge pull request ajv-validator#39 from rpl/fix/ajv-v7-and-v8

fix: Applied minimum amount of changes to adapt ajv-merge-patch to ajv v7 and v8

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "4"
-  - "6"
+  - "12"
+  - "14"
 after_script:
   - coveralls < coverage/lcov.info

keywords/add_keyword.js

@@ -3,7 +3,8 @@
 var url = require('url');
 
 module.exports = function (ajv, keyword, jsonPatch, patchSchema) {
-  ajv.addKeyword(keyword, {
+  ajv.addKeyword({
+    keyword: keyword,
     macro: function (schema, parentSchema, it) {
       var source = schema.source;
       var patch = schema.with;

package.json

@@ -37,7 +37,7 @@
     "json-merge-patch": "^0.2.3"
   },
   "devDependencies": {
-    "ajv": "^6.5.1",
+    "ajv": "^8.2.0",
     "coveralls": "^2.11.12",
     "eslint": "^3.3.0",
     "if-node-version": "^1.0.0",
@@ -46,6 +46,6 @@
     "pre-commit": "^1.1.3"
   },
   "peerDependencies": {
-    "ajv": ">=6.0.0"
+    "ajv": ">=8.0.0"
   }
 }

spec/async.spec.js

@@ -58,7 +58,7 @@ describe('async schema loading', function() {
     if (ref == 'obj.json') {
       loadCount++;
       var schema = {
-        "id": "obj.json#",
+        "$id": "obj.json#",
         "type": "object",
         "properties": { "p": { "type": "string" } },
         "additionalProperties": false,

spec/test_validate.js

@@ -10,21 +10,21 @@ module.exports = function (validate, keyword) {
   var errs = validate.errors;
   assert.equal(errs.length, 2);
   assert.equal(errs[0].keyword, 'type');
-  assert.equal(errs[0].dataPath, '.q');
-  assert.equal(errs[0].schemaPath, '#/properties/q/type');
+  assert.equal(errs[0].schemaPath, '#/' + keyword + '/properties/q/type');
+  assert.equal(errs[0].instancePath, '/q');
   assert.equal(errs[1].keyword, keyword);
-  assert.equal(errs[1].dataPath, '');
+  assert.equal(errs[1].instancePath, '');
   assert.equal(errs[1].schemaPath, '#/' + keyword);
 
   // an object without q should fail
   assert.strictEqual(validate({ p: 'foo' }), false);
   errs = validate.errors;
   assert.equal(errs.length, 2);
   assert.equal(errs[0].keyword, 'required');
-  assert.equal(errs[0].dataPath, '');
-  assert.equal(errs[0].schemaPath, '#/required');
+  assert.equal(errs[0].schemaPath, '#/' + keyword + '/required');
   assert.deepEqual(errs[0].params, { missingProperty: 'q' });
+  assert.equal(errs[0].instancePath, '');
   assert.equal(errs[1].keyword, keyword);
-  assert.equal(errs[1].dataPath, '');
   assert.equal(errs[1].schemaPath, '#/' + keyword);
+  assert.equal(errs[1].instancePath, '');
 };