From b843e829907b3e975532c5cbc52d25cde0df09f1 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 23 Apr 2018 21:24:48 -0400
Subject: [PATCH] component spread

---
 src/generators/nodes/Component.ts | 35 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts
index 4fe64b5393..04c3879ac4 100644
--- a/src/generators/nodes/Component.ts
+++ b/src/generators/nodes/Component.ts
@@ -44,7 +44,7 @@ export default class Component extends Node {
 		info.attributes.forEach(node => {
 			switch (node.type) {
 				case 'Attribute':
-					// TODO spread
+				case 'Spread':
 					this.attributes.push(new Attribute(compiler, this, scope, node));
 					break;
 
@@ -150,7 +150,7 @@ export default class Component extends Node {
 
 		const updates: string[] = [];
 
-		const usesSpread = !!this.attributes.find(a => a.spread);
+		const usesSpread = !!this.attributes.find(a => a.isSpread);
 
 		const attributeObject = usesSpread
 			? '{}'
@@ -174,26 +174,25 @@ export default class Component extends Node {
 				const initialProps = [];
 				const changes = [];
 
-				this.attributes
-					.forEach(attr => {
-						const { spread, name, dependencies } = attr;
-						const value = attr.getValue();
+				this.attributes.forEach(attr => {
+					const { name, dependencies } = attr;
 
-						const condition = dependencies.size > 0
-							? [...dependencies].map(d => `changed.${d}`).join(' || ')
-							: null;
+					const condition = dependencies.size > 0
+						? [...dependencies].map(d => `changed.${d}`).join(' || ')
+						: null;
 
-						if (spread) {
-							initialProps.push(value);
+					if (attr.isSpread) {
+						const value = attr.expression.snippet;
+						initialProps.push(value);
 
-							changes.push(condition ? `${condition} && ${value}` : value);
-						} else {
-							const obj = `{ ${quoteIfNecessary(name)}: ${value} }`;
-							initialProps.push(obj);
+						changes.push(condition ? `${condition} && ${value}` : value);
+					} else {
+						const obj = `{ ${quoteIfNecessary(name)}: ${attr.getValue()} }`;
+						initialProps.push(obj);
 
-							changes.push(condition ? `${condition} && ${obj}` : obj);
-						}
-					});
+						changes.push(condition ? `${condition} && ${obj}` : obj);
+					}
+				});
 
 				block.addVariable(levels);