Reduce nesting of ContextOfKey

i18next · May 14, 2024 · 55078b6 · 55078b6
1 parent 1abbcf8
commit 55078b6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/typescript/t.d.ts b/typescript/t.d.ts
@@ -213,14 +213,12 @@ type ContextOfKey<
   ActualNS extends Namespace = NsByTOptions<Ns, TOpt>,
   ActualKeys = Keys[$FirstNamespace<ActualNS>],
 > = $IsResourcesDefined extends true
-  ? Key extends string
-    ? Key extends `${infer Nsp}${_NsSeparator}${infer RestKey}`
-      ? Nsp extends Namespace
-        ? ContextOfKey<Nsp, RestKey, TOpt>
-        : never
-      : ActualKeys extends `${Key}${_ContextSeparator}${infer Context}`
-      ? Context
+  ? Key extends `${infer Nsp}${_NsSeparator}${infer RestKey}`
+    ? Nsp extends Namespace
+      ? ContextOfKey<Nsp, RestKey, TOpt>
       : never
+    : ActualKeys extends `${Key extends string ? Key : never}${_ContextSeparator}${infer Context}`
+    ? Context
     : never
   : string;