Merge pull request #378 from kykosic/var-tuple

Fix variable length tuple codegen

Author: yukinarit

serde/de.py

@@ -791,8 +791,12 @@ def tuple(self, arg: DeField) -> str:
 maybe_generic=maybe_generic, maybe_generic_type_vars=maybe_generic_type_vars, \
 variable_type_args=None, reuse_instances=reuse_instances),)"
         """
-        if is_bare_tuple(arg.type) or is_variable_tuple(arg.type):
+        if is_bare_tuple(arg.type):
             return f"tuple({arg.data})"
+        elif is_variable_tuple(arg.type):
+            earg = arg[0]
+            earg.datavar = "v"
+            return f"tuple({self.render(earg)} for v in {arg.data})"
         else:
             values = []
             for i, _typ in enumerate(type_args(arg.type)):

serde/se.py

@@ -9,16 +9,16 @@
 import functools
 import typing
 from dataclasses import dataclass, is_dataclass
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Type, TypeVar, Generic
+from typing import Any, Callable, Dict, Generic, Iterator, List, Optional, Tuple, Type, TypeVar
 
 import jinja2
 from typing_extensions import dataclass_transform
 
 from .compat import (
-    T,
     Literal,
     SerdeError,
     SerdeSkip,
+    T,
     get_origin,
     is_any,
     is_bare_dict,
@@ -757,8 +757,12 @@ def tuple(self, arg: SeField) -> str:
         """
         Render rvalue for tuple.
         """
-        if is_bare_tuple(arg.type) or is_variable_tuple(arg.type):
+        if is_bare_tuple(arg.type):
             return arg.varname
+        elif is_variable_tuple(arg.type):
+            earg = arg[0]
+            earg.name = "v"
+            return f"tuple({self.render(earg)} for v in {arg.varname})"
         else:
             rvalues = []
             for i, _ in enumerate(type_args(arg.type)):

tests/test_basics.py

@@ -315,15 +315,21 @@ class Nested:
         )
         assert d == de(Nested, se(d))
 
+    @serde.serde(**opt)
+    @dataclasses.dataclass
+    class Inner:
+        i: int
+
     @serde.serde(**opt)
     @dataclasses.dataclass
     class VariableTuple:
         t: Tuple[int, ...]
+        i: Tuple[Inner, ...]
 
-    e = VariableTuple((1, 2, 3))
+    e = VariableTuple((1, 2, 3), (Inner(0), Inner(1)))
     assert e == de(VariableTuple, se(e))
 
-    e = VariableTuple(())
+    e = VariableTuple((), ())
     assert e == de(VariableTuple, se(e))
 
     with pytest.raises(Exception):