Take the module from the parent to avoid a constructor argument

rollup · Apr 16, 2018 · a903b28 · a903b28
1 parent 4978d7c
commit a903b28
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 21 deletions.
diff --git a/src/Module.ts b/src/Module.ts
@@ -220,7 +220,13 @@ export default class Module {
 
 		timeStart('analyse ast', 3);
 
-		this.ast = new Program(this.esTreeAst, nodeConstructors, {}, this, this.scope, false);
+		this.ast = new Program(
+			this.esTreeAst,
+			nodeConstructors,
+			{ type: 'Module', module: this },
+			this.scope,
+			false
+		);
 
 		timeEnd('analyse ast', 3);
 	}

diff --git a/src/ast/nodes/ArrowFunctionExpression.ts b/src/ast/nodes/ArrowFunctionExpression.ts
@@ -72,7 +72,6 @@ export default class ArrowFunctionExpression extends NodeBase {
 				esTreeNode.body,
 				nodeConstructors,
 				this,
-				this.module,
 				new Scope({ parent: this.scope }),
 				true
 			);

diff --git a/src/ast/nodes/CatchClause.ts b/src/ast/nodes/CatchClause.ts
@@ -25,7 +25,6 @@ export default class CatchClause extends NodeBase {
 			esTreeNode.body,
 			nodeConstructors,
 			this,
-			this.module,
 			this.scope,
 			true
 		);

diff --git a/src/ast/nodes/ClassDeclaration.ts b/src/ast/nodes/ClassDeclaration.ts
@@ -27,7 +27,6 @@ export default class ClassDeclaration extends ClassNode {
 				esTreeNode.id,
 				nodeConstructors,
 				this,
-				this.module,
 				<Scope>this.scope.parent,
 				false
 			);

diff --git a/src/ast/nodes/FunctionDeclaration.ts b/src/ast/nodes/FunctionDeclaration.ts
@@ -23,7 +23,6 @@ export default class FunctionDeclaration extends FunctionNode {
 				esTreeNode.id,
 				nodeConstructors,
 				this,
-				this.module,
 				this.scope.parent,
 				false
 			);

diff --git a/src/ast/nodes/shared/FunctionNode.ts b/src/ast/nodes/shared/FunctionNode.ts
@@ -93,7 +93,6 @@ export default class FunctionNode extends NodeBase {
 			esTreeNode.body,
 			nodeConstructors,
 			this,
-			this.module,
 			new Scope({ parent: this.scope }),
 			true
 		);

diff --git a/src/ast/nodes/shared/Node.ts b/src/ast/nodes/shared/Node.ts
@@ -85,7 +85,7 @@ export class NodeBase implements ExpressionNode {
 	start: number;
 	end: number;
 	module: Module;
-	parent: Node | { type?: string };
+	parent: Node | { type: string; module: Module };
 
 	// Not initialised during construction
 	included: boolean = false;
@@ -94,19 +94,18 @@ export class NodeBase implements ExpressionNode {
 		esTreeNode: GenericEsTreeNode,
 		// we need to pass down the node constructors to avoid a circular dependency
 		nodeConstructors: { [p: string]: typeof NodeBase },
-		parent: Node | {},
-		module: Module,
+		parent: Node | { type: string; module: Module },
 		parentScope: Scope,
 		preventNewScope: boolean
 	) {
 		this.keys = keys[esTreeNode.type] || getAndCreateKeys(esTreeNode);
 		this.parent = parent;
-		this.module = module;
+		this.module = parent.module;
 		this.createScope(parentScope, preventNewScope);
 		this.parseNode(esTreeNode, nodeConstructors);
 		this.initialise();
-		module.magicString.addSourcemapLocation(this.start);
-		module.magicString.addSourcemapLocation(this.end);
+		this.module.magicString.addSourcemapLocation(this.start);
+		this.module.magicString.addSourcemapLocation(this.end);
 	}
 
 	/**
@@ -249,22 +248,14 @@ export class NodeBase implements ExpressionNode {
 								child,
 								nodeConstructors,
 								this,
-								this.module,
 								this.scope,
 								false
 							)
 					);
 				}
 			} else {
 				(<GenericEsTreeNode>this)[key] = new (nodeConstructors[value.type] ||
-					nodeConstructors.UnknownNode)(
-					value,
-					nodeConstructors,
-					this,
-					this.module,
-					this.scope,
-					false
-				);
+					nodeConstructors.UnknownNode)(value, nodeConstructors, this, this.scope, false);
 			}
 		}
 	}