i18next-cli 1.39.7 → 1.39.9

package/dist/cjs/cli.js

@@ -28,7 +28,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.39.7'); // This string is replaced with the actual version at build time by rollup
+    .version('1.39.9'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/cjs/rename-key.js

@@ -56,13 +56,21 @@ async function runRenameKey(config, oldKey, newKey, options = {}, logger$1 = new
     // Check for conflicts in translation files
     const conflicts = await checkConflicts(newParts, config);
     if (conflicts.length > 0) {
-        return {
-            success: false,
-            sourceFiles: [],
-            translationFiles: [],
-            conflicts,
-            error: 'Target key already exists in translation files'
-        };
+        // If the old key doesn't exist in any translation file, treat this as a
+        // no-op (allow the command to succeed). This mirrors previous behavior
+        // where renaming a missing key doesn't fail just because the target
+        // already exists (it avoids blocking repeated/no-op renames).
+        const oldExists = await checkOldKeyExists(parseKeyWithNamespace(oldKey, config), config);
+        if (oldExists) {
+            return {
+                success: false,
+                sourceFiles: [],
+                translationFiles: [],
+                conflicts,
+                error: 'Target key already exists in translation files'
+            };
+        }
+        // otherwise: old key not present -> continue (no-op)
     }
     // Build a quick map of which namespaces contain which keys (union across locales).
     // This allows us to decide, per-call, whether an explicit `{ ns: 'x' }` refers to
@@ -155,6 +163,25 @@ async function checkConflicts(newParts, config) {
     }
     return conflicts;
 }
+async function checkOldKeyExists(oldParts, config) {
+    const keySeparator = config.extract.keySeparator ?? '.';
+    for (const locale of config.locales) {
+        const outputPath = fileUtils.getOutputPath(config.extract.output, locale, oldParts.namespace);
+        const fullPath = node_path.resolve(process.cwd(), outputPath);
+        try {
+            const translations = await fileUtils.loadTranslationFile(fullPath);
+            if (translations) {
+                const val = nestedObject.getNestedValue(translations, oldParts.key, keySeparator);
+                if (val !== undefined)
+                    return true;
+            }
+        }
+        catch {
+            // file missing — continue to next locale
+        }
+    }
+    return false;
+}
 async function buildNamespaceKeyMap(config) {
     // Map namespace -> set of flattened keys present in that namespace (union across locales)
     const map = new Map();
@@ -323,7 +350,34 @@ function replaceKeyWithRegex(code, oldParts, newParts, config, namespaceKeyMap)
             });
         }
         //
-        // 3) fullKey (explicitly namespaced string in call): only when user supplied a namespaced target
+        // 3a) Replace occurrences where the call uses an explicitly namespaced string
+        //     literal like t('ns:key') while the CLI rename was invoked with the
+        //     key without namespace (oldKey='key'). Example: defaultNS = 'ns1',
+        //     source contains t('ns1:key'), and user called runRenameKey('key', 'key2').
+        //     We should update 'ns1:key' -> 'ns1:key2' or to a new namespace if the
+        //     target includes an explicit namespace.
+        //
+        // Only update explicit "ns:oldKey" string literals when the key name itself
+        // is changing. If only the namespace is changing but the key name stays
+        // identical (e.g. `key` -> `ns2:key`) we should NOT rewrite explicit
+        // `t('ns1:key')` occurrences — keep their explicit namespace intact.
+        if (oldParts.namespace && newParts.key !== oldParts.key) {
+            // ensure ns separator is a string for regex building (default ':')
+            const nsSepStr = nsSeparator === false ? ':' : String(nsSeparator);
+            const prefixed = `${escapeRegex(String(oldParts.namespace))}${escapeRegex(nsSepStr)}${escapeRegex(oldParts.key)}`;
+            const regexPrefixed = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${prefixed}\\1`, 'g');
+            newCode = newCode.replace(regexPrefixed, (match) => {
+                changes++;
+                // determine replacement: if newParts is explicitly namespaced, use fullKey;
+                // otherwise keep the original namespace but swap the key.
+                const replacement = newParts.explicitNamespace
+                    ? newParts.fullKey
+                    : `${oldParts.namespace}${nsSepStr}${newParts.key}`;
+                return match.replace(`${oldParts.namespace}${nsSepStr}${oldParts.key}`, replacement);
+            });
+        }
+        //
+        // 3b) fullKey (explicitly namespaced string in call): only when user supplied a namespaced target
         //
         if (oldParts.fullKey && oldParts.explicitNamespace) {
             const regexFull = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.fullKey)}\\1`, 'g');
