Skip to content

Fix: Return type inference for t function (typescript 4.1) #1221

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
jamuhl merged 2 commits into from
Dec 10, 2020
Merged

Fix: Return type inference for t function (typescript 4.1) #1221

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fca2b73
Fix automatically inferrance (#1217)
pedrodurek Dec 9, 2020
24b1ee4
Fix issue which was defaulting TFunctionResult for t function (#1217)
pedrodurek Dec 9, 2020
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
34 changes: 22 additions & 12 deletions src/ts4.1/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,32 @@ export type TFuncKey<N, T = Resources> = N extends (keyof T)[]
? Normalize<T[N]>
: string;

export type TFuncReturn<N, P, T = Resources> = N extends (keyof T)[]
? NormalizeMultiReturn<T, P>
export type TFuncReturn<N, TKeys, TDefaultResult, T = Resources> = [keyof Resources] extends [never]
? TDefaultResult
: N extends (keyof T)[]
? NormalizeMultiReturn<T, TKeys>
: N extends keyof T
? NormalizeReturn<T[N], P>
: TFunctionResult;
? NormalizeReturn<T[N], TKeys>
: string;

export interface TFunction<N extends Namespace = DefaultNamespace> {
<K extends TFuncKey<N> | TemplateStringsArray, I extends object = StringMap>(
key: K | K[],
options?: TOptions<I> | string,
): TFuncReturn<N, K>;
<K extends TFuncKey<N> | TemplateStringsArray, I extends object = StringMap>(
key: K | K[],
<
TKeys extends TFuncKey<N> | TemplateStringsArray,
TDefaultResult extends TFunctionResult = string,
TInterpolationMap extends object = StringMap
>(
key: TKeys | TKeys[],
options?: TOptions<TInterpolationMap> | string,
): TFuncReturn<N, TKeys, TDefaultResult>;
<
TKeys extends TFuncKey<N> | TemplateStringsArray,
TDefaultResult extends TFunctionResult = string,
TInterpolationMap extends object = StringMap
>(
key: TKeys | TKeys[],
defaultValue?: string,
options?: TOptions<I> | string,
): TFuncReturn<N, K>;
options?: TOptions<TInterpolationMap> | string,
): TFuncReturn<N, TKeys, TDefaultResult>;
}

export interface TransProps<
Expand Down