move field selection normalization after merging inline fragments

wundergraph · Dec 15, 2023 · 49b34ba · 49b34ba
1 parent 037d76b
commit 49b34ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/v2/pkg/astnormalization/astnormalization.go b/v2/pkg/astnormalization/astnormalization.go
@@ -224,9 +224,8 @@ func (o *OperationNormalizer) setupOperationWalkers() {
 	other := astvisitor.NewWalker(48)
 	removeSelfAliasing(&other)
 	inlineSelectionsFromInlineFragments(&other)
-	mergeFieldSelections(&other)
 	o.operationWalkers = append(o.operationWalkers, walkerStage{
-		name:   "removeSelfAliasing, inlineSelectionsFromInlineFragments, mergeFieldSelections",
+		name:   "removeSelfAliasing, inlineSelectionsFromInlineFragments",
 		walker: &other,
 	})
 
@@ -238,6 +237,7 @@ func (o *OperationNormalizer) setupOperationWalkers() {
 	})
 
 	cleanup := astvisitor.NewWalker(48)
+	mergeFieldSelections(&cleanup)
 	deduplicateFields(&cleanup)
 	if o.options.removeFragmentDefinitions {
 		removeFragmentDefinitions(&cleanup)
@@ -246,7 +246,7 @@ func (o *OperationNormalizer) setupOperationWalkers() {
 		deleteUnusedVariables(&cleanup)
 	}
 	o.operationWalkers = append(o.operationWalkers, walkerStage{
-		name:   "deduplicateFields, removeFragmentDefinitions, deleteUnusedVariables",
+		name:   "mergeFieldSelections, deduplicateFields, removeFragmentDefinitions, deleteUnusedVariables",
 		walker: &cleanup,
 	})