.circleci/config.yml

@@ -20,10 +20,6 @@ references:
           prefix: coverage
 
 jobs:
-  build-node4:
-    docker:
-      - image: circleci/node:4
-    <<: *run_tests
   build-node6:
     docker:
       - image: circleci/node:6
@@ -48,11 +44,9 @@ workflows:
   version: 2
   build:
     jobs:
-      - build-node4
       - build-node6
       - build-node8
       - release:
           requires: 
-            - build-node4
             - build-node6
             - build-node8

README.md

@@ -1,6 +1,6 @@
 # graphql-import
 
-[![CircleCI](https://circleci.com/gh/prismagraphql/graphql-import.svg?style=shield)](https://circleci.com/gh/prismagraphql/graphql-import) [![npm version](https://badge.fury.io/js/graphql-import.svg)](https://badge.fury.io/js/graphql-import)
+[![CircleCI](https://circleci.com/gh/prisma/graphql-import.svg?style=shield)](https://circleci.com/gh/prisma/graphql-import) [![npm version](https://badge.fury.io/js/graphql-import.svg)](https://badge.fury.io/js/graphql-import)
 
 Import & export definitions in GraphQL SDL (also refered to as GraphQL modules)
 

package.json

@@ -35,16 +35,16 @@
       "cp ./now.json ./docs && cd docs && now --public -f && now alias && now rm --yes --safe graphql-import & cd .."
   },
   "peerDependencies": {
-    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0"
+    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
   },
   "devDependencies": {
-    "@types/graphql": "0.12.6",
+    "@types/graphql": "14.0.0",
     "@types/lodash": "4.14.116",
     "@types/resolve-from": "0.0.18",
     "@types/node": "9.6.31",
     "ava": "0.25.0",
     "ava-ts": "0.25.1",
-    "graphql": "0.13.2",
+    "graphql": "14.0.2",
     "nyc": "11.8.0",
     "tap-xunit": "2.3.0",
     "ts-node": "7.0.1",

src/index.ts

@@ -85,7 +85,7 @@ export function importSchema(
   schemas?: { [key: string]: string },
 ): string {
   const sdl = read(schema, schemas) || schema
-  const document = getDocumentFromSDL(sdl)
+  let document = getDocumentFromSDL(sdl)
 
   // Recursively process the imports, starting by importing all types from the initial schema
   let { allDefinitions, typeDefinitions } = collectDefinitions(
@@ -122,12 +122,14 @@ export function importSchema(
     }
   }
 
-  document.definitions = completeDefinitionPool(
-    flatten(allDefinitions),
-    firstSet,
-    flatten(typeDefinitions),
-  )
-
+  document = {
+    ...document,
+    definitions: completeDefinitionPool(
+      flatten(allDefinitions),
+      firstSet,
+      flatten(typeDefinitions),
+    ),
+  }
   // Return the schema as string
   return print(document)
 }
@@ -269,7 +271,7 @@ function collectDefinitions(
  */
 function filterImportedDefinitions(
   imports: string[],
-  typeDefinitions: DefinitionNode[],
+  typeDefinitions: ReadonlyArray<DefinitionNode>,
   allDefinitions: ValidDefinitionNode[][] = [],
 ): ValidDefinitionNode[] {
   // This should do something smart with fields
@@ -306,7 +308,7 @@ function filterImportedDefinitions(
       const fields = groupedFieldImports[rootType].map(x => x.split('.')[1])
       ;(filteredDefinitions.find(
         def => def.name.value === rootType,
-      ) as ObjectTypeDefinitionNode).fields = (filteredDefinitions.find(
+      ) as any).fields = (filteredDefinitions.find(
         def => def.name.value === rootType,
       ) as ObjectTypeDefinitionNode).fields.filter(
         f => includes(fields, f.name.value) || includes(fields, '*'),
@@ -324,7 +326,7 @@ function filterImportedDefinitions(
  * @returns Relevant type definitions
  */
 function filterTypeDefinitions(
-  definitions: DefinitionNode[],
+  definitions: ReadonlyArray<DefinitionNode>,
 ): ValidDefinitionNode[] {
   const validKinds = [
     'DirectiveDefinition',