@zachhandley/ez-i18n 0.2.0 → 0.2.2

package/dist/index.js

@@ -435,6 +435,7 @@ export function t(key, params) {
 function generateDevTranslationsModule(translationInfo, projectRoot, pathBasedNamespacing) {
   const imports = [];
   const loaderEntries = [];
+  let needsPublicLoader = false;
   imports.push(getDeepMergeCode());
   if (pathBasedNamespacing) {
     imports.push(generateNamespaceWrapperCode());
@@ -443,24 +444,29 @@ function generateDevTranslationsModule(translationInfo, projectRoot, pathBasedNa
     if (info.files.length === 0) {
       loaderEntries.push(`  ${JSON.stringify(locale)}: async () => ({})`);
     } else if (info.isPublic) {
+      needsPublicLoader = true;
       if (pathBasedNamespacing && info.localeBaseDir) {
-        const localeBaseDirForNs = getLocaleBaseDirForNamespace(info.localeBaseDir, projectRoot);
         const fileEntries = info.files.map((f) => {
           const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, "/");
           const namespace = getNamespaceFromPath(f, info.localeBaseDir);
-          return `{ url: ${JSON.stringify(url)}, namespace: ${JSON.stringify(namespace)} }`;
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)}, namespace: ${JSON.stringify(namespace)} }`;
         });
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
     const fileInfos = [${fileEntries.join(", ")}];
-    const responses = await Promise.all(fileInfos.map(f => fetch(f.url).then(r => r.json())));
+    const responses = await Promise.all(fileInfos.map(f => __loadPublicJson(f.url, f.path)));
     const wrapped = responses.map((content, i) => __wrapWithNamespace(fileInfos[i].namespace, content));
     return __deepMerge({}, ...wrapped);
   }`);
       } else {
-        const urls = info.files.map((f) => toPublicUrl(f, projectRoot));
+        const fileEntries = info.files.map((f) => {
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, "/");
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)} }`;
+        });
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
-    const urls = ${JSON.stringify(urls)};
-    const responses = await Promise.all(urls.map(url => fetch(url).then(r => r.json())));
+    const files = [${fileEntries.join(", ")}];
+    const responses = await Promise.all(files.map(f => __loadPublicJson(f.url, f.path)));
     if (responses.length === 1) return responses[0];
     return __deepMerge({}, ...responses);
   }`);
@@ -531,6 +537,9 @@ function generateDevTranslationsModule(translationInfo, projectRoot, pathBasedNa
       }
     }
   }
+  if (needsPublicLoader) {
+    imports.push(getPublicLoaderCode());
+  }
   return `
 ${imports.join("\n")}
 
@@ -562,32 +571,42 @@ function generateBuildTranslationsModule(translationInfo, projectRoot, pathBased
   const loaderEntries = [];
   let needsDeepMerge = false;
   let needsNamespaceWrapper = false;
+  let needsPublicLoader = false;
   for (const [locale, info] of translationInfo) {
     if (info.files.length === 0) {
       loaderEntries.push(`  ${JSON.stringify(locale)}: async () => ({})`);
     } else if (info.isPublic) {
+      needsPublicLoader = true;
       needsDeepMerge = info.files.length > 1;
       if (pathBasedNamespacing && info.localeBaseDir) {
         needsNamespaceWrapper = true;
         const fileEntries = info.files.map((f) => {
           const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, "/");
           const namespace = getNamespaceFromPath(f, info.localeBaseDir);
-          return `{ url: ${JSON.stringify(url)}, namespace: ${JSON.stringify(namespace)} }`;
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)}, namespace: ${JSON.stringify(namespace)} }`;
         });
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
     const fileInfos = [${fileEntries.join(", ")}];
-    const responses = await Promise.all(fileInfos.map(f => fetch(f.url).then(r => r.json())));
+    const responses = await Promise.all(fileInfos.map(f => __loadPublicJson(f.url, f.path)));
     const wrapped = responses.map((content, i) => __wrapWithNamespace(fileInfos[i].namespace, content));
     return __deepMerge({}, ...wrapped);
   }`);
       } else {
-        const urls = info.files.map((f) => toPublicUrl(f, projectRoot));
-        if (urls.length === 1) {
-          loaderEntries.push(`  ${JSON.stringify(locale)}: () => fetch(${JSON.stringify(urls[0])}).then(r => r.json())`);
+        const fileEntries = info.files.map((f) => {
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, "/");
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)} }`;
+        });
+        if (fileEntries.length === 1) {
+          const f = info.files[0];
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, "/");
+          loaderEntries.push(`  ${JSON.stringify(locale)}: () => __loadPublicJson(${JSON.stringify(url)}, ${JSON.stringify(absolutePath)})`);
         } else {
           loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
-    const urls = ${JSON.stringify(urls)};
-    const responses = await Promise.all(urls.map(url => fetch(url).then(r => r.json())));
+    const files = [${fileEntries.join(", ")}];
+    const responses = await Promise.all(files.map(f => __loadPublicJson(f.url, f.path)));
     return __deepMerge({}, ...responses);
   }`);
         }
@@ -632,7 +651,8 @@ function generateBuildTranslationsModule(translationInfo, projectRoot, pathBased
   }
   const helperCode = [
     needsDeepMerge ? getDeepMergeCode() : "",
-    needsNamespaceWrapper ? generateNamespaceWrapperCode() : ""
+    needsNamespaceWrapper ? generateNamespaceWrapperCode() : "",
+    needsPublicLoader ? getPublicLoaderCode() : ""
   ].filter(Boolean).join("\n");
   return `
 ${helperCode}
