allow to print NFs directly

andimarek · andimarek · commit 0b7756c8a832 · 2025-03-06T09:08:19.000+10:00
diff --git a/src/main/java/graphql/normalized/nf/NormalizedOperationToAstCompiler.java b/src/main/java/graphql/normalized/nf/NormalizedOperationToAstCompiler.java
@@ -70,16 +70,51 @@ public Map<String, Object> getVariables() {
         }
     }
 
-    public static CompilerResult compileToDocument(@NotNull GraphQLSchema schema,
+    public static CompilerResult compileToDocument(GraphQLSchema graphQLSchema,
+                                                   GraphQLObjectType rootType,
+                                                   List<NormalizedField> rootFields,
+                                                   @Nullable String operationName,
+                                                   OperationDefinition.Operation operationKind) {
+
+        return compileToDocumentImpl(graphQLSchema, rootType, rootFields, operationName, operationKind);
+    }
+
+    public static CompilerResult compileToDocument(GraphQLSchema graphQLSchema,
+                                                   GraphQLObjectType rootType,
+                                                   NormalizedField singleRootField,
+                                                   @Nullable String operationName,
+                                                   OperationDefinition.Operation operationKind) {
+        return compileToDocumentImpl(graphQLSchema, rootType, ImmutableList.of(singleRootField), operationName, operationKind);
+
+
+    }
+
+
+    public static CompilerResult compileToDocument(GraphQLSchema schema,
                                                    NormalizedOperation normalizedOperation) {
         GraphQLObjectType operationType = getOperationType(schema, normalizedOperation.getOperation());
 
-        List<Selection<?>> selections = subSelectionsForNormalizedField(schema, operationType.getName(), normalizedOperation.getRootFields());
+        return compileToDocumentImpl(
+                schema,
+                operationType,
+                normalizedOperation.getRootFields(),
+                normalizedOperation.getOperationName(),
+                normalizedOperation.getOperation()
+        );
+    }
+
+    private static CompilerResult compileToDocumentImpl(GraphQLSchema schema,
+                                                        GraphQLObjectType rootType,
+                                                        List<NormalizedField> rootFields,
+                                                        @Nullable String operationName,
+                                                        OperationDefinition.Operation operationKind) {
+
+        List<Selection<?>> selections = subSelectionsForNormalizedFields(schema, rootType.getName(), rootFields);
         SelectionSet selectionSet = new SelectionSet(selections);
 
         OperationDefinition.Builder definitionBuilder = OperationDefinition.newOperationDefinition()
-                .name(normalizedOperation.getOperationName())
-                .operation(normalizedOperation.getOperation())
+                .name(operationName)
+                .operation(operationKind)
                 .selectionSet(selectionSet);
 
 //        definitionBuilder.variableDefinitions(variableAccumulator.getVariableDefinitions());
@@ -92,9 +127,10 @@ public static CompilerResult compileToDocument(@NotNull GraphQLSchema schema,
         );
     }
 
-    private static List<Selection<?>> subSelectionsForNormalizedField(GraphQLSchema schema,
-                                                                      @NotNull String parentOutputType,
-                                                                      List<NormalizedField> normalizedFields
+
+    private static List<Selection<?>> subSelectionsForNormalizedFields(GraphQLSchema schema,
+                                                                       @NotNull String parentOutputType,
+                                                                       List<NormalizedField> normalizedFields
     ) {
         ImmutableList.Builder<Selection<?>> selections = ImmutableList.builder();
 
@@ -155,7 +191,7 @@ private static Field selectionForNormalizedField(GraphQLSchema schema,
             GraphQLFieldDefinition fieldDef = getFieldDefinition(schema, objectTypeName, normalizedField);
             GraphQLUnmodifiedType fieldOutputType = unwrapAll(fieldDef.getType());
 
-            subSelections = subSelectionsForNormalizedField(
+            subSelections = subSelectionsForNormalizedFields(
                     schema,
                     fieldOutputType.getName(),
                     normalizedField.getChildren()
@@ -195,7 +231,6 @@ private static GraphQLFieldDefinition getFieldDefinition(GraphQLSchema schema,
     }
 
 
-    @Nullable
     private static GraphQLObjectType getOperationType(@NotNull GraphQLSchema schema,
                                                       @NotNull OperationDefinition.Operation operationKind) {
         switch (operationKind) {
diff --git a/src/test/groovy/graphql/normalized/nf/NormalizedOperationToAstCompilerTest.groovy b/src/test/groovy/graphql/normalized/nf/NormalizedOperationToAstCompilerTest.groovy
@@ -4,6 +4,7 @@ import graphql.GraphQL
 import graphql.TestUtil
 import graphql.language.AstPrinter
 import graphql.language.AstSorter
+import graphql.language.OperationDefinition
 import graphql.parser.Parser
 import graphql.schema.GraphQLSchema
 import spock.lang.Specification
@@ -185,6 +186,68 @@ class NormalizedOperationToAstCompilerTest extends Specification {
     }
 
 
+    def "print one root field"() {
+        def sdl = """
+        type Query {
+            foo: Foo
+        }
+        type Foo {
+            bar: String
+        }
+        """
+        def query = '''
+        { foo { bar } }
+        '''
+        GraphQLSchema schema = TestUtil.schema(sdl)
+        assertValidQuery(schema, query)
+        def normalizedDocument = NormalizedDocumentFactory.createNormalizedDocument(schema, Parser.parse(query))
+        def normalizedOperation = normalizedDocument.getSingleNormalizedOperation()
+        def rootField = normalizedOperation.getRootFields().get(0)
+        when:
+        def result = NormalizedOperationToAstCompiler.compileToDocument(schema, schema.getObjectType("Query"), rootField, "myOperation", OperationDefinition.Operation.QUERY)
+        def printed = AstPrinter.printAst(new AstSorter().sort(result.document))
+        then:
+        printed == '''query myOperation {
+  foo {
+    bar
+  }
+}
+'''
+    }
+
+    def "print list of root fields"() {
+        def sdl = """
+        type Query {
+            foo: Foo
+        }
+        type Foo {
+            bar: String
+        }
+        """
+        def query = '''
+        { foo { bar } foo2: foo { bar } }
+        '''
+        GraphQLSchema schema = TestUtil.schema(sdl)
+        assertValidQuery(schema, query)
+        def normalizedDocument = NormalizedDocumentFactory.createNormalizedDocument(schema, Parser.parse(query))
+        def normalizedOperation = normalizedDocument.getSingleNormalizedOperation()
+        def rootFields = normalizedOperation.getRootFields()
+        when:
+        def result = NormalizedOperationToAstCompiler.compileToDocument(schema, schema.getObjectType("Query"), rootFields, "myOperation", OperationDefinition.Operation.QUERY)
+        def printed = AstPrinter.printAst(new AstSorter().sort(result.document))
+        then:
+        printed == '''query myOperation {
+  foo {
+    bar
+  }
+  foo2: foo {
+    bar
+  }
+}
+'''
+    }
+
+
     private void assertValidQuery(GraphQLSchema graphQLSchema, String query, Map variables = [:]) {
         GraphQL graphQL = GraphQL.newGraphQL(graphQLSchema).build()
         assert graphQL.execute(newExecutionInput().query(query).variables(variables)).errors.isEmpty()
