Update to allow for instrumentation

Author: jdesrosiers

draft-2020-12/dynamicRef.js

@@ -12,7 +12,7 @@ const compile = async (dynamicRef, ast) => {
   return [referencedSchema.document.baseUri, fragment, canonicalUri(referencedSchema)];
 };
 
-const evaluate = (strategy) => ([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 strategy(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
@@ -21,8 +21,8 @@ const evaluate = (strategy) => ([id, fragment, ref], instance, ast, dynamicAncho
   }
 };
 
-const interpret = evaluate(Validation.interpret);
-const collectEvaluatedProperties = evaluate(Validation.collectEvaluatedProperties);
-const collectEvaluatedItems = evaluate(Validation.collectEvaluatedItems);
+const interpret = (...args) => evaluate(Validation.interpret, ...args);
+const collectEvaluatedProperties = (...args) => evaluate(Validation.collectEvaluatedProperties, ...args);
+const collectEvaluatedItems = (...args) => evaluate(Validation.collectEvaluatedItems, ...args);
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

lib/keywords/dynamicRef.js

@@ -12,15 +12,15 @@ const compile = async (schema, ast) => {
   return reference;
 };
 
-const evaluate = (strategy) => (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 strategy(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
 };
 
-const interpret = evaluate(Validation.interpret);
-const collectEvaluatedProperties = evaluate(Validation.collectEvaluatedProperties);
-const collectEvaluatedItems = evaluate(Validation.collectEvaluatedItems);
+const interpret = (...args) => evaluate(Validation.interpret, ...args);
+const collectEvaluatedProperties = (...args) => evaluate(Validation.collectEvaluatedProperties, ...args);
+const collectEvaluatedItems = (...args) => evaluate(Validation.collectEvaluatedItems, ...args);
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

lib/keywords/not.js

@@ -3,7 +3,7 @@ import { Validation } from "../experimental.js";
 
 const id = "https://json-schema.org/keyword/not";
 
-const compile = Validation.compile;
-const interpret = (not, instance, ast, dynamicAnchors, quiet) => !Validation.interpret(not, instance, ast, dynamicAnchors, quiet);
+const compile = (...args) => Validation.compile(...args);
+const interpret = (...args) => !Validation.interpret(...args);
 
 export default { id, compile, interpret };

lib/keywords/ref.js

@@ -3,9 +3,9 @@ import { Validation } from "../experimental.js";
 
 const id = "https://json-schema.org/keyword/ref";
 
-const compile = Validation.compile;
-const interpret = Validation.interpret;
-const collectEvaluatedProperties = Validation.collectEvaluatedProperties;
-const collectEvaluatedItems = Validation.collectEvaluatedItems;
+const compile = (...args) => Validation.compile(...args);
+const interpret = (...args) => Validation.interpret(...args);
+const collectEvaluatedProperties = (...args) => Validation.collectEvaluatedProperties(...args);
+const collectEvaluatedItems = (...args) => Validation.collectEvaluatedItems(...args);
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };