Subschema improvements (part 2)

pkg/codegen/model.go

@@ -277,7 +277,7 @@ type AliasType struct {
 }
 
 func (p AliasType) Generate(out *Emitter) error {
-	out.Printf("type %s = %s", p.Alias, p.Name)
+	out.Printlnf("type %s = %s", p.Alias, p.Name)
 
 	return nil
 }

pkg/generator/generate.go

@@ -147,6 +147,14 @@ func (g *Generator) AddFile(fileName string, schema *schemas.Schema) error {
 		return err
 	}
 
+	if schema.ID != "" {
+		if _, processed := o.processedSchemas[schema.ID]; processed {
+			return nil
+		}
+
+		o.processedSchemas[schema.ID] = true
+	}
+
 	return newSchemaGenerator(g, schema, fileName, o).generateRootType()
 }
 
@@ -213,6 +221,7 @@ func (g *Generator) beginOutput(
 		declsBySchema:           map[*schemas.Type]*codegen.TypeDecl{},
 		declsByName:             map[string]*codegen.TypeDecl{},
 		unmarshallersByTypeDecl: map[*codegen.TypeDecl]bool{},
+		processedSchemas:        map[string]bool{},
 	}
 	g.outputs[id] = output
 

pkg/generator/output.go

@@ -16,6 +16,7 @@ type output struct {
 	declsByName             map[string]*codegen.TypeDecl
 	declsBySchema           map[*schemas.Type]*codegen.TypeDecl
 	unmarshallersByTypeDecl map[*codegen.TypeDecl]bool
+	processedSchemas        map[string]bool
 	warner                  func(string)
 }
 

pkg/schemas/model.go

@@ -304,6 +304,7 @@ func AnyOf(types []*Type, baseType *Type) (*Type, error) {
 		return nil, err
 	}
 
+	typ.Required = mergeRequiredUnion(types, baseType)
 	typ.subSchemaType = SubSchemaTypeAnyOf
 	typ.subSchemasCount = len(types)
 
@@ -339,6 +340,29 @@ func MergeTypes(types []*Type, baseType *Type) (*Type, error) {
 	return result, nil
 }
 
+func mergeRequiredUnion(types []*Type, baseType *Type) []string {
+	required := make([]string, len(baseType.Required))
+	copy(required, baseType.Required)
+
+	for _, r := range types[0].Required {
+		valid := true
+
+		for _, t := range types {
+			if !slices.Contains(t.Required, r) {
+				valid = false
+
+				break
+			}
+		}
+
+		if valid && !slices.Contains(required, r) {
+			required = append(required, r) //nolint:makezero
+		}
+	}
+
+	return required
+}
+
 func updateAllRefsValues(structValue *reflect.Value, refPath string) error {
 	switch structValue.Kind() { //nolint:exhaustive
 	case reflect.Struct:

tests/unmarshal_json_test.go

@@ -85,8 +85,8 @@ func TestJsonUmarshalAnyOf(t *testing.T) {
 					t,
 					&testAnyOf.AnyOf1{
 						Configurations: []testAnyOf.AnyOf1ConfigurationsElem{
-							{Foo: "hello"},
-							{Bar: 2.2},
+							{Foo: ptr("hello")},
+							{Bar: ptr(2.2)},
 							{Baz: ptr(true)},
 						},
 						Flags: "hello",
@@ -115,8 +115,8 @@ func TestJsonUmarshalAnyOf(t *testing.T) {
 					t,
 					&testAnyOf.AnyOf1{
 						Configurations: []testAnyOf.AnyOf1ConfigurationsElem{
-							{Foo: "ciao"},
-							{Bar: 200.0},
+							{Foo: ptr("ciao")},
+							{Bar: ptr(200.0)},
 						},
 						Flags: true,
 					},
@@ -145,8 +145,8 @@ func TestJsonUmarshalAnyOf(t *testing.T) {
 					t,
 					&testAnyOf.AnyOf2{
 						Configurations: []testAnyOf.AnyOf2ConfigurationsElem{
-							{Foo: "ciao"},
-							{Bar: 2.0},
+							{Foo: ptr("ciao")},
+							{Bar: ptr(2.0)},
 							{Baz: ptr(false)},
 						},
 					},
@@ -162,7 +162,7 @@ func TestJsonUmarshalAnyOf(t *testing.T) {
 				assert.Equal(
 					t,
 					&testAnyOf.AnyOf3{
-						Foo: "ciao",
+						Foo: ptr("ciao"),
 					},
 					target,
 				)
@@ -176,7 +176,7 @@ func TestJsonUmarshalAnyOf(t *testing.T) {
 				assert.Equal(
 					t,
 					&testAnyOf.AnyOf3{
-						Bar: 2.0,
+						Bar: ptr(2.0),
 					},
 					target,
 				)