Skip to content

chore: improve createEndpoint typing #70

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

Open
himself65 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: improve createEndpoint typing #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 9 additions & 43 deletions src/endpoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { HasRequiredKeys, Prettify } from "./helper";
import type { HasRequiredKeys, InferResultType, Prettify } from "./helper";
import { toResponse } from "./to-response";
import type { Middleware } from "./middleware";
import {
Expand Down Expand Up @@ -368,52 +368,18 @@ export const createEndpoint = <Path extends string, Options extends EndpointOpti
}
type Context = InputContext<Path, Options>;

type ResultType<
AsResponse extends boolean,
ReturnHeaders extends boolean,
ReturnStatus extends boolean,
> = AsResponse extends true
? Response
: ReturnHeaders extends true
? ReturnStatus extends true
? {
headers: Headers;
status: number;
response: Awaited<R>;
}
: {
headers: Headers;
response: Awaited<R>;
}
: ReturnStatus extends true
? {
status: number;
response: Awaited<R>;
}
: Awaited<R>;

const internalHandler = async <
AsResponse extends boolean = false,
ReturnHeaders extends boolean = false,
ReturnStatus extends boolean = false,
>(
...inputCtx: HasRequiredKeys<Context> extends true
? [
Context & {
asResponse?: AsResponse;
returnHeaders?: ReturnHeaders;
returnStatus?: ReturnStatus;
},
]
: [
(Context & {
asResponse?: AsResponse;
returnHeaders?: ReturnHeaders;
returnStatus?: ReturnStatus;
})?,
]
): Promise<ResultType<AsResponse, ReturnHeaders, ReturnStatus>> => {
const context = (inputCtx[0] || {}) as InputContext<any, any>;
input?: Context & {
asResponse?: AsResponse;
returnHeaders?: ReturnHeaders;
returnStatus?: ReturnStatus;
},
): Promise<InferResultType<AsResponse, ReturnHeaders, ReturnStatus, R>> => {
const context = (input ?? {}) as InputContext<any, any>;
const internalContext = await createInternalContext(context, {
options,
path,
Expand Down Expand Up @@ -453,7 +419,7 @@ export const createEndpoint = <Path extends string, Options extends EndpointOpti
: context.returnStatus
? { response, status }
: response
) as ResultType<AsResponse, ReturnHeaders, ReturnStatus>;
) as InferResultType<AsResponse, ReturnHeaders, ReturnStatus, R>;
};
internalHandler.options = options;
internalHandler.path = path;
Expand Down
25 changes: 25 additions & 0 deletions src/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,28 @@ export type InferParamWildCard<Path> = Path extends
: Path extends `${infer _Start}/${infer Rest}`
? InferParamWildCard<Rest>
: {};

export type InferResultType<
AsResponse extends boolean,
ReturnHeaders extends boolean,
ReturnStatus extends boolean,
R,
> = AsResponse extends true
? Response
: ReturnHeaders extends true
? ReturnStatus extends true
? {
headers: Headers;
status: number;
response: Awaited<R>;
}
: {
headers: Headers;
response: Awaited<R>;
}
: ReturnStatus extends true
? {
status: number;
response: Awaited<R>;
}
: Awaited<R>;
Loading