Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -809,13 +809,20 @@ def _get_key_name(key: Any) -> Any:

return key

additional_properties = (
additional_properties
or _key_allows_additional_properties(key)
)
key_allows_additional = _key_allows_additional_properties(key)
sub_schema = _to_schema(s[key], ignore_extra_keys=i)
key_name = _get_key_name(key)

if key_allows_additional and isinstance(s[key], dict):
# Preserve the value schema of dict-of-dicts type keys
additional_properties = _json_schema(
sub_schema, is_main_schema=False
)
else:
additional_properties = (
additional_properties or key_allows_additional
)

if isinstance(key_name, str):
if not isinstance(key, Optional):
required_keys.append(key_name)
Expand Down
17 changes: 17 additions & 0 deletions test_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,23 @@ def test_json_schema_additional_properties_multiple():
}


def test_json_schema_dict_of_dicts_additional_properties():
s = Schema({str: {"property-1": str}})
assert s.json_schema("my-id") == {
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "my-id",
"required": [],
"properties": {},
"additionalProperties": {
"type": "object",
"properties": {"property-1": {"type": "string"}},
"required": ["property-1"],
"additionalProperties": False,
},
"type": "object",
}


@mark.parametrize(
"input_schema, expected_keyword, expected_value",
[
Expand Down