Unverified Commit 196ed2b8 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Fix syntax contexts in server action transform (#91210)

```
let x: Ident = IdentName::new(name, span).into();
```
should never be done. It uses `SyntaxContext::default()` for the Ident. So from swc's perspective, you are referring to a different variable than you think. When constructing an `Ident`, you should usually always provide a SyntaxContext.

I think this would pose a problem in Webpack because it serializes it into a code string again, but for Turbopack these SyntaxContext are important.
parent 9848d228
......@@ -481,12 +481,15 @@ impl<C: Comments> ServerActions<C> {
) -> Box<Expr> {
let mut new_params: Vec<Param> = vec![];
let closure_bound_ident =
Ident::new(atom!("$$ACTION_CLOSURE_BOUND"), DUMMY_SP, self.private_ctxt);
if !ids_from_closure.is_empty() {
// First param is the encrypted closure variables.
new_params.push(Param {
span: DUMMY_SP,
decorators: vec![],
pat: Pat::Ident(IdentName::new(atom!("$$ACTION_CLOSURE_BOUND"), DUMMY_SP).into()),
pat: Pat::Ident(closure_bound_ident.clone().into()),
});
}
......@@ -542,10 +545,7 @@ impl<C: Comments> ServerActions<C> {
arg: Box::new(Expr::Call(CallExpr {
span: DUMMY_SP,
callee: quote_ident!("decryptActionBoundArgs").as_callee(),
args: vec![
action_id.clone().as_arg(),
quote_ident!("$$ACTION_CLOSURE_BOUND").as_arg(),
],
args: vec![action_id.clone().as_arg(), closure_bound_ident.as_arg()],
..Default::default()
})),
}))),
......@@ -646,12 +646,15 @@ impl<C: Comments> ServerActions<C> {
) -> Box<Expr> {
let mut new_params: Vec<Param> = vec![];
let closure_bound_ident =
Ident::new(atom!("$$ACTION_CLOSURE_BOUND"), DUMMY_SP, self.private_ctxt);
if !ids_from_closure.is_empty() {
// First param is the encrypted closure variables.
new_params.push(Param {
span: DUMMY_SP,
decorators: vec![],
pat: Pat::Ident(IdentName::new(atom!("$$ACTION_CLOSURE_BOUND"), DUMMY_SP).into()),
pat: Pat::Ident(closure_bound_ident.clone().into()),
});
}
......@@ -705,10 +708,7 @@ impl<C: Comments> ServerActions<C> {
arg: Box::new(Expr::Call(CallExpr {
span: DUMMY_SP,
callee: quote_ident!("decryptActionBoundArgs").as_callee(),
args: vec![
action_id.clone().as_arg(),
quote_ident!("$$ACTION_CLOSURE_BOUND").as_arg(),
],
args: vec![action_id.clone().as_arg(), closure_bound_ident.as_arg()],
..Default::default()
})),
}))),
......@@ -2326,7 +2326,8 @@ impl<C: Comments> VisitMut for ServerActions<C> {
decls: vec![VarDeclarator {
span: DUMMY_SP,
name: Pat::Ident(
IdentName::new(var_name.clone(), name_span).into(),
Ident::new(var_name.clone(), name_span, self.private_ctxt)
.into(),
),
init: Some(Box::new(Expr::Call(CallExpr {
span: PURE_SP,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment