Fix GoComply#129

nettnikl · Aug 23, 2024 · e932368 · e932368
1 parent a193ea3
commit e932368
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/pkg/xsd/schema.go b/pkg/xsd/schema.go
@@ -162,8 +162,22 @@ func (sch *Schema) encodingXmlImportNeeded() bool {
 	return len(sch.Elements) != 0 || len(sch.ComplexTypes) != 0
 }
 
+func deduplicateElementsLossfree(elements []Element) []Element {
+	seen := make(map[string]int, len(elements))
+	for j, element := range elements {
+		dupeCount, dupe := seen[element.GoName()]
+		if !dupe {
+			seen[element.GoName()] = 1
+			continue
+		}
+		elements[j].nameOverride = fmt.Sprintf("%s-%d", element.GoName(), dupeCount)
+		seen[element.GoName()]++
+	}
+	return elements
+}
+
 func (sch *Schema) ExportableElements() []Element {
-	return append(sch.Elements, sch.inlinedElements...)
+	return deduplicateElementsLossfree(append(sch.Elements, sch.inlinedElements...))
 }
 
 func (sch *Schema) ExportableComplexTypes() []ComplexType {

diff --git a/tests/xsd-examples/valid/issue129.xsd.out b/tests/xsd-examples/valid/issue129.xsd.out
@@ -14,7 +14,7 @@ type List struct {
 }
 
 // Element
-type List struct {
+type List1 struct {
 	XMLName xml.Name `xml:"List"`
 
 	Ddd []int `xml:",any"`