polyxml 0.6.0__tar.gz → 0.7.0__tar.gz

{polyxml-0.6.0 → polyxml-0.7.0}/Cargo.lock

@@ -395,7 +395,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "criterion",
  "lexical-core",
@@ -408,14 +408,14 @@ dependencies = [
 
 [[package]]
 name = "polyxml-c"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "polyxml",
 ]
 
 [[package]]
 name = "polyxml-js"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "napi",
  "napi-build",
@@ -425,7 +425,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-python"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "lexical-core",
  "polyxml",

{polyxml-0.6.0 → polyxml-0.7.0}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/polyxml-core", "crates/polyxml-python"]
 
 [workspace.package]
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 rust-version = "1.80"
 license = "MIT"

{polyxml-0.6.0 → polyxml-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyxml
-Version: 0.6.0
+Version: 0.7.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{polyxml-0.6.0 → polyxml-0.7.0}/crates/polyxml-core/src/parser.rs

@@ -69,9 +69,18 @@ impl StackFrame {
             if let Some(ref text_buf) = self.frame_text_buf {
                 if !text_buf.is_empty() {
                     let field = &self.schema.fields[text_idx];
-                    if let ValueType::Scalar(ref st) = field.val_type {
-                        let val = ValueConverter::parse_scalar(st, text_buf, &field.name)?;
-                        obj.insert(field.name.clone(), val);
+                    match &field.val_type {
+                        ValueType::Scalar(st) => {
+                            let val = ValueConverter::parse_scalar(st, text_buf, &field.name)?;
+                            obj.insert(field.name.clone(), val);
+                        }
+                        ValueType::List(inner) => {
+                            if let ValueType::Scalar(st) = &**inner {
+                                let val = ValueConverter::parse_scalar(st, text_buf, &field.name)?;
+                                obj.insert(field.name.clone(), PolyValue::List(vec![val]));
+                            }
+                        }
+                        _ => {}
                     }
                 }
             }

{polyxml-0.6.0 → polyxml-0.7.0}/crates/polyxml-core/src/serializer.rs

@@ -93,6 +93,17 @@ impl XmlSerializer {
                             .write_event(Event::Text(BytesText::new(text_content)))
                             .map_err(|e| PolyXmlError::SerializationError(e.to_string()))?;
                     }
+                } else if let PolyValue::List(items) = val {
+                    for item in items {
+                        let mut item_buf = [0u8; lexical_core::BUFFER_SIZE];
+                        if let Some(text_content) = Self::format_scalar_to(item, &mut item_buf) {
+                            if !text_content.is_empty() {
+                                writer
+                                    .write_event(Event::Text(BytesText::new(text_content)))
+                                    .map_err(|e| PolyXmlError::SerializationError(e.to_string()))?;
+                            }
+                        }
+                    }
                 }
             }
         }

{polyxml-0.6.0 → polyxml-0.7.0}/crates/polyxml-python/src/lib.rs

@@ -216,6 +216,13 @@ fn extract_schema_from_class<'py>(
                     match t_str.as_str() {
                         "Attribute" => kind = FieldKind::Attribute,
                         "Text" => kind = FieldKind::Text,
+                        "Wildcard" => {
+                            if let Ok(m_mixed) = m.get_item("mixed") {
+                                if m_mixed.extract::<bool>().unwrap_or(false) {
+                                    kind = FieldKind::Text;
+                                }
+                            }
+                        }
                         _ => kind = FieldKind::Element,
                     }
                 }
@@ -264,6 +271,13 @@ fn extract_schema_from_class<'py>(
                     match t_str.as_str() {
                         "Attribute" => kind = FieldKind::Attribute,
                         "Text" => kind = FieldKind::Text,
+                        "Wildcard" => {
+                            if let Ok(m_mixed) = meta.get_item("mixed") {
+                                if m_mixed.extract::<bool>().unwrap_or(false) {
+                                    kind = FieldKind::Text;
+                                }
+                            }
+                        }
                         _ => kind = FieldKind::Element,
                     }
                 }

{polyxml-0.6.0 → polyxml-0.7.0}/crates/polyxml-python/tests/test_polyxml.py

@@ -542,3 +542,23 @@ def test_binary_serialization_loads_corrupted_or_non_tagged():
     # Non-decodable data to custom type
     with pytest.raises(msgspec.DecodeError):
         polyxml.loads_binary(b"\xc1")
+
+
+def test_mixed_content_wildcard_dataclass():
+    @dataclass
+    class MixedNode:
+        lang: str | None = field(default=None, metadata={"type": "Attribute"})
+        content: list[object] = field(
+            default_factory=list,
+            metadata={"type": "Wildcard", "mixed": True},
+        )
+
+    xml = '<MixedNode lang="en">Sample Text Content</MixedNode>'
+    decoded = polyxml.deserialize(xml.encode("utf-8"), MixedNode)
+    assert decoded.lang == "en"
+    assert decoded.content == ["Sample Text Content"]
+
+    serialized = polyxml.serialize(decoded)
+    assert b"Sample Text Content" in serialized
+    assert b'lang="en"' in serialized
+

{polyxml-0.6.0 → polyxml-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "polyxml"
-version = "0.6.0"
+version = "0.7.0"
 description = "High-performance, polyglot XML data-binding engine built in Rust"
 authors = [
     { name = "Bailey Nguyen", email = "bailey.tan.nguyen@gmail.com" }