Always Box Structs and Enums to allow for recursive types in XSDs

xsd-parser/src/generator/enum.rs

@@ -18,7 +18,7 @@ pub trait EnumGenerator {
             indent = gen.base().indent()
         );
 
-        format!(
+        let str = format!(
             "{comment}{macros}\n\
             pub enum {name} {{\n\
                 {cases}\n\
@@ -36,7 +36,14 @@ pub trait EnumGenerator {
             default = default_case,
             subtypes = self.subtypes(entity, gen),
             validation = self.validation(entity, gen),
-        )
+        );
+
+        let mut str2 = format!("impl YaSerialize for Box<{name}> {{\n");
+        str2 += format!("\tfn serialize<W: Write>(&self, writer: &mut Serializer<W>) -> Result<(), String> {{\n\t\tself.as_ref().serialize(writer)\n}}\n").as_str();
+        str2 += format!("\tfn serialize_attributes(&self, attributes: Vec<OwnedAttribute>, namespace: Namespace) -> Result<(Vec<OwnedAttribute>, Namespace), String> {{\n\t\tself.as_ref().serialize_attributes(attributes, namespace)\n}}\n}}\n\n").as_str();
+        let mut str3 = format!("impl YaDeserialize for Box<{name}> {{\n\tfn deserialize<R: Read>(reader: &mut Deserializer<R>) -> Result<Self, String> {{\n");
+        str3 += format!("\t\tOk(Box::new({name}::deserialize(reader)?))\n}}\n}}\n\n").as_str();
+        str + str2.as_str() + str3.as_str()
     }
 
     fn cases(&self, entity: &Enum, gen: &Generator) -> String {

xsd-parser/src/generator/struct.rs

@@ -7,15 +7,22 @@ use crate::{
 
 pub trait StructGenerator {
     fn generate(&self, entity: &Struct, gen: &Generator) -> String {
-        format!(
+        let str = format!(
             "{comment}{macros}pub struct {name} {{{fields}}}\n\n{validation}\n{subtypes}\n",
             comment = self.format_comment(entity, gen),
             macros = self.macros(entity, gen),
             name = self.get_type_name(entity, gen),
             fields = self.fields(entity, gen),
             subtypes = self.subtypes(entity, gen),
             validation = self.validation(entity, gen),
-        )
+        );
+        let name = self.get_type_name(entity, gen);
+        let mut str2 = format!("impl YaSerialize for Box<{name}> {{\n");
+        str2 += format!("\tfn serialize<W: Write>(&self, writer: &mut Serializer<W>) -> Result<(), String> {{\n\t\tself.as_ref().serialize(writer)\n}}\n").as_str();
+        str2 += format!("\tfn serialize_attributes(&self, attributes: Vec<OwnedAttribute>, namespace: Namespace) -> Result<(Vec<OwnedAttribute>, Namespace), String> {{\n\t\tself.as_ref().serialize_attributes(attributes, namespace)\n}}\n}}\n\n").as_str();
+        let mut str3 = format!("impl YaDeserialize for Box<{name}> {{\n\tfn deserialize<R: Read>(reader: &mut Deserializer<R>) -> Result<Self, String> {{\n");
+        str3 += format!("\t\tOk(Box::new({name}::deserialize(reader)?))\n}}\n}}\n\n").as_str();
+        str + str2.as_str() + str3.as_str()
     }
 
     fn fields(&self, entity: &Struct, gen: &Generator) -> String {

xsd-parser/src/generator/struct_field.rs

@@ -22,12 +22,18 @@ pub trait StructFieldGenerator {
     }
 
     fn get_type_name(&self, entity: &StructField, gen: &Generator) -> String {
-        gen.base()
+        let type_name = gen.base().format_type_name(entity.type_name.as_str(), gen).to_string();
+        let mut type_name: String = gen.base()
             .modify_type(
-                gen.base().format_type_name(entity.type_name.as_str(), gen).as_ref(),
+                &type_name,
                 &entity.type_modifiers,
             )
-            .into()
+            .into();
+        if type_name != "f64" && !type_name.contains("String") && !type_name.starts_with("Vec<") {
+            type_name = format!("Box<{type_name}>");
+        }
+        type_name = type_name.replace("Box<Option<", "Option<Box<");
+        type_name
     }
 
     fn get_name(&self, entity: &StructField, gen: &Generator) -> String {