i18next-cli 1.45.0 → 1.46.0

package/dist/cjs/cli.js

@@ -28,7 +28,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.45.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.46.0'); // 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/jsx-parser.js

@@ -135,7 +135,13 @@ function extractFromTransComponent(node, config) {
         valuesAttr.value.expression.type === 'ObjectExpression') {
         valuesCountProperty = astUtils.getObjectPropValueExpression(valuesAttr.value.expression, 'count');
     }
-    const hasCount = !!countAttr || !!valuesCountProperty;
+    // Mirror react-i18next v16.4.0: infer count from inline {{ count }} children
+    // when no explicit `count` prop or `values={{ count }}` is present.
+    // The runtime check is `typeof valuesFromChildren.count === 'number'`; at
+    // extraction time we can only inspect the AST shape, so we look for any
+    // ObjectExpression interpolation that declares a `count` key.
+    const hasInlineCount = !countAttr && !valuesCountProperty && childrenHaveInlineCount(node.children);
+    const hasCount = !!countAttr || !!valuesCountProperty || hasInlineCount;
     const tOptionsAttr = node.opening.attributes?.find((attr) => attr.type === 'JSXAttribute' &&
         attr.name.type === 'Identifier' &&
         attr.name.value === 'tOptions');
@@ -385,6 +391,74 @@ function swcChildToReactNode(node) {
 function swcChildrenToReactNodes(children) {
     return children.map(swcChildToReactNode).filter(n => n !== null);
 }
+/**
+ * Unwraps TypeScript type-assertion and parenthesis wrappers from a JSX
+ * expression so callers can inspect the underlying node type.
+ *
+ * Handles:
+ *   `{{ count } as any}`          → TsAsExpression wrapping ObjectExpression
+ *   `{{ count } as TransInterpolation}` → same
+ *   `({{ count }})`               → ParenthesisExpression wrapping ObjectExpression
+ */
+function unwrapJSXExpression(expr) {
+    if (expr.type === 'TsAsExpression' || expr.type === 'TsSatisfiesExpression') {
+        return unwrapJSXExpression(expr.expression);
+    }
+    if (expr.type === 'ParenthesisExpression') {
+        return unwrapJSXExpression(expr.expression);
+    }
+    return expr;
+}
+/**
+ * Recursively walks JSX children to determine whether any interpolation
+ * object contains a `count` property — mirroring the runtime behaviour of
+ * react-i18next v16.4.0's `getValuesFromChildren`.
+ *
+ * This lets the extractor infer `hasCount = true` when a `{{ count }}`
+ * (or `{{ count: expr }}`) interpolation is present in children without an
+ * explicit `count` prop on the `<Trans>` component.
+ *
+ * Matches:
+ *   `{{ count }}`               — shorthand Identifier  (prop.type === 'Identifier')
+ *   `{{ count: someExpr }}`     — KeyValueProperty with Identifier key
+ *   `{{ count } as any}`        — TsAsExpression-wrapped ObjectExpression
+ *   Deeply nested in child JSX elements (e.g. `<strong>{{ count }}</strong>`)
+ *
+ * @param children - The JSX children array to search
+ * @returns `true` when a `count` interpolation is found anywhere in the tree
+ */
+function childrenHaveInlineCount(children) {
+    for (const child of children) {
+        if (child.type === 'JSXExpressionContainer') {
+            const inner = unwrapJSXExpression(child.expression);
+            if (inner.type === 'ObjectExpression') {
+                const hasCount = inner.properties.some(prop => {
+                    if (prop.type === 'KeyValueProperty') {
+                        // { count: expr }
+                        return ((prop.key.type === 'Identifier' || prop.key.type === 'StringLiteral') &&
+                            prop.key.value === 'count');
+                    }
+                    if (prop.type === 'Identifier') {
+                        // shorthand { count }
+                        return prop.value === 'count';
+                    }
+                    return false;
+                });
+                if (hasCount)
+                    return true;
+            }
+        }
+        else if (child.type === 'JSXElement') {
+            if (childrenHaveInlineCount(child.children))
+                return true;
+        }
+        else if (child.type === 'JSXFragment') {
+            if (childrenHaveInlineCount(child.children))
+                return true;
+        }
+    }
+    return false;
+}
 function serializeJSXChildren(children, config) {
     const i18nextOptions = { ...reactI18next.getDefaults() };
     if (config.extract.transKeepBasicHtmlNodesFor) {

package/dist/esm/cli.js

@@ -26,7 +26,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.45.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.46.0'); // 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/jsx-parser.js

@@ -133,7 +133,13 @@ function extractFromTransComponent(node, config) {
         valuesAttr.value.expression.type === 'ObjectExpression') {
         valuesCountProperty = getObjectPropValueExpression(valuesAttr.value.expression, 'count');
     }
-    const hasCount = !!countAttr || !!valuesCountProperty;
+    // Mirror react-i18next v16.4.0: infer count from inline {{ count }} children
+    // when no explicit `count` prop or `values={{ count }}` is present.
+    // The runtime check is `typeof valuesFromChildren.count === 'number'`; at
+    // extraction time we can only inspect the AST shape, so we look for any
+    // ObjectExpression interpolation that declares a `count` key.
+    const hasInlineCount = !countAttr && !valuesCountProperty && childrenHaveInlineCount(node.children);
+    const hasCount = !!countAttr || !!valuesCountProperty || hasInlineCount;
     const tOptionsAttr = node.opening.attributes?.find((attr) => attr.type === 'JSXAttribute' &&
         attr.name.type === 'Identifier' &&
         attr.name.value === 'tOptions');
@@ -383,6 +389,74 @@ function swcChildToReactNode(node) {
 function swcChildrenToReactNodes(children) {
     return children.map(swcChildToReactNode).filter(n => n !== null);
 }
+/**
+ * Unwraps TypeScript type-assertion and parenthesis wrappers from a JSX
+ * expression so callers can inspect the underlying node type.
+ *
+ * Handles:
+ *   `{{ count } as any}`          → TsAsExpression wrapping ObjectExpression
+ *   `{{ count } as TransInterpolation}` → same
+ *   `({{ count }})`               → ParenthesisExpression wrapping ObjectExpression
+ */
+function unwrapJSXExpression(expr) {
+    if (expr.type === 'TsAsExpression' || expr.type === 'TsSatisfiesExpression') {
+        return unwrapJSXExpression(expr.expression);
+    }
+    if (expr.type === 'ParenthesisExpression') {
+        return unwrapJSXExpression(expr.expression);
+    }
+    return expr;
+}
+/**
+ * Recursively walks JSX children to determine whether any interpolation
+ * object contains a `count` property — mirroring the runtime behaviour of
+ * react-i18next v16.4.0's `getValuesFromChildren`.
+ *
+ * This lets the extractor infer `hasCount = true` when a `{{ count }}`
+ * (or `{{ count: expr }}`) interpolation is present in children without an
+ * explicit `count` prop on the `<Trans>` component.
+ *
+ * Matches:
+ *   `{{ count }}`               — shorthand Identifier  (prop.type === 'Identifier')
+ *   `{{ count: someExpr }}`     — KeyValueProperty with Identifier key
+ *   `{{ count } as any}`        — TsAsExpression-wrapped ObjectExpression
+ *   Deeply nested in child JSX elements (e.g. `<strong>{{ count }}</strong>`)
+ *
+ * @param children - The JSX children array to search
+ * @returns `true` when a `count` interpolation is found anywhere in the tree
+ */
+function childrenHaveInlineCount(children) {
+    for (const child of children) {
+        if (child.type === 'JSXExpressionContainer') {
+            const inner = unwrapJSXExpression(child.expression);
+            if (inner.type === 'ObjectExpression') {
+                const hasCount = inner.properties.some(prop => {
+                    if (prop.type === 'KeyValueProperty') {
+                        // { count: expr }
+                        return ((prop.key.type === 'Identifier' || prop.key.type === 'StringLiteral') &&
+                            prop.key.value === 'count');
+                    }
+                    if (prop.type === 'Identifier') {
+                        // shorthand { count }
+                        return prop.value === 'count';
+                    }
+                    return false;
+                });
+                if (hasCount)
+                    return true;
+            }
+        }
+        else if (child.type === 'JSXElement') {
+            if (childrenHaveInlineCount(child.children))
+                return true;
+        }
+        else if (child.type === 'JSXFragment') {
+            if (childrenHaveInlineCount(child.children))
+                return true;
+        }
+    }
+    return false;
+}
 function serializeJSXChildren(children, config) {
     const i18nextOptions = { ...getDefaults() };
     if (config.extract.transKeepBasicHtmlNodesFor) {

package/package.json

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

package/types/extractor/parsers/jsx-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsx-parser.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/jsx-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAsC,UAAU,EAAkD,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC7J,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAsEvD,MAAM,WAAW,sBAAsB;IACrC,gDAAgD;IAChD,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,qDAAqD;IACrD,kBAAkB,EAAE,MAAM,CAAC;IAE3B,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,8DAA8D;IAC9D,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,oEAAoE;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAE/B,mDAAmD;IACnD,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAE/B,kHAAkH;IAClH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AA4BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,yBAAyB,CAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,sBAAsB,GAAG,IAAI,CA2LxH"}
+{"version":3,"file":"jsx-parser.d.ts","sourceRoot":"","sources":["../../../src/extractor/parsers/jsx-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAsC,UAAU,EAAkD,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC7J,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAsEvD,MAAM,WAAW,sBAAsB;IACrC,gDAAgD;IAChD,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,qDAAqD;IACrD,kBAAkB,EAAE,MAAM,CAAC;IAE3B,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,8DAA8D;IAC9D,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,oEAAoE;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAE/B,mDAAmD;IACnD,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAE/B,kHAAkH;IAClH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AA4BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,yBAAyB,CAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,sBAAsB,GAAG,IAAI,CAkMxH"}