i18next-cli 1.24.1 → 1.24.2

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.24.2](https://github.com/i18next/i18next-cli/compare/v1.24.1...v1.24.2) - 2025-11-12
+
+- **Extractor (`--sync-primary`):** Fixed a bug where default values containing colons (like `"fallback:"`) were incorrectly identified as namespace-prefixed keys, resulting in empty strings in translation files when using the `--sync-primary` flag. [#110](https://github.com/i18next/i18next-cli/issues/110)
+
 ## [1.24.1](https://github.com/i18next/i18next-cli/compare/v1.24.0...v1.24.1) - 2025-11-12
 
 - Windows fix for new **CLI:** command `rename-key`

package/dist/cjs/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-"use strict";var e=require("commander"),o=require("chokidar"),t=require("glob"),n=require("minimatch"),i=require("chalk"),r=require("./config.js"),a=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"),d=require("./init.js"),g=require("./linter.js"),f=require("./status.js"),p=require("./locize.js"),m=require("./rename-key.js");const y=new e.Command;y.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.24.1"),y.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),y.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 t=y.opts().config,i=await r.ensureConfig(t),a=async()=>{const o=await c.runExtractor(i,{isWatchMode:!!e.watch,isDryRun:!!e.dryRun,syncPrimaryWithDefaults:!!e.syncPrimary});return e.ci&&!o?(console.log("✅ No files were updated."),process.exit(0)):e.ci&&o&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),o};if(await a(),e.watch){console.log("\nWatching for changes...");const e=await x(i.extract.input),t=h(i.extract.ignore),r=w(i.extract.output),c=[...t,...r].filter(Boolean),s=e.filter(e=>!c.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}catch(e){console.error("Error running extractor:",e),process.exit(1)}}),y.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,o)=>{const t=y.opts().config;let n=await r.loadConfig(t);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await a.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 f.runStatus(n,{detail:e,namespace:o.namespace})}),y.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 t=y.opts().config,i=await r.ensureConfig(t),a=()=>s.runTypesGenerator(i);if(await a(),e.watch){console.log("\nWatching for changes...");const e=await x(i.types?.input||[]),t=[...h(i.extract?.ignore)].filter(Boolean),r=e.filter(e=>!t.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(r,{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}),y.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=y.opts().config,o=await r.ensureConfig(e);await l.runSyncer(o)}),y.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await u.runMigrator(e)}),y.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(d.runInit),y.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 t=y.opts().config,c=async()=>{let e=await r.loadConfig(t);if(!e){console.log(i.blue("No config file found. Attempting to detect project structure..."));const o=await a.detectConfig();o||(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=o}await g.runLinterCli(e)};if(await c(),e.watch){console.log("\nWatching for changes...");const e=await r.loadConfig(t);if(e?.extract?.input){const t=await x(e.extract.input),i=[...h(e.extract.ignore),...w(e.extract.output)].filter(Boolean),r=t.filter(e=>!i.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),c()})}}}),y.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 o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeSync(t,e)}),y.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeDownload(t,e)}),y.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeMigrate(t,e)}),y.command("rename-key <oldKey> <newKey>").description("Rename a translation key across all source files and translation files.").option("--dry-run","Preview changes without modifying files").action(async(e,o,t)=>{try{const n=y.opts().config,a=await r.ensureConfig(n),c=await m.runRenameKey(a,e,o,t);c.success||(c.conflicts&&(console.error(i.red("\n❌ Conflicts detected:")),c.conflicts.forEach(e=>console.error(`   - ${e}`))),c.error&&console.error(i.red(`\n❌ ${c.error}`)),process.exit(1));0===c.sourceFiles.reduce((e,o)=>e+o.changes,0)&&console.log(i.yellow(`\n⚠️  No usages found for "${e}"`))}catch(e){console.error(i.red("Error renaming key:"),e),process.exit(1)}}),y.parse(process.argv);const h=e=>Array.isArray(e)?e:e?[e]:[],w=e=>e&&"string"==typeof e?[e.replace(/\{\{[^}]+\}\}/g,"*")]:[],x=async(e=[])=>{const o=h(e),n=await Promise.all(o.map(e=>t.glob(e||"",{nodir:!0})));return Array.from(new Set(n.flat()))};
+"use strict";var e=require("commander"),o=require("chokidar"),t=require("glob"),n=require("minimatch"),i=require("chalk"),r=require("./config.js"),a=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"),d=require("./init.js"),g=require("./linter.js"),f=require("./status.js"),p=require("./locize.js"),m=require("./rename-key.js");const y=new e.Command;y.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.24.2"),y.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),y.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 t=y.opts().config,i=await r.ensureConfig(t),a=async()=>{const o=await c.runExtractor(i,{isWatchMode:!!e.watch,isDryRun:!!e.dryRun,syncPrimaryWithDefaults:!!e.syncPrimary});return e.ci&&!o?(console.log("✅ No files were updated."),process.exit(0)):e.ci&&o&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),o};if(await a(),e.watch){console.log("\nWatching for changes...");const e=await x(i.extract.input),t=h(i.extract.ignore),r=w(i.extract.output),c=[...t,...r].filter(Boolean),s=e.filter(e=>!c.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}catch(e){console.error("Error running extractor:",e),process.exit(1)}}),y.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,o)=>{const t=y.opts().config;let n=await r.loadConfig(t);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await a.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 f.runStatus(n,{detail:e,namespace:o.namespace})}),y.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 t=y.opts().config,i=await r.ensureConfig(t),a=()=>s.runTypesGenerator(i);if(await a(),e.watch){console.log("\nWatching for changes...");const e=await x(i.types?.input||[]),t=[...h(i.extract?.ignore)].filter(Boolean),r=e.filter(e=>!t.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(r,{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}),y.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=y.opts().config,o=await r.ensureConfig(e);await l.runSyncer(o)}),y.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await u.runMigrator(e)}),y.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(d.runInit),y.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 t=y.opts().config,c=async()=>{let e=await r.loadConfig(t);if(!e){console.log(i.blue("No config file found. Attempting to detect project structure..."));const o=await a.detectConfig();o||(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=o}await g.runLinterCli(e)};if(await c(),e.watch){console.log("\nWatching for changes...");const e=await r.loadConfig(t);if(e?.extract?.input){const t=await x(e.extract.input),i=[...h(e.extract.ignore),...w(e.extract.output)].filter(Boolean),r=t.filter(e=>!i.some(o=>n.minimatch(e,o,{dot:!0})));o.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),c()})}}}),y.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 o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeSync(t,e)}),y.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeDownload(t,e)}),y.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const o=y.opts().config,t=await r.ensureConfig(o);await p.runLocizeMigrate(t,e)}),y.command("rename-key <oldKey> <newKey>").description("Rename a translation key across all source files and translation files.").option("--dry-run","Preview changes without modifying files").action(async(e,o,t)=>{try{const n=y.opts().config,a=await r.ensureConfig(n),c=await m.runRenameKey(a,e,o,t);c.success||(c.conflicts&&(console.error(i.red("\n❌ Conflicts detected:")),c.conflicts.forEach(e=>console.error(`   - ${e}`))),c.error&&console.error(i.red(`\n❌ ${c.error}`)),process.exit(1));0===c.sourceFiles.reduce((e,o)=>e+o.changes,0)&&console.log(i.yellow(`\n⚠️  No usages found for "${e}"`))}catch(e){console.error(i.red("Error renaming key:"),e),process.exit(1)}}),y.parse(process.argv);const h=e=>Array.isArray(e)?e:e?[e]:[],w=e=>e&&"string"==typeof e?[e.replace(/\{\{[^}]+\}\}/g,"*")]:[],x=async(e=[])=>{const o=h(e),n=await Promise.all(o.map(e=>t.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"),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,s,n){if(0===t.size)return!1;let r=e;const o=["zero","one","two","few","many","other"];for(const e of o){if(r.endsWith(`${s}${e}`)){r=r.slice(0,-(s.length+e.length));break}if(r.endsWith(`${s}ordinal${s}${e}`)){r=r.slice(0,-(s.length+7+s.length+e.length));break}}const a=r.split(n);if(a.length>1)for(let e=1;e<a.length;e++){const s=a.slice(0,-e).join(n);if(t.has(s))return!0}return!!t.has(r)}function i(e,t,s){if("object"!=typeof e||null===e||Array.isArray(e))return e;const n={},r=t?.extract?.pluralSeparator??"_",o=["zero","one","two","few","many","other"],a=o.map(e=>`ordinal${r}${e}`),l=Object.keys(e).sort((e,t)=>{const n=e=>{for(const t of a)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 o)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}},i=n(e),l=n(t);if(i.isPlural&&l.isPlural){const e=s?s(i.base,l.base):i.base.localeCompare(l.base,void 0,{sensitivity:"base"});if(0!==e)return e;if(i.isOrdinal!==l.isOrdinal)return i.isOrdinal?1:-1;const t=i.isOrdinal?a:o,n=t.indexOf(i.form),r=t.indexOf(l.form);return-1!==n&&-1!==r?n-r:i.form.localeCompare(l.form)}if(s)return s(e,t);const c=e.localeCompare(t,void 0,{sensitivity:"base"});return 0===c?e.localeCompare(t,void 0,{sensitivity:"case"}):c});for(const r of l)n[r]=i(e[r],t,s);return n}function l(e,t,n,l,c,u=[],f=new Set,d=!1){const{keySeparator:p=".",sort:g=!0,removeUnusedKeys:h=!0,primaryLanguage:y,defaultValue:x="",pluralSeparator:m="_",contextSeparator:S="_",preserveContextVariants:O=!1}=n.extract,$=new Set;if(O)for(const{keyAcceptingContext:t}of e)t&&$.add(t);const v=new Set;let w=[],N=[];try{const e=new Intl.PluralRules(l,{type:"cardinal"}),t=new Intl.PluralRules(l,{type:"ordinal"});w=e.resolvedOptions().pluralCategories,N=t.resolvedOptions().pluralCategories,w.forEach(e=>v.add(e)),t.resolvedOptions().pluralCategories.forEach(e=>v.add(`ordinal_${e}`))}catch(e){const t=y||"en",s=new Intl.PluralRules(t,{type:"cardinal"}),n=new Intl.PluralRules(t,{type:"ordinal"});w=s.resolvedOptions().pluralCategories,N=n.resolvedOptions().pluralCategories,w.forEach(e=>v.add(e)),n.resolvedOptions().pluralCategories.forEach(e=>v.add(`ordinal_${e}`))}const b=n.extract.preservePatterns||[],k="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",j=e=>{if(u.some(t=>t.test(e)))return!0;for(const t of b)if("string"==typeof t){if(t.endsWith(`${k}*`)){const e=t.slice(0,-(k.length+1));if("*"===e||c&&e===c)return!0}if(t.includes(k)&&c){const[s,n]=t.split(k);if(s===c){if(o(n).test(e))return!0}}}return!1},P=e.filter(({key:e,hasCount:t,isOrdinal:s})=>{if((e=>{if(u.some(t=>t.test(e)))return!0;for(const e of b)if("string"==typeof e&&e.endsWith(`${k}*`)){const t=e.slice(0,-(k.length+1));if("*"===t||c&&t===c)return!0}return!1})(e))return!1;if(!t)return!0;const n=e.split(m);if(t&&1===n.length)return!0;if(1===w.length&&"other"===w[0]&&1===n.length)return!0;if(s&&n.includes("ordinal")){const e=n[n.length-1];return v.has(`ordinal_${e}`)}if(t){const e=n[n.length-1];return v.has(e)}return!0}),V=new Set;for(const e of P)if(e.isExpandedPlural){const t=String(e.key).split(m);t.length>=3&&"ordinal"===t[t.length-2]?V.add(t.slice(0,-2).join(m)):V.add(t.slice(0,-1).join(m))}let C=h?{}:JSON.parse(JSON.stringify(t));const W=s.getNestedKeys(t,p??".");for(const e of W){const n=j(e),r=!n&&a(e,$,m,S);if(n||O&&r){const n=s.getNestedValue(t,e,p??".");s.setNestedValue(C,e,n,p??".")}}if(h){const e=s.getNestedKeys(t,p??".");for(const n of e){const e=n.split(m);if("zero"===e[e.length-1]){const r=e.slice(0,-1).join(m);if(P.some(({key:e})=>e.split(m).slice(0,-1).join(m)===r)){const e=s.getNestedValue(t,n,p??".");s.setNestedValue(C,n,e,p??".")}}}}for(const{key:e,defaultValue:o,explicitDefault:a,hasCount:i,isExpandedPlural:u,isOrdinal:g}of P){if(i&&!u){const t=String(e).split(m);let s=e;if(t.length>=3&&"ordinal"===t[t.length-2]?s=t.slice(0,-2).join(m):t.length>=2&&(s=t.slice(0,-1).join(m)),V.has(s))continue}if(i&&!u){if(1===String(e).split(m).length&&l!==y){const a=e;if(V.has(a));else{const e=g?N:w;for(const i of e){const e=g?`${a}${m}ordinal${m}${i}`:`${a}${m}${i}`,u=s.getNestedValue(t,e,p??".");if(void 0===u){let t;t="string"==typeof o?o:r.resolveDefaultValue(x,String(a),c||n?.extract?.defaultNS||"translation",l,o),s.setNestedValue(C,e,t,p??".")}else s.setNestedValue(C,e,u,p??".")}}continue}}const h=s.getNestedValue(t,e,p??"."),O=!1===p||!P.some(t=>t.key!==e&&t.key.startsWith(`${e}${p}`)),$="object"==typeof h&&null!==h&&(f.has(e)||!o||o===e),v="object"==typeof h&&null!==h&&O&&!f.has(e)&&!$;if($){s.setNestedValue(C,e,h,p??".");continue}let b;if(void 0===h||v)if(l===y)if(d){const t=o&&(o===e||o.includes(k)||e!==o&&(e.startsWith(o+m)||e.startsWith(o+S)));b=o&&!t?o:r.resolveDefaultValue(x,e,c||n?.extract?.defaultNS||"translation",l,o)}else b=o||e;else b=r.resolveDefaultValue(x,e,c||n?.extract?.defaultNS||"translation",l,o);else if(l===y&&d){const t=o&&(o===e||o.includes(k)||e!==o&&(e.startsWith(o+m)||e.startsWith(o+S)));b=(e.includes(m)||e.includes(S))&&!a?h:o&&!t?o:h}else b=h;s.setNestedValue(C,e,b,p??".")}if(!0===g)return i(C,n);if("function"==typeof g){const t={},s=Object.keys(C),r=new Map;for(const t of e)if(r.set(String(t.key),t),p){const e=String(t.key).split(p)[0];r.has(e)||r.set(e,t)}const o=(e,t)=>{const s=r.get(e),n=r.get(t);if(s&&n)return g(s,n);return g({key:e},{key:t})};s.sort(o);for(const e of s)t[e]=i(C[e],n,o);C=t}return C}exports.getTranslations=async function(s,r,a,{syncPrimaryWithDefaults:i=!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=[],h=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),h=await n.loadTranslationFile(c)||{},y=Object.keys(h),x=!1!==a.extract.defaultNS&&y.some(e=>{const t=h[e];return"object"==typeof t&&null!==t&&!Array.isArray(t)})?new Set([...p.keys(),...y]):new Set([...p.keys(),d]);for(const e of x){const n=p.get(e)||[];if(e===d){const e=l(n,h,a,s,void 0,f,r,i);Object.assign(t,e)}else{const o=h[e]||{};t[e]=l(n,o,a,s,e,f,r,i)}}const m=JSON.stringify(h,null,u),S=JSON.stringify(t,null,u);g.push({path:c,updated:S!==m,newTranslations:t,existingTranslations:h})}else{const o=new Set(p.keys()),c=n.getOutputPath(a.extract.output,s,"*").replace(/\\/g,"/"),d=await t.glob(c,{ignore:h});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),h=await n.loadTranslationFile(d)||{},y=l(o,h,a,s,t,f,r,i),x=JSON.stringify(h,null,u),m=JSON.stringify(y,null,u);g.push({path:d,updated:m!==x,newTranslations:y,existingTranslations:h})}}}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,s,n){if(0===t.size)return!1;let r=e;const o=["zero","one","two","few","many","other"];for(const e of o){if(r.endsWith(`${s}${e}`)){r=r.slice(0,-(s.length+e.length));break}if(r.endsWith(`${s}ordinal${s}${e}`)){r=r.slice(0,-(s.length+7+s.length+e.length));break}}const a=r.split(n);if(a.length>1)for(let e=1;e<a.length;e++){const s=a.slice(0,-e).join(n);if(t.has(s))return!0}return!!t.has(r)}function i(e,t,s){if("object"!=typeof e||null===e||Array.isArray(e))return e;const n={},r=t?.extract?.pluralSeparator??"_",o=["zero","one","two","few","many","other"],a=o.map(e=>`ordinal${r}${e}`),l=Object.keys(e).sort((e,t)=>{const n=e=>{for(const t of a)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 o)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}},i=n(e),l=n(t);if(i.isPlural&&l.isPlural){const e=s?s(i.base,l.base):i.base.localeCompare(l.base,void 0,{sensitivity:"base"});if(0!==e)return e;if(i.isOrdinal!==l.isOrdinal)return i.isOrdinal?1:-1;const t=i.isOrdinal?a:o,n=t.indexOf(i.form),r=t.indexOf(l.form);return-1!==n&&-1!==r?n-r:i.form.localeCompare(l.form)}if(s)return s(e,t);const c=e.localeCompare(t,void 0,{sensitivity:"base"});return 0===c?e.localeCompare(t,void 0,{sensitivity:"case"}):c});for(const r of l)n[r]=i(e[r],t,s);return n}function l(e,t,n,l,c,u=[],f=new Set,d=!1){const{keySeparator:p=".",sort:g=!0,removeUnusedKeys:h=!0,primaryLanguage:y,defaultValue:x="",pluralSeparator:$="_",contextSeparator:m="_",preserveContextVariants:S=!1}=n.extract,O=new Set;if(S)for(const{keyAcceptingContext:t}of e)t&&O.add(t);const v=new Set;let w=[],N=[];try{const e=new Intl.PluralRules(l,{type:"cardinal"}),t=new Intl.PluralRules(l,{type:"ordinal"});w=e.resolvedOptions().pluralCategories,N=t.resolvedOptions().pluralCategories,w.forEach(e=>v.add(e)),t.resolvedOptions().pluralCategories.forEach(e=>v.add(`ordinal_${e}`))}catch(e){const t=y||"en",s=new Intl.PluralRules(t,{type:"cardinal"}),n=new Intl.PluralRules(t,{type:"ordinal"});w=s.resolvedOptions().pluralCategories,N=n.resolvedOptions().pluralCategories,w.forEach(e=>v.add(e)),n.resolvedOptions().pluralCategories.forEach(e=>v.add(`ordinal_${e}`))}const b=n.extract.preservePatterns||[],k="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",j=e=>{if(u.some(t=>t.test(e)))return!0;for(const t of b)if("string"==typeof t){if(t.endsWith(`${k}*`)){const e=t.slice(0,-(k.length+1));if("*"===e||c&&e===c)return!0}if(t.includes(k)&&c){const[s,n]=t.split(k);if(s===c){if(o(n).test(e))return!0}}}return!1},P=e.filter(({key:e,hasCount:t,isOrdinal:s})=>{if((e=>{if(u.some(t=>t.test(e)))return!0;for(const e of b)if("string"==typeof e&&e.endsWith(`${k}*`)){const t=e.slice(0,-(k.length+1));if("*"===t||c&&t===c)return!0}return!1})(e))return!1;if(!t)return!0;const n=e.split($);if(t&&1===n.length)return!0;if(1===w.length&&"other"===w[0]&&1===n.length)return!0;if(s&&n.includes("ordinal")){const e=n[n.length-1];return v.has(`ordinal_${e}`)}if(t){const e=n[n.length-1];return v.has(e)}return!0}),V=new Set;for(const e of P)if(e.isExpandedPlural){const t=String(e.key).split($);t.length>=3&&"ordinal"===t[t.length-2]?V.add(t.slice(0,-2).join($)):V.add(t.slice(0,-1).join($))}let C=h?{}:JSON.parse(JSON.stringify(t));const W=s.getNestedKeys(t,p??".");for(const e of W){const n=j(e),r=!n&&a(e,O,$,m);if(n||S&&r){const n=s.getNestedValue(t,e,p??".");s.setNestedValue(C,e,n,p??".")}}if(h){const e=s.getNestedKeys(t,p??".");for(const n of e){const e=n.split($);if("zero"===e[e.length-1]){const r=e.slice(0,-1).join($);if(P.some(({key:e})=>e.split($).slice(0,-1).join($)===r)){const e=s.getNestedValue(t,n,p??".");s.setNestedValue(C,n,e,p??".")}}}}for(const{key:e,defaultValue:o,explicitDefault:a,hasCount:i,isExpandedPlural:u,isOrdinal:g}of P){if(i&&!u){const t=String(e).split($);let s=e;if(t.length>=3&&"ordinal"===t[t.length-2]?s=t.slice(0,-2).join($):t.length>=2&&(s=t.slice(0,-1).join($)),V.has(s))continue}if(i&&!u){if(1===String(e).split($).length&&l!==y){const a=e;if(V.has(a));else{const e=g?N:w;for(const i of e){const e=g?`${a}${$}ordinal${$}${i}`:`${a}${$}${i}`,u=s.getNestedValue(t,e,p??".");if(void 0===u){let t;t="string"==typeof o?o:r.resolveDefaultValue(x,String(a),c||n?.extract?.defaultNS||"translation",l,o),s.setNestedValue(C,e,t,p??".")}else s.setNestedValue(C,e,u,p??".")}}continue}}const h=s.getNestedValue(t,e,p??"."),S=!1===p||!P.some(t=>t.key!==e&&t.key.startsWith(`${e}${p}`)),O="object"==typeof h&&null!==h&&(f.has(e)||!o||o===e),v="object"==typeof h&&null!==h&&S&&!f.has(e)&&!O;if(O){s.setNestedValue(C,e,h,p??".");continue}let b;if(void 0===h||v)if(l===y)if(d){const t=o&&(o===e||k&&c&&o===`${c}${k}${e}`||e!==o&&(e.startsWith(o+$)||e.startsWith(o+m)));b=o&&!t?o:r.resolveDefaultValue(x,e,c||n?.extract?.defaultNS||"translation",l,o)}else b=o||e;else b=r.resolveDefaultValue(x,e,c||n?.extract?.defaultNS||"translation",l,o);else if(l===y&&d){const t=o&&(o===e||k&&c&&o===`${c}${k}${e}`||e!==o&&(e.startsWith(o+$)||e.startsWith(o+m)));b=(e.includes($)||e.includes(m))&&!a?h:o&&!t?o:h}else b=h;s.setNestedValue(C,e,b,p??".")}if(!0===g)return i(C,n);if("function"==typeof g){const t={},s=Object.keys(C),r=new Map;for(const t of e)if(r.set(String(t.key),t),p){const e=String(t.key).split(p)[0];r.has(e)||r.set(e,t)}const o=(e,t)=>{const s=r.get(e),n=r.get(t);if(s&&n)return g(s,n);return g({key:e},{key:t})};s.sort(o);for(const e of s)t[e]=i(C[e],n,o);C=t}return C}exports.getTranslations=async function(s,r,a,{syncPrimaryWithDefaults:i=!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=[],h=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),h=await n.loadTranslationFile(c)||{},y=Object.keys(h),x=!1!==a.extract.defaultNS&&y.some(e=>{const t=h[e];return"object"==typeof t&&null!==t&&!Array.isArray(t)})?new Set([...p.keys(),...y]):new Set([...p.keys(),d]);for(const e of x){const n=p.get(e)||[];if(e===d){const e=l(n,h,a,s,void 0,f,r,i);Object.assign(t,e)}else{const o=h[e]||{};t[e]=l(n,o,a,s,e,f,r,i)}}const $=JSON.stringify(h,null,u),m=JSON.stringify(t,null,u);g.push({path:c,updated:m!==$,newTranslations:t,existingTranslations:h})}else{const o=new Set(p.keys()),c=n.getOutputPath(a.extract.output,s,"*").replace(/\\/g,"/"),d=await t.glob(c,{ignore:h});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),h=await n.loadTranslationFile(d)||{},y=l(o,h,a,s,t,f,r,i),x=JSON.stringify(h,null,u),$=JSON.stringify(y,null,u);g.push({path:d,updated:$!==x,newTranslations:y,existingTranslations:h})}}}return g};

package/dist/esm/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import{Command as o}from"commander";import e from"chokidar";import{glob as t}from"glob";import{minimatch as n}from"minimatch";import i 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 f}from"./migrator.js";import{runInit as m}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";import{runRenameKey as w}from"./rename-key.js";const x=new o;x.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.24.1"),x.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),x.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 o=>{try{const t=x.opts().config,i=await a(t),r=async()=>{const e=await s(i,{isWatchMode:!!o.watch,isDryRun:!!o.dryRun,syncPrimaryWithDefaults:!!o.syncPrimary});return o.ci&&!e?(console.log("✅ No files were updated."),process.exit(0)):o.ci&&e&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),e};if(await r(),o.watch){console.log("\nWatching for changes...");const o=await z(i.extract.input),t=j(i.extract.ignore),a=k(i.extract.output),c=[...t,...a].filter(Boolean),s=o.filter(o=>!c.some(e=>n(o,e,{dot:!0})));e.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),r()})}}catch(o){console.error("Error running extractor:",o),process.exit(1)}}),x.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(o,e)=>{const t=x.opts().config;let n=await r(t);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const o=await c();o||(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=o}await g(n,{detail:o,namespace:e.namespace})}),x.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 o=>{const t=x.opts().config,i=await a(t),r=()=>l(i);if(await r(),o.watch){console.log("\nWatching for changes...");const o=await z(i.types?.input||[]),t=[...j(i.extract?.ignore)].filter(Boolean),a=o.filter(o=>!t.some(e=>n(o,e,{dot:!0})));e.watch(a,{persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),r()})}}),x.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const o=x.opts().config,e=await a(o);await p(e)}),x.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async o=>{await f(o)}),x.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(m),x.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 o=>{const t=x.opts().config,a=async()=>{let o=await r(t);if(!o){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await c();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!")),o=e}await d(o)};if(await a(),o.watch){console.log("\nWatching for changes...");const o=await r(t);if(o?.extract?.input){const t=await z(o.extract.input),i=[...j(o.extract.ignore),...k(o.extract.output)].filter(Boolean),r=t.filter(o=>!i.some(e=>n(o,e,{dot:!0})));e.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),a()})}}}),x.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 o=>{const e=x.opts().config,t=await a(e);await u(t,o)}),x.command("locize-download").description("Download all translations from your locize project.").action(async o=>{const e=x.opts().config,t=await a(e);await y(t,o)}),x.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async o=>{const e=x.opts().config,t=await a(e);await h(t,o)}),x.command("rename-key <oldKey> <newKey>").description("Rename a translation key across all source files and translation files.").option("--dry-run","Preview changes without modifying files").action(async(o,e,t)=>{try{const n=x.opts().config,r=await a(n),c=await w(r,o,e,t);c.success||(c.conflicts&&(console.error(i.red("\n❌ Conflicts detected:")),c.conflicts.forEach(o=>console.error(`   - ${o}`))),c.error&&console.error(i.red(`\n❌ ${c.error}`)),process.exit(1));0===c.sourceFiles.reduce((o,e)=>o+e.changes,0)&&console.log(i.yellow(`\n⚠️  No usages found for "${o}"`))}catch(o){console.error(i.red("Error renaming key:"),o),process.exit(1)}}),x.parse(process.argv);const j=o=>Array.isArray(o)?o:o?[o]:[],k=o=>o&&"string"==typeof o?[o.replace(/\{\{[^}]+\}\}/g,"*")]:[],z=async(o=[])=>{const e=j(o),n=await Promise.all(e.map(o=>t(o||"",{nodir:!0})));return Array.from(new Set(n.flat()))};
+import{Command as o}from"commander";import e from"chokidar";import{glob as t}from"glob";import{minimatch as n}from"minimatch";import i 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 f}from"./migrator.js";import{runInit as m}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";import{runRenameKey as w}from"./rename-key.js";const x=new o;x.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.24.2"),x.option("-c, --config <path>","Path to i18next-cli config file (overrides detection)"),x.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 o=>{try{const t=x.opts().config,i=await a(t),r=async()=>{const e=await s(i,{isWatchMode:!!o.watch,isDryRun:!!o.dryRun,syncPrimaryWithDefaults:!!o.syncPrimary});return o.ci&&!e?(console.log("✅ No files were updated."),process.exit(0)):o.ci&&e&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),e};if(await r(),o.watch){console.log("\nWatching for changes...");const o=await z(i.extract.input),t=j(i.extract.ignore),a=k(i.extract.output),c=[...t,...a].filter(Boolean),s=o.filter(o=>!c.some(e=>n(o,e,{dot:!0})));e.watch(s,{ignored:/node_modules/,persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),r()})}}catch(o){console.error("Error running extractor:",o),process.exit(1)}}),x.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(o,e)=>{const t=x.opts().config;let n=await r(t);if(!n){console.log(i.blue("No config file found. Attempting to detect project structure..."));const o=await c();o||(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=o}await g(n,{detail:o,namespace:e.namespace})}),x.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 o=>{const t=x.opts().config,i=await a(t),r=()=>l(i);if(await r(),o.watch){console.log("\nWatching for changes...");const o=await z(i.types?.input||[]),t=[...j(i.extract?.ignore)].filter(Boolean),a=o.filter(o=>!t.some(e=>n(o,e,{dot:!0})));e.watch(a,{persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),r()})}}),x.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const o=x.opts().config,e=await a(o);await p(e)}),x.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async o=>{await f(o)}),x.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(m),x.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 o=>{const t=x.opts().config,a=async()=>{let o=await r(t);if(!o){console.log(i.blue("No config file found. Attempting to detect project structure..."));const e=await c();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!")),o=e}await d(o)};if(await a(),o.watch){console.log("\nWatching for changes...");const o=await r(t);if(o?.extract?.input){const t=await z(o.extract.input),i=[...j(o.extract.ignore),...k(o.extract.output)].filter(Boolean),r=t.filter(o=>!i.some(e=>n(o,e,{dot:!0})));e.watch(r,{ignored:/node_modules/,persistent:!0}).on("change",o=>{console.log(`\nFile changed: ${o}`),a()})}}}),x.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 o=>{const e=x.opts().config,t=await a(e);await u(t,o)}),x.command("locize-download").description("Download all translations from your locize project.").action(async o=>{const e=x.opts().config,t=await a(e);await y(t,o)}),x.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async o=>{const e=x.opts().config,t=await a(e);await h(t,o)}),x.command("rename-key <oldKey> <newKey>").description("Rename a translation key across all source files and translation files.").option("--dry-run","Preview changes without modifying files").action(async(o,e,t)=>{try{const n=x.opts().config,r=await a(n),c=await w(r,o,e,t);c.success||(c.conflicts&&(console.error(i.red("\n❌ Conflicts detected:")),c.conflicts.forEach(o=>console.error(`   - ${o}`))),c.error&&console.error(i.red(`\n❌ ${c.error}`)),process.exit(1));0===c.sourceFiles.reduce((o,e)=>o+e.changes,0)&&console.log(i.yellow(`\n⚠️  No usages found for "${o}"`))}catch(o){console.error(i.red("Error renaming key:"),o),process.exit(1)}}),x.parse(process.argv);const j=o=>Array.isArray(o)?o:o?[o]:[],k=o=>o&&"string"==typeof o?[o.replace(/\{\{[^}]+\}\}/g,"*")]:[],z=async(o=[])=>{const e=j(o),n=await Promise.all(e.map(o=>t(o||"",{nodir:!0})));return Array.from(new Set(n.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,n,r){if(0===e.size)return!1;let s=t;const o=["zero","one","two","few","many","other"];for(const t of o){if(s.endsWith(`${n}${t}`)){s=s.slice(0,-(n.length+t.length));break}if(s.endsWith(`${n}ordinal${n}${t}`)){s=s.slice(0,-(n.length+7+n.length+t.length));break}}const i=s.split(r);if(i.length>1)for(let t=1;t<i.length;t++){const n=i.slice(0,-t).join(r);if(e.has(n))return!0}return!!e.has(s)}function p(t,e,n){if("object"!=typeof t||null===t||Array.isArray(t))return t;const r={},s=e?.extract?.pluralSeparator??"_",o=["zero","one","two","few","many","other"],i=o.map(t=>`ordinal${s}${t}`),a=Object.keys(t).sort((t,e)=>{const r=t=>{for(const e of i)if(t.endsWith(`${s}${e}`)){return{base:t.slice(0,-(s.length+e.length)),form:e,isOrdinal:!0,isPlural:!0,fullKey:t}}for(const e of o)if(t.endsWith(`${s}${e}`)){return{base:t.slice(0,-(s.length+e.length)),form:e,isOrdinal:!1,isPlural:!0,fullKey:t}}return{base:t,form:"",isOrdinal:!1,isPlural:!1,fullKey:t}},a=r(t),l=r(e);if(a.isPlural&&l.isPlural){const t=n?n(a.base,l.base):a.base.localeCompare(l.base,void 0,{sensitivity:"base"});if(0!==t)return t;if(a.isOrdinal!==l.isOrdinal)return a.isOrdinal?1:-1;const e=a.isOrdinal?i:o,r=e.indexOf(a.form),s=e.indexOf(l.form);return-1!==r&&-1!==s?r-s:a.form.localeCompare(l.form)}if(n)return n(t,e);const c=t.localeCompare(e,void 0,{sensitivity:"base"});return 0===c?t.localeCompare(e,void 0,{sensitivity:"case"}):c});for(const s of a)r[s]=p(t[s],e,n);return r}function d(t,e,n,r,a,l=[],d=new Set,g=!1){const{keySeparator:h=".",sort:y=!0,removeUnusedKeys:m=!0,primaryLanguage:x,defaultValue:S="",pluralSeparator:$="_",contextSeparator:O="_",preserveContextVariants:w=!1}=n.extract,b=new Set;if(w)for(const{keyAcceptingContext:e}of t)e&&b.add(e);const v=new Set;let k=[],j=[];try{const t=new Intl.PluralRules(r,{type:"cardinal"}),e=new Intl.PluralRules(r,{type:"ordinal"});k=t.resolvedOptions().pluralCategories,j=e.resolvedOptions().pluralCategories,k.forEach(t=>v.add(t)),e.resolvedOptions().pluralCategories.forEach(t=>v.add(`ordinal_${t}`))}catch(t){const e=x||"en",n=new Intl.PluralRules(e,{type:"cardinal"}),r=new Intl.PluralRules(e,{type:"ordinal"});k=n.resolvedOptions().pluralCategories,j=r.resolvedOptions().pluralCategories,k.forEach(t=>v.add(t)),r.resolvedOptions().pluralCategories.forEach(t=>v.add(`ordinal_${t}`))}const C=n.extract.preservePatterns||[],P="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",N=t=>{if(l.some(e=>e.test(t)))return!0;for(const e of C)if("string"==typeof e){if(e.endsWith(`${P}*`)){const t=e.slice(0,-(P.length+1));if("*"===t||a&&t===a)return!0}if(e.includes(P)&&a){const[n,r]=e.split(P);if(n===a){if(f(r).test(t))return!0}}}return!1},W=t.filter(({key:t,hasCount:e,isOrdinal:n})=>{if((t=>{if(l.some(e=>e.test(t)))return!0;for(const t of C)if("string"==typeof t&&t.endsWith(`${P}*`)){const e=t.slice(0,-(P.length+1));if("*"===e||a&&e===a)return!0}return!1})(t))return!1;if(!e)return!0;const r=t.split($);if(e&&1===r.length)return!0;if(1===k.length&&"other"===k[0]&&1===r.length)return!0;if(n&&r.includes("ordinal")){const t=r[r.length-1];return v.has(`ordinal_${t}`)}if(e){const t=r[r.length-1];return v.has(t)}return!0}),_=new Set;for(const t of W)if(t.isExpandedPlural){const e=String(t.key).split($);e.length>=3&&"ordinal"===e[e.length-2]?_.add(e.slice(0,-2).join($)):_.add(e.slice(0,-1).join($))}let A=m?{}:JSON.parse(JSON.stringify(e));const E=s(e,h??".");for(const t of E){const n=N(t),r=!n&&u(t,b,$,O);if(n||w&&r){const n=o(e,t,h??".");i(A,t,n,h??".")}}if(m){const t=s(e,h??".");for(const n of t){const t=n.split($);if("zero"===t[t.length-1]){const r=t.slice(0,-1).join($);if(W.some(({key:t})=>t.split($).slice(0,-1).join($)===r)){const t=o(e,n,h??".");i(A,n,t,h??".")}}}}for(const{key:t,defaultValue:s,explicitDefault:l,hasCount:f,isExpandedPlural:u,isOrdinal:p}of W){if(f&&!u){const e=String(t).split($);let n=t;if(e.length>=3&&"ordinal"===e[e.length-2]?n=e.slice(0,-2).join($):e.length>=2&&(n=e.slice(0,-1).join($)),_.has(n))continue}if(f&&!u){if(1===String(t).split($).length&&r!==x){const l=t;if(_.has(l));else{const t=p?j:k;for(const f of t){const t=p?`${l}${$}ordinal${$}${f}`:`${l}${$}${f}`,u=o(e,t,h??".");if(void 0===u){let e;e="string"==typeof s?s:c(S,String(l),a||n?.extract?.defaultNS||"translation",r,s),i(A,t,e,h??".")}else i(A,t,u,h??".")}}continue}}const y=o(e,t,h??"."),m=!1===h||!W.some(e=>e.key!==t&&e.key.startsWith(`${t}${h}`)),w="object"==typeof y&&null!==y&&(d.has(t)||!s||s===t),b="object"==typeof y&&null!==y&&m&&!d.has(t)&&!w;if(w){i(A,t,y,h??".");continue}let v;if(void 0===y||b)if(r===x)if(g){const e=s&&(s===t||s.includes(P)||t!==s&&(t.startsWith(s+$)||t.startsWith(s+O)));v=s&&!e?s:c(S,t,a||n?.extract?.defaultNS||"translation",r,s)}else v=s||t;else v=c(S,t,a||n?.extract?.defaultNS||"translation",r,s);else if(r===x&&g){const e=s&&(s===t||s.includes(P)||t!==s&&(t.startsWith(s+$)||t.startsWith(s+O)));v=(t.includes($)||t.includes(O))&&!l?y:s&&!e?s:y}else v=y;i(A,t,v,h??".")}if(!0===y)return p(A,n);if("function"==typeof y){const e={},r=Object.keys(A),s=new Map;for(const e of t)if(s.set(String(e.key),e),h){const t=String(e.key).split(h)[0];s.has(t)||s.set(t,e)}const o=(t,e)=>{const n=s.get(t),r=s.get(e);if(n&&r)return y(n,r);return y({key:t},{key:e})};r.sort(o);for(const t of r)e[t]=p(A[t],n,o);A=e}return A}async function g(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||[]],p=i.extract.indentation??2;for(const t of o)u.push(`${t}.*`);const g=u.map(f),h="__no_namespace__",y=new Map;for(const t of s.values()){const e=t.nsIsImplicit&&!1===i.extract.defaultNS?h:String(t.ns??i.extract.defaultNS??"translation");y.has(e)||y.set(e,[]),y.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([...y.keys(),...u]):new Set([...y.keys(),h]);for(const t of x){const n=y.get(t)||[];if(t===h){const t=d(n,f,i,s,void 0,g,o,c);Object.assign(e,t)}else{const r=f[t]||{};e[t]=d(n,r,i,s,t,g,o,c)}}const S=JSON.stringify(f,null,p),$=JSON.stringify(e,null,p);m.push({path:r,updated:$!==S,newTranslations:e,existingTranslations:f})}else{const f=new Set(y.keys()),u=a(i.extract.output,s,"*").replace(/\\/g,"/"),h=await r(u,{ignore:x});for(const t of h)f.add(e(t,n(t)));for(const e of f){const n=y.get(e)||[],r=a(i.extract.output,s,e),f=t(process.cwd(),r),u=await l(f)||{},h=d(n,u,i,s,e,g,o,c),x=JSON.stringify(u,null,p),S=JSON.stringify(h,null,p);m.push({path:f,updated:S!==x,newTranslations:h,existingTranslations:u})}}}return m}export{g 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,n,r){if(0===e.size)return!1;let s=t;const o=["zero","one","two","few","many","other"];for(const t of o){if(s.endsWith(`${n}${t}`)){s=s.slice(0,-(n.length+t.length));break}if(s.endsWith(`${n}ordinal${n}${t}`)){s=s.slice(0,-(n.length+7+n.length+t.length));break}}const i=s.split(r);if(i.length>1)for(let t=1;t<i.length;t++){const n=i.slice(0,-t).join(r);if(e.has(n))return!0}return!!e.has(s)}function p(t,e,n){if("object"!=typeof t||null===t||Array.isArray(t))return t;const r={},s=e?.extract?.pluralSeparator??"_",o=["zero","one","two","few","many","other"],i=o.map(t=>`ordinal${s}${t}`),a=Object.keys(t).sort((t,e)=>{const r=t=>{for(const e of i)if(t.endsWith(`${s}${e}`)){return{base:t.slice(0,-(s.length+e.length)),form:e,isOrdinal:!0,isPlural:!0,fullKey:t}}for(const e of o)if(t.endsWith(`${s}${e}`)){return{base:t.slice(0,-(s.length+e.length)),form:e,isOrdinal:!1,isPlural:!0,fullKey:t}}return{base:t,form:"",isOrdinal:!1,isPlural:!1,fullKey:t}},a=r(t),l=r(e);if(a.isPlural&&l.isPlural){const t=n?n(a.base,l.base):a.base.localeCompare(l.base,void 0,{sensitivity:"base"});if(0!==t)return t;if(a.isOrdinal!==l.isOrdinal)return a.isOrdinal?1:-1;const e=a.isOrdinal?i:o,r=e.indexOf(a.form),s=e.indexOf(l.form);return-1!==r&&-1!==s?r-s:a.form.localeCompare(l.form)}if(n)return n(t,e);const c=t.localeCompare(e,void 0,{sensitivity:"base"});return 0===c?t.localeCompare(e,void 0,{sensitivity:"case"}):c});for(const s of a)r[s]=p(t[s],e,n);return r}function d(t,e,n,r,a,l=[],d=new Set,g=!1){const{keySeparator:h=".",sort:y=!0,removeUnusedKeys:m=!0,primaryLanguage:x,defaultValue:$="",pluralSeparator:S="_",contextSeparator:O="_",preserveContextVariants:w=!1}=n.extract,b=new Set;if(w)for(const{keyAcceptingContext:e}of t)e&&b.add(e);const v=new Set;let k=[],j=[];try{const t=new Intl.PluralRules(r,{type:"cardinal"}),e=new Intl.PluralRules(r,{type:"ordinal"});k=t.resolvedOptions().pluralCategories,j=e.resolvedOptions().pluralCategories,k.forEach(t=>v.add(t)),e.resolvedOptions().pluralCategories.forEach(t=>v.add(`ordinal_${t}`))}catch(t){const e=x||"en",n=new Intl.PluralRules(e,{type:"cardinal"}),r=new Intl.PluralRules(e,{type:"ordinal"});k=n.resolvedOptions().pluralCategories,j=r.resolvedOptions().pluralCategories,k.forEach(t=>v.add(t)),r.resolvedOptions().pluralCategories.forEach(t=>v.add(`ordinal_${t}`))}const C=n.extract.preservePatterns||[],P="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",N=t=>{if(l.some(e=>e.test(t)))return!0;for(const e of C)if("string"==typeof e){if(e.endsWith(`${P}*`)){const t=e.slice(0,-(P.length+1));if("*"===t||a&&t===a)return!0}if(e.includes(P)&&a){const[n,r]=e.split(P);if(n===a){if(f(r).test(t))return!0}}}return!1},W=t.filter(({key:t,hasCount:e,isOrdinal:n})=>{if((t=>{if(l.some(e=>e.test(t)))return!0;for(const t of C)if("string"==typeof t&&t.endsWith(`${P}*`)){const e=t.slice(0,-(P.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===k.length&&"other"===k[0]&&1===r.length)return!0;if(n&&r.includes("ordinal")){const t=r[r.length-1];return v.has(`ordinal_${t}`)}if(e){const t=r[r.length-1];return v.has(t)}return!0}),_=new Set;for(const t of W)if(t.isExpandedPlural){const e=String(t.key).split(S);e.length>=3&&"ordinal"===e[e.length-2]?_.add(e.slice(0,-2).join(S)):_.add(e.slice(0,-1).join(S))}let A=m?{}:JSON.parse(JSON.stringify(e));const E=s(e,h??".");for(const t of E){const n=N(t),r=!n&&u(t,b,S,O);if(n||w&&r){const n=o(e,t,h??".");i(A,t,n,h??".")}}if(m){const t=s(e,h??".");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(W.some(({key:t})=>t.split(S).slice(0,-1).join(S)===r)){const t=o(e,n,h??".");i(A,n,t,h??".")}}}}for(const{key:t,defaultValue:s,explicitDefault:l,hasCount:f,isExpandedPlural:u,isOrdinal:p}of W){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)),_.has(n))continue}if(f&&!u){if(1===String(t).split(S).length&&r!==x){const l=t;if(_.has(l));else{const t=p?j:k;for(const f of t){const t=p?`${l}${S}ordinal${S}${f}`:`${l}${S}${f}`,u=o(e,t,h??".");if(void 0===u){let e;e="string"==typeof s?s:c($,String(l),a||n?.extract?.defaultNS||"translation",r,s),i(A,t,e,h??".")}else i(A,t,u,h??".")}}continue}}const y=o(e,t,h??"."),m=!1===h||!W.some(e=>e.key!==t&&e.key.startsWith(`${t}${h}`)),w="object"==typeof y&&null!==y&&(d.has(t)||!s||s===t),b="object"==typeof y&&null!==y&&m&&!d.has(t)&&!w;if(w){i(A,t,y,h??".");continue}let v;if(void 0===y||b)if(r===x)if(g){const e=s&&(s===t||P&&a&&s===`${a}${P}${t}`||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));v=s&&!e?s:c($,t,a||n?.extract?.defaultNS||"translation",r,s)}else v=s||t;else v=c($,t,a||n?.extract?.defaultNS||"translation",r,s);else if(r===x&&g){const e=s&&(s===t||P&&a&&s===`${a}${P}${t}`||t!==s&&(t.startsWith(s+S)||t.startsWith(s+O)));v=(t.includes(S)||t.includes(O))&&!l?y:s&&!e?s:y}else v=y;i(A,t,v,h??".")}if(!0===y)return p(A,n);if("function"==typeof y){const e={},r=Object.keys(A),s=new Map;for(const e of t)if(s.set(String(e.key),e),h){const t=String(e.key).split(h)[0];s.has(t)||s.set(t,e)}const o=(t,e)=>{const n=s.get(t),r=s.get(e);if(n&&r)return y(n,r);return y({key:t},{key:e})};r.sort(o);for(const t of r)e[t]=p(A[t],n,o);A=e}return A}async function g(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||[]],p=i.extract.indentation??2;for(const t of o)u.push(`${t}.*`);const g=u.map(f),h="__no_namespace__",y=new Map;for(const t of s.values()){const e=t.nsIsImplicit&&!1===i.extract.defaultNS?h:String(t.ns??i.extract.defaultNS??"translation");y.has(e)||y.set(e,[]),y.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([...y.keys(),...u]):new Set([...y.keys(),h]);for(const t of x){const n=y.get(t)||[];if(t===h){const t=d(n,f,i,s,void 0,g,o,c);Object.assign(e,t)}else{const r=f[t]||{};e[t]=d(n,r,i,s,t,g,o,c)}}const $=JSON.stringify(f,null,p),S=JSON.stringify(e,null,p);m.push({path:r,updated:S!==$,newTranslations:e,existingTranslations:f})}else{const f=new Set(y.keys()),u=a(i.extract.output,s,"*").replace(/\\/g,"/"),h=await r(u,{ignore:x});for(const t of h)f.add(e(t,n(t)));for(const e of f){const n=y.get(e)||[],r=a(i.extract.output,s,e),f=t(process.cwd(),r),u=await l(f)||{},h=d(n,u,i,s,e,g,o,c),x=JSON.stringify(u,null,p),$=JSON.stringify(h,null,p);m.push({path:f,updated:$!==x,newTranslations:h,existingTranslations:u})}}}return m}export{g as getTranslations};

package/package.json

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

package/src/cli.ts

@@ -23,7 +23,7 @@ const program = new Command()
 program
   .name('i18next-cli')
   .description('A unified, high-performance i18next CLI.')
-  .version('1.24.1')
+  .version('1.24.2')
 
 // 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

@@ -490,9 +490,9 @@ function buildNewTranslationsForNs (
           // - Use defaultValue if it exists and is meaningful (not derived from key pattern)
           // - 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) ||
+            defaultValue === key || // Exact match with the key itself
+            // Check if defaultValue matches the namespaced key format (namespace:key)
+            (nsSep && namespace && defaultValue === `${namespace}${nsSep}${key}`) ||
             // For variant keys (plural/context), check if defaultValue is the base
             (key !== defaultValue &&
             (key.startsWith(defaultValue + pluralSeparator) ||
@@ -513,13 +513,13 @@ function buildNewTranslationsForNs (
       if (locale === primaryLanguage && syncPrimaryWithDefaults) {
         // 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) ||
-            key.startsWith(defaultValue + contextSeparator)))
+          defaultValue === key || // Exact match with the key itself
+            // Check if defaultValue matches the namespaced key format (namespace:key)
+            (nsSep && namespace && defaultValue === `${namespace}${nsSep}${key}`) ||
+            // For variant keys (plural/context), check if defaultValue is the base
+            (key !== defaultValue &&
+            (key.startsWith(defaultValue + pluralSeparator) ||
+              key.startsWith(defaultValue + contextSeparator)))
         )
 
         // If this key looks like a plural/context variant and the default