@cosmicdrift/kumiko-headless 0.215.7 → 0.217.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-headless",
-  "version": "0.215.7",
+  "version": "0.217.0",
   "description": "Headless UI logic for Kumiko — Dispatcher contract, Form-Controller, View-Model, Nav-Resolver. Plattform- und React-frei; jeder Renderer (renderer, renderer-web, renderer-native, …) komponiert darauf.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -36,7 +36,7 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-framework": "0.215.7",
+    "@cosmicdrift/kumiko-framework": "0.217.0",
     "temporal-polyfill": "^0.3.2",
     "zod": "^4.4.3"
   },

package/src/locale-routing/__tests__/locale-routing.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { createLocaleRouter } from "../index";
+import type { LocaleResolver } from "../../contracts";
+import { createLocaleRouter, wrapUrlLocaleResolver } from "../index";
 
 type MoneyHorsePage = "home" | "features" | "rechner" | "budget" | "ltv";
 
@@ -76,7 +77,7 @@ describe("createLocaleRouter publicstatus config", () => {
 });
 
 describe("createLocaleRouter inverted default (website-style)", () => {
-  const router = createLocaleRouter({
+  const router = createLocaleRouter<"home">({
     defaultLocale: "en",
     prefixedLocales: ["de"],
     prefixFor: () => "/de",
@@ -157,3 +158,64 @@ describe("createLocaleRouter homePage validation", () => {
     expect(() => router.publicPath("features", "de")).toThrow(/no path for page/);
   });
 });
+
+function staticBase(locale: string): LocaleResolver {
+  let current = locale;
+  const listeners = new Set<() => void>();
+  return {
+    translate: (key) => key,
+    locale: () => current,
+    timeZone: () => "UTC",
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    setLocale: (next) => {
+      current = next;
+      for (const listener of listeners) listener();
+    },
+  };
+}
+
+describe("wrapUrlLocaleResolver", () => {
+  test("registered path uses detectLang, not base locale", () => {
+    const wrapped = wrapUrlLocaleResolver(staticBase("de"), {
+      resolvePage: (pathname) => moneyHorseRouter.resolvePage(pathname),
+      detectLang: (pathname) => moneyHorseRouter.detectLang(pathname),
+      pathname: () => "/en/features",
+    });
+    expect(wrapped.locale()).toBe("en");
+  });
+
+  test("home path uses URL locale even when base differs", () => {
+    const wrapped = wrapUrlLocaleResolver(staticBase("en"), {
+      resolvePage: (pathname) => moneyHorseRouter.resolvePage(pathname),
+      detectLang: (pathname) => moneyHorseRouter.detectLang(pathname),
+      pathname: () => "/",
+    });
+    expect(wrapped.locale()).toBe("de");
+  });
+
+  test("unregistered path keeps base locale", () => {
+    const wrapped = wrapUrlLocaleResolver(staticBase("de"), {
+      resolvePage: (pathname) => moneyHorseRouter.resolvePage(pathname),
+      detectLang: (pathname) => moneyHorseRouter.detectLang(pathname),
+      pathname: () => "/app/credits",
+    });
+    expect(wrapped.locale()).toBe("de");
+  });
+
+  test("setLocale passes through to base", () => {
+    const base = staticBase("de");
+    const wrapped = wrapUrlLocaleResolver(base, {
+      resolvePage: () => undefined,
+      detectLang: () => "en",
+      pathname: () => "/app",
+    });
+    wrapped.setLocale?.("en");
+    expect(base.locale()).toBe("en");
+    expect(wrapped.locale()).toBe("en");
+  });
+});

package/src/locale-routing/index.ts

@@ -1,3 +1,5 @@
+import type { LocaleResolver } from "../contracts";
+
 export type LocaleRouterConfig<TPage extends string> = {
   /** Canonical default, usually "de". No URL prefix. */
   readonly defaultLocale: string;
@@ -142,3 +144,38 @@ export function createLocaleRouter<TPage extends string>(
 
   return { detectLang, publicPath, resolvePage, altLocalePath, sectionAnchor };
 }
+
+export type WrapUrlLocaleResolverOptions = {
+  resolvePage: (pathname: string) => unknown;
+  detectLang: (pathname: string) => string;
+  pathname?: () => string;
+};
+
+function defaultBrowserPathname(): string {
+  const loc = (globalThis as { location?: { pathname?: string } }).location;
+  return typeof loc?.pathname === "string" ? loc.pathname : "/";
+}
+
+/**
+ * Prefer URL-derived locale when `resolvePage` matches the current path;
+ * otherwise defer to `base.locale()`. Passes through setLocale and the rest of LocaleResolver.
+ */
+export function wrapUrlLocaleResolver(
+  base: LocaleResolver,
+  options: WrapUrlLocaleResolverOptions,
+): LocaleResolver {
+  const getPathname = options.pathname ?? defaultBrowserPathname;
+  return {
+    translate: (key, params) => base.translate(key, params),
+    timeZone: () => base.timeZone(),
+    subscribe: (listener) => base.subscribe(listener),
+    setLocale: base.setLocale !== undefined ? (locale) => base.setLocale?.(locale) : undefined,
+    locale: () => {
+      const path = getPathname();
+      if (options.resolvePage(path) !== undefined) {
+        return options.detectLang(path);
+      }
+      return base.locale();
+    },
+  };
+}