fix annoying issue with type_is pkg

Author: v1rtl

app.ts

@@ -12,6 +12,34 @@ import * as path from 'https://deno.land/std/path/mod.ts'
 
 const lead = (x: string) => (x.charCodeAt(0) === 47 ? x : '/' + x)
 
+declare global {
+  namespace tinyhttp {
+    // These open interfaces may be extended in an application-specific manner via declaration merging.
+    interface Request {}
+    interface Response {}
+    interface Application {}
+  }
+}
+
+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
@@ -75,10 +103,12 @@ export type TemplateEngineOptions<O = any> = Partial<{
  * ```
  */
 export class App<
-  RenderOptions = any,
-  Req extends Request = Request,
-  Res extends Response<RenderOptions> = Response<RenderOptions>
-> extends Router<App, Req, Res> {
+    RenderOptions = any,
+    Req extends Request = Request,
+    Res extends Response<RenderOptions> = Response<RenderOptions>
+  >
+  extends Router<App, Req, Res>
+  implements tinyhttp.Application {
   middleware: Middleware<Req>[] = []
   locals: Record<string, string> = {}
   noMatchHandler: Handler

deps.ts

@@ -0,0 +1,12 @@
+export { default as ipaddr, IPv4, IPv6 } from 'https://esm.sh/ipaddr.js'
+import { default as parseRange, Options } from 'https://esm.sh/range-parser@1.2.1'
+export { parseRange }
+export type { Options as ParseRangeOptions }
+export { escapeHtml } from 'https://deno.land/x/escape_html@1.0.0/mod.ts'
+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 type { ServerRequest as Req, Response as Res } from 'https://deno.land/std@0.88.0/http/server.ts'

examples/mongodb/index.ts renamed to examples/mongodb/server.ts

@@ -1,21 +1,20 @@
 import { NextFunction } from 'https://esm.sh/@tinyhttp/router'
-import { App } from './app.ts'
+import { App, renderTemplate } from './app.ts'
 import { Request } from './request.ts'
 import {
   getRequestHeader,
-  getFreshOrStale,
+  /* getFreshOrStale, */
   getAccepts,
   getAcceptsCharsets,
   getAcceptsEncodings,
   getAcceptsLanguages,
-  getRangeFromHeader,
   checkIfXMLHttpRequest,
-  reqIs,
   getHostname,
   getIP,
   getIPs,
   getProtocol,
   getSubdomains
+  /* reqIs */
 } from './extensions/req/mod.ts'
 import {
   send,
@@ -37,7 +36,7 @@ import {
   clearCookie
 } from './extensions/res/mod.ts'
 import { getQueryParams } from './utils/parseUrl.ts'
-import { Response, renderTemplate } from './response.ts'
+import { Response } from './response.ts'
 
 export const extendMiddleware = <
   RenderOptions = unknown,
@@ -62,27 +61,27 @@ export const extendMiddleware = <
 
   req.get = getRequestHeader(req)
 
-  if (settings?.freshnessTesting) {
-    req.fresh = getFreshOrStale(req, res)
+  /*   if (settings?.freshnessTesting) {
+    req.fresh = getFreshOrStale<Req, Res>(req, res)
     req.stale = !req.fresh
-  }
+  } */
 
-  req.accepts = getAccepts(req)
-  req.acceptsCharsets = getAcceptsCharsets(req)
-  req.acceptsEncodings = getAcceptsEncodings(req)
-  req.acceptsLanguages = getAcceptsLanguages(req)
+  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.protocol = getProtocol<Req>(req)
     req.secure = req.protocol === 'https'
-    req.hostname = getHostname(req)
-    req.subdomains = getSubdomains(req, settings.subdomainOffset)
-    req.ip = getIP(req)
-    req.ips = getIPs(req)
+    req.hostname = getHostname<Req>(req)
+    req.subdomains = getSubdomains<Req>(req, settings.subdomainOffset)
+    req.ip = getIP<Req>(req)
+    req.ips = getIPs<Req>(req)
   }
 
   // Response extensions
@@ -91,7 +90,7 @@ export const extendMiddleware = <
   res.send = send<Req, Res>(req, res)
   res.sendFile = sendFile<Req, Res>(req, res)
   res.sendStatus = sendStatus(req, res)
-  res.json = json<Res>(res)
+  res.json = json<Req, Res>(req, res)
   res.setHeader = setHeader<Res>(res)
   res.set = setHeader<Res>(res)
   res.location = setLocationHeader<Req, Res>(req, res)

extend.ts

@@ -1,13 +1,14 @@
-import { Accepts } from 'https://deno.land/x/accepts@2.1.0/mod.ts'
-import { Request } from '../../request.ts'
+import { Accepts } from '../../deps.ts'
+import { Req } from '../../deps.ts'
 
-export const getAccepts = (req: Request) => (...types: string[]) => new Accepts(req.headers).types(types)
+export const getAccepts = <Request extends Req = Req>(req: Request) => (...types: string[]) =>
+  new Accepts(req.headers).types(types)
 
-export const getAcceptsEncodings = (req: Request) => (...encodings: string[]) =>
+export const getAcceptsEncodings = <Request extends Req = Req>(req: Request) => (...encodings: string[]) =>
   new Accepts(req.headers).encodings(encodings)
 
-export const getAcceptsCharsets = (req: Request) => (...charsets: string[]) =>
+export const getAcceptsCharsets = <Request extends Req = Req>(req: Request) => (...charsets: string[]) =>
   new Accepts(req.headers).charsets(charsets)
 
-export const getAcceptsLanguages = (req: Request) => (...languages: string[]) =>
+export const getAcceptsLanguages = <Request extends Req = Req>(req: Request) => (...languages: string[]) =>
   new Accepts(req.headers).languages(languages)

extensions/req/accepts.ts

@@ -1,29 +1,30 @@
-import { Request } from '../../request.ts'
-import { Response } from '../../response.ts'
-import parseRange, { Options } from 'https://esm.sh/range-parser'
+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.2/mod.ts'
+import { is } from 'https://deno.land/x/type_is@1.0.1/mod.ts'
 
-export const getRequestHeader = (req: Request) => (header: string): string | string[] | null => {
+export const getRequestHeader = <Request extends Req = Req>(req: Request) => (header: string) => {
   const lc = header.toLowerCase()
 
   switch (lc) {
     case 'referer':
     case 'referrer':
-      return req.headers.get('referrer') || req.headers.get('referer')
+      return (req.headers.get('referrer') as string) || (req.headers.get('referer') as string)
     default:
-      return req.headers.get(lc)
+      return req.headers.get(lc) as string
   }
 }
-export const getRangeFromHeader = (req: Request) => (size: number, options?: Options) => {
-  const range = getRequestHeader(req)('Range') as string
+export const getRangeFromHeader = <Request extends Req = Req>(req: Request) => (
+  size: number,
+  options?: ParseRangeOptions
+) => {
+  const range = getRequestHeader(req)('Range')
 
   if (!range) return
 
   return parseRange(size, range, options)
 }
 
-export const getFreshOrStale = (req: Request, res: Response) => {
+export const getFreshOrStale = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => {
   const method = req.method
   const status = res.status || 200
 
@@ -44,6 +45,8 @@ export const getFreshOrStale = (req: Request, res: Response) => {
   return false
 }
 
-export const checkIfXMLHttpRequest = (req: Request) => req.headers.get('X-Requested-With') === 'XMLHttpRequest'
+export const checkIfXMLHttpRequest = <Request extends Req = Req>(req: Request) =>
+  req.headers?.get('X-Requested-With') === 'XMLHttpRequest'
 
-export const reqIs = (req: Request) => (...types: string[]) => is(req.headers.get('content-type') as string, types)
+export const reqIs = <Request extends Req = Req>(req: Request) => (...types: string[]) =>
+  is(req.headers?.get('content-type') as string, types)

extensions/req/headers.ts

@@ -1,9 +1,9 @@
-import { isIP } from 'https://deno.land/x/isIP@1.0.0/mod.ts'
-import { Request } from '../../request.ts'
+import { isIP } from '../../deps.ts'
+import { Req } from '../../deps.ts'
+import { Protocol } from '../../types.ts'
 import { compile, proxyaddr, all } from '../../utils/proxyAddr.ts'
-import { Protocol } from '../../request.ts'
 
-export const trustRemoteAddress = (req: Request) => {
+export const trustRemoteAddress = <Request extends Req = Req>(req: Request) => {
   const val = (req.conn.remoteAddr as Deno.NetAddr).hostname
 
   if (typeof val === 'function') return val
@@ -17,10 +17,10 @@ export const trustRemoteAddress = (req: Request) => {
   return compile(val)
 }
 
-export const getProtocol = (req: Request): Protocol => {
+export const getProtocol = <Request extends Req = Req>(req: Request): Protocol => {
   const proto = req.proto.includes('https') ? 'https' : 'http'
 
-  const header = (req.get('X-Forwarded-Proto') as string) ?? proto
+  const header = (req.headers.get('X-Forwarded-Proto') as string) ?? proto
   const index = header.indexOf(',')
 
   if (!trustRemoteAddress(req)) return proto
@@ -31,11 +31,11 @@ export const getProtocol = (req: Request): Protocol => {
   return (index !== -1 ? header.substring(0, index).trim() : header.trim()) as Protocol
 }
 
-export const getHostname = (req: Request): string | undefined => {
-  let host: string = req.get('X-Forwarded-Host') as string
+export const getHostname = <Request extends Req = Req>(req: Request): string | undefined => {
+  let host: string = req.headers.get('X-Forwarded-Host') as string
 
   if (!host || !trustRemoteAddress(req)) {
-    host = (req.get('Host') as string) || (req.conn.remoteAddr as Deno.NetAddr).hostname
+    host = (req.headers.get('Host') as string) || (req.conn.remoteAddr as Deno.NetAddr).hostname
   }
 
   if (!host) return
@@ -45,11 +45,13 @@ export const getHostname = (req: Request): string | undefined => {
 
   return index !== -1 ? host.substring(0, index) : host
 }
-export const getIP = (req: Request): string | undefined => proxyaddr(req, trustRemoteAddress(req))?.replace(/^.*:/, '') // striping the redundant prefix addeded by OS to IPv4 address
+export const getIP = <Request extends Req = Req>(req: Request): string | undefined =>
+  proxyaddr(req, trustRemoteAddress(req))?.replace(/^.*:/, '') // striping the redundant prefix addeded by OS to IPv4 address
 
-export const getIPs = (req: Request): string[] | undefined => all(req, trustRemoteAddress(req))
+export const getIPs = <Request extends Req = Req>(req: Request): string[] | undefined =>
+  all(req, trustRemoteAddress(req))
 
-export const getSubdomains = (req: Request, subdomainOffset = 2): string[] => {
+export const getSubdomains = <Request extends Req = Req>(req: Request, subdomainOffset = 2): string[] => {
   const hostname = getHostname(req)
 
   if (!hostname) return []

extensions/req/security.ts

@@ -1,4 +1,4 @@
-import { Response as Res } from '../../response.ts'
+import { Res } from '../../deps.ts'
 import { setHeader, getResponseHeader } from './headers.ts'
 
 export const append = <Response extends Res = Res>(res: Response) => (

extensions/res/append.ts

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

extensions/res/cookie.ts

@@ -2,8 +2,7 @@ import { contentDisposition } from 'https://esm.sh/@tinyhttp/content-disposition
 import { SendFileOptions, sendFile } from './sendFile.ts'
 import { resolve, extname } from 'https://deno.land/std@0.88.0/path/mod.ts'
 import { setContentType, setHeader } from './headers.ts'
-import { Request as Req } from '../../request.ts'
-import { Response as Res } from '../../response.ts'
+import { Req, Res } from '../../deps.ts'
 
 export type DownloadOptions = SendFileOptions &
   Partial<{