Call formatError when passed in options to runQuery, fixes apollograp…

…hql#1439

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

@@ -13,6 +13,7 @@ import {
 import { runQuery } from '../runQuery';
 
 import { GraphQLExtensionStack, GraphQLExtension } from 'graphql-extensions';
+import { FormatErrorExtension } from '../formatters';
 
 const queryType = new GraphQLObjectType({
  name: 'QueryType',
@@ -419,4 +420,39 @@ describe('runQuery', () => {
  expect(ids.length).toBeGreaterThanOrEqual(2);
  });
  });
+
+ describe('formatError', () => {
+ it('is called with errors if passed in options', () => {
+ const formatError = jest.fn();
+ const query = `query { testError }`;
+ return runQuery({
+ schema,
+ queryString: query,
+ variables: { base: 1 },
+ request: new MockReq(),
+ formatError,
+ }).then(() => {
+ expect(formatError).toBeCalledTimes(1);
+ });
+ });
+
+ it('overrides FormatErrorExtension in extensions if passed', () => {
+ const formatError = jest.fn();
+ const extensionsFormatError = jest.fn();
+ const query = `query { testError }`;
+ return runQuery({
+ schema,
+ queryString: query,
+ variables: { base: 1 },
+ request: new MockReq(),
+ formatError,
+ extensions: [
+ () => new FormatErrorExtension(extensionsFormatError, false),
+ ],
+ }).then(() => {
+ expect(formatError).toBeCalledTimes(1);
+ expect(extensionsFormatError).toBeCalledTimes(0);
+ });
+ });
+ });
 });

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

@@ -32,6 +32,7 @@ import {
  ValidationError,
  SyntaxError,
 } from 'apollo-server-errors';
+import { FormatErrorExtension } from '../src/formatters';
 
 export interface GraphQLResponse {
  data?: object;
@@ -94,9 +95,28 @@ function doRunQuery(options: QueryOptions): Promise<GraphQLResponse> {
 
  const context = options.context || {};
 
+ let hasFormatError = false;
+
  // If custom extension factories were provided, create per-request extension
  // objects.
- const extensions = options.extensions ? options.extensions.map(f => f()) : [];
+ const extensions = options.extensions
+ ? options.extensions.map(f => {
+ const ext = f();
+ // If we've passed formatError as part of the options,
+ // ensure it overrides any FormatErrorExtension from the constructor.
+ if (options.formatError && !hasFormatError) {
+ if (ext instanceof FormatErrorExtension) {
+ hasFormatError = true;
+ return new FormatErrorExtension(options.formatError, debug);
+ }
+ }
+ return ext;
+ })
+ : [];
+
+ if (options.formatError && !hasFormatError) {
+ extensions.push(new FormatErrorExtension(options.formatError, debug));
+ }
 
  // If you're running behind an engineproxy, set these options to turn on
  // tracing and cache-control extensions.