mirrors/hono
mirrors/hono
0
0
Fork 0
mirror of https://github.com/honojs/hono.git synced 2024-12-01 11:51:01 +01:00
Code Issues Releases Activity

refactor: Tweaks variable names to reduce code. (#1157)

Browse Source 
* refactor: Tweaks variable names to reduce code.

* Delete meaningless comments

* chore: denoify
This commit is contained in:
Taku Amano 2023-06-04 09:16:29 +09:00 committed by GitHub
parent 2d6abaff5c
commit 8a1b9aa9a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deno_dist/context.ts
View File

@ -64,7 +64,7 @@ type ContextOptions<E extends Env> = {
executionCtx?: FetchEvent | ExecutionContext | undefined
notFoundHandler?: NotFoundHandler<E>
path?: string
paramData?: Record<string, string>
params?: Record<string, string>
}
export class Context<
@ -89,7 +89,7 @@ export class Context<
private _pH: Record<string, string> | undefined = undefined // _preparedHeaders
private _res: Response | undefined
private _path: string = '/'
private _pData?: Record<string, string> | null // __paramData
private _params?: Record<string, string> | null
private rawRequest?: Request | null
private notFoundHandler: NotFoundHandler<E> = () => new Response()
@ -98,7 +98,7 @@ export class Context<
if (options) {
this._exCtx = options.executionCtx
this._path = options.path ?? '/'
this._pData = options.paramData
this._params = options.params
this.env = options.env
if (options.notFoundHandler) {
this.notFoundHandler = options.notFoundHandler
@ -111,9 +111,9 @@ export class Context<
return this._req
} else {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this._req = new HonoRequest(this.rawRequest!, this._path, this._pData!)
this._req = new HonoRequest(this.rawRequest!, this._path, this._params!)
this.rawRequest = undefined
this._pData = undefined
this._params = undefined
return this._req
}
}

19
deno_dist/hono-base.ts
View File

@ -254,7 +254,7 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
}
private matchRoute(method: string, path: string) {
return this.router.match(method, path)
return this.router.match(method, path) || { handlers: [], params: {} }
}
private handleError(err: unknown, c: Context<E>) {
@ -266,7 +266,7 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
private dispatch(
request: Request,
eventOrExecutionCtx: ExecutionContext | FetchEvent | undefined,
executionCtx: ExecutionContext | FetchEvent | undefined,
env: E['Bindings'],
method: string
): Response | Promise<Response> {
@ -275,27 +275,25 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
// Handle HEAD method
if (method === 'HEAD') {
return (async () =>
new Response(null, await this.dispatch(request, eventOrExecutionCtx, env, 'GET')))()
new Response(null, await this.dispatch(request, executionCtx, env, 'GET')))()
}
const result = this.matchRoute(method, path)
const paramData = result?.params
const { handlers, params } = this.matchRoute(method, path)
const c = new Context(request, {
env,
executionCtx: eventOrExecutionCtx,
executionCtx,
notFoundHandler: this.notFoundHandler,
path,
paramData,
params,
})
// Do not `compose` if it has only one handler
if (result?.handlers.length === 1) {
const handler = result.handlers[0]
if (handlers.length === 1) {
let res: ReturnType<H>
try {
res = handler(c, async () => {})
res = handlers[0](c, async () => {})
if (!res) {
return this.notFoundHandler(c)
}
@ -328,7 +326,6 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
})()
}
const handlers = result ? result.handlers : [this.notFoundHandler]
const composed = compose<Context>(handlers, this.errorHandler, this.notFoundHandler)
return (async () => {

2
deno_dist/router/reg-exp-router/router.ts
View File

@ -117,7 +117,7 @@ export class RegExpRouter<T> implements Router<T> {
throw new Error('Can not add a route since the matcher is already built.')
}
if (!methodNames.includes(method)) methodNames.push(method)
if (methodNames.indexOf(method) === -1) methodNames.push(method)
if (!middleware[method]) {
;[middleware, routes].forEach((handlerMap) => {
handlerMap[method] = {}

4
deno_dist/utils/url.ts
View File

@ -132,10 +132,10 @@ const _decodeURI = (value: string) => {
if (!/[%+]/.test(value)) {
return value
}
if (value.includes('+')) {
if (value.indexOf('+') !== -1) {
value = value.replace(/\+/g, ' ')
}
return value.includes('%') ? decodeURIComponent_(value) : value
return value.indexOf('%') === -1 ? value : decodeURIComponent_(value)
}
const _getQueryParam = (

10
src/context.ts
View File

@ -64,7 +64,7 @@ type ContextOptions<E extends Env> = {
executionCtx?: FetchEvent | ExecutionContext | undefined
notFoundHandler?: NotFoundHandler<E>
path?: string
paramData?: Record<string, string>
params?: Record<string, string>
}
export class Context<
@ -89,7 +89,7 @@ export class Context<
private _pH: Record<string, string> | undefined = undefined // _preparedHeaders
private _res: Response | undefined
private _path: string = '/'
private _pData?: Record<string, string> | null // __paramData
private _params?: Record<string, string> | null
private rawRequest?: Request | null
private notFoundHandler: NotFoundHandler<E> = () => new Response()
@ -98,7 +98,7 @@ export class Context<
if (options) {
this._exCtx = options.executionCtx
this._path = options.path ?? '/'
this._pData = options.paramData
this._params = options.params
this.env = options.env
if (options.notFoundHandler) {
this.notFoundHandler = options.notFoundHandler
@ -111,9 +111,9 @@ export class Context<
return this._req
} else {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this._req = new HonoRequest(this.rawRequest!, this._path, this._pData!)
this._req = new HonoRequest(this.rawRequest!, this._path, this._params!)
this.rawRequest = undefined
this._pData = undefined
this._params = undefined
return this._req
}
}

19
src/hono-base.ts
View File

@ -254,7 +254,7 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
}
private matchRoute(method: string, path: string) {
return this.router.match(method, path)
return this.router.match(method, path) || { handlers: [], params: {} }
}
private handleError(err: unknown, c: Context<E>) {
@ -266,7 +266,7 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
private dispatch(
request: Request,
eventOrExecutionCtx: ExecutionContext | FetchEvent | undefined,
executionCtx: ExecutionContext | FetchEvent | undefined,
env: E['Bindings'],
method: string
): Response | Promise<Response> {
@ -275,27 +275,25 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
// Handle HEAD method
if (method === 'HEAD') {
return (async () =>
new Response(null, await this.dispatch(request, eventOrExecutionCtx, env, 'GET')))()
new Response(null, await this.dispatch(request, executionCtx, env, 'GET')))()
}
const result = this.matchRoute(method, path)
const paramData = result?.params
const { handlers, params } = this.matchRoute(method, path)
const c = new Context(request, {
env,
executionCtx: eventOrExecutionCtx,
executionCtx,
notFoundHandler: this.notFoundHandler,
path,
paramData,
params,
})
// Do not `compose` if it has only one handler
if (result?.handlers.length === 1) {
const handler = result.handlers[0]
if (handlers.length === 1) {
let res: ReturnType<H>
try {
res = handler(c, async () => {})
res = handlers[0](c, async () => {})
if (!res) {
return this.notFoundHandler(c)
}
@ -328,7 +326,6 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
})()
}
const handlers = result ? result.handlers : [this.notFoundHandler]
const composed = compose<Context>(handlers, this.errorHandler, this.notFoundHandler)
return (async () => {