@hyperjump/json-schema 1.7.1 → 1.7.3

package/annotations/annotated-instance.js

@@ -5,8 +5,8 @@ import { getKeywordId } from "../lib/keywords.js";
 
 const defaultDialectId = "https://json-schema.org/validation";
 
-export const nil = { ...nilInstance, annotations: {} };
-export const cons = (instance, id = undefined) => ({
+export const nil = { ...nilInstance, annotations: {} }; // eslint-disable-line import/export
+export const cons = (instance, id = undefined) => ({ // eslint-disable-line import/export
   ...nil,
   id: id ? toAbsoluteIri(id) : "",
   instance,
@@ -47,4 +47,4 @@ export const annotatedWith = (instance, keyword, dialectId = defaultDialectId) =
   return instances;
 };
 
-export * from "../lib/instance.js";
+export * from "../lib/instance.js"; // eslint-disable-line import/export

package/lib/index.js

@@ -94,6 +94,7 @@ addKeyword(exclusiveMinimum);
 addKeyword(format);
 addKeyword(id);
 addKeyword(if_);
+addKeyword(itemPattern);
 addKeyword(items);
 addKeyword(maxContains);
 addKeyword(maxItems);
@@ -118,7 +119,6 @@ addKeyword(readOnly);
 addKeyword(ref);
 addKeyword(requireAllExcept);
 addKeyword(required);
-addKeyword(itemPattern);
 addKeyword(title);
 addKeyword(then);
 addKeyword(type);

package/lib/instance.js

@@ -1,6 +1,6 @@
 import { append as pointerAppend, get as pointerGet } from "@hyperjump/json-pointer";
 import { toAbsoluteIri } from "@hyperjump/uri";
-import { jsonTypeOf } from "./common.js";
+import { jsonTypeOf, uriFragment } from "./common.js";
 import { Reference } from "@hyperjump/browser/jref";
 
 
@@ -17,7 +17,7 @@ export const get = (url, instance = nil) => {
     throw Error(`No JSON document found at '${url.split("#")[0]}'`);
   }
 
-  const pointer = url.substr(1);
+  const pointer = uriFragment(url);
   return {
     ...instance,
     pointer: pointer,

package/lib/keywords/allOf.js

@@ -16,17 +16,31 @@ const interpret = (allOf, instance, ast, dynamicAnchors, quiet) => {
 };
 
 const collectEvaluatedProperties = (allOf, instance, ast, dynamicAnchors) => {
-  return allOf.reduce((acc, schemaUrl) => {
-    const propertyNames = acc && Validation.collectEvaluatedProperties(schemaUrl, instance, ast, dynamicAnchors);
-    return propertyNames !== false && [...acc, ...propertyNames];
-  }, []);
+  const evaluatedPropertyNames = new Set();
+  for (const schemaUrl of allOf) {
+    const propertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, ast, dynamicAnchors);
+    if (!propertyNames) {
+      return false;
+    }
+
+    propertyNames.forEach(evaluatedPropertyNames.add, evaluatedPropertyNames);
+  }
+
+  return evaluatedPropertyNames;
 };
 
 const collectEvaluatedItems = (allOf, instance, ast, dynamicAnchors) => {
-  return allOf.reduce((acc, schemaUrl) => {
-    const itemIndexes = acc !== false && Validation.collectEvaluatedItems(schemaUrl, instance, ast, dynamicAnchors);
-    return itemIndexes !== false && new Set([...acc, ...itemIndexes]);
-  }, new Set());
+  const evaluatedItemIndexes = new Set();
+  for (const schemaUrl of allOf) {
+    const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, ast, dynamicAnchors);
+    if (!itemIndexes) {
+      return false;
+    }
+
+    itemIndexes.forEach(evaluatedItemIndexes.add, evaluatedItemIndexes);
+  }
+
+  return evaluatedItemIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/lib/keywords/anyOf.js

@@ -17,17 +17,29 @@ const interpret = (anyOf, instance, ast, dynamicAnchors, quiet) => {
 };
 
 const collectEvaluatedProperties = (anyOf, instance, ast, dynamicAnchors) => {
-  return anyOf.reduce((acc, schemaUrl) => {
+  let evaluatedPropertyNames = false;
+  for (const schemaUrl of anyOf) {
     const propertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, ast, dynamicAnchors);
-    return propertyNames === false ? acc : [...acc || [], ...propertyNames];
-  }, false);
+    if (propertyNames) {
+      evaluatedPropertyNames ||= new Set();
+      propertyNames.forEach(evaluatedPropertyNames.add, evaluatedPropertyNames);
+    }
+  }
+
+  return evaluatedPropertyNames;
 };
 
 const collectEvaluatedItems = (anyOf, instance, ast, dynamicAnchors) => {
-  return anyOf.reduce((acc, schemaUrl) => {
+  let evaluatedItemIndexes = false;
+  for (const schemaUrl of anyOf) {
     const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, ast, dynamicAnchors);
-    return itemIndexes === false ? acc : new Set([...acc || [], ...itemIndexes]);
-  }, false);
+    if (itemIndexes) {
+      evaluatedItemIndexes ||= new Set();
+      itemIndexes.forEach(evaluatedItemIndexes.add, evaluatedItemIndexes);
+    }
+  }
+
+  return evaluatedItemIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/lib/keywords/oneOf.js

@@ -27,27 +27,35 @@ const interpret = (oneOf, instance, ast, dynamicAnchors, quiet) => {
 };
 
 const collectEvaluatedProperties = (oneOf, instance, ast, dynamicAnchors) => {
-  let validCount = 0;
-  return oneOf.reduce((acc, schemaUrl) => {
-    if (validCount > 1) {
-      return false;
+  let evaluatedProperties = false;
+  for (const schemaUrl of oneOf) {
+    const propertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, ast, dynamicAnchors);
+    if (propertyNames) {
+      if (evaluatedProperties) {
+        return false;
+      }
+
+      evaluatedProperties = propertyNames;
     }
+  }
 
-    const propertyNames = Validation.collectEvaluatedProperties(schemaUrl, instance, ast, dynamicAnchors);
-    return propertyNames ? validCount++ === 0 && propertyNames : acc;
-  }, false);
+  return evaluatedProperties;
 };
 
 const collectEvaluatedItems = (oneOf, instance, ast, dynamicAnchors) => {
-  let validCount = 0;
-  return oneOf.reduce((acc, schemaUrl) => {
-    if (validCount > 1) {
-      return false;
+  let evaluatedItemIndexes = false;
+  for (const schemaUrl of oneOf) {
+    const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, ast, dynamicAnchors);
+    if (itemIndexes) {
+      if (evaluatedItemIndexes) {
+        return false;
+      }
+
+      evaluatedItemIndexes = itemIndexes;
     }
+  }
 
-    const itemIndexes = Validation.collectEvaluatedItems(schemaUrl, instance, ast, dynamicAnchors);
-    return itemIndexes ? validCount++ === 0 && itemIndexes : acc;
-  }, false);
+  return evaluatedItemIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedProperties, collectEvaluatedItems };

package/lib/keywords/propertyDependencies.js

@@ -30,17 +30,22 @@ const interpret = (propertyDependencies, instance, ast, dynamicAnchors, quiet) =
 };
 
 const collectEvaluatedProperties = (propertyDependencies, instance, ast, dynamicAnchors) => {
-  return Object.entries(propertyDependencies)
-    .reduce((acc, [propertyName, valueMappings]) => {
-      const propertyValue = Instance.value(instance)[propertyName];
-
-      if (Instance.has(propertyName, instance) && propertyValue in valueMappings) {
-        const propertyNames = Validation.collectEvaluatedProperties(valueMappings[propertyValue], instance, ast, dynamicAnchors);
-        return propertyNames !== false && acc.concat(propertyNames);
-      } else {
-        return acc;
+  const evaluatedPropertyNames = new Set();
+  for (const propertyName in propertyDependencies) {
+    const propertyValue = Instance.value(instance)[propertyName];
+
+    const valueMappings = propertyDependencies[propertyName];
+    if (Instance.has(propertyName, instance) && propertyValue in valueMappings) {
+      const propertyNames = Validation.collectEvaluatedProperties(valueMappings[propertyValue], instance, ast, dynamicAnchors);
+      if (!propertyNames) {
+        return false;
       }
-    }, []);
+
+      propertyNames.forEach(evaluatedPropertyNames.add, evaluatedPropertyNames);
+    }
+  }
+
+  return evaluatedPropertyNames;
 };
 
 export default { id, compile, interpret, collectEvaluatedProperties };

package/lib/keywords/validation.js

@@ -77,7 +77,7 @@ const interpret = (url, instance, ast, dynamicAnchors, quiet = false) => {
 const emptyPropertyNames = new Set();
 const collectEvaluatedProperties = (url, instance, ast, dynamicAnchors, isTop = false) => {
   if (typeof ast[url] === "boolean") {
-    return ast[url] ? [] : false;
+    return ast[url] ? new Set() : false;
   }
 
   const accumulatedPropertyNames = new Set();
@@ -95,7 +95,7 @@ const collectEvaluatedProperties = (url, instance, ast, dynamicAnchors, isTop =
       return false;
     }
 
-    propertyNames.forEach(Set.prototype.add.bind(accumulatedPropertyNames));
+    propertyNames.forEach(accumulatedPropertyNames.add, accumulatedPropertyNames);
   }
 
   return accumulatedPropertyNames;
@@ -122,7 +122,7 @@ const collectEvaluatedItems = (url, instance, ast, dynamicAnchors, isTop = false
       return false;
     }
 
-    itemIndexes.forEach(Set.prototype.add.bind(accumulatedItemIndexes));
+    itemIndexes.forEach(accumulatedItemIndexes.add, accumulatedItemIndexes);
   }
 
   return accumulatedItemIndexes;

package/lib/schema.js

@@ -14,20 +14,18 @@ export const schemaPlugin = {
 
     return buildSchemaDocument(await response.json(), response.url, contextDialectId);
   },
-  fileMatcher: (path) => path.endsWith(".schema.json")
+  fileMatcher: (path) => /(\.|\/)schema\.json$/.test(path)
 };
 
 const schemaRegistry = {};
 
 export const getSchema = async (uri, browser = undefined) => {
   if (!browser) {
-    const cache = {};
+    browser = { _cache: {} };
 
     for (const uri in schemaRegistry) {
-      cache[uri] = schemaRegistry[uri];
+      browser._cache[uri] = schemaRegistry[uri];
     }
-
-    browser = { _cache: cache };
   }
 
   const schema = await browserGet(uri, browser);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -22,7 +22,8 @@
   "scripts": {
     "clean": "xargs -a .gitignore rm -rf",
     "lint": "eslint lib stable draft-* openapi-* bundle annotations",
-    "test": "vitest --watch=false"
+    "test": "vitest --watch=false",
+    "check-types": "tsc --noEmit"
   },
   "repository": {
     "type": "git",