hono 0.5.4 → 0.5.5

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

@@ -5,9 +5,7 @@ export interface Context {
 export declare class Node {
     index?: number;
     varIndex?: number;
-    children: {
-        [key: string]: Node;
-    };
+    children: Record<string, Node>;
     insert(tokens: readonly string[], index: number, paramMap: ParamMap, context: Context): void;
     buildRegExpStr(): string;
 }

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

@@ -1,15 +1,7 @@
 import { Router, Result } from '../../router';
-import type { ParamMap, ReplacementMap } from './trie';
 declare type Route<T> = [string, T];
-declare type HandlerData<T> = [T, ParamMap];
-declare type Matcher<T> = [RegExp | true, ReplacementMap, HandlerData<T>[]];
 export declare class RegExpRouter<T> extends Router<T> {
-    routes?: {
-        [method: string]: Route<T>[];
-    };
-    matchers?: {
-        [method: string]: Matcher<T> | null;
-    };
+    routes?: Record<string, Route<T>[]>;
     add(method: string, path: string, handler: T): void;
     match(method: string, path: string): Result<T> | null;
     private buildAllMatchers;

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

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegExpRouter = void 0;
 const router_1 = require("../../router");
 const trie_1 = require("./trie");
+const regExpMatchAll = new RegExp('');
+const emptyParam = {};
 class RegExpRouter extends router_1.Router {
     constructor() {
         super(...arguments);
         this.routes = {};
-        this.matchers = null;
     }
     add(method, path, handler) {
         var _a;
@@ -18,43 +19,54 @@ class RegExpRouter extends router_1.Router {
         this.routes[method].push([path, handler]);
     }
     match(method, path) {
-        if (!this.matchers) {
-            this.buildAllMatchers();
-        }
-        const matcher = this.matchers[method] || this.matchers[router_1.METHOD_NAME_OF_ALL];
-        if (!matcher) {
-            return null;
-        }
-        const [regexp, replacementMap, handlers] = matcher;
-        if (regexp === true) {
-            // '*'
-            return new router_1.Result(handlers[0][0], {});
-        }
-        const match = path.match(regexp);
-        if (!match) {
-            return null;
-        }
-        if (!replacementMap) {
-            // there is only one route and no capture
-            return new router_1.Result(handlers[0][0], {});
-        }
-        const index = match.indexOf('', 1);
-        const [handler, paramMap] = handlers[replacementMap[index]];
-        const params = {};
-        for (let i = 0; i < paramMap.length; i++) {
-            params[paramMap[i][0]] = match[paramMap[i][1]];
+        const matchers = this.buildAllMatchers();
+        let match;
+        // Optimization for middleware
+        const methods = Object.keys(matchers);
+        if (methods.length === 1 && methods[0] === router_1.METHOD_NAME_OF_ALL) {
+            const [regexp, handlers] = matchers[router_1.METHOD_NAME_OF_ALL];
+            if (handlers.length === 1) {
+                const result = new router_1.Result(handlers[0][0], emptyParam);
+                if (regexp === regExpMatchAll) {
+                    match = () => result;
+                }
+                else if (handlers.length === 1 && !handlers[0][1]) {
+                    match = (_, path) => (regexp.test(path) ? result : null);
+                }
+            }
         }
-        return new router_1.Result(handler, params);
+        match || (match = (method, path) => {
+            const matcher = matchers[method] || matchers[router_1.METHOD_NAME_OF_ALL];
+            if (!matcher) {
+                return null;
+            }
+            const match = path.match(matcher[0]);
+            if (!match) {
+                return null;
+            }
+            const index = match.indexOf('', 1);
+            const [handler, paramMap] = matcher[1][index];
+            if (!paramMap) {
+                return new router_1.Result(handler, emptyParam);
+            }
+            const params = {};
+            for (let i = 0; i < paramMap.length; i++) {
+                params[paramMap[i][0]] = match[paramMap[i][1]];
+            }
+            return new router_1.Result(handler, params);
+        });
+        this.match = match;
+        return this.match(method, path);
     }
     buildAllMatchers() {
-        this.matchers || (this.matchers = {});
+        const matchers = {};
         Object.keys(this.routes).forEach((method) => {
-            this.buildMatcher(method);
+            matchers[method] = this.buildMatcher(method);
         });
         delete this.routes; // to reduce memory usage
+        return matchers;
     }
     buildMatcher(method) {
-        this.matchers || (this.matchers = {});
         const trie = new trie_1.Trie();
         const handlers = [];
         const targetMethods = [method];
@@ -63,34 +75,40 @@ class RegExpRouter extends router_1.Router {
         }
         const routes = targetMethods.flatMap((method) => this.routes[method] || []);
         if (routes.length === 0) {
-            this.matchers[method] = null;
-            return;
-        }
-        if (routes.length === 1 && routes[0][0] === '*') {
-            this.matchers[method] = [true, null, [[routes[0][1], []]]];
-            return;
+            return null;
         }
-        if (routes.length === 1 && !routes[0][0].match(/:/)) {
-            // there is only one route and no capture
-            const tmp = routes[0][0].endsWith('*')
-                ? routes[0][0].replace(/\/\*$/, '(?:$|/)') // /path/to/* => /path/to(?:$|/)
-                : `${routes[0][0]}$`; // /path/to/action => /path/to/action$
-            const regExpStr = `^${tmp.replace(/\*/g, '[^/]+')}`; // /prefix/*/path/to => /prefix/[^/]+/path/to
-            this.matchers[method] = [new RegExp(regExpStr), null, [[routes[0][1], []]]];
-            return;
+        if (method === router_1.METHOD_NAME_OF_ALL) {
+            if (routes.length === 1 && routes[0][0] === '*') {
+                return [regExpMatchAll, [[routes[0][1], null]]];
+            }
+            if (routes.length === 1 && !routes[0][0].match(/:/)) {
+                // there is only one route and no capture
+                const tmp = routes[0][0].endsWith('*')
+                    ? routes[0][0].replace(/\/\*$/, '(?:$|/)') // /path/to/* => /path/to(?:$|/)
+                    : `${routes[0][0]}$`; // /path/to/action => /path/to/action$
+                const regExpStr = `^${tmp.replace(/\*/g, '[^/]+')}`; // /prefix/*/path/to => /prefix/[^/]+/path/to
+                return [new RegExp(regExpStr), [[routes[0][1], null]]];
+            }
         }
         for (let i = 0; i < routes.length; i++) {
             const paramMap = trie.insert(routes[i][0], i);
-            handlers[i] = [routes[i][1], paramMap];
+            handlers[i] = [routes[i][1], Object.keys(paramMap).length !== 0 ? paramMap : null];
         }
         const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
         for (let i = 0; i < handlers.length; i++) {
             const paramMap = handlers[i][1];
-            for (let i = 0; i < paramMap.length; i++) {
-                paramMap[i][1] = paramReplacementMap[paramMap[i][1]];
+            if (paramMap) {
+                for (let i = 0; i < paramMap.length; i++) {
+                    paramMap[i][1] = paramReplacementMap[paramMap[i][1]];
+                }
             }
         }
-        this.matchers[method] = [new RegExp(regexp), indexReplacementMap, handlers];
+        const handlerMap = [];
+        // using `in` because indexReplacementMap is a sparse array
+        for (const i in indexReplacementMap) {
+            handlerMap[i] = handlers[indexReplacementMap[i]];
+        }
+        return [regexp, handlerMap];
     }
 }
 exports.RegExpRouter = RegExpRouter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "[炎] Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,10 +20,12 @@
     "./body-parse": "./dist/middleware/body-parse/body-parse.js",
     "./cookie": "./dist/middleware/cookie/cookie.js",
     "./cors": "./dist/middleware/cors/cors.js",
+    "./etag": "./dist/middleware/etag/etag.js",
     "./logger": "./dist/middleware/logger/logger.js",
     "./mustache": "./dist/middleware/mustache/mustache.js",
     "./powered-by": "./dist/middleware/powered-by/powered-by.js",
     "./serve-static": "./dist/middleware/serve-static/serve-static.js",
+    "./router/trie-router": "./dist/router/trie-router/router.js",
     "./router/reg-exp-router": "./dist/router/reg-exp-router/index.js"
   },
   "typesVersions": {
@@ -40,6 +42,9 @@
       "cors": [
         "./dist/middleware/cors/cors.d.ts"
       ],
+      "etag": [
+        "./dist/middleware/etag/etag.d.ts"
+      ],
       "logger": [
         "./dist/middleware/logger/logger.d.ts"
       ],
@@ -52,6 +57,9 @@
       "serve-static": [
         "./dist/middleware/serve-static/serve-static.d.ts"
       ],
+      "router/trie-router": [
+        "./dist/router/trie-router/router.d.ts"
+      ],
       "router/reg-exp-router": [
         "./dist/router/reg-exp-router/router.d.ts"
       ]