README.md

@@ -48,7 +48,7 @@ npm create hono@latest my-app
 ## Features
 
 - **Ultrafast** 🚀 - The router `RegExpRouter` is really fast. Not using linear loops. Fast.
-- **Lightweight** 🪶 - The `hono/tiny` preset is under 12kB. Hono has zero dependencies and uses only the Web Standard API.
+- **Lightweight** 🪶 - The `hono/tiny` preset is under 14kB. Hono has zero dependencies and uses only the Web Standard API.
 - **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute, Deno, Bun, Lagon, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
 - **Batteries Included** 🔋 - Hono has built-in middleware, custom middleware, and third-party middleware. Batteries included.
 - **Delightful DX** 😃 - Super clean APIs. First-class TypeScript support. Now, we've got "Types".

deno_dist/README.md

@@ -48,7 +48,7 @@ npm create hono@latest my-app
 ## Features
 
 - **Ultrafast** 🚀 - The router `RegExpRouter` is really fast. Not using linear loops. Fast.
-- **Lightweight** 🪶 - The `hono/tiny` preset is under 12kB. Hono has zero dependencies and uses only the Web Standard API.
+- **Lightweight** 🪶 - The `hono/tiny` preset is under 14kB. Hono has zero dependencies and uses only the Web Standard API.
 - **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute, Deno, Bun, Lagon, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
 - **Batteries Included** 🔋 - Hono has built-in middleware, custom middleware, and third-party middleware. Batteries included.
 - **Delightful DX** 😃 - Super clean APIs. First-class TypeScript support. Now, we've got "Types".

deno_dist/context.ts

@@ -6,7 +6,7 @@ import { serialize } from './utils/cookie.ts'
 import { resolveStream } from './utils/html.ts'
 import type { StatusCode } from './utils/http-status.ts'
 import { StreamingApi } from './utils/stream.ts'
-import type { JSONValue, InterfaceToType } from './utils/types.ts'
+import type { JSONValue, InterfaceToType, JSONParsed } from './utils/types.ts'
 
 type HeaderRecord = Record<string, string | string[]>
 type Data = string | ArrayBuffer | ReadableStream
@@ -57,15 +57,15 @@ interface JSONRespond {
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     >
   <T>(object: InterfaceToType<T> extends JSONValue ? T : JSONValue, init?: ResponseInit): Response &
     TypedResponse<
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     >
 }
@@ -230,17 +230,11 @@ export class Context<
       })
     }
 
-    // Return Response immediately if arg is ResponseInit.
     if (arg && typeof arg !== 'number') {
-      const res = new Response(data, arg)
-      const contentType = this.#preparedHeaders?.['content-type']
-      if (contentType) {
-        res.headers.set('content-type', contentType)
-      }
-      return res
+      this.res = new Response(data, arg)
     }
 
-    const status = arg ?? this.#status
+    let status = typeof arg === 'number' ? arg : this.#status
     this.#preparedHeaders ??= {}
 
     this.#headers ??= new Headers()
@@ -255,6 +249,7 @@ export class Context<
       for (const [k, v] of Object.entries(this.#preparedHeaders)) {
         this.#headers.set(k, v)
       }
+      status = this.#res.status
     }
 
     headers ??= {}
