polyxml 0.33.11__tar.gz → 0.34.0__tar.gz

{polyxml-0.33.11 → polyxml-0.34.0}/Cargo.lock

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

{polyxml-0.33.11 → polyxml-0.34.0}/Cargo.toml

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

{polyxml-0.33.11 → polyxml-0.34.0}/PKG-INFO

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

{polyxml-0.33.11 → polyxml-0.34.0}/crates/polyxml-core/src/codegen/java/mod.rs

@@ -24,6 +24,8 @@ pub enum JavaBackend {
     Standard,
     /// Jackson-annotated records for Spring Boot / enterprise JSON+XML binding.
     Jackson,
+    /// Jackson 3 annotations for Spring Boot 4 JSON+XML binding.
+    Jackson3,
 }
 
 impl JavaBackend {
@@ -31,12 +33,13 @@ impl JavaBackend {
         match s.to_lowercase().trim() {
             "standard" | "std" | "default" => Some(Self::Standard),
             "jackson" | "spring" | "spring-boot" | "enterprise" => Some(Self::Jackson),
+            "jackson3" | "jackson-3" | "jackson_3" | "spring-boot-4" => Some(Self::Jackson3),
             _ => None,
         }
     }
 
     pub fn is_jackson(self) -> bool {
-        matches!(self, Self::Jackson)
+        matches!(self, Self::Jackson | Self::Jackson3)
     }
 }
 
