support destructing on assignment

sokra · sokra · commit 272c105f5cdc · 2017-05-21T08:10:13.000+02:00
fixes webpack#4870
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -993,8 +993,9 @@ class Parser extends Tapable {
 			}
 		} else {
 			this.walkExpression(expression.right);
-			this.scope.renames["$" + expression.left.name] = undefined;
-			this.walkExpression(expression.left);
+			this.enterPattern(expression.left, (name, decl) => {
+				this.scope.renames["$" + name] = undefined;
+			});
 		}
 	}
 
diff --git a/test/cases/parsing/issue-4870/file.js b/test/cases/parsing/issue-4870/file.js
@@ -0,0 +1 @@
+export var test = "test";
diff --git a/test/cases/parsing/issue-4870/index.js b/test/cases/parsing/issue-4870/index.js
@@ -0,0 +1,13 @@
+import { test } from "./file";
+
+it("should allow import in array destructing", function() {
+	var other;
+	[other = test] = [];
+	other.should.be.eql("test");
+});
+
+it("should allow import in object destructing", function() {
+	var other;
+	({other = test} = {});
+	other.should.be.eql("test");
+});
diff --git a/test/cases/parsing/issue-4870/test.filter.js b/test/cases/parsing/issue-4870/test.filter.js
@@ -0,0 +1,6 @@
+var supportsIteratorDestructuring = require("../../../helpers/supportsIteratorDestructuring");
+var supportsObjectDestructuring = require("../../../helpers/supportsObjectDestructuring");
+
+module.exports = function(config) {
+	return !config.minimize && supportsObjectDestructuring() && supportsIteratorDestructuring();
+};

Original file line number	Diff line number	Diff line change
`@@ -993,8 +993,9 @@ class Parser extends Tapable {`
`993`	`993`	`}`
`994`	`994`	`} else {`
`995`	`995`	`this.walkExpression(expression.right);`
`996`		`- this.scope.renames["$" + expression.left.name] = undefined;`
`997`		`- this.walkExpression(expression.left);`
	`996`	`+ this.enterPattern(expression.left, (name, decl) => {`
	`997`	`+ this.scope.renames["$" + name] = undefined;`
	`998`	`+ });`
`998`	`999`	`}`
`999`	`1000`	`}`
`1000`	`1001`