From 49665232ebe0621aed00fcc5e6f729585cca462f Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 10 Dec 2016 15:21:16 -0500
Subject: [PATCH] use builders in place of local.detach and local.teardown

---
 src/generate/visitors/Component.js                         | 4 +---
 src/generate/visitors/Element.js                           | 4 +---
 src/generate/visitors/attributes/addComponentAttributes.js | 2 +-
 src/generate/visitors/attributes/addElementAttributes.js   | 6 +++---
 src/generate/visitors/attributes/binding/index.js          | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/generate/visitors/Component.js b/src/generate/visitors/Component.js
index 274ea2a583..dda336aaab 100644
--- a/src/generate/visitors/Component.js
+++ b/src/generate/visitors/Component.js
@@ -110,13 +110,11 @@ export default {
 			` );
 		}
 
-		local.teardown.push( `${name}.teardown( ${isToplevel ? 'detach' : 'false'} );` );
+		generator.current.builders.teardown.addLine( `${name}.teardown( ${isToplevel ? 'detach' : 'false'} );` );
 
 		generator.current.builders.init.addBlock( local.init.join( '\n' ) );
 		if ( local.update.length ) generator.current.builders.update.addBlock( local.update.join( '\n' ) );
 		if ( local.mount.length ) generator.current.builders.mount.addBlock( local.mount.join( '\n' ) );
-		if ( local.detach.length ) generator.current.builders.detach.addBlock( local.detach.join( '\n' ) );
-		generator.current.builders.teardown.addBlock( local.teardown.join( '\n' ) );
 
 		generator.push({
 			namespace: local.namespace,
diff --git a/src/generate/visitors/Element.js b/src/generate/visitors/Element.js
index 4154c810a7..e00029c57a 100644
--- a/src/generate/visitors/Element.js
+++ b/src/generate/visitors/Element.js
@@ -69,7 +69,7 @@ export default {
 
 		local.init.unshift( render );
 		if ( isToplevel ) {
-			local.detach.push( `${name}.parentNode.removeChild( ${name} );` );
+			generator.current.builders.detach.addLine( `${name}.parentNode.removeChild( ${name} );` );
 		}
 
 		// special case – bound <option> without a value attribute
@@ -82,8 +82,6 @@ export default {
 		generator.current.builders.init.addBlock( local.init.join( '\n' ) );
 		if ( local.update.length ) generator.current.builders.update.addBlock( local.update.join( '\n' ) );
 		if ( local.mount.length ) generator.current.builders.mount.addBlock( local.mount.join( '\n' ) );
-		if ( local.detach.length ) generator.current.builders.detach.addBlock( local.detach.join( '\n' ) );
-		generator.current.builders.teardown.addBlock( local.teardown.join( '\n' ) );
 
 		generator.createMountStatement( name );
 
diff --git a/src/generate/visitors/attributes/addComponentAttributes.js b/src/generate/visitors/attributes/addComponentAttributes.js
index 4fff08b40e..5eda3786e1 100644
--- a/src/generate/visitors/attributes/addComponentAttributes.js
+++ b/src/generate/visitors/attributes/addComponentAttributes.js
@@ -122,7 +122,7 @@ export default function addComponentAttributes ( generator, node, local ) {
 				component.refs.${attribute.name} = ${local.name};
 			` );
 
-			local.teardown.push( deindent`
+			generator.current.builders.teardown.addLine( deindent`
 				if ( component.refs.${attribute.name} === ${local.name} ) component.refs.${attribute.name} = null;
 			` );
 		}
diff --git a/src/generate/visitors/attributes/addElementAttributes.js b/src/generate/visitors/attributes/addElementAttributes.js
index 4873d2d637..5b24d0bfbb 100644
--- a/src/generate/visitors/attributes/addElementAttributes.js
+++ b/src/generate/visitors/attributes/addElementAttributes.js
@@ -152,7 +152,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					});
 				` );
 
-				local.teardown.push( deindent`
+				generator.current.builders.teardown.addLine( deindent`
 					${handlerName}.teardown();
 				` );
 			} else {
@@ -164,7 +164,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					${local.name}.addEventListener( '${attribute.name}', ${handlerName}, false );
 				` );
 
-				local.teardown.push( deindent`
+				generator.current.builders.teardown.addLine( deindent`
 					${local.name}.removeEventListener( '${attribute.name}', ${handlerName}, false );
 				` );
 			}
@@ -181,7 +181,7 @@ export default function addElementAttributes ( generator, node, local ) {
 				component.refs.${attribute.name} = ${local.name};
 			` );
 
-			local.teardown.push( deindent`
+			generator.current.builders.teardown.addLine( deindent`
 				if ( component.refs.${attribute.name} === ${local.name} ) component.refs.${attribute.name} = null;
 			` );
 		}
diff --git a/src/generate/visitors/attributes/binding/index.js b/src/generate/visitors/attributes/binding/index.js
index bf4b260166..f5fa1ce2fc 100644
--- a/src/generate/visitors/attributes/binding/index.js
+++ b/src/generate/visitors/attributes/binding/index.js
@@ -121,7 +121,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 			if ( !${local.name}_updating ) ${updateElement};
 		` );
 
-		local.teardown.push( deindent`
+		generator.current.builders.teardown.addLine( deindent`
 			${local.name}.removeEventListener( '${eventName}', ${handler}, false );
 		` );
 	}