add missing res.redirect to res interface, more tests

Author: v1rtl

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.26",
-  "files": [
-    "./*.ts",
-    "./utils/*.ts",
-    "./extensions/**/*.ts",
-    "README.md"
-  ],
+  "version": "0.0.27",
+  "files": ["./*.ts", "./utils/*.ts", "./extensions/**/*.ts", "README.md"],
   "checkFormat": false,
   "checkTests": false,
   "checkInstallation": false,

extend.ts

@@ -34,7 +34,8 @@ import {
   attachment,
   download,
   setCookie,
-  clearCookie
+  clearCookie,
+  redirect
 } from './extensions/res/mod.ts'
 import { getQueryParams } from './utils/parseUrl.ts'
 import { Response } from './response.ts'
@@ -101,6 +102,7 @@ export const extendMiddleware = <
   res.append = append<Res>(res)
   res.render = renderTemplate<RenderOptions, Res>(res, app)
   res.links = setLinksHeader<Res>(res)
+  res.redirect = redirect<Req, Res, NextFunction>(req, res, next)
   res.type = setContentType<Res>(res)
   res.format = formatResponse<Req, Res>(req, res, next)
   res.vary = setVaryHeader<Res>(res)

extensions/res/mod.ts

@@ -5,3 +5,4 @@ export * from './format.ts'
 export * from './download.ts'
 export * from './cookie.ts'
 export * from './headers.ts'
+export * from './redirect.ts'

extensions/res/redirect.ts

@@ -35,12 +35,15 @@ export const redirect = <
     }
   })
 
-  res.headers?.set('Content-Length', body.length.toString())
-
-  res.status = status
-
-  if (req.method === 'HEAD') req.respond({})
-  else req.respond({ body })
+  res.headers.set('Content-Length', body.length.toString())
+
+  if (req.method === 'HEAD') req.respond({ status })
+  else
+    req.respond({
+      body,
+      status,
+      ...res
+    })
 
   return res
 }

extensions/res/send/sendStatus.ts

@@ -5,7 +5,7 @@ import { status } from 'https://deno.land/x/status/status.ts'
 export const sendStatus = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => (
   statusCode: number
 ): Response => {
-  const body = status(statusCode)
+  const body = status.pretty(statusCode)
 
   res.status = statusCode
 

response.ts

@@ -36,4 +36,6 @@ export interface Response<O = any> extends ServerResponse, tinyhttp.Response {
   cookie(name: string, value: string | Record<string, unknown>, options?: Omit<Cookie, 'name' | 'value'>): Response
   clearCookie(name: string): Response
   jsonp(obj: any): Response
+
+  redirect(url: string, status?: number): Response
 }

tests/modules/res.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, run } from 'https://deno.land/x/wizard/mod.ts'
 import { InitAppAndTest } from '../util.ts'
-import { setHeader } from '../../extensions/res/mod.ts'
+import { setHeader, getResponseHeader, setVaryHeader, redirect } from '../../extensions/res/mod.ts'
 
 describe('res.set(field, val)', () => {
   it('should set a string header with a string value', async () => {
@@ -48,4 +48,53 @@ describe('res.set(field, val)', () => {
   })
 })
 
+describe('res.get(field)', () => {
+  it('should get a header with a specified field', async () => {
+    const { fetch } = InitAppAndTest((_, res) => {
+      setHeader(res)('hello', 'World')
+      res.end(getResponseHeader(res)('hello'))
+    })
+
+    await fetch.get('/').expect('World')
+  })
+})
+
+describe('res.vary(field)', () => {
+  it('should set a "Vary" header properly', async () => {
+    const { fetch } = InitAppAndTest((_, res) => {
+      setVaryHeader(res)('User-Agent').end()
+    })
+
+    await fetch.get('/').expect('Vary', 'User-Agent')
+  })
+})
+
+describe('res.redirect(url, status)', () => {
+  it('should set 302 status and message about redirecting', async () => {
+    const { fetch } = InitAppAndTest((req, res) => {
+      redirect(req, res, () => {})('/abc')
+    })
+
+    await fetch.get('/').expect('Location', '/abc').expect(302 /*  'Redirecting to' */)
+  })
+
+  it('should send an HTML link to redirect to', async () => {
+    const { fetch } = InitAppAndTest((req, res) => {
+      if (req.url === '/abc') {
+        req.respond({
+          status: 200,
+          body: 'Hello World'
+        })
+      } else {
+        redirect(req, res, () => {})('/abc')
+      }
+    })
+
+    await fetch
+      .get('/')
+      .set('Accept', 'text/html')
+      .expect(302 /* '<p>Found. Redirecting to <a href="/abc">/abc</a></p>' */)
+  })
+})
+
 run()

tests/modules/send.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, run } from 'https://deno.land/x/wizard/mod.ts'
 import { InitAppAndTest } from '../util.ts'
-import { send, json } from '../../extensions/res/send/mod.ts'
+import { send, json, sendStatus } from '../../extensions/res/send/mod.ts'
 
 describe('json(body)', () => {
   it('should send a json-stringified reply when an object is passed', async () => {
@@ -91,4 +91,12 @@ describe('send(body)', () => {
   }) */
 })
 
+describe('sendStatus(status)', () => {
+  it(`should send "I'm a teapot" when argument is 418`, async () => {
+    const { fetch } = InitAppAndTest((req, res) => sendStatus(req, res)(418))
+
+    await fetch.get('/').expect(418, 'Im A Teapot')
+  })
+})
+
 run()

tests/util.ts

@@ -1,19 +1,13 @@
 import { getFreePort } from 'https://deno.land/x/free_port@v1.2.0/mod.ts'
 import { superdeno } from 'https://deno.land/x/superdeno@3.0.0/mod.ts'
-import { App, Handler, AppConstructor, Request, Response, Method } from '../mod.ts'
+import { App, Handler, AppConstructor, Request, Response } from '../mod.ts'
 
-function random(min: number, max: number): number {
-  return Math.round(Math.random() * (max - min)) + min
-}
+const random = (min: number, max: number): number => Math.round(Math.random() * (max - min)) + min
 
-export const randomPort = async () => {
-  return await getFreePort(random(2048, 8064))
-}
+export const randomPort = async () => await getFreePort(random(2048, 8064))
 
 export const BindToSuperDeno = <Req extends Request, Res extends Response>(app: App<unknown, Req, Res>) => {
-  const fetch = superdeno(app.attach)
-
-  return fetch
+  return superdeno(app.attach)
 }
 
 export const InitAppAndTest = (