@@ -371,14 +425,22 @@ function replaceKeyWithRegex(code, oldParts, newParts, config, namespaceKeyMap)
         }
         //
         // 6) Bare calls without options: fn('key') -> fn('newKey')
+        //    Apply this replacement only when the old key's namespace is the
+        //    *effective* default namespace (config.extract.defaultNS ?? 'translation').
+        //    This preserves previous behaviour: default-namespace bare-calls are
+        //    considered "key form" and should be rewritten even when the translation
+        //    file exists but the specific key isn't present.
         //
         {
-            const regexKeyNoOptions = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.key)}\\1\\s*\\)`, 'g');
-            newCode = newCode.replace(regexKeyNoOptions, (match, q) => {
-                changes++;
-                const replacementKey = newParts.key;
-                return match.replace(new RegExp(`(['"\`])${escapeRegex(oldParts.key)}\\1`), `${q}${replacementKey}${q}`);
-            });
+            const effectiveDefaultNS = config.extract.defaultNS ?? 'translation';
+            if (oldParts.namespace === effectiveDefaultNS) {
+                const regexKeyNoOptions = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.key)}\\1\\s*\\)`, 'g');
+                newCode = newCode.replace(regexKeyNoOptions, (match, q) => {
+                    changes++;
+                    const replacementKey = newParts.key;
+                    return match.replace(new RegExp(`(['"\`])${escapeRegex(oldParts.key)}\\1`), `${q}${replacementKey}${q}`);
+                });
+            }
         }
         //
         // 7) JSX i18nKey attribute (handles both fullKey and key)

package/dist/esm/cli.js

@@ -26,7 +26,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.39.7'); // This string is replaced with the actual version at build time by rollup
+    .version('1.39.9'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/esm/rename-key.js

@@ -54,13 +54,21 @@ async function runRenameKey(config, oldKey, newKey, options = {}, logger = new C
     // Check for conflicts in translation files
     const conflicts = await checkConflicts(newParts, config);
     if (conflicts.length > 0) {
-        return {
-            success: false,
-            sourceFiles: [],
-            translationFiles: [],
-            conflicts,
-            error: 'Target key already exists in translation files'
-        };
+        // If the old key doesn't exist in any translation file, treat this as a
+        // no-op (allow the command to succeed). This mirrors previous behavior
+        // where renaming a missing key doesn't fail just because the target
+        // already exists (it avoids blocking repeated/no-op renames).
+        const oldExists = await checkOldKeyExists(parseKeyWithNamespace(oldKey, config), config);
+        if (oldExists) {
+            return {
+                success: false,
+                sourceFiles: [],
+                translationFiles: [],
+                conflicts,
+                error: 'Target key already exists in translation files'
+            };
+        }
+        // otherwise: old key not present -> continue (no-op)
     }
     // Build a quick map of which namespaces contain which keys (union across locales).
     // This allows us to decide, per-call, whether an explicit `{ ns: 'x' }` refers to
@@ -153,6 +161,25 @@ async function checkConflicts(newParts, config) {
     }
     return conflicts;
 }
+async function checkOldKeyExists(oldParts, config) {
+    const keySeparator = config.extract.keySeparator ?? '.';
+    for (const locale of config.locales) {
+        const outputPath = getOutputPath(config.extract.output, locale, oldParts.namespace);
+        const fullPath = resolve(process.cwd(), outputPath);
+        try {
+            const translations = await loadTranslationFile(fullPath);
+            if (translations) {
+                const val = getNestedValue(translations, oldParts.key, keySeparator);
+                if (val !== undefined)
+                    return true;
+            }
+        }
+        catch {
+            // file missing — continue to next locale
+        }
+    }
+    return false;
+}
 async function buildNamespaceKeyMap(config) {
     // Map namespace -> set of flattened keys present in that namespace (union across locales)
     const map = new Map();
@@ -321,7 +348,34 @@ function replaceKeyWithRegex(code, oldParts, newParts, config, namespaceKeyMap)
             });
         }
         //
