Changed 34 solution and problem

Author: mattpocock

src/06-challenges/34-internationalization.problem.ts

@@ -1,7 +1,4 @@
 import { expect, it } from "vitest";
-import { Equal, Expect } from "../helpers/type-utils";
-
-// HELPERS
 
 type GetParamKeys<TTranslation extends string> = TTranslation extends ""
   ? []
@@ -12,18 +9,6 @@ type GetParamKeys<TTranslation extends string> = TTranslation extends ""
 type GetParamKeysAsUnion<TTranslation extends string> =
   GetParamKeys<TTranslation>[number];
 
-// CODE
-
-/**
- * In this example, the inner bits of the functions have been built out.
- * Feel free to modify them if needed, but the solution uses this code.
- *
- * Your job is to try and make the solutions type-safe.
- */
-const makeTranslations = (translations: unknown) => {
-  return translations;
-};
-
 const translate = (translations: unknown, key: unknown, ...args: unknown[]) => {
   const translation = translations[key];
   const params: any = args[0] || {};
@@ -33,24 +18,11 @@ const translate = (translations: unknown, key: unknown, ...args: unknown[]) => {
 
 // TESTS
 
-const translations = makeTranslations({
+const translations = {
   title: "Hello, {name}!",
   subtitle: "You have {count} unread messages.",
   button: "Click me!",
-});
-
-type tests = [
-  Expect<
-    Equal<
-      typeof translations,
-      {
-        title: "Hello, {name}!";
-        subtitle: "You have {count} unread messages.";
-        button: "Click me!";
-      }
-    >
-  >,
-];
+} as const;
 
 it("Should translate a translation without parameters", () => {
   const buttonText = translate(translations, "button");

src/06-challenges/34-internationalization.solution.ts

@@ -1,8 +1,4 @@
-import { F } from "ts-toolbelt";
 import { expect, it } from "vitest";
-import { Equal, Expect } from "../helpers/type-utils";
-
-// HELPERS
 
 type GetParamKeys<TTranslation extends string> = TTranslation extends ""
   ? []
@@ -13,22 +9,16 @@ type GetParamKeys<TTranslation extends string> = TTranslation extends ""
 type GetParamKeysAsUnion<TTranslation extends string> =
   GetParamKeys<TTranslation>[number];
 
-// CODE
-
-const makeTranslations = <TTranslations extends Record<string, string>>(
-  translations: F.Narrow<TTranslations>,
-) => {
-  return translations;
-};
-
 const translate = <
   TTranslations extends Record<string, string>,
   TKey extends keyof TTranslations,
-  TDynamicParams = GetParamKeysAsUnion<TTranslations[TKey]>,
+  TDynamicKeys = GetParamKeysAsUnion<TTranslations[TKey]>
 >(
   translations: TTranslations,
   key: TKey,
-  ...args: TDynamicParams extends string ? [Record<TDynamicParams, string>] : []
+  ...args: TDynamicKeys extends string
+    ? [dynamicArgs: Record<TDynamicKeys, string>]
+    : []
 ) => {
   const translation = translations[key];
   const params: any = args[0] || {};
@@ -38,24 +28,11 @@ const translate = <
 
 // TESTS
 
-const translations = makeTranslations({
+const translations = {
   title: "Hello, {name}!",
   subtitle: "You have {count} unread messages.",
   button: "Click me!",
-});
-
-type tests = [
-  Expect<
-    Equal<
-      typeof translations,
-      {
-        title: "Hello, {name}!";
-        subtitle: "You have {count} unread messages.";
-        button: "Click me!";
-      }
-    >
-  >,
-];
+} as const;
 
 it("Should translate a translation without parameters", () => {
   const buttonText = translate(translations, "button");