feat: add support of entity interfaces (#703)

fixes ENG-4650 fixes ENG-4711
wundergraph · Jan 9, 2024 · 633da60 · 633da60
2 parents ce77736 + 9bd1617
commit 633da60
Show file tree

Hide file tree

Showing 37 changed files with 3,020 additions and 508 deletions.
diff --git a/v2/pkg/ast/ast_node_kind_test.go b/v2/pkg/ast/ast_node_kind_test.go
@@ -1,8 +1,9 @@
 package ast
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNodeKindIsAbstractType(t *testing.T) {

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,
 	})