hono 4.5.4 → 4.5.6

package/dist/adapter/bun/serve-static.js

@@ -1,5 +1,6 @@
 // src/adapter/bun/serve-static.ts
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
+import { stat } from "node:fs/promises";
 var serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -10,10 +11,20 @@ var serveStatic = (options) => {
     const pathResolve = (path) => {
       return `./${path}`;
     };
+    const isDir = async (path) => {
+      let isDir2;
+      try {
+        const stats = await stat(path);
+        isDir2 = stats.isDirectory();
+      } catch {
+      }
+      return isDir2;
+    };
     return baseServeStatic({
       ...options,
       getContent,
-      pathResolve
+      pathResolve,
+      isDir
     })(c, next);
   };
 };

package/dist/adapter/deno/serve-static.js

@@ -1,6 +1,6 @@
 // src/adapter/deno/serve-static.ts
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
-var { open } = Deno;
+var { open, lstatSync } = Deno;
 var serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -14,10 +14,20 @@ var serveStatic = (options) => {
     const pathResolve = (path) => {
       return `./${path}`;
     };
+    const isDir = (path) => {
+      let isDir2;
+      try {
+        const stat = lstatSync(path);
+        isDir2 = stat.isDirectory;
+      } catch {
+      }
+      return isDir2;
+    };
     return baseServeStatic({
       ...options,
       getContent,
-      pathResolve
+      pathResolve,
+      isDir
     })(c, next);
   };
 };

package/dist/cjs/adapter/bun/serve-static.js

@@ -22,6 +22,7 @@ __export(serve_static_exports, {
 });
 module.exports = __toCommonJS(serve_static_exports);
 var import_serve_static = require("../../middleware/serve-static");
+var import_promises = require("node:fs/promises");
 const serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -32,10 +33,20 @@ const serveStatic = (options) => {
     const pathResolve = (path) => {
       return `./${path}`;
     };
+    const isDir = async (path) => {
+      let isDir2;
+      try {
+        const stats = await (0, import_promises.stat)(path);
+        isDir2 = stats.isDirectory();
+      } catch {
+      }
+      return isDir2;
+    };
     return (0, import_serve_static.serveStatic)({
       ...options,
       getContent,
-      pathResolve
+      pathResolve,
+      isDir
     })(c, next);
   };
 };

package/dist/cjs/adapter/deno/serve-static.js

@@ -22,7 +22,7 @@ __export(serve_static_exports, {
 });
 module.exports = __toCommonJS(serve_static_exports);
 var import_serve_static = require("../../middleware/serve-static");
-const { open } = Deno;
+const { open, lstatSync } = Deno;
 const serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -36,10 +36,20 @@ const serveStatic = (options) => {
     const pathResolve = (path) => {
       return `./${path}`;
     };
+    const isDir = (path) => {
+      let isDir2;
+      try {
+        const stat = lstatSync(path);
+        isDir2 = stat.isDirectory;
+      } catch {
+      }
+      return isDir2;
+    };
     return (0, import_serve_static.serveStatic)({
       ...options,
       getContent,
-      pathResolve
+      pathResolve,
+      isDir
     })(c, next);
   };
 };

package/dist/cjs/jsx/base.js

@@ -208,7 +208,9 @@ class JSXFunctionNode extends JSXNode {
       ...this.props,
       children: children.length <= 1 ? children[0] : children
     });
