Merge pull request #1667 from lukastaegert/simple-object-shape-tracking

Implement object shape and function return value tracking

.gitignore

@@ -7,4 +7,6 @@ coverage
 .commithash
 .idea
 bin/rollup
-test/_tmp
+test/_tmp
+test/hooks/tmp
+test/tmp

package.json

@@ -52,6 +52,7 @@
     "date-time": "^2.1.0",
     "eslint": "^4.4.1",
     "eslint-plugin-import": "^2.2.0",
+    "immutable": "^3.8.1",
     "is-reference": "^1.0.0",
     "istanbul": "^0.4.3",
     "locate-character": "^2.0.0",

src/Bundle.js

@@ -261,11 +261,9 @@ export default class Bundle {
 
 		this.modules.forEach( module => {
 			forOwn( module.scope.variables, variable => {
-				if ( variable.isDefault && variable.declaration.id ) {
-					return;
+				if ( !variable.isDefault || !variable.hasId ) {
+					variable.name = getSafeName( variable.name );
 				}
-
-				variable.name = getSafeName( variable.name );
 			} );
 
 			// deconflict reified namespaces

src/Module.js

@@ -32,7 +32,10 @@ function tryParse ( module, acornOptions ) {
 }
 
 function includeFully ( node ) {
-	node.includeInBundle();
+	node.included = true;
+	if ( node.variable && !node.variable.included ) {
+		node.variable.includeVariable();
+	}
 	node.eachChild( includeFully );
 }
 
@@ -277,13 +280,6 @@ export default class Module {
 		for ( const node of this.ast.body ) {
 			node.bind();
 		}
-
-		// if ( this.declarations.default ) {
-		// 	if ( this.exports.default.identifier ) {
-		// 		const declaration = this.trace( this.exports.default.identifier );
-		// 		if ( declaration ) this.declarations.default.bind( declaration );
-		// 	}
-		// }
 	}
 
 	error ( props, pos ) {

src/ast/CallOptions.js

@@ -0,0 +1,15 @@
+export default class CallOptions {
+	static create ( callOptions ) {
+		return new this( callOptions );
+	}
+
+	constructor ( { withNew = false, args = [], caller } = {} ) {
+		this.withNew = withNew;
+		this.args = args;
+		this.caller = caller;
+	}
+
+	equals ( callOptions ) {
+		return callOptions && this.caller === callOptions.caller;
+	}
+}