Skip to content

Commit 91621a7

Browse files
sokrasokra
committed
hoist exports, more efficent for immutable declarations
1 parent 0f0ede8 commit 91621a7

8 files changed

Lines changed: 47 additions & 8 deletions

File tree

‎lib/Parser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ Parser.prototype.walkExportDefaultDeclaration = function walkExportDefaultDeclar
548548
}, this);
549549
}
550550
} else {
551+
this.walkExpression(statement.declaration);
551552
if(!this.applyPluginsBailResult("export expression", statement, statement.declaration)) {
552-
this.walkExpression(statement.declaration);
553553
this.applyPluginsBailResult("export specifier", statement, statement.declaration, "default");
554554
}
555555
}

‎lib/dependencies/HarmonyExportDependencyParserPlugin.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,29 @@ module.exports = AbstractPlugin.create({
3232
},
3333
"export declaration": function() {},
3434
"export specifier": function(statement, id, name) {
35-
var dep = new HarmonyExportSpecifierDependency(this.state.module, id, name, statement.range[1] + 0.5);
35+
var immutable = isImmutableStatement(statement.declaration);
36+
var hoisted = isHoistedStatement(statement.declaration);
37+
var dep = new HarmonyExportSpecifierDependency(this.state.module, id, name, hoisted ? 0 : (statement.range[1] + 0.5), immutable);
3638
dep.loc = statement.loc;
3739
this.state.current.addDependency(dep);
3840
return true;
3941
},
4042
"export import specifier": function(statement, source, id, name) {
41-
var dep = new HarmonyExportImportedSpecifierDependency(this.state.module, this.state.lastHarmoryImport, HarmonyModulesHelpers.getModuleVar(this.state, source), id, name, statement.range[1] + 0.5);
43+
var dep = new HarmonyExportImportedSpecifierDependency(this.state.module, this.state.lastHarmoryImport, HarmonyModulesHelpers.getModuleVar(this.state, source), id, name, 0);
4244
dep.loc = statement.loc;
4345
this.state.current.addDependency(dep);
4446
return true;
4547
}
4648
});
49+
50+
function isImmutableStatement(statement) {
51+
if(statement.type === "FunctionDeclaration") return true;
52+
if(statement.type === "ClassDeclaration") return true;
53+
return false;
54+
}
55+
56+
function isHoistedStatement(statement) {
57+
if(statement.type === "FunctionDeclaration") return true;
58+
if(statement.type === "VariableDeclarators" && statement.kind === "var") return true;
59+
return false;
60+
}

‎lib/dependencies/HarmonyExportHeaderDependency.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ HarmonyExportHeaderDependency.Template = function HarmonyExportDependencyTemplat
2020

2121
HarmonyExportHeaderDependency.Template.prototype.apply = function(dep, source) {
2222
var content;
23-
content = "/* harmony export */";
23+
content = "";
2424
source.replace(dep.rangeStatement[0], dep.range ? dep.range[0] - 1 : dep.rangeStatement[1] - 1, content);
2525
};

‎lib/dependencies/HarmonyExportSpecifierDependency.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
*/
55
var NullDependency = require("./NullDependency");
66

7-
function HarmonyExportSpecifierDependency(originModule, id, name, position) {
7+
function HarmonyExportSpecifierDependency(originModule, id, name, position, immutable) {
88
NullDependency.call(this);
99
this.Class = HarmonyExportSpecifierDependency;
1010
this.originModule = originModule;
1111
this.id = id;
1212
this.name = name;
1313
this.position = position;
14+
this.immutable = immutable;
1415
}
1516
module.exports = HarmonyExportSpecifierDependency;
1617

@@ -25,6 +26,8 @@ HarmonyExportSpecifierDependency.Template.prototype.apply = function(dep, source
2526
var content;
2627
if(!used) {
2728
content = "/* ununsed harmony export " + (dep.name || "namespace") + " */;";
29+
} else if(dep.immutable) {
30+
content = "/* harmony export */ exports[" + JSON.stringify(dep.name) + "] = " + dep.id + ";";
2831
} else {
2932
content = "/* harmony export */ Object.defineProperty(exports, " + JSON.stringify(dep.name) + ", {configurable: false, enumerable: true, get: function() { return " + dep.id + "; }});";
3033
}

‎lib/dependencies/HarmonyImportDependency.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ HarmonyImportDependency.Template.prototype.apply = function(dep, source, outputO
3131
if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(dep.request) + " */ ";
3232
var content;
3333
if(!dep.module) {
34-
content = "!(function webpackMissingModule() { throw new Error(" + JSON.stringify("Cannot find module \"" + dep.request + "\"") + "); }())";
34+
content = "throw new Error(" + JSON.stringify("Cannot find module \"" + dep.request + "\"") + ");\n";
3535
} else if(dep.importedVar) {
36-
content = "/* harmony import */ var " + dep.importedVar + " = __webpack_require__(" + comment + JSON.stringify(dep.module.id) + ");";
36+
content = "/* harmony import */ var " + dep.importedVar + " = __webpack_require__(" + comment + JSON.stringify(dep.module.id) + ");\n";
3737
} else {
3838
content = "";
3939
}
40-
source.replace(dep.range[0], dep.range[1] - 1, content);
40+
source.replace(dep.range[0], dep.range[1] - 1, "");
41+
source.insert(0, content);
4142
};

‎test/cases/parsing/harmony/index.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import { test1, test2 } from "exportKinds";
1010

1111
import { a as rea, b as reb, c as rec, o as reo, two as retwo } from "reexport";
1212

13+
import threeIsOdd, { even } from "circularEven";
14+
1315
it("should import an identifier from a module", function() {
1416
a.should.be.eql("a");
1517
B.should.be.eql("b");
@@ -37,3 +39,8 @@ it("should reexport a module", function() {
3739
reo.should.be.eql("one");
3840
retwo.should.be.eql("two");
3941
});
42+
43+
it("should support circular dependencies", function() {
44+
threeIsOdd.should.be.eql(true);
45+
even(4).should.be.eql(true);
46+
})

‎test/cases/parsing/harmony/node_modules/circularEven.js‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/parsing/harmony/node_modules/circularOdd.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)