fix: use raw enum values for cross-enum conflict detection

natalie-o-perret · natalie-o-perret · commit 00d47d29d988 · 2026-06-01T18:22:15.000+02:00
GetValues() returns prefixed identifier names for enums already marked
as conflicting. Using it in the cross-enum comparison loop makes the
result order-dependent: an enum that was prefixed in an earlier iteration
produces keys like FooStateReady, which no longer match the unprefixed
key Ready in a later enum, so the later enum misses the conflict and
stays unprefixed.

Fix by comparing Schema.EnumValues keys directly, which are always the
raw (unprefixed) Go-safe identifiers regardless of PrefixTypeName state.
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
@@ -1028,8 +1028,10 @@ func GenerateEnums(t *template.Template, types []TypeDefinition) (string, error)
 		for j := i + 1; j < len(enums); j++ {
 			e2 := enums[j]
 
-			for e1key := range e1.GetValues() {
-				_, found := e2.GetValues()[e1key]
+			// Use Schema.EnumValues (always unprefixed) rather than GetValues(),
+			// which returns prefixed names once an enum is already marked.
+			for e1key := range e1.Schema.EnumValues {
+				_, found := e2.Schema.EnumValues[e1key]
 				if found {
 					e1.PrefixTypeName = true
 					e2.PrefixTypeName = true
diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go
@@ -329,5 +329,60 @@ paths:
 	assert.Contains(t, code, "roleName string")
 }
 
+// TestEnumConflictDetectionOrderIndependent checks that conflict detection
+// doesn't miss overlaps because an enum was already marked for prefixing.
+func TestEnumConflictDetectionOrderIndependent(t *testing.T) {
+	// AState+BState share "running" (both prefixed), AState+CState share "migrating".
+	// The bug: once AState was marked, GetValues() returned prefixed names that
+	// no longer matched CState's raw values, so CState's conflict was missed.
+	const spec = `
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Test Enum Conflict Detection
+paths: {}
+components:
+  schemas:
+    AState:
+      type: string
+      enum:
+        - running
+        - migrating
+    BState:
+      type: string
+      enum:
+        - running
+    CState:
+      type: string
+      enum:
+        - migrating
+`
+	loader := openapi3.NewLoader()
+	swagger, err := loader.LoadFromData([]byte(spec))
+	require.NoError(t, err)
+
+	opts := Configuration{
+		PackageName: "api",
+		Generate: GenerateOptions{
+			Models: true,
+		},
+		OutputOptions: OutputOptions{
+			SkipPrune: true,
+		},
+	}
+
+	code, err := Generate(swagger, opts)
+	require.NoError(t, err)
+
+	_, err = format.Source([]byte(code))
+	require.NoError(t, err)
+
+	// All three enums share values with at least one other enum; all must be prefixed.
+	assert.Contains(t, code, "AStateRunning")
+	assert.Contains(t, code, "AStateMigrating")
+	assert.Contains(t, code, "BStateRunning")
+	assert.Contains(t, code, "CStateMigrating")
+}
+
 //go:embed test_spec.yaml
 var testOpenAPIDefinition string
