README.md

@@ -4,7 +4,7 @@
 
 Import & export definitions in GraphQL SDL (also refered to as GraphQL modules)
 
-> There is also a [`graphql-import-loader`](https://github.com/graphcool/graphql-import-loader) for Webpack available.
+> There is also a [`graphql-import-loader`](https://github.com/prisma/graphql-import-loader) for Webpack available.
 
 ## Install
 
@@ -24,117 +24,68 @@ const resolvers = {}
 const schema = makeExecutableSchema({ typeDefs, resolvers })
 ```
 
-## Examples
-
-### Importing specific fields
-
 Assume the following directory structure:
 
 ```
 .
-├── a.graphql
-├── b.graphql
-└── c.graphql
+├── schema.graphql
+├── posts.graphql
+└── comments.graphql
 ```
 
-`a.graphql`
+`schema.graphql`
 
 ```graphql
-# import B from "b.graphql"
+# import Post from "posts.graphql"
 
-type A {
-  # test 1
-  first: String
-  second: Float
-  b: B
+type Query {
+  posts: [Post]
 }
 ```
 
-`b.graphql`
+`posts.graphql`
 
 ```graphql
-# import C from 'c.graphql'
+# import Comment from 'comments.graphql'
 
-type B {
-  c: C
-  hello: String!
-}
-```
-
-`c.graphql`
-
-```graphql
-type C {
+type Post {
+  comments: [Comment]
   id: ID!
+  text: String!
+  tags: [String]
 }
 ```
 
-Running `console.log(importSchema('a.graphql'))` produces the following output:
+`comments.graphql`
 
 ```graphql
-type A {
-  first: String
-  second: Float
-  b: B
-}
-
-type B {
-  c: C
-  hello: String!
-}
-
-type C {
+type Comment {
   id: ID!
+  text: String!
 }
 ```
 
-### Extending root fields
-
-It is possible to import from a root field like `Query`;
-
-`queries.graphql`
+Running `console.log(importSchema('schema.graphql'))` produces the following output:
 
 ```graphql
 type Query {
-  feed: [Post!]!
-  drafts: [Post!]!
+  posts: [Post]
 }
-```
-
-`mutations.graphql`
 
-```graphql
-type Mutation {
-  publish(id: ID!): Post!
-  deletePost(id: ID!): Post!
-}
-```
-
-`schema.graphql`
-
-```graphql
-# import Query.* from "queries.graphql"
-# import Mutation.publish from "mutations.graphql"
-```
-
-Running `console.log(importSchema('schema.graphql'))` produces the following output:
-
-```graphql
-type Query {
-  feed: [Post!]!
-  drafts: [Post!]!
+type Post {
+  comments: [Comment]
+  id: ID!
+  text: String!
+  tags: [String]
 }
 
-type Mutation {
-  publish(id: ID!): Post!
+type Comment {
+  id: ID!
+  text: String!
 }
 ```
 
-Please refer to [`src/index.test.ts`](https://github.com/graphcool/graphql-import/blob/master/src/index.test.ts) for more examples.
-
-## Development
-
-The [implementation documentation](https://graphql-import.now.sh/) documents how things are implemented under the hood. You can also use the VSCode test setup to debug your code/tests.
+## [Full documentation](https://oss.prisma.io/content/graphql-import/overview)
 
 ## Related topics & next steps
 

fixtures/collision/a.graphql

@@ -0,0 +1,6 @@
+# import * from "b.graphql"
+
+type User {
+  id: ID!
+  name: String!
+}

fixtures/collision/b.graphql

@@ -0,0 +1,5 @@
+type User {
+  id: ID!
+  name: String
+  intro: String
+}

fixtures/import-module/a.graphql

@@ -0,0 +1,6 @@
+# import B from 'graphql-import-test/b.graphql'
+
+type A {
+  id: ID!
+  author: B!
+}

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
+}

package.json

@@ -39,20 +39,22 @@
   },
   "devDependencies": {
     "@types/graphql": "0.12.6",
-    "@types/lodash": "4.14.109",
-    "@types/node": "9.6.18",
+    "@types/lodash": "4.14.116",
+    "@types/resolve-from": "0.0.18",
+    "@types/node": "9.6.31",
     "ava": "0.25.0",
-    "ava-ts": "0.24.5",
+    "ava-ts": "0.25.1",
     "graphql": "0.13.2",
     "nyc": "11.8.0",
     "tap-xunit": "2.3.0",
-    "ts-node": "6.0.3",
-    "tslint": "5.10.0",
+    "ts-node": "7.0.1",
+    "tslint": "5.11.0",
     "tslint-config-standard": "7.0.0",
     "typedoc": "0.11.1",
-    "typescript": "2.8.3"
+    "typescript": "3.0.1"
   },
   "dependencies": {
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "resolve-from": "^4.0.0"
   }
 }

src/index.test.ts

@@ -1,4 +1,5 @@
 import test from 'ava'
+import * as fs from 'fs'
 import { parseImportLine, parseSDL, importSchema } from '.'
 
 test('parseImportLine: parse single import', t => {
@@ -44,6 +45,13 @@ test('parseImportLine: different path', t => {
   })
 })
 
+test('parseImportLine: module in node_modules', t => {
+  t.deepEqual(parseImportLine(`import A from "module-name"`), {
+    imports: ['A'],
+    from: 'module-name',
+  })
+})
+
 test('parseSDL: non-import comment', t => {
   t.deepEqual(parseSDL(`#importent: comment`), [])
 })
@@ -65,6 +73,39 @@ test('parse: multi line import', t => {
   ])
 })
 
+test('Module in node_modules', t => {
+  const b = `\
+# import lower from './lower.graphql'
+type B {
+  id: ID!
+  nickname: String! @lower
+}
+`
+  const lower = `\
+directive @lower on FIELD_DEFINITION
+`
+  const expectedSDL = `\
+type A {
+  id: ID!
+  author: B!
+}
+
+type B {
+  id: ID!
+  nickname: String! @lower
+}
+
+directive @lower on FIELD_DEFINITION
+`
+  const moduleDir = 'node_modules/graphql-import-test'
+  if (!fs.existsSync(moduleDir)) {
+    fs.mkdirSync(moduleDir)
+  }
+  fs.writeFileSync(moduleDir + '/b.graphql', b)
+  fs.writeFileSync(moduleDir + '/lower.graphql', lower)
+  t.is(importSchema('fixtures/import-module/a.graphql'), expectedSDL)
+})
+
 test('importSchema: imports only', t => {
   const expectedSDL = `\
 type Query {
@@ -87,6 +128,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 {
@@ -744,3 +796,14 @@ test('missing type on directive', t => {
     `Directive first: Couldn't find type first in any of the schemas.`,
   )
 })
+
+test('import with collision', t => {
+  // Local type gets preference over imported type
+  const expectedSDL = `\
+type User {
+  id: ID!
+  name: String!
+}
+`
+  t.is(importSchema('fixtures/collision/a.graphql'), expectedSDL)
+})