Fix a couple issues with dependent keywords

- Check that min/maxContains is coming from the right schema
- Add exclusiveMinimum/Maximum to draft-04 minimum/maximum schemaLocations

Author: jdesrosiers

src/error-handlers/contains.js

@@ -28,19 +28,24 @@ const containsErrorHandler = async (normalizedErrors, instance, localization) =>
 
       /** @type ContainsRange */
       const range = {};
+      const parentLocation = pointerPop(schemaLocation);
 
       for (const minContainsLocation in normalizedErrors["https://json-schema.org/keyword/minContains"]) {
-        const minContainsNode = await getSchema(minContainsLocation);
-        const minContains = /** @type number */ (Schema.value(minContainsNode));
-        range.minContains = Math.max(range.minContains ?? -1, minContains);
-        schemaLocations.push(minContainsLocation);
+        if (pointerPop(minContainsLocation) === parentLocation) {
+          const minContainsNode = await getSchema(minContainsLocation);
+          range.minContains = /** @type number */ (Schema.value(minContainsNode));
+          schemaLocations.push(minContainsLocation);
+          break;
+        }
       }
 
       for (const maxContainsLocation in normalizedErrors["https://json-schema.org/keyword/maxContains"]) {
-        const maxContainsNode = await getSchema(maxContainsLocation);
-        const maxContains = /** @type number */ (Schema.value(maxContainsNode));
-        range.maxContains = Math.min(range.maxContains ?? Number.MAX_VALUE, maxContains);
-        schemaLocations.push(maxContainsLocation);
+        if (pointerPop(maxContainsLocation) === parentLocation) {
+          const maxContainsNode = await getSchema(maxContainsLocation);
+          range.maxContains = /** @type number */ (Schema.value(maxContainsNode));
+          schemaLocations.push(maxContainsLocation);
+          break;
+        }
       }
 
       errors.push({
@@ -54,4 +59,7 @@ const containsErrorHandler = async (normalizedErrors, instance, localization) =>
   return errors;
 };
 
+/** @type (pointer: string) => string */
+const pointerPop = (pointer) => pointer.replace(/\/[^/]+$/, "");
+
 export default containsErrorHandler;

src/error-handlers/draft-04/maximum.js

@@ -16,12 +16,13 @@ const maximumErrorHandler = async (normalizedErrors, instance, localization) =>
       continue;
     }
 
+    const schemaLocations = [schemaLocation];
     const parentLocation = pointerPop(schemaLocation);
 
     let exclusive = false;
     for (const exclusiveLocation in normalizedErrors["https://json-schema.org/keyword/draft-04/exclusiveMaximum"]) {
-      const exclusiveParentLocation = pointerPop(exclusiveLocation);
-      if (exclusiveParentLocation === parentLocation) {
+      if (pointerPop(exclusiveLocation) === parentLocation) {
+        schemaLocations.push(exclusiveLocation);
         const exclusiveNode = await getSchema(exclusiveLocation);
         exclusive = /** @type boolean */ (Schema.value(exclusiveNode));
         break;
@@ -35,13 +36,13 @@ const maximumErrorHandler = async (normalizedErrors, instance, localization) =>
       errors.push({
         message: localization.getExclusiveMaximumErrorMessage(maximum),
         instanceLocation: Instance.uri(instance),
-        schemaLocations: [schemaLocation]
+        schemaLocations: schemaLocations
       });
     } else {
       errors.push({
         message: localization.getMaximumErrorMessage(maximum),
         instanceLocation: Instance.uri(instance),
-        schemaLocations: [schemaLocation]
+        schemaLocations: schemaLocations
       });
     }
   }

src/error-handlers/draft-04/minimum.js

@@ -16,12 +16,13 @@ const minimumErrorHandler = async (normalizedErrors, instance, localization) =>
       continue;
     }
 
+    const schemaLocations = [schemaLocation];
     const parentLocation = pointerPop(schemaLocation);
 
     let exclusive = false;
     for (const exclusiveLocation in normalizedErrors["https://json-schema.org/keyword/draft-04/exclusiveMinimum"]) {
-      const exclusiveParentLocation = pointerPop(exclusiveLocation);
-      if (exclusiveParentLocation === parentLocation) {
+      if (pointerPop(exclusiveLocation) === parentLocation) {
+        schemaLocations.push(exclusiveLocation);
         const exclusiveNode = await getSchema(exclusiveLocation);
         exclusive = /** @type boolean */ (Schema.value(exclusiveNode));
         break;
@@ -35,13 +36,13 @@ const minimumErrorHandler = async (normalizedErrors, instance, localization) =>
       errors.push({
         message: localization.getExclusiveMinimumErrorMessage(minimum),
         instanceLocation: Instance.uri(instance),
-        schemaLocations: [schemaLocation]
+        schemaLocations: schemaLocations
       });
     } else {
       errors.push({
         message: localization.getMinimumErrorMessage(minimum),
         instanceLocation: Instance.uri(instance),
-        schemaLocations: [schemaLocation]
+        schemaLocations: schemaLocations
       });
     }
   }

src/test-suite/tests/maximum.json

@@ -70,7 +70,10 @@
             "exclusiveMaximum": "3"
           },
           "instanceLocation": "#",
-          "schemaLocations": ["#/maximum"]
+          "schemaLocations": [
+            "#/maximum",
+            "#/exclusiveMaximum"
+          ]
         }
       ]
     },

src/test-suite/tests/minimum.json

@@ -70,7 +70,10 @@
             "exclusiveMinimum": "3"
           },
           "instanceLocation": "#",
-          "schemaLocations": ["#/minimum"]
+          "schemaLocations": [
+            "#/minimum",
+            "#/exclusiveMinimum"
+          ]
         }
       ]
     },