oapi-codegen
diff --git a/‎internal/test/issues/issue-1362/issue1362.gen.go‎
Lines changed: 1 addition & 3 deletions b/‎internal/test/issues/issue-1362/issue1362.gen.go‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎internal/test/issues/issue-1572/issue1572.gen.go‎
Lines changed: 1 addition & 3 deletions b/‎internal/test/issues/issue-1572/issue1572.gen.go‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎pkg/codegen/codegen.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/codegen/codegen.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/codegen/schema.go‎
Lines changed: 21 additions & 1 deletion b/‎pkg/codegen/schema.go‎
Lines changed: 21 additions & 1 deletion
@@ -521,7 +521,7 @@ func GenerateTypesForSchemas(t *template.Template, schemas map[string]*openapi3.
 		}
 		schemaRef := schemas[schemaName]
 
-		goSchema, err := GenerateGoSchema(schemaRef, []string{schemaName})
+		goSchema, err := GenerateGoSchema(schemaRef, []string{schemaName}, true)
 		if err != nil {
 			return nil, fmt.Errorf("error converting Schema %s to Go type: %w", schemaName, err)
 		}
 
@@ -232,7 +232,7 @@ func PropertiesEqual(a, b Property) bool {
 	return a.JsonFieldName == b.JsonFieldName && a.Schema.TypeDecl() == b.Schema.TypeDecl() && a.Required == b.Required
 }
 
-func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
+func GenerateGoSchema(sref *openapi3.SchemaRef, path []string, fixedField ...bool) (Schema, error) {
 	// Add a fallback value in case the sref is nil.
 	// i.e. the parent schema defines a type:array, but the array has
 	// no items defined. Therefore, we have at least valid Go-Code.
@@ -242,6 +242,26 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 
 	schema := sref.Value
 
+	// Uses a vardic to maintain the same function signature and to avoid updating all invocations.
+	// Defaults to fixedField = false
+	if len(fixedField) == 0 || !fixedField[0] {
+		// If the reference is the same as one in the schema components fixed fields use the same
+		// type to avoid generation of anonymous structures as much as possible.
+		if refPath, match := openapi3.ReferencesComponentInRootDocument(globalState.spec, sref); match {
+			refType, err := RefPathToGoType(refPath)
+			if err != nil {
+				return Schema{}, fmt.Errorf("error turning reference (%s) matched %s into a Go type: %s",
+					sref.Ref, refPath, err)
+			}
+			return Schema{
+				GoType:         refType,
+				Description:    schema.Description,
+				DefineViaAlias: true,
+				OAPISchema:     schema,
+			}, nil
+		}
+	}
+
 	// If Ref is set on the SchemaRef, it means that this type is actually a reference to
 	// another type. We're not de-referencing, so simply use the referenced type.
 	if IsGoTypeReference(sref.Ref) {
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ func GenerateTypesForSchemas(t template.Template, schemas map[string]openapi3.`
`521`	`521`	`}`
`522`	`522`	`schemaRef := schemas[schemaName]`
`523`	`523`
`524`		`- goSchema, err := GenerateGoSchema(schemaRef, []string{schemaName})`
	`524`	`+ goSchema, err := GenerateGoSchema(schemaRef, []string{schemaName}, true)`
`525`	`525`	`if err != nil {`
`526`	`526`	`return nil, fmt.Errorf("error converting Schema %s to Go type: %w", schemaName, err)`
`527`	`527`	`}`