Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] main from honojs:main #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 25, 2025
Merged

[pull] main from honojs:main #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8ea652
refactor(hono-base): add type annotations (#4591)
yusukebe Dec 25, 2025
41ee1bb
refactor(client): refactor `HonoURL` types (#4592)
yusukebe Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 20 additions & 52 deletions src/client/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,65 +109,33 @@ export interface ClientResponse<
arrayBuffer(): Promise<ArrayBuffer>
}

type BuildSearch<Arg, Key extends 'query'> = Arg extends { [K in Key]: infer Query }
? IsEmptyObject<Query> extends true
? ''
: `?${string}`
: ''

type BuildPathname<P extends string, Arg> = Arg extends { param: infer Param }
? `${ApplyParam<TrimStartSlash<P>, Param>}`
: `/${TrimStartSlash<P>}`

type BuildTypedURL<
Protocol extends string,
Host extends string,
Port extends string,
P extends string,
Arg,
> = TypedURL<`${Protocol}:`, Host, Port, BuildPathname<P, Arg>, BuildSearch<Arg, 'query'>>

type HonoURL<Prefix extends string, Path extends string, Arg> =
IsLiteral<Prefix> extends true
? TrimEndSlash<Prefix> extends `${infer Protocol}://${infer Rest}`
? Rest extends `${infer Hostname}/${infer P}`
? ParseHostName<Hostname> extends [infer Host extends string, infer Port extends string]
? Arg extends { param: infer Param }
? Arg extends { query: infer Query }
? IsEmptyObject<Query> extends true
? TypedURL<
`${Protocol}:`,
Host,
Port,
`${ApplyParam<TrimStartSlash<P>, Param>}`,
''
>
: TypedURL<
`${Protocol}:`,
Host,
Port,
`${ApplyParam<TrimStartSlash<P>, Param>}`,
`?${string}`
>
: TypedURL<`${Protocol}:`, Host, Port, `${ApplyParam<TrimStartSlash<P>, Param>}`, ''>
: Arg extends { query: infer Query }
? IsEmptyObject<Query> extends true
? TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<P>}`, ''>
: TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<P>}`, `?${string}`>
: TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<P>}`, ''>
? BuildTypedURL<Protocol, Host, Port, P, Arg>
: never
: ParseHostName<Rest> extends [infer Host extends string, infer Port extends string]
? Arg extends { param: infer Param }
? Arg extends { query: infer Query }
? IsEmptyObject<Query> extends true
? TypedURL<
`${Protocol}:`,
Host,
Port,
`${ApplyParam<TrimStartSlash<Path>, Param>}`,
''
>
: TypedURL<
`${Protocol}:`,
Host,
Port,
`${ApplyParam<TrimStartSlash<Path>, Param>}`,
`?${string}`
>
: TypedURL<
`${Protocol}:`,
Host,
Port,
`${ApplyParam<TrimStartSlash<Path>, Param>}`,
''
>
: Arg extends { query: infer Query }
? IsEmptyObject<Query> extends true
? TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<Path>}`, ''>
: TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<Path>}`, `?${string}`>
: TypedURL<`${Protocol}:`, Host, Port, `/${TrimStartSlash<Path>}`, ''>
? BuildTypedURL<Protocol, Host, Port, Path, Arg>
: never
: URL
: URL
Expand Down
4 changes: 2 additions & 2 deletions src/hono-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,15 +382,15 @@ class Hono<
return this
}

#addRoute(method: string, path: string, handler: H) {
#addRoute(method: string, path: string, handler: H): void {
method = method.toUpperCase()
path = mergePath(this._basePath, path)
const r: RouterRoute = { basePath: this._basePath, path, method, handler }
this.router.add(method, path, [handler, r])
this.routes.push(r)
}

#handleError(err: unknown, c: Context<E>) {
#handleError(err: unknown, c: Context<E>): Response | Promise<Response> {
if (err instanceof Error) {
return this.errorHandler(err, c)
}
Expand Down
Loading