hono 4.4.3 → 4.4.5

package/dist/adapter/cloudflare-workers/index.js

@@ -1,7 +1,9 @@
 // src/adapter/cloudflare-workers/index.ts
 import { serveStatic } from "./serve-static-module.js";
 import { upgradeWebSocket } from "./websocket.js";
+import { getConnInfo } from "./conninfo.js";
 export {
+  getConnInfo,
   serveStatic,
   upgradeWebSocket
 };

package/dist/cjs/adapter/cloudflare-workers/index.js

@@ -18,14 +18,17 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cloudflare_workers_exports = {};
 __export(cloudflare_workers_exports, {
+  getConnInfo: () => import_conninfo.getConnInfo,
   serveStatic: () => import_serve_static_module.serveStatic,
   upgradeWebSocket: () => import_websocket.upgradeWebSocket
 });
 module.exports = __toCommonJS(cloudflare_workers_exports);
 var import_serve_static_module = require("./serve-static-module");
 var import_websocket = require("./websocket");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getConnInfo,
   serveStatic,
   upgradeWebSocket
 });

package/dist/cjs/context.js

@@ -31,7 +31,7 @@ const setHeaders = (headers, map = {}) => {
 class Context {
   req;
   env = {};
-  _var = {};
+  _var;
   finalized = false;
   error = void 0;
   #status = 200;
@@ -232,10 +232,10 @@ class Context {
     }
     return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
   };
-  redirect = (location, status = 302) => {
+  redirect = (location, status) => {
     this.#headers ??= new Headers();
     this.#headers.set("Location", location);
-    return this.newResponse(null, status);
+    return this.newResponse(null, status ?? 302);
   };
   notFound = () => {
     return this.notFoundHandler(this);

package/dist/cjs/helper/conninfo/types.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/cjs/hono-base.js

@@ -24,7 +24,6 @@ __export(hono_base_exports, {
 module.exports = __toCommonJS(hono_base_exports);
 var import_compose = require("./compose");
 var import_context = require("./context");
-var import_http_exception = require("./http-exception");
 var import_request = require("./request");
 var import_router = require("./router");
 var import_url = require("./utils/url");
@@ -33,7 +32,7 @@ const notFoundHandler = (c) => {
   return c.text("404 Not Found", 404);
 };
 const errorHandler = (err, c) => {
-  if (err instanceof import_http_exception.HTTPException) {
+  if ("getResponse" in err) {
     return err.getResponse();
   }
   console.error(err);
@@ -72,9 +71,6 @@ class Hono {
       };
     });
     this.on = (method, path, ...handlers) => {
-      if (!method) {
-        return this;
-      }
       for (const p of [path].flat()) {
         this.#path = p;
         for (const m of [method].flat()) {
@@ -114,9 +110,6 @@ class Hono {
   errorHandler = errorHandler;
   route(path, app) {
     const subApp = this.basePath(path);
-    if (!app) {
-      return subApp;
-    }
     app.routes.map((r) => {
       let handler;
       if (app.errorHandler === errorHandler) {
@@ -221,7 +214,7 @@ class Hono {
       }
       return res instanceof Promise ? res.then(
         (resolved) => resolved || (c.finalized ? c.res : this.notFoundHandler(c))
-      ).catch((err) => this.handleError(err, c)) : res;
+      ).catch((err) => this.handleError(err, c)) : res ?? this.notFoundHandler(c);
     }
     const composed = (0, import_compose.compose)(matchResult[0], this.errorHandler, this.notFoundHandler);
     return (async () => {
@@ -229,7 +222,7 @@ class Hono {
         const context = await composed(c);
         if (!context.finalized) {
           throw new Error(
-            "Context is not finalized. You may forget returning Response object or `await next()`"
+            "Context is not finalized. Did you forget to return a Response object or `await next()`?"
           );
         }
         return context.res;

package/dist/cjs/jsx/base.js

@@ -133,10 +133,8 @@ class JSXNode {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
-    const propsKeys = Object.keys(props || {});
-    for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const key = propsKeys[i];
-      const v = props[key];
+    for (let [key, v] of Object.entries(props)) {
+      key = (0, import_utils.normalizeIntrinsicElementKey)(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -237,7 +235,6 @@ const jsxFn = (tag, props, children) => {
   if (typeof tag === "function") {
     return new JSXFunctionNode(tag, props, children);
   } else {
-    (0, import_utils.normalizeIntrinsicElementProps)(props);
     return new JSXNode(tag, props, children);
   }
 };

package/dist/cjs/jsx/dom/jsx-dev-runtime.js

@@ -22,13 +22,9 @@ __export(jsx_dev_runtime_exports, {
   jsxDEV: () => jsxDEV
 });
 module.exports = __toCommonJS(jsx_dev_runtime_exports);
-var import_utils = require("../utils");
-var import_utils2 = require("./utils");
+var import_utils = require("./utils");
 const jsxDEV = (tag, props, key) => {
-  if (typeof tag === "string") {
-    (0, import_utils.normalizeIntrinsicElementProps)(props);
-  }
-  return (0, import_utils2.newJSXNode)({
+  return (0, import_utils.newJSXNode)({
     tag,
     props,
     key

package/dist/cjs/jsx/dom/render.js

@@ -41,8 +41,8 @@ const eventAliasMap = {
   DoubleClick: "DblClick"
 };
 const nameSpaceMap = {
-  svg: "http://www.w3.org/2000/svg",
-  math: "http://www.w3.org/1998/Math/MathML"
+  svg: "2000/svg",
+  math: "1998/Math/MathML"
 };
 const skipProps = /* @__PURE__ */ new Set(["children"]);
 const buildDataStack = [];
@@ -59,8 +59,9 @@ const getEventSpec = (key) => {
 const toAttributeName = (element, key) => element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 const applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
-  for (const [key, value] of Object.entries(attributes)) {
+  for (let [key, value] of Object.entries(attributes)) {
     if (!skipProps.has(key) && (!oldAttributes || oldAttributes[key] !== value)) {
+      key = (0, import_utils.normalizeIntrinsicElementKey)(key);
       const eventSpec = getEventSpec(key);
       if (eventSpec) {
         if (oldAttributes) {
@@ -125,8 +126,9 @@ const applyProps = (container, attributes, oldAttributes) => {
     }
   }
   if (oldAttributes) {
-    for (const [key, value] of Object.entries(oldAttributes)) {
+    for (let [key, value] of Object.entries(oldAttributes)) {
       if (!skipProps.has(key) && !(key in attributes)) {
+        key = (0, import_utils.normalizeIntrinsicElementKey)(key);
         const eventSpec = getEventSpec(key);
         if (eventSpec) {
           container.removeEventListener(eventSpec[0], value, eventSpec[1]);
@@ -386,14 +388,12 @@ const buildNode = (node) => {
     } else {
       const ns = nameSpaceMap[node.tag];
       if (ns) {
-        ;
-        node.n = ns;
         nameSpaceContext ||= (0, import_context2.createContext)("");
         node.props.children = [
           {
             tag: nameSpaceContext.Provider,
             props: {
-              value: ns,
+              value: node.n = `http://www.w3.org/${ns}`,
               children: node.props.children
             }
           }

package/dist/cjs/jsx/utils.js

@@ -18,16 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  normalizeIntrinsicElementProps: () => normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey: () => normalizeIntrinsicElementKey,
   styleObjectForEach: () => styleObjectForEach
 });
 module.exports = __toCommonJS(utils_exports);
-const normalizeIntrinsicElementProps = (props) => {
-  if (props && "className" in props) {
-    props["class"] = props["className"];
-    delete props["className"];
-  }
-};
+const normalizeElementKeyMap = /* @__PURE__ */ new Map([
+  ["className", "class"],
+  ["htmlFor", "for"]
+]);
+const normalizeIntrinsicElementKey = (key) => normalizeElementKeyMap.get(key) || key;
 const styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {
     const key = k[0] === "-" || !/[A-Z]/.test(k) ? k : k.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`);
@@ -41,6 +40,6 @@ const styleObjectForEach = (style, fn) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey,
   styleObjectForEach
 });

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

@@ -50,7 +50,12 @@ const cors = (options) => {
       set("Access-Control-Allow-Origin", allowOrigin);
     }
     if (opts.origin !== "*") {
-      set("Vary", "Origin");
+      const existingVary = c.req.header("Vary");
+      if (existingVary) {
+        set("Vary", existingVary);
+      } else {
+        set("Vary", "Origin");
+      }
     }
     if (opts.credentials) {
       set("Access-Control-Allow-Credentials", "true");

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

@@ -55,9 +55,11 @@ const serveStatic = (options) => {
         return await next();
       }
       pathWithOutDefaultDocument = pathResolve(pathWithOutDefaultDocument);
-      content = await getContent(pathWithOutDefaultDocument, c);
-      if (content) {
-        path = pathWithOutDefaultDocument;
+      if (pathWithOutDefaultDocument !== path) {
+        content = await getContent(pathWithOutDefaultDocument, c);
+        if (content) {
+          path = pathWithOutDefaultDocument;
+        }
       }
     }
     if (content instanceof Response) {

package/dist/cjs/request.js

@@ -75,12 +75,7 @@ class HonoRequest {
     return headerData;
   }
   async parseBody(options) {
-    if (this.bodyCache.parsedBody) {
-      return this.bodyCache.parsedBody;
-    }
-    const parsedBody = await (0, import_body.parseBody)(this, options);
-    this.bodyCache.parsedBody = parsedBody;
-    return parsedBody;
+    return this.bodyCache.parsedBody ??= await (0, import_body.parseBody)(this, options);
   }
   cachedBody = (key) => {
     const { bodyCache, raw } = this;
@@ -88,19 +83,14 @@ class HonoRequest {
     if (cachedBody) {
       return cachedBody;
     }
-    if (!bodyCache[key]) {
-      for (const keyOfBodyCache of Object.keys(bodyCache)) {
-        if (keyOfBodyCache === "parsedBody") {
-          continue;
+    const anyCachedKey = Object.keys(bodyCache)[0];
+    if (anyCachedKey) {
+      return bodyCache[anyCachedKey].then((body) => {
+        if (anyCachedKey === "json") {
+          body = JSON.stringify(body);
         }
-        return (async () => {
-          let body = await bodyCache[keyOfBodyCache];
-          if (keyOfBodyCache === "json") {
-            body = JSON.stringify(body);
-          }
-          return await new Response(body)[key]();
-        })();
-      }
+        return new Response(body)[key]();
+      });
     }
     return bodyCache[key] = raw[key]();
   };

package/dist/cjs/utils/filepath.js

@@ -27,7 +27,7 @@ const getFilePath = (options) => {
   const defaultDocument = options.defaultDocument || "index.html";
   if (filename.endsWith("/")) {
     filename = filename.concat(defaultDocument);
-  } else if (!filename.match(/\.[a-zA-Z0-9]+$/)) {
+  } else if (!filename.match(/\.[a-zA-Z0-9_-]+$/)) {
     filename = filename.concat("/" + defaultDocument);
   }
   const path = getFilePathWithoutDefaultDocument({

package/dist/context.js

@@ -8,7 +8,7 @@ var setHeaders = (headers, map = {}) => {
 var Context = class {
   req;
   env = {};
-  _var = {};
+  _var;
   finalized = false;
   error = void 0;
   #status = 200;
@@ -209,10 +209,10 @@ var Context = class {
     }
     return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
   };
-  redirect = (location, status = 302) => {
+  redirect = (location, status) => {
     this.#headers ??= new Headers();
     this.#headers.set("Location", location);
-    return this.newResponse(null, status);
+    return this.newResponse(null, status ?? 302);
   };
   notFound = () => {
     return this.notFoundHandler(this);

package/dist/hono-base.js

@@ -1,7 +1,6 @@
 // src/hono-base.ts
 import { compose } from "./compose.js";
 import { Context } from "./context.js";
-import { HTTPException } from "./http-exception.js";
 import { HonoRequest } from "./request.js";
 import { METHODS, METHOD_NAME_ALL, METHOD_NAME_ALL_LOWERCASE } from "./router.js";
 import { getPath, getPathNoStrict, mergePath } from "./utils/url.js";
@@ -10,7 +9,7 @@ var notFoundHandler = (c) => {
   return c.text("404 Not Found", 404);
 };
 var errorHandler = (err, c) => {
-  if (err instanceof HTTPException) {
+  if ("getResponse" in err) {
     return err.getResponse();
   }
   console.error(err);
@@ -49,9 +48,6 @@ var Hono = class {
       };
     });
     this.on = (method, path, ...handlers) => {
-      if (!method) {
-        return this;
-      }
       for (const p of [path].flat()) {
         this.#path = p;
         for (const m of [method].flat()) {
@@ -91,9 +87,6 @@ var Hono = class {
   errorHandler = errorHandler;
   route(path, app) {
     const subApp = this.basePath(path);
-    if (!app) {
-      return subApp;
-    }
     app.routes.map((r) => {
       let handler;
       if (app.errorHandler === errorHandler) {
@@ -198,7 +191,7 @@ var Hono = class {
       }
       return res instanceof Promise ? res.then(
         (resolved) => resolved || (c.finalized ? c.res : this.notFoundHandler(c))
-      ).catch((err) => this.handleError(err, c)) : res;
+      ).catch((err) => this.handleError(err, c)) : res ?? this.notFoundHandler(c);
     }
     const composed = compose(matchResult[0], this.errorHandler, this.notFoundHandler);
     return (async () => {
@@ -206,7 +199,7 @@ var Hono = class {
         const context = await composed(c);
         if (!context.finalized) {
           throw new Error(
-            "Context is not finalized. You may forget returning Response object or `await next()`"
+            "Context is not finalized. Did you forget to return a Response object or `await next()`?"
           );
         }
         return context.res;

package/dist/jsx/base.js

@@ -2,7 +2,7 @@
 import { raw } from "../helper/html/index.js";
 import { escapeToBuffer, stringBufferToString } from "../utils/html.js";
 import { globalContexts } from "./context.js";
-import { normalizeIntrinsicElementProps, styleObjectForEach } from "./utils.js";
+import { normalizeIntrinsicElementKey, styleObjectForEach } from "./utils.js";
 var emptyTags = [
   "area",
   "base",
@@ -103,10 +103,8 @@ var JSXNode = class {
     const props = this.props;
     let { children } = this;
     buffer[0] += `<${tag}`;
-    const propsKeys = Object.keys(props || {});
-    for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const key = propsKeys[i];
-      const v = props[key];
+    for (let [key, v] of Object.entries(props)) {
+      key = normalizeIntrinsicElementKey(key);
       if (key === "children") {
       } else if (key === "style" && typeof v === "object") {
         let styleStr = "";
@@ -207,7 +205,6 @@ var jsxFn = (tag, props, children) => {
   if (typeof tag === "function") {
     return new JSXFunctionNode(tag, props, children);
   } else {
-    normalizeIntrinsicElementProps(props);
     return new JSXNode(tag, props, children);
   }
 };

package/dist/jsx/dom/jsx-dev-runtime.js

@@ -1,10 +1,6 @@
 // src/jsx/dom/jsx-dev-runtime.ts
-import { normalizeIntrinsicElementProps } from "../utils.js";
 import { newJSXNode } from "./utils.js";
 var jsxDEV = (tag, props, key) => {
-  if (typeof tag === "string") {
-    normalizeIntrinsicElementProps(props);
-  }
   return newJSXNode({
     tag,
     props,

package/dist/jsx/dom/render.js

@@ -3,7 +3,7 @@ import { toArray } from "../children.js";
 import { DOM_ERROR_HANDLER, DOM_INTERNAL_TAG, DOM_RENDERER, DOM_STASH } from "../constants.js";
 import { globalContexts as globalJSXContexts, useContext } from "../context.js";
 import { STASH_EFFECT } from "../hooks/index.js";
-import { styleObjectForEach } from "../utils.js";
+import { normalizeIntrinsicElementKey, styleObjectForEach } from "../utils.js";
 import { createContext } from "./context.js";
 import { newJSXNode } from "./utils.js";
 var HONO_PORTAL_ELEMENT = "_hp";
@@ -12,8 +12,8 @@ var eventAliasMap = {
   DoubleClick: "DblClick"
 };
 var nameSpaceMap = {
-  svg: "http://www.w3.org/2000/svg",
-  math: "http://www.w3.org/1998/Math/MathML"
+  svg: "2000/svg",
+  math: "1998/Math/MathML"
 };
 var skipProps = /* @__PURE__ */ new Set(["children"]);
 var buildDataStack = [];
@@ -30,8 +30,9 @@ var getEventSpec = (key) => {
 var toAttributeName = (element, key) => element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
 var applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
-  for (const [key, value] of Object.entries(attributes)) {
+  for (let [key, value] of Object.entries(attributes)) {
     if (!skipProps.has(key) && (!oldAttributes || oldAttributes[key] !== value)) {
+      key = normalizeIntrinsicElementKey(key);
       const eventSpec = getEventSpec(key);
       if (eventSpec) {
         if (oldAttributes) {
@@ -96,8 +97,9 @@ var applyProps = (container, attributes, oldAttributes) => {
     }
   }
   if (oldAttributes) {
-    for (const [key, value] of Object.entries(oldAttributes)) {
+    for (let [key, value] of Object.entries(oldAttributes)) {
       if (!skipProps.has(key) && !(key in attributes)) {
+        key = normalizeIntrinsicElementKey(key);
         const eventSpec = getEventSpec(key);
         if (eventSpec) {
           container.removeEventListener(eventSpec[0], value, eventSpec[1]);
@@ -357,14 +359,12 @@ var buildNode = (node) => {
     } else {
       const ns = nameSpaceMap[node.tag];
       if (ns) {
-        ;
-        node.n = ns;
         nameSpaceContext ||= createContext("");
         node.props.children = [
           {
             tag: nameSpaceContext.Provider,
             props: {
-              value: ns,
+              value: node.n = `http://www.w3.org/${ns}`,
               children: node.props.children
             }
           }

package/dist/jsx/utils.js

@@ -1,10 +1,9 @@
 // src/jsx/utils.ts
-var normalizeIntrinsicElementProps = (props) => {
-  if (props && "className" in props) {
-    props["class"] = props["className"];
-    delete props["className"];
-  }
-};
+var normalizeElementKeyMap = /* @__PURE__ */ new Map([
+  ["className", "class"],
+  ["htmlFor", "for"]
+]);
+var normalizeIntrinsicElementKey = (key) => normalizeElementKeyMap.get(key) || key;
 var styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {
     const key = k[0] === "-" || !/[A-Z]/.test(k) ? k : k.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`);
@@ -17,6 +16,6 @@ var styleObjectForEach = (style, fn) => {
   }
 };
 export {
-  normalizeIntrinsicElementProps,
+  normalizeIntrinsicElementKey,
   styleObjectForEach
 };

package/dist/middleware/cors/index.js

@@ -28,7 +28,12 @@ var cors = (options) => {
       set("Access-Control-Allow-Origin", allowOrigin);
     }
     if (opts.origin !== "*") {
-      set("Vary", "Origin");
+      const existingVary = c.req.header("Vary");
+      if (existingVary) {
+        set("Vary", existingVary);
+      } else {
+        set("Vary", "Origin");
+      }
     }
     if (opts.credentials) {
       set("Access-Control-Allow-Credentials", "true");

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

@@ -33,9 +33,11 @@ var serveStatic = (options) => {
         return await next();
       }
       pathWithOutDefaultDocument = pathResolve(pathWithOutDefaultDocument);
-      content = await getContent(pathWithOutDefaultDocument, c);
-      if (content) {
-        path = pathWithOutDefaultDocument;
+      if (pathWithOutDefaultDocument !== path) {
+        content = await getContent(pathWithOutDefaultDocument, c);
+        if (content) {
+          path = pathWithOutDefaultDocument;
+        }
       }
     }
     if (content instanceof Response) {

package/dist/request.js

@@ -53,12 +53,7 @@ var HonoRequest = class {
     return headerData;
   }
   async parseBody(options) {
-    if (this.bodyCache.parsedBody) {
-      return this.bodyCache.parsedBody;
-    }
-    const parsedBody = await parseBody(this, options);
-    this.bodyCache.parsedBody = parsedBody;
-    return parsedBody;
+    return this.bodyCache.parsedBody ??= await parseBody(this, options);
   }
   cachedBody = (key) => {
     const { bodyCache, raw } = this;
@@ -66,19 +61,14 @@ var HonoRequest = class {
     if (cachedBody) {
       return cachedBody;
     }
-    if (!bodyCache[key]) {
-      for (const keyOfBodyCache of Object.keys(bodyCache)) {
-        if (keyOfBodyCache === "parsedBody") {
-          continue;
+    const anyCachedKey = Object.keys(bodyCache)[0];
+    if (anyCachedKey) {
+      return bodyCache[anyCachedKey].then((body) => {
+        if (anyCachedKey === "json") {
+          body = JSON.stringify(body);
         }
-        return (async () => {
-          let body = await bodyCache[keyOfBodyCache];
-          if (keyOfBodyCache === "json") {
-            body = JSON.stringify(body);
-          }
-          return await new Response(body)[key]();
-        })();
-      }
+        return new Response(body)[key]();
+      });
     }
     return bodyCache[key] = raw[key]();
   };

package/dist/types/adapter/cloudflare-workers/index.d.ts

@@ -4,3 +4,4 @@
  */
 export { serveStatic } from './serve-static-module';
 export { upgradeWebSocket } from './websocket';
+export { getConnInfo } from './conninfo';

package/dist/types/context.d.ts

@@ -1,7 +1,7 @@
 import type { HonoRequest } from './request';
 import type { Env, FetchEventLike, Input, NotFoundHandler, TypedResponse } from './types';
 import type { RedirectStatusCode, StatusCode } from './utils/http-status';
-import type { IsAny, JSONParsed, JSONValue, Simplify } from './utils/types';
+import type { IsAny, JSONParsed, JSONValue, SimplifyDeepArray } from './utils/types';
 type HeaderRecord = Record<string, string | string[]>;
 /**
  * Data type can be a string, ArrayBuffer, or ReadableStream.
@@ -95,8 +95,8 @@ interface BodyRespond extends NewResponse {
  * @returns {Response & TypedResponse<T, U, 'text'>} - The response after rendering the text content, typed with the provided text and status code types.
  */
 interface TextRespond {
-    <T extends string, U extends StatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'text'>;
-    <T extends string, U extends StatusCode>(text: T, init?: ResponseInit): Response & TypedResponse<T, U, 'text'>;
+    <T extends string, U extends StatusCode = StatusCode>(text: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<T, U, 'text'>;
+    <T extends string, U extends StatusCode = StatusCode>(text: T, init?: ResponseInit): Response & TypedResponse<T, U, 'text'>;
 }
 /**
  * Interface for responding with JSON.
@@ -109,12 +109,19 @@ interface TextRespond {
  * @param {U} [status] - An optional status code for the response.
  * @param {HeaderRecord} [headers] - An optional record of headers to include in the response.
  *
- * @returns {Response & TypedResponse<Simplify<T> extends JSONValue ? (JSONValue extends Simplify<T> ? never : JSONParsed<T>) : never, U, 'json'>} - The response after rendering the JSON object, typed with the provided object and status code types.
+ * @returns {JSONRespondReturn<T, U>} - The response after rendering the JSON object, typed with the provided object and status code types.
  */
 interface JSONRespond {
-    <T extends JSONValue | Simplify<unknown>, U extends StatusCode>(object: T, status?: U, headers?: HeaderRecord): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
-    <T extends JSONValue | Simplify<unknown>, U extends StatusCode>(object: Simplify<T> extends JSONValue ? T : Simplify<T>, init?: ResponseInit): Response & TypedResponse<Simplify<T> extends JSONValue ? JSONValue extends Simplify<T> ? never : JSONParsed<T> : never, U, 'json'>;
+    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode = StatusCode>(object: T, status?: U, headers?: HeaderRecord): JSONRespondReturn<T, U>;
+    <T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode = StatusCode>(object: T, init?: ResponseInit): JSONRespondReturn<T, U>;
 }
+/**
+ * @template T - The type of the JSON value or simplified unknown type.
+ * @template U - The type of the status code.
+ *
+ * @returns {Response & TypedResponse<SimplifyDeepArray<T> extends JSONValue ? (JSONValue extends SimplifyDeepArray<T> ? never : JSONParsed<T>) : never, U, 'json'>} - The response after rendering the JSON object, typed with the provided object and status code types.
+ */
+type JSONRespondReturn<T extends JSONValue | SimplifyDeepArray<unknown>, U extends StatusCode> = Response & TypedResponse<SimplifyDeepArray<T> extends JSONValue ? JSONValue extends SimplifyDeepArray<T> ? never : JSONParsed<T> : never, U, 'json'>;
 /**
  * Interface representing a function that responds with HTML content.
  *
@@ -401,7 +408,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * })
      * ```
      */
-    redirect: (location: string, status?: RedirectStatusCode) => Response;
+    redirect: <T extends RedirectStatusCode = 302>(location: string, status?: T | undefined) => Response & TypedResponse<undefined, T, "redirect">;
     /**
      * `.notFound()` can return the Not Found Response.
      *

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

@@ -2,39 +2,4 @@
  * @module
  * ConnInfo Helper for Hono.
  */
-import type { Context } from '../../context';
-export type AddressType = 'IPv6' | 'IPv4' | 'unknown';
-export type NetAddrInfo = {
-    /**
-     * Transport protocol type
-     */
-    transport?: 'tcp' | 'udp';
-    /**
-     * Transport port number
-     */
-    port?: number;
-    address?: string;
-    addressType?: AddressType;
-} & ({
-    /**
-     * Host name such as IP Addr
-     */
-    address: string;
-    /**
-     * Host name type
-     */
-    addressType: AddressType;
-} | {});
-/**
- * HTTP Connection infomation
- */
-export interface ConnInfo {
-    /**
-     * Remote infomation
-     */
-    remote: NetAddrInfo;
-}
-/**
- * Helper type
- */
-export type GetConnInfo = (c: Context) => ConnInfo;
+export type { AddressType, NetAddrInfo, ConnInfo, GetConnInfo } from './types';

package/dist/types/helper/conninfo/types.d.ts

@@ -0,0 +1,36 @@
+import type { Context } from '../../context';
+export type AddressType = 'IPv6' | 'IPv4' | 'unknown';
+export type NetAddrInfo = {
+    /**
+     * Transport protocol type
+     */
+    transport?: 'tcp' | 'udp';
+    /**
+     * Transport port number
+     */
+    port?: number;
+    address?: string;
+    addressType?: AddressType;
+} & ({
+    /**
+     * Host name such as IP Addr
+     */
+    address: string;
+    /**
+     * Host name type
+     */
+    addressType: AddressType;
+} | {});
+/**
+ * HTTP Connection infomation
+ */
+export interface ConnInfo {
+    /**
+     * Remote infomation
+     */
+    remote: NetAddrInfo;
+}
+/**
+ * Helper type
+ */
+export type GetConnInfo = (c: Context) => ConnInfo;

package/dist/types/hono-base.d.ts

@@ -98,7 +98,7 @@ declare class Hono<E extends Env = Env, S extends Schema = {}, BasePath extends
      * app.route("/api", app2) // GET /api/user
      * ```
      */
-    route<SubPath extends string, SubEnv extends Env, SubSchema extends Schema, SubBasePath extends string>(path: SubPath, app?: Hono<SubEnv, SubSchema, SubBasePath>): Hono<E, MergeSchemaPath<SubSchema, MergePath<BasePath, SubPath>> & S, BasePath>;
+    route<SubPath extends string, SubEnv extends Env, SubSchema extends Schema, SubBasePath extends string>(path: SubPath, app: Hono<SubEnv, SubSchema, SubBasePath>): Hono<E, MergeSchemaPath<SubSchema, MergePath<BasePath, SubPath>> & S, BasePath>;
     /**
      * `.basePath()` allows base paths to be specified.
      *

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

@@ -1,13 +1,13 @@
 import type { HtmlEscaped, HtmlEscapedString, StringBuffer } from '../utils/html';
 import type { Context } from './context';
-import type { Hono, IntrinsicElements as IntrinsicElementsDefined } from './intrinsic-elements';
+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>;
     defaultProps?: Partial<P> | undefined;
     displayName?: string | undefined;
 };
-export type DOMAttributes = Hono.HTMLAttributes;
+export type DOMAttributes = HonoJSX.HTMLAttributes;
 export declare namespace JSX {
     type Element = HtmlEscapedString | Promise<HtmlEscapedString>;
     interface ElementChildrenAttribute {

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

@@ -65,3 +65,4 @@ declare const _default: {
 };
 export default _default;
 export type * from './types';
+export type { JSX } from './intrinsic-elements';

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

@@ -4,7 +4,7 @@
  * MIT License
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  */
-export declare namespace Hono {
+export declare namespace JSX {
     export type CrossOrigin = 'anonymous' | 'use-credentials' | '' | undefined;
     export type CSSProperties = {};
     type AnyAttributes = {
@@ -636,5 +636,5 @@ export declare namespace Hono {
     }
     export {};
 }
-export interface IntrinsicElements extends Hono.IntrinsicElements {
+export interface IntrinsicElements extends JSX.IntrinsicElements {
 }

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

@@ -2,14 +2,14 @@
  * All types exported from "hono/jsx" are in this file.
  */
 import type { Child, JSXNode } from './base';
-import type { Hono } from './intrinsic-elements';
+import type { JSX } from './intrinsic-elements';
 export type { Child, JSXNode, FC } from './base';
 export type { RefObject } from './hooks';
 export type { Context } from './context';
 export type PropsWithChildren<P = unknown> = P & {
     children?: Child | undefined;
 };
-export type CSSProperties = Hono.CSSProperties;
+export type CSSProperties = JSX.CSSProperties;
 /**
  * React types
  */

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

@@ -1,2 +1,2 @@
-export declare const normalizeIntrinsicElementProps: (props: Record<string, unknown>) => void;
+export declare const normalizeIntrinsicElementKey: (key: string) => string;
 export declare const styleObjectForEach: (style: Record<string, string | number>, fn: (key: string, value: string | null) => void) => void;

package/dist/types/types.d.ts

@@ -5,7 +5,7 @@
 import type { Context } from './context';
 import type { Hono } from './hono';
 import type { StatusCode } from './utils/http-status';
-import type { IfAnyThenEmptyObject, IsAny, JSONValue, Prettify, RemoveBlankRecord, Simplify, UnionToIntersection } from './utils/types';
+import type { IfAnyThenEmptyObject, IsAny, JSONValue, RemoveBlankRecord, Simplify, UnionToIntersection } from './utils/types';
 export type Bindings = Record<string, unknown>;
 export type Variables = Record<string, unknown>;
 export type BlankEnv = {};
@@ -32,7 +32,10 @@ export type Handler<E extends Env = any, P extends string = any, I extends Input
 export type MiddlewareHandler<E extends Env = any, P extends string = string, I extends Input = {}> = (c: Context<E, P, I>, next: Next) => Promise<Response | void>;
 export type H<E extends Env = any, P extends string = any, I extends Input = BlankInput, R extends HandlerResponse<any> = any> = Handler<E, P, I, R> | MiddlewareHandler<E, P, I>;
 export type NotFoundHandler<E extends Env = any> = (c: Context<E>) => Response | Promise<Response>;
-export type ErrorHandler<E extends Env = any> = (err: Error, c: Context<E>) => Response | Promise<Response>;
+export interface HTTPResponseError extends Error {
+    getResponse: () => Response;
+}
+export type ErrorHandler<E extends Env = any> = (err: Error | HTTPResponseError, c: Context<E>) => Response | Promise<Response>;
 export interface HandlerInterface<E extends Env = Env, M extends string = string, S extends Schema = BlankSchema, BasePath extends string = '/'> {
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = BlankInput, R extends HandlerResponse<any> = any, E2 extends Env = E>(handler: H<E2, P, I, R>): Hono<IntersectNonAnyTypes<[E, E2]>, S & ToSchema<M, P, I, MergeTypedResponse<R>>, BasePath>;
     <P extends string, MergedPath extends MergePath<BasePath, P> = MergePath<BasePath, P>, R extends HandlerResponse<any> = any, I extends Input = BlankInput, E2 extends Env = E>(path: P, handler: H<E2, MergedPath, I, R>): Hono<IntersectNonAnyTypes<[E, E2]>, S & ToSchema<M, MergePath<BasePath, P>, I, MergeTypedResponse<R>>, BasePath>;
@@ -367,7 +370,7 @@ export interface OnHandlerInterface<E extends Env = Env, S extends Schema = Blan
     <I extends Input = BlankInput, R extends HandlerResponse<any> = any>(methods: string | string[], paths: string[], ...handlers: H<E, any, I, R>[]): Hono<E, S & ToSchema<string, string, I, MergeTypedResponse<R>>, BasePath>;
 }
 type ExtractKey<S> = S extends Record<infer Key, unknown> ? Key extends string ? Key : never : string;
-export type ToSchema<M extends string, P extends string, I extends Input | Input['in'], RorO> = Prettify<{
+export type ToSchema<M extends string, P extends string, I extends Input | Input['in'], RorO> = Simplify<{
     [K in P]: {
         [K2 in M as AddDollar<K2>]: Simplify<{
             input: AddParam<ExtractInput<I>, P>;
@@ -409,7 +412,7 @@ type ExtractParams<Path extends string> = string extends Path ? Record<string, s
 type FlattenIfIntersect<T> = T extends infer O ? {
     [K in keyof O]: O[K];
 } : never;
-export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = Prettify<{
+export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = Simplify<{
     [P in keyof OrigSchema as MergePath<SubPath, P & string>]: {
         [M in keyof OrigSchema[P]]: MergeEndpointParamsWithPath<OrigSchema[P][M], SubPath>;
     };
@@ -442,12 +445,12 @@ export type AddParam<I, P extends string> = ParamKeys<P> extends never ? I : I e
 };
 type AddDollar<T extends string> = `$${Lowercase<T>}`;
 export type MergePath<A extends string, B extends string> = B extends '' ? MergePath<A, '/'> : A extends '' ? B : A extends '/' ? B : A extends `${infer P}/` ? B extends `/${infer Q}` ? `${P}/${Q}` : `${P}/${B}` : B extends `/${infer Q}` ? Q extends '' ? A : `${A}/${Q}` : `${A}/${B}`;
-export type KnownResponseFormat = 'json' | 'text';
+export type KnownResponseFormat = 'json' | 'text' | 'redirect';
 export type ResponseFormat = KnownResponseFormat | string;
 export type TypedResponse<T = unknown, U extends StatusCode = StatusCode, F extends ResponseFormat = T extends string ? 'text' : T extends JSONValue ? 'json' : ResponseFormat> = {
-    data: T;
-    status: U;
-    format: F;
+    _data: T;
+    _status: U;
+    _format: F;
 };
 type MergeTypedResponse<T> = T extends Promise<infer T2> ? T2 extends TypedResponse ? T2 : TypedResponse : T extends TypedResponse ? T : TypedResponse;
 export type ValidationTargets = {

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

@@ -19,9 +19,19 @@ export type JSONParsed<T> = T extends {
 } ? (() => J) extends () => JSONObject ? J : JSONParsed<J> : T extends JSONPrimitive ? T : T extends Array<infer U> ? Array<JSONParsed<U>> : T extends object ? {
     [K in keyof T]: JSONParsed<T[K]>;
 } : never;
+/**
+ * Useful to flatten the type output to improve type hints shown in editors. And also to transform an interface into a type to aide with assignability.
+ * @copyright from sindresorhus/type-fest
+ */
 export type Simplify<T> = {
     [KeyType in keyof T]: T[KeyType];
 } & {};
+/**
+ * A simple extension of Simplify that will deeply traverse array elements.
+ */
+export type SimplifyDeepArray<T> = T extends any[] ? {
+    [E in keyof T]: SimplifyDeepArray<T[E]>;
+} : Simplify<T>;
 export type InterfaceToType<T> = T extends Function ? T : {
     [K in keyof T]: InterfaceToType<T[K]>;
 };
@@ -30,6 +40,3 @@ export type RequiredKeysOf<BaseType extends object> = Exclude<{
 }[keyof BaseType], undefined>;
 export type HasRequiredKeys<BaseType extends object> = RequiredKeysOf<BaseType> extends never ? false : true;
 export type IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
-export type Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};

package/dist/utils/filepath.js

@@ -4,7 +4,7 @@ var getFilePath = (options) => {
   const defaultDocument = options.defaultDocument || "index.html";
   if (filename.endsWith("/")) {
     filename = filename.concat(defaultDocument);
-  } else if (!filename.match(/\.[a-zA-Z0-9]+$/)) {
+  } else if (!filename.match(/\.[a-zA-Z0-9_-]+$/)) {
     filename = filename.concat("/" + defaultDocument);
   }
   const path = getFilePathWithoutDefaultDocument({

package/package.json

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