next-tongue 0.9.10 → 0.9.11

package/dist/next/loader.js

@@ -67,13 +67,25 @@ export function transformCallSites(source, resourcePath, _options = {}) {
         importLines.push(`import { ${safeExport(key)} as ${ident} } from '${path}';`);
         loadedCalls.push(`process.env.NODE_ENV !== 'production' && globalThis.__tongueDevLoaded?.(${JSON.stringify(ns || '_root')}, ${JSON.stringify(key)});`);
     }
-    const localeVar = '__tongue_locale';
-    // Inject locale once after the first useT declaration
-    code = code.replace(/((?:const|let|var)\s+\w+\s*=\s*useT\s*\([^)]*\))/, `$1\n  const ${localeVar} = useLocale();`);
+    // Inject locale after every useT — one binding per translator var so each
+    // component (and multi-useT in one function) has __tongue_locale_* in scope.
+    for (const varName of translators.keys()) {
+        if (escapes(withoutDirs, varName))
+            continue;
+        const localeVar = localeVarFor(varName);
+        const declRe = new RegExp(`((?:const|let|var)\\s+${escapeRegExp(varName)}\\s*=\\s*useT\\s*\\([^)]*\\))`, 'g');
+        code = code.replace(declRe, (full) => {
+            // Idempotent if a prior pass already injected.
+            if (full.includes(localeVar))
+                return full;
+            return `${full}\n  const ${localeVar} = useLocale();`;
+        });
+    }
     // Replace t.dynamic(expr, { from }, values?) — rewrite from the end so indices stay valid
     for (const [varName, ns] of translators) {
         if (escapes(withoutDirs, varName))
             continue;
+        const localeVar = localeVarFor(varName);
         const calls = findDynamicCalls(code, varName).filter((c) => c.keys && c.keys.length > 0);
         for (let ci = calls.length - 1; ci >= 0; ci--) {
             const call = calls[ci];
@@ -96,6 +108,7 @@ export function transformCallSites(source, resourcePath, _options = {}) {
     for (const [varName, ns] of translators) {
         if (escapes(withoutDirs, varName))
             continue;
+        const localeVar = localeVarFor(varName);
         for (const { key, ident } of [...imports.values()].filter((i) => i.ns === ns)) {
             const richRe = new RegExp(`\\b${escapeRegExp(varName)}\\.rich\\s*\\(\\s*(['"])${escapeRegExp(key)}\\1\\s*(,\\s*([^)]*))?\\)`, 'g');
             code = code.replace(richRe, (_full, _q, _rest, values) => {
@@ -178,6 +191,10 @@ function escapes(source, varName) {
 function escapeRegExp(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
+/** Per-useT locale binding so each component function has its own in-scope var. */
+function localeVarFor(varName) {
+    return varName === 't' ? '__tongue_locale' : `__tongue_locale_${varName}`;
+}
 function safeImportIdent(ns, key) {
     return `__tongue_${(ns + '_' + key).replace(/[^A-Za-z0-9_]/g, '_')}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-tongue",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "Compiler-first, type-safe i18n for the Next.js 16 App Router",
   "license": "MIT",
   "type": "module",