Fix schema gathering oversight

mromaszewicz · mromaszewicz · commit 8107da4477c5 · 2026-02-13T08:28:28.000-08:00
Response and RequestBodies need to include any additional types
into model generation
diff --git a/internal/test/name_conflict_resolution/name_conflict_resolution.gen.go b/internal/test/name_conflict_resolution/name_conflict_resolution.gen.go
diff --git a/internal/test/name_conflict_resolution/name_conflict_resolution_test.go b/internal/test/name_conflict_resolution/name_conflict_resolution_test.go
@@ -213,6 +213,16 @@ func TestRequestBodyVsSchema(t *testing.T) {
 	assert.Equal(t, "Fluffy", *petReqBody.Name)
 	assert.Equal(t, "cat", *petReqBody.Species)
 
+	// Inline nested object with additionalProperties in the requestBody
+	// must produce a named AdditionalType (not get silently dropped).
+	reqBodyOwner := Pet_Owner{
+		Name:                 ptr("Alice"),
+		Phone:                ptr("555-1234"),
+		AdditionalProperties: map[string]string{"email": "alice@example.com"},
+	}
+	assert.Equal(t, "Alice", *reqBodyOwner.Name)
+	assert.Equal(t, "alice@example.com", reqBodyOwner.AdditionalProperties["email"])
+
 	// CreatePet wrapper doesn't collide (unique name CreatePetResponse)
 	var wrapper CreatePetResponse
 	assert.Nil(t, wrapper.JSON200)
@@ -311,6 +321,17 @@ func TestInlineResponseWithRefProperties(t *testing.T) {
 	// pointing to the inline response type.
 	var wrapper ListEntitiesResponse
 	assert.Nil(t, wrapper.JSON200)
+
+	// Inline nested object with additionalProperties in the response
+	// must produce a named AdditionalType (not get silently dropped).
+	pagination := ListEntities_200_Pagination{
+		Page:                 ptr(1),
+		TotalPages:           ptr(10),
+		AdditionalProperties: map[string]string{"cursor": "abc123"},
+	}
+	assert.Equal(t, 1, *pagination.Page)
+	assert.Equal(t, 10, *pagination.TotalPages)
+	assert.Equal(t, "abc123", pagination.AdditionalProperties["cursor"])
 }
 
 func ptr[T any](v T) *T {
diff --git a/internal/test/name_conflict_resolution/spec.yaml b/internal/test/name_conflict_resolution/spec.yaml
@@ -171,6 +171,15 @@ paths:
                       $ref: '#/components/schemas/Widget'
                   metadata:
                     $ref: '#/components/schemas/Metadata'
+                  pagination:
+                    type: object
+                    properties:
+                      page:
+                        type: integer
+                      totalPages:
+                        type: integer
+                    additionalProperties:
+                      type: string
 
   # Cross-section: requestBody vs schema (issues #254, #407)
   # "Pet" appears in both schemas and requestBodies.
@@ -338,6 +347,15 @@ components:
                 type: string
               species:
                 type: string
+              owner:
+                type: object
+                properties:
+                  name:
+                    type: string
+                  phone:
+                    type: string
+                additionalProperties:
+                  type: string
 
   headers:
     Bar:
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
@@ -733,6 +733,7 @@ func GenerateTypesForResponses(t *template.Template, responses openapi3.Response
 			}
 
 			types = append(types, typeDef)
+			types = append(types, goType.AdditionalTypes...)
 		}
 	}
 	return types, nil
@@ -784,6 +785,7 @@ func GenerateTypesForRequestBodies(t *template.Template, bodies map[string]*open
 				typeDef.TypeName = SchemaNameToTypeName(refType)
 			}
 			types = append(types, typeDef)
+			types = append(types, goType.AdditionalTypes...)
 		}
 	}
 	return types, nil

Original file line number	Diff line number	Diff line change
`@@ -733,6 +733,7 @@ func GenerateTypesForResponses(t *template.Template, responses openapi3.Response`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`types = append(types, typeDef)`
	`736`	`+ types = append(types, goType.AdditionalTypes...)`
`736`	`737`	`}`
`737`	`738`	`}`
`738`	`739`	`return types, nil`
`@@ -784,6 +785,7 @@ func GenerateTypesForRequestBodies(t template.Template, bodies map[string]open`
`784`	`785`	`typeDef.TypeName = SchemaNameToTypeName(refType)`
`785`	`786`	`}`
`786`	`787`	`types = append(types, typeDef)`
	`788`	`+ types = append(types, goType.AdditionalTypes...)`
`787`	`789`	`}`
`788`	`790`	`}`
`789`	`791`	`return types, nil`