hono 4.5.9 → 4.5.10

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

@@ -22,9 +22,16 @@ __export(compress_exports, {
 });
 module.exports = __toCommonJS(compress_exports);
 const ENCODING_TYPES = ["gzip", "deflate"];
+const cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/i;
+const compressibleContentTypeRegExp = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 const compress = (options) => {
+  const threshold = options?.threshold ?? 1024;
   return async function compress2(ctx, next) {
     await next();
+    const contentLength = ctx.res.headers.get("Content-Length");
+    if (ctx.res.headers.has("Content-Encoding") || ctx.req.method === "HEAD" || contentLength && Number(contentLength) < threshold || !shouldCompress(ctx.res) || !shouldTransform(ctx.res)) {
+      return;
+    }
     const accepted = ctx.req.header("Accept-Encoding");
     const encoding = options?.encoding ?? ENCODING_TYPES.find((encoding2) => accepted?.includes(encoding2));
     if (!encoding || !ctx.res.body) {
@@ -36,6 +43,14 @@ const compress = (options) => {
     ctx.res.headers.set("Content-Encoding", encoding);
   };
 };
+const shouldCompress = (res) => {
+  const type = res.headers.get("Content-Type");
+  return type && compressibleContentTypeRegExp.test(type);
+};
+const shouldTransform = (res) => {
+  const cacheControl = res.headers.get("Cache-Control");
+  return !cacheControl || !cacheControlNoTransformRegExp.test(cacheControl);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   compress

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

@@ -53,7 +53,7 @@ const colorStatus = (status) => {
   return out[calculateStatus];
 };
 function log(fn, prefix, method, path, status = 0, elapsed) {
-  const out = prefix === "<--" /* Incoming */ ? `  ${prefix} ${method} ${path}` : `  ${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;
+  const out = prefix === "<--" /* Incoming */ ? `${prefix} ${method} ${path}` : `${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;
   fn(out);
 }
 const logger = (fn = console.log) => {

package/dist/middleware/compress/index.js

@@ -1,8 +1,15 @@
 // src/middleware/compress/index.ts
 var ENCODING_TYPES = ["gzip", "deflate"];
+var cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/i;
+var compressibleContentTypeRegExp = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 var compress = (options) => {
+  const threshold = options?.threshold ?? 1024;
   return async function compress2(ctx, next) {
     await next();
+    const contentLength = ctx.res.headers.get("Content-Length");
+    if (ctx.res.headers.has("Content-Encoding") || ctx.req.method === "HEAD" || contentLength && Number(contentLength) < threshold || !shouldCompress(ctx.res) || !shouldTransform(ctx.res)) {
+      return;
+    }
     const accepted = ctx.req.header("Accept-Encoding");
     const encoding = options?.encoding ?? ENCODING_TYPES.find((encoding2) => accepted?.includes(encoding2));
     if (!encoding || !ctx.res.body) {
@@ -14,6 +21,14 @@ var compress = (options) => {
     ctx.res.headers.set("Content-Encoding", encoding);
   };
 };
+var shouldCompress = (res) => {
+  const type = res.headers.get("Content-Type");
+  return type && compressibleContentTypeRegExp.test(type);
+};
+var shouldTransform = (res) => {
+  const cacheControl = res.headers.get("Cache-Control");
+  return !cacheControl || !cacheControlNoTransformRegExp.test(cacheControl);
+};
 export {
   compress
 };

package/dist/middleware/logger/index.js

@@ -25,7 +25,7 @@ var colorStatus = (status) => {
   return out[calculateStatus];
 };
 function log(fn, prefix, method, path, status = 0, elapsed) {
-  const out = prefix === "<--" /* Incoming */ ? `  ${prefix} ${method} ${path}` : `  ${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;
+  const out = prefix === "<--" /* Incoming */ ? `${prefix} ${method} ${path}` : `${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;
   fn(out);
 }
 var logger = (fn = console.log) => {

package/dist/types/jsx/intrinsic-elements.d.ts

@@ -166,7 +166,8 @@ export declare namespace JSX {
         lang?: string | undefined;
         nonce?: string | undefined;
         placeholder?: string | undefined;
-        popover?: string | undefined;
+        /** @see https://developer.mozilla.org/en-US/docs/Web/API/Popover_API */
+        popover?: boolean | 'auto' | 'manual' | undefined;
         slot?: string | undefined;
         spellcheck?: boolean | undefined;
         style?: CSSProperties | string | undefined;
@@ -207,16 +208,20 @@ export declare namespace JSX {
     interface BlockquoteHTMLAttributes extends HTMLAttributes {
         cite?: string | undefined;
     }
+    /** @see https://developer.mozilla.org/en-US/docs/Web/API/Popover_API */
+    type HTMLAttributePopoverTargetAction = 'show' | 'hide' | 'toggle';
     interface ButtonHTMLAttributes extends HTMLAttributes {
         disabled?: boolean | undefined;
         form?: string | undefined;
-        formenctype?: string | undefined;
-        formmethod?: string | undefined;
+        formenctype?: HTMLAttributeFormEnctype | undefined;
+        formmethod?: HTMLAttributeFormMethod | undefined;
         formnovalidate?: boolean | undefined;
         formtarget?: HTMLAttributeAnchorTarget | undefined;
         name?: string | undefined;
         type?: 'submit' | 'reset' | 'button' | undefined;
         value?: string | ReadonlyArray<string> | number | undefined;
+        popovertarget?: string | undefined;
+        popovertargetaction?: HTMLAttributePopoverTargetAction | undefined;
         formAction?: string | Function | undefined;
     }
     interface CanvasHTMLAttributes extends HTMLAttributes {
@@ -254,11 +259,17 @@ export declare namespace JSX {
         form?: string | undefined;
         name?: string | undefined;
     }
+    /** @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#method */
+    type HTMLAttributeFormMethod = 'get' | 'post' | 'dialog';
+    /** @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#enctype */
+    type HTMLAttributeFormEnctype = 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'text/plain';
+    /** @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#autocomplete */
+    type HTMLAttributeFormAutocomplete = 'on' | 'off';
     interface FormHTMLAttributes extends HTMLAttributes {
-        'accept-charset'?: string | undefined;
-        autocomplete?: string | undefined;
-        enctype?: string | undefined;
-        method?: string | undefined;
+        'accept-charset'?: StringLiteralUnion<'utf-8'> | undefined;
+        autocomplete?: HTMLAttributeFormAutocomplete | undefined;
+        enctype?: HTMLAttributeFormEnctype | undefined;
+        method?: HTMLAttributeFormMethod | undefined;
         name?: string | undefined;
         novalidate?: boolean | undefined;
         target?: HTMLAttributeAnchorTarget | undefined;
@@ -317,8 +328,8 @@ export declare namespace JSX {
         checked?: boolean | undefined;
         disabled?: boolean | undefined;
         form?: string | undefined;
-        formenctype?: string | undefined;
-        formmethod?: string | undefined;
+        formenctype?: HTMLAttributeFormEnctype | undefined;
+        formmethod?: HTMLAttributeFormMethod | undefined;
         formnovalidate?: boolean | undefined;
         formtarget?: HTMLAttributeAnchorTarget | undefined;
         height?: number | string | undefined;
@@ -339,6 +350,8 @@ export declare namespace JSX {
         type?: HTMLInputTypeAttribute | undefined;
         value?: string | ReadonlyArray<string> | number | undefined;
         width?: number | string | undefined;
+        popovertarget?: string | undefined;
+        popovertargetaction?: HTMLAttributePopoverTargetAction | undefined;
         formAction?: string | Function | undefined;
     }
     interface KeygenHTMLAttributes extends HTMLAttributes {

package/dist/types/middleware/compress/index.d.ts

@@ -6,6 +6,7 @@ import type { MiddlewareHandler } from '../../types';
 declare const ENCODING_TYPES: readonly ["gzip", "deflate"];
 interface CompressionOptions {
     encoding?: (typeof ENCODING_TYPES)[number];
+    threshold?: number;
 }
 /**
  * Compress Middleware for Hono.
@@ -14,6 +15,7 @@ interface CompressionOptions {
  *
  * @param {CompressionOptions} [options] - The options for the compress middleware.
  * @param {'gzip' | 'deflate'} [options.encoding] - The compression scheme to allow for response compression. Either 'gzip' or 'deflate'. If not defined, both are allowed and will be used based on the Accept-Encoding header. 'gzip' is prioritized if this option is not provided and the client provides both in the Accept-Encoding header.
+ * @param {number} [options.threshold=1024] - The minimum size in bytes to compress. Defaults to 1024 bytes.
  * @returns {MiddlewareHandler} The middleware handler function.
  *
  * @example

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.5.9",
+  "version": "4.5.10",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -617,7 +617,7 @@
     "@types/jsdom": "^21.1.4",
     "@types/node": "20.11.4",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-v8": "^1.1.0",
+    "@vitest/coverage-v8": "^2.0.5",
     "arg": "^5.0.2",
     "crypto-js": "^4.1.1",
     "esbuild": "^0.15.12",
@@ -631,7 +631,7 @@
     "supertest": "^6.3.3",
     "typescript": "^5.3.3",
     "vite-plugin-fastly-js-compute": "^0.4.2",
-    "vitest": "^1.2.2",
+    "vitest": "^2.0.5",
     "wrangler": "^3.58.0",
     "ws": "^8.17.0",
     "zod": "^3.20.2"