@fluenti/solid 0.1.2 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluenti/solid",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
   "description": "SolidJS compile-time i18n — Trans/Plural/Select components, I18nProvider, useI18n",
   "homepage": "https://fluenti.dev",
@@ -43,6 +43,16 @@
         "types": "./dist/index.d.ts",
         "default": "./dist/index.cjs"
       }
+    },
+    "./vite-plugin": {
+      "import": {
+        "types": "./dist/vite-plugin.d.ts",
+        "default": "./dist/vite-plugin.js"
+      },
+      "require": {
+        "types": "./dist/vite-plugin.d.ts",
+        "default": "./dist/vite-plugin.cjs"
+      }
     }
   },
   "files": [
@@ -50,10 +60,17 @@
     "src"
   ],
   "peerDependencies": {
-    "solid-js": "^1.8"
+    "solid-js": "^1.8",
+    "vite": "^5 || ^6 || ^8"
+  },
+  "peerDependenciesMeta": {
+    "vite": {
+      "optional": true
+    }
   },
   "dependencies": {
-    "@fluenti/core": "0.1.2"
+    "@fluenti/core": "0.2.0",
+    "@fluenti/vite-plugin": "0.2.0"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8",

package/src/context.ts

@@ -223,6 +223,7 @@ export function createI18nContext(config: FluentConfig | I18nConfig): I18nContex
   }
 
   const loadMessages = (loc: Locale, msgs: Messages): void => {
+    // Intentional mutation: messages record is locally scoped to this context closure
     messages[loc] = { ...messages[loc], ...msgs }
     loadedLocalesSet.add(loc)
     setLoadedLocales(new Set(loadedLocalesSet))
@@ -247,6 +248,7 @@ export function createI18nContext(config: FluentConfig | I18nConfig): I18nContex
     setIsLoading(true)
     try {
       const loaded = resolveChunkMessages(await i18nConfig.chunkLoader(newLocale))
+      // Intentional mutation: messages record is locally scoped to this context closure
       messages[newLocale] = { ...messages[newLocale], ...loaded }
       loadedLocalesSet.add(newLocale)
       setLoadedLocales(new Set(loadedLocalesSet))
@@ -264,14 +266,15 @@ export function createI18nContext(config: FluentConfig | I18nConfig): I18nContex
     const splitRuntime = getSplitRuntimeModule()
     i18nConfig.chunkLoader(loc).then(async (loaded) => {
       const resolved = resolveChunkMessages(loaded)
+      // Intentional mutation: messages record is locally scoped to this context closure
       messages[loc] = { ...messages[loc], ...resolved }
       loadedLocalesSet.add(loc)
       setLoadedLocales(new Set(loadedLocalesSet))
       if (splitRuntime?.__preloadLocale) {
         await splitRuntime.__preloadLocale(loc)
       }
-    }).catch(() => {
-      // Silent failure for preload
+    }).catch((e: unknown) => {
+      console.warn('[fluenti] preload failed:', loc, e)
     })
   }
 
@@ -314,8 +317,6 @@ export function createI18n(config: FluentConfig | I18nConfig): I18nContext {
       '[fluenti] createI18n() detected SSR environment. ' +
       'Use <I18nProvider> for per-request isolation in SSR.',
     )
-    // Still set globalCtx as fallback, but document the risk
-    globalCtx = ctx
   }
 
   return ctx

package/src/server.ts

