i18next-cli 1.23.4 → 1.23.5

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.23.5](https://github.com/i18next/i18next-cli/compare/v1.23.4...v1.23.5) - 2025-11-11
+
+- **Extractor:** Fixed custom sort function not being applied to nested keys. When providing a custom `sort` function (e.g., for case-insensitive sorting to match locize's behavior), the sorting logic is now correctly applied throughout the entire object hierarchy, not just at the top level. This ensures consistent key ordering at all nesting levels in translation files. [#106](https://github.com/i18next/i18next-cli/issues/106)
+
 ## [1.23.4](https://github.com/i18next/i18next-cli/compare/v1.23.3...v1.23.4) - 2025-11-11
 
 - Fix preservingContextVariants when using shorthand property for context in options. [#105](https://github.com/i18next/i18next-cli/pull/105)

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.23.4"),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.23.5"),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"),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){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}`),a=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 a)s[n]=i(e[n],t);return s}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:O="_",preserveContextVariants:S=!1}=n.extract,$=new Set;if(S)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||[],j="string"==typeof n.extract.nsSeparator?n.extract.nsSeparator:":",k=e=>{if(u.some(t=>t.test(e)))return!0;for(const t of b)if("string"==typeof t){if(t.endsWith(`${j}*`)){const e=t.slice(0,-(j.length+1));if("*"===e||c&&e===c)return!0}if(t.includes(j)&&c){const[s,n]=t.split(j);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(`${j}*`)){const t=e.slice(0,-(j.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=k(e),r=!n&&a(e,$,m,O);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(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??"."),S=!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&&S&&!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(j)||e!==o&&(e.startsWith(o+m)||e.startsWith(o+O)));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(j)||e!==o&&(e.startsWith(o+m)||e.startsWith(o+O)));b=(e.includes(m)||e.includes(O))&&!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 e={},t=Object.keys(C),s=new Map;for(const e of P){const t=!1===p?e.key:e.key.split(p)[0];s.has(t)||s.set(t,e)}t.sort((e,t)=>{if("function"==typeof g){const n=s.get(e),r=s.get(t);if(n&&r)return g(n,r)}return e.localeCompare(t,void 0,{sensitivity:"base"})});for(const s of t)e[s]=i(C[s],n);C=e}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),O=JSON.stringify(t,null,u);g.push({path:c,updated:O!==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: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};

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.23.4"),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.23.5"),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,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){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]=p(t[r],e);return n}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,v=new Set;if(w)for(const{keyAcceptingContext:e}of t)e&&v.add(e);const b=new Set;let j=[],k=[];try{const t=new Intl.PluralRules(r,{type:"cardinal"}),e=new Intl.PluralRules(r,{type:"ordinal"});j=t.resolvedOptions().pluralCategories,k=e.resolvedOptions().pluralCategories,j.forEach(t=>b.add(t)),e.resolvedOptions().pluralCategories.forEach(t=>b.add(`ordinal_${t}`))}catch(t){const e=x||"en",n=new Intl.PluralRules(e,{type:"cardinal"}),r=new Intl.PluralRules(e,{type:"ordinal"});j=n.resolvedOptions().pluralCategories,k=r.resolvedOptions().pluralCategories,j.forEach(t=>b.add(t)),r.resolvedOptions().pluralCategories.forEach(t=>b.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===j.length&&"other"===j[0]&&1===r.length)return!0;if(n&&r.includes("ordinal")){const t=r[r.length-1];return b.has(`ordinal_${t}`)}if(e){const t=r[r.length-1];return b.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,v,$,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?k:j;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),v="object"==typeof y&&null!==y&&m&&!d.has(t)&&!w;if(w){i(A,t,y,h??".");continue}let b;if(void 0===y||v)if(r===x)if(g){const e=s&&(s===t||s.includes(P)||t!==s&&(t.startsWith(s+$)||t.startsWith(s+O)));b=s&&!e?s:c(S,t,a||n?.extract?.defaultNS||"translation",r,s)}else b=s||t;else b=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)));b=(t.includes($)||t.includes(O))&&!l?y:s&&!e?s:y}else b=y;i(A,t,b,h??".")}if(!0===y)return p(A,n);if("function"==typeof y){const t={},e=Object.keys(A),r=new Map;for(const t of W){const e=!1===h?t.key:t.key.split(h)[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]=p(A[r],n);A=t}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: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};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "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.23.4')
+  .version('1.23.5')
 
 // 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

