Update to support [email protected]

Author: leebyron

package.json

@@ -42,7 +42,7 @@
     "babel-runtime": "^6.9.0"
   },
   "peerDependencies": {
-    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0"
+    "graphql": "^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0-b"
   },
   "devDependencies": {
     "babel-cli": "6.18.0",
@@ -75,7 +75,7 @@
     "eslint-plugin-babel": "3.3.0",
     "eslint-plugin-flowtype": "2.25.0",
     "flow-bin": "0.35.0",
-    "graphql": "0.7.0",
+    "graphql": "0.8.2",
     "isparta": "4.0.0",
     "mocha": "3.1.2",
     "sane": "1.4.1"

src/connection/connection.js

@@ -21,6 +21,7 @@ import type {
   GraphQLFieldConfigArgumentMap,
   GraphQLFieldConfigMap,
   GraphQLFieldResolver,
+  Thunk,
 } from 'graphql';
 
 /**
@@ -63,16 +64,16 @@ type ConnectionConfig = {
   nodeType: GraphQLObjectType,
   resolveNode?: ?GraphQLFieldResolver<*, *>,
   resolveCursor?: ?GraphQLFieldResolver<*, *>,
-  edgeFields?: ?(() => GraphQLFieldConfigMap) | ?GraphQLFieldConfigMap,
-  connectionFields?: ?(() => GraphQLFieldConfigMap) | ?GraphQLFieldConfigMap,
+  edgeFields?: ?Thunk<GraphQLFieldConfigMap<*, *>>,
+  connectionFields?: ?Thunk<GraphQLFieldConfigMap<*, *>>,
 };
 
 type GraphQLConnectionDefinitions = {
   edgeType: GraphQLObjectType,
   connectionType: GraphQLObjectType
 };
 
-function resolveMaybeThunk<T>(thingOrThunk: T | () => T): T {
+function resolveMaybeThunk<T>(thingOrThunk: Thunk<T>): T {
   return typeof thingOrThunk === 'function' ? thingOrThunk() : thingOrThunk;
 }
 

src/mutation/__tests__/mutation.js

@@ -99,12 +99,17 @@ describe('mutationWithClientMutationId()', () => {
         }
       }
     `;
-    const result = await graphql(schema, query);
-    expect(result.errors.length).to.equal(1);
-    expect(result.errors[0].message).to.equal(
-      'Field "simpleMutation" argument "input" of type "SimpleMutationInput!" ' +
-      'is required but not provided.'
-    );
+    expect(await graphql(schema, query)).to.deep.equal({
+      errors: [
+        {
+          message:
+            'Field "simpleMutation" argument "input" of type ' +
+            '"SimpleMutationInput!" is required but not provided.',
+          locations: [ { line: 3, column: 9 } ],
+          path: undefined
+        }
+      ]
+    });
   });
 
   it('returns the same client mutation ID', async () => {

src/mutation/mutation.js

@@ -17,9 +17,10 @@ import {
 
 import type {
   GraphQLFieldConfig,
-  InputObjectConfigFieldMap,
+  GraphQLInputFieldConfigMap,
   GraphQLFieldConfigMap,
-  GraphQLResolveInfo
+  GraphQLResolveInfo,
+  Thunk,
 } from 'graphql';
 
 type mutationFn = (
@@ -28,7 +29,7 @@ type mutationFn = (
   info: GraphQLResolveInfo
 ) => Promise<any> | any;
 
-function resolveMaybeThunk<T>(thingOrThunk: T | () => T): T {
+function resolveMaybeThunk<T>(thingOrThunk: Thunk<T>): T {
   return typeof thingOrThunk === 'function' ? thingOrThunk() : thingOrThunk;
 }
 
@@ -48,8 +49,8 @@ function resolveMaybeThunk<T>(thingOrThunk: T | () => T): T {
  */
 type MutationConfig = {
   name: string,
-  inputFields: InputObjectConfigFieldMap,
-  outputFields: GraphQLFieldConfigMap,
+  inputFields: Thunk<GraphQLInputFieldConfigMap>,
+  outputFields: Thunk<GraphQLFieldConfigMap<*, *>>,
   mutateAndGetPayload: mutationFn,
 };
 
@@ -59,7 +60,7 @@ type MutationConfig = {
  */
 export function mutationWithClientMutationId(
   config: MutationConfig
-): GraphQLFieldConfig {
+): GraphQLFieldConfig<*, *> {
   const { name, inputFields, outputFields, mutateAndGetPayload } = config;
   const augmentedInputFields = () => ({
     ...resolveMaybeThunk(inputFields),

src/node/node.js

@@ -16,8 +16,8 @@ import {
 
 import type {
   GraphQLFieldConfig,
-  GraphQLObjectType,
-  GraphQLResolveInfo
+  GraphQLResolveInfo,
+  GraphQLTypeResolver
 } from 'graphql';
 
 import {
@@ -27,13 +27,9 @@ import {
 
 type GraphQLNodeDefinitions = {
   nodeInterface: GraphQLInterfaceType,
-  nodeField: GraphQLFieldConfig
+  nodeField: GraphQLFieldConfig<*, *>
 };
 
-type typeResolverFn = (
-  object: any
-) => ?GraphQLObjectType | ?Promise<GraphQLObjectType>;
-
 /**
  * Given a function to map from an ID to an underlying object, and a function
  * to map from an underlying object to the concrete GraphQLObjectType it
@@ -44,9 +40,9 @@ type typeResolverFn = (
  * handled with the `isTypeOf` method on object types, as with any GraphQL
  * interface without a provided `resolveType` method.
  */
-export function nodeDefinitions(
-  idFetcher: ((id: string, context: any, info: GraphQLResolveInfo) => any),
-  typeResolver?: ?typeResolverFn
+export function nodeDefinitions<TContext>(
+  idFetcher: ((id: string, context: TContext, info: GraphQLResolveInfo) => any),
+  typeResolver?: ?GraphQLTypeResolver<*, TContext>
 ): GraphQLNodeDefinitions {
   const nodeInterface = new GraphQLInterfaceType({
     name: 'Node',
@@ -70,10 +66,10 @@ export function nodeDefinitions(
         description: 'The ID of an object'
       }
     },
-    resolve: (obj, {id}, context, info) => idFetcher(id, context, info),
+    resolve: (obj, { id }, context, info) => idFetcher(id, context, info),
   };
 
-  return {nodeInterface, nodeField};
+  return { nodeInterface, nodeField };
 }
 
 type ResolvedGlobalId = {
@@ -111,7 +107,7 @@ export function fromGlobalId(globalId: string): ResolvedGlobalId {
 export function globalIdField(
   typeName?: ?string,
   idFetcher?: (object: any, context: any, info: GraphQLResolveInfo) => string
-): GraphQLFieldConfig {
+): GraphQLFieldConfig<*, *> {
   return {
     name: 'id',
     description: 'The ID of an object',

src/node/plural.js

@@ -34,13 +34,17 @@ type PluralIdentifyingRootFieldConfig = {
 
 export function pluralIdentifyingRootField(
   config: PluralIdentifyingRootFieldConfig
-): GraphQLFieldConfig {
+): GraphQLFieldConfig<*, *> {
   const inputArgs = {};
+  let inputType = config.inputType;
+  if (inputType instanceof GraphQLNonNull) {
+    inputType = inputType.ofType;
+  }
   inputArgs[config.argName] = {
     type: new GraphQLNonNull(
       new GraphQLList(
         new GraphQLNonNull(
-          config.inputType
+          inputType
         )
       )
     )