clean up

Author: epwalsh

src/dataclass_extensions/decode.py

@@ -3,7 +3,6 @@
 import collections.abc
 import dataclasses
 import inspect
-import sys
 import types
 import typing
 from datetime import datetime
@@ -15,11 +14,6 @@
 from .registrable import Registrable
 from .types import *
 
-if sys.version_info >= (3, 11):
-    from typing import Self  # type: ignore
-else:
-    from typing_extensions import Self  # type: ignore
-
 C = TypeVar("C", bound=Dataclass)
 
 
@@ -61,10 +55,15 @@ def _get_type_hints(obj: Any) -> dict[str, Any]:
 
 def _resolve_type_hint(type_hint: Any, owner: Any) -> Any:
     if isinstance(type_hint, str):
+        if not hasattr(typing_extensions, "evaluate_forward_ref"):
+            raise ImportError(
+                "evaluating string type hints (like forward references) "
+                "requires a newer version of typing extensions"
+            )
         type_hint = typing_extensions.evaluate_forward_ref(  # type: ignore
             typing.ForwardRef(type_hint), owner=owner
         )
-    elif type_hint is Self:  # type: ignore
+    elif type_hint is typing_extensions.Self or hasattr(typing, "Self") and type_hint is getattr(typing, "Self"):  # type: ignore
         if inspect.isclass(owner):
             type_hint = owner
         else:
@@ -251,7 +250,7 @@ def _coerce(
                     raise KeyError(
                         f"type {allowed_type} has no field '{k}' (full key '{key}.{k}')"
                     ) from e
-                kwargs[k] = _coerce(v, type_hint, custom_handlers, f"{key}.{k}", owner)
+                kwargs[k] = _coerce(v, type_hint, custom_handlers, f"{key}.{k}", allowed_type)
             return allowed_type(**kwargs)
 
     if Any in allowed_types:

src/test/decode_test.py

@@ -162,7 +162,7 @@ class Point2D(typing.TypedDict):
     ],
 )
 def test_coerce_from_type_hints(value: Any, type_hint: Any, expected: Any):
-    result = _coerce(value, type_hint, {}, "0", value)
+    result = _coerce(value, type_hint, {}, "0", type(value))
     assert type(result) is type(expected)
     assert result == expected
 
@@ -545,6 +545,30 @@ def test_recursive_decode():
     assert x.children[0].children[0].name == "l3"
 
 
+def test_nested_recursive_decode():
+    @dataclass
+    class Config:
+        x: RecursiveType
+
+    c = decode(
+        Config,
+        {
+            "x": {
+                "name": "l1",
+                "children": [{"name": "l2", "children": [{"name": "l3", "children": None}]}],
+            }
+        },
+    )
+    assert isinstance(c, Config)
+    assert c.x.name == "l1"
+    assert c.x.children is not None
+    assert isinstance(c.x.children[0], RecursiveType)
+    assert c.x.children[0].name == "l2"
+    assert c.x.children[0].children is not None
+    assert isinstance(c.x.children[0].children[0], RecursiveType)
+    assert c.x.children[0].children[0].name == "l3"
+
+
 @dataclass
 class RecursiveType2:
     name: str
@@ -568,13 +592,36 @@ def test_recursive_decode_with_str_forward_reference():
     assert x.children[0].children[0].name == "l3"
 
 
+def test_nested_recursive_decode_with_str_forward_reference():
+    @dataclass
+    class Config:
+        x: RecursiveType2
+
+    c = decode(
+        Config,
+        {
+            "x": {
+                "name": "l1",
+                "children": [{"name": "l2", "children": [{"name": "l3", "children": None}]}],
+            }
+        },
+    )
+    assert isinstance(c, Config)
+    assert c.x.name == "l1"
+    assert c.x.children is not None
+    assert isinstance(c.x.children[0], RecursiveType2)
+    assert c.x.children[0].name == "l2"
+    assert c.x.children[0].children is not None
+    assert isinstance(c.x.children[0].children[0], RecursiveType2)
+    assert c.x.children[0].children[0].name == "l3"
+
+
 @dataclass
 class RecursiveTypeWithSelf:
     name: str
     children: list[Self] | None
 
 
-#  @pytest.mark.xfail
 def test_recursive_decode_with_self_type():
     x = decode(
         RecursiveTypeWithSelf,
@@ -590,3 +637,27 @@ def test_recursive_decode_with_self_type():
     assert x.children[0].children is not None
     assert isinstance(x.children[0].children[0], RecursiveTypeWithSelf)
     assert x.children[0].children[0].name == "l3"
+
+
+def test_nested_recursive_decode_with_self_type():
+    @dataclass
+    class Config:
+        x: RecursiveTypeWithSelf
+
+    c = decode(
+        Config,
+        {
+            "x": {
+                "name": "l1",
+                "children": [{"name": "l2", "children": [{"name": "l3", "children": None}]}],
+            }
+        },
+    )
+    assert isinstance(c, Config)
+    assert c.x.name == "l1"
+    assert c.x.children is not None
+    assert isinstance(c.x.children[0], RecursiveTypeWithSelf)
+    assert c.x.children[0].name == "l2"
+    assert c.x.children[0].children is not None
+    assert isinstance(c.x.children[0].children[0], RecursiveTypeWithSelf)
+    assert c.x.children[0].children[0].name == "l3"