fix: normalize locale persistence config

Author: AleksandrSl

cmp/compiler/src/index.ts

@@ -1,9 +1 @@
-export type {
-  PartialLingoConfig,
-  MetadataConfig,
-  TranslationConfig,
-  PathConfig,
-  TranslationEntry,
-  MetadataSchema,
-  CookieConfig,
-} from "./types";
+export type { PartialLingoConfig } from "./types";

cmp/compiler/src/plugin/next.ts

@@ -17,7 +17,7 @@ export type LingoNextPluginOptions = PartialLingoConfig;
 
 type RuleKey = "compiler" | "devConfig" | "localeServer" | "localeClient";
 
-export function loaders({
+function loaders({
   lingoConfig,
   metadataFilePath,
   translationServerUrl,
@@ -56,15 +56,15 @@ export function loaders({
     loader: "@lingo.dev/compiler/next-locale-server-loader",
     options: {
       ...common,
-      cookieConfig: lingoConfig.cookieConfig,
+      localePersistence: lingoConfig.localePersistence,
     },
   };
 
   const localeClientLoader = {
     loader: "@lingo.dev/compiler/next-locale-client-loader",
     options: {
       ...common,
-      cookieConfig: lingoConfig.cookieConfig,
+      localePersistence: lingoConfig.localePersistence,
     },
   };
 
@@ -345,6 +345,3 @@ export async function withLingo(
     webpack,
   };
 }
-
-// Also export TypeScript types
-export type { NextConfig };

cmp/compiler/src/react/next/cookie-locale-resolver.ts

@@ -13,7 +13,7 @@ import type { LocaleCode } from "lingo.dev/spec";
 /**
  * Configuration for Next.js locale resolver
  */
-export interface NextLocaleResolverConfig {
+interface NextLocaleResolverConfig {
   /**
    * Cookie configuration (name and maxAge)
    * @default { name: 'locale', maxAge: 31536000 }

cmp/compiler/src/types.ts

@@ -26,7 +26,7 @@ export interface CookieConfig {
  * Locale persistence configuration
  * Currently only supports cookie-based persistence
  */
-export type LocalePersistenceConfig = { type: "cookie"; cookieName?: string };
+export type LocalePersistenceConfig = { type: "cookie"; config: CookieConfig };
 
 /**
  * Field that we require users to fill in the config. The rest could be taken from defaults.
@@ -163,17 +163,11 @@ export type LingoConfig = {
     translationServerUrl?: string;
   };
 
-  /**
-   * Cookie configuration for locale persistence
-   * Used by both client-side LocaleSwitcher and server-side locale resolver
-   */
-  cookieConfig: CookieConfig;
-
   /**
    * Locale persistence configuration
    * Defines how locale changes should be persisted
    *
-   * @default { type: 'cookie', cookieName: 'locale' }
+   * @default { type: 'cookie', config: { name: 'locale' } }
    */
   localePersistence: LocalePersistenceConfig;
 
@@ -189,21 +183,6 @@ export type LingoConfig = {
   buildMode: "translate" | "cache-only";
 };
 
-/**
- * Minimal config needed for metadata operations
- * Used by metadata manager functions
- */
-export type MetadataConfig = Pick<LingoConfig, "sourceRoot" | "lingoDir">;
-
-/**
- * Config needed for translation operations
- * Includes translator configuration
- */
-export type TranslationConfig = Pick<
-  LingoConfig,
-  "sourceRoot" | "lingoDir" | "sourceLocale" | "models" | "prompt"
->;
-
 /**
  * Config needed for translation middleware and server
  * Extends TranslationConfig with optional fields

cmp/compiler/src/utils/config-factory.ts

@@ -18,13 +18,12 @@ export const DEFAULT_CONFIG = {
   dev: {
     translationServerStartPort: 60000,
   },
-  cookieConfig: {
-    name: "locale",
-    maxAge: 31536000,
-  },
   localePersistence: {
     type: "cookie" as const,
-    cookieName: "locale",
+    config: {
+      name: "locale",
+      maxAge: 31536000,
+    },
   },
   models: "lingo.dev",
   pluralization: {
@@ -66,6 +65,10 @@ export function createLingoConfig(
     localePersistence: {
       ...DEFAULT_CONFIG.localePersistence,
       ...options.localePersistence,
+      config: {
+        ...DEFAULT_CONFIG.localePersistence.config,
+        ...options.localePersistence?.config,
+      },
     },
   };
 }

cmp/compiler/src/virtual/code-generator.ts

@@ -30,7 +30,7 @@ export const sourceLocale = ${JSON.stringify(config.sourceLocale)};
 export function generateServerLocaleModule(config: LingoConfig): string {
   return `
 import { createNextCookieLocaleResolver } from '@lingo.dev/compiler/react/next';
-export const getServerLocale = createNextCookieLocaleResolver({ cookieConfig: ${JSON.stringify(config.cookieConfig)}, defaultLocale: ${JSON.stringify(config.sourceLocale)} });
+export const getServerLocale = createNextCookieLocaleResolver({ cookieConfig: ${JSON.stringify(config.localePersistence.config)}, defaultLocale: ${JSON.stringify(config.sourceLocale)} });
 `;
 }
 
@@ -39,8 +39,8 @@ export const getServerLocale = createNextCookieLocaleResolver({ cookieConfig: ${
  * Exports getClientLocale() and persistLocale() functions
  */
 export function generateClientLocaleModule(config: LingoConfig): string {
-  const cookieName = config.cookieConfig.name;
-  const maxAge = config.cookieConfig.maxAge;
+  const cookieName = config.localePersistence.config.name;
+  const maxAge = config.localePersistence.config.maxAge;
 
   return `
 export function getClientLocale() {