i18next-cli 1.11.6 → 1.11.8

package/CHANGELOG.md

@@ -5,6 +5,15 @@ 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.11.8](https://github.com/i18next/i18next-cli/compare/v1.11.7...v1.11.8) - 2025-10-20
+
+- Fix: Make `<Trans>` child indexing more robust by recognizing self-closing HTML tags (e.g. `<br/>`) and treating them as layout-only when appropriate. This prevents preserved HTML and surrounding formatting whitespace from shifting component placeholder indexes, so extracted default values now match react‑i18next runtime normalization. [#63](https://github.com/i18next/i18next-cli/issues/63)
+
+## [1.11.7](https://github.com/i18next/i18next-cli/compare/v1.11.6...v1.11.7) - 2025-10-20
+
+- improve: extractor --sync-primary (--syncPrimaryWithDefaults) incorrectly reset plural variants to empty strings, effectively removing existing plural translations [#67](https://github.com/i18next/i18next-cli/issues/67)
+- improve Trans child indexing further [#63](https://github.com/i18next/i18next-cli/issues/63)
+
 ## [1.11.6](https://github.com/i18next/i18next-cli/compare/v1.11.5...v1.11.6) - 2025-10-19
 
 - Fix Trans child indexing to match react-i18next and handle layout-only whitespace correctly [#63](https://github.com/i18next/i18next-cli/issues/63)

package/dist/cjs/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-"use strict";var e=require("commander"),t=require("chokidar"),n=require("glob"),o=require("chalk"),i=require("./config.js"),a=require("./heuristic-config.js"),r=require("./extractor/core/extractor.js");require("node:path"),require("node:fs/promises"),require("jiti");var c=require("./types-generator.js"),s=require("./syncer.js"),l=require("./migrator.js"),u=require("./init.js"),d=require("./linter.js"),g=require("./status.js"),p=require("./locize.js");const f=new e.Command;f.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.11.6"),f.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=await i.ensureConfig(),a=async()=>{const t=await r.runExtractor(o,{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 a(),e.watch){console.log("\nWatching for changes...");t.watch(await n.glob(o.extract.input),{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)}}),f.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)=>{let n=await i.loadConfig();if(!n){console.log(o.blue("No config file found. Attempting to detect project structure..."));const e=await a.detectConfig();e||(console.error(o.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${o.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(o.green("Project structure detected successfully!")),n=e}await g.runStatus(n,{detail:e,namespace:t.namespace})}),f.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=await i.ensureConfig(),a=()=>c.runTypesGenerator(o);if(await a(),e.watch){console.log("\nWatching for changes...");t.watch(await n.glob(o.types?.input||[]),{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}),f.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=await i.ensureConfig();await s.runSyncer(e)}),f.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await l.runMigrator(e)}),f.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(u.runInit),f.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 r=async()=>{let e=await i.loadConfig();if(!e){console.log(o.blue("No config file found. Attempting to detect project structure..."));const t=await a.detectConfig();t||(console.error(o.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${o.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(o.green("Project structure detected successfully!")),e=t}await d.runLinter(e)};if(await r(),e.watch){console.log("\nWatching for changes...");const e=await i.loadConfig();if(e?.extract?.input){t.watch(await n.glob(e.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}}),f.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=await i.ensureConfig();await p.runLocizeSync(t,e)}),f.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const t=await i.ensureConfig();await p.runLocizeDownload(t,e)}),f.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const t=await i.ensureConfig();await p.runLocizeMigrate(t,e)}),f.parse(process.argv);
+"use strict";var e=require("commander"),t=require("chokidar"),n=require("glob"),o=require("chalk"),i=require("./config.js"),a=require("./heuristic-config.js"),r=require("./extractor/core/extractor.js");require("node:path"),require("node:fs/promises"),require("jiti");var c=require("./types-generator.js"),s=require("./syncer.js"),l=require("./migrator.js"),u=require("./init.js"),d=require("./linter.js"),g=require("./status.js"),p=require("./locize.js");const f=new e.Command;f.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.11.8"),f.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=await i.ensureConfig(),a=async()=>{const t=await r.runExtractor(o,{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 a(),e.watch){console.log("\nWatching for changes...");t.watch(await n.glob(o.extract.input),{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)}}),f.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)=>{let n=await i.loadConfig();if(!n){console.log(o.blue("No config file found. Attempting to detect project structure..."));const e=await a.detectConfig();e||(console.error(o.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${o.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(o.green("Project structure detected successfully!")),n=e}await g.runStatus(n,{detail:e,namespace:t.namespace})}),f.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=await i.ensureConfig(),a=()=>c.runTypesGenerator(o);if(await a(),e.watch){console.log("\nWatching for changes...");t.watch(await n.glob(o.types?.input||[]),{persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),a()})}}),f.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const e=await i.ensureConfig();await s.runSyncer(e)}),f.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async e=>{await l.runMigrator(e)}),f.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(u.runInit),f.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 r=async()=>{let e=await i.loadConfig();if(!e){console.log(o.blue("No config file found. Attempting to detect project structure..."));const t=await a.detectConfig();t||(console.error(o.red("Could not automatically detect your project structure.")),console.log(`Please create a config file first by running: ${o.cyan("npx i18next-cli init")}`),process.exit(1)),console.log(o.green("Project structure detected successfully!")),e=t}await d.runLinter(e)};if(await r(),e.watch){console.log("\nWatching for changes...");const e=await i.loadConfig();if(e?.extract?.input){t.watch(await n.glob(e.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",e=>{console.log(`\nFile changed: ${e}`),r()})}}}),f.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=await i.ensureConfig();await p.runLocizeSync(t,e)}),f.command("locize-download").description("Download all translations from your locize project.").action(async e=>{const t=await i.ensureConfig();await p.runLocizeDownload(t,e)}),f.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async e=>{const t=await i.ensureConfig();await p.runLocizeMigrate(t,e)}),f.parse(process.argv);

