hono 3.2.3 → 3.2.4

package/dist/cjs/context.js

@@ -176,7 +176,7 @@ class Context {
     if (options) {
       this._exCtx = options.executionCtx;
       this._path = options.path ?? "/";
-      this._pData = options.paramData;
+      this._params = options.params;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
@@ -187,9 +187,9 @@ class Context {
     if (this._req) {
       return this._req;
     } else {
-      this._req = new import_request.HonoRequest(this.rawRequest, this._path, this._pData);
+      this._req = new import_request.HonoRequest(this.rawRequest, this._path, this._params);
       this.rawRequest = void 0;
-      this._pData = void 0;
+      this._params = void 0;
       return this._req;
     }
   }

package/dist/cjs/hono-base.js

@@ -49,11 +49,15 @@ class Hono extends defineDynamicClass() {
     this.routes = [];
     this.notFoundHandler = notFoundHandler;
     this.errorHandler = errorHandler;
+    this.head = () => {
+      console.warn("`app.head()` is no longer used. `app.get()` implicitly handles the HEAD method.");
+      return this;
+    };
     this.handleEvent = (event) => {
-      return this.dispatch(event.request, event);
+      return this.dispatch(event.request, event, void 0, event.request.method);
     };
     this.fetch = (request, Env, executionCtx) => {
-      return this.dispatch(request, executionCtx, Env);
+      return this.dispatch(request, executionCtx, Env, request.method);
     };
     this.request = async (input, requestInit) => {
       if (input instanceof Request) {
@@ -191,7 +195,7 @@ class Hono extends defineDynamicClass() {
     this.routes.push(r);
   }
   matchRoute(method, path) {
-    return this.router.match(method, path);
+    return this.router.match(method, path) || { handlers: [], params: {} };
   }
   handleError(err, c) {
     if (err instanceof Error) {
@@ -199,23 +203,23 @@ class Hono extends defineDynamicClass() {
     }
     throw err;
   }
-  dispatch(request, eventOrExecutionCtx, env) {
+  dispatch(request, executionCtx, env, method) {
     const path = this.getPath(request);
-    const method = request.method;
-    const result = this.matchRoute(method, path);
-    const paramData = result?.params;
+    if (method === "HEAD") {
+      return (async () => new Response(null, await this.dispatch(request, executionCtx, env, "GET")))();
+    }
+    const { handlers, params } = this.matchRoute(method, path);
     const c = new import_context.Context(request, {
       env,
-      executionCtx: eventOrExecutionCtx,
+      executionCtx,
       notFoundHandler: this.notFoundHandler,
       path,
-      paramData
+      params
     });
-    if (result?.handlers.length === 1) {
-      const handler = result.handlers[0];
+    if (handlers.length === 1) {
       let res;
       try {
-        res = handler(c, async () => {
+        res = handlers[0](c, async () => {
         });
         if (!res) {
           return this.notFoundHandler(c);
@@ -246,7 +250,6 @@ class Hono extends defineDynamicClass() {
         return awaited;
       })();
     }
-    const handlers = result ? result.handlers : [this.notFoundHandler];
     const composed = (0, import_compose.compose)(handlers, this.errorHandler, this.notFoundHandler);
     return (async () => {
       try {

package/dist/cjs/router/pattern-router/router.js

@@ -62,21 +62,22 @@ class PatternRouter {
   }
   match(method, path) {
     const handlers = [];
-    let params = void 0;
+    const params = {};
     for (const [pattern, routeMethod, handler] of this.routes) {
+      const isRegExp = pattern.source.charCodeAt(pattern.source.length - 1) === 36;
       if (routeMethod === import_router.METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
           handlers.push(handler);
-          if (pattern.source.charCodeAt(pattern.source.length - 1) === 36) {
-            params ?? (params = match.groups || {});
+          if (isRegExp) {
+            Object.assign(params, match.groups);
           }
         }
       }
     }
     return handlers.length ? {
       handlers,
-      params: params || {}
+      params
     } : null;
   }
 }

package/dist/cjs/router/reg-exp-router/router.js

@@ -39,18 +39,18 @@ function clearWildcardRegExpCache() {
 }
 function buildMatcherFromPreprocessedRoutes(routes) {
   const trie = new import_trie.Trie();
-  const handlers = [];
+  const handlerData = [];
   if (routes.length === 0) {
     return nullMatcher;
   }
-  routes = routes.sort(([a], [b]) => a.length - b.length);
+  const routesWithStaticPathFlag = routes.map((route) => [!/\*|\/:/.test(route[0]), ...route]).sort(
+    ([isStaticA, pathA], [isStaticB, pathB]) => isStaticA ? 1 : isStaticB ? -1 : pathA.length - pathB.length
+  );
   const staticMap = {};
-  for (let i = 0, j = -1, len = routes.length; i < len; i++) {
-    const path = routes[i][0];
-    let pathErrorCheckOnly = false;
-    if (!/\*|\/:/.test(path)) {
-      pathErrorCheckOnly = true;
-      staticMap[routes[i][0]] = { handlers: routes[i][1], params: emptyParam };
+  for (let i = 0, j = -1, len = routesWithStaticPathFlag.length; i < len; i++) {
+    const [pathErrorCheckOnly, path, handlers] = routesWithStaticPathFlag[i];
+    if (pathErrorCheckOnly) {
+      staticMap[path] = { handlers, params: emptyParam };
     } else {
       j++;
     }
@@ -63,11 +63,11 @@ function buildMatcherFromPreprocessedRoutes(routes) {
     if (pathErrorCheckOnly) {
       continue;
     }
-    handlers[j] = paramMap.length === 0 ? [{ handlers: routes[i][1], params: emptyParam }, null] : [routes[i][1], paramMap];
+    handlerData[j] = paramMap.length === 0 ? [{ handlers, params: emptyParam }, null] : [handlers, paramMap];
   }
   const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-  for (let i = 0, len = handlers.length; i < len; i++) {
-    const paramMap = handlers[i][1];
+  for (let i = 0, len = handlerData.length; i < len; i++) {
+    const paramMap = handlerData[i][1];
     if (paramMap) {
       for (let j = 0, len2 = paramMap.length; j < len2; j++) {
         paramMap[j][1] = paramReplacementMap[paramMap[j][1]];
@@ -76,7 +76,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   }
   const handlerMap = [];
   for (const i in indexReplacementMap) {
-    handlerMap[i] = handlers[indexReplacementMap[i]];
+    handlerMap[i] = handlerData[indexReplacementMap[i]];
   }
   return [regexp, handlerMap, staticMap];
 }
@@ -103,7 +103,7 @@ class RegExpRouter {
     if (!middleware || !routes) {
       throw new Error("Can not add a route since the matcher is already built.");
     }
-    if (!methodNames.includes(method))
+    if (methodNames.indexOf(method) === -1)
       methodNames.push(method);
     if (!middleware[method]) {
       ;

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

@@ -40,7 +40,6 @@ function findParam(node, name) {
 class Node {
   constructor(method, handler, children) {
     this.order = 0;
-    this.shouldCapture = false;
     this.children = children || {};
     this.methods = [];
     this.name = "";
@@ -72,7 +71,6 @@ class Node {
       const pattern = (0, import_url.getPattern)(p);
       if (pattern) {
         if (typeof pattern === "object") {
-          this.shouldCapture = true;
           for (let j = 0, len2 = parentPatterns.length; j < len2; j++) {
             if (typeof parentPatterns[j] === "object" && parentPatterns[j][1] === pattern[1]) {
               throw new Error(errorMessage(pattern[1]));
@@ -87,7 +85,6 @@ class Node {
       }
       parentPatterns.push(...curNode.patterns);
       curNode = curNode.children[p];
-      curNode.shouldCapture = this.shouldCapture;
     }
     if (!curNode.methods.length) {
       curNode.methods = [];
@@ -167,7 +164,7 @@ class Node {
             if (typeof name === "string" && !matched) {
               params[name] = part;
             } else {
-              if (node.children[part] && node.children[part].shouldCapture) {
+              if (node.children[part]) {
                 params[name] = part;
               }
             }

package/dist/cjs/router.js

@@ -26,7 +26,7 @@ __export(router_exports, {
 module.exports = __toCommonJS(router_exports);
 const METHOD_NAME_ALL = "ALL";
 const METHOD_NAME_ALL_LOWERCASE = "all";
-const METHODS = ["get", "post", "put", "delete", "head", "options", "patch"];
+const METHODS = ["get", "post", "put", "delete", "options", "patch"];
 class UnsupportedPathError extends Error {
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/url.js

@@ -128,10 +128,10 @@ const _decodeURI = (value) => {
   if (!/[%+]/.test(value)) {
     return value;
   }
-  if (value.includes("+")) {
+  if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return value.includes("%") ? decodeURIComponent_(value) : value;
+  return value.indexOf("%") === -1 ? value : decodeURIComponent_(value);
 };
 const _getQueryParam = (url, key, multiple) => {
   let encoded;

package/dist/context.js

@@ -154,7 +154,7 @@ var Context = class {
     if (options) {
       this._exCtx = options.executionCtx;
       this._path = options.path ?? "/";
-      this._pData = options.paramData;
+      this._params = options.params;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
@@ -165,9 +165,9 @@ var Context = class {
     if (this._req) {
       return this._req;
     } else {
-      this._req = new HonoRequest(this.rawRequest, this._path, this._pData);
+      this._req = new HonoRequest(this.rawRequest, this._path, this._params);
       this.rawRequest = void 0;
-      this._pData = void 0;
+      this._params = void 0;
       return this._req;
     }
   }

package/dist/hono-base.js

@@ -27,11 +27,15 @@ var Hono = class extends defineDynamicClass() {
     this.routes = [];
     this.notFoundHandler = notFoundHandler;
     this.errorHandler = errorHandler;
+    this.head = () => {
+      console.warn("`app.head()` is no longer used. `app.get()` implicitly handles the HEAD method.");
+      return this;
+    };
     this.handleEvent = (event) => {
-      return this.dispatch(event.request, event);
+      return this.dispatch(event.request, event, void 0, event.request.method);
     };
     this.fetch = (request, Env, executionCtx) => {
-      return this.dispatch(request, executionCtx, Env);
+      return this.dispatch(request, executionCtx, Env, request.method);
     };
     this.request = async (input, requestInit) => {
       if (input instanceof Request) {
@@ -169,7 +173,7 @@ var Hono = class extends defineDynamicClass() {
     this.routes.push(r);
   }
   matchRoute(method, path) {
-    return this.router.match(method, path);
+    return this.router.match(method, path) || { handlers: [], params: {} };
   }
   handleError(err, c) {
     if (err instanceof Error) {
@@ -177,23 +181,23 @@ var Hono = class extends defineDynamicClass() {
     }
     throw err;
   }
-  dispatch(request, eventOrExecutionCtx, env) {
+  dispatch(request, executionCtx, env, method) {
     const path = this.getPath(request);
-    const method = request.method;
-    const result = this.matchRoute(method, path);
-    const paramData = result?.params;
+    if (method === "HEAD") {
+      return (async () => new Response(null, await this.dispatch(request, executionCtx, env, "GET")))();
+    }
+    const { handlers, params } = this.matchRoute(method, path);
     const c = new Context(request, {
       env,
-      executionCtx: eventOrExecutionCtx,
+      executionCtx,
       notFoundHandler: this.notFoundHandler,
       path,
-      paramData
+      params
     });
-    if (result?.handlers.length === 1) {
-      const handler = result.handlers[0];
+    if (handlers.length === 1) {
       let res;
       try {
-        res = handler(c, async () => {
+        res = handlers[0](c, async () => {
         });
         if (!res) {
           return this.notFoundHandler(c);
@@ -224,7 +228,6 @@ var Hono = class extends defineDynamicClass() {
         return awaited;
       })();
     }
-    const handlers = result ? result.handlers : [this.notFoundHandler];
     const composed = compose(handlers, this.errorHandler, this.notFoundHandler);
     return (async () => {
       try {

package/dist/router/pattern-router/router.js

@@ -40,21 +40,22 @@ var PatternRouter = class {
   }
   match(method, path) {
     const handlers = [];
-    let params = void 0;
+    const params = {};
     for (const [pattern, routeMethod, handler] of this.routes) {
+      const isRegExp = pattern.source.charCodeAt(pattern.source.length - 1) === 36;
       if (routeMethod === METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
           handlers.push(handler);
-          if (pattern.source.charCodeAt(pattern.source.length - 1) === 36) {
-            params ?? (params = match.groups || {});
+          if (isRegExp) {
+            Object.assign(params, match.groups);
           }
         }
       }
     }
     return handlers.length ? {
       handlers,
-      params: params || {}
+      params
     } : null;
   }
 };

package/dist/router/reg-exp-router/router.js

@@ -17,18 +17,18 @@ function clearWildcardRegExpCache() {
 }
 function buildMatcherFromPreprocessedRoutes(routes) {
   const trie = new Trie();
-  const handlers = [];
+  const handlerData = [];
   if (routes.length === 0) {
     return nullMatcher;
   }
-  routes = routes.sort(([a], [b]) => a.length - b.length);
+  const routesWithStaticPathFlag = routes.map((route) => [!/\*|\/:/.test(route[0]), ...route]).sort(
+    ([isStaticA, pathA], [isStaticB, pathB]) => isStaticA ? 1 : isStaticB ? -1 : pathA.length - pathB.length
+  );
   const staticMap = {};
-  for (let i = 0, j = -1, len = routes.length; i < len; i++) {
-    const path = routes[i][0];
-    let pathErrorCheckOnly = false;
-    if (!/\*|\/:/.test(path)) {
-      pathErrorCheckOnly = true;
-      staticMap[routes[i][0]] = { handlers: routes[i][1], params: emptyParam };
+  for (let i = 0, j = -1, len = routesWithStaticPathFlag.length; i < len; i++) {
+    const [pathErrorCheckOnly, path, handlers] = routesWithStaticPathFlag[i];
+    if (pathErrorCheckOnly) {
+      staticMap[path] = { handlers, params: emptyParam };
     } else {
       j++;
     }
@@ -41,11 +41,11 @@ function buildMatcherFromPreprocessedRoutes(routes) {
     if (pathErrorCheckOnly) {
       continue;
     }
-    handlers[j] = paramMap.length === 0 ? [{ handlers: routes[i][1], params: emptyParam }, null] : [routes[i][1], paramMap];
+    handlerData[j] = paramMap.length === 0 ? [{ handlers, params: emptyParam }, null] : [handlers, paramMap];
   }
   const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-  for (let i = 0, len = handlers.length; i < len; i++) {
-    const paramMap = handlers[i][1];
+  for (let i = 0, len = handlerData.length; i < len; i++) {
+    const paramMap = handlerData[i][1];
     if (paramMap) {
       for (let j = 0, len2 = paramMap.length; j < len2; j++) {
         paramMap[j][1] = paramReplacementMap[paramMap[j][1]];
@@ -54,7 +54,7 @@ function buildMatcherFromPreprocessedRoutes(routes) {
   }
   const handlerMap = [];
   for (const i in indexReplacementMap) {
-    handlerMap[i] = handlers[indexReplacementMap[i]];
+    handlerMap[i] = handlerData[indexReplacementMap[i]];
   }
   return [regexp, handlerMap, staticMap];
 }
@@ -81,7 +81,7 @@ var RegExpRouter = class {
     if (!middleware || !routes) {
       throw new Error("Can not add a route since the matcher is already built.");
     }
-    if (!methodNames.includes(method))
+    if (methodNames.indexOf(method) === -1)
       methodNames.push(method);
     if (!middleware[method]) {
       ;

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

@@ -18,7 +18,6 @@ function findParam(node, name) {
 var Node = class {
   constructor(method, handler, children) {
     this.order = 0;
-    this.shouldCapture = false;
     this.children = children || {};
     this.methods = [];
     this.name = "";
@@ -50,7 +49,6 @@ var Node = class {
       const pattern = getPattern(p);
       if (pattern) {
         if (typeof pattern === "object") {
-          this.shouldCapture = true;
           for (let j = 0, len2 = parentPatterns.length; j < len2; j++) {
             if (typeof parentPatterns[j] === "object" && parentPatterns[j][1] === pattern[1]) {
               throw new Error(errorMessage(pattern[1]));
@@ -65,7 +63,6 @@ var Node = class {
       }
       parentPatterns.push(...curNode.patterns);
       curNode = curNode.children[p];
-      curNode.shouldCapture = this.shouldCapture;
     }
     if (!curNode.methods.length) {
       curNode.methods = [];
@@ -145,7 +142,7 @@ var Node = class {
             if (typeof name === "string" && !matched) {
               params[name] = part;
             } else {
-              if (node.children[part] && node.children[part].shouldCapture) {
+              if (node.children[part]) {
                 params[name] = part;
               }
             }

package/dist/router.js

@@ -1,7 +1,7 @@
 // src/router.ts
 var METHOD_NAME_ALL = "ALL";
 var METHOD_NAME_ALL_LOWERCASE = "all";
-var METHODS = ["get", "post", "put", "delete", "head", "options", "patch"];
+var METHODS = ["get", "post", "put", "delete", "options", "patch"];
 var UnsupportedPathError = class extends Error {
 };
 export {

package/dist/types/context.d.ts

@@ -48,7 +48,7 @@ declare type ContextOptions<E extends Env> = {
     executionCtx?: FetchEvent | ExecutionContext | undefined;
     notFoundHandler?: NotFoundHandler<E>;
     path?: string;
-    paramData?: Record<string, string>;
+    params?: Record<string, string>;
 };
 export declare class Context<E extends Env = any, P extends string = any, I extends Input = {}> {
     env: E['Bindings'];
@@ -64,7 +64,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
     private _pH;
     private _res;
     private _path;
-    private _pData?;
+    private _params?;
     private rawRequest?;
     private notFoundHandler;
     constructor(req: Request, options?: ContextOptions<E>);

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

@@ -14,7 +14,6 @@ declare const Hono_base: new <E_1 extends Env = Env, S_1 = {}, BasePath_1 extend
     post: HandlerInterface<E_1, "post", S_1, BasePath_1>;
     put: HandlerInterface<E_1, "put", S_1, BasePath_1>;
     delete: HandlerInterface<E_1, "delete", S_1, BasePath_1>;
-    head: HandlerInterface<E_1, "head", S_1, BasePath_1>;
     options: HandlerInterface<E_1, "options", S_1, BasePath_1>;
     patch: HandlerInterface<E_1, "patch", S_1, BasePath_1>;
 } & {
@@ -51,6 +50,12 @@ declare class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> e
      */
     mount(path: string, applicationHandler: (request: Request, ...args: any) => Response | Promise<Response>, optionHandler?: (c: Context) => unknown): Hono<E, S, BasePath>;
     get routerName(): string;
+    /**
+     * @deprecate
+     * `app.head()` is no longer used.
+     * `app.get()` implicitly handles the HEAD method.
+     */
+    head: () => this;
     private addRoute;
     private matchRoute;
     private handleError;

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

@@ -3,6 +3,9 @@ declare type Props = Record<string, any>;
 declare global {
     namespace JSX {
         type Element = HtmlEscapedString;
+        interface ElementChildrenAttribute {
+            children: Child;
+        }
         interface IntrinsicElements {
             [tagName: string]: Props;
         }

package/dist/types/router/trie-router/node.d.ts

@@ -12,7 +12,6 @@ export declare class Node<T> {
     order: number;
     name: string;
     handlerSetCache: Record<string, HandlerSet<T>[]>;
-    shouldCapture: boolean;
     constructor(method?: string, handler?: T, children?: Record<string, Node<T>>);
     insert(method: string, path: string, handler: T): Node<T>;
     private gHSets;

package/dist/types/router.d.ts

@@ -1,6 +1,6 @@
 export declare const METHOD_NAME_ALL: "ALL";
 export declare const METHOD_NAME_ALL_LOWERCASE: "all";
-export declare const METHODS: readonly ["get", "post", "put", "delete", "head", "options", "patch"];
+export declare const METHODS: readonly ["get", "post", "put", "delete", "options", "patch"];
 export interface Router<T> {
     name: string;
     add(method: string, path: string, handler: T): void;

package/dist/utils/url.js

@@ -97,10 +97,10 @@ var _decodeURI = (value) => {
   if (!/[%+]/.test(value)) {
     return value;
   }
-  if (value.includes("+")) {
+  if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return value.includes("%") ? decodeURIComponent_(value) : value;
+  return value.indexOf("%") === -1 ? value : decodeURIComponent_(value);
 };
 var _getQueryParam = (url, key, multiple) => {
   let encoded;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -12,7 +12,7 @@
   "scripts": {
     "test": "jest",
     "test:deno": "env NAME=Deno deno test --allow-read --allow-env runtime_tests/deno",
-    "test:bun": "env NAME=Bun bun test --jsx-import-source ../../src/middleware/jsx/jsx-dev-runtime runtime_tests/bun/index.test.tsx",
+    "test:bun": "env NAME=Bun bun test --jsx-import-source ../../src/middleware/jsx runtime_tests/bun/index.test.tsx",
     "test:fastly": "jest --config ./runtime_tests/fastly/jest.config.js",
     "test:lagon": "start-server-and-test \"lagon dev runtime_tests/lagon/index.ts\" http://127.0.0.1:1234 \"yarn jest runtime_tests/lagon/index.test.ts --testMatch '**/*.test.ts'\"",
     "test:node": "env NAME=Node jest --config ./runtime_tests/node/jest.config.js",