Merge pull request hooklift#143 from amuttsch/feature/improved-type-h…

…andling Handle default type in attribute and handle lists in simple types in
stormvirux · May 30, 2019 · ca42ca0 · ca42ca0
2 parents 9dc92ee + 257a49c
commit ca42ca0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/types_tmpl.go b/types_tmpl.go
@@ -42,7 +42,11 @@ var typesTmpl = `
 {{define "Attributes"}}
 	{{range .}}
 		{{if .Doc}} {{.Doc | comment}} {{end}}
-		{{ .Name | makeFieldPublic}} {{toGoType .Type}} ` + "`" + `xml:"{{.Name}},attr,omitempty"` + "`" + `
+		{{ if ne .Type "" }}
+			{{ .Name | makeFieldPublic}} {{toGoType .Type}} ` + "`" + `xml:"{{.Name}},attr,omitempty"` + "`" + `
+		{{ else }}
+			{{ .Name | makeFieldPublic}} string ` + "`" + `xml:"{{.Name}},attr,omitempty"` + "`" + `
+		{{ end }}
 	{{end}}
 {{end}}
 
@@ -76,7 +80,11 @@ var typesTmpl = `
 		{{if not .Type}}
 			{{if .SimpleType}}
 				{{if .Doc}} {{.Doc | comment}} {{end}}
-				{{ .Name | makeFieldPublic}} {{toGoType .SimpleType.Restriction.Base}} ` + "`" + `xml:"{{.Name}},omitempty"` + "`" + `
+				{{if ne .SimpleType.List.ItemType ""}}
+					{{ .Name | makeFieldPublic}} []{{toGoType .SimpleType.List.ItemType}} ` + "`" + `xml:"{{.Name}},omitempty"` + "`" + `
+				{{else}}
+					{{ .Name | makeFieldPublic}} {{toGoType .SimpleType.Restriction.Base}} ` + "`" + `xml:"{{.Name}},omitempty"` + "`" + `
+				{{end}}
 			{{else}}
 				{{template "ComplexTypeInline" .}}
 			{{end}}