fix some conflict-types with Graphql

Author: iamchenxin

src/mutation/__tests__/mutation.js

@@ -92,7 +92,7 @@ describe('mutationWithClientMutationId()', () => {
         }
       }
     `;
-    var result = await graphql(schema, query);
+    var result:any = 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.');
   });

src/mutation/mutation.js

@@ -22,9 +22,8 @@ import type {
   GraphQLResolveInfo
 } from 'graphql';
 
-type mutationFn =
-  (object: Object, ctx: Object, info: GraphQLResolveInfo) => Object |
-  (object: Object, ctx: Object, info: GraphQLResolveInfo) => Promise<Object>;
+type mutationFn = (object: Object, ctx: mixed, info: GraphQLResolveInfo) =>
+  ( Object | Promise<Object> );
 
 function resolveMaybeThunk<T>(thingOrThunk: T | () => T): T {
   return typeof thingOrThunk === 'function' ? thingOrThunk() : thingOrThunk;

src/node/node.js

@@ -30,8 +30,7 @@ type GraphQLNodeDefinitions = {
   nodeField: GraphQLFieldConfig
 }
 
-type typeResolverFn = (object: any) => ?GraphQLObjectType |
-                      (object: any) => ?Promise<GraphQLObjectType>;
+type typeResolverFn = (object: any) => ?GraphQLObjectType;
 
 /**
  * Given a function to map from an ID to an underlying object, and a function
@@ -45,7 +44,7 @@ type typeResolverFn = (object: any) => ?GraphQLObjectType |
  */
 export function nodeDefinitions(
   idFetcher: ((id: string, context: any, info: GraphQLResolveInfo) => any),
-  typeResolver?: ?typeResolverFn
+  typeResolver?: typeResolverFn
 ): GraphQLNodeDefinitions {
   var nodeInterface = new GraphQLInterfaceType({
     name: 'Node',

src/node/plural.js

@@ -17,7 +17,10 @@ import type {
   GraphQLFieldConfig,
   GraphQLInputType,
   GraphQLOutputType,
-  GraphQLResolveInfo
+  GraphQLResolveInfo,
+  GraphQLScalarType,
+  GraphQLEnumType,
+  GraphQLInputObjectType
 } from 'graphql';
 
 type PluralIdentifyingRootFieldConfig = {
@@ -36,9 +39,7 @@ export function pluralIdentifyingRootField(
   inputArgs[config.argName] = {
     type: new GraphQLNonNull(
             new GraphQLList(
-              new GraphQLNonNull(
-                config.inputType
-              )
+              nonNull(config.inputType)
             )
           )
   };
@@ -56,3 +57,17 @@ export function pluralIdentifyingRootField(
     }
   };
 }
+
+type NonNullInputType = GraphQLNonNull<
+    GraphQLScalarType |
+    GraphQLEnumType |
+    GraphQLInputObjectType |
+    GraphQLList<GraphQLInputType> >;
+
+function nonNull(type:GraphQLInputType):NonNullInputType {
+  if ( type instanceof GraphQLNonNull) {
+    return type;
+  } else {
+    return new GraphQLNonNull(type);
+  }
+}