dep bump

Author: v1rtl

app.ts

@@ -22,38 +22,38 @@ declare global {
   }
 }
 
-export const renderTemplate = <O = any, Res extends Response = Response>(res: Res, app: App) => (
-  file: string,
-  data?: Record<string, any>,
-  options?: TemplateEngineOptions<O>
-): Response => {
-  app.render(
-    file,
-    data,
-    (err: unknown, html: unknown) => {
-      if (err) throw err
-
-      res.send(html)
-    },
-    options
-  )
-
-  return res
-}
+export const renderTemplate =
+  <O = any, Res extends Response = Response>(res: Res, app: App) =>
+  (file: string, data?: Record<string, any>, options?: TemplateEngineOptions<O>): Response => {
+    app.render(
+      file,
+      data,
+      (err: unknown, html: unknown) => {
+        if (err) throw err
+
+        res.send(html)
+      },
+      options
+    )
+
+    return res
+  }
 
 /**
  * Execute handler with passed `req` and `res`. Catches errors and resolves async handlers.
  * @param h
  */
-export const applyHandler = <Req, Res>(h: Handler<Req, Res>) => async (req: Req, res: Res, next: NextFunction) => {
-  try {
-    if (h.constructor.name === 'AsyncFunction') {
-      await h(req, res, next)
-    } else h(req, res, next)
-  } catch (e) {
-    next(e)
+export const applyHandler =
+  <Req, Res>(h: Handler<Req, Res>) =>
+  async (req: Req, res: Res, next: NextFunction) => {
+    try {
+      if (h.constructor.name === 'AsyncFunction') {
+        await h(req, res, next)
+      } else h(req, res, next)
+    } catch (e) {
+      next(e)
+    }
   }
-}
 
 /**
  * tinyhttp App has a few settings for toggling features
@@ -119,7 +119,8 @@ export class App<
     Res extends Response<RenderOptions> = Response<RenderOptions>
   >
   extends Router<App, Req, Res>
-  implements tinyhttp.Application {
+  implements tinyhttp.Application
+{
   middleware: Middleware<Req>[] = []
   locals: Record<string, string> = {}
   noMatchHandler: Handler
@@ -221,7 +222,7 @@ export class App<
 
     const path = typeof base === 'string' ? base : '/'
 
-    let regex: { keys: string[]; pattern: RegExp } | undefined
+    let regex: { keys: string[] | boolean; pattern: RegExp } | undefined
 
     for (const fn of fns) {
       if (fn instanceof App) {
@@ -312,14 +313,14 @@ export class App<
 
       if (type === 'route') req.params = getURLParams(regex, pathname)
 
-      await applyHandler<Req, Res>((handler as unknown) as Handler<Req, Res>)(req, res, next)
+      await applyHandler<Req, Res>(handler as unknown as Handler<Req, Res>)(req, res, next)
     }
 
     let idx = 0
 
     next = next || ((err: any) => (err ? this.onError(err, req) : loop()))
 
-    const loop = () => idx < mw.length && handle(mw[idx++])(req, (res as unknown) as Res, next as NextFunction)
+    const loop = () => idx < mw.length && handle(mw[idx++])(req, res as unknown as Res, next as NextFunction)
 
     loop()
 

deps.ts

@@ -8,9 +8,9 @@ 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.8.4/mod.ts'
-export { default as rg } from 'https://esm.sh/regexparam'
+export { default as rg } from 'https://deno.land/x/regexparam@v1.3.0/src/index.js'
 export { forwarded } from 'https://deno.land/x/forwarded@0.0.5/mod.ts'
-export * from 'https://deno.land/x/proxy_addr@0.0.3/mod.ts'
+export * from 'https://deno.land/x/proxy_addr@0.0.4/mod.ts'
 import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.97.0/http/server.ts'
 
 interface Res extends ServerResponse {

utils/compileTrust.ts

@@ -5,22 +5,14 @@ type TrustValue = ((...args: any[]) => any) | boolean | string | number | string
 export function compileTrust(value: TrustValue) {
   if (typeof value === 'function') return value
 
-  if (value === true) {
-    // Support plain true / false
-    return () => true
-  }
+  // Support plain true / false
+  if (value === true) return () => true
 
-  if (typeof value === 'number') {
-    // Support trusting hop count
-    return function (_: unknown, i: number) {
-      return i < ((value as unknown) as number)
-    }
-  }
+  // Support trusting hop count
+  if (typeof value === 'number') return (_: unknown, i: number) => i < (value as unknown as number)
 
-  if (typeof value === 'string') {
-    // Support comma-separated values
-    value = value.split(/ *, */)
-  }
+  // Support comma-separated values
+  if (typeof value === 'string') value = value.split(/ *, */)
 
   return compile(value || [])
 }

utils/parseUrl.ts

@@ -1,7 +1,7 @@
 import { parse } from 'https://deno.land/std@0.97.0/node/querystring.ts'
 
 type Regex = {
-  keys: string[]
+  keys: string[] | boolean
   pattern: RegExp
 }
 
@@ -11,7 +11,7 @@ export const getURLParams = (r: Regex, reqUrl = '/'): URLParams => {
 
   const params: URLParams = {}
 
-  if (matches) for (let i = 0; i < keys.length; i++) params[keys[i]] = matches[i + 1]
+  if (matches && Array.isArray(keys)) for (let i = 0; i < keys.length; i++) params[keys[i]] = matches[i + 1]
 
   return params
 }