i18next-cli 1.41.2 → 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.2'); // 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

@@ -217,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}`));
     }
@@ -236,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}`));
     }
@@ -450,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.2'); // 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

@@ -215,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}`));
     }
@@ -234,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}`));
     }
@@ -448,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.2",
+  "version": "1.41.3",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {

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;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"}
+{"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"}