package/dist/cjs/extractor/parsers/jsx-parser.js

@@ -1 +1 @@
-"use strict";var e=require("./ast-utils.js");exports.extractFromTransComponent=function(t,n){const i=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"i18nKey"===e.name.value),r=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"defaults"===e.name.value),p=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"count"===e.name.value),s=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"values"===e.name.value);let o;p||"JSXAttribute"!==s?.type||"JSXExpressionContainer"!==s.value?.type||"ObjectExpression"!==s.value.expression.type||(o=e.getObjectProperty(s.value.expression,"count"));const a=!!p||!!o,l=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"tOptions"===e.name.value),u="JSXAttribute"===l?.type&&"JSXExpressionContainer"===l.value?.type&&"ObjectExpression"===l.value.expression.type?l.value.expression:void 0,y=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ordinal"===e.name.value),f=!!y,c=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"context"===e.name.value);let v="JSXAttribute"===c?.type&&"JSXExpressionContainer"===c.value?.type?c.value.expression:"JSXAttribute"===c?.type&&"StringLiteral"===c.value?.type?c.value:void 0;const S=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ns"===e.name.value);let x;if(x="JSXAttribute"===S?.type&&"StringLiteral"===S.value?.type?S.value.value:void 0,u&&(void 0===x&&(x=e.getObjectPropValue(u,"ns")),void 0===v)){const t=e.getObjectProperty(u,"context");t?.value&&(v=t.value)}const d=function(e,t){if(!e||0===e.length)return"";const n=new Set(t.extract.transKeepBasicHtmlNodesFor??["br","strong","i","p"]),i=e=>e&&"JSXText"===e.type&&/^\s*$/.test(e.value)&&e.value.includes("\n");function r(e,t,p=!1){if(!e||!e.length)return;let s=0,o=e.length-1;for(;s<=o&&i(e[s]);)s++;for(;o>=s&&i(e[o]);)o--;const a=s<=o?e.slice(s,o+1):[];for(let e=0;e<a.length;e++){const s=a[e];if(s)if("JSXText"!==s.type)if("JSXExpressionContainer"!==s.type){if("JSXElement"===s.type){const e=s.opening&&s.opening.name&&"Identifier"===s.opening.name.type?s.opening.name.value:void 0;e&&n.has(e)?r(s.children||[],t,!1):(t.push(s),r(s.children||[],t,!0));continue}"JSXFragment"!==s.type||r(s.children||[],t,p)}else{if(p&&s.expression&&"ObjectExpression"===s.expression.type){const e=s.expression.properties&&s.expression.properties[0];if(e&&"KeyValueProperty"===e.type)continue}if(s.expression&&"StringLiteral"===s.expression.type){const n=String(s.expression.value||""),r=/^\s*$/.test(n)&&!n.includes("\n"),p=a[e-1],o=a[e+1];if(r){const n=a[e+2];if(o&&"JSXText"===o.type&&i(o)&&n&&("JSXElement"===n.type||"JSXFragment"===n.type)){const t=a[e-1],n=a[e-2];if(!t||"JSXText"!==t.type||n&&"JSXExpressionContainer"===n.type)continue}if(p&&("JSXElement"===p.type||"JSXFragment"===p.type)&&o&&"JSXText"===o.type&&i(o))continue;const r=!o||"JSXText"===o.type&&!i(o);if(p&&"JSXText"===p.type&&r){const e=t[t.length-1];if(e&&"JSXText"===e.type){e.value=String(e.value)+s.expression.value;continue}}if(p&&("JSXElement"===p.type||"JSXFragment"===p.type)&&o&&"JSXText"===o.type&&i(o))continue}}t.push(s)}else{if(i(s)){const n=t[t.length-1],i=a[e-1];if(n){if(i&&"JSXExpressionContainer"===i.type)continue;if("JSXText"===n.type&&i&&"JSXText"===i.type){n.value=String(n.value)+s.value;continue}}}t.push(s)}}}const p=[];function s(e){if(!e||0===e.length)return"";let t="";for(const r of e)if(r)if("JSXText"!==r.type){if("JSXExpressionContainer"===r.type){const e=r.expression;if(!e)continue;if("StringLiteral"===e.type)t+=e.value;else if("Identifier"===e.type)t+=`{{${e.value}}}`;else if("ObjectExpression"===e.type){const n=e.properties[0];n&&"KeyValueProperty"===n.type&&n.key&&"Identifier"===n.key.type?t+=`{{${n.key.value}}}`:n&&"Identifier"===n.type?t+=`{{${n.value}}}`:t+="{{value}}"}else"MemberExpression"===e.type&&e.property&&"Identifier"===e.property.type?t+=`{{${e.property.value}}}`:"CallExpression"===e.type&&"Identifier"===e.callee?.type?t+=`{{${e.callee.value}}}`:t+="{{value}}";continue}if("JSXElement"===r.type){let e;if(r.opening&&r.opening.name&&"Identifier"===r.opening.name.type&&(e=r.opening.name.value),e&&n.has(e)){t+=`<${e}>${s(r.children||[])}</${e}>`}else{const e=p.indexOf(r);t+=`<${e}>${s(r.children||[])}</${e}>`}continue}"JSXFragment"!==r.type||(t+=s(r.children||[]))}else i(r)||(t+=r.value);return t}r(e,p,!1);const o=s(e);return String(o).replace(/\s+/g," ").trim()}(t.children,n);let g,J,X;if("JSXAttribute"===r?.type&&"StringLiteral"===r.value?.type)g=r.value.value;else{const e=n.extract.defaultValue;g="string"==typeof e?e:""}if("JSXAttribute"===i?.type){if("StringLiteral"===i.value?.type){if(J=i.value,X=J.value,!X||""===X.trim())return null;if(x&&"StringLiteral"===J.type){const e=n.extract.nsSeparator??":",t=J.value;if(e&&t.startsWith(`${x}${e}`)){if(X=t.slice(`${x}${e}`.length),!X||""===X.trim())return null;J={...J,value:X}}}}else"JSXExpressionContainer"===i.value?.type&&"JSXEmptyExpression"!==i.value.expression.type&&(J=i.value.expression);if(!J)return null}return r||!X||d.trim()?!r&&d.trim()&&(g=d):g=X,{keyExpression:J,serializedChildren:d,ns:x,defaultValue:g,hasCount:a,isOrdinal:f,contextExpression:v,optionsNode:u}};
+"use strict";var e=require("./ast-utils.js");exports.extractFromTransComponent=function(t,n){const i=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"i18nKey"===e.name.value),r=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"defaults"===e.name.value),s=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"count"===e.name.value),p=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"values"===e.name.value);let o;s||"JSXAttribute"!==p?.type||"JSXExpressionContainer"!==p.value?.type||"ObjectExpression"!==p.value.expression.type||(o=e.getObjectProperty(p.value.expression,"count"));const l=!!s||!!o,a=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"tOptions"===e.name.value),u="JSXAttribute"===a?.type&&"JSXExpressionContainer"===a.value?.type&&"ObjectExpression"===a.value.expression.type?a.value.expression:void 0,y=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ordinal"===e.name.value),f=!!y,c=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"context"===e.name.value);let v="JSXAttribute"===c?.type&&"JSXExpressionContainer"===c.value?.type?c.value.expression:"JSXAttribute"===c?.type&&"StringLiteral"===c.value?.type?c.value:void 0;const S=t.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ns"===e.name.value);let x;if(x="JSXAttribute"===S?.type&&"StringLiteral"===S.value?.type?S.value.value:void 0,u&&(void 0===x&&(x=e.getObjectPropValue(u,"ns")),void 0===v)){const t=e.getObjectProperty(u,"context");t?.value&&(v=t.value)}const g=function(e,t){if(!e||0===e.length)return"";const n=new Set(t.extract.transKeepBasicHtmlNodesFor??["br","strong","i","p"]),i=e=>e&&"JSXText"===e.type&&/^\s*$/.test(e.value)&&e.value.includes("\n");function r(e,t,s=!1){if(!e||!e.length)return;let p=0,o=e.length-1;for(;p<=o&&i(e[p]);)p++;for(;o>=p&&i(e[o]);)o--;const l=p<=o?e.slice(p,o+1):[];for(let e=0;e<l.length;e++){const p=l[e];if(p)if("JSXText"!==p.type)if("JSXExpressionContainer"!==p.type){if("JSXElement"===p.type){const e=p.opening&&p.opening.name&&"Identifier"===p.opening.name.type?p.opening.name.value:void 0;if(e&&n.has(e)){!(!p.opening||!p.opening.selfClosing)&&t.push(p),r(p.children||[],t,!1)}else t.push(p),r(p.children||[],t,!0);continue}"JSXFragment"!==p.type||r(p.children||[],t,s)}else{if(s&&p.expression){const e=p.expression.type;if("ObjectExpression"===e){const e=p.expression.properties&&p.expression.properties[0];if(e&&"KeyValueProperty"===e.type)continue}if("StringLiteral"===e){const e=String(p.expression.value||"");if(!(/^\s*$/.test(e)&&!e.includes("\n")))continue}else if("Identifier"===e||"MemberExpression"===e||"CallExpression"===e)continue}if(p.expression&&"StringLiteral"===p.expression.type){const n=String(p.expression.value||""),r=/^\s*$/.test(n)&&!n.includes("\n"),s=l[e-1],o=l[e+1];if(r){const n=l[e+2];if(o&&"JSXText"===o.type&&i(o)&&n&&("JSXElement"===n.type||"JSXFragment"===n.type)){const t=l[e-1],n=l[e-2];if(!t||"JSXText"!==t.type&&n&&"JSXExpressionContainer"===n.type)continue}if(s&&("JSXElement"===s.type||"JSXFragment"===s.type)&&o&&"JSXText"===o.type&&i(o))continue;const r=!o||"JSXText"===o.type&&!i(o);if(s&&"JSXText"===s.type&&r){const e=t[t.length-1];if(e&&"JSXText"===e.type){e.value=String(e.value)+p.expression.value;continue}}if(s&&("JSXElement"===s.type||"JSXFragment"===s.type)&&o&&"JSXText"===o.type&&i(o))continue}}t.push(p)}else{if(s)continue;if(i(p)){const n=t[t.length-1],i=l[e-1];if(n){if(i&&"JSXExpressionContainer"===i.type)continue;if("JSXText"===n.type&&i&&"JSXText"===i.type){n.value=String(n.value)+p.value;continue}}}t.push(p)}}}const s=[];function p(e){if(!e||0===e.length)return"";let t="",r=!1;for(let o=0;o<e.length;o++){const l=e[o];if(l)if("JSXText"!==l.type){if("JSXExpressionContainer"===l.type){const e=l.expression;if(!e)continue;if("StringLiteral"===e.type)t+=e.value;else if("Identifier"===e.type)t+=`{{${e.value}}}`;else if("ObjectExpression"===e.type){const n=e.properties[0];n&&"KeyValueProperty"===n.type&&n.key&&"Identifier"===n.key.type?t+=`{{${n.key.value}}}`:n&&"Identifier"===n.type?t+=`{{${n.value}}}`:t+="{{value}}"}else"MemberExpression"===e.type&&e.property&&"Identifier"===e.property.type?t+=`{{${e.property.value}}}`:"CallExpression"===e.type&&"Identifier"===e.callee?.type?t+=`{{${e.callee.value}}}`:t+="{{value}}";r=!1;continue}if("JSXElement"===l.type){let i;if(l.opening&&l.opening.name&&"Identifier"===l.opening.name.type&&(i=l.opening.name.value),i&&n.has(i)){const n=p(l.children||[]),s=!(!l.opening||!l.opening.selfClosing),a=""!==String(n).trim();if(s||!a){const n=e[o-1];n&&"JSXText"===n.type&&/\n\s*$/.test(n.value)&&(t=t.replace(/\s+$/,"")),t+=`<${i}/>`,r=!0}else t+=`<${i}>${n}</${i}>`,r=!1}else{const e=s.indexOf(l);t+=`<${e}>${p(l.children||[])}</${e}>`,r=!1}continue}"JSXFragment"!==l.type||(t+=p(l.children||[]),r=!1)}else{if(i(l))continue;r?(t+=l.value.replace(/^\s+/,""),r=!1):t+=l.value}}return t}r(e,s,!1);const o=p(e);return String(o).replace(/\s+/g," ").trim()}(t.children,n);let d,J,X;if("JSXAttribute"===r?.type&&"StringLiteral"===r.value?.type)d=r.value.value;else{const e=n.extract.defaultValue;d="string"==typeof e?e:""}if("JSXAttribute"===i?.type){if("StringLiteral"===i.value?.type){if(J=i.value,X=J.value,!X||""===X.trim())return null;if(x&&"StringLiteral"===J.type){const e=n.extract.nsSeparator??":",t=J.value;if(e&&t.startsWith(`${x}${e}`)){if(X=t.slice(`${x}${e}`.length),!X||""===X.trim())return null;J={...J,value:X}}}}else"JSXExpressionContainer"===i.value?.type&&"JSXEmptyExpression"!==i.value.expression.type&&(J=i.value.expression);if(!J)return null}return r||!X||g.trim()?!r&&g.trim()&&(d=g):d=X,{keyExpression:J,serializedChildren:g,ns:x,defaultValue:d,hasCount:l,isOrdinal:f,contextExpression:v,optionsNode:u}};

