Switch to a JSON Schema validator with later draft support

Author: MikeRalphson

package.json

@@ -19,10 +19,10 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "jsonschema": "^1.2.4",
+    "@hyperjump/json-schema": "^0.4.2",
     "mdv": "^1.0.7",
     "node-readfiles": "^0.2.0",
-    "yaml": "^1.7.2"
+    "yaml": "^1.8.3"
   },
   "keywords": [
     "OpenAPI",

scripts/validateExamples/index.js

@@ -6,38 +6,37 @@ const util = require('util');
 
 const yaml = require('yaml');
 const rf = require('node-readfiles');
-const jsonschema = require('jsonschema').Validator;
-const options = { };
-const validator = new jsonschema(options);
+const jsonschema = require('@hyperjump/json-schema');
 
 const schema = {};
 schema["v2.0"] = yaml.parse(fs.readFileSync('./schemas/v2.0/schema.json','utf8'));
-schema.draft4 = yaml.parse(fs.readFileSync('./schemas/jsonSchema/draft-04/metaschema.json','utf8'));
 schema["v3.0"] = yaml.parse(fs.readFileSync('./schemas/v3.0/schema.yaml','utf8'));
 
-validator.addSchema(schema.draft4);
+jsonschema.add(schema["v2.0"]);
+jsonschema.add(schema["v3.0"]);
 
 async function main(path,schema,propName) {
     return new Promise(async function(resolve,reject){
         let files = await rf(path, { readContents: false, filenameFormat: rf.FULL_PATH });
         files = files.sort();
         for (let file of files) {
-            const contentStr = fs.readFileSync(file,'utf8');
-            let contentObj;
+            const instanceStr = fs.readFileSync(file,'utf8');
+            let instanceObj;
             try {
-                contentObj = yaml.parse(contentStr,{prettyErrors:true});
+                instanceObj = yaml.parse(instanceStr,{prettyErrors:true});
             }
             catch (ex) {
                 process.exitCode = 1;
                 console.warn(file,ex.message);
             }
-            if (contentObj && contentObj[propName]) {
+            if (instanceObj && instanceObj[propName]) {
                 console.log('Validating',file);
                 try {
-                    const result = await validator.validate(contentObj,schema);
-                    if (result.errors && result.errors.length) {
+                    const schemaObj = await jsonschema.get(schema.id);
+                    const result = await jsonschema.validate(schemaObj, instanceObj, jsonschema.DETAILED);
+                    if (!result.valid) {
                         process.exitCode = 1;
-                        console.warn(file,util.inspect(result.errors));
+                        console.warn(file,util.inspect(result.errors, {depth:null}));
                     }
                 }
                 catch (ex) {

scripts/validateSchema/index.js

@@ -5,22 +5,29 @@ const fs = require('fs');
 const util = require('util');
 
 const yaml = require('yaml');
-const jsonschema = require('jsonschema').Validator;
-const options = { base: process.argv[2] };
-const validator = new jsonschema(options);
+const jsonschema = require('@hyperjump/json-schema');
 
 const schema = yaml.parse(fs.readFileSync(process.argv[2],'utf8'));
 const metaSchema = yaml.parse(fs.readFileSync(process.argv[3],'utf8'));
 
-console.log('Checking',process.argv[2]);
-
-const result = validator.validate(schema, metaSchema);
-
-if (result.errors.length) {
-  console.warn(util.inspect(result.errors));
-  process.exit(1);
-}
-else {
-  console.log('OK');
+async function main() {
+  jsonschema.add(metaSchema);
+  const msObj = await jsonschema.get(metaSchema.id);
+  let result;
+  try {
+    result = await jsonschema.validate(msObj, schema, jsonschema.DETAILED);
+  }
+  catch (ex) {
+    result = { valid: false, errors: [ ex ] };
+  }
+  if (!result.valid) {
+    console.warn(util.inspect(result.errors, {depth:null}));
+    process.exit(1);
+  }
+  else {
+    console.log('OK');
+  }
 }
 
+console.log('Checking',process.argv[2]);
+main();