Scaffold out new transport mechanisms

package.json

@@ -113,6 +113,7 @@
     "mock-req": "0.2.0",
     "nock": "10.0.6",
     "node-fetch": "2.3.0",
+    "node-mocks-http": "^1.8.1",
     "prettier": "1.19.1",
     "qs-middleware": "1.0.3",
     "request": "2.88.0",

v3/package.json

@@ -59,6 +59,7 @@
     "jest": "24.9.0",
     "jest-junit": "7.0.0",
     "jest-matcher-utils": "24.9.0",
+    "node-mocks-http": "^1.8.1",
     "ts-jest": "24.0.2",
     "typescript": "3.7.3"
   },

v3/src/__tests__/index.ts

@@ -1,7 +1,7 @@
 import { ApolloServer, gql } from "../index";
+import { GraphQLSchemaModule } from "../types";
 
-// TODO(AS3) Why can't I apply the `GraphQLSchemaModule` type here?
-const testModule = {
+const testModule: GraphQLSchemaModule = {
   typeDefs: gql`
     type Book {
       title: String
@@ -33,7 +33,9 @@ describe("ApolloServer", () => {
     const operation = await (new ApolloServer({
       modules: [testModule],
     })).executeOperation({
-      query: 'query GetBooks { books { author } }',
+      request: {
+        query: 'query GetBooks { books { author } }',
+      },
     });
 
     expect(operation).toHaveProperty(['data', 'books', 0, 'author']);

v3/src/execution/__tests__/__snapshots__/execution.test.ts.snap

@@ -373,7 +373,7 @@ exports[`parseGraphqlRequest Returns an error for invalid queries - empty select
 
 exports[`parseGraphqlRequest Returns an error for invalid queries - missing closing } 1`] = `[GraphQLError: Syntax Error: Expected Name, found <EOF>]`;
 
-exports[`processGraphqlRequest Executable queries - basic - { people { name } } 1`] = `
+exports[`processGraphqlRequestAgainstSchema Executable queries - basic - { people { name } } 1`] = `
 Object {
   "people": Array [
     Object {
@@ -392,7 +392,7 @@ Object {
 }
 `;
 
-exports[`processGraphqlRequest Executable queries - with directives - { people { name { friends { name } } } 1`] = `
+exports[`processGraphqlRequestAgainstSchema Executable queries - with directives - { people { name { friends { name } } } 1`] = `
 Object {
   "people": Array [
     Object {
@@ -455,7 +455,7 @@ Object {
 }
 `;
 
-exports[`processGraphqlRequest Executable queries - with multiple documents - { people { name } } 1`] = `
+exports[`processGraphqlRequestAgainstSchema Executable queries - with multiple documents - { people { name } } 1`] = `
 Object {
   "people": Array [
     Object {
@@ -474,7 +474,7 @@ Object {
 }
 `;
 
-exports[`processGraphqlRequest Executable queries - with nested selection sets - { people { name friends { name friends { name } } } } 1`] = `
+exports[`processGraphqlRequestAgainstSchema Executable queries - with nested selection sets - { people { name friends { name friends { name } } } } 1`] = `
 Object {
   "people": Array [
     Object {
@@ -669,38 +669,38 @@ Object {
 }
 `;
 
-exports[`processGraphqlRequest Invalid queries - basic 1`] = `
+exports[`processGraphqlRequestAgainstSchema Invalid queries - basic 1`] = `
 Array [
   [GraphQLError: Cannot query field "invalidField" on type "Query".],
 ]
 `;
 
-exports[`processGraphqlRequest Invalid queries - missing directive 1`] = `
+exports[`processGraphqlRequestAgainstSchema Invalid queries - missing directive 1`] = `
 Array [
   [GraphQLError: Unknown directive "invalid".],
 ]
 `;
 
-exports[`processGraphqlRequest Invalid queries - with invalid selection sets 1`] = `
+exports[`processGraphqlRequestAgainstSchema Invalid queries - with invalid selection sets 1`] = `
 Array [
   [GraphQLError: Cannot query field "invalidField" on type "Person".],
 ]
 `;
 
-exports[`processGraphqlRequest Invalid queries - with multiple errors 1`] = `
+exports[`processGraphqlRequestAgainstSchema Invalid queries - with multiple errors 1`] = `
 Array [
   [GraphQLError: Cannot query field "invalidOne" on type "Person".],
   [GraphQLError: Cannot query field "invalidTwo" on type "Query".],
 ]
 `;
 
-exports[`processGraphqlRequest Non-executable queries - error field throws 1`] = `
+exports[`processGraphqlRequestAgainstSchema Non-executable queries - error field throws 1`] = `
 Array [
   [GraphQLError: Error while resolving \`error\` field],
 ]
 `;
 
-exports[`processGraphqlRequest Non-executable queries - throws multiple errors 1`] = `
+exports[`processGraphqlRequestAgainstSchema Non-executable queries - throws multiple errors 1`] = `
 Array [
   [GraphQLError: Error while resolving \`error\` field],
   [GraphQLError: Error while resolving \`nestedError\` field],
@@ -710,19 +710,19 @@ Array [
 ]
 `;
 
-exports[`processGraphqlRequest Unparseable queries - empty query 1`] = `
+exports[`processGraphqlRequestAgainstSchema Unparseable queries - empty query 1`] = `
 Array [
   [GraphQLError: Syntax Error: Expected Name, found }],
 ]
 `;
 
-exports[`processGraphqlRequest Unparseable queries - empty selection set 1`] = `
+exports[`processGraphqlRequestAgainstSchema Unparseable queries - empty selection set 1`] = `
 Array [
   [GraphQLError: Syntax Error: Expected Name, found }],
 ]
 `;
 
-exports[`processGraphqlRequest Unparseable queries - missing closing } 1`] = `
+exports[`processGraphqlRequestAgainstSchema Unparseable queries - missing closing } 1`] = `
 Array [
   [GraphQLError: Syntax Error: Expected Name, found <EOF>],
 ]

v3/src/execution/__tests__/execution.test.ts

@@ -2,7 +2,7 @@ import {
   parseGraphqlRequest,
   validateGraphqlRequest,
   executeGraphqlRequest,
-  processGraphqlRequest
+  processGraphqlRequestAgainstSchema
 } from "..";
 import { astSerializer } from "../../snapshotSerializers";
 import { VariableValues, gql } from "apollo-server-core";
@@ -323,11 +323,11 @@ describe("executeGraphqlRequest", () => {
   );
 });
 
-describe("processGraphqlRequest", () => {
+describe("processGraphqlRequestAgainstSchema", () => {
   it.each(validQueryTests)(
     "Executable queries - %s",
     async (_, { query, operationName, variables }) => {
-      const { data, errors } = await processGraphqlRequest({
+      const { data, errors } = await processGraphqlRequestAgainstSchema({
         schema,
         request: {
           query,
@@ -344,7 +344,7 @@ describe("processGraphqlRequest", () => {
   it.each(unparseableQueryTests)(
     "Unparseable queries - %s",
     async (_, query) => {
-      const { errors } = await processGraphqlRequest({
+      const { errors } = await processGraphqlRequestAgainstSchema({
         schema,
         request: {
           query
@@ -358,7 +358,7 @@ describe("processGraphqlRequest", () => {
   it.each(invalidQueryTests)(
     "Invalid queries - %s",
     async (_, { query, operationName }) => {
-      const { errors } = await processGraphqlRequest({
+      const { errors } = await processGraphqlRequestAgainstSchema({
         schema,
         request: {
           query,
@@ -373,7 +373,7 @@ describe("processGraphqlRequest", () => {
   it.each(nonExecutableQueryTests)(
     "Non-executable queries - %s",
     async (_, { query }) => {
-      const { errors } = await processGraphqlRequest({
+      const { errors } = await processGraphqlRequestAgainstSchema({
         schema,
         request: {
           query
@@ -387,7 +387,7 @@ describe("processGraphqlRequest", () => {
 
   it("Passes a modifiable context object to resolvers", async () => {
     const context = Object.create(null);
-    const { data } = await processGraphqlRequest({
+    const { data } = await processGraphqlRequestAgainstSchema({
       schema,
       request: {
         query: graphql`
@@ -399,7 +399,7 @@ describe("processGraphqlRequest", () => {
       context
     });
 
-    expect(data!.modifiesContext).toBe("Context modified!");
+    expect(data && data.modifiesContext).toBe("Context modified!");
     expect(context).toHaveProperty("modified");
   });
 });