package/dist/esm/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import{Command as t}from"commander";import e from"chokidar";import{glob as o}from"glob";import n from"chalk";import{ensureConfig as i,loadConfig as a}from"./config.js";import{detectConfig as c}from"./heuristic-config.js";import{runExtractor as r}from"./extractor/core/extractor.js";import"node:path";import"node:fs/promises";import"jiti";import{runTypesGenerator as s}from"./types-generator.js";import{runSyncer as l}from"./syncer.js";import{runMigrator as p}from"./migrator.js";import{runInit as m}from"./init.js";import{runLinter as d}from"./linter.js";import{runStatus as u}from"./status.js";import{runLocizeSync as f,runLocizeDownload as g,runLocizeMigrate as h}from"./locize.js";const y=new t;y.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.11.6"),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 t=>{try{const n=await i(),a=async()=>{const e=await r(n,{isWatchMode:!!t.watch,isDryRun:!!t.dryRun,syncPrimaryWithDefaults:!!t.syncPrimary});return t.ci&&!e?(console.log("✅ No files were updated."),process.exit(0)):t.ci&&e&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),e};if(await a(),t.watch){console.log("\nWatching for changes...");e.watch(await o(n.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}catch(t){console.error("Error running extractor:",t),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(t,e)=>{let o=await a();if(!o){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!")),o=t}await u(o,{detail:t,namespace:e.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 t=>{const n=await i(),a=()=>s(n);if(await a(),t.watch){console.log("\nWatching for changes...");e.watch(await o(n.types?.input||[]),{persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}),y.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const t=await i();await l(t)}),y.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async t=>{await p(t)}),y.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(m),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 t=>{const i=async()=>{let t=await a();if(!t){console.log(n.blue("No config file found. Attempting to detect project structure..."));const e=await c();e||(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=e}await d(t)};if(await i(),t.watch){console.log("\nWatching for changes...");const t=await a();if(t?.extract?.input){e.watch(await o(t.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),i()})}}}),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 t=>{const e=await i();await f(e,t)}),y.command("locize-download").description("Download all translations from your locize project.").action(async t=>{const e=await i();await g(e,t)}),y.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async t=>{const e=await i();await h(e,t)}),y.parse(process.argv);
+import{Command as t}from"commander";import e from"chokidar";import{glob as o}from"glob";import n from"chalk";import{ensureConfig as i,loadConfig as a}from"./config.js";import{detectConfig as c}from"./heuristic-config.js";import{runExtractor as r}from"./extractor/core/extractor.js";import"node:path";import"node:fs/promises";import"jiti";import{runTypesGenerator as s}from"./types-generator.js";import{runSyncer as l}from"./syncer.js";import{runMigrator as p}from"./migrator.js";import{runInit as m}from"./init.js";import{runLinter as d}from"./linter.js";import{runStatus as u}from"./status.js";import{runLocizeSync as f,runLocizeDownload as g,runLocizeMigrate as h}from"./locize.js";const y=new t;y.name("i18next-cli").description("A unified, high-performance i18next CLI.").version("1.11.8"),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 t=>{try{const n=await i(),a=async()=>{const e=await r(n,{isWatchMode:!!t.watch,isDryRun:!!t.dryRun,syncPrimaryWithDefaults:!!t.syncPrimary});return t.ci&&!e?(console.log("✅ No files were updated."),process.exit(0)):t.ci&&e&&(console.error("❌ Some files were updated. This should not happen in CI mode."),process.exit(1)),e};if(await a(),t.watch){console.log("\nWatching for changes...");e.watch(await o(n.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}catch(t){console.error("Error running extractor:",t),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(t,e)=>{let o=await a();if(!o){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!")),o=t}await u(o,{detail:t,namespace:e.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 t=>{const n=await i(),a=()=>s(n);if(await a(),t.watch){console.log("\nWatching for changes...");e.watch(await o(n.types?.input||[]),{persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),a()})}}),y.command("sync").description("Synchronize secondary language files with the primary language file.").action(async()=>{const t=await i();await l(t)}),y.command("migrate-config [configPath]").description("Migrate a legacy i18next-parser.config.js to the new format.").action(async t=>{await p(t)}),y.command("init").description("Create a new i18next.config.ts/js file with an interactive setup wizard.").action(m),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 t=>{const i=async()=>{let t=await a();if(!t){console.log(n.blue("No config file found. Attempting to detect project structure..."));const e=await c();e||(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=e}await d(t)};if(await i(),t.watch){console.log("\nWatching for changes...");const t=await a();if(t?.extract?.input){e.watch(await o(t.extract.input),{ignored:/node_modules/,persistent:!0}).on("change",t=>{console.log(`\nFile changed: ${t}`),i()})}}}),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 t=>{const e=await i();await f(e,t)}),y.command("locize-download").description("Download all translations from your locize project.").action(async t=>{const e=await i();await g(e,t)}),y.command("locize-migrate").description("Migrate local translation files to a new locize project.").action(async t=>{const e=await i();await h(e,t)}),y.parse(process.argv);

package/dist/esm/extractor/parsers/jsx-parser.js

@@ -1 +1 @@
-import{getObjectProperty as e,getObjectPropValue as t}from"./ast-utils.js";function n(n,i){const r=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"i18nKey"===e.name.value),p=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"defaults"===e.name.value),s=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"count"===e.name.value),o=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"values"===e.name.value);let a;s||"JSXAttribute"!==o?.type||"JSXExpressionContainer"!==o.value?.type||"ObjectExpression"!==o.value.expression.type||(a=e(o.value.expression,"count"));const l=!!s||!!a,u=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"tOptions"===e.name.value),y="JSXAttribute"===u?.type&&"JSXExpressionContainer"===u.value?.type&&"ObjectExpression"===u.value.expression.type?u.value.expression:void 0,f=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ordinal"===e.name.value),c=!!f,v=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"context"===e.name.value);let S="JSXAttribute"===v?.type&&"JSXExpressionContainer"===v.value?.type?v.value.expression:"JSXAttribute"===v?.type&&"StringLiteral"===v.value?.type?v.value:void 0;const x=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ns"===e.name.value);let d;if(d="JSXAttribute"===x?.type&&"StringLiteral"===x.value?.type?x.value.value:void 0,y&&(void 0===d&&(d=t(y,"ns")),void 0===S)){const t=e(y,"context");t?.value&&(S=t.value)}const J=function(e,t){if(!e||0===e.length)return"";const n=new Set(t.extract.transKeepBasicHtmlNodesFor??["br","strong","i","p"]),i=e=>e&&"JSXText"===e.type&&/^\s*$/.test(e.value)&&e.value.includes("\n");function r(e,t,p=!1){if(!e||!e.length)return;let s=0,o=e.length-1;for(;s<=o&&i(e[s]);)s++;for(;o>=s&&i(e[o]);)o--;const a=s<=o?e.slice(s,o+1):[];for(let e=0;e<a.length;e++){const s=a[e];if(s)if("JSXText"!==s.type)if("JSXExpressionContainer"!==s.type){if("JSXElement"===s.type){const e=s.opening&&s.opening.name&&"Identifier"===s.opening.name.type?s.opening.name.value:void 0;e&&n.has(e)?r(s.children||[],t,!1):(t.push(s),r(s.children||[],t,!0));continue}"JSXFragment"!==s.type||r(s.children||[],t,p)}else{if(p&&s.expression&&"ObjectExpression"===s.expression.type){const e=s.expression.properties&&s.expression.properties[0];if(e&&"KeyValueProperty"===e.type)continue}if(s.expression&&"StringLiteral"===s.expression.type){const n=String(s.expression.value||""),r=/^\s*$/.test(n)&&!n.includes("\n"),p=a[e-1],o=a[e+1];if(r){const n=a[e+2];if(o&&"JSXText"===o.type&&i(o)&&n&&("JSXElement"===n.type||"JSXFragment"===n.type)){const t=a[e-1],n=a[e-2];if(!t||"JSXText"!==t.type||n&&"JSXExpressionContainer"===n.type)continue}if(p&&("JSXElement"===p.type||"JSXFragment"===p.type)&&o&&"JSXText"===o.type&&i(o))continue;const r=!o||"JSXText"===o.type&&!i(o);if(p&&"JSXText"===p.type&&r){const e=t[t.length-1];if(e&&"JSXText"===e.type){e.value=String(e.value)+s.expression.value;continue}}if(p&&("JSXElement"===p.type||"JSXFragment"===p.type)&&o&&"JSXText"===o.type&&i(o))continue}}t.push(s)}else{if(i(s)){const n=t[t.length-1],i=a[e-1];if(n){if(i&&"JSXExpressionContainer"===i.type)continue;if("JSXText"===n.type&&i&&"JSXText"===i.type){n.value=String(n.value)+s.value;continue}}}t.push(s)}}}const p=[];function s(e){if(!e||0===e.length)return"";let t="";for(const r of e)if(r)if("JSXText"!==r.type){if("JSXExpressionContainer"===r.type){const e=r.expression;if(!e)continue;if("StringLiteral"===e.type)t+=e.value;else if("Identifier"===e.type)t+=`{{${e.value}}}`;else if("ObjectExpression"===e.type){const n=e.properties[0];n&&"KeyValueProperty"===n.type&&n.key&&"Identifier"===n.key.type?t+=`{{${n.key.value}}}`:n&&"Identifier"===n.type?t+=`{{${n.value}}}`:t+="{{value}}"}else"MemberExpression"===e.type&&e.property&&"Identifier"===e.property.type?t+=`{{${e.property.value}}}`:"CallExpression"===e.type&&"Identifier"===e.callee?.type?t+=`{{${e.callee.value}}}`:t+="{{value}}";continue}if("JSXElement"===r.type){let e;if(r.opening&&r.opening.name&&"Identifier"===r.opening.name.type&&(e=r.opening.name.value),e&&n.has(e)){t+=`<${e}>${s(r.children||[])}</${e}>`}else{const e=p.indexOf(r);t+=`<${e}>${s(r.children||[])}</${e}>`}continue}"JSXFragment"!==r.type||(t+=s(r.children||[]))}else i(r)||(t+=r.value);return t}r(e,p,!1);const o=s(e);return String(o).replace(/\s+/g," ").trim()}(n.children,i);let X,g,m;if("JSXAttribute"===p?.type&&"StringLiteral"===p.value?.type)X=p.value.value;else{const e=i.extract.defaultValue;X="string"==typeof e?e:""}if("JSXAttribute"===r?.type){if("StringLiteral"===r.value?.type){if(g=r.value,m=g.value,!m||""===m.trim())return null;if(d&&"StringLiteral"===g.type){const e=i.extract.nsSeparator??":",t=g.value;if(e&&t.startsWith(`${d}${e}`)){if(m=t.slice(`${d}${e}`.length),!m||""===m.trim())return null;g={...g,value:m}}}}else"JSXExpressionContainer"===r.value?.type&&"JSXEmptyExpression"!==r.value.expression.type&&(g=r.value.expression);if(!g)return null}return p||!m||J.trim()?!p&&J.trim()&&(X=J):X=m,{keyExpression:g,serializedChildren:J,ns:d,defaultValue:X,hasCount:l,isOrdinal:c,contextExpression:S,optionsNode:y}}export{n as extractFromTransComponent};
+import{getObjectProperty as e,getObjectPropValue as t}from"./ast-utils.js";function n(n,i){const r=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"i18nKey"===e.name.value),s=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"defaults"===e.name.value),p=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"count"===e.name.value),o=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"values"===e.name.value);let l;p||"JSXAttribute"!==o?.type||"JSXExpressionContainer"!==o.value?.type||"ObjectExpression"!==o.value.expression.type||(l=e(o.value.expression,"count"));const a=!!p||!!l,u=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"tOptions"===e.name.value),y="JSXAttribute"===u?.type&&"JSXExpressionContainer"===u.value?.type&&"ObjectExpression"===u.value.expression.type?u.value.expression:void 0,f=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ordinal"===e.name.value),c=!!f,v=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"context"===e.name.value);let S="JSXAttribute"===v?.type&&"JSXExpressionContainer"===v.value?.type?v.value.expression:"JSXAttribute"===v?.type&&"StringLiteral"===v.value?.type?v.value:void 0;const x=n.opening.attributes?.find(e=>"JSXAttribute"===e.type&&"Identifier"===e.name.type&&"ns"===e.name.value);let g;if(g="JSXAttribute"===x?.type&&"StringLiteral"===x.value?.type?x.value.value:void 0,y&&(void 0===g&&(g=t(y,"ns")),void 0===S)){const t=e(y,"context");t?.value&&(S=t.value)}const d=function(e,t){if(!e||0===e.length)return"";const n=new Set(t.extract.transKeepBasicHtmlNodesFor??["br","strong","i","p"]),i=e=>e&&"JSXText"===e.type&&/^\s*$/.test(e.value)&&e.value.includes("\n");function r(e,t,s=!1){if(!e||!e.length)return;let p=0,o=e.length-1;for(;p<=o&&i(e[p]);)p++;for(;o>=p&&i(e[o]);)o--;const l=p<=o?e.slice(p,o+1):[];for(let e=0;e<l.length;e++){const p=l[e];if(p)if("JSXText"!==p.type)if("JSXExpressionContainer"!==p.type){if("JSXElement"===p.type){const e=p.opening&&p.opening.name&&"Identifier"===p.opening.name.type?p.opening.name.value:void 0;if(e&&n.has(e)){!(!p.opening||!p.opening.selfClosing)&&t.push(p),r(p.children||[],t,!1)}else t.push(p),r(p.children||[],t,!0);continue}"JSXFragment"!==p.type||r(p.children||[],t,s)}else{if(s&&p.expression){const e=p.expression.type;if("ObjectExpression"===e){const e=p.expression.properties&&p.expression.properties[0];if(e&&"KeyValueProperty"===e.type)continue}if("StringLiteral"===e){const e=String(p.expression.value||"");if(!(/^\s*$/.test(e)&&!e.includes("\n")))continue}else if("Identifier"===e||"MemberExpression"===e||"CallExpression"===e)continue}if(p.expression&&"StringLiteral"===p.expression.type){const n=String(p.expression.value||""),r=/^\s*$/.test(n)&&!n.includes("\n"),s=l[e-1],o=l[e+1];if(r){const n=l[e+2];if(o&&"JSXText"===o.type&&i(o)&&n&&("JSXElement"===n.type||"JSXFragment"===n.type)){const t=l[e-1],n=l[e-2];if(!t||"JSXText"!==t.type&&n&&"JSXExpressionContainer"===n.type)continue}if(s&&("JSXElement"===s.type||"JSXFragment"===s.type)&&o&&"JSXText"===o.type&&i(o))continue;const r=!o||"JSXText"===o.type&&!i(o);if(s&&"JSXText"===s.type&&r){const e=t[t.length-1];if(e&&"JSXText"===e.type){e.value=String(e.value)+p.expression.value;continue}}if(s&&("JSXElement"===s.type||"JSXFragment"===s.type)&&o&&"JSXText"===o.type&&i(o))continue}}t.push(p)}else{if(s)continue;if(i(p)){const n=t[t.length-1],i=l[e-1];if(n){if(i&&"JSXExpressionContainer"===i.type)continue;if("JSXText"===n.type&&i&&"JSXText"===i.type){n.value=String(n.value)+p.value;continue}}}t.push(p)}}}const s=[];function p(e){if(!e||0===e.length)return"";let t="",r=!1;for(let o=0;o<e.length;o++){const l=e[o];if(l)if("JSXText"!==l.type){if("JSXExpressionContainer"===l.type){const e=l.expression;if(!e)continue;if("StringLiteral"===e.type)t+=e.value;else if("Identifier"===e.type)t+=`{{${e.value}}}`;else if("ObjectExpression"===e.type){const n=e.properties[0];n&&"KeyValueProperty"===n.type&&n.key&&"Identifier"===n.key.type?t+=`{{${n.key.value}}}`:n&&"Identifier"===n.type?t+=`{{${n.value}}}`:t+="{{value}}"}else"MemberExpression"===e.type&&e.property&&"Identifier"===e.property.type?t+=`{{${e.property.value}}}`:"CallExpression"===e.type&&"Identifier"===e.callee?.type?t+=`{{${e.callee.value}}}`:t+="{{value}}";r=!1;continue}if("JSXElement"===l.type){let i;if(l.opening&&l.opening.name&&"Identifier"===l.opening.name.type&&(i=l.opening.name.value),i&&n.has(i)){const n=p(l.children||[]),s=!(!l.opening||!l.opening.selfClosing),a=""!==String(n).trim();if(s||!a){const n=e[o-1];n&&"JSXText"===n.type&&/\n\s*$/.test(n.value)&&(t=t.replace(/\s+$/,"")),t+=`<${i}/>`,r=!0}else t+=`<${i}>${n}</${i}>`,r=!1}else{const e=s.indexOf(l);t+=`<${e}>${p(l.children||[])}</${e}>`,r=!1}continue}"JSXFragment"!==l.type||(t+=p(l.children||[]),r=!1)}else{if(i(l))continue;r?(t+=l.value.replace(/^\s+/,""),r=!1):t+=l.value}}return t}r(e,s,!1);const o=p(e);return String(o).replace(/\s+/g," ").trim()}(n.children,i);let J,X,m;if("JSXAttribute"===s?.type&&"StringLiteral"===s.value?.type)J=s.value.value;else{const e=i.extract.defaultValue;J="string"==typeof e?e:""}if("JSXAttribute"===r?.type){if("StringLiteral"===r.value?.type){if(X=r.value,m=X.value,!m||""===m.trim())return null;if(g&&"StringLiteral"===X.type){const e=i.extract.nsSeparator??":",t=X.value;if(e&&t.startsWith(`${g}${e}`)){if(m=t.slice(`${g}${e}`.length),!m||""===m.trim())return null;X={...X,value:m}}}}else"JSXExpressionContainer"===r.value?.type&&"JSXEmptyExpression"!==r.value.expression.type&&(X=r.value.expression);if(!X)return null}return s||!m||d.trim()?!s&&d.trim()&&(J=d):J=m,{keyExpression:X,serializedChildren:d,ns:g,defaultValue:J,hasCount:a,isOrdinal:c,contextExpression:S,optionsNode:y}}export{n as extractFromTransComponent};

