Improved problem/solution for 34

total-typescript · Aug 7, 2023 · 417f69a · 417f69a
1 parent 7ac23db
commit 417f69a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/06-challenges/34-internationalization.problem.ts b/src/06-challenges/34-internationalization.problem.ts
@@ -6,9 +6,6 @@ type GetParamKeys<TTranslation extends string> = TTranslation extends ""
   ? [Param, ...GetParamKeys<Tail>]
   : [];
 
-type GetParamKeysAsUnion<TTranslation extends string> =
-  GetParamKeys<TTranslation>[number];
-
 const translate = (translations: unknown, key: unknown, ...args: unknown[]) => {
   const translation = translations[key];
   const params: any = args[0] || {};

diff --git a/src/06-challenges/34-internationalization.solution.ts b/src/06-challenges/34-internationalization.solution.ts
@@ -6,19 +6,16 @@ type GetParamKeys<TTranslation extends string> = TTranslation extends ""
   ? [Param, ...GetParamKeys<Tail>]
   : [];
 
-type GetParamKeysAsUnion<TTranslation extends string> =
-  GetParamKeys<TTranslation>[number];
-
 const translate = <
   TTranslations extends Record<string, string>,
   TKey extends keyof TTranslations,
-  TDynamicKeys = GetParamKeysAsUnion<TTranslations[TKey]>,
+  TComputedArgs extends string[] = GetParamKeys<TTranslations[TKey]>,
 >(
   translations: TTranslations,
   key: TKey,
-  ...args: [TDynamicKeys] extends [never]
+  ...args: TComputedArgs extends []
     ? []
-    : [dynamicArgs: Record<TDynamicKeys & string, string>]
+    : [params: Record<TComputedArgs[number], string>]
 ) => {
   const translation = translations[key];
   const params: any = args[0] || {};
@@ -29,7 +26,7 @@ const translate = <
 // TESTS
 
 const translations = {
-  title: "Hello, {name}!",
+  title: "Hello, {firstName} {surname}!",
   subtitle: "You have {count} unread messages.",
   button: "Click me!",
 } as const;