Skip to content
This repository was archived by the owner on Jul 31, 2025. It is now read-only.

Commit 2fa2c9d

Browse files
author
v1rtl
committed
bump deps, replace barely maintained deps with source code
1 parent a408455 commit 2fa2c9d

File tree

25 files changed

+959
-84
lines changed

25 files changed

+959
-84
lines changed

app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import { Router, serve, Server, rg, pushMiddleware } from './deps.ts'
33
import { NextFunction, RHandler as Handler, Middleware, UseMethodParams } from './types.ts'
44
import { onErrorHandler, ErrorHandler } from './onError.ts'
5-
import { setImmediate } from 'https://deno.land/std@0.103.0/node/timers.ts'
5+
import { setImmediate } from 'https://deno.land/std@0.106.0/node/timers.ts'
66
import type { Request } from './request.ts'
77
import type { Response } from './response.ts'
88
import { getURLParams, getPathname } from './utils/parseUrl.ts'
99
import { extendMiddleware } from './extend.ts'
10-
import * as path from 'https://deno.land/std@0.103.0/path/mod.ts'
10+
import * as path from 'https://deno.land/std@0.106.0/path/mod.ts'
1111

1212
const lead = (x: string) => (x.charCodeAt(0) === 47 ? x : '/' + x)
1313

deps.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ export type { Options as ParseRangeOptions }
44
export { escapeHtml } from 'https://deno.land/x/[email protected]/mod.ts'
55
export { vary } from 'https://deno.land/x/[email protected]/mod.ts'
66
export { isIP } from 'https://deno.land/x/[email protected]/mod.ts'
7-
export { Accepts } from 'https://denopkg.com/talentlessguy/accepts@patch-1/mod.ts#=^'
87
export { encodeUrl } from 'https://deno.land/x/[email protected]/mod.ts'
9-
export { charset, contentType, lookup } from 'https://deno.land/x/media_types@v2.9.3/mod.ts'
8+
export { charset, contentType, lookup } from 'https://deno.land/x/media_types@v2.10.1/mod.ts'
109
export { parse as rg } from 'https://deno.land/x/[email protected]/src/index.js'
11-
export { forwarded } from 'https://deno.land/x/[email protected].10/mod.ts'
12-
export * from 'https://deno.land/x/[email protected].16/mod.ts'
13-
import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.103.0/http/server.ts'
10+
export { forwarded } from 'https://deno.land/x/[email protected].12/mod.ts'
11+
export * from 'https://deno.land/x/[email protected].19/mod.ts'
12+
import type { ServerRequest as Req, Response as ServerResponse } from 'https://deno.land/std@0.106.0/http/server.ts'
1413
export { default as ipaddr, IPv4, IPv6 } from 'https://cdn.skypack.dev/ipaddr.js'
1514
interface Res extends ServerResponse {
1615
headers: Headers
1716
}
1817

18+
export { default as Negotiator } from 'https://deno.land/x/[email protected]/mod.ts'
19+
1920
export type { Req, Res }
2021

21-
export { serve, Server } from 'https://deno.land/std@0.103.0/http/server.ts'
22+
export { serve, Server } from 'https://deno.land/std@0.106.0/http/server.ts'
2223

2324
export { Router, pushMiddleware } from 'https://esm.sh/@tinyhttp/[email protected]'

egg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"files": ["./*.ts", "./utils/*.ts", "./extensions/**/*.ts", "README.md"],
99
"checkFormat": false,
1010
"checkTests": true,
11-
"checkInstallation": false,
11+
"checkInstallation": true,
1212
"check": true,
1313
"unlisted": false,
1414
"ignore": []

examples/jwt/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { App } from '../../mod.ts'
22
import { getNumericDate, Payload, Header, create, verify } from 'https://deno.land/x/[email protected]/mod.ts'
3-
import { readAll } from 'https://deno.land/std@0.103.0/io/util.ts'
3+
import { readAll } from 'https://deno.land/std@0.106.0/io/util.ts'
44

55
const SECRET = 'my_secret'
66

