From 49b34ba5639edbf6b3b966cf56f3778259acec01 Mon Sep 17 00:00:00 2001 From: spetrunin Date: Fri, 15 Dec 2023 20:39:22 +0200 Subject: [PATCH] move field selection normalization after merging inline fragments --- v2/pkg/astnormalization/astnormalization.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/pkg/astnormalization/astnormalization.go b/v2/pkg/astnormalization/astnormalization.go index e22f8af0cd..38f219f3c4 100644 --- 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, })