Merge pull request #226 from sveltejs/gh-221

SSR – handle component directives at positions other than end

src/generators/server-side-rendering/visitors/Component.js

@@ -8,29 +8,32 @@ export default {
 			}
 		}
 
-		const props = node.attributes.map( attribute => {
+		const props = node.attributes
-			if ( attribute.type !== 'Attribute' ) return;
+			.map( attribute => {
-
+				if ( attribute.type !== 'Attribute' ) return;
-			let value;
+
-
+				let value;
-			if ( attribute.value === true ) {
+
-				value = `true`;
+				if ( attribute.value === true ) {
-			} else if ( attribute.value.length === 0 ) {
+					value = `true`;
-				value = `''`;
+				} else if ( attribute.value.length === 0 ) {
-			} else if ( attribute.value.length === 1 ) {
+					value = `''`;
-				const chunk = attribute.value[0];
+				} else if ( attribute.value.length === 1 ) {
-				if ( chunk.type === 'Text' ) {
+					const chunk = attribute.value[0];
-					value = isNaN( parseFloat( chunk.data ) ) ? JSON.stringify( chunk.data ) : chunk.data;
+					if ( chunk.type === 'Text' ) {
+						value = isNaN( parseFloat( chunk.data ) ) ? JSON.stringify( chunk.data ) : chunk.data;
+					} else {
+						const { snippet } = generator.contextualise( chunk.expression );
+						value = snippet;
+					}
 				} else {
-					const { snippet } = generator.contextualise( chunk.expression );
+					value = '`' + attribute.value.map( stringify ).join( '' ) + '`';
-					value = snippet;
 				}
-			} else {
-				value = '`' + attribute.value.map( stringify ).join( '' ) + '`';
-			}
 
-			return `${attribute.name}: ${value}`;
+				return `${attribute.name}: ${value}`;
-		}).join( ', ' );
+			})
+			.filter( Boolean )
+			.join( ', ' );
 
 		let open = `\${template.components.${node.name}.render({${props}}`;
 

test/server-side-rendering/component-refs-and-attributes/Widget.html

@@ -0,0 +1 @@
+<p>{{foo}}</p>

test/server-side-rendering/component-refs-and-attributes/_actual.html

@@ -0,0 +1 @@
+<div><p>42</p></div>

test/server-side-rendering/component-refs-and-attributes/_expected.html

@@ -0,0 +1 @@
+<div><p>42</p></div>

test/server-side-rendering/component-refs-and-attributes/main.html

@@ -0,0 +1,13 @@
+<div><Widget ref:widget foo='{{foo}}'/></div>
+
+<script>
+	import Widget from './Widget.html';
+
+	export default {
+		components: { Widget },
+
+		data () {
+			return { foo: 42 }
+		}
+	};
+</script>