@verbaly/sveltekit 0.16.0 → 0.17.0

package/README.md

@@ -63,20 +63,20 @@ declare namespace App {
 export const load = ({ locals }) => ({ locale: locals.verbalyLocale });
 ```
 
-**5. One instance per render, catalog awaited** — this is the no-FOUC guarantee:
+**5. One instance per render, catalog awaited** — this is the no-FOUC guarantee, in one call:
 
 ```ts
 // src/routes/+layout.ts
-import { createInstance } from 'virtual:verbaly';
-
-export const load = async ({ data }) => {
-  const verbaly = createInstance();
-  await verbaly.loadLocale(data.locale); // catalog ready BEFORE render
-  verbaly.setLocale(data.locale);
-  return { ...data, verbaly };
-};
+import { createRequestInstance } from 'virtual:verbaly';
+
+export const load = async ({ data }) => ({
+  ...data,
+  verbaly: await createRequestInstance(data.locale), // catalog ready BEFORE render
+});
 ```
 
+(`createInstance(options)` remains available when you need custom options.)
+
 ```html
 <!-- src/routes/+layout.svelte -->
 <script>

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Verbaly } from "verbaly";
 //#region src/index.d.ts
-declare const LOCALE_COOKIE = "verbaly-locale";
+declare const LOCALE_COOKIE: string;
 interface HandleEvent {
   request: Request;
   cookies: {

package/dist/index.js

@@ -1,6 +1,6 @@
-import { negotiateLocale } from "verbaly";
+import { LOCALE_STORAGE_KEY, resolveRequestLocale } from "verbaly";
 //#region src/index.ts
-const LOCALE_COOKIE = "verbaly-locale";
+const LOCALE_COOKIE = LOCALE_STORAGE_KEY;
 const LANG_PLACEHOLDER = "%verbaly.lang%";
 const YEAR = 31536e3;
 function verbalyHandle(options) {
@@ -8,12 +8,12 @@ function verbalyHandle(options) {
 	if (!Array.isArray(locales) || locales.length === 0) throw new Error("[verbaly] verbalyHandle needs `locales` — pass the `locales` export from 'virtual:verbaly' (requires @verbaly/vite ≥0.16) or list them yourself: verbalyHandle({ locales: [...] })");
 	const fallback = options.fallback ?? locales[0];
 	return ({ event, resolve }) => {
-		let locale;
-		if (cookie) {
-			const stored = event.cookies.get(cookie);
-			if (stored) locale = negotiateLocale(stored, locales, "") || void 0;
-		}
-		const resolved = locale ?? negotiateLocale(event.request.headers.get("accept-language"), locales, fallback);
+		const resolved = resolveRequestLocale({
+			supported: locales,
+			cookie: cookie ? event.cookies.get(cookie) : void 0,
+			header: event.request.headers.get("accept-language"),
+			fallback
+		});
 		event.locals.verbalyLocale = resolved;
 		return resolve(event, { transformPageChunk: ({ html }) => html.replaceAll(LANG_PLACEHOLDER, resolved) });
 	};

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["import { negotiateLocale } from 'verbaly';\nimport type { Verbaly } from 'verbaly';\n\n// same name as core's localStorage key — one identity per user across channels\nexport const LOCALE_COOKIE = 'verbaly-locale';\nconst LANG_PLACEHOLDER = '%verbaly.lang%';\nconst YEAR = 31536000;\n\n// structural subset of @sveltejs/kit — no runtime or type dependency on kit\ninterface HandleEvent {\n  request: Request;\n  cookies: { get(name: string): string | undefined };\n  locals: { verbalyLocale?: string };\n}\ninterface ResolveOptions {\n  transformPageChunk?(input: { html: string; done: boolean }): string | undefined;\n}\ninterface HandleInput {\n  event: HandleEvent;\n  resolve(event: HandleEvent, opts?: ResolveOptions): Response | Promise<Response>;\n}\n\nexport interface VerbalyHandleOptions {\n  /** supported locales — pass `locales` from 'virtual:verbaly' */\n  locales: string[];\n  /** default when nothing matches (defaults to the first locale) */\n  fallback?: string;\n  /** cookie read for the user's choice; `false` = Accept-Language only */\n  cookie?: string | false;\n}\n\n// server hook: cookie → Accept-Language → fallback, per request.\n// Sets event.locals.verbalyLocale and fills %verbaly.lang% in app.html.\nexport function verbalyHandle(options: VerbalyHandleOptions) {\n  const { locales, cookie = LOCALE_COOKIE } = options;\n  if (!Array.isArray(locales) || locales.length === 0) {\n    throw new Error(\n      \"[verbaly] verbalyHandle needs `locales` — pass the `locales` export from 'virtual:verbaly' \" +\n        '(requires @verbaly/vite ≥0.16) or list them yourself: verbalyHandle({ locales: [...] })',\n    );\n  }\n  const fallback = options.fallback ?? locales[0]!;\n\n  return ({ event, resolve }: HandleInput): Response | Promise<Response> => {\n    let locale: string | undefined;\n    if (cookie) {\n      const stored = event.cookies.get(cookie);\n      // '' sentinel = no match → fall through to the header\n      if (stored) locale = negotiateLocale(stored, locales, '') || undefined;\n    }\n    const resolved =\n      locale ?? negotiateLocale(event.request.headers.get('accept-language'), locales, fallback);\n\n    event.locals.verbalyLocale = resolved;\n    return resolve(event, {\n      transformPageChunk: ({ html }) => html.replaceAll(LANG_PLACEHOLDER, resolved),\n    });\n  };\n}\n\nexport interface SwitchLocaleOptions {\n  /** cookie written so the next SSR request matches; `false` = don't persist */\n  cookie?: string | false;\n  /** cookie lifetime in seconds (default 1 year) */\n  maxAge?: number;\n}\n\n// client-side switch: catalog first (no flash), then locale, then persistence\nexport async function switchLocale(\n  instance: Pick<Verbaly, 'loadLocale' | 'setLocale'>,\n  locale: string,\n  options: SwitchLocaleOptions = {},\n): Promise<void> {\n  const { cookie = LOCALE_COOKIE, maxAge = YEAR } = options;\n  await instance.loadLocale(locale);\n  instance.setLocale(locale);\n  if (typeof document === 'undefined') return; // SSR-safe no-op\n  if (cookie) {\n    document.cookie = `${cookie}=${encodeURIComponent(locale)}; path=/; max-age=${maxAge}; samesite=lax`;\n  }\n  document.documentElement.lang = locale;\n}\n"],"mappings":";;AAIA,MAAa,gBAAgB;AAC7B,MAAM,mBAAmB;AACzB,MAAM,OAAO;AA2Bb,SAAgB,cAAc,SAA+B;CAC3D,MAAM,EAAE,SAAS,SAAS,kBAAkB;CAC5C,IAAI,CAAC,MAAM,QAAQ,OAAO,KAAK,QAAQ,WAAW,GAChD,MAAM,IAAI,MACR,oLAEF;CAEF,MAAM,WAAW,QAAQ,YAAY,QAAQ;CAE7C,QAAQ,EAAE,OAAO,cAAyD;EACxE,IAAI;EACJ,IAAI,QAAQ;GACV,MAAM,SAAS,MAAM,QAAQ,IAAI,MAAM;GAEvC,IAAI,QAAQ,SAAS,gBAAgB,QAAQ,SAAS,EAAE,KAAK,KAAA;EAC/D;EACA,MAAM,WACJ,UAAU,gBAAgB,MAAM,QAAQ,QAAQ,IAAI,iBAAiB,GAAG,SAAS,QAAQ;EAE3F,MAAM,OAAO,gBAAgB;EAC7B,OAAO,QAAQ,OAAO,EACpB,qBAAqB,EAAE,WAAW,KAAK,WAAW,kBAAkB,QAAQ,EAC9E,CAAC;CACH;AACF;AAUA,eAAsB,aACpB,UACA,QACA,UAA+B,CAAC,GACjB;CACf,MAAM,EAAE,SAAS,eAAe,SAAS,SAAS;CAClD,MAAM,SAAS,WAAW,MAAM;CAChC,SAAS,UAAU,MAAM;CACzB,IAAI,OAAO,aAAa,aAAa;CACrC,IAAI,QACF,SAAS,SAAS,GAAG,OAAO,GAAG,mBAAmB,MAAM,EAAE,oBAAoB,OAAO;CAEvF,SAAS,gBAAgB,OAAO;AAClC"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["import { LOCALE_STORAGE_KEY, resolveRequestLocale } from 'verbaly';\nimport type { Verbaly } from 'verbaly';\n\n// derived from core's localStorage key — one identity per user across channels\nexport const LOCALE_COOKIE: string = LOCALE_STORAGE_KEY;\nconst LANG_PLACEHOLDER = '%verbaly.lang%';\nconst YEAR = 31536000;\n\n// structural subset of @sveltejs/kit — no runtime or type dependency on kit\ninterface HandleEvent {\n  request: Request;\n  cookies: { get(name: string): string | undefined };\n  locals: { verbalyLocale?: string };\n}\ninterface ResolveOptions {\n  transformPageChunk?(input: { html: string; done: boolean }): string | undefined;\n}\ninterface HandleInput {\n  event: HandleEvent;\n  resolve(event: HandleEvent, opts?: ResolveOptions): Response | Promise<Response>;\n}\n\nexport interface VerbalyHandleOptions {\n  /** supported locales — pass `locales` from 'virtual:verbaly' */\n  locales: string[];\n  /** default when nothing matches (defaults to the first locale) */\n  fallback?: string;\n  /** cookie read for the user's choice; `false` = Accept-Language only */\n  cookie?: string | false;\n}\n\n// server hook: cookie → Accept-Language → fallback, per request.\n// Sets event.locals.verbalyLocale and fills %verbaly.lang% in app.html.\nexport function verbalyHandle(options: VerbalyHandleOptions) {\n  const { locales, cookie = LOCALE_COOKIE } = options;\n  if (!Array.isArray(locales) || locales.length === 0) {\n    throw new Error(\n      \"[verbaly] verbalyHandle needs `locales` — pass the `locales` export from 'virtual:verbaly' \" +\n        '(requires @verbaly/vite ≥0.16) or list them yourself: verbalyHandle({ locales: [...] })',\n    );\n  }\n  const fallback = options.fallback ?? locales[0]!;\n\n  return ({ event, resolve }: HandleInput): Response | Promise<Response> => {\n    const resolved = resolveRequestLocale({\n      supported: locales,\n      cookie: cookie ? event.cookies.get(cookie) : undefined,\n      header: event.request.headers.get('accept-language'),\n      fallback,\n    });\n\n    event.locals.verbalyLocale = resolved;\n    return resolve(event, {\n      transformPageChunk: ({ html }) => html.replaceAll(LANG_PLACEHOLDER, resolved),\n    });\n  };\n}\n\nexport interface SwitchLocaleOptions {\n  /** cookie written so the next SSR request matches; `false` = don't persist */\n  cookie?: string | false;\n  /** cookie lifetime in seconds (default 1 year) */\n  maxAge?: number;\n}\n\n// client-side switch: catalog first (no flash), then locale, then persistence\nexport async function switchLocale(\n  instance: Pick<Verbaly, 'loadLocale' | 'setLocale'>,\n  locale: string,\n  options: SwitchLocaleOptions = {},\n): Promise<void> {\n  const { cookie = LOCALE_COOKIE, maxAge = YEAR } = options;\n  await instance.loadLocale(locale);\n  instance.setLocale(locale);\n  if (typeof document === 'undefined') return; // SSR-safe no-op\n  if (cookie) {\n    document.cookie = `${cookie}=${encodeURIComponent(locale)}; path=/; max-age=${maxAge}; samesite=lax`;\n  }\n  document.documentElement.lang = locale;\n}\n"],"mappings":";;AAIA,MAAa,gBAAwB;AACrC,MAAM,mBAAmB;AACzB,MAAM,OAAO;AA2Bb,SAAgB,cAAc,SAA+B;CAC3D,MAAM,EAAE,SAAS,SAAS,kBAAkB;CAC5C,IAAI,CAAC,MAAM,QAAQ,OAAO,KAAK,QAAQ,WAAW,GAChD,MAAM,IAAI,MACR,oLAEF;CAEF,MAAM,WAAW,QAAQ,YAAY,QAAQ;CAE7C,QAAQ,EAAE,OAAO,cAAyD;EACxE,MAAM,WAAW,qBAAqB;GACpC,WAAW;GACX,QAAQ,SAAS,MAAM,QAAQ,IAAI,MAAM,IAAI,KAAA;GAC7C,QAAQ,MAAM,QAAQ,QAAQ,IAAI,iBAAiB;GACnD;EACF,CAAC;EAED,MAAM,OAAO,gBAAgB;EAC7B,OAAO,QAAQ,OAAO,EACpB,qBAAqB,EAAE,WAAW,KAAK,WAAW,kBAAkB,QAAQ,EAC9E,CAAC;CACH;AACF;AAUA,eAAsB,aACpB,UACA,QACA,UAA+B,CAAC,GACjB;CACf,MAAM,EAAE,SAAS,eAAe,SAAS,SAAS;CAClD,MAAM,SAAS,WAAW,MAAM;CAChC,SAAS,UAAU,MAAM;CACzB,IAAI,OAAO,aAAa,aAAa;CACrC,IAAI,QACF,SAAS,SAAS,GAAG,OAAO,GAAG,mBAAmB,MAAM,EAAE,oBAAoB,OAAO;CAEvF,SAAS,gBAAgB,OAAO;AAClC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verbaly/sveltekit",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "SvelteKit SSR integration for Verbaly — per-request locale negotiation and flash-free hydration.",
   "keywords": [
     "i18n",
@@ -40,13 +40,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "verbaly": "^0.16.0"
+    "verbaly": "^0.17.0"
   },
   "devDependencies": {
     "@sveltejs/kit": "^2.69.2",
     "happy-dom": "^20.10.6",
     "svelte": "^5.56.4",
-    "verbaly": "0.16.0"
+    "verbaly": "0.17.0"
   },
   "scripts": {
     "build": "tsdown",