@hyperjump/json-schema 1.2.5 → 1.2.6

package/draft-04/additionalItems.js

@@ -23,7 +23,16 @@ const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAncho
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  if (!interpret(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/lib/keywords/items.js

@@ -8,8 +8,8 @@ const id = "https://json-schema.org/keyword/items";
 
 const compile = async (schema, ast, parentSchema) => {
   const prefixItemKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/prefixItems");
-  const items = await Schema.step(prefixItemKeyword, parentSchema);
-  const numberOfPrefixItems = Schema.typeOf(items, "array") ? Schema.length(items) : 0;
+  const prefixItems = await Schema.step(prefixItemKeyword, parentSchema);
+  const numberOfPrefixItems = Schema.typeOf(prefixItems, "array") ? Schema.length(prefixItems) : 0;
 
   return [numberOfPrefixItems, await Validation.compile(schema, ast)];
 };
@@ -23,7 +23,16 @@ const interpret = ([numberOfPrefixItems, items], instance, ast, dynamicAnchors)
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  if (!interpret(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/lib/keywords/unevaluatedItems.js

@@ -21,7 +21,18 @@ const interpret = ([schemaUrl, unevaluatedItems], instance, ast, dynamicAnchors)
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  const itemIndexes = Validation.collectEvaluatedItems(keywordValue[0], instance, ast, dynamicAnchors, true);
+  if (!itemIndexes) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = 0; ndx < Instance.length(instance); ndx++) {
+    if (!itemIndexes.has(ndx)) {
+      evaluatedIndexes.add(ndx);
+    }
+  }
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/package.json

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