@apollo/gateway 0.26.0-alpha.2 → 0.26.3

package/dist/utilities/graphql.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSelections = exports.printWithReducedWhitespace = exports.astFromType = exports.allNodesAreOfSameKind = exports.getResponseName = void 0;
+exports.parseSelections = exports.astFromType = exports.allNodesAreOfSameKind = exports.getResponseName = void 0;
 const graphql_1 = require("graphql");
+const assert_1 = require("./assert");
 function getResponseName(node) {
     return node.alias ? node.alias.value : node.name.value;
 }
@@ -25,15 +26,11 @@ function astFromType(type) {
     }
 }
 exports.astFromType = astFromType;
-function printWithReducedWhitespace(ast) {
-    return graphql_1.print(ast)
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-exports.printWithReducedWhitespace = printWithReducedWhitespace;
 function parseSelections(source) {
-    return graphql_1.parse(`query { ${source} }`)
-        .definitions[0].selectionSet.selections;
+    const parsed = graphql_1.parse(`{${source}}`);
+    assert_1.assert(parsed.definitions.length === 1, `Invalid FieldSet provided: '${source}'. FieldSets may not contain operations within them.`);
+    return parsed.definitions[0].selectionSet
+        .selections;
 }
 exports.parseSelections = parseSelections;
 //# sourceMappingURL=graphql.js.map

package/dist/utilities/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/utilities/graphql.ts"],"names":[],"mappings":";;;AAAA,qCAeiB;AAEjB,SAAgB,eAAe,CAAC,IAAe;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACzD,CAAC;AAFD,0CAEC;AAED,SAAgB,qBAAqB,CACnC,SAAY,EACZ,cAAyB;IAEzB,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AALD,sDAKC;AAKD,SAAgB,WAAW,CAAC,IAAiB;IAC3C,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAE;QACpB,OAAO,EAAE,IAAI,EAAE,cAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;KACjE;SAAM,IAAI,uBAAa,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,EAAE,IAAI,EAAE,cAAI,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;KACrE;SAAM;QACL,OAAO;YACL,IAAI,EAAE,cAAI,CAAC,UAAU;YACrB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE;SAC5C,CAAC;KACH;AACH,CAAC;AAXD,kCAWC;AAED,SAAgB,0BAA0B,CAAC,GAAY;IACrD,OAAO,eAAK,CAAC,GAAG,CAAC;SACd,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,IAAI,EAAE,CAAC;AACZ,CAAC;AAJD,gEAIC;AAED,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAQ,eAAK,CAAC,WAAW,MAAM,IAAI,CAAC;SACjC,WAAW,CAAC,CAAC,CAA6B,CAAC,YAAY,CAAC,UAAU,CAAC;AACxE,CAAC;AAHD,0CAGC"}
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/utilities/graphql.ts"],"names":[],"mappings":";;;AAAA,qCAciB;AACjB,qCAAkC;AAElC,SAAgB,eAAe,CAAC,IAAe;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACzD,CAAC;AAFD,0CAEC;AAED,SAAgB,qBAAqB,CACnC,SAAY,EACZ,cAAyB;IAEzB,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AALD,sDAKC;AAKD,SAAgB,WAAW,CAAC,IAAiB;IAC3C,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAE;QACpB,OAAO,EAAE,IAAI,EAAE,cAAI,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;KACjE;SAAM,IAAI,uBAAa,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,EAAE,IAAI,EAAE,cAAI,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;KACrE;SAAM;QACL,OAAO;YACL,IAAI,EAAE,cAAI,CAAC,UAAU;YACrB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE;SAC5C,CAAC;KACH;AACH,CAAC;AAXD,kCAWC;AAUD,SAAgB,eAAe,CAAC,MAAc;IAC5C,MAAM,MAAM,GAAG,eAAK,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC;IACpC,eAAM,CACJ,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAC/B,+BAA+B,MAAM,sDAAsD,CAC5F,CAAC;IACF,OAAQ,MAAM,CAAC,WAAW,CAAC,CAAC,CAA6B,CAAC,YAAY;SACnE,UAAU,CAAC;AAChB,CAAC;AARD,0CAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "0.26.0-alpha.2",
+  "version": "0.26.3",
   "description": "Apollo Gateway",
   "author": "Apollo <opensource@apollographql.com>",
   "main": "dist/index.js",
@@ -25,15 +25,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/federation": "^0.23.0-alpha.0",
-    "@apollo/query-planner": "^0.1.0-alpha.1",
-    "@types/node-fetch": "2.5.8",
-    "apollo-graphql": "^0.6.0",
+    "@apollo/federation": "^0.23.2",
+    "@apollo/query-planner": "^0.1.2",
+    "@types/node-fetch": "2.5.10",
+    "apollo-graphql": "^0.9.2",
     "apollo-reporting-protobuf": "^0.6.0",
     "apollo-server-caching": "^0.6.0",
-    "apollo-server-core": "^2.21.0",
+    "apollo-server-core": "^2.23.0",
     "apollo-server-env": "^3.0.0",
-    "apollo-server-errors": "^2.4.2",
+    "apollo-server-errors": "^2.5.0",
     "apollo-server-types": "^0.7.0",
     "loglevel": "^1.6.1",
     "make-fetch-happen": "^8.0.0",
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "graphql": "^14.5.0 || ^15.0.0"
   },
