Combine error messages for maxItems and minItems (#152)

* Combine error messages for maxItems and minItems

* Add tests for maxItems and minItems

Author: Padmashree06

src/error-handlers/maxItems.js

@@ -10,6 +10,8 @@ import * as Instance from "@hyperjump/json-schema/instance/experimental";
 const maxItemsErrorHandler = async (normalizedErrors, instance, localization) => {
   /** @type ErrorObject[] */
   const errors = [];
+  let lowestMaxItems = Infinity;
+  let effectiveSchemaLocation = "";
 
   for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/maxItems"]) {
     if (normalizedErrors["https://json-schema.org/keyword/maxItems"][schemaLocation]) {
@@ -19,10 +21,17 @@ const maxItemsErrorHandler = async (normalizedErrors, instance, localization) =>
     const keyword = await getSchema(schemaLocation);
     const maxItems = /** @type number */ (Schema.value(keyword));
 
+    if (maxItems < lowestMaxItems) {
+      lowestMaxItems = maxItems;
+      effectiveSchemaLocation = schemaLocation;
+    }
+  }
+
+  if (lowestMaxItems != Infinity) {
     errors.push({
-      message: localization.getMaxItemsErrorMessage(maxItems),
+      message: localization.getMaxItemsErrorMessage(lowestMaxItems),
       instanceLocation: Instance.uri(instance),
-      schemaLocations: [schemaLocation]
+      schemaLocations: [effectiveSchemaLocation]
     });
   }
 

src/error-handlers/minItems.js

@@ -10,6 +10,8 @@ import * as Instance from "@hyperjump/json-schema/instance/experimental";
 const minItemsErrorHandler = async (normalizedErrors, instance, localization) => {
   /** @type ErrorObject[] */
   const errors = [];
+  let highestMinItem = 0;
+  let effectiveSchemaLocation = "";
 
   for (const schemaLocation in normalizedErrors["https://json-schema.org/keyword/minItems"]) {
     if (normalizedErrors["https://json-schema.org/keyword/minItems"][schemaLocation]) {
@@ -19,10 +21,17 @@ const minItemsErrorHandler = async (normalizedErrors, instance, localization) =>
     const keyword = await getSchema(schemaLocation);
     const minItems = /** @type number */ (Schema.value(keyword));
 
+    if (minItems > highestMinItem) {
+      highestMinItem = minItems;
+      effectiveSchemaLocation = schemaLocation;
+    }
+  }
+
+  if (highestMinItem != 0) {
     errors.push({
-      message: localization.getMinItemsErrorMessage(minItems),
+      message: localization.getMinItemsErrorMessage(highestMinItem),
       instanceLocation: Instance.uri(instance),
-      schemaLocations: [schemaLocation]
+      schemaLocations: [effectiveSchemaLocation]
     });
   }
 

src/test-suite/tests/maxItems.json

@@ -27,6 +27,23 @@
       },
       "instance": ["foo"],
       "errors": []
+    },
+    {
+      "description": "maxItems with multiple constraints (lowest value considered)",
+      "schema": {
+        "allOf": [{ "maxItems": 2 }, { "maxItems": 1 }]
+      },
+      "instance": ["foo", "bar", "word"],
+      "errors": [
+        {
+          "messageId": "maxItems-message",
+          "messageParams": {
+            "maxItems": "1"
+          },
+          "instanceLocation": "#",
+          "schemaLocations": ["#/allOf/1/maxItems"]
+        }
+      ]
     }
   ]
 }

src/test-suite/tests/minItems.json

@@ -27,6 +27,23 @@
       },
       "instance": ["foo"],
       "errors": []
+    },
+    {
+      "description": "minItems with multiple constraints (highest value is considered)",
+      "schema": {
+        "allOf": [{ "minItems": 4 }, { "minItems": 3 }]
+      },
+      "instance": ["foo", "bar"],
+      "errors": [
+        {
+          "messageId": "minItems-message",
+          "messageParams": {
+            "minItems": "4"
+          },
+          "instanceLocation": "#",
+          "schemaLocations": ["#/allOf/0/minItems"]
+        }
+      ]
     }
   ]
 }