andimarek · Mar 11, 2019 · Mar 5, 2019 · Mar 11, 2019 · Mar 11, 2019 · Mar 11, 2019
diff --git a/src/main/java/graphql/analysis/NodeVisitorWithTypeTracking.java b/src/main/java/graphql/analysis/NodeVisitorWithTypeTracking.java
@@ -89,10 +89,13 @@ public TraversalControl visitFragmentDefinition(FragmentDefinition node, Travers
             return TraversalControl.ABORT;
         }
 
+        QueryVisitorFragmentDefinitionEnvironment fragmentEnvironment = new QueryVisitorFragmentDefinitionEnvironmentImpl(node, context);
+
         if (context.getVar(NodeTraverser.LeaveOrEnter.class) == LEAVE) {
+            postOrderCallback.visitFragmentDefinition(fragmentEnvironment);
             return TraversalControl.CONTINUE;
         }
-
+        preOrderCallback.visitFragmentDefinition(fragmentEnvironment);
 
         QueryTraversalContext parentEnv = context.getVarFromParents(QueryTraversalContext.class);
         GraphQLCompositeType typeCondition = (GraphQLCompositeType) schema.getType(node.getTypeCondition().getName());

diff --git a/src/main/java/graphql/analysis/QueryVisitor.java b/src/main/java/graphql/analysis/QueryVisitor.java
@@ -16,4 +16,8 @@ public interface QueryVisitor {
 
     void visitFragmentSpread(QueryVisitorFragmentSpreadEnvironment queryVisitorFragmentSpreadEnvironment);
 
+    default void visitFragmentDefinition(QueryVisitorFragmentDefinitionEnvironment queryVisitorFragmentDefinitionEnvironment) {
+
+    }
+
 }
diff --git a/src/main/java/graphql/analysis/QueryVisitorFragmentDefinitionEnvironment.java b/src/main/java/graphql/analysis/QueryVisitorFragmentDefinitionEnvironment.java
@@ -0,0 +1,13 @@
+package graphql.analysis;
+
+import graphql.PublicApi;
+import graphql.language.FragmentDefinition;
+import graphql.language.Node;
+import graphql.util.TraverserContext;
+
+@PublicApi
+public interface QueryVisitorFragmentDefinitionEnvironment {
+    FragmentDefinition getFragmentDefinition();
+
+    TraverserContext<Node> getTraverserContext();
+}
diff --git a/src/main/java/graphql/analysis/QueryVisitorFragmentDefinitionEnvironmentImpl.java b/src/main/java/graphql/analysis/QueryVisitorFragmentDefinitionEnvironmentImpl.java
@@ -0,0 +1,56 @@
+package graphql.analysis;
+
+import graphql.Internal;
+import graphql.language.FragmentDefinition;
+import graphql.language.Node;
+import graphql.util.TraverserContext;
+
+import java.util.Objects;
+
+@Internal
+public class QueryVisitorFragmentDefinitionEnvironmentImpl implements QueryVisitorFragmentDefinitionEnvironment {
+
+    private final FragmentDefinition fragmentDefinition;
+    private final TraverserContext<Node> traverserContext;
+
+
+    public QueryVisitorFragmentDefinitionEnvironmentImpl(FragmentDefinition fragmentDefinition, TraverserContext<Node> traverserContext) {
+        this.fragmentDefinition = fragmentDefinition;
+        this.traverserContext = traverserContext;
+    }
+
+    @Override
+    public FragmentDefinition getFragmentDefinition() {
+        return fragmentDefinition;
+    }
+
+    @Override
+    public TraverserContext<Node> getTraverserContext() {
+        return traverserContext;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        QueryVisitorFragmentDefinitionEnvironmentImpl that = (QueryVisitorFragmentDefinitionEnvironmentImpl) o;
+        return Objects.equals(fragmentDefinition, that.fragmentDefinition);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(fragmentDefinition);
+    }
+
+    @Override
+    public String toString() {
+        return "QueryVisitorFragmentDefinitionEnvironmentImpl{" +
+                "fragmentDefinition=" + fragmentDefinition +
+                '}';
+    }
+}
+
diff --git a/src/test/groovy/graphql/analysis/QueryTransformerTest.groovy b/src/test/groovy/graphql/analysis/QueryTransformerTest.groovy
@@ -5,6 +5,7 @@ import graphql.language.Document
 import graphql.language.Field
 import graphql.language.NodeUtil
 import graphql.language.SelectionSet
+import graphql.language.TypeName
 import graphql.parser.Parser
 import graphql.schema.GraphQLSchema
 import spock.lang.Specification
@@ -207,7 +208,7 @@ class QueryTransformerTest extends Specification {
         0 * _
     }
 
-    def "named fragment is traversed if it is a root and can be transformed"() {
+    def "fragment definition is traversed if it is a root and can be transformed"() {
         def query = TestUtil.parseQuery('''
             {
                 root {
@@ -241,13 +242,22 @@ class QueryTransformerTest extends Specification {
                     })
                 }
             }
+
+            @Override
+            void visitFragmentDefinition(QueryVisitorFragmentDefinitionEnvironment env) {
+                def changed = env.fragmentDefinition.transform({ builder ->
+                    builder.typeCondition(TypeName.newTypeName("newTypeName").build())
+                            .name("newFragName")
+                })
+                changeNode(env.traverserContext, changed)
+            }
         }
 
 
         when:
         def newFragment = queryTransformer.transform(visitor)
         then:
         printAstCompact(newFragment) ==
-                "fragment frag on Root {fooA {midA {newChild1 newChild2}}}"
+                "fragment newFragName on newTypeName {fooA {midA {newChild1 newChild2}}}"
     }
 }
diff --git a/src/test/groovy/graphql/analysis/QueryTraversalTest.groovy b/src/test/groovy/graphql/analysis/QueryTraversalTest.groovy
@@ -7,6 +7,7 @@ import graphql.language.FragmentDefinition
 import graphql.language.FragmentSpread
 import graphql.language.InlineFragment
 import graphql.language.NodeTraverser
+import graphql.language.NodeUtil
 import graphql.parser.Parser
 import graphql.schema.GraphQLNonNull
 import graphql.schema.GraphQLObjectType
@@ -20,7 +21,7 @@ import static graphql.schema.GraphQLList.list
 import static graphql.schema.GraphQLNonNull.nonNull
 import static java.util.Collections.emptyMap
 
-class QueryTraversalTest extends Specification {
+class QueryTrqaversalTest extends Specification {
 
 
     Document createQuery(String query) {
@@ -302,6 +303,54 @@ class QueryTraversalTest extends Specification {
 
     }
 
+
+    def "test preOrder and postOrder order for fragment definitions"() {
+        given:
+        def schema = TestUtil.schema("""
+            type Query{
+                foo: Foo
+                bar: String
+            }
+            type Foo {
+                subFoo: String  
+            }
+        """)
+        def visitor = Mock(QueryVisitor)
+        def query = createQuery("""
+                {
+                    ...F1
+                }
+
+                fragment F1 on Query {
+                    foo {
+                        subFoo
+                    }
+                }
+                """)
+
+        def fragments = NodeUtil.getFragmentsByName(query)
+
+        QueryTraversal queryTraversal = QueryTraversal.newQueryTraversal()
+                .schema(schema)
+                .root(fragments["F1"])
+                .rootParentType(schema.getQueryType())
+                .fragmentsByName(fragments)
+                .variables([:])
+                .build()
+
+        when:
+        queryTraversal.visitPreOrder(visitor)
+
+        then:
+        1 * visitor.visitFragmentDefinition({ QueryVisitorFragmentDefinitionEnvironment env -> env.fragmentDefinition == fragments["F1"] })
+
+        when:
+        queryTraversal.visitPostOrder(visitor)
+
+        then:
+        1 * visitor.visitFragmentDefinition({ QueryVisitorFragmentDefinitionEnvironment env -> env.fragmentDefinition == fragments["F1"] })
+    }
+
     def "works for mutations()"() {
         given:
         def schema = TestUtil.schema("""
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,8 @@ public interface QueryVisitor { @@
         void visitFragmentSpread(QueryVisitorFragmentSpreadEnvironment queryVisitorFragmentSpreadEnvironment);
+        default void visitFragmentDefinition(QueryVisitorFragmentDefinitionEnvironment queryVisitorFragmentDefinitionEnvironment) {
+        }
     }