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.

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

Jump to bottom

Fix context type checking #2182

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fix context type checking #2182

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fa6420d
Fix context typing
May 10, 2024
a080730
Remove unneeded type change
May 10, 2024
9f4f9ca
Merge branch 'i18next:master' into master
stefan-schweiger May 13, 2024
8b225ea
Add tests for context type checking
May 13, 2024
f82a259
improve readability of typing
May 13, 2024
bb47175
add additional test cases
May 13, 2024
11d1472
add additional test cases
May 13, 2024
cbbbe81
Merge branch 'i18next:master' into master
stefan-schweiger May 14, 2024
6787fa0
fix for multiple namespaces
May 14, 2024
1abbcf8
fix typo in test
May 14, 2024
55078b6
Reduce nesting of ContextOfKey
May 14, 2024
c2ba23a
support falsy values
May 15, 2024
1788111
fix error due to formatting
May 15, 2024
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
21 changes: 20 additions & 1 deletion typescript/t.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,19 @@ export type KeyWithContext<Key, TOpt extends TOptions> = TOpt['context'] extends
? `${Key & string}${_ContextSeparator}${TOpt['context']}`
: Key;

export type ContextOfKey<
stefan-schweiger marked this conversation as resolved.
Show resolved Hide resolved
Key extends string,
Ns extends Namespace = DefaultNamespace,
TOpt extends TOptions = {},
Keys extends $Dictionary = KeysByTOptions<TOpt>,
ActualNS extends Namespace = NsByTOptions<Ns, TOpt>,
ActualKeys = Keys[$FirstNamespace<ActualNS>],
> = $IsResourcesDefined extends true
? ActualKeys extends `${Key}${_ContextSeparator}${infer Context}`
? Context
: never
: string;

export type TFunctionReturn<
Ns extends Namespace,
Key,
Expand Down Expand Up @@ -261,7 +274,13 @@ export interface TFunction<Ns extends Namespace = DefaultNamespace, KPrefix = un
const Key extends ParseKeys<Ns, TOpt, KPrefix> | TemplateStringsArray,
const TOpt extends TOptions,
Ret extends TFunctionReturn<Ns, AppendKeyPrefix<Key, KPrefix>, TOpt>,
const ActualOptions extends TOpt & InterpolationMap<Ret> = TOpt & InterpolationMap<Ret>,
const ActualOptions extends Omit<TOpt, 'context'> &
InterpolationMap<Ret> & {
context?: Key extends string ? ContextOfKey<Key, Ns, TOpt> : never;
} = TOpt &
InterpolationMap<Ret> & {
context?: Key extends string ? ContextOfKey<Key, Ns, TOpt> : never;
},
>(
...args:
| [key: Key | Key[], options?: ActualOptions]
Expand Down