Merge pull request #6 from koh110/dev

fix defaultFetcher

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiny-type-api/client",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "main": "./dist/esm/src/index.js",
   "types": "./dist/esm/src/index.d.ts",

packages/client/src/index.ts

@@ -134,9 +134,12 @@ async function defaultFetcher<T>(options: {
     init.body = options.form
   }
   const res = await fetch(options.url, init)
-  const body = options.headers['Content-Type']?.includes('application/json')
-    ? await res.json()
-    : await res.text()
+  let body = undefined
+  if ((Number(res.headers.get('content-length')) ?? 0) > 0) {
+    body = options.headers['Content-Type']?.includes('application/json')
+      ? await res.json()
+      : await res.text()
+  }
   return {
     ok: res.ok,
     status: res.status,

packages/client/src/indext.test.ts

@@ -51,7 +51,17 @@ const { apis } = defineApis({
         }
       }
     }
-  }
+  },
+  '/api/void': {
+    PUT: {
+      request: {},
+      response: {
+        200: {
+          body: define<void>()
+        }
+      }
+    }
+  },
 })
 
 import { createClients } from './index.js'
@@ -68,9 +78,12 @@ test('clients', async () => {
   const resMock = {
     ok: true,
     status: 200,
+    headers: {
+      get: vi.fn().mockReturnValue('64')
+    },
     json: async () => ({ name: 'user-name' })
-  } satisfies Pick<Response, 'ok' | 'status' | 'json'>
-  requestMock.mockResolvedValue(resMock as Response)
+  } satisfies Pick<Response, 'ok' | 'status' | 'json'> & { headers: Pick<Response['headers'], 'get'> }
+  requestMock.mockResolvedValue(resMock as unknown as Response)
 
   const res = await clients['/api/user/:user_id'].POST.client({
     headers: {
@@ -96,15 +109,51 @@ test('clients', async () => {
   )
 })
 
+test('clients: void response body', async () => {
+  const requestMock = vi.mocked(fetch).mockReset()
+  type Response = Awaited<ReturnType<typeof fetch>>
+  const jsonFn = vi.fn()
+  const textFn = vi.fn()
+  const resMock = {
+    ok: true,
+    status: 200,
+    headers: {
+      get: vi.fn().mockReturnValue('0')
+    },
+    json: jsonFn,
+    text: textFn
+  } satisfies Pick<Response, 'ok' | 'status' | 'json' | 'text'> & { headers: Pick<Response['headers'], 'get'> }
+  requestMock.mockResolvedValue(resMock as unknown as Response)
+
+  const res = await clients['/api/void'].PUT.client({})
+
+  expect(res.ok).toStrictEqual(true)
+  expect(res.status).toStrictEqual(200)
+  expect(requestMock).toBeCalledTimes(1)
+  expect(requestMock).toBeCalledWith(
+    'https://localhost:8000/api/void',
+    {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' }
+    }
+  )
+  expect(jsonFn).toBeCalledTimes(0)
+  expect(textFn).toBeCalledTimes(0)
+})
+
+
 test('clients: FormData', async () => {
   const requestMock = vi.mocked(fetch).mockReset()
   type Response = Awaited<ReturnType<typeof fetch>>
   const resMock = {
     ok: true,
     status: 200,
+    headers: {
+      get: vi.fn().mockReturnValue('64')
+    },
     text: async () => 'user-name'
-  } satisfies Pick<Response, 'ok' | 'status' | 'text'>
-  requestMock.mockResolvedValue(resMock as Response)
+  } satisfies Pick<Response, 'ok' | 'status' | 'text'> & { headers: Pick<Response['headers'], 'get'> }
+  requestMock.mockResolvedValue(resMock as unknown as Response)
 
   const iconData = new Blob()
 

packages/examples/dist/src/universal.d.ts

@@ -95,4 +95,14 @@ export declare const apis: {
             };
         };
     };
+    "/api/void": {
+        PUT: {
+            request: {};
+            response: {
+                200: {
+                    body: (args: void) => void;
+                };
+            };
+        };
+    };
 };