Integrate graphql-http, refactor and comply with spec (v3)

examples/cloudflare-modules/__integration-tests__/index.spec.ts

@@ -32,7 +32,7 @@ test('should succeeds introspection query', async () => {
   const response = await worker.fetch(request)
 
   expect(response.status).toBe(200)
-  expect(response.headers.get('content-type')).toBe('application/json')
+  expect(response.headers.get('content-type')).toContain('application/json')
   expect(await response.json()).toMatchObject({
     data: {
       __schema: {

examples/express/__integration-tests__/express.spec.ts

@@ -15,7 +15,9 @@ function getTests(app: Express.Application) {
       .post('/graphql')
       .send({ query: '{ hello }' })
     expect(response.statusCode).toBe(200)
-    expect(response.headers['content-type']).toContain('application/json')
+    expect(response.headers['content-type']).toContain(
+      'application/graphql+json',
+    )
     expect(response.body).toStrictEqual({
       data: {
         hello: 'world',

examples/koa/__integration-tests__/koa.spec.ts

@@ -15,7 +15,9 @@ describe('koa', () => {
       .post('/graphql')
       .send({ query: '{ hello }' })
     expect(response.statusCode).toBe(200)
-    expect(response.headers['content-type']).toContain('application/json')
+    expect(response.headers['content-type']).toContain(
+      'application/graphql+json',
+    )
     expect(response.body).toStrictEqual({
       data: {
         hello: 'world',
@@ -27,7 +29,9 @@ describe('koa', () => {
       .post('/graphql')
       .send({ query: '{ isKoa }' })
     expect(response.statusCode).toBe(200)
-    expect(response.headers['content-type']).toContain('application/json')
+    expect(response.headers['content-type']).toContain(
+      'application/graphql+json',
+    )
     expect(response.body).toStrictEqual({
       data: {
         isKoa: true,

examples/service-worker/__integration-tests__/integration.spec.ts

@@ -111,7 +111,7 @@ describe('Service worker', () => {
     })
 
     expect(response.status).toBe(200)
-    expect(response.headers.get('content-type')).toBe('application/json')
+    expect(response.headers.get('content-type')).toContain('application/json')
     expect(await response.json()).toMatchObject({
       data: {
         __schema: {

packages/graphql-yoga/__tests__/accept-header.spec.ts

@@ -166,7 +166,11 @@ describe('accept header', () => {
         },
       },
     )
-    expect(response.status).toEqual(406)
+    expect(response.status).toEqual(200)
+    const body = await response.json()
+    expect(body.errors).toEqual([
+      { message: 'Subscriptions are not supported' },
+    ])
   })
 
   it('server rejects request for AsyncIterable source (defer/stream) when client only accepts application/json', async () => {
@@ -202,6 +206,10 @@ describe('accept header', () => {
         accept: 'application/json',
       },
     })
-    expect(response.status).toEqual(406)
+    expect(response.status).toEqual(200)
+    const body = await response.json()
+    expect(body.errors).toEqual([
+      { message: 'Subscriptions are not supported' },
+    ])
   })
 })

packages/graphql-yoga/__tests__/error-masking.spec.ts

@@ -145,12 +145,12 @@ describe('error masking', () => {
     }
   })
 
-  it('non GraphQLError raised in onRequestParse is masked with the correct status code 500', async () => {
+  it('non GraphQLError raised in onPrepare is masked with the correct status code 500', async () => {
     const yoga = createYoga({
       schema: createTestSchema(),
       plugins: [
         {
-          onRequestParse() {
+          onPrepare() {
             throw new Error('Some random error!')
           },
         },
@@ -160,6 +160,9 @@ describe('error masking', () => {
 
     const response = await yoga.fetch('http://yoga/graphql', {
       method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+      },
       body: JSON.stringify({ query: '{ hi hello }' }),
     })
 
@@ -186,15 +189,14 @@ describe('error masking', () => {
     })
     const body = JSON.parse(await response.text())
     expect(body).toMatchInlineSnapshot(`
-            Object {
-              "data": null,
-              "errors": Array [
-                Object {
-                  "message": "I like turtles",
-                },
-              ],
-            }
-          `)
+      Object {
+        "errors": Array [
+          Object {
+            "message": "I like turtles",
+          },
+        ],
+      }
+    `)
   })
 
   it('error thrown within context factory is masked', async () => {
@@ -213,15 +215,14 @@ describe('error masking', () => {
     })
     const body = JSON.parse(await response.text())
     expect(body).toMatchInlineSnapshot(`
-            Object {
-              "data": null,
-              "errors": Array [
-                Object {
-                  "message": "Unexpected error.",
-                },
-              ],
-            }
-          `)
+      Object {
+        "errors": Array [
+          Object {
+            "message": "Unexpected error.",
+          },
+        ],
+      }
+    `)
   })
 
   it('GraphQLError thrown within context factory with error masking is not masked', async () => {
@@ -240,15 +241,14 @@ describe('error masking', () => {
     })
     const body = JSON.parse(await response.text())
     expect(body).toMatchInlineSnapshot(`
-            Object {
-              "data": null,
-              "errors": Array [
-                Object {
-                  "message": "I like turtles",
-                },
-              ],
-            }
-          `)
+      Object {
+        "errors": Array [
+          Object {
+            "message": "I like turtles",
+          },
+        ],
+      }
+    `)
   })
 
   it('GraphQLError thrown within context factory has error extensions exposed on the response', async () => {
@@ -277,7 +277,6 @@ describe('error masking', () => {
     })
     const body = JSON.parse(await response.text())
     expect(body).toStrictEqual({
-      data: null,
       errors: [
         {
           message: 'I like turtles',
@@ -287,7 +286,7 @@ describe('error masking', () => {
         },
       ],
     })
-    expect(response.status).toEqual(200)
+    expect(response.status).toEqual(400)
   })
 
   it('parse error is not masked', async () => {
@@ -314,7 +313,6 @@ describe('error masking', () => {
     const body = JSON.parse(await response.text())
 
     expect(body).toEqual({
-      data: null,
       errors: [
         {
           locations: [
@@ -353,7 +351,6 @@ describe('error masking', () => {
     const body = JSON.parse(await response.text())
 
     expect(body).toEqual({
-      data: null,
       errors: [
         {
           locations: [

packages/graphql-yoga/__tests__/http-extensions.spec.ts

@@ -1,32 +1,25 @@
 import { GraphQLError } from 'graphql'
-import { createSchema, createYoga } from 'graphql-yoga'
+import { createYoga } from 'graphql-yoga'
 
 describe('GraphQLError.extensions.http', () => {
-  it('sets correct status code and headers for thrown GraphQLError in a resolver', async () => {
+  it('sets correct status code and headers for thrown GraphQLError in plugins', async () => {
     const yoga = createYoga({
-      schema: createSchema({
-        typeDefs: /* GraphQL */ `
-          type Query {
-            a: String
-          }
-        `,
-        resolvers: {
-          Query: {
-            a() {
-              throw new GraphQLError('A', {
-                extensions: {
-                  http: {
-                    status: 401,
-                    headers: {
-                      'www-authenticate': 'Bearer',
-                    },
+      plugins: [
+        {
+          onPrepare() {
+            throw new GraphQLError('A', {
+              extensions: {
+                http: {
+                  status: 401,
+                  headers: {
+                    'www-authenticate': 'Bearer',
                   },
                 },
-              })
-            },
+              },
+            })
           },
         },
-      }),
+      ],
       logging: false,
     })
 
@@ -39,120 +32,4 @@ describe('GraphQLError.extensions.http', () => {
     expect(response.status).toBe(401)
     expect(response.headers.get('www-authenticate')).toBe('Bearer')
   })
-
-  it('picks the highest status code and headers for GraphQLErrors thrown within multiple resolvers', async () => {
-    const yoga = createYoga({
-      schema: {
-        typeDefs: /* GraphQL */ `
-          type Query {
-            a: String
-            b: String
-          }
-        `,
-        resolvers: {
-          Query: {
-            a: () => {
-              throw new GraphQLError('A', {
-                extensions: {
-                  http: {
-                    status: 401,
-                  },
-                },
-              })
-            },
-            b: () => {
-              throw new GraphQLError('B', {
-                extensions: {
-                  http: {
-                    status: 503,
-                  },
-                },
-              })
-            },
-          },
-        },
-      },
-    })
-
-    const response = await yoga.fetch('http://yoga/graphql', {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ query: '{ a b }' }),
-    })
-
-    expect(response.status).toBe(503)
-
-    const body = JSON.parse(await response.text())
-    expect(body).toMatchObject({
-      data: {
-        a: null,
-        b: null,
-      },
-      errors: [
-        {
-          message: 'A',
-          path: ['a'],
-        },
-        {
-          message: 'B',
-          path: ['b'],
-        },
-      ],
-    })
-  })
-
-  it('picks the header of the last GraphQLError when multiple errors are thrown within multiple resolvers', async () => {
-    const yoga = createYoga({
-      schema: {
-        typeDefs: /* GraphQL */ `
-          type Query {
-            a: String
-            b: String
-          }
-        `,
-        resolvers: {
-          Query: {
-            a: () => {
-              throw new GraphQLError('', {
-                extensions: {
-                  http: {
-                    headers: {
-                      'x-foo': 'A',
-                    },
-                  },
-                },
-              })
-            },
-            b: () => {
-              throw new GraphQLError('DB is not available', {
-                extensions: {
-                  http: {
-                    headers: {
-                      'x-foo': 'B',
-                    },
-                  },
-                },
-              })
-            },
-          },
-        },
-      },
-    })
-
-    let response = await yoga.fetch('http://yoga/graphql', {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ query: '{ a b }' }),
-    })
-
-    expect(response.headers.get('x-foo')).toBe('B')
-
-    response = await yoga.fetch('http://yoga/graphql', {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ query: '{ b a }' }),
-    })
-
-    expect(response.headers.get('x-foo')).toBe('A')
-  })
 })

packages/graphql-yoga/__tests__/introspection.spec.ts

@@ -51,9 +51,11 @@ describe('introspection', () => {
     })
 
     expect(response.status).toBe(400)
-    expect(response.headers.get('content-type')).toBe('application/json')
+    expect(response.headers.get('content-type')).toBe(
+      'application/graphql+json; charset=utf-8',
+    )
     const body = await response.json()
-    expect(body.data).toBeNull()
+    expect(body.data).not.toBeDefined()
     expect(body.errors![0]).toMatchInlineSnapshot(`
             Object {
               "locations": Array [