From 135f6263956c794704c358ce3c0a484482b35821 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 12 Jun 2017 21:49:38 -0400
Subject: [PATCH 01/12] include ast in svelte.compile return value (#632)

---
 src/generators/Generator.ts |  4 ++++
 src/utils/clone.ts          | 18 ++++++++++++++++++
 test/parser/index.js        | 35 ++++++++++++++++++++++-------------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 src/utils/clone.ts

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 084f1e7d90..4dd423be09 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -10,6 +10,7 @@ import getIntro from './shared/utils/getIntro';
 import getOutro from './shared/utils/getOutro';
 import processCss from './shared/processCss';
 import annotateWithScopes from '../utils/annotateWithScopes';
+import clone from '../utils/clone';
 import DomBlock from './dom/Block';
 import SsrBlock from './server-side-rendering/Block';
 import { Node, Parsed, CompileOptions } from '../interfaces';
@@ -48,6 +49,8 @@ export default class Generator {
 		name: string,
 		options: CompileOptions
 	) {
+		this.ast = clone(parsed);
+
 		this.parsed = parsed;
 		this.source = source;
 		this.name = name;
@@ -330,6 +333,7 @@ export default class Generator {
 		addString('\n\n' + getOutro(format, name, options, this.imports));
 
 		return {
+			ast: this.ast,
 			code: compiled.toString(),
 			map: compiled.generateMap({
 				includeContent: true,
diff --git a/src/utils/clone.ts b/src/utils/clone.ts
new file mode 100644
index 0000000000..523568e434
--- /dev/null
+++ b/src/utils/clone.ts
@@ -0,0 +1,18 @@
+import { Node } from '../interfaces';
+
+export default function clone(node: Node) {
+	const cloned = {};
+
+	for (const key in node) {
+		const value = node[key];
+		if (Array.isArray(value)) {
+			cloned[key] = value.map(clone);
+		} else if (value && typeof value === 'object') {
+			cloned[key] = clone(value);
+		} else {
+			cloned[key] = value;
+		}
+	}
+
+	return cloned;
+}
\ No newline at end of file
diff --git a/test/parser/index.js b/test/parser/index.js
index 35f687376a..6bdd1b6376 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -1,10 +1,10 @@
-import assert from "assert";
-import * as fs from "fs";
-import { svelte } from "../helpers.js";
+import assert from 'assert';
+import fs from 'fs';
+import { svelte } from '../helpers.js';
 
-describe("parse", () => {
-	fs.readdirSync("test/parser/samples").forEach(dir => {
-		if (dir[0] === ".") return;
+describe('parse', () => {
+	fs.readdirSync('test/parser/samples').forEach(dir => {
+		if (dir[0] === '.') return;
 
 		// add .solo to a sample directory name to only run that test
 		const solo = /\.solo$/.test(dir);
@@ -17,14 +17,14 @@ describe("parse", () => {
 
 		(solo ? it.only : it)(dir, () => {
 			const input = fs
-				.readFileSync(`test/parser/samples/${dir}/input.html`, "utf-8")
-				.replace(/\s+$/, "");
+				.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8')
+				.replace(/\s+$/, '');
 
 			try {
 				const actual = svelte.parse(input);
 				fs.writeFileSync(
 					`test/parser/samples/${dir}/_actual.json`,
-					JSON.stringify(actual, null, "\t")
+					JSON.stringify(actual, null, '\t')
 				);
 				const expected = require(`./samples/${dir}/output.json`);
 
@@ -32,7 +32,7 @@ describe("parse", () => {
 				assert.deepEqual(actual.css, expected.css);
 				assert.deepEqual(actual.js, expected.js);
 			} catch (err) {
-				if (err.name !== "ParseError") throw err;
+				if (err.name !== 'ParseError') throw err;
 
 				try {
 					const expected = require(`./samples/${dir}/error.json`);
@@ -41,13 +41,13 @@ describe("parse", () => {
 					assert.deepEqual(err.loc, expected.loc);
 					assert.equal(err.pos, expected.pos);
 				} catch (err2) {
-					throw err2.code === "MODULE_NOT_FOUND" ? err : err2;
+					throw err2.code === 'MODULE_NOT_FOUND' ? err : err2;
 				}
 			}
 		});
 	});
 
-	it("handles errors with options.onerror", () => {
+	it('handles errors with options.onerror', () => {
 		let errored = false;
 
 		svelte.compile(`<h1>unclosed`, {
@@ -60,9 +60,18 @@ describe("parse", () => {
 		assert.ok(errored);
 	});
 
-	it("throws without options.onerror", () => {
+	it('throws without options.onerror', () => {
 		assert.throws(() => {
 			svelte.compile(`<h1>unclosed`);
 		}, /<h1> was left open/);
 	});
+
+	it('includes AST in svelte.compile output', () => {
+		const dir = fs.readdirSync('test/parser/samples')[0];
+		const source = fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8');
+
+		const { ast } = svelte.compile(source);
+		const parsed = svelte.parse(source);
+		assert.deepEqual(ast, parsed);
+	});
 });

From d3d026a510a3b702d6113e04ce540b3beaf8ac00 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 14 Jun 2017 17:44:13 -0400
Subject: [PATCH 02/12] sync state with view, if <select> binding does not have
 initial value (#639)

---
 .../dom/visitors/Element/Binding.ts           |  5 ++++
 .../_config.js                                | 26 +++++++++++++++++++
 .../main.html                                 |  9 +++++++
 3 files changed, 40 insertions(+)
 create mode 100644 test/runtime/samples/binding-select-initial-value-undefined/_config.js
 create mode 100644 test/runtime/samples/binding-select-initial-value-undefined/main.html

diff --git a/src/generators/dom/visitors/Element/Binding.ts b/src/generators/dom/visitors/Element/Binding.ts
index 9ea9dcb541..b190230527 100644
--- a/src/generators/dom/visitors/Element/Binding.ts
+++ b/src/generators/dom/visitors/Element/Binding.ts
@@ -89,6 +89,11 @@ export default function visitBinding(
 				${ifStatement}
 			}
 		`;
+
+		generator.hasComplexBindings = true;
+		block.builders.create.addBlock(
+			`if ( !('${name}' in state) ) ${block.component}._bindings.push( ${handler} );`
+		);
 	} else if (attribute.name === 'group') {
 		// <input type='checkbox|radio' bind:group='selected'> special case
 		if (type === 'radio') {
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/_config.js b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
new file mode 100644
index 0000000000..5328bf4727
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
@@ -0,0 +1,26 @@
+export default {
+	solo: true,
+	show: true,
+
+	html: `
+		<p>selected: a</p>
+
+		<select>
+			<option>a</option>
+			<option>b</option>
+			<option>c</option>
+		</select>
+
+		<p>selected: a</p>
+	`,
+
+	test ( assert, component, target ) {
+		const select = target.querySelector( 'select' );
+		const options = [ ...target.querySelectorAll( 'option' ) ];
+
+		assert.equal( select.value, 'a' );
+		assert.ok( options[0].selected );
+
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/main.html b/test/runtime/samples/binding-select-initial-value-undefined/main.html
new file mode 100644
index 0000000000..ea15402240
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined/main.html
@@ -0,0 +1,9 @@
+<p>selected: {{selected}}</p>
+
+<select bind:value='selected'>
+	<option>a</option>
+	<option>b</option>
+	<option>c</option>
+</select>
+
+<p>selected: {{selected}}</p>
\ No newline at end of file

From 4b7b0503af1482af5234e1d3080350fac34d02b9 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 14 Jun 2017 17:45:25 -0400
Subject: [PATCH 03/12] skip failing SSR test for now

---
 .../samples/binding-select-initial-value-undefined/_config.js  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/runtime/samples/binding-select-initial-value-undefined/_config.js b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
index 5328bf4727..d5944ae815 100644
--- a/test/runtime/samples/binding-select-initial-value-undefined/_config.js
+++ b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
@@ -1,6 +1,5 @@
 export default {
-	solo: true,
-	show: true,
+	'skip-ssr': true, // TODO would be nice to fix this in SSR as well
 
 	html: `
 		<p>selected: a</p>

From 9a70ca78745588e385d18b907a270479c20ce605 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 15 Jun 2017 13:44:29 -0400
Subject: [PATCH 04/12] mark indirect dependencies of <select> bindings - #639

---
 src/generators/Generator.ts                   | 16 +++-
 src/generators/dom/Block.ts                   |  2 +-
 src/generators/dom/interfaces.ts              |  1 +
 src/generators/dom/preprocess.ts              | 75 ++++++++++-----
 .../dom/visitors/shared/binding/getSetter.ts  |  7 +-
 .../samples/binding-indirect/_config.js       | 91 +++++++++++++++++++
 .../samples/binding-indirect/main.html        | 14 +++
 7 files changed, 181 insertions(+), 25 deletions(-)
 create mode 100644 test/runtime/samples/binding-indirect/_config.js
 create mode 100644 test/runtime/samples/binding-indirect/main.html

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 084f1e7d90..5ead00769d 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -32,6 +32,7 @@ export default class Generator {
 	code: MagicString;
 
 	bindingGroups: string[];
+	indirectDependencies: Map<string, Set<string>>;
 	expectedProperties: Set<string>;
 	cascade: boolean;
 	css: string;
@@ -61,6 +62,7 @@ export default class Generator {
 		this.importedComponents = new Map();
 
 		this.bindingGroups = [];
+		this.indirectDependencies = new Map();
 
 		// track which properties are needed, so we can provide useful info
 		// in dev mode
@@ -185,8 +187,20 @@ export default class Generator {
 			},
 		});
 
+		const dependencies = new Set(expression._dependencies || []);
+
+		if (expression._dependencies) {
+			expression._dependencies.forEach((prop: string) => {
+				if (this.indirectDependencies.has(prop)) {
+					this.indirectDependencies.get(prop).forEach(dependency => {
+						dependencies.add(dependency);
+					});
+				}
+			});
+		}
+
 		return {
-			dependencies: expression._dependencies, // TODO probably a better way to do this
+			dependencies: Array.from(dependencies),
 			contexts: usedContexts,
 			snippet: `[✂${expression.start}-${expression.end}✂]`,
 		};
diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts
index c23a80977c..7b7a19eb10 100644
--- a/src/generators/dom/Block.ts
+++ b/src/generators/dom/Block.ts
@@ -174,7 +174,7 @@ export default class Block {
 		);
 	}
 
-	findDependencies(expression) {
+	findDependencies(expression: Node) {
 		return this.generator.findDependencies(
 			this.contextDependencies,
 			this.indexes,
diff --git a/src/generators/dom/interfaces.ts b/src/generators/dom/interfaces.ts
index 8c460a4733..625f919c28 100644
--- a/src/generators/dom/interfaces.ts
+++ b/src/generators/dom/interfaces.ts
@@ -8,4 +8,5 @@ export interface State {
 	inEachBlock?: boolean;
 	allUsedContexts?: string[];
 	usesComponent?: boolean;
+	selectBindingDependencies?: string[];
 }
diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts
index 93cbbf7e4b..6d68c5c371 100644
--- a/src/generators/dom/preprocess.ts
+++ b/src/generators/dom/preprocess.ts
@@ -217,6 +217,60 @@ const preprocessors = {
 		state: State,
 		node: Node
 	) => {
+		node.attributes.forEach((attribute: Node) => {
+			if (attribute.type === 'Attribute' && attribute.value !== true) {
+				attribute.value.forEach((chunk: Node) => {
+					if (chunk.type !== 'Text') {
+						const dependencies = block.findDependencies(chunk.expression);
+						block.addDependencies(dependencies);
+
+						// special case — <option value='{{foo}}'> — see below
+						if (node.name === 'option' && attribute.name === 'value' && state.selectBindingDependencies) {
+							state.selectBindingDependencies.forEach(prop => {
+								dependencies.forEach((dependency: string) => {
+									generator.indirectDependencies.get(prop).add(dependency);
+								});
+							});
+						}
+					}
+				});
+			} else if (attribute.type === 'Binding') {
+				const dependencies = block.findDependencies(attribute.value);
+				block.addDependencies(dependencies);
+			} else if (attribute.type === 'Transition') {
+				if (attribute.intro)
+					generator.hasIntroTransitions = block.hasIntroMethod = true;
+				if (attribute.outro) {
+					generator.hasOutroTransitions = block.hasOutroMethod = true;
+					block.outros += 1;
+				}
+			}
+		});
+
+		// special case — in a case like this...
+		//
+		//   <select bind:value='foo'>
+		//     <option value='{{bar}}'>bar</option>
+		//     <option value='{{baz}}'>baz</option>
+		//   </option>
+		//
+		// ...we need to know that `foo` depends on `bar` and `baz`,
+		// so that if `foo.qux` changes, we know that we need to
+		// mark `bar` and `baz` as dirty too
+		if (node.name === 'select') {
+			const value = node.attributes.find((attribute: Node) => attribute.name === 'value');
+			if (value) {
+				// TODO does this also apply to e.g. `<input type='checkbox' bind:group='foo'>`?
+				const dependencies = block.findDependencies(value.value);
+				state.selectBindingDependencies = dependencies;
+				dependencies.forEach((prop: string) => {
+					generator.indirectDependencies.set(prop, new Set());
+				});
+			} else {
+				state.selectBindingDependencies = null;
+			}
+		}
+
 		const isComponent =
 			generator.components.has(node.name) || node.name === ':Self';
 
@@ -239,27 +293,6 @@ const preprocessors = {
 			});
 		}
 
-		node.attributes.forEach((attribute: Node) => {
-			if (attribute.type === 'Attribute' && attribute.value !== true) {
-				attribute.value.forEach((chunk: Node) => {
-					if (chunk.type !== 'Text') {
-						const dependencies = block.findDependencies(chunk.expression);
-						block.addDependencies(dependencies);
-					}
-				});
-			} else if (attribute.type === 'Binding') {
-				const dependencies = block.findDependencies(attribute.value);
-				block.addDependencies(dependencies);
-			} else if (attribute.type === 'Transition') {
-				if (attribute.intro)
-					generator.hasIntroTransitions = block.hasIntroMethod = true;
-				if (attribute.outro) {
-					generator.hasOutroTransitions = block.hasOutroMethod = true;
-					block.outros += 1;
-				}
-			}
-		});
-
 		if (node.children.length) {
 			if (isComponent) {
 				const name = block.getUniqueName(
diff --git a/src/generators/dom/visitors/shared/binding/getSetter.ts b/src/generators/dom/visitors/shared/binding/getSetter.ts
index 7ce77b4489..679d9005f6 100644
--- a/src/generators/dom/visitors/shared/binding/getSetter.ts
+++ b/src/generators/dom/visitors/shared/binding/getSetter.ts
@@ -25,7 +25,10 @@ export default function getSetter({
 			${computed && `var state = ${block.component}.get();`}
 			list[index]${tail} = ${value};
 
-			${block.component}._set({ ${prop}: ${block.component}.get( '${prop}' ) });
+			${computed ?
+				`${block.component}._set({ ${dependencies.map((prop: string) => `${prop}: state.${prop}`).join(', ')} });` :
+				`${block.component}._set({ ${dependencies.map((prop: string) => `${prop}: ${block.component}.get( '${prop}' )`).join(', ')} });`
+			}
 		`;
 	}
 
@@ -35,7 +38,7 @@ export default function getSetter({
 		return deindent`
 			var state = ${block.component}.get();
 			${snippet} = ${value};
-			${block.component}._set({ ${name}: state.${name} });
+			${block.component}._set({ ${dependencies.map((prop: string) => `${prop}: state.${prop}`).join(', ')} });
 		`;
 	}
 
diff --git a/test/runtime/samples/binding-indirect/_config.js b/test/runtime/samples/binding-indirect/_config.js
new file mode 100644
index 0000000000..9fdfa23a25
--- /dev/null
+++ b/test/runtime/samples/binding-indirect/_config.js
@@ -0,0 +1,91 @@
+const tasks = [
+	{ description: 'put your left leg in', done: false },
+	{ description: 'your left leg out', done: false },
+	{ description: 'in, out, in, out', done: false },
+	{ description: 'shake it all about', done: false }
+];
+
+export default {
+	'skip-ssr': true,
+	allowES2015: true,
+
+	data: {
+		tasks,
+		selected: tasks[0]
+	},
+
+	html: `
+		<select>
+			<option value='[object Object]'>put your left leg in</option>
+			<option value='[object Object]'>your left leg out</option>
+			<option value='[object Object]'>in, out, in, out</option>
+			<option value='[object Object]'>shake it all about</option>
+		</select>
+
+		<label>
+			<input type='checkbox'> put your left leg in
+		</label>
+
+		<h2>Pending tasks</h2>
+		<p>put your left leg in</p>
+		<p>your left leg out</p>
+		<p>in, out, in, out</p>
+		<p>shake it all about</p>
+	`,
+
+	test(assert, component, target, window) {
+		const input = target.querySelector('input');
+		const select = target.querySelector('select');
+		const options = target.querySelectorAll('option');
+
+		const change = new window.Event('change');
+
+		input.checked = true;
+		input.dispatchEvent(change);
+
+		assert.ok(component.get('tasks')[0].done);
+		assert.htmlEqual(target.innerHTML, `
+			<select>
+				<option value='[object Object]'>put your left leg in</option>
+				<option value='[object Object]'>your left leg out</option>
+				<option value='[object Object]'>in, out, in, out</option>
+				<option value='[object Object]'>shake it all about</option>
+			</select>
+
+			<label>
+				<input type='checkbox'> put your left leg in
+			</label>
+
+			<h2>Pending tasks</h2>
+			<p>your left leg out</p>
+			<p>in, out, in, out</p>
+			<p>shake it all about</p>
+		`);
+
+		options[1].selected = true;
+		select.dispatchEvent(change);
+		assert.equal(component.get('selected'), tasks[1]);
+		assert.ok(!input.checked);
+
+		input.checked = true;
+		input.dispatchEvent(change);
+
+		assert.ok(component.get('tasks')[1].done);
+		assert.htmlEqual(target.innerHTML, `
+			<select>
+				<option value='[object Object]'>put your left leg in</option>
+				<option value='[object Object]'>your left leg out</option>
+				<option value='[object Object]'>in, out, in, out</option>
+				<option value='[object Object]'>shake it all about</option>
+			</select>
+
+			<label>
+				<input type='checkbox'> your left leg out
+			</label>
+
+			<h2>Pending tasks</h2>
+			<p>in, out, in, out</p>
+			<p>shake it all about</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect/main.html b/test/runtime/samples/binding-indirect/main.html
new file mode 100644
index 0000000000..e1ab12c82f
--- /dev/null
+++ b/test/runtime/samples/binding-indirect/main.html
@@ -0,0 +1,14 @@
+<select bind:value='selected'>
+	{{#each tasks as task}}
+		<option value='{{task}}'>{{task.description}}</option>
+	{{/each}}
+</select>
+
+<label>
+	<input type='checkbox' bind:checked='selected.done'> {{selected.description}}
+</label>
+
+<h2>Pending tasks</h2>
+{{#each tasks.filter(t => !t.done) as task}}
+	<p>{{task.description}}</p>
+{{/each}}
\ No newline at end of file

From cae565bece941aee415d8542207a5ca206421c60 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 15 Jun 2017 13:57:28 -0400
Subject: [PATCH 05/12] -> v1.22.4

---
 CHANGELOG.md | 6 ++++++
 README.md    | 2 +-
 package.json | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aef7d40aab..ed3818af12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Svelte changelog
 
+## 1.23.0
+
+* Include `ast` in `svelte.compile` return value ([#632](https://github.com/sveltejs/svelte/issues/632))
+* Set initial value of `<select>` binding, if unspecified ([#639](https://github.com/sveltejs/svelte/issues/639))
+* Mark indirect dependencies of `<select>` bindings (i.e. the dependencies of their `<option>` values) ([#639](https://github.com/sveltejs/svelte/issues/639))
+
 ## 1.22.3
 
 * Fix nested component unmounting bug ([#625](https://github.com/sveltejs/svelte/issues/625))
diff --git a/README.md b/README.md
index 526867a53d..c50a07810d 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ const { code, map } = svelte.compile( source, {
 
 The Svelte compiler exposes the following API:
 
-* `compile( source [, options ] ) => { code, map }` - Compile the component with the given options (see below). Returns an object containing the compiled JavaScript and a sourcemap.
+* `compile( source [, options ] ) => { code, map, ast, css }` - Compile the component with the given options (see below). Returns an object containing the compiled JavaScript, a sourcemap, an AST and transformed CSS.
 * `create( source [, options ] ) => function` - Compile the component and return the component itself.
 * `VERSION` - The version of this copy of the Svelte compiler as a string, `'x.x.x'`.
 
diff --git a/package.json b/package.json
index 48a5d1cb1c..5e7f38c6e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.22.3",
+  "version": "1.22.4",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [

From 30d855b089d592ff3bde034296fbdc213d875da7 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 15 Jun 2017 13:58:07 -0400
Subject: [PATCH 06/12] typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed3818af12..f5fbac4cc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Svelte changelog
 
-## 1.23.0
+## 1.22.4
 
 * Include `ast` in `svelte.compile` return value ([#632](https://github.com/sveltejs/svelte/issues/632))
 * Set initial value of `<select>` binding, if unspecified ([#639](https://github.com/sveltejs/svelte/issues/639))

From dc0dedf3fe7ce813990cc6ac086116a075791354 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@burngames.net>
Date: Thu, 15 Jun 2017 22:28:50 -0500
Subject: [PATCH 07/12] Fix #643

---
 src/generators/dom/visitors/IfBlock.ts                | 7 ++++++-
 test/js/samples/if-block-no-update/expected-bundle.js | 4 +++-
 test/js/samples/if-block-no-update/expected.js        | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/generators/dom/visitors/IfBlock.ts b/src/generators/dom/visitors/IfBlock.ts
index 7e294bc89f..16f0ce795b 100644
--- a/src/generators/dom/visitors/IfBlock.ts
+++ b/src/generators/dom/visitors/IfBlock.ts
@@ -271,9 +271,14 @@ function compound(
 		`);
 	}
 
-	block.builders.destroy.addLine(
+	block.builders.unmount.addLine(
 		`${if_name}{
 			${name}.unmount();
+		}`
+	);
+
+	block.builders.destroy.addLine(
+		`${if_name}{
 			${name}.destroy();
 		}`
 	);
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
index bf5690896d..b1c908a8da 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -164,12 +164,14 @@ function create_main_fragment ( state, component ) {
 		},
 
 		unmount: function () {
+			{
+						if_block.unmount();
+					}
 			detachNode( if_block_anchor );
 		},
 
 		destroy: function () {
 			{
-						if_block.unmount();
 						if_block.destroy();
 					}
 		}
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index a4a22ba105..63f272f1d1 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -29,12 +29,14 @@ function create_main_fragment ( state, component ) {
 		},
 
 		unmount: function () {
+			{
+						if_block.unmount();
+					}
 			detachNode( if_block_anchor );
 		},
 
 		destroy: function () {
 			{
-						if_block.unmount();
 						if_block.destroy();
 					}
 		}
@@ -116,4 +118,4 @@ SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = functio
 	this._torndown = true;
 };
 
-export default SvelteComponent;
\ No newline at end of file
+export default SvelteComponent;

From e9516abffd4d5526c314ea9881c047b4bd969342 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 16 Jun 2017 10:47:19 -0400
Subject: [PATCH 08/12] fix bad indentation in generated code

---
 src/generators/dom/visitors/IfBlock.ts                | 8 ++------
 test/js/samples/if-block-no-update/expected-bundle.js | 8 ++------
 test/js/samples/if-block-no-update/expected.js        | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/generators/dom/visitors/IfBlock.ts b/src/generators/dom/visitors/IfBlock.ts
index 16f0ce795b..e36c5d9984 100644
--- a/src/generators/dom/visitors/IfBlock.ts
+++ b/src/generators/dom/visitors/IfBlock.ts
@@ -272,15 +272,11 @@ function compound(
 	}
 
 	block.builders.unmount.addLine(
-		`${if_name}{
-			${name}.unmount();
-		}`
+		`${if_name}${name}.unmount();`
 	);
 
 	block.builders.destroy.addLine(
-		`${if_name}{
-			${name}.destroy();
-		}`
+		`${if_name}${name}.destroy();`
 	);
 }
 
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
index b1c908a8da..3177df9b02 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -164,16 +164,12 @@ function create_main_fragment ( state, component ) {
 		},
 
 		unmount: function () {
-			{
-						if_block.unmount();
-					}
+			if_block.unmount();
 			detachNode( if_block_anchor );
 		},
 
 		destroy: function () {
-			{
-						if_block.destroy();
-					}
+			if_block.destroy();
 		}
 	};
 }
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index 63f272f1d1..ac25a686c6 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -29,16 +29,12 @@ function create_main_fragment ( state, component ) {
 		},
 
 		unmount: function () {
-			{
-						if_block.unmount();
-					}
+			if_block.unmount();
 			detachNode( if_block_anchor );
 		},
 
 		destroy: function () {
-			{
-						if_block.destroy();
-					}
+			if_block.destroy();
 		}
 	};
 }

From 78b3a1b0791c801e8a1cb2bdb0e8fc9b5781d66a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 17 Jun 2017 11:22:49 -0400
Subject: [PATCH 09/12] add test for #643

---
 .../component-nested-deeper/Level1.html       | 22 +++++++++++++++++++
 .../component-nested-deeper/Level2.html       |  8 +++++++
 .../component-nested-deeper/Level3.html       |  4 ++++
 .../component-nested-deeper/_config.js        | 11 ++++++++++
 .../samples/component-nested-deeper/main.html | 11 ++++++++++
 5 files changed, 56 insertions(+)
 create mode 100644 test/runtime/samples/component-nested-deeper/Level1.html
 create mode 100644 test/runtime/samples/component-nested-deeper/Level2.html
 create mode 100644 test/runtime/samples/component-nested-deeper/Level3.html
 create mode 100644 test/runtime/samples/component-nested-deeper/_config.js
 create mode 100644 test/runtime/samples/component-nested-deeper/main.html

diff --git a/test/runtime/samples/component-nested-deeper/Level1.html b/test/runtime/samples/component-nested-deeper/Level1.html
new file mode 100644
index 0000000000..0789b14445
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level1.html
@@ -0,0 +1,22 @@
+<div class="level1">
+	{{#each values as value}}
+		<h4>level 1 #{{value}}</h4>
+		<Level2 condition="{{value % 2}}">
+			<Level3>
+				<span>And more stuff goes in here</span>
+			</Level3>
+		</Level2>
+	{{/each}}
+</div>
+
+<script>
+	import Level2 from './Level2.html';
+	import Level3 from './Level3.html';
+	
+	export default {
+		components: {
+			Level2,
+			Level3
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level2.html b/test/runtime/samples/component-nested-deeper/Level2.html
new file mode 100644
index 0000000000..6742c7d7f9
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level2.html
@@ -0,0 +1,8 @@
+<div class="level2" ref:wat>
+	<h4>level 2</h4>
+	{{#if condition}}
+		<span>TRUE! {{yield}}</span>
+	{{else}}
+		<span>FALSE! {{yield}}</span>
+	{{/if}}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level3.html b/test/runtime/samples/component-nested-deeper/Level3.html
new file mode 100644
index 0000000000..e09fc525a8
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level3.html
@@ -0,0 +1,4 @@
+<div class="level3" ref:thingy>
+	<h4>level 3</h4>
+	{{yield}}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/_config.js b/test/runtime/samples/component-nested-deeper/_config.js
new file mode 100644
index 0000000000..6b216f84d6
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/_config.js
@@ -0,0 +1,11 @@
+export default {
+	solo: true,
+	
+	data: {
+		values: [1, 2, 3, 4]
+	},
+
+	test(assert, component) {
+		component.set({ values: [2, 3] });
+	}
+};
diff --git a/test/runtime/samples/component-nested-deeper/main.html b/test/runtime/samples/component-nested-deeper/main.html
new file mode 100644
index 0000000000..5ad2d9d319
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/main.html
@@ -0,0 +1,11 @@
+<Level1 :values/>
+
+<script>
+	import Level1 from './Level1.html';
+	
+	export default {
+		components: {
+			Level1
+		}
+	}
+</script>
\ No newline at end of file

From 57c25b7a438602aeedafdc2e85a4f372061a4821 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 17 Jun 2017 11:23:16 -0400
Subject: [PATCH 10/12] add eslint-plugin-html, for linting test .html files

---
 .eslintrc.json |  3 +++
 package.json   |  1 +
 yarn.lock      | 53 ++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index f7f065e374..340b9a0e12 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -33,6 +33,9 @@
         "plugin:import/errors",
         "plugin:import/warnings"
     ],
+    "plugins": [
+        "html"
+    ],
     "parserOptions": {
         "ecmaVersion": 6,
         "sourceType": "module"
diff --git a/package.json b/package.json
index 5e7f38c6e9..551c8c5944 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "console-group": "^0.3.2",
     "css-tree": "1.0.0-alpha16",
     "eslint": "^3.12.2",
+    "eslint-plugin-html": "^3.0.0",
     "eslint-plugin-import": "^2.2.0",
     "estree-walker": "^0.3.0",
     "fuzzyset.js": "0.0.1",
diff --git a/yarn.lock b/yarn.lock
index abc1ddc757..682deff103 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -976,6 +976,34 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -986,6 +1014,10 @@ electron-to-chromium@^1.2.7:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6"
 
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
 error-ex@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -1083,6 +1115,12 @@ eslint-module-utils@^2.0.0:
     debug "2.2.0"
     pkg-dir "^1.0.0"
 
+eslint-plugin-html@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
+  dependencies:
+    htmlparser2 "^3.8.2"
+
 eslint-plugin-import@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
@@ -1472,6 +1510,17 @@ html-encoding-sniffer@^1.0.1:
   dependencies:
     whatwg-encoding "^1.0.1"
 
+htmlparser2@^3.8.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -1499,7 +1548,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.1:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -2285,7 +2334,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@^2.2.2:
+readable-stream@^2.0.2, readable-stream@^2.2.2:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:

From 3c36b77c1cd68a88606af8664c5ce6ff5718c5f3 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 17 Jun 2017 11:25:47 -0400
Subject: [PATCH 11/12] doh

---
 test/runtime/samples/component-nested-deeper/_config.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/runtime/samples/component-nested-deeper/_config.js b/test/runtime/samples/component-nested-deeper/_config.js
index 6b216f84d6..8c525fedd4 100644
--- a/test/runtime/samples/component-nested-deeper/_config.js
+++ b/test/runtime/samples/component-nested-deeper/_config.js
@@ -1,6 +1,4 @@
 export default {
-	solo: true,
-	
 	data: {
 		values: [1, 2, 3, 4]
 	},

From 6b49c6039d70f0dc53111337c999d98d1bde8cbe Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 17 Jun 2017 11:33:51 -0400
Subject: [PATCH 12/12] -> v1.22.5

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5fbac4cc2..47c45a367d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Svelte changelog
 
+## 1.22.5
+
+* Fix nested component unmounting bug ([#643](https://github.com/sveltejs/svelte/issues/643)) 
+
 ## 1.22.4
 
 * Include `ast` in `svelte.compile` return value ([#632](https://github.com/sveltejs/svelte/issues/632))
diff --git a/package.json b/package.json
index 551c8c5944..5240cbadbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.22.4",
+  "version": "1.22.5",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [