@voltro/i18n 0.69.1 → 0.71.0

package/dist/server.d.ts

@@ -22,14 +22,14 @@ export declare const isSupportedTimeZone: (name: string | null | undefined) => n
 export declare const LOCALE_COOKIE = "voltro:locale";
 
 /**
- * Build the per-request resolver: cookie > Accept-Language > default, then the
+ * Build the per-request resolver: route locale > cookie > Accept-Language > default, then the
  * matching wrapper.
  *
  * Returns `undefined` when the app ships no usable catalog, so a caller can
  * spread the result and omit `outerWrap` entirely rather than passing an
  * identity wrap — an app without locales must render exactly as before.
  */
-export declare const makeSsrI18nResolver: (args: SsrI18nResolverArgs) => ((cookieHeader?: string | null, acceptLanguageHeader?: string | null) => ResolvedSsrI18n | undefined);
+export declare const makeSsrI18nResolver: (args: SsrI18nResolverArgs) => ((cookieHeader?: string | null, acceptLanguageHeader?: string | null, routeLocale?: string | null) => ResolvedSsrI18n | undefined);
 
 /** What a renderer needs to render one request in the right locale. */
 export declare interface ResolvedSsrI18n {
@@ -48,6 +48,10 @@ export declare interface ResolvedSsrI18n {
 export declare const resolveLocale: (args: ResolveLocaleArgs) => string;
 
 export declare interface ResolveLocaleArgs {
+    /** The matched `[locale]` route parameter, not a guessed pathname prefix.
+     *  Wins only on an EXACT supported spelling; unknown route values fall
+     *  through to request preferences. Does not validate or redirect a route. */
+    readonly routeLocale?: string | null | undefined;
     /** Raw `Cookie:` request header, or null/undefined when absent. */
     readonly cookieHeader?: string | null;
     /** Raw `Accept-Language:` request header, or null/undefined when

package/dist/server.js

@@ -29,16 +29,18 @@ var o = a, s = (e) => RegExp(`(?:^|;\\s*)${e.replace(/[.*+?^${}()|[\]\\]/g, "\\$
 		q: r
 	};
 }).filter((e) => e !== null).sort((e, t) => t.q - e.q) : [], d = (e) => {
-	let { cookieHeader: t, acceptLanguageHeader: n, supported: r, defaultLocale: i } = e, a = c(t, o);
-	if (a) {
-		let e = l(a, r);
+	let { routeLocale: t, cookieHeader: n, acceptLanguageHeader: r, supported: i, defaultLocale: a } = e;
+	if (t && i.includes(t)) return t;
+	let s = c(n, o);
+	if (s) {
+		let e = l(s, i);
 		if (e) return e;
 	}
-	for (let e of u(n)) {
-		let t = l(e.tag, r);
+	for (let e of u(r)) {
+		let t = l(e.tag, i);
 		if (t) return t;
 	}
-	return i;
+	return a;
 }, f = (e) => {
 	let { cookieHeader: t, configured: n, defaultTimeZone: a } = e;
 	if (!n) return;
@@ -47,23 +49,24 @@ var o = a, s = (e) => RegExp(`(?:^|;\\s*)${e.replace(/[.*+?^${}()|[\]\\]/g, "\\$
 	return r(o) ? o : r(a) ? a : "UTC";
 }, p = (e) => {
 	let { wraps: t, supported: n, defaultLocale: r } = e;
-	return Object.keys(t).length === 0 ? () => void 0 : (i, a) => {
-		let o = d({
+	return Object.keys(t).length === 0 ? () => void 0 : (i, a, o) => {
+		let s = d({
+			routeLocale: o ?? null,
 			cookieHeader: i ?? null,
 			acceptLanguageHeader: a ?? null,
 			supported: n,
 			defaultLocale: r
-		}), s = f({
+		}), c = f({
 			cookieHeader: i ?? null,
 			configured: e.timeZone ?? null,
 			defaultTimeZone: e.defaultTimeZone ?? null
-		}), c = (e.now ?? Date.now)(), l = t[o] ?? t[r];
-		if (l !== void 0) return {
-			locale: o,
-			timeZone: s,
-			outerWrap: (e) => l(e, {
-				timeZone: s,
-				renderedAt: c
+		}), l = (e.now ?? Date.now)(), u = t[s] ?? t[r];
+		if (u !== void 0) return {
+			locale: s,
+			timeZone: c,
+			outerWrap: (e) => u(e, {
+				timeZone: c,
+				renderedAt: l
 			})
 		};
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/i18n",
-  "version": "0.69.1",
+  "version": "0.71.0",
   "description": "Voltro's i18n layer — thin opinionated wrap over react-intl. Provides the framework's locale-resolution conventions (voltro:locale cookie + Accept-Language fallback), a typed message-catalog helper, and a slim provider component. Power users can import directly from react-intl for advanced APIs.",
   "keywords": [
     "voltro",