Some performance tweaks

Author: jdesrosiers

lib/keywords/else.js

@@ -1,4 +1,5 @@
 import * as Browser from "@hyperjump/browser";
+import { FLAG } from "../index.js";
 import { getKeywordName, Validation } from "../experimental.js";
 
 
@@ -16,7 +17,7 @@ const compile = async (schema, ast, parentSchema) => {
 
 const interpret = ([ifSchema, elseSchema], instance, context) => {
   return ifSchema === undefined
-    || Validation.interpret(ifSchema, instance, { ...context, errors: [], annotations: [] })
+    || Validation.interpret(ifSchema, instance, { ...context, errors: [], annotations: [], oututFormat: FLAG })
     || Validation.interpret(elseSchema, instance, context);
 };
 

lib/keywords/then.js

@@ -1,6 +1,6 @@
 import * as Browser from "@hyperjump/browser";
-import { getKeywordName } from "../keywords.js";
-import { Validation } from "../experimental.js";
+import { FLAG } from "../index.js";
+import { getKeywordName, Validation } from "../experimental.js";
 
 
 const id = "https://json-schema.org/keyword/then";
@@ -17,7 +17,7 @@ const compile = async (schema, ast, parentSchema) => {
 
 const interpret = ([ifSchema, thenSchema], instance, context) => {
   return ifSchema === undefined
-    || !Validation.interpret(ifSchema, instance, { ...context, errors: [], annotations: [] })
+    || !Validation.interpret(ifSchema, instance, { ...context, errors: [], annotations: [], outputFormat: FLAG })
     || Validation.interpret(thenSchema, instance, context);
 };
 

lib/keywords/unevaluatedItems.js

@@ -1,7 +1,7 @@
 import { zip, range } from "@hyperjump/pact";
+import { FLAG } from "../index.js";
+import { canonicalUri, Validation } from "../experimental.js";
 import * as Instance from "../instance.js";
-import { canonicalUri } from "../schema.js";
-import { Validation } from "../experimental.js";
 
 
 const id = "https://json-schema.org/keyword/unevaluatedItems";
@@ -15,7 +15,8 @@ const interpret = ([schemaUrl, unevaluatedItems], instance, context) => {
     return true;
   }
 
-  const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, { ...context, errors: [], annotations: [] }, true);
+  const keywordContext = { ...context, errors: [], annotations: [], outputFormat: FLAG };
+  const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, keywordContext, true);
   if (itemIndexes === false) {
     return true;
   }

lib/keywords/unevaluatedProperties.js

@@ -1,3 +1,4 @@
+import { FLAG } from "../index.js";
 import { Validation, canonicalUri } from "../experimental.js";
 import * as Instance from "../instance.js";
 
@@ -13,7 +14,8 @@ const interpret = ([schemaUrl, unevaluatedProperties], instance, context) => {
     return true;
   }
 
-  const evaluatedPropertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, { ...context, errors: [], annotations: [] }, true);
+  const keywordContext = { ...context, errors: [], annotations: [], outputFormat: FLAG };
+  const evaluatedPropertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, keywordContext, true);
   if (evaluatedPropertyNames === false) {
     return true;
   }