Cleanup annotation code I missed from refactor

Author: jdesrosiers

README.md

@@ -800,7 +800,7 @@ following functions are available in addition to the functions available in the
 * **annotation**: (instance: JsonNode, keyword: string, dialect?: string): any[];
 
     Get the annotations for a keyword for the value represented by the JsonNode.
-* **annotatedWith**: (instance: JsonNode, keyword: string, dialect?: string): JsonNode[];
+* **annotatedWith**: (instance: JsonNode, keyword: string, dialect?: string): Generator<JsonNode>;
 
     Get all JsonNodes that are annotated with the given keyword.
 * **setAnnotation**: (instance: JsonNode, keywordId: string, value: any) => JsonNode

annotations/annotated-instance.d.ts

@@ -1,4 +1,4 @@
 export const annotation: <A>(instance: JsonNode, keyword: string, dialectUri?: string) => A[];
-export const annotatedWith: <A extends JsonNode>(instance: A, keyword: string, dialectUri?: string) => A[];
+export const annotatedWith: <A extends JsonNode>(instance: A, keyword: string, dialectUri?: string) => Generator<A>;
 
 export * from "../lib/instance.js";

annotations/annotated-instance.js

@@ -1,4 +1,3 @@
-import * as JsonPointer from "@hyperjump/json-pointer";
 import * as Instance from "../lib/instance.js";
 import { getKeywordId } from "../lib/keywords.js";
 
@@ -7,43 +6,15 @@ const defaultDialectId = "https://json-schema.org/validation";
 
 export const annotation = (node, keyword, dialect = defaultDialectId) => {
   const keywordUri = getKeywordId(keyword, dialect);
-
-  let currentNode = node.root;
-  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(...invalidSchemas(currentNode));
-  }
-
-  const annotations = [];
-  for (const schemaLocation in node.annotations[keywordUri]) {
-    if (!errors.some((error) => schemaLocation.startsWith(error))) {
-      annotations.unshift(node.annotations[keywordUri][schemaLocation]);
-    }
-  }
-
-  return annotations;
+  return node.annotations[keywordUri] ?? [];
 };
 
-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 = [];
-
+export const annotatedWith = function* (instance, keyword, dialectId = defaultDialectId) {
   for (const node of Instance.allNodes(instance)) {
     if (annotation(node, keyword, dialectId).length > 0) {
-      nodes.push(node);
+      yield node;
     }
   }
-
-  return nodes;
 };
 
 export * from "../lib/instance.js";

lib/keywords/validation.js

@@ -86,14 +86,16 @@ const interpret = (url, instance, { ast, dynamicAnchors, errors, annotations, ou
             errors.push(...context.errors);
           } else {
             if (keywordHandler.annotation) {
-              schemaAnnotations.push({
+              schemaAnnotations.unshift({
                 keyword: keywordId,
                 absoluteKeywordLocation: schemaUri,
                 instanceLocation: Instance.uri(instance),
                 annotation: keywordHandler.annotation(keywordValue)
               });
             }
-            schemaAnnotations.push(...context.annotations);
+            for (const contextAnnotation of context.annotations) {
+              schemaAnnotations.unshift(contextAnnotation);
+            }
           }
           break;
         case DETAILED: {