@hyperjump/json-schema 1.6.1 → 1.6.3

package/draft-2019-09/index.js

@@ -13,7 +13,7 @@ import additionalItems from "../draft-04/additionalItems.js";
 import contains from "./contains.js";
 import items from "../draft-04/items.js";
 import recursiveAnchor from "./recursiveAnchor.js";
-import recursiveRef from "./recursiveRef.js";
+import recursiveRef from "../draft-2020-12/dynamicRef.js";
 
 
 addKeyword(additionalItems);
@@ -27,7 +27,7 @@ defineVocabulary("https://json-schema.org/draft/2019-09/vocab/core", {
   "$comment": "https://json-schema.org/keyword/comment",
   "$defs": "https://json-schema.org/keyword/definitions",
   "$recursiveAnchor": "https://json-schema.org/keyword/draft-2019-09/recursiveAnchor",
-  "$recursiveRef": "https://json-schema.org/keyword/draft-2019-09/recursiveRef",
+  "$recursiveRef": "https://json-schema.org/keyword/draft-2020-12/dynamicRef",
   "$id": "https://json-schema.org/keyword/id",
   "$ref": "https://json-schema.org/keyword/ref",
   "$vocabulary": "https://json-schema.org/keyword/vocabulary"

package/draft-2020-12/dynamicRef.js

@@ -12,16 +12,17 @@ const compile = async (dynamicRef, ast) => {
   return [referencedSchema.id, fragment, Schema.uri(referencedSchema)];
 };
 
-const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors, quiet) => {
+const evaluate = (strategy) => ([id, fragment, ref], instance, ast, dynamicAnchors, quiet) => {
   if (fragment in ast.metaData[id].dynamicAnchors) {
     dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
-    return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
+    return strategy(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
   } else {
-    return Validation.interpret(ref, instance, ast, dynamicAnchors, quiet);
+    return strategy(ref, instance, ast, dynamicAnchors, quiet);
   }
 };
 
-const collectEvaluatedProperties = Validation.collectEvaluatedProperties;
-const collectEvaluatedItems = Validation.collectEvaluatedItems;
+const interpret = evaluate(Validation.interpret);
+const collectEvaluatedProperties = evaluate(Validation.collectEvaluatedProperties);
+const collectEvaluatedItems = evaluate(Validation.collectEvaluatedItems);
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/lib/keywords/dynamicRef.js

@@ -7,14 +7,15 @@ const experimental = true;
 
 const compile = Schema.value;
 
-const interpret = (fragment, instance, ast, dynamicAnchors, quiet) => {
+const evaluate = (strategy) => (fragment, instance, ast, dynamicAnchors, quiet) => {
   if (!(fragment in dynamicAnchors)) {
     throw Error(`No dynamic anchor found for "${fragment}"`);
   }
-  return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
+  return strategy(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
 };
 
-const collectEvaluatedProperties = Validation.collectEvaluatedProperties;
-const collectEvaluatedItems = Validation.collectEvaluatedItems;
+const interpret = evaluate(Validation.interpret);
+const collectEvaluatedProperties = evaluate(Validation.collectEvaluatedProperties);
+const collectEvaluatedItems = evaluate(Validation.collectEvaluatedItems);
 
 export default { id, experimental, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@types/chai": "*",
     "@types/mocha": "*",
-    "@types/node": "^20.6.2",
+    "@types/node": "*",
     "@typescript-eslint/eslint-plugin": "*",
     "@typescript-eslint/parser": "*",
     "chai": "*",

package/draft-2019-09/recursiveRef.js

@@ -1,20 +0,0 @@
-import Validation from "../lib/keywords/validation.js";
-
-
-const id = "https://json-schema.org/keyword/draft-2019-09/recursiveRef";
-
-const compile = (schema) => schema.id;
-
-const interpret = (id, instance, ast, dynamicAnchors, quiet) => {
-  if ("" in ast.metaData[id].dynamicAnchors) {
-    dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
-    return Validation.interpret(dynamicAnchors[""], instance, ast, dynamicAnchors, quiet);
-  } else {
-    return Validation.interpret(`${id}#`, instance, ast, dynamicAnchors, quiet);
-  }
-};
-
-const collectEvaluatedProperties = Validation.collectEvaluatedProperties;
-const collectEvaluatedItems = Validation.collectEvaluatedItems;
-
-export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };