graphql-java · bbakerman · Oct 1, 2020 · Sep 27, 2020
diff --git a/src/main/java/graphql/analysis/QueryTraverser.java b/src/main/java/graphql/analysis/QueryTraverser.java
@@ -35,7 +35,7 @@
  * visitField calls.
  */
 @PublicApi
-public class    QueryTraverser {
+public class QueryTraverser {
 
     private final Collection<? extends Node> roots;
     private final GraphQLSchema schema;

diff --git a/src/main/java/graphql/language/AstPrinter.java b/src/main/java/graphql/language/AstPrinter.java
@@ -65,6 +65,7 @@ private AstPrinter(boolean compactMode) {
         printers.put(ScalarTypeDefinition.class, scalarTypeDefinition());
         printers.put(ScalarTypeExtensionDefinition.class, scalarTypeExtensionDefinition());
         printers.put(SchemaDefinition.class, schemaDefinition());
+        printers.put(SchemaExtensionDefinition.class, schemaExtensionDefinition());
         printers.put(SelectionSet.class, selectionSet());
         printers.put(StringValue.class, value());
         printers.put(TypeName.class, type());
@@ -384,6 +385,10 @@ private NodePrinter<InputObjectTypeExtensionDefinition> inputObjectTypeExtension
         return (out, node) -> out.printf("extend %s", node(node, InputObjectTypeDefinition.class));
     }
 
+    private NodePrinter<SchemaExtensionDefinition> schemaExtensionDefinition() {
+        return (out, node) -> out.printf("extend %s", node(node, SchemaDefinition.class));
+    }
+
     private NodePrinter<UnionTypeDefinition> unionTypeDefinition() {
         String barSep = compactMode ? "|" : " | ";
         String equals = compactMode ? "=" : "= ";

diff --git a/src/main/java/graphql/language/EnumTypeExtensionDefinition.java b/src/main/java/graphql/language/EnumTypeExtensionDefinition.java
@@ -51,6 +51,14 @@ public static Builder newEnumTypeExtensionDefinition() {
         return new Builder();
     }
 
+    @Override
+    public EnumTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder
+                .enumValueDefinitions(newChildren.getChildren(CHILD_ENUM_VALUE_DEFINITIONS))
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+        );
+    }
+
     public EnumTypeExtensionDefinition transformExtension(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder(this);
         builderConsumer.accept(builder);

diff --git a/src/main/java/graphql/language/InputObjectTypeExtensionDefinition.java b/src/main/java/graphql/language/InputObjectTypeExtensionDefinition.java
@@ -51,6 +51,13 @@ public static Builder newInputObjectTypeExtensionDefinition() {
         return new Builder();
     }
 
+    @Override
+    public InputObjectTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+                .inputValueDefinitions(newChildren.getChildren(CHILD_INPUT_VALUES_DEFINITIONS))
+        );
+    }
 
     public InputObjectTypeExtensionDefinition transformExtension(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder(this);

diff --git a/src/main/java/graphql/language/InterfaceTypeExtensionDefinition.java b/src/main/java/graphql/language/InterfaceTypeExtensionDefinition.java
@@ -54,6 +54,14 @@ public static Builder newInterfaceTypeExtensionDefinition() {
         return new Builder();
     }
 
+    @Override
+    public InterfaceTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder
+                .definitions(newChildren.getChildren(CHILD_DEFINITIONS))
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+        );
+    }
+
     public InterfaceTypeExtensionDefinition transformExtension(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder(this);
         builderConsumer.accept(builder);

diff --git a/src/main/java/graphql/language/ObjectTypeExtensionDefinition.java b/src/main/java/graphql/language/ObjectTypeExtensionDefinition.java
@@ -52,6 +52,12 @@ public ObjectTypeExtensionDefinition deepCopy() {
                 getAdditionalData());
     }
 
+    @Override
+    public ObjectTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder.implementz(newChildren.getChildren(CHILD_IMPLEMENTZ))
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+                .fieldDefinitions(newChildren.getChildren(CHILD_FIELD_DEFINITIONS)));
+    }
 
     @Override
     public String toString() {

diff --git a/src/main/java/graphql/language/ScalarTypeExtensionDefinition.java b/src/main/java/graphql/language/ScalarTypeExtensionDefinition.java
@@ -42,6 +42,13 @@ public static Builder newScalarTypeExtensionDefinition() {
         return new Builder();
     }
 
+    @Override
+    public ScalarTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+        );
+    }
+
     public ScalarTypeExtensionDefinition transformExtension(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder(this);
         builderConsumer.accept(builder);

diff --git a/src/main/java/graphql/language/UnionTypeExtensionDefinition.java b/src/main/java/graphql/language/UnionTypeExtensionDefinition.java
@@ -57,6 +57,14 @@ public static Builder newUnionTypeExtensionDefinition() {
         return new Builder();
     }
 
+    @Override
+    public UnionTypeExtensionDefinition withNewChildren(NodeChildrenContainer newChildren) {
+        return transformExtension(builder -> builder
+                .directives(newChildren.getChildren(CHILD_DIRECTIVES))
+                .memberTypes(newChildren.getChildren(CHILD_MEMBER_TYPES))
+        );
+    }
+
     public UnionTypeExtensionDefinition transformExtension(Consumer<Builder> builderConsumer) {
         Builder builder = new Builder(this);
         builderConsumer.accept(builder);

diff --git a/src/test/groovy/graphql/language/AstPrinterTest.groovy b/src/test/groovy/graphql/language/AstPrinterTest.groovy
@@ -454,6 +454,10 @@ type Query {
 
     def "print type extensions"() {
         def query = '''
+    extend schema {
+        query: Query
+    }
+
     extend type Object @directive {
         objectField : String
     }    
@@ -479,7 +483,11 @@ type Query {
         String output = printAst(document)
 
         expect:
-        output == '''extend type Object @directive {
+        output == '''extend schema {
+  query: Query
+}
+
+extend type Object @directive {
   objectField: String
 }
 

diff --git a/src/test/groovy/graphql/language/AstTransformerTest.groovy b/src/test/groovy/graphql/language/AstTransformerTest.groovy
@@ -5,6 +5,7 @@ import graphql.util.TraversalControl
 import graphql.util.TraverserContext
 import spock.lang.Specification
 
+import static graphql.language.AstPrinter.printAst
 import static graphql.language.AstPrinter.printAstCompact
 import static graphql.util.TreeTransformerUtil.changeNode
 import static graphql.util.TreeTransformerUtil.deleteNode
@@ -795,5 +796,105 @@ class AstTransformerTest extends Specification {
 
     }
 
+    def "regression: changing a property of an extension should not change the extension to a base definition"() {
+        def document = TestUtil.toDocument("""
+            extend schema { query: Query }
+            extend type MyObjectType { login: String }
+            extend input MyInputObjectType { login: String }
+            extend interface MyInterface { login: String }
+            extend enum MyEnum { MONDAY }
+            extend scalar MyScalar @myDirective
+            extend union MyUnion = MyObjectType
+         """)
 
+        AstTransformer astTransformer = new AstTransformer()
+
+        def visitor = new NodeVisitorStub() {
+
+            @Override
+            TraversalControl visitFieldDefinition(FieldDefinition fieldDefinition, TraverserContext<Node> context) {
+                if (fieldDefinition.name == "login") {
+                    // change name
+                    FieldDefinition signin = fieldDefinition.transform({ builder -> builder.name("signin") })
+                    return changeNode(context, signin)
+                }
+                return super.visitFieldDefinition(fieldDefinition, context)
+            }
+
+            @Override
+            TraversalControl visitInputValueDefinition(InputValueDefinition fieldDefinition, TraverserContext<Node> context) {
+                if (fieldDefinition.name == "login") {
+                    // change name
+                    InputValueDefinition signin = fieldDefinition.transform({ builder -> builder.name("signin") })
+                    return changeNode(context, signin)
+                }
+                return super.visitInputValueDefinition(fieldDefinition, context)
+            }
+
+            @Override
+            TraversalControl visitEnumValueDefinition(EnumValueDefinition node, TraverserContext<Node> context) {
+                if (node.name == "MONDAY") {
+                    // change name
+                    return changeNode(context, node.transform({ builder -> builder.name("TUESDAY") }))
+                }
+                return super.visitEnumValueDefinition(node, context)
+            }
+
+            @Override
+            TraversalControl visitSchemaDefinition(SchemaDefinition node, TraverserContext<Node> context) {
+                if (node instanceof SchemaExtensionDefinition) {
+                    return changeNode(context, node.transformExtension({
+                        it.operationTypeDefinitions([OperationTypeDefinition.newOperationTypeDefinition()
+                                .name("myQuery")
+                                .typeName(TypeName.newTypeName("MyQuery").build())
+                                .build()])
+                    }))
+                }
+                return super.visitSchemaDefinition(node, context)
+            }
+        }
+
+        when:
+        def newDocument = astTransformer.transform(document, visitor)
+
+        then:
+        newDocument instanceof Document
+
+        and:
+        def transformedDoc = newDocument as Document
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyObjectType"} instanceof ObjectTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyInputObjectType"} instanceof InputObjectTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyInterface"} instanceof InterfaceTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyEnum"} instanceof EnumTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyScalar"} instanceof ScalarTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof NamedNode && it.name == "MyUnion"} instanceof UnionTypeExtensionDefinition
+        transformedDoc.definitions.find {it instanceof SchemaDefinition } instanceof SchemaExtensionDefinition
+
+        and:
+        printAst(newDocument).trim() == """
+        |extend schema {
+        |  myQuery: MyQuery
+        |}
+        |
+        |extend type MyObjectType {
+        |  signin: String
+        |}
+        |
+        |extend input MyInputObjectType {
+        |  signin: String
+        |}
+        |
+        |extend interface MyInterface {
+        |  signin: String
+        |}
+        |
+        |extend enum MyEnum {
+        |  TUESDAY
+        |}
+        |
+        |extend scalar MyScalar @myDirective
+        |
+        |extend union MyUnion = MyObjectType
+        """.trim().stripMargin()
+    }
 }