chore(upstream): graphql v15 support

 - add code support for interfaces that implement interfaces
 - changes one implementation within tests to implement the interface implementer :)
 - removes some verbose tests to make the above changes more facile
 - do not call extendSchema after buildSchema as both now process extensions
 - use getIntrospectionQuery method instead of introspectionQuery object
 - type/lint changes
 - remove references to deprecated SchemaPrinter

.travis.yml

@@ -1,14 +1,14 @@
 language: node_js
 node_js:
-  - "8"
-  - "10"
+  - '13'
+  - '12'
+  - '10'
 
 install:
   - npm config set spin=false
   - npm install -g mocha coveralls
   - npm install
   - npm install graphql@$GRAPHQL_VERSION
-  - npm install @types/graphql@$TYPES_GRAPHQL_VERSION
 
 script:
   - npm test
@@ -19,4 +19,4 @@ script:
 sudo: false
 
 env:
-  - GRAPHQL_VERSION='^14.0' TYPES_GRAPHQL_VERSION='^14.0'
+  - GRAPHQL_VERSION='^15.0.0-rc.2'

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [9.0.0-graphql-15.0.0-rc.2.1.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.1.0) (2020-02-14)
+
+## [9.0.0-graphql-15.0.0-rc.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.0) (2020-02-14)
+
+## [9.0.0-graphql-15.0.0-rc.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.0) (2020-02-14)
+
+## [9.0.0-graphql-15.0.0-rc.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.0) (2020-02-14)
+
+## [9.0.0-graphql-15.0.0-rc.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.0) (2020-02-14)
+
+## [9.0.0-graphql-15.0.0-rc.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.4...v9.0.0-graphql-15.0.0-rc.2.0) (2020-02-14)
+
 ### [8.5.4](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.3...v8.5.4) (2020-02-13)
 
 ### [8.5.3](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.5.2...v8.5.3) (2020-02-13)
