hono 4.12.28 → 4.12.30

package/dist/adapter/aws-lambda/handler.js

@@ -348,10 +348,7 @@ var defaultIsContentTypeBinary = (contentType) => {
   );
 };
 var isContentEncodingBinary = (contentEncoding) => {
-  if (contentEncoding === null) {
-    return false;
-  }
-  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+  return !!contentEncoding && !/^identity$/i.test(contentEncoding);
 };
 export {
   ALBProcessor,

package/dist/adapter/lambda-edge/handler.js

@@ -15,21 +15,31 @@ var convertHeaders = (headers) => {
 var handle = (app) => {
   return async (event, ...args) => {
     const [context, callback] = args;
+    let callbackError = null;
+    let callbackResult;
     const res = await app.fetch(createRequest(event), {
       event,
       context,
       callback: (err, result) => {
+        if (!callbackError && !callbackResult) {
+          callbackError = err;
+          callbackResult = result;
+        }
         callback?.(err, result);
       },
       config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });
-    return createResult(res);
+    if (callbackError) {
+      throw callbackError;
+    }
+    return callbackResult ?? createResult(res);
   };
 };
 var createResult = async (res) => {
-  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
+  const contentEncoding = res.headers.get("content-encoding");
+  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "") || !!contentEncoding && !/^identity$/i.test(contentEncoding);
   const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
   return {
     status: res.status.toString(),

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -378,10 +378,7 @@ const defaultIsContentTypeBinary = (contentType) => {
   );
 };
 const isContentEncodingBinary = (contentEncoding) => {
-  if (contentEncoding === null) {
-    return false;
-  }
-  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+  return !!contentEncoding && !/^identity$/i.test(contentEncoding);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/adapter/lambda-edge/handler.js

@@ -48,21 +48,31 @@ const convertHeaders = (headers) => {
 const handle = (app) => {
   return async (event, ...args) => {
     const [context, callback] = args;
+    let callbackError = null;
+    let callbackResult;
     const res = await app.fetch(createRequest(event), {
       event,
       context,
       callback: (err, result) => {
+        if (!callbackError && !callbackResult) {
+          callbackError = err;
+          callbackResult = result;
+        }
         callback?.(err, result);
       },
       config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });
-    return createResult(res);
+    if (callbackError) {
+      throw callbackError;
+    }
+    return callbackResult ?? createResult(res);
   };
 };
 const createResult = async (res) => {
-  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
+  const contentEncoding = res.headers.get("content-encoding");
+  const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "") || !!contentEncoding && !/^identity$/i.test(contentEncoding);
   const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
   return {
     status: res.status.toString(),

package/dist/cjs/client/client.js

@@ -184,7 +184,16 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   });
   if (method) {
     options ??= {};
-    const args = (0, import_utils.deepMerge)(options, { ...opts.args[1] });
+    const reqOptions = { ...opts.args[1] };
+    const baseHeaders = options.headers;
+    const reqHeaders = reqOptions.headers;
+    if (baseHeaders && reqHeaders) {
+      reqOptions.headers = async () => ({
+        ...typeof baseHeaders === "function" ? await baseHeaders() : baseHeaders,
+        ...typeof reqHeaders === "function" ? await reqHeaders() : reqHeaders
+      });
+    }
+    const args = (0, import_utils.deepMerge)(options, reqOptions);
     return req.fetch(opts.args[0], args);
   }
   return req;

package/dist/cjs/client/utils.js

@@ -36,7 +36,7 @@ const mergePath = (base, path) => {
 };
 const replaceUrlParam = (urlString, params) => {
   for (const [k, v] of Object.entries(params)) {
-    const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??");
+    const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??(?=/|$)");
     urlString = urlString.replace(reg, v ? `/${v}` : "");
   }
   return urlString;

package/dist/cjs/middleware/cache/index.js

@@ -55,7 +55,7 @@ const cache = (options) => {
   );
   const addHeader = (c, responseVary) => {
     if (cacheControlDirectives) {
-      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0]) ?? [];
+      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0].toLowerCase()) ?? [];
       for (const directive of cacheControlDirectives) {
         let [name, value] = directive.trim().split("=", 2);
         name = name.toLowerCase();

package/dist/cjs/middleware/compress/index.js

@@ -57,7 +57,8 @@ const compress = (options) => {
   return async function compress2(ctx, next) {
     await next();
     const contentLength = ctx.res.headers.get("Content-Length");
-    if (ctx.res.headers.has("Content-Encoding") || // already encoded
+    if (ctx.res.status === 206 || // partial content, Content-Range refers to the uncompressed bytes
+    ctx.res.headers.has("Content-Encoding") || // already encoded
     ctx.res.headers.has("Transfer-Encoding") || // already encoded or chunked
     ctx.req.method === "HEAD" || // HEAD request
     contentLength && Number(contentLength) < threshold || // content-length below threshold

package/dist/cjs/middleware/etag/index.js

@@ -70,7 +70,8 @@ const etag = (options) => {
       }
       etag3 = weak ? `W/"${hash}"` : `"${hash}"`;
     }
-    if (etagMatches(etag3, ifNoneMatch)) {
+    const matched = ifNoneMatch === "*" ? (c.req.method === "GET" || c.req.method === "HEAD") && res.ok : etagMatches(etag3, ifNoneMatch);
+    if (matched) {
       c.res = new Response(null, {
         status: 304,
         statusText: "Not Modified",

package/dist/cjs/middleware/method-override/index.js

@@ -80,11 +80,13 @@ const methodOverride = (options) => async function methodOverride2(c, next) {
     if (method) {
       const url = new URL(c.req.url);
       url.searchParams.delete(queryName);
-      const request = new Request(url.toString(), {
+      const requestInit = {
         body: c.req.raw.body,
         headers: c.req.raw.headers,
-        method
-      });
+        method,
+        duplex: c.req.raw.body ? "half" : void 0
+      };
+      const request = new Request(url.toString(), requestInit);
       return app.fetch(request, c.env, getExecutionCtx(c));
     }
   }

package/dist/cjs/router/trie-router/node.js

@@ -155,6 +155,15 @@ class Node {
             if (m) {
               params[name] = m[0];
               this.#pushHandlerSets(handlerSets, child, method, node.#params, params);
+              if (m[0].length === restPathString.length && child.#children["*"]) {
+                this.#pushHandlerSets(
+                  handlerSets,
+                  child.#children["*"],
+                  method,
+                  node.#params,
+                  params
+                );
+              }
               if (hasChildren(child.#children)) {
                 child.#params = params;
                 const componentCount = m[0].match(/\//)?.length ?? 0;

package/dist/client/client.js

@@ -170,7 +170,16 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   });
   if (method) {
     options ??= {};
-    const args = deepMerge(options, { ...opts.args[1] });
+    const reqOptions = { ...opts.args[1] };
+    const baseHeaders = options.headers;
+    const reqHeaders = reqOptions.headers;
+    if (baseHeaders && reqHeaders) {
+      reqOptions.headers = async () => ({
+        ...typeof baseHeaders === "function" ? await baseHeaders() : baseHeaders,
+        ...typeof reqHeaders === "function" ? await reqHeaders() : reqHeaders
+      });
+    }
+    const args = deepMerge(options, reqOptions);
     return req.fetch(opts.args[0], args);
   }
   return req;

package/dist/client/utils.js

@@ -8,7 +8,7 @@ var mergePath = (base, path) => {
 };
 var replaceUrlParam = (urlString, params) => {
   for (const [k, v] of Object.entries(params)) {
-    const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??");
+    const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??(?=/|$)");
     urlString = urlString.replace(reg, v ? `/${v}` : "");
   }
   return urlString;

package/dist/middleware/cache/index.js

@@ -34,7 +34,7 @@ var cache = (options) => {
   );
   const addHeader = (c, responseVary) => {
     if (cacheControlDirectives) {
-      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0]) ?? [];
+      const existingDirectives = c.res.headers.get("Cache-Control")?.split(",").map((d) => d.trim().split("=", 1)[0].toLowerCase()) ?? [];
       for (const directive of cacheControlDirectives) {
         let [name, value] = directive.trim().split("=", 2);
         name = name.toLowerCase();

package/dist/middleware/compress/index.js

@@ -35,7 +35,8 @@ var compress = (options) => {
   return async function compress2(ctx, next) {
     await next();
     const contentLength = ctx.res.headers.get("Content-Length");
-    if (ctx.res.headers.has("Content-Encoding") || // already encoded
+    if (ctx.res.status === 206 || // partial content, Content-Range refers to the uncompressed bytes
+    ctx.res.headers.has("Content-Encoding") || // already encoded
     ctx.res.headers.has("Transfer-Encoding") || // already encoded or chunked
     ctx.req.method === "HEAD" || // HEAD request
     contentLength && Number(contentLength) < threshold || // content-length below threshold

package/dist/middleware/etag/index.js

@@ -48,7 +48,8 @@ var etag = (options) => {
       }
       etag3 = weak ? `W/"${hash}"` : `"${hash}"`;
     }
-    if (etagMatches(etag3, ifNoneMatch)) {
+    const matched = ifNoneMatch === "*" ? (c.req.method === "GET" || c.req.method === "HEAD") && res.ok : etagMatches(etag3, ifNoneMatch);
+    if (matched) {
       c.res = new Response(null, {
         status: 304,
         statusText: "Not Modified",

package/dist/middleware/method-override/index.js

@@ -59,11 +59,13 @@ var methodOverride = (options) => async function methodOverride2(c, next) {
     if (method) {
       const url = new URL(c.req.url);
       url.searchParams.delete(queryName);
-      const request = new Request(url.toString(), {
+      const requestInit = {
         body: c.req.raw.body,
         headers: c.req.raw.headers,
-        method
-      });
+        method,
+        duplex: c.req.raw.body ? "half" : void 0
+      };
+      const request = new Request(url.toString(), requestInit);
       return app.fetch(request, c.env, getExecutionCtx(c));
     }
   }

package/dist/router/trie-router/node.js

@@ -134,6 +134,15 @@ var Node = class _Node {
             if (m) {
               params[name] = m[0];
               this.#pushHandlerSets(handlerSets, child, method, node.#params, params);
+              if (m[0].length === restPathString.length && child.#children["*"]) {
+                this.#pushHandlerSets(
+                  handlerSets,
+                  child.#children["*"],
+                  method,
+                  node.#params,
+                  params
+                );
+              }
               if (hasChildren(child.#children)) {
                 child.#params = params;
                 const componentCount = m[0].match(/\//)?.length ?? 0;

package/dist/types/adapter/lambda-edge/handler.d.ts

@@ -81,7 +81,7 @@ interface CloudFrontResult {
     body?: string;
     bodyEncoding?: 'text' | 'base64';
 }
-export declare const handle: (app: Hono<any>) => ((event: CloudFrontEdgeEvent, context?: CloudFrontContext, callback?: Callback) => Promise<CloudFrontResult>);
+export declare const handle: (app: Hono<any>) => ((event: CloudFrontEdgeEvent, context?: CloudFrontContext, callback?: Callback) => Promise<CloudFrontResult | CloudFrontRequest>);
 export declare const createBody: (method: string, requestBody: CloudFrontRequest["body"]) => string | Uint8Array<ArrayBuffer> | undefined;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export {};

package/dist/types/helper/websocket/index.d.ts

@@ -31,7 +31,7 @@ export type WSReadyState = 0 | 1 | 2 | 3;
  * An argument for WSContext class
  */
 export interface WSContextInit<T = unknown> {
-    send(data: string | ArrayBuffer | Uint8Array, options: SendOptions): void;
+    send(data: string | ArrayBuffer | Uint8Array<ArrayBuffer>, options: SendOptions): void;
     close(code?: number, reason?: string): void;
     raw?: T;
     readyState: WSReadyState;

package/dist/types/middleware/language/language.d.ts

@@ -98,5 +98,23 @@ export declare function validateOptions(options: DetectorOptions): void;
  * Language detector middleware factory
  * @param userOptions Configuration options for the language detector
  * @returns Hono middleware function
+ *
+ * @example
+ * ```ts
+ * type Variables = LanguageVariables
+ * const app = new Hono<{ Variables: Variables }>()
+ *
+ * app.use(
+ *   languageDetector({
+ *     supportedLanguages: ['en', 'ja'], // Must include fallback
+ *     fallbackLanguage: 'en', // Required
+ *   })
+ * )
+ *
+ * app.get('/', (c) => {
+ *   const lang = c.get('language')
+ *   return c.text(`Current language: ${lang}`)
+ * })
+ * ```
  */
 export declare const languageDetector: (userOptions: Partial<DetectorOptions>) => MiddlewareHandler;

package/dist/types/utils/types.d.ts

@@ -42,7 +42,7 @@ export type JSONParsed<T, TError = bigint | ReadonlyArray<bigint>> = T extends {
     toJSON(): unknown;
 } ? {} : JSONParsed<J, TError> : T extends JSONPrimitive ? T : T extends InvalidJSONValue ? never : T extends ReadonlyArray<unknown> ? {
     [K in keyof T]: JSONParsed<InvalidToNull<T[K]>, TError>;
-} : T extends Set<unknown> | Map<unknown, unknown> | Record<string, never> ? {} : T extends object ? T[keyof T] extends TError ? never : {
+} extends infer A ? A extends ReadonlyArray<unknown> ? A : JSONParsed<InvalidToNull<T[number]>, TError>[] : never : T extends Set<unknown> | Map<unknown, unknown> | Record<string, never> ? {} : T extends object ? T[keyof T] extends TError ? never : {
     [K in keyof OmitSymbolKeys<T> as IsInvalid<T[K]> extends true ? never : K]: boolean extends IsInvalid<T[K]> ? JSONParsed<T[K], TError> | undefined : JSONParsed<T[K], TError>;
 } : T extends unknown ? T extends TError ? never : JSONValue : never;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.12.28",
+  "version": "4.12.30",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -11,7 +11,7 @@
     "!dist/**/*.tsbuildinfo"
   ],
   "scripts": {
-    "test": "tsc --noEmit && vitest --run",
+    "test": "tsc -p tsconfig.spec.json && vitest --run",
     "test:watch": "vitest --watch",
     "test:deno": "deno test --allow-read --allow-env --allow-write --allow-net -c runtime-tests/deno/deno.json runtime-tests/deno && deno test --no-lock -c runtime-tests/deno-jsx/deno.precompile.json runtime-tests/deno-jsx && deno test --no-lock -c runtime-tests/deno-jsx/deno.react-jsx.json runtime-tests/deno-jsx",
     "test:bun": "bun test --jsx-import-source ../../src/jsx runtime-tests/bun/*",
@@ -666,7 +666,7 @@
     "nodejs"
   ],
   "devDependencies": {
-    "@hono/eslint-config": "^2.1.0",
+    "@hono/eslint-config": "^2.1.1",
     "@hono/node-server": "^2.0.2",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^24.3.0",
@@ -684,7 +684,7 @@
     "pkg-pr-new": "^0.0.53",
     "prettier": "3.7.4",
     "publint": "0.3.15",
-    "typescript": "^5.9.2",
+    "typescript": "^6.0.3",
     "undici": "^6.27.0",
     "vite-plugin-fastly-js-compute": "^0.4.2",
     "vitest": "^4.1.9",