support choice in sequences

Author: marcelbuesing

xml_schema/tests/choice.rs

@@ -39,3 +39,37 @@ fn choice() {
     r#"<?xml version="1.0" encoding="utf-8"?><Parent><XFirstname>John</XFirstname></Parent>"#
   );
 }
+
+#[test]
+fn choice_sequence() {
+  #[derive(Debug, XmlSchema)]
+  #[xml_schema(source = "xml_schema/tests/choice_sequence.xsd")]
+  struct ChoiceTypeSchema;
+
+  let xml_1 = r#"
+  <?xml version="1.0" encoding="UTF-8"?>
+  <Parent>
+    <Name>Doe</Name>
+    <XFirstname>John</XFirstname>
+  </Parent>
+  "#;
+
+  let sample_1: Parent = from_str(xml_1).unwrap();
+
+  let model = Parent {
+    name: "Doe".to_string(),
+    x_firstname: Some(Firstname {
+      content: "John".to_string(),
+      scope: None,
+    }),
+    x_lastname: None,
+  };
+
+  assert_eq!(sample_1, model);
+
+  let data = to_string(&model).unwrap();
+  assert_eq!(
+    data,
+    r#"<?xml version="1.0" encoding="utf-8"?><Parent><Name>Doe</Name><XFirstname>John</XFirstname></Parent>"#
+  );
+}

xml_schema/tests/choice_sequence.xsd

@@ -0,0 +1,28 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:complexType name="Firstname">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="scope" type="xs:anyURI" use="optional" default="http://example.com#elements"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:complexType name="Lastname">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="scope" type="xs:anyURI" use="optional" default="http://example.com#elements"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+
+    <xs:complexType name="Parent">
+        <xs:sequence>
+            <xs:element name="Name" type="xsd:string" minOccurs="1"/>
+            <xs:choice>
+                <xs:element name="XFirstname" type="Firstname"/>
+                <xs:element name="XLastname" type="Lastname"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>

xml_schema_derive/src/xsd/complex_type.rs

@@ -20,6 +20,7 @@ pub struct ComplexType {
   pub name: String,
   #[yaserde(rename = "attribute")]
   pub attributes: Vec<Attribute>,
+  #[yaserde(rename = "sequence")]
   pub sequence: Option<Sequence>,
   #[yaserde(rename = "simpleContent")]
   pub simple_content: Option<SimpleContent>,

xml_schema_derive/src/xsd/extension.rs

@@ -20,6 +20,8 @@ pub struct Extension {
   pub attributes: Vec<Attribute>,
   #[yaserde(rename = "sequence")]
   pub sequences: Vec<Sequence>,
+  #[yaserde(rename = "choice")]
+  pub choices: Vec<Choice>,
 }
 
 impl Implementation for Extension {

xml_schema_derive/src/xsd/sequence.rs

@@ -1,4 +1,4 @@
-use crate::xsd::{element::Element, Implementation, XsdContext};
+use crate::xsd::{choice::Choice, element::Element, Implementation, XsdContext};
 use log::{debug, info};
 use proc_macro2::TokenStream;
 use std::io::prelude::*;
@@ -9,6 +9,8 @@ use yaserde::YaDeserialize;
 pub struct Sequence {
   #[yaserde(rename = "element")]
   pub elements: Vec<Element>,
+  #[yaserde(rename = "choice")]
+  pub choices: Vec<Choice>,
 }
 
 impl Implementation for Sequence {
@@ -19,11 +21,22 @@ impl Implementation for Sequence {
     context: &XsdContext,
   ) -> TokenStream {
     info!("Generate elements");
-    self
+    let elements: TokenStream = self
       .elements
       .iter()
       .map(|element| element.get_field_implementation(context, prefix, false, false))
-      .collect()
+      .collect();
+
+    let choices: TokenStream = self
+      .choices
+      .iter()
+      .map(|choice| choice.get_field_implementation(context, prefix))
+      .collect();
+
+    quote!(
+      #elements
+      #choices
+    )
   }
 }
 
@@ -47,10 +60,21 @@ impl Sequence {
     context: &XsdContext,
     prefix: &Option<String>,
   ) -> TokenStream {
-    self
+    let elements: TokenStream = self
       .elements
       .iter()
-      .map(|element| element.get_field_implementation(context, prefix, true, false))
-      .collect()
+      .map(|element| element.get_field_implementation(context, prefix, false, false))
+      .collect();
+
+    let choices: TokenStream = self
+      .choices
+      .iter()
+      .map(|choice| choice.get_field_implementation(context, prefix))
+      .collect();
+
+    quote!(
+      #elements
+      #choices
+    )
   }
 }