@@ -676,6 +696,20 @@ function __deepMerge(target, ...sources) {
   return result;
 }`;
 }
+function getPublicLoaderCode() {
+  return `
+async function __loadPublicJson(url, absolutePath) {
+  if (typeof window !== 'undefined') {
+    // Browser - use fetch with relative URL
+    return fetch(url).then(r => r.json());
+  } else {
+    // SSR/Node - read from filesystem
+    const fs = await import('node:fs');
+    const content = fs.readFileSync(absolutePath, 'utf-8');
+    return JSON.parse(content);
+  }
+}`;
+}
 function resolveConfig(config) {
   const isAutoDiscovery = !config.translations || typeof config.translations === "string";
   return {

package/dist/runtime/react-plugin.d.ts

@@ -1,6 +1,5 @@
-import { setLocale } from './index.js';
+import { setLocale } from '@zachhandley/ez-i18n/runtime';
 import { T as TranslateFunction } from '../types-Cd9e7Lkc.js';
-import 'nanostores';
 
 /**
  * React hook for i18n

package/dist/runtime/react-plugin.js

@@ -1,49 +1,6 @@
 // src/runtime/react-plugin.ts
 import { useStore } from "@nanostores/react";
-
-// src/runtime/store.ts
-import { atom, computed } from "nanostores";
-import { persistentAtom } from "@nanostores/persistent";
-var serverLocale = atom(null);
-var localePreference = persistentAtom("ez-locale", "en", {
-  encode: (value) => value,
-  decode: (value) => value
-});
-var effectiveLocale = computed(
-  [serverLocale, localePreference],
-  (server, client) => server ?? client
-);
-var translations = atom({});
-var localeLoading = atom(false);
-async function setLocale(locale, options = {}) {
-  const opts = typeof options === "string" ? { cookieName: options } : options;
-  const { cookieName = "ez-locale", loadTranslations } = opts;
-  localeLoading.set(true);
-  try {
-    if (loadTranslations) {
-      const mod = await loadTranslations();
-      const trans = "default" in mod ? mod.default : mod;
-      translations.set(trans);
-    }
-    localePreference.set(locale);
-    serverLocale.set(locale);
-    if (typeof document !== "undefined") {
-      document.cookie = `${cookieName}=${locale}; path=/; max-age=31536000; samesite=lax`;
-    }
-    if (typeof document !== "undefined") {
-      document.dispatchEvent(
-        new CustomEvent("ez-i18n:locale-changed", {
-          detail: { locale },
-          bubbles: true
-        })
-      );
-    }
-  } finally {
-    localeLoading.set(false);
-  }
-}
-
-// src/runtime/react-plugin.ts
+import { effectiveLocale, translations, setLocale } from "@zachhandley/ez-i18n/runtime";
 function getNestedValue(obj, path) {
   const keys = path.split(".");
   let value = obj;

package/dist/runtime/vue-plugin.d.ts

@@ -1,8 +1,7 @@
 import * as vue from 'vue';
 import { Plugin } from 'vue';
-import { setLocale } from './index.js';
+import { setLocale } from '@zachhandley/ez-i18n/runtime';
 import { T as TranslateFunction } from '../types-Cd9e7Lkc.js';
-import 'nanostores';
 
 /**
  * Vue plugin that provides global $t(), $locale, and $setLocale

package/dist/runtime/vue-plugin.js

@@ -1,50 +1,7 @@
 // src/runtime/vue-plugin.ts
-import { computed as computed2 } from "vue";
+import { computed } from "vue";
 import { useStore } from "@nanostores/vue";
-
-// src/runtime/store.ts
-import { atom, computed } from "nanostores";
-import { persistentAtom } from "@nanostores/persistent";
-var serverLocale = atom(null);
-var localePreference = persistentAtom("ez-locale", "en", {
-  encode: (value) => value,
-  decode: (value) => value
-});
-var effectiveLocale = computed(
-  [serverLocale, localePreference],
-  (server, client) => server ?? client
-);
-var translations = atom({});
-var localeLoading = atom(false);
-async function setLocale(locale, options = {}) {
-  const opts = typeof options === "string" ? { cookieName: options } : options;
-  const { cookieName = "ez-locale", loadTranslations } = opts;
-  localeLoading.set(true);
-  try {
-    if (loadTranslations) {
-      const mod = await loadTranslations();
-      const trans = "default" in mod ? mod.default : mod;
-      translations.set(trans);
-    }
-    localePreference.set(locale);
-    serverLocale.set(locale);
-    if (typeof document !== "undefined") {
-      document.cookie = `${cookieName}=${locale}; path=/; max-age=31536000; samesite=lax`;
-    }
-    if (typeof document !== "undefined") {
-      document.dispatchEvent(
-        new CustomEvent("ez-i18n:locale-changed", {
-          detail: { locale },
-          bubbles: true
-        })
-      );
-    }
-  } finally {
-    localeLoading.set(false);
-  }
-}
-
-// src/runtime/vue-plugin.ts
+import { effectiveLocale, translations, setLocale } from "@zachhandley/ez-i18n/runtime";
 function getNestedValue(obj, path) {
   const keys = path.split(".");
   let value = obj;
@@ -79,7 +36,7 @@ var ezI18nVue = {
   install(app) {
     const locale = useStore(effectiveLocale);
     const trans = useStore(translations);
-    const transComputed = computed2(() => trans.value);
+    const transComputed = computed(() => trans.value);
     const t = createTranslateFunction(transComputed);
     app.config.globalProperties.$t = t;
     app.config.globalProperties.$locale = locale;
@@ -94,7 +51,7 @@ var ezI18nVue = {
 function useI18n() {
   const locale = useStore(effectiveLocale);
   const trans = useStore(translations);
-  const transComputed = computed2(() => trans.value);
+  const transComputed = computed(() => trans.value);
   const t = createTranslateFunction(transComputed);
   return {
     t,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachhandley/ez-i18n",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "publishConfig": {
     "access": "public"
   },

package/src/runtime/react-plugin.ts

@@ -1,5 +1,6 @@
 import { useStore } from '@nanostores/react';
-import { effectiveLocale, translations, setLocale } from './store';
+// Import from package path (not relative) to ensure shared store instance
+import { effectiveLocale, translations, setLocale } from '@zachhandley/ez-i18n/runtime';
 import type { TranslateFunction } from '../types';
 
 /**

package/src/runtime/vue-plugin.ts

@@ -1,7 +1,8 @@
 import type { App, Plugin, ComputedRef } from 'vue';
 import { computed } from 'vue';
 import { useStore } from '@nanostores/vue';
-import { effectiveLocale, translations, setLocale } from './store';
+// Import from package path (not relative) to ensure shared store instance
+import { effectiveLocale, translations, setLocale } from '@zachhandley/ez-i18n/runtime';
 import type { TranslateFunction } from '../types';
 
 /**

package/src/vite-plugin.ts

@@ -346,7 +346,7 @@ export function t(key, params) {
 /**
  * Generate the translations virtual module for dev mode.
  * Uses import.meta.glob where possible for HMR support.
- * Uses fetch() for files in public/ directory.
+ * Uses fetch() for files in public/ directory (with fs fallback for SSR).
  */
 function generateDevTranslationsModule(
   translationInfo: Map<string, TranslationInfo>,
@@ -355,6 +355,7 @@ function generateDevTranslationsModule(
 ): string {
   const imports: string[] = [];
   const loaderEntries: string[] = [];
+  let needsPublicLoader = false;
 
   // Add deepMerge inline for runtime merging
   imports.push(getDeepMergeCode());
@@ -369,26 +370,31 @@ function generateDevTranslationsModule(
       // No files - return empty object
       loaderEntries.push(`  ${JSON.stringify(locale)}: async () => ({})`);
     } else if (info.isPublic) {
-      // Public directory files - use fetch() instead of import
+      // Public directory files - use fetch in browser, fs in SSR
+      needsPublicLoader = true;
       if (pathBasedNamespacing && info.localeBaseDir) {
-        const localeBaseDirForNs = getLocaleBaseDirForNamespace(info.localeBaseDir, projectRoot);
         const fileEntries = info.files.map(f => {
           const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, '/');
           const namespace = getNamespaceFromPath(f, info.localeBaseDir!);
-          return `{ url: ${JSON.stringify(url)}, namespace: ${JSON.stringify(namespace)} }`;
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)}, namespace: ${JSON.stringify(namespace)} }`;
         });
 
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
     const fileInfos = [${fileEntries.join(', ')}];
