Merge branch 'v5.x' into auto-router-v2

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Changelog
 
+- **v4.2.2**
+  - fixed: withContent should return undefined if request.body is undefined
 - **v4.2.1**
   - maintenance: updated deps, test coverage, removed isomorphic-fetch dev dep
 - **v4.2.0**

src/withContent.spec.ts

@@ -45,13 +45,13 @@ describe('withContent (middleware)', () => {
     expect(handler).toHaveReturnedWith('bar')
   })
 
-  it('will return empty string (but not throw) if no body', async () => {
+  it('will return undefined (but not throw) if no body', async () => {
     const router = Router()
-    const handler = vi.fn(({ content }) => content ?? true)
+    const handler = vi.fn(({ content }) => content === undefined ? true : false)
     const request = new Request('https://foo.bar', { method: 'POST' })
 
     await router.post('/', withContent, handler).handle(request)
 
-    expect(handler).toHaveReturnedWith('')
+    expect(handler).toHaveReturnedWith(true)
   })
 })

src/withContent.ts

@@ -6,7 +6,9 @@ export type HasContent<ContentType> = {
 
 // withContent - embeds any request body as request.content
 export const withContent = async (request: IRequest): Promise<void> => {
-  request.content = await request.clone().json()
-                            .catch(() => request.clone().formData())
-                            .catch(() => request.text())
+  request.content = request.body
+    ? await request.clone().json()
+        .catch(() => request.clone().formData())
+        .catch(() => request.text())
+    : undefined
 }