Merge branch 'release/0.5.3'

docs/source/changelog.rst

@@ -6,6 +6,11 @@ Pre-1.0 Releases
 
 Before version 1.0, everything is experimental and can change at any time.
 
+Version 0.5.3
+~~~~~~~~~~~~~
+
+Minor bug fixes
+
 Version 0.5.2
 ~~~~~~~~~~~~~
 

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "typefit"
-version = "0.5.2"
+version = "0.5.3"
 
 description = "Fits JSON values into Python type-anotated objects"
 license = "WTFPL"

src/typefit/fitting.py

@@ -153,7 +153,7 @@ def _fit_literal(self, t: Type[T], value: Node) -> T:
             value.fit_success = True
             return value.value
 
-        raise value.fail(f"No match in literal {t!r} (got {value!r})")
+        raise value.fail(f"No match in literal {t!r} (got {value.value!r})")
 
     def fit_node(self, t: Type[T], value: Node) -> T:
         """
@@ -184,7 +184,7 @@ def fit_node(self, t: Type[T], value: Node) -> T:
             return self._fit_union(t, value)
         elif t is Any:
             return self._fit_any(t, value)
-        elif isinstance(value, (MappingNode, ListNode)):
+        elif isinstance(value, (MappingNode, ListNode, LiteralNode)):
             return value.fit(t)
         elif t is None or t is None.__class__:
             return self._fit_none(t, value)

tests/issue_000050/test_context.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+from typing import Mapping
 
 from pytest import raises
 
@@ -20,6 +21,17 @@ class Root:
     _foo: int = field(metadata=meta(context="foo"))
 
 
+@dataclass
+class B:
+    val: int
+    foo: Mapping[str, str] = field(metadata=meta(context="foo"))
+
+
+@dataclass
+class A:
+    val: Mapping[str, Mapping[str, B]]
+
+
 class TestErrorReporter(ErrorReporter):
     def __init__(self):
         self.formatter = PrettyJson5Formatter(colors="")
@@ -59,6 +71,25 @@ def test_root_injection():
     assert x.child._root is x
 
 
+def test_context_mapping_injection():
+    a: A = typefit(
+        A,
+        dict(
+            val=dict(
+                foo=dict(
+                    bar=dict(
+                        val=42,
+                    )
+                ),
+            ),
+        ),
+        context=dict(foo=dict(hello="world")),
+    )
+
+    assert a.val["foo"]["bar"].val == 42
+    assert a.val["foo"]["bar"].foo["hello"] == "world"
+
+
 def test_context_injection_fail():
     rep = TestErrorReporter()
     fitter = Fitter(error_reporter=rep)