i18next-cli 1.51.0 → 1.51.2

package/README.md

@@ -649,10 +649,10 @@ export default defineConfig({
     // The count option can still be used for {{count}} interpolation in the translation value
     disablePlurals: false, // Default: false
 
-    // Force generation of all 6 CLDR plural forms (zero, one, two, few, many, other)
-    // for every language, including the primary language.
-    // Useful when secondary languages need plural forms that the primary language doesn't have,
-    // and you want a consistent set of keys across all locales.
+    // Generate the union of all configured locales' plural forms for every language.
+    // For example, if your locales are ['en', 'pl'], English normally only gets _one/_other,
+    // but with this option it also gets _few/_many (needed by Polish).
+    // Useful when you want a consistent set of plural keys across all locales.
     allPluralForms: false, // Default: false
 
     // Prefix for nested translations.

package/dist/cjs/cli.js

@@ -31,7 +31,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.51.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.51.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

@@ -273,6 +273,17 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
     const cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
     cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
     ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
+    // When allPluralForms is enabled, compute the union of cardinal categories across all configured locales.
+    // This ensures every locale gets the same set of plural keys — but only the forms actually needed by at least one locale.
+    const allLocalesCardinalCategories = config.extract.allPluralForms
+        ? (() => {
+            const union = new Set();
+            for (const loc of config.locales) {
+                pluralRules.safePluralRules(loc, { type: 'cardinal' }).resolvedOptions().pluralCategories.forEach(c => union.add(c));
+            }
+            return [...union];
+        })()
+        : null;
     // Prepare namespace pattern checking helpers
     const rawPreserve = config.extract.preservePatterns || [];
     // Helper to check if a key should be filtered out during extraction
@@ -364,7 +375,7 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             return true;
         }
         // When allPluralForms is enabled, include all CLDR plural forms regardless of the target language
-        if (config.extract.allPluralForms && pluralForms.includes(lastPart)) {
+        if (allLocalesCardinalCategories && allLocalesCardinalCategories.includes(lastPart)) {
             return true;
         }
         if (isOrdinal && keyParts.includes('ordinal')) {
@@ -511,8 +522,8 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                     let formsToGenerate;
                     if (locale !== primaryLanguage) {
                         // For non-primary locales:
-                        // 1. Generate the forms that locale actually needs (or all forms if allPluralForms is enabled)
-                        formsToGenerate = config.extract.allPluralForms ? [...pluralForms] : cardinalCategories;
+                        // 1. Generate the forms that locale actually needs (or union of all locales' forms if allPluralForms is enabled)
+                        formsToGenerate = allLocalesCardinalCategories ?? 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));
@@ -556,13 +567,13 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                     else {
                         // For primary language, only expand if it has multiple plural forms
                         // Single-"other" languages (ja, zh, ko) should NOT expand the base key (unless allPluralForms is enabled)
-                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other' && !config.extract.allPluralForms) {
+                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other' && !allLocalesCardinalCategories) {
                             // Single-"other" language - don't expand, keep just the base key
                             formsToGenerate = [];
                         }
                         else {
-                            // Multi-form language - expand to its plural forms (or all forms if allPluralForms is enabled)
-                            formsToGenerate = config.extract.allPluralForms ? [...pluralForms] : cardinalCategories;
+                            // Multi-form language - expand to its plural forms (or union of all locales' forms if allPluralForms is enabled)
+                            formsToGenerate = allLocalesCardinalCategories ?? cardinalCategories;
                             for (const form of formsToGenerate) {
                                 const finalKey = isOrdinal
                                     ? `${base}${pluralSeparator}${form}`
@@ -710,11 +721,11 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         }
         nestedObject.setNestedValue(newTranslations, key, valueToSet, separator);
     }
-    // When allPluralForms is enabled, ensure all 6 CLDR plural forms exist for every plural base key.
+    // When allPluralForms is enabled, ensure all union plural forms exist for every plural base key.
     // The extractor only generates forms for the configured locales' categories, so we need to fill in the rest.
-    if (config.extract.allPluralForms && !config.extract.disablePlurals) {
+    if (allLocalesCardinalCategories && !config.extract.disablePlurals) {
         for (const base of expandedBases) {
-            for (const form of pluralForms) {
+            for (const form of allLocalesCardinalCategories) {
                 const finalKey = `${base}${pluralSeparator}${form}`;
                 const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
                 const existingInNew = nestedObject.getNestedValue(newTranslations, finalKey, separator);
@@ -904,9 +915,12 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             }
             // When nsSeparator is false, keys resolved to the defaultNS (e.g. from
             // useTranslation() with no args) should be treated as top-level, not
-            // wrapped under the namespace name.
+            // wrapped under the namespace name — but only when there are no other
+            // explicit namespaces. If multiple namespaces exist, we must keep the
+            // default namespace wrapper to avoid flattening it into the top level (#227).
             const defaultNs = String(config.extract.defaultNS ?? 'translation');
-            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs);
+            const hasOtherNamespaces = [...keysByNS.keys()].some(k => k !== NO_NS_TOKEN && k !== defaultNs);
+            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs && !hasOtherNamespaces);
             for (const nsKey of namespacesToProcess) {
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {

package/dist/esm/cli.js

@@ -29,7 +29,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.51.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.51.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

@@ -271,6 +271,17 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
     const cardinalCategories = cardinalRules.resolvedOptions().pluralCategories;
     cardinalCategories.forEach(cat => targetLanguagePluralCategories.add(cat));
     ordinalRules.resolvedOptions().pluralCategories.forEach(cat => targetLanguagePluralCategories.add(`ordinal_${cat}`));
+    // When allPluralForms is enabled, compute the union of cardinal categories across all configured locales.
+    // This ensures every locale gets the same set of plural keys — but only the forms actually needed by at least one locale.
+    const allLocalesCardinalCategories = config.extract.allPluralForms
+        ? (() => {
+            const union = new Set();
+            for (const loc of config.locales) {
+                safePluralRules(loc, { type: 'cardinal' }).resolvedOptions().pluralCategories.forEach(c => union.add(c));
+            }
+            return [...union];
+        })()
+        : null;
     // Prepare namespace pattern checking helpers
     const rawPreserve = config.extract.preservePatterns || [];
     // Helper to check if a key should be filtered out during extraction
@@ -362,7 +373,7 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             return true;
         }
         // When allPluralForms is enabled, include all CLDR plural forms regardless of the target language
-        if (config.extract.allPluralForms && pluralForms.includes(lastPart)) {
+        if (allLocalesCardinalCategories && allLocalesCardinalCategories.includes(lastPart)) {
             return true;
         }
         if (isOrdinal && keyParts.includes('ordinal')) {
@@ -509,8 +520,8 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                     let formsToGenerate;
                     if (locale !== primaryLanguage) {
                         // For non-primary locales:
-                        // 1. Generate the forms that locale actually needs (or all forms if allPluralForms is enabled)
-                        formsToGenerate = config.extract.allPluralForms ? [...pluralForms] : cardinalCategories;
+                        // 1. Generate the forms that locale actually needs (or union of all locales' forms if allPluralForms is enabled)
+                        formsToGenerate = allLocalesCardinalCategories ?? 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));
@@ -554,13 +565,13 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                     else {
                         // For primary language, only expand if it has multiple plural forms
                         // Single-"other" languages (ja, zh, ko) should NOT expand the base key (unless allPluralForms is enabled)
-                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other' && !config.extract.allPluralForms) {
+                        if (cardinalCategories.length === 1 && cardinalCategories[0] === 'other' && !allLocalesCardinalCategories) {
                             // Single-"other" language - don't expand, keep just the base key
                             formsToGenerate = [];
                         }
                         else {
-                            // Multi-form language - expand to its plural forms (or all forms if allPluralForms is enabled)
-                            formsToGenerate = config.extract.allPluralForms ? [...pluralForms] : cardinalCategories;
+                            // Multi-form language - expand to its plural forms (or union of all locales' forms if allPluralForms is enabled)
+                            formsToGenerate = allLocalesCardinalCategories ?? cardinalCategories;
                             for (const form of formsToGenerate) {
                                 const finalKey = isOrdinal
                                     ? `${base}${pluralSeparator}${form}`
@@ -708,11 +719,11 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         }
         setNestedValue(newTranslations, key, valueToSet, separator);
     }
-    // When allPluralForms is enabled, ensure all 6 CLDR plural forms exist for every plural base key.
+    // When allPluralForms is enabled, ensure all union plural forms exist for every plural base key.
     // The extractor only generates forms for the configured locales' categories, so we need to fill in the rest.
-    if (config.extract.allPluralForms && !config.extract.disablePlurals) {
+    if (allLocalesCardinalCategories && !config.extract.disablePlurals) {
         for (const base of expandedBases) {
-            for (const form of pluralForms) {
+            for (const form of allLocalesCardinalCategories) {
                 const finalKey = `${base}${pluralSeparator}${form}`;
                 const separator = finalKey.startsWith('<') ? false : (keySeparator ?? '.');
                 const existingInNew = getNestedValue(newTranslations, finalKey, separator);
@@ -902,9 +913,12 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             }
             // When nsSeparator is false, keys resolved to the defaultNS (e.g. from
             // useTranslation() with no args) should be treated as top-level, not
-            // wrapped under the namespace name.
+            // wrapped under the namespace name — but only when there are no other
+            // explicit namespaces. If multiple namespaces exist, we must keep the
+            // default namespace wrapper to avoid flattening it into the top level (#227).
             const defaultNs = String(config.extract.defaultNS ?? 'translation');
-            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs);
+            const hasOtherNamespaces = [...keysByNS.keys()].some(k => k !== NO_NS_TOKEN && k !== defaultNs);
+            const isTopLevel = (nsKey) => nsKey === NO_NS_TOKEN || (config.extract.nsSeparator === false && nsKey === defaultNs && !hasOtherNamespaces);
             for (const nsKey of namespacesToProcess) {
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.51.0",
+  "version": "1.51.2",
   "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,EAAE,MAAM,gBAAgB,CAAA;AAi6B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,EACf,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAoJ9B"}
+{"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,EAAE,MAAM,gBAAgB,CAAA;AA66B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,EACf,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAuJ9B"}

package/types/types.d.ts

@@ -135,10 +135,10 @@ export interface I18nextToolkitConfig {
         generateBasePluralForms?: boolean;
         disablePlurals?: boolean;
         /**
-         * When true, generates all 6 CLDR plural forms (zero, one, two, few, many, other)
-         * for every language, including the primary language.
-         * Useful when secondary languages need plural forms that the primary language doesn't have,
-         * and you want a consistent set of keys across all locales.
+         * When true, generates the union of all configured locales' plural forms for every language.
+         * For example, with locales ['en', 'pl'], English normally only gets _one/_other,
+         * but with this option it also gets _few/_many (needed by Polish).
+         * Only forms required by at least one configured locale are generated.
          * (default: false)
          */
         allPluralForms?: boolean;