include side-effects (#40)

src/Bundle.js

@@ -425,7 +425,28 @@ export default class Bundle {
 					if ( shouldMark ) {
 						settled = false;
 						promises.push( statement.mark() );
+						return;
 					}
+
+					// special case - https://github.com/rollup/rollup/pull/40
+					const importDeclaration = module.imports[ name ];
+					if ( !importDeclaration ) return;
+
+					const promise = Promise.resolve( importDeclaration.module || this.fetchModule( importDeclaration.source, module.id ) )
+						.then( module => {
+							importDeclaration.module = module;
+							const exportDeclaration = module.exports[ importDeclaration.name ];
+							// TODO things like `export default a + b` don't apply here... right?
+							return module.findDefiningStatement( exportDeclaration.localName );
+						})
+						.then( definingStatement => {
+							if ( !definingStatement ) return;
+
+							settled = false;
+							return statement.mark();
+						});
+
+					promises.push( promise );
 				});
 			});
 		});

src/Module.js

@@ -220,6 +220,90 @@ export default class Module {
 		return { strongDependencies, weakDependencies };
 	}
 
+	findDefiningStatement ( name ) {
+		if ( this.definitions[ name ] ) return this.definitions[ name ];
+
+		// TODO what about `default`/`*`?
+
+		const importDeclaration = this.imports[ name ];
+		if ( !importDeclaration ) return null;
+
+		return Promise.resolve( importDeclaration.module || this.bundle.fetchModule( importDeclaration.source, this.id ) )
+			.then( module => {
+				importDeclaration.module = module;
+				return module.findDefiningStatement( name );
+			});
+	}
+
+	findDeclaration ( localName ) {
+		const importDeclaration = this.imports[ localName ];
+
+		// name was defined by another module
+		if ( importDeclaration ) {
+			const module = importDeclaration.module;
+
+			if ( module.isExternal ) return null;
+
+			const exportDeclaration = module.exports[ importDeclaration.name ];
+			return module.findDeclaration( exportDeclaration.localName );
+		}
+
+		// name was defined by this module, if any
+		let i = this.statements.length;
+		while ( i-- ) {
+			const declaration = this.statements[i].scope.declarations[ localName ];
+			if ( declaration ) {
+				return declaration;
+			}
+		}
+
+		return null;
+	}
+
+	getCanonicalName ( localName ) {
+		// Special case
+		if ( localName === 'default' && ( this.exports.default.isModified || !this.suggestedNames.default ) ) {
+			let canonicalName = makeLegalIdentifier( this.id.replace( dirname( this.bundle.entryModule.id ) + '/', '' ).replace( /\.js$/, '' ) );
+			return deconflict( canonicalName, this.definitions );
+		}
+
+		if ( this.suggestedNames[ localName ] ) {
+			localName = this.suggestedNames[ localName ];
+		}
+
+		if ( !this.canonicalNames[ localName ] ) {
+			let canonicalName;
+
+			if ( this.imports[ localName ] ) {
+				const importDeclaration = this.imports[ localName ];
+				const module = importDeclaration.module;
+
+				if ( importDeclaration.name === '*' ) {
+					canonicalName = module.suggestedNames[ '*' ];
+				} else {
+					let exporterLocalName;
+
+					if ( module.isExternal ) {
+						exporterLocalName = importDeclaration.name;
+					} else {
+						const exportDeclaration = module.exports[ importDeclaration.name ];
+						exporterLocalName = exportDeclaration.localName;
+					}
+
+					canonicalName = module.getCanonicalName( exporterLocalName );
+				}
+			}
+
+			else {
+				canonicalName = localName;
+			}
+
+			this.canonicalNames[ localName ] = canonicalName;
+		}
+
+		return this.canonicalNames[ localName ];
+	}
+
 	mark ( name ) {
 		// shortcut cycles. TODO this won't work everywhere...
 		if ( this.definitionPromises[ name ] ) {
@@ -365,75 +449,6 @@ export default class Module {
 		});
 	}
 
-	findDeclaration ( localName ) {
-		const importDeclaration = this.imports[ localName ];
-
-		// name was defined by another module
-		if ( importDeclaration ) {
-			const module = importDeclaration.module;
-
-			if ( module.isExternal ) return null;
-
-			const exportDeclaration = module.exports[ importDeclaration.name ];
-			return module.findDeclaration( exportDeclaration.localName );
-		}
-
-		// name was defined by this module, if any
-		let i = this.statements.length;
-		while ( i-- ) {
-			const declaration = this.statements[i].scope.declarations[ localName ];
-			if ( declaration ) {
-				return declaration;
-			}
-		}
-
-		return null;
-	}
-
-	getCanonicalName ( localName ) {
-		// Special case
-		if ( localName === 'default' && ( this.exports.default.isModified || !this.suggestedNames.default ) ) {
-			let canonicalName = makeLegalIdentifier( this.id.replace( dirname( this.bundle.entryModule.id ) + '/', '' ).replace( /\.js$/, '' ) );
-			return deconflict( canonicalName, this.definitions );
-		}
-
-		if ( this.suggestedNames[ localName ] ) {
-			localName = this.suggestedNames[ localName ];
-		}
-
-		if ( !this.canonicalNames[ localName ] ) {
-			let canonicalName;
-
-			if ( this.imports[ localName ] ) {
-				const importDeclaration = this.imports[ localName ];
-				const module = importDeclaration.module;
-
-				if ( importDeclaration.name === '*' ) {
-					canonicalName = module.suggestedNames[ '*' ];
-				} else {
-					let exporterLocalName;
-
-					if ( module.isExternal ) {
-						exporterLocalName = importDeclaration.name;
-					} else {
-						const exportDeclaration = module.exports[ importDeclaration.name ];
-						exporterLocalName = exportDeclaration.localName;
-					}
-
-					canonicalName = module.getCanonicalName( exporterLocalName );
-				}
-			}
-
-			else {
-				canonicalName = localName;
-			}
-
-			this.canonicalNames[ localName ] = canonicalName;
-		}
-
-		return this.canonicalNames[ localName ];
-	}
-
 	// TODO rename this to parse, once https://github.com/rollup/rollup/issues/42 is fixed
 	_parse () {
 		// Try to extract a list of top-level statements/declarations. If

test/function/top-level-side-effects-are-preserved/_config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  description: 'top level side effects are preserved'
+	description: 'top level side effects are preserved'
 };