From 985e91a5aade5b02232d264d57afa1b2dd9cbef6 Mon Sep 17 00:00:00 2001
From: Alexander Tikhonov <fatal1ty.rnd@gmail.com>
Date: Sun, 22 Jan 2023 16:39:46 +0300
Subject: [PATCH] Add support for generic TypedDict following
 python/cpython#89026

---
 mashumaro/core/meta/types/pack.py   | 10 ++++++++--
 mashumaro/core/meta/types/unpack.py | 10 ++++++++--
 tests/entities.py                   |  5 +++++
 tests/test_data_types.py            | 21 +++++++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/mashumaro/core/meta/types/pack.py b/mashumaro/core/meta/types/pack.py
index 1d983143..68e560de 100644
--- a/mashumaro/core/meta/types/pack.py
+++ b/mashumaro/core/meta/types/pack.py
@@ -528,7 +528,13 @@ def pack_named_tuple(spec: ValueSpec) -> Expression:
 
 
 def pack_typed_dict(spec: ValueSpec) -> Expression:
-    annotations = spec.type.__annotations__
+    resolved = resolve_type_params(spec.origin_type, get_args(spec.type))[
+        spec.origin_type
+    ]
+    annotations = {
+        k: resolved.get(v, v)
+        for k, v in spec.origin_type.__annotations__.items()
+    }
     all_keys = list(annotations.keys())
     required_keys = getattr(spec.type, "__required_keys__", all_keys)
     optional_keys = getattr(spec.type, "__optional_keys__", [])
@@ -637,7 +643,7 @@ def inner_expr(
             f'{{{inner_expr(0, "key")}: {inner_expr(1, v_type=int)} '
             f"for key, value in {spec.expression}.items()}}"
         )
-    elif is_typed_dict(spec.type):
+    elif is_typed_dict(spec.origin_type):
         return pack_typed_dict(spec)
     elif ensure_generic_mapping(spec, args, typing.Mapping):
         return (
diff --git a/mashumaro/core/meta/types/unpack.py b/mashumaro/core/meta/types/unpack.py
index bf53c178..f99a3ea4 100644
--- a/mashumaro/core/meta/types/unpack.py
+++ b/mashumaro/core/meta/types/unpack.py
@@ -653,7 +653,13 @@ def unpack_named_tuple(spec: ValueSpec) -> Expression:
 
 
 def unpack_typed_dict(spec: ValueSpec) -> Expression:
-    annotations = spec.type.__annotations__
+    resolved = resolve_type_params(spec.origin_type, get_args(spec.type))[
+        spec.origin_type
+    ]
+    annotations = {
+        k: resolved.get(v, v)
+        for k, v in spec.origin_type.__annotations__.items()
+    }
     all_keys = list(annotations.keys())
     required_keys = getattr(spec.type, "__required_keys__", all_keys)
     optional_keys = getattr(spec.type, "__optional_keys__", [])
@@ -786,7 +792,7 @@ def inner_expr(
             f"{inner_expr(1, v_type=int)} "
             f"for key, value in {spec.expression}.items()}})"
         )
-    elif is_typed_dict(spec.type):
+    elif is_typed_dict(spec.origin_type):
         return unpack_typed_dict(spec)
     elif ensure_generic_mapping(spec, args, typing.Mapping):
         return (
diff --git a/tests/entities.py b/tests/entities.py
index ca4795d9..f3512a7a 100644
--- a/tests/entities.py
+++ b/tests/entities.py
@@ -257,6 +257,11 @@ class TypedDictOptionalKeysWithOptional(TypedDict, total=False):
     y: float
 
 
+class GenericTypedDict(TypedDict, Generic[T]):
+    x: T
+    y: int
+
+
 class MyNamedTuple(NamedTuple):
     i: int
     f: float
diff --git a/tests/test_data_types.py b/tests/test_data_types.py
index bb50477b..739ec09b 100644
--- a/tests/test_data_types.py
+++ b/tests/test_data_types.py
@@ -64,6 +64,7 @@
     DataClassWithoutMixin,
     GenericSerializableList,
     GenericSerializableTypeDataClass,
+    GenericTypedDict,
     MutableString,
     MyDataClass,
     MyDataClassWithUnion,
@@ -1346,6 +1347,26 @@ class DataClass(DataClassDictMixin):
     assert obj.to_dict()
 
 
+def test_unbound_generic_typed_dict():
+    @dataclass
+    class DataClass(DataClassDictMixin):
+        x: GenericTypedDict
+
+    obj = DataClass({"x": "2023-01-22", "y": 42})
+    assert DataClass.from_dict({"x": {"x": "2023-01-22", "y": "42"}}) == obj
+    assert obj.to_dict() == {"x": {"x": "2023-01-22", "y": 42}}
+
+
+def test_bound_generic_typed_dict():
+    @dataclass
+    class DataClass(DataClassDictMixin):
+        x: GenericTypedDict[date]
+
+    obj = DataClass({"x": date(2023, 1, 22), "y": 42})
+    assert DataClass.from_dict({"x": {"x": "2023-01-22", "y": "42"}}) == obj
+    assert obj.to_dict() == {"x": {"x": "2023-01-22", "y": 42}}
+
+
 def test_dataclass_with_init_false_field():
     @dataclass
     class DataClass(DataClassDictMixin):