feat: Detect circular references more accurately

tefra · Mar 9, 2024 · d1bbb50 · d1bbb50
1 parent 3beda15
commit d1bbb50
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 85 deletions.
diff --git a/output/instances/saxonData/Open/open005.v1.py b/output/instances/saxonData/Open/open005.v1.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.open.open006_xsd.open006 import Doc
+from output.models.saxon_data.open.open005_xsd.open005 import Doc
 from xsdata.formats.dataclass.models.generics import AnyElement
 
 

diff --git a/output/instances/saxonData/Open/open005.v2.py b/output/instances/saxonData/Open/open005.v2.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.open.open006_xsd.open006 import Doc
+from output.models.saxon_data.open.open005_xsd.open005 import Doc
 from xsdata.formats.dataclass.models.generics import AnyElement
 
 

diff --git a/output/instances/saxonData/Open/open005.v3.py b/output/instances/saxonData/Open/open005.v3.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.open.open006_xsd.open006 import Doc
+from output.models.saxon_data.open.open005_xsd.open005 import Doc
 from xsdata.formats.dataclass.models.generics import AnyElement
 
 

diff --git a/output/instances/saxonData/Open/open005.v4.py b/output/instances/saxonData/Open/open005.v4.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.open.open006_xsd.open006 import Doc
+from output.models.saxon_data.open.open005_xsd.open005 import Doc
 
 
 obj = Doc(

diff --git a/output/instances/saxonData/Override/over001.v01.py b/output/instances/saxonData/Override/over001.v01.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.override.over023_xsd.over023 import Doc
+from output.models.saxon_data.override.over001_xsd.over001 import Doc
 from xsdata.models.datatype import XmlDate
 
 

diff --git a/output/instances/saxonData/VC/vc001.n1.py b/output/instances/saxonData/VC/vc001.n1.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.vc.vc024_xsd.vc024 import Temp
+from output.models.saxon_data.vc.vc001_xsd.vc001 import Temp
 
 
 obj = Temp(

diff --git a/output/instances/saxonData/VC/vc001.v1.py b/output/instances/saxonData/VC/vc001.v1.py
@@ -1,4 +1,4 @@
-from output.models.saxon_data.vc.vc008_xsd.vc008 import Temp
+from output.models.saxon_data.vc.vc001_xsd.vc001 import Temp
 
 
 obj = Temp(

diff --git a/output/models/ibm_data/valid/d4_3_15/d4_3_15v14_xsd/d4_3_15v14.py b/output/models/ibm_data/valid/d4_3_15/d4_3_15v14_xsd/d4_3_15v14.py
@@ -3,50 +3,50 @@
 
 
 @dataclass
-class ElementType1:
+class RootType:
     class Meta:
-        name = "elementType1"
+        name = "rootType"
 
-    sub_element1: List["RootType"] = field(
+    ele1: List["ElementType1"] = field(
         default_factory=list,
         metadata={
-            "name": "subElement1",
             "type": "Element",
             "namespace": "",
         },
     )
-
-
-@dataclass
-class ElementType2:
-    class Meta:
-        name = "elementType2"
-
-    sub_element2: List["RootType"] = field(
+    ele2: List["ElementType2"] = field(
         default_factory=list,
         metadata={
-            "name": "subElement2",
             "type": "Element",
             "namespace": "",
         },
     )
 
 
 @dataclass
-class RootType:
+class ElementType1:
     class Meta:
-        name = "rootType"
+        name = "elementType1"
 
-    ele1: List[ElementType1] = field(
+    sub_element1: List[RootType] = field(
         default_factory=list,
         metadata={
+            "name": "subElement1",
             "type": "Element",
             "namespace": "",
         },
     )
-    ele2: List[ElementType2] = field(
+
+
+@dataclass
+class ElementType2:
+    class Meta:
+        name = "elementType2"
+
+    sub_element2: List[RootType] = field(
         default_factory=list,
         metadata={
+            "name": "subElement2",
             "type": "Element",
             "namespace": "",
         },

diff --git a/output/models/ibm_data/valid/d4_3_15/d4_3_15v15_xsd/d4_3_15v15.py b/output/models/ibm_data/valid/d4_3_15/d4_3_15v15_xsd/d4_3_15v15.py
@@ -3,40 +3,40 @@
 
 
 @dataclass
-class ElementType1:
+class RootType:
     class Meta:
-        name = "elementType1"
+        name = "rootType"
 
-    sub_element1: List["RootType"] = field(
+    ele1: List["ElementType1"] = field(
         default_factory=list,
         metadata={
-            "name": "subElement1",
             "type": "Element",
             "namespace": "",
         },
     )
-    attr1: Optional[str] = field(
-        default=None,
+    ele2: List["ElementType2"] = field(
+        default_factory=list,
         metadata={
-            "type": "Attribute",
+            "type": "Element",
+            "namespace": "",
         },
     )
 
 
 @dataclass
-class ElementType2:
+class ElementType1:
     class Meta:
-        name = "elementType2"
+        name = "elementType1"
 
-    sub_element2: List["RootType"] = field(
+    sub_element1: List[RootType] = field(
         default_factory=list,
         metadata={
-            "name": "subElement2",
+            "name": "subElement1",
             "type": "Element",
             "namespace": "",
         },
     )
-    attr2: Optional[str] = field(
+    attr1: Optional[str] = field(
         default=None,
         metadata={
             "type": "Attribute",
@@ -45,22 +45,22 @@ class Meta:
 
 
 @dataclass
-class RootType:
+class ElementType2:
     class Meta:
-        name = "rootType"
+        name = "elementType2"
 
-    ele1: List[ElementType1] = field(
+    sub_element2: List[RootType] = field(
         default_factory=list,
         metadata={
+            "name": "subElement2",
             "type": "Element",
             "namespace": "",
         },
     )
-    ele2: List[ElementType2] = field(
-        default_factory=list,
+    attr2: Optional[str] = field(
+        default=None,
         metadata={
-            "type": "Element",
-            "namespace": "",
+            "type": "Attribute",
         },
     )
 

diff --git a/output/models/saxon_data/override/over030_xsd/over030a.py b/output/models/saxon_data/override/over030_xsd/over030a.py
@@ -135,47 +135,6 @@ class Meta:
         namespace = "http://example.org/ns/document"
 
 
-@dataclass
-class Blockquote:
-    class Meta:
-        name = "blockquote"
-        namespace = "http://example.org/ns/document"
-
-    title: Optional[Title] = field(
-        default=None,
-        metadata={
-            "type": "Element",
-        },
-    )
-    p: Optional["P"] = field(
-        default=None,
-        metadata={
-            "type": "Element",
-            "required": True,
-        },
-    )
-    role: Optional[object] = field(
-        default=None,
-        metadata={
-            "type": "Attribute",
-        },
-    )
-    id: Optional[str] = field(
-        default=None,
-        metadata={
-            "type": "Attribute",
-            "namespace": "http://www.w3.org/XML/1998/namespace",
-        },
-    )
-    base: Optional[str] = field(
-        default=None,
-        metadata={
-            "type": "Attribute",
-            "namespace": "http://www.w3.org/XML/1998/namespace",
-        },
-    )
-
-
 @dataclass
 class ParaType:
     class Meta:
@@ -240,7 +199,7 @@ class Meta:
                 },
                 {
                     "name": "blockquote",
-                    "type": Blockquote,
+                    "type": Type["Blockquote"],
                     "namespace": "http://example.org/ns/document",
                 },
             ),
@@ -255,6 +214,47 @@ class Meta:
         namespace = "http://example.org/ns/document"
 
 
+@dataclass
+class Blockquote:
+    class Meta:
+        name = "blockquote"
+        namespace = "http://example.org/ns/document"
+
+    title: Optional[Title] = field(
+        default=None,
+        metadata={
+            "type": "Element",
+        },
+    )
+    p: Optional[P] = field(
+        default=None,
+        metadata={
+            "type": "Element",
+            "required": True,
+        },
+    )
+    role: Optional[object] = field(
+        default=None,
+        metadata={
+            "type": "Attribute",
+        },
+    )
+    id: Optional[str] = field(
+        default=None,
+        metadata={
+            "type": "Attribute",
+            "namespace": "http://www.w3.org/XML/1998/namespace",
+        },
+    )
+    base: Optional[str] = field(
+        default=None,
+        metadata={
+            "type": "Attribute",
+            "namespace": "http://www.w3.org/XML/1998/namespace",
+        },
+    )
+
+
 @dataclass
 class Doc:
     class Meta: