swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-23 21:54:36 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(es/helpers): Inject helpers for scripts (#4025)

Browse Source 
**Description:**

This PR adds support for helpers in script mode. For now, we does not support `externalHelpers` for scripts, as there is no standard for importing other files from a script.

**Related issue:**

 - Closes https://github.com/swc-project/swc/issues/2385
This commit is contained in:
Donny/강동윤 2022-03-15 18:43:57 +09:00 committed by GitHub
parent 2f6f829405
commit 73c91d34d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
crates/swc_ecma_transforms_base/src/helpers/mod.rs
View File

@ -45,16 +45,10 @@ macro_rules! add_to {
let enable = $b.load(Ordering::Relaxed);
if enable {
$buf.extend(
STMTS
.iter()
.cloned()
.map(|mut stmt| {
stmt.visit_mut_with(&mut Marker($mark));
stmt
})
.map(ModuleItem::Stmt),
)
$buf.extend(STMTS.iter().cloned().map(|mut stmt| {
stmt.visit_mut_with(&mut Marker($mark));
stmt
}))
}
}};
}
@ -146,7 +140,7 @@ macro_rules! define_helpers {
value
}
fn build_helpers(&self) -> Vec<ModuleItem> {
fn build_helpers(&self) -> Vec<Stmt> {
let mut buf = vec![];
HELPERS.with(|helpers|{
@ -303,7 +297,7 @@ pub fn inject_helpers() -> impl Fold + VisitMut {
struct InjectHelpers;
impl InjectHelpers {
fn mk_helpers(&self) -> Vec<ModuleItem> {
fn make_helpers_for_module(&self) -> Vec<ModuleItem> {
let (mark, external) = HELPERS.with(|helper| (helper.mark(), helper.external()));
if external {
if self.is_helper_used() {
@ -322,18 +316,40 @@ impl InjectHelpers {
}
} else {
self.build_helpers()
.into_iter()
.map(ModuleItem::Stmt)
.collect()
}
}
fn make_helpers_for_script(&self) -> Vec<Stmt> {
let external = HELPERS.with(|helper| helper.external());
if external {
panic!(
"Cannot use script with externalHelpers; There's no standard way to import other \
modules"
);
}
self.build_helpers()
}
}
impl VisitMut for InjectHelpers {
noop_visit_mut_type!();
fn visit_mut_module(&mut self, module: &mut Module) {
let helpers = self.mk_helpers();
let helpers = self.make_helpers_for_module();
prepend_stmts(&mut module.body, helpers.into_iter());
}
fn visit_mut_script(&mut self, script: &mut Script) {
let helpers = self.make_helpers_for_script();
prepend_stmts(&mut script.body, helpers.into_iter());
}
}
struct Marker(Mark);