Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update export all output #79

Merged
merged 15 commits into from
Oct 11, 2023
Merged

Update export all output #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5e6120a
Create test fixture
wadjoh Oct 11, 2023
a3c16b8
Add output test fixture
wadjoh Oct 11, 2023
82dac23
Update output fixture for issue_55
wadjoh Oct 11, 2023
6c82041
Update lib.rs
wadjoh Oct 11, 2023
a214018
Update local_export_strip.rs
wadjoh Oct 11, 2023
ec71070
Delete tests/fixture/issue_78 directory
wadjoh Oct 11, 2023
67c6ba7
Update lib.rs
wadjoh Oct 11, 2023
1767e78
Update local_export_strip.rs
wadjoh Oct 11, 2023
c300b0b
Update output.js
wadjoh Oct 11, 2023
eeff88f
Update output.js
wadjoh Oct 11, 2023
b11d505
Update lib.rs
wadjoh Oct 11, 2023
06f1602
Update output.js
wadjoh Oct 11, 2023
7264419
Update output.js
wadjoh Oct 11, 2023
83ef35a
chore: clean code
magic-akari Oct 11, 2023
fbc79a6
chore: clean code
magic-akari Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 60 additions & 41 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use swc_core::{
},
plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
};
use utils::emit_export_stmts;
use utils::{emit_export_stmts, object_define_property};

#[derive(Debug)]
pub struct TransformVisitor {
Expand Down Expand Up @@ -149,9 +149,14 @@ impl TransformVisitor {
/// ```JavaScript
/// Object.keys(_mod).forEach(function (key) {
/// if (key === "default" || key === "__esModule") return;
/// if (key in exports && exports[key] === _mod[key]) return;
/// exports[key] = _mod[key];
/// });
/// if (Object.prototype.hasOwnProperty.call(exports, key)) return;
/// Object.defineProperty(exports, key, {
/// enumerable: true,
/// get: function () {
/// return mod[key];
/// },
/// configurable: true
/// });
/// ```
fn export_all(&self, id: Id) -> ModuleItem {
let mod_name = Ident::from(id);
Expand Down Expand Up @@ -201,34 +206,16 @@ impl TransformVisitor {
alt: None,
}
.into(),
// if (key in exports && exports[key] === _mod[key]) return;
// if (Object.prototype.hasOwnProperty.call(exports, key)) return;
IfStmt {
span: DUMMY_SP,
test: BinExpr {
span: DUMMY_SP,
op: op!("&&"),
left: BinExpr {
span: DUMMY_SP,
op: op!("in"),
left: key.clone().into(),
right: self.exports().into(),
}
.into(),
right: BinExpr {
span: DUMMY_SP,
op: op!("==="),
left: self
.exports()
.computed_member(quote_ident!("key"))
.into(),
right: mod_name
.clone()
.computed_member(quote_ident!("key"))
.into(),
}
.into(),
}
.into(),
test: Box::new(
member_expr!(DUMMY_SP, Object.prototype.hasOwnProperty.call)
.as_call(
DUMMY_SP,
vec![self.exports().as_arg(), key.clone().as_arg()],
),
),
cons: Box::new(
ReturnStmt {
span: DUMMY_SP,
Expand All @@ -239,17 +226,49 @@ impl TransformVisitor {
alt: None,
}
.into(),
// exports[key] = _mod[key];
mod_name
.clone()
.computed_member(quote_ident!("key"))
.make_assign_to(
op!("="),
self.exports()
.computed_member(quote_ident!("key"))
.as_pat_or_expr(),
)
.into_stmt(),
// Object.defineProperty(exports, key, {
// enumerable: true,
// get: function () {
// return mod[key];
// },
// configurable: true
// });
object_define_property(
self.exports().as_arg(),
key.clone().as_arg(),
ObjectLit {
span: DUMMY_SP,
props: vec![
PropOrSpread::Prop(Box::new(
KeyValueProp {
key: quote_ident!("enumerable").into(),
value: true.into(),
}
.into(),
)),
PropOrSpread::Prop(Box::new(
KeyValueProp {
key: quote_ident!("get").into(),
value: mod_name
.clone()
.computed_member(key.clone())
.into_lazy_fn(vec![])
.into(),
}
.into(),
)),
PropOrSpread::Prop(Box::new(
KeyValueProp {
key: quote_ident!("configurable").into(),
value: true.into(),
}
.into(),
)),
],
}
.as_arg(),
)
.into_stmt(),
],
}),
is_generator: false,
Expand Down
10 changes: 8 additions & 2 deletions tests/fixture/issue_55/1/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Object.keys(mod).forEach(function(key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === mod[key]) return;
exports[key] = mod[key];
if (Object.prototype.hasOwnProperty.call(exports, key)) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function() {
return mod[key];
},
configurable: true
});
});
import * as mod from "./someModule";
10 changes: 8 additions & 2 deletions tests/fixture/issue_55/2/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,14 @@ Object.defineProperty(exports, "baz", {
});
Object.keys(mod1).forEach(function(key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === mod1[key]) return;
exports[key] = mod1[key];
if (Object.prototype.hasOwnProperty.call(exports, key)) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function() {
return mod1[key];
},
configurable: true
});
});
import * as mod from "./someModule";
import * as mod1 from "./someModule";
Expand Down