Skip to content
Merged
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
13 changes: 8 additions & 5 deletions serde/se.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ def {{func}}(obj, reuse_instances=None, convert_sets=None, skip_none=False):
)
""",
"union": """
def {{func}}(obj, reuse_instances, convert_sets):
def {{func}}(obj, reuse_instances, convert_sets, skip_none=False):
union_args = serde_scope.union_se_args['{{func}}']

{% for t in union_args %}
Expand Down Expand Up @@ -794,7 +794,7 @@ def render(self, arg: SeField[Any]) -> str:
elif is_none(arg.type):
res = "None"
elif is_any(arg.type) or is_bearable(arg.type, TypeVar):
res = f"to_obj({arg.varname}, True, False, False, c=typing.Any)"
res = f"to_obj({arg.varname}, True, False, False, skip_none, typing.Any)"

Copilot AI Aug 10, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function call to to_obj has positional parameters mixed with a keyword-like parameter name skip_none. This inconsistency could lead to confusion. Consider using named parameters for all arguments or ensure the parameter order matches the function signature.

Suggested change
res = f"to_obj({arg.varname}, True, False, False, skip_none, typing.Any)"
res = f"to_obj({arg.varname}, True, False, False, skip_none=skip_none, typing.Any)"

Copilot uses AI. Check for mistakes.
elif is_generic(arg.type):
origin = get_origin(arg.type)
assert origin
Expand Down Expand Up @@ -844,8 +844,8 @@ def dataclass(self, arg: SeField[Any]) -> str:
return ", ".join(flattened)
else:
return (
f"{arg.varname}.{SERDE_SCOPE}.funcs['{self.func}']({arg.varname},"
" reuse_instances=reuse_instances, convert_sets=convert_sets)"
f"{arg.varname}.{SERDE_SCOPE}.funcs['{self.func}']({arg.varname}, "
"reuse_instances=reuse_instances, convert_sets=convert_sets, skip_none=skip_none)"
)

def opt(self, arg: SeField[Any]) -> str:
Expand Down Expand Up @@ -939,7 +939,10 @@ def string(self, arg: SeField[Any]) -> str:

def union_func(self, arg: SeField[Any]) -> str:
func_name = union_func_name(UNION_SE_PREFIX, list(type_args(arg.type)))
return f"serde_scope.funcs['{func_name}']({arg.varname}, reuse_instances, convert_sets)"
return (
f"serde_scope.funcs['{func_name}']({arg.varname}, "
"reuse_instances, convert_sets, skip_none)"
)

def literal(self, arg: SeField[Any]) -> str:
return f"{arg.varname}"
Expand Down
45 changes: 44 additions & 1 deletion tests/test_json.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from serde import serde
from serde.json import to_json, from_json
from typing import Optional
from typing import Optional, Union, List


def test_json_basics() -> None:
Expand Down Expand Up @@ -32,3 +32,46 @@ class Foo:

f = Foo(10, None)
assert to_json(f, skip_none=True) == '{"a":10}'


def test_skip_none_nested() -> None:
"""Test that skip_none propagates to nested objects."""

@serde
class Inner:
a: int
b: Optional[int]

@serde
class Outer:
i: Inner
j: int
k: Optional[int]

# Test nested dataclass with skip_none
o = Outer(i=Inner(a=1, b=None), j=3, k=None)
result = to_json(o, skip_none=True)
expected = '{"i":{"a":1},"j":3}'
assert result == expected

# Test union with nested dataclass and skip_none
@serde
class WithUnion:
u: Union[Inner, str]
value: Optional[str]

u = WithUnion(u=Inner(a=5, b=None), value=None)
result = to_json(u, skip_none=True)
expected = '{"u":{"Inner":{"a":5}}}'
assert result == expected

# Test list with nested objects and skip_none
@serde
class WithList:
items: List[Inner]
name: Optional[str]

w = WithList(items=[Inner(a=1, b=None), Inner(a=2, b=3)], name=None)
result = to_json(w, skip_none=True)
expected = '{"items":[{"a":1},{"a":2,"b":3}]}'
assert result == expected
2 changes: 1 addition & 1 deletion tests/test_se.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Foo:
val: int


kwargs = "reuse_instances=reuse_instances, convert_sets=convert_sets"
kwargs = "reuse_instances=reuse_instances, convert_sets=convert_sets, skip_none=skip_none"


def test_render_primitives() -> None:
Expand Down