i18next-cli 1.21.0 → 1.21.1

package/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.21.1](https://github.com/i18next/i18next-cli/compare/v1.21.0...v1.21.1) - 2025-11-05
+
+- **Extractor (`--sync-primary`):** Fixed a bug where `<Trans i18nKey='namespace:key' />` components with namespaced keys were having their existing primary language translations overwritten with the full namespaced key string (e.g., `'translation:app.preservedTrans'`) when using the `--sync-primary` flag. The extractor now correctly identifies namespaced keys in defaultValue as derived (auto-generated) defaults rather than explicit developer-provided values, preserving existing translations when no explicit defaultValue is provided. This ensures that `<Trans>` components without explicit defaults behave consistently with `t()` calls under `--sync-primary`. [#92](https://github.com/i18next/i18next-cli/issues/92)
+
 ## [1.21.0](https://github.com/i18next/i18next-cli/compare/v1.20.4...v1.21.0) - 2025-11-05
 
 - **Extractor:** Enhanced `preservePatterns` with namespace pattern support. You can now preserve entire namespaces or namespace-specific key patterns using the namespace separator (e.g., `'assets:*'` to preserve all keys in the `assets` namespace, or `'common:button.*'` to preserve specific patterns within a namespace). This is particularly useful for managing translations that are handled externally, loaded dynamically, or constructed at runtime. Pattern matching respects the configured `nsSeparator` setting. [#90](https://github.com/i18next/i18next-cli/issues/90)

package/dist/cjs/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-"use strict";var e=require("commander"),t=require("chokidar"),o=require("glob"),n=require("minimatch"),i=require("chalk"),a=require("./config.js"),r=require("./heuristic-config.js"),c=require("./extractor/core/extractor.js");require("node:path"),require("node:fs/promises"),require("jiti");var s=require("./types-generator.js"),l=require("./syncer.js"),u=require("./migrator.js"),g=require("./init.js"),d=require("./linter.js"),p=require("./status.js"),f=require("./locize.js");const m=new e.Command;m.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.21.0"),m.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),m.command("extract").description("Extract translation keys from source files and update resource files.").option("-w, --watch","Watch for file changes and re-run the extractor.").option("--ci","Exit with a non-zero status code if any files are updated.").option("--dry-run","Run the extractor without writing any files to disk.").option("--sync-primary","Sync primary language values with default values from code.").action(async e=>{try{const o=m.opts().config,i=await a.ensureConfig(o),r=async()=>{const t=await c.runExtractor(i,{isWatchMode:!!e.watch,isDryRun:!!e.dryRun,syncPrimaryWithDefaults:!!e.syncPrimary});return e.ci&&!t?(console.log("✅ No files were updated."),process.exit(0)):e.ci&&t&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),t};if(await r(),e.watch){console.log("\nWatching for changes...");const e=await w(i.extract.input),o=y(i.extract.ignore),a=h(i.extract.output),c=[...o,...a].filter(Boolean),s=e.filter(e=>!c.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}catch(e){console.error("Error running extractor:",e),process.exit(1)}}),m.command("status [locale]").description("Display translation status. Provide a locale for a detailed key-by-key view.").option("-n, --namespace <ns>","Filter the status report by a specific namespace").action(async(e,t)=>{const o=m.opts().config;let n=await a.loadConfig(o);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await r.detectConfig();e||(console.error(i.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${i.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(i.green("Project structure detected successfully!")),n=e}await p.runStatus(n,{detail:e,namespace:t.namespace})}),m.command("types").description("Generate TypeScript definitions from translation resource files.").option("-w, --watch","Watch for file changes and re-run the type generator.").action(async e=>{const o=m.opts().config,i=await a.ensureConfig(o),r=()=>s.runTypesGenerator(i);if(await r(),e.watch){console.log("\nWatching for changes...");const e=await w(i.types?.input||[]),o=[...y(i.extract?.ignore)].filter(Boolean),a=e.filter(e=>!o.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(a,{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}),m.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=m.opts().config,t=await a.ensureConfig(e);await l.runSyncer(t)}),m.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await u.runMigrator(e)}),m.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(g.runInit),m.command("lint").description("Find potential issues like hardcoded strings in your codebase.").option("-w, --watch","Watch for file changes and re-run the linter.").action(async e=>{const o=m.opts().config,c=async()=>{let e=await a.loadConfig(o);if(!e){console.log(i.blue("No config file found. Attempting to detect project structure..."));const t=await r.detectConfig();t||(console.error(i.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${i.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(i.green("Project structure detected successfully!")),e=t}await d.runLinterCli(e)};if(await c(),e.watch){console.log("\nWatching for changes...");const e=await a.loadConfig(o);if(e?.extract?.input){const o=await w(e.extract.input),i=[...y(e.extract.ignore),...h(e.extract.output)].filter(Boolean),a=o.filter(e=>!i.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(a,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),c()})}}}),m.command("locize-sync").description("Synchronize local translations with your locize project.").option("--update-values","Update values of existing translations on locize.").option("--src-lng-only","Check for changes in source language only.").option("--compare-mtime","Compare modification times when syncing.").option("--dry-run","Run the command without making any changes.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeSync(o,e)}),m.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeDownload(o,e)}),m.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeMigrate(o,e)}),m.parse(process.argv);const y=e=>Array.isArray(e)?e:e?[e]:[],h=e=>e&&"string"==typeof e?[e.replace(/\{\{[^}]+\}\}/g,"*")]:[],w=async(e=[])=>{const t=y(e),n=await Promise.all(t.map(e=>o.glob(e||"",{nodir:!0})));return Array.from(new Set(n.flat()))};
+"use strict";var e=require("commander"),t=require("chokidar"),o=require("glob"),n=require("minimatch"),i=require("chalk"),a=require("./config.js"),r=require("./heuristic-config.js"),c=require("./extractor/core/extractor.js");require("node:path"),require("node:fs/promises"),require("jiti");var s=require("./types-generator.js"),l=require("./syncer.js"),u=require("./migrator.js"),g=require("./init.js"),d=require("./linter.js"),p=require("./status.js"),f=require("./locize.js");const m=new e.Command;m.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.21.1"),m.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),m.command("extract").description("Extract translation keys from source files and update resource files.").option("-w, --watch","Watch for file changes and re-run the extractor.").option("--ci","Exit with a non-zero status code if any files are updated.").option("--dry-run","Run the extractor without writing any files to disk.").option("--sync-primary","Sync primary language values with default values from code.").action(async e=>{try{const o=m.opts().config,i=await a.ensureConfig(o),r=async()=>{const t=await c.runExtractor(i,{isWatchMode:!!e.watch,isDryRun:!!e.dryRun,syncPrimaryWithDefaults:!!e.syncPrimary});return e.ci&&!t?(console.log("✅ No files were updated."),process.exit(0)):e.ci&&t&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),t};if(await r(),e.watch){console.log("\nWatching for changes...");const e=await w(i.extract.input),o=y(i.extract.ignore),a=h(i.extract.output),c=[...o,...a].filter(Boolean),s=e.filter(e=>!c.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}catch(e){console.error("Error running extractor:",e),process.exit(1)}}),m.command("status [locale]").description("Display translation status. Provide a locale for a detailed key-by-key view.").option("-n, --namespace <ns>","Filter the status report by a specific namespace").action(async(e,t)=>{const o=m.opts().config;let n=await a.loadConfig(o);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await r.detectConfig();e||(console.error(i.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${i.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(i.green("Project structure detected successfully!")),n=e}await p.runStatus(n,{detail:e,namespace:t.namespace})}),m.command("types").description("Generate TypeScript definitions from translation resource files.").option("-w, --watch","Watch for file changes and re-run the type generator.").action(async e=>{const o=m.opts().config,i=await a.ensureConfig(o),r=()=>s.runTypesGenerator(i);if(await r(),e.watch){console.log("\nWatching for changes...");const e=await w(i.types?.input||[]),o=[...y(i.extract?.ignore)].filter(Boolean),a=e.filter(e=>!o.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(a,{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}),m.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=m.opts().config,t=await a.ensureConfig(e);await l.runSyncer(t)}),m.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await u.runMigrator(e)}),m.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(g.runInit),m.command("lint").description("Find potential issues like hardcoded strings in your codebase.").option("-w, --watch","Watch for file changes and re-run the linter.").action(async e=>{const o=m.opts().config,c=async()=>{let e=await a.loadConfig(o);if(!e){console.log(i.blue("No config file found. Attempting to detect project structure..."));const t=await r.detectConfig();t||(console.error(i.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${i.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(i.green("Project structure detected successfully!")),e=t}await d.runLinterCli(e)};if(await c(),e.watch){console.log("\nWatching for changes...");const e=await a.loadConfig(o);if(e?.extract?.input){const o=await w(e.extract.input),i=[...y(e.extract.ignore),...h(e.extract.output)].filter(Boolean),a=o.filter(e=>!i.some(t=>n.minimatch(e,t,{dot:!0})));t.watch(a,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),c()})}}}),m.command("locize-sync").description("Synchronize local translations with your locize project.").option("--update-values","Update values of existing translations on locize.").option("--src-lng-only","Check for changes in source language only.").option("--compare-mtime","Compare modification times when syncing.").option("--dry-run","Run the command without making any changes.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeSync(o,e)}),m.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeDownload(o,e)}),m.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const t=m.opts().config,o=await a.ensureConfig(t);await f.runLocizeMigrate(o,e)}),m.parse(process.argv);const y=e=>Array.isArray(e)?e:e?[e]:[],h=e=>e&&"string"==typeof e?[e.replace(/\{\{[^}]+\}\}/g,"*")]:[],w=async(e=[])=>{const t=y(e),n=await Promise.all(t.map(e=>o.glob(e||"",{nodir:!0})));return Array.from(new Set(n.flat()))};