-    if (res instanceof Promise) {
+    if (typeof res === "boolean" || res == null) {
+      return;
+    } else if (res instanceof Promise) {
       if (import_context.globalContexts.length === 0) {
         buffer.unshift("", res);
       } else {
@@ -303,11 +305,11 @@ const shallowEqual = (a, b) => {
   return true;
 };
 const memo = (component, propsAreEqual = shallowEqual) => {
-  let computed = void 0;
+  let computed = null;
   let prevProps = void 0;
   return (props) => {
     if (prevProps && !propsAreEqual(prevProps, props)) {
-      computed = void 0;
+      computed = null;
     }
     prevProps = props;
     return computed ||= component(props);

package/dist/cjs/middleware/serve-static/index.js

@@ -34,6 +34,15 @@ const serveStatic = (options) => {
     let filename = options.path ?? decodeURI(c.req.path);
     filename = options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename;
     const root = options.root;
+    if (!filename.endsWith("/") && options.isDir) {
+      const path2 = (0, import_filepath.getFilePathWithoutDefaultDocument)({
+        filename,
+        root
+      });
+      if (path2 && await options.isDir(path2)) {
+        filename = filename + "/";
+      }
+    }
     let path = (0, import_filepath.getFilePath)({
       filename,
       root,

package/dist/cjs/utils/html.js

@@ -41,13 +41,14 @@ const escapeRe = /[&<>'"]/;
 const stringBufferToString = async (buffer, callbacks) => {
   let str = "";
   callbacks ||= [];
-  for (let i = buffer.length - 1; ; i--) {
-    str += buffer[i];
+  const resolvedBuffer = await Promise.all(buffer);
+  for (let i = resolvedBuffer.length - 1; ; i--) {
+    str += resolvedBuffer[i];
     i--;
     if (i < 0) {
       break;
     }
-    let r = await buffer[i];
+    let r = resolvedBuffer[i];
     if (typeof r === "object") {
       callbacks.push(...r.callbacks || []);
     }

package/dist/cjs/validator/validator.js

@@ -25,7 +25,7 @@ var import_cookie = require("../helper/cookie");
 var import_http_exception = require("../http-exception");
 var import_buffer = require("../utils/buffer");
 const jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
-const multipartRegex = /^multipart\/form-data(; boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
+const multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
 const urlencodedRegex = /^application\/x-www-form-urlencoded$/;
 const validator = (target, validationFunc) => {
   return async (c, next) => {
@@ -64,12 +64,13 @@ const validator = (target, validationFunc) => {
         const form = {};
         formData.forEach((value2, key) => {
           if (key.endsWith("[]")) {
-            if (form[key] === void 0) {
-              form[key] = [value2];
-            } else if (Array.isArray(form[key])) {
-              ;
-              form[key].push(value2);
-            }
+            ;
+            (form[key] ??= []).push(value2);
+          } else if (Array.isArray(form[key])) {
+            ;
+            form[key].push(value2);
+          } else if (key in form) {
+            form[key] = [form[key], value2];
           } else {
             form[key] = value2;
           }

package/dist/jsx/base.js

@@ -171,7 +171,9 @@ var JSXFunctionNode = class extends JSXNode {
       ...this.props,
       children: children.length <= 1 ? children[0] : children
     });
-    if (res instanceof Promise) {
+    if (typeof res === "boolean" || res == null) {
+      return;
+    } else if (res instanceof Promise) {
       if (globalContexts.length === 0) {
         buffer.unshift("", res);
       } else {
@@ -266,11 +268,11 @@ var shallowEqual = (a, b) => {
   return true;
 };
 var memo = (component, propsAreEqual = shallowEqual) => {
-  let computed = void 0;
+  let computed = null;
   let prevProps = void 0;
   return (props) => {
     if (prevProps && !propsAreEqual(prevProps, props)) {
-      computed = void 0;
+      computed = null;
     }
     prevProps = props;
     return computed ||= component(props);

package/dist/middleware/serve-static/index.js

@@ -12,6 +12,15 @@ var serveStatic = (options) => {
     let filename = options.path ?? decodeURI(c.req.path);
     filename = options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename;
     const root = options.root;
+    if (!filename.endsWith("/") && options.isDir) {
+      const path2 = getFilePathWithoutDefaultDocument({
+        filename,
+        root
+      });
+      if (path2 && await options.isDir(path2)) {
+        filename = filename + "/";
+      }
+    }
     let path = getFilePath({
       filename,
       root,

package/dist/types/context.d.ts

@@ -3,7 +3,8 @@ import type { Result } from './router';
 import type { Env, FetchEventLike, H, Input, NotFoundHandler, RouterRoute, TypedResponse } from './types';
 import type { RedirectStatusCode, StatusCode } from './utils/http-status';
 import type { InvalidJSONValue, IsAny, JSONParsed, JSONValue, SimplifyDeepArray } from './utils/types';
-type HeaderRecord = Record<string, string | string[]>;
+import type { BaseMime } from './utils/mime';
+type HeaderRecord = Record<'Content-Type', BaseMime> | Record<ResponseHeader, string | string[]> | Record<string, string | string[]>;
 /**
  * Data type can be a string, ArrayBuffer, or ReadableStream.
  */
@@ -158,6 +159,21 @@ type ContextOptions<E extends Env> = {
     matchResult?: Result<[H, RouterRoute]>;
     path?: string;
 };
+interface SetHeadersOptions {
+    append?: boolean;
+}
+type ResponseHeader = 'Access-Control-Allow-Credentials' | 'Access-Control-Allow-Headers' | 'Access-Control-Allow-Methods' | 'Access-Control-Allow-Origin' | 'Access-Control-Expose-Headers' | 'Access-Control-Max-Age' | 'Age' | 'Allow' | 'Cache-Control' | 'Clear-Site-Data' | 'Content-Disposition' | 'Content-Encoding' | 'Content-Language' | 'Content-Length' | 'Content-Location' | 'Content-Range' | 'Content-Security-Policy' | 'Content-Security-Policy-Report-Only' | 'Content-Type' | 'Cookie' | 'Cross-Origin-Embedder-Policy' | 'Cross-Origin-Opener-Policy' | 'Cross-Origin-Resource-Policy' | 'Date' | 'ETag' | 'Expires' | 'Last-Modified' | 'Location' | 'Permissions-Policy' | 'Pragma' | 'Retry-After' | 'Save-Data' | 'Sec-CH-Prefers-Color-Scheme' | 'Sec-CH-Prefers-Reduced-Motion' | 'Sec-CH-UA' | 'Sec-CH-UA-Arch' | 'Sec-CH-UA-Bitness' | 'Sec-CH-UA-Form-Factor' | 'Sec-CH-UA-Full-Version' | 'Sec-CH-UA-Full-Version-List' | 'Sec-CH-UA-Mobile' | 'Sec-CH-UA-Model' | 'Sec-CH-UA-Platform' | 'Sec-CH-UA-Platform-Version' | 'Sec-CH-UA-WoW64' | 'Sec-Fetch-Dest' | 'Sec-Fetch-Mode' | 'Sec-Fetch-Site' | 'Sec-Fetch-User' | 'Sec-GPC' | 'Server' | 'Server-Timing' | 'Service-Worker-Navigation-Preload' | 'Set-Cookie' | 'Strict-Transport-Security' | 'Timing-Allow-Origin' | 'Trailer' | 'Transfer-Encoding' | 'Upgrade' | 'Vary' | 'WWW-Authenticate' | 'Warning' | 'X-Content-Type-Options' | 'X-DNS-Prefetch-Control' | 'X-Frame-Options' | 'X-Permitted-Cross-Domain-Policies' | 'X-Powered-By' | 'X-Robots-Tag' | 'X-XSS-Protection';
+interface SetHeaders {
+    (name: 'Content-Type', value?: BaseMime, options?: SetHeadersOptions): void;
+    (name: ResponseHeader, value?: string, options?: SetHeadersOptions): void;
+    (name: string, value?: string, options?: SetHeadersOptions): void;
+}
+type ResponseHeadersInit = [string, string][] | Record<'Content-Type', BaseMime> | Record<ResponseHeader, string> | Record<string, string> | Headers;
+interface ResponseInit {
+    headers?: ResponseHeadersInit;
+    status?: number;
+    statusText?: string;
+}
 export declare const TEXT_PLAIN = "text/plain; charset=UTF-8";
 export declare class Context<E extends Env = any, P extends string = any, I extends Input = {}> {
     #private;
@@ -298,9 +314,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * })
      * ```
      */
-    header: (name: string, value: string | undefined, options?: {
-        append?: boolean;
-    }) => void;
+    header: SetHeaders;
     status: (status: StatusCode) => void;
     /**
      * `.set()` can set the value specified by the key.

package/dist/types/jsx/base.d.ts

@@ -3,7 +3,7 @@ import type { Context } from './context';
 import type { JSX as HonoJSX, IntrinsicElements as IntrinsicElementsDefined } from './intrinsic-elements';
 export type Props = Record<string, any>;
 export type FC<P = Props> = {
-    (props: P): HtmlEscapedString | Promise<HtmlEscapedString>;
+    (props: P): HtmlEscapedString | Promise<HtmlEscapedString> | null;
     defaultProps?: Partial<P> | undefined;
     displayName?: string | undefined;
 };

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

@@ -149,7 +149,7 @@ export declare namespace JSX {
         contenteditable?: boolean | 'inherit' | undefined;
         contextmenu?: string | undefined;
         dir?: string | undefined;
-        draggable?: 'true' | 'false' | undefined;
+        draggable?: 'true' | 'false' | boolean | undefined;
         enterkeyhint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send' | undefined;
         hidden?: boolean | undefined;
         id?: string | undefined;
@@ -381,13 +381,31 @@ export declare namespace JSX {
         preload?: string | undefined;
         src?: string | undefined;
     }
+    /**
+     * String literal types with auto-completion
+     * @see https://github.com/Microsoft/TypeScript/issues/29729
+     */
+    type LiteralUnion<T> = T | (string & Record<never, never>);
+    /**
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta#http-equiv
+     */
+    type MetaHttpEquiv = 'content-security-policy' | 'content-type' | 'default-style' | 'x-ua-compatible' | 'refresh';
+    /**
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta/name
+     */
+    type MetaName = 'application-name' | 'author' | 'description' | 'generator' | 'keywords' | 'referrer' | 'theme-color' | 'color-scheme' | 'viewport' | 'creator' | 'googlebot' | 'publisher' | 'robots';
+    /**
+     * @see https://ogp.me/
+     */
+    type MetaProperty = 'og:title' | 'og:type' | 'og:image' | 'og:url' | 'og:audio' | 'og:description' | 'og:determiner' | 'og:locale' | 'og:locale:alternate' | 'og:site_name' | 'og:video' | 'og:image:url' | 'og:image:secure_url' | 'og:image:type' | 'og:image:width' | 'og:image:height' | 'og:image:alt';
     interface MetaHTMLAttributes extends HTMLAttributes {
-        charset?: string | undefined;
-        'http-equiv'?: string | undefined;
-        name?: string | undefined;
+        charset?: LiteralUnion<'utf-8'> | undefined;
+        'http-equiv'?: LiteralUnion<MetaHttpEquiv> | undefined;
+        name?: LiteralUnion<MetaName> | undefined;
         media?: string | undefined;
         content?: string | undefined;
-        httpEquiv?: string | undefined;
+        property?: LiteralUnion<MetaProperty> | undefined;
+        httpEquiv?: LiteralUnion<MetaHttpEquiv> | undefined;
     }
     interface MeterHTMLAttributes extends HTMLAttributes {
         form?: string | undefined;

package/dist/types/middleware/serve-static/index.d.ts

@@ -17,4 +17,5 @@ export type ServeStaticOptions<E extends Env = Env> = {
 export declare const serveStatic: <E extends Env = Env>(options: ServeStaticOptions<E> & {
     getContent: (path: string, c: Context<E, any, {}>) => Promise<Data | Response | null>;
     pathResolve?: ((path: string) => string) | undefined;
+    isDir?: ((path: string) => boolean | undefined | Promise<boolean | undefined>) | undefined;
 }) => MiddlewareHandler;

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

@@ -5,4 +5,8 @@
 export declare const getMimeType: (filename: string, mimes?: Record<string, string>) => string | undefined;
 export declare const getExtension: (mimeType: string) => string | undefined;
 export { baseMimes as mimes };
-declare const baseMimes: Record<string, string>;
+/**
+ * Union types for BaseMime
+ */
+export type BaseMime = 'audio/aac' | 'video/x-msvideo' | 'image/avif' | 'video/av1' | 'application/octet-stream' | 'image/bmp' | 'text/css' | 'text/csv' | 'application/vnd.ms-fontobject' | 'application/epub+zip' | 'image/gif' | 'application/gzip' | 'text/html' | 'image/x-icon' | 'text/calendar' | 'image/jpeg' | 'text/javascript' | 'application/json' | 'application/ld+json' | 'audio/x-midi' | 'audio/mpeg' | 'video/mp4' | 'video/mpeg' | 'audio/ogg' | 'video/ogg' | 'application/ogg' | 'audio/opus' | 'font/otf' | 'application/pdf' | 'image/png' | 'application/rtf' | 'image/svg+xml' | 'image/tiff' | 'video/mp2t' | 'font/ttf' | 'text/plain' | 'application/wasm' | 'video/webm' | 'audio/webm' | 'image/webp' | 'font/woff' | 'font/woff2' | 'application/xhtml+xml' | 'application/xml' | 'application/zip' | 'video/3gpp' | 'video/3gpp2' | 'model/gltf+json' | 'model/gltf-binary';
+declare const baseMimes: Record<string, BaseMime>;

package/dist/utils/html.js

@@ -14,13 +14,14 @@ var escapeRe = /[&<>'"]/;
 var stringBufferToString = async (buffer, callbacks) => {
   let str = "";
   callbacks ||= [];
-  for (let i = buffer.length - 1; ; i--) {
-    str += buffer[i];
+  const resolvedBuffer = await Promise.all(buffer);
+  for (let i = resolvedBuffer.length - 1; ; i--) {
+    str += resolvedBuffer[i];
     i--;
     if (i < 0) {
       break;
     }
-    let r = await buffer[i];
+    let r = resolvedBuffer[i];
     if (typeof r === "object") {
       callbacks.push(...r.callbacks || []);
     }

package/dist/validator/validator.js

@@ -3,7 +3,7 @@ import { getCookie } from "../helper/cookie/index.js";
 import { HTTPException } from "../http-exception.js";
 import { bufferToFormData } from "../utils/buffer.js";
 var jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/;
-var multipartRegex = /^multipart\/form-data(; boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
+var multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/;
 var urlencodedRegex = /^application\/x-www-form-urlencoded$/;
 var validator = (target, validationFunc) => {
   return async (c, next) => {
@@ -42,12 +42,13 @@ var validator = (target, validationFunc) => {
         const form = {};
         formData.forEach((value2, key) => {
           if (key.endsWith("[]")) {
-            if (form[key] === void 0) {
-              form[key] = [value2];
-            } else if (Array.isArray(form[key])) {
-              ;
-              form[key].push(value2);
-            }
+            ;
+            (form[key] ??= []).push(value2);
+          } else if (Array.isArray(form[key])) {
+            ;
+            form[key].push(value2);
+          } else if (key in form) {
+            form[key] = [form[key], value2];
           } else {
             form[key] = value2;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.5.4",
+  "version": "4.5.6",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",