add attach fn, res.locals, more tests

Author: v1rtl

app.ts

@@ -2,7 +2,7 @@
 import { Router, serve, Server, rg } from './deps.ts'
 import { NextFunction, RHandler as Handler, Middleware, UseMethodParams } from './types.ts'
 import { onErrorHandler, ErrorHandler } from './onError.ts'
-// import { setImmediate } from 'https://deno.land/std@0.88.0/node/timers.ts'
+import { setImmediate } from 'https://deno.land/std@0.88.0/node/timers.ts'
 import type { Request } from './request.ts'
 import type { Response } from './response.ts'
 import { getURLParams, getPathname } from './utils/parseUrl.ts'
@@ -125,13 +125,15 @@ export class App<
   settings: AppSettings & Record<string, any>
   engines: Record<string, TemplateFunc<RenderOptions>> = {}
   applyExtensions?: (req: Req, res: Res, next: NextFunction) => void
+  attach: (req: Req) => void
 
   constructor(options: AppConstructor<Req, Res> = {}) {
     super()
     this.onError = options?.onError || onErrorHandler
     this.noMatchHandler = options?.noMatchHandler || this.onError.bind(null, { code: 404 })
     this.settings = options.settings || { xPoweredBy: true }
     this.applyExtensions = options?.applyExtensions
+    this.attach = (req) => setImmediate(this.handler.bind(this, req, undefined), req)
   }
 
   set(setting: string, value: any) {
@@ -298,7 +300,7 @@ export class App<
     cb?.()
 
     for await (const req of server) {
-      this.handler(req as any)
+      this.attach(req as any)
     }
     return server
   }

egg.json

@@ -4,13 +4,8 @@
   "entry": "./app.ts",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "homepage": "https://github.com/talentlessguy/tinyhttp-deno",
-  "version": "0.0.17",
-  "files": [
-    "./*.ts",
-    "./utils/*.ts",
-    "./extensions/**/*.ts",
-    "README.md"
-  ],
+  "version": "0.0.18",
+  "files": ["./*.ts", "./utils/*.ts", "./extensions/**/*.ts", "README.md"],
   "checkFormat": false,
   "checkTests": false,
   "checkInstallation": false,

extend.ts

@@ -48,6 +48,8 @@ export const extendMiddleware = <
 ) => (req: Req, res: Res, next: NextFunction) => {
   const { settings } = app
 
+  res.locals = res.locals || Object.create(null)
+
   // Request extensions
   if (settings?.bindAppToReqRes) {
     req.app = app

response.ts

@@ -29,7 +29,7 @@ export interface Response<O = any> extends ServerResponse, tinyhttp.Response {
   type(type: string): Response
   format(obj: FormatProps): Response
   vary(field: string): Response
-  locals?: Record<string, any>
+  locals: Record<string, any>
   download(path: string, filename: string, options?: DownloadOptions, cb?: (err?: any) => void): Response
   attachment(filename?: string): Response
 

robo.yml

@@ -1,3 +1,3 @@
 test:
-  exec: deno test --allow-net --no-check --location http://127.0.1 ./tests -q
+  exec: deno test --allow-net --no-check --location http://127.0.1
   summary: run tests

tests/core/app.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, run } from 'https://deno.land/x/wizard@0.1.0/mod.ts'
-import { App } from '../../mod.ts'
+import { App } from '../../app.ts'
 import { BindToSuperDeno, InitAppAndTest } from '../util.ts'
 
 describe('Testing App', () => {
@@ -22,18 +22,24 @@ describe('Testing App', () => {
 
     expect(app.locals.hello).toBe('world')
   })
-  /* it('Custom noMatchHandler works', async () => {
-    const { fetch } = InitAppAndTest(() => {}, undefined, {
-      noMatchHandler: (req) => {
-        req.respond({
-          status: 404,
-          body: `Oopsie! Page ${req.url} is lost.`
-        })
+  it('Custom noMatchHandler works', async () => {
+    const { fetch } = InitAppAndTest(
+      (_req, _res, next) => {
+        next()
+      },
+      undefined,
+      {
+        noMatchHandler: (req) => {
+          req.respond({
+            status: 404,
+            body: `Oopsie! Page ${req.url} is lost.`
+          })
+        }
       }
-    })
+    )
 
     await fetch.get('/').expect(404, 'Oopsie! Page / is lost.')
-  }) */
+  })
   it('Custom onError works', async () => {
     const app = new App({
       onError: (err, req) => {
@@ -50,6 +56,54 @@ describe('Testing App', () => {
 
     await fetch.get('/').expect(500, 'Ouch, you hurt me on / page.')
   })
+  it('req and res inherit properties from previous middlewares', async () => {
+    const app = new App()
+
+    app
+      .use((_req, res, next) => {
+        res.locals.hello = 'world'
+
+        next()
+      })
+      .get('/', (_, res) => {
+        res.send(res.locals)
+      })
+
+    const fetch = BindToSuperDeno(app)
+
+    await fetch.get('/').expect(200, '{\n  "hello": "world"\n}')
+  })
+})
+
+describe('Testing App routing', () => {
+  it('should respond on matched route', async () => {
+    const { fetch } = InitAppAndTest((_req, res) => void res.send('Hello world'), '/route')
+
+    await fetch.get('/route').expect(200, 'Hello world')
+  })
+  it('should match wares containing base path', async () => {
+    const app = new App()
+
+    app.use('/abc', (_req, res) => void res.send('Hello world'))
+
+    const fetch = BindToSuperDeno(app)
+
+    await fetch.get('/abc/def').expect(200, 'Hello world')
+  })
+  it('"*" should catch all undefined routes', async () => {
+    const app = new App()
+
+    app
+      .get('/route', (_req, res) => void res.send('A different route'))
+      .all('*', (_req, res) => void res.send('Hello world'))
+
+    const fetch = BindToSuperDeno(app)
+
+    await fetch.get('/test').expect(200, 'Hello world')
+  })
+  it('should throw 404 on no routes', async () => {
+    await BindToSuperDeno(new App()).get('/').expect(404)
+  })
 })
 
 run()

tests/util.ts

@@ -11,7 +11,7 @@ export const randomPort = async () => {
 }
 
 export const BindToSuperDeno = <Req extends Request, Res extends Response>(app: App<unknown, Req, Res>) => {
-  const fetch = superdeno(app.handler.bind(app))
+  const fetch = superdeno(app.attach)
 
   return fetch
 }