Revert "Allow an optional function to resolve the rootValue (#1555)"

This reverts commit 4175f1b9cd.

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - FIXME(@abernix): Allow context to be passed to all GraphQLExtension methods.
 - FIXME(@abernix): client info in traces.
-- Allow an optional function to resolve the `rootValue`, passing the `DocumentNode` AST to determine the value. [PR #1555](https://github.com/apollographql/apollo-server/pull/1555)
+- FIXME(@abernix): Allow an optional function to resolve the `rootValue`, passing the `DocumentNode` AST to determine the value. [PR #1555](https://github.com/apollographql/apollo-server/pull/1555)
 - Follow-up on the work in [PR #1516](https://github.com/apollographql/apollo-server/pull/1516) to also fix missing insertion cursor/caret when a custom GraphQL configuration is specified which doesn't specify its own `cursorShape` property. [PR #1607](https://github.com/apollographql/apollo-server/pull/1607)
 
 ### v2.1.0

docs/source/api/apollo-server.md

@@ -51,21 +51,6 @@ new ApolloServer({
 		authScope: getScope(req.headers.authorization)
 	}),
 });
-```
-
-  * `rootValue`: <`Any`> | <`Function`>
-
-    A value or function called with the parsed `Document`, creating the root value passed to the graphql executor. The function is useful if you wish to provide a different root value based on the query operation type.
-
-```js
-new ApolloServer({
-  typeDefs,
-  resolvers,
-  rootValue: (documentAST) => ({
-    const op = getOperationAST(documentNode)
-    return op === 'mutation' ? mutationRoot : queryRoot;
-  })
-});
 ```
 
 * `mocks`: <`Object`> | <`Boolean`>

packages/apollo-server-core/src/__tests__/runQuery.test.ts

@@ -8,7 +8,6 @@ import {
   GraphQLInt,
   GraphQLNonNull,
   parse,
-  DocumentNode,
 } from 'graphql';
 
 import { runQuery } from '../runQuery';
@@ -176,22 +175,6 @@ describe('runQuery', () => {
     });
   });
 
-  it('correctly evaluates a rootValue function', () => {
-    const query = `{ testRootValue }`;
-    const expected = { testRootValue: 'it also works' };
-    return runQuery({
-      schema,
-      queryString: query,
-      rootValue: (doc: DocumentNode) => {
-        expect(doc.kind).toEqual('Document');
-        return 'it also';
-      },
-      request: new MockReq(),
-    }).then(res => {
-      expect(res.data).toEqual(expected);
-    });
-  });
-
   it('correctly passes in the context', () => {
     const query = `{ testContextValue }`;
     const expected = { testContextValue: 'it still works' };

packages/apollo-server-core/src/graphqlOptions.ts

@@ -2,7 +2,6 @@ import {
   GraphQLSchema,
   ValidationContext,
   GraphQLFieldResolver,
-  DocumentNode,
 } from 'graphql';
 import { GraphQLExtension } from 'graphql-extensions';
 import { CacheControlExtensionOptions } from 'apollo-cache-control';
@@ -14,7 +13,7 @@ import { DataSource } from 'apollo-datasource';
  *
  * - schema: an executable GraphQL schema used to fulfill requests.
  * - (optional) formatError: Formatting function applied to all errors before response is sent
- * - (optional) rootValue: rootValue passed to GraphQL execution, or a function to resolving the rootValue from the DocumentNode
+ * - (optional) rootValue: rootValue passed to GraphQL execution
  * - (optional) context: the context passed to GraphQL execution
  * - (optional) validationRules: extra validation rules applied to requests
  * - (optional) formatResponse: a function applied to each graphQL execution result
@@ -26,12 +25,11 @@ import { DataSource } from 'apollo-datasource';
 export interface GraphQLServerOptions<
   TContext =
     | (() => Promise<Record<string, any>> | Record<string, any>)
-    | Record<string, any>,
-  TRootVal = ((parsedQuery: DocumentNode) => any) | any
+    | Record<string, any>
 > {
   schema: GraphQLSchema;
   formatError?: Function;
-  rootValue?: TRootVal;
+  rootValue?: any;
   context?: TContext;
   validationRules?: Array<(context: ValidationContext) => any>;
   formatResponse?: Function;

packages/apollo-server-core/src/runQuery.ts

@@ -50,7 +50,7 @@ export interface QueryOptions {
   // a mutation), throw this error.
   nonQueryError?: Error;
 
-  rootValue?: ((parsedQuery: DocumentNode) => any) | any;
+  rootValue?: any;
   context?: any;
   variables?: { [key: string]: any };
   operationName?: string;
@@ -219,10 +219,7 @@ function doRunQuery(options: QueryOptions): Promise<GraphQLResponse> {
         const executionArgs: ExecutionArgs = {
           schema: options.schema,
           document: documentAST,
-          rootValue:
-            typeof options.rootValue === 'function'
-              ? options.rootValue(documentAST)
-              : options.rootValue,
+          rootValue: options.rootValue,
           contextValue: context,
           variableValues: options.variables,
           operationName: options.operationName,

packages/apollo-server-integration-testsuite/src/index.ts

@@ -12,8 +12,6 @@ import {
   GraphQLScalarType,
   introspectionQuery,
   BREAK,
-  DocumentNode,
-  getOperationAST,
 } from 'graphql';
 
 import request = require('supertest');
@@ -852,40 +850,6 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
         });
       });
 
-      it('passes the rootValue function result to the resolver', async () => {
-        const expectedQuery = 'query: it passes rootValue';
-        const expectedMutation = 'mutation: it passes rootValue';
-        app = await createApp({
-          graphqlOptions: {
-            schema,
-            rootValue: (documentNode: DocumentNode) => {
-              const op = getOperationAST(documentNode, undefined);
-              return op.operation === 'query'
-                ? expectedQuery
-                : expectedMutation;
-            },
-          },
-        });
-        const queryReq = request(app)
-          .post('/graphql')
-          .send({
-            query: 'query test{ testRootValue }',
-          });
-        return queryReq.then(res => {
-          expect(res.status).toEqual(200);
-          expect(res.body.data.testRootValue).toEqual(expectedQuery);
-        });
-        const mutationReq = request(app)
-          .post('/graphql')
-          .send({
-            query: 'mutation test{ testMutation(echo: "ping") }',
-          });
-        return mutationReq.then(res => {
-          expect(res.status).toEqual(200);
-          expect(res.body.data.testRootValue).toEqual(expectedMutation);
-        });
-      });
-
       it('returns errors', async () => {
         const expected = 'Secret error message';
         app = await createApp({