@hyperjump/json-schema 1.9.3 → 1.9.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Jason Desrosiers
+Copyright (c) 2022 Hyperjump Software, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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/instance.d.ts

@@ -23,14 +23,14 @@ export const values: (node: JsonNode) => Generator<JsonNode>;
 export const entries: (node: JsonNode) => Generator<[JsonNode, JsonNode]>;
 export const length: (node: JsonNode) => number;
 
-export const allNodes: (node) => Generator<JsonNode>;
+export const allNodes: (node: JsonNode) => Generator<JsonNode>;
 
 export type JsonNode = {
   baseUri: string;
   pointer: string;
   type: JsonNodeType;
   children: JsonNode[];
-  parent: JsonNode;
+  parent?: JsonNode;
   root: JsonNode;
   valid: boolean;
   errors: Record<string, string>;

package/lib/instance.js

@@ -118,7 +118,9 @@ export const values = function* (node) {
   }
 
   for (const property of node.children) {
-    yield property.children[1];
+    if (property.children[1]) {
+      yield property.children[1];
+    }
   }
 };
 
@@ -128,7 +130,9 @@ export const entries = function* (node) {
   }
 
   for (const property of node.children) {
-    yield property.children;
+    if (property.children.length === 2) {
+      yield property.children;
+    }
   }
 };
 

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/unknown.js

@@ -1,13 +1,18 @@
 import * as Browser from "@hyperjump/browser";
 import * as Instance from "../../annotations/annotated-instance.js";
+import { pointerSegments } from "@hyperjump/json-pointer";
 
 
 const id = "https://json-schema.org/keyword/unknown";
 
-const compile = (schema) => Browser.value(schema);
+const compile = (schema) => {
+  const keywordName = [...pointerSegments(schema.cursor)].pop();
+  return [keywordName, Browser.value(schema)];
+};
 
-const interpret = (value, instance, _ast, _dynamicAnchors, _quiet, schemaLocation) => {
-  Instance.setAnnotation(instance, id, schemaLocation, value);
+const interpret = ([keywordName, value], instance, _ast, _dynamicAnchors, _quiet, schemaLocation) => {
+  const keywordId = `${id}#${keywordName}`;
+  Instance.setAnnotation(instance, keywordId, schemaLocation, value);
   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/package.json

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