-        // 3) fullKey (explicitly namespaced string in call): only when user supplied a namespaced target
+        // 3a) Replace occurrences where the call uses an explicitly namespaced string
+        //     literal like t('ns:key') while the CLI rename was invoked with the
+        //     key without namespace (oldKey='key'). Example: defaultNS = 'ns1',
+        //     source contains t('ns1:key'), and user called runRenameKey('key', 'key2').
+        //     We should update 'ns1:key' -> 'ns1:key2' or to a new namespace if the
+        //     target includes an explicit namespace.
+        //
+        // Only update explicit "ns:oldKey" string literals when the key name itself
+        // is changing. If only the namespace is changing but the key name stays
+        // identical (e.g. `key` -> `ns2:key`) we should NOT rewrite explicit
+        // `t('ns1:key')` occurrences — keep their explicit namespace intact.
+        if (oldParts.namespace && newParts.key !== oldParts.key) {
+            // ensure ns separator is a string for regex building (default ':')
+            const nsSepStr = nsSeparator === false ? ':' : String(nsSeparator);
+            const prefixed = `${escapeRegex(String(oldParts.namespace))}${escapeRegex(nsSepStr)}${escapeRegex(oldParts.key)}`;
+            const regexPrefixed = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${prefixed}\\1`, 'g');
+            newCode = newCode.replace(regexPrefixed, (match) => {
+                changes++;
+                // determine replacement: if newParts is explicitly namespaced, use fullKey;
+                // otherwise keep the original namespace but swap the key.
+                const replacement = newParts.explicitNamespace
+                    ? newParts.fullKey
+                    : `${oldParts.namespace}${nsSepStr}${newParts.key}`;
+                return match.replace(`${oldParts.namespace}${nsSepStr}${oldParts.key}`, replacement);
+            });
+        }
+        //
+        // 3b) fullKey (explicitly namespaced string in call): only when user supplied a namespaced target
         //
         if (oldParts.fullKey && oldParts.explicitNamespace) {
             const regexFull = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.fullKey)}\\1`, 'g');
@@ -369,14 +423,22 @@ function replaceKeyWithRegex(code, oldParts, newParts, config, namespaceKeyMap)
         }
         //
         // 6) Bare calls without options: fn('key') -> fn('newKey')
+        //    Apply this replacement only when the old key's namespace is the
+        //    *effective* default namespace (config.extract.defaultNS ?? 'translation').
+        //    This preserves previous behaviour: default-namespace bare-calls are
+        //    considered "key form" and should be rewritten even when the translation
+        //    file exists but the specific key isn't present.
         //
         {
-            const regexKeyNoOptions = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.key)}\\1\\s*\\)`, 'g');
-            newCode = newCode.replace(regexKeyNoOptions, (match, q) => {
-                changes++;
-                const replacementKey = newParts.key;
-                return match.replace(new RegExp(`(['"\`])${escapeRegex(oldParts.key)}\\1`), `${q}${replacementKey}${q}`);
-            });
+            const effectiveDefaultNS = config.extract.defaultNS ?? 'translation';
+            if (oldParts.namespace === effectiveDefaultNS) {
+                const regexKeyNoOptions = new RegExp(`${prefix}\\s*\\(\\s*(['"\`])${escapeRegex(oldParts.key)}\\1\\s*\\)`, 'g');
+                newCode = newCode.replace(regexKeyNoOptions, (match, q) => {
+                    changes++;
+                    const replacementKey = newParts.key;
+                    return match.replace(new RegExp(`(['"\`])${escapeRegex(oldParts.key)}\\1`), `${q}${replacementKey}${q}`);
+                });
+            }
         }
         //
         // 7) JSX i18nKey attribute (handles both fullKey and key)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.39.7",
+  "version": "1.39.9",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {

package/types/rename-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rename-key.d.ts","sourceRoot":"","sources":["../src/rename-key.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAA;CACZ,EACN,MAAM,GAAE,MAA4B,GACnC,OAAO,CAAC,eAAe,CAAC,CA6D1B"}
+{"version":3,"file":"rename-key.d.ts","sourceRoot":"","sources":["../src/rename-key.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,OAAO,CAAA;CACZ,EACN,MAAM,GAAE,MAA4B,GACnC,OAAO,CAAC,eAAe,CAAC,CAqE1B"}