package/dist/cjs/extractor/core/translation-manager.js

@@ -1 +1 @@
-"use strict";var e=require("node:path"),t=require("glob"),s=require("../../utils/nested-object.js"),r=require("../../utils/file-utils.js"),n=require("../../utils/default-value.js");function o(e){const t=`^${e.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*")}$`;return new RegExp(t)}function a(e,t){if("object"!=typeof e||null===e||Array.isArray(e))return e;const s={},r=t?.extract?.pluralSeparator??"_",n=["zero","one","two","few","many","other"],o=n.map(e=>`ordinal${r}${e}`),i=Object.keys(e).sort((e,t)=>{const s=e=>{for(const t of o)if(e.endsWith(`${r}${t}`)){return{base:e.slice(0,-(r.length+t.length)),form:t,isOrdinal:!0,isPlural:!0,fullKey:e}}for(const t of n)if(e.endsWith(`${r}${t}`)){return{base:e.slice(0,-(r.length+t.length)),form:t,isOrdinal:!1,isPlural:!0,fullKey:e}}return{base:e,form:"",isOrdinal:!1,isPlural:!1,fullKey:e}},a=s(e),i=s(t);if(a.isPlural&&i.isPlural){const e=a.base.localeCompare(i.base,void 0,{sensitivity:"base"});if(0!==e)return e;if(a.isOrdinal!==i.isOrdinal)return a.isOrdinal?1:-1;const t=a.isOrdinal?o:n,s=t.indexOf(a.form),r=t.indexOf(i.form);return-1!==s&&-1!==r?s-r:a.form.localeCompare(i.form)}const l=e.localeCompare(t,void 0,{sensitivity:"base"});return 0===l?e.localeCompare(t,void 0,{sensitivity:"case"}):l});for(const r of i)s[r]=a(e[r],t);return s}function i(e,t,r,i,l,c=[],u=new Set,f=!1){const{keySeparator:d=".",sort:p=!0,removeUnusedKeys:g=!0,primaryLanguage:y,defaultValue:h="",pluralSeparator:x="_",contextSeparator:m="_"}=r.extract,O=new Set;let S=[],v=[];try{const e=new Intl.PluralRules(i,{type:"cardinal"}),t=new Intl.PluralRules(i,{type:"ordinal"});S=e.resolvedOptions().pluralCategories,v=t.resolvedOptions().pluralCategories,S.forEach(e=>O.add(e)),t.resolvedOptions().pluralCategories.forEach(e=>O.add(`ordinal_${e}`))}catch(e){const t=y||"en",s=new Intl.PluralRules(t,{type:"cardinal"}),r=new Intl.PluralRules(t,{type:"ordinal"});S=s.resolvedOptions().pluralCategories,v=r.resolvedOptions().pluralCategories,S.forEach(e=>O.add(e)),r.resolvedOptions().pluralCategories.forEach(e=>O.add(`ordinal_${e}`))}const N=r.extract.preservePatterns||[],$="string"==typeof r.extract.nsSeparator?r.extract.nsSeparator:":",w=e=>{if(c.some(t=>t.test(e)))return!0;for(const t of N)if("string"==typeof t){if(t.endsWith(`${$}*`)){const e=t.slice(0,-($.length+1));if("*"===e||l&&e===l)return!0}if(t.includes($)&&l){const[s,r]=t.split($);if(s===l){if(o(r).test(e))return!0}}}return!1},b=e.filter(({key:e,hasCount:t,isOrdinal:s})=>{if((e=>{if(c.some(t=>t.test(e)))return!0;for(const e of N)if("string"==typeof e&&e.endsWith(`${$}*`)){const t=e.slice(0,-($.length+1));if("*"===t||l&&t===l)return!0}return!1})(e))return!1;if(!t)return!0;const r=e.split(x);if(t&&1===r.length)return!0;if(1===S.length&&"other"===S[0]&&1===r.length)return!0;if(s&&r.includes("ordinal")){const e=r[r.length-1];return O.has(`ordinal_${e}`)}if(t){const e=r[r.length-1];return O.has(e)}return!0}),j=new Set;for(const e of b)if(e.isExpandedPlural){const t=String(e.key).split(x);t.length>=3&&"ordinal"===t[t.length-2]?j.add(t.slice(0,-2).join(x)):j.add(t.slice(0,-1).join(x))}let P=g?{}:JSON.parse(JSON.stringify(t));const k=s.getNestedKeys(t,d??".");for(const e of k)if(w(e)){const r=s.getNestedValue(t,e,d??".");s.setNestedValue(P,e,r,d??".")}if(g){const e=s.getNestedKeys(t,d??".");for(const r of e){const e=r.split(x);if("zero"===e[e.length-1]){const n=e.slice(0,-1).join(x);if(b.some(({key:e})=>e.split(x).slice(0,-1).join(x)===n)){const e=s.getNestedValue(t,r,d??".");s.setNestedValue(P,r,e,d??".")}}}}for(const{key:e,defaultValue:o,explicitDefault:a,hasCount:c,isExpandedPlural:p,isOrdinal:g}of b){if(c&&!p){const t=String(e).split(x);let s=e;if(t.length>=3&&"ordinal"===t[t.length-2]?s=t.slice(0,-2).join(x):t.length>=2&&(s=t.slice(0,-1).join(x)),j.has(s))continue}if(c&&!p){if(1===String(e).split(x).length&&i!==y){const a=e;if(j.has(a));else{const e=g?v:S;for(const c of e){const e=g?`${a}${x}ordinal${x}${c}`:`${a}${x}${c}`,u=s.getNestedValue(t,e,d??".");if(void 0===u){let t;t="string"==typeof o?o:n.resolveDefaultValue(h,String(a),l||r?.extract?.defaultNS||"translation",i,o),s.setNestedValue(P,e,t,d??".")}else s.setNestedValue(P,e,u,d??".")}}continue}}const O=s.getNestedValue(t,e,d??"."),N=!1===d||!b.some(t=>t.key!==e&&t.key.startsWith(`${e}${d}`)),$="object"==typeof O&&null!==O&&(u.has(e)||!o||o===e),w="object"==typeof O&&null!==O&&N&&!u.has(e)&&!$;if($){s.setNestedValue(P,e,O,d??".");continue}let k;if(void 0===O||w)if(i===y)if(f){const t=o&&(o===e||e!==o&&(e.startsWith(o+x)||e.startsWith(o+m)));k=o&&!t?o:n.resolveDefaultValue(h,e,l||r?.extract?.defaultNS||"translation",i,o)}else k=o||e;else k=n.resolveDefaultValue(h,e,l||r?.extract?.defaultNS||"translation",i,o);else if(i===y&&f){const t=o&&(o===e||e!==o&&(e.startsWith(o+x)||e.startsWith(o+m)));k=(e.includes(x)||e.includes(m))&&!a?O:o&&!t?o:O}else k=O;s.setNestedValue(P,e,k,d??".")}if(!0===p)return a(P,r);if("function"==typeof p){const e={},t=Object.keys(P),s=new Map;for(const e of b){const t=!1===d?e.key:e.key.split(d)[0];s.has(t)||s.set(t,e)}t.sort((e,t)=>{if("function"==typeof p){const r=s.get(e),n=s.get(t);if(r&&n)return p(r,n)}return e.localeCompare(t,void 0,{sensitivity:"base"})});for(const s of t)e[s]=a(P[s],r);P=e}return P}exports.getTranslations=async function(s,n,a,{syncPrimaryWithDefaults:l=!1}={}){a.extract.primaryLanguage||=a.locales[0]||"en",a.extract.secondaryLanguages||=a.locales.filter(e=>e!==a?.extract?.primaryLanguage);const c=[...a.extract.preservePatterns||[]],u=a.extract.indentation??2;for(const e of n)c.push(`${e}.*`);const f=c.map(o),d="__no_namespace__",p=new Map;for(const e of s.values()){const t=e.nsIsImplicit&&!1===a.extract.defaultNS?d:String(e.ns??a.extract.defaultNS??"translation");p.has(t)||p.set(t,[]),p.get(t).push(e)}const g=[],y=Array.isArray(a.extract.ignore)?a.extract.ignore:a.extract.ignore?[a.extract.ignore]:[];for(const s of a.locales){if(a.extract.mergeNamespaces||"string"==typeof a.extract.output&&!a.extract.output.includes("{{namespace}}")){const t={},o=r.getOutputPath(a.extract.output,s),c=e.resolve(process.cwd(),o),y=await r.loadTranslationFile(c)||{},h=Object.keys(y),x=!1!==a.extract.defaultNS&&h.some(e=>{const t=y[e];return"object"==typeof t&&null!==t&&!Array.isArray(t)})?new Set([...p.keys(),...h]):new Set([...p.keys(),d]);for(const e of x){const r=p.get(e)||[];if(e===d){const e=i(r,y,a,s,void 0,f,n,l);Object.assign(t,e)}else{const o=y[e]||{};t[e]=i(r,o,a,s,e,f,n,l)}}const m=JSON.stringify(y,null,u),O=JSON.stringify(t,null,u);g.push({path:c,updated:O!==m,newTranslations:t,existingTranslations:y})}else{const o=new Set(p.keys()),c=r.getOutputPath(a.extract.output,s,"*").replace(/\\/g,"/"),d=await t.glob(c,{ignore:y});for(const t of d)o.add(e.basename(t,e.extname(t)));for(const t of o){const o=p.get(t)||[],c=r.getOutputPath(a.extract.output,s,t),d=e.resolve(process.cwd(),c),y=await r.loadTranslationFile(d)||{},h=i(o,y,a,s,t,f,n,l),x=JSON.stringify(y,null,u),m=JSON.stringify(h,null,u);g.push({path:d,updated:m!==x,newTranslations:h,existingTranslations:y})}}}return g};
+"use strict";var e=require("node:path"),t=require("glob"),s=require("../../utils/nested-object.js"),n=require("../../utils/file-utils.js"),r=require("../../utils/default-value.js");function o(e){const t=`^${e.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*")}$`;return new RegExp(t)}function a(e,t){if("object"!=typeof e||null===e||Array.isArray(e))return e;const s={},n=t?.extract?.pluralSeparator??"_",r=["zero","one","two","few","many","other"],o=r.map(e=>`ordinal${n}${e}`),i=Object.keys(e).sort((e,t)=>{const s=e=>{for(const t of o)if(e.endsWith(`${n}${t}`)){return{base:e.slice(0,-(n.length+t.length)),form:t,isOrdinal:!0,isPlural:!0,fullKey:e}}for(const t of r)if(e.endsWith(`${n}${t}`)){return{base:e.slice(0,-(n.length+t.length)),form:t,isOrdinal:!1,isPlural:!0,fullKey:e}}return{base:e,form:"",isOrdinal:!1,isPlural:!1,fullKey:e}},a=s(e),i=s(t);if(a.isPlural&&i.isPlural){const e=a.base.localeCompare(i.base,void 0,{sensitivity:"base"});if(0!==e)return e;if(a.isOrdinal!==i.isOrdinal)return a.isOrdinal?1:-1;const t=a.isOrdinal?o:r,s=t.indexOf(a.form),n=t.indexOf(i.form);return-1!==s&&-1!==n?s-n:a.form.localeCompare(i.form)}const l=e.localeCompare(t,void 0,{sensitivity:"base"});return 0===l?e.localeCompare(t,void 0,{sensitivity:"case"}):l});for(const n of i)s[n]=a(e[n],t);return s}function i(e,t,n,i,l,c=[],u=new Set,f=!1){const{keySeparator:d=".",sort:p=!0,removeUnusedKeys:g=!0,primaryLanguage:y,defaultValue:h="",pluralSeparator:x="_",contextSeparator:m="_"}=n.extract,O=new Set;let S=[],v=[];try{const e=new Intl.PluralRules(i,{type:"cardinal"}),t=new Intl.PluralRules(i,{type:"ordinal"});S=e.resolvedOptions().pluralCategories,v=t.resolvedOptions().pluralCategories,S.forEach(e=>O.add(e)),t.resolvedOptions().pluralCategories.forEach(e=>O.add(`ordinal_${e}`))}catch(e){const t=y||"en",s=new Intl.PluralRules(t,{type:"cardinal"}),n=new Intl.PluralRules(t,{type:"ordinal"});S=s.resolvedOptions().pluralCategories,v=n.resolvedOptions().pluralCategories,S.forEach(e=>O.add(e)),n.resolvedOptions().pluralCategories.forEach(e=>O.add(`ordinal_${e}`))}const N=n.extract.preservePatterns||[],$="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",w=e=>{if(c.some(t=>t.test(e)))return!0;for(const t of N)if("string"==typeof t){if(t.endsWith(`${$}*`)){const e=t.slice(0,-($.length+1));if("*"===e||l&&e===l)return!0}if(t.includes($)&&l){const[s,n]=t.split($);if(s===l){if(o(n).test(e))return!0}}}return!1},b=e.filter(({key:e,hasCount:t,isOrdinal:s})=>{if((e=>{if(c.some(t=>t.test(e)))return!0;for(const e of N)if("string"==typeof e&&e.endsWith(`${$}*`)){const t=e.slice(0,-($.length+1));if("*"===t||l&&t===l)return!0}return!1})(e))return!1;if(!t)return!0;const n=e.split(x);if(t&&1===n.length)return!0;if(1===S.length&&"other"===S[0]&&1===n.length)return!0;if(s&&n.includes("ordinal")){const e=n[n.length-1];return O.has(`ordinal_${e}`)}if(t){const e=n[n.length-1];return O.has(e)}return!0}),j=new Set;for(const e of b)if(e.isExpandedPlural){const t=String(e.key).split(x);t.length>=3&&"ordinal"===t[t.length-2]?j.add(t.slice(0,-2).join(x)):j.add(t.slice(0,-1).join(x))}let P=g?{}:JSON.parse(JSON.stringify(t));const k=s.getNestedKeys(t,d??".");for(const e of k)if(w(e)){const n=s.getNestedValue(t,e,d??".");s.setNestedValue(P,e,n,d??".")}if(g){const e=s.getNestedKeys(t,d??".");for(const n of e){const e=n.split(x);if("zero"===e[e.length-1]){const r=e.slice(0,-1).join(x);if(b.some(({key:e})=>e.split(x).slice(0,-1).join(x)===r)){const e=s.getNestedValue(t,n,d??".");s.setNestedValue(P,n,e,d??".")}}}}for(const{key:e,defaultValue:o,explicitDefault:a,hasCount:c,isExpandedPlural:p,isOrdinal:g}of b){if(c&&!p){const t=String(e).split(x);let s=e;if(t.length>=3&&"ordinal"===t[t.length-2]?s=t.slice(0,-2).join(x):t.length>=2&&(s=t.slice(0,-1).join(x)),j.has(s))continue}if(c&&!p){if(1===String(e).split(x).length&&i!==y){const a=e;if(j.has(a));else{const e=g?v:S;for(const c of e){const e=g?`${a}${x}ordinal${x}${c}`:`${a}${x}${c}`,u=s.getNestedValue(t,e,d??".");if(void 0===u){let t;t="string"==typeof o?o:r.resolveDefaultValue(h,String(a),l||n?.extract?.defaultNS||"translation",i,o),s.setNestedValue(P,e,t,d??".")}else s.setNestedValue(P,e,u,d??".")}}continue}}const O=s.getNestedValue(t,e,d??"."),N=!1===d||!b.some(t=>t.key!==e&&t.key.startsWith(`${e}${d}`)),w="object"==typeof O&&null!==O&&(u.has(e)||!o||o===e),k="object"==typeof O&&null!==O&&N&&!u.has(e)&&!w;if(w){s.setNestedValue(P,e,O,d??".");continue}let V;if(void 0===O||k)if(i===y)if(f){const t=o&&(o===e||o.includes($)||e!==o&&(e.startsWith(o+x)||e.startsWith(o+m)));V=o&&!t?o:r.resolveDefaultValue(h,e,l||n?.extract?.defaultNS||"translation",i,o)}else V=o||e;else V=r.resolveDefaultValue(h,e,l||n?.extract?.defaultNS||"translation",i,o);else if(i===y&&f){const t=o&&(o===e||o.includes($)||e!==o&&(e.startsWith(o+x)||e.startsWith(o+m)));V=(e.includes(x)||e.includes(m))&&!a?O:o&&!t?o:O}else V=O;s.setNestedValue(P,e,V,d??".")}if(!0===p)return a(P,n);if("function"==typeof p){const e={},t=Object.keys(P),s=new Map;for(const e of b){const t=!1===d?e.key:e.key.split(d)[0];s.has(t)||s.set(t,e)}t.sort((e,t)=>{if("function"==typeof p){const n=s.get(e),r=s.get(t);if(n&&r)return p(n,r)}return e.localeCompare(t,void 0,{sensitivity:"base"})});for(const s of t)e[s]=a(P[s],n);P=e}return P}exports.getTranslations=async function(s,r,a,{syncPrimaryWithDefaults:l=!1}={}){a.extract.primaryLanguage||=a.locales[0]||"en",a.extract.secondaryLanguages||=a.locales.filter(e=>e!==a?.extract?.primaryLanguage);const c=[...a.extract.preservePatterns||[]],u=a.extract.indentation??2;for(const e of r)c.push(`${e}.*`);const f=c.map(o),d="__no_namespace__",p=new Map;for(const e of s.values()){const t=e.nsIsImplicit&&!1===a.extract.defaultNS?d:String(e.ns??a.extract.defaultNS??"translation");p.has(t)||p.set(t,[]),p.get(t).push(e)}const g=[],y=Array.isArray(a.extract.ignore)?a.extract.ignore:a.extract.ignore?[a.extract.ignore]:[];for(const s of a.locales){if(a.extract.mergeNamespaces||"string"==typeof a.extract.output&&!a.extract.output.includes("{{namespace}}")){const t={},o=n.getOutputPath(a.extract.output,s),c=e.resolve(process.cwd(),o),y=await n.loadTranslationFile(c)||{},h=Object.keys(y),x=!1!==a.extract.defaultNS&&h.some(e=>{const t=y[e];return"object"==typeof t&&null!==t&&!Array.isArray(t)})?new Set([...p.keys(),...h]):new Set([...p.keys(),d]);for(const e of x){const n=p.get(e)||[];if(e===d){const e=i(n,y,a,s,void 0,f,r,l);Object.assign(t,e)}else{const o=y[e]||{};t[e]=i(n,o,a,s,e,f,r,l)}}const m=JSON.stringify(y,null,u),O=JSON.stringify(t,null,u);g.push({path:c,updated:O!==m,newTranslations:t,existingTranslations:y})}else{const o=new Set(p.keys()),c=n.getOutputPath(a.extract.output,s,"*").replace(/\\/g,"/"),d=await t.glob(c,{ignore:y});for(const t of d)o.add(e.basename(t,e.extname(t)));for(const t of o){const o=p.get(t)||[],c=n.getOutputPath(a.extract.output,s,t),d=e.resolve(process.cwd(),c),y=await n.loadTranslationFile(d)||{},h=i(o,y,a,s,t,f,r,l),x=JSON.stringify(y,null,u),m=JSON.stringify(h,null,u);g.push({path:d,updated:m!==x,newTranslations:h,existingTranslations:y})}}}return g};

