inheritance fix

Author: monomonedula

nvelope/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 from nvelope.nvelope import *

nvelope/nvelope.py

@@ -106,18 +106,18 @@ def as_json(self) -> JSON:
     def from_json(cls, parsed: JSON) -> "Obj":
         assert isinstance(parsed, dict)
         kwargs = {}
-        for name, t in cls.__annotations__.items():
-            field: Conversion = cls._conversion[name]
+        for f in fields(cls):
+            conv: Conversion = cls._conversion[f.name]
             if (
-                hasattr(t, "__origin__")
-                and inspect.isclass(t.__origin__)
-                and issubclass(t.__origin__, MaybeMissing)
+                hasattr(f.type, "__origin__")
+                and inspect.isclass(f.type.__origin__)
+                and issubclass(f.type.__origin__, MaybeMissing)
             ):
-                kwargs[name] = (
-                    Jst(field.from_json(parsed[name])) if name in parsed else Miss()
+                kwargs[f.name] = (
+                    Jst(conv.from_json(parsed[f.name])) if f.name in parsed else Miss()
                 )
             else:
-                kwargs[name] = field.from_json(parsed[name])
+                kwargs[f.name] = conv.from_json(parsed[f.name])
         return cls(**kwargs)  # type: ignore
 
 
@@ -171,21 +171,21 @@ def as_json(self) -> JSON:
     def from_json(cls, parsed: JSON) -> "Obj":
         assert isinstance(parsed, dict)
         kwargs = {}
-        for name, t in cls.__annotations__.items():
-            field: Conversion = cls._conversion[name]
-            maybe_unescaped_name = cls._maybe_renamed(name)
+        for field in fields(cls):
+            conv: Conversion = cls._conversion[field.name]
+            maybe_unescaped_name = cls._maybe_renamed(field.name)
             if (
-                hasattr(t, "__origin__")
-                and inspect.isclass(t.__origin__)
-                and issubclass(t.__origin__, MaybeMissing)
+                hasattr(field.type, "__origin__")
+                and inspect.isclass(field.type.__origin__)
+                and issubclass(field.type.__origin__, MaybeMissing)
             ):
-                kwargs[name] = (
-                    Jst(field.from_json(parsed[maybe_unescaped_name]))
+                kwargs[field.name] = (
+                    Jst(conv.from_json(parsed[maybe_unescaped_name]))
                     if maybe_unescaped_name in parsed
                     else Miss()
                 )
             else:
-                kwargs[name] = field.from_json(parsed[maybe_unescaped_name])
+                kwargs[field.name] = conv.from_json(parsed[maybe_unescaped_name])
         return cls(**kwargs)  # type:  ignore
 
     @classmethod

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nvelope"
-version = "0.2.0"
+version = "0.3.0"
 description = "Painless JSON marshalling and unmarshalling"
 authors = ["monomonedula <valh@tuta.io>"]
 readme = 'README.md'

tests/test_nvelope.py

@@ -17,6 +17,7 @@
     ListConversion,
     MappingConv,
     ConversionOf,
+    JSON,
 )
 
 
@@ -344,3 +345,31 @@ class Data(Obj):
     assert Data({443: "hello there"}).as_json() == {
         "mapping_field": {"443": "hello there"}
     }
+
+
+def test_inheritance():
+    @dataclass
+    class Human(Obj):
+        _conversion = {
+            "name": string_conv,
+            "age": int_conv,
+        }
+
+        name: str
+        age: int
+
+    @dataclass
+    class Employee(Human):
+        _conversion = {
+            **Human._conversion,
+            "experience": int_conv,
+        }
+
+        experience: int
+
+        @classmethod
+        def from_json(cls, j: JSON):
+            return super(Employee, cls).from_json(j)
+
+    j = Employee("Boris", 42, 20).as_json()
+    assert Employee.from_json(j) == Employee("Boris", 42, 20)