-  "gitHead": "d06ab0b92b03a3d3c4d241d94266653fc71695c3"
+  "gitHead": "86161e5b21a65d9d6c872e1446201214542eca11"
 }

package/src/__tests__/buildQueryPlan.test.ts

@@ -1,20 +1,20 @@
 import { GraphQLSchema } from 'graphql';
 import gql from 'graphql-tag';
-import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan';
+import { buildOperationContext } from '../operationContext';
 import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
 import { getFederatedTestingSchema } from './execution-utils';
-import { QueryPlannerPointer } from '@apollo/query-planner';
+import { QueryPlanner } from '@apollo/query-planner';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);
 
 describe('buildQueryPlan', () => {
   let schema: GraphQLSchema;
-  let queryPlannerPointer: QueryPlannerPointer;
+  let queryPlanner: QueryPlanner;
 
   beforeEach(() => {
     expect(
-      () => ({ schema, queryPlannerPointer } = getFederatedTestingSchema()),
+      () => ({ schema, queryPlanner } = getFederatedTestingSchema()),
     ).not.toThrow();
   });
 
@@ -39,12 +39,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       }),
     );
 
@@ -83,12 +81,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -119,12 +115,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -208,12 +202,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -341,12 +333,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -385,12 +375,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -428,12 +416,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -485,12 +471,10 @@ describe('buildQueryPlan', () => {
 
         const operationDocument = gql(operationString);
 
-        const queryPlan = buildQueryPlan(
+        const queryPlan = queryPlanner.buildQueryPlan(
           buildOperationContext({
             schema,
             operationDocument,
-            operationString,
-            queryPlannerPointer,
           })
         );
 
@@ -543,12 +527,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -602,12 +584,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -657,12 +637,10 @@ describe('buildQueryPlan', () => {
 
         const operationDocument = gql(operationString);
 
-        const queryPlan = buildQueryPlan(
+        const queryPlan = queryPlanner.buildQueryPlan(
           buildOperationContext({
             schema,
             operationDocument,
-            operationString,
-            queryPlannerPointer,
           })
         );
 
@@ -714,12 +692,10 @@ describe('buildQueryPlan', () => {
 
         const operationDocument = gql(operationString);
 
-        const queryPlan = buildQueryPlan(
+        const queryPlan = queryPlanner.buildQueryPlan(
           buildOperationContext({
             schema,
             operationDocument,
-            operationString,
-            queryPlannerPointer,
           })
         );
 
@@ -771,12 +747,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -829,12 +803,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -875,12 +847,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -951,12 +921,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -1008,12 +976,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -1060,12 +1026,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         }),
         { autoFragmentization: true },
       );
@@ -1185,12 +1149,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         }),
         { autoFragmentization: true },
       );
@@ -1222,12 +1184,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         }),
         { autoFragmentization: true },
       );
