Merge pull request #354 from kmsquire/fix-default-alias

Fix combination of alias and default

Author: yukinarit

serde/de.py

@@ -123,6 +123,13 @@ def _get_by_aliases(d: Dict[str, str], aliases: List[str]):
         return _get_by_aliases(d, aliases[1:])
 
 
+def _exists_by_aliases(d: Dict[str, str], aliases: List[str]):
+    for alias in aliases:
+        if alias in d:
+            return True
+    return False
+
+
 def _make_deserialize(
     cls_name: str,
     fields,
@@ -262,6 +269,7 @@ def wrap(cls: Type[Any]):
         g['NoCheck'] = NoCheck
         g['coerce'] = coerce
         g['_get_by_aliases'] = _get_by_aliases
+        g['_exists_by_aliases'] = _exists_by_aliases
         if deserialize:
             g['serde_custom_class_deserializer'] = functools.partial(
                 serde_custom_class_deserializer, custom=deserializer
@@ -877,7 +885,11 @@ def literal(self, arg: DeField) -> str:
         return f"serde_scope.funcs['{func_name}'](cls=cls, data={arg.data}, reuse_instances=reuse_instances)"
 
     def default(self, arg: DeField, code: str) -> str:
-        exists = f'"{arg.conv_name()}" in {arg.datavar}'
+        if arg.alias:
+            aliases = map(lambda s: f'"{s}"', [arg.name, *arg.alias])
+            exists = f'_exists_by_aliases({arg.datavar}, [{",".join(aliases)}])'
+        else:
+            exists = f'"{arg.conv_name()}" in {arg.datavar}'
         if has_default(arg):
             return f'({code}) if {exists} else serde_scope.defaults["{arg.name}"]'
         elif has_default_factory(arg):

tests/test_basics.py

@@ -4,7 +4,17 @@
 import logging
 import pathlib
 import uuid
-from typing import ClassVar, DefaultDict, Dict, FrozenSet, List, Optional, Set, Tuple, Union
+from typing import (
+    ClassVar,
+    DefaultDict,
+    Dict,
+    FrozenSet,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Union,
+)
 
 import pytest
 
@@ -536,6 +546,45 @@ class Foo:
     assert ff.a == 10
 
 
+def test_default_and_alias():
+    @serde.serde
+    class Foo:
+        a: int = serde.field(default=2, alias=["b", "c", "d"])
+
+    f = Foo(a=1)
+    assert '{"a":1}' == serde.json.to_json(f)
+    ff = serde.json.from_json(Foo, '{"b":10}')
+    assert ff.a == 10
+    ff = serde.json.from_json(Foo, '{"e":10}')
+    assert ff.a == 2
+
+
+def test_default_and_rename():
+    @serde.serde
+    class Foo:
+        a: int = serde.field(default=2, rename="z")
+
+    f = Foo(a=1)
+    assert '{"z":1}' == serde.json.to_json(f)
+    ff = serde.json.from_json(Foo, '{"z":10}')
+    assert ff.a == 10
+    fff = serde.json.from_json(Foo, '{"a":10}')
+    assert fff.a == 2
+
+
+def test_default_rename_and_alias():
+    @serde.serde
+    class Foo:
+        a: int = serde.field(default=2, rename="z", alias=["b", "c", "d"])
+
+    f = Foo(a=1)
+    assert '{"z":1}' == serde.json.to_json(f)
+    ff = serde.json.from_json(Foo, '{"b":10}')
+    assert ff.a == 10
+    ff = serde.json.from_json(Foo, '{"e":10}')
+    assert ff.a == 2
+
+
 @pytest.mark.parametrize(
     'se,de', (format_dict + format_json + format_msgpack + format_yaml + format_toml + format_pickle)
 )