hono 1.4.7 → 1.5.0

package/README.md

@@ -556,9 +556,9 @@ import { RegExpRouter } from 'hono/router/reg-exp-router'
 const app = new Hono({ router: new RegExpRouter() })
 ```
 
-## Routing Ordering
+## Routing priority
 
-The routing priority is decided by the order of registration. Only one handler will be dispatched.
+Handlers or middleware will be executed in registration order.
 
 ```ts
 app.get('/book/a', (c) => c.text('a')) // a
@@ -566,27 +566,37 @@ app.get('/book/:slug', (c) => c.text('common')) // common
 ```
 
 ```http
-GET /book/a ---> `a` // common will not be dispatched
-GET /book/b ---> `common` // a will not be dispatched
+GET /book/a ---> `a`
+GET /book/b ---> `common`
 ```
 
-All scoring rules:
+When a handler is executed, the process will be stopped.
 
 ```ts
-app.get('/api/*', 'c') // score 1.1 <--- `/*` is special wildcard
-app.get('/api/:type/:id', 'd') // score 3.2
-app.get('/api/posts/:id', 'e') // score 3.3
-app.get('/api/posts/123', 'f') // score 3.4
-app.get('/*/*/:id', 'g') // score 3.5
-app.get('/api/posts/*/comment', 'h') // score 4.6 - not match
-app.get('*', 'a') // score 0.7
-app.get('*', 'b') // score 0.8
+app.get('*', (c) => c.text('common')) // common
+app.get('/foo', (c) => c.text('foo')) // foo
 ```
 
-```plain
-GET /api/posts/123
----> will match => c, d, e, f, b, a, b
----> sort by score => a, b, c, d, e, f, g
+```http
+GET /foo ---> `common` // foo will not be dispatched
+```
+
+If you have the middleware that you want to execute, write the code above the handler.
+
+```ts
+app.use('*', logger())
+app.get('/foo', (c) => c.text('foo'))
+```
+
+If you want a "_fallback_" handler, write the code below the other handler.
+
+```ts
+app.get('/foo', (c) => c.text('foo')) // foo
+app.get('*', (c) => c.text('fallback')) // fallback
+```
+
+```http
+GET /bar ---> `fallback`
 ```
 
 ## Cloudflare Workers with Hono

package/dist/router/reg-exp-router/router.d.ts

@@ -11,7 +11,6 @@ interface Hint {
 interface HandlerWithSortIndex<T> {
     handler: T;
     index: number;
-    componentsLength: number;
 }
 interface Route<T> {
     method: string;

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

@@ -65,9 +65,7 @@ function compareRoute(a, b) {
     return i === b.hint.regExpComponents.length || a.hint.endWithWildcard ? 1 : 0;
 }
 function compareHandler(a, b) {
-    return a.componentsLength !== b.componentsLength
-        ? a.componentsLength - b.componentsLength
-        : a.index - b.index;
+    return a.index - b.index;
 }
 function getSortedHandlers(handlers) {
     return [...handlers].sort(compareHandler).map((h) => h.handler);
@@ -158,7 +156,6 @@ class RegExpRouter {
         const handlerWithSortIndex = {
             index,
             handler,
-            componentsLength: hint.components.length || 1,
         };
         for (let i = 0, len = routes.length; i < len; i++) {
             if (routes[i].method === method && routes[i].path === path) {
@@ -318,9 +315,7 @@ class RegExpRouter {
                         }
                     }
                     if (routes[j].hint.components.length < routes[i].hint.components.length) {
-                        const componentsLength = routes[j].hint.components.length || 1;
                         routes[j].middleware.push(...routes[i].handlers.map((h) => ({
-                            componentsLength,
                             index: h.index,
                             handler: h.handler,
                         })));

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

@@ -66,18 +66,11 @@ class Node {
             parentPatterns.push(...curNode.patterns);
             curNode = curNode.children[p];
         }
-        let score = 1;
-        if (path === '*') {
-            score = score + this.order * 0.01;
-        }
-        else {
-            score = parts.length + this.order * 0.01;
-        }
         if (!curNode.methods.length) {
             curNode.methods = [];
         }
         const m = {};
-        const handlerSet = { handler: handler, name: this.name, score: score };
+        const handlerSet = { handler: handler, name: this.name, score: this.order };
         m[method] = handlerSet;
         curNode.methods.push(m);
         return curNode;
@@ -90,9 +83,6 @@ class Node {
                 const handlerSet = m[method] || m[router_1.METHOD_NAME_ALL];
                 if (handlerSet !== undefined) {
                     const hs = { ...handlerSet };
-                    if (wildcard) {
-                        hs.score = handlerSet.score - 1;
-                    }
                     handlerSets.push(hs);
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",