package/package.json

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

package/src/cli.ts

@@ -21,7 +21,7 @@ const program = new Command()
 program
   .name('i18next-cli')
   .description('A unified, high-performance i18next CLI.')
-  .version('1.11.6')
+  .version('1.11.8')
 
 program
   .command('extract')

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

@@ -227,6 +227,7 @@ function buildNewTranslationsForNs (
     }
 
     let valueToSet: string
+
     if (existingValue === undefined || isStaleObject) {
       // New key or stale object - determine what value to use
       if (locale === primaryLanguage) {
@@ -264,7 +265,22 @@ function buildNewTranslationsForNs (
             key.startsWith(defaultValue + contextSeparator)))
         )
 
-        valueToSet = (defaultValue && !isDerivedDefault) ? defaultValue : existingValue
+        // Check if the current key is a plural or context variant
+        // const isVariantKey = key.includes(pluralSeparator) || key.includes(contextSeparator)
+        // A simple check to see if the default value seems like a base value reused for a variant
+        // This is true if the key IS a variant, but the default value is NOT derived from the key itself.
+        // const isBaseDefaultReusedForVariant = isVariantKey && defaultValue && !isDerivedDefault
+
+        // If a meaningful (non-derived) defaultValue is provided in code, apply it.
+        // This includes plural/context variant keys generated from a single explicit
+        // default (e.g. t('key', 'Default', { count })) — we should update all
+        // generated variant forms to that explicit default.
+        if (defaultValue && !isDerivedDefault) {
+          valueToSet = defaultValue
+        } else {
+          // Otherwise preserve existing translations.
+          valueToSet = existingValue
+        }
       } else {
         // Not primary language or not syncing - always preserve existing
         valueToSet = existingValue

package/src/extractor/parsers/jsx-parser.ts

@@ -279,10 +279,16 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
       if (!n) continue
 
       if (n.type === 'JSXText') {
-        // Skip/merge pure-whitespace JSXText according to context:
-        // - If it immediately follows an expression container (and that expression
-        //   wasn't originally a JSXText sibling), skip it (it's formatting).
-        // - If it follows an original JSXText sibling, merge it into that text.
+        // Do NOT add plain text nodes as separate global slots when they are
+        // children of a non-preserved parent element (e.g. <pre>). The parent
+        // element itself is the slot; inner text must not shift indexes.
+        if (parentIsNonPreserved) {
+          // Still allow formatting-whitespace handling to be ignored here (skip)
+          // so they don't pollute the slot ordering.
+          continue
+        }
+
+        // Otherwise, preserve previous behavior for boundary/formatting merging.
         if (isFormattingWhitespace(n)) {
           const prevSlot = slots[slots.length - 1]
           const prevOriginal = meaningfulNodes[i - 1]
@@ -306,12 +312,33 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
       }
 
       if (n.type === 'JSXExpressionContainer') {
-        // If this expression is an object-expression placeholder like
-        // {{ key: value }} and we're inside a non-preserved parent element,
-        // treat it as part of the parent (do NOT add as a sibling/global slot).
-        if (parentIsNonPreserved && n.expression && n.expression.type === 'ObjectExpression') {
-          const prop = n.expression.properties && n.expression.properties[0]
-          if (prop && prop.type === 'KeyValueProperty') {
+        // If this expression is inside a non-preserved parent element, treat
+        // simple content-bearing expressions as part of the parent and do NOT
+        // add them as separate sibling/global slots. This prevents inner nodes
+        // (like <code>{'{{x}}'}</code> or <pre>{'foo'}</pre>) from being treated
+        // as extra slots which shifts global indexes.
+        if (parentIsNonPreserved && n.expression) {
+          const exprType = n.expression.type
+          // ObjectExpression placeholders ({{ key: value }}) should be treated
+          // as part of the parent.
+          if (exprType === 'ObjectExpression') {
+            const prop = n.expression.properties && n.expression.properties[0]
+            if (prop && prop.type === 'KeyValueProperty') {
+              continue
+            }
+          }
+
+          // For common simple content expressions, don't allocate a separate slot.
+          // However, if it's a pure-space StringLiteral ({" "}) we want to keep the
+          // special-space handling below, so only skip non-whitespace string literals.
+          if (exprType === 'StringLiteral') {
+            const textVal = String(n.expression.value || '')
+            const isPureSpaceNoNewline = /^\s*$/.test(textVal) && !textVal.includes('\n')
+            if (!isPureSpaceNoNewline) {
+              continue
+            }
+            // otherwise fall through to the pure-space handling below
+          } else if (exprType === 'Identifier' || exprType === 'MemberExpression' || exprType === 'CallExpression') {
             continue
           }
         }
@@ -347,10 +374,14 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
               //   (pattern: <expr>, JSXText, {" "}, newline-only JSXText, <element>)
               const prevOriginal = meaningfulNodes[i - 1]
               const prevPrevOriginal = meaningfulNodes[i - 2]
+              // Only skip when there's no previous original OR when the previous
+              // original is not text AND the node before that is an expression.
+              // The previous logic skipped too aggressively when prevOriginal was
+              // just a non-text element (e.g. <span>), which removed the slot
+              // that should keep the later element index (fixes index off-by-one).
               const shouldSkip =
                 !prevOriginal ||
-                prevOriginal.type !== 'JSXText' ||
-                (prevPrevOriginal && prevPrevOriginal.type === 'JSXExpressionContainer')
+                (prevOriginal.type !== 'JSXText' && prevPrevOriginal && prevPrevOriginal.type === 'JSXExpressionContainer')
 
               if (shouldSkip) {
                 continue
@@ -408,7 +439,15 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
           ? n.opening.name.value
           : undefined
         if (tagName && allowedTags.has(tagName)) {
-          // preserved tag: descend into children (tag itself is not a slot)
+          // Count preserved HTML element as a global slot only when the AST
+          // marks it self-closing (e.g. <br />). Self-closing preserved tags
+          // should influence placeholder indexes (they appear inline without
+          // children), while non-self-closing preserved tags (e.g. <strong>)
+          // should not.
+          const isAstSelfClosing = !!(n.opening && (n.opening as any).selfClosing)
+          if (isAstSelfClosing) {
+            slots.push(n)
+          }
           collectSlots(n.children || [], slots, false)
         } else {
           // non-preserved element: the element itself is a single slot.
@@ -438,12 +477,20 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
   function visitNodes (nodes: any[]): string {
     if (!nodes || nodes.length === 0) return ''
     let out = ''
+    let lastWasSelfClosing = false
 
-    for (const node of nodes) {
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i]
       if (!node) continue
 
       if (node.type === 'JSXText') {
-        if (!isFormattingWhitespace(node)) out += node.value
+        if (isFormattingWhitespace(node)) continue
+        if (lastWasSelfClosing) {
+          out += node.value.replace(/^\s+/, '')
+          lastWasSelfClosing = false
+        } else {
+          out += node.value
+        }
         continue
       }
 
@@ -471,6 +518,7 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
         } else {
           out += '{{value}}'
         }
+        lastWasSelfClosing = false
         continue
       }
 
@@ -482,19 +530,38 @@ function serializeJSXChildren (children: any[], config: I18nextToolkitConfig): s
 
         if (tag && allowedTags.has(tag)) {
           const inner = visitNodes(node.children || [])
-          out += `<${tag}>${inner}</${tag}>`
+          // consider element self-closing for rendering when AST marks it so or it has no meaningful children
+          const isAstSelfClosing = !!(node.opening && (node.opening as any).selfClosing)
+          const hasMeaningfulChildren = String(inner).trim() !== ''
+          if (isAstSelfClosing || !hasMeaningfulChildren) {
+            // If the previous original sibling is a JSXText that ends with a
+            // newline (the tag was placed on its own indented line), trim any
+            // trailing space we've accumulated so we don't leave " ... . <br/>".
+            // This targeted trimming avoids breaking other spacing-sensitive cases.
+            const prevOriginal = nodes[i - 1]
+            if (prevOriginal && prevOriginal.type === 'JSXText' && /\n\s*$/.test(prevOriginal.value)) {
+              out = out.replace(/\s+$/, '')
+            }
+            out += `<${tag}/>`
+            lastWasSelfClosing = true
+          } else {
+            out += `<${tag}>${inner}</${tag}>`
+            lastWasSelfClosing = false
+          }
         } else {
           // Use the pre-order globalSlots index so placeholder numbers reflect
           // the global ordering (including nested slots collected earlier).
           const idx = globalSlots.indexOf(node)
           const inner = visitNodes(node.children || [])
           out += `<${idx}>${inner}</${idx}>`
+          lastWasSelfClosing = false
         }
         continue
       }
 
       if (node.type === 'JSXFragment') {
         out += visitNodes(node.children || [])
+        lastWasSelfClosing = false
         continue
       }
 

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;AAgUnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,CA8E9B"}
+{"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;AAgVnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,CA8E9B"}