JSON Parser: try all someclasses for element nodes

tefra · Jun 14, 2021 · d7fab05 · d7fab05
1 parent 54ebc76
commit d7fab05
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/tests/fixtures/models.py b/tests/fixtures/models.py
@@ -40,6 +40,21 @@ class TypeDuplicate:
     x1: str = field(metadata={"name": "x"})
 
 
+@dataclass
+class BaseA:
+    x: str
+
+
+@dataclass
+class BaseB(BaseA):
+    y: str
+
+
+@dataclass
+class BaseC(BaseB):
+    z: str
+
+
 @dataclass
 class ExtendedType:
     a: Optional[TypeA] = field(default=None)
@@ -75,6 +90,11 @@ class UnionType:
     element: Union[TypeA, TypeB, TypeC, TypeD]
 
 
+@dataclass
+class BaseType:
+    element: BaseA
+
+
 @dataclass
 class AttrsType:
     index: int = field(metadata={"type": "Attribute"})

diff --git a/tests/formats/dataclass/parsers/test_json.py b/tests/formats/dataclass/parsers/test_json.py
@@ -7,6 +7,8 @@
 from tests.fixtures.books import BookForm
 from tests.fixtures.books import Books
 from tests.fixtures.models import AttrsType
+from tests.fixtures.models import BaseC
+from tests.fixtures.models import BaseType
 from tests.fixtures.models import ChoiceType
 from tests.fixtures.models import ExtendedType
 from tests.fixtures.models import TypeA
@@ -223,6 +225,12 @@ def test_bind_dataclass_union(self):
             str(cm.exception),
         )
 
+    def test_bind_dataclass_subclasses(self):
+        data = {"element": {"x": "1", "y": "foo", "z": "1.0"}}
+        actual = self.parser.bind_dataclass(data, BaseType)
+
+        self.assertIsInstance(actual.element, BaseC)
+
     def test_bind_attributes(self):
         data = {"attrs": {"a": 1, "b": 2}, "index": 1}
 

diff --git a/xsdata/formats/dataclass/parsers/json.py b/xsdata/formats/dataclass/parsers/json.py
@@ -258,6 +258,13 @@ def bind_complex_type(self, meta: XmlMeta, var: XmlVar, data: Dict) -> Any:
             return self.bind_best_dataclass(data, meta.element_types)
         else:
             assert var.clazz is not None
+
+            subclasses = set(self.context.get_subclasses(var.clazz))
+            if subclasses:
+                # field annotation is an abstract/base type
+                subclasses.add(var.clazz)
+                return self.bind_best_dataclass(data, subclasses)
+
             return self.bind_dataclass(data, var.clazz)
 
     def bind_derived_value(self, meta: XmlMeta, var: XmlVar, data: Dict) -> T: