1515import graphql .schema .GraphQLObjectType ;
1616import graphql .schema .GraphQLType ;
1717import graphql .schema .GraphQLUnionType ;
18+ import graphql .util .SelectionSetTraversalFrame ;
1819
20+ import java .util .ArrayDeque ;
21+ import java .util .Deque ;
1922import java .util .LinkedHashMap ;
2023import java .util .LinkedHashSet ;
2124import java .util .List ;
@@ -70,19 +73,32 @@ public MergedSelectionSet collectFields(FieldCollectorParameters parameters, Sel
7073
7174
7275 private void collectFields (FieldCollectorParameters parameters , SelectionSet selectionSet , Set <String > visitedFragments , Map <String , MergedField > fields , DeferredExecution deferredExecution , boolean incrementalSupport ) {
73-
74- for ( Selection selection : selectionSet . getSelections ()) {
75- if ( selection instanceof Field ) {
76- collectField ( parameters , fields , ( Field ) selection , deferredExecution );
77- } else if ( selection instanceof InlineFragment ) {
78- collectInlineFragment ( parameters , visitedFragments , fields , ( InlineFragment ) selection , incrementalSupport );
79- } else if ( selection instanceof FragmentSpread ) {
80- collectFragmentSpread ( parameters , visitedFragments , fields , ( FragmentSpread ) selection , incrementalSupport ) ;
76+ Deque < SelectionSetTraversalFrame < DeferredExecution >> frames = new ArrayDeque <>();
77+ frames . push ( new SelectionSetTraversalFrame <>( selectionSet , deferredExecution ));
78+ while (! frames . isEmpty () ) {
79+ SelectionSetTraversalFrame < DeferredExecution > frame = frames . getFirst ( );
80+ Selection selection = frame . nextSelection ();
81+ if ( selection == null ) {
82+ frames . pop ();
83+ continue ;
8184 }
85+ collectSelection (parameters , visitedFragments , fields , frames , frame .getContext (), selection , incrementalSupport );
86+ }
87+ }
88+
89+ private void collectSelection (FieldCollectorParameters parameters , Set <String > visitedFragments , Map <String , MergedField > fields ,
90+ Deque <SelectionSetTraversalFrame <DeferredExecution >> frames , DeferredExecution deferredExecution ,
91+ Selection selection , boolean incrementalSupport ) {
92+ if (selection instanceof Field ) {
93+ collectField (parameters , fields , (Field ) selection , deferredExecution );
94+ } else if (selection instanceof InlineFragment ) {
95+ collectInlineFragment (parameters , frames , (InlineFragment ) selection , incrementalSupport );
96+ } else if (selection instanceof FragmentSpread ) {
97+ collectFragmentSpread (parameters , visitedFragments , frames , (FragmentSpread ) selection , incrementalSupport );
8298 }
8399 }
84100
85- private void collectFragmentSpread (FieldCollectorParameters parameters , Set <String > visitedFragments , Map < String , MergedField > fields , FragmentSpread fragmentSpread , boolean incrementalSupport ) {
101+ private void collectFragmentSpread (FieldCollectorParameters parameters , Set <String > visitedFragments , Deque < SelectionSetTraversalFrame < DeferredExecution >> frames , FragmentSpread fragmentSpread , boolean incrementalSupport ) {
86102 if (visitedFragments .contains (fragmentSpread .getName ())) {
87103 return ;
88104 }
@@ -111,10 +127,10 @@ private void collectFragmentSpread(FieldCollectorParameters parameters, Set<Stri
111127 DeferredExecution ::new
112128 ) : null ;
113129
114- collectFields ( parameters , fragmentDefinition .getSelectionSet (), visitedFragments , fields , deferredExecution , incrementalSupport );
130+ frames . push ( new SelectionSetTraversalFrame <>( fragmentDefinition .getSelectionSet (), deferredExecution ) );
115131 }
116132
117- private void collectInlineFragment (FieldCollectorParameters parameters , Set < String > visitedFragments , Map < String , MergedField > fields , InlineFragment inlineFragment , boolean incrementalSupport ) {
133+ private void collectInlineFragment (FieldCollectorParameters parameters , Deque < SelectionSetTraversalFrame < DeferredExecution >> frames , InlineFragment inlineFragment , boolean incrementalSupport ) {
118134 if (!conditionalNodes .shouldInclude (inlineFragment ,
119135 parameters .getVariables (),
120136 parameters .getGraphQLSchema (),
@@ -129,7 +145,7 @@ private void collectInlineFragment(FieldCollectorParameters parameters, Set<Stri
129145 DeferredExecution ::new
130146 ) : null ;
131147
132- collectFields ( parameters , inlineFragment .getSelectionSet (), visitedFragments , fields , deferredExecution , incrementalSupport );
148+ frames . push ( new SelectionSetTraversalFrame <>( inlineFragment .getSelectionSet (), deferredExecution ) );
133149 }
134150
135151 private void collectField (FieldCollectorParameters parameters , Map <String , MergedField > fields , Field field , DeferredExecution deferredExecution ) {
0 commit comments