Fix: Update local type alias naming scheme to prevent conflicts with …

…object field types (#626) Update local type alias naming scheme to prevent conflicts with object field types
palantir · Nov 7, 2024 · 343b326 · 343b326
1 parent b755e77
commit 343b326
Show file tree

Hide file tree

Showing 17 changed files with 284 additions and 133 deletions.
diff --git a/changelog/@unreleased/pr-626.v2.yml b/changelog/@unreleased/pr-626.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Update local type alias naming scheme to prevent conflicts with object
+    field types
+  links:
+  - https://github.com/palantir/conjure-go/pull/626
diff --git a/conjure-api/conjure/spec/structs.conjure.go b/conjure-api/conjure/spec/structs.conjure.go
diff --git a/conjure-go-verifier/conjure/verification/server/structs.conjure.go b/conjure-go-verifier/conjure/verification/server/structs.conjure.go
diff --git a/conjure-go-verifier/conjure/verification/types/structs.conjure.go b/conjure-go-verifier/conjure/verification/types/structs.conjure.go
diff --git a/conjure/objectwriter.go b/conjure/objectwriter.go
@@ -52,7 +52,8 @@ func writeObjectType(file *jen.Group, objectDef *types.ObjectType) {
 	// If there are no collections, we can defer to the default json behavior
 	// Otherwise we need to override MarshalJSON and UnmarshalJSON
 	if containsCollection {
-		tmpAliasName := objectDef.Name + "Alias"
+		// We use this prefix to ensure that the resulting type alias does not conflict with any of the types in the object's fields, which will always be exported.
+		tmpAliasName := "_tmp" + objectDef.Name
 		// Declare MarshalJSON
 		file.Add(snip.MethodMarshalJSON(objReceiverName, objectDef.Name).BlockFunc(func(methodBody *jen.Group) {
 			writeStructMarshalInitDecls(methodBody, objectDef.Fields, objReceiverName)