upgrade yaserde to 0.12

README.md

@@ -98,7 +98,7 @@ In such cases we don't know in advance what fields must be present in Rust struc
 
 ```rust
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct MyType {
     #[yaserde(prefix = "tns", rename = "Parameters")]
     pub parameters: String,

wsdl-parser-cli/Cargo.toml

@@ -17,6 +17,6 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }
-roxmltree = { version = "0.19", features = ["std"] }
+roxmltree = { version = "0.20", features = ["std"] }
 wsdl-parser = { path = "../wsdl-parser" }
 xsd-parser = { path = "../xsd-parser" }

wsdl-parser/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 Inflector = "0.11"
-roxmltree = "0.19"
+roxmltree = "0.20"
 
 [dev-dependencies]
 syn = { version = "2", features = ["full", "extra-traits"] }

wsdl-parser/tests/port_type_to_function/expected.rs

@@ -1,6 +1,6 @@
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tds", namespace = "tds: http://www.onvif.org/ver10/device/wsdl")]
+#[yaserde(prefix = "tds", namespaces = {"tds" = "http://www.onvif.org/ver10/device/wsdl"})]
 pub struct GetServices {
     // Indicates if the service capabilities (untyped) should be included in the
     // response.
@@ -12,7 +12,7 @@ impl Validate for GetServices {}
 
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tds", namespace = "tds: http://www.onvif.org/ver10/device/wsdl")]
+#[yaserde(prefix = "tds", namespaces = {"tds" = "http://www.onvif.org/ver10/device/wsdl"})]
 pub struct GetServicesResponse {
     // Each Service element contains information about one service.
     #[yaserde(prefix = "tds", rename = "Service")]

xsd-parser/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 Inflector = "0.11"
-roxmltree = "0.19"
+roxmltree = "0.20"
 
 [dev-dependencies]
 num-bigint = "0.4"
@@ -21,5 +21,4 @@ text-diff = "0.4"
 xml-rs = "0.8"
 xsd-macro-utils = { path = "../xsd-macro-utils" }
 xsd-types = { path = "../xsd-types" }
-yaserde = "0.7"
-yaserde_derive = "0.7"
+yaserde = {version="0.12", features=["derive"]}

xsd-parser/src/generator/default.rs

@@ -67,13 +67,13 @@ pub fn default_modify_type(type_name: &str, modifiers: &[TypeModifier]) -> Cow<'
 pub fn yaserde_for_attribute(name: &str, indent: &str) -> String {
     if let Some(index) = name.find(':') {
         format!(
-            "{}#[yaserde(attribute, prefix = \"{}\", rename = \"{}\")]\n",
+            "{}#[yaserde(attribute = true, prefix = \"{}\", rename = \"{}\")]\n",
             indent,
             &name[0..index],
             &name[index + 1..]
         )
     } else {
-        format!("{}#[yaserde(attribute, rename = \"{}\")]\n", indent, name)
+        format!("{}#[yaserde(attribute = true, rename = \"{}\")]\n", indent, name)
     }
 }
 

xsd-parser/src/generator/enum.rs

@@ -69,12 +69,15 @@ pub trait EnumGenerator {
         let tns = gen.target_ns.borrow();
         match tns.as_ref() {
             Some(tn) => match tn.name() {
+                // needs to put it differently when multiples namespaces are defined.
+                // namepsaces = {"tns" = "example.com", "tds = "another.example.com"}
                 Some(name) => format!(
-                    "{derives}#[yaserde(prefix = \"{prefix}\", namespace = \"{prefix}: {uri}\")]\n",
+                    "{derives}#[yaserde(prefix = \"{prefix}\", namespaces = {{\"{prefix}\" = \"{uri}\"}})]\n",
                     derives = derives,
                     prefix = name,
                     uri = tn.uri()
                 ),
+                // deal with it
                 None => format!(
                     "{derives}#[yaserde(namespace = \"{uri}\")]\n",
                     derives = derives,

xsd-parser/src/generator/struct.rs

@@ -84,11 +84,12 @@ pub trait StructGenerator {
         match tns.as_ref() {
             Some(tn) => match tn.name() {
                 Some(name) => format!(
-                    "{derives}#[yaserde(prefix = \"{prefix}\", namespace = \"{prefix}: {uri}\")]\n",
+                    "{derives}#[yaserde(prefix = \"{prefix}\", namespaces = {{\"{prefix}\" = \"{uri}\"}})]\n",
                     derives = derives,
                     prefix = name,
                     uri = tn.uri()
                 ),
+                // todo: deal with it
                 None => format!(
                     "{derives}#[yaserde(namespace = \"{uri}\")]\n",
                     derives = derives,

xsd-parser/tests/all/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Once")]
     pub once: i32,

xsd-parser/tests/all/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/any/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Name")]
     pub name: String,

xsd-parser/tests/any/mod.rs

@@ -3,7 +3,7 @@ use super::utils;
 #[test]
 fn deserialization_works() {
     mod expected {
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/choice/expected.rs

@@ -5,7 +5,7 @@ pub struct BarType(pub String);
 pub struct BazType(pub i32);
 
 #[derive(PartialEq, Debug, Clone, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub enum FooTypeChoice {
     Bar(BarType),
     Baz(BazType),
@@ -19,8 +19,8 @@ impl Default for FooTypeChoice {
 }
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
-    #[yaserde(flatten)]
+    #[yaserde(flatten = true)]
     pub foo_type_choice: FooTypeChoice,
 }

xsd-parser/tests/choice/mod.rs

@@ -6,7 +6,7 @@ fn deserialization_works() {
         use std::str::FromStr;
 
         use xsd_macro_utils::*;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/complex_type/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Min")]
     pub min: i32,

xsd-parser/tests/complex_type/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/complex_type_subtypes_clash/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Extension")]
     pub extension: foo_type::ExtensionType,
@@ -11,14 +11,14 @@ pub mod foo_type {
     use super::*;
 
     #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-    #[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+    #[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
     pub struct ExtensionType {}
 
     impl Validate for ExtensionType {}
 }
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct BarType {
     #[yaserde(prefix = "tns", rename = "Extension")]
     pub extension: bar_type::ExtensionType,
@@ -30,7 +30,7 @@ pub mod bar_type {
     use super::*;
 
     #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-    #[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+    #[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
     pub struct ExtensionType {}
 
     impl Validate for ExtensionType {}

xsd-parser/tests/complex_type_subtypes_clash/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/enumeration/expected.rs

@@ -1,5 +1,5 @@
 #[derive(PartialEq, Debug, Clone, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub enum FooType {
     #[yaserde(rename = "OFF")]
     Off,

xsd-parser/tests/enumeration/mod.rs

@@ -7,7 +7,7 @@ fn deserialization_works() {
 
         use xsd_macro_utils::*;
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/extension_base/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct BarType {
     #[yaserde(prefix = "tns", rename = "b")]
     pub b: i32,
@@ -11,7 +11,7 @@ pub struct BarType {
 impl Validate for BarType {}
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "a")]
     pub a: f64,

xsd-parser/tests/extension_base/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/extension_base_multilayer/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct BarType {
     #[yaserde(prefix = "tns", rename = "aa")]
     pub aa: i32,
@@ -11,7 +11,7 @@ pub struct BarType {
 impl Validate for BarType {}
 
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "Messages")]
     pub messages: foo_type::MessagesType,
@@ -23,7 +23,7 @@ pub mod foo_type {
     use super::*;
 
     #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-    #[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+    #[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
     pub struct MessagesType {
         #[yaserde(prefix = "tns", rename = "a")]
         pub a: String,

xsd-parser/tests/extension_base_multilayer/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/extension_base_two_files/expected.rs

@@ -1,8 +1,7 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
 #[yaserde(
     prefix = "tns",
-    namespace = "tns: http://example.com",
-    namespace = "tns2: http://other.example.com"
+    namespaces = {"tns" = "http://example.com", "tns2" = "http://other.example.com"},
 )]
 pub struct FooType {
     #[yaserde(prefix = "tns", rename = "a")]

xsd-parser/tests/extension_base_two_files/mod.rs

@@ -3,7 +3,7 @@ use super::utils;
 #[test]
 fn deserialization_works() {
     mod expected {
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
         include!("expected.rs");
     }
 

xsd-parser/tests/ref_to_attribute/expected.rs

@@ -3,9 +3,9 @@ pub struct Id(pub String);
 
 impl Validate for Id {}
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
-    #[yaserde(attribute, prefix = "tns", rename = "id")]
+    #[yaserde(attribute = true, prefix = "tns", rename = "id")]
     pub id: Option<Id>,
 }
 

xsd-parser/tests/ref_to_attribute/mod.rs

@@ -7,7 +7,7 @@ fn deserialization_works() {
 
         use xsd_macro_utils::*;
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/rename_only_where_needed/expected.rs

@@ -1,5 +1,5 @@
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://example.com")]
+#[yaserde(prefix = "tns", namespaces = {"tns" = "http://example.com"})]
 pub struct FooType {
     #[yaserde(prefix = "tns")]
     pub min: i32,

xsd-parser/tests/rename_only_where_needed/mod.rs

@@ -3,7 +3,7 @@ use super::utils;
 #[test]
 fn deserialization_works() {
     mod expected {
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
         include!("expected.rs");
     }
 

xsd-parser/tests/restriction_any_type/expected.rs

@@ -1,14 +1,14 @@
 // pub type AppSequence = AppSequenceType;
 #[derive(Default, Clone, PartialEq, Debug, YaSerialize, YaDeserialize)]
-#[yaserde(prefix = "tns", namespace = "tns: http://schemas.xmlsoap.org/ws/2005/04/discovery")]
+#[yaserde(prefix = "tns", namespaces = {"tns" =  "http://schemas.xmlsoap.org/ws/2005/04/discovery"})]
 pub struct AppSequenceType {
-    #[yaserde(attribute, rename = "InstanceId")]
+    #[yaserde(attribute = true, rename = "InstanceId")]
     pub instance_id: u32,
 
-    #[yaserde(attribute, rename = "SequenceId")]
+    #[yaserde(attribute = true, rename = "SequenceId")]
     pub sequence_id: Option<String>,
 
-    #[yaserde(attribute, rename = "MessageNumber")]
+    #[yaserde(attribute = true, rename = "MessageNumber")]
     pub message_number: u32,
 }
 

xsd-parser/tests/restriction_any_type/mod.rs

@@ -4,7 +4,7 @@ use super::utils;
 fn deserialization_works() {
     mod expected {
         use xsd_parser::generator::validator::Validate;
-        use yaserde_derive::{YaDeserialize, YaSerialize};
+        use yaserde::{YaDeserialize, YaSerialize};
 
         include!("expected.rs");
     }

xsd-parser/tests/tuple_with_vec/mod.rs

@@ -17,7 +17,7 @@ fn deserialization_works() {
     assert_eq!(de, expected::FooType(vec![1, 2, 3]));
 
     assert_eq!(
-        r#"<?xml version="1.0" encoding="utf-8"?><FooType>1 2 3</FooType>"#,
+        r#"<?xml version="1.0" encoding="UTF-8"?><FooType>1 2 3</FooType>"#,
         yaserde::ser::to_string(&de).unwrap()
     );
 }