Mark an additionalProperty as evaluated.

Workiva · Jun 7, 2024 · adaf37d · adaf37d
1 parent 2fb11c6
commit adaf37d
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 7 deletions.
diff --git a/lib/src/json_schema/validator.dart b/lib/src/json_schema/validator.dart
@@ -530,17 +530,19 @@ class Validator {
         }
       });
 
-      if (!propCovered) {
+      if (propCovered) {
+        _addEvaluatedProp(newInstance);
+      } else {
         final additionalPropertiesSchema = schema.additionalPropertiesSchema;
         if (additionalPropertiesSchema != null) {
           _validate(additionalPropertiesSchema, newInstance);
+          _addEvaluatedProp(newInstance);
         } else if (propMustValidate) {
-          _err('unallowed additional property $k', instance.path, '${schema.path!}/additionalProperties');
+          _err('unallowed additional property $k', instance.path,
+              '${schema.path!}/additionalProperties');
         } else if (schema.additionalPropertiesBool == true) {
           _addEvaluatedProp(newInstance);
         }
-      } else {
-        _addEvaluatedProp(newInstance);
       }
     });
   }

diff --git a/test/JSON-Schema-Test-Suite/tests/draft2020-12/unevaluatedProperties.json b/test/JSON-Schema-Test-Suite/tests/draft2020-12/unevaluatedProperties.json
@@ -1307,5 +1307,22 @@
                 "valid": false
             }
         ]
-    }
+    },
+    {
+      "description": "additionalProperties",
+      "schema": {
+        "type": "object",
+        "additionalProperties": {"type": "object"},
+        "unevaluatedProperties": false
+      },
+      "tests": [
+       {
+          "description": "are evaluated",
+          "data": {
+            "anyKey": {}
+          },
+          "valid": true
+       }
+    ]
+  }
 ]
diff --git a/test/unit/specification_tests.dart b/test/unit/specification_tests.dart