Fix typing performance regression

i18next · Apr 7, 2024 · 555c9b7 · 555c9b7
1 parent 0949a2b
commit 555c9b7
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/typescript/t.d.ts b/typescript/t.d.ts
@@ -46,8 +46,8 @@ type WithOrWithoutPlural<Key> = _JSONFormat extends 'v4' | 'v3'
   ? Key extends `${infer KeyWithoutOrdinalPlural}${_PluralSeparator}ordinal${_PluralSeparator}${PluralSuffix}`
     ? KeyWithoutOrdinalPlural | Key
     : Key extends `${infer KeyWithoutPlural}${_PluralSeparator}${PluralSuffix}`
-    ? KeyWithoutPlural | Key
-    : Key
+      ? KeyWithoutPlural | Key
+      : Key
   : Key;
 
 type JoinKeys<K1, K2> = `${K1 & string}${_KeySeparator}${K2 & string}`;
@@ -113,11 +113,11 @@ type ParseKeysByNamespaces<Ns extends Namespace, Keys> = Ns extends readonly (in
 type ParseKeysByFallbackNs<Keys extends $Dictionary> = _FallbackNamespace extends false
   ? never
   : _FallbackNamespace extends (infer UnionFallbackNs extends string)[]
-  ? Keys[UnionFallbackNs]
-  : Keys[_FallbackNamespace & string];
+    ? Keys[UnionFallbackNs]
+    : Keys[_FallbackNamespace & string];
 
-type FilterKeysByContext<Keys, TOpt extends TOptions> = TOpt['context'] extends string
-  ? Keys extends `${infer Prefix}${_ContextSeparator}${TOpt['context']}${infer Suffix}`
+type FilterKeysByContext<Keys, Context> = Context extends string
+  ? Keys extends `${infer Prefix}${_ContextSeparator}${Context}${infer Suffix}`
     ? `${Prefix}${Suffix}`
     : never
   : Keys;
@@ -128,12 +128,13 @@ export type ParseKeys<
   KPrefix = undefined,
   Keys extends $Dictionary = KeysByTOptions<TOpt>,
   ActualNS extends Namespace = NsByTOptions<Ns, TOpt>,
+  const Context extends TOpt['context'] = TOpt['context'],
 > = $IsResourcesDefined extends true
   ? FilterKeysByContext<
       | ParseKeysByKeyPrefix<Keys[$FirstNamespace<ActualNS>], KPrefix>
       | ParseKeysByNamespaces<ActualNS, Keys>
       | ParseKeysByFallbackNs<Keys>,
-      TOpt
+      Context
     >
   : string;
 
@@ -170,34 +171,34 @@ type ParseTReturnWithFallback<Key, Val> = Val extends ''
     ? ''
     : Key
   : Val extends null
-  ? _ReturnNull extends true
-    ? null
-    : Key
-  : Val;
+    ? _ReturnNull extends true
+      ? null
+      : Key
+    : Val;
 
 type ParseTReturn<Key, Res, TOpt extends TOptions = {}> = ParseTReturnWithFallback<
   Key,
   Key extends `${infer K1}${_KeySeparator}${infer RestKey}`
     ? ParseTReturn<RestKey, Res[K1 & keyof Res], TOpt>
     : // Process plurals only if count is provided inside options
-    TOpt['count'] extends number
-    ? TOpt['ordinal'] extends boolean
-      ? ParseTReturnPluralOrdinal<Res, Key>
-      : ParseTReturnPlural<Res, Key>
-    : // otherwise access plain key without adding plural and ordinal suffixes
-    Res extends readonly unknown[]
-    ? Key extends `${infer NKey extends number}`
-      ? Res[NKey]
-      : never
-    : Res[Key & keyof Res]
+      TOpt['count'] extends number
+      ? TOpt['ordinal'] extends boolean
+        ? ParseTReturnPluralOrdinal<Res, Key>
+        : ParseTReturnPlural<Res, Key>
+      : // otherwise access plain key without adding plural and ordinal suffixes
+        Res extends readonly unknown[]
+        ? Key extends `${infer NKey extends number}`
+          ? Res[NKey]
+          : never
+        : Res[Key & keyof Res]
 >;
 
 type TReturnOptionalNull = _ReturnNull extends true ? null : never;
 type TReturnOptionalObjects<TOpt extends TOptions> = _ReturnObjects extends true
   ? $SpecialObject | string
   : TOpt['returnObjects'] extends true
-  ? $SpecialObject
-  : string;
+    ? $SpecialObject
+    : string;
 type DefaultTReturn<TOpt extends TOptions> = TReturnOptionalObjects<TOpt> | TReturnOptionalNull;
 
 export type KeyWithContext<Key, TOpt extends TOptions> = TOpt['context'] extends string