i18next-cli 1.41.1 → 1.41.3

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.1'); // This string is replaced with the actual version at build time by rollup
+    .version('1.41.3'); // 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) {
@@ -218,16 +217,14 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
         }
     }
-    // Get the plural categories for the target language
+    // Get the plural categories for the target language (only used for filtering extracted keys)
     const targetLanguagePluralCategories = new Set();
     // Track cardinal plural categories separately so we can special-case single-"other" languages
     let cardinalCategories = [];
-    let ordinalCategories = [];
     try {
         const cardinalRules = new Intl.PluralRules(locale, { type: 'cardinal' });
         const ordinalRules = new Intl.PluralRules(locale, { type: 'ordinal' });
         cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
-        ordinalCategories = ordinalRules.resolvedOptions().pluralCategories;
         cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
         ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
     }
@@ -237,7 +234,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         const cardinalRules = new Intl.PluralRules(fallbackLang, { type: 'cardinal' });
         const ordinalRules = new Intl.PluralRules(fallbackLang, { type: 'ordinal' });
         cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
-        ordinalCategories = ordinalRules.resolvedOptions().pluralCategories;
         cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
         ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
     }
@@ -366,6 +362,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) {
@@ -408,49 +447,104 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                 continue;
             }
         }
-        // If this is a base plural key (no explicit suffix) and the locale is NOT the primary,
-        // expand it into locale-specific plural variants (e.g. key_one, key_other).
-        // Use the extracted defaultValue (fallback to base) for variant values.
+        // If this is a base plural key (no explicit suffix), expand it into locale-specific plural variants.
+        // For non-primary locales, we generate forms for that specific locale from CLDR.
+        // Additionally, we generate empty placeholders for ALL other CLDR forms not in the target locale
+        // (so translators can add them manually if needed).
         if (hasCount && !isExpandedPlural) {
             const parts = String(key).split(pluralSeparator);
             const isBaseKey = parts.length === 1;
-            if (isBaseKey && locale !== primaryLanguage) {
+            if (isBaseKey) {
                 // If explicit expanded variants exist, do not expand the base.
                 const base = key;
                 if (expandedBases.has(base)) ;
                 else {
-                    // choose categories based on ordinal flag
-                    const categories = isOrdinal ? ordinalCategories : cardinalCategories;
-                    for (const category of categories) {
-                        const finalKey = isOrdinal
-                            ? `${base}${pluralSeparator}ordinal${pluralSeparator}${category}`
-                            : `${base}${pluralSeparator}${category}`;
-                        // If the key looks like a serialized Trans component (starts with <), treat it as a flat key
-                        // to prevent splitting on dots that appear within the content.
-                        const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
-                        // Preserve existing translation if present; otherwise set a sensible default
-                        const existingVariantValue = nestedObject.getNestedValue(existingTranslations, finalKey, separator);
-                        if (existingVariantValue === undefined) {
-                            // Prefer explicit defaultValue extracted for this key; fall back to configured defaultValue
-                            // (resolved via resolveDefaultValue which handles functions or strings and accepts the full parameter set).
-                            let resolvedValue;
-                            if (typeof defaultValue$1 === 'string') {
-                                resolvedValue = defaultValue$1;
+                    // Determine which plural forms to generate
+                    let formsToGenerate;
+                    if (locale !== primaryLanguage) {
+                        // For non-primary locales:
+                        // 1. Generate the forms that locale actually needs
+                        formsToGenerate = cardinalCategories;
+                        // 2. Also prepare empty placeholders for all OTHER CLDR forms not in this locale
+                        //    so translators can add them manually without --sync-primary removing them
+                        const otherForms = pluralForms.filter(f => !cardinalCategories.includes(f));
+                        // Process the locale-specific forms normally
+                        for (const form of formsToGenerate) {
+                            const finalKey = isOrdinal
+                                ? `${base}${pluralSeparator}${form}`
+                                : `${base}${pluralSeparator}${form}`;
+                            const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                            const existingVariantValue = nestedObject.getNestedValue(existingTranslations, finalKey, separator);
+                            if (existingVariantValue === undefined) {
+                                // Use the default value for secondary locale forms
+                                let resolvedValue;
+                                if (typeof defaultValue$1 === 'string') {
+                                    resolvedValue = defaultValue$1;
+                                }
+                                else {
+                                    resolvedValue = defaultValue.resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue$1);
+                                }
+                                nestedObject.setNestedValue(newTranslations, finalKey, resolvedValue, separator);
                             }
                             else {
-                                // Use resolveDefaultValue to compute a sensible default, providing namespace and locale context.
-                                resolvedValue = defaultValue.resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue$1);
+                                nestedObject.setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
                             }
-                            nestedObject.setNestedValue(newTranslations, finalKey, resolvedValue, separator);
+                        }
+                        // Now process other CLDR forms: set empty placeholders for forms this locale doesn't use
+                        // but preserve any that were manually added by translators
+                        for (const form of otherForms) {
+                            const finalKey = isOrdinal
+                                ? `${base}${pluralSeparator}${form}`
+                                : `${base}${pluralSeparator}${form}`;
+                            const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                            const existingVariantValue = nestedObject.getNestedValue(existingTranslations, finalKey, separator);
+                            if (existingVariantValue !== undefined) {
+                                // Preserve manually-added forms
+                                nestedObject.setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                            }
+                            // Don't generate empty placeholders - only generate what the locale needs and preserve what's manual
+                        }
+                    }
+                    else {
+                        // For primary language, only expand if it has multiple plural forms
+                        // Single-"other" languages (ja, zh, ko) should NOT expand the base key
+                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other') {
+                            // Single-"other" language - don't expand, keep just the base key
+                            formsToGenerate = [];
                         }
                         else {
-                            // Keep existing translation
-                            nestedObject.setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                            // Multi-form language - expand to its plural forms
+                            formsToGenerate = cardinalCategories;
+                            for (const form of formsToGenerate) {
+                                const finalKey = isOrdinal
+                                    ? `${base}${pluralSeparator}${form}`
+                                    : `${base}${pluralSeparator}${form}`;
+                                const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                                const existingVariantValue = nestedObject.getNestedValue(existingTranslations, finalKey, separator);
+                                if (existingVariantValue === undefined) {
+                                    // Prefer explicit defaultValue extracted for this key; fall back to configured defaultValue
+                                    let resolvedValue;
+                                    if (typeof defaultValue$1 === 'string') {
+                                        resolvedValue = defaultValue$1;
+                                    }
+                                    else {
+                                        resolvedValue = defaultValue.resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue$1);
+                                    }
+                                    nestedObject.setNestedValue(newTranslations, finalKey, resolvedValue, separator);
+                                }
+                                else {
+                                    nestedObject.setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                                }
+                            }
                         }
                     }
+                    if (formsToGenerate && formsToGenerate.length > 0) {
+                        // We've handled expansion for this base key; skip the normal single-key handling.
+                        continue;
+                    }
+                    // else: formsToGenerate is empty (single-"other" primary language)
+                    // Fall through to normal key handling below
                 }
-                // We've expanded variants for this base key; skip the normal single-key handling.
-                continue;
             }
         }
         // If the key looks like a serialized Trans component (starts with <), treat it as a flat 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.41.1'); // This string is replaced with the actual version at build time by rollup
+    .version('1.41.3'); // 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) {
@@ -216,16 +215,14 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
         }
     }
-    // Get the plural categories for the target language
+    // Get the plural categories for the target language (only used for filtering extracted keys)
     const targetLanguagePluralCategories = new Set();
     // Track cardinal plural categories separately so we can special-case single-"other" languages
     let cardinalCategories = [];
-    let ordinalCategories = [];
     try {
         const cardinalRules = new Intl.PluralRules(locale, { type: 'cardinal' });
         const ordinalRules = new Intl.PluralRules(locale, { type: 'ordinal' });
         cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
-        ordinalCategories = ordinalRules.resolvedOptions().pluralCategories;
         cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
         ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
     }
@@ -235,7 +232,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         const cardinalRules = new Intl.PluralRules(fallbackLang, { type: 'cardinal' });
         const ordinalRules = new Intl.PluralRules(fallbackLang, { type: 'ordinal' });
         cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
-        ordinalCategories = ordinalRules.resolvedOptions().pluralCategories;
         cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
         ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
     }
@@ -364,6 +360,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) {
@@ -406,49 +445,104 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                 continue;
             }
         }
-        // If this is a base plural key (no explicit suffix) and the locale is NOT the primary,
-        // expand it into locale-specific plural variants (e.g. key_one, key_other).
-        // Use the extracted defaultValue (fallback to base) for variant values.
+        // If this is a base plural key (no explicit suffix), expand it into locale-specific plural variants.
+        // For non-primary locales, we generate forms for that specific locale from CLDR.
+        // Additionally, we generate empty placeholders for ALL other CLDR forms not in the target locale
+        // (so translators can add them manually if needed).
         if (hasCount && !isExpandedPlural) {
             const parts = String(key).split(pluralSeparator);
             const isBaseKey = parts.length === 1;
-            if (isBaseKey && locale !== primaryLanguage) {
+            if (isBaseKey) {
                 // If explicit expanded variants exist, do not expand the base.
                 const base = key;
                 if (expandedBases.has(base)) ;
                 else {
-                    // choose categories based on ordinal flag
-                    const categories = isOrdinal ? ordinalCategories : cardinalCategories;
-                    for (const category of categories) {
-                        const finalKey = isOrdinal
-                            ? `${base}${pluralSeparator}ordinal${pluralSeparator}${category}`
-                            : `${base}${pluralSeparator}${category}`;
-                        // If the key looks like a serialized Trans component (starts with <), treat it as a flat key
-                        // to prevent splitting on dots that appear within the content.
-                        const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
-                        // Preserve existing translation if present; otherwise set a sensible default
-                        const existingVariantValue = getNestedValue(existingTranslations, finalKey, separator);
-                        if (existingVariantValue === undefined) {
-                            // Prefer explicit defaultValue extracted for this key; fall back to configured defaultValue
-                            // (resolved via resolveDefaultValue which handles functions or strings and accepts the full parameter set).
-                            let resolvedValue;
-                            if (typeof defaultValue === 'string') {
-                                resolvedValue = defaultValue;
+                    // Determine which plural forms to generate
+                    let formsToGenerate;
+                    if (locale !== primaryLanguage) {
+                        // For non-primary locales:
+                        // 1. Generate the forms that locale actually needs
+                        formsToGenerate = cardinalCategories;
+                        // 2. Also prepare empty placeholders for all OTHER CLDR forms not in this locale
+                        //    so translators can add them manually without --sync-primary removing them
+                        const otherForms = pluralForms.filter(f => !cardinalCategories.includes(f));
+                        // Process the locale-specific forms normally
+                        for (const form of formsToGenerate) {
+                            const finalKey = isOrdinal
+                                ? `${base}${pluralSeparator}${form}`
+                                : `${base}${pluralSeparator}${form}`;
+                            const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                            const existingVariantValue = getNestedValue(existingTranslations, finalKey, separator);
+                            if (existingVariantValue === undefined) {
+                                // Use the default value for secondary locale forms
+                                let resolvedValue;
+                                if (typeof defaultValue === 'string') {
+                                    resolvedValue = defaultValue;
+                                }
+                                else {
+                                    resolvedValue = resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue);
+                                }
+                                setNestedValue(newTranslations, finalKey, resolvedValue, separator);
                             }
                             else {
-                                // Use resolveDefaultValue to compute a sensible default, providing namespace and locale context.
-                                resolvedValue = resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue);
+                                setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
                             }
-                            setNestedValue(newTranslations, finalKey, resolvedValue, separator);
+                        }
+                        // Now process other CLDR forms: set empty placeholders for forms this locale doesn't use
+                        // but preserve any that were manually added by translators
+                        for (const form of otherForms) {
+                            const finalKey = isOrdinal
+                                ? `${base}${pluralSeparator}${form}`
+                                : `${base}${pluralSeparator}${form}`;
+                            const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                            const existingVariantValue = getNestedValue(existingTranslations, finalKey, separator);
+                            if (existingVariantValue !== undefined) {
+                                // Preserve manually-added forms
+                                setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                            }
+                            // Don't generate empty placeholders - only generate what the locale needs and preserve what's manual
+                        }
+                    }
+                    else {
+                        // For primary language, only expand if it has multiple plural forms
+                        // Single-"other" languages (ja, zh, ko) should NOT expand the base key
+                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other') {
+                            // Single-"other" language - don't expand, keep just the base key
+                            formsToGenerate = [];
                         }
                         else {
-                            // Keep existing translation
-                            setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                            // Multi-form language - expand to its plural forms
+                            formsToGenerate = cardinalCategories;
+                            for (const form of formsToGenerate) {
+                                const finalKey = isOrdinal
+                                    ? `${base}${pluralSeparator}${form}`
+                                    : `${base}${pluralSeparator}${form}`;
+                                const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
+                                const existingVariantValue = getNestedValue(existingTranslations, finalKey, separator);
+                                if (existingVariantValue === undefined) {
+                                    // Prefer explicit defaultValue extracted for this key; fall back to configured defaultValue
+                                    let resolvedValue;
+                                    if (typeof defaultValue === 'string') {
+                                        resolvedValue = defaultValue;
+                                    }
+                                    else {
+                                        resolvedValue = resolveDefaultValue(emptyDefaultValue, String(base), namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue);
+                                    }
+                                    setNestedValue(newTranslations, finalKey, resolvedValue, separator);
+                                }
+                                else {
+                                    setNestedValue(newTranslations, finalKey, existingVariantValue, separator);
+                                }
+                            }
                         }
                     }
+                    if (formsToGenerate && formsToGenerate.length > 0) {
+                        // We've handled expansion for this base key; skip the normal single-key handling.
+                        continue;
+                    }
+                    // else: formsToGenerate is empty (single-"other" primary language)
+                    // Fall through to normal key handling below
                 }
-                // We've expanded variants for this base key; skip the normal single-key handling.
-                continue;
             }
         }
         // If the key looks like a serialized Trans component (starts with <), treat it as a flat key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.41.1",
+  "version": "1.41.3",
   "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;AAgyBnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}