Fix GraphQLFileLoader #import syntax handling (#1808)

packages/loaders/graphql-file/src/index.ts

@@ -10,7 +10,9 @@ import {
 import { isAbsolute, resolve } from 'path';
 import { readFile, readFileSync, pathExists, pathExistsSync } from 'fs-extra';
 import { cwd as processCwd } from 'process';
+import { isExecutableDefinitionNode, Kind } from 'graphql';
 import { processImport } from '@graphql-tools/import';
+import { mergeTypeDefs } from '@graphql-tools/merge';
 
 const FILE_EXTENSIONS = ['.gql', '.gqls', '.graphql', '.graphqls'];
 
@@ -97,9 +99,21 @@ export class GraphQLFileLoader implements UniversalLoader<GraphQLFileLoaderOptio
 
   handleFileContent(rawSDL: string, pointer: string, options: GraphQLFileLoaderOptions) {
     if (!options.skipGraphQLImport && isGraphQLImportFile(rawSDL)) {
+      const document = processImport(pointer, options.cwd);
+      const typeSystemDefinitions = document.definitions
+        .filter(d => !isExecutableDefinitionNode(d))
+        .map(definition => ({
+          kind: Kind.DOCUMENT,
+          definitions: [definition],
+        }));
+      const mergedTypeDefs = mergeTypeDefs(typeSystemDefinitions, { useSchemaDefinition: false });
+      const executableDefinitions = document.definitions.filter(isExecutableDefinitionNode);
       return {
         location: pointer,
-        document: processImport(pointer, options.cwd),
+        document: {
+          ...mergedTypeDefs,
+          definitions: [...mergedTypeDefs.definitions, ...executableDefinitions],
+        },
       };
     }
     return parseGraphQLSDL(pointer, rawSDL.trim(), options);

packages/loaders/graphql-file/tests/loader.spec.ts

@@ -1,9 +1,11 @@
 import { join } from 'path';
 
+import { print } from 'graphql'
 import { Source } from '@graphql-tools/utils';
 
 import { GraphQLFileLoader } from '../src';
 import { runTests } from '../../../testing/utils';
+import '../../../testing/to-be-similar-gql-doc'
 
 describe('GraphQLFileLoader', () => {
   const loader = new GraphQLFileLoader();
@@ -59,9 +61,32 @@ describe('GraphQLFileLoader', () => {
         expect(result.document).toBeDefined();
       });
 
-      it('should load file with #import expression', async () => {
+      it('should load type definitions document with #import expression', async () => {
         const result: Source = await load(getPointer('type-defs-with-import.graphql'), {});
-        expect(result.document?.definitions.length).toBe(2);
+        expect(print(result.document!)).toBeSimilarGqlDoc(/* GraphQL */`
+          type Query {
+            a: A
+          }
+
+          type A {
+            b: String
+          }
+        `)
+      });
+
+      it('should load executable document with #import expression', async () => {
+        const result: Source = await load(getPointer('executable.graphql'), {});
+        expect(print(result.document!)).toBeSimilarGqlDoc(/* GraphQL */`
+          query MyQuery {
+            a {
+              ...AFragment
+            }
+          }
+
+          fragment AFragment on A {
+            b
+          }
+        `)
       });
     });
   });

packages/loaders/graphql-file/tests/test-files/executable.graphql

@@ -0,0 +1,7 @@
+#import AFragment from "./fragment.graphql"
+
+query MyQuery {
+  a {
+    ...AFragment
+  }
+}

packages/loaders/graphql-file/tests/test-files/fragment.graphql

@@ -0,0 +1,3 @@
+fragment AFragment on A {
+  b
+}

packages/loaders/graphql-file/tests/test-files/import-me.graphql

@@ -1,3 +1,3 @@
-type Mutation {
-  sayGoodbye: String
+type A {
+  b: String
 }

packages/loaders/graphql-file/tests/test-files/type-defs-with-import.graphql

@@ -1,5 +1,5 @@
-#import Mutation from "./import-me.graphql"
+#import A from "./import-me.graphql"
 
 type Query {
-  hello: String
+  a: A
 }