Skip to content

Commit

Permalink
don't use dynamicClass
Browse files Browse the repository at this point in the history
  • Loading branch information
@yusukebe
yusukebe committed May 12, 2024
1 parent c45fa0f commit b902590
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 42 deletions.
40 changes: 19 additions & 21 deletions deno_dist/hono-base.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { compose } from './compose.ts'
import { Context } from './context.ts'
import type { ExecutionContext } from './context.ts'
Expand Down Expand Up @@ -25,20 +26,6 @@ import { getPath, getPathNoStrict, getQueryStrings, mergePath } from './utils/ur

export const COMPOSED_HANDLER = Symbol('composedHandler')

type Methods = (typeof METHODS)[number] | typeof METHOD_NAME_ALL_LOWERCASE

function defineDynamicClass(): {
new <E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'>(): {
[M in Methods]: HandlerInterface<E, M, S, BasePath>
} & {
on: OnHandlerInterface<E, S, BasePath>
} & {
use: MiddlewareHandlerInterface<E, S, BasePath>
}
} {
return class {} as never
}

const notFoundHandler = (c: Context) => {
return c.text('404 Not Found', 404)
}
Expand Down Expand Up @@ -89,11 +76,28 @@ export type HonoOptions<E extends Env> = {
getPath?: GetPath<E>
}

abstract class SuperClass<
E extends Env = Env,
S extends Schema = {},
BasePath extends string = '/'
> {
// The implementations of these methods are fake.
get: HandlerInterface<E, 'get', S, BasePath> = () => new Hono<any>()
post: HandlerInterface<E, 'post', S, BasePath> = () => new Hono<any>()
put: HandlerInterface<E, 'put', S, BasePath> = () => new Hono<any>()
delete: HandlerInterface<E, 'delete', S, BasePath> = () => new Hono<any>()
options: HandlerInterface<E, 'options', S, BasePath> = () => new Hono<any>()
patch: HandlerInterface<E, 'patch', S, BasePath> = () => new Hono<any>()
all: HandlerInterface<E, 'all', S, BasePath> = () => new Hono<any>()
on: OnHandlerInterface<E, S, BasePath> = () => new Hono<any>()
use: MiddlewareHandlerInterface<E, S, BasePath> = () => new Hono<any>()
}

class Hono<
E extends Env = Env,
S extends Schema = {},
BasePath extends string = '/'
> extends defineDynamicClass()<E, S, BasePath> {
> extends SuperClass<E, S, BasePath> {
/*
This class is like an abstract class and does not have a router.
To use it, inherit the class and implement router in the constructor.
Expand Down Expand Up @@ -123,7 +127,6 @@ class Hono<
this.addRoute(method, this.#path, handler)
}
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}
})
Expand All @@ -141,12 +144,10 @@ class Hono<
})
}
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}

// Implementation of app.use(...handlers[]) or app.use(path, ...handlers[])
// eslint-disable-next-line @typescript-eslint/no-explicit-any
this.use = (arg1: string | MiddlewareHandler<any>, ...handlers: MiddlewareHandler<any>[]) => {
if (typeof arg1 === 'string') {
this.#path = arg1
Expand All @@ -157,7 +158,6 @@ class Hono<
handlers.forEach((handler) => {
this.addRoute(METHOD_NAME_ALL, this.#path, handler)
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}

Expand Down Expand Up @@ -201,7 +201,6 @@ class Hono<
} else {
handler = async (c: Context, next: Next) =>
(await compose<Context>([], app.errorHandler)(c, () => r.handler(c, next))).res
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(handler as any)[COMPOSED_HANDLER] = r.handler
}

Expand Down Expand Up @@ -254,7 +253,6 @@ class Hono<

mount(
path: string,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
applicationHandler: (request: Request, ...args: any) => Response | Promise<Response>,
optionHandler?: (c: Context) => unknown
): Hono<E, S, BasePath> {
Expand Down
40 changes: 19 additions & 21 deletions src/hono-base.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { compose } from './compose'
import { Context } from './context'
import type { ExecutionContext } from './context'
Expand Down Expand Up @@ -25,20 +26,6 @@ import { getPath, getPathNoStrict, getQueryStrings, mergePath } from './utils/ur

export const COMPOSED_HANDLER = Symbol('composedHandler')

type Methods = (typeof METHODS)[number] | typeof METHOD_NAME_ALL_LOWERCASE

function defineDynamicClass(): {
new <E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'>(): {
[M in Methods]: HandlerInterface<E, M, S, BasePath>
} & {
on: OnHandlerInterface<E, S, BasePath>
} & {
use: MiddlewareHandlerInterface<E, S, BasePath>
}
} {
return class {} as never
}

const notFoundHandler = (c: Context) => {
return c.text('404 Not Found', 404)
}
Expand Down Expand Up @@ -89,11 +76,28 @@ export type HonoOptions<E extends Env> = {
getPath?: GetPath<E>
}

abstract class SuperClass<
E extends Env = Env,
S extends Schema = {},
BasePath extends string = '/'
> {
// The implementations of these methods are fake.
get: HandlerInterface<E, 'get', S, BasePath> = () => new Hono<any>()
post: HandlerInterface<E, 'post', S, BasePath> = () => new Hono<any>()
put: HandlerInterface<E, 'put', S, BasePath> = () => new Hono<any>()
delete: HandlerInterface<E, 'delete', S, BasePath> = () => new Hono<any>()
options: HandlerInterface<E, 'options', S, BasePath> = () => new Hono<any>()
patch: HandlerInterface<E, 'patch', S, BasePath> = () => new Hono<any>()
all: HandlerInterface<E, 'all', S, BasePath> = () => new Hono<any>()
on: OnHandlerInterface<E, S, BasePath> = () => new Hono<any>()
use: MiddlewareHandlerInterface<E, S, BasePath> = () => new Hono<any>()
}

class Hono<
E extends Env = Env,
S extends Schema = {},
BasePath extends string = '/'
> extends defineDynamicClass()<E, S, BasePath> {
> extends SuperClass<E, S, BasePath> {
/*
This class is like an abstract class and does not have a router.
To use it, inherit the class and implement router in the constructor.
Expand Down Expand Up @@ -123,7 +127,6 @@ class Hono<
this.addRoute(method, this.#path, handler)
}
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}
})
Expand All @@ -141,12 +144,10 @@ class Hono<
})
}
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}

// Implementation of app.use(...handlers[]) or app.use(path, ...handlers[])
// eslint-disable-next-line @typescript-eslint/no-explicit-any
this.use = (arg1: string | MiddlewareHandler<any>, ...handlers: MiddlewareHandler<any>[]) => {
if (typeof arg1 === 'string') {
this.#path = arg1
Expand All @@ -157,7 +158,6 @@ class Hono<
handlers.forEach((handler) => {
this.addRoute(METHOD_NAME_ALL, this.#path, handler)
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return this as any
}

Expand Down Expand Up @@ -201,7 +201,6 @@ class Hono<
} else {
handler = async (c: Context, next: Next) =>
(await compose<Context>([], app.errorHandler)(c, () => r.handler(c, next))).res
// eslint-disable-next-line @typescript-eslint/no-explicit-any
;(handler as any)[COMPOSED_HANDLER] = r.handler
}

Expand Down Expand Up @@ -254,7 +253,6 @@ class Hono<

mount(
path: string,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
applicationHandler: (request: Request, ...args: any) => Response | Promise<Response>,
optionHandler?: (c: Context) => unknown
): Hono<E, S, BasePath> {
Expand Down

0 comments on commit b902590

Please sign in to comment.