Improve output of cmd/generate-fix

Signed-off-by: Sylvain Rabot <[email protected]>

Author: sylr

cmd/generate-fix/internal/template_helpers.go

@@ -77,30 +77,41 @@ func checkFieldTimeRequired(f *datadictionary.FieldDef) (required bool, err erro
 	return
 }
 
-func collectExtraImports(m *datadictionary.MessageDef) (imports []string, err error) {
-	var timeRequired, decimalRequired bool
+func collectStandardImports(m *datadictionary.MessageDef) (imports []string, err error) {
+	var timeRequired bool
 	for _, f := range m.Fields {
 		if !timeRequired {
 			if timeRequired, err = checkFieldTimeRequired(f); err != nil {
 				return
 			}
 		}
 
+		if timeRequired {
+			break
+		}
+	}
+
+	if timeRequired {
+		imports = append(imports, "time")
+	}
+
+	return
+}
+
+func collectExtraImports(m *datadictionary.MessageDef) (imports []string, err error) {
+	var decimalRequired bool
+	for _, f := range m.Fields {
 		if !decimalRequired {
 			if decimalRequired, err = checkFieldDecimalRequired(f); err != nil {
 				return
 			}
 		}
 
-		if decimalRequired && timeRequired {
+		if decimalRequired {
 			break
 		}
 	}
 
-	if timeRequired {
-		imports = append(imports, "time")
-	}
-
 	if decimalRequired {
 		imports = append(imports, "github.com/shopspring/decimal")
 	}
@@ -180,7 +191,7 @@ func quickfixType(field *datadictionary.FieldType) (quickfixType string, err err
 		fallthrough
 	case "MONTHYEAR":
 		fallthrough
-	case "LOCALMKTDATE":
+	case "LOCALMKTTIME", "LOCALMKTDATE":
 		fallthrough
 	case "TIME":
 		fallthrough
@@ -204,6 +215,8 @@ func quickfixType(field *datadictionary.FieldType) (quickfixType string, err err
 		fallthrough
 	case "TZTIMESTAMP":
 		fallthrough
+	case "XID", "XIDREF":
+		fallthrough
 	case "STRING":
 		quickfixType = "FIXString"
 
@@ -218,6 +231,8 @@ func quickfixType(field *datadictionary.FieldType) (quickfixType string, err err
 		fallthrough
 	case "SEQNUM":
 		fallthrough
+	case "TAGNUM":
+		fallthrough
 	case "INT":
 		quickfixType = "FIXInt"
 

cmd/generate-fix/internal/templates.go

@@ -24,6 +24,7 @@ func init() {
 		"quickfixType":                          quickfixType,
 		"quickfixValueType":                     quickfixValueType,
 		"getGlobalFieldType":                    getGlobalFieldType,
+		"collectStandardImports":                collectStandardImports,
 		"collectExtraImports":                   collectExtraImports,
 		"checkIfDecimalImportRequiredForFields": checkIfDecimalImportRequiredForFields,
 		"checkIfEnumImportRequired":             checkIfEnumImportRequired,
@@ -111,7 +112,14 @@ func ({{ template "receiver" }} {{ $.Name }}) Has{{ .Name}}() bool {
 
 {{ define "group_template" }}
 quickfix.GroupTemplate{
-{{- range $index, $field := . }}{{if $index}},{{end}}{{if $field.IsGroup }}New{{ $field.Name }}RepeatingGroup(){{else}}quickfix.GroupElement(tag.{{$field.Name}}){{ end }}{{ end }} }
+{{- range $index, $field := . }}
+	{{- if $field.IsGroup }}
+	New{{ $field.Name }}RepeatingGroup(),
+	{{- else}}
+	quickfix.GroupElement(tag.{{$field.Name}}),
+	{{- end }}
+{{- end }}
+}
 {{- end }}
 
 {{ define "field_args" }}
@@ -139,7 +147,11 @@ type {{ .Name }}RepeatingGroup struct {
 // New{{ .Name }}RepeatingGroup returns an initialized, {{ .Name }}RepeatingGroup.
 func New{{ .Name }}RepeatingGroup() {{ .Name }}RepeatingGroup {
 	return {{ .Name }}RepeatingGroup{
-		quickfix.NewRepeatingGroup(tag.{{ .Name }}, {{ template "group_template" .Fields }})}
+		quickfix.NewRepeatingGroup(
+			tag.{{ .Name }},
+			{{- template "group_template" .Fields }},
+		),
+	}
 }
 
 // Add create and append a new {{ .Name }} to this group.
@@ -160,12 +172,17 @@ func ({{ template "receiver" }} {{ .Name}}RepeatingGroup) Get(i int) {{ .Name }}
 {{ define "receiver" }}h{{ end }}
 package {{ .Package }}
 
-import(
+import (
+	{{- if collectStandardImports .MessageDef }}
+	{{- range collectStandardImports .MessageDef }}
+	"{{ . }}"
+	{{- end }}{{ "\n" }}
+	{{- end }}
+	{{- if collectExtraImports .MessageDef }}
 	{{- range collectExtraImports .MessageDef }}
 	"{{ . }}"
+	{{- end }}{{ "\n" }}
 	{{- end }}
-
-
 	"github.com/quickfixgo/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
@@ -196,11 +213,17 @@ func NewHeader(header *quickfix.Header) (h Header) {
 {{ define "receiver" }}t{{ end }}
 package {{ .Package }}
 
-import(
+import (
+	{{- if collectStandardImports .MessageDef }}
+	{{- range collectStandardImports .MessageDef }}
+	"{{ . }}"
+	{{- end }}{{ "\n" }}
+	{{- end }}
+	{{- if collectExtraImports .MessageDef }}
 	{{- range collectExtraImports .MessageDef }}
 	"{{ . }}"
+	{{- end }}{{ "\n" }}
 	{{- end }}
-
 	"github.com/quickfixgo/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
@@ -224,11 +247,17 @@ type Trailer struct {
 {{ define "receiver" }}m{{ end }}
 package {{ .Package }}
 
-import(
+import (
+	{{- if collectStandardImports .MessageDef }}
+	{{- range collectStandardImports .MessageDef }}
+	"{{ . }}"
+	{{- end }}{{ "\n" }}
+	{{- end }}
+	{{- if collectExtraImports .MessageDef }}
 	{{- range collectExtraImports .MessageDef }}
 	"{{ . }}"
+	{{- end }}{{ "\n" }}
 	{{- end }}
-
 	"github.com/quickfixgo/quickfix"
 	{{- if checkIfEnumImportRequired .MessageDef}}
 	"{{ importRootPath }}/enum"
@@ -296,23 +325,25 @@ func Route(router RouteOut) (string, string, quickfix.MessageRoute) {
 
 	TagTemplate = template.Must(template.New("Tag").Parse(`
 package tag
-import("github.com/quickfixgo/quickfix")
+import "github.com/quickfixgo/quickfix"
 
 const (
 {{- range .}}
-{{ .Name }} quickfix.Tag =  {{ .Tag }}
+{{ .Name }} quickfix.Tag = {{ .Tag }}
 {{- end }}
 )
 	`))
 
 	FieldTemplate = template.Must(template.New("Field").Funcs(tmplFuncs).Parse(`
 package field
-import(
+import (
+	"time"
+
+	{{ if checkIfDecimalImportRequiredForFields . }}"github.com/shopspring/decimal"{{ end }}
+
 	"github.com/quickfixgo/quickfix"
 	"{{ importRootPath }}/enum"
 	"{{ importRootPath }}/tag"
-{{ if checkIfDecimalImportRequiredForFields . }} "github.com/shopspring/decimal" {{ end }}
-	"time"
 )
 
 {{ range . }}