Merge branch 'better-tests'

.travis.yml

@@ -10,4 +10,4 @@ env:
 install: npm install --ignore-scripts
 before_install:
   - if [[ $TRAVIS_NODE_VERSION -lt 8 ]]; then npm install --global npm@5; fi
-# script: npm run ci
+script: npm run ci

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.61.1
 *2018-06-21*
 * Do not try to deconflict "undefined" ([#2291](https://github.com/rollup/rollup/pull/2291))
+* Properly track values for loop interator declarations and reassigned namespaces, add smoke test ([#2292](https://github.com/rollup/rollup/pull/2292))
 
 ## 0.61.0
 *2018-06-20*

package.json

@@ -11,20 +11,21 @@
   },
   "scripts": {
     "pretest": "npm run build",
-    "test": "npm run test:only && npm run test:typescript",
+    "test": "npm run test:only && npm run test:typescript && npm run test:leak",
     "test:only": "mocha",
-    "test:leak": "node --expose-gc test/leak/index.js",
     "test:quick": "mocha -b",
+    "test:leak": "npm i --silent --no-save weak@1 && node --expose-gc test/leak/index.js",
     "pretest:typescript": "shx rm -rf test/typescript/dist && shx cp -r dist test/typescript/",
     "test:typescript": "tsc -p test/typescript",
     "pretest-coverage": "npm run build",
     "test-coverage": "shx rm -rf coverage/* && istanbul cover --report json node_modules/.bin/_mocha -- -u exports -R spec test/test.js",
     "posttest-coverage": "remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped.json -b dist && remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped.lcov -t lcovonly -b dist && remap-istanbul -i coverage/coverage-final.json -o coverage/coverage-remapped -t html -b dist",
-    "ci": "npm run test-coverage && codecov < coverage/coverage-remapped.lcov",
+    "ci": "npm run test && npm run build:bootstrap && npm run test:only",
     "prebuild": "shx rm -rf dist",
     "build": "git rev-parse HEAD > .commithash && rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x bin/rollup",
+    "build:bootstrap": "bin/rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x bin/rollup",
     "watch": "rollup -cw",
-    "prepublishOnly": "npm run lint && npm run test && npm run test:leak",
+    "prepublishOnly": "npm run lint && npm run test",
     "prepare": "npm run build",
     "lint": "tslint --project . --fix && eslint --fix src browser bin test/test.js test/*/index.js test/utils test/**/_config.js",
     "precommit": "lint-staged",
@@ -87,7 +88,7 @@
     "pretty-ms": "^3.1.0",
     "remap-istanbul": "^0.11.1",
     "require-relative": "^0.8.7",
-    "rollup": "^0.59.1",
+    "rollup": "^0.60.7",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-json": "^3.0.0",

src/ast/nodes/ForInStatement.ts

@@ -43,6 +43,7 @@ export default class ForInStatement extends StatementBase {
 	include() {
 		this.included = true;
 		this.left.includeWithAllDeclaredVariables();
+		this.left.reassignPath(EMPTY_PATH);
 		this.right.include();
 		this.body.include();
 	}

src/ast/nodes/ForOfStatement.ts

@@ -43,6 +43,7 @@ export default class ForOfStatement extends StatementBase {
 	include() {
 		this.included = true;
 		this.left.includeWithAllDeclaredVariables();
+		this.left.reassignPath(EMPTY_PATH);
 		this.right.include();
 		this.body.include();
 	}

src/ast/variables/NamespaceVariable.ts

@@ -1,6 +1,7 @@
 import { AstContext } from '../../Module';
 import { RenderOptions } from '../../utils/renderHelpers';
 import Identifier from '../nodes/Identifier';
+import { UNKNOWN_PATH } from '../values';
 import Variable from './Variable';
 
 export default class NamespaceVariable extends Variable {
@@ -45,6 +46,16 @@ export default class NamespaceVariable extends Variable {
 		return this.referencedEarly;
 	}
 
+	// This is only called if "UNKNOWN_PATH" is reassigned as in all other situations, either the
+	// build fails due to an illegal namespace reassignment or MemberExpression already forwards
+	// the reassignment to the right variable. This means we lost track of this variable and thus
+	// need to reassign all exports.
+	reassignPath() {
+		for (const key in this.originals) {
+			this.originals[key].reassignPath(UNKNOWN_PATH);
+		}
+	}
+
 	renderBlock(options: RenderOptions) {
 		const _ = options.compact ? '' : ' ';
 		const n = options.compact ? '' : '\n';

test/function/samples/aaa/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'treat for-in variable as unknown'
+};

test/function/samples/aaa/main.js

@@ -0,0 +1,13 @@
+for (const name in {present: true}) {
+	if (name !== 'present') {
+		throw new Error('Always false for-in check was inlined');
+	}
+	assert.equal(name, 'present');
+}
+
+for (const name of ['present']) {
+	if (name !== 'present') {
+		throw new Error('Always false for-of check was inlined');
+	}
+	assert.equal(name, 'present');
+}

test/function/samples/reassign-namespace/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'members of namespaces are reassigned when the namespace is passed to a function'
+};

test/function/samples/reassign-namespace/foo.js

@@ -0,0 +1,10 @@
+const flags = {};
+
+function test() {
+	if (!flags.x) {
+		throw new Error('Flag "x" not set');
+	}
+	assert.ok(flags.x);
+}
+
+export { flags, test };

test/function/samples/reassign-namespace/main.js

@@ -0,0 +1,9 @@
+import * as foo from './foo.js';
+
+function reassignFlagX(obj) {
+	obj.flags.x = true;
+}
+
+reassignFlagX(foo);
+
+foo.test();

test/leak/index.js

@@ -1,56 +1,38 @@
 const path = require('path');
 const rollup = require('../..');
+const weak = require('weak');
 
-function test() {
-	const weak = require('weak');
+var shouldCollect = false;
+var isCollected = false;
 
-	var shouldCollect = false;
-	var isCollected = false;
-
-	function onCollect() {
-		isCollected = true;
-	}
-
-	var cache;
-	function run() {
-		return rollup
-			.rollup({
-				input: path.resolve(__dirname, 'main.js'),
-				cache
-			})
-			.then(bundle => {
-				weak(bundle, onCollect);
-				cache = bundle;
-				global.gc();
-				if (shouldCollect && !isCollected) {
-					throw new Error('Memory leak detected');
-				}
-				shouldCollect = true;
-			});
-	}
+function onCollect() {
+	isCollected = true;
+}
 
-	run()
-		.then(run)
-		.then(() => {
-			console.log('Success');
+var cache;
+function run() {
+	return rollup
+		.rollup({
+			input: path.resolve(__dirname, 'main.js'),
+			cache
 		})
-		.catch(err => {
-			console.error(err.message);
-			process.exit(1);
+		.then(bundle => {
+			weak(bundle, onCollect);
+			cache = bundle;
+			global.gc();
+			if (shouldCollect && !isCollected) {
+				throw new Error('Memory leak detected');
+			}
+			shouldCollect = true;
 		});
 }
 
-try {
-	require.resolve('weak');
-	test();
-} catch (err) {
-	console.error(err);
-	console.log('installing weak');
-	require('child_process').exec('npm i --no-save --silent weak@1.0.1', (err, stdout, stderr) => {
-		if (err) {
-			console.log('failed to install weak');
-		} else {
-			test();
-		}
+run()
+	.then(run)
+	.then(() => {
+		console.log('Success: No memory leak detected');
+	})
+	.catch(err => {
+		console.error(err.message);
+		process.exit(1);
 	});
-}