This fixes #47, support plural items on max occurs on sequence elements (#97)

Author: wiegell

parser.go

@@ -42,6 +42,7 @@ type Options struct {
 	InGroup          int
 	InUnion          bool
 	InAttributeGroup bool
+	InPluralSequence []bool
 
 	SimpleType     *Stack
 	ComplexType    *Stack

test/c/base64.xsd.h

@@ -34,6 +34,21 @@ typedef struct {
 	char OriginAttr; // attr
 } MyType7;
 
+// MyType8 ...
+typedef struct {
+	MyType4 Title[];
+} MyType8;
+
+// MyType9 ...
+typedef struct {
+	MyType4 Title[];
+} MyType9;
+
+// MyType10 ...
+typedef struct {
+	MyType4 Title;
+} MyType10;
+
 // TopLevel ...
 typedef struct {
 	float CostAttr; // attr, optional

test/go/base64.xsd.go

@@ -68,6 +68,24 @@ public class MyType7 {
 	protected String value;
 }
 
+// MyType8 ...
+public class MyType8 {
+	@XmlElement(required = true, name = "title")
+	protected List<MyType4> Title;
+}
+
+// MyType9 ...
+public class MyType9 {
+	@XmlElement(required = true, name = "title")
+	protected List<MyType4> Title;
+}
+
+// MyType10 ...
+public class MyType10 {
+	@XmlElement(required = true, name = "title")
+	protected MyType4 Title;
+}
+
 // TopLevel ...
 public class TopLevel extends MyType6  {
 	@XmlAttribute(name = "cost")

test/java/base64.xsd.java

@@ -74,6 +74,30 @@ pub struct MyType7 {
 }
 
 
+// MyType8 ...
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+pub struct MyType8 {
+	#[serde(rename = "title")]
+	pub title: Vec<MyType4>,
+}
+
+
+// MyType9 ...
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+pub struct MyType9 {
+	#[serde(rename = "title")]
+	pub title: Vec<MyType4>,
+}
+
+
+// MyType10 ...
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+pub struct MyType10 {
+	#[serde(rename = "title")]
+	pub title: MyType4,
+}
+
+
 // TopLevel ...
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 pub struct TopLevel {

test/rs/base64.xsd.rs

@@ -37,6 +37,21 @@ export class MyType7 {
 	Value: string;
 }
 
+// MyType8 ...
+export class MyType8 {
+	Title: Array<MyType4>;
+}
+
+// MyType9 ...
+export class MyType9 {
+	Title: Array<MyType4>;
+}
+
+// MyType10 ...
+export class MyType10 {
+	Title: MyType4;
+}
+
 // TopLevel ...
 export class TopLevel extends MyType6  {
 	CostAttr: number | null;

test/ts/base64.xsd.ts

@@ -53,6 +53,24 @@
     </simpleContent>
   </complexType>
 
+  <complexType name="MyType8">
+    <sequence maxOccurs="unbounded">
+      <element name="title" type="here:myType4" />
+    </sequence>
+  </complexType>
+
+  <complexType name="MyType9">
+    <sequence maxOccurs="2">
+      <element name="title" type="here:myType4" />
+    </sequence>
+  </complexType>
+
+  <complexType name="MyType10">
+    <sequence maxOccurs="1">
+      <element name="title" type="here:myType4" />
+    </sequence>
+  </complexType>
+
   <element name="TopLevel">
     <complexType>
       <complexContent>

test/xsd/base64.xsd

@@ -59,6 +59,10 @@ func (opt *Options) OnElement(ele xml.StartElement, protoTree []interface{}) (er
 		}
 	}
 
+	if len(opt.InPluralSequence) > 0 && opt.InPluralSequence[len(opt.InPluralSequence)-1] {
+		e.Plural = true
+	}
+
 	alreadyPushedElement := false
 	if e.Type == "" {
 		e.Type, err = opt.GetValueType(e.Name, protoTree)

xmlElement.go

@@ -0,0 +1,41 @@
+// Copyright 2020 - 2024 The xgen Authors. All rights reserved. Use of this
+// source code is governed by a BSD-style license that can be found in the
+// LICENSE file.
+//
+// Package xgen written in pure Go providing a set of functions that allow you
+// to parse XSD (XML schema files). This library needs Go version 1.10 or
+// later.
+
+package xgen
+
+import (
+	"encoding/xml"
+	"strconv"
+)
+
+// OnSequence evaluates wether the sequence element contains a maxOccurs attribute
+// (that in turn mandates plural inner elements) and saves that info on a stack
+func (opt *Options) OnSequence(ele xml.StartElement, protoTree []interface{}) (err error) {
+	for _, attr := range ele.Attr {
+		if attr.Name.Local == "maxOccurs" {
+			if attr.Value == "unbounded" {
+				opt.InPluralSequence = append(opt.InPluralSequence, true)
+				return nil
+			}
+
+			var maxOccurs int
+			if maxOccurs, err = strconv.Atoi(attr.Value); err == nil && maxOccurs > 1 {
+				opt.InPluralSequence = append(opt.InPluralSequence, true)
+				return nil
+			}
+		}
+	}
+	opt.InPluralSequence = append(opt.InPluralSequence, false)
+	return nil
+}
+
+// EndSequence removes an item from the stack mentioned above
+func (opt *Options) EndSequence(ele xml.EndElement, protoTree []interface{}) (err error) {
+	opt.InPluralSequence = opt.InPluralSequence[:len(opt.InPluralSequence)-1]
+	return
+}