Deno 1.9 support (and std bump)

Author: v1rtl

app.ts

@@ -1,17 +1,17 @@
 // deno-lint-ignore-file
-import { Router, serve, Server, rg } from './deps.ts'
+import { Router, serve, Server, rg, pushMiddleware } 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.93.0/node/timers.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 * as path from 'https://deno.land/std@0.88.0/path/mod.ts'
+import * as path from 'https://deno.land/std@0.93.0/path/mod.ts'
 
 const lead = (x: string) => (x.charCodeAt(0) === 47 ? x : '/' + x)
 
-const mount = (fn: App | Handler) => (fn instanceof App ? fn.attach : fn)
+const mount = (fn: any) => (fn instanceof App ? fn.attach : fn)
 
 declare global {
   namespace tinyhttp {
@@ -140,6 +140,10 @@ export class App<
   applyExtensions?: (req: Req, res: Res, next: NextFunction) => void
   attach: (req: Req) => void
 
+  mountpath = '/'
+
+  apps: Record<string, App> = {}
+
   #eventHandler?: FetchEventListenerObject
 
   constructor(options: AppConstructor<Req, Res> = {}) {
@@ -215,27 +219,52 @@ export class App<
   use(...args: UseMethodParams<Req, Res, App>) {
     const base = args[0]
 
-    const fns = args.slice(1)
+    const fns = args.slice(1).flat()
+
+    if (base instanceof App) {
+      // Set App parent to current App
+      // @ts-ignore
+      base.parent = this
+
+      // Mount on root
+      base.mountpath = '/'
+
+      this.apps['/'] = base
+    }
+
+    const path = typeof base === 'string' ? base : '/'
+
+    let regex: { keys: string[]; pattern: RegExp }
+
+    for (const fn of fns) {
+      if (fn instanceof App) {
+        regex = rg(path, true)
+
+        fn.mountpath = path
+
+        this.apps[path] = fn
+
+        // @ts-ignore
+        fn.parent = this
+      }
+    }
 
     if (base === '/') {
-      for (const fn of fns.flat()) super.use(base, mount(fn as Handler))
+      for (const fn of fns) super.use(base, mount(fn as Handler))
     } else if (typeof base === 'function' || base instanceof App) {
-      super.use('/', [base, ...fns].map(mount as any))
-    } else if (fns.some((fn) => fn instanceof App)) {
-      super.use(
-        base,
-        fns.flatMap((fn) => {
-          if (fn instanceof App) {
-            fn = fn as App
-            fn.mountpath = typeof base === 'string' ? base : '/'
-
-            fn.parent = (this as unknown) as App
-          }
-
-          return mount(fn as App)
-        })
-      )
-    } else super.use(...args)
+      super.use('/', [base, ...fns].map(mount))
+    } else if (Array.isArray(base)) {
+      super.use('/', [...base, ...fns].map(mount))
+    } else {
+      pushMiddleware(this.middleware)({
+        path: base as string,
+        // @ts-ignore
+        regex,
+        type: 'mw',
+        handler: mount(fns[0] as Handler),
+        handlers: fns.slice(1).map(mount)
+      })
+    }
 
     return this // chainable
   }
@@ -244,7 +273,7 @@ export class App<
       if (!m.path) m.path = '/'
       m.regex = m.type === 'mw' ? rg(m.path, true) : rg(m.path)
 
-      return (m.method ? m.method === method : true) && m.regex.pattern.test(url)
+      return (m.method ? m.method === method : true) && m.regex?.pattern.test(url)
     })
   }
   /**

deps.ts

@@ -7,18 +7,18 @@ export { vary } from 'https://deno.land/x/vary@1.0.0/mod.ts'
 export { isIP } from 'https://deno.land/x/isIP@1.0.0/mod.ts'
 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 { charset, contentType, lookup } from 'https://deno.land/x/media_types@v2.8.1/mod.ts'
 export { default as rg } from 'https://esm.sh/regexparam'
-export { forwarded } from 'https://deno.land/x/forwarded@v0.0.2/mod.ts'
-export * from 'https://deno.land/x/proxy_addr@v0.0.0/mod.ts'
-import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.88.0/http/server.ts'
+export { forwarded } from 'https://deno.land/x/forwarded@0.0.4/mod.ts'
+export * from 'https://deno.land/x/proxy_addr@0.0.1/mod.ts'
+import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.93.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 { serve, Server } from 'https://deno.land/std@0.93.0/http/server.ts'
 
-export { Router } from 'https://esm.sh/@tinyhttp/router'
+export { Router, pushMiddleware } from 'https://esm.sh/@tinyhttp/router@1.2.7'

egg.json

@@ -4,7 +4,7 @@
   "entry": "./mod.ts",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "homepage": "https://github.com/talentlessguy/tinyhttp-deno",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "files": [
     "./*.ts",
     "./utils/*.ts",

examples/basic/server.ts

@@ -6,8 +6,8 @@ app
   .get('/', (req, res) => {
     const greeting = `Hello on ${req.url} from Deno v${Deno.version.deno} and tinyhttp! 🦕`
     res.format({
-      html: () => `<h1>${greeting}</h1>`,
-      text: () => greeting
+      text: (_, res) => res.send(greeting),
+      html: (_, res) => res.send(`<h1>${greeting}</h1>`)
     })
   })
   .get('/page/:page/', (req, res) => {

extensions/req/accepts.ts

@@ -1,5 +1,5 @@
 import { Accepts } from '../../deps.ts'
-import { Req } from '../../deps.ts'
+import type { Req } from '../../deps.ts'
 
 export const getAccepts = <Request extends Req = Req>(req: Request) => (...types: string[]) =>
   new Accepts(req.headers).types(types)

extensions/req/headers.ts

@@ -1,6 +1,6 @@
 import { Req, Res, parseRange, ParseRangeOptions } from '../../deps.ts'
 import fresh from 'https://deno.land/x/fresh@v1.0.0/mod.ts'
-import { is } from 'https://deno.land/x/type_is@1.0.1/mod.ts'
+import { is } from 'https://denopkg.com/talentlessguy/type_is'
 
 export const getRequestHeader = <Request extends Req = Req>(req: Request) => (header: string) => {
   const lc = header.toLowerCase()

extensions/res/cookie.ts

@@ -1,5 +1,5 @@
 import { Req, Res } from '../../deps.ts'
-import * as cookie from 'https://deno.land/std@0.88.0/http/cookie.ts'
+import * as cookie from 'https://deno.land/std@0.93.0/http/cookie.ts'
 
 export const setCookie = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => (
   name: string,

extensions/res/download.ts

@@ -1,6 +1,6 @@
 import { contentDisposition } from 'https://esm.sh/@tinyhttp/content-disposition'
 import { SendFileOptions, sendFile } from './send/sendFile.ts'
-import { resolve, extname } from 'https://deno.land/std@0.88.0/path/mod.ts'
+import { extname } from 'https://deno.land/std@0.93.0/path/mod.ts'
 import { setContentType, setHeader } from './headers.ts'
 import { Req, Res } from '../../deps.ts'
 
@@ -18,7 +18,7 @@ export const download = <Request extends Req = Req, Response extends Res = Res>(
   let opts: DownloadOptions = options
 
   // set Content-Disposition when file is sent
-  const headers: Record<string, any> = {
+  const headers: Record<string, string> = {
     'Content-Disposition': contentDisposition(name || path)
   }
 

extensions/res/format.ts

@@ -25,6 +25,7 @@ export const formatResponse = <Request extends Req = Req, Response extends Res =
 
   if (key) {
     res.headers?.set('Content-Type', normalizeType(key).value || '')
+
     obj[key](req, res, next)
   } else if (fn) {
     fn()

extensions/res/utils.ts

@@ -1,5 +1,5 @@
 import { format, parse } from 'https://deno.land/x/content_type/mod.ts'
-import { etag as eTag } from 'https://deno.land/x/opine@1.1.0/src/utils/etag.ts'
+import { etag as eTag } from 'https://deno.land/x/opine@1.3.2/src/utils/etag.ts'
 import { lookup } from '../../deps.ts'
 
 export const createETag = (body: Parameters<typeof eTag>[0]) => {