Skip to content

Commit bf58831

Browse files
committed
linting
1 parent 16cac75 commit bf58831

File tree

14 files changed

+117
-103
lines changed

14 files changed

+117
-103
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: npm install
1616

1717
- name: Linting
18-
run: npx standard
18+
run: npm run lint
1919

2020
- name: Run tests
2121
run: npm run test

common.d.ts

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
import { type Server as HTTPServer, IncomingMessage, ServerResponse } from "http";
2-
import { type Server as HTTPSServer } from "https";
3-
import { Pattern, Methods } from "trouter";
1+
import { type Server as HTTPServer, IncomingMessage, ServerResponse } from 'http'
2+
import { type Server as HTTPSServer } from 'https'
3+
import { Pattern, Methods } from 'trouter'
44

5-
import {
6-
Http2SecureServer,
7-
Http2ServerRequest,
8-
Http2ServerResponse
9-
} from 'http2'
5+
import { Http2SecureServer, Http2ServerRequest, Http2ServerResponse } from 'http2'
106

117
export enum Protocol {
128
HTTP = 'http',
139
HTTPS = 'https',
1410
HTTP2 = 'http2'
1511
}
1612

17-
export type Server<P extends Protocol> = P extends Protocol.HTTP2 ? Http2SecureServer : P extends Protocol.HTTPS ? HTTPSServer : HTTPServer
13+
export type Server<P extends Protocol> = P extends Protocol.HTTP2
14+
? Http2SecureServer
15+
: P extends Protocol.HTTPS
16+
? HTTPSServer
17+
: HTTPServer
1818

1919
export type StepFunction = (error?: unknown) => void
2020

21-
export type Request<P extends Protocol> = P extends Protocol.HTTP2
22-
? Http2ServerRequest
23-
: IncomingMessage
21+
export type Request<P extends Protocol> = P extends Protocol.HTTP2 ? Http2ServerRequest : IncomingMessage
2422

25-
export type Response<P extends Protocol> = P extends Protocol.HTTP2
26-
? Http2ServerResponse : ServerResponse
23+
export type Response<P extends Protocol> = P extends Protocol.HTTP2 ? Http2ServerResponse : ServerResponse
2724

2825
export type RequestHandler<P extends Protocol> = (
2926
req: Request<P>,
@@ -34,22 +31,21 @@ export type RequestHandler<P extends Protocol> = (
3431
export interface IRouter<P extends Protocol> {
3532
lookup: RequestHandler<P>
3633

37-
use(...handlers: RequestHandler<P>[]): this;
38-
use(router: IRouter<P>): this;
39-
use(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
40-
use(prefix: Pattern, router: IRouter<P>): this;
41-
42-
all(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
43-
get(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
44-
head(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
45-
patch(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
46-
options(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
47-
connect(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
48-
delete(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
49-
trace(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
50-
post(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
51-
put(pattern: Pattern, ...handlers: RequestHandler<P>[]): this;
52-
53-
on(method: Methods, pattern: Pattern, ...middlewares: RequestHandler<P>[]): this;
34+
use(...handlers: RequestHandler<P>[]): this
35+
use(router: IRouter<P>): this
36+
use(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
37+
use(prefix: Pattern, router: IRouter<P>): this
38+
39+
all(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
40+
get(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
41+
head(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
42+
patch(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
43+
options(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
44+
connect(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
45+
delete(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
46+
trace(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
47+
post(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
48+
put(pattern: Pattern, ...handlers: RequestHandler<P>[]): this
49+
50+
on(method: Methods, pattern: Pattern, ...middlewares: RequestHandler<P>[]): this
5451
}
55-

demos/basic-low-sequential.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ router.get('/hi', (req, res) => {
1111
res.end('Hello World!')
1212
})
1313

14-
server.listen(3000, socket => {})
14+
server.listen(3000, (socket) => {})

demos/middleware.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ router.use('/', (req, res, next) => {
1212
res.write('World')
1313
return next()
1414
})
15-
router.get('/hi', (req, res, next) => {
16-
res.write('!')
17-
return next()
18-
}, (req, res) => {
19-
res.end()
20-
})
15+
router.get(
16+
'/hi',
17+
(req, res, next) => {
18+
res.write('!')
19+
return next()
20+
},
21+
(req, res) => {
22+
res.end()
23+
}
24+
)
2125

2226
server.listen(3000)

demos/uwebsockets.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
21
const uWS = require('uWebSockets.js')
32

4-
uWS.App().get('/hi', (res, req) => {
5-
res.onAborted(() => {
6-
res.aborted = true
3+
uWS
4+
.App()
5+
.get('/hi', (res, req) => {
6+
res.onAborted(() => {
7+
res.aborted = true
8+
})
9+
setTimeout(() => {
10+
res.end('Hello World!')
11+
}, 100)
712
})
8-
setTimeout(() => {
9-
res.end('Hello World!')
10-
}, 100)
11-
}).listen(3000, () => {})
13+
.listen(3000, () => {})

index.d.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { Protocol, IRouter, Server } from './common'
22

33
interface IBuildServerAndRouterConfig<P extends Protocol, S extends Server<P>, R extends IRouter<P>> {
4-
router?: R;
5-
server?: S;
6-
prioRequestsProcessing?: boolean;
4+
router?: R
5+
server?: S
6+
prioRequestsProcessing?: boolean
77
}
88

99
export default function zero<P extends Protocol>(config?: IBuildServerAndRouterConfig<P, Server<P>, IRouter<P>>): {
10-
server: Server<P>,
10+
server: Server<P>
1111
router: IRouter<P>
12-
};
13-
12+
}

index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ module.exports = (config = { prioRequestsProcessing: true }) => {
66
const router = config.router || require('./lib/router/sequential')()
77
const server = config.server || http.createServer()
88

9-
server.prioRequestsProcessing = config.prioRequestsProcessing && (server instanceof httpServer || server instanceof httpsServer)
9+
server.prioRequestsProcessing =
10+
config.prioRequestsProcessing && (server instanceof httpServer || server instanceof httpsServer)
1011

1112
if (server.prioRequestsProcessing) {
1213
server.on('request', (req, res) => {

lib/next.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function next (middlewares, req, res, index, routers = {}, defaultRoute, errorHandler) {
1+
function next(middlewares, req, res, index, routers = {}, defaultRoute, errorHandler) {
22
const middleware = middlewares[index]
33
if (!middleware) {
44
if (!res.finished) {
@@ -8,7 +8,7 @@ function next (middlewares, req, res, index, routers = {}, defaultRoute, errorHa
88
return
99
}
1010

11-
function step (err) {
11+
function step(err) {
1212
if (err) {
1313
return errorHandler(err, req, res)
1414
} else {

lib/router/sequential.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import { Protocol, IRouter, RequestHandler } from './../../common'
22

3-
export default function createSequentialRouter<P extends Protocol>(config?: object): IRouter<P>
3+
export default function createSequentialRouter<P extends Protocol>(config?: object): IRouter<P>

lib/utils/queryparams.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ module.exports = (req, url) => {
55
const query = {}
66
for (const [name, value] of searchParams.entries()) {
77
if (query[name]) {
8-
Array.isArray(query[name])
9-
? query[name].push(value)
10-
: (query[name] = [query[name], value])
8+
Array.isArray(query[name]) ? query[name].push(value) : (query[name] = [query[name], value])
119
} else {
1210
query[name] = value
1311
}

0 commit comments

Comments
 (0)