rollup 0.41.2 → 0.41.6

package/dist/rollup.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.41.2
-	Fri Jan 13 2017 14:29:19 GMT-0500 (EST) - commit e2d9b6bb059a881068b574b2af407ee40ff999cf
+	Rollup.js v0.41.6
+	Thu Mar 16 2017 00:50:25 GMT-0400 (EDT) - commit a96a923d631b9d2c471137542b9c4f578b8faa53
 
 
 	https://github.com/rollup/rollup
@@ -5995,12 +5995,14 @@ function callHasEffects ( scope, callee, isNew ) {
 			}
 		}
 
-		else {
-			if ( !node.gatherPossibleValues ) {
-				throw new Error( 'TODO' );
-			}
+		else if ( node.gatherPossibleValues ) {
 			node.gatherPossibleValues( values );
 		}
+
+		else {
+			// probably an error in the user's code — err on side of caution
+			return true;
+		}
 	}
 
 	return false;
@@ -6211,10 +6213,18 @@ var ConditionalExpression = (function (Node) {
 			else if ( this.testValue ) {
 				code.remove( this.start, this.consequent.start );
 				code.remove( this.consequent.end, this.end );
+				if ( this.consequent.type === 'SequenceExpression' ) {
+					code.insertRight( this.consequent.start, '(' );
+					code.insertLeft( this.consequent.end, ')' );
+				}
 				this.consequent.render( code, es );
 			} else {
 				code.remove( this.start, this.alternate.start );
 				code.remove( this.alternate.end, this.end );
+				if ( this.alternate.type === 'SequenceExpression' ) {
+					code.insertRight( this.alternate.start, '(' );
+					code.insertLeft( this.alternate.end, ')' );
+				}
 				this.alternate.render( code, es );
 			}
 		}
@@ -6384,6 +6394,8 @@ var ExportDefaultDeclaration = (function (Node) {
 					var hasEffects = this.declaration.hasEffects( this.module.scope );
 					code.remove( this.start, hasEffects ? declaration_start : this.next || this.end );
 				}
+			} else if (name === this.declaration.name) {
+				code.remove( this.start, this.next || this.end );
 			} else {
 				code.overwrite( this.start, declaration_start, ((this.module.bundle.varOrConst) + " " + name + " = ") );
 			}
@@ -7008,7 +7020,7 @@ var MemberExpression = (function (Node) {
 		// TODO this code is a bit inefficient
 		var keypath = new Keypath( this );
 
-		if ( !keypath.computed ) {
+		if ( !keypath.computed && keypath.root.type === 'Identifier' ) {
 			var declaration = scope.findDeclaration( keypath.root.name );
 
 			while ( declaration.isNamespace && keypath.parts.length ) {
@@ -8067,6 +8079,7 @@ Module.prototype.toJSON = function toJSON () {
 		dependencies: this.dependencies.map( function (module) { return module.id; } ),
 		code: this.code,
 		originalCode: this.originalCode,
+		originalSourceMap: this.originalSourceMap,
 		ast: this.astClone,
 		sourceMapChain: this.sourceMapChain,
 		resolvedIds: this.resolvedIds
@@ -8080,8 +8093,8 @@ Module.prototype.trace = function trace ( name ) {
 	}
 
 	if ( name in this.imports ) {
-		var importDeclaration = this.imports[ name ];
-			var otherModule = importDeclaration.module;
+			var importDeclaration = this.imports[ name ];
+		var otherModule = importDeclaration.module;
 
 		if ( importDeclaration.name === '*' && !otherModule.isExternal ) {
 			return otherModule.namespace();
@@ -8106,6 +8119,12 @@ Module.prototype.trace = function trace ( name ) {
 Module.prototype.traceExport = function traceExport ( name ) {
 		var this$1 = this;
 
+	// export * from 'external'
+	if ( name[0] === '*' ) {
+		var module = this.bundle.moduleById.get( name.slice( 1 ) );
+		return module.traceExport( '*' );
+	}
+
 	// export { foo } from './other.js'
 	var reexportDeclaration = this.reexports[ name ];
 	if ( reexportDeclaration ) {
@@ -8133,8 +8152,8 @@ Module.prototype.traceExport = function traceExport ( name ) {
 	if ( name === 'default' ) return;
 
 	for ( var i = 0; i < this.exportAllModules.length; i += 1 ) {
-		var module = this$1.exportAllModules[i];
-		var declaration$2 = module.traceExport( name );
+		var module$1 = this$1.exportAllModules[i];
+		var declaration$2 = module$1.traceExport( name );
 
 		if ( declaration$2 ) return declaration$2;
 	}
@@ -8987,6 +9006,9 @@ Link.prototype.traceMappings = function traceMappings () {
 
 		line.forEach( function (segment) {
 			var source = this$1.sources[ segment[1] ];
+
+			if ( !source ) return;
+
 			var traced = source.traceSegment( segment[2], segment[3], this$1.names[ segment[4] ] );
 
 			if ( traced ) {
@@ -9486,7 +9508,9 @@ Bundle$$1.prototype.fetchModule = function fetchModule ( id, importer ) {
 
 			return this$1.fetchAllDependencies( module ).then( function () {
 				keys( module.exports ).forEach( function (name) {
-					module.exportsAll[name] = module.id;
+					if ( name !== 'default' ) {
+						module.exportsAll[name] = module.id;
+					}
 				});
 				module.exportAllSources.forEach( function (source) {
 					var id = module.resolvedIds[ source ];
@@ -9497,10 +9521,11 @@ Bundle$$1.prototype.fetchModule = function fetchModule ( id, importer ) {
 						if ( name in module.exportsAll ) {
 							this$1.warn({
 								code: 'NAMESPACE_CONFLICT',
-								message: ("Conflicting namespaces: " + (relativeId( module.id )) + " re-exports '" + name + "' from both " + (relativeId( module.exportsAll[ name ] )) + " (will be ignored) and " + (relativeId( exportAllModule.exportsAll[ name ] )))
+								message: ("Conflicting namespaces: " + (relativeId( module.id )) + " re-exports '" + name + "' from both " + (relativeId( module.exportsAll[ name ] )) + " and " + (relativeId( exportAllModule.exportsAll[ name ] )) + " (will be ignored)")
 							});
+						} else {
+							  module.exportsAll[ name ] = exportAllModule.exportsAll[ name ];
 						}
-						module.exportsAll[ name ] = exportAllModule.exportsAll[ name ];
 					});
 				});
 				return module;
@@ -9637,7 +9662,7 @@ Bundle$$1.prototype.render = function render ( options ) {
 		.filter( Boolean )
 		.join( '\n\n' );
 
-	if ( intro ) intro += '\n\n';
+		if ( intro ) intro += '\n\n';
 
 	var outro = [ options.outro ]
 		.concat(
@@ -9648,12 +9673,12 @@ Bundle$$1.prototype.render = function render ( options ) {
 
 	if ( outro ) outro = "\n\n" + outro;
 
-	var indentString = getIndentString( magicString, options );
+		var indentString = getIndentString( magicString, options );
 
-		var finalise = finalisers[ options.format ];
+	var finalise = finalisers[ options.format ];
 	if ( !finalise ) {
-			error({
-				code: 'INVALID_OPTION',
+		error({
+			code: 'INVALID_OPTION',
 			message: ("You must specify an output type - valid options are " + (keys( finalisers ).join( ', ' )))
 		});
 	}
@@ -9764,7 +9789,7 @@ Bundle$$1.prototype.sort = function sort () {
 				var b = ordered[i];
 
 				// TODO reinstate this! it no longer works
-				if ( stronglyDependsOn[ a.id ][ b.id ] ) {
+					if ( stronglyDependsOn[ a.id ][ b.id ] ) {
 					// somewhere, there is a module that imports b before a. Because
 					// b imports a, a is placed before b. We need to find the module
 					// in question, so we can provide a useful error message
@@ -9785,7 +9810,7 @@ Bundle$$1.prototype.sort = function sort () {
 
 					findParent( this$1.entryModule );
 
-					this$1.onwarn(
+						this$1.onwarn(
 						("Module " + (a.id) + " may be unable to evaluate without " + (b.id) + ", but is included first due to a cyclical dependency. Consider swapping the import statements in " + parent + " to ensure correct ordering")
 					);
 				}
@@ -9812,7 +9837,7 @@ Bundle$$1.prototype.warn = function warn ( warning ) {
 	this.onwarn( warning );
 };
 
-var VERSION = '0.41.2';
+var VERSION = '0.41.6';
 
 var ALLOWED_KEYS = [
 	'acorn',