Unverified Commit 0a803baf authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

fix(styled-jsx): Use correct SyntaxContext for identifiers (#29705)

Co-authored-by: 's avatarkdy1 <kdy1@users.noreply.github.com>
Co-authored-by: 's avatarMaia Teegarden <dev@padmaia.rocks>
parent 9b22406e
...@@ -3,6 +3,7 @@ use std::collections::hash_map::DefaultHasher; ...@@ -3,6 +3,7 @@ use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::mem::take; use std::mem::take;
use swc_common::{collections::AHashSet, Span, DUMMY_SP}; use swc_common::{collections::AHashSet, Span, DUMMY_SP};
use swc_common::{Mark, SyntaxContext};
use swc_ecmascript::ast::*; use swc_ecmascript::ast::*;
use swc_ecmascript::minifier::{ use swc_ecmascript::minifier::{
eval::{EvalResult, Evaluator}, eval::{EvalResult, Evaluator},
...@@ -39,7 +40,7 @@ struct StyledJSXTransformer { ...@@ -39,7 +40,7 @@ struct StyledJSXTransformer {
external_bindings: Vec<Id>, external_bindings: Vec<Id>,
file_has_css_resolve: bool, file_has_css_resolve: bool,
external_hash: Option<String>, external_hash: Option<String>,
add_hash: Option<(String, String)>, add_hash: Option<((String, SyntaxContext), String)>,
add_default_decl: Option<(String, Expr)>, add_default_decl: Option<(String, Expr)>,
in_function_params: bool, in_function_params: bool,
evaluator: Option<Evaluator>, evaluator: Option<Evaluator>,
...@@ -218,10 +219,10 @@ impl Fold for StyledJSXTransformer { ...@@ -218,10 +219,10 @@ impl Fold for StyledJSXTransformer {
if let Some(external_hash) = &self.external_hash.take() { if let Some(external_hash) = &self.external_hash.take() {
match &declarator.name { match &declarator.name {
Pat::Ident(BindingIdent { Pat::Ident(BindingIdent {
id: Ident { sym, .. }, id: Ident { span, sym, .. },
.. ..
}) => { }) => {
self.add_hash = Some((sym.to_string(), external_hash.clone())); self.add_hash = Some(((sym.to_string(), span.ctxt), external_hash.clone()));
} }
_ => {} _ => {}
} }
...@@ -233,12 +234,20 @@ impl Fold for StyledJSXTransformer { ...@@ -233,12 +234,20 @@ impl Fold for StyledJSXTransformer {
let default_expr = default_expr.fold_children_with(self); let default_expr = default_expr.fold_children_with(self);
if let Some(external_hash) = &self.external_hash.take() { if let Some(external_hash) = &self.external_hash.take() {
let default_ident = "_defaultExport"; let default_ident = "_defaultExport";
self.add_hash = Some((String::from(default_ident), external_hash.clone())); // (JsWord, SyntaxContext) is core of the Identifier
let private_mark = Mark::fresh(Mark::root());
self.add_hash = Some((
(
String::from(default_ident),
SyntaxContext::empty().apply_mark(private_mark),
),
external_hash.clone(),
));
self.add_default_decl = Some((String::from(default_ident), *default_expr.expr)); self.add_default_decl = Some((String::from(default_ident), *default_expr.expr));
return ExportDefaultExpr { return ExportDefaultExpr {
expr: Box::new(Expr::Ident(Ident { expr: Box::new(Expr::Ident(Ident {
sym: default_ident.into(), sym: default_ident.into(),
span: DUMMY_SP, span: DUMMY_SP.with_ctxt(SyntaxContext::empty().apply_mark(private_mark)),
optional: false, optional: false,
})), })),
span: DUMMY_SP, span: DUMMY_SP,
...@@ -786,13 +795,13 @@ fn join_spreads(spreads: Vec<Expr>) -> Expr { ...@@ -786,13 +795,13 @@ fn join_spreads(spreads: Vec<Expr>) -> Expr {
new_expr new_expr
} }
fn add_hash_statment((ident, hash): (String, String)) -> Stmt { fn add_hash_statment(((ident, ctxt), hash): ((String, SyntaxContext), String)) -> Stmt {
Stmt::Expr(ExprStmt { Stmt::Expr(ExprStmt {
expr: Box::new(Expr::Assign(AssignExpr { expr: Box::new(Expr::Assign(AssignExpr {
left: PatOrExpr::Expr(Box::new(Expr::Member(MemberExpr { left: PatOrExpr::Expr(Box::new(Expr::Member(MemberExpr {
obj: ExprOrSuper::Expr(Box::new(Expr::Ident(Ident { obj: ExprOrSuper::Expr(Box::new(Expr::Ident(Ident {
sym: ident.into(), sym: ident.into(),
span: DUMMY_SP, span: DUMMY_SP.with_ctxt(ctxt),
optional: false, optional: false,
}))), }))),
prop: Box::new(Expr::Ident(Ident { prop: Box::new(Expr::Ident(Ident {
......
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