Merge branch 'master' into svg-set-xmlns

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Svelte changelog
 
+## 1.6.6
+
+* Omit text from comment anchors ([#247](https://github.com/sveltejs/svelte/issues/247))
+* Handle `xlink` attributes ([#264](https://github.com/sveltejs/svelte/issues/264))
+
 ## 1.6.5
 
 * Handle `<!doctype>` declarations ([#255](https://github.com/sveltejs/svelte/pull/255))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [

src/generators/dom/index.js

@@ -98,9 +98,9 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	createAnchor ( name, description = '' ) {
+	createAnchor ( name ) {
 		this.uses.createComment = true;
-		const renderStatement = `createComment( ${JSON.stringify( description )} )`;
+		const renderStatement = `createComment()`;
 		this.addElement( name, renderStatement, true );
 	}
 

src/generators/dom/visitors/EachBlock.js

@@ -21,7 +21,7 @@ export default {
 		const { dependencies, snippet } = generator.contextualise( node.expression );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#each ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addLine( `var ${name}_value = ${snippet};` );
 		generator.current.builders.init.addLine( `var ${iterations} = [];` );

src/generators/dom/visitors/IfBlock.js

@@ -41,7 +41,7 @@ export default {
 		const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `renderIfBlock` ) );
 
 		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor, `#if ${generator.source.slice( node.expression.start, node.expression.end )}` );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.init.addBlock( deindent`
 			function ${getBlock} ( ${params} ) {

src/generators/dom/visitors/YieldTag.js

@@ -1,7 +1,7 @@
 export default {
 	enter ( generator ) {
 		const anchor = `yield_anchor`;
-		generator.createAnchor( anchor, 'yield' );
+		generator.createAnchor( anchor );
 
 		generator.current.builders.mount.addLine(
 			`component._yield && component._yield.mount( ${generator.current.target}, ${anchor} );`

src/generators/dom/visitors/attributes/addElementAttributes.js

@@ -5,15 +5,24 @@ import flattenReference from '../../../../utils/flattenReference.js';
 
 export default function addElementAttributes ( generator, node, local ) {
 	node.attributes.forEach( attribute => {
+		const name = attribute.name;
+
 		if ( attribute.type === 'Attribute' ) {
-			let metadata = local.namespace ? null : attributeLookup[ attribute.name ];
+			let metadata = local.namespace ? null : attributeLookup[ name ];
 			if ( metadata && metadata.appliesTo && !~metadata.appliesTo.indexOf( node.name ) ) metadata = null;
 
 			let dynamic = false;
 
-			const isBoundOptionValue = node.name === 'option' && attribute.name === 'value'; // TODO check it's actually bound
+			const isBoundOptionValue = node.name === 'option' && name === 'value'; // TODO check it's actually bound
 			const propertyName = isBoundOptionValue ? '__value' : metadata && metadata.propertyName;
 
+			const isXlink = name.slice( 0, 6 ) === 'xlink:';
+
+			// xlink is a special case... we could maybe extend this to generic
+			// namespaced attributes but I'm not sure that's applicable in
+			// HTML5?
+			const helper = isXlink ? 'setXlinkAttribute' : 'setAttribute';
+
 			if ( attribute.value === true ) {
 				// attributes without values, e.g. <textarea readonly>
 				if ( propertyName ) {
@@ -21,14 +30,14 @@ export default function addElementAttributes ( generator, node, local ) {
 						`${local.name}.${propertyName} = true;`
 					);
 				} else {
-					generator.uses.setAttribute = true;
+					generator.uses[ helper ] = true;
 					local.init.addLine(
-						`setAttribute( ${local.name}, '${attribute.name}', true );`
+						`${helper}( ${local.name}, '${name}', true );`
 					);
 				}
 
 				// special case – autofocus. has to be handled in a bit of a weird way
-				if ( attribute.name === 'autofocus' ) {
+				if ( name === 'autofocus' ) {
 					generator.current.autofocus = local.name;
 				}
 			}
@@ -39,9 +48,9 @@ export default function addElementAttributes ( generator, node, local ) {
 						`${local.name}.${propertyName} = '';`
 					);
 				} else {
-					generator.uses.setAttribute = true;
+					generator.uses[ helper ] = true;
 					local.init.addLine(
-						`setAttribute( ${local.name}, '${attribute.name}', '' );`
+						`${helper}( ${local.name}, '${name}', '' );`
 					);
 				}
 			}
@@ -56,7 +65,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					result = JSON.stringify( value.data );
 
 					let addAttribute = false;
-					if ( attribute.name === 'xmlns' ) {
+					if ( name === 'xmlns' ) {
 						// special case
 						// TODO this attribute must be static – enforce at compile time
 						local.namespace = value.data;
@@ -70,9 +79,9 @@ export default function addElementAttributes ( generator, node, local ) {
 					}
 
 					if (addAttribute) {
-						generator.uses.setAttribute = true;
+						generator.uses[ helper ] = true;
 						local.init.addLine(
-							`setAttribute( ${local.name}, '${attribute.name}', ${result} );`
+							`${helper}( ${local.name}, '${name}', ${result} );`
 						);
 					}
 				}
@@ -87,8 +96,8 @@ export default function addElementAttributes ( generator, node, local ) {
 					if (propertyName) {
 						updater = `${local.name}.${propertyName} = ${snippet};`;
 					} else {
-						generator.uses.setAttribute = true;
-						updater = `setAttribute( ${local.name}, '${attribute.name}', ${snippet} );`; // TODO use snippet both times – see note below
+						generator.uses[ helper ] = true;
+						updater = `${helper}( ${local.name}, '${name}', ${snippet} );`; // TODO use snippet both times – see note below
 					}
 
 					local.init.addLine( updater );
@@ -116,8 +125,8 @@ export default function addElementAttributes ( generator, node, local ) {
 				if (propertyName) {
 					updater = `${local.name}.${propertyName} = ${value};`;
 				} else {
-					generator.uses.setAttribute = true;
-					updater = `setAttribute( ${local.name}, '${attribute.name}', ${value} );`;
+					generator.uses[ helper ] = true;
+					updater = `${helper}( ${local.name}, '${name}', ${value} );`;
 				}
 
 				local.init.addLine( updater );
@@ -159,12 +168,12 @@ export default function addElementAttributes ( generator, node, local ) {
 				return `var ${listName} = this.__svelte.${listName}, ${indexName} = this.__svelte.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
 
-			const handlerName = generator.current.getUniqueName( `${attribute.name}Handler` );
+			const handlerName = generator.current.getUniqueName( `${name}Handler` );
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
-			if ( attribute.name in generator.events ) {
+			if ( name in generator.events ) {
 				local.init.addBlock( deindent`
-					var ${handlerName} = template.events.${attribute.name}.call( component, ${local.name}, function ( event ) {
+					var ${handlerName} = template.events.${name}.call( component, ${local.name}, function ( event ) {
 						${handlerBody}
 					});
 				` );
@@ -180,11 +189,11 @@ export default function addElementAttributes ( generator, node, local ) {
 						${handlerBody}
 					}
 
-					addEventListener( ${local.name}, '${attribute.name}', ${handlerName} );
+					addEventListener( ${local.name}, '${name}', ${handlerName} );
 				` );
 
 				generator.current.builders.teardown.addLine( deindent`
-					removeEventListener( ${local.name}, '${attribute.name}', ${handlerName} );
+					removeEventListener( ${local.name}, '${name}', ${handlerName} );
 				` );
 			}
 		}
@@ -197,11 +206,11 @@ export default function addElementAttributes ( generator, node, local ) {
 			generator.usesRefs = true;
 
 			local.init.addLine(
-				`component.refs.${attribute.name} = ${local.name};`
+				`component.refs.${name} = ${local.name};`
 			);
 
 			generator.current.builders.teardown.addLine( deindent`
-				if ( component.refs.${attribute.name} === ${local.name} ) component.refs.${attribute.name} = null;
+				if ( component.refs.${name} === ${local.name} ) component.refs.${name} = null;
 			` );
 		}
 

src/shared/dom.js

@@ -34,8 +34,8 @@ export function createText ( data ) {
 	return document.createTextNode( data );
 }
 
-export function createComment ( data ) {
-	return document.createComment( data );
+export function createComment () {
+	return document.createComment( '' );
 }
 
 export function addEventListener ( node, event, handler ) {
@@ -49,3 +49,7 @@ export function removeEventListener ( node, event, handler ) {
 export function setAttribute ( node, attribute, value ) {
 	node.setAttribute ( attribute, value );
 }
+
+export function setXlinkAttribute ( node, attribute, value ) {
+	node.setAttributeNS( 'http://www.w3.org/1999/xlink', attribute, value );
+}

test/generator/attribute-dynamic-multiple/_config.js

@@ -7,5 +7,5 @@ export default {
 		]
 	},
 
-	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!--#each items-->`
+	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!---->`
 };

test/generator/binding-input-text-contextual/_config.js

@@ -6,7 +6,7 @@ export default {
 			'three'
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 		const items = component.get( 'items' );
@@ -18,12 +18,12 @@ export default {
 		inputs[1].dispatchEvent( event );
 
 		assert.equal( items[1], 'four' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		items[2] = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };

test/generator/binding-input-text-deep-contextual/_config.js

@@ -6,7 +6,7 @@ export default {
 			{ description: 'three' }
 		]
 	},
-	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!--#each items-->`,
+	html: `<div><input><p>one</p></div><div><input><p>two</p></div><div><input><p>three</p></div><!---->`,
 	test ( assert, component, target, window ) {
 		const inputs = [ ...target.querySelectorAll( 'input' ) ];
 
@@ -17,13 +17,13 @@ export default {
 		inputs[1].value = 'four';
 		inputs[1].dispatchEvent( event );
 
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>three</p></div><!---->` );
 
 		const items = component.get( 'items' );
 		items[2].description = 'five';
 
 		component.set({ items });
 		assert.equal( inputs[2].value, 'five' );
-		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!--#each items-->` );
+		assert.equal( target.innerHTML, `<div><input><p>one</p></div><div><input><p>four</p></div><div><input><p>five</p></div><!---->` );
 	}
 };

test/generator/component-yield-parent/_config.js

@@ -2,8 +2,8 @@ export default {
 	html: '<div><p>Hello</p></div>',
 	test ( assert, component, target ) {
 		assert.equal( component.get( 'data' ), 'Hello' );
-		component.set({data: 'World'})
+		component.set({data: 'World'});
 		assert.equal( component.get( 'data' ), 'World' );
-		assert.equal( target.innerHTML, '<div><p>World<!--yield--></p></div>' );
+		assert.equal( target.innerHTML, '<div><p>World<!----></p></div>' );
 	}
-}
+};

test/generator/each-block-indexed/_config.js

@@ -2,5 +2,5 @@ export default {
 	data: {
 		animals: [ 'adder', 'blue whale', 'chameleon' ]
 	},
-	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!--#each animals-->`
+	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!---->`
 };

test/generator/each-block/_config.js

@@ -2,11 +2,11 @@ export default {
 	data: {
 		animals: [ 'alpaca', 'baboon', 'capybara' ]
 	},
-	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!--#each animals-->',
+	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ animals: [ 'alpaca', 'baboon', 'caribou', 'dogfish' ] });
-		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!--#each animals-->' );
+		assert.equal( target.innerHTML, '<p>alpaca</p><p>baboon</p><p>caribou</p><p>dogfish</p><!---->' );
 		component.set({ animals: [] });
-		assert.equal( target.innerHTML, '<!--#each animals-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 	}
 };

test/generator/each-blocks-expression/_config.js

@@ -1,3 +1,3 @@
 export default {
-	html: `<p>a</p><p>b</p><p>c</p><!--#each [ 'a', 'b', 'c' ]-->`
+	html: `<p>a</p><p>b</p><p>c</p><!---->`
 };

test/generator/each-blocks-nested-b/_config.js

@@ -28,7 +28,7 @@ export default {
 			}
 		]
 	},
-	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!--#each category.things--><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!--#each category.things--><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!--#each category.things--><!--#each categories-->`,
+	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->`,
 	test ( assert, component, target ) {
 		// TODO
 	}

test/generator/each-blocks-nested/_config.js

@@ -4,7 +4,7 @@ export default {
 		rows: [ 1, 2, 3 ]
 	},
 
-	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!--#each rows--><div>b, 1</div><div>b, 2</div><div>b, 3</div><!--#each rows--><div>c, 1</div><div>c, 2</div><div>c, 3</div><!--#each rows--><!--#each columns-->`,
+	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->`,
 
 	test ( assert, component, target ) {
 		// TODO

test/generator/event-handler-removal/_config.js

@@ -1,7 +1,7 @@
 // TODO gah, JSDOM appears to behave differently to real browsers here... probably need to raise an issue
 
 export default {
-	html: '<input><!--#if visible-->',
+	html: '<input><!---->',
 	test ( assert, component ) {
 		component.refs.input.focus();
 

test/generator/event-handler/_config.js

@@ -1,13 +1,13 @@
 export default {
-	html: '<button>toggle</button>\n\n<!--#if visible-->',
+	html: '<button>toggle</button>\n\n<!---->',
 	test ( assert, component, target, window ) {
 		const button = target.querySelector( 'button' );
 		const event = new window.MouseEvent( 'click' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<p>hello!</p><!---->' );
 
 		button.dispatchEvent( event );
-		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<button>toggle</button>\n\n<!---->' );
 	}
 };

test/generator/if-block-widget/_config.js

@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: 'before\n<p>Widget</p><!--#if visible-->\nafter',
+	html: 'before\n<p>Widget</p><!---->\nafter',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, 'before\n<!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<!---->\nafter' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!--#if visible-->\nafter' );
+		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!---->\nafter' );
 	}
 };

test/generator/if-block/_config.js

@@ -2,11 +2,11 @@ export default {
 	data: {
 		visible: true
 	},
-	html: '<p>i am visible</p><!--#if visible-->',
+	html: '<p>i am visible</p><!---->',
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, '<!--#if visible-->' );
+		assert.equal( target.innerHTML, '<!---->' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, '<p>i am visible</p><!--#if visible-->' );
+		assert.equal( target.innerHTML, '<p>i am visible</p><!---->' );
 	}
 };

test/generator/svg-xlink/_config.js

@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<svg>
+			<defs>
+				<circle id='stamp' r='10' fill='blue'/>
+			</defs>
+
+			<use xlink:href='#stamp' x='20' y='20'/>
+		</svg>
+	`,
+	test ( assert, component, target ) {
+		const use = target.querySelector( 'use' );
+		const href = use.attributes[ 'xlink:href' ];
+
+		assert.equal( href.namespaceURI, 'http://www.w3.org/1999/xlink' );
+
+		component.teardown();
+	}
+};

test/generator/svg-xlink/main.html

@@ -0,0 +1,7 @@
+<svg>
+	<defs>
+		<circle id='stamp' r='10' fill='blue'/>
+	</defs>
+
+	<use xlink:href='#stamp' x='20' y='20'/>
+</svg>

test/helpers.js

@@ -65,6 +65,10 @@ function cleanChildren ( node ) {
 		}
 
 		if ( child.nodeType === 3 ) {
+			if ( node.namespaceURI === 'http://www.w3.org/2000/svg' && node.tagName !== 'text' && node.tagName !== 'tspan' ) {
+				node.removeChild( child );
+			}
+
 			child.data = child.data.replace( /\s{2,}/, '\n' );
 
 			// text