polyxml 0.29.0__tar.gz → 0.30.0__tar.gz

{polyxml-0.29.0 → polyxml-0.30.0}/Cargo.lock

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

{polyxml-0.29.0 → polyxml-0.30.0}/Cargo.toml

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

{polyxml-0.29.0 → polyxml-0.30.0}/PKG-INFO

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

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/cpp/mod.rs

@@ -497,7 +497,7 @@ endif()
 
     fn emit_includes(&self, out: &mut String, ir: &SchemaIR) {
         if self.options.validate_facets
-            && ir.types.values().any(|t| match t {
+            && ir.emitted_types().any(|t| match t {
                 TypeDef::Simple(s) => !s.facets.patterns.is_empty(),
                 TypeDef::Struct(s) => s
                     .fields
@@ -528,7 +528,7 @@ endif()
         writeln!(out, "\n// Glaze compile-time reflection metadata\n").unwrap();
 
         // 1. Enums
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Enum(enum_def) = type_def {
                 let enum_name = type_ident(&enum_def.qname);
                 let full_type = format!("{}::{}", ns, enum_name);
@@ -635,8 +635,7 @@ concept XmlModel = requires(T a) {{
 
     fn emit_forward_declarations(&self, out: &mut String, ir: &SchemaIR) {
         let mut structs: Vec<String> = ir
-            .types
-            .values()
+            .emitted_types()
             .filter_map(|t| {
                 if let TypeDef::Struct(s) = t {
                     Some(type_ident(&s.qname))
@@ -658,14 +657,14 @@ concept XmlModel = requires(T a) {{
 
     fn emit_types(&self, out: &mut String, ir: &SchemaIR) {
         // Emit simple type aliases first
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Simple(simple) = type_def {
                 self.emit_simple_type(out, simple, ir);
             }
         }
 
         // Emit enums next
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Enum(enum_def) = type_def {
                 self.emit_enum(out, enum_def);
             }
@@ -675,6 +674,9 @@ concept XmlModel = requires(T a) {{
         let sorted_qnames = self.topological_sort_types(ir);
 
         for qname in sorted_qnames {
+            if ir.is_external_type(&qname) {
+                continue;
+            }
             if let Some(type_def) = ir.types.get(&qname) {
                 match type_def {
                     TypeDef::Union(u) => self.emit_union(out, u),

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/csharp/mod.rs

@@ -307,7 +307,7 @@ impl CSharpCodegen {
         };
 
         // Emit SimpleTypes / Enums
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Enum(e) = def {
                 self.emit_enum(&mut out, e, indent);
             } else if let TypeDef::Simple(s) = def {
@@ -320,14 +320,14 @@ impl CSharpCodegen {
         }
 
         // Emit Unions (Choices)
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Union(u) = def {
                 self.emit_union(&mut out, u, ir, indent);
             }
         }
 
         // Emit Structs (ComplexTypes)
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Struct(s) = def {
                 self.emit_struct(&mut out, s, ir, indent);
             }
@@ -373,7 +373,7 @@ impl CSharpCodegen {
         .unwrap();
 
         // Enums
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Enum(e) = def {
                 let name = type_ident(&e.qname);
                 writeln!(out, "{}[JsonSerializable(typeof({}))]", indent, name).unwrap();
@@ -381,7 +381,7 @@ impl CSharpCodegen {
         }
 
         // Simple types
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Simple(s) = def {
                 let name = type_ident(&s.qname);
                 writeln!(out, "{}[JsonSerializable(typeof({}))]", indent, name).unwrap();
@@ -389,7 +389,7 @@ impl CSharpCodegen {
         }
 
         // Unions
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Union(u) = def {
                 let name = type_ident(&u.qname);
                 writeln!(out, "{}[JsonSerializable(typeof({}))]", indent, name).unwrap();
@@ -398,7 +398,7 @@ impl CSharpCodegen {
         }
 
         // Structs
-        for def in ir.types.values() {
+        for def in ir.emitted_types() {
             if let TypeDef::Struct(s) = def {
                 let name = type_ident(&s.qname);
                 writeln!(out, "{}[JsonSerializable(typeof({}))]", indent, name).unwrap();

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/go/mod.rs

@@ -255,7 +255,7 @@ impl GoCodegen {
         set_type_name_map(build_type_name_map(ir, to_go_type_name));
         let mut body = String::new();
         let mut has_time = false;
-        let lexical_patterns = ir.types.values().any(|def| match def {
+        let lexical_patterns = ir.emitted_types().any(|def| match def {
             TypeDef::Union(u) if u.is_lexical() => u.branches.iter().any(|branch| {
                 matches!(&branch.type_ref, TypeRef::Named(q) if matches!(ir.types.get(q), Some(TypeDef::Simple(s)) if !s.facets.patterns.is_empty()))
             }),
@@ -263,7 +263,7 @@ impl GoCodegen {
         });
         let has_patterns = lexical_patterns
             || (self.options.validate_facets
-                && ir.types.values().any(|t| match t {
+                && ir.emitted_types().any(|t| match t {
                     TypeDef::Simple(s) => !s.facets.patterns.is_empty(),
                     TypeDef::Struct(s) => s
                         .fields
@@ -276,7 +276,7 @@ impl GoCodegen {
         let mut has_xml = self.options.emit_xml_tags;
 
         // Check types for time.Time
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             match type_def {
                 TypeDef::Struct(s) => {
                     if s.is_mixed && self.options.emit_xml_tags {
@@ -421,28 +421,28 @@ impl GoCodegen {
 
     fn emit_types(&self, out: &mut String, ir: &SchemaIR) {
         // Emit simple types
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Simple(simple) = type_def {
                 self.emit_simple_type(out, simple, ir);
             }
         }
 
         // Emit enums
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Enum(enum_def) = type_def {
                 self.emit_enum(out, enum_def);
             }
         }
 
         // Emit choices (unions)
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Union(u) = type_def {
                 self.emit_union(out, u, ir);
             }
         }
 
         // Emit structs
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             if let TypeDef::Struct(s) = type_def {
                 self.emit_struct(out, s, ir);
             }

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/java/codec.rs

@@ -20,8 +20,8 @@ impl JavaCodegen {
                 _ => Ok(()),
             }
         }
-        let names: HashSet<_> = ir.types.values().map(|d| type_ident(d.qname())).collect();
-        for def in ir.types.values() {
+        let names: HashSet<_> = ir.emitted_types().map(|d| type_ident(d.qname())).collect();
+        for def in ir.emitted_types() {
             let name = type_ident(def.qname());
             if names.contains(&format!("{name}Codec")) {
                 return Err(format!(

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/java/mod.rs

@@ -260,7 +260,7 @@ impl JavaCodegen {
         set_type_name_map(build_type_name_map(ir, to_java_type_name));
         let mut files = Vec::new();
 
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             let (type_name, content) = self.generate_single_type(type_def, false, ir);
             let filename = format!("{}.java", type_name);
             files.push((filename, content));
@@ -285,7 +285,7 @@ impl JavaCodegen {
         let _ = writeln!(out, "public final class {} {{", outer_class_name);
         let _ = writeln!(out, "    private {}() {{}}\n", outer_class_name);
 
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             let (_, body) = self.generate_type_body(type_def, "    ", ir);
             out.push_str(&body);
             out.push('\n');
@@ -316,7 +316,7 @@ impl JavaCodegen {
         }
 
         if self.options.emit_direct_codec {
-            for def in ir.types.values() {
+            for def in ir.emitted_types() {
                 let codec = self.generate_codec(def, ir);
                 let body = &codec[codec.find("public final class ").unwrap()..];
                 out.push_str(&body.replacen(

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/mod.rs

@@ -85,7 +85,9 @@ pub fn build_type_name_map<F: Fn(&str) -> String>(
 ) -> HashMap<QName, String> {
     let mut taken: HashSet<String> = HashSet::new();
     let mut map = HashMap::new();
-    for qname in ir.types.keys() {
+    let mut keys: Vec<&QName> = ir.types.keys().collect();
+    keys.sort_by_key(|q| (ir.is_external_type(q), *q));
+    for qname in keys {
         let base = name_of(&qname.local);
         let mut name = base.clone();
         let mut n = 2u32;

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/python/mod.rs

@@ -276,6 +276,9 @@ impl PythonCodegen {
         let sorted_types = self.order_types(ir);
 
         for type_def in sorted_types {
+            if ir.is_external_type(type_def.qname()) {
+                continue;
+            }
             out.push('\n');
             match type_def {
                 TypeDef::Simple(s) => self.emit_simple_type(&mut out, s),
@@ -298,7 +301,7 @@ impl PythonCodegen {
         let mut has_decimal = false;
         let mut has_annotated = false;
 
-        for type_def in ir.types.values() {
+        for type_def in ir.emitted_types() {
             match type_def {
                 TypeDef::Struct(_) => has_structs = true,
                 TypeDef::Enum(_) => has_enums = true,

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/rust/mod.rs

@@ -259,6 +259,9 @@ impl RustCodegen {
         }
 
         for type_def in &sorted_types {
+            if ir.is_external_type(type_def.qname()) {
+                continue;
+            }
             out.push('\n');
             match type_def {
                 TypeDef::Simple(s) => self.emit_simple_type(&mut out, s, &types_with_lifetime),

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/codegen/typescript/mod.rs

@@ -221,6 +221,9 @@ impl TypeScriptCodegen {
 
         let ordered = self.order_types(ir);
         for type_def in ordered {
+            if ir.is_external_type(type_def.qname()) {
+                continue;
+            }
             match type_def {
                 TypeDef::Simple(s) => {
                     let mut simple = s.clone();

{polyxml-0.29.0 → polyxml-0.30.0}/crates/polyxml-core/src/ir/mod.rs

@@ -457,9 +457,22 @@ pub struct SchemaIR {
     pub types: BTreeMap<QName, TypeDef>,
     pub elements: BTreeMap<QName, ElementDef>,
     pub substitution_groups: HashMap<QName, Vec<QName>>,
+    /// Type owners outside the module currently being emitted. Definitions
+    /// remain in `types` so generators can resolve their field semantics.
+    #[serde(default)]
+    pub external_types: BTreeMap<QName, String>,
 }
 
 impl SchemaIR {
+    pub fn is_external_type(&self, qname: &QName) -> bool {
+        self.external_types.contains_key(qname)
+    }
+
+    pub fn emitted_types(&self) -> impl Iterator<Item = &TypeDef> {
+        self.types
+            .values()
+            .filter(|ty| !self.is_external_type(ty.qname()))
+    }
     pub fn new() -> Self {
         Self::default()
     }

{polyxml-0.29.0 → polyxml-0.30.0}/pyproject.toml

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