Fix type issues, add async example

Author: v1rtl

app.ts

@@ -1,14 +1,13 @@
 // deno-lint-ignore-file
-import { NextFunction, Router, Handler, Middleware, UseMethodParams } from 'https://esm.sh/@tinyhttp/router'
-export type { NextFunction, Router, Handler, Middleware, UseMethodParams }
+import { Router, serve, Server } from './deps.ts'
+import { NextFunction, 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 rg from 'https://esm.sh/regexparam'
-import { Request, getRouteFromApp } from './request.ts'
-import { Response } from './response.ts'
+import type { Request } from './request.ts'
+import type { Response } from './response.ts'
 import { getURLParams, getPathname } from './utils/parseUrl.ts'
 import { extendMiddleware } from './extend.ts'
-import { serve, Server } from 'https://deno.land/std/http/server.ts'
 import * as path from 'https://deno.land/std/path/mod.ts'
 
 const lead = (x: string) => (x.charCodeAt(0) === 47 ? x : '/' + x)
@@ -81,6 +80,9 @@ export type TemplateEngineOptions<O = any> = Partial<{
   _locals: Record<string, any>
 }>
 
+export const getRouteFromApp = ({ middleware }: App, h: Handler) =>
+  middleware.find(({ handler }) => typeof handler === 'function' && handler.name === h.name)
+
 /**
  * `App` class - the starting point of tinyhttp app.
  *

deps.ts

@@ -9,4 +9,14 @@ export { Accepts } from 'https://deno.land/x/accepts@2.1.0/mod.ts'
 export { encodeUrl } from 'https://deno.land/x/encodeurl@1.0.0/mod.ts'
 export { charset, contentType, lookup } from 'https://deno.land/x/media_types@v2.6.1/mod.ts'
 
-export type { ServerRequest as Req, Response as Res } from 'https://deno.land/std@0.88.0/http/server.ts'
+import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.88.0/http/server.ts'
+
+interface Res extends ServerResponse {
+  headers: Headers
+}
+
+export type { Req, Res }
+
+export { serve, Server } from 'https://deno.land/std@0.88.0/http/server.ts'
+
+export { Router } from 'https://esm.sh/@tinyhttp/router'

egg.json

@@ -4,14 +4,9 @@
   "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.14",
-  "ignore": [
-    "./examples/**/*.ts"
-  ],
-  "files": [
-    "./**/*.ts",
-    "README.md"
-  ],
+  "version": "0.0.15",
+  "ignore": ["./examples/**/*.ts"],
+  "files": ["./**/*.ts", "README.md"],
   "checkFormat": false,
   "checkTests": false,
   "checkInstallation": false,

examples/async/server.ts

@@ -0,0 +1,12 @@
+import { App } from '../../mod.ts'
+
+const app = new App()
+
+app.get('/', async (_, res) => {
+  const decoder = new TextDecoder('utf-8')
+  const file = await Deno.readFile(`test.txt`)
+
+  res.send(decoder.decode(file))
+})
+
+app.listen(3000, () => console.log('Started on http://localhost:3000'))

examples/async/test.txt

@@ -0,0 +1 @@
+Hello async

examples/basic/server.ts

@@ -1,4 +1,4 @@
-import { App } from '../../app.ts'
+import { App } from '../../mod.ts'
 
 const app = new App()
 

examples/mongodb/server.ts

@@ -6,10 +6,10 @@ import * as dotenv from 'https://deno.land/x/tiny_env@1.0.0/mod.ts'
 dotenv.load()
 
 type Req = Request & {
-  bodyResult: any
+  bodyResult: Record<string, unknown>
 }
 
-const app = new App<any, Req>()
+const app = new App<unknown, Req>()
 const port = parseInt(Deno.env.get('PORT') || '') || 3000
 
 // connect to mongodb

extend.ts

@@ -3,7 +3,7 @@ import { App, renderTemplate } from './app.ts'
 import { Request } from './request.ts'
 import {
   getRequestHeader,
-  /* getFreshOrStale, */
+  getFreshOrStale,
   getAccepts,
   getAcceptsCharsets,
   getAcceptsEncodings,
@@ -13,8 +13,9 @@ import {
   getIP,
   getIPs,
   getProtocol,
-  getSubdomains
-  /* reqIs */
+  getSubdomains,
+  getRangeFromHeader,
+  reqIs
 } from './extensions/req/mod.ts'
 import {
   send,
@@ -61,19 +62,19 @@ export const extendMiddleware = <
 
   req.get = getRequestHeader(req)
 
-  /*   if (settings?.freshnessTesting) {
+  if (settings?.freshnessTesting) {
     req.fresh = getFreshOrStale<Req, Res>(req, res)
     req.stale = !req.fresh
-  } */
+  }
 
   req.accepts = getAccepts<Req>(req)
   req.acceptsCharsets = getAcceptsCharsets<Req>(req)
   req.acceptsEncodings = getAcceptsEncodings<Req>(req)
   req.acceptsLanguages = getAcceptsLanguages<Req>(req)
 
-  // req.range = getRangeFromHeader(req)
+  req.range = getRangeFromHeader(req)
   req.xhr = checkIfXMLHttpRequest(req)
-  // req.is = reqIs(req)
+  req.is = reqIs(req)
 
   if (settings?.networkExtensions) {
     req.protocol = getProtocol<Req>(req)

extensions/res/headers.ts

@@ -23,7 +23,7 @@ export const setHeader = <Response extends Res = Res>(res: Response) => (
       }
     }
 
-    res.headers?.set(field, value as string)
+    res.headers.set(field, value as string)
   } else {
     for (const key in field) {
       setHeader(res)(key, field[key] as string)
@@ -46,7 +46,7 @@ export const setLocationHeader = <Request extends Req = Req, Response extends Re
   if (url === 'back') loc = (getRequestHeader(req)('Referrer') as string) || '/'
 
   // set location
-  res.headers?.set('Location', encodeUrl(loc))
+  res.headers.set('Location', encodeUrl(loc))
   return res
 }
 
@@ -55,7 +55,7 @@ export const setLinksHeader = <Response extends Res = Res>(res: Response) => (li
 }): Response => {
   let link = res.headers?.get('Link') || ''
   if (link) link += ', '
-  res.headers?.set(
+  res.headers.set(
     'Link',
     link +
       Object.keys(links)

extensions/res/json.ts

@@ -1,4 +1,4 @@
-import { Req, Res } from '../../deps.ts'
+import type { Req, Res } from '../../deps.ts'
 
 export const json = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => <
   T = unknown
@@ -9,8 +9,8 @@ export const json = <Request extends Req = Req, Response extends Res = Res>(req:
   if (typeof body === 'object' && body != null) req.respond({ body: JSON.stringify(body, null, 2) })
   else if (typeof body === 'string') req.respond({ body })
   else if (body == null) {
-    res.headers?.delete('Content-Length')
-    res.headers?.delete('Transfer-Encoding')
+    res.headers.delete('Content-Length')
+    res.headers.delete('Transfer-Encoding')
     req.respond({})
   }