Fix issue with maxLength restrictions

Bergmann89 · Bergmann89 · commit 5fb7be8bbf09 · 2025-03-21T19:50:17.000+01:00
We mistakenly have interpreted the `maxLength` restriction facet as
value for the maximum occurrences of an element.
diff --git a/src/interpreter/type_builder.rs b/src/interpreter/type_builder.rs
@@ -75,17 +75,6 @@ macro_rules! init_any {
     }};
 }
 
-/// Get the type `$variant` of a `$builder` or panic if the variant does not match.
-macro_rules! get_any {
-    ($builder:expr, $variant:ident) => {
-        match &mut $builder.type_ {
-            None => crate::unreachable!("Type is not assigned yet!"),
-            Some(Type::$variant(ret)) => ret,
-            Some(e) => crate::unreachable!("Type is expected to be a {:?}", e),
-        }
-    };
-}
-
 /// Get the type `$variant` of a `$builder` or set the type variant if unset.
 macro_rules! get_or_init_any {
     ($builder:expr, $variant:ident) => {
@@ -735,20 +724,6 @@ impl<'a, 'schema, 'state> TypeBuilder<'a, 'schema, 'state> {
     fn apply_facet(&mut self, ty: &Facet) -> Result<(), Error> {
         match ty {
             Facet::Enumeration(x) => self.apply_enumeration(x)?,
-            Facet::MinLength(x) => {
-                let ti = get_any!(self, Reference);
-                ti.min_occurs = x
-                    .value
-                    .parse::<usize>()
-                    .map_err(|_| Error::InvalidValue("value"))?;
-            }
-            Facet::MaxLength(x) => {
-                let ti = get_any!(self, Reference);
-                ti.max_occurs = x
-                    .value
-                    .parse::<MaxOccurs>()
-                    .map_err(|_| Error::InvalidValue("value"))?;
-            }
             x => tracing::warn!("Unknown facet: {x:#?}"),
         }
 
diff --git a/tests/feature/mod.rs b/tests/feature/mod.rs
@@ -21,6 +21,7 @@ mod sequence;
 mod sequence_with_choice;
 mod simple_content;
 mod simple_type;
+mod simple_type_max_length;
 mod static_list;
 mod tuple_with_integer;
 mod tuple_with_string;
diff --git a/tests/feature/simple_type_max_length/example/default.xml b/tests/feature/simple_type_max_length/example/default.xml
@@ -0,0 +1 @@
+<tns:Name xmlns:tns="http://example.com">string</tns:Name>
diff --git a/tests/feature/simple_type_max_length/expected/default.rs b/tests/feature/simple_type_max_length/expected/default.rs
@@ -0,0 +1 @@
+pub type Name = String;
diff --git a/tests/feature/simple_type_max_length/expected/quick_xml.rs b/tests/feature/simple_type_max_length/expected/quick_xml.rs
@@ -0,0 +1,5 @@
+pub const NS_XS: Namespace = Namespace::new_const(b"http://www.w3.org/2001/XMLSchema");
+pub const NS_XML: Namespace = Namespace::new_const(b"http://www.w3.org/XML/1998/namespace");
+pub const NS_TNS: Namespace = Namespace::new_const(b"http://example.com");
+use xsd_parser::schema::Namespace;
+pub type Name = String;
diff --git a/tests/feature/simple_type_max_length/expected/serde_quick_xml.rs b/tests/feature/simple_type_max_length/expected/serde_quick_xml.rs
@@ -0,0 +1 @@
+pub type Name = String;
diff --git a/tests/feature/simple_type_max_length/expected/serde_xml_rs.rs b/tests/feature/simple_type_max_length/expected/serde_xml_rs.rs
@@ -0,0 +1 @@
+pub type Name = String;
diff --git a/tests/feature/simple_type_max_length/mod.rs b/tests/feature/simple_type_max_length/mod.rs
@@ -0,0 +1,109 @@
+use xsd_parser::{generator::SerdeSupport, types::IdentType, Config};
+
+use crate::utils::{generate_test, ConfigEx};
+
+#[test]
+fn generate_default() {
+    generate_test(
+        "tests/feature/simple_type_max_length/schema.xsd",
+        "tests/feature/simple_type_max_length/expected/default.rs",
+        Config::test_default().with_generate([(IdentType::Element, "tns:Name")]),
+    );
+}
+
+#[test]
+fn generate_quick_xml() {
+    generate_test(
+        "tests/feature/simple_type_max_length/schema.xsd",
+        "tests/feature/simple_type_max_length/expected/quick_xml.rs",
+        Config::test_default()
+            .with_quick_xml()
+            .with_generate([(IdentType::Element, "tns:Name")]),
+    );
+}
+
+#[test]
+fn generate_serde_xml_rs() {
+    generate_test(
+        "tests/feature/simple_type_max_length/schema.xsd",
+        "tests/feature/simple_type_max_length/expected/serde_xml_rs.rs",
+        Config::test_default()
+            .with_serde_support(SerdeSupport::SerdeXmlRs)
+            .with_generate([(IdentType::Element, "tns:Name")]),
+    );
+}
+
+#[test]
+fn generate_serde_quick_xml() {
+    generate_test(
+        "tests/feature/simple_type_max_length/schema.xsd",
+        "tests/feature/simple_type_max_length/expected/serde_quick_xml.rs",
+        Config::test_default()
+            .with_serde_support(SerdeSupport::QuickXml)
+            .with_generate([(IdentType::Element, "tns:Name")]),
+    );
+}
+
+#[test]
+#[cfg(not(feature = "update-expectations"))]
+fn read_quick_xml() {
+    use quick_xml::Name;
+
+    let obj = crate::utils::quick_xml_read_test::<Name, _>(
+        "tests/feature/simple_type_max_length/example/default.xml",
+    );
+
+    assert_eq!(obj, "string");
+}
+
+#[test]
+#[cfg(not(feature = "update-expectations"))]
+fn read_serde_xml_rs() {
+    use serde_xml_rs::Name;
+
+    let obj = crate::utils::serde_xml_rs_read_test::<Name, _>(
+        "tests/feature/simple_type_max_length/example/default.xml",
+    );
+
+    assert_eq!(obj, "string");
+}
+
+#[test]
+#[cfg(not(feature = "update-expectations"))]
+fn read_serde_quick_xml() {
+    use serde_quick_xml::Name;
+
+    let obj = crate::utils::serde_quick_xml_read_test::<Name, _>(
+        "tests/feature/simple_type_max_length/example/default.xml",
+    );
+
+    assert_eq!(obj, "string");
+}
+
+#[cfg(not(feature = "update-expectations"))]
+mod default {
+    #![allow(unused_imports)]
+
+    include!("expected/default.rs");
+}
+
+#[cfg(not(feature = "update-expectations"))]
+mod quick_xml {
+    #![allow(unused_imports)]
+
+    include!("expected/quick_xml.rs");
+}
+
+#[cfg(not(feature = "update-expectations"))]
+mod serde_xml_rs {
+    #![allow(unused_imports)]
+
+    include!("expected/serde_xml_rs.rs");
+}
+
+#[cfg(not(feature = "update-expectations"))]
+mod serde_quick_xml {
+    #![allow(unused_imports)]
+
+    include!("expected/serde_quick_xml.rs");
+}
diff --git a/tests/feature/simple_type_max_length/schema.xsd b/tests/feature/simple_type_max_length/schema.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://example.com"
+           targetNamespace="http://example.com"
+           elementFormDefault="qualified">
+    <xs:simpleType name="NameType">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="30"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+    <xs:element name="Name" type="tns:NameType"/>
+</xs:schema>
diff --git a/tests/schema/xml_schema/expected/quick_xml.rs b/tests/schema/xml_schema/expected/quick_xml.rs
@@ -545,7 +545,7 @@ impl DeserializeBytes for DefaultOpenContentModeType {
 pub struct WildcardType {
     pub id: Option<String>,
     pub namespace: Option<NamespaceListType>,
-    pub not_namespace: Option<NotNamespaceType>,
+    pub not_namespace: Option<BasicNamespaceListType>,
     pub process_contents: ProcessContentsType,
     pub annotation: Option<AnnotationElementType>,
 }
@@ -687,7 +687,7 @@ impl WithDeserializer for OpenContentElementType {
 pub struct AnyAttributeElementType {
     pub id: Option<String>,
     pub namespace: Option<NamespaceListType>,
-    pub not_namespace: Option<NotNamespaceType>,
+    pub not_namespace: Option<BasicNamespaceListType>,
     pub process_contents: ProcessContentsType,
     pub not_q_name: Option<QnameListAType>,
     pub annotation: Option<AnnotationElementType>,
@@ -731,7 +731,7 @@ impl DeserializeBytes for AllNNIType {
 pub struct AnyElementType {
     pub id: Option<String>,
     pub namespace: Option<NamespaceListType>,
-    pub not_namespace: Option<NotNamespaceType>,
+    pub not_namespace: Option<BasicNamespaceListType>,
     pub process_contents: ProcessContentsType,
     pub not_q_name: Option<QnameListType>,
     pub min_occurs: usize,
@@ -869,8 +869,8 @@ impl DeserializeBytes for NamespaceListType {
     }
 }
 #[derive(Debug, Clone, Default)]
-pub struct NotNamespaceType(pub Vec<BasicNamespaceListItemType>);
-impl DeserializeBytes for NotNamespaceType {
+pub struct BasicNamespaceListType(pub Vec<BasicNamespaceListItemType>);
+impl DeserializeBytes for BasicNamespaceListType {
     fn deserialize_bytes<R>(reader: &R, bytes: &[u8]) -> Result<Self, Error>
     where
         R: DeserializeReader,
@@ -1063,21 +1063,6 @@ pub struct FieldElementType {
 impl WithDeserializer for FieldElementType {
     type Deserializer = quick_xml_deserialize::FieldElementTypeDeserializer;
 }
-#[derive(Debug, Clone, Default)]
-pub struct BasicNamespaceListType(pub Vec<BasicNamespaceListItemType>);
-impl DeserializeBytes for BasicNamespaceListType {
-    fn deserialize_bytes<R>(reader: &R, bytes: &[u8]) -> Result<Self, Error>
-    where
-        R: DeserializeReader,
-    {
-        Ok(Self(
-            bytes
-                .split(|b| *b == b' ' || *b == b'|' || *b == b',' || *b == b';')
-                .map(|bytes| BasicNamespaceListItemType::deserialize_bytes(reader, bytes))
-                .collect::<Result<Vec<_>, _>>()?,
-        ))
-    }
-}
 #[derive(Debug, Clone)]
 pub enum BasicNamespaceListItemType {
     String(String),
@@ -13218,7 +13203,7 @@ pub mod quick_xml_deserialize {
     pub struct WildcardTypeDeserializer {
         id: Option<String>,
         namespace: Option<super::NamespaceListType>,
-        not_namespace: Option<super::NotNamespaceType>,
+        not_namespace: Option<super::BasicNamespaceListType>,
         process_contents: super::ProcessContentsType,
         annotation: Option<super::AnnotationElementType>,
         state: Box<WildcardTypeDeserializerState>,
@@ -13237,7 +13222,7 @@ pub mod quick_xml_deserialize {
         {
             let mut id: Option<String> = None;
             let mut namespace: Option<super::NamespaceListType> = None;
-            let mut not_namespace: Option<super::NotNamespaceType> = None;
+            let mut not_namespace: Option<super::BasicNamespaceListType> = None;
             let mut process_contents: Option<super::ProcessContentsType> = None;
             for attrib in filter_xmlns_attributes(&bytes_start) {
                 let attrib = attrib?;
@@ -16347,7 +16332,7 @@ pub mod quick_xml_deserialize {
     pub struct AnyAttributeElementTypeDeserializer {
         id: Option<String>,
         namespace: Option<super::NamespaceListType>,
-        not_namespace: Option<super::NotNamespaceType>,
+        not_namespace: Option<super::BasicNamespaceListType>,
         process_contents: super::ProcessContentsType,
         not_q_name: Option<super::QnameListAType>,
         annotation: Option<super::AnnotationElementType>,
@@ -16367,7 +16352,7 @@ pub mod quick_xml_deserialize {
         {
             let mut id: Option<String> = None;
             let mut namespace: Option<super::NamespaceListType> = None;
-            let mut not_namespace: Option<super::NotNamespaceType> = None;
+            let mut not_namespace: Option<super::BasicNamespaceListType> = None;
             let mut process_contents: Option<super::ProcessContentsType> = None;
             let mut not_q_name: Option<super::QnameListAType> = None;
             for attrib in filter_xmlns_attributes(&bytes_start) {
@@ -16829,7 +16814,7 @@ pub mod quick_xml_deserialize {
     pub struct AnyElementTypeDeserializer {
         id: Option<String>,
         namespace: Option<super::NamespaceListType>,
-        not_namespace: Option<super::NotNamespaceType>,
+        not_namespace: Option<super::BasicNamespaceListType>,
         process_contents: super::ProcessContentsType,
         not_q_name: Option<super::QnameListType>,
         min_occurs: usize,
@@ -16851,7 +16836,7 @@ pub mod quick_xml_deserialize {
         {
             let mut id: Option<String> = None;
             let mut namespace: Option<super::NamespaceListType> = None;
-            let mut not_namespace: Option<super::NotNamespaceType> = None;
+            let mut not_namespace: Option<super::BasicNamespaceListType> = None;
             let mut process_contents: Option<super::ProcessContentsType> = None;
             let mut not_q_name: Option<super::QnameListType> = None;
             let mut min_occurs: Option<usize> = None;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<tns:Name xmlns:tns="http://example.com">string</tns:Name>`