package/dist/esm/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import{Command as t}from"commander";import o from"chokidar";import{glob as e}from"glob";import{minimatch as i}from"minimatch";import n from"chalk";import{ensureConfig as a,loadConfig as r}from"./config.js";import{detectConfig as c}from"./heuristic-config.js";import{runExtractor as s}from"./extractor/core/extractor.js";import"node:path";import"node:fs/promises";import"jiti";import{runTypesGenerator as l}from"./types-generator.js";import{runSyncer as p}from"./syncer.js";import{runMigrator as m}from"./migrator.js";import{runInit as f}from"./init.js";import{runLinterCli as d}from"./linter.js";import{runStatus as g}from"./status.js";import{runLocizeSync as u,runLocizeDownload as y,runLocizeMigrate as h}from"./locize.js";const w=new t;w.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.21.0"),w.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),w.command("extract").description("Extract translation keys from source files and update resource files.").option("-w, --watch","Watch for file changes and re-run the extractor.").option("--ci","Exit with a non-zero status code if any files are updated.").option("--dry-run","Run the extractor without writing any files to disk.").option("--sync-primary","Sync primary language values with default values from code.").action(async t=>{try{const e=w.opts().config,n=await a(e),r=async()=>{const o=await s(n,{isWatchMode:!!t.watch,isDryRun:!!t.dryRun,syncPrimaryWithDefaults:!!t.syncPrimary});return t.ci&&!o?(console.log("✅ No files were updated."),process.exit(0)):t.ci&&o&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),o};if(await r(),t.watch){console.log("\nWatching for changes...");const t=await z(n.extract.input),e=x(n.extract.ignore),a=j(n.extract.output),c=[...e,...a].filter(Boolean),s=t.filter(t=>!c.some(o=>i(t,o,{dot:!0})));o.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),r()})}}catch(t){console.error("Error running extractor:",t),process.exit(1)}}),w.command("status [locale]").description("Display translation status. Provide a locale for a detailed key-by-key view.").option("-n, --namespace <ns>","Filter the status report by a specific namespace").action(async(t,o)=>{const e=w.opts().config;let i=await r(e);if(!i){console.log(n.blue("No config file found. Attempting to detect project structure..."));const t=await c();t||(console.error(n.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${n.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(n.green("Project structure detected successfully!")),i=t}await g(i,{detail:t,namespace:o.namespace})}),w.command("types").description("Generate TypeScript definitions from translation resource files.").option("-w, --watch","Watch for file changes and re-run the type generator.").action(async t=>{const e=w.opts().config,n=await a(e),r=()=>l(n);if(await r(),t.watch){console.log("\nWatching for changes...");const t=await z(n.types?.input||[]),e=[...x(n.extract?.ignore)].filter(Boolean),a=t.filter(t=>!e.some(o=>i(t,o,{dot:!0})));o.watch(a,{persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),r()})}}),w.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const t=w.opts().config,o=await a(t);await p(o)}),w.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async t=>{await m(t)}),w.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(f),w.command("lint").description("Find potential issues like hardcoded strings in your codebase.").option("-w, --watch","Watch for file changes and re-run the linter.").action(async t=>{const e=w.opts().config,a=async()=>{let t=await r(e);if(!t){console.log(n.blue("No config file found. Attempting to detect project structure..."));const o=await c();o||(console.error(n.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${n.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(n.green("Project structure detected successfully!")),t=o}await d(t)};if(await a(),t.watch){console.log("\nWatching for changes...");const t=await r(e);if(t?.extract?.input){const e=await z(t.extract.input),n=[...x(t.extract.ignore),...j(t.extract.output)].filter(Boolean),r=e.filter(t=>!n.some(o=>i(t,o,{dot:!0})));o.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}}),w.command("locize-sync").description("Synchronize local translations with your locize project.").option("--update-values","Update values of existing translations on locize.").option("--src-lng-only","Check for changes in source language only.").option("--compare-mtime","Compare modification times when syncing.").option("--dry-run","Run the command without making any changes.").action(async t=>{const o=w.opts().config,e=await a(o);await u(e,t)}),w.command("locize-download").description("Download all translations from your locize project.").action(async t=>{const o=w.opts().config,e=await a(o);await y(e,t)}),w.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async t=>{const o=w.opts().config,e=await a(o);await h(e,t)}),w.parse(process.argv);const x=t=>Array.isArray(t)?t:t?[t]:[],j=t=>t&&"string"==typeof t?[t.replace(/\{\{[^}]+\}\}/g,"*")]:[],z=async(t=[])=>{const o=x(t),i=await Promise.all(o.map(t=>e(t||"",{nodir:!0})));return Array.from(new Set(i.flat()))};
+import{Command as t}from"commander";import o from"chokidar";import{glob as e}from"glob";import{minimatch as i}from"minimatch";import n from"chalk";import{ensureConfig as a,loadConfig as r}from"./config.js";import{detectConfig as c}from"./heuristic-config.js";import{runExtractor as s}from"./extractor/core/extractor.js";import"node:path";import"node:fs/promises";import"jiti";import{runTypesGenerator as l}from"./types-generator.js";import{runSyncer as p}from"./syncer.js";import{runMigrator as m}from"./migrator.js";import{runInit as f}from"./init.js";import{runLinterCli as d}from"./linter.js";import{runStatus as g}from"./status.js";import{runLocizeSync as u,runLocizeDownload as y,runLocizeMigrate as h}from"./locize.js";const w=new t;w.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.21.1"),w.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),w.command("extract").description("Extract translation keys from source files and update resource files.").option("-w, --watch","Watch for file changes and re-run the extractor.").option("--ci","Exit with a non-zero status code if any files are updated.").option("--dry-run","Run the extractor without writing any files to disk.").option("--sync-primary","Sync primary language values with default values from code.").action(async t=>{try{const e=w.opts().config,n=await a(e),r=async()=>{const o=await s(n,{isWatchMode:!!t.watch,isDryRun:!!t.dryRun,syncPrimaryWithDefaults:!!t.syncPrimary});return t.ci&&!o?(console.log("✅ No files were updated."),process.exit(0)):t.ci&&o&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),o};if(await r(),t.watch){console.log("\nWatching for changes...");const t=await z(n.extract.input),e=x(n.extract.ignore),a=j(n.extract.output),c=[...e,...a].filter(Boolean),s=t.filter(t=>!c.some(o=>i(t,o,{dot:!0})));o.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),r()})}}catch(t){console.error("Error running extractor:",t),process.exit(1)}}),w.command("status [locale]").description("Display translation status. Provide a locale for a detailed key-by-key view.").option("-n, --namespace <ns>","Filter the status report by a specific namespace").action(async(t,o)=>{const e=w.opts().config;let i=await r(e);if(!i){console.log(n.blue("No config file found. Attempting to detect project structure..."));const t=await c();t||(console.error(n.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${n.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(n.green("Project structure detected successfully!")),i=t}await g(i,{detail:t,namespace:o.namespace})}),w.command("types").description("Generate TypeScript definitions from translation resource files.").option("-w, --watch","Watch for file changes and re-run the type generator.").action(async t=>{const e=w.opts().config,n=await a(e),r=()=>l(n);if(await r(),t.watch){console.log("\nWatching for changes...");const t=await z(n.types?.input||[]),e=[...x(n.extract?.ignore)].filter(Boolean),a=t.filter(t=>!e.some(o=>i(t,o,{dot:!0})));o.watch(a,{persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),r()})}}),w.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const t=w.opts().config,o=await a(t);await p(o)}),w.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async t=>{await m(t)}),w.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(f),w.command("lint").description("Find potential issues like hardcoded strings in your codebase.").option("-w, --watch","Watch for file changes and re-run the linter.").action(async t=>{const e=w.opts().config,a=async()=>{let t=await r(e);if(!t){console.log(n.blue("No config file found. Attempting to detect project structure..."));const o=await c();o||(console.error(n.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${n.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(n.green("Project structure detected successfully!")),t=o}await d(t)};if(await a(),t.watch){console.log("\nWatching for changes...");const t=await r(e);if(t?.extract?.input){const e=await z(t.extract.input),n=[...x(t.extract.ignore),...j(t.extract.output)].filter(Boolean),r=e.filter(t=>!n.some(o=>i(t,o,{dot:!0})));o.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}}),w.command("locize-sync").description("Synchronize local translations with your locize project.").option("--update-values","Update values of existing translations on locize.").option("--src-lng-only","Check for changes in source language only.").option("--compare-mtime","Compare modification times when syncing.").option("--dry-run","Run the command without making any changes.").action(async t=>{const o=w.opts().config,e=await a(o);await u(e,t)}),w.command("locize-download").description("Download all translations from your locize project.").action(async t=>{const o=w.opts().config,e=await a(o);await y(e,t)}),w.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async t=>{const o=w.opts().config,e=await a(o);await h(e,t)}),w.parse(process.argv);const x=t=>Array.isArray(t)?t:t?[t]:[],j=t=>t&&"string"==typeof t?[t.replace(/\{\{[^}]+\}\}/g,"*")]:[],z=async(t=[])=>{const o=x(t),i=await Promise.all(o.map(t=>e(t||"",{nodir:!0})));return Array.from(new Set(i.flat()))};

