polyxml 0.34.5__tar.gz → 0.34.6__tar.gz

{polyxml-0.34.5 → polyxml-0.34.6}/Cargo.lock

@@ -608,7 +608,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "criterion",
  "heck",
@@ -629,14 +629,14 @@ dependencies = [
 
 [[package]]
 name = "polyxml-c"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "polyxml",
 ]
 
 [[package]]
 name = "polyxml-cli"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "clap",
  "glob",
@@ -650,7 +650,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-js"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "napi",
  "napi-build",
@@ -660,7 +660,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-python"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "lexical-core",
  "polyxml",
@@ -670,7 +670,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-wasm"
-version = "0.34.5"
+version = "0.34.6"
 dependencies = [
  "polyxml",
  "quick-xml",

{polyxml-0.34.5 → polyxml-0.34.6}/Cargo.toml

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

{polyxml-0.34.5 → polyxml-0.34.6}/PKG-INFO

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

{polyxml-0.34.5 → polyxml-0.34.6}/crates/polyxml-core/src/codegen/rust/mod.rs

@@ -928,9 +928,31 @@ impl RustCodegen {
         let _ = writeln!(out, "{} {{", struct_decl);
 
         let mut seen_fields = HashSet::new();
-        for field in flatten_fields(s, ir) {
+        let mut seen_json_names = HashSet::new();
+        let fields = flatten_fields(s, ir);
+        let wire_names: HashSet<_> = fields.iter().map(|field| field.xml_name.as_str()).collect();
+        for field in fields {
             let rust_name = self.unique_rust_field_name(&field.name, &mut seen_fields);
-            self.emit_struct_field(out, field, &rust_name, types_with_lifetime, has_boxed);
+            let mut json_name = field.xml_name.clone();
+            if !seen_json_names.insert(json_name.clone()) {
+                let base = rust_name.strip_prefix("r#").unwrap_or(&rust_name);
+                json_name = base.to_string();
+                let mut suffix = 2;
+                while wire_names.contains(json_name.as_str())
+                    || !seen_json_names.insert(json_name.clone())
+                {
+                    json_name = format!("{base}_{suffix}");
+                    suffix += 1;
+                }
+            }
+            self.emit_struct_field(
+                out,
+                field,
+                &rust_name,
+                &json_name,
+                types_with_lifetime,
+                has_boxed,
+            );
         }
 
         out.push_str("}\n");
@@ -960,6 +982,7 @@ impl RustCodegen {
         out: &mut String,
         field: &FieldDef,
         rust_name: &str,
+        json_name: &str,
         types_with_lifetime: &HashSet<QName>,
         has_boxed: bool,
     ) {
@@ -984,8 +1007,8 @@ impl RustCodegen {
         // Serde attribute
         if self.options.derive_serde {
             let mut serde_parts = Vec::new();
-            if field.xml_name != rust_name.strip_prefix("r#").unwrap_or(rust_name) {
-                serde_parts.push(format!("rename = \"{}\"", field.xml_name));
+            if json_name != rust_name.strip_prefix("r#").unwrap_or(rust_name) {
+                serde_parts.push(format!("rename = \"{}\"", json_name));
             }
             if is_optional {
                 serde_parts.push("default".to_string());

{polyxml-0.34.5 → polyxml-0.34.6}/crates/polyxml-core/tests/test_rust_codegen.rs

@@ -1461,3 +1461,47 @@ fn empty_modules_compile_without_unused_reexports() {
         );
     }
 }
+
+#[test]
+fn duplicate_wire_names_keep_distinct_json_values() {
+    let schema = r#"<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"><xs:complexType name="Payload"><xs:sequence><xs:any namespace="urn:first" minOccurs="0" maxOccurs="unbounded"/><xs:any namespace="urn:second" minOccurs="0" maxOccurs="unbounded"/><xs:element name="any_2" type="xs:string" minOccurs="0"/></xs:sequence></xs:complexType></xs:schema>"#;
+    let ir = XsdParser::new().parse_str(schema).unwrap();
+    let core = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
+    for zero_copy in [true, false] {
+        let dir = tempfile::tempdir().unwrap();
+        std::fs::create_dir(dir.path().join("src")).unwrap();
+        std::fs::write(
+            dir.path().join("src/models.rs"),
+            RustCodegen::new(RustOptions {
+                zero_copy,
+                emit_codecs: false,
+                ..Default::default()
+            })
+            .generate_module(&ir),
+        )
+        .unwrap();
+        std::fs::write(dir.path().join("Cargo.toml"),format!("[package]\nname=\"duplicate-json-test\"\nversion=\"0.0.0\"\nedition=\"2021\"\n[dependencies]\npolyxml={{path={core:?}}}\nserde={{version=\"1\",features=[\"derive\"]}}\nserde_json=\"1\"\n")).unwrap();
+        std::fs::write(dir.path().join("src/main.rs"),r#"mod models;use models::*;
+fn main(){
+let mut value=Payload::default();value.any.push("first".into());value.any_2.push("second".into());value.any_2_2=Some("named".into());
+let json=serde_json::to_string(&value).unwrap();let parsed:Payload=serde_json::from_str(&json).unwrap();
+assert_eq!(parsed,value);let object:serde_json::Value=serde_json::from_str(&json).unwrap();assert_eq!(object.as_object().unwrap().len(),3);
+}
+"#).unwrap();
+        let output = std::process::Command::new("cargo")
+            .args(["run", "--quiet", "--offline"])
+            .env("RUSTFLAGS", "-D unreachable-patterns")
+            .env(
+                "CARGO_TARGET_DIR",
+                core.join("../../target/binary-lexical-tests"),
+            )
+            .current_dir(dir.path())
+            .output()
+            .unwrap();
+        assert!(
+            output.status.success(),
+            "borrowed={zero_copy}: {}",
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+}

{polyxml-0.34.5 → polyxml-0.34.6}/pyproject.toml

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