Merge pull request #21 from larsmaxfield/developer/lars

Fix #20: KeyError when filling missing object with nested defaults for non-"properties" keywords

Author: larsmaxfield

jsonschema_fill_default/jsonschema_fill_default.py

@@ -132,7 +132,7 @@ def _fill_properties(instance: dict, schema: dict):
         None
     """
     for _property, subschema in schema["properties"].items():
-        if "properties" in subschema:  # Recursion
+        if any(key in ["properties", "oneOf", "allOf", "anyOf", "if", "dependentSchemas"] for key in subschema):  # Recursion
             if _property not in instance:
                 instance[_property] = dict()
             fill_default(instance[_property], subschema)
@@ -149,8 +149,6 @@ def _fill_properties(instance: dict, schema: dict):
                 if default_key not in instance[_property]:
                     instance[_property][default_key] = \
                         subschema["default"][default_key]
-        if any(key in ["oneOf", "allOf", "anyOf", "if", "dependentSchemas"] for key in subschema):
-            fill_default(instance[_property], subschema)
         if "prefixItems" in subschema or "items" in subschema:
             if _property in instance:  # Instance must have array to fill
                 fill_default(instance[_property], subschema)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jsonschema-fill-default"
-version = "0.1.0.20250109"
+version = "0.1.1.20250130"
 description = "Fill a JSON instance with the missing defaults from its JSON Schema Draft 2020-12-valid schema"
 authors = ["Lars Maxfield"]
 readme = "README.md"

pyproject.toml

@@ -669,6 +669,41 @@
             }
         ]
     },
+    "nestedKeywords": {
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "title": "JSON Schema of 'dependentSchemas' with nested keywords",
+            "type": "object",
+            "properties": {
+                "subObject": {
+                    "allOf": [
+                        {
+                            "properties": {
+                                "subString": {"default": "nested"}
+                            }
+                        }
+                    ]
+                }
+            }
+        },
+        "instances": [
+            {  # Empty
+                "original": {
+                },
+                "expected": {
+                    "subObject": {"subString": "nested"}
+                }
+            },
+            {  # Full
+                "original": {
+                    "subObject": {"subString": "already taken"}
+                },
+                "expected": {
+                    "subObject": {"subString": "already taken"}
+                }
+            }
+        ]
+    },
 }