@@ -1270,12 +1230,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         }),
         { autoFragmentization: true },
       );
@@ -1414,12 +1372,10 @@ describe('buildQueryPlan', () => {
 
     const operationDocument = gql(operationString);
 
-    const queryPlan = buildQueryPlan(
+    const queryPlan = queryPlanner.buildQueryPlan(
       buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       })
     );
 
@@ -1478,12 +1434,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 
@@ -1530,12 +1484,10 @@ describe('buildQueryPlan', () => {
 
       const operationDocument = gql(operationString);
 
-      const queryPlan = buildQueryPlan(
+      const queryPlan = queryPlanner.buildQueryPlan(
         buildOperationContext({
           schema,
           operationDocument,
-          operationString,
-          queryPlannerPointer,
         })
       );
 

package/src/__tests__/executeQueryPlan.test.ts

@@ -3,12 +3,12 @@ import { addResolversToSchema, GraphQLResolverMap } from 'apollo-graphql';
 import gql from 'graphql-tag';
 import { GraphQLRequestContext } from 'apollo-server-types';
 import { AuthenticationError } from 'apollo-server-core';
-import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan';
+import { buildOperationContext } from '../operationContext';
 import { executeQueryPlan } from '../executeQueryPlan';
 import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource';
 import { astSerializer, queryPlanSerializer } from 'apollo-federation-integration-testsuite';
 import { getFederatedTestingSchema } from './execution-utils';
-import { QueryPlannerPointer } from '@apollo/query-planner';
+import { QueryPlanner } from '@apollo/query-planner';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);
@@ -33,7 +33,7 @@ describe('executeQueryPlan', () => {
   }
 
   let schema: GraphQLSchema;
-  let queryPlannerPointer: QueryPlannerPointer;
+  let queryPlanner: QueryPlanner;
 
   beforeEach(() => {
     expect(
@@ -41,7 +41,7 @@ describe('executeQueryPlan', () => {
         ({
           serviceMap,
           schema,
-          queryPlannerPointer,
+          queryPlanner,
         } = getFederatedTestingSchema()),
     ).not.toThrow();
   });
@@ -75,11 +75,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -116,11 +114,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -180,11 +176,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -260,11 +254,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -364,11 +356,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -415,11 +405,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -491,11 +479,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -530,11 +516,9 @@ describe('executeQueryPlan', () => {
       const operationContext = buildOperationContext({
         schema,
         operationDocument,
-        operationString,
-        queryPlannerPointer,
       });
 
-      const queryPlan = buildQueryPlan(operationContext);
+      const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
       const response = await executeQueryPlan(
         queryPlan,
@@ -568,11 +552,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -663,11 +645,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const requestContext = buildRequestContext();
     requestContext.request.variables = { first: 3 };
@@ -764,11 +744,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const requestContext = buildRequestContext();
     requestContext.request.variables = { locale: 'en-US' };
@@ -844,10 +822,8 @@ describe('executeQueryPlan', () => {
       operationDocument: gql`
         ${getIntrospectionQuery()}
       `,
-      operationString: getIntrospectionQuery(),
-      queryPlannerPointer,
     });
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -876,11 +852,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -922,11 +896,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -979,11 +951,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -1023,11 +993,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -1080,11 +1048,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,
@@ -1131,11 +1097,9 @@ describe('executeQueryPlan', () => {
     const operationContext = buildOperationContext({
       schema,
       operationDocument,
-      operationString,
-      queryPlannerPointer,
     });
 
-    const queryPlan = buildQueryPlan(operationContext);
+    const queryPlan = queryPlanner.buildQueryPlan(operationContext);
 
     const response = await executeQueryPlan(
       queryPlan,