@@ -365,7 +368,11 @@ impl JavaCodegen {
         if self.options.backend.is_jackson() {
             out.push('\n');
             out.push_str("import com.fasterxml.jackson.annotation.*;\n");
-            out.push_str("import com.fasterxml.jackson.dataformat.xml.annotation.*;\n");
+            if self.options.backend == JavaBackend::Jackson3 {
+                out.push_str("import tools.jackson.dataformat.xml.annotation.*;\n");
+            } else {
+                out.push_str("import com.fasterxml.jackson.dataformat.xml.annotation.*;\n");
+            }
         }
 
         out.push('\n');
@@ -445,6 +452,7 @@ impl JavaCodegen {
         let jackson = self.options.backend.is_jackson();
 
         // Jackson class-level annotations
+        self.emit_jackson_property_order(out, s, ir, indent);
         if jackson {
             let _ = writeln!(out, "{}@JsonIgnoreProperties(ignoreUnknown = true)", indent);
             let _ = writeln!(out, "{}@JsonInclude(JsonInclude.Include.NON_EMPTY)", indent);
@@ -488,10 +496,14 @@ impl JavaCodegen {
                     .as_deref()
                     .map(|ns| format!(", namespace = {:?}", ns))
                     .unwrap_or_default();
-                annotations.push(format!(
-                    "@JacksonXmlProperty(localName = {:?}, isAttribute = {}{})",
-                    field.xml_name, is_attr, ns_part
-                ));
+                if field.kind == crate::ir::FieldKind::Text {
+                    annotations.push("@JacksonXmlText".to_string());
+                } else {
+                    annotations.push(format!(
+                        "@JacksonXmlProperty(localName = {:?}, isAttribute = {}{})",
+                        field.xml_name, is_attr, ns_part
+                    ));
+                }
 
                 // List fields: @JacksonXmlElementWrapper(useWrapping = false)
                 if is_list {

{polyxml-0.33.11 → polyxml-0.34.0}/crates/polyxml-core/src/codegen/java/models.rs

@@ -3,6 +3,25 @@ use crate::codegen::flatten_fields;
 use crate::ir::{FieldDef, FieldKind};
 
 impl JavaCodegen {
+    pub(super) fn emit_jackson_property_order(
+        &self,
+        out: &mut String,
+        s: &StructDef,
+        ir: &SchemaIR,
+        indent: &str,
+    ) {
+        if self.options.backend == JavaBackend::Jackson3 {
+            // Jackson 3 sorts properties alphabetically by default. XML
+            // sequences must instead retain the schema's declaration order.
+            let names = flatten_fields(s, ir)
+                .into_iter()
+                .map(|field| format!("{:?}", field.xml_name))
+                .collect::<Vec<_>>()
+                .join(", ");
+            let _ = writeln!(out, "{indent}@JsonPropertyOrder({{{names}}})");
+        }
+    }
+
     pub(super) fn emit_value_class(
         &self,
         out: &mut String,
@@ -141,6 +160,7 @@ impl JavaCodegen {
         if let Some(doc) = &s.documentation {
             self.emit_docstring(out, doc, indent);
         }
+        self.emit_jackson_property_order(out, s, ir, indent);
         if self.options.backend.is_jackson() {
             let _ = writeln!(out, "{indent}@JsonIgnoreProperties(ignoreUnknown = true)\n{indent}@JsonInclude(JsonInclude.Include.NON_NULL)\n{indent}@JacksonXmlRootElement(localName = {:?}, namespace = {:?})", s.qname.local, s.qname.namespace.as_deref().unwrap_or(""));
             // Bind the explicitly annotated fields only; avoids duplicate XML properties after bean name normalization.

{polyxml-0.33.11 → polyxml-0.34.0}/crates/polyxml-core/src/ir/mod.rs

@@ -484,6 +484,9 @@ pub struct SchemaIR {
     pub ordered_types: std::collections::BTreeSet<QName>,
     #[serde(default)]
     pub content_models: BTreeMap<QName, Particle>,
+    /// Source particle identity retained for schema-level XSD 1.0 UPA checks.
+    #[serde(default)]
+    pub upa_documents: Vec<crate::schema_parser::upa::Document>,
     /// Type owners outside the module currently being emitted. Definitions
     /// remain in `types` so generators can resolve their field semantics.
     #[serde(default)]

{polyxml-0.33.11 → polyxml-0.34.0}/crates/polyxml-core/src/schema_parser/mod.rs

@@ -1,3 +1,4 @@
+pub mod upa;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -185,6 +186,7 @@ impl XsdParser {
         if self.frame_depth == 0 {
             resolve_global_field_refs(&mut ir);
             validate_type_references(&ir, xml)?;
+            upa::validate(&ir)?;
             ir.content_models.retain(|_, model| {
                 model.has_choice()
                     || model.has_repeated_sequence()
@@ -214,6 +216,7 @@ impl XsdParser {
         reader.config_mut().trim_text(true);
 
         let mut ir = SchemaIR::new();
+        ir.upa_documents.push(upa::Document::parse(xml)?);
         let mut target_namespace = None;
         // The `xml` prefix is bound by XML itself, even when the schema omits
         // an explicit xmlns:xml declaration (as Dublin Core's dc.xsd does).
@@ -2329,6 +2332,9 @@ fn unique_type_name(ir: &SchemaIR, target_ns: Option<&str>, base: &str) -> Strin
 /// Rewrite every namespace-less QName in the IR to `ns`. Used for chameleon
 /// includes, whose components adopt the including schema's target namespace.
 fn rekey_to_namespace(ir: &mut SchemaIR, ns: &str) {
+    for document in &mut ir.upa_documents {
+        document.adopt_namespace(ns);
+    }
     ir.target_namespace = Some(ns.to_string());
     ir.abstract_elements = std::mem::take(&mut ir.abstract_elements)
         .into_iter()
@@ -2548,6 +2554,7 @@ fn collect_chain_patterns(ir: &SchemaIR, q: &QName, visited: &mut HashSet<QName>
 }
 
 fn merge_ir(dest: &mut SchemaIR, src: SchemaIR) {
+    dest.upa_documents.extend(src.upa_documents);
     dest.abstract_elements.extend(src.abstract_elements);
     dest.ordered_types.extend(src.ordered_types);
     dest.content_models.extend(src.content_models);