@xndrjs/i18n 0.7.0 → 0.8.0-alpha.0

package/src/codegen/generate-i18n-types.test.ts

@@ -1,12 +1,4 @@
-import {
-  mkdtempSync,
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  rmSync,
-  statSync,
-  writeFileSync,
-} from "node:fs";
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { spawnSync } from "node:child_process";
@@ -65,11 +57,8 @@ describe("generate-i18n-types", () => {
           default: "src/i18n/translations/default.json",
           billing: "src/i18n/translations/billing.json",
         },
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -79,13 +68,11 @@ describe("generate-i18n-types", () => {
     const types = readFileSync(join(tempDir, "src/i18n/i18n-types.generated.ts"), "utf8");
     const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
     expect(types).toContain("export const I18N_MODE = 'multi' as const");
-    expect(types).toContain("export type AppLocale = 'en'");
+    expect(types).toContain('export const AppLocales = ["en"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
     expect(factory).toContain("export function createI18n(");
-    expect(factory).toContain("options?: { onMissing?: OnMissingTranslation }");
-    expect(factory).toContain("export function projectDictionaryLocales(");
-    expect(factory).toContain("projectDictionaryLocalesCore(dictionary, locales)");
-    expect(factory).toContain("export function projectNamespaceLocales(");
-    expect(factory).toContain("projectNamespaceLocalesCore(dictionary, locales)");
+    expect(factory).toContain("onMissing?: OnMissingTranslation");
+    expect(factory).toContain("state?: { dictionary: InitialSchema");
     expect(factory).toContain("IcuTranslationProviderMulti");
     expect(types).toContain("login_button: never");
     expect(types).toContain("welcome: { name: string }");
@@ -110,12 +97,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -123,8 +109,8 @@ describe("generate-i18n-types", () => {
 
     const generatedPaths = [
       join(tempDir, "src/i18n/i18n-types.generated.ts"),
-      join(tempDir, "src/i18n/dictionary.generated.ts"),
       join(tempDir, "src/i18n/instance.generated.ts"),
+      join(tempDir, "src/i18n/namespace-loaders.generated.ts"),
     ];
     const mtimesBefore = generatedPaths.map((filePath) => statSync(filePath).mtimeMs);
 
@@ -134,7 +120,7 @@ describe("generate-i18n-types", () => {
     expect(mtimesAfter).toEqual(mtimesBefore);
   });
 
-  it("generates dictionary schema file when dictionarySchemaOutput is set", () => {
+  it("always generates dictionary schema file under codegenPath", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
 
@@ -159,12 +145,8 @@ describe("generate-i18n-types", () => {
           default: "src/i18n/translations/default.json",
           billing: "src/i18n/translations/billing.json",
         },
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        dictionarySchemaOutput: "src/i18n/dictionary-schema.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -180,12 +162,12 @@ describe("generate-i18n-types", () => {
     expect(schema).toContain('"name": "string"');
   });
 
-  it("generates single-mode dictionary schema without namespace validator", () => {
+  it("generates multi-mode dictionary schema with namespace validator", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
 
     writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
+      join(tempDir, "src/i18n/translations/default.json"),
       JSON.stringify({
         welcome: { en: "Welcome {name}!" },
       })
@@ -193,13 +175,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        dictionarySchemaOutput: "src/i18n/dictionary-schema.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/default.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -207,49 +187,12 @@ describe("generate-i18n-types", () => {
     expect(result.status).toBe(0);
 
     const schema = readFileSync(join(tempDir, "src/i18n/dictionary-schema.generated.ts"), "utf8");
-    expect(schema).toContain("mode: 'single' as const");
+    expect(schema).toContain("mode: 'multi' as const");
     expect(schema).toContain("validateExternalDictionaryPartial");
+    expect(schema).toContain("validateExternalNamespacePartial");
     expect(schema).toContain("validateExternalKey");
   });
 
-  it("generates flat types for single-file config", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
-      JSON.stringify({
-        login_button: { en: "Login" },
-        welcome: { en: "Welcome {name}!" },
-      })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-
-    const types = readFileSync(join(tempDir, "src/i18n/i18n-types.generated.ts"), "utf8");
-    const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-    expect(types).toContain("export const I18N_MODE = 'single' as const");
-    expect(types).toContain("export type AppLocale = 'en'");
-    expect(factory).toContain("export function createI18n(");
-    expect(factory).toContain("export function projectDictionaryLocales(");
-    expect(factory).toContain("dictionary: AppSchema");
-    expect(factory).toContain("IcuTranslationProviderSingle");
-    expect(types).toContain("login_button: never;");
-    expect(types).toContain("welcome: { name: string };");
-  });
-
   it("fails with a non-zero exit code on malformed ICU", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
@@ -263,12 +206,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -290,12 +232,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
         localeFallback: {
           en: null,
           "de-CH": "en",
@@ -310,12 +251,12 @@ describe("generate-i18n-types", () => {
     const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
     expect(types).toContain("export const LOCALE_FALLBACK");
     expect(types).toContain('"de-CH": "en"');
-    expect(types).toContain("export type AppLocale = 'de-CH' | 'en'");
+    expect(types).toContain('export const AppLocales = ["de-CH", "en"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
     expect(factory).toContain("localeFallback: LOCALE_FALLBACK");
-    expect(factory).toContain("...options");
-    expect(factory).toContain("projectNamespaceLocalesCore(dictionary, locales, LOCALE_FALLBACK)");
+    expect(factory).toContain("...providerOptions");
     expect(factory).toContain(
-      "IcuTranslationProviderSingle<AppSchema, AppParams, AppLocale, typeof LOCALE_FALLBACK>"
+      "IcuTranslationProviderMulti<AppSchema, AppParams, AppLocale, typeof LOCALE_FALLBACK>"
     );
   });
 
@@ -332,12 +273,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
         localeFallback: {
           en: null,
           it: "en",
@@ -351,7 +291,8 @@ describe("generate-i18n-types", () => {
     const types = readFileSync(join(tempDir, "src/i18n/i18n-types.generated.ts"), "utf8");
     expect(types).toContain('"fr": null');
     expect(types).toContain('"it": "en"');
-    expect(types).toContain("export type AppLocale = 'en' | 'fr' | 'it'");
+    expect(types).toContain('export const AppLocales = ["en", "fr", "it"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
   });
 
   it("does not emit LOCALE_FALLBACK when localeFallback is absent from config", () => {
@@ -367,12 +308,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -380,9 +320,8 @@ describe("generate-i18n-types", () => {
     expect(result.status).toBe(0);
 
     const types = readFileSync(join(tempDir, "src/i18n/i18n-types.generated.ts"), "utf8");
-    const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-    expect(factory).toContain("projectNamespaceLocalesCore(dictionary, locales)");
-    expect(types).toContain("export type AppLocale = 'en' | 'it'");
+    expect(types).toContain('export const AppLocales = ["en", "it"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
   });
 
   it("fails on circular locale fallback in config", () => {
@@ -398,12 +337,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
         localeFallback: {
           a: "b",
           b: "a",
@@ -416,7 +354,7 @@ describe("generate-i18n-types", () => {
     expect(result.stderr).toContain("Circular locale fallback");
   });
 
-  it("generates lazy namespace loaders when loadOnInit is a subset", () => {
+  it("generates namespace loaders for all namespaces under split-by-locale", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
 
@@ -441,14 +379,8 @@ describe("generate-i18n-types", () => {
           default: "src/i18n/translations/default.json",
           billing: "src/i18n/translations/billing.json",
         },
-        loadOnInit: ["default"],
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        dictionarySchemaOutput: "src/i18n/dictionary-schema.generated.ts",
-        namespaceLoadersOutput: "src/i18n/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -456,82 +388,23 @@ describe("generate-i18n-types", () => {
     expect(result.status).toBe(0);
 
     const types = readFileSync(join(tempDir, "src/i18n/i18n-types.generated.ts"), "utf8");
-    const dictionary = readFileSync(join(tempDir, "src/i18n/dictionary.generated.ts"), "utf8");
     const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
     const loaders = readFileSync(join(tempDir, "src/i18n/namespace-loaders.generated.ts"), "utf8");
 
-    expect(types).toContain("export type LoadOnInitNamespace = 'default'");
-    expect(types).toContain("export type LazyNamespace = 'billing'");
-    expect(types).toContain("export type InitialSchema = Pick<AppSchema, LoadOnInitNamespace>");
-    expect(dictionary).toContain("export const defaultDictionary: InitialSchema");
-    expect(factory).toContain("dictionary: InitialSchema,");
-    expect(loaders).toContain("export const namespaceLoaders");
-    expect(loaders).toContain("[K in LazyNamespace]: () => Promise<AppSchema[K]>");
-    expect(loaders).toContain("import('./translations/billing.json')");
-  });
-
-  it("keeps eager output when loadOnInit is omitted", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/default.json"),
-      JSON.stringify({ welcome: { en: "Welcome {name}!" } })
-    );
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/billing.json"),
-      JSON.stringify({ invoice_summary: { en: "Invoice" } })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        namespaces: {
-          default: "src/i18n/translations/default.json",
-          billing: "src/i18n/translations/billing.json",
-        },
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
+    expect(types).toContain("export type LazyNamespace = 'default' | 'billing'");
+    expect(types).toContain("export type InitialSchema = Record<string, never>");
+    expect(factory).toContain(
+      "state?: { dictionary: InitialSchema; resources?: readonly (readonly [string, string])[] }"
     );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-
-    const dictionary = readFileSync(join(tempDir, "src/i18n/dictionary.generated.ts"), "utf8");
-    const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-
-    expect(dictionary).toContain("export const defaultDictionary: AppSchema");
-    expect(dictionary).toContain("billingNs");
-    expect(factory).toContain("dictionary: AppSchema,");
-  });
-
-  it("fails when loadOnInit is used in single mode", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
-      JSON.stringify({ welcome: { en: "Welcome" } })
+    expect(factory).toContain("normalizeI18nCreateInput");
+    expect(factory).toContain("seedBuilderResources");
+    expect(loaders).toContain("export const namespaceLoaders");
+    expect(loaders).toContain(
+      "[K in LazyNamespace]: (locale: AppLocale) => Promise<AppSchema[K]>;"
     );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        loadOnInit: ["default"],
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
+    expect(loaders).toContain(
+      "return import('./translations/billing.en.json').then((m) => m.default);"
     );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).not.toBe(0);
-    expect(result.stderr).toContain("loadOnInit");
   });
 
   it("infers number when English plural and Italian simple interpolation share a key", () => {
@@ -550,12 +423,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -582,12 +454,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -612,12 +483,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -642,12 +512,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -670,11 +539,8 @@ describe("generate-i18n-types", () => {
         namespaces: {
           default: "src/i18n/translations/default.json",
         },
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -699,108 +565,22 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.json",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
     const result = runCodegen(tempDir);
     expect(result.status).toBe(0);
 
-    const dictionary = readFileSync(join(tempDir, "src/i18n/dictionary.generated.ts"), "utf8");
     const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-    expect(dictionary).toContain("from './i18n-types.generated'");
+    const loaders = readFileSync(join(tempDir, "src/i18n/namespace-loaders.generated.ts"), "utf8");
     expect(factory).toContain("from './i18n-types.generated'");
-    expect(factory).toContain("dictionary: AppSchema,");
-  });
-
-  it("supports importExtension .ts", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
-      JSON.stringify({ welcome: { en: "Welcome {name}!" } })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        importExtension: ".ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-
-    const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-    expect(factory).toContain("from './i18n-types.generated.ts'");
-  });
-
-  it("supports importExtension .js for NodeNext ESM projects", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
-      JSON.stringify({ welcome: { en: "Welcome {name}!" } })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        importExtension: ".js",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-
-    const factory = readFileSync(join(tempDir, "src/i18n/instance.generated.ts"), "utf8");
-    expect(factory).toContain("from './i18n-types.generated.js'");
-  });
-
-  it("fails when importExtension is invalid", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/translations.json"),
-      JSON.stringify({ welcome: { en: "Welcome {name}!" } })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        dictionary: "src/i18n/translations/translations.json",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        importExtension: ".mjs",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).not.toBe(0);
-    expect(result.stderr).toContain("Invalid i18n.codegen.json");
-    expect(result.stderr).toContain("importExtension");
-    expect(result.stderr).toContain('one of "none"|".ts"|".js"');
-    expect(result.stderr).toContain("Allowed keys:");
+    expect(factory).toContain("dictionary: InitialSchema");
+    expect(loaders).toContain("from './i18n-types.generated'");
   });
 
   it("compiles yaml dictionaries to json and generates json imports", () => {
@@ -822,33 +602,34 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.yaml",
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.yaml",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
     const result = runCodegen(tempDir);
     expect(result.status).toBe(0);
     expect(result.stdout).toContain(
-      "Compiled: src/i18n/translations/translations.yaml → src/i18n/generated/translations/translations.json"
+      "Compiled: src/i18n/translations/translations.yaml → src/i18n/generated/translations/translations.en.json"
     );
 
     const compiled = JSON.parse(
-      readFileSync(join(tempDir, "src/i18n/generated/translations/translations.json"), "utf8")
+      readFileSync(join(tempDir, "src/i18n/generated/translations/translations.en.json"), "utf8")
     ) as Record<string, Record<string, string>>;
     expect(compiled.welcome?.en).toBe("Line one\nLine two\n");
 
-    const dictionary = readFileSync(
-      join(tempDir, "src/i18n/generated/dictionary.generated.ts"),
+    const types = readFileSync(join(tempDir, "src/i18n/generated/i18n-types.generated.ts"), "utf8");
+    const loaders = readFileSync(
+      join(tempDir, "src/i18n/generated/namespace-loaders.generated.ts"),
       "utf8"
     );
-    const types = readFileSync(join(tempDir, "src/i18n/generated/i18n-types.generated.ts"), "utf8");
-    expect(dictionary).toContain("from './translations/translations.json'");
     expect(types).toContain("welcome: Partial<Record<AppLocale, string>>;");
+    expect(loaders).toContain(
+      "return import('./translations/translations.en.json').then((m) => m.default);"
+    );
   });
 
   it("supports mixed json and yaml namespaces", () => {
@@ -875,26 +656,27 @@ describe("generate-i18n-types", () => {
           default: "src/i18n/translations/default.json",
           billing: "src/i18n/translations/billing.yaml",
         },
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
     const result = runCodegen(tempDir);
     expect(result.status).toBe(0);
 
-    const dictionary = readFileSync(
-      join(tempDir, "src/i18n/generated/dictionary.generated.ts"),
+    const types = readFileSync(join(tempDir, "src/i18n/generated/i18n-types.generated.ts"), "utf8");
+    const loaders = readFileSync(
+      join(tempDir, "src/i18n/generated/namespace-loaders.generated.ts"),
       "utf8"
     );
-    const types = readFileSync(join(tempDir, "src/i18n/generated/i18n-types.generated.ts"), "utf8");
-    expect(dictionary).toContain("from '../translations/default.json'");
-    expect(dictionary).toContain("from './translations/billing.json'");
     expect(types).toContain("login_button: Partial<Record<AppLocale, string>>;");
     expect(types).toContain("invoice_summary: Partial<Record<AppLocale, string>>;");
+    expect(loaders).toContain(
+      "return import('./translations/billing.en.json').then((m) => m.default);"
+    );
+    expect(loaders).toContain(
+      "return import('./translations/default.en.json').then((m) => m.default);"
+    );
   });
 
   it("generates lazy loaders that import compiled json for yaml namespaces", () => {
@@ -921,14 +703,8 @@ describe("generate-i18n-types", () => {
           default: "src/i18n/translations/default.json",
           billing: "src/i18n/translations/billing.yaml",
         },
-        loadOnInit: ["default"],
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        dictionarySchemaOutput: "src/i18n/generated/dictionary-schema.generated.ts",
-        namespaceLoadersOutput: "src/i18n/generated/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -939,7 +715,9 @@ describe("generate-i18n-types", () => {
       join(tempDir, "src/i18n/generated/namespace-loaders.generated.ts"),
       "utf8"
     );
-    expect(loaders).toContain("import('./translations/billing.json')");
+    expect(loaders).toContain(
+      "return import('./translations/billing.en.json').then((m) => m.default);"
+    );
   });
 
   it("fails when dictionary extension is unsupported", () => {
@@ -950,12 +728,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.toml",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.toml",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );
 
@@ -964,7 +741,7 @@ describe("generate-i18n-types", () => {
     expect(result.stderr).toMatch(/unsupported dictionary (extension|format)/i);
   });
 
-  it("generates split-by-locale delivery with per-locale files and defaultDictionaryFor", () => {
+  it("generates split-by-locale delivery with per-locale files and namespace loaders", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
     mkdirSync(join(tempDir, "src/i18n/generated"), { recursive: true });
@@ -999,12 +776,8 @@ describe("generate-i18n-types", () => {
           billing: "src/i18n/translations/billing.json",
         },
         delivery: "split-by-locale",
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        namespaceLoadersOutput: "src/i18n/generated/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -1034,14 +807,12 @@ describe("generate-i18n-types", () => {
       "utf8"
     );
 
-    expect(existsSync(join(tempDir, "src/i18n/generated/dictionary.generated.ts"))).toBe(false);
-
     expect(types).toContain("welcome: Partial<Record<AppLocale, string>>;");
     expect(types).toContain("invoice_summary: Partial<Record<AppLocale, string>>;");
-    expect(types).toContain("export type AppLocale = 'en' | 'it'");
+    expect(types).toContain('export const AppLocales = ["en", "it"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
     expect(types).toContain("invoice_summary: { count: number }");
 
-    expect(types).toContain("export type LoadOnInitNamespace = never;");
     expect(types).toContain("export type LazyNamespace = 'default' | 'user' | 'billing';");
 
     expect(loaders).toContain(
@@ -1061,42 +832,7 @@ describe("generate-i18n-types", () => {
     expect(loaders).toContain("user: (locale) => {");
   });
 
-  it("omits dictionaryOutput in split mode and removes stale dictionary at the default path", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-    mkdirSync(join(tempDir, "src/i18n/generated"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/default.json"),
-      JSON.stringify({
-        welcome: { en: "Welcome {name}!", it: "Benvenuto {name}!" },
-      })
-    );
-    writeFileSync(
-      join(tempDir, "src/i18n/generated/dictionary.generated.ts"),
-      "// stale dictionary manifest\n"
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        namespaces: {
-          default: "src/i18n/translations/default.json",
-        },
-        delivery: "split-by-locale",
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        namespaceLoadersOutput: "src/i18n/generated/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-    expect(existsSync(join(tempDir, "src/i18n/generated/dictionary.generated.ts"))).toBe(false);
-  });
-
-  it("writes delivery json under deliveryOutput when it differs from typesOutput directory", () => {
+  it("writes delivery json under artifactsPath when it differs from codegenPath", () => {
     tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
     mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
     mkdirSync(join(tempDir, "src/i18n/generated"), { recursive: true });
@@ -1122,13 +858,9 @@ describe("generate-i18n-types", () => {
           billing: "src/i18n/translations/billing.yaml",
         },
         delivery: "split-by-locale",
-        deliveryOutput: "public/i18n",
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        namespaceLoadersOutput: "src/i18n/generated/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        artifactsPath: "public/i18n",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -1150,8 +882,6 @@ describe("generate-i18n-types", () => {
       join(tempDir, "src/i18n/generated/namespace-loaders.generated.ts"),
       "utf8"
     );
-
-    expect(existsSync(join(tempDir, "src/i18n/generated/dictionary.generated.ts"))).toBe(false);
     expect(loaders).toContain("export const defaultLazyNamespaces");
     expect(loaders).toContain(
       "return import('../../../public/i18n/translations/default.en.json').then((m) => m.default);"
@@ -1188,11 +918,8 @@ describe("generate-i18n-types", () => {
           "de-CH": "de-DE",
           it: "en",
         },
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -1208,48 +935,8 @@ describe("generate-i18n-types", () => {
     });
 
     const types = readFileSync(join(tempDir, "src/i18n/generated/i18n-types.generated.ts"), "utf8");
-    expect(types).toContain("export type AppLocale = 'de-CH' | 'de-DE' | 'en' | 'it'");
-  });
-
-  it("keeps canonical output when delivery is explicitly set to canonical", () => {
-    tempDir = mkdtempSync(join(tmpdir(), "xndrjs-i18n-codegen-"));
-    mkdirSync(join(tempDir, "src/i18n/translations"), { recursive: true });
-
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/default.json"),
-      JSON.stringify({ welcome: { en: "Welcome {name}!" } })
-    );
-    writeFileSync(
-      join(tempDir, "src/i18n/translations/billing.json"),
-      JSON.stringify({ invoice_summary: { en: "Invoice" } })
-    );
-    writeFileSync(
-      join(tempDir, "i18n.codegen.json"),
-      JSON.stringify({
-        namespaces: {
-          default: "src/i18n/translations/default.json",
-          billing: "src/i18n/translations/billing.json",
-        },
-        loadOnInit: ["default"],
-        delivery: "canonical",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        namespaceLoadersOutput: "src/i18n/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
-      })
-    );
-
-    const result = runCodegen(tempDir);
-    expect(result.status).toBe(0);
-
-    const dictionary = readFileSync(join(tempDir, "src/i18n/dictionary.generated.ts"), "utf8");
-    const loaders = readFileSync(join(tempDir, "src/i18n/namespace-loaders.generated.ts"), "utf8");
-
-    expect(dictionary).toContain("export const defaultDictionary: InitialSchema");
-    expect(loaders).toContain("[K in LazyNamespace]: () => Promise<AppSchema[K]>");
-    expect(loaders).toContain("import('./translations/billing.json')");
+    expect(types).toContain('export const AppLocales = ["de-CH", "de-DE", "en", "it"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
   });
 
   it("generates custom delivery with per-area json files", () => {
@@ -1290,12 +977,8 @@ describe("generate-i18n-types", () => {
           it: "en-US",
           fr: null,
         },
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        namespaceLoadersOutput: "src/i18n/generated/namespace-loaders.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -1349,7 +1032,8 @@ describe("generate-i18n-types", () => {
       readFileSync(join(tempDir, "src/i18n/generated/translations/billing.json"), "utf8")
     ).toThrow();
 
-    expect(types).toContain("export type AppDeliveryArea = 'eu' | 'us';");
+    expect(types).toContain('export const AppDeliveryAreas = ["eu", "us"] as const;');
+    expect(types).toContain("export type AppDeliveryArea = (typeof AppDeliveryAreas)[number];");
     expect(types).toContain("export const DELIVERY_ARTIFACTS = {");
     expect(types).toContain('"eu": ["fr", "it"] as const');
     expect(types).toContain('"us": ["en-US"] as const');
@@ -1360,16 +1044,14 @@ describe("generate-i18n-types", () => {
     expect(types).toContain('"fr": "eu"');
     expect(types).toContain('"en-US": "us"');
     expect(types).toContain("} as const satisfies Record<AppLocale, AppDeliveryArea>;");
-    expect(types).toContain("export type AppLocale = 'en-US' | 'fr' | 'it';");
+    expect(types).toContain('export const AppLocales = ["en-US", "fr", "it"] as const;');
+    expect(types).toContain("export type AppLocale = (typeof AppLocales)[number];");
     expect(types).toContain("export const LOCALE_FALLBACK");
     expect(types).toContain('"it": "en-US"');
     expect(types).toContain("some_key: Partial<Record<AppLocale, string>>;");
     expect(types).toContain("invoice_summary: Partial<Record<AppLocale, string>>;");
     expect(types).toContain("invoice_summary: { count: number }");
 
-    expect(existsSync(join(tempDir, "src/i18n/generated/dictionary.generated.ts"))).toBe(false);
-
-    expect(types).toContain("export type LoadOnInitNamespace = never;");
     expect(types).toContain("export type LazyNamespace = 'default' | 'billing';");
 
     expect(loaders).toContain(
@@ -1387,14 +1069,7 @@ describe("generate-i18n-types", () => {
       "return import('./translations/billing.us.json').then((m) => m.default);"
     );
 
-    expect(factory).toContain("export function projectDictionaryForDeliveryArea(");
-    expect(factory).toContain("export function projectNamespaceForDeliveryArea(");
-    expect(factory).toContain(
-      "projectDictionaryForDeliveryAreaCore(dictionary, areaLocales, LOCALE_FALLBACK)"
-    );
-    expect(factory).toContain(
-      "projectNamespaceForDeliveryAreaCore(dictionary, areaLocales, LOCALE_FALLBACK)"
-    );
+    expect(factory).toContain("partitionForLocale: (locale) => LOCALE_DELIVERY_AREA[locale]");
   });
 
   it("fails when deliveryArtifacts does not partition request locales", () => {
@@ -1423,11 +1098,8 @@ describe("generate-i18n-types", () => {
           it: "en-US",
           fr: null,
         },
-        typesOutput: "src/i18n/generated/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/generated/dictionary.generated.ts",
-        instanceOutput: "src/i18n/generated/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        projectName: "App",
+        codegenPath: "src/i18n/generated",
       })
     );
 
@@ -1450,12 +1122,11 @@ describe("generate-i18n-types", () => {
     writeFileSync(
       join(tempDir, "i18n.codegen.json"),
       JSON.stringify({
-        dictionary: "src/i18n/translations/translations.yaml",
-        typesOutput: "src/i18n/i18n-types.generated.ts",
-        dictionaryOutput: "src/i18n/dictionary.generated.ts",
-        instanceOutput: "src/i18n/instance.generated.ts",
-        paramsTypeName: "AppParams",
-        schemaTypeName: "AppSchema",
+        namespaces: {
+          default: "src/i18n/translations/translations.yaml",
+        },
+        projectName: "App",
+        codegenPath: "src/i18n",
       })
     );