rollup 0.36.0 → 0.36.4

package/dist/rollup.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.36.0
-	Sun Sep 18 2016 17:57:56 GMT-0400 (EDT) - commit 152afb9732975188c7f4bf716c143da549afd432
+	Rollup.js v0.36.4
+	Wed Nov 23 2016 09:01:35 GMT-0500 (EST) - commit fca14dbab102a9fa8efc7249287e2145583712ea
 
 
 	https://github.com/rollup/rollup
@@ -185,9 +185,7 @@ function mapSequence ( array, fn ) {
 	return promise.then( function () { return results; } );
 }
 
-function validateKeys ( object, allowedKeys ) {
-	var actualKeys = keys( object );
-
+function validateKeys ( actualKeys, allowedKeys ) {
 	var i = actualKeys.length;
 
 	while ( i-- ) {
@@ -5010,6 +5008,11 @@ function makeLegalIdentifier ( str ) {
 	return str;
 }
 
+function relativeId ( id ) {
+	if ( typeof process === 'undefined' ) return id;
+	return id.replace( process.cwd(), '' ).replace( /^[\/\\]/, '' );
+}
+
 // properties are for debugging purposes only
 var ARRAY    = { ARRAY:    true, toString: function () { return '[[ARRAY]]'; } };
 var NUMBER   = { NUMBER:   true, toString: function () { return '[[NUMBER]]'; } };
@@ -5054,7 +5057,7 @@ SyntheticNamespaceDeclaration.prototype.getName = function getName () {
 	return this.name;
 };
 
-SyntheticNamespaceDeclaration.prototype.renderBlock = function renderBlock ( es, indentString ) {
+SyntheticNamespaceDeclaration.prototype.renderBlock = function renderBlock ( es, legacy, indentString ) {
 		var this$1 = this;
 
 	var members = keys( this.originals ).map( function (name) {
@@ -5067,7 +5070,8 @@ SyntheticNamespaceDeclaration.prototype.renderBlock = function renderBlock ( es,
 		return ("" + indentString + name + ": " + (original.getName( es )));
 	});
 
-	return ((this.module.bundle.varOrConst) + " " + (this.getName( es )) + " = Object.freeze({\n" + (members.join( ',\n' )) + "\n});\n\n");
+	var callee = legacy ? "(Object.freeze || Object)" : "Object.freeze";
+	return ((this.module.bundle.varOrConst) + " " + (this.getName( es )) + " = " + callee + "({\n" + (members.join( ',\n' )) + "\n});\n\n");
 };
 
 var ExternalDeclaration = function ExternalDeclaration ( module, name ) {
@@ -5217,6 +5221,12 @@ Node$1.prototype.initialise = function initialise ( scope ) {
 	this.eachChild( function (child) { return child.initialise( this$1.scope || scope ); } );
 };
 
+Node$1.prototype.insertSemicolon = function insertSemicolon ( code ) {
+	if ( code.original[ this.end - 1 ] !== ';' ) {
+		code.insertLeft( this.end, ';' );
+	}
+};
+
 Node$1.prototype.locate = function locate () {
 	// useful for debugging
 	var location = getLocation( this.module.code, this.start );
@@ -5285,7 +5295,7 @@ Parameter.prototype.getName = function getName () {
 };
 
 var Scope = function Scope ( options ) {
-	options = options || {};
+	if ( options === void 0 ) options = {};
 
 	this.parent = options.parent;
 	this.isBlockScope = !!options.isBlockScope;
@@ -5660,6 +5670,16 @@ var BlockStatement = (function (Statement) {
 		}
 	};
 
+	BlockStatement.prototype.render = function render ( code, es ) {
+		if (this.body.length) {
+			for ( var node of this.body ) {
+				node.render( code, es );
+			}
+		} else {
+			Statement.prototype.render.call(this, code, es);
+		}
+	};
+
 	return BlockStatement;
 }(Statement));
 
@@ -5847,7 +5867,9 @@ var CallExpression = (function (Node) {
 	};
 
 	CallExpression.prototype.initialise = function initialise ( scope ) {
-		this.module.bundle.dependentExpressions.push( this );
+		if ( isProgramLevel( this ) ) {
+			this.module.bundle.dependentExpressions.push( this );
+		}
 		Node.prototype.initialise.call( this, scope );
 	};
 
@@ -5858,6 +5880,17 @@ var CallExpression = (function (Node) {
 	return CallExpression;
 }(Node$1));
 
+function isProgramLevel ( node ) {
+	do {
+		if ( node.type === 'Program' ) {
+			return true;
+		}
+		node = node.parent;
+	} while ( node && !/Function/.test( node.type ) );
+
+	return false;
+}
+
 // TODO is this basically identical to FunctionDeclaration?
 var ClassDeclaration = (function (Node) {
 	function ClassDeclaration () {
@@ -6114,7 +6147,7 @@ var ExportDefaultDeclaration = (function (Node) {
 		var treeshake = this.module.bundle.treeshake;
 		var name = this.getName( es );
 
-		if ( this.shouldInclude ) {
+		if ( this.shouldInclude || this.declaration.activated ) {
 			if ( this.activated ) {
 				if ( functionOrClassDeclaration.test( this.declaration.type ) ) {
 					if ( this.declaration.id ) {
@@ -6132,6 +6165,8 @@ var ExportDefaultDeclaration = (function (Node) {
 					} else {
 						code.overwrite( this.start, this.declaration.start, ((this.module.bundle.varOrConst) + " " + name + " = ") );
 					}
+
+					this.insertSemicolon( code );
 				}
 			} else {
 				// remove `var foo` from `var foo = bar()`, if `foo` is unused
@@ -6141,7 +6176,7 @@ var ExportDefaultDeclaration = (function (Node) {
 			Node.prototype.render.call( this, code, es );
 		} else {
 			if ( treeshake ) {
-				if ( functionOrClassDeclaration.test( this.declaration.type ) && !this.declaration.activated ) {
+				if ( functionOrClassDeclaration.test( this.declaration.type ) ) {
 					code.remove( this.leadingCommentStart || this.start, this.next || this.end );
 				} else {
 					var hasEffects = this.declaration.hasEffects( this.module.scope );
@@ -6251,11 +6286,16 @@ var ExportNamedDeclaration = (function (Node) {
 var ExpressionStatement = (function (Statement) {
 	function ExpressionStatement () {
 		Statement.apply(this, arguments);
-	}if ( Statement ) ExpressionStatement.__proto__ = Statement;
+	}
+
+	if ( Statement ) ExpressionStatement.__proto__ = Statement;
 	ExpressionStatement.prototype = Object.create( Statement && Statement.prototype );
 	ExpressionStatement.prototype.constructor = ExpressionStatement;
 
-	
+	ExpressionStatement.prototype.render = function render ( code, es ) {
+		Statement.prototype.render.call( this, code, es );
+		if ( this.shouldInclude ) this.insertSemicolon( code );
+	};
 
 	return ExpressionStatement;
 }(Statement));
@@ -6518,6 +6558,16 @@ var Identifier = (function (Node) {
 	return Identifier;
 }(Node$1));
 
+// Statement types which may contain if-statements as direct children.
+var statementsWithIfStatements = new Set([
+	'DoWhileStatement',
+	'ForInStatement',
+	'ForOfStatement',
+	'ForStatement',
+	'IfStatement',
+	'WhileStatement'
+]);
+
 // TODO DRY this out
 var IfStatement = (function (Statement) {
 	function IfStatement () {
@@ -6539,7 +6589,9 @@ var IfStatement = (function (Statement) {
 			else if ( this.testValue ) {
 				this.consequent.initialise( scope );
 				this.alternate = null;
-			} else {
+			}
+
+			else {
 				if ( this.alternate ) this.alternate.initialise( scope );
 				this.consequent = null;
 			}
@@ -6566,9 +6618,18 @@ var IfStatement = (function (Statement) {
 					code.remove( this.start, this.consequent.start );
 					code.remove( this.consequent.end, this.end );
 					this.consequent.render( code, es );
-				} else {
+				}
+
+				else {
 					code.remove( this.start, this.alternate ? this.alternate.start : this.next || this.end );
-					if ( this.alternate ) this.alternate.render( code, es );
+
+					if ( this.alternate ) {
+						this.alternate.render( code, es );
+					}
+
+					else if ( statementsWithIfStatements.has( this.parent.type ) ) {
+						code.insertRight( this.start, '{}' );
+					}
 				}
 			}
 		}
@@ -6796,6 +6857,8 @@ var TemplateLiteral = (function (Node) {
 	return TemplateLiteral;
 }(Node$1));
 
+var warning = "The 'this' keyword is equivalent to 'undefined' at the top level of an ES module, and has been rewritten. See https://github.com/rollup/rollup/wiki/Troubleshooting#this-is-undefined for more information";
+
 var ThisExpression = (function (Node) {
 	function ThisExpression () {
 		Node.apply(this, arguments);
@@ -6809,9 +6872,13 @@ var ThisExpression = (function (Node) {
 		var lexicalBoundary = scope.findLexicalBoundary();
 
 		if ( lexicalBoundary.isModuleScope ) {
-			this.alias = this.module.bundle.context;
+			this.alias = this.module.context;
 			if ( this.alias === 'undefined' ) {
-				this.module.bundle.onwarn( 'The `this` keyword is equivalent to `undefined` at the top level of an ES module, and has been rewritten' );
+				var ref = getLocation( this.module.code, this.start );
+				var line = ref.line;
+				var column = ref.column;
+				var detail = (relativeId( this.module.id )) + " (" + line + ":" + (column + 1) + ")"; // use one-based column number convention
+				this.module.bundle.onwarn( (detail + " " + warning) );
 			}
 		}
 	};
@@ -7042,7 +7109,7 @@ function getSeparator ( code, start ) {
 	return (";\n" + lineStart);
 }
 
-var forStatement = /^For(?:Of|In)Statement/;
+var forStatement = /^For(?:Of|In)?Statement/;
 
 var VariableDeclaration = (function (Node) {
 	function VariableDeclaration () {
@@ -7132,9 +7199,16 @@ var VariableDeclaration = (function (Node) {
 
 		if ( treeshake && empty ) {
 			code.remove( this.leadingCommentStart || this.start, this.next || this.end );
-		} else if ( this.end > c ) {
-			var hasSemicolon = code.original[ this.end - 1 ] === ';';
-			code.overwrite( c, this.end, hasSemicolon ? ';' : '' );
+		} else {
+			// always include a semi-colon (https://github.com/rollup/rollup/pull/1013),
+			// unless it's a var declaration in a loop head
+			var needsSemicolon = !forStatement.test( this.parent.type );
+
+			if ( this.end > c ) {
+				code.overwrite( c, this.end, needsSemicolon ? ';' : '' );
+			} else if ( needsSemicolon  ) {
+				this.insertSemicolon( code );
+			}
 		}
 	};
 
@@ -7351,6 +7425,7 @@ var Module = function Module (ref) {
 	this.bundle = bundle;
 	this.id = id;
 	this.excludeFromSourcemap = /\0/.test( id );
+	this.context = bundle.getModuleContext( id );
 
 	// all dependencies
 	this.sources = [];
@@ -7499,11 +7574,11 @@ Module.prototype.addImport = function addImport ( node ) {
 	if ( !~this.sources.indexOf( source ) ) this.sources.push( source );
 
 	node.specifiers.forEach( function (specifier) {
-			var localName = specifier.local.name;
+		var localName = specifier.local.name;
 
 		if ( this$1.imports[ localName ] ) {
 			var err = new Error( ("Duplicated import '" + localName + "'") );
-			err.file = this$1.id;
+				err.file = this$1.id;
 			err.loc = getLocation( this$1.code, specifier.start );
 			throw err;
 		}
@@ -7590,18 +7665,18 @@ Module.prototype.findParent = function findParent () {
 
 Module.prototype.findScope = function findScope () {
 	return this.scope;
-	};
+};
 
-	Module.prototype.getExports = function getExports () {
-		var exports = blank();
+Module.prototype.getExports = function getExports () {
+	var exports = blank();
 
-		keys( this.exports ).forEach( function (name) {
+	keys( this.exports ).forEach( function (name) {
 		exports[ name ] = true;
 	});
 
 	keys( this.reexports ).forEach( function (name) {
-		exports[ name ] = true;
-	});
+			exports[ name ] = true;
+		});
 
 	this.exportAllModules.forEach( function (module) {
 		if ( module.isExternal ) return; // TODO
@@ -7622,7 +7697,7 @@ Module.prototype.namespace = function namespace () {
 	return this.declarations['*'];
 };
 
-Module.prototype.render = function render ( es ) {
+Module.prototype.render = function render ( es, legacy ) {
 	var magicString = this.magicString.clone();
 
 	for ( var node of this.ast.body ) {
@@ -7630,7 +7705,7 @@ Module.prototype.render = function render ( es ) {
 	}
 
 	if ( this.namespace().needsNamespaceBlock ) {
-		magicString.append( '\n\n' + this.namespace().renderBlock( es, '\t' ) ); // TODO use correct indentation
+		magicString.append( '\n\n' + this.namespace().renderBlock( es, legacy, '\t' ) ); // TODO use correct indentation
 	}
 
 	return magicString.trim();
@@ -7674,7 +7749,7 @@ Module.prototype.trace = function trace ( name ) {
 
 		var declaration = otherModule.traceExport( importDeclaration.name );
 
-		if ( !declaration ) throw new Error( ("Module " + (otherModule.id) + " does not export " + (importDeclaration.name) + " (imported by " + (this.id) + ")") );
+		if ( !declaration ) throw new Error( ("'" + (importDeclaration.name) + "' is not exported by " + (relativeId( otherModule.id )) + " (imported by " + (relativeId( this.id )) + "). For help fixing this error see https://github.com/rollup/rollup/wiki/Troubleshooting#name-is-not-exported-by-module") );
 		return declaration;
 	}
 
@@ -8177,7 +8252,11 @@ function badExports ( option, keys ) {
 	throw new Error( ("'" + option + "' was specified for options.exports, but entry module has following exports: " + (keys.join(', '))) );
 }
 
-function getExportMode ( bundle, exportMode, moduleName ) {
+function getExportMode ( bundle, ref ) {
+	var exportMode = ref.exports;
+	var moduleName = ref.moduleName;
+	var format = ref.format;
+
 	var exportKeys = keys( bundle.entryModule.exports )
 		.concat( keys( bundle.entryModule.reexports ) )
 		.concat( bundle.entryModule.exportAllSources ); // not keys, but makes our job easier this way
@@ -8196,7 +8275,7 @@ function getExportMode ( bundle, exportMode, moduleName ) {
 		} else if ( exportKeys.length === 1 && exportKeys[0] === 'default' ) {
 			exportMode = 'default';
 		} else {
-			if ( bundle.entryModule.exports.default ) {
+			if ( bundle.entryModule.exports.default && format !== 'es') {
 				bundle.onwarn( ("Using named and default exports together. Consumers of your bundle will have to use " + (moduleName || 'bundle') + "['default'] to access the default export, which may not be what you want. Use `exports: 'named'` to disable this warning. See https://github.com/rollup/rollup/wiki/JavaScript-API#exports for more information") );
 			}
 			exportMode = 'named';
@@ -8534,11 +8613,10 @@ var Bundle = function Bundle ( options ) {
 
 	this.plugins = ensureArray( options.plugins );
 
-	this.plugins.forEach( function (plugin) {
-		if ( plugin.options ) {
-			options = plugin.options( options ) || options;
-		}
-	});
+	options = this.plugins.reduce( function ( acc, plugin ) {
+		if ( plugin.options ) return plugin.options( acc ) || acc;
+		return acc;
+	}, options);
 
 	this.entry = options.entry;
 	this.entryId = null;
@@ -8576,6 +8654,18 @@ var Bundle = function Bundle ( options ) {
 
 	this.context = String( options.context );
 
+	if ( typeof options.moduleContext === 'function' ) {
+		this.getModuleContext = function (id) { return options.moduleContext( id ) || this$1.context; };
+	} else if ( typeof options.moduleContext === 'object' ) {
+		var moduleContext = new Map();
+		Object.keys( options.moduleContext ).forEach( function (key) {
+			moduleContext.set( path.resolve( key ), options.moduleContext[ key ] );
+		});
+		this.getModuleContext = function (id) { return moduleContext.get( id ) || this$1.context; };
+	} else {
+		this.getModuleContext = function () { return this$1.context; };
+	}
+
 	if ( typeof options.external === 'function' ) {
 		this.isExternal = options.external;
 	} else {
@@ -8586,6 +8676,7 @@ var Bundle = function Bundle ( options ) {
 	this.onwarn = options.onwarn || makeOnwarn();
 
 	this.varOrConst = options.preferConst ? 'const' : 'var';
+	this.legacy = options.legacy;
 	this.acornOptions = options.acorn || {};
 
 	this.dependentExpressions = [];
@@ -8781,7 +8872,7 @@ Bundle.prototype.fetchModule = function fetchModule ( id, importer ) {
 			});
 
 			this$1.modules.push( module );
-				this$1.moduleById.set( id, module );
+			this$1.moduleById.set( id, module );
 
 			return this$1.fetchAllDependencies( module ).then( function () {
 				keys( module.exports ).forEach( function (name) {
@@ -8856,6 +8947,7 @@ Bundle.prototype.getPathRelativeToEntryDirname = function getPathRelativeToEntry
 };
 
 Bundle.prototype.render = function render ( options ) {
+		var this$1 = this;
 		if ( options === void 0 ) options = {};
 
 	if ( options.format === 'es6' ) {
@@ -8866,7 +8958,7 @@ Bundle.prototype.render = function render ( options ) {
 	var format = options.format || 'es';
 
 	// Determine export mode - 'default', 'named', 'none'
-	var exportMode = getExportMode( this, options.exports, options.moduleName );
+	var exportMode = getExportMode( this, options );
 
 	var magicString = new Bundle$1({ separator: '\n\n' });
 	var usedModules = [];
@@ -8874,7 +8966,7 @@ Bundle.prototype.render = function render ( options ) {
 	timeStart( 'render modules' );
 
 	this.orderedModules.forEach( function (module) {
-		var source = module.render( format === 'es' );
+		var source = module.render( format === 'es', this$1.legacy );
 
 		if ( source.toString().length ) {
 			magicString.addSource( source );
@@ -8951,7 +9043,7 @@ Bundle.prototype.render = function render ( options ) {
 	return { code: code, map: map };
 };
 
-Bundle.prototype.sort = function sort () {
+	Bundle.prototype.sort = function sort () {
 		var this$1 = this;
 
 	var hasCycles;
@@ -9019,7 +9111,7 @@ Bundle.prototype.sort = function sort () {
 						visited[ module.id ] = true;
 						for ( var i = 0; i < module.dependencies.length; i += 1 ) {
 							var dependency = module.dependencies[i];
-								if ( !visited[ dependency.id ] && findParent( dependency ) ) return true;
+							if ( !visited[ dependency.id ] && findParent( dependency ) ) return true;
 						}
 					};
 
@@ -9038,7 +9130,7 @@ Bundle.prototype.sort = function sort () {
 	return ordered;
 };
 
-var VERSION = '0.36.0';
+var VERSION = '0.36.4';
 
 var ALLOWED_KEYS = [
 	'acorn',
@@ -9055,6 +9147,8 @@ var ALLOWED_KEYS = [
 	'indent',
 	'interop',
 	'intro',
+	'legacy',
+	'moduleContext',
 	'moduleId',
 	'moduleName',
 	'noConflict',
@@ -9070,20 +9164,24 @@ var ALLOWED_KEYS = [
 	'useStrict'
 ];
 
-function rollup ( options ) {
+function checkOptions ( options ) {
 	if ( !options || !options.entry ) {
-		return Promise.reject( new Error( 'You must supply options.entry to rollup' ) );
+		return new Error( 'You must supply options.entry to rollup' );
 	}
 
 	if ( options.transform || options.load || options.resolveId || options.resolveExternal ) {
-		return Promise.reject( new Error( 'The `transform`, `load`, `resolveId` and `resolveExternal` options are deprecated in favour of a unified plugin API. See https://github.com/rollup/rollup/wiki/Plugins for details' ) );
+		return new Error( 'The `transform`, `load`, `resolveId` and `resolveExternal` options are deprecated in favour of a unified plugin API. See https://github.com/rollup/rollup/wiki/Plugins for details' );
 	}
 
-	var error = validateKeys( options, ALLOWED_KEYS );
+	var error = validateKeys( keys(options), ALLOWED_KEYS );
+	if ( error ) return error;
 
-	if ( error ) {
-		return Promise.reject( error );
-	}
+	return null;
+}
+
+function rollup ( options ) {
+	var error = checkOptions ( options );
+	if ( error ) return Promise.reject( error );
 
 	var bundle = new Bundle( options );