examples/mongodb/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { App } from '../../mod.ts'
2-
import { MongoClient, Bson } from 'https://deno.land/x/mongo@v0.24.0/mod.ts'
2+
import { MongoClient, Bson } from 'https://deno.land/x/mongo@v0.25.0/mod.ts'
33
import * as dotenv from 'https://deno.land/x/[email protected]/mod.ts'
44
import { json } from 'https://deno.land/x/parsec/mod.ts'
55

examples/postgresql/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { App } from '../../mod.ts'
2-
import { Client } from 'https://deno.land/x/postgres@v0.11.3/mod.ts'
2+
import { Client } from 'https://deno.land/x/postgres@v0.12.0/mod.ts'
33
import { json } from 'https://deno.land/x/parsec/mod.ts'
44

55
const app = new App()

extensions/req/accepts.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
import { Accepts } from '../../deps.ts'
1+
import { Accepts } from '../../utils/accepts.ts'
22
import type { Req } from '../../deps.ts'
33

4-
export const getAccepts = <Request extends Req = Req>(req: Request) => (...types: string[]) =>
5-
new Accepts(req.headers).types(types)
4+
export const getAccepts =
5+
<Request extends Req = Req>(req: Request) =>
6+
(...types: string[]) =>
7+
new Accepts(req.headers).types(types)
68

7-
export const getAcceptsEncodings = <Request extends Req = Req>(req: Request) => (...encodings: string[]) =>
8-
new Accepts(req.headers).encodings(encodings)
9+
export const getAcceptsEncodings =
10+
<Request extends Req = Req>(req: Request) =>
11+
(...encodings: string[]) =>
12+
new Accepts(req.headers).encodings(encodings)
913

10-
export const getAcceptsCharsets = <Request extends Req = Req>(req: Request) => (...charsets: string[]) =>
11-
new Accepts(req.headers).charsets(charsets)
14+
export const getAcceptsCharsets =
15+
<Request extends Req = Req>(req: Request) =>
16+
(...charsets: string[]) =>
17+
new Accepts(req.headers).charsets(charsets)
1218

13-
export const getAcceptsLanguages = <Request extends Req = Req>(req: Request) => (...languages: string[]) =>
14-
new Accepts(req.headers).languages(languages)
19+
export const getAcceptsLanguages =
20+
<Request extends Req = Req>(req: Request) =>
21+
(...languages: string[]) =>
22+
new Accepts(req.headers).languages(languages)

