fix: should handle empty content (HTTP 204) (#23)

* fix: should handle empty content (HTTP 204)

* feat: re-implement by checking Content-Type

* update test

src/index.test.ts

@@ -307,12 +307,22 @@ describe('delete()', () => {
       params: { path: { post_id: '123' } },
     });
 
-    // assert correct URL was called
-    expect(fetchMocker.mock.calls[0][0]).toBe('/post/123');
+    // assert correct data was returned
+    expect(data).toEqual({});
+
+    // assert error is empty
+    expect(error).toBe(undefined);
+  });
+
+  it('returns empty object on Content-Length: 0', async () => {
+    const client = createClient<paths>();
+    fetchMocker.mockResponseOnce(() => ({ headers: { 'Content-Length': 0 }, status: 200, body: '' }));
+    const { data, error, response } = await client.del('/post/{post_id}', {
+      params: { path: { post_id: '123' } },
+    });
 
     // assert correct data was returned
     expect(data).toEqual({});
-    expect(response.status).toBe(204);
 
     // assert error is empty
     expect(error).toBe(undefined);

src/index.ts

@@ -101,7 +101,7 @@ export default function createClient<T>(options?: ClientOptions) {
   });
 
   async function coreFetch<U extends keyof T, M extends keyof T[U]>(url: U, fetchOptions: FetchOptions<T[U][M]>): Promise<FetchResponse<T[U][M]>> {
-    let { headers, body, params = {}, querySerializer = (q: any) => new URLSearchParams(q).toString(), ...init } = fetchOptions || {};
+    let { headers, body: requestBody, params = {}, querySerializer = (q: any) => new URLSearchParams(q).toString(), ...init } = fetchOptions || {};
 
     // URL
     let finalURL = `${options?.baseUrl ?? ''}${url as string}`;
@@ -123,19 +123,23 @@ export default function createClient<T>(options?: ClientOptions) {
       ...options,
       ...init,
       headers: baseHeaders,
-      body: typeof body === 'string' ? body : JSON.stringify(body),
+      body: typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody),
     });
+    const respHeaders = res.headers;
     const response: TruncatedResponse = {
       bodyUsed: res.bodyUsed,
-      headers: res.headers,
+      headers: respHeaders,
       ok: res.ok,
       redirected: res.redirected,
       status: res.status,
       statusText: res.statusText,
       type: res.type,
       url: res.url,
     };
-    return res.ok ? { data: res.status === 204 ? {} : await res.json(), response } : { error: await res.json(), response };
+
+    const contentLength = res.headers.get('Content-Length');
+    const bodyParsed = res.status !== 204 && contentLength !== '0' ? await res.json() : {};
+    return res.ok ? { data: bodyParsed, response } : { error: bodyParsed, response };
   }
 
   return {