swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-28 16:13:34 +03:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

feat(es/modules/amd): Support local-scoped amd requires (#4727)

Browse Source
This commit is contained in:
OJ Kwon 2022-05-21 11:32:34 -07:00 committed by GitHub
parent 2a8aa2cb6e
commit 886585b90e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 108 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/swc/tests/fixture/issues-4xxx/4316/1/output/index.ts
View File

@ -1,6 +1,7 @@
define([
"require",
"exports"
], function(_exports) {
], function(require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
value: true

54
crates/swc_ecma_transforms_module/src/amd.rs
View File

@ -14,7 +14,7 @@ use swc_ecma_utils::{
prepend_stmts, private_ident, quote_ident, quote_str, var::VarCollector, DestructuringFinder,
ExprFactory,
};
use swc_ecma_visit::{noop_fold_type, Fold, FoldWith, VisitWith};
use swc_ecma_visit::{noop_fold_type, Fold, FoldWith, Visit, VisitWith};
use super::util::{
self, define_es_module, define_property, has_use_strict, initialize_to_undefined,
@ -50,6 +50,44 @@ pub fn amd_with_resolver(
}
}
struct LocalScopedRequireVisitor {
pub require_ident: Option<Ident>,
}
impl LocalScopedRequireVisitor {
pub fn new() -> Self {
LocalScopedRequireVisitor {
require_ident: Default::default(),
}
}
}
impl Visit for LocalScopedRequireVisitor {
fn visit_call_expr(&mut self, call_expr: &CallExpr) {
let callee = &call_expr.callee;
if let Callee::Expr(expr) = callee {
match &**expr {
Expr::Ident(ident) => {
if self.require_ident.is_none() && &*ident.sym == "require" {
self.require_ident = Some(ident.clone());
}
}
Expr::Member(MemberExpr { obj, .. }) => {
let expr = &**obj;
if let Expr::Ident(ident) = expr {
if self.require_ident.is_none() && &*ident.sym == "require" {
self.require_ident = Some(ident.clone());
}
}
}
_ => {}
}
}
call_expr.visit_children_with(self);
}
}
struct Amd {
config: Config,
in_top_level: bool,
@ -84,6 +122,9 @@ impl Fold for Amd {
}
fn fold_module(&mut self, module: Module) -> Module {
let mut local_scoped_require_visitor = LocalScopedRequireVisitor::new();
module.visit_with(&mut local_scoped_require_visitor);
let items = module.body;
self.in_top_level = true;
@ -100,6 +141,11 @@ impl Fold for Amd {
let mut emitted_esmodule = false;
let mut has_export = false;
let exports_ident = self.exports.0.clone();
// We'll preserve local scoped `require` ident as amd's local require ident
// shadows global one
let scoped_local_require_ident = local_scoped_require_visitor
.require_ident
.unwrap_or_else(|| private_ident!("require"));
// Process items
for item in items {
@ -487,6 +533,12 @@ impl Fold for Amd {
let scope = &mut *scope_ref_mut;
let mut factory_params = Vec::with_capacity(scope.imports.len() + 1);
if has_export {
define_deps_arg.elems.push(Some("require".as_arg()));
factory_params.push(Param {
span: DUMMY_SP,
decorators: Default::default(),
pat: scoped_local_require_ident.into(),
});
define_deps_arg.elems.push(Some("exports".as_arg()));
factory_params.push(Param {
span: DUMMY_SP,

86
crates/swc_ecma_transforms_module/tests/amd.rs
View File

@ -50,7 +50,7 @@ test!(
export const bar = { foo }",
"
define([\"exports\", \"foo\"], function(_exports, _foo) {
define([\"require\", \"exports\", \"foo\"], function(require, _exports, _foo) {
\"use strict\";
_foo = _interopRequireDefault(_foo);
Object.defineProperty(_exports, \"__esModule\", {
@ -77,7 +77,7 @@ test!(
custom_strict,
r#"export function foo(){}"#,
r#"
define(["exports"], function(_exports) {
define(["require", "exports"], function(require, _exports) {
"use strict";
_exports.foo = foo;
function foo(){}
@ -85,6 +85,26 @@ define(["exports"], function(_exports) {
"#
);
test!(
syntax(),
|_| tr(Config {
config: util::Config {
strict: true,
..Default::default()
},
..Default::default()
}),
inner_scoped_local_require,
r#"export function foo(){ return require.toUrl(""); }"#,
r#"
define(["require", "exports"], function(require, _exports) {
"use strict";
_exports.foo = foo;
function foo(){ return require.toUrl(""); }
});
"#
);
test!(
syntax(),
|_| tr(Config {
@ -97,7 +117,7 @@ test!(
custom_non_strict_mode,
r#"export function foo(){}"#,
r#"
define(["exports"], function(_exports) {
define(["require", "exports"], function(require, _exports) {
Object.defineProperty(_exports, "__esModule", {
value: true
});
@ -156,7 +176,7 @@ test!(
import {foo} from 'src';
export {foo};
"#,
r#"define("moduleId", ["exports", "src"], function(_exports, _src) {
r#"define("moduleId", ["require", "exports", "src"], function(require, _exports, _src) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
value: true
@ -181,7 +201,7 @@ export default foo;
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -205,7 +225,7 @@ export {foo} from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -233,7 +253,7 @@ export {foo, bar};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -308,7 +328,7 @@ export { foo as default };
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -336,7 +356,7 @@ export default 42;
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -360,7 +380,7 @@ export default {};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -384,7 +404,7 @@ export {foo as bar} from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -412,7 +432,7 @@ export {foo};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -438,7 +458,7 @@ export * from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -469,7 +489,7 @@ export default function foo () {}
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -494,7 +514,7 @@ export {foo as default};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -560,7 +580,7 @@ d = 4;
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -625,7 +645,7 @@ export {foo, bar} from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -658,7 +678,7 @@ export default function () {}
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -682,7 +702,7 @@ export default (function(){return "foo"})();
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -711,7 +731,7 @@ export {foo as bar};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -752,8 +772,8 @@ bar2;
"#,
r#"
define(["exports", "foo", "foo-bar", "./directory/foo-bar"],
function (_exports, foo2, _fooBar, _fooBar1) {
define(["require", "exports", "foo", "foo-bar", "./directory/foo-bar"],
function (require, _exports, foo2, _fooBar, _fooBar1) {
"use strict";
foo2 = _interopRequireWildcard(foo2);
@ -786,7 +806,7 @@ export {foo as default, bar} from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -829,7 +849,7 @@ export var isOdd = (function (isEven) {
"#,
r#"
define(["exports", "./evens"], function (_exports, _evens) {
define(["require", "exports", "./evens"], function (require, _exports, _evens) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -864,7 +884,7 @@ export default class Foo {}
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -890,7 +910,7 @@ export {foo as default} from "foo";
"#,
r#"
define(["exports", "foo"], function (_exports, _foo) {
define(["require", "exports", "foo"], function (require, _exports, _foo) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -917,7 +937,7 @@ export default [];
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -964,7 +984,7 @@ export { a as default };
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -996,7 +1016,7 @@ export class foo9 {}
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -1077,7 +1097,7 @@ export default class {}
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -1108,7 +1128,7 @@ export {foo as default, bar};
"#,
r#"
define(["exports"], function (_exports) {
define(["require", "exports"], function (require, _exports) {
"use strict";
Object.defineProperty(_exports, "__esModule", {
@ -1134,7 +1154,7 @@ export const foo = function () {
function e(t) {}
return A(e, {}), e
}();",
"define([\"exports\", \"path\"], function(_exports, _path) {
"define([\"require\", \"exports\", \"path\"], function(require, _exports, _path) {
\"use strict\";
Object.defineProperty(_exports, \"__esModule\", {
value: true
@ -1161,7 +1181,7 @@ export const foo = function () {
var e = 1;
return A(e, {}), e
}();",
"define([\"exports\", \"path\"], function(_exports, _path) {
"define([\"require\", \"exports\", \"path\"], function(require, _exports, _path) {
\"use strict\";
Object.defineProperty(_exports, \"__esModule\", {
value: true