@@ -90,6 +102,10 @@ All notable changes to this project will be documented in this file. See [standa
 
 * **stitching:** custom scalars/enums ([fd1bd8f](https://github.com/yaacovCR/graphql-tools-fork/commit/fd1bd8fb55a357258e04d026bad661d39b316752))
 
+### Features
+
+* **graphql v15 support** See https://github.com/graphql/graphql-js/issues/2303.
+
 ## [8.2.0](https://github.com/yaacovCR/graphql-tools-fork/compare/v8.1.1...v8.2.0) (2020-01-06)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-tools-fork",
-  "version": "8.5.4",
+  "version": "9.0.0-graphql-15.0.0-rc.2.1.0",
   "description": "Forked graphql-tools, still more useful tools to create and manipulate GraphQL schemas.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,7 @@
     "uuid": "^3.4.0"
   },
   "peerDependencies": {
-    "graphql": "^14.2.0"
+    "graphql": "^15.0.0-rc.2"
   },
   "devDependencies": {
     "@types/apollo-upload-client": "^8.1.3",
@@ -84,7 +84,7 @@
     "eslint-watch": "^6.0.1",
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",
-    "graphql": "^14.5.8",
+    "graphql": "^15.0.0-rc.2",
     "graphql-subscriptions": "^1.1.0",
     "graphql-type-json": "^0.3.1",
     "graphql-upload": "^9.0.0",

src/generate/buildSchemaFromTypeDefinitions.ts

@@ -1,6 +1,5 @@
 import {
   parse,
-  extendSchema,
   buildASTSchema,
   GraphQLSchema,
   DocumentNode,
@@ -9,7 +8,6 @@ import {
 
 import { ITypeDefinitions, GraphQLParseOptions } from '../Interfaces';
 
-import extractExtensionDefinitions from './extractExtensionDefinitions';
 import concatenateTypeDefs from './concatenateTypeDefs';
 import SchemaError from './SchemaError';
 
@@ -40,16 +38,7 @@ function buildSchemaFromTypeDefinitions(
   const backcompatOptions = { commentDescriptions: true };
 
   // TODO fix types https://github.com/apollographql/graphql-tools/issues/542
-  let schema: GraphQLSchema = (buildASTSchema as any)(
-    astDocument,
-    backcompatOptions,
-  );
-
-  const extensionsAst = extractExtensionDefinitions(astDocument);
-  if (extensionsAst.definitions.length > 0) {
-    // TODO fix types https://github.com/apollographql/graphql-tools/issues/542
-    schema = (extendSchema as any)(schema, extensionsAst, backcompatOptions);
-  }
+  const schema: GraphQLSchema = buildASTSchema(astDocument, backcompatOptions);
 
   return schema;
 }

src/mock.ts

@@ -105,7 +105,6 @@ function addMocksToSchema({
     ): any => {
       // nullability doesn't matter for the purpose of mocking.
       const fieldType = getNullableType(type);
-      const namedFieldType = getNamedType(fieldType);
 
       if (fieldName && root && typeof root[fieldName] !== 'undefined') {
         let result: any;
@@ -129,7 +128,11 @@ function addMocksToSchema({
 
         // Now we merge the result with the default mock for this type.
         // This allows overriding defaults while writing very little code.
-        if (mockFunctionMap.has(namedFieldType.name)) {
+        const namedFieldType: GraphQLNamedType = getNamedType(fieldType);
+        if (
+          namedFieldType != null &&
+          mockFunctionMap.has(namedFieldType.name)
+        ) {
           const mock = mockFunctionMap.get(namedFieldType.name);
 
           result = mergeMocks(
@@ -200,7 +203,7 @@ function addMocksToSchema({
       // if we get to here, we don't have a value, and we don't have a mock for this type,
       // we could return undefined, but that would be hard to debug, so we throw instead.
       // however, we returning it instead of throwing it, so preserveResolvers can handle the failures.
-      return Error(`No mock defined for type "${fieldType.name}"`);
+      return Error(`No mock defined for type "${fieldType.name as string}"`);
     };
   };
 
@@ -369,16 +372,17 @@ function getResolveType(namedFieldType: GraphQLNamedType) {
 
 function assignResolveType(type: GraphQLType, preserveResolvers: boolean) {
   const fieldType = getNullableType(type);
-  const namedFieldType = getNamedType(fieldType);
+  const namedFieldType: GraphQLNamedType = getNamedType(fieldType);
 
   const oldResolveType = getResolveType(namedFieldType);
   if (preserveResolvers && oldResolveType != null && oldResolveType.length) {
     return;
   }
 
   if (
-    namedFieldType instanceof GraphQLUnionType ||
-    namedFieldType instanceof GraphQLInterfaceType
+    namedFieldType != null &&
+    (namedFieldType instanceof GraphQLUnionType ||
+      namedFieldType instanceof GraphQLInterfaceType)
   ) {
     // the default `resolveType` always returns null. We add a fallback
     // resolution that works with how unions and interface are mocked

src/stitching/introspectSchema.ts

@@ -2,7 +2,7 @@ import { ApolloLink } from 'apollo-link';
 import {
   GraphQLSchema,
   DocumentNode,
-  introspectionQuery,
+  getIntrospectionQuery,
   buildClientSchema,
   parse,
 } from 'graphql';
@@ -12,7 +12,7 @@ import { Fetcher } from '../Interfaces';
 import { combineErrors } from './errors';
 import linkToFetcher from './linkToFetcher';
 
-const parsedIntrospectionQuery: DocumentNode = parse(introspectionQuery);
+const parsedIntrospectionQuery: DocumentNode = parse(getIntrospectionQuery());
 
 export default function introspectSchema(
   linkOrFetcher: ApolloLink | Fetcher,

src/stitching/makeRemoteExecutableSchema.ts

@@ -8,7 +8,6 @@ import {
   BuildSchemaOptions,
   DocumentNode,
 } from 'graphql';
-import { Options as PrintSchemaOptions } from 'graphql/utilities/schemaPrinter';
 
 import { addResolversToSchema } from '../generate';
 import { Fetcher, Operation } from '../Interfaces';
@@ -40,7 +39,6 @@ export default function makeRemoteExecutableSchema({
   fetcher?: Fetcher;
   createResolver?: (fetcher: Fetcher) => GraphQLFieldResolver<any, any>;
   buildSchemaOptions?: BuildSchemaOptions;
-  printSchemaOptions?: PrintSchemaOptions;
 }): GraphQLSchema {
   let finalFetcher: Fetcher = fetcher;
 

src/stitching/typeFromAST.ts

@@ -87,6 +87,14 @@ function makeInterfaceType(
   return new GraphQLInterfaceType({
     name: node.name.value,
     fields: () => makeFields(node.fields),
+    interfaces: () =>
+      node.interfaces.map(
+        iface =>
+          createNamedStub(
+            iface.name.value,
+            'interface',
+          ) as GraphQLInterfaceType,
+      ),
     description: getDescription(node, backcompatOptions),
     resolveType: parent => resolveFromParentTypename(parent),
   });