Skip to content

Commit cc2df2f

Browse files
ljqx
ljqx
authored and
committed
add test
1 parent 9bff9ac commit cc2df2f

3 files changed

Lines changed: 34 additions & 9 deletions

File tree

‎lib/Parser.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,20 +1069,20 @@ class Parser extends Tapable {
10691069
this.walkExpression(argOrThis);
10701070
}
10711071
const params = functionExpression.params;
1072-
const args = options.map(renameArgOrThis, this);
10731072
const renameThis = currentThis ? renameArgOrThis.call(this, currentThis) : null;
1073+
const args = options.map(renameArgOrThis, this);
10741074
this.inScope(params.filter(function(identifier, idx) {
10751075
return !args[idx];
10761076
}), function() {
1077+
if(renameThis) {
1078+
this.scope.renames.$this = renameThis;
1079+
}
10771080
for(let i = 0; i < args.length; i++) {
10781081
const param = args[i];
10791082
if(!param) continue;
10801083
if(!params[i] || params[i].type !== "Identifier") continue;
10811084
this.scope.renames["$" + params[i].name] = param;
10821085
}
1083-
if(renameThis) {
1084-
this.scope.renames.$this = renameThis;
1085-
}
10861086
if(functionExpression.body.type === "BlockStatement") {
10871087
this.prewalkStatement(functionExpression.body);
10881088
this.walkStatement(functionExpression.body);
@@ -1140,10 +1140,10 @@ class Parser extends Tapable {
11401140
}
11411141
if((expr.type === "Identifier" && this.scope.definitions.indexOf(expr.name) === -1) ||
11421142
(expr.type === "ThisExpression" && this.scope.renames.$this)) {
1143-
if(expr.type === "Identifier") {
1144-
exprName.unshift(this.scope.renames["$" + expr.name] || expr.name);
1145-
} else {
1143+
if(expr.type === "ThisExpression") {
11461144
exprName.unshift(this.scope.renames.$this);
1145+
} else {
1146+
exprName.unshift(this.scope.renames["$" + expr.name] || expr.name);
11471147
}
11481148
let result = this.applyPluginsBailResult1("expression " + exprName.join("."), expression);
11491149
if(result === true)
@@ -1175,6 +1175,8 @@ class Parser extends Tapable {
11751175
renames: Object.create(oldScope.renames)
11761176
};
11771177

1178+
this.scope.renames.$this = undefined;
1179+
11781180
for(let paramIndex = 0, len = params.length; paramIndex < len; paramIndex++) {
11791181
const param = params[paramIndex];
11801182

‎test/Parser.test.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ describe("Parser", () => {
161161
abc: ["test"]
162162
}
163163
],
164-
"renaming with IIFE (called)": [
164+
"renaming arguments with IIFE (called)": [
165165
function() {
166166
! function(xyz) {
167167
xyz("test");
@@ -171,6 +171,15 @@ describe("Parser", () => {
171171
fgh: [""]
172172
}
173173
],
174+
"renaming this's properties with IIFE (called)": [
175+
function() {
176+
! function() {
177+
this.sub;
178+
}.call(ijk);
179+
}, {
180+
ijksub: ["test"]
181+
}
182+
],
174183
};
175184

176185
Object.keys(testCases).forEach((name) => {
@@ -181,6 +190,7 @@ describe("Parser", () => {
181190

182191
const testParser = new Parser({});
183192
testParser.plugin("can-rename abc", (expr) => true);
193+
testParser.plugin("can-rename ijk", (expr) => true);
184194
testParser.plugin("call abc", (expr) => {
185195
if(!testParser.state.abc) testParser.state.abc = [];
186196
testParser.state.abc.push(testParser.parseString(expr.arguments[0]));
@@ -206,6 +216,11 @@ describe("Parser", () => {
206216
testParser.state.fghsub.push(testParser.scope.inTry ? "try" : "notry");
207217
return true;
208218
});
219+
testParser.plugin("expression ijk.sub", (expr) => {
220+
if(!testParser.state.ijksub) testParser.state.ijksub = [];
221+
testParser.state.ijksub.push("test");
222+
return true;
223+
});
209224
testParser.plugin("expression memberExpr", (expr) => {
210225
if(!testParser.state.expressions) testParser.state.expressions = [];
211226
testParser.state.expressions.push(expr.name);

‎test/configCases/plugins/provide-plugin/index.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ it("should provide a module for a nested var", function() {
88
x.should.be.eql("bbbccc");
99
});
1010

11-
it("should provide a module for a nested var within a IIFE", function() {
11+
it("should provide a module for a nested var within a IIFE's argument", function() {
1212
(function(process) {
1313
(process.env.NODE_ENV).should.be.eql("development");
1414
var x = process.env.NODE_ENV;
1515
x.should.be.eql("development");
1616
}(process));
1717
});
1818

19+
it("should provide a module for a nested var within a IIFE's this", function() {
20+
(function() {
21+
(this.env.NODE_ENV).should.be.eql("development");
22+
var x = this.env.NODE_ENV;
23+
x.should.be.eql("development");
24+
}.call(process));
25+
});
26+
1927
it("should not provide a module for a part of a var", function() {
2028
(typeof bbb).should.be.eql("undefined");
2129
});

0 commit comments

Comments
 (0)