msgspec-xml 0.3.0__tar.gz → 0.3.1__tar.gz

{msgspec_xml-0.3.0 → msgspec_xml-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msgspec-xml
-Version: 0.3.0
+Version: 0.3.1
 Summary: XML Serialization/Deserialization using msgspec
 Project-URL: Homepage, https://pypi.org/project/msgspec-xml
 Project-URL: Issues, https://codefloe.com/buriedincode/msgspec-xml/issues

{msgspec_xml-0.3.0 → msgspec_xml-0.3.1}/msgspec_xml/__init__.py

@@ -9,7 +9,7 @@ __all__ = [
     "decode",
     "encode",
 ]
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 from msgspec_xml.decoder import Decoder, decode
 from msgspec_xml.encoder import Encoder, encode

{msgspec_xml-0.3.0 → msgspec_xml-0.3.1}/msgspec_xml/introspection.py

@@ -24,6 +24,7 @@ class FieldType(Struct, frozen=True, kw_only=True):
     type: Any
     xml: XML
     is_struct: bool = False
+    is_generic: bool = False
     item: Optional["FieldType"] = None
 
 
@@ -35,6 +36,9 @@ def inspect_annotation(annotation: Any) -> FieldType:  # noqa: ANN401
         return FieldType(
             type=annotation, xml=xml, item=inspect_annotation(annotation=item_annotation)
         )
+    origin = get_origin(annotation)
+    if origin is not None and isinstance(origin, type) and issubclass(origin, Struct):
+        return FieldType(type=origin, xml=xml, is_struct=True, is_generic=True)
     return FieldType(type=annotation, xml=xml, is_struct=is_struct_type(annotation))
 
 
@@ -60,7 +64,7 @@ def attribute_name(field: FieldInfo, info: FieldType, namespaces: dict[str, str]
 def element_tag(field: FieldInfo, info: FieldType, namespaces: dict[str, str]) -> str:
     if info.xml.tag:
         name = info.xml.tag
-    elif info.is_struct:
+    elif info.is_struct and not info.is_generic:
         name = class_tag(cls=info.type)
     else:
         name = field.encode_name
@@ -76,7 +80,7 @@ def item_tag(field: FieldInfo, info: FieldType, namespaces: dict[str, str]) -> s
         name = item.xml.tag
     elif info.xml.tag:
         name = info.xml.tag
-    elif item.is_struct:
+    elif item.is_struct and not item.is_generic:
         name = class_tag(cls=item.type)
     else:
         name = field.encode_name

msgspec_xml-0.3.1/tests/resources/test-05.xml

@@ -0,0 +1,7 @@
+<Credit>
+    <Creator id="cr1">Michael Moreci</Creator>
+    <Roles>
+        <Role>Writer</Role>
+        <Role>Artist</Role>
+    </Roles>
+</Credit>

{msgspec_xml-0.3.0 → msgspec_xml-0.3.1}/tests/test_roundtrip.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 from pathlib import Path
-from typing import Annotated
+from typing import Annotated, Generic, TypeVar
 
 import pytest
 from msgspec import Struct
@@ -45,6 +45,19 @@ class Book(Struct, rename="pascal"):
     authors: Annotated[list[Author], XML(wrapper="Authors", tag="Author")]
 
 
+T = TypeVar("T")
+
+
+class Resource(Struct, Generic[T]):
+    value: Annotated[T, Value()]
+    id: Annotated[str | None, Attribute()] = None
+
+
+class Credit(Struct, rename="pascal"):
+    creator: Annotated[Resource[str], Element()]
+    roles: Annotated[list[Resource[str]], Wrapper(wrapper="Roles", tag="Role")]
+
+
 def load_resource(name: str) -> str:
     return (RESOURCE_DIR / name).read_text(encoding="UTF-8")
 
@@ -56,6 +69,7 @@ def load_resource(name: str) -> str:
         ("test-02.xml", Greetings, True),
         ("test-03.xml", Product, False),
         ("test-04.xml", Book, True),
+        ("test-05.xml", Credit, False),
     ],
 )
 def test_roundtrip(resource: str, cls: type[Struct], show_declaration: bool) -> None: