i18next-cli 1.41.0 → 1.41.2

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.41.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.41.2'); // 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/extractor/core/translation-manager.js

@@ -8,6 +8,7 @@ var defaultValue = require('../../utils/default-value.js');
 
 // used for natural language check
 const chars = [' ', ',', '?', '!', ';'];
+const pluralForms = ['zero', 'one', 'two', 'few', 'many', 'other'];
 /**
  * Converts a glob pattern to a regular expression for matching keys
  * @param glob - The glob pattern to convert
@@ -37,7 +38,6 @@ function isContextVariantOfAcceptingKey(existingKey, keysAcceptingContext, plura
     // Try to extract the base key from this existing key by removing context and/or plural suffixes
     let potentialBaseKey = existingKey;
     // First, try removing plural suffixes if present
-    const pluralForms = ['zero', 'one', 'two', 'few', 'many', 'other'];
     for (const form of pluralForms) {
         if (potentialBaseKey.endsWith(`${pluralSeparator}${form}`)) {
             potentialBaseKey = potentialBaseKey.slice(0, -(pluralSeparator.length + form.length));
@@ -97,8 +97,7 @@ function sortObject(obj, config, customSort) {
     const sortedObj = {};
     const pluralSeparator = config?.extract?.pluralSeparator ?? '_';
     // Define the canonical order for plural forms
-    const pluralOrder = ['zero', 'one', 'two', 'few', 'many', 'other'];
-    const ordinalPluralOrder = pluralOrder.map(form => `ordinal${pluralSeparator}${form}`);
+    const ordinalPluralOrder = pluralForms.map(form => `ordinal${pluralSeparator}${form}`);
     const keys = Object.keys(obj).sort((a, b) => {
         // Helper function to extract base key and form info
         const getKeyInfo = (key) => {
@@ -110,7 +109,7 @@ function sortObject(obj, config, customSort) {
                 }
             }
             // Handle cardinal plurals: key_form or key_context_form
-            for (const form of pluralOrder) {
+            for (const form of pluralForms) {
                 if (key.endsWith(`${pluralSeparator}${form}`)) {
                     const base = key.slice(0, -(pluralSeparator.length + form.length));
                     return { base, form, isOrdinal: false, isPlural: true, fullKey: key };
@@ -135,7 +134,7 @@ function sortObject(obj, config, customSort) {
                 return aInfo.isOrdinal ? 1 : -1;
             }
             // Both same type (cardinal or ordinal), sort by canonical order
-            const orderArray = aInfo.isOrdinal ? ordinalPluralOrder : pluralOrder;
+            const orderArray = aInfo.isOrdinal ? ordinalPluralOrder : pluralForms;
             const aIndex = orderArray.indexOf(aInfo.form);
             const bIndex = orderArray.indexOf(bInfo.form);
             if (aIndex !== -1 && bIndex !== -1) {
@@ -366,6 +365,49 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             nestedObject.setNestedValue(newTranslations, existingKey, value, keySeparator ?? '.');
         }
     }
+    // PRESERVE LOCALE-SPECIFIC PLURAL FORMS: When dealing with plural keys in non-primary locales,
+    // preserve any existing plural forms that are NOT being explicitly generated.
+    // This ensures that locale-specific forms (like _few, _many) added by translators are preserved.
+    if (locale !== primaryLanguage && removeUnusedKeys) {
+        const existingKeys = nestedObject.getNestedKeys(existingTranslations, keySeparator ?? '.');
+        for (const existingKey of existingKeys) {
+            // Check if this is a plural form variant (ends with _form)
+            let isPluralForm = false;
+            let baseKey = existingKey;
+            let foundForm = '';
+            for (const form of pluralForms) {
+                if (existingKey.endsWith(`${pluralSeparator}${form}`)) {
+                    baseKey = existingKey.slice(0, -(pluralSeparator.length + form.length));
+                    foundForm = form;
+                    isPluralForm = true;
+                    break;
+                }
+            }
+            if (isPluralForm && foundForm) {
+                // Check if the base key is in our filtered keys (meaning it's a plural key we're handling)
+                const isBaseInExtracted = filteredKeys.some(({ key }) => {
+                    let extractedBase = key;
+                    for (const form of pluralForms) {
+                        if (extractedBase.endsWith(`${pluralSeparator}${form}`)) {
+                            extractedBase = extractedBase.slice(0, -(pluralSeparator.length + form.length));
+                            break;
+                        }
+                    }
+                    return extractedBase === baseKey;
+                });
+                if (isBaseInExtracted) {
+                    // This is a plural form for a key we're handling.
+                    // Check if it's already in newTranslations (will be set by the normal flow)
+                    const isAlreadySet = nestedObject.getNestedValue(newTranslations, existingKey, keySeparator ?? '.') !== undefined;
+                    if (!isAlreadySet) {
+                        // This plural form is NOT being generated by our code, so preserve it
+                        const value = nestedObject.getNestedValue(existingTranslations, existingKey, keySeparator ?? '.');
+                        nestedObject.setNestedValue(newTranslations, existingKey, value, keySeparator ?? '.');
+                    }
+                }
+            }
+        }
+    }
     // SPECIAL HANDLING: Preserve existing _zero forms even if not in extracted keys
     // This ensures that optional _zero forms are not removed when they exist
     if (removeUnusedKeys) {

package/dist/cjs/extractor/parsers/call-expression-handler.js

@@ -202,20 +202,29 @@ class CallExpressionHandler {
             if (!ns)
                 ns = this.config.extract.defaultNS;
             let finalKey = key;
+            let keyPrefix;
+            // Check for keyPrefix in call options before falling back to scope
+            if (options) {
+                const kpVal = astUtils.getObjectPropValue(options, 'keyPrefix');
+                if (typeof kpVal === 'string')
+                    keyPrefix = kpVal;
+            }
+            // Fall back to scope keyPrefix if not overridden in options
+            keyPrefix ||= scopeInfo?.keyPrefix;
             // Apply keyPrefix AFTER namespace extraction
-            if (scopeInfo?.keyPrefix) {
+            if (keyPrefix) {
                 const keySeparator = this.config.extract.keySeparator ?? '.';
                 // Apply keyPrefix - handle case where keyPrefix already ends with separator
                 if (keySeparator !== false) {
-                    if (scopeInfo.keyPrefix.endsWith(keySeparator)) {
-                        finalKey = `${scopeInfo.keyPrefix}${key}`;
+                    if (keyPrefix.endsWith(keySeparator)) {
+                        finalKey = `${keyPrefix}${key}`;
                     }
                     else {
-                        finalKey = `${scopeInfo.keyPrefix}${keySeparator}${key}`;
+                        finalKey = `${keyPrefix}${keySeparator}${key}`;
                     }
                 }
                 else {
-                    finalKey = `${scopeInfo.keyPrefix}${key}`;
+                    finalKey = `${keyPrefix}${key}`;
                 }
                 // Validate keyPrefix combinations that create problematic keys
                 if (keySeparator !== false) {
@@ -223,7 +232,7 @@ class CallExpressionHandler {
                     const segments = finalKey.split(keySeparator);
                     const hasEmptySegment = segments.some(segment => segment.trim() === '');
                     if (hasEmptySegment) {
-                        this.logger.warn(`Skipping key with empty segments: '${finalKey}' (keyPrefix: '${scopeInfo.keyPrefix}', key: '${key}')`);
+                        this.logger.warn(`Skipping key with empty segments: '${finalKey}' (keyPrefix: '${keyPrefix}', key: '${key}')`);
                         continue;
                     }
                 }

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.41.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.41.2'); // 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/extractor/core/translation-manager.js

@@ -6,6 +6,7 @@ import { resolveDefaultValue } from '../../utils/default-value.js';
 
 // used for natural language check
 const chars = [' ', ',', '?', '!', ';'];
+const pluralForms = ['zero', 'one', 'two', 'few', 'many', 'other'];
 /**
  * Converts a glob pattern to a regular expression for matching keys
  * @param glob - The glob pattern to convert
@@ -35,7 +36,6 @@ function isContextVariantOfAcceptingKey(existingKey, keysAcceptingContext, plura
     // Try to extract the base key from this existing key by removing context and/or plural suffixes
     let potentialBaseKey = existingKey;
     // First, try removing plural suffixes if present
-    const pluralForms = ['zero', 'one', 'two', 'few', 'many', 'other'];
     for (const form of pluralForms) {
         if (potentialBaseKey.endsWith(`${pluralSeparator}${form}`)) {
             potentialBaseKey = potentialBaseKey.slice(0, -(pluralSeparator.length + form.length));
@@ -95,8 +95,7 @@ function sortObject(obj, config, customSort) {
     const sortedObj = {};
     const pluralSeparator = config?.extract?.pluralSeparator ?? '_';
     // Define the canonical order for plural forms
-    const pluralOrder = ['zero', 'one', 'two', 'few', 'many', 'other'];
-    const ordinalPluralOrder = pluralOrder.map(form => `ordinal${pluralSeparator}${form}`);
+    const ordinalPluralOrder = pluralForms.map(form => `ordinal${pluralSeparator}${form}`);
     const keys = Object.keys(obj).sort((a, b) => {
         // Helper function to extract base key and form info
         const getKeyInfo = (key) => {
@@ -108,7 +107,7 @@ function sortObject(obj, config, customSort) {
                 }
             }
             // Handle cardinal plurals: key_form or key_context_form
-            for (const form of pluralOrder) {
+            for (const form of pluralForms) {
                 if (key.endsWith(`${pluralSeparator}${form}`)) {
                     const base = key.slice(0, -(pluralSeparator.length + form.length));
                     return { base, form, isOrdinal: false, isPlural: true, fullKey: key };
@@ -133,7 +132,7 @@ function sortObject(obj, config, customSort) {
                 return aInfo.isOrdinal ? 1 : -1;
             }
             // Both same type (cardinal or ordinal), sort by canonical order
-            const orderArray = aInfo.isOrdinal ? ordinalPluralOrder : pluralOrder;
+            const orderArray = aInfo.isOrdinal ? ordinalPluralOrder : pluralForms;
             const aIndex = orderArray.indexOf(aInfo.form);
             const bIndex = orderArray.indexOf(bInfo.form);
             if (aIndex !== -1 && bIndex !== -1) {
@@ -364,6 +363,49 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             setNestedValue(newTranslations, existingKey, value, keySeparator ?? '.');
         }
     }
+    // PRESERVE LOCALE-SPECIFIC PLURAL FORMS: When dealing with plural keys in non-primary locales,
+    // preserve any existing plural forms that are NOT being explicitly generated.
+    // This ensures that locale-specific forms (like _few, _many) added by translators are preserved.
+    if (locale !== primaryLanguage && removeUnusedKeys) {
+        const existingKeys = getNestedKeys(existingTranslations, keySeparator ?? '.');
+        for (const existingKey of existingKeys) {
+            // Check if this is a plural form variant (ends with _form)
+            let isPluralForm = false;
+            let baseKey = existingKey;
+            let foundForm = '';
+            for (const form of pluralForms) {
+                if (existingKey.endsWith(`${pluralSeparator}${form}`)) {
+                    baseKey = existingKey.slice(0, -(pluralSeparator.length + form.length));
+                    foundForm = form;
+                    isPluralForm = true;
+                    break;
+                }
+            }
+            if (isPluralForm && foundForm) {
+                // Check if the base key is in our filtered keys (meaning it's a plural key we're handling)
+                const isBaseInExtracted = filteredKeys.some(({ key }) => {
+                    let extractedBase = key;
+                    for (const form of pluralForms) {
+                        if (extractedBase.endsWith(`${pluralSeparator}${form}`)) {
+                            extractedBase = extractedBase.slice(0, -(pluralSeparator.length + form.length));
+                            break;
+                        }
+                    }
+                    return extractedBase === baseKey;
+                });
+                if (isBaseInExtracted) {
+                    // This is a plural form for a key we're handling.
+                    // Check if it's already in newTranslations (will be set by the normal flow)
+                    const isAlreadySet = getNestedValue(newTranslations, existingKey, keySeparator ?? '.') !== undefined;
+                    if (!isAlreadySet) {
+                        // This plural form is NOT being generated by our code, so preserve it
+                        const value = getNestedValue(existingTranslations, existingKey, keySeparator ?? '.');
+                        setNestedValue(newTranslations, existingKey, value, keySeparator ?? '.');
+                    }
+                }
+            }
+        }
+    }
     // SPECIAL HANDLING: Preserve existing _zero forms even if not in extracted keys
     // This ensures that optional _zero forms are not removed when they exist
     if (removeUnusedKeys) {

package/dist/esm/extractor/parsers/call-expression-handler.js

@@ -200,20 +200,29 @@ class CallExpressionHandler {
             if (!ns)
                 ns = this.config.extract.defaultNS;
             let finalKey = key;
+            let keyPrefix;
+            // Check for keyPrefix in call options before falling back to scope
+            if (options) {
+                const kpVal = getObjectPropValue(options, 'keyPrefix');
+                if (typeof kpVal === 'string')
+                    keyPrefix = kpVal;
+            }
+            // Fall back to scope keyPrefix if not overridden in options
+            keyPrefix ||= scopeInfo?.keyPrefix;
             // Apply keyPrefix AFTER namespace extraction
-            if (scopeInfo?.keyPrefix) {
+            if (keyPrefix) {
                 const keySeparator = this.config.extract.keySeparator ?? '.';
                 // Apply keyPrefix - handle case where keyPrefix already ends with separator
                 if (keySeparator !== false) {
-                    if (scopeInfo.keyPrefix.endsWith(keySeparator)) {
-                        finalKey = `${scopeInfo.keyPrefix}${key}`;
+                    if (keyPrefix.endsWith(keySeparator)) {
+                        finalKey = `${keyPrefix}${key}`;
                     }
                     else {
-                        finalKey = `${scopeInfo.keyPrefix}${keySeparator}${key}`;
+                        finalKey = `${keyPrefix}${keySeparator}${key}`;
                     }
                 }
                 else {
-                    finalKey = `${scopeInfo.keyPrefix}${key}`;
+                    finalKey = `${keyPrefix}${key}`;
                 }
                 // Validate keyPrefix combinations that create problematic keys
                 if (keySeparator !== false) {
@@ -221,7 +230,7 @@ class CallExpressionHandler {
                     const segments = finalKey.split(keySeparator);
                     const hasEmptySegment = segments.some(segment => segment.trim() === '');
                     if (hasEmptySegment) {
-                        this.logger.warn(`Skipping key with empty segments: '${finalKey}' (keyPrefix: '${scopeInfo.keyPrefix}', key: '${key}')`);
+                        this.logger.warn(`Skipping key with empty segments: '${finalKey}' (keyPrefix: '${keyPrefix}', key: '${key}')`);
                         continue;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.41.0",
+  "version": "1.41.2",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {
@@ -55,8 +55,8 @@
     "@rollup/plugin-replace": "6.0.3",
     "@rollup/plugin-terser": "0.4.4",
     "@types/inquirer": "9.0.9",
-    "@types/node": "25.0.10",
-    "@types/react": "19.2.9",
+    "@types/node": "25.2.0",
+    "@types/react": "19.2.10",
     "@vitest/coverage-v8": "4.0.18",
     "eslint": "9.39.2",
     "eslint-plugin-import": "2.32.0",
@@ -70,20 +70,20 @@
   },
   "dependencies": {
     "@croct/json5-parser": "0.2.2",
-    "@swc/core": "1.15.10",
+    "@swc/core": "1.15.11",
     "chalk": "5.6.2",
     "chokidar": "5.0.0",
-    "commander": "14.0.2",
+    "commander": "14.0.3",
     "execa": "9.6.1",
     "glob": "13.0.0",
     "i18next-resources-for-ts": "2.0.0",
-    "inquirer": "13.2.1",
+    "inquirer": "13.2.2",
     "jiti": "2.6.1",
     "jsonc-parser": "3.3.1",
     "minimatch": "10.1.1",
     "ora": "9.1.0",
-    "react": "^19.2.3",
-    "react-i18next": "^16.5.3",
+    "react": "^19.2.4",
+    "react-i18next": "^16.5.4",
     "swc-walk": "1.0.1"
   }
 }

package/types/extractor/core/translation-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA0rBnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EAChB,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAA;CACb,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA0I9B"}
+{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA2uBnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EAChB,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAA;CACb,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA0I9B"}

package/types/extractor/parsers/call-expression-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-expression-handler.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/call-expression-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,WAAW,CAAA;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAgB,SAAS,EAAE,MAAM,aAAa,CAAA;AACvG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAM1D,qBAAa,qBAAqB;IAChC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,kBAAkB,CAAoB;IACvC,UAAU,cAAoB;IACrC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,eAAe,CAAY;gBAGjC,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,MAAM,MAAM,EAC5B,cAAc,EAAE,MAAM,MAAM;IAU9B;;;OAGG;IACI,gBAAgB,IAAK,IAAI;IAIhC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4C3B;;;;;;;;;;;;;;OAcG;IACH,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GAAG,IAAI;IAuXxG;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,oBAAoB;IA6E5B,OAAO,CAAC,wBAAwB;IAyEhC;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,sBAAsB;IA2C9B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IA6LxB;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CA2BxB"}
+{"version":3,"file":"call-expression-handler.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/call-expression-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,WAAW,CAAA;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAgB,SAAS,EAAE,MAAM,aAAa,CAAA;AACvG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAM1D,qBAAa,qBAAqB;IAChC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,kBAAkB,CAAoB;IACvC,UAAU,cAAoB;IACrC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,eAAe,CAAY;gBAGjC,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,MAAM,MAAM,EAC5B,cAAc,EAAE,MAAM,MAAM;IAU9B;;;OAGG;IACI,gBAAgB,IAAK,IAAI;IAIhC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4C3B;;;;;;;;;;;;;;OAcG;IACH,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GAAG,IAAI;IAgYxG;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,oBAAoB;IA6E5B,OAAO,CAAC,wBAAwB;IAyEhC;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,sBAAsB;IA2C9B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IA6LxB;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CA2BxB"}