@hyperjump/json-schema 1.4.3 → 1.4.5

package/bundle/index.js

@@ -92,7 +92,7 @@ const loadKeywordSupport = () => {
 
   const additionalProperties = getKeyword("https://json-schema.org/keyword/additionalProperties");
   if (additionalProperties) {
-    additionalProperties.collectExternalIds = ([, , additionalProperties], externalIds, ast, dynamicAnchors) => {
+    additionalProperties.collectExternalIds = ([, additionalProperties], externalIds, ast, dynamicAnchors) => {
       if (typeof additionalProperties === "string") {
         Validation.collectExternalIds(additionalProperties, externalIds, ast, dynamicAnchors);
       }

package/draft-04/additionalItems.js

@@ -14,12 +14,12 @@ const compile = async (schema, ast, parentSchema) => {
   return [numberOfItems, await Validation.compile(schema, ast)];
 };
 
-const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAnchors) => {
+const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAnchors, quiet) => {
   if (!Instance.typeOf(instance, "array")) {
     return true;
   }
 
-  return Instance.every((item, ndx) => ndx < numberOfItems || Validation.interpret(additionalItems, item, ast, dynamicAnchors), instance);
+  return Instance.every((item, ndx) => ndx < numberOfItems || Validation.interpret(additionalItems, item, ast, dynamicAnchors), instance, quiet);
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {

package/draft-04/dependencies.js

@@ -14,7 +14,7 @@ const compile = (schema, ast) => Pact.pipeline([
   Pact.all
 ], schema);
 
-const interpret = (dependencies, instance, ast, dynamicAnchors) => {
+const interpret = (dependencies, instance, ast, dynamicAnchors, quiet) => {
   const value = Instance.value(instance);
 
   return !Instance.typeOf(instance, "object") || dependencies.every(([propertyName, dependency]) => {
@@ -25,7 +25,7 @@ const interpret = (dependencies, instance, ast, dynamicAnchors) => {
     if (Array.isArray(dependency)) {
       return dependency.every((key) => key in value);
     } else {
-      return Validation.interpret(dependency, instance, ast, dynamicAnchors);
+      return Validation.interpret(dependency, instance, ast, dynamicAnchors, quiet);
     }
   });
 };

package/draft-04/items.js

@@ -14,15 +14,15 @@ const compile = async (schema, ast) => {
   }
 };
 
-const interpret = (items, instance, ast, dynamicAnchors) => {
+const interpret = (items, instance, ast, dynamicAnchors, quiet) => {
   if (!Instance.typeOf(instance, "array")) {
     return true;
   }
 
   if (typeof items === "string") {
-    return Instance.every((itemValue) => Validation.interpret(items, itemValue, ast, dynamicAnchors), instance);
+    return Instance.every((itemValue) => Validation.interpret(items, itemValue, ast, dynamicAnchors), instance, quiet);
   } else {
-    return Instance.every((item, ndx) => !(ndx in items) || Validation.interpret(items[ndx], item, ast, dynamicAnchors), instance);
+    return Instance.every((item, ndx) => !(ndx in items) || Validation.interpret(items[ndx], item, ast, dynamicAnchors), instance, quiet);
   }
 };
 

package/draft-06/contains.js

@@ -6,8 +6,8 @@ const id = "https://json-schema.org/keyword/draft-06/contains";
 
 const compile = (schema, ast) => Validation.compile(schema, ast);
 
-const interpret = (contains, instance, ast, dynamicAnchors) => {
-  return !Instance.typeOf(instance, "array") || Instance.some((item) => Validation.interpret(contains, item, ast, dynamicAnchors), instance);
+const interpret = (contains, instance, ast, dynamicAnchors, quiet) => {
+  return !Instance.typeOf(instance, "array") || Instance.some((item) => Validation.interpret(contains, item, ast, dynamicAnchors), instance, quiet);
 };
 
 export default { id, compile, interpret };

package/draft-2019-09/contains.js

@@ -20,13 +20,13 @@ const compile = async (schema, ast, parentSchema) => {
   return { contains, minContains, maxContains };
 };
 
-const interpret = ({ contains, minContains, maxContains }, instance, ast, dynamicAnchors) => {
+const interpret = ({ contains, minContains, maxContains }, instance, ast, dynamicAnchors, quiet) => {
   if (!Instance.typeOf(instance, "array")) {
     return true;
   }
 
   const matches = Instance.reduce((matches, item) => {
-    return Validation.interpret(contains, item, ast, dynamicAnchors) ? matches + 1 : matches;
+    return Validation.interpret(contains, item, ast, dynamicAnchors, quiet) ? matches + 1 : matches;
   }, 0, instance);
   return matches >= minContains && matches <= maxContains;
 };

package/draft-2019-09/recursiveRef.js

@@ -5,12 +5,12 @@ const id = "https://json-schema.org/keyword/draft-2019-09/recursiveRef";
 
 const compile = (schema) => schema.id;
 
-const interpret = (id, instance, ast, dynamicAnchors) => {
+const interpret = (id, instance, ast, dynamicAnchors, quiet) => {
   if ("" in ast.metaData[id].dynamicAnchors) {
     dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
-    return Validation.interpret(dynamicAnchors[""], instance, ast, dynamicAnchors);
+    return Validation.interpret(dynamicAnchors[""], instance, ast, dynamicAnchors, quiet);
   } else {
-    return Validation.interpret(`${id}#`, instance, ast, dynamicAnchors);
+    return Validation.interpret(`${id}#`, instance, ast, dynamicAnchors, quiet);
   }
 };
 

package/draft-2020-12/dynamicRef.js

@@ -12,12 +12,12 @@ const compile = async (dynamicRef, ast) => {
   return [referencedSchema.id, fragment, Schema.uri(referencedSchema)];
 };
 
-const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors) => {
+const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors, quiet) => {
   if (fragment in ast.metaData[id].dynamicAnchors) {
     dynamicAnchors = { ...ast.metaData[id].dynamicAnchors, ...dynamicAnchors };
-    return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors);
+    return Validation.interpret(dynamicAnchors[fragment], instance, ast, dynamicAnchors, quiet);
   } else {
-    return Validation.interpret(ref, instance, ast, dynamicAnchors);
+    return Validation.interpret(ref, instance, ast, dynamicAnchors, quiet);
   }
 };
 

package/lib/common.js

@@ -1,4 +1,4 @@
-import { resolveIri, toAbsoluteIri, parseIriReference } from "@hyperjump/uri";
+import { resolveIri, parseIriReference } from "@hyperjump/uri";
 import * as JsonPointer from "@hyperjump/json-pointer";
 
 

package/lib/keywords/additionalProperties.js

@@ -7,35 +7,50 @@ import Validation from "./validation.js";
 const id = "https://json-schema.org/keyword/additionalProperties";
 
 const compile = async (schema, ast, parentSchema) => {
+  const patterns = [];
+
   const propertiesKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/properties");
   const propertiesSchema = await Schema.step(propertiesKeyword, parentSchema);
-  const propertyNames = Schema.typeOf(propertiesSchema, "object") ? Schema.keys(propertiesSchema) : [];
+  if (Schema.typeOf(propertiesSchema, "object")) {
+    for (const name of Schema.keys(propertiesSchema)) {
+      patterns.push(regexEscape(name));
+    }
+  }
 
   const patternPropertiesKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/patternProperties");
   const patternProperties = await Schema.step(patternPropertiesKeyword, parentSchema);
-  const propertyNamePatterns = Schema.typeOf(patternProperties, "object") ? Schema.keys(patternProperties).map((pattern) => new RegExp(pattern)) : [];
+  if (Schema.typeOf(patternProperties, "object")) {
+    patterns.push(...Schema.keys(patternProperties));
+  }
 
-  return [propertyNames, propertyNamePatterns, await Validation.compile(schema, ast)];
+  return [
+    new RegExp(patterns.length > 0 ? patterns.join("|") : "(?!)", "u"),
+    await Validation.compile(schema, ast)
+  ];
 };
 
-const interpret = ([propertyNames, propertyNamePatterns, additionalProperties], instance, ast, dynamicAnchors, quiet) => {
+const regexEscape = (string) => string
+  .replace(/[|\\{}()[\]^$+*?.]/g, "\\$&")
+  .replace(/-/g, "\\x2d");
+
+const interpret = ([isDefinedProperty, additionalProperties], instance, ast, dynamicAnchors, quiet) => {
   if (!Instance.typeOf(instance, "object")) {
     return true;
   }
 
   return Instance.entries(instance)
-    .filter(([propertyName]) => !propertyNames.includes(propertyName) && !propertyNamePatterns.some((pattern) => pattern.test(propertyName)))
+    .filter(([propertyName]) => !isDefinedProperty.test(propertyName))
     .every(([, property]) => Validation.interpret(additionalProperties, property, ast, dynamicAnchors, quiet));
 };
 
-const collectEvaluatedProperties = ([propertyNames, propertyNamePatterns, additionalProperties], instance, ast, dynamicAnchors) => {
+const collectEvaluatedProperties = ([isDefinedProperty, additionalProperties], instance, ast, dynamicAnchors) => {
   if (!Instance.typeOf(instance, "object")) {
     return true;
   }
 
   const evaluatedPropertyNames = new Set();
   for (const [propertyName, property] of Instance.entries(instance)) {
-    if (!propertyNames.includes(propertyName) && !propertyNamePatterns.some((pattern) => pattern.test(propertyName))) {
+    if (!isDefinedProperty.test(propertyName)) {
       if (!Validation.interpret(additionalProperties, property, ast, dynamicAnchors, true)) {
         return false;
       }

package/package.json

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