Skip to content

fix: optimize ReplyWithTypeMapping resolution #3155

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

Draft
PavelPashov wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: optimize ReplyWithTypeMapping resolution #3155

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
26 changes: 21 additions & 5 deletions packages/client/lib/RESP/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,31 @@ type MapKey<

export type UnwrapReply<REPLY extends RespType<any, any, any, any>> = REPLY['DEFAULT' | 'TYPES'];

/**
* Helper type that resolves a RespType to its mapped value.
* Separated to allow TypeScript to cache the resolution.
*/
type ResolveRespTypeMapping<
RESP_TYPE extends RespTypes,
DEFAULT,
TYPES,
TYPE_MAPPING extends TypeMapping
> = TYPE_MAPPING[RESP_TYPE] extends MappedType<infer T>
? Extract<DEFAULT | TYPES, T>
: DEFAULT;

export type ReplyWithTypeMapping<
REPLY,
TYPE_MAPPING extends TypeMapping
> = (
// if REPLY is a type, extract the coresponding type from TYPE_MAPPING or use the default type
REPLY extends RespType<infer RESP_TYPE, infer DEFAULT, infer TYPES, unknown> ?
TYPE_MAPPING[RESP_TYPE] extends MappedType<infer T> ?
ReplyWithTypeMapping<Extract<DEFAULT | TYPES, T>, TYPE_MAPPING> :
ReplyWithTypeMapping<DEFAULT, TYPE_MAPPING>
// Early exit for primitive types - no mapping needed
REPLY extends string | number | bigint | boolean | null | undefined ? REPLY :
// Handle RespType - extract and apply type mapping using helper
REPLY extends RespType<infer RESP_TYPE, infer DEFAULT, infer TYPES, unknown> ?
ReplyWithTypeMapping<
ResolveRespTypeMapping<RESP_TYPE, DEFAULT, TYPES, TYPE_MAPPING>,
TYPE_MAPPING
>
: (
// if REPLY is a known generic type, convert its generic arguments
// TODO: tuples?
Expand Down
Loading