Merge pull request #41 from MatthewKennedy/feature/widen-scope-of-json

Allow for 'application/vnd.api+json' response.

Author: marcelolx

__tests__/fetch_request.js

@@ -91,7 +91,7 @@ describe('header handling', () => {
     test('json', async () => {
       const jsonRequest = new FetchRequest("get", "localhost", { responseKind: 'json' })
       expect(jsonRequest.fetchOptions.headers)
-        .toStrictEqual({...defaultHeaders, 'Accept' : 'application/json'})
+        .toStrictEqual({...defaultHeaders, 'Accept' : 'application/json, application/vnd.api+json'})
     })
     test('turbo-stream', async () => {
       const turboRequest = new FetchRequest("get", "localhost", { responseKind: 'turbo-stream' })
@@ -235,4 +235,4 @@ describe('query params are parsed', () => {
     const emptyQueryRequest = new FetchRequest("get", "localhost/test")
     expect(emptyQueryRequest.url).toBe("localhost/test")
   })
-})
+})

__tests__/fetch_response.js

@@ -52,12 +52,27 @@ describe('body accessors', () => {
       expect({ json: 'body' }).toStrictEqual(await testResponse.json)
     })
     test('rejects on invalid content-type', async () => {
-      const mockResponse = new Response("<h1>hi</h1>", { status: 200, headers: new Headers({'Content-Type': 'text/plain'}) })
+      const mockResponse = new Response("<h1>hi</h1>", { status: 200, headers: new Headers({'Content-Type': 'text/json'}) })
       const testResponse = new FetchResponse(mockResponse)
 
       expect(testResponse.json).rejects.toBeInstanceOf(Error)
     })
   })
+  describe('application/vnd.api+json', () => {
+    test('works multiple times', async () => {
+      const mockResponse = new Response(JSON.stringify({ json: 'body' }), { status: 200, headers: new Headers({'Content-Type': 'application/vnd.api+json'}) })
+      const testResponse = new FetchResponse(mockResponse)
+
+      expect({ json: 'body' }).toStrictEqual(await testResponse.json)
+      expect({ json: 'body' }).toStrictEqual(await testResponse.json)
+    })
+    test('rejects on invalid content-type', async () => {
+      const mockResponse = new Response("<h1>hi</h1>", { status: 200, headers: new Headers({'Content-Type': 'application/plain'}) })
+      const testResponse = new FetchResponse(mockResponse)
+
+      expect(testResponse.json).rejects.toBeInstanceOf(Error)
+    })
+  })
   describe('turbostream', () => {
     const mockTurboStreamMessage = `
       <turbo-stream action="append" target="mock_collection"><template>

src/fetch_request.js

@@ -84,7 +84,7 @@ export class FetchRequest {
       case 'turbo-stream':
         return 'text/vnd.turbo-stream.html, text/html, application/xhtml+xml'
       case 'json':
-        return 'application/json'
+        return 'application/json, application/vnd.api+json'
       default:
         return '*/*'
     }

src/fetch_response.js

@@ -46,7 +46,7 @@ export class FetchResponse {
   }
 
   get json () {
-    if (this.contentType.match(/^application\/json/)) {
+    if (this.contentType.match(/^application\/.*json$/)) {
       return this.responseJson || (this.responseJson = this.response.json())
     }