i18next-cli 1.56.4 → 1.56.5

package/dist/cjs/cli.js

@@ -32,7 +32,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.56.4'); // This string is replaced with the actual version at build time by rollup
+    .version('1.56.5'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/cjs/extractor/parsers/call-expression-handler.js

@@ -608,7 +608,48 @@ class CallExpressionHandler {
                 return [];
             }
         }
-        let current = body;
+        return this.extractKeysFromSelectorExpression(body);
+    }
+    /**
+     * Recursively extracts key paths from a selector-body expression.
+     *
+     * On top of the straight MemberExpression walk this also descends into
+     * branching forms so keys referenced in either branch are preserved
+     * (see #247): ternaries (`cond ? $.a : $.b`), nullish/logical
+     * short-circuits (`x ?? $.a`, `x && $.a`, `x || $.a`), and common
+     * wrapper nodes (parentheses, TS type assertions).
+     */
+    extractKeysFromSelectorExpression(expr) {
+        if (!expr)
+            return [];
+        // Unwrap wrappers that don't change the expressed key path.
+        if (expr.type === 'ParenthesisExpression' ||
+            expr.type === 'TsAsExpression' ||
+            expr.type === 'TsSatisfiesExpression' ||
+            expr.type === 'TsNonNullExpression' ||
+            expr.type === 'TsConstAssertion') {
+            return this.extractKeysFromSelectorExpression(expr.expression);
+        }
+        // Ternary: union of both branches.
+        if (expr.type === 'ConditionalExpression') {
+            return [
+                ...this.extractKeysFromSelectorExpression(expr.consequent),
+                ...this.extractKeysFromSelectorExpression(expr.alternate),
+            ];
+        }
+        // Short-circuit logicals (`||`, `&&`, `??`): union of both sides. SWC
+        // may emit these as LogicalExpression or BinaryExpression depending on
+        // version, so accept both.
+        if ((expr.type === 'LogicalExpression' || expr.type === 'BinaryExpression') &&
+            (expr.operator === '||' || expr.operator === '&&' || expr.operator === '??')) {
+            return [
+                ...this.extractKeysFromSelectorExpression(expr.left),
+                ...this.extractKeysFromSelectorExpression(expr.right),
+            ];
+        }
+        if (expr.type !== 'MemberExpression')
+            return [];
+        let current = expr;
         // Each element is an array of possible values for that position in the key path
         const parts = [];
         // Recursively walk down MemberExpressions

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

@@ -73,7 +73,7 @@ class JSXHandler {
             const where = loc
                 ? `${this.getCurrentFile()}:${loc.line}:${loc.column}`
                 : this.getCurrentFile();
-            emit(`Error: <${elementName}> child {${name}} at ${where} won't match at runtime — react-i18next inlines the value (e.g. "<1>meow</1>"), but extraction produces "<1>{{${name}}}</1>". Use {{${name}}} (double braces) with values={{ ${name} }} for interpolation, or inline the value if it isn't meant to be translated.`);
+            emit(`Error: <${elementName}> child {${name}} at ${where} won't match at runtime — react-i18next inlines the value (e.g. "<1>meow</1>"), but extraction produces "<1>{{${name}}}</1>". Use {{${name}}} (double braces) with values={{ ${name} }} for interpolation.`);
         }
     }
     /**

package/dist/esm/cli.js

@@ -30,7 +30,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.56.4'); // This string is replaced with the actual version at build time by rollup
+    .version('1.56.5'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/esm/extractor/parsers/call-expression-handler.js

@@ -606,7 +606,48 @@ class CallExpressionHandler {
                 return [];
             }
         }
-        let current = body;
+        return this.extractKeysFromSelectorExpression(body);
+    }
+    /**
+     * Recursively extracts key paths from a selector-body expression.
+     *
+     * On top of the straight MemberExpression walk this also descends into
+     * branching forms so keys referenced in either branch are preserved
+     * (see #247): ternaries (`cond ? $.a : $.b`), nullish/logical
+     * short-circuits (`x ?? $.a`, `x && $.a`, `x || $.a`), and common
+     * wrapper nodes (parentheses, TS type assertions).
+     */
+    extractKeysFromSelectorExpression(expr) {
+        if (!expr)
+            return [];
+        // Unwrap wrappers that don't change the expressed key path.
+        if (expr.type === 'ParenthesisExpression' ||
+            expr.type === 'TsAsExpression' ||
+            expr.type === 'TsSatisfiesExpression' ||
+            expr.type === 'TsNonNullExpression' ||
+            expr.type === 'TsConstAssertion') {
+            return this.extractKeysFromSelectorExpression(expr.expression);
+        }
+        // Ternary: union of both branches.
+        if (expr.type === 'ConditionalExpression') {
+            return [
+                ...this.extractKeysFromSelectorExpression(expr.consequent),
+                ...this.extractKeysFromSelectorExpression(expr.alternate),
+            ];
+        }
+        // Short-circuit logicals (`||`, `&&`, `??`): union of both sides. SWC
+        // may emit these as LogicalExpression or BinaryExpression depending on
+        // version, so accept both.
+        if ((expr.type === 'LogicalExpression' || expr.type === 'BinaryExpression') &&
+            (expr.operator === '||' || expr.operator === '&&' || expr.operator === '??')) {
+            return [
+                ...this.extractKeysFromSelectorExpression(expr.left),
+                ...this.extractKeysFromSelectorExpression(expr.right),
+            ];
+        }
+        if (expr.type !== 'MemberExpression')
+            return [];
+        let current = expr;
         // Each element is an array of possible values for that position in the key path
         const parts = [];
         // Recursively walk down MemberExpressions

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

@@ -71,7 +71,7 @@ class JSXHandler {
             const where = loc
                 ? `${this.getCurrentFile()}:${loc.line}:${loc.column}`
                 : this.getCurrentFile();
-            emit(`Error: <${elementName}> child {${name}} at ${where} won't match at runtime — react-i18next inlines the value (e.g. "<1>meow</1>"), but extraction produces "<1>{{${name}}}</1>". Use {{${name}}} (double braces) with values={{ ${name} }} for interpolation, or inline the value if it isn't meant to be translated.`);
+            emit(`Error: <${elementName}> child {${name}} at ${where} won't match at runtime — react-i18next inlines the value (e.g. "<1>meow</1>"), but extraction produces "<1>{{${name}}}</1>". Use {{${name}}} (double braces) with values={{ ${name} }} for interpolation.`);
         }
     }
     /**

package/package.json

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

package/types/extractor/parsers/call-expression-handler.d.ts

@@ -67,6 +67,16 @@ export declare class CallExpressionHandler {
      * @returns Extracted key paths, or empty array if not statically analyzable
      */
     private extractKeysFromSelector;