@@ -72,6 +72,13 @@ export interface ServerI18n {
  * your `resolveLocale` callback, or call `setLocale()` in your
  * entry-server middleware.
  *
+ * **⚠️ SSR Concurrency Warning**: This function uses module-level state for locale
+ * and cached instance. In concurrent SSR environments (e.g. multiple simultaneous
+ * requests), this can cause cross-request locale leakage. For per-request isolation:
+ * - Use `getRequestEvent()` in SolidStart to scope locale per request
+ * - Or create a separate `createServerI18n()` per request context
+ * - Consider using AsyncLocalStorage for true per-request isolation (future)
+ *
  * @example
  * ```ts
  * // lib/i18n.server.ts
@@ -90,6 +97,7 @@ export function createServerI18n(config: ServerI18nConfig): ServerI18n {
 
   function setLocale(locale: string): void {
     currentLocale = locale
+    cachedInstance = null
   }
 
   async function loadLocaleMessages(locale: string): Promise<Messages> {

package/src/solid-runtime.ts

@@ -0,0 +1,134 @@
+import { resolve } from 'node:path'
+import type { RuntimeGenerator, RuntimeGeneratorOptions } from '@fluenti/vite-plugin'
+
+export const solidRuntimeGenerator: RuntimeGenerator = {
+  generateRuntime(options: RuntimeGeneratorOptions): string {
+    const { catalogDir, locales, sourceLocale, defaultBuildLocale } = options
+    const defaultLocale = defaultBuildLocale || sourceLocale
+    const absoluteCatalogDir = resolve(process.cwd(), catalogDir)
+    const runtimeKey = 'fluenti.runtime.solid'
+    const lazyLocales = locales.filter((locale) => locale !== defaultLocale)
+
+    return `
+import { createSignal } from 'solid-js'
+import { createStore, reconcile } from 'solid-js/store'
+import __defaultMsgs from '${absoluteCatalogDir}/${defaultLocale}.js'
+
+const [__catalog, __setCatalog] = createStore({ ...__defaultMsgs })
+const [__currentLocale, __setCurrentLocale] = createSignal('${defaultLocale}')
+const __loadedLocales = new Set(['${defaultLocale}'])
+const [__loading, __setLoading] = createSignal(false)
+const __cache = new Map()
+const __normalizeMessages = (mod) => mod.default ?? mod
+
+const __loaders = {
+${lazyLocales.map((l) => `  '${l}': () => import('${absoluteCatalogDir}/${l}.js'),`).join('\n')}
+}
+
+async function __switchLocale(locale) {
+  if (__loadedLocales.has(locale)) {
+    __setCatalog(reconcile(__cache.get(locale) || __defaultMsgs))
+    __setCurrentLocale(locale)
+    return
+  }
+  __setLoading(true)
+  try {
+    const mod = __normalizeMessages(await __loaders[locale]())
+    __cache.set(locale, mod)
+    __loadedLocales.add(locale)
+    __setCatalog(reconcile(mod))
+    __setCurrentLocale(locale)
+  } finally {
+    __setLoading(false)
+  }
+}
+
+async function __preloadLocale(locale) {
+  if (__loadedLocales.has(locale) || !__loaders[locale]) return
+  try {
+    const mod = __normalizeMessages(await __loaders[locale]())
+    __cache.set(locale, mod)
+    __loadedLocales.add(locale)
+  } catch (e) { console.warn('[fluenti] preload failed:', locale, e) }
+}
+
+globalThis[Symbol.for('${runtimeKey}')] = { __switchLocale, __preloadLocale }
+
+export { __catalog, __switchLocale, __preloadLocale, __currentLocale, __loading, __loadedLocales }
+`
+  },
+
+  generateRouteRuntime(options: RuntimeGeneratorOptions): string {
+    const { catalogDir, locales, sourceLocale, defaultBuildLocale } = options
+    const defaultLocale = defaultBuildLocale || sourceLocale
+    const absoluteCatalogDir = resolve(process.cwd(), catalogDir)
+    const runtimeKey = 'fluenti.runtime.solid'
+    const lazyLocales = locales.filter((locale) => locale !== defaultLocale)
+
+    return `
+import { createSignal } from 'solid-js'
+import { createStore, reconcile } from 'solid-js/store'
+import __defaultMsgs from '${absoluteCatalogDir}/${defaultLocale}.js'
+
+const [__catalog, __setCatalog] = createStore({ ...__defaultMsgs })
+const [__currentLocale, __setCurrentLocale] = createSignal('${defaultLocale}')
+const __loadedLocales = new Set(['${defaultLocale}'])
+const [__loading, __setLoading] = createSignal(false)
+const __cache = new Map()
+const __loadedRoutes = new Set()
+const __normalizeMessages = (mod) => mod.default ?? mod
+
+const __loaders = {
+${lazyLocales.map((l) => `  '${l}': () => import('${absoluteCatalogDir}/${l}.js'),`).join('\n')}
+}
+
+const __routeLoaders = {}
+
+function __registerRouteLoader(routeId, locale, loader) {
+  const key = routeId + ':' + locale
+  __routeLoaders[key] = loader
+}
+
+async function __loadRoute(routeId, locale) {
+  const key = routeId + ':' + (locale || __currentLocale())
+  if (__loadedRoutes.has(key)) return
+  const loader = __routeLoaders[key]
+  if (!loader) return
+  const mod = __normalizeMessages(await loader())
+  __setCatalog(reconcile({ ...__catalog, ...mod }))
+  __loadedRoutes.add(key)
+}
+
+async function __switchLocale(locale) {
+  if (locale === __currentLocale()) return
+  __setLoading(true)
+  try {
+    if (__cache.has(locale)) {
+      __setCatalog(reconcile(__cache.get(locale)))
+    } else {
+      const mod = __normalizeMessages(await __loaders[locale]())
+      __cache.set(locale, mod)
+      __setCatalog(reconcile(mod))
+    }
+    __loadedLocales.add(locale)
+    __setCurrentLocale(locale)
+  } finally {
+    __setLoading(false)
+  }
+}
+
+async function __preloadLocale(locale) {
+  if (__cache.has(locale) || !__loaders[locale]) return
+  try {
+    const mod = __normalizeMessages(await __loaders[locale]())
+    __cache.set(locale, mod)
+    __loadedLocales.add(locale)
+  } catch (e) { console.warn('[fluenti] preload failed:', locale, e) }
+}
+
+globalThis[Symbol.for('${runtimeKey}')] = { __switchLocale, __preloadLocale }
+
+export { __catalog, __switchLocale, __preloadLocale, __loadRoute, __registerRouteLoader, __currentLocale, __loading, __loadedLocales }
+`
+  },
+}

package/src/vite-plugin.ts

@@ -0,0 +1,14 @@
+import type { Plugin } from 'vite'
+import type { FluentiPluginOptions } from '@fluenti/vite-plugin'
+import { createFluentiPlugins } from '@fluenti/vite-plugin'
+import { solidRuntimeGenerator } from './solid-runtime'
+
+export type { FluentiPluginOptions as FluentiSolidOptions } from '@fluenti/vite-plugin'
+
+export default function fluentiSolid(options?: FluentiPluginOptions): Plugin[] {
+  return createFluentiPlugins(
+    { ...options, framework: 'solid' },
+    [],
+    solidRuntimeGenerator,
+  )
+}