extensions/req/headers.ts

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
import { Req, Res, parseRange, ParseRangeOptions } from '../../deps.ts'
22
import fresh from 'https://deno.land/x/[email protected]/mod.ts'
3-
import { is } from 'https://deno.land/x/[email protected]/mod.ts'
4-
5-
export const getRequestHeader = <Request extends Req = Req>(req: Request) => (header: string) => {
6-
const lc = header.toLowerCase()
7-
8-
switch (lc) {
9-
case 'referer':
10-
case 'referrer':
11-
return (req.headers.get('referrer') as string) || (req.headers.get('referer') as string)
12-
default:
13-
return req.headers.get(lc) as string
3+
import { is } from '../../utils/type_is.ts'
4+
5+
export const getRequestHeader =
6+
<Request extends Req = Req>(req: Request) =>
7+
(header: string) => {
8+
const lc = header.toLowerCase()
9+
10+
switch (lc) {
11+
case 'referer':
12+
case 'referrer':
13+
return (req.headers.get('referrer') as string) || (req.headers.get('referer') as string)
14+
default:
15+
return req.headers.get(lc) as string
16+
}
1417
}
15-
}
16-
export const getRangeFromHeader = <Request extends Req = Req>(req: Request) => (
17-
size: number,
18-
options?: ParseRangeOptions
19-
) => {
20-
const range = getRequestHeader(req)('Range')
18+
export const getRangeFromHeader =
19+
<Request extends Req = Req>(req: Request) =>
20+
(size: number, options?: ParseRangeOptions) => {
21+
const range = getRequestHeader(req)('Range')
2122

22-
if (!range) return
23+
if (!range) return
2324

24-
return parseRange(size, range, options)
25-
}
25+
return parseRange(size, range, options)
26+
}
2627

2728
export const getFreshOrStale = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => {
2829
const method = req.method
@@ -48,5 +49,7 @@ export const getFreshOrStale = <Request extends Req = Req, Response extends Res
4849
export const checkIfXMLHttpRequest = <Request extends Req = Req>(req: Request) =>
4950
req.headers?.get('X-Requested-With') === 'XMLHttpRequest'
5051

51-
export const reqIs = <Request extends Req = Req>(req: Request) => (...types: string[]) =>
52-
is(req.headers?.get('content-type') as string, types)
52+
export const reqIs =
53+
<Request extends Req = Req>(req: Request) =>
54+
(...types: string[]) =>
55+
is(req.headers?.get('content-type') as string, types)

extensions/res/cookie.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Req, Res } from '../../deps.ts'
2-
import * as cookie from 'https://deno.land/std@0.103.0/http/cookie.ts'
2+
import * as cookie from 'https://deno.land/std@0.106.0/http/cookie.ts'
33

44
export const setCookie =
55
<Request extends Req = Req, Response extends Res = Res>(_: Request, res: Response) =>

extensions/res/download.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { contentDisposition } from 'https://esm.sh/@tinyhttp/content-disposition'
1+
import { contentDisposition } from 'https://cdn.skypack.dev/@tinyhttp/content-disposition@2.0.0'
22
import { SendFileOptions, sendFile } from './send/sendFile.ts'
3-
import { extname } from 'https://deno.land/std@0.103.0/path/mod.ts'
3+
import { extname } from 'https://deno.land/std@0.106.0/path/mod.ts'
44
import { setContentType, setHeader } from './headers.ts'
55
import { Req, Res } from '../../deps.ts'
66

@@ -9,38 +9,38 @@ export type DownloadOptions = SendFileOptions &
99
headers: Record<string, unknown>
1010
}>
1111

12-
export const download = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => (
13-
path: string,
14-
filename?: string,
15-
options: DownloadOptions = {}
16-
): Response => {
17-
const name: string | null = filename as string
18-
let opts: DownloadOptions = options
19-
20-
// set Content-Disposition when file is sent
21-
const headers: Record<string, string> = {
22-
'Content-Disposition': contentDisposition(name || path)
23-
}
12+
export const download =
13+
<Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) =>
14+
(path: string, filename?: string, options: DownloadOptions = {}): Response => {
15+
const name: string | null = filename as string
16+
let opts: DownloadOptions = options
2417

25-
// merge user-provided headers
26-
if (opts.headers) {
27-
for (const key of Object.keys(opts.headers)) {
28-
if (key.toLowerCase() !== 'content-disposition') headers[key] = opts.headers[key]
18+
// set Content-Disposition when file is sent
19+
const headers: Record<string, string> = {
20+
'Content-Disposition': contentDisposition(name || path)
21+
}
22+
23+
// merge user-provided headers
24+
if (opts.headers) {
25+
for (const key of Object.keys(opts.headers)) {
26+
if (key.toLowerCase() !== 'content-disposition') headers[key] = opts.headers[key]
27+
}
2928
}
30-
}
3129

32-
// merge user-provided options
33-
opts = { ...opts, headers }
30+
// merge user-provided options
31+
opts = { ...opts, headers }
3432

35-
// send file
33+
// send file
3634

37-
return sendFile<Request, Response>(req, res)(path, opts) as Response
38-
}
35+
return sendFile<Request, Response>(req, res)(path, opts) as Response
36+
}
3937

40-
export const attachment = <Response extends Res = Res>(res: Response) => (filename?: string): Response => {
41-
if (filename) setContentType(res)(extname(filename))
38+
export const attachment =
39+
<Response extends Res = Res>(res: Response) =>
40+
(filename?: string): Response => {
41+
if (filename) setContentType(res)(extname(filename))
4242

43-
setHeader(res)('Content-Disposition', contentDisposition(filename))
43+
setHeader(res)('Content-Disposition', contentDisposition(filename))
4444

45-
return res
46-
}
45+
return res
46+
}

0 commit comments

Comments
 (0)