hono 4.4.2 → 4.4.4

package/README.md

@@ -8,7 +8,7 @@
 
 <p align="center">
 <a href="https://hono.dev"><b>Documentation 👉 hono.dev</b></a><br />
-<i>v4 has been released!</i> <a href="docs/MIGRATION.md">Migration guide</b>
+<i>Now supports <a href="https://jsr.io/@hono/hono">JSR</a> and <code>deno.land/x</code> is deprecated! See <a href="docs/MIGRATION.md">Migration guide</a>.</i>
 </p>
 
 <hr />
@@ -22,6 +22,7 @@
 [![Bundle Size](https://img.shields.io/bundlephobia/minzip/hono)](https://bundlephobia.com/result?p=hono)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/honojs/hono)](https://github.com/honojs/hono/pulse)
 [![GitHub last commit](https://img.shields.io/github/last-commit/honojs/hono)](https://github.com/honojs/hono/commits/main)
+[![codecov](https://codecov.io/github/honojs/hono/graph/badge.svg)](https://codecov.io/github/honojs/hono)
 [![Discord badge](https://img.shields.io/discord/1011308539819597844?label=Discord&logo=Discord)](https://discord.gg/KMh2eNSdxV)
 
 Hono - _**\[炎\] means flame🔥 in Japanese**_ - is a small, simple, and ultrafast web framework for the Edges.

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/adapter/cloudflare-workers/websocket.js

@@ -35,6 +35,7 @@ var upgradeWebSocket = (createEvents) => async (c, next) => {
   }
   server.accept?.();
   return new Response(null, {
+    status: 101,
     webSocket: client
   });
 };

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

@@ -4,13 +4,12 @@ var { open } = Deno;
 var serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
-      let file;
       try {
-        file = await open(path);
+        const file = await open(path);
+        return file ? file.readable : null;
       } catch (e) {
         console.warn(`${e}`);
       }
-      return file ? file.readable : null;
     };
     const pathResolve = (path) => {
       return `./${path}`;

package/dist/adapter/deno/websocket.js

@@ -3,8 +3,8 @@ var upgradeWebSocket = (createEvents) => async (c, next) => {
   if (c.req.header("upgrade") !== "websocket") {
     return await next();
   }
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
   const events = await createEvents(c);
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
   const wsContext = {
     binaryType: "arraybuffer",
     close: (code, reason) => socket.close(code, reason),

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/adapter/cloudflare-workers/websocket.js

@@ -57,6 +57,7 @@ const upgradeWebSocket = (createEvents) => async (c, next) => {
   }
   server.accept?.();
   return new Response(null, {
+    status: 101,
     webSocket: client
   });
 };

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

@@ -26,13 +26,12 @@ const { open } = Deno;
 const serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
-      let file;
       try {
-        file = await open(path);
+        const file = await open(path);
+        return file ? file.readable : null;
       } catch (e) {
         console.warn(`${e}`);
       }
-      return file ? file.readable : null;
     };
     const pathResolve = (path) => {
       return `./${path}`;

package/dist/cjs/adapter/deno/websocket.js

@@ -25,8 +25,8 @@ const upgradeWebSocket = (createEvents) => async (c, next) => {
   if (c.req.header("upgrade") !== "websocket") {
     return await next();
   }
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
   const events = await createEvents(c);
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
   const wsContext = {
     binaryType: "arraybuffer",
     close: (code, reason) => socket.close(code, reason),

package/dist/cjs/context.js

@@ -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/{adapter/aws-lambda/custom-context.js → helper/conninfo/types.js}

@@ -12,5 +12,5 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var custom_context_exports = {};
-module.exports = __toCommonJS(custom_context_exports);
+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);
@@ -142,25 +141,39 @@ class Hono {
     this.notFoundHandler = handler;
     return this;
   };
-  mount(path, applicationHandler, optionHandler) {
-    const mergedPath = (0, import_url.mergePath)(this._basePath, path);
-    const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-    const handler = async (c, next) => {
+  mount(path, applicationHandler, options) {
+    let replaceRequest;
+    let optionHandler;
+    if (options) {
+      if (typeof options === "function") {
+        optionHandler = options;
+      } else {
+        optionHandler = options.optionHandler;
+        replaceRequest = options.replaceRequest;
+      }
+    }
+    const getOptions = optionHandler ? (c) => {
+      const options2 = optionHandler(c);
+      return Array.isArray(options2) ? options2 : [options2];
+    } : (c) => {
       let executionContext = void 0;
       try {
         executionContext = c.executionCtx;
       } catch {
       }
-      const options = optionHandler ? optionHandler(c) : [c.env, executionContext];
-      const optionsArray = Array.isArray(options) ? options : [options];
-      const queryStrings = (0, import_url.getQueryStrings)(c.req.url);
-      const res = await applicationHandler(
-        new Request(
-          new URL((c.req.path.slice(pathPrefixLength) || "/") + queryStrings, c.req.url),
-          c.req.raw
-        ),
-        ...optionsArray
-      );
+      return [c.env, executionContext];
+    };
+    replaceRequest ||= (() => {
+      const mergedPath = (0, import_url.mergePath)(this._basePath, path);
+      const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
+      return (request) => {
+        const url = new URL(request.url);
+        url.pathname = url.pathname.slice(pathPrefixLength) || "/";
+        return new Request(url, request);
+      };
+    })();
+    const handler = async (c, next) => {
+      const res = await applicationHandler(replaceRequest(c.req.raw), ...getOptions(c));
       if (res) {
         return res;
       }
@@ -207,7 +220,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 () => {
@@ -215,7 +228,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/utils.js

@@ -27,6 +27,10 @@ const normalizeIntrinsicElementProps = (props) => {
     props["class"] = props["className"];
     delete props["className"];
   }
+  if (props && "htmlFor" in props) {
+    props["for"] = props["htmlFor"];
+    delete props["htmlFor"];
+  }
 };
 const styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {

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/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

@@ -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,16 +1,15 @@
 // 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, getQueryStrings, mergePath } from "./utils/url.js";
+import { getPath, getPathNoStrict, mergePath } from "./utils/url.js";
 var COMPOSED_HANDLER = Symbol("composedHandler");
 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);
@@ -119,25 +118,39 @@ var Hono = class {
     this.notFoundHandler = handler;
     return this;
   };
-  mount(path, applicationHandler, optionHandler) {
-    const mergedPath = mergePath(this._basePath, path);
-    const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-    const handler = async (c, next) => {
+  mount(path, applicationHandler, options) {
+    let replaceRequest;
+    let optionHandler;
+    if (options) {
+      if (typeof options === "function") {
+        optionHandler = options;
+      } else {
+        optionHandler = options.optionHandler;
+        replaceRequest = options.replaceRequest;
+      }
+    }
+    const getOptions = optionHandler ? (c) => {
+      const options2 = optionHandler(c);
+      return Array.isArray(options2) ? options2 : [options2];
+    } : (c) => {
       let executionContext = void 0;
       try {
         executionContext = c.executionCtx;
       } catch {
       }
-      const options = optionHandler ? optionHandler(c) : [c.env, executionContext];
-      const optionsArray = Array.isArray(options) ? options : [options];
-      const queryStrings = getQueryStrings(c.req.url);
-      const res = await applicationHandler(
-        new Request(
-          new URL((c.req.path.slice(pathPrefixLength) || "/") + queryStrings, c.req.url),
-          c.req.raw
-        ),
-        ...optionsArray
-      );
+      return [c.env, executionContext];
+    };
+    replaceRequest ||= (() => {
+      const mergedPath = mergePath(this._basePath, path);
+      const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
+      return (request) => {
+        const url = new URL(request.url);
+        url.pathname = url.pathname.slice(pathPrefixLength) || "/";
+        return new Request(url, request);
+      };
+    })();
+    const handler = async (c, next) => {
+      const res = await applicationHandler(replaceRequest(c.req.raw), ...getOptions(c));
       if (res) {
         return res;
       }
@@ -184,7 +197,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 () => {
@@ -192,7 +205,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/utils.js

@@ -4,6 +4,10 @@ var normalizeIntrinsicElementProps = (props) => {
     props["class"] = props["className"];
     delete props["className"];
   }
+  if (props && "htmlFor" in props) {
+    props["for"] = props["htmlFor"];
+    delete props["htmlFor"];
+  }
 };
 var styleObjectForEach = (style, fn) => {
   for (const [k, v] of Object.entries(style)) {

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/types/adapter/aws-lambda/handler.d.ts

@@ -1,7 +1,6 @@
 import type { Hono } from '../../hono';
 import type { Env, Schema } from '../../types';
-import type { ALBRequestContext, ApiGatewayRequestContext, ApiGatewayRequestContextV2 } from './custom-context';
-import type { Handler, LambdaContext } from './types';
+import type { ALBRequestContext, ApiGatewayRequestContext, ApiGatewayRequestContextV2, Handler, LambdaContext } from './types';
 export type LambdaEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2 | ALBProxyEvent;
 export interface APIGatewayProxyEventV2 {
     version: string;

package/dist/types/adapter/aws-lambda/index.d.ts

@@ -4,5 +4,4 @@
  */
 export { handle, streamHandle } from './handler';
 export type { APIGatewayProxyResult, LambdaEvent } from './handler';
-export type { ApiGatewayRequestContext, ApiGatewayRequestContextV2, ALBRequestContext, } from './custom-context';
-export type { LambdaContext } from './types';
+export type { ApiGatewayRequestContext, ApiGatewayRequestContextV2, ALBRequestContext, LambdaContext, } from './types';

package/dist/types/adapter/aws-lambda/types.d.ts

@@ -40,4 +40,86 @@ export interface LambdaContext {
 }
 type Callback<TResult = any> = (error?: Error | string | null, result?: TResult) => void;
 export type Handler<TEvent = any, TResult = any> = (event: TEvent, context: LambdaContext, callback: Callback<TResult>) => void | Promise<TResult>;
+interface ClientCert {
+    clientCertPem: string;
+    subjectDN: string;
+    issuerDN: string;
+    serialNumber: string;
+    validity: {
+        notBefore: string;
+        notAfter: string;
+    };
+}
+interface Identity {
+    accessKey?: string;
+    accountId?: string;
+    caller?: string;
+    cognitoAuthenticationProvider?: string;
+    cognitoAuthenticationType?: string;
+    cognitoIdentityId?: string;
+    cognitoIdentityPoolId?: string;
+    principalOrgId?: string;
+    sourceIp: string;
+    user?: string;
+    userAgent: string;
+    userArn?: string;
+    clientCert?: ClientCert;
+}
+export interface ApiGatewayRequestContext {
+    accountId: string;
+    apiId: string;
+    authorizer: {
+        claims?: unknown;
+        scopes?: unknown;
+    };
+    domainName: string;
+    domainPrefix: string;
+    extendedRequestId: string;
+    httpMethod: string;
+    identity: Identity;
+    path: string;
+    protocol: string;
+    requestId: string;
+    requestTime: string;
+    requestTimeEpoch: number;
+    resourceId?: string;
+    resourcePath: string;
+    stage: string;
+}
+interface Authorizer {
+    iam?: {
+        accessKey: string;
+        accountId: string;
+        callerId: string;
+        cognitoIdentity: null;
+        principalOrgId: null;
+        userArn: string;
+        userId: string;
+    };
+}
+export interface ApiGatewayRequestContextV2 {
+    accountId: string;
+    apiId: string;
+    authentication: null;
+    authorizer: Authorizer;
+    domainName: string;
+    domainPrefix: string;
+    http: {
+        method: string;
+        path: string;
+        protocol: string;
+        sourceIp: string;
+        userAgent: string;
+    };
+    requestId: string;
+    routeKey: string;
+    stage: string;
+    time: string;
+    timeEpoch: number;
+}
+export interface ALBRequestContext {
+    elb: {
+        targetGroupArn: string;
+    };
+}
 export {};

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';