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

fix(swc/transform_module): fix local scoped amd require #4800

Merged
merged 4 commits into from
May 25, 2022
+69 −32
Merged

fix(swc/transform_module): fix local scoped amd require #4800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba6786c
fix(swc/transform_module): preserve local scoped require ident
kwonoj May 25, 2022
6383e6a
fix(swc/transform_module): loosen local require insert rule
kwonoj May 25, 2022
20fc051
Merge branch 'main' into fix-amd-local-scoped-require
swc-bot May 25, 2022
324d56f
Merge branch 'main' into fix-amd-local-scoped-require
swc-bot May 25, 2022
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
32 changes: 10 additions & 22 deletions crates/swc_ecma_transforms_module/src/amd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,10 @@ impl LocalScopedRequireVisitor {
}

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());
}
}
}
_ => {}
}
fn visit_ident(&mut self, ident: &Ident) {
if self.require_ident.is_none() && &*ident.sym == "require" {
self.require_ident = Some(ident.clone());
}

call_expr.visit_children_with(self);
}
}

Expand Down Expand Up @@ -532,13 +514,19 @@ impl Fold for Amd {
let mut scope_ref_mut = self.scope.borrow_mut();
let scope = &mut *scope_ref_mut;
let mut factory_params = Vec::with_capacity(scope.imports.len() + 1);
if has_export {

// inject local scoped `require` regardless of having exports or not, as long as
// it can be considered as module (either having import or export)
if !scope.imports.is_empty() || 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(),
});
}

if has_export {
define_deps_arg.elems.push(Some("exports".as_arg()));
factory_params.push(Param {
span: DUMMY_SP,
Expand Down
69 changes: 59 additions & 10 deletions crates/swc_ecma_transforms_module/tests/amd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ test!(
"import bar from 'bar';

obj[bar('bas')] = '123'",
"define([\"bar\"], function(_bar) {
"define([\"require\", \"bar\"], function(require, _bar) {
\"use strict\";
_bar = _interopRequireDefault(_bar);
obj[(0, _bar).default('bas')] = '123';
Expand Down Expand Up @@ -105,6 +105,55 @@ define(["require", "exports"], function(require, _exports) {
"#
);

test!(
syntax(),
|_| tr(Config {
config: util::Config {
strict: true,
..Default::default()
},
..Default::default()
}),
inner_scoped_local_require_member_expr,
r#"export const DefaultIconPath = FileAccess.asBrowserUri('./media/defaultIcon.png', require).toString(true);"#,
r#"
define([
"require",
"exports",
], function(require, _exports) {
"use strict";
_exports.DefaultIconPath = void 0;
const DefaultIconPath = FileAccess.asBrowserUri('./media/defaultIcon.png', require).toString(true);
_exports.DefaultIconPath = DefaultIconPath;
});
"#
);

test!(
syntax(),
|_| tr(Config {
config: util::Config {
strict: true,
..Default::default()
},
..Default::default()
}),
inner_scoped_local_require_non_export_module,
r#"
import { getPathFromAmdModule } from 'vs/base/test/node/testUtils';
const fixturesFolder = getPathFromAmdModule(require, './fixtures');
"#,
r#"
define([
"require",
"vs/base/test/node/testUtils"
], function(require, _testUtils) {
"use strict";
const fixturesFolder = (0, _testUtils).getPathFromAmdModule(require, './fixtures');
});
"#
);

test!(
syntax(),
|_| tr(Config {
Expand Down Expand Up @@ -140,7 +189,7 @@ test!(
r#"import * as foo from 'foo';
import bar from 'bar';"#,
r#"
define(["foo", "bar"], function(foo, _bar) {
define(["require", "foo", "bar"], function(require, foo, _bar) {
"use strict";
});
"#
Expand All @@ -157,7 +206,7 @@ import React from 'react'
window.React = React;
"#,
r#"
define(["react"], function(_react) {
define(["require", "react"], function(require, _react) {
"use strict";
_react = _interopRequireDefault(_react);
window.React = _react.default;
Expand Down Expand Up @@ -282,7 +331,7 @@ foo2;

"#,
r#"
define(["foo"], function (_foo) {
define(["require", "foo"], function (require, _foo) {
"use strict";

_foo = _interopRequireDefault(_foo);
Expand All @@ -306,7 +355,7 @@ xyz;

"#,
r#"
define(["foo"], function (_foo) {
define(["require", "foo"], function (require, _foo) {
"use strict";

_foo = _interopRequireWildcard(_foo);
Expand Down Expand Up @@ -540,7 +589,7 @@ foo;

"#,
r#"
define(["foo"], function (foo) {
define(["require", "foo"], function (require, foo) {
"use strict";

foo = _interopRequireWildcard(foo);
Expand Down Expand Up @@ -628,7 +677,7 @@ import "./directory/foo-bar";

"#,
r#"
define(["foo", "foo-bar", "./directory/foo-bar"], function (_foo, _fooBar, _fooBar1) {
define(["require", "foo", "foo-bar", "./directory/foo-bar"], function (require, _foo, _fooBar, _fooBar1) {
"use strict";
});

Expand Down Expand Up @@ -964,7 +1013,7 @@ import { qux } from './qux';

"#,
r#"
define(["./foo", "./bar", "./derp", "./qux"], function (_foo, _bar, _derp, _qux) {
define(["require", "./foo", "./bar", "./derp", "./qux"], function (require, _foo, _bar, _derp, _qux) {
"use strict";

_bar = _interopRequireDefault(_bar);
Expand Down Expand Up @@ -1073,7 +1122,7 @@ xyz;

"#,
r#"
define(["foo"], function (_foo) {
define(["require", "foo"], function (require, _foo) {
"use strict";

_foo.bar;
Expand Down Expand Up @@ -1239,7 +1288,7 @@ console.log(elm);

"#,
r#"
define(["foo"], function (_foo) {
define(["require", "foo"], function (require, _foo) {
"use strict";

for(let _i = 0; _i < _foo.array.length; _i++){
Expand Down