+    /**
+     * Recursively extracts key paths from a selector-body expression.
+     *
+     * On top of the straight MemberExpression walk this also descends into
+     * branching forms so keys referenced in either branch are preserved
+     * (see #247): ternaries (`cond ? $.a : $.b`), nullish/logical
+     * short-circuits (`x ?? $.a`, `x && $.a`, `x || $.a`), and common
+     * wrapper nodes (parentheses, TS type assertions).
+     */
+    private extractKeysFromSelectorExpression;
     /**
      * Generates plural form keys based on the primary language's plural rules.
      *

package/types/extractor/parsers/call-expression-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-expression-handler.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/call-expression-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,WAAW,CAAA;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAgB,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAa7D,qBAAa,qBAAqB;IAChC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,kBAAkB,CAAoB;IACvC,UAAU,cAAoB;IACrC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,iBAAiB,CAAsC;gBAG7D,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,MAAM,MAAM,EAC5B,cAAc,EAAE,MAAM,MAAM,EAC5B,iBAAiB,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAA2B;IAW3E;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAiB3B;;;;;;;;;;;;;;OAcG;IACH,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GAAG,IAAI;IA0ZxG;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,wBAAwB;IAyEhC;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,uBAAuB;IAgE/B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAyMxB;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CA2BxB"}
+{"version":3,"file":"call-expression-handler.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/call-expression-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA6C,MAAM,WAAW,CAAA;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,EAAgB,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAa7D,qBAAa,qBAAqB;IAChC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,MAAM,CAAuC;IACrD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,kBAAkB,CAAoB;IACvC,UAAU,cAAoB;IACrC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,iBAAiB,CAAsC;gBAG7D,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC7C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,kBAAkB,EACtC,cAAc,EAAE,MAAM,MAAM,EAC5B,cAAc,EAAE,MAAM,MAAM,EAC5B,iBAAiB,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAA2B;IAW3E;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAiB3B;;;;;;;;;;;;;;OAcG;IACH,oBAAoB,CAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GAAG,IAAI;IA0ZxG;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,wBAAwB;IAyEhC;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,uBAAuB;IAgB/B;;;;;;;;OAQG;IACH,OAAO,CAAC,iCAAiC;IAwFzC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAyMxB;;;;;;;;;OASG;IACH,OAAO,CAAC,eAAe;CA2BxB"}