Merge pull request #113 from jackhftang/master

deterministic generation
francoispqt · May 29, 2019 · c53b22c · c53b22c
2 parents e46791d + 8bd2766
commit c53b22c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/gojay/codegen/generator.go b/gojay/codegen/generator.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-
 	"github.com/viant/toolbox"
 )
 
@@ -89,19 +88,24 @@ func (g *Generator) Generate() error {
 
 func (g *Generator) writeCode() error {
 	var generatedCode = []string{}
-	for _, code := range g.pooledObjects {
+
+	for _, key := range sortedKeys(g.pooledObjects) {
+		code := g.pooledObjects[key]
 		generatedCode = append(generatedCode, code)
 	}
 	generatedCode = append(generatedCode, "")
-	for _, code := range g.sliceTypes {
+	for _, key := range sortedKeys(g.sliceTypes) {
+		code := g.sliceTypes[key]
 		generatedCode = append(generatedCode, code)
 	}
 	generatedCode = append(generatedCode, "")
-	for _, code := range g.structTypes {
+	for _, key := range sortedKeys(g.structTypes) {
+		code := g.structTypes[key]
 		generatedCode = append(generatedCode, code)
 	}
 
-	for _, code := range g.poolInit {
+	for _, key := range sortedKeys(g.poolInit) {
+		code := g.poolInit[key]
 		if g.Init != "" {
 			g.Init += "\n"
 		}

diff --git a/gojay/codegen/helper.go b/gojay/codegen/helper.go
@@ -4,6 +4,7 @@ import (
 	"github.com/viant/toolbox"
 	"reflect"
 	"strings"
+	"sort"
 )
 
 func firstLetterToUppercase(text string) string {
@@ -87,3 +88,14 @@ func getJSONKey(options *Options, field *toolbox.FieldInfo) string {
 func normalizeTypeName(typeName string) string {
 	return strings.Replace(typeName, "*", "", strings.Count(typeName, "*"))
 }
+
+func sortedKeys(m map[string]string) ([]string) {
+	keys := make([]string, len(m))
+	i := 0
+	for k := range m {
+		keys[i] = k
+		i++
+	}
+	sort.Strings(keys)
+	return keys
+}