@@ -313,7 +308,7 @@ export class Context<
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     > => {
     const body = JSON.stringify(object)

deno_dist/utils/types.ts

@@ -25,8 +25,11 @@ export type IntersectNonAnyTypes<T extends any[]> = T extends [infer Head, ...in
 
 export type JSONPrimitive = string | boolean | number | null | undefined
 export type JSONArray = (JSONPrimitive | JSONObject | JSONArray)[]
-export type JSONObject = { [key: string]: JSONPrimitive | JSONArray | JSONObject }
+export type JSONObject = { [key: string]: JSONPrimitive | JSONArray | JSONObject | object }
 export type JSONValue = JSONObject | JSONArray | JSONPrimitive
+export type JSONParsed<T> = {
+  [k in keyof T]: T[k] extends JSONValue ? T[k] : string
+}
 
 export type InterfaceToType<T> = T extends Function ? T : { [K in keyof T]: InterfaceToType<T[K]> }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.11.4",
+  "version": "3.11.5",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",

src/client/client.test.ts

@@ -500,15 +500,14 @@ describe('Merge path with `app.route()`', () => {
     expect(data.ok).toBe(true)
   })
 
-  it('Should not allow the incorrect JSON type', async () => {
+  it('Should allow a Date object and return it as a string', async () => {
     const app = new Hono()
-    // @ts-expect-error
     const route = app.get('/api/foo', (c) => c.json({ datetime: new Date() }))
     type AppType = typeof route
     const client = hc<AppType>('http://localhost')
     const res = await client.api.foo.$get()
-    const data = await res.json()
-    type verify = Expect<Equal<never, typeof data>>
+    const { datetime } = await res.json()
+    type verify = Expect<Equal<string, typeof datetime>>
   })
 
   describe('Multiple endpoints', () => {

src/context.test.ts

@@ -205,6 +205,16 @@ describe('Context header', () => {
     const res = c.text('foo')
     expect(res.headers.get('Content-Type')).toMatch(/^text\/plain/)
   })
+
+  it('Should set header values if the #this.headers is set and the arg is ResponseInit', async () => {
+    c.header('foo', 'bar')
+    const res = c.body('foo', {
+      headers: {
+        'Content-Type': 'text/plain',
+      },
+    })
+    expect(res.headers.get('foo')).toBe('bar')
+  })
 })
 
 describe('Pass a ResponseInit to respond methods', () => {

src/context.ts

@@ -6,7 +6,7 @@ import { serialize } from './utils/cookie'
 import { resolveStream } from './utils/html'
 import type { StatusCode } from './utils/http-status'
 import { StreamingApi } from './utils/stream'
-import type { JSONValue, InterfaceToType } from './utils/types'
+import type { JSONValue, InterfaceToType, JSONParsed } from './utils/types'
 
 type HeaderRecord = Record<string, string | string[]>
 type Data = string | ArrayBuffer | ReadableStream
@@ -57,15 +57,15 @@ interface JSONRespond {
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     >
   <T>(object: InterfaceToType<T> extends JSONValue ? T : JSONValue, init?: ResponseInit): Response &
     TypedResponse<
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     >
 }
@@ -230,17 +230,11 @@ export class Context<
       })
     }
 
-    // Return Response immediately if arg is ResponseInit.
     if (arg && typeof arg !== 'number') {
-      const res = new Response(data, arg)
-      const contentType = this.#preparedHeaders?.['content-type']
-      if (contentType) {
-        res.headers.set('content-type', contentType)
-      }
-      return res
+      this.res = new Response(data, arg)
     }
 
-    const status = arg ?? this.#status
+    let status = typeof arg === 'number' ? arg : this.#status
     this.#preparedHeaders ??= {}
 
     this.#headers ??= new Headers()
@@ -255,6 +249,7 @@ export class Context<
       for (const [k, v] of Object.entries(this.#preparedHeaders)) {
         this.#headers.set(k, v)
       }
+      status = this.#res.status
     }
 
     headers ??= {}
@@ -313,7 +308,7 @@ export class Context<
       InterfaceToType<T> extends JSONValue
         ? JSONValue extends InterfaceToType<T>
           ? never
-          : T
+          : JSONParsed<T>
         : never
     > => {
     const body = JSON.stringify(object)

src/utils/types.ts

@@ -25,8 +25,11 @@ export type IntersectNonAnyTypes<T extends any[]> = T extends [infer Head, ...in
 
 export type JSONPrimitive = string | boolean | number | null | undefined
 export type JSONArray = (JSONPrimitive | JSONObject | JSONArray)[]
-export type JSONObject = { [key: string]: JSONPrimitive | JSONArray | JSONObject }
+export type JSONObject = { [key: string]: JSONPrimitive | JSONArray | JSONObject | object }
 export type JSONValue = JSONObject | JSONArray | JSONPrimitive
+export type JSONParsed<T> = {
+  [k in keyof T]: T[k] extends JSONValue ? T[k] : string
+}
 
 export type InterfaceToType<T> = T extends Function ? T : { [K in keyof T]: InterfaceToType<T[K]> }