fix: iterate over the annotation chain in correct order

Author: MrIndeciso

libdestruct/common/struct/struct_impl.py

@@ -68,10 +68,10 @@ def _inflate_struct_attributes(
     ) -> None:
         current_offset = 0
 
-        for name, annotation in iterate_annotation_chain(reference_type, terminate_at=struct):
-            if name in reference_type.__dict__:
+        for name, annotation, reference in iterate_annotation_chain(reference_type, terminate_at=struct):
+            if name in reference.__dict__:
                 # Field associated with the annotation
-                attrs = getattr(reference_type, name)
+                attrs = getattr(reference, name)
 
                 # If attrs is not a tuple, we need to convert it to a tuple
                 if not isinstance(attrs, tuple):
@@ -113,10 +113,11 @@ def compute_own_size(cls: type[struct_impl], reference_type: type) -> None:
         """Compute the size of the struct."""
         size = 0
 
-        for name, annotation in iterate_annotation_chain(reference_type, terminate_at=struct):
-            if name in reference_type.__dict__:
+        for name, annotation, reference in iterate_annotation_chain(reference_type, terminate_at=struct):
+            print(name, annotation, reference)
+            if name in reference.__dict__:
                 # Field associated with the annotation
-                attrs = getattr(reference_type, name)
+                attrs = getattr(reference, name)
 
                 # If attrs is not a tuple, we need to convert it to a tuple
                 if not isinstance(attrs, tuple):

libdestruct/common/utils.py

@@ -36,9 +36,16 @@ def size_of(item_or_inflater: obj | callable[[Resolver], obj]) -> int:
     raise ValueError(f"Cannot determine the size of {item_or_inflater}")
 
 
-def iterate_annotation_chain(item: obj, terminate_at: object | None = None) -> Generator[tuple[str, Any]]:
+def iterate_annotation_chain(item: obj, terminate_at: object | None = None) -> Generator[tuple[str, Any, type[obj]]]:
     """Iterate over the annotation chain of the provided item."""
     current_item = item
+
+    chain = []
+
     while current_item is not terminate_at:
-        yield from current_item.__annotations__.items()
+        chain.insert(0, current_item)
         current_item = current_item.__base__ if hasattr(current_item, "__base__") else None
+
+    for reference_item in chain:
+        for name, annotation in reference_item.__annotations__.items():
+            yield name, annotation, reference_item