Merge pull request #36 from larsmaxfield/developer/lars

Check default type on iteration, update

Author: larsmaxfield

jsonschema_fill_default/jsonschema_fill_default.py

@@ -64,7 +64,10 @@ def fill_default(
             _fill_dependentschemas(instance, schema, config)
         if keyword == "default":
             if not instance:
-                instance.update(schema["default"])
+                if isinstance(schema["default"], dict):
+                    instance.update(schema["default"])
+                else:
+                    instance = schema["default"]
     if isinstance(instance, list):  # Handle "(prefix)Items" for lists (arrays)
         _fill_prefixitems_and_items(instance, schema, config)
     return None
@@ -183,8 +186,9 @@ def _fill_properties(instance: dict, schema: dict, config: FillConfig):
             instance[_property] = subschema["default"]
         # Fill missing keys if instance already exists as object
         elif _property in instance \
+                and isinstance(instance[_property], dict) \
                 and "default" in subschema \
-                and isinstance(instance[_property], dict):
+                and isinstance(subschema["default"], dict):
             for default_key in subschema["default"]:
                 if default_key not in instance[_property]:
                     instance[_property][default_key] = \

pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "jsonschema-fill-default"
-version = "0.2.0.20250602"
+version = "0.2.1.20250710"
 description = "Fill a JSON instance with the missing defaults from its JSON Schema Draft 2020-12-valid schema"
 license = "MIT"
 authors = ["Lars Maxfield"]
 maintainers = ["Lars Maxfield"]
 readme = "README.md"
 repository = "https://github.com/larsmaxfield/jsonschema-fill-default"
-keywords = ["jsonschema", "default"]
+keywords = ["jsonschema", "default", "nested"]
 
 [tool.poetry.dependencies]
 python = "^3.9"

tests/unit/test_validate_and_fill.py

@@ -963,6 +963,39 @@
                 }
             }
         ]
+    },
+    "defaultNotDict": {
+        "schema": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "title": "JSON Schema where default is not a dict, but instance is",
+            "type": "object",
+            "properties": {
+                "usuallyBool": {
+                    "default": True,
+                    "oneOf": [
+                        {"type": "boolean"},
+                        {"type": "object"}
+                    ]
+                }
+            }
+        },
+        "instances": [
+            {  # Empty
+                "original": {
+                },
+                "expected": {
+                    "usuallyBool": True
+                }
+            },
+            {  # Partial
+                "original": {
+                    "usuallyBool": {"is not": "a bool"}
+                },
+                "expected": {
+                    "usuallyBool": {"is not": "a bool"}
+                }
+            },
+        ]
     }
 }