fix: Use defaultMergedResolver from graphql-tools (#264)

* Use defaultMergedResolver from graphql-tools

1. defaultMergedResolver is also an alias aware resolver and can be used in place of customFieldResolver - #216
2. We still need an alias aware resolver for this - https://github.com/graphcool/prisma/issues/1896 and defaultMergedResolver serves as one having no need for us to maintain a customFieldResolver
3. This is an ongoing disucssion to permanently mitigate this issue - dotansimha/graphql-binding#80

* resolve yarn.lock conflict

Author: Divyendu Singh

package.json

@@ -61,7 +61,7 @@
     "graphql-playground-middleware-express": "1.6.3",
     "graphql-playground-middleware-lambda": "1.6.1",
     "graphql-subscriptions": "^0.5.8",
-    "graphql-tools": "^2.23.1",
+    "graphql-tools": "^2.24.0",
     "subscriptions-transport-ws": "^0.9.8"
   },
   "devDependencies": {

src/customFieldResolver.ts

@@ -21,12 +21,11 @@ import {
 import { importSchema } from 'graphql-import'
 import { deflate } from 'graphql-deduplicator'
 import expressPlayground from 'graphql-playground-middleware-express'
-import { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools'
+import { makeExecutableSchema, addMockFunctionsToSchema, defaultMergedResolver } from 'graphql-tools'
 import { applyMiddleware as applyFieldMiddleware } from 'graphql-middleware'
 import { createServer, Server as HttpServer } from 'http'
 import { createServer as createHttpsServer, Server as HttpsServer } from 'https'
 import * as path from 'path'
-import customFieldResolver from './customFieldResolver'
 import { SubscriptionServer } from 'subscriptions-transport-ws'
 
 import {
@@ -262,11 +261,11 @@ export class GraphQLServer {
           formatError: this.options.formatError || defaultErrorFormatter,
           logFunction: this.options.logFunction,
           rootValue: this.options.rootValue,
-          validationRules:
+          validationRules: this.options.validationRules,
             typeof this.options.validationRules === 'function'
               ? this.options.validationRules(request, response)
               : this.options.validationRules,
-          fieldResolver: this.options.fieldResolver || customFieldResolver,
+          fieldResolver: this.options.fieldResolver || defaultMergedResolver,
           formatParams: this.options.formatParams,
           formatResponse: formatResponse(request),
           debug: this.options.debug,

src/index.ts

@@ -3,10 +3,9 @@ import * as fs from 'fs'
 import { GraphQLSchema } from 'graphql'
 import { importSchema } from 'graphql-import'
 import lambdaPlayground from 'graphql-playground-middleware-lambda'
-import { makeExecutableSchema } from 'graphql-tools'
+import { makeExecutableSchema, defaultMergedResolver } from 'graphql-tools'
 import { deflate } from 'graphql-deduplicator'
 import * as path from 'path'
-import customFieldResolver from './customFieldResolver'
 
 import { LambdaOptions, LambdaProps } from './types'
 
@@ -121,7 +120,7 @@ export class GraphQLServerLambda {
         logFunction: this.options.logFunction,
         rootValue: this.options.rootValue,
         validationRules: this.options.validationRules,
-        fieldResolver: this.options.fieldResolver || customFieldResolver,
+        fieldResolver: this.options.fieldResolver || defaultMergedResolver,
         formatParams: this.options.formatParams,
         formatResponse: formatResponse(event),
         debug: this.options.debug,

src/lambda.ts

@@ -1873,7 +1873,7 @@ graphql-subscriptions@^0.5.8:
   dependencies:
     iterall "^1.2.1"
 
-graphql-tools@^2.23.1:
+graphql-tools@^2.23.1, graphql-tools@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.24.0.tgz#bbacaad03924012a0edb8735a5e65df5d5563675"
   dependencies: