fix(formatjs_cli): extract formatMessage from callbacks inside optional chains (#6460)

walkerburgin · longlho · claude · web-flow · commit cb7bb238098f · 2026-04-28T16:11:23.000-04:00
Fixes #6459. The Rust CLI's chain-expression visitor walked into call expression arguments, but skipped the callee. As a result, `formatMessage` calls inside callbacks passed to optional-chain methods (e.g. `getUsers()?.map(() => intl.formatMessage(...))`) were never extracted. ## Changes - Walk both the callee and arguments of a `CallExpression` chain element so nested `formatMessage` calls inside callback bodies are extracted. - Drop the `StaticMemberExpression` arm — `walk_chain_expression` covers it via the default case. - Add fixture case in `packages/ts-transformer/tests/fixtures/optionalChaining.tsx`. - Add Rust unit-test expectation in `crates/formatjs_cli/src/extractor.rs`. - Add ts-transformer assertion in `packages/ts-transformer/tests/index.test.ts`. - Add CLI conformance case `22_callback_in_optional_chain.txt` so both Rust and TS extractors are guarded. ## Test plan - [x] `bazel test //crates/formatjs_cli:formatjs_cli_test` - [x] `bazel test //packages/ts-transformer:ts-transformer_test` - [x] `bazel test //packages/cli/integration-tests:conformance_test` --------- Co-authored-by: Long Ho <holevietlong@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/crates/formatjs_cli/src/extractor.rs b/crates/formatjs_cli/src/extractor.rs
@@ -591,19 +591,14 @@ impl<'a> Visit<'a> for MessageExtractor<'a> {
             oxc_ast::ast::ChainElement::CallExpression(call) => {
                 // Extract the message from this call expression
                 self.extract_call_expression_message(call);
-                // Don't walk - this prevents double extraction since walk would
-                // visit the arguments which may contain nested chains
-                // Instead, manually walk just the arguments to find nested messages
+                // Walk both callee and arguments to find nested messages
+                walk::walk_expression(self, &call.callee);
                 for arg in &call.arguments {
                     if let Some(expr) = arg.as_expression() {
                         walk::walk_expression(self, expr);
                     }
                 }
             }
-            oxc_ast::ast::ChainElement::StaticMemberExpression(_) => {
-                // For member expressions in chains, walk normally to find nested patterns
-                walk::walk_chain_expression(self, it);
-            }
             _ => {
                 // For other chain elements, walk normally
                 walk::walk_chain_expression(self, it);
@@ -1379,6 +1374,14 @@ mod tests {
                 start: None,
                 end: None,
             },
+            MessageDescriptor {
+                id: None,
+                default_message: Some("In a callback inside an optional chain".to_string()),
+                description: Some(Value::String("Test callbacks inside an optional chain".to_string())),
+                file: None,
+                start: None,
+                end: None,
+            },
         ];
 
         assert_eq!(messages, expected);
diff --git a/packages/cli/integration-tests/conformance-tests/test_cases/22_callback_in_optional_chain.txt b/packages/cli/integration-tests/conformance-tests/test_cases/22_callback_in_optional_chain.txt
@@ -0,0 +1,31 @@
+import React from 'react';
+
+function getUsers(): Array<string> | undefined {
+  return undefined;
+}
+
+function MyComponent({intl}) {
+  // formatMessage nested in a callback inside an optional chain.
+  const messages = getUsers()?.map(() =>
+    intl.formatMessage({
+      id: 'callback.in.optional.chain',
+      defaultMessage: 'In a callback inside an optional chain',
+      description: 'Test callbacks inside an optional chain'
+    })
+  ).join(', ');
+
+  return <div>{messages}</div>;
+}
+---
+{
+  "command": "extract",
+  "args": ["--throws"],
+  "fileType": "tsx"
+}
+---
+{
+  "callback.in.optional.chain": {
+    "defaultMessage": "In a callback inside an optional chain",
+    "description": "Test callbacks inside an optional chain"
+  }
+}
diff --git a/packages/ts-transformer/tests/fixtures/optionalChaining.tsx b/packages/ts-transformer/tests/fixtures/optionalChaining.tsx
@@ -1,8 +1,12 @@
 // @ts-ignore
 const intl = {} as any
 
+function getUsers(): Array<string> | undefined {
+  return undefined;
+}
+
 // GH #4471: Test optional chaining with generics
-export function testOptionalChainingWithGenerics() {
+export function testOptionalChainingWithGenerics(): void {
   // Case 1: Normal call (baseline - should work)
   intl.formatMessage({
     defaultMessage: 'Normal call',
@@ -33,4 +37,14 @@ export function testOptionalChainingWithGenerics() {
     defaultMessage: 'Nested optional chaining',
     description: 'Test nested optional chaining',
   })
+
+  // Case 6: formatMessage nested in a callback inside an optional chain.
+  getUsers()?.map(() =>
+    intl.formatMessage(
+      {
+        defaultMessage: 'In a callback inside an optional chain',
+        description: 'Test callbacks inside an optional chain',
+      },
+    ),
+  ).join(', ')
 }
diff --git a/packages/ts-transformer/tests/index.test.ts b/packages/ts-transformer/tests/index.test.ts
@@ -710,6 +710,11 @@ describe('emit asserts for', function () {
         description: 'Test nested optional chaining',
         id: 'DZ/55FDtO6',
       },
+      {
+        defaultMessage: 'In a callback inside an optional chain',
+        description: 'Test callbacks inside an optional chain',
+        id: '7SldKmH/WX',
+      },
     ])
   })
 
