From 0050871197a0c41d31fed4ce4ea4713381a6fc32 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:49:33 -0400
Subject: [PATCH] more consistent naming

---
 src/generators/dom/Block.js              | 10 ++++++----
 src/generators/dom/visitors/Component.js |  2 +-
 src/generators/dom/visitors/EachBlock.js | 15 +++------------
 src/generators/dom/visitors/IfBlock.js   |  3 +--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/generators/dom/Block.js b/src/generators/dom/Block.js
index a3897af4c6..9e2cbc0ab6 100644
--- a/src/generators/dom/Block.js
+++ b/src/generators/dom/Block.js
@@ -2,15 +2,13 @@ import CodeBuilder from '../../utils/CodeBuilder.js';
 import deindent from '../../utils/deindent.js';
 
 export default class Block {
-	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, getUniqueName }) {
+	constructor ({ generator, name, key, expression, context, contextDependencies, contexts, indexes, params, indexNames, listNames }) {
 		this.generator = generator;
 		this.name = name;
 		this.key = key;
 		this.expression = expression;
 		this.context = context;
 
-		this.component = component;
-
 		this.contexts = contexts;
 		this.indexes = indexes;
 		this.contextDependencies = contextDependencies;
@@ -27,7 +25,11 @@ export default class Block {
 			detachRaw: new CodeBuilder(),
 			destroy: new CodeBuilder()
 		};
-		this.getUniqueName = getUniqueName;
+
+		this.getUniqueName = generator.getUniqueNameMaker( params );
+
+		// unique names
+		this.component = this.getUniqueName( 'component' );
 	}
 
 	addElement ( name, renderStatement, parentNode, needsIdentifier = false ) {
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index d90bb3112f..d4c5a86dc6 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -78,7 +78,7 @@ export default function visitComponent ( generator, block, state, node ) {
 		const params = block.params.join( ', ' );
 
 		const childBlock = block.child({
-			name: generator.getUniqueName( `render_${name}_yield_fragment` ) // TODO should getUniqueName happen inside Fragment? probably
+			name: generator.getUniqueName( `create_${name}_yield_fragment` ) // TODO should getUniqueName happen inside Fragment? probably
 		});
 
 		const childState = Object.assign( {}, state, {
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index aab0d8e3ee..cef7478dfc 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -4,7 +4,7 @@ import visit from '../visit.js';
 
 export default function visitEachBlock ( generator, block, state, node ) {
 	const name = generator.getUniqueName( `each_block` );
-	const renderer = generator.getUniqueName( `render_each_block` );
+	const renderer = generator.getUniqueName( `create_each_block` );
 	const elseName = generator.getUniqueName( `${name}_else` );
 	const renderElse = generator.getUniqueName( `${renderer}_else` );
 	const i = block.getUniqueName( `i` );
@@ -181,27 +181,19 @@ export default function visitEachBlock ( generator, block, state, node ) {
 	const contextDependencies = new Map( block.contextDependencies );
 	contextDependencies.set( node.context, dependencies );
 
-	const blockParams = block.params.concat( listName, context, indexName );
-
-	const getUniqueName = generator.getUniqueNameMaker( blockParams );
-
 	const childBlock = block.child({
 		name: renderer,
 		expression: node.expression,
 		context: node.context,
 		key: node.key,
 
-		component: getUniqueName( 'component' ),
-
 		contextDependencies,
 		contexts,
 		indexes,
 
 		indexNames,
 		listNames,
-		params: blockParams,
-
-		getUniqueName
+		params: block.params.concat( listName, context, indexName )
 	});
 
 	const childState = Object.assign( {}, state, {
@@ -216,8 +208,7 @@ export default function visitEachBlock ( generator, block, state, node ) {
 
 	if ( node.else ) {
 		const childBlock = block.child({
-			name: renderElse,
-			getUniqueName: generator.getUniqueNameMaker( block.params )
+			name: renderElse
 		});
 
 		node.else.children.forEach( child => {
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index d9ffbe57f9..d3b1363e7d 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -39,7 +39,6 @@ function generateBlock ( generator, block, state, node, name ) {
 		parentNode: null
 	});
 
-	// walk the children here
 	node.children.forEach( node => {
 		visit( generator, childBlock, childState, node );
 	});
@@ -55,7 +54,7 @@ export default function visitIfBlock ( generator, fragment, state, node ) {
 	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
 	const isToplevel = !state.parentNode;
-	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `render_if_block` ) );
+	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `create_if_block` ) );
 
 	const anchor = `${name}_anchor`;
 	fragment.createAnchor( anchor, state.parentNode );