From 00bf96bc3d70bcadc0e8551e07ad03f62b77a9c0 Mon Sep 17 00:00:00 2001 From: utherbit Date: Wed, 27 Dec 2023 11:25:07 +0300 Subject: [PATCH] fix(gen): detect conflict when generic is not of the same base type --- gen/schema_gen_sum.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gen/schema_gen_sum.go b/gen/schema_gen_sum.go index 083952c26..a5dbaa8fd 100644 --- a/gen/schema_gen_sum.go +++ b/gen/schema_gen_sum.go @@ -465,10 +465,9 @@ func (g *schemaGen) allOf(name string, schema *jsonschema.Schema) (*ir.Type, err return nil, err } - // Do not modify reference fields, as they may still refer to the original schema. - if mergedSchema.Ref.IsZero() { - mergedSchema.Ref = schema.Ref - } + // The reference field must not change + mergedSchema.Ref = schema.Ref + return g.generate(name, mergedSchema, false) }