Skip to content
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.

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

Simplify protocol map definitions #54

Merged
Merged
Changes from all commits
Commits
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
25 changes: 16 additions & 9 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,23 @@ export type GetDataType<
K extends DataTypeKey,
Fallback extends JsonValue = undefined,
> = K extends keyof ProtocolMap
? ProtocolMap[K] extends ProtocolWithReturn<infer Data, any>
? Data
: ProtocolMap[K]
: Fallback
? ProtocolMap[K] extends (...args: infer Args) => any
? Args['length'] extends 0
? undefined
: Args[0]
: ProtocolMap[K] extends ProtocolWithReturn<infer Data, any>
? Data
: ProtocolMap[K]
: Fallback;


export type GetReturnType<
K extends DataTypeKey,
Fallback extends JsonValue = undefined,
Fallback extends JsonValue = undefined
> = K extends keyof ProtocolMap
? ProtocolMap[K] extends ProtocolWithReturn<any, infer Return>
? Return
: void
: Fallback
? ProtocolMap[K] extends (...args: any[]) => infer R
? R
: ProtocolMap[K] extends ProtocolWithReturn<any, infer Return>
? Return
: void
: Fallback;