-    const responses = await Promise.all(fileInfos.map(f => fetch(f.url).then(r => r.json())));
+    const responses = await Promise.all(fileInfos.map(f => __loadPublicJson(f.url, f.path)));
     const wrapped = responses.map((content, i) => __wrapWithNamespace(fileInfos[i].namespace, content));
     return __deepMerge({}, ...wrapped);
   }`);
       } else {
-        const urls = info.files.map(f => toPublicUrl(f, projectRoot));
+        const fileEntries = info.files.map(f => {
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, '/');
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)} }`;
+        });
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
-    const urls = ${JSON.stringify(urls)};
-    const responses = await Promise.all(urls.map(url => fetch(url).then(r => r.json())));
+    const files = [${fileEntries.join(', ')}];
+    const responses = await Promise.all(files.map(f => __loadPublicJson(f.url, f.path)));
     if (responses.length === 1) return responses[0];
     return __deepMerge({}, ...responses);
   }`);
@@ -470,6 +476,11 @@ function generateDevTranslationsModule(
     }
   }
 
+  // Add public loader helper if needed
+  if (needsPublicLoader) {
+    imports.push(getPublicLoaderCode());
+  }
+
   return `
 ${imports.join('\n')}
 
@@ -501,7 +512,7 @@ export async function loadTranslations(locale) {
 /**
  * Generate the translations virtual module for production builds.
  * Pre-resolves all imports for optimal bundling.
- * Uses fetch() for files in public/ directory.
+ * Uses fetch() for files in public/ directory (with fs fallback for SSR).
  */
 function generateBuildTranslationsModule(
   translationInfo: Map<string, TranslationInfo>,
@@ -511,35 +522,45 @@ function generateBuildTranslationsModule(
   const loaderEntries: string[] = [];
   let needsDeepMerge = false;
   let needsNamespaceWrapper = false;
+  let needsPublicLoader = false;
 
   for (const [locale, info] of translationInfo) {
     if (info.files.length === 0) {
       loaderEntries.push(`  ${JSON.stringify(locale)}: async () => ({})`);
     } else if (info.isPublic) {
-      // Public directory files - use fetch() instead of import
+      // Public directory files - use fetch in browser, fs in SSR
+      needsPublicLoader = true;
       needsDeepMerge = info.files.length > 1;
       if (pathBasedNamespacing && info.localeBaseDir) {
         needsNamespaceWrapper = true;
         const fileEntries = info.files.map(f => {
           const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, '/');
           const namespace = getNamespaceFromPath(f, info.localeBaseDir!);
-          return `{ url: ${JSON.stringify(url)}, namespace: ${JSON.stringify(namespace)} }`;
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)}, namespace: ${JSON.stringify(namespace)} }`;
         });
 
         loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
     const fileInfos = [${fileEntries.join(', ')}];
-    const responses = await Promise.all(fileInfos.map(f => fetch(f.url).then(r => r.json())));
+    const responses = await Promise.all(fileInfos.map(f => __loadPublicJson(f.url, f.path)));
     const wrapped = responses.map((content, i) => __wrapWithNamespace(fileInfos[i].namespace, content));
     return __deepMerge({}, ...wrapped);
   }`);
       } else {
-        const urls = info.files.map(f => toPublicUrl(f, projectRoot));
-        if (urls.length === 1) {
-          loaderEntries.push(`  ${JSON.stringify(locale)}: () => fetch(${JSON.stringify(urls[0])}).then(r => r.json())`);
+        const fileEntries = info.files.map(f => {
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, '/');
+          return `{ url: ${JSON.stringify(url)}, path: ${JSON.stringify(absolutePath)} }`;
+        });
+        if (fileEntries.length === 1) {
+          const f = info.files[0];
+          const url = toPublicUrl(f, projectRoot);
+          const absolutePath = f.replace(/\\/g, '/');
+          loaderEntries.push(`  ${JSON.stringify(locale)}: () => __loadPublicJson(${JSON.stringify(url)}, ${JSON.stringify(absolutePath)})`);
         } else {
           loaderEntries.push(`  ${JSON.stringify(locale)}: async () => {
-    const urls = ${JSON.stringify(urls)};
-    const responses = await Promise.all(urls.map(url => fetch(url).then(r => r.json())));
+    const files = [${fileEntries.join(', ')}];
+    const responses = await Promise.all(files.map(f => __loadPublicJson(f.url, f.path)));
     return __deepMerge({}, ...responses);
   }`);
         }
@@ -593,6 +614,7 @@ function generateBuildTranslationsModule(
   const helperCode = [
     needsDeepMerge ? getDeepMergeCode() : '',
     needsNamespaceWrapper ? generateNamespaceWrapperCode() : '',
+    needsPublicLoader ? getPublicLoaderCode() : '',
   ].filter(Boolean).join('\n');
 
   return `
@@ -642,6 +664,25 @@ function __deepMerge(target, ...sources) {
 }`;
 }
 
+/**
+ * Inline public JSON loader for the virtual module.
+ * Uses fetch in browser, fs.readFileSync in SSR/Node.
+ */
+function getPublicLoaderCode(): string {
+  return `
+async function __loadPublicJson(url, absolutePath) {
+  if (typeof window !== 'undefined') {
+    // Browser - use fetch with relative URL
+    return fetch(url).then(r => r.json());
+  } else {
+    // SSR/Node - read from filesystem
+    const fs = await import('node:fs');
+    const content = fs.readFileSync(absolutePath, 'utf-8');
+    return JSON.parse(content);
+  }
+}`;
+}
+
 // Re-export resolveConfig for backwards compatibility
 export function resolveConfig(config: EzI18nConfig): ResolvedEzI18nConfig {
   // This is now a simplified version - full resolution happens in buildStart