@hyperjump/json-schema 1.2.2 → 1.2.3

package/lib/keywords/validation.js

@@ -89,6 +89,7 @@ const interpret = (url, instance, ast, dynamicAnchors) => {
   return isValid;
 };
 
+const emptyPropertyNames = [];
 const collectEvaluatedProperties = (url, instance, ast, dynamicAnchors, isTop = false) => {
   const nodes = ast[url][2];
 
@@ -96,14 +97,28 @@ const collectEvaluatedProperties = (url, instance, ast, dynamicAnchors, isTop =
     return nodes ? [] : false;
   }
 
-  return nodes
-    .filter(([keywordId]) => !isTop || keywordId !== "https://json-schema.org/keyword/unevaluatedProperties")
-    .reduce((acc, [keywordId, , keywordValue]) => {
-      const propertyNames = acc && getKeyword(keywordId).collectEvaluatedProperties(keywordValue, instance, ast, dynamicAnchors);
-      return propertyNames !== false && [...acc, ...propertyNames];
-    }, []);
+  const accumulatedPropertyNames = [];
+  for (const [keywordId, , keywordValue] of nodes) {
+    if (isTop && keywordId === "https://json-schema.org/keyword/unevaluatedProperties") {
+      continue;
+    }
+
+    const keywordHandler = getKeyword(keywordId);
+    const propertyNames = "collectEvaluatedProperties" in keywordHandler
+      ? keywordHandler.collectEvaluatedProperties(keywordValue, instance, ast, dynamicAnchors, isTop)
+      : keywordHandler.interpret(keywordValue, instance, ast, dynamicAnchors, isTop) && emptyPropertyNames;
+
+    if (propertyNames === false) {
+      return false;
+    }
+
+    Array.prototype.push.apply(accumulatedPropertyNames, propertyNames);
+  }
+
+  return accumulatedPropertyNames;
 };
 
+const emptyItemIndexes = new Set();
 const collectEvaluatedItems = (url, instance, ast, dynamicAnchors, isTop = false) => {
   const nodes = ast[url][2];
 
@@ -111,12 +126,25 @@ const collectEvaluatedItems = (url, instance, ast, dynamicAnchors, isTop = false
     return nodes ? new Set() : false;
   }
 
-  return nodes
-    .filter(([keywordId]) => !isTop || keywordId !== "https://json-schema.org/keyword/unevaluatedItems")
-    .reduce((acc, [keywordId, , keywordValue]) => {
-      const itemIndexes = acc !== false && getKeyword(keywordId).collectEvaluatedItems(keywordValue, instance, ast, dynamicAnchors);
-      return itemIndexes !== false && new Set([...acc, ...itemIndexes]);
-    }, new Set());
+  const accumulatedItemIndexes = new Set();
+  for (const [keywordId, , keywordValue] of nodes) {
+    if (isTop && keywordId === "https://json-schema.org/keyword/unevaluatedItems") {
+      continue;
+    }
+
+    const keywordHandler = getKeyword(keywordId);
+    const itemIndexes = "collectEvaluatedItems" in keywordHandler
+      ? keywordHandler.collectEvaluatedItems(keywordValue, instance, ast, dynamicAnchors, isTop)
+      : keywordHandler.interpret(keywordValue, instance, ast, dynamicAnchors, isTop) && emptyItemIndexes;
+
+    if (itemIndexes === false) {
+      return false;
+    }
+
+    itemIndexes.forEach(Set.prototype.add.bind(accumulatedItemIndexes));
+  }
+
+  return accumulatedItemIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/lib/keywords.js

@@ -5,15 +5,7 @@ const _keywords = {};
 export const getKeyword = (id) => _keywords[id] || id.startsWith("https://json-schema.org/keyword/unknown#") && { id, ...metaData };
 
 export const addKeyword = (keywordHandler) => {
-  _keywords[keywordHandler.id] = {
-    collectEvaluatedItems: (keywordValue, instance, ast, dynamicAnchors, isTop) => {
-      return keywordHandler.interpret(keywordValue, instance, ast, dynamicAnchors, isTop) && new Set();
-    },
-    collectEvaluatedProperties: (keywordValue, instance, ast, dynamicAnchors, isTop) => {
-      return keywordHandler.interpret(keywordValue, instance, ast, dynamicAnchors, isTop) && [];
-    },
-    ...keywordHandler
-  };
+  _keywords[keywordHandler.id] = keywordHandler;
 };
 
 const _vocabularies = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -71,6 +71,6 @@
     "uuid": "^9.0.0"
   },
   "engines": {
-    "node": "^18.0.0"
+    "node": ">=18.0.0"
   }
 }