polyxml 0.14.0__tar.gz → 0.14.2__tar.gz

{polyxml-0.14.0 → polyxml-0.14.2}/Cargo.lock

@@ -549,7 +549,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "criterion",
  "heck",
@@ -567,14 +567,14 @@ dependencies = [
 
 [[package]]
 name = "polyxml-c"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "polyxml",
 ]
 
 [[package]]
 name = "polyxml-cli"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "clap",
  "glob",
@@ -588,7 +588,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-js"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "napi",
  "napi-build",
@@ -598,7 +598,7 @@ dependencies = [
 
 [[package]]
 name = "polyxml-python"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "lexical-core",
  "polyxml",

{polyxml-0.14.0 → polyxml-0.14.2}/Cargo.toml

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

{polyxml-0.14.0 → polyxml-0.14.2}/PKG-INFO

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

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/src/codegen/cpp/mod.rs

@@ -799,7 +799,12 @@ concept XmlModel = requires(T a) {{
             let target_type = self.context.map_type_ref(&elem.type_ref);
             if elem_alias != target_type {
                 if let Some(ref doc) = elem.documentation {
-                    writeln!(out, "/// {}", doc).unwrap();
+                    for line in doc.lines() {
+                        let trimmed = line.trim();
+                        if !trimmed.is_empty() {
+                            writeln!(out, "/// {}", trimmed).unwrap();
+                        }
+                    }
                 }
                 writeln!(out, "using {} = {};", elem_alias, target_type).unwrap();
             }

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/src/codegen/csharp/mod.rs

@@ -595,10 +595,11 @@ impl CSharpCodegen {
 
     fn emit_struct_validator(&self, out: &mut String, s: &StructDef, indent: &str) {
         let struct_name = to_csharp_type_name(&s.qname.local);
+        let new_kw = if s.base_type.is_some() { "new " } else { "" };
         writeln!(
             out,
-            "{}    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)",
-            indent
+            "{}    public {}IEnumerable<ValidationResult> Validate(ValidationContext validationContext)",
+            indent, new_kw
         )
         .unwrap();
         writeln!(out, "{}    {{", indent).unwrap();

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/src/codegen/go/mod.rs

@@ -760,7 +760,12 @@ impl GoCodegen {
             let target_type = self.context.map_type_ref(&elem.type_ref);
             if elem_alias != target_type {
                 if let Some(ref doc) = elem.documentation {
-                    writeln!(out, "// {}", doc).unwrap();
+                    for line in doc.lines() {
+                        let trimmed = line.trim();
+                        if !trimmed.is_empty() {
+                            writeln!(out, "// {}", trimmed).unwrap();
+                        }
+                    }
                 }
                 writeln!(out, "type {} = {}\n", elem_alias, target_type).unwrap();
             }

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/src/codegen/rust/mod.rs

@@ -33,7 +33,7 @@ impl Default for RustOptions {
             zero_copy: true,
             derive_serde: true,
             derive_default: true,
-            emit_polyxml_attrs: true,
+            emit_polyxml_attrs: false,
             emit_root_aliases: true,
             emit_codecs: true,
         }
@@ -201,7 +201,7 @@ impl RustCodegen {
 
         out.push_str("// Generated by PolyXML Compiler (https://github.com/nth-bailey/PolyXML)\n");
         out.push_str(
-            "#![allow(dead_code, unused_imports, non_camel_case_types, non_snake_case)]\n\n",
+            "#![allow(dead_code, unused_imports, unused_mut, unused_variables, non_camel_case_types, non_snake_case)]\n\n",
         );
 
         let types_with_lifetime = if self.options.zero_copy {
@@ -422,6 +422,9 @@ impl RustCodegen {
         }
 
         let mut derives = vec!["Debug", "Clone", "Copy", "PartialEq", "Eq", "Hash"];
+        if self.options.derive_default {
+            derives.push("Default");
+        }
         if self.options.derive_serde {
             derives.push("Serialize");
             derives.push("Deserialize");
@@ -433,7 +436,7 @@ impl RustCodegen {
         let mut seen_variants = HashSet::new();
         let mut variant_map = Vec::new();
 
-        for variant in &e.variants {
+        for (idx, variant) in e.variants.iter().enumerate() {
             let mut var_id = to_rust_variant_identifier(&variant.name);
             let mut counter = 1;
             while seen_variants.contains(&var_id) {
@@ -448,6 +451,9 @@ impl RustCodegen {
             if self.options.derive_serde {
                 let _ = writeln!(out, "    #[serde(rename = \"{}\")]", variant.value);
             }
+            if self.options.derive_default && idx == 0 {
+                let _ = writeln!(out, "    #[default]");
+            }
             let _ = writeln!(out, "    {},", var_id);
             variant_map.push((var_id, variant.value.clone()));
         }
@@ -471,7 +477,7 @@ impl RustCodegen {
         // std::str::FromStr
         let _ = writeln!(out, "impl std::str::FromStr for {} {{", enum_name);
         out.push_str("    type Err = String;\n\n");
-        out.push_str("    fn from_str(s: &str) -> Result<Self, Self::Err> {\n");
+        out.push_str("    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {\n");
         out.push_str("        match s {\n");
         for (var_id, val) in &variant_map {
             let _ = writeln!(out, "            \"{}\" => Ok(Self::{}),", val, var_id);
@@ -837,6 +843,18 @@ impl RustCodegen {
                     | PrimitiveType::Entities
                     | PrimitiveType::AnyUri
                     | PrimitiveType::QName
+                    | PrimitiveType::DateTime
+                    | PrimitiveType::Date
+                    | PrimitiveType::Time
+                    | PrimitiveType::Duration
+                    | PrimitiveType::GYear
+                    | PrimitiveType::GYearMonth
+                    | PrimitiveType::GMonth
+                    | PrimitiveType::GMonthDay
+                    | PrimitiveType::GDay
+                    | PrimitiveType::Base64Binary
+                    | PrimitiveType::HexBinary
+                    | PrimitiveType::AnySimpleType
             ),
             TypeRef::Named(qname) => {
                 if let Some(TypeDef::Simple(s)) = ir.types.get(qname) {
@@ -1028,7 +1046,6 @@ impl RustCodegen {
             }
             out.push_str("                _ => {}\n");
             out.push_str("            }\n");
-            out.push_str("        }\n");
         }
 
         let elem_fields: Vec<_> = field_metas
@@ -1175,7 +1192,7 @@ impl RustCodegen {
         if !attr_fields.is_empty() {
             out.push_str("\n        for attr in start.attributes() {\n");
             out.push_str("            let attr = attr?;\n");
-            out.push_str("            match attr.key.local_name().as_ref() {\n");
+            out.push_str("            match std::str::from_utf8(attr.key.local_name().as_ref()).unwrap_or(\"\") {\n");
             for meta in &attr_fields {
                 let _ = writeln!(out, "                \"{}\" => {{", meta.field.xml_name);
                 self.emit_attr_parse(out, &meta.field, &meta.rust_name, ir);
@@ -1217,6 +1234,12 @@ impl RustCodegen {
                         meta.rust_name, meta.rust_name
                     );
                 }
+            } else if self.options.derive_default {
+                let _ = writeln!(
+                    out,
+                    "            {}: var_{}.unwrap_or_default(),",
+                    meta.rust_name, meta.rust_name
+                );
             } else {
                 let _ = writeln!(
                     out,

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/src/codegen/typescript/mod.rs

@@ -246,6 +246,29 @@ impl TypeScriptCodegen {
                     }
                 }
             }
+            for f in &s.fields {
+                if !f.is_cycle_cut {
+                    match &f.type_ref {
+                        TypeRef::Named(target_qname) => {
+                            if target_qname != &s.qname {
+                                if let Some(TypeDef::Struct(dep_struct)) = ir.types.get(target_qname) {
+                                    visit(dep_struct, ir, visiting, visited, ordered);
+                                }
+                            }
+                        }
+                        TypeRef::List(inner) | TypeRef::Boxed(inner) => {
+                            if let TypeRef::Named(target_qname) = inner.as_ref() {
+                                if target_qname != &s.qname {
+                                    if let Some(TypeDef::Struct(dep_struct)) = ir.types.get(target_qname) {
+                                        visit(dep_struct, ir, visiting, visited, ordered);
+                                    }
+                                }
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
             visiting.remove(&s.qname);
             visited.insert(s.qname.clone());
             ordered.push(ir.types.get(&s.qname).unwrap());

{polyxml-0.14.0 → polyxml-0.14.2}/crates/polyxml-core/tests/test_csharp_codegen.rs

@@ -11,6 +11,14 @@ use polyxml::ir::{
 };
 use tempfile::tempdir;
 
+fn dotnet_command() -> Command {
+    let mut cmd = Command::new("dotnet");
+    cmd.env("DOTNET_NOLOGO", "1");
+    cmd.env("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
+    cmd.env("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1");
+    cmd
+}
+
 #[test]
 fn test_csharp_sanitization() {
     assert_eq!(to_csharp_type_name("event"), "Event");
@@ -308,7 +316,7 @@ public class Program
     )
     .unwrap();
 
-    let build_status = Command::new("dotnet")
+    let build_status = dotnet_command()
         .args(["build", "--warnaserror"])
         .current_dir(temp.path())
         .status()
@@ -318,7 +326,7 @@ public class Program
         "dotnet build failed on generated records"
     );
 
-    let run_status = Command::new("dotnet")
+    let run_status = dotnet_command()
         .args(["run"])
         .current_dir(temp.path())
         .status()
@@ -487,7 +495,7 @@ public class Program
     )
     .unwrap();
 
-    let build_status = Command::new("dotnet")
+    let build_status = dotnet_command()
         .args(["build", "--warnaserror"])
         .current_dir(temp.path())
         .status()
@@ -497,7 +505,7 @@ public class Program
         "dotnet build failed on choice models"
     );
 
-    let run_status = Command::new("dotnet")
+    let run_status = dotnet_command()
         .args(["run"])
         .current_dir(temp.path())
         .status()
@@ -628,7 +636,7 @@ public class Program
     )
     .unwrap();
 
-    let build_status = Command::new("dotnet")
+    let build_status = dotnet_command()
         .args(["build", "--warnaserror"])
         .current_dir(temp.path())
         .status()
@@ -638,7 +646,7 @@ public class Program
         "dotnet build failed on recursive tree models"
     );
 
-    let run_status = Command::new("dotnet")
+    let run_status = dotnet_command()
         .args(["run"])
         .current_dir(temp.path())
         .status()

{polyxml-0.14.0 → polyxml-0.14.2}/pyproject.toml

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