@hyperjump/json-schema 1.4.4 → 1.4.6

package/README.md

@@ -409,13 +409,13 @@ addSchema({
   "$schema": "https://json-schema.org/draft/2020-12/schema",
 
   "$vocabulary": {
-    "https://json-schema.org/vocab/core": true,
-    "https://json-schema.org/vocab/applicator": true,
-    "https://json-schema.org/vocab/unevaluated": true,
-    "https://json-schema.org/vocab/validation": true,
-    "https://json-schema.org/vocab/meta-data": true,
-    "https://json-schema.org/vocab/format-annotation": true,
-    "https://json-schema.org/vocab/content": true,
+    "https://json-schema.org/draft/2020-12/vocab/core": true,
+    "https://json-schema.org/draft/2020-12/vocab/applicator": true,
+    "https://json-schema.org/draft/2020-12/vocab/unevaluated": true,
+    "https://json-schema.org/draft/2020-12/vocab/validation": true,
+    "https://json-schema.org/draft/2020-12/vocab/meta-data": true,
+    "https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
+    "https://json-schema.org/draft/2020-12/vocab/content": true
     "https://example.com/vocab/logic": true
   },
 

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/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.4",
+  "version": "1.4.6",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",
@@ -65,7 +65,7 @@
   "dependencies": {
     "@hyperjump/json-pointer": "^1.0.0",
     "@hyperjump/pact": "^0.2.4",
-    "@hyperjump/uri": "^1.0.0",
+    "@hyperjump/uri": "^1.2.0",
     "content-type": "^1.0.4",
     "fastest-stable-stringify": "^2.0.2",
     "just-curry-it": "^5.3.0",