next-tongue 0.9.13 → 0.9.14

package/dist/cli/index.js

@@ -32,6 +32,7 @@ export async function runCli(argv) {
             prefix: { type: 'string' },
             export: { type: 'boolean', default: false },
             force: { type: 'boolean', default: false },
+            proxy: { type: 'string' },
             format: { type: 'string' },
             out: { type: 'string' },
             'missing-only': { type: 'boolean', default: false },
@@ -116,11 +117,26 @@ export async function runCli(argv) {
                     process.exitCode = 2;
                     break;
                 }
+                const proxyRaw = typeof values.proxy === 'string' ? values.proxy : undefined;
+                const proxyMode = proxyRaw === 'merge' ||
+                    proxyRaw === 'skip' ||
+                    proxyRaw === 'overwrite'
+                    ? proxyRaw
+                    : undefined;
+                if (proxyRaw != null &&
+                    proxyRaw !== 'merge' &&
+                    proxyRaw !== 'skip' &&
+                    proxyRaw !== 'overwrite') {
+                    console.error(`Invalid --proxy ${JSON.stringify(proxyRaw)} (expected merge|skip|overwrite)`);
+                    process.exitCode = 2;
+                    break;
+                }
                 await cmdInit({
                     ...(typeof values.cwd === 'string' ? { cwd: values.cwd } : {}),
                     ...(typeof values.locales === 'string' ? { locales: values.locales } : {}),
                     ...(typeof values.default === 'string' ? { default: values.default } : {}),
                     ...(prefix ? { prefix } : {}),
+                    ...(proxyMode ? { proxyMode } : {}),
                     export: values.export === true,
                     yes: values.yes === true,
                     force: values.force === true,
@@ -270,7 +286,7 @@ Usage:
   tongue build [--cwd <dir>] [--config <path>] [--json] [--quiet]
   tongue check [--cwd <dir>] [--config <path>] [--locale de] [--reporter pretty|json|github] [--max-warnings N]
   tongue extract [--include app,src] [--placeholder ''] [--prune] [--yes] [--dry-run]
-  tongue init [--locales en,de] [--default en] [--prefix as-needed] [--export] [--yes] [--force] [--dry-run]
+  tongue init [--locales en,de] [--default en] [--prefix as-needed] [--proxy merge|skip|overwrite] [--export] [--yes] [--force] [--dry-run]
   tongue export --format xliff|csv [--locale de] [--out ./translations] [--missing-only]
   tongue import <file.xlf|file.csv> [--dry-run]
   tongue report [--json] [--max-bytes 4kb]

package/dist/cli/init.d.ts

@@ -1,8 +1,11 @@
+export type ProxyMode = 'merge' | 'skip' | 'overwrite';
 export type InitCliOptions = {
     cwd?: string;
     locales?: string;
     default?: string;
     prefix?: 'always' | 'as-needed' | 'never';
+    /** How to treat an existing proxy.ts / middleware.ts. Default: skip. */
+    proxyMode?: ProxyMode;
     export?: boolean;
     yes?: boolean;
     force?: boolean;
@@ -12,8 +15,10 @@ export type InitCliOptions = {
 export declare function cmdInit(opts: InitCliOptions): Promise<void>;
 /** Prefer src/app when present; otherwise app/. */
 export declare function detectAppRoot(cwd: string): Promise<'app' | 'src/app'>;
+/** Where to write a new proxy.ts when none exists. */
+export declare function detectProxyWritePath(appRoot: 'app' | 'src/app'): string;
 /**
  * Where to write proxy.ts. Returns null when the project already has proxy/middleware
- * (caller should compose manually).
+ * (caller should compose or pass `--proxy merge|overwrite`).
  */
 export declare function detectProxyPath(cwd: string, appRoot: 'app' | 'src/app'): Promise<string | null>;

package/dist/cli/init.js

@@ -1,6 +1,7 @@
 import { access, mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, join, relative } from 'node:path';
 import * as readline from 'node:readline';
+import { findExistingProxyPath, mergeProxySource, PROXY_CANDIDATES, } from './merge-proxy.js';
 import { resolveInsideProject } from './safe-path.js';
 export async function cmdInit(opts) {
     const cwd = opts.cwd ?? process.cwd();
@@ -36,7 +37,7 @@ export async function cmdInit(opts) {
         console.log(`tongue init: using ${appRoot}/ for App Router files`);
     }
     const hasRootLayout = await hasFile(cwd, `${appRoot}/layout.tsx`, `${appRoot}/layout.ts`, `${appRoot}/layout.jsx`, `${appRoot}/layout.js`);
-    const proxyPath = await detectProxyPath(cwd, appRoot);
+    const existingProxy = await findExistingProxyPath(cwd, (rel) => exists(join(cwd, rel)));
     const plans = [];
     plans.push({
         path: 'tongue.config.ts',
@@ -64,16 +65,55 @@ export default defineConfig({
             content: `${JSON.stringify(sample, null, 2)}\n`,
         });
     }
-    if (proxyPath) {
+    let proxyMode = opts.proxyMode ?? 'skip';
+    if (existingProxy && opts.proxyMode == null && interactive) {
+        const answer = await ask(`Existing ${existingProxy} — merge|skip|overwrite [skip]: `, 'skip');
+        if (answer === 'merge' || answer === 'skip' || answer === 'overwrite') {
+            proxyMode = answer;
+        }
+    }
+    const scaffold = proxyScaffold(locales, defaultLocale, prefix);
+    if (!existingProxy) {
         plans.push({
-            path: proxyPath,
+            path: detectProxyWritePath(appRoot),
             kind: 'create',
-            content: proxyScaffold(locales, defaultLocale, prefix),
+            content: scaffold,
+        });
+    }
+    else if (proxyMode === 'overwrite') {
+        plans.push({
+            path: existingProxy,
+            kind: 'merge',
+            content: scaffold,
         });
     }
+    else if (proxyMode === 'merge') {
+        const abs = join(cwd, existingProxy);
+        const src = await readFile(abs, 'utf8');
+        const merged = mergeProxySource(src, {
+            locales,
+            defaultLocale,
+            prefix,
+        });
+        if (merged.status === 'merged') {
+            plans.push({
+                path: existingProxy,
+                kind: 'merge',
+                content: merged.code,
+            });
+            if (!opts.quiet && merged.note) {
+                console.log(`tongue init: ${merged.note}`);
+            }
+        }
+        else if (!opts.quiet) {
+            console.log(`tongue init: could not merge ${existingProxy} (${merged.reason}). Compose like:\n\n` +
+                scaffold +
+                '\nSee docs/routing-and-proxy.md#composing-with-your-own-proxy-logic.');
+        }
+    }
     else if (!opts.quiet) {
-        console.log('tongue init: existing proxy/middleware detected — do not overwrite. Compose like:\n\n' +
-            proxyScaffold(locales, defaultLocale, prefix) +
+        console.log(`tongue init: existing ${existingProxy} — skipped (pass --proxy merge to wire createProxy, or --proxy overwrite). Compose like:\n\n` +
+            scaffold +
             '\nSee docs/routing-and-proxy.md#composing-with-your-own-proxy-logic / hybrid routing.');
     }
     const layoutPath = `${appRoot}/[locale]/layout.tsx`;
@@ -311,26 +351,20 @@ export async function detectAppRoot(cwd) {
         return 'src/app';
     return 'app';
 }
+/** Where to write a new proxy.ts when none exists. */
+export function detectProxyWritePath(appRoot) {
+    return appRoot.startsWith('src/') ? 'src/proxy.ts' : 'proxy.ts';
+}
 /**
  * Where to write proxy.ts. Returns null when the project already has proxy/middleware
- * (caller should compose manually).
+ * (caller should compose or pass `--proxy merge|overwrite`).
  */
 export async function detectProxyPath(cwd, appRoot) {
-    const existing = [
-        'proxy.ts',
-        'proxy.js',
-        'src/proxy.ts',
-        'src/proxy.js',
-        'middleware.ts',
-        'middleware.js',
-        'src/middleware.ts',
-        'src/middleware.js',
-    ];
-    for (const p of existing) {
+    for (const p of PROXY_CANDIDATES) {
         if (await exists(join(cwd, p)))
             return null;
     }
-    return appRoot.startsWith('src/') ? 'src/proxy.ts' : 'proxy.ts';
+    return detectProxyWritePath(appRoot);
 }
 function wrapNextConfig(src, staticExport) {
     let out = src;

package/dist/cli/merge-proxy.d.ts

@@ -0,0 +1,27 @@
+export type MergeProxyOptions = {
+    locales: readonly string[];
+    defaultLocale: string;
+    prefix: string;
+};
+export type MergeProxyResult = {
+    status: 'unchanged';
+    reason: string;
+    code: string;
+} | {
+    status: 'merged';
+    code: string;
+    note?: string;
+};
+/**
+ * Merge `createProxy({ locales, defaultLocale, prefix })` into an existing
+ * proxy.ts / middleware.ts without wiping user logic.
+ *
+ * - Adds the import + `const tongue = createProxy(...)`.
+ * - Replaces bare `return NextResponse.next()` with `return tongue(<req>)`
+ *   using the handler's first parameter name.
+ * - If already using `createProxy`, leaves the file alone.
+ */
+export declare function mergeProxySource(source: string, opts: MergeProxyOptions): MergeProxyResult;
+export declare const PROXY_CANDIDATES: readonly ["proxy.ts", "proxy.js", "src/proxy.ts", "src/proxy.js", "middleware.ts", "middleware.js", "src/middleware.ts", "src/middleware.js"];
+/** Relative path of an existing proxy/middleware file, or null. */
+export declare function findExistingProxyPath(cwd: string, exists: (rel: string) => Promise<boolean>): Promise<string | null>;

package/dist/cli/merge-proxy.js

@@ -0,0 +1,145 @@
+const CREATE_PROXY_IMPORT = /import\s*\{([^}]*)\}\s*from\s*['"]next-tongue\/proxy['"]/;
+/**
+ * Merge `createProxy({ locales, defaultLocale, prefix })` into an existing
+ * proxy.ts / middleware.ts without wiping user logic.
+ *
+ * - Adds the import + `const tongue = createProxy(...)`.
+ * - Replaces bare `return NextResponse.next()` with `return tongue(<req>)`
+ *   using the handler's first parameter name.
+ * - If already using `createProxy`, leaves the file alone.
+ */
+export function mergeProxySource(source, opts) {
+    if (/\bcreateProxy\s*\(/.test(source)) {
+        return {
+            status: 'unchanged',
+            reason: 'createProxy already present',
+            code: source,
+        };
+    }
+    let code = source.replace(/^\uFEFF/, '');
+    const reqIdent = detectRequestIdent(code) ?? 'req';
+    const tongueIdent = /\btongue\b/.test(code) ? '__tongueProxy' : 'tongue';
+    code = ensureCreateProxyImport(code);
+    code = insertTongueConst(code, tongueIdent, opts);
+    // Only the *last* NextResponse.next() — early returns for /api etc. stay passthrough.
+    const replaced = replaceLastNextReturn(code, tongueIdent, reqIdent);
+    if (replaced) {
+        return {
+            status: 'merged',
+            code: ensureTrailingNewline(replaced),
+            note: `Replaced final NextResponse.next() with ${tongueIdent}(${reqIdent}). Early next() returns (allow-lists) are kept.`,
+        };
+    }
+    // No next() — wrap exported handler so user logic runs first, then tongue.
+    const wrapped = wrapExportedHandler(code, tongueIdent, reqIdent);
+    if (wrapped) {
+        return {
+            status: 'merged',
+            code: ensureTrailingNewline(wrapped),
+            note: `Wrapped existing handler: user Response wins unless it is a passthrough next; otherwise ${tongueIdent} runs.`,
+        };
+    }
+    return {
+        status: 'unchanged',
+        reason: 'could not find NextResponse.next() or an exportable proxy/middleware handler to wrap',
+        code: source,
+    };
+}
+function ensureTrailingNewline(s) {
+    return s.endsWith('\n') ? s : `${s}\n`;
+}
+function ensureCreateProxyImport(code) {
+    if (CREATE_PROXY_IMPORT.test(code)) {
+        return code.replace(CREATE_PROXY_IMPORT, (full, specs) => {
+            if (/\bcreateProxy\b/.test(specs))
+                return full;
+            const parts = specs
+                .split(',')
+                .map((s) => s.trim())
+                .filter(Boolean);
+            parts.push('createProxy');
+            return full.replace(specs, ` ${parts.join(', ')} `);
+        });
+    }
+    const importBlock = `import { createProxy } from 'next-tongue/proxy';\n`;
+    // After last import, or at top
+    const lastImport = [...code.matchAll(/^import\s.+;?\s*$/gm)].pop();
+    if (lastImport && lastImport.index != null) {
+        const end = lastImport.index + lastImport[0].length;
+        return code.slice(0, end) + '\n' + importBlock + code.slice(end);
+    }
+    return importBlock + code;
+}
+function insertTongueConst(code, tongueIdent, opts) {
+    if (new RegExp(`\\b(?:const|let|var)\\s+${tongueIdent}\\s*=`).test(code)) {
+        return code;
+    }
+    const decl = `const ${tongueIdent} = createProxy({\n` +
+        `  locales: ${JSON.stringify([...opts.locales])},\n` +
+        `  defaultLocale: ${JSON.stringify(opts.defaultLocale)},\n` +
+        `  prefix: ${JSON.stringify(opts.prefix)},\n` +
+        `});\n`;
+    // Prefer after imports / 'use …' directives
+    const lastImport = [...code.matchAll(/^import\s.+;?\s*$/gm)].pop();
+    if (lastImport && lastImport.index != null) {
+        const end = lastImport.index + lastImport[0].length;
+        return code.slice(0, end) + '\n\n' + decl + code.slice(end);
+    }
+    return decl + '\n' + code;
+}
+function replaceLastNextReturn(code, tongueIdent, reqIdent) {
+    const re = /\breturn\s+NextResponse\.next\s*\(\s*\)\s*;?/g;
+    let last = null;
+    let m;
+    while ((m = re.exec(code)) !== null)
+        last = m;
+    if (!last)
+        return null;
+    return (code.slice(0, last.index) +
+        `return ${tongueIdent}(${reqIdent});` +
+        code.slice(last.index + last[0].length));
+}
+function detectRequestIdent(code) {
+    const m = /export\s+(?:async\s+)?function\s+(?:proxy|middleware)\s*\(\s*([A-Za-z_$][\w$]*)/.exec(code) ??
+        /export\s+const\s+(?:proxy|middleware)\s*=\s*(?:async\s*)?\(\s*([A-Za-z_$][\w$]*)/.exec(code);
+    return m?.[1] ?? null;
+}
+/**
+ * Rename `export function proxy/middleware` → internal, add wrapper that
+ * prefers a non-passthrough user Response then falls back to tongue.
+ */
+function wrapExportedHandler(code, tongueIdent, reqIdent) {
+    const fnRe = /export\s+(async\s+)?function\s+(proxy|middleware)\s*\(/;
+    const m = fnRe.exec(code);
+    if (!m || m.index == null)
+        return null;
+    const asyncKw = m[1] ?? '';
+    const name = m[2];
+    const inner = `__tongue_user_${name}`;
+    let out = code.slice(0, m.index) + `${asyncKw}function ${inner}(` + code.slice(m.index + m[0].length);
+    out +=
+        `\n\nexport ${asyncKw}function ${name}(${reqIdent}: Parameters<typeof ${inner}>[0]) {\n` +
+            `  const __user = ${asyncKw ? 'await ' : ''}${inner}(${reqIdent});\n` +
+            `  if (__user && __user.headers?.get?.('x-middleware-next') !== '1') return __user;\n` +
+            `  return ${tongueIdent}(${reqIdent});\n` +
+            `}\n`;
+    return out;
+}
+export const PROXY_CANDIDATES = [
+    'proxy.ts',
+    'proxy.js',
+    'src/proxy.ts',
+    'src/proxy.js',
+    'middleware.ts',
+    'middleware.js',
+    'src/middleware.ts',
+    'src/middleware.js',
+];
+/** Relative path of an existing proxy/middleware file, or null. */
+export async function findExistingProxyPath(cwd, exists) {
+    for (const p of PROXY_CANDIDATES) {
+        if (await exists(p))
+            return p;
+    }
+    return null;
+}

package/package.json

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