Continue fixing bug with multiple imports in a schema file (#42)

detrohutt · Jun 29, 2018 · 4680270 · 4680270
1 parent 485da2e
commit 4680270
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/plugin/requireGql.js b/plugin/requireGql.js
@@ -19,10 +19,12 @@ export const requireGql = (filepath, { resolve = defaultResolve, nowrap = true }
     if (imports.length === 0) return source
 
     // Resolve all #import statements (types, etc) recursively and concat them to the main source.
-    return imports
-      .reduce((acc, fp) => [...acc, ...customImport.getSources(fp, resolve, [source])], [])
-      .map(stripImportStatements)
-      .join('')
+    return (
+      imports
+        .reduce((acc, fp) => [...acc, ...customImport.getSources(fp, resolve, [])], [])
+        .map(stripImportStatements)
+        .join('') + stripImportStatements(source)
+    )
   }
 
   const doc = processDoc(createDoc(source, filepath, resolve))

diff --git a/tests/__snapshots__/requireGql.test.js.snap b/tests/__snapshots__/requireGql.test.js.snap
@@ -32,6 +32,10 @@ type LevelOne {
   levelTwo: LevelTwo
   levelTwoBis: LevelTwoBis
 }
+type LevelOneBis {
+  levelTwo: LevelTwo
+  levelTwoBis: LevelTwoBis
+}
 
 type Query {
   levelOne: LevelOne

diff --git a/tests/fixtures/requireGql/customImport/chainedImportsSchema.graphql b/tests/fixtures/requireGql/customImport/chainedImportsSchema.graphql
@@ -1,4 +1,5 @@
 #import "./levelOne.graphql"
+#import "./levelOneBis.graphql"
 
 type Query {
   levelOne: LevelOne

diff --git a/tests/fixtures/requireGql/customImport/levelOneBis.graphql b/tests/fixtures/requireGql/customImport/levelOneBis.graphql
@@ -0,0 +1,4 @@
+type LevelOneBis {
+  levelTwo: LevelTwo
+  levelTwoBis: LevelTwoBis
+}