fix: update optional call rewriter for complex chain support and add Linux persona to expected deltas

Author: lemon-mint

rewriter-rs/src/js/swc_rewriter.rs

@@ -663,11 +663,45 @@ impl SwcRewriter<'_> {
     }
 
     fn rewrite_optional_call(&mut self, call: &OptCall) -> Option<Expr> {
-        let callee = Callee::Expr(call.callee.clone());
-        let (base, prop) = self.call_target_parts(&callee, true)?;
-        let args = array_expr(call.args.iter().cloned().map(expr_from_spread).collect());
+        let (base, prop) = self.optional_call_target_parts(&call.callee)?;
+        let args = array_expr(
+            call.args
+                .iter()
+                .cloned()
+                .map(|arg| self.transformed_arg_expr(arg))
+                .collect(),
+        );
         Some(call_helper("__zp_optionalCall", vec![base, prop, args]))
     }
+
+    fn optional_call_target_parts(&mut self, callee: &Expr) -> Option<(Expr, Expr)> {
+        match callee {
+            Expr::Member(member) => {
+                let wrapped = Callee::Expr(Box::new(Expr::Member(member.clone())));
+                self.call_target_parts(&wrapped, true)
+            }
+            Expr::OptChain(chain) => match &*chain.base {
+                OptChainBase::Member(member) => {
+                    let base = self.transformed_expr(&member.obj);
+                    let prop = self.member_prop_expr(&member.prop);
+                    Some((base, prop))
+                }
+                _ => None,
+            },
+            Expr::Paren(paren) => self.optional_call_target_parts(&paren.expr),
+            _ => None,
+        }
+    }
+
+    fn transformed_arg_expr(&mut self, arg: ExprOrSpread) -> Expr {
+        let ExprOrSpread { spread, expr } = arg;
+        let mut expr = *expr;
+        expr.visit_mut_with(self);
+        expr_from_spread(ExprOrSpread {
+            spread,
+            expr: Box::new(expr),
+        })
+    }
 }
 
 fn rewritten_str_lit(src: &Str, ctx: RewriteContext<'_>) -> Str {

test/e2e/expected-deltas.json

@@ -27,17 +27,17 @@
     },
     {
       "id": "navigator-app-version-persona",
-      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.5\\.0 \\((Macintosh; Intel Mac OS X 10_15_7|Windows NT 10\\.0; Win64; x64)\\) AppleWebKit/537\\.36 \\(KHTML, like Gecko\\) (HeadlessChrome|Chrome)/[0-9]+\\.0\\.0\\.0 Safari/537\\.36$",
+      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.5\\.0 \\((Macintosh; Intel Mac OS X 10_15_7|Windows NT 10\\.0; Win64; x64|X11; Linux x86_64)\\) AppleWebKit/537\\.36 \\(KHTML, like Gecko\\) (HeadlessChrome|Chrome)/[0-9]+\\.0\\.0\\.0 Safari/537\\.36$",
       "reason": "Native Chromium exposes host platform appVersion while ZeroProxy exposes the Windows Chrome persona."
     },
     {
       "id": "navigator-user-agent-persona",
-      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.Mozilla/5\\.0 \\((Macintosh; Intel Mac OS X 10_15_7|Windows NT 10\\.0; Win64; x64)\\) AppleWebKit/537\\.36 \\(KHTML, like Gecko\\) (HeadlessChrome|Chrome)/[0-9]+\\.0\\.0\\.0 Safari/537\\.36$",
+      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.Mozilla/5\\.0 \\((Macintosh; Intel Mac OS X 10_15_7|Windows NT 10\\.0; Win64; x64|X11; Linux x86_64)\\) AppleWebKit/537\\.36 \\(KHTML, like Gecko\\) (HeadlessChrome|Chrome)/[0-9]+\\.0\\.0\\.0 Safari/537\\.36$",
       "reason": "Native Chromium exposes host platform userAgent while ZeroProxy exposes the Windows Chrome persona."
     },
     {
       "id": "navigator-platform-persona",
-      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.(MacIntel|Win32)$",
+      "pattern": "^surface\\.fingerprint\\.objectPropertyCollection\\.r\\.(Linux x86_64|MacIntel|Win32)$",
       "reason": "Native Chromium exposes host platform while ZeroProxy exposes the Windows Chrome persona."
     }
   ]

test/js/rewriter.test.js

@@ -873,6 +873,8 @@ test('Rust rewriter preserves optional access semantics for guarded probes', asy
   assert.ok(out.code.includes('__zp_optionalCall'));
   assert.ok(out.code.includes('__zp_optionalCall(Object,"getOwnPropertyDescriptors"'));
   assert.ok(out.code.includes('__zp_optionalCall(Reflect,"ownKeys"'));
+  assert.ok(out.code.includes('__zp_optionalCall(__zp_optionalGet(frame,"contentWindow"),"postMessage"'));
+  assert.equal(out.code.includes('__zp_optionalGet(__zp_optionalGet(frame,"contentWindow"),"postMessage")('), false);
 });
 
 test('Rust rewriter routes computed global-alias member access through runtime membrane', async () => {