package/dist/esm/extractor/core/translation-manager.js

@@ -1 +1 @@
-import{resolve as t,basename as e,extname as n}from"node:path";import{glob as r}from"glob";import{getNestedKeys as s,getNestedValue as o,setNestedValue as i}from"../../utils/nested-object.js";import{getOutputPath as a,loadTranslationFile as l}from"../../utils/file-utils.js";import{resolveDefaultValue as c}from"../../utils/default-value.js";function f(t){const e=`^${t.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*")}$`;return new RegExp(e)}function u(t,e){if("object"!=typeof t||null===t||Array.isArray(t))return t;const n={},r=e?.extract?.pluralSeparator??"_",s=["zero","one","two","few","many","other"],o=s.map(t=>`ordinal${r}${t}`),i=Object.keys(t).sort((t,e)=>{const n=t=>{for(const e of o)if(t.endsWith(`${r}${e}`)){return{base:t.slice(0,-(r.length+e.length)),form:e,isOrdinal:!0,isPlural:!0,fullKey:t}}for(const e of s)if(t.endsWith(`${r}${e}`)){return{base:t.slice(0,-(r.length+e.length)),form:e,isOrdinal:!1,isPlural:!0,fullKey:t}}return{base:t,form:"",isOrdinal:!1,isPlural:!1,fullKey:t}},i=n(t),a=n(e);if(i.isPlural&&a.isPlural){const t=i.base.localeCompare(a.base,void 0,{sensitivity:"base"});if(0!==t)return t;if(i.isOrdinal!==a.isOrdinal)return i.isOrdinal?1:-1;const e=i.isOrdinal?o:s,n=e.indexOf(i.form),r=e.indexOf(a.form);return-1!==n&&-1!==r?n-r:i.form.localeCompare(a.form)}const l=t.localeCompare(e,void 0,{sensitivity:"base"});return 0===l?t.localeCompare(e,void 0,{sensitivity:"case"}):l});for(const r of i)n[r]=u(t[r],e);return n}function p(t,e,n,r,a,l=[],p=new Set,d=!1){const{keySeparator:g=".",sort:y=!0,removeUnusedKeys:h=!0,primaryLanguage:m,defaultValue:x="",pluralSeparator:S="_",contextSeparator:O="_"}=n.extract,$=new Set;let v=[],w=[];try{const t=new Intl.PluralRules(r,{type:"cardinal"}),e=new Intl.PluralRules(r,{type:"ordinal"});v=t.resolvedOptions().pluralCategories,w=e.resolvedOptions().pluralCategories,v.forEach(t=>$.add(t)),e.resolvedOptions().pluralCategories.forEach(t=>$.add(`ordinal_${t}`))}catch(t){const e=m||"en",n=new Intl.PluralRules(e,{type:"cardinal"}),r=new Intl.PluralRules(e,{type:"ordinal"});v=n.resolvedOptions().pluralCategories,w=r.resolvedOptions().pluralCategories,v.forEach(t=>$.add(t)),r.resolvedOptions().pluralCategories.forEach(t=>$.add(`ordinal_${t}`))}const b=n.extract.preservePatterns||[],j="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",k=t=>{if(l.some(e=>e.test(t)))return!0;for(const e of b)if("string"==typeof e){if(e.endsWith(`${j}*`)){const t=e.slice(0,-(j.length+1));if("*"===t||a&&t===a)return!0}if(e.includes(j)&&a){const[n,r]=e.split(j);if(n===a){if(f(r).test(t))return!0}}}return!1},P=t.filter(({key:t,hasCount:e,isOrdinal:n})=>{if((t=>{if(l.some(e=>e.test(t)))return!0;for(const t of b)if("string"==typeof t&&t.endsWith(`${j}*`)){const e=t.slice(0,-(j.length+1));if("*"===e||a&&e===a)return!0}return!1})(t))return!1;if(!e)return!0;const r=t.split(S);if(e&&1===r.length)return!0;if(1===v.length&&"other"===v[0]&&1===r.length)return!0;if(n&&r.includes("ordinal")){const t=r[r.length-1];return $.has(`ordinal_${t}`)}if(e){const t=r[r.length-1];return $.has(t)}return!0}),C=new Set;for(const t of P)if(t.isExpandedPlural){const e=String(t.key).split(S);e.length>=3&&"ordinal"===e[e.length-2]?C.add(e.slice(0,-2).join(S)):C.add(e.slice(0,-1).join(S))}let N=h?{}:JSON.parse(JSON.stringify(e));const _=s(e,g??".");for(const t of _)if(k(t)){const n=o(e,t,g??".");i(N,t,n,g??".")}if(h){const t=s(e,g??".");for(const n of t){const t=n.split(S);if("zero"===t[t.length-1]){const r=t.slice(0,-1).join(S);if(P.some(({key:t})=>t.split(S).slice(0,-1).join(S)===r)){const t=o(e,n,g??".");i(N,n,t,g??".")}}}}for(const{key:t,defaultValue:s,explicitDefault:l,hasCount:f,isExpandedPlural:u,isOrdinal:y}of P){if(f&&!u){const e=String(t).split(S);let n=t;if(e.length>=3&&"ordinal"===e[e.length-2]?n=e.slice(0,-2).join(S):e.length>=2&&(n=e.slice(0,-1).join(S)),C.has(n))continue}if(f&&!u){if(1===String(t).split(S).length&&r!==m){const l=t;if(C.has(l));else{const t=y?w:v;for(const f of t){const t=y?`${l}${S}ordinal${S}${f}`:`${l}${S}${f}`,u=o(e,t,g??".");if(void 0===u){let e;e="string"==typeof s?s:c(x,String(l),a||n?.extract?.defaultNS||"translation",r,s),i(N,t,e,g??".")}else i(N,t,u,g??".")}}continue}}const h=o(e,t,g??"."),$=!1===g||!P.some(e=>e.key!==t&&e.key.startsWith(`${t}${g}`)),b="object"==typeof h&&null!==h&&(p.has(t)||!s||s===t),j="object"==typeof h&&null!==h&&$&&!p.has(t)&&!b;if(b){i(N,t,h,g??".");continue}let k;if(void 0===h||j)if(r===m)if(d){const e=s&&(s===t||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));k=s&&!e?s:c(x,t,a||n?.extract?.defaultNS||"translation",r,s)}else k=s||t;else k=c(x,t,a||n?.extract?.defaultNS||"translation",r,s);else if(r===m&&d){const e=s&&(s===t||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));k=(t.includes(S)||t.includes(O))&&!l?h:s&&!e?s:h}else k=h;i(N,t,k,g??".")}if(!0===y)return u(N,n);if("function"==typeof y){const t={},e=Object.keys(N),r=new Map;for(const t of P){const e=!1===g?t.key:t.key.split(g)[0];r.has(e)||r.set(e,t)}e.sort((t,e)=>{if("function"==typeof y){const n=r.get(t),s=r.get(e);if(n&&s)return y(n,s)}return t.localeCompare(e,void 0,{sensitivity:"base"})});for(const r of e)t[r]=u(N[r],n);N=t}return N}async function d(s,o,i,{syncPrimaryWithDefaults:c=!1}={}){i.extract.primaryLanguage||=i.locales[0]||"en",i.extract.secondaryLanguages||=i.locales.filter(t=>t!==i?.extract?.primaryLanguage);const u=[...i.extract.preservePatterns||[]],d=i.extract.indentation??2;for(const t of o)u.push(`${t}.*`);const g=u.map(f),y="__no_namespace__",h=new Map;for(const t of s.values()){const e=t.nsIsImplicit&&!1===i.extract.defaultNS?y:String(t.ns??i.extract.defaultNS??"translation");h.has(e)||h.set(e,[]),h.get(e).push(t)}const m=[],x=Array.isArray(i.extract.ignore)?i.extract.ignore:i.extract.ignore?[i.extract.ignore]:[];for(const s of i.locales){if(i.extract.mergeNamespaces||"string"==typeof i.extract.output&&!i.extract.output.includes("{{namespace}}")){const e={},n=a(i.extract.output,s),r=t(process.cwd(),n),f=await l(r)||{},u=Object.keys(f),x=!1!==i.extract.defaultNS&&u.some(t=>{const e=f[t];return"object"==typeof e&&null!==e&&!Array.isArray(e)})?new Set([...h.keys(),...u]):new Set([...h.keys(),y]);for(const t of x){const n=h.get(t)||[];if(t===y){const t=p(n,f,i,s,void 0,g,o,c);Object.assign(e,t)}else{const r=f[t]||{};e[t]=p(n,r,i,s,t,g,o,c)}}const S=JSON.stringify(f,null,d),O=JSON.stringify(e,null,d);m.push({path:r,updated:O!==S,newTranslations:e,existingTranslations:f})}else{const f=new Set(h.keys()),u=a(i.extract.output,s,"*").replace(/\\/g,"/"),y=await r(u,{ignore:x});for(const t of y)f.add(e(t,n(t)));for(const e of f){const n=h.get(e)||[],r=a(i.extract.output,s,e),f=t(process.cwd(),r),u=await l(f)||{},y=p(n,u,i,s,e,g,o,c),x=JSON.stringify(u,null,d),S=JSON.stringify(y,null,d);m.push({path:f,updated:S!==x,newTranslations:y,existingTranslations:u})}}}return m}export{d as getTranslations};
+import{resolve as t,basename as e,extname as n}from"node:path";import{glob as r}from"glob";import{getNestedKeys as s,getNestedValue as o,setNestedValue as i}from"../../utils/nested-object.js";import{getOutputPath as a,loadTranslationFile as l}from"../../utils/file-utils.js";import{resolveDefaultValue as c}from"../../utils/default-value.js";function f(t){const e=`^${t.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*")}$`;return new RegExp(e)}function u(t,e){if("object"!=typeof t||null===t||Array.isArray(t))return t;const n={},r=e?.extract?.pluralSeparator??"_",s=["zero","one","two","few","many","other"],o=s.map(t=>`ordinal${r}${t}`),i=Object.keys(t).sort((t,e)=>{const n=t=>{for(const e of o)if(t.endsWith(`${r}${e}`)){return{base:t.slice(0,-(r.length+e.length)),form:e,isOrdinal:!0,isPlural:!0,fullKey:t}}for(const e of s)if(t.endsWith(`${r}${e}`)){return{base:t.slice(0,-(r.length+e.length)),form:e,isOrdinal:!1,isPlural:!0,fullKey:t}}return{base:t,form:"",isOrdinal:!1,isPlural:!1,fullKey:t}},i=n(t),a=n(e);if(i.isPlural&&a.isPlural){const t=i.base.localeCompare(a.base,void 0,{sensitivity:"base"});if(0!==t)return t;if(i.isOrdinal!==a.isOrdinal)return i.isOrdinal?1:-1;const e=i.isOrdinal?o:s,n=e.indexOf(i.form),r=e.indexOf(a.form);return-1!==n&&-1!==r?n-r:i.form.localeCompare(a.form)}const l=t.localeCompare(e,void 0,{sensitivity:"base"});return 0===l?t.localeCompare(e,void 0,{sensitivity:"case"}):l});for(const r of i)n[r]=u(t[r],e);return n}function p(t,e,n,r,a,l=[],p=new Set,d=!1){const{keySeparator:g=".",sort:y=!0,removeUnusedKeys:h=!0,primaryLanguage:m,defaultValue:x="",pluralSeparator:S="_",contextSeparator:O="_"}=n.extract,$=new Set;let v=[],w=[];try{const t=new Intl.PluralRules(r,{type:"cardinal"}),e=new Intl.PluralRules(r,{type:"ordinal"});v=t.resolvedOptions().pluralCategories,w=e.resolvedOptions().pluralCategories,v.forEach(t=>$.add(t)),e.resolvedOptions().pluralCategories.forEach(t=>$.add(`ordinal_${t}`))}catch(t){const e=m||"en",n=new Intl.PluralRules(e,{type:"cardinal"}),r=new Intl.PluralRules(e,{type:"ordinal"});v=n.resolvedOptions().pluralCategories,w=r.resolvedOptions().pluralCategories,v.forEach(t=>$.add(t)),r.resolvedOptions().pluralCategories.forEach(t=>$.add(`ordinal_${t}`))}const b=n.extract.preservePatterns||[],j="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",k=t=>{if(l.some(e=>e.test(t)))return!0;for(const e of b)if("string"==typeof e){if(e.endsWith(`${j}*`)){const t=e.slice(0,-(j.length+1));if("*"===t||a&&t===a)return!0}if(e.includes(j)&&a){const[n,r]=e.split(j);if(n===a){if(f(r).test(t))return!0}}}return!1},P=t.filter(({key:t,hasCount:e,isOrdinal:n})=>{if((t=>{if(l.some(e=>e.test(t)))return!0;for(const t of b)if("string"==typeof t&&t.endsWith(`${j}*`)){const e=t.slice(0,-(j.length+1));if("*"===e||a&&e===a)return!0}return!1})(t))return!1;if(!e)return!0;const r=t.split(S);if(e&&1===r.length)return!0;if(1===v.length&&"other"===v[0]&&1===r.length)return!0;if(n&&r.includes("ordinal")){const t=r[r.length-1];return $.has(`ordinal_${t}`)}if(e){const t=r[r.length-1];return $.has(t)}return!0}),C=new Set;for(const t of P)if(t.isExpandedPlural){const e=String(t.key).split(S);e.length>=3&&"ordinal"===e[e.length-2]?C.add(e.slice(0,-2).join(S)):C.add(e.slice(0,-1).join(S))}let N=h?{}:JSON.parse(JSON.stringify(e));const _=s(e,g??".");for(const t of _)if(k(t)){const n=o(e,t,g??".");i(N,t,n,g??".")}if(h){const t=s(e,g??".");for(const n of t){const t=n.split(S);if("zero"===t[t.length-1]){const r=t.slice(0,-1).join(S);if(P.some(({key:t})=>t.split(S).slice(0,-1).join(S)===r)){const t=o(e,n,g??".");i(N,n,t,g??".")}}}}for(const{key:t,defaultValue:s,explicitDefault:l,hasCount:f,isExpandedPlural:u,isOrdinal:y}of P){if(f&&!u){const e=String(t).split(S);let n=t;if(e.length>=3&&"ordinal"===e[e.length-2]?n=e.slice(0,-2).join(S):e.length>=2&&(n=e.slice(0,-1).join(S)),C.has(n))continue}if(f&&!u){if(1===String(t).split(S).length&&r!==m){const l=t;if(C.has(l));else{const t=y?w:v;for(const f of t){const t=y?`${l}${S}ordinal${S}${f}`:`${l}${S}${f}`,u=o(e,t,g??".");if(void 0===u){let e;e="string"==typeof s?s:c(x,String(l),a||n?.extract?.defaultNS||"translation",r,s),i(N,t,e,g??".")}else i(N,t,u,g??".")}}continue}}const h=o(e,t,g??"."),$=!1===g||!P.some(e=>e.key!==t&&e.key.startsWith(`${t}${g}`)),b="object"==typeof h&&null!==h&&(p.has(t)||!s||s===t),k="object"==typeof h&&null!==h&&$&&!p.has(t)&&!b;if(b){i(N,t,h,g??".");continue}let _;if(void 0===h||k)if(r===m)if(d){const e=s&&(s===t||s.includes(j)||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));_=s&&!e?s:c(x,t,a||n?.extract?.defaultNS||"translation",r,s)}else _=s||t;else _=c(x,t,a||n?.extract?.defaultNS||"translation",r,s);else if(r===m&&d){const e=s&&(s===t||s.includes(j)||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));_=(t.includes(S)||t.includes(O))&&!l?h:s&&!e?s:h}else _=h;i(N,t,_,g??".")}if(!0===y)return u(N,n);if("function"==typeof y){const t={},e=Object.keys(N),r=new Map;for(const t of P){const e=!1===g?t.key:t.key.split(g)[0];r.has(e)||r.set(e,t)}e.sort((t,e)=>{if("function"==typeof y){const n=r.get(t),s=r.get(e);if(n&&s)return y(n,s)}return t.localeCompare(e,void 0,{sensitivity:"base"})});for(const r of e)t[r]=u(N[r],n);N=t}return N}async function d(s,o,i,{syncPrimaryWithDefaults:c=!1}={}){i.extract.primaryLanguage||=i.locales[0]||"en",i.extract.secondaryLanguages||=i.locales.filter(t=>t!==i?.extract?.primaryLanguage);const u=[...i.extract.preservePatterns||[]],d=i.extract.indentation??2;for(const t of o)u.push(`${t}.*`);const g=u.map(f),y="__no_namespace__",h=new Map;for(const t of s.values()){const e=t.nsIsImplicit&&!1===i.extract.defaultNS?y:String(t.ns??i.extract.defaultNS??"translation");h.has(e)||h.set(e,[]),h.get(e).push(t)}const m=[],x=Array.isArray(i.extract.ignore)?i.extract.ignore:i.extract.ignore?[i.extract.ignore]:[];for(const s of i.locales){if(i.extract.mergeNamespaces||"string"==typeof i.extract.output&&!i.extract.output.includes("{{namespace}}")){const e={},n=a(i.extract.output,s),r=t(process.cwd(),n),f=await l(r)||{},u=Object.keys(f),x=!1!==i.extract.defaultNS&&u.some(t=>{const e=f[t];return"object"==typeof e&&null!==e&&!Array.isArray(e)})?new Set([...h.keys(),...u]):new Set([...h.keys(),y]);for(const t of x){const n=h.get(t)||[];if(t===y){const t=p(n,f,i,s,void 0,g,o,c);Object.assign(e,t)}else{const r=f[t]||{};e[t]=p(n,r,i,s,t,g,o,c)}}const S=JSON.stringify(f,null,d),O=JSON.stringify(e,null,d);m.push({path:r,updated:O!==S,newTranslations:e,existingTranslations:f})}else{const f=new Set(h.keys()),u=a(i.extract.output,s,"*").replace(/\\/g,"/"),y=await r(u,{ignore:x});for(const t of y)f.add(e(t,n(t)));for(const e of f){const n=h.get(e)||[],r=a(i.extract.output,s,e),f=t(process.cwd(),r),u=await l(f)||{},y=p(n,u,i,s,e,g,o,c),x=JSON.stringify(u,null,d),S=JSON.stringify(y,null,d);m.push({path:f,updated:S!==x,newTranslations:y,existingTranslations:u})}}}return m}export{d as getTranslations};

package/package.json

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

package/src/cli.ts

@@ -22,7 +22,7 @@ const program = new Command()
 program
   .name('i18next-cli')
   .description('A unified, high-performance i18next CLI.')
-  .version('1.21.0')
+  .version('1.21.1')
 
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)')

package/src/extractor/core/translation-manager.ts

@@ -401,6 +401,8 @@ function buildNewTranslationsForNs (
           // - Otherwise use empty string for new keys
           const isDerivedDefault = defaultValue && (
             defaultValue === key || // Exact match
+            // Check if defaultValue includes namespace prefix (e.g., "translation:app.key")
+            defaultValue.includes(nsSep) ||
             // For variant keys (plural/context), check if defaultValue is the base
             (key !== defaultValue &&
             (key.startsWith(defaultValue + pluralSeparator) ||
@@ -422,6 +424,8 @@ function buildNewTranslationsForNs (
         // Only update when we have a meaningful defaultValue that's not derived from the key pattern.
         const isDerivedDefault = defaultValue && (
           defaultValue === key || // Exact match
+          // Check if defaultValue includes namespace prefix (e.g., "translation:app.key")
+          defaultValue.includes(nsSep) ||
           // For variant keys (plural/context), check if defaultValue is the base
           (key !== defaultValue &&
           (key.startsWith(defaultValue + pluralSeparator) ||

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;AA+enF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,EAAE,uBAA+B,EAAE,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9E,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAgH9B"}
+{"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;AAmfnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,EAAE,uBAA+B,EAAE,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9E,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAgH9B"}