Merge pull request #276 from Yamashou/fragment-spred

Bug Fragment spred

Author: Yamashou

clientgenv2/source_generator.go

@@ -227,6 +227,39 @@ func NewLayerTypeName(base, thisField string) string {
 	return fmt.Sprintf("%s_%s", cases.Title(language.Und, cases.NoLower).String(base), thisField)
 }
 
+func (r *SourceGenerator) expandFragmentFields(responseFields ResponseFieldList) ResponseFieldList {
+	result := make(ResponseFieldList, 0, len(responseFields))
+	for _, field := range responseFields {
+		if field.IsFragmentSpread {
+			for _, fragmentField := range field.ResponseFields {
+				result = append(result, fragmentField)
+			}
+		} else {
+			result = append(result, field)
+		}
+	}
+	return result
+}
+
+func (r *SourceGenerator) hasFragmentSpread(fields ResponseFieldList) bool {
+	for _, field := range fields {
+		if field.IsFragmentSpread {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *SourceGenerator) collectFragmentFields(fields ResponseFieldList) ResponseFieldList {
+	var fragmentFields ResponseFieldList
+	for _, field := range fields {
+		if field.IsFragmentSpread {
+			fragmentFields = append(fragmentFields, field.ResponseFields...)
+		}
+	}
+	return fragmentFields
+}
+
 func (r *SourceGenerator) NewResponseField(selection ast.Selection, typeName string) *ResponseField {
 	var isOptional bool
 	switch selection := selection.(type) {
@@ -312,24 +345,51 @@ func (r *SourceGenerator) NewResponseField(selection ast.Selection, typeName str
 
 	case *ast.InlineFragment:
 		// InlineFragmentは子要素をそのままstructとしてもつので、ここで、構造体の型を作成します
+		// InlineFragment has child elements, so create a struct type here
 		name := NewLayerTypeName(typeName, templates.ToGo(selection.TypeCondition))
 		fieldsResponseFields := r.NewResponseFields(selection.SelectionSet, name)
 
-		if fieldsResponseFields.IsFragmentSpread() {
+		hasFragmentSpread := r.hasFragmentSpread(fieldsResponseFields)
+		fragmentFields := r.collectFragmentFields(fieldsResponseFields)
+
+		// フラグメントスプレッドがある場合
+		// if there is a fragment spread
+		if hasFragmentSpread {
+			// フラグメントからの全フィールドを集めます
+			// collect all fields from fragment
+			allFields := make(ResponseFieldList, 0)
+			for _, field := range fieldsResponseFields {
+				if !field.IsFragmentSpread {
+					allFields = append(allFields, field)
+				}
+			}
+			// フラグメントのフィールドを追加
+			// append fragment fields
+			allFields = append(allFields, fragmentFields...)
+
+			// 構造体を生成
+			// generate struct
+			structType := allFields.StructType()
+			r.StructSources = append(r.StructSources, &StructSource{
+				Name: name,
+				Type: structType,
+			})
 			typ := types.NewNamed(
-				types.NewTypeName(0, r.client.Pkg(), templates.ToGo(fieldsResponseFields[0].Name), nil),
-				fieldsResponseFields.StructType(),
+				types.NewTypeName(0, r.client.Pkg(), name, nil),
+				structType,
 				nil,
 			)
 
 			return &ResponseField{
-				Name:           selection.TypeCondition,
-				Type:           typ,
-				Tags:           []string{fmt.Sprintf(`graphql:"... on %s"`, selection.TypeCondition)},
-				ResponseFields: fieldsResponseFields,
+				Name:             selection.TypeCondition,
+				Type:             typ,
+				IsInlineFragment: true,
+				Tags:             []string{fmt.Sprintf(`graphql:"... on %s"`, selection.TypeCondition)},
+				ResponseFields:   allFields.SortByName(),
 			}
 		}
-
+		// フラグメントスプレッドがない場合
+		// if there is no fragment spread
 		structType := fieldsResponseFields.StructType()
 		r.StructSources = append(r.StructSources, &StructSource{
 			Name: name,
@@ -346,7 +406,7 @@ func (r *SourceGenerator) NewResponseField(selection ast.Selection, typeName str
 			Type:             typ,
 			IsInlineFragment: true,
 			Tags:             []string{fmt.Sprintf(`graphql:"... on %s"`, selection.TypeCondition)},
-			ResponseFields:   fieldsResponseFields,
+			ResponseFields:   fieldsResponseFields.SortByName(),
 		}
 	}
 

clientgenv2/source_generator_test.go

@@ -1,6 +1,8 @@
 package clientgenv2
 
 import (
+	"github.com/99designs/gqlgen/codegen/config"
+	gqlgencConfig "github.com/Yamashou/gqlgenc/config"
 	"go/types"
 	"testing"
 )
@@ -235,3 +237,143 @@ func TestMergeFieldsRecursively(t *testing.T) {
 		})
 	}
 }
+
+func TestFragmentSpreadExpansionInInlineFragment(t *testing.T) {
+	// このテストでは、フラグメントスプレッドがあるインラインフラグメントで
+	// `hasFragmentSpread` と `collectFragmentFields` 関数が正しく動作することを確認します
+	//
+	// This test verifies that `hasFragmentSpread` and `collectFragmentFields` functions 
+	// work correctly when handling fragment spreads in inline fragments.
+	
+	// テストデータを作成
+	// Create test data
+	// フラグメントスプレッドを含むフィールドのセット
+	// A set of fields containing fragment spreads
+	responseFields := ResponseFieldList{
+		{
+			Name: "languages",
+			Type: types.NewPointer(types.NewNamed(
+				types.NewTypeName(0, nil, "LanguagesConnection", nil),
+				types.NewStruct(nil, nil),
+				nil,
+			)),
+			Tags: []string{`json:"languages,omitempty" graphql:"languages"`},
+		},
+		{
+			Name:             "RepositoryFragment",
+			Type:             types.NewPointer(types.NewNamed(types.NewTypeName(0, nil, "RepositoryFragment", nil), types.NewStruct(nil, nil), nil)),
+			IsFragmentSpread: true,
+			ResponseFields: ResponseFieldList{
+				{
+					Name: "id",
+					Type: types.Typ[types.String],
+					Tags: []string{`json:"id" graphql:"id"`},
+				},
+				{
+					Name: "name",
+					Type: types.Typ[types.String],
+					Tags: []string{`json:"name" graphql:"name"`},
+				},
+			},
+		},
+	}
+
+	mockCfg := &config.Config{}
+	mockBinder := &config.Binder{}
+	mockPackageConfig := config.PackageConfig{}
+	mockGenCfg := &gqlgencConfig.GenerateConfig{}
+
+	sg := &SourceGenerator{
+		cfg:           mockCfg,
+		binder:        mockBinder,
+		client:        mockPackageConfig,
+		genCfg:        mockGenCfg,
+		StructSources: make([]*StructSource, 0),
+	}
+
+	// フラグメントスプレッドの存在を確認
+	// Verify the existence of fragment spreads
+	hasFragmentSpread := sg.hasFragmentSpread(responseFields)
+	if !hasFragmentSpread {
+		t.Errorf("Expected hasFragmentSpread to return true when a fragment spread is present")
+	}
+	
+	// フラグメントフィールドの収集をテスト
+	// Test the collection of fragment fields
+	fragmentFields := sg.collectFragmentFields(responseFields)
+	if len(fragmentFields) != 2 {
+		t.Errorf("Expected 2 fields from fragment spread, got %d", len(fragmentFields))
+	}
+	
+	// フィールド名を検証
+	// Validate field names
+	foundID := false
+	foundName := false
+
+	for _, field := range fragmentFields {
+		switch field.Name {
+		case "id":
+			foundID = true
+		case "name":
+			foundName = true
+		}
+	}
+
+	if !foundID {
+		t.Errorf("Expected to find 'id' field from fragment")
+	}
+	if !foundName {
+		t.Errorf("Expected to find 'name' field from fragment")
+	}
+
+	// 実際のフラグメントスプレッド展開処理をテスト
+	// Test the actual fragment spread expansion process
+	// フラグメントスプレッドを含むフィールドから、すべてのフィールドを集める
+	// Collect all fields from fields containing fragment spreads
+	allFields := make(ResponseFieldList, 0)
+	for _, field := range responseFields {
+		if !field.IsFragmentSpread {
+			allFields = append(allFields, field)
+		}
+	}
+	// フラグメントのフィールドを追加
+	// Add fields from fragments
+	allFields = append(allFields, fragmentFields...)
+
+	// フィールドの数を検証
+	// Validate the number of fields
+	if len(allFields) != 3 { // languages + id + name
+		t.Errorf("Expected 3 fields after expansion, got %d", len(allFields))
+	}
+
+	// フィールド名を検証
+	// Validate field names
+	foundLanguages := false
+	foundID = false
+	foundName = false
+
+	for _, field := range allFields {
+		switch field.Name {
+		case "languages":
+			foundLanguages = true
+		case "id":
+			foundID = true
+		case "name":
+			foundName = true
+		case "RepositoryFragment":
+			// このフィールドは展開されるため、ここには存在しないはず
+			// This field should not exist after expansion
+			t.Errorf("RepositoryFragment field should not exist after expansion")
+		}
+	}
+
+	if !foundLanguages {
+		t.Errorf("Expected to find 'languages' field")
+	}
+	if !foundID {
+		t.Errorf("Expected to find 'id' field from fragment")
+	}
+	if !foundName {
+		t.Errorf("Expected to find 'name' field from fragment")
+	}
+}