jolimail · jdrouet · Feb 4, 2023 · Jan 25, 2023 · Jan 25, 2023 · Jan 27, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,6 +44,7 @@ mrml-print-macros = { path = "./lib/mrml-print-macros", optional = true }
 
 [dev-dependencies]
 criterion = "0.4"
+similar-asserts = "1.4"
 
 [workspace]
 members = [

diff --git a/lib/mrml-parse-macros/src/attributes.rs b/lib/mrml-parse-macros/src/attributes.rs
@@ -41,7 +41,11 @@ fn create_builder_build_field(field: &Field) -> Option<proc_macro2::TokenStream>
 
 fn create_builder_insert_field(field: &Field) -> Option<proc_macro2::TokenStream> {
     if let Some(ref field_ident) = field.ident {
-        let attribute = to_kebab_case(&field_ident.to_string());
+        let attribute = match field_ident.to_string().as_str() {
+            // TODO make this a macro like #[mrml_parse(rename = "type")]
+            "kind" => "type".to_string(),
+            other => to_kebab_case(other),
+        };
         Some(quote! {
             #attribute => {
                 self.#field_ident = Some(value.to_string());

diff --git a/lib/mrml-parse-macros/src/element.rs b/lib/mrml-parse-macros/src/element.rs
@@ -158,7 +158,7 @@ fn create_parse_child_element(ast: &DeriveInput, opts: &Opts) -> proc_macro2::To
                 tokenizer: &mut xmlparser::Tokenizer<'a>,
             ) -> Result<(), crate::prelude::parse::Error> {
                 use crate::prelude::parse::Parsable;
-                self.children.push(<#ty>::parse(tag, tokenizer)?);
+                self.children.push(<#ty>::parse(tag, tokenizer, self.opts.clone())?);
                 Ok(())
             }
         },
@@ -189,13 +189,15 @@ pub fn derive(input: TokenStream) -> TokenStream {
     quote! {
         #[derive(Debug)]
         struct #parser_ident {
+            opts: std::rc::Rc<crate::prelude::parse::ParserOptions>,
             #attributes
             #children
         }
 
         impl #parser_ident {
-            fn new() -> Self {
+            fn new(opts: std::rc::Rc<crate::prelude::parse::ParserOptions>) -> Self {
                 Self {
+                    opts,
                     #attributes_new
                     #children_new
                 }
@@ -219,9 +221,9 @@ pub fn derive(input: TokenStream) -> TokenStream {
         }
 
         impl crate::prelude::parse::Parsable for #origin_ident {
-            fn parse(_tag: xmlparser::StrSpan, tokenizer: &mut xmlparser::Tokenizer) -> Result<Self, crate::prelude::parse::Error> {
+            fn parse(_tag: xmlparser::StrSpan, tokenizer: &mut xmlparser::Tokenizer, opts: std::rc::Rc<crate::prelude::parse::ParserOptions>) -> Result<Self, crate::prelude::parse::Error> {
                 use crate::prelude::parse::Parser;
-                #parser_ident::new().parse(tokenizer)?.build()
+                #parser_ident::new(opts).parse(tokenizer)?.build()
             }
         }
     }

diff --git a/lib/mrml-print-macros/src/element.rs b/lib/mrml-print-macros/src/element.rs
@@ -10,9 +10,14 @@ pub(super) struct Opts {
     tag: Option<String>,
     close_empty: Option<bool>,
     indent_children: Option<bool>,
+    children: Option<bool>,
 }
 
 impl Opts {
+    fn children(&self) -> bool {
+        self.children.unwrap_or(true)
+    }
+
     fn indent_children(&self) -> bool {
         self.indent_children.unwrap_or(true)
     }
@@ -64,13 +69,7 @@ impl Generator {
         let attrs = self.build_print_trait_attributes();
 
         match self.children_kind {
-            ChildrenKind::None => {
-                let close_empty = self.options.close_empty.unwrap_or(true);
-                quote! {
-                    crate::prelude::print::open(#tag_name, #attrs, #close_empty, pretty, level, indent_size)
-                }
-            }
-            ChildrenKind::String if self.options.indent_children() => {
+            ChildrenKind::String if self.options.children() && self.options.indent_children() => {
                 quote! {
                     if self.children.is_empty() {
                         crate::prelude::print::open(#tag_name, #attrs, true, pretty, level, indent_size)
@@ -82,7 +81,7 @@ impl Generator {
                     }
                 }
             }
-            ChildrenKind::String => {
+            ChildrenKind::String if self.options.children() => {
                 quote! {
                     if self.children.is_empty() {
                         crate::prelude::print::open(#tag_name, #attrs, true, pretty, level, indent_size)
@@ -98,7 +97,7 @@ impl Gen
F737
erator {
                     }
                 }
             }
-            ChildrenKind::Single => {
+            ChildrenKind::Single if self.options.children() => {
                 quote! {
                     let content = self.children.print(pretty, level + 1, indent_size);
                     if content.is_empty() {
@@ -111,7 +110,7 @@ impl Generator {
                     }
                 }
             }
-            ChildrenKind::List(_) => {
+            ChildrenKind::List(_) if self.options.children() => {
                 quote! {
                     if self.children.is_empty() {
                         crate::prelude::print::open(#tag_name, #attrs, true, pretty, level, indent_size)
@@ -125,6 +124,12 @@ impl Generator {
                     }
                 }
             }
+            _ => {
+                let close_empty = self.options.close_empty.unwrap_or(true);
+                quote! {
+                    crate::prelude::print::open(#tag_name, #attrs, #close_empty, pretty, level, indent_size)
+                }
+            }
         }
     }
 

diff --git a/src/helper/mod.rs b/src/helper/mod.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "render")]
+#[cfg(any(test, feature = "render"))]
 pub mod condition;
 #[cfg(feature = "render")]
 pub mod random;
@@ -13,5 +13,5 @@ pub mod style;
 #[cfg(feature = "render")]
 pub mod tag;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "parse"))]
 pub mod test;