Support group-as/@in-xml on assemblies

GoComply · Sep 21, 2020 · 2f83b20 · 2f83b20
1 parent 879b7e9
commit 2f83b20
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/metaschema/parser/main.go b/metaschema/parser/main.go
@@ -290,6 +290,20 @@ func (a *Assembly) IndexBy() string {
 	return strcase.ToCamel(a.Def.JsonKey.FlagName)
 }
 
+func (a *Assembly) XmlGroupping() string {
+	if a.GroupAs == nil {
+		return ""
+	}
+	if a.GroupAs.InXml == "UNGROUPED" || a.GroupAs.InXml == "" {
+		return ""
+	}
+	if a.GroupAs.InXml == "GROUPED" {
+		return a.GroupAs.Name + ">"
+	}
+	panic("Not implemented group-as/@in-xml=" + a.GroupAs.InXml)
+	return ""
+}
+
 type Field struct {
 	Required string `xml:"required,attr"`
 
@@ -418,6 +432,7 @@ type Choice struct {
 type GroupAs struct {
 	Name   string `xml:"name,attr"`
 	InJson string `xml:"in-json,attr"`
+	InXml  string `xml:"in-xml,attr"`
 }
 
 func (ga *GroupAs) SingletonOrArray() bool {

diff --git a/metaschema/templates/generated_models.tmpl b/metaschema/templates/generated_models.tmpl
@@ -23,7 +23,7 @@ type {{.GoTypeName}} struct {
 
     {{- range .Model.Assembly}}
       // {{ .GoComment }}
-      {{.GoName}} {{.GoMemLayout}}{{.GoTypeNameMultiplexed}} `xml:"{{.XmlName}},omitempty" json:"{{.JsonName}},omitempty"`
+      {{.GoName}} {{.GoMemLayout}}{{.GoTypeNameMultiplexed}} `xml:"{{.XmlGroupping}}{{.XmlName}},omitempty" json:"{{.JsonName}},omitempty"`
     {{- end}}
 
   {{- range .Model.Choice}}

diff --git a/metaschema/templates/pkged.go b/metaschema/templates/pkged.go