Refactor: Fields should be considered GoStructItems

and use this same abstraction
GoComply · Oct 30, 2020 · 68df5f7 · 68df5f7
1 parent 85398c5
commit 68df5f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/metaschema/parser/field.go b/metaschema/parser/field.go
@@ -79,6 +79,10 @@ func (f *Field) GoTypeName() string {
 	return f.Def.GoTypeName()
 }
 
+func (f *Field) GoTypeNameMultiplexed() string {
+	return f.GoTypeName()
+}
+
 func (f *Field) GoPackageName() string {
 	if f.Ref == "" {
 		return ""

diff --git a/metaschema/parser/main.go b/metaschema/parser/main.go
@@ -95,9 +95,12 @@ type Model struct {
 }
 
 func (m *Model) GoStructItems() []GoStructItem {
-	res := make([]GoStructItem, len(m.Assembly))
+	res := make([]GoStructItem, len(m.Assembly)+len(m.Field))
+	for i, _ := range m.Field {
+		res[i] = &m.Field[i]
+	}
 	for i, _ := range m.Assembly {
-		res[i] = &m.Assembly[i]
+		res[i+len(m.Field)] = &m.Assembly[i]
 	}
 	return res
 }

diff --git a/metaschema/templates/generated_models.tmpl b/metaschema/templates/generated_models.tmpl
@@ -16,11 +16,6 @@ type {{.GoTypeName}} struct {
   {{.GoName}} {{.GoDatatype}} `xml:"{{.XmlName}},attr,omitempty" json:"{{.JsonName}},omitempty"`
 {{- end}}
   {{if .Model}}
-    {{ range .Model.Field}}
-      // {{ .GoComment }}
-      {{.GoName}} {{.GoMemLayout}}{{.GoTypeName}} `xml:"{{.XmlAnnotation}}" json:"{{.JsonName}},omitempty"`
-    {{- end}}
-
     {{- range .Model.GoStructItems}}
       // {{ .GoComment }}
       {{.GoName}} {{.GoMemLayout}}{{.GoTypeNameMultiplexed}} `xml:"{{.XmlAnnotation}}" json:"{{.JsonName}},omitempty"`

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