@zachhandley/ez-i18n 0.3.18 → 0.4.0

package/README.md

@@ -5,7 +5,7 @@ Cookie-based i18n for Astro. Ships the Astro integration plus the shared runtime
 ## Installation
 
 ```bash
-pnpm add @zachhandley/ez-i18n nanostores @nanostores/persistent
+pnpm add @zachhandley/ez-i18n nanostores
 ```
 
 ## Astro Setup

package/dist/runtime/index.d.ts

@@ -13,9 +13,11 @@ declare function getNestedValue(obj: Record<string, unknown>, path: string): unk
  */
 declare function interpolate(str: string, params?: Record<string, string | number>): string;
 /**
- * Client-side locale preference (persisted to localStorage)
+ * Client-side locale preference
+ * Note: Persistence is handled via cookies (set by middleware) and the hydration script
+ * that syncs localStorage. We use a regular atom to avoid proxy issues in Cloudflare Workers.
  */
-declare const localePreference: nanostores.WritableAtom<string>;
+declare const localePreference: nanostores.PreinitializedWritableAtom<string> & object;
 /**
  * Effective locale - uses server locale if set, otherwise client preference
  */

package/dist/runtime/index.js

@@ -1,6 +1,5 @@
 // src/runtime/store.ts
 import { atom, computed } from "nanostores";
-import { persistentAtom } from "@nanostores/persistent";
 function getNestedValue(obj, path) {
   const keys = path.split(".");
   let value = obj;
@@ -19,10 +18,7 @@ function interpolate(str, params) {
   });
 }
 var serverLocale = atom(null);
-var localePreference = persistentAtom("ez-locale", "en", {
-  encode: (value) => value,
-  decode: (value) => value
-});
+var localePreference = atom("en");
 var effectiveLocale = computed(
   [serverLocale, localePreference],
   (server, client) => server ?? client
@@ -81,6 +77,47 @@ function getLocale() {
 function getTranslations() {
   return translations.get();
 }
+var embeddedI18nPattern = /\[i18n:([^\]|]+)(?:\|([^\]]+))?]/g;
+function parseEmbeddedParams(paramString) {
+  if (!paramString) return {};
+  const params = new URLSearchParams(paramString);
+  const result = {};
+  for (const [key, value] of params) {
+    result[key] = value;
+  }
+  return result;
+}
+function mergeEmbeddedParams(embeddedParams, overrideParams) {
+  const embeddedKeys = Object.keys(embeddedParams);
+  if (embeddedKeys.length === 0) return void 0;
+  const merged = { ...embeddedParams };
+  if (overrideParams) {
+    for (const key of embeddedKeys) {
+      if (key in overrideParams) {
+        merged[key] = overrideParams[key];
+      }
+    }
+  }
+  return merged;
+}
+function formatEmbeddedString(str, overrideParams, translateKey) {
+  if (!str.includes("[i18n:")) return str;
+  return str.replace(embeddedI18nPattern, (_match, embeddedKey, paramString) => {
+    const embeddedParams = parseEmbeddedParams(paramString);
+    const mergedParams = mergeEmbeddedParams(embeddedParams, overrideParams);
+    return translateKey(embeddedKey, mergedParams);
+  });
+}
+function translateKeyWithTranslations(trans, key, params) {
+  const value = getNestedValue(trans, key);
+  if (typeof value !== "string") {
+    if (typeof import.meta !== "undefined" && import.meta.env?.DEV) {
+      console.warn("[ez-i18n] Missing translation:", key);
+    }
+    return key;
+  }
+  return interpolate(value, params);
+}
 function getTranslationsWithSSRFallback() {
   const trans = translations.get();
   if (Object.keys(trans).length === 0) {
@@ -93,26 +130,20 @@ function getTranslationsWithSSRFallback() {
 }
 function t(key, params) {
   const trans = getTranslationsWithSSRFallback();
-  const value = getNestedValue(trans, key);
-  if (typeof value !== "string") {
-    if (typeof import.meta !== "undefined" && import.meta.env?.DEV) {
-      console.warn("[ez-i18n] Missing translation:", key);
-    }
-    return key;
+  const translate = (lookupKey, lookupParams) => translateKeyWithTranslations(trans, lookupKey, lookupParams);
+  if (key.includes("[i18n:")) {
+    return formatEmbeddedString(key, params, translate);
   }
-  return interpolate(value, params);
+  return translate(key, params);
 }
 function tc(key, params) {
   return computed(translations, (trans) => {
     const effectiveTrans = Object.keys(trans).length === 0 ? globalThis.__EZ_I18N__?.translations ?? trans : trans;
-    const value = getNestedValue(effectiveTrans, key);
-    if (typeof value !== "string") {
-      if (typeof import.meta !== "undefined" && import.meta.env?.DEV) {
-        console.warn("[ez-i18n] Missing translation:", key);
-      }
-      return key;
+    const translate = (lookupKey, lookupParams) => translateKeyWithTranslations(effectiveTrans, lookupKey, lookupParams);
+    if (key.includes("[i18n:")) {
+      return formatEmbeddedString(key, params, translate);
     }
-    return interpolate(value, params);
+    return translate(key, params);
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachhandley/ez-i18n",
-  "version": "0.3.18",
+  "version": "v0.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -56,12 +56,10 @@
     "tinyglobby": "^0.2.15"
   },
   "peerDependencies": {
-    "@nanostores/persistent": "^0.10.0",
     "astro": "^4.0.0 || ^5.0.0",
     "nanostores": "^0.9.0 || ^0.10.0 || ^0.11.0"
   },
   "devDependencies": {
-    "@nanostores/persistent": "^0.10.2",
     "@types/node": "^22.0.0",
     "astro": "^5.1.1",
     "nanostores": "^0.11.3",