Merge pull request #268 from mbostock/assignment-to-re-exports

Fix assignment to re-exported bindings.

src/Module.js

@@ -344,7 +344,7 @@ export default class Module {
 
 				if ( declaration ) {
 					declaration.addReference( reference );
-				} else {
+				} else if ( statement.node.type !== 'ExportNamedDeclaration' || !this.reexports[ reference.name ] ) {
 					// TODO handle globals
 					this.bundle.assumedGlobals[ reference.name ] = true;
 				}

src/ast/attachScopes.js

@@ -17,11 +17,10 @@ export default function attachScopes ( statement ) {
 				scope.addDeclaration( node, false, false );
 			}
 
-			// var foo = 1
+			// var foo = 1, bar = 2
 			if ( node.type === 'VariableDeclaration' ) {
 				const isBlockDeclaration = blockDeclarations[ node.kind ];
-				// only one declarator per block, because we split them up already
+				node.declarations.forEach( declaration => scope.addDeclaration( declaration, isBlockDeclaration, true ) );
-				scope.addDeclaration( node.declarations[0], isBlockDeclaration, true );
 			}
 
 			let newScope;

test/function/assignment-to-re-exports-conflict/_config.js

@@ -0,0 +1,10 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 're-exports are kept up-to-date',
+	exports: function ( exports ) {
+		assert.equal( exports.count, 0 );
+		exports.incr();
+		assert.equal( exports.count, 1 );
+	}
+};

test/function/assignment-to-re-exports-conflict/count.js

@@ -0,0 +1,10 @@
+export var count = 0;
+
+export function conflict () {
+	var foo = 0,
+			count = 42;
+}
+
+export function incr () {
+	count += 1;
+}

test/function/assignment-to-re-exports-conflict/main.js

@@ -0,0 +1 @@
+export {count, incr, conflict} from './count';

test/function/assignment-to-re-exports/_config.js

@@ -0,0 +1,10 @@
+var assert = require( 'assert' );
+
+module.exports = {
+	description: 're-exports are kept up-to-date',
+	exports: function ( exports ) {
+		assert.equal( exports.count, 0 );
+		exports.incr();
+		assert.equal( exports.count, 1 );
+	}
+};

test/function/assignment-to-re-exports/count.js

@@ -0,0 +1,5 @@
+export var count = 0;
+
+export function incr () {
+	count += 1;
+}

test/function/assignment-to-re-exports/main.js

@@ -0,0 +1 @@
+export {count, incr} from './count';