fix(es/compat): Support vars from reserved_word pass (#8543)

**Related issue:**

 - Closes #8539
This commit is contained in:
Donny/강동윤 2024-01-23 13:23:48 +09:00 committed by GitHub
parent ecd9403c1d
commit fc929e962b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 98 additions and 25 deletions

View File

@ -0,0 +1,21 @@
{
"jsc": {
"parser": {
"syntax": "ecmascript",
"jsx": false
},
"loose": false,
"minify": {
"compress": false,
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true,
"env": {
"targets": "chrome >= 12"
}
}

View File

@ -0,0 +1,3 @@
export const goto = () => {
return null
}

View File

@ -0,0 +1,4 @@
var _goto = function() {
return null;
};
export { _goto as goto };

View File

@ -1,7 +1,6 @@
use swc_common::{util::take::Take, DUMMY_SP}; use swc_common::{util::take::Take, DUMMY_SP};
use swc_ecma_ast::*; use swc_ecma_ast::*;
use swc_ecma_visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith}; use swc_ecma_visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith};
use swc_trace_macro::swc_trace;
/// babel: `@babel/plugin-transform-reserved-words` /// babel: `@babel/plugin-transform-reserved-words`
/// ///
@ -27,7 +26,6 @@ struct ReservedWord {
pub preserve_import: bool, pub preserve_import: bool,
} }
#[swc_trace]
impl VisitMut for ReservedWord { impl VisitMut for ReservedWord {
noop_visit_mut_type!(); noop_visit_mut_type!();
@ -35,18 +33,24 @@ impl VisitMut for ReservedWord {
let mut extra_exports = vec![]; let mut extra_exports = vec![];
n.iter_mut().for_each(|module_item| { n.iter_mut().for_each(|module_item| {
if let Some((ident, decl)) = match module_item { match module_item {
ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl { decl, .. })) => { ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl {
let ident = decl decl: decl @ Decl::Fn(..) | decl @ Decl::Class(..),
.as_fn_decl() ..
.filter(|fn_decl| fn_decl.ident.is_reserved_in_es3()) })) => {
.map(|fn_decl| fn_decl.ident.clone()); let ident = match decl {
Decl::Class(d) => d.ident.clone(),
ident.map(|ident| (ident, decl.take())) Decl::Fn(d) => d.ident.clone(),
_ => {
unreachable!()
} }
_ => None, };
} {
*module_item = ModuleItem::Stmt(decl.into()); if !ident.is_reserved_in_es3() {
return;
}
*module_item = ModuleItem::Stmt(decl.take().into());
let mut orig = ident.clone(); let mut orig = ident.clone();
orig.visit_mut_with(self); orig.visit_mut_with(self);
@ -62,6 +66,47 @@ impl VisitMut for ReservedWord {
); );
} }
ModuleItem::ModuleDecl(ModuleDecl::ExportDecl(ExportDecl {
decl: Decl::Var(var),
..
})) => {
if var.decls.iter().all(|var| {
if let Pat::Ident(i) = &var.name {
!i.id.sym.is_reserved_in_es3()
} else {
true
}
}) {
return;
}
for var in &var.decls {
let ident = var.name.clone().expect_ident().id;
if !ident.is_reserved_in_es3() {
return;
}
let mut orig = ident.clone();
orig.visit_mut_with(self);
extra_exports.push(
ExportNamedSpecifier {
span: DUMMY_SP,
orig: orig.into(),
exported: Some(ident.into()),
is_type_only: false,
}
.into(),
);
}
*module_item = ModuleItem::Stmt(Decl::Var(var.take()).into());
}
_ => {}
}
module_item.visit_mut_with(self); module_item.visit_mut_with(self);
}); });