@@ -83,7 +83,7 @@ function isContextVariantOfAcceptingKey (
 /**
  * Recursively sorts the keys of an object.
  */
-function sortObject (obj: any, config?: I18nextToolkitConfig): any {
+function sortObject (obj: any, config?: I18nextToolkitConfig, customSort?: (a: string, b: string) => number): any {
   if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
     return obj
   }
@@ -120,8 +120,10 @@ function sortObject (obj: any, config?: I18nextToolkitConfig): any {
 
     // If both are plural forms
     if (aInfo.isPlural && bInfo.isPlural) {
-      // First compare by base key (alphabetically)
-      const baseComparison = aInfo.base.localeCompare(bInfo.base, undefined, { sensitivity: 'base' })
+      // First compare by base key
+      const baseComparison = customSort
+        ? customSort(aInfo.base, bInfo.base)
+        : aInfo.base.localeCompare(bInfo.base, undefined, { sensitivity: 'base' })
       if (baseComparison !== 0) {
         return baseComparison
       }
@@ -145,8 +147,12 @@ function sortObject (obj: any, config?: I18nextToolkitConfig): any {
       return aInfo.form.localeCompare(bInfo.form)
     }
 
-    // If one is plural and one is not, or both are non-plural
-    // Regular alphabetical sorting (case-insensitive, then by case)
+    // Use custom sort if provided, otherwise default sorting
+    if (customSort) {
+      return customSort(a, b)
+    }
+
+    // Default: case-insensitive, then by case
     const caseInsensitiveComparison = a.localeCompare(b, undefined, { sensitivity: 'base' })
     if (caseInsensitiveComparison === 0) {
       return a.localeCompare(b, undefined, { sensitivity: 'case' })
@@ -155,7 +161,7 @@ function sortObject (obj: any, config?: I18nextToolkitConfig): any {
   })
 
   for (const key of keys) {
-    sortedObj[key] = sortObject(obj[key], config)
+    sortedObj[key] = sortObject(obj[key], config, customSort)
   }
 
   return sortedObj
@@ -548,32 +554,46 @@ function buildNewTranslationsForNs (
     const sortedObject: Record<string, any> = {}
     const topLevelKeys = Object.keys(newTranslations)
 
-    // Create a map of top-level keys to a representative ExtractedKey object.
-    // This is needed for the custom sort function.
+    // Create a map from key string to ExtractedKey for lookup
     const keyMap = new Map<string, ExtractedKey>()
-    for (const ek of filteredKeys) {
-      const topLevelKey = keySeparator === false ? ek.key : ek.key.split(keySeparator as string)[0]
-      if (!keyMap.has(topLevelKey)) {
-        keyMap.set(topLevelKey, ek)
+    for (const extractedKey of nsKeys) {
+      // Store the full key path
+      keyMap.set(String(extractedKey.key), extractedKey)
+
+      // For nested keys, also store the top-level part
+      if (keySeparator) {
+        const topLevelKey = String(extractedKey.key).split(keySeparator)[0]
+        if (!keyMap.has(topLevelKey)) {
+          keyMap.set(topLevelKey, extractedKey)
+        }
       }
     }
 
-    topLevelKeys.sort((a, b) => {
-      if (typeof sort === 'function') {
-        const keyA = keyMap.get(a)
-        const keyB = keyMap.get(b)
-        // If we can find both original keys, use the custom comparator.
-        if (keyA && keyB) {
-          return sort(keyA, keyB)
-        }
+    // Create a string comparator that applies the same logic as the custom sort function
+    // by extracting the actual comparison behavior
+    const stringSort = (a: string, b: string) => {
+      // Try to find ExtractedKey objects to use the custom comparator
+      const keyA = keyMap.get(a)
+      const keyB = keyMap.get(b)
+
+      if (keyA && keyB) {
+        return sort(keyA, keyB)
       }
-      // Fallback to a case-insensitive alphabetical sort.
-      return a.localeCompare(b, undefined, { sensitivity: 'base' })
-    })
 
-    // 3. Rebuild the object in the final sorted order.
+      // If we don't have ExtractedKey objects, we need to apply the same sorting logic
+      // Create mock ExtractedKey objects with just the key property
+      const mockKeyA = { key: a } as ExtractedKey
+      const mockKeyB = { key: b } as ExtractedKey
+
+      return sort(mockKeyA, mockKeyB)
+    }
+
+    // Sort top-level keys
+    topLevelKeys.sort(stringSort)
+
+    // Pass the same string comparator to sortObject for nested keys
     for (const key of topLevelKeys) {
-      sortedObject[key] = sortObject(newTranslations[key], config)
+      sortedObject[key] = sortObject(newTranslations[key], config, stringSort)
     }
     newTranslations = sortedObject
   }

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;AAukBnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;AA2lBnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}