Merge pull request #213 from SpaceK33z/fix-nested-imports

fix(nested importing)

fixtures/import-nested/a.graphql

@@ -0,0 +1,3 @@
+# import Query.first, Query.second from "c.graphql"
+
+type Query

fixtures/import-nested/all.graphql

@@ -0,0 +1,4 @@
+# import Query.first, Query.second from "a.graphql"
+# import Query.third from "b.graphql"
+
+type Query

fixtures/import-nested/b.graphql

@@ -0,0 +1,3 @@
+# import Query.third from "c.graphql"
+
+type Query

fixtures/import-nested/c.graphql

@@ -0,0 +1,6 @@
+type Query {
+  first: String
+  second: Float
+  third: String
+  unused: String
+}

src/index.test.ts

@@ -87,6 +87,17 @@ type Query {
   t.is(importSchema('fixtures/import-duplicate/all.graphql'), expectedSDL)
 })
 
+test('importSchema: import nested', t => {
+  const expectedSDL = `\
+type Query {
+  first: String
+  second: Float
+  third: String
+}
+`
+  t.is(importSchema('fixtures/import-nested/all.graphql'), expectedSDL)
+})
+
 test('importSchema: field types', t => {
   const expectedSDL = `\
 type A {

src/index.ts

@@ -9,7 +9,7 @@ import {
   DocumentNode,
   Kind,
 } from 'graphql'
-import { flatten, groupBy, includes, keyBy } from 'lodash'
+import { flatten, groupBy, includes, keyBy, isEqual } from 'lodash'
 import * as path from 'path'
 
 import { completeDefinitionPool, ValidDefinitionNode } from './definition'
@@ -182,7 +182,7 @@ function collectDefinitions(
   sdl: string,
   filePath: string,
   schemas?: { [key: string]: string },
-  processedFiles: Set<string> = new Set(),
+  processedFiles: Map<string, RawModule[]> = new Map(),
   typeDefinitions: ValidDefinitionNode[][] = [],
   allDefinitions: ValidDefinitionNode[][] = [],
 ): {
@@ -208,31 +208,22 @@ function collectDefinitions(
   // Add typedefinitions to running total
   typeDefinitions.push(currentTypeDefinitions)
 
-  // Mark file as processed (for circular dependency cases)
-  processedFiles.add(key)
-
   // Read imports from current file
   const rawModules = parseSDL(sdl)
-  const mergedModules: RawModule[] = []
-
-  // Merge imports from the same path
-  rawModules.forEach(m => {
-    const mergedModule = mergedModules.find(mm => mm.from === m.from)
-    if (mergedModule) {
-      mergedModule.imports = mergedModule.imports.concat(m.imports)
-    } else {
-      mergedModules.push(m)
-    }
-  })
 
   // Process each file (recursively)
-  mergedModules.forEach(m => {
+  rawModules.forEach(m => {
     // If it was not yet processed (in case of circular dependencies)
     const moduleFilePath =
-      isFile(filePath) && isFile(m.from)
-        ? path.resolve(path.join(dirname, m.from))
-        : m.from
-    if (!processedFiles.has(moduleFilePath)) {
+    isFile(filePath) && isFile(m.from)
+    ? path.resolve(path.join(dirname, m.from))
+    : m.from
+
+    const processedFile = processedFiles.get(key)
+    if (!processedFile || !processedFile.find(rModule => isEqual(rModule, m))) {
+      // Mark this specific import line as processed for this file (for cicular dependency cases)
+      processedFiles.set(key, processedFile ? processedFile.concat(m) : [m])
+
       collectDefinitions(
         m.imports,
         read(moduleFilePath, schemas),