Fix unevaluatedItems on draft2019.

This was trivial, other than needing to copy paste the
function which anyhow needs removal.

It only didn't work previously because of the items -> prefixItems
rename in draft2020.

Author: Julian

CHANGELOG.rst

@@ -3,8 +3,8 @@ v4.14.0
 
 * ``FormatChecker.cls_checks`` is deprecated. Use ``FormatChecker.checks`` on
   an instance of ``FormatChecker`` instead.
-* ``unevaluatedItems`` has been fixed on draft 2019. It's nonetheless
-  discouraged to use draft2019 for any schemas, new or old.
+* ``unevaluatedItems`` has been fixed for draft 2019. It's nonetheless
+  discouraged to use draft 2019 for any schemas, new or old.
 
 v4.13.0
 =======

jsonschema/_legacy_validators.py

@@ -226,3 +226,81 @@ def recursiveRef(validator, recursiveRef, instance, schema):
     #        see it.
     subschema
     return []
+
+
+def find_evaluated_item_indexes_by_schema(validator, instance, schema):
+    """
+    Get all indexes of items that get evaluated under the current schema
+
+    Covers all keywords related to unevaluatedItems: items, prefixItems, if,
+    then, else, contains, unevaluatedItems, allOf, oneOf, anyOf
+    """
+    if validator.is_type(schema, "boolean"):
+        return []
+    evaluated_indexes = []
+
+    if "additionalItems" in schema:
+        return list(range(0, len(instance)))
+
+    if "$ref" in schema:
+        scope, resolved = validator.resolver.resolve(schema["$ref"])
+        validator.resolver.push_scope(scope)
+
+        try:
+            evaluated_indexes += find_evaluated_item_indexes_by_schema(
+                validator, instance, resolved,
+            )
+        finally:
+            validator.resolver.pop_scope()
+
+    if "items" in schema:
+        if validator.is_type(schema["items"], "object"):
+            return list(range(0, len(instance)))
+        evaluated_indexes += list(range(0, len(schema["items"])))
+
+    if "if" in schema:
+        if validator.evolve(schema=schema["if"]).is_valid(instance):
+            evaluated_indexes += find_evaluated_item_indexes_by_schema(
+                validator, instance, schema["if"],
+            )
+            if "then" in schema:
+                evaluated_indexes += find_evaluated_item_indexes_by_schema(
+                    validator, instance, schema["then"],
+                )
+        else:
+            if "else" in schema:
+                evaluated_indexes += find_evaluated_item_indexes_by_schema(
+                    validator, instance, schema["else"],
+                )
+
+    for keyword in ["contains", "unevaluatedItems"]:
+        if keyword in schema:
+            for k, v in enumerate(instance):
+                if validator.evolve(schema=schema[keyword]).is_valid(v):
+                    evaluated_indexes.append(k)
+
+    for keyword in ["allOf", "oneOf", "anyOf"]:
+        if keyword in schema:
+            for subschema in schema[keyword]:
+                errs = list(validator.descend(instance, subschema))
+                if not errs:
+                    evaluated_indexes += find_evaluated_item_indexes_by_schema(
+                        validator, instance, subschema,
+                    )
+
+    return evaluated_indexes
+
+
+def unevaluatedItems_draft2019(validator, unevaluatedItems, instance, schema):
+    if not validator.is_type(instance, "array"):
+        return
+    evaluated_item_indexes = find_evaluated_item_indexes_by_schema(
+        validator, instance, schema,
+    )
+    unevaluated_items = [
+        item for index, item in enumerate(instance)
+        if index not in evaluated_item_indexes
+    ]
+    if unevaluated_items:
+        error = "Unevaluated items are not allowed (%s %s unexpected)"
+        yield ValidationError(error % _utils.extras_msg(unevaluated_items))

jsonschema/tests/test_jsonschema_test_suite.py

@@ -8,7 +8,7 @@
 
 import sys
 
-from jsonschema.tests._helpers import bug, test_suite_bug
+from jsonschema.tests._helpers import bug
 from jsonschema.tests._suite import Suite
 import jsonschema
 
@@ -331,61 +331,6 @@ def leap_second(test):
     Validator=jsonschema.Draft201909Validator,
     skip=lambda test: (
         skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            description="uncle keyword evaluation is not significant",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            description="when one schema matches and has unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            description="when two schemas match and has unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            description="when if matches and it has unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            case_description="unevaluatedItems with nested tuple",
-            description="with unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            case_description="unevaluatedItems with not",
-            description="with unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            case_description="unevaluatedItems with oneOf",
-            description="with unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            case_description="unevaluatedItems with $ref",
-            description="with unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            case_description="unevaluatedItems with tuple",
-            description="with unevaluated items",
-        )(test)
-        or skip(
-            message="unevaluatedItems is different in 2019-09 (needs work).",
-            subject="unevaluatedItems",
-            description="when if doesn't match and it has unevaluated items",
-        )(test)
-        or skip(
             message="recursiveRef support isn't working yet.",
             subject="recursiveRef",
             case_description=(

jsonschema/validators.py

@@ -605,7 +605,7 @@ def extend(
         "propertyNames": _validators.propertyNames,
         "required": _validators.required,
         "type": _validators.type,
-        "unevaluatedItems": _validators.unevaluatedItems,
+        "unevaluatedItems": _legacy_validators.unevaluatedItems_draft2019,
         "unevaluatedProperties": _validators.unevaluatedProperties,
         "uniqueItems": _validators.uniqueItems,
     },