next-tongue 0.9.3 → 0.9.5

package/dist/client/dev-registry.js

@@ -12,13 +12,29 @@ function store() {
             escapes: new Map(),
             rendered: [],
             listeners: new Set(),
+            snapshot: null,
+            notifyScheduled: false,
         };
     }
     return g.__nextTongueDev;
 }
+/**
+ * Invalidate snapshot and notify subscribers **after** the current render.
+ * Synchronous notify from inside `t()` (render) caused
+ * "Cannot update DevOverlay while rendering Header".
+ */
 function notify() {
-    for (const l of store().listeners)
-        l();
+    const s = store();
+    s.snapshot = null;
+    if (s.notifyScheduled)
+        return;
+    s.notifyScheduled = true;
+    queueMicrotask(() => {
+        const st = store();
+        st.notifyScheduled = false;
+        for (const l of st.listeners)
+            l();
+    });
 }
 export function tongueDevLoaded(namespace, key) {
     const fullKey = namespace === '_root' || namespace === '' ? key : `${namespace}.${key}`;
@@ -74,13 +90,16 @@ export function subscribeTongueDev(listener) {
 }
 export function getTongueDevSnapshot() {
     const s = store();
-    return {
+    if (s.snapshot)
+        return s.snapshot;
+    s.snapshot = {
         loaded: [...s.loaded.values()],
         missing: [...s.missing.values()],
         fallbacks: [...s.fallbacks.values()],
         escapes: [...s.escapes.values()],
         rendered: [...s.rendered],
     };
+    return s.snapshot;
 }
 /** @internal test helper */
 export function __resetTongueDev() {

package/dist/client/index.js

@@ -68,8 +68,11 @@ export function useFormat() {
 export function useT(namespace) {
     const ns = (namespace ?? '_root');
     const { locale, loadNamespace } = useTongue();
+    // Literal `t('key')` is rewritten by the call-site loader to per-key imports;
+    // `useT()` itself must still be safe during SSR without loadNamespace.
+    // Invoking the returned `t` without a rewrite (dynamic/escaped) throws below.
     if (!loadNamespace) {
-        throw new TongueError('TONGUE_E_NO_PROVIDER', `useT('${String(ns)}') needs the call-site loader (or pass loadNamespace to TongueProvider). Prefer translating on the server with getT and passing strings.`);
+        return createLoaderStubT(locale, String(ns));
     }
     const messages = loadNamespace(ns);
     return createT({
@@ -78,6 +81,24 @@ export function useT(namespace) {
         loadNamespace,
     });
 }
+/**
+ * Stub used when the call-site loader owns message delivery. Calling the
+ * function (or .rich / .dynamic / .ns) means a key was not rewritten — usually
+ * a missing loader or a non-literal key without `t.dynamic({ from })`.
+ */
+function createLoaderStubT(locale, ns) {
+    const fail = () => {
+        throw new TongueError('TONGUE_E_NO_PROVIDER', `useT('${ns}') call was not rewritten to a per-key import. Ensure withTongue() is applied, or pass loadNamespace to TongueProvider. Prefer getT on the server for static copy; for dynamic keys use t.dynamic(key, { from: [...] }).`);
+    };
+    const t = Object.assign((..._args) => fail(), {
+        rich: fail,
+        has: () => false,
+        dynamic: fail,
+        ns: fail,
+    });
+    void locale;
+    return t;
+}
 export function getClientLocales() {
     return clientLocales;
 }

package/dist/compiler/scan-keys.d.ts

@@ -5,9 +5,20 @@ export type ReferencedKey = {
     file: string;
     line: number;
 };
+export type ScanResult = {
+    refs: ReferencedKey[];
+    /**
+     * Namespaces where `t(variable)` / `t.ns(...)` / `t.dynamic` was seen —
+     * unused-key warnings for these namespaces are suppressed.
+     */
+    dynamicNamespaces: Set<string>;
+};
 /**
  * Find `t('key')` / `t.rich('key')` under a known `useT`/`getT` namespace,
- * plus bare `useT('ns')` / `getT('ns')` for namespace awareness.
+ * plus `t.dynamic(..., { from })` declared keys and dynamic `t(var)` markers.
  */
 export declare function scanReferencedKeys(cwd: string, roots?: string[]): Promise<ReferencedKey[]>;
-export declare function extractFromSource(source: string, file: string): ReferencedKey[];
+export declare function scanKeys(cwd: string, roots?: string[]): Promise<ScanResult>;
+/** Strip // and /* *\/ comments; preserve newlines for line numbers. */
+export declare function stripComments(source: string): string;
+export declare function extractFromSource(source: string, file: string): ScanResult;

package/dist/compiler/scan-keys.js

@@ -12,9 +12,12 @@ const SKIP_DIRS = new Set([
 ]);
 /**
  * Find `t('key')` / `t.rich('key')` under a known `useT`/`getT` namespace,
- * plus bare `useT('ns')` / `getT('ns')` for namespace awareness.
+ * plus `t.dynamic(..., { from })` declared keys and dynamic `t(var)` markers.
  */
 export async function scanReferencedKeys(cwd, roots = ['app', 'src', 'components']) {
+    return (await scanKeys(cwd, roots)).refs;
+}
+export async function scanKeys(cwd, roots = ['app', 'src', 'components']) {
     const files = [];
     for (const root of roots) {
         const abs = join(cwd, root);
@@ -27,13 +30,17 @@ export async function scanReferencedKeys(cwd, roots = ['app', 'src', 'components
         }
         await walk(abs, files);
     }
-    const out = [];
+    const refs = [];
+    const dynamicNamespaces = new Set();
     for (const file of files) {
         const src = await readFile(file, 'utf8');
         const rel = relative(cwd, file);
-        out.push(...extractFromSource(src, rel));
+        const part = extractFromSource(src, rel);
+        refs.push(...part.refs);
+        for (const ns of part.dynamicNamespaces)
+            dynamicNamespaces.add(ns);
     }
-    return out;
+    return { refs, dynamicNamespaces };
 }
 async function walk(dir, out) {
     const entries = await readdir(dir, { withFileTypes: true });
@@ -55,32 +62,124 @@ function extname(name) {
     const i = name.lastIndexOf('.');
     return i === -1 ? '' : name.slice(i);
 }
+/** Strip // and /* *\/ comments; preserve newlines for line numbers. */
+export function stripComments(source) {
+    let out = '';
+    let i = 0;
+    while (i < source.length) {
+        const ch = source[i];
+        const next = source[i + 1];
+        // string / template — copy verbatim so // inside strings stay
+        if (ch === '"' || ch === "'" || ch === '`') {
+            const quote = ch;
+            out += ch;
+            i++;
+            while (i < source.length) {
+                const c = source[i];
+                out += c;
+                if (c === '\\' && i + 1 < source.length) {
+                    out += source[i + 1];
+                    i += 2;
+                    continue;
+                }
+                if (c === quote) {
+                    i++;
+                    break;
+                }
+                // template ${ } — shallow skip (good enough for comment strip)
+                if (quote === '`' && c === '$' && source[i + 1] === '{') {
+                    out += '{';
+                    i += 2;
+                    let depth = 1;
+                    while (i < source.length && depth > 0) {
+                        if (source[i] === '{')
+                            depth++;
+                        else if (source[i] === '}')
+                            depth--;
+                        out += source[i];
+                        i++;
+                    }
+                    continue;
+                }
+                i++;
+            }
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            while (i < source.length && source[i] !== '\n')
+                i++;
+            continue;
+        }
+        if (ch === '/' && next === '*') {
+            i += 2;
+            while (i < source.length && !(source[i] === '*' && source[i + 1] === '/')) {
+                out += source[i] === '\n' ? '\n' : ' ';
+                i++;
+            }
+            i += 2;
+            continue;
+        }
+        out += ch;
+        i++;
+    }
+    return out;
+}
 export function extractFromSource(source, file) {
+    const code = stripComments(source);
     const out = [];
+    const dynamicNamespaces = new Set();
     const translators = new Map(); // var → ns
     // useT('ns') | getT('ns') | getT(locale, 'ns')
     const declRe = /(?:const|let|var)\s+(\w+)\s*=\s*(?:await\s+)?(?:useT|getT)\s*\(\s*(?:[^'"\n,]+,\s*)?(['"])([^'"]*)\2\s*\)/g;
     let m;
-    while ((m = declRe.exec(source)) !== null) {
+    while ((m = declRe.exec(code)) !== null) {
         translators.set(m[1], m[3] || '_root');
     }
+    const push = (ns, key, index) => {
+        const fullKey = ns === '_root' || ns === '' ? key : `${ns}.${key}`;
+        out.push({
+            fullKey,
+            namespace: ns || '_root',
+            key,
+            file,
+            line: lineAt(code, index),
+        });
+    };
     for (const [varName, ns] of translators) {
+        // Literal t('key') / t.rich('key')
         const callRe = new RegExp(`\\b${escapeRegExp(varName)}(?:\\.rich)?\\s*\\(\\s*(['"])([^'"]+)\\1`, 'g');
         let cm;
-        while ((cm = callRe.exec(source)) !== null) {
-            const key = cm[2];
-            const fullKey = ns === '_root' || ns === '' ? key : `${ns}.${key}`;
-            const line = lineAt(source, cm.index);
-            out.push({
-                fullKey,
-                namespace: ns || '_root',
-                key,
-                file,
-                line,
-            });
+        while ((cm = callRe.exec(code)) !== null) {
+            push(ns, cm[2], cm.index);
+        }
+        // t.dynamic(any, { from: ['a', 'b'] }) — only `from` keys become refs
+        const dynRe = new RegExp(`\\b${escapeRegExp(varName)}\\.dynamic\\s*\\(`, 'g');
+        let dm;
+        while ((dm = dynRe.exec(code)) !== null) {
+            const tail = code.slice(dm.index, dm.index + 400);
+            const fromMatch = /from\s*:\s*\[([^\]]*)\]/.exec(tail);
+            if (fromMatch) {
+                const keys = fromMatch[1].match(/['"]([^'"]+)['"]/g) ?? [];
+                for (const raw of keys) {
+                    push(ns, raw.slice(1, -1), dm.index);
+                }
+            }
+            dynamicNamespaces.add(ns || '_root');
+        }
+        // t.ns('other') — whole namespace marked dynamic
+        const nsRe = new RegExp(`\\b${escapeRegExp(varName)}\\.ns\\s*\\(\\s*(['"])([^'"]+)\\1`, 'g');
+        let nm;
+        while ((nm = nsRe.exec(code)) !== null) {
+            dynamicNamespaces.add(nm[2] || '_root');
+        }
+        // Non-literal t(var) — suppress unused for the namespace only.
+        // Do NOT harvest unrelated string arrays (cache tags, sort keys, …).
+        const nonLitRe = new RegExp(`\\b${escapeRegExp(varName)}(?:\\.rich)?\\s*\\(\\s*(?!['"])([A-Za-z_$][\\w$]*)`, 'g');
+        if (nonLitRe.test(code)) {
+            dynamicNamespaces.add(ns || '_root');
         }
     }
-    return out;
+    return { refs: out, dynamicNamespaces };
 }
 function lineAt(source, index) {
     let line = 1;

package/dist/compiler/validate/usage.js

@@ -1,5 +1,5 @@
 import { loadLocaleMessages } from '../load-messages.js';
-import { scanReferencedKeys } from '../scan-keys.js';
+import { scanKeys } from '../scan-keys.js';
 function severityFor(level, alwaysError = false) {
     if (alwaysError)
         return 'error';
@@ -7,6 +7,10 @@ function severityFor(level, alwaysError = false) {
         return null;
     return level === 'error' ? 'error' : 'warn';
 }
+function namespaceOf(fullKey) {
+    const i = fullKey.indexOf('.');
+    return i === -1 ? '_root' : fullKey.slice(0, i);
+}
 /** unused + undefined checks against scanned source references. */
 export async function validateUsage(config, cwd) {
     const issues = [];
@@ -20,7 +24,7 @@ export async function validateUsage(config, cwd) {
             defined.add(ns === '_root' ? key : `${ns}.${key}`);
         }
     }
-    const refs = await scanReferencedKeys(cwd);
+    const { refs, dynamicNamespaces } = await scanKeys(cwd);
     const used = new Set();
     for (const ref of refs) {
         used.add(ref.fullKey);
@@ -40,6 +44,9 @@ export async function validateUsage(config, cwd) {
         for (const fullKey of defined) {
             if (used.has(fullKey))
                 continue;
+            // Dynamic t(var) / t.ns / t.dynamic — do not false-flag catalog keys as unused
+            if (dynamicNamespaces.has(namespaceOf(fullKey)))
+                continue;
             issues.push({
                 check: 'unused',
                 severity: unusedSev,

package/dist/next/with-tongue.js

@@ -32,9 +32,11 @@ export function withTongue(nextConfig = {}, options = {}) {
     }
     // Next 16: content must be RegExp; omit `as` when returning the same module type
     // (using `as: '*.tsx'` previously doubled extensions → `file.tsx.tsx`).
+    // Do NOT gate on `browser` — client components still SSR, and useT must be
+    // rewritten on the server graph too (otherwise SSR throws without loadNamespace).
     const tongueLoaderRule = {
         condition: {
-            all: [{ not: 'foreign' }, 'browser', { content: /useT\s*\(/ }],
+            all: [{ not: 'foreign' }, { content: /useT\s*\(/ }],
         },
         loaders: [
             {
@@ -65,18 +67,17 @@ export function withTongue(nextConfig = {}, options = {}) {
             ...(config.resolve.alias ?? {}),
             '#tongue': outDir,
         };
-        if (!ctx.isServer) {
-            config.module ??= {};
-            config.module.rules = [
-                ...(config.module.rules ?? []),
-                {
-                    test: /\.[jt]sx?$/,
-                    exclude: /node_modules/,
-                    enforce: 'pre',
-                    use: [{ loader: loaderPath, options: { outDir: '.tongue' } }],
-                },
-            ];
-        }
+        // Client components SSR under webpack too — apply on both graphs.
+        config.module ??= {};
+        config.module.rules = [
+            ...(config.module.rules ?? []),
+            {
+                test: /\.[jt]sx?$/,
+                exclude: /node_modules/,
+                enforce: 'pre',
+                use: [{ loader: loaderPath, options: { outDir: '.tongue' } }],
+            },
+        ];
         return userWebpack ? userWebpack(config, ctx) : config;
     };
     const enableRootParams = peekRootParamsFlag(cwd, options.config);

package/package.json

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