Fix implementations for draft 2020-12 (#69)

sourcemeta-research · Oct 25, 2024 · 2598ad6 · 2598ad6
1 parent 2ec671a
commit 2598ad6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 42 deletions.
diff --git a/implementations/ajv/main.mjs b/implementations/ajv/main.mjs
@@ -1,9 +1,13 @@
-import Ajv from 'ajv';
-import draft7schema from 'ajv/lib/refs/json-schema-draft-07.json' with { type: 'json' };
 import fs from 'fs';
 import readline from 'readline';
 import { performance } from 'perf_hooks';
 
+const DRAFTS = {
+  "https://json-schema.org/draft/2020-12/schema": (await import("ajv/dist/2020.js")).Ajv2020,
+  "https://json-schema.org/draft/2019-09/schema": (await import("ajv/dist/2019.js")).Ajv2019,
+  "http://json-schema.org/draft-07/schema#": (await import("ajv")).Ajv,
+};
+
 function readJSONFile(filePath) {
   try {
     const fileContent = fs.readFileSync(filePath, 'utf8');
@@ -25,13 +29,7 @@ async function* readJSONLines(filePath) {
 async function validateSchema(schemaPath, instancePath) {
   const schema = readJSONFile(schemaPath);
 
-  const ajv = new Ajv({
-    schemaId: 'id',
-    meta: false,
-    validateSchema: false
-  });
-
-  ajv.addMetaSchema(draft7schema);
+  const ajv = new DRAFTS[schema['$schema']]({strict: false});
   const validate = ajv.compile(schema);
 
   const instances = [];

diff --git a/implementations/ajv/package-lock.json b/implementations/ajv/package-lock.json
diff --git a/implementations/ajv/package.json b/implementations/ajv/package.json
@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "author": "Juan Cruz Viotti <[email protected]>",
   "dependencies": {
-    "ajv": "^6.12.6"
+    "ajv": "^8.17.1"
   }
 }
diff --git a/implementations/hyperjump/main.mjs b/implementations/hyperjump/main.mjs
@@ -1,8 +1,13 @@
-import { registerSchema, validate } from "@hyperjump/json-schema/draft-07";
+import { registerSchema, validate } from "@hyperjump/json-schema/draft-2020-12";
 import fs from 'fs';
 import readline from 'readline';
 import { performance } from 'perf_hooks';
 
+await Promise.all([
+  import("@hyperjump/json-schema/draft-2019-09"),
+  import("@hyperjump/json-schema/draft-07"),
+]);
+
 function readJSONFile(filePath) {
   try {
     const fileContent = fs.readFileSync(filePath, 'utf8');

diff --git a/implementations/python-jsonschema/validate.py b/implementations/python-jsonschema/validate.py
@@ -11,7 +11,8 @@
     schema = json.load(open(example_dir / "schema.json"))
     instances = [json.loads(doc) for doc in open(example_dir / "instances.jsonl").readlines()]
 
-    validator = jsonschema.Draft4Validator(schema)
+    Validator = jsonschema.validators.validator_for(schema)
+    validator = Validator(schema)
 
     start = time.time_ns()
     for instance in instances: