.circleci/config.yml

@@ -3,8 +3,7 @@ references:
   run_tests: &run_tests
     steps:
       - checkout
-      - run: sudo npm install -g yarn
-      - run: yarn install
+      - run: yarn
       - run:
           name: test
           command: |
@@ -31,14 +30,14 @@ jobs:
     <<: *run_tests
   build-node8:
     docker:
-      - image: circleci/node
+      - image: circleci/node:8
     <<: *run_tests
   release:
     docker: 
-      - image: circleci/node
+      - image: circleci/node:latest
     steps: 
       - checkout
-      - run: sudo npm install -g yarn semantic-release@12.0.0
+      - run: sudo npm install -g semantic-release
       - run: yarn install
       - run: semantic-release
       - run: yarn docs

fixtures/global/a.graphql

@@ -0,0 +1,6 @@
+# import * from "shared"
+
+type A {
+  first: String
+  second: Shared
+}

fixtures/interfaces-implements-many/a.graphql

@@ -0,0 +1,5 @@
+# import B from "b.graphql"
+
+type A implements B {
+  id: ID!
+}

fixtures/interfaces-implements-many/b.graphql

@@ -0,0 +1,11 @@
+interface B {
+  id: ID!
+}
+
+type B1 implements B {
+  id: ID!
+}
+
+type B2 implements B {
+  id: ID!
+}

fixtures/interfaces-many/a.graphql

@@ -0,0 +1,7 @@
+# import B from "b.graphql"
+
+type A implements B {
+  # test 1
+  first: String
+  second: Float
+}

fixtures/interfaces-many/b.graphql

@@ -0,0 +1,6 @@
+# import C from "c.graphql"
+
+interface B {
+  second: Float
+  c: [C!]!
+}

fixtures/interfaces-many/c.graphql

@@ -0,0 +1,5 @@
+# import D1, D2 from "d.graphql"
+
+type C implements D1 & D2 {
+  c: ID!
+}

fixtures/interfaces-many/d.graphql

@@ -0,0 +1,7 @@
+interface D1 {
+  d1: ID!
+}
+
+interface D2 {
+  d2: ID!
+}

package.json

@@ -46,18 +46,18 @@
   },
   "devDependencies": {
     "@types/graphql": "0.12.6",
-    "@types/lodash": "4.14.106",
-    "@types/node": "9.6.0",
+    "@types/lodash": "4.14.108",
+    "@types/node": "9.6.7",
     "ava": "0.25.0",
-    "ava-ts": "0.24.2",
+    "ava-ts": "0.24.4",
     "graphql": "0.13.2",
-    "nyc": "11.6.0",
+    "nyc": "11.7.1",
     "tap-xunit": "2.3.0",
-    "ts-node": "4.1.0",
+    "ts-node": "6.0.1",
     "tslint": "5.9.1",
     "tslint-config-standard": "7.0.0",
     "typedoc": "0.11.1",
-    "typescript": "2.7.2"
+    "typescript": "2.8.3"
   },
   "dependencies": {
     "lodash": "^4.17.4"

renovate.json

@@ -1,6 +1,7 @@
 {
   "extends": [
-    "config:base"
+    "config:base",
+    "docker:disable"
   ],
   "automerge": true,
   "major": {

src/index.test.ts

@@ -363,6 +363,33 @@ type C {
   t.is(importSchema('fixtures/interfaces/a.graphql'), expectedSDL)
 })
 
+test('importSchema: interfaces-many', t => {
+  const expectedSDL = `\
+type A implements B {
+  first: String
+  second: Float
+}
+
+interface B {
+  second: Float
+  c: [C!]!
+}
+
+type C implements D1 & D2 {
+  c: ID!
+}
+
+interface D1 {
+  d1: ID!
+}
+
+interface D2 {
+  d2: ID!
+}
+`
+  t.is(importSchema('fixtures/interfaces-many/a.graphql'), expectedSDL)
+})
+
 test('importSchema: interfaces-implements', t => {
   const expectedSDL = `\
 type A implements B {
@@ -380,6 +407,27 @@ type B1 implements B {
   t.is(importSchema('fixtures/interfaces-implements/a.graphql'), expectedSDL)
 })
 
+test('importSchema: interfaces-implements-many', t => {
+  const expectedSDL = `\
+type A implements B {
+  id: ID!
+}
+
+interface B {
+  id: ID!
+}
+
+type B1 implements B {
+  id: ID!
+}
+
+type B2 implements B {
+  id: ID!
+}
+`
+  t.is(importSchema('fixtures/interfaces-implements-many/a.graphql'), expectedSDL)
+})
+
 test('importSchema: input types', t => {
   const expectedSDL = `\
 type A {
@@ -524,6 +572,25 @@ input PostFilter {
   t.is(actualSDL, expectedSDL)
 })
 
+test('global schema modules', t => {
+  const shared = `
+    type Shared {
+      first: String
+    }
+  `
+  const expectedSDL = `\
+type A {
+  first: String
+  second: Shared
+}
+
+type Shared {
+  first: String
+}
+`
+  t.is(importSchema('fixtures/global/a.graphql', { shared }), expectedSDL)
+})
+
 test('missing type on type', t => {
   const err = t.throws(() => importSchema('fixtures/type-not-found/a.graphql'), Error)
   t.is(err.message, `Field test: Couldn't find type Post in any of the schemas.`)

src/index.ts

@@ -197,7 +197,9 @@ function collectDefinitions(
   // Process each file (recursively)
   rawModules.forEach(m => {
     // If it was not yet processed (in case of circular dependencies)
-    const moduleFilePath = isFile(filePath) ? path.resolve(path.join(dirname, m.from)) : m.from
+    const moduleFilePath = isFile(filePath) && isFile(m.from)
+      ? path.resolve(path.join(dirname, m.from))
+      : m.from
     if (!processedFiles.has(moduleFilePath)) {
       collectDefinitions(
         m.imports,