@hyperjump/json-schema 1.9.4 → 1.9.6

package/annotations/annotated-instance.js

@@ -16,11 +16,11 @@ export const annotation = (node, keyword, dialect = defaultDialectId) => {
   const keywordUri = getKeywordId(keyword, dialect);
 
   let currentNode = node.root;
-  const errors = Object.keys(node.root.errors);
+  const errors = [...invalidSchemas(currentNode)];
   for (let segment of JsonPointer.pointerSegments(node.pointer)) {
     segment = segment === "-" && Instance.typeOf(currentNode) === "array" ? Instance.length(currentNode) : segment;
     currentNode = Instance.step(segment, currentNode);
-    errors.push(...Object.keys(currentNode.errors));
+    errors.push(...invalidSchemas(currentNode));
   }
 
   const annotations = [];
@@ -33,6 +33,14 @@ export const annotation = (node, keyword, dialect = defaultDialectId) => {
   return annotations;
 };
 
+const invalidSchemas = function* (node) {
+  for (const error in node.errors) {
+    if (node.errors[error] === "https://json-schema.org/evaluation/validate") {
+      yield error;
+    }
+  }
+};
+
 export const annotatedWith = (instance, keyword, dialectId = defaultDialectId) => {
   const nodes = [];
 

package/lib/core.js

@@ -43,7 +43,7 @@ subscribe("validate.metaValidate", async (_message, schema) => {
 
     // Compile
     if (!(schema.document.dialectId in metaValidators)) {
-      const metaSchema = await getSchema(schema.document.dialectId);
+      const metaSchema = await getSchema(schema.document.dialectId, schema);
       const compiledSchema = await compile(metaSchema);
       metaValidators[schema.document.dialectId] = interpret(compiledSchema);
     }

package/lib/instance.js

@@ -76,10 +76,6 @@ export const typeOf = (node) => node.type;
 export const has = (key, node) => key in node.value;
 
 export const step = (key, node) => {
-  if (node.type !== "object" && node.type !== "array") {
-    return;
-  }
-
   switch (node.type) {
     case "object":
       const property = node.children.find((propertyNode) => {

package/lib/keywords/if.js

@@ -5,8 +5,8 @@ const id = "https://json-schema.org/keyword/if";
 
 const compile = (schema, ast) => Validation.compile(schema, ast);
 
-const interpret = (ifSchema, instance, ast, dynamicAnchors, quiet) => {
-  Validation.interpret(ifSchema, instance, ast, dynamicAnchors, quiet);
+const interpret = (ifSchema, instance, ast, dynamicAnchors) => {
+  Validation.interpret(ifSchema, instance, ast, dynamicAnchors, true);
   return true;
 };
 

package/lib/keywords/validation.js

@@ -62,9 +62,7 @@ const interpret = (url, instance, ast, dynamicAnchors, quiet = false) => {
   }
 
   if (!isSchemaValid) {
-    if (!quiet) {
-      instance.errors[url] = id;
-    }
+    instance.errors[url] = id;
   }
 
   instance.valid = isSchemaValid;

package/lib/output.js

@@ -25,7 +25,7 @@ outputFormats.BASIC = (instance) => {
 
     for (const child of Instance.allNodes(instance)) {
       for (const [absoluteKeywordLocation, keyword] of Object.entries(child.errors).reverse()) {
-        if (!child.valid) {
+        if (keyword !== "https://json-schema.org/evaluation/validate" && !child.valid) {
           output.errors.unshift({
             keyword,
             absoluteKeywordLocation,
@@ -35,8 +35,6 @@ outputFormats.BASIC = (instance) => {
         }
       }
     }
-
-    output.errors.pop();
   }
 
   return output;

package/lib/schema.js

@@ -22,13 +22,15 @@ const schemaRegistry = {};
 export const getSchema = async (uri, browser = undefined) => {
   if (!browser) {
     browser = { _cache: {} };
+  }
 
-    for (const uri in schemaRegistry) {
+  for (const uri in schemaRegistry) {
+    if (!(uri in browser._cache)) {
       browser._cache[uri] = schemaRegistry[uri];
     }
   }
 
-  const schema = await browserGet(uri, browser);
+  const schema = await browserGet(uri, { ...browser });
   if (typeof schema.document.dialectId !== "string") {
     throw Error(`The document at ${schema.document.baseUri} is not a schema.`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",