Handle None for optional Enums.

seandstewart · Dec 15, 2021 · 47dca6a · 47dca6a
1 parent 4487e25
commit 47dca6a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/tests/test_serdes.py b/tests/test_serdes.py
@@ -186,6 +186,8 @@ class MemberInt:
             {"members": [{"field": "string"}, {"field": 1}]},
         ),
         (objects.SubTypic, objects.SubTypic(var="", sub=""), {"var": "", "sub": ""}),
+        (Optional[objects.FooNum], None, None),
+        (Optional[objects.FooNum], objects.FooNum.bar, objects.FooNum.bar.value),
     ],
 )
 def test_serde_serialize(t, obj, prim):

diff --git a/typic/serde/ser.py b/typic/serde/ser.py
@@ -253,13 +253,38 @@ def _compile_enum_serializer(self, annotation: Annotation) -> SerializerT:
         # If we can predict a single type the return the serializer for that
         if len(ts) == 1:
             t = ts.pop()
-            va = self.resolver.annotation(t, flags=annotation.serde.flags)
+            va = self.resolver.annotation(
+                t,
+                flags=annotation.serde.flags,
+                is_optional=annotation.optional,
+                is_strict=annotation.strict,
+                parameter=annotation.parameter,
+                default=annotation.parameter.default,
+            )
             vser = self.factory(va)
-
-            def serializer(
-                o: enum.Enum, *, lazy: bool = False, name: util.ReprT = None, _vser=vser
-            ):
-                return _vser(o.value, lazy=lazy, name=name)
+            if va.optional:
+
+                def serializer(
+                    o: Optional[enum.Enum],
+                    *,
+                    lazy: bool = False,
+                    name: util.ReprT = None,
+                    _vser=vser,
+                ):
+                    if o is None:
+                        return o
+                    return _vser(o.value, lazy=lazy, name=name)
+
+            else:
+
+                def serializer(
+                    o: enum.Enum,
+                    *,
+                    lazy: bool = False,
+                    name: util.ReprT = None,
+                    _vser=vser,
+                ):
+                    return _vser(o.value, lazy=lazy, name=name)
 
             return cast(SerializerT, serializer)
         # Else default to lazy serialization