make types in union deterministic (#1855)

lolopinto · Nov 18, 2024 · 242adad · 242adad · Swahvay · Nov 21, 2024
1 parent f004b22
commit 242adad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/examples/simple/src/graphql/generated/resolvers/contact_item_result_type.ts b/examples/simple/src/graphql/generated/resolvers/contact_item_result_type.ts
diff --git a/examples/simple/src/graphql/generated/resolvers/feedback_type.ts b/examples/simple/src/graphql/generated/resolvers/feedback_type.ts
diff --git a/examples/simple/src/graphql/generated/resolvers/with_day_of_week_type.ts b/examples/simple/src/graphql/generated/resolvers/with_day_of_week_type.ts
diff --git a/internal/graphql/custom_ts.go b/internal/graphql/custom_ts.go
@@ -3,6 +3,7 @@ package graphql
 import (
 	"fmt"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"github.com/lolopinto/ent/internal/codegen"
@@ -1090,6 +1091,8 @@ func processCustomUnions(processor *codegen.Processor, cd *CustomData, s *gqlSch
 
 		unionTypes := make([]string, len(union.UnionTypes))
 		imports := make([]*tsimport.ImportPath, len(union.UnionTypes))
+		// sort to make sure it's deterministic
+		sort.Strings(union.UnionTypes)
 		for i, unionType := range union.UnionTypes {
 			unionTypes[i] = fmt.Sprintf("%sType", unionType)
 			imports[i] = tsimport.NewLocalGraphQLEntImportPath(unionType)

diff --git a/internal/graphql/generate_ts_code.go b/internal/graphql/generate_ts_code.go
@@ -1670,6 +1670,8 @@ func buildGQLSchema(processor *codegen.Processor) chan *buildGQLSchemaResult {
 
 				unionTypes := make([]string, len(nodeNames))
 				imports := make([]*tsimport.ImportPath, len(nodeNames))
+				// sort for deterministic output
+				sort.Strings(nodeNames)
 				for i, nodeName := range nodeNames {
 					unionTypes[i] = fmt.Sprintf("%sType", nodeName)
 					imports[i] = tsimport.NewLocalGraphQLEntImportPath(nodeName)