fix(app, router): improve perf by caching regex and using push instead of spread

v1rtl · v1rtl · commit a29218dcbf59 · 2025-05-28T11:30:09.000+03:00
diff --git a/packages/app/src/app.ts b/packages/app/src/app.ts
@@ -247,17 +247,33 @@ export class App<Req extends Request = Request, Res extends Response = Response>
   }
 
   #find(url: string): Middleware<Req, Res>[] {
-    return this.middleware.filter((m) => {
-      m.regex = m.regex || rg(m.path as string, m.type === 'mw')
+    const result: Middleware<Req, Res>[] = []
 
-      let fullPathRegex: { keys: string[]; pattern: RegExp } | null
+    for (let i = 0; i < this.middleware.length; i++) {
+      const m = this.middleware[i]
 
-      m.fullPath && typeof m.fullPath === 'string'
-        ? (fullPathRegex = rg(m.fullPath, m.type === 'mw'))
-        : (fullPathRegex = null)
+      if (!m.regex) {
+        m.regex = rg(m.path as string, m.type === 'mw')
+      }
+
+      if (!m.regex.pattern.test(url)) {
+        continue
+      }
+
+      if (m.type === 'mw' && m.fullPath && typeof m.fullPath === 'string') {
+        if (!m.fullPathRegex) {
+          m.fullPathRegex = rg(m.fullPath, true)
+        }
+
+        if (!m.fullPathRegex.pattern.test(url)) {
+          continue
+        }
+      }
+
+      result.push(m)
+    }
 
-      return m.regex.pattern.test(url) && (m.type === 'mw' && fullPathRegex ? fullPathRegex.pattern.test(url) : true)
-    })
+    return result
   }
 
   handler<RenderOptions extends TemplateEngineOptions = TemplateEngineOptions>(
@@ -271,7 +287,7 @@ export class App<Req extends Request = Request, Res extends Response = Response>
     // @ts-expect-error typescript is not smart enough to understand "this" ts(2345)
     const exts = this.applyExtensions || extendMiddleware<RenderOptions>(this)
 
-    let mw: Middleware[] = [
+    const mw: Middleware[] = [
       {
         handler: exts,
         type: 'mw',
@@ -333,21 +349,18 @@ export class App<Req extends Request = Request, Res extends Response = Response>
           idx = mw.length
           req.params = {}
         }
-        mw = [
-          ...mw,
-          ...matched,
-          {
-            type: 'mw',
-            handler: (req, res, next) => {
-              if (req.method === 'HEAD') {
-                res.statusCode = 204
-                return res.end('')
-              }
-              next?.()
-            },
-            path: '/'
-          }
-        ]
+        mw.push(...matched)
+        mw.push({
+          type: 'mw',
+          handler: (req, res, next) => {
+            if (req.method === 'HEAD') {
+              res.statusCode = 204
+              return res.end('')
+            }
+            next?.()
+          },
+          path: '/'
+        })
       } else if (this.parent == null) {
         mw.push({
           handler: this.noMatchHandler,
diff --git a/packages/app/src/extend.ts b/packages/app/src/extend.ts
@@ -100,7 +100,7 @@ export const extendMiddleware = <EngineOptions extends TemplateEngineOptions = T
     res.attachment = attachment<Response>(res)
     res.download = download<Request, Response>(req, res)
     res.append = append<Response>(res)
-    res.locals = res.locals || Object.create(null)
+    res.locals ??= {}
 
     Object.defineProperty(req, 'fresh', { get: getFreshOrStale.bind(null, req, res), configurable: true })
     req.stale = !req.fresh
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
@@ -68,6 +68,7 @@ export interface Middleware<Req = any, Res = any> {
   type: MiddlewareType
   regex?: RegexParams
   fullPath?: string
+  fullPathRegex?: RegexParams
 }
 
 export type MethodHandler<Req = any, Res = any> = {

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ export interface Middleware<Req = any, Res = any> {`
`68`	`68`	`type: MiddlewareType`
`69`	`69`	`regex?: RegexParams`
`70`	`70`	`fullPath?: string`
	`71`	`+ fullPathRegex?: RegexParams`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`export type MethodHandler<Req = any, Res = any> = {`