cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[systemjs] Fix: export star alongside with named export (#12612)

Browse Source
This commit is contained in:
Leslie Leigh (李的序) 2021-01-13 07:12:12 +08:00 committed by GitHub
parent 58d2f41930
commit 2338b052ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/babel-plugin-transform-modules-systemjs/src/index.js
View File

@ -74,34 +74,36 @@ function constructExportCall(
stringSpecifiers: Set<string>, stringSpecifiers: Set<string>,
) { ) {
const statements = []; const statements = [];
if (exportNames.length === 1) { if (!exportStarTarget) {
statements.push( if (exportNames.length === 1) {
t.expressionStatement( statements.push(
t.callExpression(exportIdent, [ t.expressionStatement(
t.stringLiteral(exportNames[0]), t.callExpression(exportIdent, [
exportValues[0], t.stringLiteral(exportNames[0]),
]), exportValues[0],
), ]),
); ),
} else if (!exportStarTarget) { );
const objectProperties = []; } else {
for (let i = 0; i < exportNames.length; i++) { const objectProperties = [];
const exportName = exportNames[i]; for (let i = 0; i < exportNames.length; i++) {
const exportValue = exportValues[i]; const exportName = exportNames[i];
objectProperties.push( const exportValue = exportValues[i];
t.objectProperty( objectProperties.push(
stringSpecifiers.has(exportName) t.objectProperty(
? t.stringLiteral(exportName) stringSpecifiers.has(exportName)
: t.identifier(exportName), ? t.stringLiteral(exportName)
exportValue, : t.identifier(exportName),
exportValue,
),
);
}
statements.push(
t.expressionStatement(
t.callExpression(exportIdent, [t.objectExpression(objectProperties)]),
), ),
); );
} }
statements.push(
t.expressionStatement(
t.callExpression(exportIdent, [t.objectExpression(objectProperties)]),
),
);
} else { } else {
const exportObj = path.scope.generateUid("exportObj"); const exportObj = path.scope.generateUid("exportObj");

5
packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-alongside-with-export-star/input.mjs vendored Normal file
View File

@ -0,0 +1,5 @@
export { default } from 'foo';
export * from 'foo';
export { a, b } from 'bar';
export * from 'bar';

29
packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-alongside-with-export-star/output.mjs vendored Normal file
View File

@ -0,0 +1,29 @@
System.register(["foo", "bar"], function (_export, _context) {
"use strict";
return {
setters: [function (_foo) {
var _exportObj = {};
for (var _key in _foo) {
if (_key !== "default" && _key !== "__esModule") _exportObj[_key] = _foo[_key];
}
_exportObj.default = _foo.default;
_export(_exportObj);
}, function (_bar) {
var _exportObj2 = {};
for (var _key2 in _bar) {
if (_key2 !== "default" && _key2 !== "__esModule") _exportObj2[_key2] = _bar[_key2];
}
_exportObj2.a = _bar.a;
_exportObj2.b = _bar.b;
_export(_exportObj2);
}],
execute: function () {}
};
});