From 803d1d2746c164615eba15f5eae00e03003dbcd8 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 12:05:54 -0400
Subject: [PATCH 01/31] move test/generator to test/runtime, and have separate
 input -> output tests for codegen. add test for #433

---
 .eslintignore                                 |   4 +-
 test/js/README.md                             |   1 +
 test/js/index.js                              |  28 +++
 .../samples/event-handlers-custom/expected.js | 205 ++++++++++++++++++
 .../samples/event-handlers-custom/input.html  |  17 ++
 test/{generator => runtime}/index.js          |   8 +-
 .../attribute-dynamic-multiple/_config.js     |   0
 .../attribute-dynamic-multiple/main.html      |   0
 .../attribute-dynamic-reserved/_config.js     |   0
 .../attribute-dynamic-reserved/main.html      |   0
 .../attribute-dynamic-shorthand/_config.js    |   0
 .../attribute-dynamic-shorthand/main.html     |   0
 .../samples/attribute-dynamic/_config.js      |   0
 .../samples/attribute-dynamic/main.html       |   0
 .../samples/attribute-empty-svg/_config.js    |   0
 .../samples/attribute-empty-svg/main.html     |   0
 .../samples/attribute-empty/_config.js        |   0
 .../samples/attribute-empty/main.html         |   0
 .../attribute-partial-number/Component.html   |   0
 .../attribute-partial-number/_config.js       |   0
 .../attribute-partial-number/main.html        |   0
 .../attribute-prefer-expression/_config.js    |   0
 .../attribute-prefer-expression/main.html     |   0
 .../attribute-static-boolean/_config.js       |   0
 .../attribute-static-boolean/main.html        |   0
 .../samples/attribute-static/_config.js       |   0
 .../samples/attribute-static/main.html        |   0
 .../samples/autofocus/_config.js              |   0
 .../samples/autofocus/main.html               |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../binding-input-checkbox-group/_config.js   |   0
 .../binding-input-checkbox-group/main.html    |   0
 .../samples/binding-input-checkbox/_config.js |   0
 .../samples/binding-input-checkbox/main.html  |   0
 .../samples/binding-input-number/_config.js   |   0
 .../samples/binding-input-number/main.html    |   0
 .../binding-input-radio-group/_config.js      |   0
 .../binding-input-radio-group/main.html       |   0
 .../samples/binding-input-range/_config.js    |   0
 .../samples/binding-input-range/main.html     |   0
 .../binding-input-text-contextual/_config.js  |   0
 .../binding-input-text-contextual/main.html   |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../binding-input-text-deep/_config.js        |   0
 .../samples/binding-input-text-deep/main.html |   0
 .../samples/binding-input-text/_config.js     |   0
 .../samples/binding-input-text/main.html      |   0
 .../binding-select-initial-value/_config.js   |   0
 .../binding-select-initial-value/main.html    |   0
 .../binding-select-multiple/_config.js        |   0
 .../samples/binding-select-multiple/main.html |   0
 .../samples/binding-select/_config.js         |   0
 .../samples/binding-select/main.html          |   0
 .../samples/binding-textarea/_config.js       |   0
 .../samples/binding-textarea/main.html        |   0
 .../component-binding-conditional-b/Bar.html  |   0
 .../component-binding-conditional-b/Baz.html  |   0
 .../component-binding-conditional-b/Foo.html  |   0
 .../_config.js                                |   0
 .../component-binding-conditional-b/main.html |   0
 .../component-binding-conditional/Bar.html    |   0
 .../component-binding-conditional/Baz.html    |   0
 .../component-binding-conditional/Foo.html    |   0
 .../component-binding-conditional/_config.js  |   0
 .../component-binding-conditional/main.html   |   0
 .../ComponentSelector.html                    |   0
 .../component-binding-deep-b/Editor.html      |   0
 .../component-binding-deep-b/_config.js       |   0
 .../component-binding-deep-b/main.html        |   0
 .../component-binding-deep/Widget.html        |   0
 .../samples/component-binding-deep/_config.js |   0
 .../samples/component-binding-deep/main.html  |   0
 .../component-binding-each-nested/Widget.html |   0
 .../component-binding-each-nested/_config.js  |   0
 .../component-binding-each-nested/main.html   |   0
 .../component-binding-each-object/Widget.html |   0
 .../component-binding-each-object/_config.js  |   0
 .../component-binding-each-object/main.html   |   0
 .../component-binding-each/Widget.html        |   0
 .../samples/component-binding-each/_config.js |   0
 .../samples/component-binding-each/main.html  |   0
 .../component-binding-infinite-loop/A.html    |   0
 .../component-binding-infinite-loop/B.html    |   0
 .../component-binding-infinite-loop/C.html    |   0
 .../_config.js                                |   0
 .../component-binding-infinite-loop/main.html |   0
 .../samples/component-binding-nested/Bar.html |   0
 .../samples/component-binding-nested/Baz.html |   0
 .../samples/component-binding-nested/Foo.html |   0
 .../component-binding-nested/_config.js       |   0
 .../component-binding-nested/main.html        |   0
 .../Counter.html                              |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../samples/component-binding/Counter.html    |   0
 .../samples/component-binding/_config.js      |   0
 .../samples/component-binding/main.html       |   0
 .../component-data-dynamic-late/Widget.html   |   0
 .../component-data-dynamic-late/_config.js    |   0
 .../component-data-dynamic-late/main.html     |   0
 .../Widget.html                               |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../component-data-dynamic/Widget.html        |   0
 .../samples/component-data-dynamic/_config.js |   0
 .../samples/component-data-dynamic/main.html  |   0
 .../samples/component-data-empty/Widget.html  |   0
 .../samples/component-data-empty/_config.js   |   0
 .../samples/component-data-empty/main.html    |   0
 .../component-data-static-boolean/Foo.html    |   0
 .../component-data-static-boolean/_config.js  |   0
 .../component-data-static-boolean/main.html   |   0
 .../samples/component-data-static/Widget.html |   0
 .../samples/component-data-static/_config.js  |   0
 .../samples/component-data-static/main.html   |   0
 .../samples/component-events-data/Widget.html |   0
 .../samples/component-events-data/_config.js  |   0
 .../samples/component-events-data/main.html   |   0
 .../samples/component-events-each/Widget.html |   0
 .../samples/component-events-each/_config.js  |   0
 .../samples/component-events-each/main.html   |   0
 .../samples/component-events/Widget.html      |   0
 .../samples/component-events/_config.js       |   0
 .../samples/component-events/main.html        |   0
 .../samples/component-not-void/Link.html      |   0
 .../samples/component-not-void/_config.js     |   0
 .../samples/component-not-void/main.html      |   0
 .../samples/component-ref/Widget.html         |   0
 .../samples/component-ref/_config.js          |   0
 .../samples/component-ref/main.html           |   0
 .../samples/component-yield-if/Widget.html    |   0
 .../samples/component-yield-if/_config.js     |   0
 .../samples/component-yield-if/main.html      |   0
 .../Widget.html                               |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../Widget.html                               |   0
 .../component-yield-multiple-in-if/_config.js |   0
 .../component-yield-multiple-in-if/main.html  |   0
 .../component-yield-parent/Widget.html        |   0
 .../samples/component-yield-parent/_config.js |   0
 .../samples/component-yield-parent/main.html  |   0
 .../samples/component-yield/_config.js        |   0
 .../samples/component-yield/main.html         |   0
 .../samples/component/Widget.html             |   0
 .../samples/component/_config.js              |   0
 .../samples/component/main.html               |   0
 .../samples/computed-function/_config.js      |   0
 .../samples/computed-function/main.html       |   0
 .../computed-values-default/_config.js        |   0
 .../samples/computed-values-default/main.html |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../samples/computed-values/_config.js        |   0
 .../samples/computed-values/main.html         |   0
 .../samples/css-comments/_config.js           |   0
 .../samples/css-comments/main.html            |   0
 .../samples/css-false/Widget.html             |   0
 .../samples/css-false/_config.js              |   0
 .../samples/css-false/main.html               |   0
 .../css-space-in-attribute/Widget.html        |   0
 .../samples/css-space-in-attribute/_config.js |   0
 .../samples/css-space-in-attribute/main.html  |   0
 .../samples/css/Widget.html                   |   0
 .../samples/css/_config.js                    |   0
 .../samples/css/main.html                     |   0
 .../samples/custom-method/_config.js          |   0
 .../samples/custom-method/main.html           |   0
 .../samples/deconflict-builtins/_config.js    |   0
 .../samples/deconflict-builtins/get.js        |   0
 .../samples/deconflict-builtins/main.html     |   0
 .../samples/deconflict-contexts/_config.js    |   0
 .../samples/deconflict-contexts/main.html     |   0
 .../samples/deconflict-non-helpers/_config.js |   0
 .../samples/deconflict-non-helpers/main.html  |   0
 .../samples/deconflict-non-helpers/module.js  |   0
 .../samples/deconflict-template-1/_config.js  |   0
 .../samples/deconflict-template-1/main.html   |   0
 .../samples/deconflict-template-1/module.js   |   0
 .../samples/deconflict-template-2/_config.js  |   0
 .../samples/deconflict-template-2/main.html   |   0
 .../samples/default-data-function/_config.js  |   0
 .../samples/default-data-function/main.html   |   0
 .../samples/default-data-override/_config.js  |   0
 .../samples/default-data-override/main.html   |   0
 .../samples/default-data/_config.js           |   0
 .../samples/default-data/main.html            |   0
 .../samples/destructuring/_config.js          |   0
 .../samples/destructuring/main.html           |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../dev-warning-missing-data/_config.js       |   0
 .../dev-warning-missing-data/main.html        |   0
 .../each-block-containing-if/_config.js       |   0
 .../each-block-containing-if/main.html        |   0
 .../samples/each-block-else/_config.js        |   0
 .../samples/each-block-else/main.html         |   0
 .../samples/each-block-indexed/_config.js     |   0
 .../samples/each-block-indexed/main.html      |   0
 .../samples/each-block-keyed/_config.js       |   0
 .../samples/each-block-keyed/main.html        |   0
 .../each-block-random-permute/_config.js      |   0
 .../each-block-random-permute/main.html       |   0
 .../samples/each-block-text-node/_config.js   |   0
 .../samples/each-block-text-node/main.html    |   0
 .../samples/each-block/_config.js             |   0
 .../samples/each-block/main.html              |   0
 .../samples/each-blocks-expression/_config.js |   0
 .../samples/each-blocks-expression/main.html  |   0
 .../samples/each-blocks-nested-b/_config.js   |   0
 .../samples/each-blocks-nested-b/main.html    |   0
 .../samples/each-blocks-nested/_config.js     |   0
 .../samples/each-blocks-nested/main.html      |   0
 .../event-handler-custom-context/_config.js   |   0
 .../event-handler-custom-context/main.html    |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../samples/event-handler-custom/_config.js   |   0
 .../samples/event-handler-custom/main.html    |   0
 .../event-handler-event-methods/_config.js    |   0
 .../event-handler-event-methods/main.html     |   0
 .../samples/event-handler-removal/_config.js  |   0
 .../samples/event-handler-removal/main.html   |   0
 .../event-handler-this-methods/_config.js     |   0
 .../event-handler-this-methods/main.html      |   0
 .../samples/event-handler/_config.js          |   0
 .../samples/event-handler/main.html           |   0
 .../samples/events-custom/_config.js          |   0
 .../samples/events-custom/main.html           |   0
 .../samples/events-lifecycle/_config.js       |   0
 .../samples/events-lifecycle/main.html        |   0
 .../samples/function-in-expression/_config.js |   0
 .../samples/function-in-expression/main.html  |   0
 .../samples/get-state/_config.js              |   0
 .../samples/get-state/main.html               |   0
 .../globals-accessible-directly/_config.js    |   0
 .../globals-accessible-directly/main.html     |   0
 .../globals-not-dereferenced/_config.js       |   0
 .../globals-not-dereferenced/main.html        |   0
 .../globals-shadowed-by-data/_config.js       |   0
 .../globals-shadowed-by-data/main.html        |   0
 .../globals-shadowed-by-helpers/_config.js    |   0
 .../globals-shadowed-by-helpers/main.html     |   0
 .../samples/hello-world/_config.js            |   0
 .../samples/hello-world/main.html             |   0
 .../samples/helpers/_config.js                |   0
 .../samples/helpers/main.html                 |   0
 .../samples/if-block-else/_config.js          |   0
 .../samples/if-block-else/main.html           |   0
 .../samples/if-block-elseif-text/_config.js   |   0
 .../samples/if-block-elseif-text/main.html    |   0
 .../samples/if-block-elseif/_config.js        |   0
 .../samples/if-block-elseif/main.html         |   0
 .../samples/if-block-expression/_config.js    |   0
 .../samples/if-block-expression/main.html     |   0
 .../samples/if-block-widget/Widget.html       |   0
 .../samples/if-block-widget/_config.js        |   0
 .../samples/if-block-widget/main.html         |   0
 .../samples/if-block/_config.js               |   0
 .../samples/if-block/main.html                |   0
 .../ComponentOne.html                         |   0
 .../ComponentTwo.html                         |   0
 .../imported-renamed-components/_config.js    |   0
 .../imported-renamed-components/main.html     |   0
 .../samples/inline-expressions/_config.js     |   0
 .../samples/inline-expressions/main.html      |   0
 .../samples/input-list/_config.js             |   0
 .../samples/input-list/main.html              |   0
 .../samples/lifecycle-events/_config.js       |   0
 .../samples/lifecycle-events/main.html        |   0
 .../names-deconflicted-nested/_config.js      |   0
 .../names-deconflicted-nested/main.html       |   0
 .../samples/names-deconflicted/Widget.html    |   0
 .../samples/names-deconflicted/_config.js     |   0
 .../samples/names-deconflicted/main.html      |   0
 .../samples/nbsp/_config.js                   |   0
 .../samples/nbsp/main.html                    |   0
 .../Foo.html                                  |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../samples/observe-prevents-loop/_config.js  |   0
 .../samples/observe-prevents-loop/main.html   |   0
 .../samples/onrender-chain/Item.html          |   0
 .../samples/onrender-chain/List.html          |   0
 .../samples/onrender-chain/_config.js         |   0
 .../samples/onrender-chain/main.html          |   0
 .../ParentWidget.html                         |   0
 .../Widget.html                               |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../onrender-fires-when-ready/Widget.html     |   0
 .../onrender-fires-when-ready/_config.js      |   0
 .../onrender-fires-when-ready/main.html       |   0
 .../samples/pass-no-options/_config.js        |   0
 .../samples/pass-no-options/main.html         |   0
 .../raw-mustaches-preserved/_config.js        |   0
 .../samples/raw-mustaches-preserved/main.html |   0
 .../samples/raw-mustaches/_config.js          |   0
 .../samples/raw-mustaches/main.html           |   0
 .../samples/refs-unset/_config.js             |   0
 .../samples/refs-unset/main.html              |   0
 .../samples/refs/_config.js                   |   0
 .../samples/refs/main.html                    |   0
 .../samples/select-one-way-bind/_config.js    |   0
 .../samples/select-one-way-bind/main.html     |   0
 .../samples/select/_config.js                 |   0
 .../samples/select/main.html                  |   0
 .../samples/self-reference-tree/_config.js    |   0
 .../samples/self-reference-tree/main.html     |   0
 .../samples/self-reference/_config.js         |   0
 .../samples/self-reference/main.html          |   0
 .../Widget.html                               |   0
 .../set-in-observe-dedupes-renders/_config.js |   0
 .../set-in-observe-dedupes-renders/main.html  |   0
 .../samples/set-in-observe/_config.js         |   0
 .../samples/set-in-observe/main.html          |   0
 .../samples/set-in-onrender/_config.js        |   0
 .../samples/set-in-onrender/main.html         |   0
 .../samples/set-prevents-loop/Foo.html        |   0
 .../samples/set-prevents-loop/_config.js      |   0
 .../samples/set-prevents-loop/main.html       |   0
 .../samples/single-static-element/_config.js  |   0
 .../samples/single-static-element/main.html   |   0
 .../samples/single-text-node/_config.js       |   0
 .../samples/single-text-node/main.html        |   0
 .../samples/svg-attributes/_config.js         |   0
 .../samples/svg-attributes/main.html          |   0
 .../Rect.html                                 |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../Rect.html                                 |   0
 .../_config.js                                |   0
 .../main.html                                 |   0
 .../samples/svg-class/_config.js              |   0
 .../samples/svg-class/main.html               |   0
 .../svg-each-block-namespace/_config.js       |   0
 .../svg-each-block-namespace/main.html        |   0
 .../samples/svg-multiple/_config.js           |   0
 .../samples/svg-multiple/main.html            |   0
 .../samples/svg-no-whitespace/_config.js      |   0
 .../samples/svg-no-whitespace/main.html       |   0
 .../samples/svg-xlink/_config.js              |   0
 .../samples/svg-xlink/main.html               |   0
 .../samples/svg-xmlns/_config.js              |   0
 .../samples/svg-xmlns/main.html               |   0
 .../samples/svg/_config.js                    |   0
 .../samples/svg/main.html                     |   0
 .../samples/window-binding-resize/_config.js  |   0
 .../samples/window-binding-resize/main.html   |   0
 .../samples/window-event/_config.js           |   0
 .../samples/window-event/main.html            |   0
 test/server-side-rendering/index.js           |   8 +-
 358 files changed, 262 insertions(+), 9 deletions(-)
 create mode 100644 test/js/README.md
 create mode 100644 test/js/index.js
 create mode 100644 test/js/samples/event-handlers-custom/expected.js
 create mode 100644 test/js/samples/event-handlers-custom/input.html
 rename test/{generator => runtime}/index.js (94%)
 rename test/{generator => runtime}/samples/attribute-dynamic-multiple/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic-multiple/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic-reserved/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic-reserved/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic-shorthand/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic-shorthand/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-dynamic/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-empty-svg/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-empty-svg/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-empty/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-empty/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-partial-number/Component.html (100%)
 rename test/{generator => runtime}/samples/attribute-partial-number/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-partial-number/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-prefer-expression/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-prefer-expression/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-static-boolean/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-static-boolean/main.html (100%)
 rename test/{generator => runtime}/samples/attribute-static/_config.js (100%)
 rename test/{generator => runtime}/samples/attribute-static/main.html (100%)
 rename test/{generator => runtime}/samples/autofocus/_config.js (100%)
 rename test/{generator => runtime}/samples/autofocus/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox-deep-contextual/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox-deep-contextual/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox-group/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox-group/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-checkbox/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-number/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-number/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-radio-group/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-radio-group/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-range/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-range/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-text-contextual/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-text-contextual/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-text-deep-contextual/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-text-deep-contextual/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-text-deep/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-text-deep/main.html (100%)
 rename test/{generator => runtime}/samples/binding-input-text/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-input-text/main.html (100%)
 rename test/{generator => runtime}/samples/binding-select-initial-value/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-select-initial-value/main.html (100%)
 rename test/{generator => runtime}/samples/binding-select-multiple/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-select-multiple/main.html (100%)
 rename test/{generator => runtime}/samples/binding-select/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-select/main.html (100%)
 rename test/{generator => runtime}/samples/binding-textarea/_config.js (100%)
 rename test/{generator => runtime}/samples/binding-textarea/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional-b/Bar.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional-b/Baz.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional-b/Foo.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional-b/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional-b/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional/Bar.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional/Baz.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional/Foo.html (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-conditional/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-deep-b/ComponentSelector.html (100%)
 rename test/{generator => runtime}/samples/component-binding-deep-b/Editor.html (100%)
 rename test/{generator => runtime}/samples/component-binding-deep-b/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-deep-b/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-deep/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-binding-deep/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-deep/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each-nested/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each-nested/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-each-nested/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each-object/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each-object/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-each-object/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-binding-each/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-each/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-infinite-loop/A.html (100%)
 rename test/{generator => runtime}/samples/component-binding-infinite-loop/B.html (100%)
 rename test/{generator => runtime}/samples/component-binding-infinite-loop/C.html (100%)
 rename test/{generator => runtime}/samples/component-binding-infinite-loop/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-infinite-loop/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-nested/Bar.html (100%)
 rename test/{generator => runtime}/samples/component-binding-nested/Baz.html (100%)
 rename test/{generator => runtime}/samples/component-binding-nested/Foo.html (100%)
 rename test/{generator => runtime}/samples/component-binding-nested/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-nested/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding-parent-supercedes-child/Counter.html (100%)
 rename test/{generator => runtime}/samples/component-binding-parent-supercedes-child/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding-parent-supercedes-child/main.html (100%)
 rename test/{generator => runtime}/samples/component-binding/Counter.html (100%)
 rename test/{generator => runtime}/samples/component-binding/_config.js (100%)
 rename test/{generator => runtime}/samples/component-binding/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-late/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-late/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-late/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-shorthand/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-shorthand/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic-shorthand/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-dynamic/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-empty/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-data-empty/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-empty/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-static-boolean/Foo.html (100%)
 rename test/{generator => runtime}/samples/component-data-static-boolean/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-static-boolean/main.html (100%)
 rename test/{generator => runtime}/samples/component-data-static/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-data-static/_config.js (100%)
 rename test/{generator => runtime}/samples/component-data-static/main.html (100%)
 rename test/{generator => runtime}/samples/component-events-data/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-events-data/_config.js (100%)
 rename test/{generator => runtime}/samples/component-events-data/main.html (100%)
 rename test/{generator => runtime}/samples/component-events-each/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-events-each/_config.js (100%)
 rename test/{generator => runtime}/samples/component-events-each/main.html (100%)
 rename test/{generator => runtime}/samples/component-events/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-events/_config.js (100%)
 rename test/{generator => runtime}/samples/component-events/main.html (100%)
 rename test/{generator => runtime}/samples/component-not-void/Link.html (100%)
 rename test/{generator => runtime}/samples/component-not-void/_config.js (100%)
 rename test/{generator => runtime}/samples/component-not-void/main.html (100%)
 rename test/{generator => runtime}/samples/component-ref/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-ref/_config.js (100%)
 rename test/{generator => runtime}/samples/component-ref/main.html (100%)
 rename test/{generator => runtime}/samples/component-yield-if/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-yield-if/_config.js (100%)
 rename test/{generator => runtime}/samples/component-yield-if/main.html (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-each/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-each/_config.js (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-each/main.html (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-if/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-if/_config.js (100%)
 rename test/{generator => runtime}/samples/component-yield-multiple-in-if/main.html (100%)
 rename test/{generator => runtime}/samples/component-yield-parent/Widget.html (100%)
 rename test/{generator => runtime}/samples/component-yield-parent/_config.js (100%)
 rename test/{generator => runtime}/samples/component-yield-parent/main.html (100%)
 rename test/{generator => runtime}/samples/component-yield/_config.js (100%)
 rename test/{generator => runtime}/samples/component-yield/main.html (100%)
 rename test/{generator => runtime}/samples/component/Widget.html (100%)
 rename test/{generator => runtime}/samples/component/_config.js (100%)
 rename test/{generator => runtime}/samples/component/main.html (100%)
 rename test/{generator => runtime}/samples/computed-function/_config.js (100%)
 rename test/{generator => runtime}/samples/computed-function/main.html (100%)
 rename test/{generator => runtime}/samples/computed-values-default/_config.js (100%)
 rename test/{generator => runtime}/samples/computed-values-default/main.html (100%)
 rename test/{generator => runtime}/samples/computed-values-function-dependency/_config.js (100%)
 rename test/{generator => runtime}/samples/computed-values-function-dependency/main.html (100%)
 rename test/{generator => runtime}/samples/computed-values/_config.js (100%)
 rename test/{generator => runtime}/samples/computed-values/main.html (100%)
 rename test/{generator => runtime}/samples/css-comments/_config.js (100%)
 rename test/{generator => runtime}/samples/css-comments/main.html (100%)
 rename test/{generator => runtime}/samples/css-false/Widget.html (100%)
 rename test/{generator => runtime}/samples/css-false/_config.js (100%)
 rename test/{generator => runtime}/samples/css-false/main.html (100%)
 rename test/{generator => runtime}/samples/css-space-in-attribute/Widget.html (100%)
 rename test/{generator => runtime}/samples/css-space-in-attribute/_config.js (100%)
 rename test/{generator => runtime}/samples/css-space-in-attribute/main.html (100%)
 rename test/{generator => runtime}/samples/css/Widget.html (100%)
 rename test/{generator => runtime}/samples/css/_config.js (100%)
 rename test/{generator => runtime}/samples/css/main.html (100%)
 rename test/{generator => runtime}/samples/custom-method/_config.js (100%)
 rename test/{generator => runtime}/samples/custom-method/main.html (100%)
 rename test/{generator => runtime}/samples/deconflict-builtins/_config.js (100%)
 rename test/{generator => runtime}/samples/deconflict-builtins/get.js (100%)
 rename test/{generator => runtime}/samples/deconflict-builtins/main.html (100%)
 rename test/{generator => runtime}/samples/deconflict-contexts/_config.js (100%)
 rename test/{generator => runtime}/samples/deconflict-contexts/main.html (100%)
 rename test/{generator => runtime}/samples/deconflict-non-helpers/_config.js (100%)
 rename test/{generator => runtime}/samples/deconflict-non-helpers/main.html (100%)
 rename test/{generator => runtime}/samples/deconflict-non-helpers/module.js (100%)
 rename test/{generator => runtime}/samples/deconflict-template-1/_config.js (100%)
 rename test/{generator => runtime}/samples/deconflict-template-1/main.html (100%)
 rename test/{generator => runtime}/samples/deconflict-template-1/module.js (100%)
 rename test/{generator => runtime}/samples/deconflict-template-2/_config.js (100%)
 rename test/{generator => runtime}/samples/deconflict-template-2/main.html (100%)
 rename test/{generator => runtime}/samples/default-data-function/_config.js (100%)
 rename test/{generator => runtime}/samples/default-data-function/main.html (100%)
 rename test/{generator => runtime}/samples/default-data-override/_config.js (100%)
 rename test/{generator => runtime}/samples/default-data-override/main.html (100%)
 rename test/{generator => runtime}/samples/default-data/_config.js (100%)
 rename test/{generator => runtime}/samples/default-data/main.html (100%)
 rename test/{generator => runtime}/samples/destructuring/_config.js (100%)
 rename test/{generator => runtime}/samples/destructuring/main.html (100%)
 rename test/{generator => runtime}/samples/dev-warning-bad-observe-arguments/_config.js (100%)
 rename test/{generator => runtime}/samples/dev-warning-bad-observe-arguments/main.html (100%)
 rename test/{generator => runtime}/samples/dev-warning-destroy-not-teardown/_config.js (100%)
 rename test/{generator => runtime}/samples/dev-warning-destroy-not-teardown/main.html (100%)
 rename test/{generator => runtime}/samples/dev-warning-missing-data-binding/_config.js (100%)
 rename test/{generator => runtime}/samples/dev-warning-missing-data-binding/main.html (100%)
 rename test/{generator => runtime}/samples/dev-warning-missing-data/_config.js (100%)
 rename test/{generator => runtime}/samples/dev-warning-missing-data/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-containing-if/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-containing-if/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-else/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-else/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-indexed/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-indexed/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-keyed/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-keyed/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-random-permute/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-random-permute/main.html (100%)
 rename test/{generator => runtime}/samples/each-block-text-node/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block-text-node/main.html (100%)
 rename test/{generator => runtime}/samples/each-block/_config.js (100%)
 rename test/{generator => runtime}/samples/each-block/main.html (100%)
 rename test/{generator => runtime}/samples/each-blocks-expression/_config.js (100%)
 rename test/{generator => runtime}/samples/each-blocks-expression/main.html (100%)
 rename test/{generator => runtime}/samples/each-blocks-nested-b/_config.js (100%)
 rename test/{generator => runtime}/samples/each-blocks-nested-b/main.html (100%)
 rename test/{generator => runtime}/samples/each-blocks-nested/_config.js (100%)
 rename test/{generator => runtime}/samples/each-blocks-nested/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-custom-context/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-custom-context/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-custom-node-context/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-custom-node-context/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-custom/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-custom/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-event-methods/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-event-methods/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-removal/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-removal/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler-this-methods/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler-this-methods/main.html (100%)
 rename test/{generator => runtime}/samples/event-handler/_config.js (100%)
 rename test/{generator => runtime}/samples/event-handler/main.html (100%)
 rename test/{generator => runtime}/samples/events-custom/_config.js (100%)
 rename test/{generator => runtime}/samples/events-custom/main.html (100%)
 rename test/{generator => runtime}/samples/events-lifecycle/_config.js (100%)
 rename test/{generator => runtime}/samples/events-lifecycle/main.html (100%)
 rename test/{generator => runtime}/samples/function-in-expression/_config.js (100%)
 rename test/{generator => runtime}/samples/function-in-expression/main.html (100%)
 rename test/{generator => runtime}/samples/get-state/_config.js (100%)
 rename test/{generator => runtime}/samples/get-state/main.html (100%)
 rename test/{generator => runtime}/samples/globals-accessible-directly/_config.js (100%)
 rename test/{generator => runtime}/samples/globals-accessible-directly/main.html (100%)
 rename test/{generator => runtime}/samples/globals-not-dereferenced/_config.js (100%)
 rename test/{generator => runtime}/samples/globals-not-dereferenced/main.html (100%)
 rename test/{generator => runtime}/samples/globals-shadowed-by-data/_config.js (100%)
 rename test/{generator => runtime}/samples/globals-shadowed-by-data/main.html (100%)
 rename test/{generator => runtime}/samples/globals-shadowed-by-helpers/_config.js (100%)
 rename test/{generator => runtime}/samples/globals-shadowed-by-helpers/main.html (100%)
 rename test/{generator => runtime}/samples/hello-world/_config.js (100%)
 rename test/{generator => runtime}/samples/hello-world/main.html (100%)
 rename test/{generator => runtime}/samples/helpers/_config.js (100%)
 rename test/{generator => runtime}/samples/helpers/main.html (100%)
 rename test/{generator => runtime}/samples/if-block-else/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block-else/main.html (100%)
 rename test/{generator => runtime}/samples/if-block-elseif-text/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block-elseif-text/main.html (100%)
 rename test/{generator => runtime}/samples/if-block-elseif/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block-elseif/main.html (100%)
 rename test/{generator => runtime}/samples/if-block-expression/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block-expression/main.html (100%)
 rename test/{generator => runtime}/samples/if-block-widget/Widget.html (100%)
 rename test/{generator => runtime}/samples/if-block-widget/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block-widget/main.html (100%)
 rename test/{generator => runtime}/samples/if-block/_config.js (100%)
 rename test/{generator => runtime}/samples/if-block/main.html (100%)
 rename test/{generator => runtime}/samples/imported-renamed-components/ComponentOne.html (100%)
 rename test/{generator => runtime}/samples/imported-renamed-components/ComponentTwo.html (100%)
 rename test/{generator => runtime}/samples/imported-renamed-components/_config.js (100%)
 rename test/{generator => runtime}/samples/imported-renamed-components/main.html (100%)
 rename test/{generator => runtime}/samples/inline-expressions/_config.js (100%)
 rename test/{generator => runtime}/samples/inline-expressions/main.html (100%)
 rename test/{generator => runtime}/samples/input-list/_config.js (100%)
 rename test/{generator => runtime}/samples/input-list/main.html (100%)
 rename test/{generator => runtime}/samples/lifecycle-events/_config.js (100%)
 rename test/{generator => runtime}/samples/lifecycle-events/main.html (100%)
 rename test/{generator => runtime}/samples/names-deconflicted-nested/_config.js (100%)
 rename test/{generator => runtime}/samples/names-deconflicted-nested/main.html (100%)
 rename test/{generator => runtime}/samples/names-deconflicted/Widget.html (100%)
 rename test/{generator => runtime}/samples/names-deconflicted/_config.js (100%)
 rename test/{generator => runtime}/samples/names-deconflicted/main.html (100%)
 rename test/{generator => runtime}/samples/nbsp/_config.js (100%)
 rename test/{generator => runtime}/samples/nbsp/main.html (100%)
 rename test/{generator => runtime}/samples/observe-component-ignores-irrelevant-changes/Foo.html (100%)
 rename test/{generator => runtime}/samples/observe-component-ignores-irrelevant-changes/_config.js (100%)
 rename test/{generator => runtime}/samples/observe-component-ignores-irrelevant-changes/main.html (100%)
 rename test/{generator => runtime}/samples/observe-prevents-loop/_config.js (100%)
 rename test/{generator => runtime}/samples/observe-prevents-loop/main.html (100%)
 rename test/{generator => runtime}/samples/onrender-chain/Item.html (100%)
 rename test/{generator => runtime}/samples/onrender-chain/List.html (100%)
 rename test/{generator => runtime}/samples/onrender-chain/_config.js (100%)
 rename test/{generator => runtime}/samples/onrender-chain/main.html (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready-nested/ParentWidget.html (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready-nested/Widget.html (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready-nested/_config.js (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready-nested/main.html (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready/Widget.html (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready/_config.js (100%)
 rename test/{generator => runtime}/samples/onrender-fires-when-ready/main.html (100%)
 rename test/{generator => runtime}/samples/pass-no-options/_config.js (100%)
 rename test/{generator => runtime}/samples/pass-no-options/main.html (100%)
 rename test/{generator => runtime}/samples/raw-mustaches-preserved/_config.js (100%)
 rename test/{generator => runtime}/samples/raw-mustaches-preserved/main.html (100%)
 rename test/{generator => runtime}/samples/raw-mustaches/_config.js (100%)
 rename test/{generator => runtime}/samples/raw-mustaches/main.html (100%)
 rename test/{generator => runtime}/samples/refs-unset/_config.js (100%)
 rename test/{generator => runtime}/samples/refs-unset/main.html (100%)
 rename test/{generator => runtime}/samples/refs/_config.js (100%)
 rename test/{generator => runtime}/samples/refs/main.html (100%)
 rename test/{generator => runtime}/samples/select-one-way-bind/_config.js (100%)
 rename test/{generator => runtime}/samples/select-one-way-bind/main.html (100%)
 rename test/{generator => runtime}/samples/select/_config.js (100%)
 rename test/{generator => runtime}/samples/select/main.html (100%)
 rename test/{generator => runtime}/samples/self-reference-tree/_config.js (100%)
 rename test/{generator => runtime}/samples/self-reference-tree/main.html (100%)
 rename test/{generator => runtime}/samples/self-reference/_config.js (100%)
 rename test/{generator => runtime}/samples/self-reference/main.html (100%)
 rename test/{generator => runtime}/samples/set-in-observe-dedupes-renders/Widget.html (100%)
 rename test/{generator => runtime}/samples/set-in-observe-dedupes-renders/_config.js (100%)
 rename test/{generator => runtime}/samples/set-in-observe-dedupes-renders/main.html (100%)
 rename test/{generator => runtime}/samples/set-in-observe/_config.js (100%)
 rename test/{generator => runtime}/samples/set-in-observe/main.html (100%)
 rename test/{generator => runtime}/samples/set-in-onrender/_config.js (100%)
 rename test/{generator => runtime}/samples/set-in-onrender/main.html (100%)
 rename test/{generator => runtime}/samples/set-prevents-loop/Foo.html (100%)
 rename test/{generator => runtime}/samples/set-prevents-loop/_config.js (100%)
 rename test/{generator => runtime}/samples/set-prevents-loop/main.html (100%)
 rename test/{generator => runtime}/samples/single-static-element/_config.js (100%)
 rename test/{generator => runtime}/samples/single-static-element/main.html (100%)
 rename test/{generator => runtime}/samples/single-text-node/_config.js (100%)
 rename test/{generator => runtime}/samples/single-text-node/main.html (100%)
 rename test/{generator => runtime}/samples/svg-attributes/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-attributes/main.html (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace-shorthand/Rect.html (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace-shorthand/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace-shorthand/main.html (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace/Rect.html (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-child-component-declared-namespace/main.html (100%)
 rename test/{generator => runtime}/samples/svg-class/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-class/main.html (100%)
 rename test/{generator => runtime}/samples/svg-each-block-namespace/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-each-block-namespace/main.html (100%)
 rename test/{generator => runtime}/samples/svg-multiple/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-multiple/main.html (100%)
 rename test/{generator => runtime}/samples/svg-no-whitespace/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-no-whitespace/main.html (100%)
 rename test/{generator => runtime}/samples/svg-xlink/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-xlink/main.html (100%)
 rename test/{generator => runtime}/samples/svg-xmlns/_config.js (100%)
 rename test/{generator => runtime}/samples/svg-xmlns/main.html (100%)
 rename test/{generator => runtime}/samples/svg/_config.js (100%)
 rename test/{generator => runtime}/samples/svg/main.html (100%)
 rename test/{generator => runtime}/samples/window-binding-resize/_config.js (100%)
 rename test/{generator => runtime}/samples/window-binding-resize/main.html (100%)
 rename test/{generator => runtime}/samples/window-event/_config.js (100%)
 rename test/{generator => runtime}/samples/window-event/main.html (100%)

diff --git a/.eslintignore b/.eslintignore
index a84efdafe36f..effb19af4547 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,5 @@
 src/shared
 shared.js
-test/test.js
\ No newline at end of file
+test/test.js
+**/_actual.js
+**/expected.js
\ No newline at end of file
diff --git a/test/js/README.md b/test/js/README.md
new file mode 100644
index 000000000000..c43905123ea8
--- /dev/null
+++ b/test/js/README.md
@@ -0,0 +1 @@
+Use these tests sparingly, as they will need to be updated frequently as the code generation changes.
\ No newline at end of file
diff --git a/test/js/index.js b/test/js/index.js
new file mode 100644
index 000000000000..cf8ab54bbd3a
--- /dev/null
+++ b/test/js/index.js
@@ -0,0 +1,28 @@
+import assert from 'assert';
+import * as fs from 'fs';
+import * as path from 'path';
+import { svelte } from '../helpers.js';
+
+describe( 'js', () => {
+	fs.readdirSync( 'test/js/samples' ).forEach( dir => {
+		if ( dir[0] === '.' ) return;
+
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo/.test( dir );
+
+		if ( solo && process.env.CI ) {
+			throw new Error( 'Forgot to remove `solo: true` from test' );
+		}
+
+		( solo ? it.only : it )( dir, () => {
+			dir = path.resolve( 'test/js/samples', dir );
+			const input = fs.readFileSync( `${dir}/input.html`, 'utf-8' ).replace( /\s+$/, '' );
+
+			const actual = svelte.compile( input ).code;
+			fs.writeFileSync( `${dir}/_actual.js`, actual );
+			const expected = fs.readFileSync( `${dir}/expected.js`, 'utf-8' );
+
+			assert.equal( actual.trim(), expected.trim() );
+		});
+	});
+});
diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js
new file mode 100644
index 000000000000..71e633d752f2
--- /dev/null
+++ b/test/js/samples/event-handlers-custom/expected.js
@@ -0,0 +1,205 @@
+var template = (function () {
+	return {
+		methods: {
+			foo ( bar ) {
+				console.log( bar );
+			}
+		},
+
+		events: {
+			foo ( node, callback ) {
+				// code goes here
+			}
+		}
+	};
+}());
+
+function render_main_fragment ( root, component ) {
+	var button = createElement( 'button' );
+	
+	var foo_handler = template.events.foo.call( component, button, function ( event ) {
+		var root = component.get();
+		
+		component.foo( root.bar );
+	}.bind( button ) );
+	
+	appendNode( createText( "foo" ), button );
+
+	return {
+		mount: function ( target, anchor ) {
+			insertNode( button, target, anchor );
+		},
+		
+		update: noop,
+		
+		teardown: function ( detach ) {
+			foo_handler.teardown();
+			
+			if ( detach ) {
+				detachNode( button );
+			}
+		}
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+	
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+	
+	this._handlers = Object.create( null );
+	
+	this._root = options._root;
+	this._yield = options._yield;
+	
+	this._torndown = false;
+	
+	this._fragment = render_main_fragment( this._state, this );
+	if ( options.target ) this._fragment.mount( options.target, null );
+}
+
+assign( SvelteComponent.prototype, template.methods, {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+});
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	if ( this._fragment ) this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	this._fragment.teardown( detach !== false );
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+function createElement( name ) {
+	return document.createElement( name );
+}
+
+function detachNode( node ) {
+	node.parentNode.removeChild( node );
+}
+
+function insertNode( node, target, anchor ) {
+	target.insertBefore( node, anchor );
+}
+
+function createText( data ) {
+	return document.createTextNode( data );
+}
+
+function appendNode( node, target ) {
+	target.appendChild( node );
+}
+
+function assign( target ) {
+	for ( var i = 1; i < arguments.length; i += 1 ) {
+		var source = arguments[i];
+		for ( var k in source ) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function dispatchObservers( component, group, newState, oldState ) {
+	for ( var key in group ) {
+		if ( !( key in newState ) ) continue;
+
+		var newValue = newState[ key ];
+		var oldValue = oldState[ key ];
+
+		if ( newValue === oldValue && typeof newValue !== 'object' ) continue;
+
+		var callbacks = group[ key ];
+		if ( !callbacks ) continue;
+
+		for ( var i = 0; i < callbacks.length; i += 1 ) {
+			var callback = callbacks[i];
+			if ( callback.__calling ) continue;
+
+			callback.__calling = true;
+			callback.call( component, newValue, oldValue );
+			callback.__calling = false;
+		}
+	}
+}
+
+function get( key ) {
+	return key ? this._state[ key ] : this._state;
+}
+
+function fire( eventName, data ) {
+	var handlers = eventName in this._handlers && this._handlers[ eventName ].slice();
+	if ( !handlers ) return;
+
+	for ( var i = 0; i < handlers.length; i += 1 ) {
+		handlers[i].call( this, data );
+	}
+}
+
+function observe( key, callback, options ) {
+	var group = ( options && options.defer ) ? this._observers.pre : this._observers.post;
+
+	( group[ key ] || ( group[ key ] = [] ) ).push( callback );
+
+	if ( !options || options.init !== false ) {
+		callback.__calling = true;
+		callback.call( this, this._state[ key ] );
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function () {
+			var index = group[ key ].indexOf( callback );
+			if ( ~index ) group[ key ].splice( index, 1 );
+		}
+	};
+}
+
+function on( eventName, handler ) {
+	if ( eventName === 'teardown' ) return this.on( 'destroy', handler );
+
+	var handlers = this._handlers[ eventName ] || ( this._handlers[ eventName ] = [] );
+	handlers.push( handler );
+
+	return {
+		cancel: function () {
+			var index = handlers.indexOf( handler );
+			if ( ~index ) handlers.splice( index, 1 );
+		}
+	};
+}
+
+function set( newState ) {
+	this._set( newState );
+	( this._root || this )._flush();
+}
+
+function _flush() {
+	if ( !this._renderHooks ) return;
+
+	while ( this._renderHooks.length ) {
+		var hook = this._renderHooks.pop();
+		hook.fn.call( hook.context );
+	}
+}
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/event-handlers-custom/input.html b/test/js/samples/event-handlers-custom/input.html
new file mode 100644
index 000000000000..77c530fcf632
--- /dev/null
+++ b/test/js/samples/event-handlers-custom/input.html
@@ -0,0 +1,17 @@
+<button on:foo='foo( bar )'>foo</button>
+
+<script>
+	export default {
+		methods: {
+			foo ( bar ) {
+				console.log( bar );
+			}
+		},
+
+		events: {
+			foo ( node, callback ) {
+				// code goes here
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/generator/index.js b/test/runtime/index.js
similarity index 94%
rename from test/generator/index.js
rename to test/runtime/index.js
index 6ca442623b42..0d74c6db45e9 100644
--- a/test/generator/index.js
+++ b/test/runtime/index.js
@@ -38,7 +38,7 @@ describe( 'generate', () => {
 	function runTest ( dir, shared ) {
 		if ( dir[0] === '.' ) return;
 
-		const config = loadConfig( `./generator/samples/${dir}/_config.js` );
+		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
 
 		if ( config.solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
@@ -53,7 +53,7 @@ describe( 'generate', () => {
 			compileOptions.dev = config.dev;
 
 			try {
-				const source = fs.readFileSync( `test/generator/samples/${dir}/main.html`, 'utf-8' );
+				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
 				compiled = svelte.compile( source, compileOptions );
 			} catch ( err ) {
 				if ( config.compileError ) {
@@ -160,13 +160,13 @@ describe( 'generate', () => {
 	}
 
 	describe( 'inline helpers', () => {
-		fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 			runTest( dir, null );
 		});
 	});
 
 	describe( 'shared helpers', () => {
-		fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 			runTest( dir, path.resolve( 'shared.js' ) );
 		});
 	});
diff --git a/test/generator/samples/attribute-dynamic-multiple/_config.js b/test/runtime/samples/attribute-dynamic-multiple/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-multiple/_config.js
rename to test/runtime/samples/attribute-dynamic-multiple/_config.js
diff --git a/test/generator/samples/attribute-dynamic-multiple/main.html b/test/runtime/samples/attribute-dynamic-multiple/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-multiple/main.html
rename to test/runtime/samples/attribute-dynamic-multiple/main.html
diff --git a/test/generator/samples/attribute-dynamic-reserved/_config.js b/test/runtime/samples/attribute-dynamic-reserved/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-reserved/_config.js
rename to test/runtime/samples/attribute-dynamic-reserved/_config.js
diff --git a/test/generator/samples/attribute-dynamic-reserved/main.html b/test/runtime/samples/attribute-dynamic-reserved/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-reserved/main.html
rename to test/runtime/samples/attribute-dynamic-reserved/main.html
diff --git a/test/generator/samples/attribute-dynamic-shorthand/_config.js b/test/runtime/samples/attribute-dynamic-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic-shorthand/_config.js
rename to test/runtime/samples/attribute-dynamic-shorthand/_config.js
diff --git a/test/generator/samples/attribute-dynamic-shorthand/main.html b/test/runtime/samples/attribute-dynamic-shorthand/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic-shorthand/main.html
rename to test/runtime/samples/attribute-dynamic-shorthand/main.html
diff --git a/test/generator/samples/attribute-dynamic/_config.js b/test/runtime/samples/attribute-dynamic/_config.js
similarity index 100%
rename from test/generator/samples/attribute-dynamic/_config.js
rename to test/runtime/samples/attribute-dynamic/_config.js
diff --git a/test/generator/samples/attribute-dynamic/main.html b/test/runtime/samples/attribute-dynamic/main.html
similarity index 100%
rename from test/generator/samples/attribute-dynamic/main.html
rename to test/runtime/samples/attribute-dynamic/main.html
diff --git a/test/generator/samples/attribute-empty-svg/_config.js b/test/runtime/samples/attribute-empty-svg/_config.js
similarity index 100%
rename from test/generator/samples/attribute-empty-svg/_config.js
rename to test/runtime/samples/attribute-empty-svg/_config.js
diff --git a/test/generator/samples/attribute-empty-svg/main.html b/test/runtime/samples/attribute-empty-svg/main.html
similarity index 100%
rename from test/generator/samples/attribute-empty-svg/main.html
rename to test/runtime/samples/attribute-empty-svg/main.html
diff --git a/test/generator/samples/attribute-empty/_config.js b/test/runtime/samples/attribute-empty/_config.js
similarity index 100%
rename from test/generator/samples/attribute-empty/_config.js
rename to test/runtime/samples/attribute-empty/_config.js
diff --git a/test/generator/samples/attribute-empty/main.html b/test/runtime/samples/attribute-empty/main.html
similarity index 100%
rename from test/generator/samples/attribute-empty/main.html
rename to test/runtime/samples/attribute-empty/main.html
diff --git a/test/generator/samples/attribute-partial-number/Component.html b/test/runtime/samples/attribute-partial-number/Component.html
similarity index 100%
rename from test/generator/samples/attribute-partial-number/Component.html
rename to test/runtime/samples/attribute-partial-number/Component.html
diff --git a/test/generator/samples/attribute-partial-number/_config.js b/test/runtime/samples/attribute-partial-number/_config.js
similarity index 100%
rename from test/generator/samples/attribute-partial-number/_config.js
rename to test/runtime/samples/attribute-partial-number/_config.js
diff --git a/test/generator/samples/attribute-partial-number/main.html b/test/runtime/samples/attribute-partial-number/main.html
similarity index 100%
rename from test/generator/samples/attribute-partial-number/main.html
rename to test/runtime/samples/attribute-partial-number/main.html
diff --git a/test/generator/samples/attribute-prefer-expression/_config.js b/test/runtime/samples/attribute-prefer-expression/_config.js
similarity index 100%
rename from test/generator/samples/attribute-prefer-expression/_config.js
rename to test/runtime/samples/attribute-prefer-expression/_config.js
diff --git a/test/generator/samples/attribute-prefer-expression/main.html b/test/runtime/samples/attribute-prefer-expression/main.html
similarity index 100%
rename from test/generator/samples/attribute-prefer-expression/main.html
rename to test/runtime/samples/attribute-prefer-expression/main.html
diff --git a/test/generator/samples/attribute-static-boolean/_config.js b/test/runtime/samples/attribute-static-boolean/_config.js
similarity index 100%
rename from test/generator/samples/attribute-static-boolean/_config.js
rename to test/runtime/samples/attribute-static-boolean/_config.js
diff --git a/test/generator/samples/attribute-static-boolean/main.html b/test/runtime/samples/attribute-static-boolean/main.html
similarity index 100%
rename from test/generator/samples/attribute-static-boolean/main.html
rename to test/runtime/samples/attribute-static-boolean/main.html
diff --git a/test/generator/samples/attribute-static/_config.js b/test/runtime/samples/attribute-static/_config.js
similarity index 100%
rename from test/generator/samples/attribute-static/_config.js
rename to test/runtime/samples/attribute-static/_config.js
diff --git a/test/generator/samples/attribute-static/main.html b/test/runtime/samples/attribute-static/main.html
similarity index 100%
rename from test/generator/samples/attribute-static/main.html
rename to test/runtime/samples/attribute-static/main.html
diff --git a/test/generator/samples/autofocus/_config.js b/test/runtime/samples/autofocus/_config.js
similarity index 100%
rename from test/generator/samples/autofocus/_config.js
rename to test/runtime/samples/autofocus/_config.js
diff --git a/test/generator/samples/autofocus/main.html b/test/runtime/samples/autofocus/main.html
similarity index 100%
rename from test/generator/samples/autofocus/main.html
rename to test/runtime/samples/autofocus/main.html
diff --git a/test/generator/samples/binding-input-checkbox-deep-contextual/_config.js b/test/runtime/samples/binding-input-checkbox-deep-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-deep-contextual/_config.js
rename to test/runtime/samples/binding-input-checkbox-deep-contextual/_config.js
diff --git a/test/generator/samples/binding-input-checkbox-deep-contextual/main.html b/test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-deep-contextual/main.html
rename to test/runtime/samples/binding-input-checkbox-deep-contextual/main.html
diff --git a/test/generator/samples/binding-input-checkbox-group/_config.js b/test/runtime/samples/binding-input-checkbox-group/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-group/_config.js
rename to test/runtime/samples/binding-input-checkbox-group/_config.js
diff --git a/test/generator/samples/binding-input-checkbox-group/main.html b/test/runtime/samples/binding-input-checkbox-group/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox-group/main.html
rename to test/runtime/samples/binding-input-checkbox-group/main.html
diff --git a/test/generator/samples/binding-input-checkbox/_config.js b/test/runtime/samples/binding-input-checkbox/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-checkbox/_config.js
rename to test/runtime/samples/binding-input-checkbox/_config.js
diff --git a/test/generator/samples/binding-input-checkbox/main.html b/test/runtime/samples/binding-input-checkbox/main.html
similarity index 100%
rename from test/generator/samples/binding-input-checkbox/main.html
rename to test/runtime/samples/binding-input-checkbox/main.html
diff --git a/test/generator/samples/binding-input-number/_config.js b/test/runtime/samples/binding-input-number/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-number/_config.js
rename to test/runtime/samples/binding-input-number/_config.js
diff --git a/test/generator/samples/binding-input-number/main.html b/test/runtime/samples/binding-input-number/main.html
similarity index 100%
rename from test/generator/samples/binding-input-number/main.html
rename to test/runtime/samples/binding-input-number/main.html
diff --git a/test/generator/samples/binding-input-radio-group/_config.js b/test/runtime/samples/binding-input-radio-group/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-radio-group/_config.js
rename to test/runtime/samples/binding-input-radio-group/_config.js
diff --git a/test/generator/samples/binding-input-radio-group/main.html b/test/runtime/samples/binding-input-radio-group/main.html
similarity index 100%
rename from test/generator/samples/binding-input-radio-group/main.html
rename to test/runtime/samples/binding-input-radio-group/main.html
diff --git a/test/generator/samples/binding-input-range/_config.js b/test/runtime/samples/binding-input-range/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-range/_config.js
rename to test/runtime/samples/binding-input-range/_config.js
diff --git a/test/generator/samples/binding-input-range/main.html b/test/runtime/samples/binding-input-range/main.html
similarity index 100%
rename from test/generator/samples/binding-input-range/main.html
rename to test/runtime/samples/binding-input-range/main.html
diff --git a/test/generator/samples/binding-input-text-contextual/_config.js b/test/runtime/samples/binding-input-text-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-contextual/_config.js
rename to test/runtime/samples/binding-input-text-contextual/_config.js
diff --git a/test/generator/samples/binding-input-text-contextual/main.html b/test/runtime/samples/binding-input-text-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-contextual/main.html
rename to test/runtime/samples/binding-input-text-contextual/main.html
diff --git a/test/generator/samples/binding-input-text-deep-contextual/_config.js b/test/runtime/samples/binding-input-text-deep-contextual/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-deep-contextual/_config.js
rename to test/runtime/samples/binding-input-text-deep-contextual/_config.js
diff --git a/test/generator/samples/binding-input-text-deep-contextual/main.html b/test/runtime/samples/binding-input-text-deep-contextual/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-deep-contextual/main.html
rename to test/runtime/samples/binding-input-text-deep-contextual/main.html
diff --git a/test/generator/samples/binding-input-text-deep/_config.js b/test/runtime/samples/binding-input-text-deep/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text-deep/_config.js
rename to test/runtime/samples/binding-input-text-deep/_config.js
diff --git a/test/generator/samples/binding-input-text-deep/main.html b/test/runtime/samples/binding-input-text-deep/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text-deep/main.html
rename to test/runtime/samples/binding-input-text-deep/main.html
diff --git a/test/generator/samples/binding-input-text/_config.js b/test/runtime/samples/binding-input-text/_config.js
similarity index 100%
rename from test/generator/samples/binding-input-text/_config.js
rename to test/runtime/samples/binding-input-text/_config.js
diff --git a/test/generator/samples/binding-input-text/main.html b/test/runtime/samples/binding-input-text/main.html
similarity index 100%
rename from test/generator/samples/binding-input-text/main.html
rename to test/runtime/samples/binding-input-text/main.html
diff --git a/test/generator/samples/binding-select-initial-value/_config.js b/test/runtime/samples/binding-select-initial-value/_config.js
similarity index 100%
rename from test/generator/samples/binding-select-initial-value/_config.js
rename to test/runtime/samples/binding-select-initial-value/_config.js
diff --git a/test/generator/samples/binding-select-initial-value/main.html b/test/runtime/samples/binding-select-initial-value/main.html
similarity index 100%
rename from test/generator/samples/binding-select-initial-value/main.html
rename to test/runtime/samples/binding-select-initial-value/main.html
diff --git a/test/generator/samples/binding-select-multiple/_config.js b/test/runtime/samples/binding-select-multiple/_config.js
similarity index 100%
rename from test/generator/samples/binding-select-multiple/_config.js
rename to test/runtime/samples/binding-select-multiple/_config.js
diff --git a/test/generator/samples/binding-select-multiple/main.html b/test/runtime/samples/binding-select-multiple/main.html
similarity index 100%
rename from test/generator/samples/binding-select-multiple/main.html
rename to test/runtime/samples/binding-select-multiple/main.html
diff --git a/test/generator/samples/binding-select/_config.js b/test/runtime/samples/binding-select/_config.js
similarity index 100%
rename from test/generator/samples/binding-select/_config.js
rename to test/runtime/samples/binding-select/_config.js
diff --git a/test/generator/samples/binding-select/main.html b/test/runtime/samples/binding-select/main.html
similarity index 100%
rename from test/generator/samples/binding-select/main.html
rename to test/runtime/samples/binding-select/main.html
diff --git a/test/generator/samples/binding-textarea/_config.js b/test/runtime/samples/binding-textarea/_config.js
similarity index 100%
rename from test/generator/samples/binding-textarea/_config.js
rename to test/runtime/samples/binding-textarea/_config.js
diff --git a/test/generator/samples/binding-textarea/main.html b/test/runtime/samples/binding-textarea/main.html
similarity index 100%
rename from test/generator/samples/binding-textarea/main.html
rename to test/runtime/samples/binding-textarea/main.html
diff --git a/test/generator/samples/component-binding-conditional-b/Bar.html b/test/runtime/samples/component-binding-conditional-b/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Bar.html
rename to test/runtime/samples/component-binding-conditional-b/Bar.html
diff --git a/test/generator/samples/component-binding-conditional-b/Baz.html b/test/runtime/samples/component-binding-conditional-b/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Baz.html
rename to test/runtime/samples/component-binding-conditional-b/Baz.html
diff --git a/test/generator/samples/component-binding-conditional-b/Foo.html b/test/runtime/samples/component-binding-conditional-b/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/Foo.html
rename to test/runtime/samples/component-binding-conditional-b/Foo.html
diff --git a/test/generator/samples/component-binding-conditional-b/_config.js b/test/runtime/samples/component-binding-conditional-b/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/_config.js
rename to test/runtime/samples/component-binding-conditional-b/_config.js
diff --git a/test/generator/samples/component-binding-conditional-b/main.html b/test/runtime/samples/component-binding-conditional-b/main.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional-b/main.html
rename to test/runtime/samples/component-binding-conditional-b/main.html
diff --git a/test/generator/samples/component-binding-conditional/Bar.html b/test/runtime/samples/component-binding-conditional/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Bar.html
rename to test/runtime/samples/component-binding-conditional/Bar.html
diff --git a/test/generator/samples/component-binding-conditional/Baz.html b/test/runtime/samples/component-binding-conditional/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Baz.html
rename to test/runtime/samples/component-binding-conditional/Baz.html
diff --git a/test/generator/samples/component-binding-conditional/Foo.html b/test/runtime/samples/component-binding-conditional/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/Foo.html
rename to test/runtime/samples/component-binding-conditional/Foo.html
diff --git a/test/generator/samples/component-binding-conditional/_config.js b/test/runtime/samples/component-binding-conditional/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-conditional/_config.js
rename to test/runtime/samples/component-binding-conditional/_config.js
diff --git a/test/generator/samples/component-binding-conditional/main.html b/test/runtime/samples/component-binding-conditional/main.html
similarity index 100%
rename from test/generator/samples/component-binding-conditional/main.html
rename to test/runtime/samples/component-binding-conditional/main.html
diff --git a/test/generator/samples/component-binding-deep-b/ComponentSelector.html b/test/runtime/samples/component-binding-deep-b/ComponentSelector.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/ComponentSelector.html
rename to test/runtime/samples/component-binding-deep-b/ComponentSelector.html
diff --git a/test/generator/samples/component-binding-deep-b/Editor.html b/test/runtime/samples/component-binding-deep-b/Editor.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/Editor.html
rename to test/runtime/samples/component-binding-deep-b/Editor.html
diff --git a/test/generator/samples/component-binding-deep-b/_config.js b/test/runtime/samples/component-binding-deep-b/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/_config.js
rename to test/runtime/samples/component-binding-deep-b/_config.js
diff --git a/test/generator/samples/component-binding-deep-b/main.html b/test/runtime/samples/component-binding-deep-b/main.html
similarity index 100%
rename from test/generator/samples/component-binding-deep-b/main.html
rename to test/runtime/samples/component-binding-deep-b/main.html
diff --git a/test/generator/samples/component-binding-deep/Widget.html b/test/runtime/samples/component-binding-deep/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-deep/Widget.html
rename to test/runtime/samples/component-binding-deep/Widget.html
diff --git a/test/generator/samples/component-binding-deep/_config.js b/test/runtime/samples/component-binding-deep/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-deep/_config.js
rename to test/runtime/samples/component-binding-deep/_config.js
diff --git a/test/generator/samples/component-binding-deep/main.html b/test/runtime/samples/component-binding-deep/main.html
similarity index 100%
rename from test/generator/samples/component-binding-deep/main.html
rename to test/runtime/samples/component-binding-deep/main.html
diff --git a/test/generator/samples/component-binding-each-nested/Widget.html b/test/runtime/samples/component-binding-each-nested/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/Widget.html
rename to test/runtime/samples/component-binding-each-nested/Widget.html
diff --git a/test/generator/samples/component-binding-each-nested/_config.js b/test/runtime/samples/component-binding-each-nested/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/_config.js
rename to test/runtime/samples/component-binding-each-nested/_config.js
diff --git a/test/generator/samples/component-binding-each-nested/main.html b/test/runtime/samples/component-binding-each-nested/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each-nested/main.html
rename to test/runtime/samples/component-binding-each-nested/main.html
diff --git a/test/generator/samples/component-binding-each-object/Widget.html b/test/runtime/samples/component-binding-each-object/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each-object/Widget.html
rename to test/runtime/samples/component-binding-each-object/Widget.html
diff --git a/test/generator/samples/component-binding-each-object/_config.js b/test/runtime/samples/component-binding-each-object/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each-object/_config.js
rename to test/runtime/samples/component-binding-each-object/_config.js
diff --git a/test/generator/samples/component-binding-each-object/main.html b/test/runtime/samples/component-binding-each-object/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each-object/main.html
rename to test/runtime/samples/component-binding-each-object/main.html
diff --git a/test/generator/samples/component-binding-each/Widget.html b/test/runtime/samples/component-binding-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-binding-each/Widget.html
rename to test/runtime/samples/component-binding-each/Widget.html
diff --git a/test/generator/samples/component-binding-each/_config.js b/test/runtime/samples/component-binding-each/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-each/_config.js
rename to test/runtime/samples/component-binding-each/_config.js
diff --git a/test/generator/samples/component-binding-each/main.html b/test/runtime/samples/component-binding-each/main.html
similarity index 100%
rename from test/generator/samples/component-binding-each/main.html
rename to test/runtime/samples/component-binding-each/main.html
diff --git a/test/generator/samples/component-binding-infinite-loop/A.html b/test/runtime/samples/component-binding-infinite-loop/A.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/A.html
rename to test/runtime/samples/component-binding-infinite-loop/A.html
diff --git a/test/generator/samples/component-binding-infinite-loop/B.html b/test/runtime/samples/component-binding-infinite-loop/B.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/B.html
rename to test/runtime/samples/component-binding-infinite-loop/B.html
diff --git a/test/generator/samples/component-binding-infinite-loop/C.html b/test/runtime/samples/component-binding-infinite-loop/C.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/C.html
rename to test/runtime/samples/component-binding-infinite-loop/C.html
diff --git a/test/generator/samples/component-binding-infinite-loop/_config.js b/test/runtime/samples/component-binding-infinite-loop/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/_config.js
rename to test/runtime/samples/component-binding-infinite-loop/_config.js
diff --git a/test/generator/samples/component-binding-infinite-loop/main.html b/test/runtime/samples/component-binding-infinite-loop/main.html
similarity index 100%
rename from test/generator/samples/component-binding-infinite-loop/main.html
rename to test/runtime/samples/component-binding-infinite-loop/main.html
diff --git a/test/generator/samples/component-binding-nested/Bar.html b/test/runtime/samples/component-binding-nested/Bar.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Bar.html
rename to test/runtime/samples/component-binding-nested/Bar.html
diff --git a/test/generator/samples/component-binding-nested/Baz.html b/test/runtime/samples/component-binding-nested/Baz.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Baz.html
rename to test/runtime/samples/component-binding-nested/Baz.html
diff --git a/test/generator/samples/component-binding-nested/Foo.html b/test/runtime/samples/component-binding-nested/Foo.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/Foo.html
rename to test/runtime/samples/component-binding-nested/Foo.html
diff --git a/test/generator/samples/component-binding-nested/_config.js b/test/runtime/samples/component-binding-nested/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-nested/_config.js
rename to test/runtime/samples/component-binding-nested/_config.js
diff --git a/test/generator/samples/component-binding-nested/main.html b/test/runtime/samples/component-binding-nested/main.html
similarity index 100%
rename from test/generator/samples/component-binding-nested/main.html
rename to test/runtime/samples/component-binding-nested/main.html
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/Counter.html b/test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/Counter.html
rename to test/runtime/samples/component-binding-parent-supercedes-child/Counter.html
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/_config.js b/test/runtime/samples/component-binding-parent-supercedes-child/_config.js
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/_config.js
rename to test/runtime/samples/component-binding-parent-supercedes-child/_config.js
diff --git a/test/generator/samples/component-binding-parent-supercedes-child/main.html b/test/runtime/samples/component-binding-parent-supercedes-child/main.html
similarity index 100%
rename from test/generator/samples/component-binding-parent-supercedes-child/main.html
rename to test/runtime/samples/component-binding-parent-supercedes-child/main.html
diff --git a/test/generator/samples/component-binding/Counter.html b/test/runtime/samples/component-binding/Counter.html
similarity index 100%
rename from test/generator/samples/component-binding/Counter.html
rename to test/runtime/samples/component-binding/Counter.html
diff --git a/test/generator/samples/component-binding/_config.js b/test/runtime/samples/component-binding/_config.js
similarity index 100%
rename from test/generator/samples/component-binding/_config.js
rename to test/runtime/samples/component-binding/_config.js
diff --git a/test/generator/samples/component-binding/main.html b/test/runtime/samples/component-binding/main.html
similarity index 100%
rename from test/generator/samples/component-binding/main.html
rename to test/runtime/samples/component-binding/main.html
diff --git a/test/generator/samples/component-data-dynamic-late/Widget.html b/test/runtime/samples/component-data-dynamic-late/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/Widget.html
rename to test/runtime/samples/component-data-dynamic-late/Widget.html
diff --git a/test/generator/samples/component-data-dynamic-late/_config.js b/test/runtime/samples/component-data-dynamic-late/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/_config.js
rename to test/runtime/samples/component-data-dynamic-late/_config.js
diff --git a/test/generator/samples/component-data-dynamic-late/main.html b/test/runtime/samples/component-data-dynamic-late/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-late/main.html
rename to test/runtime/samples/component-data-dynamic-late/main.html
diff --git a/test/generator/samples/component-data-dynamic-shorthand/Widget.html b/test/runtime/samples/component-data-dynamic-shorthand/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/Widget.html
rename to test/runtime/samples/component-data-dynamic-shorthand/Widget.html
diff --git a/test/generator/samples/component-data-dynamic-shorthand/_config.js b/test/runtime/samples/component-data-dynamic-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/_config.js
rename to test/runtime/samples/component-data-dynamic-shorthand/_config.js
diff --git a/test/generator/samples/component-data-dynamic-shorthand/main.html b/test/runtime/samples/component-data-dynamic-shorthand/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic-shorthand/main.html
rename to test/runtime/samples/component-data-dynamic-shorthand/main.html
diff --git a/test/generator/samples/component-data-dynamic/Widget.html b/test/runtime/samples/component-data-dynamic/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic/Widget.html
rename to test/runtime/samples/component-data-dynamic/Widget.html
diff --git a/test/generator/samples/component-data-dynamic/_config.js b/test/runtime/samples/component-data-dynamic/_config.js
similarity index 100%
rename from test/generator/samples/component-data-dynamic/_config.js
rename to test/runtime/samples/component-data-dynamic/_config.js
diff --git a/test/generator/samples/component-data-dynamic/main.html b/test/runtime/samples/component-data-dynamic/main.html
similarity index 100%
rename from test/generator/samples/component-data-dynamic/main.html
rename to test/runtime/samples/component-data-dynamic/main.html
diff --git a/test/generator/samples/component-data-empty/Widget.html b/test/runtime/samples/component-data-empty/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-empty/Widget.html
rename to test/runtime/samples/component-data-empty/Widget.html
diff --git a/test/generator/samples/component-data-empty/_config.js b/test/runtime/samples/component-data-empty/_config.js
similarity index 100%
rename from test/generator/samples/component-data-empty/_config.js
rename to test/runtime/samples/component-data-empty/_config.js
diff --git a/test/generator/samples/component-data-empty/main.html b/test/runtime/samples/component-data-empty/main.html
similarity index 100%
rename from test/generator/samples/component-data-empty/main.html
rename to test/runtime/samples/component-data-empty/main.html
diff --git a/test/generator/samples/component-data-static-boolean/Foo.html b/test/runtime/samples/component-data-static-boolean/Foo.html
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/Foo.html
rename to test/runtime/samples/component-data-static-boolean/Foo.html
diff --git a/test/generator/samples/component-data-static-boolean/_config.js b/test/runtime/samples/component-data-static-boolean/_config.js
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/_config.js
rename to test/runtime/samples/component-data-static-boolean/_config.js
diff --git a/test/generator/samples/component-data-static-boolean/main.html b/test/runtime/samples/component-data-static-boolean/main.html
similarity index 100%
rename from test/generator/samples/component-data-static-boolean/main.html
rename to test/runtime/samples/component-data-static-boolean/main.html
diff --git a/test/generator/samples/component-data-static/Widget.html b/test/runtime/samples/component-data-static/Widget.html
similarity index 100%
rename from test/generator/samples/component-data-static/Widget.html
rename to test/runtime/samples/component-data-static/Widget.html
diff --git a/test/generator/samples/component-data-static/_config.js b/test/runtime/samples/component-data-static/_config.js
similarity index 100%
rename from test/generator/samples/component-data-static/_config.js
rename to test/runtime/samples/component-data-static/_config.js
diff --git a/test/generator/samples/component-data-static/main.html b/test/runtime/samples/component-data-static/main.html
similarity index 100%
rename from test/generator/samples/component-data-static/main.html
rename to test/runtime/samples/component-data-static/main.html
diff --git a/test/generator/samples/component-events-data/Widget.html b/test/runtime/samples/component-events-data/Widget.html
similarity index 100%
rename from test/generator/samples/component-events-data/Widget.html
rename to test/runtime/samples/component-events-data/Widget.html
diff --git a/test/generator/samples/component-events-data/_config.js b/test/runtime/samples/component-events-data/_config.js
similarity index 100%
rename from test/generator/samples/component-events-data/_config.js
rename to test/runtime/samples/component-events-data/_config.js
diff --git a/test/generator/samples/component-events-data/main.html b/test/runtime/samples/component-events-data/main.html
similarity index 100%
rename from test/generator/samples/component-events-data/main.html
rename to test/runtime/samples/component-events-data/main.html
diff --git a/test/generator/samples/component-events-each/Widget.html b/test/runtime/samples/component-events-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-events-each/Widget.html
rename to test/runtime/samples/component-events-each/Widget.html
diff --git a/test/generator/samples/component-events-each/_config.js b/test/runtime/samples/component-events-each/_config.js
similarity index 100%
rename from test/generator/samples/component-events-each/_config.js
rename to test/runtime/samples/component-events-each/_config.js
diff --git a/test/generator/samples/component-events-each/main.html b/test/runtime/samples/component-events-each/main.html
similarity index 100%
rename from test/generator/samples/component-events-each/main.html
rename to test/runtime/samples/component-events-each/main.html
diff --git a/test/generator/samples/component-events/Widget.html b/test/runtime/samples/component-events/Widget.html
similarity index 100%
rename from test/generator/samples/component-events/Widget.html
rename to test/runtime/samples/component-events/Widget.html
diff --git a/test/generator/samples/component-events/_config.js b/test/runtime/samples/component-events/_config.js
similarity index 100%
rename from test/generator/samples/component-events/_config.js
rename to test/runtime/samples/component-events/_config.js
diff --git a/test/generator/samples/component-events/main.html b/test/runtime/samples/component-events/main.html
similarity index 100%
rename from test/generator/samples/component-events/main.html
rename to test/runtime/samples/component-events/main.html
diff --git a/test/generator/samples/component-not-void/Link.html b/test/runtime/samples/component-not-void/Link.html
similarity index 100%
rename from test/generator/samples/component-not-void/Link.html
rename to test/runtime/samples/component-not-void/Link.html
diff --git a/test/generator/samples/component-not-void/_config.js b/test/runtime/samples/component-not-void/_config.js
similarity index 100%
rename from test/generator/samples/component-not-void/_config.js
rename to test/runtime/samples/component-not-void/_config.js
diff --git a/test/generator/samples/component-not-void/main.html b/test/runtime/samples/component-not-void/main.html
similarity index 100%
rename from test/generator/samples/component-not-void/main.html
rename to test/runtime/samples/component-not-void/main.html
diff --git a/test/generator/samples/component-ref/Widget.html b/test/runtime/samples/component-ref/Widget.html
similarity index 100%
rename from test/generator/samples/component-ref/Widget.html
rename to test/runtime/samples/component-ref/Widget.html
diff --git a/test/generator/samples/component-ref/_config.js b/test/runtime/samples/component-ref/_config.js
similarity index 100%
rename from test/generator/samples/component-ref/_config.js
rename to test/runtime/samples/component-ref/_config.js
diff --git a/test/generator/samples/component-ref/main.html b/test/runtime/samples/component-ref/main.html
similarity index 100%
rename from test/generator/samples/component-ref/main.html
rename to test/runtime/samples/component-ref/main.html
diff --git a/test/generator/samples/component-yield-if/Widget.html b/test/runtime/samples/component-yield-if/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-if/Widget.html
rename to test/runtime/samples/component-yield-if/Widget.html
diff --git a/test/generator/samples/component-yield-if/_config.js b/test/runtime/samples/component-yield-if/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-if/_config.js
rename to test/runtime/samples/component-yield-if/_config.js
diff --git a/test/generator/samples/component-yield-if/main.html b/test/runtime/samples/component-yield-if/main.html
similarity index 100%
rename from test/generator/samples/component-yield-if/main.html
rename to test/runtime/samples/component-yield-if/main.html
diff --git a/test/generator/samples/component-yield-multiple-in-each/Widget.html b/test/runtime/samples/component-yield-multiple-in-each/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/Widget.html
rename to test/runtime/samples/component-yield-multiple-in-each/Widget.html
diff --git a/test/generator/samples/component-yield-multiple-in-each/_config.js b/test/runtime/samples/component-yield-multiple-in-each/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/_config.js
rename to test/runtime/samples/component-yield-multiple-in-each/_config.js
diff --git a/test/generator/samples/component-yield-multiple-in-each/main.html b/test/runtime/samples/component-yield-multiple-in-each/main.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-each/main.html
rename to test/runtime/samples/component-yield-multiple-in-each/main.html
diff --git a/test/generator/samples/component-yield-multiple-in-if/Widget.html b/test/runtime/samples/component-yield-multiple-in-if/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/Widget.html
rename to test/runtime/samples/component-yield-multiple-in-if/Widget.html
diff --git a/test/generator/samples/component-yield-multiple-in-if/_config.js b/test/runtime/samples/component-yield-multiple-in-if/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/_config.js
rename to test/runtime/samples/component-yield-multiple-in-if/_config.js
diff --git a/test/generator/samples/component-yield-multiple-in-if/main.html b/test/runtime/samples/component-yield-multiple-in-if/main.html
similarity index 100%
rename from test/generator/samples/component-yield-multiple-in-if/main.html
rename to test/runtime/samples/component-yield-multiple-in-if/main.html
diff --git a/test/generator/samples/component-yield-parent/Widget.html b/test/runtime/samples/component-yield-parent/Widget.html
similarity index 100%
rename from test/generator/samples/component-yield-parent/Widget.html
rename to test/runtime/samples/component-yield-parent/Widget.html
diff --git a/test/generator/samples/component-yield-parent/_config.js b/test/runtime/samples/component-yield-parent/_config.js
similarity index 100%
rename from test/generator/samples/component-yield-parent/_config.js
rename to test/runtime/samples/component-yield-parent/_config.js
diff --git a/test/generator/samples/component-yield-parent/main.html b/test/runtime/samples/component-yield-parent/main.html
similarity index 100%
rename from test/generator/samples/component-yield-parent/main.html
rename to test/runtime/samples/component-yield-parent/main.html
diff --git a/test/generator/samples/component-yield/_config.js b/test/runtime/samples/component-yield/_config.js
similarity index 100%
rename from test/generator/samples/component-yield/_config.js
rename to test/runtime/samples/component-yield/_config.js
diff --git a/test/generator/samples/component-yield/main.html b/test/runtime/samples/component-yield/main.html
similarity index 100%
rename from test/generator/samples/component-yield/main.html
rename to test/runtime/samples/component-yield/main.html
diff --git a/test/generator/samples/component/Widget.html b/test/runtime/samples/component/Widget.html
similarity index 100%
rename from test/generator/samples/component/Widget.html
rename to test/runtime/samples/component/Widget.html
diff --git a/test/generator/samples/component/_config.js b/test/runtime/samples/component/_config.js
similarity index 100%
rename from test/generator/samples/component/_config.js
rename to test/runtime/samples/component/_config.js
diff --git a/test/generator/samples/component/main.html b/test/runtime/samples/component/main.html
similarity index 100%
rename from test/generator/samples/component/main.html
rename to test/runtime/samples/component/main.html
diff --git a/test/generator/samples/computed-function/_config.js b/test/runtime/samples/computed-function/_config.js
similarity index 100%
rename from test/generator/samples/computed-function/_config.js
rename to test/runtime/samples/computed-function/_config.js
diff --git a/test/generator/samples/computed-function/main.html b/test/runtime/samples/computed-function/main.html
similarity index 100%
rename from test/generator/samples/computed-function/main.html
rename to test/runtime/samples/computed-function/main.html
diff --git a/test/generator/samples/computed-values-default/_config.js b/test/runtime/samples/computed-values-default/_config.js
similarity index 100%
rename from test/generator/samples/computed-values-default/_config.js
rename to test/runtime/samples/computed-values-default/_config.js
diff --git a/test/generator/samples/computed-values-default/main.html b/test/runtime/samples/computed-values-default/main.html
similarity index 100%
rename from test/generator/samples/computed-values-default/main.html
rename to test/runtime/samples/computed-values-default/main.html
diff --git a/test/generator/samples/computed-values-function-dependency/_config.js b/test/runtime/samples/computed-values-function-dependency/_config.js
similarity index 100%
rename from test/generator/samples/computed-values-function-dependency/_config.js
rename to test/runtime/samples/computed-values-function-dependency/_config.js
diff --git a/test/generator/samples/computed-values-function-dependency/main.html b/test/runtime/samples/computed-values-function-dependency/main.html
similarity index 100%
rename from test/generator/samples/computed-values-function-dependency/main.html
rename to test/runtime/samples/computed-values-function-dependency/main.html
diff --git a/test/generator/samples/computed-values/_config.js b/test/runtime/samples/computed-values/_config.js
similarity index 100%
rename from test/generator/samples/computed-values/_config.js
rename to test/runtime/samples/computed-values/_config.js
diff --git a/test/generator/samples/computed-values/main.html b/test/runtime/samples/computed-values/main.html
similarity index 100%
rename from test/generator/samples/computed-values/main.html
rename to test/runtime/samples/computed-values/main.html
diff --git a/test/generator/samples/css-comments/_config.js b/test/runtime/samples/css-comments/_config.js
similarity index 100%
rename from test/generator/samples/css-comments/_config.js
rename to test/runtime/samples/css-comments/_config.js
diff --git a/test/generator/samples/css-comments/main.html b/test/runtime/samples/css-comments/main.html
similarity index 100%
rename from test/generator/samples/css-comments/main.html
rename to test/runtime/samples/css-comments/main.html
diff --git a/test/generator/samples/css-false/Widget.html b/test/runtime/samples/css-false/Widget.html
similarity index 100%
rename from test/generator/samples/css-false/Widget.html
rename to test/runtime/samples/css-false/Widget.html
diff --git a/test/generator/samples/css-false/_config.js b/test/runtime/samples/css-false/_config.js
similarity index 100%
rename from test/generator/samples/css-false/_config.js
rename to test/runtime/samples/css-false/_config.js
diff --git a/test/generator/samples/css-false/main.html b/test/runtime/samples/css-false/main.html
similarity index 100%
rename from test/generator/samples/css-false/main.html
rename to test/runtime/samples/css-false/main.html
diff --git a/test/generator/samples/css-space-in-attribute/Widget.html b/test/runtime/samples/css-space-in-attribute/Widget.html
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/Widget.html
rename to test/runtime/samples/css-space-in-attribute/Widget.html
diff --git a/test/generator/samples/css-space-in-attribute/_config.js b/test/runtime/samples/css-space-in-attribute/_config.js
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/_config.js
rename to test/runtime/samples/css-space-in-attribute/_config.js
diff --git a/test/generator/samples/css-space-in-attribute/main.html b/test/runtime/samples/css-space-in-attribute/main.html
similarity index 100%
rename from test/generator/samples/css-space-in-attribute/main.html
rename to test/runtime/samples/css-space-in-attribute/main.html
diff --git a/test/generator/samples/css/Widget.html b/test/runtime/samples/css/Widget.html
similarity index 100%
rename from test/generator/samples/css/Widget.html
rename to test/runtime/samples/css/Widget.html
diff --git a/test/generator/samples/css/_config.js b/test/runtime/samples/css/_config.js
similarity index 100%
rename from test/generator/samples/css/_config.js
rename to test/runtime/samples/css/_config.js
diff --git a/test/generator/samples/css/main.html b/test/runtime/samples/css/main.html
similarity index 100%
rename from test/generator/samples/css/main.html
rename to test/runtime/samples/css/main.html
diff --git a/test/generator/samples/custom-method/_config.js b/test/runtime/samples/custom-method/_config.js
similarity index 100%
rename from test/generator/samples/custom-method/_config.js
rename to test/runtime/samples/custom-method/_config.js
diff --git a/test/generator/samples/custom-method/main.html b/test/runtime/samples/custom-method/main.html
similarity index 100%
rename from test/generator/samples/custom-method/main.html
rename to test/runtime/samples/custom-method/main.html
diff --git a/test/generator/samples/deconflict-builtins/_config.js b/test/runtime/samples/deconflict-builtins/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-builtins/_config.js
rename to test/runtime/samples/deconflict-builtins/_config.js
diff --git a/test/generator/samples/deconflict-builtins/get.js b/test/runtime/samples/deconflict-builtins/get.js
similarity index 100%
rename from test/generator/samples/deconflict-builtins/get.js
rename to test/runtime/samples/deconflict-builtins/get.js
diff --git a/test/generator/samples/deconflict-builtins/main.html b/test/runtime/samples/deconflict-builtins/main.html
similarity index 100%
rename from test/generator/samples/deconflict-builtins/main.html
rename to test/runtime/samples/deconflict-builtins/main.html
diff --git a/test/generator/samples/deconflict-contexts/_config.js b/test/runtime/samples/deconflict-contexts/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-contexts/_config.js
rename to test/runtime/samples/deconflict-contexts/_config.js
diff --git a/test/generator/samples/deconflict-contexts/main.html b/test/runtime/samples/deconflict-contexts/main.html
similarity index 100%
rename from test/generator/samples/deconflict-contexts/main.html
rename to test/runtime/samples/deconflict-contexts/main.html
diff --git a/test/generator/samples/deconflict-non-helpers/_config.js b/test/runtime/samples/deconflict-non-helpers/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/_config.js
rename to test/runtime/samples/deconflict-non-helpers/_config.js
diff --git a/test/generator/samples/deconflict-non-helpers/main.html b/test/runtime/samples/deconflict-non-helpers/main.html
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/main.html
rename to test/runtime/samples/deconflict-non-helpers/main.html
diff --git a/test/generator/samples/deconflict-non-helpers/module.js b/test/runtime/samples/deconflict-non-helpers/module.js
similarity index 100%
rename from test/generator/samples/deconflict-non-helpers/module.js
rename to test/runtime/samples/deconflict-non-helpers/module.js
diff --git a/test/generator/samples/deconflict-template-1/_config.js b/test/runtime/samples/deconflict-template-1/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-template-1/_config.js
rename to test/runtime/samples/deconflict-template-1/_config.js
diff --git a/test/generator/samples/deconflict-template-1/main.html b/test/runtime/samples/deconflict-template-1/main.html
similarity index 100%
rename from test/generator/samples/deconflict-template-1/main.html
rename to test/runtime/samples/deconflict-template-1/main.html
diff --git a/test/generator/samples/deconflict-template-1/module.js b/test/runtime/samples/deconflict-template-1/module.js
similarity index 100%
rename from test/generator/samples/deconflict-template-1/module.js
rename to test/runtime/samples/deconflict-template-1/module.js
diff --git a/test/generator/samples/deconflict-template-2/_config.js b/test/runtime/samples/deconflict-template-2/_config.js
similarity index 100%
rename from test/generator/samples/deconflict-template-2/_config.js
rename to test/runtime/samples/deconflict-template-2/_config.js
diff --git a/test/generator/samples/deconflict-template-2/main.html b/test/runtime/samples/deconflict-template-2/main.html
similarity index 100%
rename from test/generator/samples/deconflict-template-2/main.html
rename to test/runtime/samples/deconflict-template-2/main.html
diff --git a/test/generator/samples/default-data-function/_config.js b/test/runtime/samples/default-data-function/_config.js
similarity index 100%
rename from test/generator/samples/default-data-function/_config.js
rename to test/runtime/samples/default-data-function/_config.js
diff --git a/test/generator/samples/default-data-function/main.html b/test/runtime/samples/default-data-function/main.html
similarity index 100%
rename from test/generator/samples/default-data-function/main.html
rename to test/runtime/samples/default-data-function/main.html
diff --git a/test/generator/samples/default-data-override/_config.js b/test/runtime/samples/default-data-override/_config.js
similarity index 100%
rename from test/generator/samples/default-data-override/_config.js
rename to test/runtime/samples/default-data-override/_config.js
diff --git a/test/generator/samples/default-data-override/main.html b/test/runtime/samples/default-data-override/main.html
similarity index 100%
rename from test/generator/samples/default-data-override/main.html
rename to test/runtime/samples/default-data-override/main.html
diff --git a/test/generator/samples/default-data/_config.js b/test/runtime/samples/default-data/_config.js
similarity index 100%
rename from test/generator/samples/default-data/_config.js
rename to test/runtime/samples/default-data/_config.js
diff --git a/test/generator/samples/default-data/main.html b/test/runtime/samples/default-data/main.html
similarity index 100%
rename from test/generator/samples/default-data/main.html
rename to test/runtime/samples/default-data/main.html
diff --git a/test/generator/samples/destructuring/_config.js b/test/runtime/samples/destructuring/_config.js
similarity index 100%
rename from test/generator/samples/destructuring/_config.js
rename to test/runtime/samples/destructuring/_config.js
diff --git a/test/generator/samples/destructuring/main.html b/test/runtime/samples/destructuring/main.html
similarity index 100%
rename from test/generator/samples/destructuring/main.html
rename to test/runtime/samples/destructuring/main.html
diff --git a/test/generator/samples/dev-warning-bad-observe-arguments/_config.js b/test/runtime/samples/dev-warning-bad-observe-arguments/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-bad-observe-arguments/_config.js
rename to test/runtime/samples/dev-warning-bad-observe-arguments/_config.js
diff --git a/test/generator/samples/dev-warning-bad-observe-arguments/main.html b/test/runtime/samples/dev-warning-bad-observe-arguments/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-bad-observe-arguments/main.html
rename to test/runtime/samples/dev-warning-bad-observe-arguments/main.html
diff --git a/test/generator/samples/dev-warning-destroy-not-teardown/_config.js b/test/runtime/samples/dev-warning-destroy-not-teardown/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-destroy-not-teardown/_config.js
rename to test/runtime/samples/dev-warning-destroy-not-teardown/_config.js
diff --git a/test/generator/samples/dev-warning-destroy-not-teardown/main.html b/test/runtime/samples/dev-warning-destroy-not-teardown/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-destroy-not-teardown/main.html
rename to test/runtime/samples/dev-warning-destroy-not-teardown/main.html
diff --git a/test/generator/samples/dev-warning-missing-data-binding/_config.js b/test/runtime/samples/dev-warning-missing-data-binding/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data-binding/_config.js
rename to test/runtime/samples/dev-warning-missing-data-binding/_config.js
diff --git a/test/generator/samples/dev-warning-missing-data-binding/main.html b/test/runtime/samples/dev-warning-missing-data-binding/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data-binding/main.html
rename to test/runtime/samples/dev-warning-missing-data-binding/main.html
diff --git a/test/generator/samples/dev-warning-missing-data/_config.js b/test/runtime/samples/dev-warning-missing-data/_config.js
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data/_config.js
rename to test/runtime/samples/dev-warning-missing-data/_config.js
diff --git a/test/generator/samples/dev-warning-missing-data/main.html b/test/runtime/samples/dev-warning-missing-data/main.html
similarity index 100%
rename from test/generator/samples/dev-warning-missing-data/main.html
rename to test/runtime/samples/dev-warning-missing-data/main.html
diff --git a/test/generator/samples/each-block-containing-if/_config.js b/test/runtime/samples/each-block-containing-if/_config.js
similarity index 100%
rename from test/generator/samples/each-block-containing-if/_config.js
rename to test/runtime/samples/each-block-containing-if/_config.js
diff --git a/test/generator/samples/each-block-containing-if/main.html b/test/runtime/samples/each-block-containing-if/main.html
similarity index 100%
rename from test/generator/samples/each-block-containing-if/main.html
rename to test/runtime/samples/each-block-containing-if/main.html
diff --git a/test/generator/samples/each-block-else/_config.js b/test/runtime/samples/each-block-else/_config.js
similarity index 100%
rename from test/generator/samples/each-block-else/_config.js
rename to test/runtime/samples/each-block-else/_config.js
diff --git a/test/generator/samples/each-block-else/main.html b/test/runtime/samples/each-block-else/main.html
similarity index 100%
rename from test/generator/samples/each-block-else/main.html
rename to test/runtime/samples/each-block-else/main.html
diff --git a/test/generator/samples/each-block-indexed/_config.js b/test/runtime/samples/each-block-indexed/_config.js
similarity index 100%
rename from test/generator/samples/each-block-indexed/_config.js
rename to test/runtime/samples/each-block-indexed/_config.js
diff --git a/test/generator/samples/each-block-indexed/main.html b/test/runtime/samples/each-block-indexed/main.html
similarity index 100%
rename from test/generator/samples/each-block-indexed/main.html
rename to test/runtime/samples/each-block-indexed/main.html
diff --git a/test/generator/samples/each-block-keyed/_config.js b/test/runtime/samples/each-block-keyed/_config.js
similarity index 100%
rename from test/generator/samples/each-block-keyed/_config.js
rename to test/runtime/samples/each-block-keyed/_config.js
diff --git a/test/generator/samples/each-block-keyed/main.html b/test/runtime/samples/each-block-keyed/main.html
similarity index 100%
rename from test/generator/samples/each-block-keyed/main.html
rename to test/runtime/samples/each-block-keyed/main.html
diff --git a/test/generator/samples/each-block-random-permute/_config.js b/test/runtime/samples/each-block-random-permute/_config.js
similarity index 100%
rename from test/generator/samples/each-block-random-permute/_config.js
rename to test/runtime/samples/each-block-random-permute/_config.js
diff --git a/test/generator/samples/each-block-random-permute/main.html b/test/runtime/samples/each-block-random-permute/main.html
similarity index 100%
rename from test/generator/samples/each-block-random-permute/main.html
rename to test/runtime/samples/each-block-random-permute/main.html
diff --git a/test/generator/samples/each-block-text-node/_config.js b/test/runtime/samples/each-block-text-node/_config.js
similarity index 100%
rename from test/generator/samples/each-block-text-node/_config.js
rename to test/runtime/samples/each-block-text-node/_config.js
diff --git a/test/generator/samples/each-block-text-node/main.html b/test/runtime/samples/each-block-text-node/main.html
similarity index 100%
rename from test/generator/samples/each-block-text-node/main.html
rename to test/runtime/samples/each-block-text-node/main.html
diff --git a/test/generator/samples/each-block/_config.js b/test/runtime/samples/each-block/_config.js
similarity index 100%
rename from test/generator/samples/each-block/_config.js
rename to test/runtime/samples/each-block/_config.js
diff --git a/test/generator/samples/each-block/main.html b/test/runtime/samples/each-block/main.html
similarity index 100%
rename from test/generator/samples/each-block/main.html
rename to test/runtime/samples/each-block/main.html
diff --git a/test/generator/samples/each-blocks-expression/_config.js b/test/runtime/samples/each-blocks-expression/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-expression/_config.js
rename to test/runtime/samples/each-blocks-expression/_config.js
diff --git a/test/generator/samples/each-blocks-expression/main.html b/test/runtime/samples/each-blocks-expression/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-expression/main.html
rename to test/runtime/samples/each-blocks-expression/main.html
diff --git a/test/generator/samples/each-blocks-nested-b/_config.js b/test/runtime/samples/each-blocks-nested-b/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-nested-b/_config.js
rename to test/runtime/samples/each-blocks-nested-b/_config.js
diff --git a/test/generator/samples/each-blocks-nested-b/main.html b/test/runtime/samples/each-blocks-nested-b/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-nested-b/main.html
rename to test/runtime/samples/each-blocks-nested-b/main.html
diff --git a/test/generator/samples/each-blocks-nested/_config.js b/test/runtime/samples/each-blocks-nested/_config.js
similarity index 100%
rename from test/generator/samples/each-blocks-nested/_config.js
rename to test/runtime/samples/each-blocks-nested/_config.js
diff --git a/test/generator/samples/each-blocks-nested/main.html b/test/runtime/samples/each-blocks-nested/main.html
similarity index 100%
rename from test/generator/samples/each-blocks-nested/main.html
rename to test/runtime/samples/each-blocks-nested/main.html
diff --git a/test/generator/samples/event-handler-custom-context/_config.js b/test/runtime/samples/event-handler-custom-context/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom-context/_config.js
rename to test/runtime/samples/event-handler-custom-context/_config.js
diff --git a/test/generator/samples/event-handler-custom-context/main.html b/test/runtime/samples/event-handler-custom-context/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom-context/main.html
rename to test/runtime/samples/event-handler-custom-context/main.html
diff --git a/test/generator/samples/event-handler-custom-node-context/_config.js b/test/runtime/samples/event-handler-custom-node-context/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom-node-context/_config.js
rename to test/runtime/samples/event-handler-custom-node-context/_config.js
diff --git a/test/generator/samples/event-handler-custom-node-context/main.html b/test/runtime/samples/event-handler-custom-node-context/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom-node-context/main.html
rename to test/runtime/samples/event-handler-custom-node-context/main.html
diff --git a/test/generator/samples/event-handler-custom/_config.js b/test/runtime/samples/event-handler-custom/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-custom/_config.js
rename to test/runtime/samples/event-handler-custom/_config.js
diff --git a/test/generator/samples/event-handler-custom/main.html b/test/runtime/samples/event-handler-custom/main.html
similarity index 100%
rename from test/generator/samples/event-handler-custom/main.html
rename to test/runtime/samples/event-handler-custom/main.html
diff --git a/test/generator/samples/event-handler-event-methods/_config.js b/test/runtime/samples/event-handler-event-methods/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-event-methods/_config.js
rename to test/runtime/samples/event-handler-event-methods/_config.js
diff --git a/test/generator/samples/event-handler-event-methods/main.html b/test/runtime/samples/event-handler-event-methods/main.html
similarity index 100%
rename from test/generator/samples/event-handler-event-methods/main.html
rename to test/runtime/samples/event-handler-event-methods/main.html
diff --git a/test/generator/samples/event-handler-removal/_config.js b/test/runtime/samples/event-handler-removal/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-removal/_config.js
rename to test/runtime/samples/event-handler-removal/_config.js
diff --git a/test/generator/samples/event-handler-removal/main.html b/test/runtime/samples/event-handler-removal/main.html
similarity index 100%
rename from test/generator/samples/event-handler-removal/main.html
rename to test/runtime/samples/event-handler-removal/main.html
diff --git a/test/generator/samples/event-handler-this-methods/_config.js b/test/runtime/samples/event-handler-this-methods/_config.js
similarity index 100%
rename from test/generator/samples/event-handler-this-methods/_config.js
rename to test/runtime/samples/event-handler-this-methods/_config.js
diff --git a/test/generator/samples/event-handler-this-methods/main.html b/test/runtime/samples/event-handler-this-methods/main.html
similarity index 100%
rename from test/generator/samples/event-handler-this-methods/main.html
rename to test/runtime/samples/event-handler-this-methods/main.html
diff --git a/test/generator/samples/event-handler/_config.js b/test/runtime/samples/event-handler/_config.js
similarity index 100%
rename from test/generator/samples/event-handler/_config.js
rename to test/runtime/samples/event-handler/_config.js
diff --git a/test/generator/samples/event-handler/main.html b/test/runtime/samples/event-handler/main.html
similarity index 100%
rename from test/generator/samples/event-handler/main.html
rename to test/runtime/samples/event-handler/main.html
diff --git a/test/generator/samples/events-custom/_config.js b/test/runtime/samples/events-custom/_config.js
similarity index 100%
rename from test/generator/samples/events-custom/_config.js
rename to test/runtime/samples/events-custom/_config.js
diff --git a/test/generator/samples/events-custom/main.html b/test/runtime/samples/events-custom/main.html
similarity index 100%
rename from test/generator/samples/events-custom/main.html
rename to test/runtime/samples/events-custom/main.html
diff --git a/test/generator/samples/events-lifecycle/_config.js b/test/runtime/samples/events-lifecycle/_config.js
similarity index 100%
rename from test/generator/samples/events-lifecycle/_config.js
rename to test/runtime/samples/events-lifecycle/_config.js
diff --git a/test/generator/samples/events-lifecycle/main.html b/test/runtime/samples/events-lifecycle/main.html
similarity index 100%
rename from test/generator/samples/events-lifecycle/main.html
rename to test/runtime/samples/events-lifecycle/main.html
diff --git a/test/generator/samples/function-in-expression/_config.js b/test/runtime/samples/function-in-expression/_config.js
similarity index 100%
rename from test/generator/samples/function-in-expression/_config.js
rename to test/runtime/samples/function-in-expression/_config.js
diff --git a/test/generator/samples/function-in-expression/main.html b/test/runtime/samples/function-in-expression/main.html
similarity index 100%
rename from test/generator/samples/function-in-expression/main.html
rename to test/runtime/samples/function-in-expression/main.html
diff --git a/test/generator/samples/get-state/_config.js b/test/runtime/samples/get-state/_config.js
similarity index 100%
rename from test/generator/samples/get-state/_config.js
rename to test/runtime/samples/get-state/_config.js
diff --git a/test/generator/samples/get-state/main.html b/test/runtime/samples/get-state/main.html
similarity index 100%
rename from test/generator/samples/get-state/main.html
rename to test/runtime/samples/get-state/main.html
diff --git a/test/generator/samples/globals-accessible-directly/_config.js b/test/runtime/samples/globals-accessible-directly/_config.js
similarity index 100%
rename from test/generator/samples/globals-accessible-directly/_config.js
rename to test/runtime/samples/globals-accessible-directly/_config.js
diff --git a/test/generator/samples/globals-accessible-directly/main.html b/test/runtime/samples/globals-accessible-directly/main.html
similarity index 100%
rename from test/generator/samples/globals-accessible-directly/main.html
rename to test/runtime/samples/globals-accessible-directly/main.html
diff --git a/test/generator/samples/globals-not-dereferenced/_config.js b/test/runtime/samples/globals-not-dereferenced/_config.js
similarity index 100%
rename from test/generator/samples/globals-not-dereferenced/_config.js
rename to test/runtime/samples/globals-not-dereferenced/_config.js
diff --git a/test/generator/samples/globals-not-dereferenced/main.html b/test/runtime/samples/globals-not-dereferenced/main.html
similarity index 100%
rename from test/generator/samples/globals-not-dereferenced/main.html
rename to test/runtime/samples/globals-not-dereferenced/main.html
diff --git a/test/generator/samples/globals-shadowed-by-data/_config.js b/test/runtime/samples/globals-shadowed-by-data/_config.js
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-data/_config.js
rename to test/runtime/samples/globals-shadowed-by-data/_config.js
diff --git a/test/generator/samples/globals-shadowed-by-data/main.html b/test/runtime/samples/globals-shadowed-by-data/main.html
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-data/main.html
rename to test/runtime/samples/globals-shadowed-by-data/main.html
diff --git a/test/generator/samples/globals-shadowed-by-helpers/_config.js b/test/runtime/samples/globals-shadowed-by-helpers/_config.js
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-helpers/_config.js
rename to test/runtime/samples/globals-shadowed-by-helpers/_config.js
diff --git a/test/generator/samples/globals-shadowed-by-helpers/main.html b/test/runtime/samples/globals-shadowed-by-helpers/main.html
similarity index 100%
rename from test/generator/samples/globals-shadowed-by-helpers/main.html
rename to test/runtime/samples/globals-shadowed-by-helpers/main.html
diff --git a/test/generator/samples/hello-world/_config.js b/test/runtime/samples/hello-world/_config.js
similarity index 100%
rename from test/generator/samples/hello-world/_config.js
rename to test/runtime/samples/hello-world/_config.js
diff --git a/test/generator/samples/hello-world/main.html b/test/runtime/samples/hello-world/main.html
similarity index 100%
rename from test/generator/samples/hello-world/main.html
rename to test/runtime/samples/hello-world/main.html
diff --git a/test/generator/samples/helpers/_config.js b/test/runtime/samples/helpers/_config.js
similarity index 100%
rename from test/generator/samples/helpers/_config.js
rename to test/runtime/samples/helpers/_config.js
diff --git a/test/generator/samples/helpers/main.html b/test/runtime/samples/helpers/main.html
similarity index 100%
rename from test/generator/samples/helpers/main.html
rename to test/runtime/samples/helpers/main.html
diff --git a/test/generator/samples/if-block-else/_config.js b/test/runtime/samples/if-block-else/_config.js
similarity index 100%
rename from test/generator/samples/if-block-else/_config.js
rename to test/runtime/samples/if-block-else/_config.js
diff --git a/test/generator/samples/if-block-else/main.html b/test/runtime/samples/if-block-else/main.html
similarity index 100%
rename from test/generator/samples/if-block-else/main.html
rename to test/runtime/samples/if-block-else/main.html
diff --git a/test/generator/samples/if-block-elseif-text/_config.js b/test/runtime/samples/if-block-elseif-text/_config.js
similarity index 100%
rename from test/generator/samples/if-block-elseif-text/_config.js
rename to test/runtime/samples/if-block-elseif-text/_config.js
diff --git a/test/generator/samples/if-block-elseif-text/main.html b/test/runtime/samples/if-block-elseif-text/main.html
similarity index 100%
rename from test/generator/samples/if-block-elseif-text/main.html
rename to test/runtime/samples/if-block-elseif-text/main.html
diff --git a/test/generator/samples/if-block-elseif/_config.js b/test/runtime/samples/if-block-elseif/_config.js
similarity index 100%
rename from test/generator/samples/if-block-elseif/_config.js
rename to test/runtime/samples/if-block-elseif/_config.js
diff --git a/test/generator/samples/if-block-elseif/main.html b/test/runtime/samples/if-block-elseif/main.html
similarity index 100%
rename from test/generator/samples/if-block-elseif/main.html
rename to test/runtime/samples/if-block-elseif/main.html
diff --git a/test/generator/samples/if-block-expression/_config.js b/test/runtime/samples/if-block-expression/_config.js
similarity index 100%
rename from test/generator/samples/if-block-expression/_config.js
rename to test/runtime/samples/if-block-expression/_config.js
diff --git a/test/generator/samples/if-block-expression/main.html b/test/runtime/samples/if-block-expression/main.html
similarity index 100%
rename from test/generator/samples/if-block-expression/main.html
rename to test/runtime/samples/if-block-expression/main.html
diff --git a/test/generator/samples/if-block-widget/Widget.html b/test/runtime/samples/if-block-widget/Widget.html
similarity index 100%
rename from test/generator/samples/if-block-widget/Widget.html
rename to test/runtime/samples/if-block-widget/Widget.html
diff --git a/test/generator/samples/if-block-widget/_config.js b/test/runtime/samples/if-block-widget/_config.js
similarity index 100%
rename from test/generator/samples/if-block-widget/_config.js
rename to test/runtime/samples/if-block-widget/_config.js
diff --git a/test/generator/samples/if-block-widget/main.html b/test/runtime/samples/if-block-widget/main.html
similarity index 100%
rename from test/generator/samples/if-block-widget/main.html
rename to test/runtime/samples/if-block-widget/main.html
diff --git a/test/generator/samples/if-block/_config.js b/test/runtime/samples/if-block/_config.js
similarity index 100%
rename from test/generator/samples/if-block/_config.js
rename to test/runtime/samples/if-block/_config.js
diff --git a/test/generator/samples/if-block/main.html b/test/runtime/samples/if-block/main.html
similarity index 100%
rename from test/generator/samples/if-block/main.html
rename to test/runtime/samples/if-block/main.html
diff --git a/test/generator/samples/imported-renamed-components/ComponentOne.html b/test/runtime/samples/imported-renamed-components/ComponentOne.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/ComponentOne.html
rename to test/runtime/samples/imported-renamed-components/ComponentOne.html
diff --git a/test/generator/samples/imported-renamed-components/ComponentTwo.html b/test/runtime/samples/imported-renamed-components/ComponentTwo.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/ComponentTwo.html
rename to test/runtime/samples/imported-renamed-components/ComponentTwo.html
diff --git a/test/generator/samples/imported-renamed-components/_config.js b/test/runtime/samples/imported-renamed-components/_config.js
similarity index 100%
rename from test/generator/samples/imported-renamed-components/_config.js
rename to test/runtime/samples/imported-renamed-components/_config.js
diff --git a/test/generator/samples/imported-renamed-components/main.html b/test/runtime/samples/imported-renamed-components/main.html
similarity index 100%
rename from test/generator/samples/imported-renamed-components/main.html
rename to test/runtime/samples/imported-renamed-components/main.html
diff --git a/test/generator/samples/inline-expressions/_config.js b/test/runtime/samples/inline-expressions/_config.js
similarity index 100%
rename from test/generator/samples/inline-expressions/_config.js
rename to test/runtime/samples/inline-expressions/_config.js
diff --git a/test/generator/samples/inline-expressions/main.html b/test/runtime/samples/inline-expressions/main.html
similarity index 100%
rename from test/generator/samples/inline-expressions/main.html
rename to test/runtime/samples/inline-expressions/main.html
diff --git a/test/generator/samples/input-list/_config.js b/test/runtime/samples/input-list/_config.js
similarity index 100%
rename from test/generator/samples/input-list/_config.js
rename to test/runtime/samples/input-list/_config.js
diff --git a/test/generator/samples/input-list/main.html b/test/runtime/samples/input-list/main.html
similarity index 100%
rename from test/generator/samples/input-list/main.html
rename to test/runtime/samples/input-list/main.html
diff --git a/test/generator/samples/lifecycle-events/_config.js b/test/runtime/samples/lifecycle-events/_config.js
similarity index 100%
rename from test/generator/samples/lifecycle-events/_config.js
rename to test/runtime/samples/lifecycle-events/_config.js
diff --git a/test/generator/samples/lifecycle-events/main.html b/test/runtime/samples/lifecycle-events/main.html
similarity index 100%
rename from test/generator/samples/lifecycle-events/main.html
rename to test/runtime/samples/lifecycle-events/main.html
diff --git a/test/generator/samples/names-deconflicted-nested/_config.js b/test/runtime/samples/names-deconflicted-nested/_config.js
similarity index 100%
rename from test/generator/samples/names-deconflicted-nested/_config.js
rename to test/runtime/samples/names-deconflicted-nested/_config.js
diff --git a/test/generator/samples/names-deconflicted-nested/main.html b/test/runtime/samples/names-deconflicted-nested/main.html
similarity index 100%
rename from test/generator/samples/names-deconflicted-nested/main.html
rename to test/runtime/samples/names-deconflicted-nested/main.html
diff --git a/test/generator/samples/names-deconflicted/Widget.html b/test/runtime/samples/names-deconflicted/Widget.html
similarity index 100%
rename from test/generator/samples/names-deconflicted/Widget.html
rename to test/runtime/samples/names-deconflicted/Widget.html
diff --git a/test/generator/samples/names-deconflicted/_config.js b/test/runtime/samples/names-deconflicted/_config.js
similarity index 100%
rename from test/generator/samples/names-deconflicted/_config.js
rename to test/runtime/samples/names-deconflicted/_config.js
diff --git a/test/generator/samples/names-deconflicted/main.html b/test/runtime/samples/names-deconflicted/main.html
similarity index 100%
rename from test/generator/samples/names-deconflicted/main.html
rename to test/runtime/samples/names-deconflicted/main.html
diff --git a/test/generator/samples/nbsp/_config.js b/test/runtime/samples/nbsp/_config.js
similarity index 100%
rename from test/generator/samples/nbsp/_config.js
rename to test/runtime/samples/nbsp/_config.js
diff --git a/test/generator/samples/nbsp/main.html b/test/runtime/samples/nbsp/main.html
similarity index 100%
rename from test/generator/samples/nbsp/main.html
rename to test/runtime/samples/nbsp/main.html
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/Foo.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/Foo.html
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/Foo.html
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/_config.js b/test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/_config.js
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/_config.js
diff --git a/test/generator/samples/observe-component-ignores-irrelevant-changes/main.html b/test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
similarity index 100%
rename from test/generator/samples/observe-component-ignores-irrelevant-changes/main.html
rename to test/runtime/samples/observe-component-ignores-irrelevant-changes/main.html
diff --git a/test/generator/samples/observe-prevents-loop/_config.js b/test/runtime/samples/observe-prevents-loop/_config.js
similarity index 100%
rename from test/generator/samples/observe-prevents-loop/_config.js
rename to test/runtime/samples/observe-prevents-loop/_config.js
diff --git a/test/generator/samples/observe-prevents-loop/main.html b/test/runtime/samples/observe-prevents-loop/main.html
similarity index 100%
rename from test/generator/samples/observe-prevents-loop/main.html
rename to test/runtime/samples/observe-prevents-loop/main.html
diff --git a/test/generator/samples/onrender-chain/Item.html b/test/runtime/samples/onrender-chain/Item.html
similarity index 100%
rename from test/generator/samples/onrender-chain/Item.html
rename to test/runtime/samples/onrender-chain/Item.html
diff --git a/test/generator/samples/onrender-chain/List.html b/test/runtime/samples/onrender-chain/List.html
similarity index 100%
rename from test/generator/samples/onrender-chain/List.html
rename to test/runtime/samples/onrender-chain/List.html
diff --git a/test/generator/samples/onrender-chain/_config.js b/test/runtime/samples/onrender-chain/_config.js
similarity index 100%
rename from test/generator/samples/onrender-chain/_config.js
rename to test/runtime/samples/onrender-chain/_config.js
diff --git a/test/generator/samples/onrender-chain/main.html b/test/runtime/samples/onrender-chain/main.html
similarity index 100%
rename from test/generator/samples/onrender-chain/main.html
rename to test/runtime/samples/onrender-chain/main.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/ParentWidget.html b/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/ParentWidget.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/Widget.html b/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/Widget.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/Widget.html
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/_config.js b/test/runtime/samples/onrender-fires-when-ready-nested/_config.js
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/_config.js
rename to test/runtime/samples/onrender-fires-when-ready-nested/_config.js
diff --git a/test/generator/samples/onrender-fires-when-ready-nested/main.html b/test/runtime/samples/onrender-fires-when-ready-nested/main.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready-nested/main.html
rename to test/runtime/samples/onrender-fires-when-ready-nested/main.html
diff --git a/test/generator/samples/onrender-fires-when-ready/Widget.html b/test/runtime/samples/onrender-fires-when-ready/Widget.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/Widget.html
rename to test/runtime/samples/onrender-fires-when-ready/Widget.html
diff --git a/test/generator/samples/onrender-fires-when-ready/_config.js b/test/runtime/samples/onrender-fires-when-ready/_config.js
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/_config.js
rename to test/runtime/samples/onrender-fires-when-ready/_config.js
diff --git a/test/generator/samples/onrender-fires-when-ready/main.html b/test/runtime/samples/onrender-fires-when-ready/main.html
similarity index 100%
rename from test/generator/samples/onrender-fires-when-ready/main.html
rename to test/runtime/samples/onrender-fires-when-ready/main.html
diff --git a/test/generator/samples/pass-no-options/_config.js b/test/runtime/samples/pass-no-options/_config.js
similarity index 100%
rename from test/generator/samples/pass-no-options/_config.js
rename to test/runtime/samples/pass-no-options/_config.js
diff --git a/test/generator/samples/pass-no-options/main.html b/test/runtime/samples/pass-no-options/main.html
similarity index 100%
rename from test/generator/samples/pass-no-options/main.html
rename to test/runtime/samples/pass-no-options/main.html
diff --git a/test/generator/samples/raw-mustaches-preserved/_config.js b/test/runtime/samples/raw-mustaches-preserved/_config.js
similarity index 100%
rename from test/generator/samples/raw-mustaches-preserved/_config.js
rename to test/runtime/samples/raw-mustaches-preserved/_config.js
diff --git a/test/generator/samples/raw-mustaches-preserved/main.html b/test/runtime/samples/raw-mustaches-preserved/main.html
similarity index 100%
rename from test/generator/samples/raw-mustaches-preserved/main.html
rename to test/runtime/samples/raw-mustaches-preserved/main.html
diff --git a/test/generator/samples/raw-mustaches/_config.js b/test/runtime/samples/raw-mustaches/_config.js
similarity index 100%
rename from test/generator/samples/raw-mustaches/_config.js
rename to test/runtime/samples/raw-mustaches/_config.js
diff --git a/test/generator/samples/raw-mustaches/main.html b/test/runtime/samples/raw-mustaches/main.html
similarity index 100%
rename from test/generator/samples/raw-mustaches/main.html
rename to test/runtime/samples/raw-mustaches/main.html
diff --git a/test/generator/samples/refs-unset/_config.js b/test/runtime/samples/refs-unset/_config.js
similarity index 100%
rename from test/generator/samples/refs-unset/_config.js
rename to test/runtime/samples/refs-unset/_config.js
diff --git a/test/generator/samples/refs-unset/main.html b/test/runtime/samples/refs-unset/main.html
similarity index 100%
rename from test/generator/samples/refs-unset/main.html
rename to test/runtime/samples/refs-unset/main.html
diff --git a/test/generator/samples/refs/_config.js b/test/runtime/samples/refs/_config.js
similarity index 100%
rename from test/generator/samples/refs/_config.js
rename to test/runtime/samples/refs/_config.js
diff --git a/test/generator/samples/refs/main.html b/test/runtime/samples/refs/main.html
similarity index 100%
rename from test/generator/samples/refs/main.html
rename to test/runtime/samples/refs/main.html
diff --git a/test/generator/samples/select-one-way-bind/_config.js b/test/runtime/samples/select-one-way-bind/_config.js
similarity index 100%
rename from test/generator/samples/select-one-way-bind/_config.js
rename to test/runtime/samples/select-one-way-bind/_config.js
diff --git a/test/generator/samples/select-one-way-bind/main.html b/test/runtime/samples/select-one-way-bind/main.html
similarity index 100%
rename from test/generator/samples/select-one-way-bind/main.html
rename to test/runtime/samples/select-one-way-bind/main.html
diff --git a/test/generator/samples/select/_config.js b/test/runtime/samples/select/_config.js
similarity index 100%
rename from test/generator/samples/select/_config.js
rename to test/runtime/samples/select/_config.js
diff --git a/test/generator/samples/select/main.html b/test/runtime/samples/select/main.html
similarity index 100%
rename from test/generator/samples/select/main.html
rename to test/runtime/samples/select/main.html
diff --git a/test/generator/samples/self-reference-tree/_config.js b/test/runtime/samples/self-reference-tree/_config.js
similarity index 100%
rename from test/generator/samples/self-reference-tree/_config.js
rename to test/runtime/samples/self-reference-tree/_config.js
diff --git a/test/generator/samples/self-reference-tree/main.html b/test/runtime/samples/self-reference-tree/main.html
similarity index 100%
rename from test/generator/samples/self-reference-tree/main.html
rename to test/runtime/samples/self-reference-tree/main.html
diff --git a/test/generator/samples/self-reference/_config.js b/test/runtime/samples/self-reference/_config.js
similarity index 100%
rename from test/generator/samples/self-reference/_config.js
rename to test/runtime/samples/self-reference/_config.js
diff --git a/test/generator/samples/self-reference/main.html b/test/runtime/samples/self-reference/main.html
similarity index 100%
rename from test/generator/samples/self-reference/main.html
rename to test/runtime/samples/self-reference/main.html
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/Widget.html b/test/runtime/samples/set-in-observe-dedupes-renders/Widget.html
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/Widget.html
rename to test/runtime/samples/set-in-observe-dedupes-renders/Widget.html
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/_config.js b/test/runtime/samples/set-in-observe-dedupes-renders/_config.js
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/_config.js
rename to test/runtime/samples/set-in-observe-dedupes-renders/_config.js
diff --git a/test/generator/samples/set-in-observe-dedupes-renders/main.html b/test/runtime/samples/set-in-observe-dedupes-renders/main.html
similarity index 100%
rename from test/generator/samples/set-in-observe-dedupes-renders/main.html
rename to test/runtime/samples/set-in-observe-dedupes-renders/main.html
diff --git a/test/generator/samples/set-in-observe/_config.js b/test/runtime/samples/set-in-observe/_config.js
similarity index 100%
rename from test/generator/samples/set-in-observe/_config.js
rename to test/runtime/samples/set-in-observe/_config.js
diff --git a/test/generator/samples/set-in-observe/main.html b/test/runtime/samples/set-in-observe/main.html
similarity index 100%
rename from test/generator/samples/set-in-observe/main.html
rename to test/runtime/samples/set-in-observe/main.html
diff --git a/test/generator/samples/set-in-onrender/_config.js b/test/runtime/samples/set-in-onrender/_config.js
similarity index 100%
rename from test/generator/samples/set-in-onrender/_config.js
rename to test/runtime/samples/set-in-onrender/_config.js
diff --git a/test/generator/samples/set-in-onrender/main.html b/test/runtime/samples/set-in-onrender/main.html
similarity index 100%
rename from test/generator/samples/set-in-onrender/main.html
rename to test/runtime/samples/set-in-onrender/main.html
diff --git a/test/generator/samples/set-prevents-loop/Foo.html b/test/runtime/samples/set-prevents-loop/Foo.html
similarity index 100%
rename from test/generator/samples/set-prevents-loop/Foo.html
rename to test/runtime/samples/set-prevents-loop/Foo.html
diff --git a/test/generator/samples/set-prevents-loop/_config.js b/test/runtime/samples/set-prevents-loop/_config.js
similarity index 100%
rename from test/generator/samples/set-prevents-loop/_config.js
rename to test/runtime/samples/set-prevents-loop/_config.js
diff --git a/test/generator/samples/set-prevents-loop/main.html b/test/runtime/samples/set-prevents-loop/main.html
similarity index 100%
rename from test/generator/samples/set-prevents-loop/main.html
rename to test/runtime/samples/set-prevents-loop/main.html
diff --git a/test/generator/samples/single-static-element/_config.js b/test/runtime/samples/single-static-element/_config.js
similarity index 100%
rename from test/generator/samples/single-static-element/_config.js
rename to test/runtime/samples/single-static-element/_config.js
diff --git a/test/generator/samples/single-static-element/main.html b/test/runtime/samples/single-static-element/main.html
similarity index 100%
rename from test/generator/samples/single-static-element/main.html
rename to test/runtime/samples/single-static-element/main.html
diff --git a/test/generator/samples/single-text-node/_config.js b/test/runtime/samples/single-text-node/_config.js
similarity index 100%
rename from test/generator/samples/single-text-node/_config.js
rename to test/runtime/samples/single-text-node/_config.js
diff --git a/test/generator/samples/single-text-node/main.html b/test/runtime/samples/single-text-node/main.html
similarity index 100%
rename from test/generator/samples/single-text-node/main.html
rename to test/runtime/samples/single-text-node/main.html
diff --git a/test/generator/samples/svg-attributes/_config.js b/test/runtime/samples/svg-attributes/_config.js
similarity index 100%
rename from test/generator/samples/svg-attributes/_config.js
rename to test/runtime/samples/svg-attributes/_config.js
diff --git a/test/generator/samples/svg-attributes/main.html b/test/runtime/samples/svg-attributes/main.html
similarity index 100%
rename from test/generator/samples/svg-attributes/main.html
rename to test/runtime/samples/svg-attributes/main.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/Rect.html
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/_config.js b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/_config.js
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
diff --git a/test/generator/samples/svg-child-component-declared-namespace-shorthand/main.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace-shorthand/main.html
rename to test/runtime/samples/svg-child-component-declared-namespace-shorthand/main.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/Rect.html
rename to test/runtime/samples/svg-child-component-declared-namespace/Rect.html
diff --git a/test/generator/samples/svg-child-component-declared-namespace/_config.js b/test/runtime/samples/svg-child-component-declared-namespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/_config.js
rename to test/runtime/samples/svg-child-component-declared-namespace/_config.js
diff --git a/test/generator/samples/svg-child-component-declared-namespace/main.html b/test/runtime/samples/svg-child-component-declared-namespace/main.html
similarity index 100%
rename from test/generator/samples/svg-child-component-declared-namespace/main.html
rename to test/runtime/samples/svg-child-component-declared-namespace/main.html
diff --git a/test/generator/samples/svg-class/_config.js b/test/runtime/samples/svg-class/_config.js
similarity index 100%
rename from test/generator/samples/svg-class/_config.js
rename to test/runtime/samples/svg-class/_config.js
diff --git a/test/generator/samples/svg-class/main.html b/test/runtime/samples/svg-class/main.html
similarity index 100%
rename from test/generator/samples/svg-class/main.html
rename to test/runtime/samples/svg-class/main.html
diff --git a/test/generator/samples/svg-each-block-namespace/_config.js b/test/runtime/samples/svg-each-block-namespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-each-block-namespace/_config.js
rename to test/runtime/samples/svg-each-block-namespace/_config.js
diff --git a/test/generator/samples/svg-each-block-namespace/main.html b/test/runtime/samples/svg-each-block-namespace/main.html
similarity index 100%
rename from test/generator/samples/svg-each-block-namespace/main.html
rename to test/runtime/samples/svg-each-block-namespace/main.html
diff --git a/test/generator/samples/svg-multiple/_config.js b/test/runtime/samples/svg-multiple/_config.js
similarity index 100%
rename from test/generator/samples/svg-multiple/_config.js
rename to test/runtime/samples/svg-multiple/_config.js
diff --git a/test/generator/samples/svg-multiple/main.html b/test/runtime/samples/svg-multiple/main.html
similarity index 100%
rename from test/generator/samples/svg-multiple/main.html
rename to test/runtime/samples/svg-multiple/main.html
diff --git a/test/generator/samples/svg-no-whitespace/_config.js b/test/runtime/samples/svg-no-whitespace/_config.js
similarity index 100%
rename from test/generator/samples/svg-no-whitespace/_config.js
rename to test/runtime/samples/svg-no-whitespace/_config.js
diff --git a/test/generator/samples/svg-no-whitespace/main.html b/test/runtime/samples/svg-no-whitespace/main.html
similarity index 100%
rename from test/generator/samples/svg-no-whitespace/main.html
rename to test/runtime/samples/svg-no-whitespace/main.html
diff --git a/test/generator/samples/svg-xlink/_config.js b/test/runtime/samples/svg-xlink/_config.js
similarity index 100%
rename from test/generator/samples/svg-xlink/_config.js
rename to test/runtime/samples/svg-xlink/_config.js
diff --git a/test/generator/samples/svg-xlink/main.html b/test/runtime/samples/svg-xlink/main.html
similarity index 100%
rename from test/generator/samples/svg-xlink/main.html
rename to test/runtime/samples/svg-xlink/main.html
diff --git a/test/generator/samples/svg-xmlns/_config.js b/test/runtime/samples/svg-xmlns/_config.js
similarity index 100%
rename from test/generator/samples/svg-xmlns/_config.js
rename to test/runtime/samples/svg-xmlns/_config.js
diff --git a/test/generator/samples/svg-xmlns/main.html b/test/runtime/samples/svg-xmlns/main.html
similarity index 100%
rename from test/generator/samples/svg-xmlns/main.html
rename to test/runtime/samples/svg-xmlns/main.html
diff --git a/test/generator/samples/svg/_config.js b/test/runtime/samples/svg/_config.js
similarity index 100%
rename from test/generator/samples/svg/_config.js
rename to test/runtime/samples/svg/_config.js
diff --git a/test/generator/samples/svg/main.html b/test/runtime/samples/svg/main.html
similarity index 100%
rename from test/generator/samples/svg/main.html
rename to test/runtime/samples/svg/main.html
diff --git a/test/generator/samples/window-binding-resize/_config.js b/test/runtime/samples/window-binding-resize/_config.js
similarity index 100%
rename from test/generator/samples/window-binding-resize/_config.js
rename to test/runtime/samples/window-binding-resize/_config.js
diff --git a/test/generator/samples/window-binding-resize/main.html b/test/runtime/samples/window-binding-resize/main.html
similarity index 100%
rename from test/generator/samples/window-binding-resize/main.html
rename to test/runtime/samples/window-binding-resize/main.html
diff --git a/test/generator/samples/window-event/_config.js b/test/runtime/samples/window-event/_config.js
similarity index 100%
rename from test/generator/samples/window-event/_config.js
rename to test/runtime/samples/window-event/_config.js
diff --git a/test/generator/samples/window-event/main.html b/test/runtime/samples/window-event/main.html
similarity index 100%
rename from test/generator/samples/window-event/main.html
rename to test/runtime/samples/window-event/main.html
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 8fa6f74e0a89..d9ac917e54c6 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -81,10 +81,10 @@ describe( 'ssr', () => {
 	});
 
 	// duplicate client-side tests, as far as possible
-	fs.readdirSync( 'test/generator/samples' ).forEach( dir => {
+	fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
 		if ( dir[0] === '.' ) return;
 
-		const config = loadConfig( `./generator/samples/${dir}/_config.js` );
+		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
 
 		if ( config.solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
@@ -96,7 +96,7 @@ describe( 'ssr', () => {
 			let compiled;
 
 			try {
-				const source = fs.readFileSync( `test/generator/samples/${dir}/main.html`, 'utf-8' );
+				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
 				compiled = svelte.compile( source, { generate: 'ssr' });
 			} catch ( err ) {
 				if ( config.compileError ) {
@@ -107,7 +107,7 @@ describe( 'ssr', () => {
 				}
 			}
 
-			const component = require( `../generator/samples/${dir}/main.html` );
+			const component = require( `../runtime/samples/${dir}/main.html` );
 			let html;
 
 			try {

From f43e71b959bf83d39e789c898e7ad63ac5e600e2 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 17:55:31 -0400
Subject: [PATCH 02/31] remove #433 test for now

---
 .../samples/event-handlers-custom/expected.js | 205 ------------------
 .../samples/event-handlers-custom/input.html  |  17 --
 2 files changed, 222 deletions(-)
 delete mode 100644 test/js/samples/event-handlers-custom/expected.js
 delete mode 100644 test/js/samples/event-handlers-custom/input.html

diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js
deleted file mode 100644
index 71e633d752f2..000000000000
--- a/test/js/samples/event-handlers-custom/expected.js
+++ /dev/null
@@ -1,205 +0,0 @@
-var template = (function () {
-	return {
-		methods: {
-			foo ( bar ) {
-				console.log( bar );
-			}
-		},
-
-		events: {
-			foo ( node, callback ) {
-				// code goes here
-			}
-		}
-	};
-}());
-
-function render_main_fragment ( root, component ) {
-	var button = createElement( 'button' );
-	
-	var foo_handler = template.events.foo.call( component, button, function ( event ) {
-		var root = component.get();
-		
-		component.foo( root.bar );
-	}.bind( button ) );
-	
-	appendNode( createText( "foo" ), button );
-
-	return {
-		mount: function ( target, anchor ) {
-			insertNode( button, target, anchor );
-		},
-		
-		update: noop,
-		
-		teardown: function ( detach ) {
-			foo_handler.teardown();
-			
-			if ( detach ) {
-				detachNode( button );
-			}
-		}
-	};
-}
-
-function SvelteComponent ( options ) {
-	options = options || {};
-	this._state = options.data || {};
-	
-	this._observers = {
-		pre: Object.create( null ),
-		post: Object.create( null )
-	};
-	
-	this._handlers = Object.create( null );
-	
-	this._root = options._root;
-	this._yield = options._yield;
-	
-	this._torndown = false;
-	
-	this._fragment = render_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
-}
-
-assign( SvelteComponent.prototype, template.methods, {
-	get: get,
-	fire: fire,
-	observe: observe,
-	on: on,
-	set: set,
-	_flush: _flush
-});
-
-SvelteComponent.prototype._set = function _set ( newState ) {
-	var oldState = this._state;
-	this._state = assign( {}, oldState, newState );
-	
-	dispatchObservers( this, this._observers.pre, newState, oldState );
-	if ( this._fragment ) this._fragment.update( newState, this._state );
-	dispatchObservers( this, this._observers.post, newState, oldState );
-};
-
-SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
-	this.fire( 'destroy' );
-
-	this._fragment.teardown( detach !== false );
-	this._fragment = null;
-
-	this._state = {};
-	this._torndown = true;
-};
-
-function createElement( name ) {
-	return document.createElement( name );
-}
-
-function detachNode( node ) {
-	node.parentNode.removeChild( node );
-}
-
-function insertNode( node, target, anchor ) {
-	target.insertBefore( node, anchor );
-}
-
-function createText( data ) {
-	return document.createTextNode( data );
-}
-
-function appendNode( node, target ) {
-	target.appendChild( node );
-}
-
-function assign( target ) {
-	for ( var i = 1; i < arguments.length; i += 1 ) {
-		var source = arguments[i];
-		for ( var k in source ) target[k] = source[k];
-	}
-
-	return target;
-}
-
-function dispatchObservers( component, group, newState, oldState ) {
-	for ( var key in group ) {
-		if ( !( key in newState ) ) continue;
-
-		var newValue = newState[ key ];
-		var oldValue = oldState[ key ];
-
-		if ( newValue === oldValue && typeof newValue !== 'object' ) continue;
-
-		var callbacks = group[ key ];
-		if ( !callbacks ) continue;
-
-		for ( var i = 0; i < callbacks.length; i += 1 ) {
-			var callback = callbacks[i];
-			if ( callback.__calling ) continue;
-
-			callback.__calling = true;
-			callback.call( component, newValue, oldValue );
-			callback.__calling = false;
-		}
-	}
-}
-
-function get( key ) {
-	return key ? this._state[ key ] : this._state;
-}
-
-function fire( eventName, data ) {
-	var handlers = eventName in this._handlers && this._handlers[ eventName ].slice();
-	if ( !handlers ) return;
-
-	for ( var i = 0; i < handlers.length; i += 1 ) {
-		handlers[i].call( this, data );
-	}
-}
-
-function observe( key, callback, options ) {
-	var group = ( options && options.defer ) ? this._observers.pre : this._observers.post;
-
-	( group[ key ] || ( group[ key ] = [] ) ).push( callback );
-
-	if ( !options || options.init !== false ) {
-		callback.__calling = true;
-		callback.call( this, this._state[ key ] );
-		callback.__calling = false;
-	}
-
-	return {
-		cancel: function () {
-			var index = group[ key ].indexOf( callback );
-			if ( ~index ) group[ key ].splice( index, 1 );
-		}
-	};
-}
-
-function on( eventName, handler ) {
-	if ( eventName === 'teardown' ) return this.on( 'destroy', handler );
-
-	var handlers = this._handlers[ eventName ] || ( this._handlers[ eventName ] = [] );
-	handlers.push( handler );
-
-	return {
-		cancel: function () {
-			var index = handlers.indexOf( handler );
-			if ( ~index ) handlers.splice( index, 1 );
-		}
-	};
-}
-
-function set( newState ) {
-	this._set( newState );
-	( this._root || this )._flush();
-}
-
-function _flush() {
-	if ( !this._renderHooks ) return;
-
-	while ( this._renderHooks.length ) {
-		var hook = this._renderHooks.pop();
-		hook.fn.call( hook.context );
-	}
-}
-
-export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/event-handlers-custom/input.html b/test/js/samples/event-handlers-custom/input.html
deleted file mode 100644
index 77c530fcf632..000000000000
--- a/test/js/samples/event-handlers-custom/input.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<button on:foo='foo( bar )'>foo</button>
-
-<script>
-	export default {
-		methods: {
-			foo ( bar ) {
-				console.log( bar );
-			}
-		},
-
-		events: {
-			foo ( node, callback ) {
-				// code goes here
-			}
-		}
-	};
-</script>
\ No newline at end of file

From 77eee8602d623d2db0a28878266e7c17410f011e Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 17:55:44 -0400
Subject: [PATCH 03/31] remove some long-since obsolete generator code

---
 src/generators/Generator.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index 65b391d20b8c..0f73292b91cb 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -154,15 +154,6 @@ export default class Generator {
 		};
 	}
 
-	fire ( eventName, data ) {
-		const handlers = this._callbacks.has( eventName ) && this._callbacks.get( eventName ).slice();
-		if ( !handlers ) return;
-
-		for ( let i = 0; i < handlers.length; i += 1 ) {
-			handlers[i].call( this, data );
-		}
-	}
-
 	generate ( result, options, { name, format } ) {
 		if ( this.imports.length ) {
 			const statements = [];
@@ -431,14 +422,6 @@ export default class Generator {
 		};
 	}
 
-	on ( eventName, handler ) {
-		if ( this._callbacks.has( eventName ) ) {
-			this._callbacks.get( eventName ).push( handler );
-		} else {
-			this._callbacks.set( eventName, [ handler ] );
-		}
-	}
-
 	pop () {
 		const tail = this.current;
 		this.current = tail.parent;

From 00f1eaee12162142c1fcc05d03df892ac2d69887 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 18:15:07 -0400
Subject: [PATCH 04/31] remove this._callbacks

---
 src/generators/Generator.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index 0f73292b91cb..ddd2dec79746 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -43,8 +43,6 @@ export default class Generator {
 		this.importedNames = new Set();
 		this._aliases = new Map();
 		this._usedNames = new Set();
-
-		this._callbacks = new Map();
 	}
 
 	addSourcemapLocations ( node ) {

From 2d4f9eac00fce55b56b1de50d231f79e904b9fa4 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 22:55:30 -0400
Subject: [PATCH 05/31] make visitors responsible for visiting their own
 children

---
 src/generators/Generator.js                   | 26 +------------------
 src/generators/dom/index.js                   | 14 +++++-----
 src/generators/dom/visit.js                   |  8 ++++++
 src/generators/dom/visitors/Component.js      | 11 ++++++--
 src/generators/dom/visitors/EachBlock.js      |  7 +++--
 src/generators/dom/visitors/Element.js        | 17 ++++++------
 src/generators/server-side-rendering/index.js | 12 +++++----
 src/generators/server-side-rendering/visit.js |  8 ++++++
 .../visitors/Component.js                     | 11 ++++++--
 .../visitors/EachBlock.js                     |  8 ++++--
 .../server-side-rendering/visitors/Element.js | 11 ++++++--
 .../server-side-rendering/visitors/IfBlock.js | 16 +++++++++---
 12 files changed, 92 insertions(+), 57 deletions(-)
 create mode 100644 src/generators/dom/visit.js
 create mode 100644 src/generators/server-side-rendering/visit.js

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index ddd2dec79746..d1956ed73460 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -12,11 +12,10 @@ import processCss from './shared/processCss.js';
 import annotateWithScopes from './annotateWithScopes.js';
 
 export default class Generator {
-	constructor ( parsed, source, name, visitors, options ) {
+	constructor ( parsed, source, name, options ) {
 		this.parsed = parsed;
 		this.source = source;
 		this.name = name;
-		this.visitors = visitors;
 		this.options = options;
 
 		this.imports = [];
@@ -434,27 +433,4 @@ export default class Generator {
 
 		this.current = newFragment;
 	}
-
-	visit ( node ) {
-		const visitor = this.visitors[ node.type ];
-		if ( !visitor ) throw new Error( `Not implemented: ${node.type}` );
-
-		if ( visitor.enter ) visitor.enter( this, node );
-
-		if ( visitor.type === 'Element' ) {
-			this.elementDepth += 1;
-		}
-
-		if ( node.children ) {
-			node.children.forEach( child => {
-				this.visit( child );
-			});
-		}
-
-		if ( visitor.type === 'Element' ) {
-			this.elementDepth -= 1;
-		}
-
-		if ( visitor.leave ) visitor.leave( this, node );
-	}
 }
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 4f829776fdf7..3e86ead4352c 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -1,13 +1,13 @@
 import deindent from '../../utils/deindent.js';
 import getBuilders from './utils/getBuilders.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
-import visitors from './visitors/index.js';
+import visit from './visit.js';
 import Generator from '../Generator.js';
 import * as shared from '../../shared/index.js';
 
 class DomGenerator extends Generator {
-	constructor ( parsed, source, name, visitors, options ) {
-		super( parsed, source, name, visitors, options );
+	constructor ( parsed, source, name, options ) {
+		super( parsed, source, name, options );
 		this.renderers = [];
 		this.uses = new Set();
 
@@ -126,7 +126,7 @@ class DomGenerator extends Generator {
 		});
 
 		// walk the children here
-		node.children.forEach( node => this.visit( node ) );
+		node.children.forEach( node => visit( node, this ) );
 		this.addRenderer( this.current );
 		this.pop();
 
@@ -149,7 +149,7 @@ export default function dom ( parsed, source, options ) {
 	const format = options.format || 'es';
 	const name = options.name || 'SvelteComponent';
 
-	const generator = new DomGenerator( parsed, source, name, visitors, options );
+	const generator = new DomGenerator( parsed, source, name, options );
 
 	const { computations, hasJs, templateProperties, namespace } = generator.parseJs();
 
@@ -177,7 +177,9 @@ export default function dom ( parsed, source, options ) {
 		getUniqueName,
 	});
 
-	parsed.html.children.forEach( node => generator.visit( node ) );
+	parsed.html.children.forEach( node => {
+		visit( node, generator );
+	});
 
 	generator.addRenderer( generator.pop() );
 
diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
new file mode 100644
index 000000000000..5f688e76acc1
--- /dev/null
+++ b/src/generators/dom/visit.js
@@ -0,0 +1,8 @@
+import visitors from './visitors/index.js';
+
+export default function visit ( node, generator ) {
+	const visitor = visitors[ node.type ];
+
+	if ( visitor.enter ) visitor.enter( generator, node );
+	if ( visitor.leave ) visitor.leave( generator, node );
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 69e2e3c2acf0..ed9cae89218d 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -1,5 +1,6 @@
 import deindent from '../../../utils/deindent.js';
 import CodeBuilder from '../../../utils/CodeBuilder.js';
+import visit from '../visit.js';
 import addComponentAttributes from './attributes/addComponentAttributes.js';
 
 function capDown ( name ) {
@@ -166,9 +167,15 @@ export default {
 			localElementDepth: current.localElementDepth + 1,
 			key: null
 		});
-	},
 
-	leave ( generator ) {
+		this.elementDepth += 1;
+
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
+		this.elementDepth -= 1;
+
 		generator.pop();
 	}
 };
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index df9936197fc4..716c5c1e34cf 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -1,6 +1,7 @@
 import CodeBuilder from '../../../utils/CodeBuilder.js';
 import deindent from '../../../utils/deindent.js';
 import getBuilders from '../utils/getBuilders.js';
+import visit from '../visit.js';
 
 export default {
 	enter ( generator, node ) {
@@ -214,9 +215,11 @@ export default {
 			builders: getBuilders(),
 			getUniqueName,
 		});
-	},
 
-	leave ( generator ) {
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
 		generator.addRenderer( generator.current );
 		generator.pop();
 	}
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 566a535bab7b..a056c2957f39 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -1,5 +1,6 @@
 import CodeBuilder from '../../../utils/CodeBuilder.js';
 import deindent from '../../../utils/deindent.js';
+import visit from '../visit.js';
 import addElementAttributes from './attributes/addElementAttributes.js';
 import Component from './Component.js';
 import Window from './meta/Window.js';
@@ -108,20 +109,20 @@ export default {
 			localElementDepth: generator.current.localElementDepth + 1,
 			key: null
 		});
-	},
 
-	leave ( generator, node ) {
+		this.elementDepth += 1;
+
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
+		this.elementDepth -= 1;
+
 		if ( node.name in meta ) {
 			if ( meta[ node.name ].leave ) meta[ node.name ].leave( generator, node );
 			return;
 		}
 
-		const isComponent = generator.components.has( node.name );
-
-		if ( isComponent ) {
-			return Component.leave( generator, node );
-		}
-
 		if ( node.initialUpdate ) {
 			generator.current.builders.init.addBlock( node.initialUpdate );
 		}
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index c28b4aeef9cb..3189fdd583b9 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -1,12 +1,12 @@
 import deindent from '../../utils/deindent.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import flattenReference from '../../utils/flattenReference.js';
-import visitors from './visitors/index.js';
 import Generator from '../Generator.js';
+import visit from './visit.js';
 
 class SsrGenerator extends Generator {
-	constructor ( parsed, source, name, visitors, options ) {
-		super( parsed, source, name, visitors, options );
+	constructor ( parsed, source, name, options ) {
+		super( parsed, source, name, options );
 		this.bindings = [];
 		this.renderCode = '';
 	}
@@ -38,7 +38,7 @@ export default function ssr ( parsed, source, options ) {
 	const format = options.format || 'cjs';
 	const name = options.name || 'SvelteComponent';
 
-	const generator = new SsrGenerator( parsed, source, name, visitors, options );
+	const generator = new SsrGenerator( parsed, source, name, options );
 
 	const { computations, hasJs, templateProperties } = generator.parseJs( true );
 
@@ -56,7 +56,9 @@ export default function ssr ( parsed, source, options ) {
 		conditions: []
 	});
 
-	parsed.html.children.forEach( node => generator.visit( node ) );
+	parsed.html.children.forEach( node => {
+		visit( node, generator );
+	});
 
 	builders.render.addLine(
 		templateProperties.data ? `root = Object.assign( ${generator.alias( 'template' )}.data(), root || {} );` : `root = root || {};`
diff --git a/src/generators/server-side-rendering/visit.js b/src/generators/server-side-rendering/visit.js
new file mode 100644
index 000000000000..5f688e76acc1
--- /dev/null
+++ b/src/generators/server-side-rendering/visit.js
@@ -0,0 +1,8 @@
+import visitors from './visitors/index.js';
+
+export default function visit ( node, generator ) {
+	const visitor = visitors[ node.type ];
+
+	if ( visitor.enter ) visitor.enter( generator, node );
+	if ( visitor.leave ) visitor.leave( generator, node );
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Component.js b/src/generators/server-side-rendering/visitors/Component.js
index aef098a02455..688f70f6146b 100644
--- a/src/generators/server-side-rendering/visitors/Component.js
+++ b/src/generators/server-side-rendering/visitors/Component.js
@@ -1,4 +1,5 @@
 import flattenReference from '../../../utils/flattenReference.js';
+import visit from '../visit.js';
 
 export default {
 	enter ( generator, node ) {
@@ -63,9 +64,15 @@ export default {
 		}
 
 		generator.append( open );
-	},
 
-	leave ( generator, node ) {
+		this.elementDepth += 1;
+
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
+		this.elementDepth -= 1;
+
 		const close = node.children.length ? `\` })}` : ')}';
 		generator.append( close );
 	}
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.js b/src/generators/server-side-rendering/visitors/EachBlock.js
index 0fbe3ee9958f..da97500a4357 100644
--- a/src/generators/server-side-rendering/visitors/EachBlock.js
+++ b/src/generators/server-side-rendering/visitors/EachBlock.js
@@ -1,3 +1,5 @@
+import visit from '../visit.js';
+
 export default {
 	enter ( generator, node ) {
 		const { dependencies, snippet } = generator.contextualise( node.expression );
@@ -21,9 +23,11 @@ export default {
 			indexes,
 			contextDependencies
 		});
-	},
 
-	leave ( generator ) {
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
 		const close = `\` ).join( '' )}`;
 		generator.append( close );
 
diff --git a/src/generators/server-side-rendering/visitors/Element.js b/src/generators/server-side-rendering/visitors/Element.js
index d50f795b6c10..f452a37e075e 100644
--- a/src/generators/server-side-rendering/visitors/Element.js
+++ b/src/generators/server-side-rendering/visitors/Element.js
@@ -1,5 +1,6 @@
 import Component from './Component.js';
 import isVoidElementName from '../../../utils/isVoidElementName.js';
+import visit from '../visit.js';
 import Window from './meta/Window.js';
 
 const meta = {
@@ -45,9 +46,15 @@ export default {
 		openingTag += '>';
 
 		generator.append( openingTag );
-	},
 
-	leave ( generator, node ) {
+		this.elementDepth += 1;
+
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
+		this.elementDepth -= 1;
+
 		if ( node.name in meta ) {
 			if ( meta[ node.name ].leave ) meta[ node.name ].leave( generator, node );
 			return;
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.js b/src/generators/server-side-rendering/visitors/IfBlock.js
index dd21ff8b4f10..1d093db3588b 100644
--- a/src/generators/server-side-rendering/visitors/IfBlock.js
+++ b/src/generators/server-side-rendering/visitors/IfBlock.js
@@ -1,3 +1,5 @@
+import visit from '../visit.js';
+
 export default {
 	enter ( generator, node ) {
 		const { snippet } = generator.contextualise( node.expression );
@@ -7,11 +9,19 @@ export default {
 		generator.push({
 			conditions: generator.current.conditions.concat( snippet )
 		});
-	},
 
-	leave ( generator, node ) {
+		node.children.forEach( child => {
+			visit( child, generator );
+		});
+
 		generator.append( '` : `' );
-		if ( node.else ) node.else.children.forEach( child => generator.visit( child ) );
+
+		if ( node.else ) {
+			node.else.children.forEach( child => {
+				visit( child, generator );
+			});
+		}
+
 		generator.append( '` }' );
 
 		generator.pop();

From e7d324f305024625abb5bd5ab714beee91e01706 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 23:10:52 -0400
Subject: [PATCH 06/31] visitors can just be functions now

---
 src/generators/dom/visitors/Component.js      |   4 +-
 src/generators/dom/visitors/Element.js        |   4 +-
 src/generators/server-side-rendering/visit.js |   4 +-
 .../server-side-rendering/visitors/Comment.js |   4 +-
 .../visitors/Component.js                     | 116 +++++++++---------
 .../visitors/EachBlock.js                     |  50 ++++----
 .../server-side-rendering/visitors/Element.js |  88 ++++++-------
 .../server-side-rendering/visitors/IfBlock.js |  38 +++---
 .../visitors/MustacheTag.js                   |  10 +-
 .../visitors/RawMustacheTag.js                |  10 +-
 .../server-side-rendering/visitors/Text.js    |   8 +-
 .../visitors/YieldTag.js                      |   8 +-
 .../visitors/meta/Window.js                   |  12 +-
 13 files changed, 161 insertions(+), 195 deletions(-)

diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index ed9cae89218d..d9a8e0daa54b 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -168,13 +168,13 @@ export default {
 			key: null
 		});
 
-		this.elementDepth += 1;
+		generator.elementDepth += 1;
 
 		node.children.forEach( child => {
 			visit( child, generator );
 		});
 
-		this.elementDepth -= 1;
+		generator.elementDepth -= 1;
 
 		generator.pop();
 	}
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index a056c2957f39..a224f0ffce35 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -110,13 +110,13 @@ export default {
 			key: null
 		});
 
-		this.elementDepth += 1;
+		generator.elementDepth += 1;
 
 		node.children.forEach( child => {
 			visit( child, generator );
 		});
 
-		this.elementDepth -= 1;
+		generator.elementDepth -= 1;
 
 		if ( node.name in meta ) {
 			if ( meta[ node.name ].leave ) meta[ node.name ].leave( generator, node );
diff --git a/src/generators/server-side-rendering/visit.js b/src/generators/server-side-rendering/visit.js
index 5f688e76acc1..e9837098c4cd 100644
--- a/src/generators/server-side-rendering/visit.js
+++ b/src/generators/server-side-rendering/visit.js
@@ -2,7 +2,5 @@ import visitors from './visitors/index.js';
 
 export default function visit ( node, generator ) {
 	const visitor = visitors[ node.type ];
-
-	if ( visitor.enter ) visitor.enter( generator, node );
-	if ( visitor.leave ) visitor.leave( generator, node );
+	visitor( generator, node );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Comment.js b/src/generators/server-side-rendering/visitors/Comment.js
index f32a1e64a8bd..4d3477d7ef0d 100644
--- a/src/generators/server-side-rendering/visitors/Comment.js
+++ b/src/generators/server-side-rendering/visitors/Comment.js
@@ -1,3 +1,3 @@
-export default {
+export default function visitComment () {
 	// do nothing
-};
+}
diff --git a/src/generators/server-side-rendering/visitors/Component.js b/src/generators/server-side-rendering/visitors/Component.js
index 688f70f6146b..4b1793f047f6 100644
--- a/src/generators/server-side-rendering/visitors/Component.js
+++ b/src/generators/server-side-rendering/visitors/Component.js
@@ -1,79 +1,77 @@
 import flattenReference from '../../../utils/flattenReference.js';
 import visit from '../visit.js';
 
-export default {
-	enter ( generator, node ) {
-		function stringify ( chunk ) {
-			if ( chunk.type === 'Text' ) return chunk.data;
-			if ( chunk.type === 'MustacheTag' ) {
-				const { snippet } = generator.contextualise( chunk.expression );
-				return '${__escape( ' + snippet + ')}';
-			}
+export default function visitComponent ( generator, node ) {
+	function stringify ( chunk ) {
+		if ( chunk.type === 'Text' ) return chunk.data;
+		if ( chunk.type === 'MustacheTag' ) {
+			const { snippet } = generator.contextualise( chunk.expression );
+			return '${__escape( ' + snippet + ')}';
 		}
+	}
 
-		const attributes = [];
-		const bindings = [];
+	const attributes = [];
+	const bindings = [];
 
-		node.attributes.forEach( attribute => {
-			if ( attribute.type === 'Attribute' ) {
-				attributes.push( attribute );
-			} else if ( attribute.type === 'Binding' ) {
-				bindings.push( attribute );
-			}
-		});
+	node.attributes.forEach( attribute => {
+		if ( attribute.type === 'Attribute' ) {
+			attributes.push( attribute );
+		} else if ( attribute.type === 'Binding' ) {
+			bindings.push( attribute );
+		}
+	});
 
-		const props = attributes
-			.map( attribute => {
-				let value;
+	const props = attributes
+		.map( attribute => {
+			let value;
 
-				if ( attribute.value === true ) {
-					value = `true`;
-				} else if ( attribute.value.length === 0 ) {
-					value = `''`;
-				} else if ( attribute.value.length === 1 ) {
-					const chunk = attribute.value[0];
-					if ( chunk.type === 'Text' ) {
-						value = isNaN( chunk.data ) ? JSON.stringify( chunk.data ) : chunk.data;
-					} else {
-						const { snippet } = generator.contextualise( chunk.expression );
-						value = snippet;
-					}
+			if ( attribute.value === true ) {
+				value = `true`;
+			} else if ( attribute.value.length === 0 ) {
+				value = `''`;
+			} else if ( attribute.value.length === 1 ) {
+				const chunk = attribute.value[0];
+				if ( chunk.type === 'Text' ) {
+					value = isNaN( chunk.data ) ? JSON.stringify( chunk.data ) : chunk.data;
 				} else {
-					value = '`' + attribute.value.map( stringify ).join( '' ) + '`';
+					const { snippet } = generator.contextualise( chunk.expression );
+					value = snippet;
 				}
+			} else {
+				value = '`' + attribute.value.map( stringify ).join( '' ) + '`';
+			}
 
-				return `${attribute.name}: ${value}`;
-			})
-			.concat( bindings.map( binding => {
-				const { name, keypath } = flattenReference( binding.value );
-				const value = generator.current.contexts.has( name ) ? keypath : `root.${keypath}`;
-				return `${binding.name}: ${value}`;
-			}))
-			.join( ', ' );
+			return `${attribute.name}: ${value}`;
+		})
+		.concat( bindings.map( binding => {
+			const { name, keypath } = flattenReference( binding.value );
+			const value = generator.current.contexts.has( name ) ? keypath : `root.${keypath}`;
+			return `${binding.name}: ${value}`;
+		}))
+		.join( ', ' );
 
-		const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
+	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
 
-		bindings.forEach( binding => {
-			generator.addBinding( binding, expression );
-		});
+	bindings.forEach( binding => {
+		generator.addBinding( binding, expression );
+	});
 
-		let open = `\${${expression}.render({${props}}`;
+	let open = `\${${expression}.render({${props}}`;
 
-		if ( node.children.length ) {
-			open += `, { yield: () => \``;
-		}
+	if ( node.children.length ) {
+		open += `, { yield: () => \``;
+	}
 
-		generator.append( open );
+	generator.append( open );
 
-		this.elementDepth += 1;
+	generator.elementDepth += 1;
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		this.elementDepth -= 1;
+	generator.elementDepth -= 1;
 
-		const close = node.children.length ? `\` })}` : ')}';
-		generator.append( close );
-	}
-};
+	const close = node.children.length ? `\` })}` : ')}';
+	generator.append( close );
+}
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.js b/src/generators/server-side-rendering/visitors/EachBlock.js
index da97500a4357..93cca86df9c2 100644
--- a/src/generators/server-side-rendering/visitors/EachBlock.js
+++ b/src/generators/server-side-rendering/visitors/EachBlock.js
@@ -1,36 +1,34 @@
 import visit from '../visit.js';
 
-export default {
-	enter ( generator, node ) {
-		const { dependencies, snippet } = generator.contextualise( node.expression );
+export default function visitEachBlock ( generator, node ) {
+	const { dependencies, snippet } = generator.contextualise( node.expression );
 
-		const open = `\${ ${snippet}.map( ${ node.index ? `( ${node.context}, ${node.index} )` : node.context} => \``;
-		generator.append( open );
+	const open = `\${ ${snippet}.map( ${ node.index ? `( ${node.context}, ${node.index} )` : node.context} => \``;
+	generator.append( open );
 
-		// TODO should this be the generator's job? It's duplicated between
-		// here and the equivalent DOM compiler visitor
-		const contexts = new Map( generator.current.contexts );
-		contexts.set( node.context, node.context );
+	// TODO should this be the generator's job? It's duplicated between
+	// here and the equivalent DOM compiler visitor
+	const contexts = new Map( generator.current.contexts );
+	contexts.set( node.context, node.context );
 
-		const indexes = new Map( generator.current.indexes );
-		if ( node.index ) indexes.set( node.index, node.context );
+	const indexes = new Map( generator.current.indexes );
+	if ( node.index ) indexes.set( node.index, node.context );
 
-		const contextDependencies = new Map( generator.current.contextDependencies );
-		contextDependencies.set( node.context, dependencies );
+	const contextDependencies = new Map( generator.current.contextDependencies );
+	contextDependencies.set( node.context, dependencies );
 
-		generator.push({
-			contexts,
-			indexes,
-			contextDependencies
-		});
+	generator.push({
+		contexts,
+		indexes,
+		contextDependencies
+	});
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		const close = `\` ).join( '' )}`;
-		generator.append( close );
+	const close = `\` ).join( '' )}`;
+	generator.append( close );
 
-		generator.pop();
-	}
-};
+	generator.pop();
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Element.js b/src/generators/server-side-rendering/visitors/Element.js
index f452a37e075e..97bc489ec987 100644
--- a/src/generators/server-side-rendering/visitors/Element.js
+++ b/src/generators/server-side-rendering/visitors/Element.js
@@ -1,72 +1,60 @@
-import Component from './Component.js';
+import visitComponent from './Component.js';
 import isVoidElementName from '../../../utils/isVoidElementName.js';
 import visit from '../visit.js';
-import Window from './meta/Window.js';
+import visitWindow from './meta/Window.js';
 
 const meta = {
-	':Window': Window
+	':Window': visitWindow
 };
 
-export default {
-	enter ( generator, node ) {
-		if ( node.name in meta ) {
-			return meta[ node.name ].enter( generator, node );
-		}
-
-		if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-			Component.enter( generator, node );
-			return;
-		}
-
-		let openingTag = `<${node.name}`;
+export default function visitElement ( generator, node ) {
+	if ( node.name in meta ) {
+		return meta[ node.name ]( generator, node );
+	}
 
-		node.attributes.forEach( attribute => {
-			if ( attribute.type !== 'Attribute' ) return;
+	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
+		visitComponent( generator, node );
+		return;
+	}
 
-			let str = ` ${attribute.name}`;
+	let openingTag = `<${node.name}`;
 
-			if ( attribute.value !== true ) {
-				str += `="` + attribute.value.map( chunk => {
-					if ( chunk.type === 'Text' ) {
-						return chunk.data;
-					}
+	node.attributes.forEach( attribute => {
+		if ( attribute.type !== 'Attribute' ) return;
 
-					const { snippet } = generator.contextualise( chunk.expression );
-					return '${' + snippet + '}';
-				}).join( '' ) + `"`;
-			}
+		let str = ` ${attribute.name}`;
 
-			openingTag += str;
-		});
+		if ( attribute.value !== true ) {
+			str += `="` + attribute.value.map( chunk => {
+				if ( chunk.type === 'Text' ) {
+					return chunk.data;
+				}
 
-		if ( generator.cssId && !generator.elementDepth ) {
-			openingTag += ` ${generator.cssId}`;
+				const { snippet } = generator.contextualise( chunk.expression );
+				return '${' + snippet + '}';
+			}).join( '' ) + `"`;
 		}
 
-		openingTag += '>';
+		openingTag += str;
+	});
 
-		generator.append( openingTag );
+	if ( generator.cssId && !generator.elementDepth ) {
+		openingTag += ` ${generator.cssId}`;
+	}
 
-		this.elementDepth += 1;
+	openingTag += '>';
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	generator.append( openingTag );
 
-		this.elementDepth -= 1;
+	generator.elementDepth += 1;
 
-		if ( node.name in meta ) {
-			if ( meta[ node.name ].leave ) meta[ node.name ].leave( generator, node );
-			return;
-		}
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-			Component.leave( generator, node );
-			return;
-		}
+	generator.elementDepth -= 1;
 
-		if ( !isVoidElementName( node.name ) ) {
-			generator.append( `</${node.name}>` );
-		}
+	if ( !isVoidElementName( node.name ) ) {
+		generator.append( `</${node.name}>` );
 	}
-};
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.js b/src/generators/server-side-rendering/visitors/IfBlock.js
index 1d093db3588b..f024f04ec3f0 100644
--- a/src/generators/server-side-rendering/visitors/IfBlock.js
+++ b/src/generators/server-side-rendering/visitors/IfBlock.js
@@ -1,29 +1,27 @@
 import visit from '../visit.js';
 
-export default {
-	enter ( generator, node ) {
-		const { snippet } = generator.contextualise( node.expression );
+export default function visitIfBlock ( generator, node ) {
+	const { snippet } = generator.contextualise( node.expression );
 
-		generator.append( '${ ' + snippet + ' ? `' );
+	generator.append( '${ ' + snippet + ' ? `' );
 
-		generator.push({
-			conditions: generator.current.conditions.concat( snippet )
-		});
+	generator.push({
+		conditions: generator.current.conditions.concat( snippet )
+	});
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		generator.append( '` : `' );
+	generator.append( '` : `' );
 
-		if ( node.else ) {
-			node.else.children.forEach( child => {
-				visit( child, generator );
-			});
-		}
+	if ( node.else ) {
+		node.else.children.forEach( child => {
+			visit( child, generator );
+		});
+	}
 
-		generator.append( '` }' );
+	generator.append( '` }' );
 
-		generator.pop();
-	}
-};
+	generator.pop();
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.js b/src/generators/server-side-rendering/visitors/MustacheTag.js
index 9052e2627fc3..99102a7ccb2e 100644
--- a/src/generators/server-side-rendering/visitors/MustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.js
@@ -1,6 +1,4 @@
-export default {
-	enter ( generator, node ) {
-		const { snippet } = generator.contextualise( node.expression );
-		generator.append( '${__escape( ' + snippet + ' )}' );
-	}
-};
+export default function visitMustacheTag ( generator, node ) {
+	const { snippet } = generator.contextualise( node.expression );
+	generator.append( '${__escape( ' + snippet + ' )}' );
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.js b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
index c84de16e2acb..0c70f363e380 100644
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
@@ -1,6 +1,4 @@
-export default {
-	enter ( generator, node ) {
-		const { snippet } = generator.contextualise( node.expression );
-		generator.append( '${' + snippet + '}' );
-	}
-};
+export default function visitRawMustacheTag ( generator, node ) {
+	const { snippet } = generator.contextualise( node.expression );
+	generator.append( '${' + snippet + '}' );
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Text.js b/src/generators/server-side-rendering/visitors/Text.js
index 16630a709d3d..d8510d839300 100644
--- a/src/generators/server-side-rendering/visitors/Text.js
+++ b/src/generators/server-side-rendering/visitors/Text.js
@@ -1,5 +1,3 @@
-export default {
-	enter ( generator, node ) {
-		generator.append( node.data.replace( /\${/g, '\\${' ) );
-	}
-};
+export default function visitText ( generator, node ) {
+	generator.append( node.data.replace( /\${/g, '\\${' ) );
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/YieldTag.js b/src/generators/server-side-rendering/visitors/YieldTag.js
index a9b35f777edf..bde5ab1a00b2 100644
--- a/src/generators/server-side-rendering/visitors/YieldTag.js
+++ b/src/generators/server-side-rendering/visitors/YieldTag.js
@@ -1,5 +1,3 @@
-export default {
-	enter ( generator ) {
-		generator.append( `\${options && options.yield ? options.yield() : ''}` );
-	}
-};
+export default function visitYieldTag ( generator ) {
+	generator.append( `\${options && options.yield ? options.yield() : ''}` );
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/meta/Window.js b/src/generators/server-side-rendering/visitors/meta/Window.js
index 7df7d8bdaf61..4b4bf67ccce2 100644
--- a/src/generators/server-side-rendering/visitors/meta/Window.js
+++ b/src/generators/server-side-rendering/visitors/meta/Window.js
@@ -1,9 +1,3 @@
-export default {
-	enter () {
-		// noop
-	},
-
-	leave () {
-		// noop
-	}
-};
+export default function visitWindow () {
+	// noop
+}
\ No newline at end of file

From b8705a5b0c0f54699b2cf596c2abb2e8207468cb Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 4 Apr 2017 23:17:02 -0400
Subject: [PATCH 07/31] turn dom generator visitors into functions

---
 src/generators/dom/visit.js                   |   4 +-
 src/generators/dom/visitors/Comment.js        |   4 +-
 src/generators/dom/visitors/Component.js      | 232 ++++++------
 src/generators/dom/visitors/EachBlock.js      | 334 +++++++++---------
 src/generators/dom/visitors/Element.js        | 179 +++++-----
 src/generators/dom/visitors/IfBlock.js        |  80 ++---
 src/generators/dom/visitors/MustacheTag.js    |  28 +-
 src/generators/dom/visitors/RawMustacheTag.js |  60 ++--
 src/generators/dom/visitors/Text.js           |  16 +-
 src/generators/dom/visitors/YieldTag.js       |  22 +-
 src/generators/dom/visitors/meta/Window.js    | 120 ++++---
 11 files changed, 526 insertions(+), 553 deletions(-)

diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
index 5f688e76acc1..e9837098c4cd 100644
--- a/src/generators/dom/visit.js
+++ b/src/generators/dom/visit.js
@@ -2,7 +2,5 @@ import visitors from './visitors/index.js';
 
 export default function visit ( node, generator ) {
 	const visitor = visitors[ node.type ];
-
-	if ( visitor.enter ) visitor.enter( generator, node );
-	if ( visitor.leave ) visitor.leave( generator, node );
+	visitor( generator, node );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Comment.js b/src/generators/dom/visitors/Comment.js
index f32a1e64a8bd..4d3477d7ef0d 100644
--- a/src/generators/dom/visitors/Comment.js
+++ b/src/generators/dom/visitors/Comment.js
@@ -1,3 +1,3 @@
-export default {
+export default function visitComment () {
 	// do nothing
-};
+}
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index d9a8e0daa54b..1733886fda5f 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -19,163 +19,161 @@ function stringifyProps ( props ) {
 	return `{ ${joined} }`;
 }
 
-export default {
-	enter ( generator, node ) {
-		const hasChildren = node.children.length > 0;
-		const { current } = generator;
-		const name = current.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
+export default function visitComponent ( generator, node ) {
+	const hasChildren = node.children.length > 0;
+	const { current } = generator;
+	const name = current.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
 
-		const local = {
-			name,
-			namespace: current.namespace,
-			isComponent: true,
+	const local = {
+		name,
+		namespace: current.namespace,
+		isComponent: true,
 
-			allUsedContexts: [],
+		allUsedContexts: [],
 
-			init: new CodeBuilder(),
-			update: new CodeBuilder()
-		};
+		init: new CodeBuilder(),
+		update: new CodeBuilder()
+	};
 
-		const isToplevel = current.localElementDepth === 0;
+	const isToplevel = current.localElementDepth === 0;
 
-		generator.hasComponents = true;
+	generator.hasComponents = true;
 
-		addComponentAttributes( generator, node, local );
+	addComponentAttributes( generator, node, local );
 
-		if ( local.allUsedContexts.length ) {
-			const initialProps = local.allUsedContexts.map( contextName => {
-				if ( contextName === 'root' ) return `root: root`;
+	if ( local.allUsedContexts.length ) {
+		const initialProps = local.allUsedContexts.map( contextName => {
+			if ( contextName === 'root' ) return `root: root`;
 
-				const listName = current.listNames.get( contextName );
-				const indexName = current.indexNames.get( contextName );
+			const listName = current.listNames.get( contextName );
+			const indexName = current.indexNames.get( contextName );
 
-				return `${listName}: ${listName},\n${indexName}: ${indexName}`;
-			}).join( ',\n' );
+			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
+		}).join( ',\n' );
 
-			const updates = local.allUsedContexts.map( contextName => {
-				if ( contextName === 'root' ) return `${name}._context.root = root;`;
+		const updates = local.allUsedContexts.map( contextName => {
+			if ( contextName === 'root' ) return `${name}._context.root = root;`;
 
-				const listName = current.listNames.get( contextName );
-				const indexName = current.indexNames.get( contextName );
+			const listName = current.listNames.get( contextName );
+			const indexName = current.indexNames.get( contextName );
 
-				return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
-			}).join( '\n' );
+			return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
+		}).join( '\n' );
 
-			local.init.addBlock( deindent`
-				${name}._context = {
-					${initialProps}
-				};
-			` );
+		local.init.addBlock( deindent`
+			${name}._context = {
+				${initialProps}
+			};
+		` );
 
-			local.update.addBlock( updates );
-		}
+		local.update.addBlock( updates );
+	}
 
-		const componentInitProperties = [
-			`target: ${!isToplevel ? current.target: 'null'}`,
-			`_root: ${current.component}._root || ${current.component}`
-		];
+	const componentInitProperties = [
+		`target: ${!isToplevel ? current.target: 'null'}`,
+		`_root: ${current.component}._root || ${current.component}`
+	];
 
-		// Component has children, put them in a separate {{yield}} block
-		if ( hasChildren ) {
-			const yieldName = generator.getUniqueName( `render_${name}_yield_fragment` );
-			const params = current.params.join( ', ' );
+	// Component has children, put them in a separate {{yield}} block
+	if ( hasChildren ) {
+		const yieldName = generator.getUniqueName( `render_${name}_yield_fragment` );
+		const params = current.params.join( ', ' );
 
-			generator.generateBlock( node, yieldName, 'block' );
+		generator.generateBlock( node, yieldName, 'block' );
 
-			const yieldFragment = current.getUniqueName( `${name}_yield_fragment` );
+		const yieldFragment = current.getUniqueName( `${name}_yield_fragment` );
 
-			current.builders.init.addLine(
-				`var ${yieldFragment} = ${yieldName}( ${params}, ${current.component} );`
-			);
+		current.builders.init.addLine(
+			`var ${yieldFragment} = ${yieldName}( ${params}, ${current.component} );`
+		);
 
-			current.builders.update.addLine(
-				`${yieldFragment}.update( changed, ${params} );`
-			);
+		current.builders.update.addLine(
+			`${yieldFragment}.update( changed, ${params} );`
+		);
 
-			componentInitProperties.push( `_yield: ${yieldFragment}`);
-		}
+		componentInitProperties.push( `_yield: ${yieldFragment}`);
+	}
 
-		const statements = [];
+	const statements = [];
 
-		if ( local.staticAttributes.length || local.dynamicAttributes.length || local.bindings.length ) {
-			const initialProps = local.staticAttributes
-				.concat( local.dynamicAttributes )
-				.map( attribute => `${attribute.name}: ${attribute.value}` );
+	if ( local.staticAttributes.length || local.dynamicAttributes.length || local.bindings.length ) {
+		const initialProps = local.staticAttributes
+			.concat( local.dynamicAttributes )
+			.map( attribute => `${attribute.name}: ${attribute.value}` );
 
-			const initialPropString = stringifyProps( initialProps );
+		const initialPropString = stringifyProps( initialProps );
 
-			if ( local.bindings.length ) {
-				const initialData = current.getUniqueName( `${name}_initial_data` );
+		if ( local.bindings.length ) {
+			const initialData = current.getUniqueName( `${name}_initial_data` );
 
-				statements.push( `var ${name}_initial_data = ${initialPropString};` );
+			statements.push( `var ${name}_initial_data = ${initialPropString};` );
 
-				local.bindings.forEach( binding => {
-					statements.push( `if ( ${binding.prop} in ${binding.obj} ) ${initialData}.${binding.name} = ${binding.value};` );
-				});
+			local.bindings.forEach( binding => {
+				statements.push( `if ( ${binding.prop} in ${binding.obj} ) ${initialData}.${binding.name} = ${binding.value};` );
+			});
 
-				componentInitProperties.push( `data: ${initialData}` );
-			} else if ( initialProps.length ) {
-				componentInitProperties.push( `data: ${initialPropString}` );
-			}
+			componentInitProperties.push( `data: ${initialData}` );
+		} else if ( initialProps.length ) {
+			componentInitProperties.push( `data: ${initialPropString}` );
 		}
+	}
 
-		const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
+	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
 
-		local.init.addBlockAtStart( deindent`
-			${statements.join( '\n' )}
-			var ${name} = new ${expression}({
-				${componentInitProperties.join(',\n')}
-			});
-		` );
+	local.init.addBlockAtStart( deindent`
+		${statements.join( '\n' )}
+		var ${name} = new ${expression}({
+			${componentInitProperties.join(',\n')}
+		});
+	` );
 
-		if ( isToplevel ) {
-			current.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
-		}
+	if ( isToplevel ) {
+		current.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
+	}
 
-		if ( local.dynamicAttributes.length ) {
-			const updates = local.dynamicAttributes.map( attribute => {
-				if ( attribute.dependencies.length ) {
-					return deindent`
-						if ( ${attribute.dependencies.map( dependency => `'${dependency}' in changed` ).join( '||' )} ) ${name}_changes.${attribute.name} = ${attribute.value};
-					`;
-				}
-
-				// TODO this is an odd situation to encounter – I *think* it should only happen with
-				// each block indices, in which case it may be possible to optimise this
-				return `${name}_changes.${attribute.name} = ${attribute.value};`;
-			});
+	if ( local.dynamicAttributes.length ) {
+		const updates = local.dynamicAttributes.map( attribute => {
+			if ( attribute.dependencies.length ) {
+				return deindent`
+					if ( ${attribute.dependencies.map( dependency => `'${dependency}' in changed` ).join( '||' )} ) ${name}_changes.${attribute.name} = ${attribute.value};
+				`;
+			}
 
-			local.update.addBlock( deindent`
-				var ${name}_changes = {};
+			// TODO this is an odd situation to encounter – I *think* it should only happen with
+			// each block indices, in which case it may be possible to optimise this
+			return `${name}_changes.${attribute.name} = ${attribute.value};`;
+		});
 
-				${updates.join( '\n' )}
+		local.update.addBlock( deindent`
+			var ${name}_changes = {};
 
-				if ( Object.keys( ${name}_changes ).length ) ${name}.set( ${name}_changes );
-			` );
-		}
+			${updates.join( '\n' )}
 
-		current.builders.teardown.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
+			if ( Object.keys( ${name}_changes ).length ) ${name}.set( ${name}_changes );
+		` );
+	}
 
-		current.builders.init.addBlock( local.init );
-		if ( !local.update.isEmpty() ) current.builders.update.addBlock( local.update );
+	current.builders.teardown.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
 
-		generator.push({
-			type: 'component',
-			namespace: local.namespace,
-			target: name,
-			parent: current,
-			localElementDepth: current.localElementDepth + 1,
-			key: null
-		});
+	current.builders.init.addBlock( local.init );
+	if ( !local.update.isEmpty() ) current.builders.update.addBlock( local.update );
 
-		generator.elementDepth += 1;
+	generator.push({
+		type: 'component',
+		namespace: local.namespace,
+		target: name,
+		parent: current,
+		localElementDepth: current.localElementDepth + 1,
+		key: null
+	});
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	generator.elementDepth += 1;
 
-		generator.elementDepth -= 1;
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		generator.pop();
-	}
-};
+	generator.elementDepth -= 1;
+
+	generator.pop();
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 716c5c1e34cf..d60c69ec8b92 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -3,224 +3,222 @@ import deindent from '../../../utils/deindent.js';
 import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
-export default {
-	enter ( generator, node ) {
-		const name = generator.getUniqueName( `each_block` );
-		const renderer = generator.getUniqueName( `render_each_block` );
-		const elseName = generator.getUniqueName( `${name}_else` );
-		const renderElse = generator.getUniqueName( `${renderer}_else` );
-		const i = generator.current.getUniqueName( `i` );
-		const params = generator.current.params.join( ', ' );
+export default function visitEachBlock ( generator, node ) {
+	const name = generator.getUniqueName( `each_block` );
+	const renderer = generator.getUniqueName( `render_each_block` );
+	const elseName = generator.getUniqueName( `${name}_else` );
+	const renderElse = generator.getUniqueName( `${renderer}_else` );
+	const i = generator.current.getUniqueName( `i` );
+	const params = generator.current.params.join( ', ' );
 
-		const listName = generator.current.getUniqueName( `${name}_value` );
+	const listName = generator.current.getUniqueName( `${name}_value` );
 
-		const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = generator.current.localElementDepth === 0;
 
-		generator.addSourcemapLocations( node.expression );
+	generator.addSourcemapLocations( node.expression );
 
-		const { dependencies, snippet } = generator.contextualise( node.expression );
+	const { dependencies, snippet } = generator.contextualise( node.expression );
 
-		const anchor = generator.current.getUniqueName( `${name}_anchor` );
-		generator.createAnchor( anchor );
+	const anchor = generator.current.getUniqueName( `${name}_anchor` );
+	generator.createAnchor( anchor );
 
-		const localVars = {};
+	const localVars = {};
 
-		localVars.iteration = generator.current.getUniqueName( `${name}_iteration` );
-		localVars.iterations = generator.current.getUniqueName( `${name}_iterations` );
-		localVars._iterations = generator.current.getUniqueName( `_${name}_iterations` );
-		localVars.lookup = generator.current.getUniqueName( `${name}_lookup` );
-		localVars._lookup = generator.current.getUniqueName( `_${name}_lookup` );
+	localVars.iteration = generator.current.getUniqueName( `${name}_iteration` );
+	localVars.iterations = generator.current.getUniqueName( `${name}_iterations` );
+	localVars._iterations = generator.current.getUniqueName( `_${name}_iterations` );
+	localVars.lookup = generator.current.getUniqueName( `${name}_lookup` );
+	localVars._lookup = generator.current.getUniqueName( `_${name}_lookup` );
 
-		generator.current.builders.init.addLine( `var ${listName} = ${snippet};` );
-		generator.current.builders.init.addLine( `var ${localVars.iterations} = [];` );
-		if ( node.key ) generator.current.builders.init.addLine( `var ${localVars.lookup} = Object.create( null );` );
-		if ( node.else ) generator.current.builders.init.addLine( `var ${elseName} = null;` );
+	generator.current.builders.init.addLine( `var ${listName} = ${snippet};` );
+	generator.current.builders.init.addLine( `var ${localVars.iterations} = [];` );
+	if ( node.key ) generator.current.builders.init.addLine( `var ${localVars.lookup} = Object.create( null );` );
+	if ( node.else ) generator.current.builders.init.addLine( `var ${elseName} = null;` );
 
-		const initialRender = new CodeBuilder();
+	const initialRender = new CodeBuilder();
 
-		if ( node.key ) {
-			localVars.fragment = generator.current.getUniqueName( 'fragment' );
-			localVars.value = generator.current.getUniqueName( 'value' );
-			localVars.key = generator.current.getUniqueName( 'key' );
+	if ( node.key ) {
+		localVars.fragment = generator.current.getUniqueName( 'fragment' );
+		localVars.value = generator.current.getUniqueName( 'value' );
+		localVars.key = generator.current.getUniqueName( 'key' );
 
-			initialRender.addBlock( deindent`
-				var ${localVars.key} = ${listName}[${i}].${node.key};
-				${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
-			` );
-		} else {
-			initialRender.addLine(
-				`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );`
-			);
-		}
+		initialRender.addBlock( deindent`
+			var ${localVars.key} = ${listName}[${i}].${node.key};
+			${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
+		` );
+	} else {
+		initialRender.addLine(
+			`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );`
+		);
+	}
 
-		if ( !isToplevel ) {
-			initialRender.addLine(
-				`${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );`
-			);
+	if ( !isToplevel ) {
+		initialRender.addLine(
+			`${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );`
+		);
+	}
+
+	generator.current.builders.init.addBlock( deindent`
+		for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
+			${initialRender}
 		}
+	` );
 
+	if ( node.else ) {
 		generator.current.builders.init.addBlock( deindent`
-			for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
-				${initialRender}
+			if ( !${listName}.length ) {
+				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
+				${!isToplevel ? `${elseName}.mount( ${anchor}.parentNode, ${anchor} );` : ''}
 			}
 		` );
+	}
 
+	if ( isToplevel ) {
+		generator.current.builders.mount.addBlock( deindent`
+			for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
+				${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
+			}
+		` );
 		if ( node.else ) {
-			generator.current.builders.init.addBlock( deindent`
-				if ( !${listName}.length ) {
-					${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
-					${!isToplevel ? `${elseName}.mount( ${anchor}.parentNode, ${anchor} );` : ''}
-				}
-			` );
-		}
-
-		if ( isToplevel ) {
 			generator.current.builders.mount.addBlock( deindent`
-				for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
-					${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
+				if ( ${elseName} ) {
+					${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 				}
 			` );
-			if ( node.else ) {
-				generator.current.builders.mount.addBlock( deindent`
-					if ( ${elseName} ) {
-						${elseName}.mount( ${anchor}.parentNode, ${anchor} );
-					}
-				` );
-			}
 		}
+	}
 
-		if ( node.key ) {
-			generator.current.builders.update.addBlock( deindent`
-				var ${listName} = ${snippet};
-				var ${localVars._iterations} = [];
-				var ${localVars._lookup} = Object.create( null );
+	if ( node.key ) {
+		generator.current.builders.update.addBlock( deindent`
+			var ${listName} = ${snippet};
+			var ${localVars._iterations} = [];
+			var ${localVars._lookup} = Object.create( null );
 
-				var ${localVars.fragment} = document.createDocumentFragment();
+			var ${localVars.fragment} = document.createDocumentFragment();
 
-				// create new iterations as necessary
-				for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
-					var ${localVars.value} = ${listName}[${i}];
-					var ${localVars.key} = ${localVars.value}.${node.key};
+			// create new iterations as necessary
+			for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
+				var ${localVars.value} = ${listName}[${i}];
+				var ${localVars.key} = ${localVars.value}.${node.key};
+
+				if ( ${localVars.lookup}[ ${localVars.key} ] ) {
+					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${localVars.lookup}[ ${localVars.key} ];
+					${localVars._lookup}[ ${localVars.key} ].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
+				} else {
+					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
+				}
 
-					if ( ${localVars.lookup}[ ${localVars.key} ] ) {
-						${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${localVars.lookup}[ ${localVars.key} ];
-						${localVars._lookup}[ ${localVars.key} ].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
-					} else {
-						${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
-					}
+				${localVars._iterations}[${i}].mount( ${localVars.fragment}, null );
+			}
 
-					${localVars._iterations}[${i}].mount( ${localVars.fragment}, null );
+			// remove old iterations
+			for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
+				var ${localVars.iteration} = ${localVars.iterations}[${i}];
+				if ( !${localVars._lookup}[ ${localVars.iteration}.key ] ) {
+					${localVars.iteration}.teardown( true );
 				}
+			}
 
-				// remove old iterations
-				for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
-					var ${localVars.iteration} = ${localVars.iterations}[${i}];
-					if ( !${localVars._lookup}[ ${localVars.iteration}.key ] ) {
-						${localVars.iteration}.teardown( true );
-					}
-				}
+			${anchor}.parentNode.insertBefore( ${localVars.fragment}, ${anchor} );
 
-				${anchor}.parentNode.insertBefore( ${localVars.fragment}, ${anchor} );
+			${localVars.iterations} = ${localVars._iterations};
+			${localVars.lookup} = ${localVars._lookup};
+		` );
+	} else {
+		generator.current.builders.update.addBlock( deindent`
+			var ${listName} = ${snippet};
 
-				${localVars.iterations} = ${localVars._iterations};
-				${localVars.lookup} = ${localVars._lookup};
-			` );
-		} else {
-			generator.current.builders.update.addBlock( deindent`
-				var ${listName} = ${snippet};
-
-				for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
-					if ( !${localVars.iterations}[${i}] ) {
-						${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );
-						${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
-					} else {
-						${localVars.iterations}[${i}].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
-					}
+			for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
+				if ( !${localVars.iterations}[${i}] ) {
+					${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );
+					${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
+				} else {
+					${localVars.iterations}[${i}].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
 				}
+			}
 
-				teardownEach( ${localVars.iterations}, true, ${listName}.length );
+			teardownEach( ${localVars.iterations}, true, ${listName}.length );
 
-				${localVars.iterations}.length = ${listName}.length;
-			` );
-		}
+			${localVars.iterations}.length = ${listName}.length;
+		` );
+	}
 
-		if ( node.else ) {
-			generator.current.builders.update.addBlock( deindent`
-				if ( !${listName}.length && ${elseName} ) {
-					${elseName}.update( changed, ${params} );
-				} else if ( !${listName}.length ) {
-					${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
-					${elseName}.mount( ${anchor}.parentNode, ${anchor} );
-				} else if ( ${elseName} ) {
-					${elseName}.teardown( true );
-				}
-			` );
-		}
+	if ( node.else ) {
+		generator.current.builders.update.addBlock( deindent`
+			if ( !${listName}.length && ${elseName} ) {
+				${elseName}.update( changed, ${params} );
+			} else if ( !${listName}.length ) {
+				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
+				${elseName}.mount( ${anchor}.parentNode, ${anchor} );
+			} else if ( ${elseName} ) {
+				${elseName}.teardown( true );
+			}
+		` );
+	}
 
-		generator.current.builders.teardown.addBlock(
-			`${generator.helper( 'teardownEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
+	generator.current.builders.teardown.addBlock(
+		`${generator.helper( 'teardownEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
 
-		if ( node.else ) {
-			generator.current.builders.teardown.addBlock( deindent`
-				if ( ${elseName} ) {
-					${elseName}.teardown( ${isToplevel ? 'detach' : 'false'} );
-				}
-			` );
-		}
+	if ( node.else ) {
+		generator.current.builders.teardown.addBlock( deindent`
+			if ( ${elseName} ) {
+				${elseName}.teardown( ${isToplevel ? 'detach' : 'false'} );
+			}
+		` );
+	}
 
-		if ( node.else ) {
-			generator.generateBlock( node.else, renderElse, 'block' );
-		}
+	if ( node.else ) {
+		generator.generateBlock( node.else, renderElse, 'block' );
+	}
 
-		const indexNames = new Map( generator.current.indexNames );
-		const indexName = node.index || generator.current.getUniqueName( `${node.context}_index` );
-		indexNames.set( node.context, indexName );
+	const indexNames = new Map( generator.current.indexNames );
+	const indexName = node.index || generator.current.getUniqueName( `${node.context}_index` );
+	indexNames.set( node.context, indexName );
 
-		const listNames = new Map( generator.current.listNames );
-		listNames.set( node.context, listName );
+	const listNames = new Map( generator.current.listNames );
+	listNames.set( node.context, listName );
 
-		const context = generator.getUniqueName( node.context );
-		const contexts = new Map( generator.current.contexts );
-		contexts.set( node.context, context );
+	const context = generator.getUniqueName( node.context );
+	const contexts = new Map( generator.current.contexts );
+	contexts.set( node.context, context );
 
-		const indexes = new Map( generator.current.indexes );
-		if ( node.index ) indexes.set( indexName, node.context );
+	const indexes = new Map( generator.current.indexes );
+	if ( node.index ) indexes.set( indexName, node.context );
 
-		const contextDependencies = new Map( generator.current.contextDependencies );
-		contextDependencies.set( node.context, dependencies );
+	const contextDependencies = new Map( generator.current.contextDependencies );
+	contextDependencies.set( node.context, dependencies );
 
-		const blockParams = generator.current.params.concat( listName, context, indexName );
+	const blockParams = generator.current.params.concat( listName, context, indexName );
 
-		const getUniqueName = generator.getUniqueNameMaker( blockParams );
+	const getUniqueName = generator.getUniqueNameMaker( blockParams );
 
-		generator.push({
-			type: 'block',
-			name: renderer,
-			target: 'target',
-			expression: node.expression,
-			context: node.context,
-			key: node.key,
-			localElementDepth: 0,
+	generator.push({
+		type: 'block',
+		name: renderer,
+		target: 'target',
+		expression: node.expression,
+		context: node.context,
+		key: node.key,
+		localElementDepth: 0,
 
-			component: getUniqueName( 'component' ),
+		component: getUniqueName( 'component' ),
 
-			contextDependencies,
-			contexts,
-			indexes,
+		contextDependencies,
+		contexts,
+		indexes,
 
-			indexNames,
-			listNames,
-			params: blockParams,
+		indexNames,
+		listNames,
+		params: blockParams,
 
-			builders: getBuilders(),
-			getUniqueName,
-		});
+		builders: getBuilders(),
+		getUniqueName,
+	});
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		generator.addRenderer( generator.current );
-		generator.pop();
-	}
-};
+	generator.addRenderer( generator.current );
+	generator.pop();
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index a224f0ffce35..21f81c8eb9d6 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -2,131 +2,122 @@ import CodeBuilder from '../../../utils/CodeBuilder.js';
 import deindent from '../../../utils/deindent.js';
 import visit from '../visit.js';
 import addElementAttributes from './attributes/addElementAttributes.js';
-import Component from './Component.js';
-import Window from './meta/Window.js';
+import visitComponent from './Component.js';
+import visitWindow from './meta/Window.js';
 
 const meta = {
-	':Window': Window
+	':Window': visitWindow
 };
 
-export default {
-	enter ( generator, node ) {
-		if ( node.name in meta ) {
-			return meta[ node.name ].enter( generator, node );
-		}
-
-		const isComponent = generator.components.has( node.name ) || node.name === ':Self';
+export default function visitElement ( generator, node ) {
+	if ( node.name in meta ) {
+		return meta[ node.name ]( generator, node );
+	}
 
-		if ( isComponent ) {
-			return Component.enter( generator, node );
-		}
+	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
+		return visitComponent( generator, node );
+	}
 
-		const name = generator.current.getUniqueName( node.name );
+	const name = generator.current.getUniqueName( node.name );
 
-		const local = {
-			name,
-			namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : generator.current.namespace,
-			isComponent: false,
+	const local = {
+		name,
+		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : generator.current.namespace,
+		isComponent: false,
 
-			allUsedContexts: [],
+		allUsedContexts: [],
 
-			init: new CodeBuilder(),
-			update: new CodeBuilder(),
-			teardown: new CodeBuilder()
-		};
+		init: new CodeBuilder(),
+		update: new CodeBuilder(),
+		teardown: new CodeBuilder()
+	};
 
-		const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = generator.current.localElementDepth === 0;
 
-		addElementAttributes( generator, node, local );
+	addElementAttributes( generator, node, local );
 
-		if ( local.allUsedContexts.length ) {
-			const initialProps = local.allUsedContexts.map( contextName => {
-				if ( contextName === 'root' ) return `root: root`;
+	if ( local.allUsedContexts.length ) {
+		const initialProps = local.allUsedContexts.map( contextName => {
+			if ( contextName === 'root' ) return `root: root`;
 
-				const listName = generator.current.listNames.get( contextName );
-				const indexName = generator.current.indexNames.get( contextName );
+			const listName = generator.current.listNames.get( contextName );
+			const indexName = generator.current.indexNames.get( contextName );
 
-				return `${listName}: ${listName},\n${indexName}: ${indexName}`;
-			}).join( ',\n' );
+			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
+		}).join( ',\n' );
 
-			const updates = local.allUsedContexts.map( contextName => {
-				if ( contextName === 'root' ) return `${name}.__svelte.root = root;`;
+		const updates = local.allUsedContexts.map( contextName => {
+			if ( contextName === 'root' ) return `${name}.__svelte.root = root;`;
 
-				const listName = generator.current.listNames.get( contextName );
-				const indexName = generator.current.indexNames.get( contextName );
+			const listName = generator.current.listNames.get( contextName );
+			const indexName = generator.current.indexNames.get( contextName );
 
-				return `${name}.__svelte.${listName} = ${listName};\n${name}.__svelte.${indexName} = ${indexName};`;
-			}).join( '\n' );
+			return `${name}.__svelte.${listName} = ${listName};\n${name}.__svelte.${indexName} = ${indexName};`;
+		}).join( '\n' );
 
-			local.init.addBlock( deindent`
-				${name}.__svelte = {
-					${initialProps}
-				};
-			` );
+		local.init.addBlock( deindent`
+			${name}.__svelte = {
+				${initialProps}
+			};
+		` );
 
-			local.update.addBlock( updates );
-		}
+		local.update.addBlock( updates );
+	}
 
-		let render;
+	let render;
 
-		if ( local.namespace ) {
-			if ( local.namespace === 'http://www.w3.org/2000/svg' ) {
-				render = `var ${name} = ${generator.helper( 'createSvgElement' )}( '${node.name}' )`;
-			} else {
-				render = `var ${name} = document.createElementNS( '${local.namespace}', '${node.name}' );`;
-			}
+	if ( local.namespace ) {
+		if ( local.namespace === 'http://www.w3.org/2000/svg' ) {
+			render = `var ${name} = ${generator.helper( 'createSvgElement' )}( '${node.name}' )`;
 		} else {
-			render = `var ${name} = ${generator.helper( 'createElement' )}( '${node.name}' );`;
-		}
-
-		if ( generator.cssId && !generator.elementDepth ) {
-			render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
-		}
-
-		local.init.addLineAtStart( render );
-		if ( isToplevel ) {
-			generator.current.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
+			render = `var ${name} = document.createElementNS( '${local.namespace}', '${node.name}' );`;
 		}
+	} else {
+		render = `var ${name} = ${generator.helper( 'createElement' )}( '${node.name}' );`;
+	}
 
-		// special case – bound <option> without a value attribute
-		if ( node.name === 'option' && !node.attributes.find( attribute => attribute.type === 'Attribute' && attribute.name === 'value' ) ) { 	// TODO check it's bound
-			const statement = `${name}.__value = ${name}.textContent;`;
-			local.update.addLine( statement );
-			node.initialUpdate = statement;
-		}
+	if ( generator.cssId && !generator.elementDepth ) {
+		render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
+	}
 
-		generator.current.builders.init.addBlock( local.init );
-		if ( !local.update.isEmpty() ) generator.current.builders.update.addBlock( local.update );
-		if ( !local.teardown.isEmpty() ) generator.current.builders.teardown.addBlock( local.teardown );
+	local.init.addLineAtStart( render );
+	if ( isToplevel ) {
+		generator.current.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
+	}
 
-		generator.createMountStatement( name );
+	// special case – bound <option> without a value attribute
+	if ( node.name === 'option' && !node.attributes.find( attribute => attribute.type === 'Attribute' && attribute.name === 'value' ) ) { 	// TODO check it's bound
+		const statement = `${name}.__value = ${name}.textContent;`;
+		local.update.addLine( statement );
+		node.initialUpdate = statement;
+	}
 
-		generator.push({
-			type: 'element',
-			namespace: local.namespace,
-			target: name,
-			parent: generator.current,
-			localElementDepth: generator.current.localElementDepth + 1,
-			key: null
-		});
+	generator.current.builders.init.addBlock( local.init );
+	if ( !local.update.isEmpty() ) generator.current.builders.update.addBlock( local.update );
+	if ( !local.teardown.isEmpty() ) generator.current.builders.teardown.addBlock( local.teardown );
 
-		generator.elementDepth += 1;
+	generator.createMountStatement( name );
 
-		node.children.forEach( child => {
-			visit( child, generator );
-		});
+	generator.push({
+		type: 'element',
+		namespace: local.namespace,
+		target: name,
+		parent: generator.current,
+		localElementDepth: generator.current.localElementDepth + 1,
+		key: null
+	});
 
-		generator.elementDepth -= 1;
+	generator.elementDepth += 1;
 
-		if ( node.name in meta ) {
-			if ( meta[ node.name ].leave ) meta[ node.name ].leave( generator, node );
-			return;
-		}
+	node.children.forEach( child => {
+		visit( child, generator );
+	});
 
-		if ( node.initialUpdate ) {
-			generator.current.builders.init.addBlock( node.initialUpdate );
-		}
+	generator.elementDepth -= 1;
 
-		generator.pop();
+	if ( node.initialUpdate ) {
+		generator.current.builders.init.addBlock( node.initialUpdate );
 	}
-};
+
+	generator.pop();
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 0de7e936b28d..aa1c15d7d1ba 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -30,52 +30,50 @@ function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
 	return conditionsAndBlocks;
 }
 
-export default {
-	enter ( generator, node ) {
-		const params = generator.current.params.join( ', ' );
-		const name = generator.getUniqueName( `if_block` );
-		const getBlock = generator.current.getUniqueName( `get_block` );
-		const currentBlock = generator.current.getUniqueName( `current_block` );
-		const _currentBlock = generator.current.getUniqueName( `_current_block` );
+export default function visitIfBlock ( generator, node ) {
+	const params = generator.current.params.join( ', ' );
+	const name = generator.getUniqueName( `if_block` );
+	const getBlock = generator.current.getUniqueName( `get_block` );
+	const currentBlock = generator.current.getUniqueName( `current_block` );
+	const _currentBlock = generator.current.getUniqueName( `_current_block` );
 
-		const isToplevel = generator.current.localElementDepth === 0;
-		const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `render_if_block` ) );
+	const isToplevel = generator.current.localElementDepth === 0;
+	const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `render_if_block` ) );
 
-		const anchor = `${name}_anchor`;
-		generator.createAnchor( anchor );
+	const anchor = `${name}_anchor`;
+	generator.createAnchor( anchor );
 
-		generator.current.builders.init.addBlock( deindent`
-			function ${getBlock} ( ${params} ) {
-				${conditionsAndBlocks.map( ({ condition, block }) => {
-					return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
-				} ).join( '\n' )}
-			}
+	generator.current.builders.init.addBlock( deindent`
+		function ${getBlock} ( ${params} ) {
+			${conditionsAndBlocks.map( ({ condition, block }) => {
+				return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
+			} ).join( '\n' )}
+		}
+
+		var ${currentBlock} = ${getBlock}( ${params} );
+		var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
+	` );
 
-			var ${currentBlock} = ${getBlock}( ${params} );
-			var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
-		` );
+	const mountStatement = `if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );`;
+	if ( isToplevel ) {
+		generator.current.builders.mount.addLine( mountStatement );
+	} else {
+		generator.current.builders.init.addLine( mountStatement );
+	}
 
-		const mountStatement = `if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );`;
-		if ( isToplevel ) {
-			generator.current.builders.mount.addLine( mountStatement );
+	generator.current.builders.update.addBlock( deindent`
+		var ${_currentBlock} = ${currentBlock};
+		${currentBlock} = ${getBlock}( ${params} );
+		if ( ${_currentBlock} === ${currentBlock} && ${name}) {
+			${name}.update( changed, ${params} );
 		} else {
-			generator.current.builders.init.addLine( mountStatement );
+			if ( ${name} ) ${name}.teardown( true );
+			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
+			if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
 		}
+	` );
 
-		generator.current.builders.update.addBlock( deindent`
-			var ${_currentBlock} = ${currentBlock};
-			${currentBlock} = ${getBlock}( ${params} );
-			if ( ${_currentBlock} === ${currentBlock} && ${name}) {
-				${name}.update( changed, ${params} );
-			} else {
-				if ( ${name} ) ${name}.teardown( true );
-				${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
-				if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
-			}
-		` );
-
-		generator.current.builders.teardown.addLine(
-			`if ( ${name} ) ${name}.teardown( ${isToplevel ? 'detach' : 'false'} );`
-		);
-	}
-};
+	generator.current.builders.teardown.addLine(
+		`if ( ${name} ) ${name}.teardown( ${isToplevel ? 'detach' : 'false'} );`
+	);
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 6e0ba72e637f..01e36b03e91c 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -1,22 +1,20 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default {
-	enter ( generator, node ) {
-		const name = generator.current.getUniqueName( 'text' );
+export default function visitMustacheTag ( generator, node ) {
+	const name = generator.current.getUniqueName( 'text' );
 
-		const { snippet } = generator.contextualise( node.expression );
+	const { snippet } = generator.contextualise( node.expression );
 
-		generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
-		generator.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
+	generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
+	generator.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
 
-		const fragment = findBlock( generator.current );
-		if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	const fragment = findBlock( generator.current );
+	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
-		generator.current.builders.update.addBlock( deindent`
-			if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-				${name}.data = last_${name} = ${fragment.tmp};
-			}
-		` );
-	}
-};
+	generator.current.builders.update.addBlock( deindent`
+		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
+			${name}.data = last_${name} = ${fragment.tmp};
+		}
+	` );
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index 2a5cf4638135..db87960e7db6 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -1,43 +1,41 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default {
-	enter ( generator, node ) {
-		const name = generator.current.getUniqueName( 'raw' );
+export default function visitRawMustacheTag ( generator, node ) {
+	const name = generator.current.getUniqueName( 'raw' );
 
-		const { snippet } = generator.contextualise( node.expression );
+	const { snippet } = generator.contextualise( node.expression );
 
-		// we would have used comments here, but the `insertAdjacentHTML` api only
-		// exists for `Element`s.
-		const before = `${name}_before`;
-		generator.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	// we would have used comments here, but the `insertAdjacentHTML` api only
+	// exists for `Element`s.
+	const before = `${name}_before`;
+	generator.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
 
-		const after = `${name}_after`;
-		generator.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	const after = `${name}_after`;
+	generator.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
 
-		const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = generator.current.localElementDepth === 0;
 
-		generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
-		const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
-		const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
+	generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
+	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
+	const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
 
-		if ( isToplevel ) {
-			generator.current.builders.mount.addLine( mountStatement );
-		} else {
-			generator.current.builders.init.addLine( mountStatement );
-		}
+	if ( isToplevel ) {
+		generator.current.builders.mount.addLine( mountStatement );
+	} else {
+		generator.current.builders.init.addLine( mountStatement );
+	}
 
-		const fragment = findBlock( generator.current );
-		if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	const fragment = findBlock( generator.current );
+	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
-		generator.current.builders.update.addBlock( deindent`
-			if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-				last_${name} = ${fragment.tmp};
-				${detachStatement}
-				${mountStatement}
-			}
-		` );
+	generator.current.builders.update.addBlock( deindent`
+		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
+			last_${name} = ${fragment.tmp};
+			${detachStatement}
+			${mountStatement}
+		}
+	` );
 
-		generator.current.builders.detachRaw.addBlock( detachStatement );
-	}
-};
+	generator.current.builders.detachRaw.addBlock( detachStatement );
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index ac1207bc862a..86231112c4f4 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -1,10 +1,8 @@
-export default {
-	enter ( generator, node ) {
-		if ( generator.current.namespace && !/\S/.test( node.data ) ) {
-			return;
-		}
-
-		const name = generator.current.getUniqueName( `text` );
-		generator.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
+export default function visitText ( generator, node ) {
+	if ( generator.current.namespace && !/\S/.test( node.data ) ) {
+		return;
 	}
-};
+
+	const name = generator.current.getUniqueName( `text` );
+	generator.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 46dc3152c901..45f28172b20f 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,14 +1,12 @@
-export default {
-	enter ( generator ) {
-		const anchor = `yield_anchor`;
-		generator.createAnchor( anchor );
+export default function visitYieldTag ( generator ) {
+	const anchor = `yield_anchor`;
+	generator.createAnchor( anchor );
 
-		generator.current.builders.mount.addLine(
-			`${generator.current.component}._yield && ${generator.current.component}._yield.mount( ${generator.current.target}, ${anchor} );`
-		);
+	generator.current.builders.mount.addLine(
+		`${generator.current.component}._yield && ${generator.current.component}._yield.mount( ${generator.current.target}, ${anchor} );`
+	);
 
-		generator.current.builders.teardown.addLine(
-			`${generator.current.component}._yield && ${generator.current.component}._yield.teardown( detach );`
-		);
-	}
-};
+	generator.current.builders.teardown.addLine(
+		`${generator.current.component}._yield && ${generator.current.component}._yield.teardown( detach );`
+	);
+}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/meta/Window.js b/src/generators/dom/visitors/meta/Window.js
index e1d5cb7b4369..df056f106b08 100644
--- a/src/generators/dom/visitors/meta/Window.js
+++ b/src/generators/dom/visitors/meta/Window.js
@@ -11,74 +11,72 @@ const associatedEvents = {
 	scrollY: 'scroll'
 };
 
-export default {
-	enter ( generator, node ) {
-		const events = {};
-
-		node.attributes.forEach( attribute => {
-			if ( attribute.type === 'EventHandler' ) {
-				// TODO verify that it's a valid callee (i.e. built-in or declared method)
-				generator.addSourcemapLocations( attribute.expression );
-
-				const flattened = flattenReference( attribute.expression.callee );
-				if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
-					// allow event.stopPropagation(), this.select() etc
-					generator.code.prependRight( attribute.expression.start, 'component.' );
-				}
-
-				const handlerName = generator.current.getUniqueName( `onwindow${attribute.name}` );
-
-				generator.current.builders.init.addBlock( deindent`
-					var ${handlerName} = function ( event ) {
-						[✂${attribute.expression.start}-${attribute.expression.end}✂];
-					};
-					window.addEventListener( '${attribute.name}', ${handlerName} );
-				` );
-
-				generator.current.builders.teardown.addBlock( deindent`
-					window.removeEventListener( '${attribute.name}', ${handlerName} );
-				` );
+export default function visitWindow ( generator, node ) {
+	const events = {};
+
+	node.attributes.forEach( attribute => {
+		if ( attribute.type === 'EventHandler' ) {
+			// TODO verify that it's a valid callee (i.e. built-in or declared method)
+			generator.addSourcemapLocations( attribute.expression );
+
+			const flattened = flattenReference( attribute.expression.callee );
+			if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
+				// allow event.stopPropagation(), this.select() etc
+				generator.code.prependRight( attribute.expression.start, 'component.' );
 			}
 
-			if ( attribute.type === 'Binding' ) {
-				const associatedEvent = associatedEvents[ attribute.name ];
-
-				if ( !associatedEvent ) {
-					throw new Error( `Cannot bind to ${attribute.name} on <:Window>` );
-				}
-
-				if ( attribute.value.type !== 'Identifier' ) {
-					const { parts, keypath } = flattenReference( attribute.value );
-					throw new Error( `Bindings on <:Window/> must be to top-level properties, e.g. '${parts.pop()}' rather than '${keypath}'` );
-				}
-
-				if ( !events[ associatedEvent ] ) events[ associatedEvent ] = [];
-				events[ associatedEvent ].push( `${attribute.value.name}: this.${attribute.name}` );
-
-				// add initial value
-				generator.builders.metaBindings.addLine(
-					`this._state.${attribute.value.name} = window.${attribute.name};`
-				);
-			}
-		});
-
-		Object.keys( events ).forEach( event => {
-			const handlerName = generator.current.getUniqueName( `onwindow${event}` );
-
-			const props = events[ event ].join( ',\n' );
+			const handlerName = generator.current.getUniqueName( `onwindow${attribute.name}` );
 
 			generator.current.builders.init.addBlock( deindent`
 				var ${handlerName} = function ( event ) {
-					component.set({
-						${props}
-					});
+					[✂${attribute.expression.start}-${attribute.expression.end}✂];
 				};
-				window.addEventListener( '${event}', ${handlerName} );
+				window.addEventListener( '${attribute.name}', ${handlerName} );
 			` );
 
 			generator.current.builders.teardown.addBlock( deindent`
-				window.removeEventListener( '${event}', ${handlerName} );
+				window.removeEventListener( '${attribute.name}', ${handlerName} );
 			` );
-		});
-	}
-};
+		}
+
+		if ( attribute.type === 'Binding' ) {
+			const associatedEvent = associatedEvents[ attribute.name ];
+
+			if ( !associatedEvent ) {
+				throw new Error( `Cannot bind to ${attribute.name} on <:Window>` );
+			}
+
+			if ( attribute.value.type !== 'Identifier' ) {
+				const { parts, keypath } = flattenReference( attribute.value );
+				throw new Error( `Bindings on <:Window/> must be to top-level properties, e.g. '${parts.pop()}' rather than '${keypath}'` );
+			}
+
+			if ( !events[ associatedEvent ] ) events[ associatedEvent ] = [];
+			events[ associatedEvent ].push( `${attribute.value.name}: this.${attribute.name}` );
+
+			// add initial value
+			generator.builders.metaBindings.addLine(
+				`this._state.${attribute.value.name} = window.${attribute.name};`
+			);
+		}
+	});
+
+	Object.keys( events ).forEach( event => {
+		const handlerName = generator.current.getUniqueName( `onwindow${event}` );
+
+		const props = events[ event ].join( ',\n' );
+
+		generator.current.builders.init.addBlock( deindent`
+			var ${handlerName} = function ( event ) {
+				component.set({
+					${props}
+				});
+			};
+			window.addEventListener( '${event}', ${handlerName} );
+		` );
+
+		generator.current.builders.teardown.addBlock( deindent`
+			window.removeEventListener( '${event}', ${handlerName} );
+		` );
+	});
+}
\ No newline at end of file

From 11033c2f20c27f7bb713cfa7d7f65812dc276334 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 6 Apr 2017 15:45:26 -0400
Subject: [PATCH 08/31] minor test tweaks

---
 test/runtime/index.js                          |  9 +++++----
 .../attribute-dynamic-multiple/_config.js      |  6 +++++-
 test/runtime/samples/each-block/_config.js     | 18 +++++++++++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/test/runtime/index.js b/test/runtime/index.js
index 0d74c6db45e9..780e380caff6 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -32,7 +32,7 @@ require.extensions[ '.html' ] = function ( module, filename ) {
 
 const Object_assign = Object.assign;
 
-describe( 'generate', () => {
+describe( 'runtime', () => {
 	before( setupHtmlEqual );
 
 	function runTest ( dir, shared ) {
@@ -69,7 +69,8 @@ describe( 'generate', () => {
 			// check that no ES2015+ syntax slipped in
 			if ( !config.allowES2015 ) {
 				try {
-					const startIndex = code.indexOf( 'function render_main_fragment' ); // may change!
+					const startIndex = code.indexOf( 'function create_main_fragment' ); // may change!
+					if ( startIndex === -1 ) throw new Error( 'missing create_main_fragment' );
 					const es5 = spaces( startIndex ) + code.slice( startIndex ).replace( /export default .+/, '' );
 					acorn.parse( es5, { ecmaVersion: 5 });
 				} catch ( err ) {
@@ -117,6 +118,8 @@ describe( 'generate', () => {
 						data: config.data
 					});
 
+					Object.assign = Object_assign;
+
 					console.warn = warn;
 
 					if ( config.error ) {
@@ -141,8 +144,6 @@ describe( 'generate', () => {
 						component.destroy();
 						assert.equal( target.innerHTML, '' );
 					}
-
-					Object.assign = Object_assign;
 				})
 				.catch( err => {
 					Object.assign = Object_assign;
diff --git a/test/runtime/samples/attribute-dynamic-multiple/_config.js b/test/runtime/samples/attribute-dynamic-multiple/_config.js
index 1a0c602cb680..048c5130e570 100644
--- a/test/runtime/samples/attribute-dynamic-multiple/_config.js
+++ b/test/runtime/samples/attribute-dynamic-multiple/_config.js
@@ -7,5 +7,9 @@ export default {
 		]
 	},
 
-	html: `<div class="foo ">1</div><div class=" bar">2</div><div class="foo bar">3</div><!---->`
+	html: `
+		<div class="foo ">1</div>
+		<div class=" bar">2</div>
+		<div class="foo bar">3</div>
+	`
 };
diff --git a/test/runtime/samples/each-block/_config.js b/test/runtime/samples/each-block/_config.js
index 655556bedfd9..73e3d0c6f461 100644
--- a/test/runtime/samples/each-block/_config.js
+++ b/test/runtime/samples/each-block/_config.js
@@ -2,11 +2,23 @@ export default {
 	data: {
 		animals: [ 'alpaca', 'baboon', 'capybara' ]
 	},
-	html: '<p>alpaca</p><p>baboon</p><p>capybara</p><!---->',
+
+	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><!---->' );
+		assert.htmlEqual( target.innerHTML, `
+			<p>alpaca</p>
+			<p>baboon</p>
+			<p>caribou</p>
+			<p>dogfish</p>
+		` );
+
 		component.set({ animals: [] });
-		assert.equal( target.innerHTML, '<!---->' );
+		assert.htmlEqual( target.innerHTML, '' );
 	}
 };

From 3006a245aff967780cfd49550c8ae3509ca311f5 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 6 Apr 2017 16:18:27 -0400
Subject: [PATCH 09/31] more consistent naming

---
 src/generators/dom/index.js                   | 28 ++++++++--------
 src/generators/dom/utils/getBuilders.js       |  4 +--
 src/generators/dom/visitors/Component.js      | 12 +++----
 src/generators/dom/visitors/EachBlock.js      | 26 +++++++--------
 src/generators/dom/visitors/Element.js        | 14 ++++----
 src/generators/dom/visitors/IfBlock.js        | 10 +++---
 src/generators/dom/visitors/MustacheTag.js    |  2 +-
 src/generators/dom/visitors/RawMustacheTag.js |  4 +--
 src/generators/dom/visitors/YieldTag.js       |  4 +--
 .../attributes/addComponentAttributes.js      |  6 ++--
 .../attributes/addComponentBinding.js         |  2 +-
 .../attributes/addElementAttributes.js        | 32 +++++++++----------
 .../visitors/attributes/addElementBinding.js  |  8 ++---
 src/generators/dom/visitors/meta/Window.js    |  8 ++---
 src/shared/dom.js                             |  4 +--
 src/validate/js/propValidators/methods.js     |  2 +-
 16 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 3e86ead4352c..deb667755e2b 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -20,13 +20,13 @@ class DomGenerator extends Generator {
 	addElement ( name, renderStatement, needsIdentifier = false ) {
 		const isToplevel = this.current.localElementDepth === 0;
 		if ( needsIdentifier || isToplevel ) {
-			this.current.builders.init.addLine(
+			this.current.builders.create.addLine(
 				`var ${name} = ${renderStatement};`
 			);
 
 			this.createMountStatement( name );
 		} else {
-			this.current.builders.init.addLine( `${this.helper( 'appendNode' )}( ${renderStatement}, ${this.current.target} );` );
+			this.current.builders.create.addLine( `${this.helper( 'appendNode' )}( ${renderStatement}, ${this.current.target} );` );
 		}
 
 		if ( isToplevel ) {
@@ -36,7 +36,7 @@ class DomGenerator extends Generator {
 
 	addRenderer ( fragment ) {
 		if ( fragment.autofocus ) {
-			fragment.builders.init.addLine( `${fragment.autofocus}.focus();` );
+			fragment.builders.create.addLine( `${fragment.autofocus}.focus();` );
 		}
 
 		// minor hack – we need to ensure that any {{{triples}}} are detached
@@ -44,7 +44,7 @@ class DomGenerator extends Generator {
 		fragment.builders.detachRaw.addBlock( fragment.builders.detach );
 
 		if ( !fragment.builders.detachRaw.isEmpty() ) {
-			fragment.builders.teardown.addBlock( deindent`
+			fragment.builders.destroy.addBlock( deindent`
 				if ( detach ) {
 					${fragment.builders.detachRaw}
 				}
@@ -81,19 +81,19 @@ class DomGenerator extends Generator {
 			` );
 		}
 
-		if ( fragment.builders.teardown.isEmpty() ) {
-			properties.addBlock( `teardown: ${this.helper( 'noop' )},` );
+		if ( fragment.builders.destroy.isEmpty() ) {
+			properties.addBlock( `destroy: ${this.helper( 'noop' )},` );
 		} else {
 			properties.addBlock( deindent`
-				teardown: function ( detach ) {
-					${fragment.builders.teardown}
+				destroy: function ( detach ) {
+					${fragment.builders.destroy}
 				}
 			` );
 		}
 
 		this.renderers.push( deindent`
 			function ${fragment.name} ( ${fragment.params.join( ', ' )}, ${fragment.component}${fragment.key ? `, ${localKey}` : ''} ) {
-				${fragment.builders.init}
+				${fragment.builders.create}
 
 				return {
 					${properties}
@@ -111,7 +111,7 @@ class DomGenerator extends Generator {
 		if ( this.current.target === 'target' ) {
 			this.current.builders.mount.addLine( `${this.helper( 'insertNode' )}( ${name}, target, anchor );` );
 		} else {
-			this.current.builders.init.addLine( `${this.helper( 'appendNode' )}( ${name}, ${this.current.target} );` );
+			this.current.builders.create.addLine( `${this.helper( 'appendNode' )}( ${name}, ${this.current.target} );` );
 		}
 	}
 
@@ -158,7 +158,7 @@ export default function dom ( parsed, source, options ) {
 
 	generator.push({
 		type: 'block',
-		name: generator.alias( 'render_main_fragment' ),
+		name: generator.alias( 'create_main_fragment' ),
 		namespace,
 		target: 'target',
 		localElementDepth: 0,
@@ -261,7 +261,7 @@ export default function dom ( parsed, source, options ) {
 	if ( generator.hasComplexBindings ) {
 		builders.init.addBlock( deindent`
 			this._bindings = [];
-			this._fragment = ${generator.alias( 'render_main_fragment' )}( this._state, this );
+			this._fragment = ${generator.alias( 'create_main_fragment' )}( this._state, this );
 			if ( options.target ) this._fragment.mount( options.target, null );
 			while ( this._bindings.length ) this._bindings.pop()();
 		` );
@@ -269,7 +269,7 @@ export default function dom ( parsed, source, options ) {
 		builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
 	} else {
 		builders.init.addBlock( deindent`
-			this._fragment = ${generator.alias( 'render_main_fragment' )}( this._state, this );
+			this._fragment = ${generator.alias( 'create_main_fragment' )}( this._state, this );
 			if ( options.target ) this._fragment.mount( options.target, null );
 		` );
 	}
@@ -369,7 +369,7 @@ export default function dom ( parsed, source, options ) {
 		${name}.prototype.teardown = ${name}.prototype.destroy = function destroy ( detach ) {
 			this.fire( 'destroy' );${templateProperties.ondestroy ? `\n${generator.alias( 'template' )}.ondestroy.call( this );` : ``}
 
-			this._fragment.teardown( detach !== false );
+			this._fragment.destroy( detach !== false );
 			this._fragment = null;
 
 			this._state = {};
diff --git a/src/generators/dom/utils/getBuilders.js b/src/generators/dom/utils/getBuilders.js
index ca66c1bec5ea..396ab54aa6b8 100644
--- a/src/generators/dom/utils/getBuilders.js
+++ b/src/generators/dom/utils/getBuilders.js
@@ -2,11 +2,11 @@ import CodeBuilder from '../../../utils/CodeBuilder.js';
 
 export default function getBuilders () {
 	return {
-		init: new CodeBuilder(),
+		create: new CodeBuilder(),
 		mount: new CodeBuilder(),
 		update: new CodeBuilder(),
 		detach: new CodeBuilder(),
 		detachRaw: new CodeBuilder(),
-		teardown: new CodeBuilder()
+		destroy: new CodeBuilder()
 	};
 }
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 1733886fda5f..12f02ba53fed 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -31,7 +31,7 @@ export default function visitComponent ( generator, node ) {
 
 		allUsedContexts: [],
 
-		init: new CodeBuilder(),
+		create: new CodeBuilder(),
 		update: new CodeBuilder()
 	};
 
@@ -60,7 +60,7 @@ export default function visitComponent ( generator, node ) {
 			return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
 		}).join( '\n' );
 
-		local.init.addBlock( deindent`
+		local.create.addBlock( deindent`
 			${name}._context = {
 				${initialProps}
 			};
@@ -83,7 +83,7 @@ export default function visitComponent ( generator, node ) {
 
 		const yieldFragment = current.getUniqueName( `${name}_yield_fragment` );
 
-		current.builders.init.addLine(
+		current.builders.create.addLine(
 			`var ${yieldFragment} = ${yieldName}( ${params}, ${current.component} );`
 		);
 
@@ -120,7 +120,7 @@ export default function visitComponent ( generator, node ) {
 
 	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
 
-	local.init.addBlockAtStart( deindent`
+	local.create.addBlockAtStart( deindent`
 		${statements.join( '\n' )}
 		var ${name} = new ${expression}({
 			${componentInitProperties.join(',\n')}
@@ -153,9 +153,9 @@ export default function visitComponent ( generator, node ) {
 		` );
 	}
 
-	current.builders.teardown.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
+	current.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
 
-	current.builders.init.addBlock( local.init );
+	current.builders.create.addBlock( local.create );
 	if ( !local.update.isEmpty() ) current.builders.update.addBlock( local.update );
 
 	generator.push({
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index d60c69ec8b92..d52feec1bf24 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -30,10 +30,10 @@ export default function visitEachBlock ( generator, node ) {
 	localVars.lookup = generator.current.getUniqueName( `${name}_lookup` );
 	localVars._lookup = generator.current.getUniqueName( `_${name}_lookup` );
 
-	generator.current.builders.init.addLine( `var ${listName} = ${snippet};` );
-	generator.current.builders.init.addLine( `var ${localVars.iterations} = [];` );
-	if ( node.key ) generator.current.builders.init.addLine( `var ${localVars.lookup} = Object.create( null );` );
-	if ( node.else ) generator.current.builders.init.addLine( `var ${elseName} = null;` );
+	generator.current.builders.create.addLine( `var ${listName} = ${snippet};` );
+	generator.current.builders.create.addLine( `var ${localVars.iterations} = [];` );
+	if ( node.key ) generator.current.builders.create.addLine( `var ${localVars.lookup} = Object.create( null );` );
+	if ( node.else ) generator.current.builders.create.addLine( `var ${elseName} = null;` );
 
 	const initialRender = new CodeBuilder();
 
@@ -58,14 +58,14 @@ export default function visitEachBlock ( generator, node ) {
 		);
 	}
 
-	generator.current.builders.init.addBlock( deindent`
+	generator.current.builders.create.addBlock( deindent`
 		for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
 			${initialRender}
 		}
 	` );
 
 	if ( node.else ) {
-		generator.current.builders.init.addBlock( deindent`
+		generator.current.builders.create.addBlock( deindent`
 			if ( !${listName}.length ) {
 				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
 				${!isToplevel ? `${elseName}.mount( ${anchor}.parentNode, ${anchor} );` : ''}
@@ -115,7 +115,7 @@ export default function visitEachBlock ( generator, node ) {
 			for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
 				var ${localVars.iteration} = ${localVars.iterations}[${i}];
 				if ( !${localVars._lookup}[ ${localVars.iteration}.key ] ) {
-					${localVars.iteration}.teardown( true );
+					${localVars.iteration}.destroy( true );
 				}
 			}
 
@@ -137,7 +137,7 @@ export default function visitEachBlock ( generator, node ) {
 				}
 			}
 
-			teardownEach( ${localVars.iterations}, true, ${listName}.length );
+			destroyEach( ${localVars.iterations}, true, ${listName}.length );
 
 			${localVars.iterations}.length = ${listName}.length;
 		` );
@@ -151,18 +151,18 @@ export default function visitEachBlock ( generator, node ) {
 				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
 				${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 			} else if ( ${elseName} ) {
-				${elseName}.teardown( true );
+				${elseName}.destroy( true );
 			}
 		` );
 	}
 
-	generator.current.builders.teardown.addBlock(
-		`${generator.helper( 'teardownEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
+	generator.current.builders.destroy.addBlock(
+		`${generator.helper( 'destroyEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
 
 	if ( node.else ) {
-		generator.current.builders.teardown.addBlock( deindent`
+		generator.current.builders.destroy.addBlock( deindent`
 			if ( ${elseName} ) {
-				${elseName}.teardown( ${isToplevel ? 'detach' : 'false'} );
+				${elseName}.destroy( ${isToplevel ? 'detach' : 'false'} );
 			}
 		` );
 	}
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 21f81c8eb9d6..6b1b20989269 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -27,9 +27,9 @@ export default function visitElement ( generator, node ) {
 
 		allUsedContexts: [],
 
-		init: new CodeBuilder(),
+		create: new CodeBuilder(),
 		update: new CodeBuilder(),
-		teardown: new CodeBuilder()
+		destroy: new CodeBuilder()
 	};
 
 	const isToplevel = generator.current.localElementDepth === 0;
@@ -55,7 +55,7 @@ export default function visitElement ( generator, node ) {
 			return `${name}.__svelte.${listName} = ${listName};\n${name}.__svelte.${indexName} = ${indexName};`;
 		}).join( '\n' );
 
-		local.init.addBlock( deindent`
+		local.create.addBlock( deindent`
 			${name}.__svelte = {
 				${initialProps}
 			};
@@ -80,7 +80,7 @@ export default function visitElement ( generator, node ) {
 		render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
 	}
 
-	local.init.addLineAtStart( render );
+	local.create.addLineAtStart( render );
 	if ( isToplevel ) {
 		generator.current.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
 	}
@@ -92,9 +92,9 @@ export default function visitElement ( generator, node ) {
 		node.initialUpdate = statement;
 	}
 
-	generator.current.builders.init.addBlock( local.init );
+	generator.current.builders.create.addBlock( local.create );
 	if ( !local.update.isEmpty() ) generator.current.builders.update.addBlock( local.update );
-	if ( !local.teardown.isEmpty() ) generator.current.builders.teardown.addBlock( local.teardown );
+	if ( !local.destroy.isEmpty() ) generator.current.builders.destroy.addBlock( local.destroy );
 
 	generator.createMountStatement( name );
 
@@ -116,7 +116,7 @@ export default function visitElement ( generator, node ) {
 	generator.elementDepth -= 1;
 
 	if ( node.initialUpdate ) {
-		generator.current.builders.init.addBlock( node.initialUpdate );
+		generator.current.builders.create.addBlock( node.initialUpdate );
 	}
 
 	generator.pop();
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index aa1c15d7d1ba..9653770de56a 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -43,7 +43,7 @@ export default function visitIfBlock ( generator, node ) {
 	const anchor = `${name}_anchor`;
 	generator.createAnchor( anchor );
 
-	generator.current.builders.init.addBlock( deindent`
+	generator.current.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
 			${conditionsAndBlocks.map( ({ condition, block }) => {
 				return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
@@ -58,7 +58,7 @@ export default function visitIfBlock ( generator, node ) {
 	if ( isToplevel ) {
 		generator.current.builders.mount.addLine( mountStatement );
 	} else {
-		generator.current.builders.init.addLine( mountStatement );
+		generator.current.builders.create.addLine( mountStatement );
 	}
 
 	generator.current.builders.update.addBlock( deindent`
@@ -67,13 +67,13 @@ export default function visitIfBlock ( generator, node ) {
 		if ( ${_currentBlock} === ${currentBlock} && ${name}) {
 			${name}.update( changed, ${params} );
 		} else {
-			if ( ${name} ) ${name}.teardown( true );
+			if ( ${name} ) ${name}.destroy( true );
 			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
 			if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
 		}
 	` );
 
-	generator.current.builders.teardown.addLine(
-		`if ( ${name} ) ${name}.teardown( ${isToplevel ? 'detach' : 'false'} );`
+	generator.current.builders.destroy.addLine(
+		`if ( ${name} ) ${name}.destroy( ${isToplevel ? 'detach' : 'false'} );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 01e36b03e91c..9f0f072c7024 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -6,7 +6,7 @@ export default function visitMustacheTag ( generator, node ) {
 
 	const { snippet } = generator.contextualise( node.expression );
 
-	generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
+	generator.current.builders.create.addLine( `var last_${name} = ${snippet};` );
 	generator.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
 
 	const fragment = findBlock( generator.current );
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index db87960e7db6..de014e001099 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -16,14 +16,14 @@ export default function visitRawMustacheTag ( generator, node ) {
 
 	const isToplevel = generator.current.localElementDepth === 0;
 
-	generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
+	generator.current.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
 	const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
 
 	if ( isToplevel ) {
 		generator.current.builders.mount.addLine( mountStatement );
 	} else {
-		generator.current.builders.init.addLine( mountStatement );
+		generator.current.builders.create.addLine( mountStatement );
 	}
 
 	const fragment = findBlock( generator.current );
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 45f28172b20f..d9b731a08d07 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -6,7 +6,7 @@ export default function visitYieldTag ( generator ) {
 		`${generator.current.component}._yield && ${generator.current.component}._yield.mount( ${generator.current.target}, ${anchor} );`
 	);
 
-	generator.current.builders.teardown.addLine(
-		`${generator.current.component}._yield && ${generator.current.component}._yield.teardown( detach );`
+	generator.current.builders.destroy.addLine(
+		`${generator.current.component}._yield && ${generator.current.component}._yield.destroy( detach );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/attributes/addComponentAttributes.js b/src/generators/dom/visitors/attributes/addComponentAttributes.js
index d2e0d48443bb..0a66db3a185c 100644
--- a/src/generators/dom/visitors/attributes/addComponentAttributes.js
+++ b/src/generators/dom/visitors/attributes/addComponentAttributes.js
@@ -102,7 +102,7 @@ export default function addComponentAttributes ( generator, node, local ) {
 
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
-			local.init.addBlock( deindent`
+			local.create.addBlock( deindent`
 				${local.name}.on( '${attribute.name}', function ( event ) {
 					${handlerBody}
 				});
@@ -116,11 +116,11 @@ export default function addComponentAttributes ( generator, node, local ) {
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
-			local.init.addLine(
+			local.create.addLine(
 				`${generator.current.component}.refs.${attribute.name} = ${local.name};`
 			);
 
-			generator.current.builders.teardown.addLine( deindent`
+			generator.current.builders.destroy.addLine( deindent`
 				if ( ${generator.current.component}.refs.${attribute.name} === ${local.name} ) ${generator.current.component}.refs.${attribute.name} = null;
 			` );
 		}
diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index 07ae7fefe811..204ab5d3bc63 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -41,7 +41,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 
 	const updating = generator.current.getUniqueName( `${local.name}_updating` );
 
-	local.init.addBlock( deindent`
+	local.create.addBlock( deindent`
 		var ${updating} = false;
 
 		${generator.current.component}._bindings.push( function () {
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 2d96cc73bf44..fb0a2b4b61a5 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -32,11 +32,11 @@ export default function addElementAttributes ( generator, node, local ) {
 			if ( attribute.value === true ) {
 				// attributes without values, e.g. <textarea readonly>
 				if ( propertyName ) {
-					local.init.addLine(
+					local.create.addLine(
 						`${local.name}.${propertyName} = true;`
 					);
 				} else {
-					local.init.addLine(
+					local.create.addLine(
 						`${generator.helper( method )}( ${local.name}, '${name}', true );`
 					);
 				}
@@ -49,11 +49,11 @@ export default function addElementAttributes ( generator, node, local ) {
 
 			else if ( attribute.value.length === 0 ) {
 				if ( propertyName ) {
-					local.init.addLine(
+					local.create.addLine(
 						`${local.name}.${propertyName} = '';`
 					);
 				} else {
-					local.init.addLine(
+					local.create.addLine(
 						`${generator.helper( method )}( ${local.name}, '${name}', '' );`
 					);
 				}
@@ -75,7 +75,7 @@ export default function addElementAttributes ( generator, node, local ) {
 						local.namespace = value.data;
 						addAttribute = true;
 					} else if ( propertyName ) {
-						local.init.addLine(
+						local.create.addLine(
 							`${local.name}.${propertyName} = ${result};`
 						);
 					} else {
@@ -83,7 +83,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					}
 
 					if ( addAttribute ) {
-						local.init.addLine(
+						local.create.addLine(
 							`${generator.helper( method )}( ${local.name}, '${name}', ${result} );`
 						);
 					}
@@ -96,7 +96,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					const { snippet } = generator.contextualise( value.expression );
 
 					const last = `last_${local.name}_${name.replace( /-/g, '_')}`;
-					local.init.addLine( `var ${last} = ${snippet};` );
+					local.create.addLine( `var ${last} = ${snippet};` );
 
 					let updater;
 					if ( propertyName ) {
@@ -105,7 +105,7 @@ export default function addElementAttributes ( generator, node, local ) {
 						updater = `${generator.helper( method )}( ${local.name}, '${name}', ${last} );`;
 					}
 
-					local.init.addLine( updater );
+					local.create.addLine( updater );
 					const fragment = findBlock( generator.current );
 					if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
@@ -139,14 +139,14 @@ export default function addElementAttributes ( generator, node, local ) {
 					updater = `${generator.helper( method )}( ${local.name}, '${name}', ${value} );`;
 				}
 
-				local.init.addLine( updater );
+				local.create.addLine( updater );
 				local.update.addLine( updater );
 			}
 
 			if ( isIndirectlyBoundValue ) {
 				const updateValue = `${local.name}.value = ${local.name}.__value;`;
 
-				local.init.addLine( updateValue );
+				local.create.addLine( updateValue );
 				if ( dynamic ) local.update.addLine( updateValue );
 			}
 		}
@@ -185,17 +185,17 @@ export default function addElementAttributes ( generator, node, local ) {
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
 			if ( generator.events.has( name ) ) {
-				local.init.addBlock( deindent`
+				local.create.addBlock( deindent`
 					var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${generator.current.component}, ${local.name}, function ( event ) {
 						${handlerBody}
 					}.bind( ${local.name} ) );
 				` );
 
-				generator.current.builders.teardown.addLine( deindent`
+				generator.current.builders.destroy.addLine( deindent`
 					${handlerName}.teardown();
 				` );
 			} else {
-				local.init.addBlock( deindent`
+				local.create.addBlock( deindent`
 					function ${handlerName} ( event ) {
 						${handlerBody}
 					}
@@ -203,7 +203,7 @@ export default function addElementAttributes ( generator, node, local ) {
 					${generator.helper( 'addEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 
-				generator.current.builders.teardown.addLine( deindent`
+				generator.current.builders.destroy.addLine( deindent`
 					${generator.helper( 'removeEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 			}
@@ -216,11 +216,11 @@ export default function addElementAttributes ( generator, node, local ) {
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
-			local.init.addLine(
+			local.create.addLine(
 				`${generator.current.component}.refs.${name} = ${local.name};`
 			);
 
-			generator.current.builders.teardown.addLine( deindent`
+			generator.current.builders.destroy.addLine( deindent`
 				if ( ${generator.current.component}.refs.${name} === ${local.name} ) ${generator.current.component}.refs.${name} = null;
 			` );
 		}
diff --git a/src/generators/dom/visitors/attributes/addElementBinding.js b/src/generators/dom/visitors/attributes/addElementBinding.js
index eea65eda9395..937324fd00aa 100644
--- a/src/generators/dom/visitors/attributes/addElementBinding.js
+++ b/src/generators/dom/visitors/attributes/addElementBinding.js
@@ -66,11 +66,11 @@ export default function createBinding ( generator, node, attribute, current, loc
 			`~${snippet}.indexOf( ${local.name}.__value )` :
 			`${local.name}.__value === ${snippet}`;
 
-		local.init.addLine(
+		local.create.addLine(
 			`${current.component}._bindingGroups[${bindingGroup}].push( ${local.name} );`
 		);
 
-		local.teardown.addBlock(
+		local.destroy.addBlock(
 			`${current.component}._bindingGroups[${bindingGroup}].splice( ${current.component}._bindingGroups[${bindingGroup}].indexOf( ${local.name} ), 1 );`
 		);
 
@@ -84,7 +84,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 
 	const updating = generator.current.getUniqueName( `${local.name}_updating` );
 
-	local.init.addBlock( deindent`
+	local.create.addBlock( deindent`
 		var ${updating} = false;
 
 		function ${handler} () {
@@ -104,7 +104,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 		}
 	` );
 
-	current.builders.teardown.addLine( deindent`
+	current.builders.destroy.addLine( deindent`
 		${generator.helper( 'removeEventListener' )}( ${local.name}, '${eventName}', ${handler} );
 	` );
 }
diff --git a/src/generators/dom/visitors/meta/Window.js b/src/generators/dom/visitors/meta/Window.js
index df056f106b08..37ce411f2f3a 100644
--- a/src/generators/dom/visitors/meta/Window.js
+++ b/src/generators/dom/visitors/meta/Window.js
@@ -27,14 +27,14 @@ export default function visitWindow ( generator, node ) {
 
 			const handlerName = generator.current.getUniqueName( `onwindow${attribute.name}` );
 
-			generator.current.builders.init.addBlock( deindent`
+			generator.current.builders.create.addBlock( deindent`
 				var ${handlerName} = function ( event ) {
 					[✂${attribute.expression.start}-${attribute.expression.end}✂];
 				};
 				window.addEventListener( '${attribute.name}', ${handlerName} );
 			` );
 
-			generator.current.builders.teardown.addBlock( deindent`
+			generator.current.builders.destroy.addBlock( deindent`
 				window.removeEventListener( '${attribute.name}', ${handlerName} );
 			` );
 		}
@@ -66,7 +66,7 @@ export default function visitWindow ( generator, node ) {
 
 		const props = events[ event ].join( ',\n' );
 
-		generator.current.builders.init.addBlock( deindent`
+		generator.current.builders.create.addBlock( deindent`
 			var ${handlerName} = function ( event ) {
 				component.set({
 					${props}
@@ -75,7 +75,7 @@ export default function visitWindow ( generator, node ) {
 			window.addEventListener( '${event}', ${handlerName} );
 		` );
 
-		generator.current.builders.teardown.addBlock( deindent`
+		generator.current.builders.destroy.addBlock( deindent`
 			window.removeEventListener( '${event}', ${handlerName} );
 		` );
 	});
diff --git a/src/shared/dom.js b/src/shared/dom.js
index 5657a1133365..9a4ef3fb6810 100644
--- a/src/shared/dom.js
+++ b/src/shared/dom.js
@@ -16,9 +16,9 @@ export function detachBetween ( before, after ) {
 	}
 }
 
-export function teardownEach ( iterations, detach, start ) {
+export function destroyEach ( iterations, detach, start ) {
 	for ( var i = ( start || 0 ); i < iterations.length; i += 1 ) {
-		iterations[i].teardown( detach );
+		iterations[i].destroy( detach );
 	}
 }
 
diff --git a/src/validate/js/propValidators/methods.js b/src/validate/js/propValidators/methods.js
index ddcffb38f432..23b10f03a58a 100644
--- a/src/validate/js/propValidators/methods.js
+++ b/src/validate/js/propValidators/methods.js
@@ -2,7 +2,7 @@ import checkForDupes from '../utils/checkForDupes.js';
 import checkForComputedKeys from '../utils/checkForComputedKeys.js';
 import usesThisOrArguments from '../utils/usesThisOrArguments.js';
 
-const builtin = new Set( [ 'set', 'get', 'on', 'fire', 'observe', 'teardown' ] );
+const builtin = new Set( [ 'set', 'get', 'on', 'fire', 'observe', 'destroy' ] );
 
 export default function methods ( validator, prop ) {
 	if ( prop.value.type !== 'ObjectExpression' ) {

From 063e76f322440f6a8de506748b0dcaedff62cfe7 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 6 Apr 2017 16:45:18 -0400
Subject: [PATCH 10/31] baby steps...

---
 src/generators/Generator.js                     |  6 +-----
 src/generators/dom/Fragment.js                  |  9 +++++++++
 src/generators/dom/index.js                     | 13 +++++++++----
 src/generators/dom/visitors/Component.js        |  3 ++-
 src/generators/dom/visitors/EachBlock.js        |  6 ++++--
 src/generators/dom/visitors/Element.js          |  4 +++-
 test/runtime/samples/pass-no-options/_config.js |  3 ++-
 7 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 src/generators/dom/Fragment.js

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index d1956ed73460..a7d0196f2dfb 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -427,10 +427,6 @@ export default class Generator {
 	}
 
 	push ( fragment ) {
-		const newFragment = Object.assign( {}, this.current, fragment, {
-			parent: this.current
-		});
-
-		this.current = newFragment;
+		this.current = fragment;
 	}
 }
diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
new file mode 100644
index 000000000000..870ac26cac52
--- /dev/null
+++ b/src/generators/dom/Fragment.js
@@ -0,0 +1,9 @@
+export default class Fragment {
+	constructor ( options ) {
+		Object.assign( this, options );
+	}
+
+	child ( options ) {
+		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
+	}
+}
\ No newline at end of file
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index deb667755e2b..c3a97f748252 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -3,6 +3,7 @@ import getBuilders from './utils/getBuilders.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import visit from './visit.js';
 import Generator from '../Generator.js';
+import Fragment from './Fragment.js';
 import * as shared from '../../shared/index.js';
 
 class DomGenerator extends Generator {
@@ -116,7 +117,7 @@ class DomGenerator extends Generator {
 	}
 
 	generateBlock ( node, name, type ) {
-		this.push({
+		const childFragment = this.current.child({
 			type,
 			name,
 			target: 'target',
@@ -125,6 +126,8 @@ class DomGenerator extends Generator {
 			getUniqueName: this.getUniqueNameMaker( this.current.params )
 		});
 
+		this.push( childFragment );
+
 		// walk the children here
 		node.children.forEach( node => visit( node, this ) );
 		this.addRenderer( this.current );
@@ -156,8 +159,9 @@ export default function dom ( parsed, source, options ) {
 	const getUniqueName = generator.getUniqueNameMaker( [ 'root' ] );
 	const component = getUniqueName( 'component' );
 
-	generator.push({
+	const mainFragment = new Fragment({
 		type: 'block',
+		generator,
 		name: generator.alias( 'create_main_fragment' ),
 		namespace,
 		target: 'target',
@@ -174,14 +178,15 @@ export default function dom ( parsed, source, options ) {
 		listNames: new Map(),
 
 		builders: getBuilders(),
-		getUniqueName,
+		getUniqueName
 	});
+	generator.push( mainFragment );
 
 	parsed.html.children.forEach( node => {
 		visit( node, generator );
 	});
 
-	generator.addRenderer( generator.pop() );
+	generator.addRenderer( mainFragment );
 
 	const builders = {
 		main: new CodeBuilder(),
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 12f02ba53fed..8ab6e8da9594 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -158,7 +158,7 @@ export default function visitComponent ( generator, node ) {
 	current.builders.create.addBlock( local.create );
 	if ( !local.update.isEmpty() ) current.builders.update.addBlock( local.update );
 
-	generator.push({
+	const childFragment = generator.current.child({
 		type: 'component',
 		namespace: local.namespace,
 		target: name,
@@ -166,6 +166,7 @@ export default function visitComponent ( generator, node ) {
 		localElementDepth: current.localElementDepth + 1,
 		key: null
 	});
+	generator.push( childFragment );
 
 	generator.elementDepth += 1;
 
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index d52feec1bf24..63aac0000db3 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -192,7 +192,7 @@ export default function visitEachBlock ( generator, node ) {
 
 	const getUniqueName = generator.getUniqueNameMaker( blockParams );
 
-	generator.push({
+	const childFragment = generator.current.child({
 		type: 'block',
 		name: renderer,
 		target: 'target',
@@ -212,9 +212,11 @@ export default function visitEachBlock ( generator, node ) {
 		params: blockParams,
 
 		builders: getBuilders(),
-		getUniqueName,
+		getUniqueName
 	});
 
+	generator.push( childFragment );
+
 	node.children.forEach( child => {
 		visit( child, generator );
 	});
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 6b1b20989269..95b55a12bbd6 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -98,7 +98,7 @@ export default function visitElement ( generator, node ) {
 
 	generator.createMountStatement( name );
 
-	generator.push({
+	const childFragment = generator.current.child({
 		type: 'element',
 		namespace: local.namespace,
 		target: name,
@@ -107,6 +107,8 @@ export default function visitElement ( generator, node ) {
 		key: null
 	});
 
+	generator.push( childFragment );
+
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
diff --git a/test/runtime/samples/pass-no-options/_config.js b/test/runtime/samples/pass-no-options/_config.js
index 7a8e7a4fb628..9683944f21b8 100644
--- a/test/runtime/samples/pass-no-options/_config.js
+++ b/test/runtime/samples/pass-no-options/_config.js
@@ -1,6 +1,7 @@
 export default {
 	html: '<h1>Just some static HTML</h1>',
-	test: function ( assert, component, target, window ) {
+
+	test ( assert, component, target, window ) {
 		const newComp = new window.SvelteComponent();
 		assert.equal(newComp instanceof window.SvelteComponent, true);
 	}

From d0752cd6b1cd2e112472f165519fe0345ceda8e0 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 6 Apr 2017 18:30:43 -0400
Subject: [PATCH 11/31] another half-done commit

---
 src/generators/dom/Fragment.js                | 30 +++++++
 src/generators/dom/index.js                   | 32 +------
 src/generators/dom/visit.js                   |  4 +-
 src/generators/dom/visitors/Component.js      | 51 ++++++-----
 src/generators/dom/visitors/EachBlock.js      | 88 +++++++++----------
 src/generators/dom/visitors/Element.js        | 42 ++++-----
 src/generators/dom/visitors/IfBlock.js        | 28 +++---
 src/generators/dom/visitors/MustacheTag.js    | 19 ++--
 src/generators/dom/visitors/RawMustacheTag.js | 29 +++---
 src/generators/dom/visitors/Text.js           |  8 +-
 src/generators/dom/visitors/YieldTag.js       | 12 +--
 .../attributes/addComponentAttributes.js      | 16 ++--
 .../attributes/addComponentBinding.js         | 14 +--
 .../attributes/addElementAttributes.js        | 36 ++++----
 .../visitors/attributes/addElementBinding.js  | 26 +++---
 .../visitors/attributes/binding/getSetter.js  | 16 ++--
 .../attributes/getStaticAttributeValue.js     |  0
 src/generators/dom/visitors/meta/Window.js    | 14 +--
 18 files changed, 234 insertions(+), 231 deletions(-)
 delete mode 100644 src/generators/dom/visitors/attributes/getStaticAttributeValue.js

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index 870ac26cac52..16b3093d3efb 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -3,7 +3,37 @@ export default class Fragment {
 		Object.assign( this, options );
 	}
 
+	addElement ( name, renderStatement, needsIdentifier = false ) {
+		const isToplevel = this.localElementDepth === 0;
+		if ( needsIdentifier || isToplevel ) {
+			this.builders.create.addLine(
+				`var ${name} = ${renderStatement};`
+			);
+
+			this.createMountStatement( name );
+		} else {
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${this.target} );` );
+		}
+
+		if ( isToplevel ) {
+			this.builders.detach.addLine( `${this.generator.helper( 'detachNode' )}( ${name} );` );
+		}
+	}
+
 	child ( options ) {
 		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
 	}
+
+	createAnchor ( name ) {
+		const renderStatement = `${this.generator.helper( 'createComment' )}()`;
+		this.addElement( name, renderStatement, true );
+	}
+
+	createMountStatement ( name ) {
+		if ( this.target === 'target' ) {
+			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
+		} else {
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${this.target} );` );
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index c3a97f748252..fb968c126387 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -18,23 +18,6 @@ class DomGenerator extends Generator {
 		};
 	}
 
-	addElement ( name, renderStatement, needsIdentifier = false ) {
-		const isToplevel = this.current.localElementDepth === 0;
-		if ( needsIdentifier || isToplevel ) {
-			this.current.builders.create.addLine(
-				`var ${name} = ${renderStatement};`
-			);
-
-			this.createMountStatement( name );
-		} else {
-			this.current.builders.create.addLine( `${this.helper( 'appendNode' )}( ${renderStatement}, ${this.current.target} );` );
-		}
-
-		if ( isToplevel ) {
-			this.current.builders.detach.addLine( `${this.helper( 'detachNode' )}( ${name} );` );
-		}
-	}
-
 	addRenderer ( fragment ) {
 		if ( fragment.autofocus ) {
 			fragment.builders.create.addLine( `${fragment.autofocus}.focus();` );
@@ -103,19 +86,6 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	createAnchor ( name ) {
-		const renderStatement = `${this.helper( 'createComment' )}()`;
-		this.addElement( name, renderStatement, true );
-	}
-
-	createMountStatement ( name ) {
-		if ( this.current.target === 'target' ) {
-			this.current.builders.mount.addLine( `${this.helper( 'insertNode' )}( ${name}, target, anchor );` );
-		} else {
-			this.current.builders.create.addLine( `${this.helper( 'appendNode' )}( ${name}, ${this.current.target} );` );
-		}
-	}
-
 	generateBlock ( node, name, type ) {
 		const childFragment = this.current.child({
 			type,
@@ -183,7 +153,7 @@ export default function dom ( parsed, source, options ) {
 	generator.push( mainFragment );
 
 	parsed.html.children.forEach( node => {
-		visit( node, generator );
+		visit( generator, mainFragment, node );
 	});
 
 	generator.addRenderer( mainFragment );
diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
index e9837098c4cd..1b96ed510ba6 100644
--- a/src/generators/dom/visit.js
+++ b/src/generators/dom/visit.js
@@ -1,6 +1,6 @@
 import visitors from './visitors/index.js';
 
-export default function visit ( node, generator ) {
+export default function visit ( generator, fragment, node ) {
 	const visitor = visitors[ node.type ];
-	visitor( generator, node );
+	visitor( generator, fragment, node );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 8ab6e8da9594..623332a334ba 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -19,14 +19,13 @@ function stringifyProps ( props ) {
 	return `{ ${joined} }`;
 }
 
-export default function visitComponent ( generator, node ) {
+export default function visitComponent ( generator, fragment, node ) {
 	const hasChildren = node.children.length > 0;
-	const { current } = generator;
-	const name = current.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
+	const name = fragment.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
 
 	const local = {
 		name,
-		namespace: current.namespace,
+		namespace: fragment.namespace,
 		isComponent: true,
 
 		allUsedContexts: [],
@@ -35,18 +34,18 @@ export default function visitComponent ( generator, node ) {
 		update: new CodeBuilder()
 	};
 
-	const isToplevel = current.localElementDepth === 0;
+	const isToplevel = fragment.localElementDepth === 0;
 
 	generator.hasComponents = true;
 
-	addComponentAttributes( generator, node, local );
+	addComponentAttributes( generator, fragment, node, local );
 
 	if ( local.allUsedContexts.length ) {
 		const initialProps = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `root: root`;
 
-			const listName = current.listNames.get( contextName );
-			const indexName = current.indexNames.get( contextName );
+			const listName = fragment.listNames.get( contextName );
+			const indexName = fragment.indexNames.get( contextName );
 
 			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
 		}).join( ',\n' );
@@ -54,8 +53,8 @@ export default function visitComponent ( generator, node ) {
 		const updates = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `${name}._context.root = root;`;
 
-			const listName = current.listNames.get( contextName );
-			const indexName = current.indexNames.get( contextName );
+			const listName = fragment.listNames.get( contextName );
+			const indexName = fragment.indexNames.get( contextName );
 
 			return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
 		}).join( '\n' );
@@ -70,24 +69,24 @@ export default function visitComponent ( generator, node ) {
 	}
 
 	const componentInitProperties = [
-		`target: ${!isToplevel ? current.target: 'null'}`,
-		`_root: ${current.component}._root || ${current.component}`
+		`target: ${!isToplevel ? fragment.target: 'null'}`,
+		`_root: ${fragment.component}._root || ${fragment.component}`
 	];
 
 	// Component has children, put them in a separate {{yield}} block
 	if ( hasChildren ) {
 		const yieldName = generator.getUniqueName( `render_${name}_yield_fragment` );
-		const params = current.params.join( ', ' );
+		const params = fragment.params.join( ', ' );
 
 		generator.generateBlock( node, yieldName, 'block' );
 
-		const yieldFragment = current.getUniqueName( `${name}_yield_fragment` );
+		const yieldFragment = fragment.getUniqueName( `${name}_yield_fragment` );
 
-		current.builders.create.addLine(
-			`var ${yieldFragment} = ${yieldName}( ${params}, ${current.component} );`
+		fragment.builders.create.addLine(
+			`var ${yieldFragment} = ${yieldName}( ${params}, ${fragment.component} );`
 		);
 
-		current.builders.update.addLine(
+		fragment.builders.update.addLine(
 			`${yieldFragment}.update( changed, ${params} );`
 		);
 
@@ -104,7 +103,7 @@ export default function visitComponent ( generator, node ) {
 		const initialPropString = stringifyProps( initialProps );
 
 		if ( local.bindings.length ) {
-			const initialData = current.getUniqueName( `${name}_initial_data` );
+			const initialData = fragment.getUniqueName( `${name}_initial_data` );
 
 			statements.push( `var ${name}_initial_data = ${initialPropString};` );
 
@@ -128,7 +127,7 @@ export default function visitComponent ( generator, node ) {
 	` );
 
 	if ( isToplevel ) {
-		current.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
+		fragment.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
 	}
 
 	if ( local.dynamicAttributes.length ) {
@@ -153,17 +152,17 @@ export default function visitComponent ( generator, node ) {
 		` );
 	}
 
-	current.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
+	fragment.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
 
-	current.builders.create.addBlock( local.create );
-	if ( !local.update.isEmpty() ) current.builders.update.addBlock( local.update );
+	fragment.builders.create.addBlock( local.create );
+	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
 
-	const childFragment = generator.current.child({
+	const childFragment = fragment.child({
 		type: 'component',
 		namespace: local.namespace,
 		target: name,
-		parent: current,
-		localElementDepth: current.localElementDepth + 1,
+		parent: fragment,
+		localElementDepth: fragment.localElementDepth + 1,
 		key: null
 	});
 	generator.push( childFragment );
@@ -171,7 +170,7 @@ export default function visitComponent ( generator, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, childFragment, child );
 	});
 
 	generator.elementDepth -= 1;
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 63aac0000db3..369b5970481a 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -3,52 +3,52 @@ import deindent from '../../../utils/deindent.js';
 import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
-export default function visitEachBlock ( generator, node ) {
+export default function visitEachBlock ( generator, fragment, node ) {
 	const name = generator.getUniqueName( `each_block` );
 	const renderer = generator.getUniqueName( `render_each_block` );
 	const elseName = generator.getUniqueName( `${name}_else` );
 	const renderElse = generator.getUniqueName( `${renderer}_else` );
-	const i = generator.current.getUniqueName( `i` );
-	const params = generator.current.params.join( ', ' );
+	const i = fragment.getUniqueName( `i` );
+	const params = fragment.params.join( ', ' );
 
-	const listName = generator.current.getUniqueName( `${name}_value` );
+	const listName = fragment.getUniqueName( `${name}_value` );
 
-	const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = fragment.localElementDepth === 0;
 
 	generator.addSourcemapLocations( node.expression );
 
 	const { dependencies, snippet } = generator.contextualise( node.expression );
 
-	const anchor = generator.current.getUniqueName( `${name}_anchor` );
-	generator.createAnchor( anchor );
+	const anchor = fragment.getUniqueName( `${name}_anchor` );
+	fragment.createAnchor( anchor );
 
 	const localVars = {};
 
-	localVars.iteration = generator.current.getUniqueName( `${name}_iteration` );
-	localVars.iterations = generator.current.getUniqueName( `${name}_iterations` );
-	localVars._iterations = generator.current.getUniqueName( `_${name}_iterations` );
-	localVars.lookup = generator.current.getUniqueName( `${name}_lookup` );
-	localVars._lookup = generator.current.getUniqueName( `_${name}_lookup` );
+	localVars.iteration = fragment.getUniqueName( `${name}_iteration` );
+	localVars.iterations = fragment.getUniqueName( `${name}_iterations` );
+	localVars._iterations = fragment.getUniqueName( `_${name}_iterations` );
+	localVars.lookup = fragment.getUniqueName( `${name}_lookup` );
+	localVars._lookup = fragment.getUniqueName( `_${name}_lookup` );
 
-	generator.current.builders.create.addLine( `var ${listName} = ${snippet};` );
-	generator.current.builders.create.addLine( `var ${localVars.iterations} = [];` );
-	if ( node.key ) generator.current.builders.create.addLine( `var ${localVars.lookup} = Object.create( null );` );
-	if ( node.else ) generator.current.builders.create.addLine( `var ${elseName} = null;` );
+	fragment.builders.create.addLine( `var ${listName} = ${snippet};` );
+	fragment.builders.create.addLine( `var ${localVars.iterations} = [];` );
+	if ( node.key ) fragment.builders.create.addLine( `var ${localVars.lookup} = Object.create( null );` );
+	if ( node.else ) fragment.builders.create.addLine( `var ${elseName} = null;` );
 
 	const initialRender = new CodeBuilder();
 
 	if ( node.key ) {
-		localVars.fragment = generator.current.getUniqueName( 'fragment' );
-		localVars.value = generator.current.getUniqueName( 'value' );
-		localVars.key = generator.current.getUniqueName( 'key' );
+		localVars.fragment = fragment.getUniqueName( 'fragment' );
+		localVars.value = fragment.getUniqueName( 'value' );
+		localVars.key = fragment.getUniqueName( 'key' );
 
 		initialRender.addBlock( deindent`
 			var ${localVars.key} = ${listName}[${i}].${node.key};
-			${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
+			${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component}${node.key ? `, ${localVars.key}` : `` } );
 		` );
 	} else {
 		initialRender.addLine(
-			`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );`
+			`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component} );`
 		);
 	}
 
@@ -58,29 +58,29 @@ export default function visitEachBlock ( generator, node ) {
 		);
 	}
 
-	generator.current.builders.create.addBlock( deindent`
+	fragment.builders.create.addBlock( deindent`
 		for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
 			${initialRender}
 		}
 	` );
 
 	if ( node.else ) {
-		generator.current.builders.create.addBlock( deindent`
+		fragment.builders.create.addBlock( deindent`
 			if ( !${listName}.length ) {
-				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
+				${elseName} = ${renderElse}( ${params}, ${fragment.component} );
 				${!isToplevel ? `${elseName}.mount( ${anchor}.parentNode, ${anchor} );` : ''}
 			}
 		` );
 	}
 
 	if ( isToplevel ) {
-		generator.current.builders.mount.addBlock( deindent`
+		fragment.builders.mount.addBlock( deindent`
 			for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
 				${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
 			}
 		` );
 		if ( node.else ) {
-			generator.current.builders.mount.addBlock( deindent`
+			fragment.builders.mount.addBlock( deindent`
 				if ( ${elseName} ) {
 					${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 				}
@@ -89,7 +89,7 @@ export default function visitEachBlock ( generator, node ) {
 	}
 
 	if ( node.key ) {
-		generator.current.builders.update.addBlock( deindent`
+		fragment.builders.update.addBlock( deindent`
 			var ${listName} = ${snippet};
 			var ${localVars._iterations} = [];
 			var ${localVars._lookup} = Object.create( null );
@@ -105,7 +105,7 @@ export default function visitEachBlock ( generator, node ) {
 					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${localVars.lookup}[ ${localVars.key} ];
 					${localVars._lookup}[ ${localVars.key} ].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
 				} else {
-					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component}${node.key ? `, ${localVars.key}` : `` } );
+					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component}${node.key ? `, ${localVars.key}` : `` } );
 				}
 
 				${localVars._iterations}[${i}].mount( ${localVars.fragment}, null );
@@ -125,12 +125,12 @@ export default function visitEachBlock ( generator, node ) {
 			${localVars.lookup} = ${localVars._lookup};
 		` );
 	} else {
-		generator.current.builders.update.addBlock( deindent`
+		fragment.builders.update.addBlock( deindent`
 			var ${listName} = ${snippet};
 
 			for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
 				if ( !${localVars.iterations}[${i}] ) {
-					${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${generator.current.component} );
+					${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component} );
 					${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
 				} else {
 					${localVars.iterations}[${i}].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
@@ -144,11 +144,11 @@ export default function visitEachBlock ( generator, node ) {
 	}
 
 	if ( node.else ) {
-		generator.current.builders.update.addBlock( deindent`
+		fragment.builders.update.addBlock( deindent`
 			if ( !${listName}.length && ${elseName} ) {
 				${elseName}.update( changed, ${params} );
 			} else if ( !${listName}.length ) {
-				${elseName} = ${renderElse}( ${params}, ${generator.current.component} );
+				${elseName} = ${renderElse}( ${params}, ${fragment.component} );
 				${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 			} else if ( ${elseName} ) {
 				${elseName}.destroy( true );
@@ -156,11 +156,11 @@ export default function visitEachBlock ( generator, node ) {
 		` );
 	}
 
-	generator.current.builders.destroy.addBlock(
+	fragment.builders.destroy.addBlock(
 		`${generator.helper( 'destroyEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
 
 	if ( node.else ) {
-		generator.current.builders.destroy.addBlock( deindent`
+		fragment.builders.destroy.addBlock( deindent`
 			if ( ${elseName} ) {
 				${elseName}.destroy( ${isToplevel ? 'detach' : 'false'} );
 			}
@@ -171,28 +171,28 @@ export default function visitEachBlock ( generator, node ) {
 		generator.generateBlock( node.else, renderElse, 'block' );
 	}
 
-	const indexNames = new Map( generator.current.indexNames );
-	const indexName = node.index || generator.current.getUniqueName( `${node.context}_index` );
+	const indexNames = new Map( fragment.indexNames );
+	const indexName = node.index || fragment.getUniqueName( `${node.context}_index` );
 	indexNames.set( node.context, indexName );
 
-	const listNames = new Map( generator.current.listNames );
+	const listNames = new Map( fragment.listNames );
 	listNames.set( node.context, listName );
 
 	const context = generator.getUniqueName( node.context );
-	const contexts = new Map( generator.current.contexts );
+	const contexts = new Map( fragment.contexts );
 	contexts.set( node.context, context );
 
-	const indexes = new Map( generator.current.indexes );
+	const indexes = new Map( fragment.indexes );
 	if ( node.index ) indexes.set( indexName, node.context );
 
-	const contextDependencies = new Map( generator.current.contextDependencies );
+	const contextDependencies = new Map( fragment.contextDependencies );
 	contextDependencies.set( node.context, dependencies );
 
-	const blockParams = generator.current.params.concat( listName, context, indexName );
+	const blockParams = fragment.params.concat( listName, context, indexName );
 
 	const getUniqueName = generator.getUniqueNameMaker( blockParams );
 
-	const childFragment = generator.current.child({
+	const childFragment = fragment.child({
 		type: 'block',
 		name: renderer,
 		target: 'target',
@@ -218,9 +218,9 @@ export default function visitEachBlock ( generator, node ) {
 	generator.push( childFragment );
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, childFragment, child );
 	});
 
-	generator.addRenderer( generator.current );
+	generator.addRenderer( childFragment );
 	generator.pop();
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 95b55a12bbd6..4db5bf32f225 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -9,20 +9,20 @@ const meta = {
 	':Window': visitWindow
 };
 
-export default function visitElement ( generator, node ) {
+export default function visitElement ( generator, fragment, node ) {
 	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, node );
+		return meta[ node.name ]( generator, fragment, node );
 	}
 
 	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		return visitComponent( generator, node );
+		return visitComponent( generator, fragment, node );
 	}
 
-	const name = generator.current.getUniqueName( node.name );
+	const name = fragment.getUniqueName( node.name );
 
 	const local = {
 		name,
-		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : generator.current.namespace,
+		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : fragment.namespace,
 		isComponent: false,
 
 		allUsedContexts: [],
@@ -32,16 +32,16 @@ export default function visitElement ( generator, node ) {
 		destroy: new CodeBuilder()
 	};
 
-	const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = fragment.localElementDepth === 0;
 
-	addElementAttributes( generator, node, local );
+	addElementAttributes( generator, fragment, node, local );
 
 	if ( local.allUsedContexts.length ) {
 		const initialProps = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `root: root`;
 
-			const listName = generator.current.listNames.get( contextName );
-			const indexName = generator.current.indexNames.get( contextName );
+			const listName = fragment.listNames.get( contextName );
+			const indexName = fragment.indexNames.get( contextName );
 
 			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
 		}).join( ',\n' );
@@ -49,8 +49,8 @@ export default function visitElement ( generator, node ) {
 		const updates = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `${name}.__svelte.root = root;`;
 
-			const listName = generator.current.listNames.get( contextName );
-			const indexName = generator.current.indexNames.get( contextName );
+			const listName = fragment.listNames.get( contextName );
+			const indexName = fragment.indexNames.get( contextName );
 
 			return `${name}.__svelte.${listName} = ${listName};\n${name}.__svelte.${indexName} = ${indexName};`;
 		}).join( '\n' );
@@ -82,7 +82,7 @@ export default function visitElement ( generator, node ) {
 
 	local.create.addLineAtStart( render );
 	if ( isToplevel ) {
-		generator.current.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
+		fragment.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
 	}
 
 	// special case – bound <option> without a value attribute
@@ -92,18 +92,18 @@ export default function visitElement ( generator, node ) {
 		node.initialUpdate = statement;
 	}
 
-	generator.current.builders.create.addBlock( local.create );
-	if ( !local.update.isEmpty() ) generator.current.builders.update.addBlock( local.update );
-	if ( !local.destroy.isEmpty() ) generator.current.builders.destroy.addBlock( local.destroy );
+	fragment.builders.create.addBlock( local.create );
+	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
+	if ( !local.destroy.isEmpty() ) fragment.builders.destroy.addBlock( local.destroy );
 
-	generator.createMountStatement( name );
+	fragment.createMountStatement( name );
 
-	const childFragment = generator.current.child({
+	const childFragment = fragment.child({
 		type: 'element',
 		namespace: local.namespace,
 		target: name,
-		parent: generator.current,
-		localElementDepth: generator.current.localElementDepth + 1,
+		parent: fragment,
+		localElementDepth: fragment.localElementDepth + 1,
 		key: null
 	});
 
@@ -112,13 +112,13 @@ export default function visitElement ( generator, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, childFragment, child );
 	});
 
 	generator.elementDepth -= 1;
 
 	if ( node.initialUpdate ) {
-		generator.current.builders.create.addBlock( node.initialUpdate );
+		fragment.builders.create.addBlock( node.initialUpdate );
 	}
 
 	generator.pop();
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 9653770de56a..dd4dbaa719d4 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -30,20 +30,20 @@ function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
 	return conditionsAndBlocks;
 }
 
-export default function visitIfBlock ( generator, node ) {
-	const params = generator.current.params.join( ', ' );
+export default function visitIfBlock ( generator, fragment, node ) {
+	const params = fragment.params.join( ', ' );
 	const name = generator.getUniqueName( `if_block` );
-	const getBlock = generator.current.getUniqueName( `get_block` );
-	const currentBlock = generator.current.getUniqueName( `current_block` );
-	const _currentBlock = generator.current.getUniqueName( `_current_block` );
+	const getBlock = fragment.getUniqueName( `get_block` );
+	const currentBlock = fragment.getUniqueName( `current_block` );
+	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
-	const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = fragment.localElementDepth === 0;
 	const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `render_if_block` ) );
 
 	const anchor = `${name}_anchor`;
-	generator.createAnchor( anchor );
+	fragment.createAnchor( anchor );
 
-	generator.current.builders.create.addBlock( deindent`
+	fragment.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
 			${conditionsAndBlocks.map( ({ condition, block }) => {
 				return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
@@ -51,29 +51,29 @@ export default function visitIfBlock ( generator, node ) {
 		}
 
 		var ${currentBlock} = ${getBlock}( ${params} );
-		var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
+		var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${fragment.component} );
 	` );
 
 	const mountStatement = `if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );`;
 	if ( isToplevel ) {
-		generator.current.builders.mount.addLine( mountStatement );
+		fragment.builders.mount.addLine( mountStatement );
 	} else {
-		generator.current.builders.create.addLine( mountStatement );
+		fragment.builders.create.addLine( mountStatement );
 	}
 
-	generator.current.builders.update.addBlock( deindent`
+	fragment.builders.update.addBlock( deindent`
 		var ${_currentBlock} = ${currentBlock};
 		${currentBlock} = ${getBlock}( ${params} );
 		if ( ${_currentBlock} === ${currentBlock} && ${name}) {
 			${name}.update( changed, ${params} );
 		} else {
 			if ( ${name} ) ${name}.destroy( true );
-			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${generator.current.component} );
+			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${fragment.component} );
 			if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
 		}
 	` );
 
-	generator.current.builders.destroy.addLine(
+	fragment.builders.destroy.addLine(
 		`if ( ${name} ) ${name}.destroy( ${isToplevel ? 'detach' : 'false'} );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 9f0f072c7024..aaa558704a7a 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -1,20 +1,21 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default function visitMustacheTag ( generator, node ) {
-	const name = generator.current.getUniqueName( 'text' );
+export default function visitMustacheTag ( generator, fragment, node ) {
+	const name = fragment.getUniqueName( 'text' );
 
 	const { snippet } = generator.contextualise( node.expression );
 
-	generator.current.builders.create.addLine( `var last_${name} = ${snippet};` );
-	generator.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
+	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
 
-	const fragment = findBlock( generator.current );
-	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	// TODO this should be unnecessary once we separate fragments from state
+	const parentFragment = findBlock( fragment );
+	if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
 
-	generator.current.builders.update.addBlock( deindent`
-		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-			${name}.data = last_${name} = ${fragment.tmp};
+	fragment.builders.update.addBlock( deindent`
+		if ( ( ${parentFragment.tmp} = ${snippet} ) !== last_${name} ) {
+			${name}.data = last_${name} = ${parentFragment.tmp};
 		}
 	` );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index de014e001099..6c2da8320748 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -1,41 +1,42 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default function visitRawMustacheTag ( generator, node ) {
-	const name = generator.current.getUniqueName( 'raw' );
+export default function visitRawMustacheTag ( generator, fragment, node ) {
+	const name = fragment.getUniqueName( 'raw' );
 
 	const { snippet } = generator.contextualise( node.expression );
 
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
 	const before = `${name}_before`;
-	generator.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
 
 	const after = `${name}_after`;
-	generator.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
 
-	const isToplevel = generator.current.localElementDepth === 0;
+	const isToplevel = fragment.localElementDepth === 0;
 
-	generator.current.builders.create.addLine( `var last_${name} = ${snippet};` );
+	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
 	const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
 
 	if ( isToplevel ) {
-		generator.current.builders.mount.addLine( mountStatement );
+		fragment.builders.mount.addLine( mountStatement );
 	} else {
-		generator.current.builders.create.addLine( mountStatement );
+		fragment.builders.create.addLine( mountStatement );
 	}
 
-	const fragment = findBlock( generator.current );
-	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	// TODO this should be unnecessary once we separate fragments from state
+	const parentFragment = findBlock( fragment );
+	if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
 
-	generator.current.builders.update.addBlock( deindent`
-		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-			last_${name} = ${fragment.tmp};
+	fragment.builders.update.addBlock( deindent`
+		if ( ( ${parentFragment.tmp} = ${snippet} ) !== last_${name} ) {
+			last_${name} = ${parentFragment.tmp};
 			${detachStatement}
 			${mountStatement}
 		}
 	` );
 
-	generator.current.builders.detachRaw.addBlock( detachStatement );
+	fragment.builders.detachRaw.addBlock( detachStatement );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index 86231112c4f4..dde8ec85b05e 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -1,8 +1,8 @@
-export default function visitText ( generator, node ) {
-	if ( generator.current.namespace && !/\S/.test( node.data ) ) {
+export default function visitText ( generator, fragment, node ) {
+	if ( fragment.namespace && !/\S/.test( node.data ) ) {
 		return;
 	}
 
-	const name = generator.current.getUniqueName( `text` );
-	generator.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
+	const name = fragment.getUniqueName( `text` );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index d9b731a08d07..95f1b1d58f76 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,12 +1,12 @@
-export default function visitYieldTag ( generator ) {
+export default function visitYieldTag ( generator, fragment ) {
 	const anchor = `yield_anchor`;
-	generator.createAnchor( anchor );
+	fragment.createAnchor( anchor );
 
-	generator.current.builders.mount.addLine(
-		`${generator.current.component}._yield && ${generator.current.component}._yield.mount( ${generator.current.target}, ${anchor} );`
+	fragment.builders.mount.addLine(
+		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${fragment.target}, ${anchor} );`
 	);
 
-	generator.current.builders.destroy.addLine(
-		`${generator.current.component}._yield && ${generator.current.component}._yield.destroy( detach );`
+	fragment.builders.destroy.addLine(
+		`${fragment.component}._yield && ${fragment.component}._yield.destroy( detach );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/attributes/addComponentAttributes.js b/src/generators/dom/visitors/attributes/addComponentAttributes.js
index 0a66db3a185c..094c6b37e940 100644
--- a/src/generators/dom/visitors/attributes/addComponentAttributes.js
+++ b/src/generators/dom/visitors/attributes/addComponentAttributes.js
@@ -1,7 +1,7 @@
 import addComponentBinding from './addComponentBinding.js';
 import deindent from '../../../../utils/deindent.js';
 
-export default function addComponentAttributes ( generator, node, local ) {
+export default function addComponentAttributes ( generator, fragment, node, local ) {
 	local.staticAttributes = [];
 	local.dynamicAttributes = [];
 	local.bindings = [];
@@ -78,7 +78,7 @@ export default function addComponentAttributes ( generator, node, local ) {
 		else if ( attribute.type === 'EventHandler' ) {
 			// TODO verify that it's a valid callee (i.e. built-in or declared method)
 			generator.addSourcemapLocations( attribute.expression );
-			generator.code.prependRight( attribute.expression.start, `${generator.current.component}.` );
+			generator.code.prependRight( attribute.expression.start, `${fragment.component}.` );
 
 			const usedContexts = [];
 			attribute.expression.arguments.forEach( arg => {
@@ -94,8 +94,8 @@ export default function addComponentAttributes ( generator, node, local ) {
 			const declarations = usedContexts.map( name => {
 				if ( name === 'root' ) return 'var root = this._context.root;';
 
-				const listName = generator.current.listNames.get( name );
-				const indexName = generator.current.indexNames.get( name );
+				const listName = fragment.listNames.get( name );
+				const indexName = fragment.indexNames.get( name );
 
 				return `var ${listName} = this._context.${listName}, ${indexName} = this._context.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
@@ -110,18 +110,18 @@ export default function addComponentAttributes ( generator, node, local ) {
 		}
 
 		else if ( attribute.type === 'Binding' ) {
-			addComponentBinding( generator, node, attribute, generator.current, local );
+			addComponentBinding( generator, node, attribute, fragment, local );
 		}
 
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
 			local.create.addLine(
-				`${generator.current.component}.refs.${attribute.name} = ${local.name};`
+				`${fragment.component}.refs.${attribute.name} = ${local.name};`
 			);
 
-			generator.current.builders.destroy.addLine( deindent`
-				if ( ${generator.current.component}.refs.${attribute.name} === ${local.name} ) ${generator.current.component}.refs.${attribute.name} = null;
+			fragment.builders.destroy.addLine( deindent`
+				if ( ${fragment.component}.refs.${attribute.name} === ${local.name} ) ${fragment.component}.refs.${attribute.name} = null;
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index 204ab5d3bc63..66be449133fc 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -2,7 +2,7 @@ import deindent from '../../../../utils/deindent.js';
 import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 
-export default function createBinding ( generator, node, attribute, current, local ) {
+export default function createBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
 	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
 
@@ -12,14 +12,14 @@ export default function createBinding ( generator, node, attribute, current, loc
 		if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
 	});
 
-	const contextual = current.contexts.has( name );
+	const contextual = fragment.contexts.has( name );
 
 	let obj;
 	let prop;
 
 	if ( contextual ) {
-		obj = current.listNames.get( name );
-		prop = current.indexNames.get( name );
+		obj = fragment.listNames.get( name );
+		prop = fragment.indexNames.get( name );
 	} else if ( attribute.value.type === 'MemberExpression' ) {
 		prop = `'[✂${attribute.value.property.start}-${attribute.value.property.end}✂]'`;
 		obj = `[✂${attribute.value.object.start}-${attribute.value.object.end}✂]`;
@@ -35,16 +35,16 @@ export default function createBinding ( generator, node, attribute, current, loc
 		prop
 	});
 
-	const setter = getSetter({ current, name, keypath, context: '_context', attribute, dependencies, value: 'value' });
+	const setter = getSetter({ fragment, name, keypath, context: '_context', attribute, dependencies, value: 'value' });
 
 	generator.hasComplexBindings = true;
 
-	const updating = generator.current.getUniqueName( `${local.name}_updating` );
+	const updating = fragment.getUniqueName( `${local.name}_updating` );
 
 	local.create.addBlock( deindent`
 		var ${updating} = false;
 
-		${generator.current.component}._bindings.push( function () {
+		${fragment.component}._bindings.push( function () {
 			if ( ${local.name}._torndown ) return;
 			${local.name}.observe( '${attribute.name}', function ( value ) {
 				if ( ${updating} ) return;
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index fb0a2b4b61a5..6c01036e78ee 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -5,7 +5,7 @@ import flattenReference from '../../../../utils/flattenReference.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 import findBlock from '../../utils/findBlock.js';
 
-export default function addElementAttributes ( generator, node, local ) {
+export default function addElementAttributes ( generator, fragment, node, local ) {
 	node.attributes.forEach( attribute => {
 		const name = attribute.name;
 
@@ -43,7 +43,7 @@ export default function addElementAttributes ( generator, node, local ) {
 
 				// special case – autofocus. has to be handled in a bit of a weird way
 				if ( name === 'autofocus' ) {
-					generator.current.autofocus = local.name;
+					fragment.autofocus = local.name;
 				}
 			}
 
@@ -106,12 +106,14 @@ export default function addElementAttributes ( generator, node, local ) {
 					}
 
 					local.create.addLine( updater );
-					const fragment = findBlock( generator.current );
-					if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+
+					// TODO unnecessary soon...
+					const parentFragment = findBlock( fragment );
+					if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
 
 					local.update.addBlock( deindent`
-						if ( ( ${fragment.tmp} = ${snippet} ) !== ${last} ) {
-							${last} = ${fragment.tmp};
+						if ( ( ${parentFragment.tmp} = ${snippet} ) !== ${last} ) {
+							${last} = ${parentFragment.tmp};
 							${updater}
 						}
 					` );
@@ -158,7 +160,7 @@ export default function addElementAttributes ( generator, node, local ) {
 			const flattened = flattenReference( attribute.expression.callee );
 			if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
 				// allow event.stopPropagation(), this.select() etc
-				generator.code.prependRight( attribute.expression.start, `${generator.current.component}.` );
+				generator.code.prependRight( attribute.expression.start, `${fragment.component}.` );
 			}
 
 			const usedContexts = [];
@@ -175,23 +177,23 @@ export default function addElementAttributes ( generator, node, local ) {
 			const declarations = usedContexts.map( name => {
 				if ( name === 'root' ) return 'var root = this.__svelte.root;';
 
-				const listName = generator.current.listNames.get( name );
-				const indexName = generator.current.indexNames.get( name );
+				const listName = fragment.listNames.get( name );
+				const indexName = fragment.indexNames.get( name );
 
 				return `var ${listName} = this.__svelte.${listName}, ${indexName} = this.__svelte.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
 
-			const handlerName = generator.current.getUniqueName( `${name}_handler` );
+			const handlerName = fragment.getUniqueName( `${name}_handler` );
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
 			if ( generator.events.has( name ) ) {
 				local.create.addBlock( deindent`
-					var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${generator.current.component}, ${local.name}, function ( event ) {
+					var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${fragment.component}, ${local.name}, function ( event ) {
 						${handlerBody}
 					}.bind( ${local.name} ) );
 				` );
 
-				generator.current.builders.destroy.addLine( deindent`
+				fragment.builders.destroy.addLine( deindent`
 					${handlerName}.teardown();
 				` );
 			} else {
@@ -203,25 +205,25 @@ export default function addElementAttributes ( generator, node, local ) {
 					${generator.helper( 'addEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 
-				generator.current.builders.destroy.addLine( deindent`
+				fragment.builders.destroy.addLine( deindent`
 					${generator.helper( 'removeEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 			}
 		}
 
 		else if ( attribute.type === 'Binding' ) {
-			addElementBinding( generator, node, attribute, generator.current, local );
+			addElementBinding( generator, node, attribute, fragment, local );
 		}
 
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
 			local.create.addLine(
-				`${generator.current.component}.refs.${name} = ${local.name};`
+				`${fragment.component}.refs.${name} = ${local.name};`
 			);
 
-			generator.current.builders.destroy.addLine( deindent`
-				if ( ${generator.current.component}.refs.${name} === ${local.name} ) ${generator.current.component}.refs.${name} = null;
+			fragment.builders.destroy.addLine( deindent`
+				if ( ${fragment.component}.refs.${name} === ${local.name} ) ${fragment.component}.refs.${name} = null;
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/attributes/addElementBinding.js b/src/generators/dom/visitors/attributes/addElementBinding.js
index 937324fd00aa..1b2bc35ba554 100644
--- a/src/generators/dom/visitors/attributes/addElementBinding.js
+++ b/src/generators/dom/visitors/attributes/addElementBinding.js
@@ -3,7 +3,7 @@ import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 
-export default function createBinding ( generator, node, attribute, current, local ) {
+export default function createBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
 	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
 
@@ -13,15 +13,15 @@ export default function createBinding ( generator, node, attribute, current, loc
 		if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
 	});
 
-	const handler = current.getUniqueName( `${local.name}_change_handler` );
+	const handler = fragment.getUniqueName( `${local.name}_change_handler` );
 
 	const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
 	const type = getStaticAttributeValue( node, 'type' );
-	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, current, attribute, keypath ) : null;
+	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, fragment, attribute, keypath ) : null;
 	const value = getBindingValue( generator, local, node, attribute, isMultipleSelect, bindingGroup, type );
 	const eventName = getBindingEventName( node );
 
-	let setter = getSetter({ current, name, keypath, context: '__svelte', attribute, dependencies, value });
+	let setter = getSetter({ fragment, name, keypath, context: '__svelte', attribute, dependencies, value });
 	let updateElement;
 
 	// <select> special case
@@ -30,9 +30,9 @@ export default function createBinding ( generator, node, attribute, current, loc
 			setter = `var selectedOption = ${local.name}.selectedOptions[0] || ${local.name}.options[0];\n${setter}`;
 		}
 
-		const value = current.getUniqueName( 'value' );
-		const i = current.getUniqueName( 'i' );
-		const option = current.getUniqueName( 'option' );
+		const value = fragment.getUniqueName( 'value' );
+		const i = fragment.getUniqueName( 'i' );
+		const option = fragment.getUniqueName( 'option' );
 
 		const ifStatement = isMultipleSelect ?
 			deindent`
@@ -67,11 +67,11 @@ export default function createBinding ( generator, node, attribute, current, loc
 			`${local.name}.__value === ${snippet}`;
 
 		local.create.addLine(
-			`${current.component}._bindingGroups[${bindingGroup}].push( ${local.name} );`
+			`${fragment.component}._bindingGroups[${bindingGroup}].push( ${local.name} );`
 		);
 
 		local.destroy.addBlock(
-			`${current.component}._bindingGroups[${bindingGroup}].splice( ${current.component}._bindingGroups[${bindingGroup}].indexOf( ${local.name} ), 1 );`
+			`${fragment.component}._bindingGroups[${bindingGroup}].splice( ${fragment.component}._bindingGroups[${bindingGroup}].indexOf( ${local.name} ), 1 );`
 		);
 
 		updateElement = `${local.name}.checked = ${condition};`;
@@ -82,7 +82,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 		updateElement = `${local.name}.${attribute.name} = ${snippet};`;
 	}
 
-	const updating = generator.current.getUniqueName( `${local.name}_updating` );
+	const updating = generator.fragment.getUniqueName( `${local.name}_updating` );
 
 	local.create.addBlock( deindent`
 		var ${updating} = false;
@@ -104,7 +104,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 		}
 	` );
 
-	current.builders.destroy.addLine( deindent`
+	fragment.builders.destroy.addLine( deindent`
 		${generator.helper( 'removeEventListener' )}( ${local.name}, '${eventName}', ${handler} );
 	` );
 }
@@ -138,7 +138,7 @@ function getBindingValue ( generator, local, node, attribute, isMultipleSelect,
 	// <input type='checkbox' bind:group='foo'>
 	if ( attribute.name === 'group' ) {
 		if ( type === 'checkbox' ) {
-			return `${generator.helper( 'getBindingGroupValue' )}( ${generator.current.component}._bindingGroups[${bindingGroup}] )`;
+			return `${generator.helper( 'getBindingGroupValue' )}( ${generator.fragment.component}._bindingGroups[${bindingGroup}] )`;
 		}
 
 		return `${local.name}.__value`;
@@ -153,7 +153,7 @@ function getBindingValue ( generator, local, node, attribute, isMultipleSelect,
 	return `${local.name}.${attribute.name}`;
 }
 
-function getBindingGroup ( generator, current, attribute, keypath ) {
+function getBindingGroup ( generator, fragment, attribute, keypath ) {
 	// TODO handle contextual bindings — `keypath` should include unique ID of
 	// each block that provides context
 	let index = generator.bindingGroups.indexOf( keypath );
diff --git a/src/generators/dom/visitors/attributes/binding/getSetter.js b/src/generators/dom/visitors/attributes/binding/getSetter.js
index c6bf99c0c229..9a9641a7d48a 100644
--- a/src/generators/dom/visitors/attributes/binding/getSetter.js
+++ b/src/generators/dom/visitors/attributes/binding/getSetter.js
@@ -1,28 +1,28 @@
 import deindent from '../../../../../utils/deindent.js';
 
-export default function getSetter ({ current, name, keypath, context, attribute, dependencies, value }) {
-	if ( current.contexts.has( name ) ) {
+export default function getSetter ({ fragment, name, keypath, context, attribute, dependencies, value }) {
+	if ( fragment.contexts.has( name ) ) {
 		const prop = dependencies[0];
 		const tail = attribute.value.type === 'MemberExpression' ? getTailSnippet( attribute.value ) : '';
 
 		return deindent`
-			var list = this.${context}.${current.listNames.get( name )};
-			var index = this.${context}.${current.indexNames.get( name )};
+			var list = this.${context}.${fragment.listNames.get( name )};
+			var index = this.${context}.${fragment.indexNames.get( name )};
 			list[index]${tail} = ${value};
 
-			${current.component}._set({ ${prop}: ${current.component}.get( '${prop}' ) });
+			${fragment.component}._set({ ${prop}: ${fragment.component}.get( '${prop}' ) });
 		`;
 	}
 
 	if ( attribute.value.type === 'MemberExpression' ) {
 		return deindent`
-			var ${name} = ${current.component}.get( '${name}' );
+			var ${name} = ${fragment.component}.get( '${name}' );
 			${keypath} = ${value};
-			${current.component}._set({ ${name}: ${name} });
+			${fragment.component}._set({ ${name}: ${name} });
 		`;
 	}
 
-	return `${current.component}._set({ ${name}: ${value} });`;
+	return `${fragment.component}._set({ ${name}: ${value} });`;
 }
 
 function getTailSnippet ( node ) {
diff --git a/src/generators/dom/visitors/attributes/getStaticAttributeValue.js b/src/generators/dom/visitors/attributes/getStaticAttributeValue.js
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/src/generators/dom/visitors/meta/Window.js b/src/generators/dom/visitors/meta/Window.js
index 37ce411f2f3a..898a21f8bb9d 100644
--- a/src/generators/dom/visitors/meta/Window.js
+++ b/src/generators/dom/visitors/meta/Window.js
@@ -11,7 +11,7 @@ const associatedEvents = {
 	scrollY: 'scroll'
 };
 
-export default function visitWindow ( generator, node ) {
+export default function visitWindow ( generator, fragment, node ) {
 	const events = {};
 
 	node.attributes.forEach( attribute => {
@@ -25,16 +25,16 @@ export default function visitWindow ( generator, node ) {
 				generator.code.prependRight( attribute.expression.start, 'component.' );
 			}
 
-			const handlerName = generator.current.getUniqueName( `onwindow${attribute.name}` );
+			const handlerName = fragment.getUniqueName( `onwindow${attribute.name}` );
 
-			generator.current.builders.create.addBlock( deindent`
+			fragment.builders.create.addBlock( deindent`
 				var ${handlerName} = function ( event ) {
 					[✂${attribute.expression.start}-${attribute.expression.end}✂];
 				};
 				window.addEventListener( '${attribute.name}', ${handlerName} );
 			` );
 
-			generator.current.builders.destroy.addBlock( deindent`
+			fragment.builders.destroy.addBlock( deindent`
 				window.removeEventListener( '${attribute.name}', ${handlerName} );
 			` );
 		}
@@ -62,11 +62,11 @@ export default function visitWindow ( generator, node ) {
 	});
 
 	Object.keys( events ).forEach( event => {
-		const handlerName = generator.current.getUniqueName( `onwindow${event}` );
+		const handlerName = fragment.getUniqueName( `onwindow${event}` );
 
 		const props = events[ event ].join( ',\n' );
 
-		generator.current.builders.create.addBlock( deindent`
+		fragment.builders.create.addBlock( deindent`
 			var ${handlerName} = function ( event ) {
 				component.set({
 					${props}
@@ -75,7 +75,7 @@ export default function visitWindow ( generator, node ) {
 			window.addEventListener( '${event}', ${handlerName} );
 		` );
 
-		generator.current.builders.destroy.addBlock( deindent`
+		fragment.builders.destroy.addBlock( deindent`
 			window.removeEventListener( '${event}', ${handlerName} );
 		` );
 	});

From c0442b5eb170b8dbff4467bfec65b72cdec63a7e Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 7 Apr 2017 16:23:28 -0400
Subject: [PATCH 12/31] another horrible half-done commit

---
 src/generators/dom/index.js                   | 40 +++++++++----------
 src/generators/dom/visitors/Component.js      | 31 +++++---------
 src/generators/dom/visitors/EachBlock.js      | 19 +++++++--
 src/generators/dom/visitors/IfBlock.js        | 30 +++++++++++---
 .../attributes/addComponentBinding.js         |  2 +-
 .../visitors/attributes/addElementBinding.js  | 10 ++---
 test/runtime/samples/if-block/_config.js      |  8 ++--
 .../runtime/samples/self-reference/_config.js |  2 +
 8 files changed, 83 insertions(+), 59 deletions(-)

diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index fb968c126387..b75fb69c43ea 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -86,26 +86,26 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	generateBlock ( node, name, type ) {
-		const childFragment = this.current.child({
-			type,
-			name,
-			target: 'target',
-			localElementDepth: 0,
-			builders: getBuilders(),
-			getUniqueName: this.getUniqueNameMaker( this.current.params )
-		});
-
-		this.push( childFragment );
-
-		// walk the children here
-		node.children.forEach( node => visit( node, this ) );
-		this.addRenderer( this.current );
-		this.pop();
-
-		// unset the children, to avoid them being visited again
-		node.children = [];
-	}
+	// generateBlock ( node, name, type ) {
+	// 	const childFragment = this.current.child({
+	// 		type,
+	// 		name,
+	// 		target: 'target',
+	// 		localElementDepth: 0,
+	// 		builders: getBuilders(),
+	// 		getUniqueName: this.getUniqueNameMaker( this.current.params )
+	// 	});
+
+	// 	this.push( childFragment );
+
+	// 	// walk the children here
+	// 	node.children.forEach( node => visit( node, this ) );
+	// 	this.addRenderer( this.current );
+	// 	this.pop();
+
+	// 	// unset the children, to avoid them being visited again
+	// 	node.children = [];
+	// }
 
 	helper ( name ) {
 		if ( this.options.dev && `${name}Dev` in shared ) {
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 623332a334ba..95c3e737b5ff 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -78,7 +78,16 @@ export default function visitComponent ( generator, fragment, node ) {
 		const yieldName = generator.getUniqueName( `render_${name}_yield_fragment` );
 		const params = fragment.params.join( ', ' );
 
-		generator.generateBlock( node, yieldName, 'block' );
+		const childFragment = this.current.child({
+			type: 'component',
+			name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably
+			target: 'target',
+			localElementDepth: 0
+		});
+
+		node.children.forEach( child => {
+			visit( generator, childFragment, child );
+		});
 
 		const yieldFragment = fragment.getUniqueName( `${name}_yield_fragment` );
 
@@ -156,24 +165,4 @@ export default function visitComponent ( generator, fragment, node ) {
 
 	fragment.builders.create.addBlock( local.create );
 	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
-
-	const childFragment = fragment.child({
-		type: 'component',
-		namespace: local.namespace,
-		target: name,
-		parent: fragment,
-		localElementDepth: fragment.localElementDepth + 1,
-		key: null
-	});
-	generator.push( childFragment );
-
-	generator.elementDepth += 1;
-
-	node.children.forEach( child => {
-		visit( generator, childFragment, child );
-	});
-
-	generator.elementDepth -= 1;
-
-	generator.pop();
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 369b5970481a..00f6a0ae7e0c 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -167,10 +167,6 @@ export default function visitEachBlock ( generator, fragment, node ) {
 		` );
 	}
 
-	if ( node.else ) {
-		generator.generateBlock( node.else, renderElse, 'block' );
-	}
-
 	const indexNames = new Map( fragment.indexNames );
 	const indexName = node.index || fragment.getUniqueName( `${node.context}_index` );
 	indexNames.set( node.context, indexName );
@@ -223,4 +219,19 @@ export default function visitEachBlock ( generator, fragment, node ) {
 
 	generator.addRenderer( childFragment );
 	generator.pop();
+
+	if ( node.else ) {
+		const childFragment = this.current.child({
+			type: 'block',
+			name: renderElse,
+			target: 'target',
+			localElementDepth: 0,
+			builders: getBuilders(),
+			getUniqueName: this.getUniqueNameMaker( this.current.params )
+		});
+
+		node.else.children.forEach( child => {
+			visit( generator, childFragment, child );
+		});
+	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index dd4dbaa719d4..4d1adcb4f7c8 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -1,6 +1,8 @@
 import deindent from '../../../utils/deindent.js';
+import getBuilders from '../utils/getBuilders.js';
+import visit from '../visit.js';
 
-function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
+function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
 	generator.addSourcemapLocations( node.expression );
 	const name = generator.getUniqueName( `${_name}_${i}` );
 
@@ -9,12 +11,12 @@ function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
 		block: name
 	}];
 
-	generator.generateBlock( node, name, 'block' );
+	generateBlock( generator, fragment, node, name, 'block' );
 
 	if ( node.else && node.else.children.length === 1 &&
 		node.else.children[0].type === 'IfBlock' ) {
 		conditionsAndBlocks.push(
-			...getConditionsAndBlocks( generator, node.else.children[0], _name, i + 1 )
+			...getConditionsAndBlocks( generator, fragment, node.else.children[0], _name, i + 1 )
 		);
 	} else {
 		const name = generator.getUniqueName( `${_name}_${i + 1}` );
@@ -24,12 +26,30 @@ function getConditionsAndBlocks ( generator, node, _name, i = 0 ) {
 		});
 
 		if ( node.else ) {
-			generator.generateBlock( node.else, name, 'block' );
+			generateBlock( generator, fragment, node.else, name, 'block' );
 		}
 	}
 	return conditionsAndBlocks;
 }
 
+function generateBlock ( generator, fragment, node, name, type ) {
+	const childFragment = fragment.child({
+		type,
+		isIfBlock: true, 
+		name,
+		target: 'target',
+		builders: getBuilders(),
+		localElementDepth: 0
+	});
+
+	// walk the children here
+	node.children.forEach( node => {
+		visit( generator, childFragment, node );
+	});
+
+	generator.addRenderer( childFragment );
+}
+
 export default function visitIfBlock ( generator, fragment, node ) {
 	const params = fragment.params.join( ', ' );
 	const name = generator.getUniqueName( `if_block` );
@@ -38,7 +58,7 @@ export default function visitIfBlock ( generator, fragment, node ) {
 	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
 	const isToplevel = fragment.localElementDepth === 0;
-	const conditionsAndBlocks = getConditionsAndBlocks( generator, node, generator.getUniqueName( `render_if_block` ) );
+	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, node, generator.getUniqueName( `render_if_block` ) );
 
 	const anchor = `${name}_anchor`;
 	fragment.createAnchor( anchor );
diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index 66be449133fc..0025c6f7ee3c 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -2,7 +2,7 @@ import deindent from '../../../../utils/deindent.js';
 import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 
-export default function createBinding ( generator, node, attribute, fragment, local ) {
+export default function addComponentBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
 	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
 
diff --git a/src/generators/dom/visitors/attributes/addElementBinding.js b/src/generators/dom/visitors/attributes/addElementBinding.js
index 1b2bc35ba554..091e3957b98d 100644
--- a/src/generators/dom/visitors/attributes/addElementBinding.js
+++ b/src/generators/dom/visitors/attributes/addElementBinding.js
@@ -3,7 +3,7 @@ import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 
-export default function createBinding ( generator, node, attribute, fragment, local ) {
+export default function addElementBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
 	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
 
@@ -18,7 +18,7 @@ export default function createBinding ( generator, node, attribute, fragment, lo
 	const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
 	const type = getStaticAttributeValue( node, 'type' );
 	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, fragment, attribute, keypath ) : null;
-	const value = getBindingValue( generator, local, node, attribute, isMultipleSelect, bindingGroup, type );
+	const value = getBindingValue( generator, fragment, local, node, attribute, isMultipleSelect, bindingGroup, type );
 	const eventName = getBindingEventName( node );
 
 	let setter = getSetter({ fragment, name, keypath, context: '__svelte', attribute, dependencies, value });
@@ -82,7 +82,7 @@ export default function createBinding ( generator, node, attribute, fragment, lo
 		updateElement = `${local.name}.${attribute.name} = ${snippet};`;
 	}
 
-	const updating = generator.fragment.getUniqueName( `${local.name}_updating` );
+	const updating = fragment.getUniqueName( `${local.name}_updating` );
 
 	local.create.addBlock( deindent`
 		var ${updating} = false;
@@ -124,7 +124,7 @@ function getBindingEventName ( node ) {
 	return 'change';
 }
 
-function getBindingValue ( generator, local, node, attribute, isMultipleSelect, bindingGroup, type ) {
+function getBindingValue ( generator, fragment, local, node, attribute, isMultipleSelect, bindingGroup, type ) {
 	// <select multiple bind:value='selected>
 	if ( isMultipleSelect ) {
 		return `[].map.call( ${local.name}.selectedOptions, function ( option ) { return option.__value; })`;
@@ -138,7 +138,7 @@ function getBindingValue ( generator, local, node, attribute, isMultipleSelect,
 	// <input type='checkbox' bind:group='foo'>
 	if ( attribute.name === 'group' ) {
 		if ( type === 'checkbox' ) {
-			return `${generator.helper( 'getBindingGroupValue' )}( ${generator.fragment.component}._bindingGroups[${bindingGroup}] )`;
+			return `${generator.helper( 'getBindingGroupValue' )}( ${fragment.component}._bindingGroups[${bindingGroup}] )`;
 		}
 
 		return `${local.name}.__value`;
diff --git a/test/runtime/samples/if-block/_config.js b/test/runtime/samples/if-block/_config.js
index 4194fd29bcab..8f9f85ab68d6 100644
--- a/test/runtime/samples/if-block/_config.js
+++ b/test/runtime/samples/if-block/_config.js
@@ -2,11 +2,13 @@ export default {
 	data: {
 		visible: true
 	},
-	html: '<p>i am visible</p><!---->',
+
+	html: '<p>i am visible</p>',
+
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, '<!---->' );
+		assert.htmlEqual( target.innerHTML, '' );
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, '<p>i am visible</p><!---->' );
+		assert.htmlEqual( target.innerHTML, '<p>i am visible</p>' );
 	}
 };
diff --git a/test/runtime/samples/self-reference/_config.js b/test/runtime/samples/self-reference/_config.js
index dabb46783384..ea6e33fb8841 100644
--- a/test/runtime/samples/self-reference/_config.js
+++ b/test/runtime/samples/self-reference/_config.js
@@ -1,4 +1,6 @@
 export default {
+	// solo: true,
+
 	data: {
 		depth: 5
 	},

From cdb8b9d01ddf1a83668b7108bbbcd8a9271a5900 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 11:59:30 -0400
Subject: [PATCH 13/31] get yield blocks working

---
 src/generators/dom/visitors/Component.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 95c3e737b5ff..1db9f3e6658a 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -1,5 +1,6 @@
 import deindent from '../../../utils/deindent.js';
 import CodeBuilder from '../../../utils/CodeBuilder.js';
+import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 import addComponentAttributes from './attributes/addComponentAttributes.js';
 
@@ -75,14 +76,14 @@ export default function visitComponent ( generator, fragment, node ) {
 
 	// Component has children, put them in a separate {{yield}} block
 	if ( hasChildren ) {
-		const yieldName = generator.getUniqueName( `render_${name}_yield_fragment` );
 		const params = fragment.params.join( ', ' );
 
-		const childFragment = this.current.child({
+		const childFragment = fragment.child({
 			type: 'component',
 			name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably
 			target: 'target',
-			localElementDepth: 0
+			localElementDepth: 0,
+			builders: getBuilders()
 		});
 
 		node.children.forEach( child => {
@@ -92,7 +93,7 @@ export default function visitComponent ( generator, fragment, node ) {
 		const yieldFragment = fragment.getUniqueName( `${name}_yield_fragment` );
 
 		fragment.builders.create.addLine(
-			`var ${yieldFragment} = ${yieldName}( ${params}, ${fragment.component} );`
+			`var ${yieldFragment} = ${childFragment.name}( ${params}, ${fragment.component} );`
 		);
 
 		fragment.builders.update.addLine(
@@ -100,6 +101,8 @@ export default function visitComponent ( generator, fragment, node ) {
 		);
 
 		componentInitProperties.push( `_yield: ${yieldFragment}`);
+
+		generator.addRenderer( childFragment );
 	}
 
 	const statements = [];

From d93a3698fb8e7c2f4a3e5a5c89748918f82c2d3e Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 12:42:27 -0400
Subject: [PATCH 14/31] all tests passing once more. now the real work begins

---
 src/generators/Generator.js                   |  4 +--
 src/generators/dom/visitors/EachBlock.js      |  8 +++--
 src/generators/dom/visitors/IfBlock.js        |  4 +--
 src/generators/dom/visitors/MustacheTag.js    |  2 +-
 src/generators/dom/visitors/RawMustacheTag.js |  2 +-
 .../attributes/addComponentAttributes.js      |  6 ++--
 .../attributes/addComponentBinding.js         |  2 +-
 .../attributes/addElementAttributes.js        |  6 ++--
 .../visitors/attributes/addElementBinding.js  |  2 +-
 .../server-side-rendering/Fragment.js         | 30 +++++++++++++++++++
 src/generators/server-side-rendering/index.js |  6 ++--
 src/generators/server-side-rendering/visit.js |  4 +--
 .../visitors/Component.js                     | 12 ++++----
 .../visitors/EachBlock.js                     | 16 +++++-----
 .../server-side-rendering/visitors/Element.js | 10 +++----
 .../server-side-rendering/visitors/IfBlock.js | 14 ++++-----
 .../visitors/MustacheTag.js                   |  4 +--
 .../visitors/RawMustacheTag.js                |  4 +--
 .../server-side-rendering/visitors/Text.js    |  2 +-
 .../samples/each-block-else/_config.js        | 30 +++++++++++++++----
 20 files changed, 109 insertions(+), 59 deletions(-)
 create mode 100644 src/generators/server-side-rendering/Fragment.js

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index a7d0196f2dfb..7241f0c048bf 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -62,14 +62,14 @@ export default class Generator {
 		return alias;
 	}
 
-	contextualise ( expression, isEventHandler ) {
+	contextualise ( fragment, expression, isEventHandler ) {
 		this.addSourcemapLocations( expression );
 
 		const usedContexts = [];
 		const dependencies = [];
 
 		const { code, helpers } = this;
-		const { contextDependencies, contexts, indexes } = this.current;
+		const { contextDependencies, contexts, indexes } = fragment;
 
 		let scope = annotateWithScopes( expression );
 
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 00f6a0ae7e0c..7d49523fd4ec 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -17,7 +17,7 @@ export default function visitEachBlock ( generator, fragment, node ) {
 
 	generator.addSourcemapLocations( node.expression );
 
-	const { dependencies, snippet } = generator.contextualise( node.expression );
+	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
 
 	const anchor = fragment.getUniqueName( `${name}_anchor` );
 	fragment.createAnchor( anchor );
@@ -221,17 +221,19 @@ export default function visitEachBlock ( generator, fragment, node ) {
 	generator.pop();
 
 	if ( node.else ) {
-		const childFragment = this.current.child({
+		const childFragment = fragment.child({
 			type: 'block',
 			name: renderElse,
 			target: 'target',
 			localElementDepth: 0,
 			builders: getBuilders(),
-			getUniqueName: this.getUniqueNameMaker( this.current.params )
+			getUniqueName: generator.getUniqueNameMaker( fragment.params )
 		});
 
 		node.else.children.forEach( child => {
 			visit( generator, childFragment, child );
 		});
+
+		generator.addRenderer( childFragment );
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 4d1adcb4f7c8..16e88398e0f6 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -7,7 +7,7 @@ function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
 	const name = generator.getUniqueName( `${_name}_${i}` );
 
 	const conditionsAndBlocks = [{
-		condition: generator.contextualise( node.expression ).snippet,
+		condition: generator.contextualise( fragment, node.expression ).snippet,
 		block: name
 	}];
 
@@ -35,7 +35,7 @@ function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
 function generateBlock ( generator, fragment, node, name, type ) {
 	const childFragment = fragment.child({
 		type,
-		isIfBlock: true, 
+		isIfBlock: true,
 		name,
 		target: 'target',
 		builders: getBuilders(),
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index aaa558704a7a..010fc7d4d12f 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -4,7 +4,7 @@ import findBlock from '../utils/findBlock.js';
 export default function visitMustacheTag ( generator, fragment, node ) {
 	const name = fragment.getUniqueName( 'text' );
 
-	const { snippet } = generator.contextualise( node.expression );
+	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index 6c2da8320748..dcfc3dec8fd1 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -4,7 +4,7 @@ import findBlock from '../utils/findBlock.js';
 export default function visitRawMustacheTag ( generator, fragment, node ) {
 	const name = fragment.getUniqueName( 'raw' );
 
-	const { snippet } = generator.contextualise( node.expression );
+	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
diff --git a/src/generators/dom/visitors/attributes/addComponentAttributes.js b/src/generators/dom/visitors/attributes/addComponentAttributes.js
index 094c6b37e940..a713232f8ff5 100644
--- a/src/generators/dom/visitors/attributes/addComponentAttributes.js
+++ b/src/generators/dom/visitors/attributes/addComponentAttributes.js
@@ -37,7 +37,7 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 
 				else {
 					// simple dynamic attributes
-					const { dependencies, string } = generator.contextualise( value.expression );
+					const { dependencies, string } = generator.contextualise( fragment, value.expression );
 
 					// TODO only update attributes that have changed
 					local.dynamicAttributes.push({
@@ -57,7 +57,7 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 						if ( chunk.type === 'Text' ) {
 							return JSON.stringify( chunk.data );
 						} else {
-							const { dependencies, string } = generator.contextualise( chunk.expression );
+							const { dependencies, string } = generator.contextualise( fragment, chunk.expression );
 							dependencies.forEach( dependency => {
 								if ( !~allDependencies.indexOf( dependency ) ) allDependencies.push( dependency );
 							});
@@ -82,7 +82,7 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 
 			const usedContexts = [];
 			attribute.expression.arguments.forEach( arg => {
-				const { contexts } = generator.contextualise( arg, true );
+				const { contexts } = generator.contextualise( fragment, arg, true );
 
 				contexts.forEach( context => {
 					if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index 0025c6f7ee3c..fb1f67ce4316 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -4,7 +4,7 @@ import getSetter from './binding/getSetter.js';
 
 export default function addComponentBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
+	const { snippet, contexts, dependencies } = generator.contextualise( fragment, attribute.value );
 
 	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
 
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 6c01036e78ee..8e33966aa47c 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -93,7 +93,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 					dynamic = true;
 
 					// dynamic – but potentially non-string – attributes
-					const { snippet } = generator.contextualise( value.expression );
+					const { snippet } = generator.contextualise( fragment, value.expression );
 
 					const last = `last_${local.name}_${name.replace( /-/g, '_')}`;
 					local.create.addLine( `var ${last} = ${snippet};` );
@@ -128,7 +128,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 						if ( chunk.type === 'Text' ) {
 							return JSON.stringify( chunk.data );
 						} else {
-							const { snippet } = generator.contextualise( chunk.expression );
+							const { snippet } = generator.contextualise( fragment, chunk.expression );
 							return `( ${snippet} )`;
 						}
 					}).join( ' + ' )
@@ -165,7 +165,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 
 			const usedContexts = [];
 			attribute.expression.arguments.forEach( arg => {
-				const { contexts } = generator.contextualise( arg, true );
+				const { contexts } = generator.contextualise( fragment, arg, true );
 
 				contexts.forEach( context => {
 					if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
diff --git a/src/generators/dom/visitors/attributes/addElementBinding.js b/src/generators/dom/visitors/attributes/addElementBinding.js
index 091e3957b98d..56e9c913ce80 100644
--- a/src/generators/dom/visitors/attributes/addElementBinding.js
+++ b/src/generators/dom/visitors/attributes/addElementBinding.js
@@ -5,7 +5,7 @@ import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 
 export default function addElementBinding ( generator, node, attribute, fragment, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = generator.contextualise( attribute.value );
+	const { snippet, contexts, dependencies } = generator.contextualise( fragment, attribute.value );
 
 	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
 
diff --git a/src/generators/server-side-rendering/Fragment.js b/src/generators/server-side-rendering/Fragment.js
new file mode 100644
index 000000000000..545619b9b8af
--- /dev/null
+++ b/src/generators/server-side-rendering/Fragment.js
@@ -0,0 +1,30 @@
+import deindent from '../../utils/deindent.js';
+import flattenReference from '../../utils/flattenReference.js';
+
+export default class Fragment {
+	constructor ( options ) {
+		Object.assign( this, options );
+	}
+
+	addBinding ( binding, name ) {
+		const conditions = [ `!( '${binding.name}' in root )`].concat( // TODO handle contextual bindings...
+			this.conditions.map( c => `(${c})` )
+		);
+
+		const { keypath } = flattenReference( binding.value );
+
+		this.generator.bindings.push( deindent`
+			if ( ${conditions.join( '&&' )} ) {
+				tmp = ${name}.data();
+				if ( '${keypath}' in tmp ) {
+					root.${binding.name} = tmp.${keypath};
+					settled = false;
+				}
+			}
+		` );
+	}
+
+	child ( options ) {
+		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
+	}
+}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index 3189fdd583b9..a5bef4013562 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -2,6 +2,7 @@ import deindent from '../../utils/deindent.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import flattenReference from '../../utils/flattenReference.js';
 import Generator from '../Generator.js';
+import Fragment from './Fragment.js';
 import visit from './visit.js';
 
 class SsrGenerator extends Generator {
@@ -50,14 +51,15 @@ export default function ssr ( parsed, source, options ) {
 	};
 
 	// create main render() function
-	generator.push({
+	const mainFragment = new Fragment({
+		generator,
 		contexts: new Map(),
 		indexes: new Map(),
 		conditions: []
 	});
 
 	parsed.html.children.forEach( node => {
-		visit( node, generator );
+		visit( generator, mainFragment, node );
 	});
 
 	builders.render.addLine(
diff --git a/src/generators/server-side-rendering/visit.js b/src/generators/server-side-rendering/visit.js
index e9837098c4cd..1b96ed510ba6 100644
--- a/src/generators/server-side-rendering/visit.js
+++ b/src/generators/server-side-rendering/visit.js
@@ -1,6 +1,6 @@
 import visitors from './visitors/index.js';
 
-export default function visit ( node, generator ) {
+export default function visit ( generator, fragment, node ) {
 	const visitor = visitors[ node.type ];
-	visitor( generator, node );
+	visitor( generator, fragment, node );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Component.js b/src/generators/server-side-rendering/visitors/Component.js
index 4b1793f047f6..abd5ef78b8be 100644
--- a/src/generators/server-side-rendering/visitors/Component.js
+++ b/src/generators/server-side-rendering/visitors/Component.js
@@ -1,11 +1,11 @@
 import flattenReference from '../../../utils/flattenReference.js';
 import visit from '../visit.js';
 
-export default function visitComponent ( generator, node ) {
+export default function visitComponent ( generator, fragment, node ) {
 	function stringify ( chunk ) {
 		if ( chunk.type === 'Text' ) return chunk.data;
 		if ( chunk.type === 'MustacheTag' ) {
-			const { snippet } = generator.contextualise( chunk.expression );
+			const { snippet } = generator.contextualise( fragment, chunk.expression );
 			return '${__escape( ' + snippet + ')}';
 		}
 	}
@@ -34,7 +34,7 @@ export default function visitComponent ( generator, node ) {
 				if ( chunk.type === 'Text' ) {
 					value = isNaN( chunk.data ) ? JSON.stringify( chunk.data ) : chunk.data;
 				} else {
-					const { snippet } = generator.contextualise( chunk.expression );
+					const { snippet } = generator.contextualise( fragment, chunk.expression );
 					value = snippet;
 				}
 			} else {
@@ -45,7 +45,7 @@ export default function visitComponent ( generator, node ) {
 		})
 		.concat( bindings.map( binding => {
 			const { name, keypath } = flattenReference( binding.value );
-			const value = generator.current.contexts.has( name ) ? keypath : `root.${keypath}`;
+			const value = fragment.contexts.has( name ) ? keypath : `root.${keypath}`;
 			return `${binding.name}: ${value}`;
 		}))
 		.join( ', ' );
@@ -53,7 +53,7 @@ export default function visitComponent ( generator, node ) {
 	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
 
 	bindings.forEach( binding => {
-		generator.addBinding( binding, expression );
+		fragment.addBinding( binding, expression );
 	});
 
 	let open = `\${${expression}.render({${props}}`;
@@ -67,7 +67,7 @@ export default function visitComponent ( generator, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, fragment, child );
 	});
 
 	generator.elementDepth -= 1;
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.js b/src/generators/server-side-rendering/visitors/EachBlock.js
index 93cca86df9c2..37d2e7568ad6 100644
--- a/src/generators/server-side-rendering/visitors/EachBlock.js
+++ b/src/generators/server-side-rendering/visitors/EachBlock.js
@@ -1,34 +1,32 @@
 import visit from '../visit.js';
 
-export default function visitEachBlock ( generator, node ) {
-	const { dependencies, snippet } = generator.contextualise( node.expression );
+export default function visitEachBlock ( generator, fragment, node ) {
+	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
 
 	const open = `\${ ${snippet}.map( ${ node.index ? `( ${node.context}, ${node.index} )` : node.context} => \``;
 	generator.append( open );
 
 	// TODO should this be the generator's job? It's duplicated between
 	// here and the equivalent DOM compiler visitor
-	const contexts = new Map( generator.current.contexts );
+	const contexts = new Map( fragment.contexts );
 	contexts.set( node.context, node.context );
 
-	const indexes = new Map( generator.current.indexes );
+	const indexes = new Map( fragment.indexes );
 	if ( node.index ) indexes.set( node.index, node.context );
 
-	const contextDependencies = new Map( generator.current.contextDependencies );
+	const contextDependencies = new Map( fragment.contextDependencies );
 	contextDependencies.set( node.context, dependencies );
 
-	generator.push({
+	const childFragment = fragment.child({
 		contexts,
 		indexes,
 		contextDependencies
 	});
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, childFragment, child );
 	});
 
 	const close = `\` ).join( '' )}`;
 	generator.append( close );
-
-	generator.pop();
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Element.js b/src/generators/server-side-rendering/visitors/Element.js
index 97bc489ec987..d0393b73c494 100644
--- a/src/generators/server-side-rendering/visitors/Element.js
+++ b/src/generators/server-side-rendering/visitors/Element.js
@@ -7,13 +7,13 @@ const meta = {
 	':Window': visitWindow
 };
 
-export default function visitElement ( generator, node ) {
+export default function visitElement ( generator, fragment, node ) {
 	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, node );
+		return meta[ node.name ]( generator, fragment, node );
 	}
 
 	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		visitComponent( generator, node );
+		visitComponent( generator, fragment, node );
 		return;
 	}
 
@@ -30,7 +30,7 @@ export default function visitElement ( generator, node ) {
 					return chunk.data;
 				}
 
-				const { snippet } = generator.contextualise( chunk.expression );
+				const { snippet } = generator.contextualise( fragment, chunk.expression );
 				return '${' + snippet + '}';
 			}).join( '' ) + `"`;
 		}
@@ -49,7 +49,7 @@ export default function visitElement ( generator, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, fragment, child );
 	});
 
 	generator.elementDepth -= 1;
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.js b/src/generators/server-side-rendering/visitors/IfBlock.js
index f024f04ec3f0..418518d0a0d8 100644
--- a/src/generators/server-side-rendering/visitors/IfBlock.js
+++ b/src/generators/server-side-rendering/visitors/IfBlock.js
@@ -1,27 +1,25 @@
 import visit from '../visit.js';
 
-export default function visitIfBlock ( generator, node ) {
-	const { snippet } = generator.contextualise( node.expression );
+export default function visitIfBlock ( generator, fragment, node ) {
+	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	generator.append( '${ ' + snippet + ' ? `' );
 
-	generator.push({
-		conditions: generator.current.conditions.concat( snippet )
+	const childFragment = fragment.child({
+		conditions: fragment.conditions.concat( snippet )
 	});
 
 	node.children.forEach( child => {
-		visit( child, generator );
+		visit( generator, childFragment, child );
 	});
 
 	generator.append( '` : `' );
 
 	if ( node.else ) {
 		node.else.children.forEach( child => {
-			visit( child, generator );
+			visit( generator, childFragment, child );
 		});
 	}
 
 	generator.append( '` }' );
-
-	generator.pop();
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.js b/src/generators/server-side-rendering/visitors/MustacheTag.js
index 99102a7ccb2e..731451ae8c48 100644
--- a/src/generators/server-side-rendering/visitors/MustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.js
@@ -1,4 +1,4 @@
-export default function visitMustacheTag ( generator, node ) {
-	const { snippet } = generator.contextualise( node.expression );
+export default function visitMustacheTag ( generator, fragment, node ) {
+	const { snippet } = generator.contextualise( fragment, node.expression );
 	generator.append( '${__escape( ' + snippet + ' )}' );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.js b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
index 0c70f363e380..ee3cb5da8684 100644
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
@@ -1,4 +1,4 @@
-export default function visitRawMustacheTag ( generator, node ) {
-	const { snippet } = generator.contextualise( node.expression );
+export default function visitRawMustacheTag ( generator, fragment, node ) {
+	const { snippet } = generator.contextualise( fragment, node.expression );
 	generator.append( '${' + snippet + '}' );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Text.js b/src/generators/server-side-rendering/visitors/Text.js
index d8510d839300..c6f2dc85a64a 100644
--- a/src/generators/server-side-rendering/visitors/Text.js
+++ b/src/generators/server-side-rendering/visitors/Text.js
@@ -1,3 +1,3 @@
-export default function visitText ( generator, node ) {
+export default function visitText ( generator, fragment, node ) {
 	generator.append( node.data.replace( /\${/g, '\\${' ) );
 }
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-else/_config.js b/test/runtime/samples/each-block-else/_config.js
index 313b7fa7e35e..35ba9637be1d 100644
--- a/test/runtime/samples/each-block-else/_config.js
+++ b/test/runtime/samples/each-block-else/_config.js
@@ -3,15 +3,35 @@ export default {
 		animals: [ 'alpaca', 'baboon', 'capybara' ],
 		foo: 'something else'
 	},
-	html: 'before\n<p>alpaca</p><p>baboon</p><p>capybara</p>\nafter',
+
+	html: `
+		before
+		<p>alpaca</p>
+		<p>baboon</p>
+		<p>capybara</p>
+		after
+	`,
+
 	test ( assert, component, target ) {
 		component.set({ animals: [] });
-		assert.htmlEqual( target.innerHTML, 'before\n<p>no animals, but rather something else</p>\nafter' );
+		assert.htmlEqual( target.innerHTML, `
+			before
+			<p>no animals, but rather something else</p>
+			after
+		` );
 
 		component.set({ foo: 'something other' });
-		assert.htmlEqual( target.innerHTML, 'before\n<p>no animals, but rather something other</p>\nafter' );
-		
+		assert.htmlEqual( target.innerHTML, `
+			before
+			<p>no animals, but rather something other</p>
+			after
+		` );
+
 		component.set({ animals: ['wombat'] });
-		assert.htmlEqual( target.innerHTML, 'before\n<p>wombat</p>\nafter' );
+		assert.htmlEqual( target.innerHTML, `
+			before
+			<p>wombat</p>
+			after
+		` );
 	}
 };

From abf774bc57680d19b84f8bdbaaae633747e8d215 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 13:32:16 -0400
Subject: [PATCH 15/31] remove generator.push and generator.pop

---
 src/generators/Generator.js                   | 11 ----------
 src/generators/dom/index.js                   | 22 -------------------
 src/generators/dom/visitors/EachBlock.js      |  3 ---
 src/generators/dom/visitors/Element.js        |  4 ----
 src/generators/server-side-rendering/index.js | 19 ----------------
 5 files changed, 59 deletions(-)

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index 7241f0c048bf..bd80f4fefa90 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -418,15 +418,4 @@ export default class Generator {
 			templateProperties
 		};
 	}
-
-	pop () {
-		const tail = this.current;
-		this.current = tail.parent;
-
-		return tail;
-	}
-
-	push ( fragment ) {
-		this.current = fragment;
-	}
 }
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index b75fb69c43ea..969bc95facd7 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -86,27 +86,6 @@ class DomGenerator extends Generator {
 		` );
 	}
 
-	// generateBlock ( node, name, type ) {
-	// 	const childFragment = this.current.child({
-	// 		type,
-	// 		name,
-	// 		target: 'target',
-	// 		localElementDepth: 0,
-	// 		builders: getBuilders(),
-	// 		getUniqueName: this.getUniqueNameMaker( this.current.params )
-	// 	});
-
-	// 	this.push( childFragment );
-
-	// 	// walk the children here
-	// 	node.children.forEach( node => visit( node, this ) );
-	// 	this.addRenderer( this.current );
-	// 	this.pop();
-
-	// 	// unset the children, to avoid them being visited again
-	// 	node.children = [];
-	// }
-
 	helper ( name ) {
 		if ( this.options.dev && `${name}Dev` in shared ) {
 			name = `${name}Dev`;
@@ -150,7 +129,6 @@ export default function dom ( parsed, source, options ) {
 		builders: getBuilders(),
 		getUniqueName
 	});
-	generator.push( mainFragment );
 
 	parsed.html.children.forEach( node => {
 		visit( generator, mainFragment, node );
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 7d49523fd4ec..6a3bea8eec31 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -211,14 +211,11 @@ export default function visitEachBlock ( generator, fragment, node ) {
 		getUniqueName
 	});
 
-	generator.push( childFragment );
-
 	node.children.forEach( child => {
 		visit( generator, childFragment, child );
 	});
 
 	generator.addRenderer( childFragment );
-	generator.pop();
 
 	if ( node.else ) {
 		const childFragment = fragment.child({
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 4db5bf32f225..d24c7c267e88 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -107,8 +107,6 @@ export default function visitElement ( generator, fragment, node ) {
 		key: null
 	});
 
-	generator.push( childFragment );
-
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
@@ -120,6 +118,4 @@ export default function visitElement ( generator, fragment, node ) {
 	if ( node.initialUpdate ) {
 		fragment.builders.create.addBlock( node.initialUpdate );
 	}
-
-	generator.pop();
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index a5bef4013562..722b854baaef 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -1,6 +1,5 @@
 import deindent from '../../utils/deindent.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
-import flattenReference from '../../utils/flattenReference.js';
 import Generator from '../Generator.js';
 import Fragment from './Fragment.js';
 import visit from './visit.js';
@@ -12,24 +11,6 @@ class SsrGenerator extends Generator {
 		this.renderCode = '';
 	}
 
-	addBinding ( binding, name ) {
-		const conditions = [ `!( '${binding.name}' in root )`].concat( // TODO handle contextual bindings...
-			this.current.conditions.map( c => `(${c})` )
-		);
-
-		const { keypath } = flattenReference( binding.value );
-
-		this.bindings.push( deindent`
-			if ( ${conditions.join( '&&' )} ) {
-				tmp = ${name}.data();
-				if ( '${keypath}' in tmp ) {
-					root.${binding.name} = tmp.${keypath};
-					settled = false;
-				}
-			}
-		` );
-	}
-
 	append ( code ) {
 		this.renderCode += code;
 	}

From 421f3d698f3a41ab1f5e9b90de6be7443d28aa94 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 14:37:29 -0400
Subject: [PATCH 16/31] separate current *fragment* from current *generator
 state*

---
 src/generators/Generator.js                   |  2 --
 src/generators/dom/Fragment.js                | 18 ++++++------
 src/generators/dom/index.js                   | 11 +++++---
 src/generators/dom/visit.js                   |  4 +--
 src/generators/dom/visitors/Component.js      | 17 ++++++-----
 src/generators/dom/visitors/EachBlock.js      | 19 +++++++------
 src/generators/dom/visitors/Element.js        | 28 ++++++++-----------
 src/generators/dom/visitors/IfBlock.js        | 26 +++++++++--------
 src/generators/dom/visitors/MustacheTag.js    |  4 +--
 src/generators/dom/visitors/RawMustacheTag.js |  8 +++---
 src/generators/dom/visitors/Text.js           |  6 ++--
 src/generators/dom/visitors/YieldTag.js       |  6 ++--
 .../samples/attribute-dynamic/_config.js      |  1 +
 13 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/src/generators/Generator.js b/src/generators/Generator.js
index bd80f4fefa90..37d8de90b663 100644
--- a/src/generators/Generator.js
+++ b/src/generators/Generator.js
@@ -30,8 +30,6 @@ export default class Generator {
 		// in dev mode
 		this.expectedProperties = new Set();
 
-		this.elementDepth = 0;
-
 		this.code = new MagicString( source );
 		this.css = parsed.css ? processCss( parsed, this.code ) : null;
 		this.cssId = parsed.css ? `svelte-${parsed.hash}` : '';
diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index 16b3093d3efb..6c1d8513a1c7 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -3,16 +3,16 @@ export default class Fragment {
 		Object.assign( this, options );
 	}
 
-	addElement ( name, renderStatement, needsIdentifier = false ) {
-		const isToplevel = this.localElementDepth === 0;
+	addElement ( name, renderStatement, target, localElementDepth, needsIdentifier = false ) {
+		const isToplevel = localElementDepth === 0;
 		if ( needsIdentifier || isToplevel ) {
 			this.builders.create.addLine(
 				`var ${name} = ${renderStatement};`
 			);
 
-			this.createMountStatement( name );
+			this.createMountStatement( name, target );
 		} else {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${this.target} );` );
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${target} );` );
 		}
 
 		if ( isToplevel ) {
@@ -24,16 +24,16 @@ export default class Fragment {
 		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
 	}
 
-	createAnchor ( name ) {
+	createAnchor ( name, target, localElementDepth ) {
 		const renderStatement = `${this.generator.helper( 'createComment' )}()`;
-		this.addElement( name, renderStatement, true );
+		this.addElement( name, renderStatement, target, localElementDepth, true );
 	}
 
-	createMountStatement ( name ) {
-		if ( this.target === 'target' ) {
+	createMountStatement ( name, target ) {
+		if ( target === 'target' ) {
 			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
 		} else {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${this.target} );` );
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${target} );` );
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 969bc95facd7..5d467e744746 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -112,9 +112,6 @@ export default function dom ( parsed, source, options ) {
 		type: 'block',
 		generator,
 		name: generator.alias( 'create_main_fragment' ),
-		namespace,
-		target: 'target',
-		localElementDepth: 0,
 		key: null,
 
 		component,
@@ -130,8 +127,14 @@ export default function dom ( parsed, source, options ) {
 		getUniqueName
 	});
 
+	const state = {
+		namespace,
+		target: 'target',
+		localElementDepth: 0
+	};
+
 	parsed.html.children.forEach( node => {
-		visit( generator, mainFragment, node );
+		visit( generator, mainFragment, state, node );
 	});
 
 	generator.addRenderer( mainFragment );
diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
index 1b96ed510ba6..918490329570 100644
--- a/src/generators/dom/visit.js
+++ b/src/generators/dom/visit.js
@@ -1,6 +1,6 @@
 import visitors from './visitors/index.js';
 
-export default function visit ( generator, fragment, node ) {
+export default function visit ( generator, fragment, state, node ) {
 	const visitor = visitors[ node.type ];
-	visitor( generator, fragment, node );
+	visitor( generator, fragment, state, node );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 1db9f3e6658a..d8969725e532 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -20,13 +20,13 @@ function stringifyProps ( props ) {
 	return `{ ${joined} }`;
 }
 
-export default function visitComponent ( generator, fragment, node ) {
+export default function visitComponent ( generator, fragment, state, node ) {
 	const hasChildren = node.children.length > 0;
 	const name = fragment.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
 
 	const local = {
 		name,
-		namespace: fragment.namespace,
+		namespace: state.namespace,
 		isComponent: true,
 
 		allUsedContexts: [],
@@ -35,7 +35,7 @@ export default function visitComponent ( generator, fragment, node ) {
 		update: new CodeBuilder()
 	};
 
-	const isToplevel = fragment.localElementDepth === 0;
+	const isToplevel = state.localElementDepth === 0;
 
 	generator.hasComponents = true;
 
@@ -70,7 +70,7 @@ export default function visitComponent ( generator, fragment, node ) {
 	}
 
 	const componentInitProperties = [
-		`target: ${!isToplevel ? fragment.target: 'null'}`,
+		`target: ${!isToplevel ? state.target: 'null'}`,
 		`_root: ${fragment.component}._root || ${fragment.component}`
 	];
 
@@ -81,13 +81,16 @@ export default function visitComponent ( generator, fragment, node ) {
 		const childFragment = fragment.child({
 			type: 'component',
 			name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably
-			target: 'target',
-			localElementDepth: 0,
 			builders: getBuilders()
 		});
 
+		const childState = Object.assign( {}, state, {
+			target: 'target',
+			localElementDepth: 0
+		});
+
 		node.children.forEach( child => {
-			visit( generator, childFragment, child );
+			visit( generator, childFragment, childState, child );
 		});
 
 		const yieldFragment = fragment.getUniqueName( `${name}_yield_fragment` );
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 6a3bea8eec31..4d0c8414c234 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -3,7 +3,7 @@ import deindent from '../../../utils/deindent.js';
 import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
-export default function visitEachBlock ( generator, fragment, node ) {
+export default function visitEachBlock ( generator, fragment, state, node ) {
 	const name = generator.getUniqueName( `each_block` );
 	const renderer = generator.getUniqueName( `render_each_block` );
 	const elseName = generator.getUniqueName( `${name}_else` );
@@ -13,14 +13,14 @@ export default function visitEachBlock ( generator, fragment, node ) {
 
 	const listName = fragment.getUniqueName( `${name}_value` );
 
-	const isToplevel = fragment.localElementDepth === 0;
+	const isToplevel = state.localElementDepth === 0;
 
 	generator.addSourcemapLocations( node.expression );
 
 	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
 
 	const anchor = fragment.getUniqueName( `${name}_anchor` );
-	fragment.createAnchor( anchor );
+	fragment.createAnchor( anchor, state.target, state.localElementDepth );
 
 	const localVars = {};
 
@@ -191,11 +191,9 @@ export default function visitEachBlock ( generator, fragment, node ) {
 	const childFragment = fragment.child({
 		type: 'block',
 		name: renderer,
-		target: 'target',
 		expression: node.expression,
 		context: node.context,
 		key: node.key,
-		localElementDepth: 0,
 
 		component: getUniqueName( 'component' ),
 
@@ -211,8 +209,13 @@ export default function visitEachBlock ( generator, fragment, node ) {
 		getUniqueName
 	});
 
+	const childState = Object.assign( {}, state, {
+		target: 'target',
+		localElementDepth: 0
+	});
+
 	node.children.forEach( child => {
-		visit( generator, childFragment, child );
+		visit( generator, childFragment, childState, child );
 	});
 
 	generator.addRenderer( childFragment );
@@ -221,14 +224,12 @@ export default function visitEachBlock ( generator, fragment, node ) {
 		const childFragment = fragment.child({
 			type: 'block',
 			name: renderElse,
-			target: 'target',
-			localElementDepth: 0,
 			builders: getBuilders(),
 			getUniqueName: generator.getUniqueNameMaker( fragment.params )
 		});
 
 		node.else.children.forEach( child => {
-			visit( generator, childFragment, child );
+			visit( generator, childFragment, childState, child );
 		});
 
 		generator.addRenderer( childFragment );
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index d24c7c267e88..5099b875f5c3 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -9,20 +9,20 @@ const meta = {
 	':Window': visitWindow
 };
 
-export default function visitElement ( generator, fragment, node ) {
+export default function visitElement ( generator, fragment, state, node ) {
 	if ( node.name in meta ) {
 		return meta[ node.name ]( generator, fragment, node );
 	}
 
 	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		return visitComponent( generator, fragment, node );
+		return visitComponent( generator, fragment, state, node );
 	}
 
 	const name = fragment.getUniqueName( node.name );
 
 	const local = {
 		name,
-		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : fragment.namespace,
+		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : state.namespace,
 		isComponent: false,
 
 		allUsedContexts: [],
@@ -32,7 +32,7 @@ export default function visitElement ( generator, fragment, node ) {
 		destroy: new CodeBuilder()
 	};
 
-	const isToplevel = fragment.localElementDepth === 0;
+	const isToplevel = state.localElementDepth === 0;
 
 	addElementAttributes( generator, fragment, node, local );
 
@@ -76,7 +76,7 @@ export default function visitElement ( generator, fragment, node ) {
 		render = `var ${name} = ${generator.helper( 'createElement' )}( '${node.name}' );`;
 	}
 
-	if ( generator.cssId && !generator.elementDepth ) {
+	if ( generator.cssId && !state.elementDepth ) {
 		render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
 	}
 
@@ -96,25 +96,19 @@ export default function visitElement ( generator, fragment, node ) {
 	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
 	if ( !local.destroy.isEmpty() ) fragment.builders.destroy.addBlock( local.destroy );
 
-	fragment.createMountStatement( name );
+	fragment.createMountStatement( name, state.target );
 
-	const childFragment = fragment.child({
-		type: 'element',
-		namespace: local.namespace,
+	const childState = Object.assign( {}, state, {
+		elementDepth: state.elementDepth + 1,
+		localElementDepth: state.localElementDepth + 1,
 		target: name,
-		parent: fragment,
-		localElementDepth: fragment.localElementDepth + 1,
-		key: null
+		namespace: local.namespace
 	});
 
-	generator.elementDepth += 1;
-
 	node.children.forEach( child => {
-		visit( generator, childFragment, child );
+		visit( generator, fragment, childState, child );
 	});
 
-	generator.elementDepth -= 1;
-
 	if ( node.initialUpdate ) {
 		fragment.builders.create.addBlock( node.initialUpdate );
 	}
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 16e88398e0f6..66e60ed7a17b 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -2,7 +2,7 @@ import deindent from '../../../utils/deindent.js';
 import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
-function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
+function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0 ) {
 	generator.addSourcemapLocations( node.expression );
 	const name = generator.getUniqueName( `${_name}_${i}` );
 
@@ -11,12 +11,12 @@ function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
 		block: name
 	}];
 
-	generateBlock( generator, fragment, node, name, 'block' );
+	generateBlock( generator, fragment, state, node, name, 'block' );
 
 	if ( node.else && node.else.children.length === 1 &&
 		node.else.children[0].type === 'IfBlock' ) {
 		conditionsAndBlocks.push(
-			...getConditionsAndBlocks( generator, fragment, node.else.children[0], _name, i + 1 )
+			...getConditionsAndBlocks( generator, fragment, state, node.else.children[0], _name, i + 1 )
 		);
 	} else {
 		const name = generator.getUniqueName( `${_name}_${i + 1}` );
@@ -26,42 +26,44 @@ function getConditionsAndBlocks ( generator, fragment, node, _name, i = 0 ) {
 		});
 
 		if ( node.else ) {
-			generateBlock( generator, fragment, node.else, name, 'block' );
+			generateBlock( generator, fragment, state, node.else, name, 'block' );
 		}
 	}
 	return conditionsAndBlocks;
 }
 
-function generateBlock ( generator, fragment, node, name, type ) {
+function generateBlock ( generator, fragment, state, node, name, type ) {
 	const childFragment = fragment.child({
 		type,
-		isIfBlock: true,
 		name,
+		builders: getBuilders()
+	});
+
+	const childState = Object.assign( {}, state, {
 		target: 'target',
-		builders: getBuilders(),
 		localElementDepth: 0
 	});
 
 	// walk the children here
 	node.children.forEach( node => {
-		visit( generator, childFragment, node );
+		visit( generator, childFragment, childState, node );
 	});
 
 	generator.addRenderer( childFragment );
 }
 
-export default function visitIfBlock ( generator, fragment, node ) {
+export default function visitIfBlock ( generator, fragment, state, node ) {
 	const params = fragment.params.join( ', ' );
 	const name = generator.getUniqueName( `if_block` );
 	const getBlock = fragment.getUniqueName( `get_block` );
 	const currentBlock = fragment.getUniqueName( `current_block` );
 	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
-	const isToplevel = fragment.localElementDepth === 0;
-	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, node, generator.getUniqueName( `render_if_block` ) );
+	const isToplevel = state.localElementDepth === 0;
+	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `render_if_block` ) );
 
 	const anchor = `${name}_anchor`;
-	fragment.createAnchor( anchor );
+	fragment.createAnchor( anchor, state.target, state.localElementDepth );
 
 	fragment.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 010fc7d4d12f..78c1b78e6f6b 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -1,13 +1,13 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default function visitMustacheTag ( generator, fragment, node ) {
+export default function visitMustacheTag ( generator, fragment, state, node ) {
 	const name = fragment.getUniqueName( 'text' );
 
 	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.target, state.localElementDepth, true );
 
 	// TODO this should be unnecessary once we separate fragments from state
 	const parentFragment = findBlock( fragment );
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index dcfc3dec8fd1..e425cdf5a3df 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -1,7 +1,7 @@
 import deindent from '../../../utils/deindent.js';
 import findBlock from '../utils/findBlock.js';
 
-export default function visitRawMustacheTag ( generator, fragment, node ) {
+export default function visitRawMustacheTag ( generator, fragment, state, node ) {
 	const name = fragment.getUniqueName( 'raw' );
 
 	const { snippet } = generator.contextualise( fragment, node.expression );
@@ -9,12 +9,12 @@ export default function visitRawMustacheTag ( generator, fragment, node ) {
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
 	const before = `${name}_before`;
-	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, state.localElementDepth, true );
 
 	const after = `${name}_after`;
-	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
+	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, state.localElementDepth, true );
 
-	const isToplevel = fragment.localElementDepth === 0;
+	const isToplevel = state.localElementDepth === 0;
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index dde8ec85b05e..7f0e06008e86 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -1,8 +1,8 @@
-export default function visitText ( generator, fragment, node ) {
-	if ( fragment.namespace && !/\S/.test( node.data ) ) {
+export default function visitText ( generator, fragment, state, node ) {
+	if ( state.namespace && !/\S/.test( node.data ) ) {
 		return;
 	}
 
 	const name = fragment.getUniqueName( `text` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.target, state.localElementDepth, false );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 95f1b1d58f76..0848836a66c0 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,9 +1,9 @@
-export default function visitYieldTag ( generator, fragment ) {
+export default function visitYieldTag ( generator, fragment, state ) {
 	const anchor = `yield_anchor`;
-	fragment.createAnchor( anchor );
+	fragment.createAnchor( anchor, state.target, state.localElementDepth );
 
 	fragment.builders.mount.addLine(
-		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${fragment.target}, ${anchor} );`
+		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.target}, ${anchor} );`
 	);
 
 	fragment.builders.destroy.addLine(
diff --git a/test/runtime/samples/attribute-dynamic/_config.js b/test/runtime/samples/attribute-dynamic/_config.js
index 2b92e8ed6067..9b33022e6207 100644
--- a/test/runtime/samples/attribute-dynamic/_config.js
+++ b/test/runtime/samples/attribute-dynamic/_config.js
@@ -1,5 +1,6 @@
 export default {
 	html: `<div style="color: red;">red</div>`,
+
 	test ( assert, component, target ) {
 		const div = target.querySelector( 'div' );
 

From a9fb93eb32e56a1f59f0feab7545ec4f1048fec3 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 15:29:53 -0400
Subject: [PATCH 17/31] remove redundant localElementDepth

---
 src/generators/dom/Fragment.js                | 14 +++++++-------
 src/generators/dom/index.js                   |  3 +--
 src/generators/dom/visitors/Component.js      |  5 ++---
 src/generators/dom/visitors/EachBlock.js      |  7 +++----
 src/generators/dom/visitors/Element.js        |  3 +--
 src/generators/dom/visitors/IfBlock.js        |  7 +++----
 src/generators/dom/visitors/MustacheTag.js    |  2 +-
 src/generators/dom/visitors/RawMustacheTag.js |  6 +++---
 src/generators/dom/visitors/Text.js           |  2 +-
 src/generators/dom/visitors/YieldTag.js       |  4 ++--
 10 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index 6c1d8513a1c7..91b2e9b4bb6a 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -3,8 +3,8 @@ export default class Fragment {
 		Object.assign( this, options );
 	}
 
-	addElement ( name, renderStatement, target, localElementDepth, needsIdentifier = false ) {
-		const isToplevel = localElementDepth === 0;
+	addElement ( name, renderStatement, target, needsIdentifier = false ) {
+		const isToplevel = !target;
 		if ( needsIdentifier || isToplevel ) {
 			this.builders.create.addLine(
 				`var ${name} = ${renderStatement};`
@@ -24,16 +24,16 @@ export default class Fragment {
 		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
 	}
 
-	createAnchor ( name, target, localElementDepth ) {
+	createAnchor ( name, target ) {
 		const renderStatement = `${this.generator.helper( 'createComment' )}()`;
-		this.addElement( name, renderStatement, target, localElementDepth, true );
+		this.addElement( name, renderStatement, target, true );
 	}
 
 	createMountStatement ( name, target ) {
-		if ( target === 'target' ) {
-			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
-		} else {
+		if ( target ) {
 			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${target} );` );
+		} else {
+			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 5d467e744746..c6da7724515e 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -129,8 +129,7 @@ export default function dom ( parsed, source, options ) {
 
 	const state = {
 		namespace,
-		target: 'target',
-		localElementDepth: 0
+		target: null
 	};
 
 	parsed.html.children.forEach( node => {
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index d8969725e532..6acea1627381 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -35,7 +35,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		update: new CodeBuilder()
 	};
 
-	const isToplevel = state.localElementDepth === 0;
+	const isToplevel = !state.target;
 
 	generator.hasComponents = true;
 
@@ -85,8 +85,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		});
 
 		const childState = Object.assign( {}, state, {
-			target: 'target',
-			localElementDepth: 0
+			target: null
 		});
 
 		node.children.forEach( child => {
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 4d0c8414c234..b3f73293ee46 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -13,14 +13,14 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 
 	const listName = fragment.getUniqueName( `${name}_value` );
 
-	const isToplevel = state.localElementDepth === 0;
+	const isToplevel = !state.target;
 
 	generator.addSourcemapLocations( node.expression );
 
 	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
 
 	const anchor = fragment.getUniqueName( `${name}_anchor` );
-	fragment.createAnchor( anchor, state.target, state.localElementDepth );
+	fragment.createAnchor( anchor, state.target );
 
 	const localVars = {};
 
@@ -210,8 +210,7 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	});
 
 	const childState = Object.assign( {}, state, {
-		target: 'target',
-		localElementDepth: 0
+		target: null
 	});
 
 	node.children.forEach( child => {
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 5099b875f5c3..2f286a3e53fa 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -32,7 +32,7 @@ export default function visitElement ( generator, fragment, state, node ) {
 		destroy: new CodeBuilder()
 	};
 
-	const isToplevel = state.localElementDepth === 0;
+	const isToplevel = !state.target;
 
 	addElementAttributes( generator, fragment, node, local );
 
@@ -100,7 +100,6 @@ export default function visitElement ( generator, fragment, state, node ) {
 
 	const childState = Object.assign( {}, state, {
 		elementDepth: state.elementDepth + 1,
-		localElementDepth: state.localElementDepth + 1,
 		target: name,
 		namespace: local.namespace
 	});
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 66e60ed7a17b..5b008b805ecb 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -40,8 +40,7 @@ function generateBlock ( generator, fragment, state, node, name, type ) {
 	});
 
 	const childState = Object.assign( {}, state, {
-		target: 'target',
-		localElementDepth: 0
+		target: null
 	});
 
 	// walk the children here
@@ -59,11 +58,11 @@ export default function visitIfBlock ( generator, fragment, state, node ) {
 	const currentBlock = fragment.getUniqueName( `current_block` );
 	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
-	const isToplevel = state.localElementDepth === 0;
+	const isToplevel = !state.target;
 	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `render_if_block` ) );
 
 	const anchor = `${name}_anchor`;
-	fragment.createAnchor( anchor, state.target, state.localElementDepth );
+	fragment.createAnchor( anchor, state.target );
 
 	fragment.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 78c1b78e6f6b..9e6a8681c8c2 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -7,7 +7,7 @@ export default function visitMustacheTag ( generator, fragment, state, node ) {
 	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.target, state.localElementDepth, true );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.target, true );
 
 	// TODO this should be unnecessary once we separate fragments from state
 	const parentFragment = findBlock( fragment );
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index e425cdf5a3df..94832530d063 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -9,12 +9,12 @@ export default function visitRawMustacheTag ( generator, fragment, state, node )
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
 	const before = `${name}_before`;
-	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, state.localElementDepth, true );
+	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, true );
 
 	const after = `${name}_after`;
-	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, state.localElementDepth, true );
+	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, true );
 
-	const isToplevel = state.localElementDepth === 0;
+	const isToplevel = !state.target;
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index 7f0e06008e86..9198cfeb3c40 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -4,5 +4,5 @@ export default function visitText ( generator, fragment, state, node ) {
 	}
 
 	const name = fragment.getUniqueName( `text` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.target, state.localElementDepth, false );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.target, false );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index 0848836a66c0..a6419f1ba4fb 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,9 +1,9 @@
 export default function visitYieldTag ( generator, fragment, state ) {
 	const anchor = `yield_anchor`;
-	fragment.createAnchor( anchor, state.target, state.localElementDepth );
+	fragment.createAnchor( anchor, state.target );
 
 	fragment.builders.mount.addLine(
-		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.target}, ${anchor} );`
+		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.target || 'target'}, ${anchor} );`
 	);
 
 	fragment.builders.destroy.addLine(

From 4b3bdcf946648285375737de30a67f559bb3f81c Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 15:33:50 -0400
Subject: [PATCH 18/31] use isTopLevel instead of elementDepth

---
 src/generators/dom/index.js            | 3 ++-
 src/generators/dom/visitors/Element.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index c6da7724515e..a97844f8df7e 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -129,7 +129,8 @@ export default function dom ( parsed, source, options ) {
 
 	const state = {
 		namespace,
-		target: null
+		target: null,
+		isTopLevel: true
 	};
 
 	parsed.html.children.forEach( node => {
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 2f286a3e53fa..b2c6e9de8fa8 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -76,7 +76,7 @@ export default function visitElement ( generator, fragment, state, node ) {
 		render = `var ${name} = ${generator.helper( 'createElement' )}( '${node.name}' );`;
 	}
 
-	if ( generator.cssId && !state.elementDepth ) {
+	if ( generator.cssId && state.isTopLevel ) {
 		render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
 	}
 
@@ -99,7 +99,7 @@ export default function visitElement ( generator, fragment, state, node ) {
 	fragment.createMountStatement( name, state.target );
 
 	const childState = Object.assign( {}, state, {
-		elementDepth: state.elementDepth + 1,
+		isTopLevel: false,
 		target: name,
 		namespace: local.namespace
 	});

From c87967be6974cba7fc49a5867a75a5c045ff9b42 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 15:37:05 -0400
Subject: [PATCH 19/31] rename state.target to more self-explanatory
 state.parentNode

---
 src/generators/dom/Fragment.js                | 18 +++++++++---------
 src/generators/dom/index.js                   |  2 +-
 src/generators/dom/visitors/Component.js      |  6 +++---
 src/generators/dom/visitors/EachBlock.js      |  6 +++---
 src/generators/dom/visitors/Element.js        |  6 +++---
 src/generators/dom/visitors/IfBlock.js        |  6 +++---
 src/generators/dom/visitors/MustacheTag.js    |  2 +-
 src/generators/dom/visitors/RawMustacheTag.js |  6 +++---
 src/generators/dom/visitors/Text.js           |  2 +-
 src/generators/dom/visitors/YieldTag.js       |  4 ++--
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index 91b2e9b4bb6a..e1af01ccf7b0 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -3,16 +3,16 @@ export default class Fragment {
 		Object.assign( this, options );
 	}
 
-	addElement ( name, renderStatement, target, needsIdentifier = false ) {
-		const isToplevel = !target;
+	addElement ( name, renderStatement, parentNode, needsIdentifier = false ) {
+		const isToplevel = !parentNode;
 		if ( needsIdentifier || isToplevel ) {
 			this.builders.create.addLine(
 				`var ${name} = ${renderStatement};`
 			);
 
-			this.createMountStatement( name, target );
+			this.createMountStatement( name, parentNode );
 		} else {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${target} );` );
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${parentNode} );` );
 		}
 
 		if ( isToplevel ) {
@@ -24,14 +24,14 @@ export default class Fragment {
 		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
 	}
 
-	createAnchor ( name, target ) {
+	createAnchor ( name, parentNode ) {
 		const renderStatement = `${this.generator.helper( 'createComment' )}()`;
-		this.addElement( name, renderStatement, target, true );
+		this.addElement( name, renderStatement, parentNode, true );
 	}
 
-	createMountStatement ( name, target ) {
-		if ( target ) {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${target} );` );
+	createMountStatement ( name, parentNode ) {
+		if ( parentNode ) {
+			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` );
 		} else {
 			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
 		}
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index a97844f8df7e..5a6ad09ff42e 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -129,7 +129,7 @@ export default function dom ( parsed, source, options ) {
 
 	const state = {
 		namespace,
-		target: null,
+		parentNode: null,
 		isTopLevel: true
 	};
 
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 6acea1627381..5f2f6d2f10c3 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -35,7 +35,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		update: new CodeBuilder()
 	};
 
-	const isToplevel = !state.target;
+	const isToplevel = !state.parentNode;
 
 	generator.hasComponents = true;
 
@@ -70,7 +70,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 	}
 
 	const componentInitProperties = [
-		`target: ${!isToplevel ? state.target: 'null'}`,
+		`target: ${!isToplevel ? state.parentNode: 'null'}`,
 		`_root: ${fragment.component}._root || ${fragment.component}`
 	];
 
@@ -85,7 +85,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		});
 
 		const childState = Object.assign( {}, state, {
-			target: null
+			parentNode: null
 		});
 
 		node.children.forEach( child => {
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index b3f73293ee46..2705d4796803 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -13,14 +13,14 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 
 	const listName = fragment.getUniqueName( `${name}_value` );
 
-	const isToplevel = !state.target;
+	const isToplevel = !state.parentNode;
 
 	generator.addSourcemapLocations( node.expression );
 
 	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
 
 	const anchor = fragment.getUniqueName( `${name}_anchor` );
-	fragment.createAnchor( anchor, state.target );
+	fragment.createAnchor( anchor, state.parentNode );
 
 	const localVars = {};
 
@@ -210,7 +210,7 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	});
 
 	const childState = Object.assign( {}, state, {
-		target: null
+		parentNode: null
 	});
 
 	node.children.forEach( child => {
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index b2c6e9de8fa8..224d8d579867 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -32,7 +32,7 @@ export default function visitElement ( generator, fragment, state, node ) {
 		destroy: new CodeBuilder()
 	};
 
-	const isToplevel = !state.target;
+	const isToplevel = !state.parentNode;
 
 	addElementAttributes( generator, fragment, node, local );
 
@@ -96,11 +96,11 @@ export default function visitElement ( generator, fragment, state, node ) {
 	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
 	if ( !local.destroy.isEmpty() ) fragment.builders.destroy.addBlock( local.destroy );
 
-	fragment.createMountStatement( name, state.target );
+	fragment.createMountStatement( name, state.parentNode );
 
 	const childState = Object.assign( {}, state, {
 		isTopLevel: false,
-		target: name,
+		parentNode: name,
 		namespace: local.namespace
 	});
 
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 5b008b805ecb..30ee1be7b814 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -40,7 +40,7 @@ function generateBlock ( generator, fragment, state, node, name, type ) {
 	});
 
 	const childState = Object.assign( {}, state, {
-		target: null
+		parentNode: null
 	});
 
 	// walk the children here
@@ -58,11 +58,11 @@ export default function visitIfBlock ( generator, fragment, state, node ) {
 	const currentBlock = fragment.getUniqueName( `current_block` );
 	const _currentBlock = fragment.getUniqueName( `_current_block` );
 
-	const isToplevel = !state.target;
+	const isToplevel = !state.parentNode;
 	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `render_if_block` ) );
 
 	const anchor = `${name}_anchor`;
-	fragment.createAnchor( anchor, state.target );
+	fragment.createAnchor( anchor, state.parentNode );
 
 	fragment.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 9e6a8681c8c2..86e975fd755f 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -7,7 +7,7 @@ export default function visitMustacheTag ( generator, fragment, state, node ) {
 	const { snippet } = generator.contextualise( fragment, node.expression );
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.target, true );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.parentNode, true );
 
 	// TODO this should be unnecessary once we separate fragments from state
 	const parentFragment = findBlock( fragment );
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index 94832530d063..be6881fc7946 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -9,12 +9,12 @@ export default function visitRawMustacheTag ( generator, fragment, state, node )
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
 	const before = `${name}_before`;
-	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, true );
+	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
 
 	const after = `${name}_after`;
-	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.target, true );
+	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
 
-	const isToplevel = !state.target;
+	const isToplevel = !state.parentNode;
 
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index 9198cfeb3c40..f78852eacf9a 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -4,5 +4,5 @@ export default function visitText ( generator, fragment, state, node ) {
 	}
 
 	const name = fragment.getUniqueName( `text` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.target, false );
+	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.parentNode, false );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index a6419f1ba4fb..ab4c4bea6587 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,9 +1,9 @@
 export default function visitYieldTag ( generator, fragment, state ) {
 	const anchor = `yield_anchor`;
-	fragment.createAnchor( anchor, state.target );
+	fragment.createAnchor( anchor, state.parentNode );
 
 	fragment.builders.mount.addLine(
-		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.target || 'target'}, ${anchor} );`
+		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.parentNode || 'target'}, ${anchor} );`
 	);
 
 	fragment.builders.destroy.addLine(

From 96eca1235b4a71615ef8b906c984d7f4f8461cc3 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 15:53:05 -0400
Subject: [PATCH 20/31] get rid of findBlock

---
 src/generators/dom/utils/findBlock.js                    | 4 ----
 src/generators/dom/visitors/MustacheTag.js               | 9 +++------
 src/generators/dom/visitors/RawMustacheTag.js            | 9 +++------
 .../dom/visitors/attributes/addElementAttributes.js      | 9 +++------
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 src/generators/dom/utils/findBlock.js

diff --git a/src/generators/dom/utils/findBlock.js b/src/generators/dom/utils/findBlock.js
deleted file mode 100644
index 59f71e35527e..000000000000
--- a/src/generators/dom/utils/findBlock.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default function findBlock ( fragment ) {
-	while ( fragment.type !== 'block' ) fragment = fragment.parent;
-	return fragment;
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 86e975fd755f..3bcaeea2931c 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -1,5 +1,4 @@
 import deindent from '../../../utils/deindent.js';
-import findBlock from '../utils/findBlock.js';
 
 export default function visitMustacheTag ( generator, fragment, state, node ) {
 	const name = fragment.getUniqueName( 'text' );
@@ -9,13 +8,11 @@ export default function visitMustacheTag ( generator, fragment, state, node ) {
 	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
 	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.parentNode, true );
 
-	// TODO this should be unnecessary once we separate fragments from state
-	const parentFragment = findBlock( fragment );
-	if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
+	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
 	fragment.builders.update.addBlock( deindent`
-		if ( ( ${parentFragment.tmp} = ${snippet} ) !== last_${name} ) {
-			${name}.data = last_${name} = ${parentFragment.tmp};
+		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
+			${name}.data = last_${name} = ${fragment.tmp};
 		}
 	` );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index be6881fc7946..aa14876b981b 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -1,5 +1,4 @@
 import deindent from '../../../utils/deindent.js';
-import findBlock from '../utils/findBlock.js';
 
 export default function visitRawMustacheTag ( generator, fragment, state, node ) {
 	const name = fragment.getUniqueName( 'raw' );
@@ -26,13 +25,11 @@ export default function visitRawMustacheTag ( generator, fragment, state, node )
 		fragment.builders.create.addLine( mountStatement );
 	}
 
-	// TODO this should be unnecessary once we separate fragments from state
-	const parentFragment = findBlock( fragment );
-	if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
+	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
 	fragment.builders.update.addBlock( deindent`
-		if ( ( ${parentFragment.tmp} = ${snippet} ) !== last_${name} ) {
-			last_${name} = ${parentFragment.tmp};
+		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
+			last_${name} = ${fragment.tmp};
 			${detachStatement}
 			${mountStatement}
 		}
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 8e33966aa47c..6384eb27c54b 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -3,7 +3,6 @@ import addElementBinding from './addElementBinding';
 import deindent from '../../../../utils/deindent.js';
 import flattenReference from '../../../../utils/flattenReference.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
-import findBlock from '../../utils/findBlock.js';
 
 export default function addElementAttributes ( generator, fragment, node, local ) {
 	node.attributes.forEach( attribute => {
@@ -107,13 +106,11 @@ export default function addElementAttributes ( generator, fragment, node, local
 
 					local.create.addLine( updater );
 
-					// TODO unnecessary soon...
-					const parentFragment = findBlock( fragment );
-					if ( !parentFragment.tmp ) parentFragment.tmp = parentFragment.getUniqueName( 'tmp' );
+					if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
 
 					local.update.addBlock( deindent`
-						if ( ( ${parentFragment.tmp} = ${snippet} ) !== ${last} ) {
-							${last} = ${parentFragment.tmp};
+						if ( ( ${fragment.tmp} = ${snippet} ) !== ${last} ) {
+							${last} = ${fragment.tmp};
 							${updater}
 						}
 					` );

From 078f36be6a216a88c73a815da13832a5c017fee1 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 15:55:04 -0400
Subject: [PATCH 21/31] get rid of fragment.type

---
 src/generators/dom/index.js              | 1 -
 src/generators/dom/visitors/Component.js | 1 -
 src/generators/dom/visitors/EachBlock.js | 2 --
 src/generators/dom/visitors/IfBlock.js   | 7 +++----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 5a6ad09ff42e..4d11107f4483 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -109,7 +109,6 @@ export default function dom ( parsed, source, options ) {
 	const component = getUniqueName( 'component' );
 
 	const mainFragment = new Fragment({
-		type: 'block',
 		generator,
 		name: generator.alias( 'create_main_fragment' ),
 		key: null,
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 5f2f6d2f10c3..56f9468ca4cb 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -79,7 +79,6 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		const params = fragment.params.join( ', ' );
 
 		const childFragment = fragment.child({
-			type: 'component',
 			name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably
 			builders: getBuilders()
 		});
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 2705d4796803..662e7e667235 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -189,7 +189,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	const getUniqueName = generator.getUniqueNameMaker( blockParams );
 
 	const childFragment = fragment.child({
-		type: 'block',
 		name: renderer,
 		expression: node.expression,
 		context: node.context,
@@ -221,7 +220,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 
 	if ( node.else ) {
 		const childFragment = fragment.child({
-			type: 'block',
 			name: renderElse,
 			builders: getBuilders(),
 			getUniqueName: generator.getUniqueNameMaker( fragment.params )
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index 30ee1be7b814..f94de000d40b 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -11,7 +11,7 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0
 		block: name
 	}];
 
-	generateBlock( generator, fragment, state, node, name, 'block' );
+	generateBlock( generator, fragment, state, node, name );
 
 	if ( node.else && node.else.children.length === 1 &&
 		node.else.children[0].type === 'IfBlock' ) {
@@ -26,15 +26,14 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0
 		});
 
 		if ( node.else ) {
-			generateBlock( generator, fragment, state, node.else, name, 'block' );
+			generateBlock( generator, fragment, state, node.else, name );
 		}
 	}
 	return conditionsAndBlocks;
 }
 
-function generateBlock ( generator, fragment, state, node, name, type ) {
+function generateBlock ( generator, fragment, state, node, name ) {
 	const childFragment = fragment.child({
-		type,
 		name,
 		builders: getBuilders()
 	});

From cc2b6fd53b7e47433af643063bc07f1addcde2d9 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:03:51 -0400
Subject: [PATCH 22/31] make fragment constructor more explicit

---
 src/generators/dom/Fragment.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index e1af01ccf7b0..490b16c84509 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -1,6 +1,23 @@
 export default class Fragment {
-	constructor ( options ) {
-		Object.assign( this, options );
+	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, builders, getUniqueName }) {
+		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;
+
+		this.params = params;
+		this.indexNames = indexNames;
+		this.listNames = listNames;
+
+		this.builders = builders;
+		this.getUniqueName = getUniqueName;
 	}
 
 	addElement ( name, renderStatement, parentNode, needsIdentifier = false ) {

From cca91f88bb2c16030272b3183ca851b064610898 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:06:03 -0400
Subject: [PATCH 23/31] remove getBuilders

---
 src/generators/dom/Fragment.js           | 13 +++++++++++--
 src/generators/dom/index.js              |  2 --
 src/generators/dom/utils/getBuilders.js  | 12 ------------
 src/generators/dom/visitors/Component.js |  4 +---
 src/generators/dom/visitors/EachBlock.js |  3 ---
 src/generators/dom/visitors/IfBlock.js   |  4 +---
 6 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 src/generators/dom/utils/getBuilders.js

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index 490b16c84509..b32b12e69b22 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -1,5 +1,7 @@
+import CodeBuilder from '../../utils/CodeBuilder.js';
+
 export default class Fragment {
-	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, builders, getUniqueName }) {
+	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, getUniqueName }) {
 		this.generator = generator;
 		this.name = name;
 		this.key = key;
@@ -16,7 +18,14 @@ export default class Fragment {
 		this.indexNames = indexNames;
 		this.listNames = listNames;
 
-		this.builders = builders;
+		this.builders = {
+			create: new CodeBuilder(),
+			mount: new CodeBuilder(),
+			update: new CodeBuilder(),
+			detach: new CodeBuilder(),
+			detachRaw: new CodeBuilder(),
+			destroy: new CodeBuilder()
+		};
 		this.getUniqueName = getUniqueName;
 	}
 
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index 4d11107f4483..a9506599e7ad 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -1,5 +1,4 @@
 import deindent from '../../utils/deindent.js';
-import getBuilders from './utils/getBuilders.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import visit from './visit.js';
 import Generator from '../Generator.js';
@@ -122,7 +121,6 @@ export default function dom ( parsed, source, options ) {
 		indexNames: new Map(),
 		listNames: new Map(),
 
-		builders: getBuilders(),
 		getUniqueName
 	});
 
diff --git a/src/generators/dom/utils/getBuilders.js b/src/generators/dom/utils/getBuilders.js
deleted file mode 100644
index 396ab54aa6b8..000000000000
--- a/src/generators/dom/utils/getBuilders.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import CodeBuilder from '../../../utils/CodeBuilder.js';
-
-export default function getBuilders () {
-	return {
-		create: new CodeBuilder(),
-		mount: new CodeBuilder(),
-		update: new CodeBuilder(),
-		detach: new CodeBuilder(),
-		detachRaw: new CodeBuilder(),
-		destroy: new CodeBuilder()
-	};
-}
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 56f9468ca4cb..27d13c1d9ee9 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -1,6 +1,5 @@
 import deindent from '../../../utils/deindent.js';
 import CodeBuilder from '../../../utils/CodeBuilder.js';
-import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 import addComponentAttributes from './attributes/addComponentAttributes.js';
 
@@ -79,8 +78,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		const params = fragment.params.join( ', ' );
 
 		const childFragment = fragment.child({
-			name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably
-			builders: getBuilders()
+			name: generator.getUniqueName( `render_${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 662e7e667235..1985ee780b2a 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -1,6 +1,5 @@
 import CodeBuilder from '../../../utils/CodeBuilder.js';
 import deindent from '../../../utils/deindent.js';
-import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
 export default function visitEachBlock ( generator, fragment, state, node ) {
@@ -204,7 +203,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 		listNames,
 		params: blockParams,
 
-		builders: getBuilders(),
 		getUniqueName
 	});
 
@@ -221,7 +219,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	if ( node.else ) {
 		const childFragment = fragment.child({
 			name: renderElse,
-			builders: getBuilders(),
 			getUniqueName: generator.getUniqueNameMaker( fragment.params )
 		});
 
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index f94de000d40b..e24215f69a35 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -1,5 +1,4 @@
 import deindent from '../../../utils/deindent.js';
-import getBuilders from '../utils/getBuilders.js';
 import visit from '../visit.js';
 
 function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0 ) {
@@ -34,8 +33,7 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0
 
 function generateBlock ( generator, fragment, state, node, name ) {
 	const childFragment = fragment.child({
-		name,
-		builders: getBuilders()
+		name
 	});
 
 	const childState = Object.assign( {}, state, {

From 858c6b5e8250825659ff6b137979d6fcfcacf7aa Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:12:54 -0400
Subject: [PATCH 24/31] add gitkeep file so tests pass in CI

---
 test/js/samples/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/js/samples/.gitkeep

diff --git a/test/js/samples/.gitkeep b/test/js/samples/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1

From bd85ffbf2886adca86683bbde2dcf629b45e551a Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:22:20 -0400
Subject: [PATCH 25/31] move render logic into fragment

---
 src/generators/dom/Fragment.js           | 69 +++++++++++++++++++++
 src/generators/dom/index.js              | 76 ++----------------------
 src/generators/dom/visitors/Component.js |  2 +-
 src/generators/dom/visitors/EachBlock.js |  4 +-
 src/generators/dom/visitors/IfBlock.js   |  2 +-
 5 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Fragment.js
index b32b12e69b22..07adab0ba417 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Fragment.js
@@ -1,4 +1,5 @@
 import CodeBuilder from '../../utils/CodeBuilder.js';
+import deindent from '../../utils/deindent.js';
 
 export default class Fragment {
 	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, getUniqueName }) {
@@ -62,4 +63,72 @@ export default class Fragment {
 			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` );
 		}
 	}
+
+	render () {
+		if ( this.autofocus ) {
+			this.builders.create.addLine( `${this.autofocus}.focus();` );
+		}
+
+		// minor hack – we need to ensure that any {{{triples}}} are detached
+		// first, so we append normal detach statements to detachRaw
+		this.builders.detachRaw.addBlock( this.builders.detach );
+
+		if ( !this.builders.detachRaw.isEmpty() ) {
+			this.builders.destroy.addBlock( deindent`
+				if ( detach ) {
+					${this.builders.detachRaw}
+				}
+			` );
+		}
+
+		const properties = new CodeBuilder();
+
+		let localKey;
+		if ( this.key ) {
+			localKey = this.getUniqueName( 'key' );
+			properties.addBlock( `key: ${localKey},` );
+		}
+
+		if ( this.builders.mount.isEmpty() ) {
+			properties.addBlock( `mount: ${this.generator.helper( 'noop' )},` );
+		} else {
+			properties.addBlock( deindent`
+				mount: function ( target, anchor ) {
+					${this.builders.mount}
+				},
+			` );
+		}
+
+		if ( this.builders.update.isEmpty() ) {
+			properties.addBlock( `update: ${this.generator.helper( 'noop' )},` );
+		} else {
+			properties.addBlock( deindent`
+				update: function ( changed, ${this.params.join( ', ' )} ) {
+					${this.tmp ? `var ${this.tmp};` : ''}
+
+					${this.builders.update}
+				},
+			` );
+		}
+
+		if ( this.builders.destroy.isEmpty() ) {
+			properties.addBlock( `destroy: ${this.generator.helper( 'noop' )},` );
+		} else {
+			properties.addBlock( deindent`
+				destroy: function ( detach ) {
+					${this.builders.destroy}
+				}
+			` );
+		}
+
+		return deindent`
+			function ${this.name} ( ${this.params.join( ', ' )}, ${this.component}${this.key ? `, ${localKey}` : ''} ) {
+				${this.builders.create}
+
+				return {
+					${properties}
+				};
+			}
+		`;
+	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index a9506599e7ad..ff9670ba2a8c 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -8,7 +8,7 @@ import * as shared from '../../shared/index.js';
 class DomGenerator extends Generator {
 	constructor ( parsed, source, name, options ) {
 		super( parsed, source, name, options );
-		this.renderers = [];
+		this.blocks = [];
 		this.uses = new Set();
 
 		// initial values for e.g. window.innerWidth, if there's a <:Window> meta tag
@@ -17,72 +17,8 @@ class DomGenerator extends Generator {
 		};
 	}
 
-	addRenderer ( fragment ) {
-		if ( fragment.autofocus ) {
-			fragment.builders.create.addLine( `${fragment.autofocus}.focus();` );
-		}
-
-		// minor hack – we need to ensure that any {{{triples}}} are detached
-		// first, so we append normal detach statements to detachRaw
-		fragment.builders.detachRaw.addBlock( fragment.builders.detach );
-
-		if ( !fragment.builders.detachRaw.isEmpty() ) {
-			fragment.builders.destroy.addBlock( deindent`
-				if ( detach ) {
-					${fragment.builders.detachRaw}
-				}
-			` );
-		}
-
-		const properties = new CodeBuilder();
-
-		let localKey;
-		if ( fragment.key ) {
-			localKey = fragment.getUniqueName( 'key' );
-			properties.addBlock( `key: ${localKey},` );
-		}
-
-		if ( fragment.builders.mount.isEmpty() ) {
-			properties.addBlock( `mount: ${this.helper( 'noop' )},` );
-		} else {
-			properties.addBlock( deindent`
-				mount: function ( target, anchor ) {
-					${fragment.builders.mount}
-				},
-			` );
-		}
-
-		if ( fragment.builders.update.isEmpty() ) {
-			properties.addBlock( `update: ${this.helper( 'noop' )},` );
-		} else {
-			properties.addBlock( deindent`
-				update: function ( changed, ${fragment.params.join( ', ' )} ) {
-					${fragment.tmp ? `var ${fragment.tmp};` : ''}
-
-					${fragment.builders.update}
-				},
-			` );
-		}
-
-		if ( fragment.builders.destroy.isEmpty() ) {
-			properties.addBlock( `destroy: ${this.helper( 'noop' )},` );
-		} else {
-			properties.addBlock( deindent`
-				destroy: function ( detach ) {
-					${fragment.builders.destroy}
-				}
-			` );
-		}
-
-		this.renderers.push( deindent`
-			function ${fragment.name} ( ${fragment.params.join( ', ' )}, ${fragment.component}${fragment.key ? `, ${localKey}` : ''} ) {
-				${fragment.builders.create}
-
-				return {
-					${properties}
-				};
-			}
-		` );
+	addBlock ( fragment ) {
+		this.blocks.push( fragment );
 	}
 
 	helper ( name ) {
@@ -134,7 +70,7 @@ export default function dom ( parsed, source, options ) {
 		visit( generator, mainFragment, state, node );
 	});
 
-	generator.addRenderer( mainFragment );
+	generator.addBlock( mainFragment );
 
 	const builders = {
 		main: new CodeBuilder(),
@@ -198,8 +134,8 @@ export default function dom ( parsed, source, options ) {
 		` );
 	}
 
-	let i = generator.renderers.length;
-	while ( i-- ) builders.main.addBlock( generator.renderers[i] );
+	let i = generator.blocks.length;
+	while ( i-- ) builders.main.addBlock( generator.blocks[i].render() );
 
 	builders.init.addLine( `this._torndown = false;` );
 
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 27d13c1d9ee9..342f531bfa3c 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -101,7 +101,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 
 		componentInitProperties.push( `_yield: ${yieldFragment}`);
 
-		generator.addRenderer( childFragment );
+		generator.addBlock( childFragment );
 	}
 
 	const statements = [];
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 1985ee780b2a..5b4aac6c5192 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -214,7 +214,7 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 		visit( generator, childFragment, childState, child );
 	});
 
-	generator.addRenderer( childFragment );
+	generator.addBlock( childFragment );
 
 	if ( node.else ) {
 		const childFragment = fragment.child({
@@ -226,6 +226,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 			visit( generator, childFragment, childState, child );
 		});
 
-		generator.addRenderer( childFragment );
+		generator.addBlock( childFragment );
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index e24215f69a35..e2090e68b993 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -45,7 +45,7 @@ function generateBlock ( generator, fragment, state, node, name ) {
 		visit( generator, childFragment, childState, node );
 	});
 
-	generator.addRenderer( childFragment );
+	generator.addBlock( childFragment );
 }
 
 export default function visitIfBlock ( generator, fragment, state, node ) {

From 552820cd7fe383168e37844067f957c354ca2a8a Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:28:20 -0400
Subject: [PATCH 26/31] rename Fragment to Block

---
 src/generators/dom/{Fragment.js => Block.js} |  4 +-
 src/generators/dom/index.js                  | 12 +--
 src/generators/dom/visitors/Component.js     | 42 ++++-----
 src/generators/dom/visitors/EachBlock.js     | 96 ++++++++++----------
 src/generators/dom/visitors/IfBlock.js       | 18 ++--
 5 files changed, 86 insertions(+), 86 deletions(-)
 rename src/generators/dom/{Fragment.js => Block.js} (96%)

diff --git a/src/generators/dom/Fragment.js b/src/generators/dom/Block.js
similarity index 96%
rename from src/generators/dom/Fragment.js
rename to src/generators/dom/Block.js
index 07adab0ba417..a3897af4c672 100644
--- a/src/generators/dom/Fragment.js
+++ b/src/generators/dom/Block.js
@@ -1,7 +1,7 @@
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import deindent from '../../utils/deindent.js';
 
-export default class Fragment {
+export default class Block {
 	constructor ({ generator, name, key, expression, context, contextDependencies, component, contexts, indexes, params, indexNames, listNames, getUniqueName }) {
 		this.generator = generator;
 		this.name = name;
@@ -48,7 +48,7 @@ export default class Fragment {
 	}
 
 	child ( options ) {
-		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
+		return new Block( Object.assign( {}, this, options, { parent: this } ) );
 	}
 
 	createAnchor ( name, parentNode ) {
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
index ff9670ba2a8c..997df13c57f2 100644
--- a/src/generators/dom/index.js
+++ b/src/generators/dom/index.js
@@ -2,7 +2,7 @@ import deindent from '../../utils/deindent.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import visit from './visit.js';
 import Generator from '../Generator.js';
-import Fragment from './Fragment.js';
+import Block from './Block.js';
 import * as shared from '../../shared/index.js';
 
 class DomGenerator extends Generator {
@@ -17,8 +17,8 @@ class DomGenerator extends Generator {
 		};
 	}
 
-	addBlock ( fragment ) {
-		this.blocks.push( fragment );
+	addBlock ( block ) {
+		this.blocks.push( block );
 	}
 
 	helper ( name ) {
@@ -43,7 +43,7 @@ export default function dom ( parsed, source, options ) {
 	const getUniqueName = generator.getUniqueNameMaker( [ 'root' ] );
 	const component = getUniqueName( 'component' );
 
-	const mainFragment = new Fragment({
+	const mainBlock = new Block({
 		generator,
 		name: generator.alias( 'create_main_fragment' ),
 		key: null,
@@ -67,10 +67,10 @@ export default function dom ( parsed, source, options ) {
 	};
 
 	parsed.html.children.forEach( node => {
-		visit( generator, mainFragment, state, node );
+		visit( generator, mainBlock, state, node );
 	});
 
-	generator.addBlock( mainFragment );
+	generator.addBlock( mainBlock );
 
 	const builders = {
 		main: new CodeBuilder(),
diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js
index 342f531bfa3c..d90bb3112fb7 100644
--- a/src/generators/dom/visitors/Component.js
+++ b/src/generators/dom/visitors/Component.js
@@ -19,9 +19,9 @@ function stringifyProps ( props ) {
 	return `{ ${joined} }`;
 }
 
-export default function visitComponent ( generator, fragment, state, node ) {
+export default function visitComponent ( generator, block, state, node ) {
 	const hasChildren = node.children.length > 0;
-	const name = fragment.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
+	const name = block.getUniqueName( capDown( node.name === ':Self' ? generator.name : node.name ) );
 
 	const local = {
 		name,
@@ -38,14 +38,14 @@ export default function visitComponent ( generator, fragment, state, node ) {
 
 	generator.hasComponents = true;
 
-	addComponentAttributes( generator, fragment, node, local );
+	addComponentAttributes( generator, block, node, local );
 
 	if ( local.allUsedContexts.length ) {
 		const initialProps = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `root: root`;
 
-			const listName = fragment.listNames.get( contextName );
-			const indexName = fragment.indexNames.get( contextName );
+			const listName = block.listNames.get( contextName );
+			const indexName = block.indexNames.get( contextName );
 
 			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
 		}).join( ',\n' );
@@ -53,8 +53,8 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		const updates = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `${name}._context.root = root;`;
 
-			const listName = fragment.listNames.get( contextName );
-			const indexName = fragment.indexNames.get( contextName );
+			const listName = block.listNames.get( contextName );
+			const indexName = block.indexNames.get( contextName );
 
 			return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
 		}).join( '\n' );
@@ -70,14 +70,14 @@ export default function visitComponent ( generator, fragment, state, node ) {
 
 	const componentInitProperties = [
 		`target: ${!isToplevel ? state.parentNode: 'null'}`,
-		`_root: ${fragment.component}._root || ${fragment.component}`
+		`_root: ${block.component}._root || ${block.component}`
 	];
 
 	// Component has children, put them in a separate {{yield}} block
 	if ( hasChildren ) {
-		const params = fragment.params.join( ', ' );
+		const params = block.params.join( ', ' );
 
-		const childFragment = fragment.child({
+		const childBlock = block.child({
 			name: generator.getUniqueName( `render_${name}_yield_fragment` ) // TODO should getUniqueName happen inside Fragment? probably
 		});
 
@@ -86,22 +86,22 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		});
 
 		node.children.forEach( child => {
-			visit( generator, childFragment, childState, child );
+			visit( generator, childBlock, childState, child );
 		});
 
-		const yieldFragment = fragment.getUniqueName( `${name}_yield_fragment` );
+		const yieldFragment = block.getUniqueName( `${name}_yield_fragment` );
 
-		fragment.builders.create.addLine(
-			`var ${yieldFragment} = ${childFragment.name}( ${params}, ${fragment.component} );`
+		block.builders.create.addLine(
+			`var ${yieldFragment} = ${childBlock.name}( ${params}, ${block.component} );`
 		);
 
-		fragment.builders.update.addLine(
+		block.builders.update.addLine(
 			`${yieldFragment}.update( changed, ${params} );`
 		);
 
 		componentInitProperties.push( `_yield: ${yieldFragment}`);
 
-		generator.addBlock( childFragment );
+		generator.addBlock( childBlock );
 	}
 
 	const statements = [];
@@ -114,7 +114,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		const initialPropString = stringifyProps( initialProps );
 
 		if ( local.bindings.length ) {
-			const initialData = fragment.getUniqueName( `${name}_initial_data` );
+			const initialData = block.getUniqueName( `${name}_initial_data` );
 
 			statements.push( `var ${name}_initial_data = ${initialPropString};` );
 
@@ -138,7 +138,7 @@ export default function visitComponent ( generator, fragment, state, node ) {
 	` );
 
 	if ( isToplevel ) {
-		fragment.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
+		block.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` );
 	}
 
 	if ( local.dynamicAttributes.length ) {
@@ -163,8 +163,8 @@ export default function visitComponent ( generator, fragment, state, node ) {
 		` );
 	}
 
-	fragment.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
+	block.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
 
-	fragment.builders.create.addBlock( local.create );
-	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
+	block.builders.create.addBlock( local.create );
+	if ( !local.update.isEmpty() ) block.builders.update.addBlock( local.update );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 5b4aac6c5192..77d101429463 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -2,52 +2,52 @@ import CodeBuilder from '../../../utils/CodeBuilder.js';
 import deindent from '../../../utils/deindent.js';
 import visit from '../visit.js';
 
-export default function visitEachBlock ( generator, fragment, state, node ) {
+export default function visitEachBlock ( generator, block, state, node ) {
 	const name = generator.getUniqueName( `each_block` );
 	const renderer = generator.getUniqueName( `render_each_block` );
 	const elseName = generator.getUniqueName( `${name}_else` );
 	const renderElse = generator.getUniqueName( `${renderer}_else` );
-	const i = fragment.getUniqueName( `i` );
-	const params = fragment.params.join( ', ' );
+	const i = block.getUniqueName( `i` );
+	const params = block.params.join( ', ' );
 
-	const listName = fragment.getUniqueName( `${name}_value` );
+	const listName = block.getUniqueName( `${name}_value` );
 
 	const isToplevel = !state.parentNode;
 
 	generator.addSourcemapLocations( node.expression );
 
-	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
+	const { dependencies, snippet } = generator.contextualise( block, node.expression );
 
-	const anchor = fragment.getUniqueName( `${name}_anchor` );
-	fragment.createAnchor( anchor, state.parentNode );
+	const anchor = block.getUniqueName( `${name}_anchor` );
+	block.createAnchor( anchor, state.parentNode );
 
 	const localVars = {};
 
-	localVars.iteration = fragment.getUniqueName( `${name}_iteration` );
-	localVars.iterations = fragment.getUniqueName( `${name}_iterations` );
-	localVars._iterations = fragment.getUniqueName( `_${name}_iterations` );
-	localVars.lookup = fragment.getUniqueName( `${name}_lookup` );
-	localVars._lookup = fragment.getUniqueName( `_${name}_lookup` );
+	localVars.iteration = block.getUniqueName( `${name}_iteration` );
+	localVars.iterations = block.getUniqueName( `${name}_iterations` );
+	localVars._iterations = block.getUniqueName( `_${name}_iterations` );
+	localVars.lookup = block.getUniqueName( `${name}_lookup` );
+	localVars._lookup = block.getUniqueName( `_${name}_lookup` );
 
-	fragment.builders.create.addLine( `var ${listName} = ${snippet};` );
-	fragment.builders.create.addLine( `var ${localVars.iterations} = [];` );
-	if ( node.key ) fragment.builders.create.addLine( `var ${localVars.lookup} = Object.create( null );` );
-	if ( node.else ) fragment.builders.create.addLine( `var ${elseName} = null;` );
+	block.builders.create.addLine( `var ${listName} = ${snippet};` );
+	block.builders.create.addLine( `var ${localVars.iterations} = [];` );
+	if ( node.key ) block.builders.create.addLine( `var ${localVars.lookup} = Object.create( null );` );
+	if ( node.else ) block.builders.create.addLine( `var ${elseName} = null;` );
 
 	const initialRender = new CodeBuilder();
 
 	if ( node.key ) {
-		localVars.fragment = fragment.getUniqueName( 'fragment' );
-		localVars.value = fragment.getUniqueName( 'value' );
-		localVars.key = fragment.getUniqueName( 'key' );
+		localVars.fragment = block.getUniqueName( 'fragment' );
+		localVars.value = block.getUniqueName( 'value' );
+		localVars.key = block.getUniqueName( 'key' );
 
 		initialRender.addBlock( deindent`
 			var ${localVars.key} = ${listName}[${i}].${node.key};
-			${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component}${node.key ? `, ${localVars.key}` : `` } );
+			${localVars.iterations}[${i}] = ${localVars.lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${block.component}${node.key ? `, ${localVars.key}` : `` } );
 		` );
 	} else {
 		initialRender.addLine(
-			`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component} );`
+			`${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${block.component} );`
 		);
 	}
 
@@ -57,29 +57,29 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 		);
 	}
 
-	fragment.builders.create.addBlock( deindent`
+	block.builders.create.addBlock( deindent`
 		for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
 			${initialRender}
 		}
 	` );
 
 	if ( node.else ) {
-		fragment.builders.create.addBlock( deindent`
+		block.builders.create.addBlock( deindent`
 			if ( !${listName}.length ) {
-				${elseName} = ${renderElse}( ${params}, ${fragment.component} );
+				${elseName} = ${renderElse}( ${params}, ${block.component} );
 				${!isToplevel ? `${elseName}.mount( ${anchor}.parentNode, ${anchor} );` : ''}
 			}
 		` );
 	}
 
 	if ( isToplevel ) {
-		fragment.builders.mount.addBlock( deindent`
+		block.builders.mount.addBlock( deindent`
 			for ( var ${i} = 0; ${i} < ${localVars.iterations}.length; ${i} += 1 ) {
 				${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
 			}
 		` );
 		if ( node.else ) {
-			fragment.builders.mount.addBlock( deindent`
+			block.builders.mount.addBlock( deindent`
 				if ( ${elseName} ) {
 					${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 				}
@@ -88,7 +88,7 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	}
 
 	if ( node.key ) {
-		fragment.builders.update.addBlock( deindent`
+		block.builders.update.addBlock( deindent`
 			var ${listName} = ${snippet};
 			var ${localVars._iterations} = [];
 			var ${localVars._lookup} = Object.create( null );
@@ -104,7 +104,7 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${localVars.lookup}[ ${localVars.key} ];
 					${localVars._lookup}[ ${localVars.key} ].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
 				} else {
-					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component}${node.key ? `, ${localVars.key}` : `` } );
+					${localVars._iterations}[${i}] = ${localVars._lookup}[ ${localVars.key} ] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${block.component}${node.key ? `, ${localVars.key}` : `` } );
 				}
 
 				${localVars._iterations}[${i}].mount( ${localVars.fragment}, null );
@@ -124,12 +124,12 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 			${localVars.lookup} = ${localVars._lookup};
 		` );
 	} else {
-		fragment.builders.update.addBlock( deindent`
+		block.builders.update.addBlock( deindent`
 			var ${listName} = ${snippet};
 
 			for ( var ${i} = 0; ${i} < ${listName}.length; ${i} += 1 ) {
 				if ( !${localVars.iterations}[${i}] ) {
-					${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${fragment.component} );
+					${localVars.iterations}[${i}] = ${renderer}( ${params}, ${listName}, ${listName}[${i}], ${i}, ${block.component} );
 					${localVars.iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
 				} else {
 					${localVars.iterations}[${i}].update( changed, ${params}, ${listName}, ${listName}[${i}], ${i} );
@@ -143,11 +143,11 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	}
 
 	if ( node.else ) {
-		fragment.builders.update.addBlock( deindent`
+		block.builders.update.addBlock( deindent`
 			if ( !${listName}.length && ${elseName} ) {
 				${elseName}.update( changed, ${params} );
 			} else if ( !${listName}.length ) {
-				${elseName} = ${renderElse}( ${params}, ${fragment.component} );
+				${elseName} = ${renderElse}( ${params}, ${block.component} );
 				${elseName}.mount( ${anchor}.parentNode, ${anchor} );
 			} else if ( ${elseName} ) {
 				${elseName}.destroy( true );
@@ -155,39 +155,39 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 		` );
 	}
 
-	fragment.builders.destroy.addBlock(
+	block.builders.destroy.addBlock(
 		`${generator.helper( 'destroyEach' )}( ${localVars.iterations}, ${isToplevel ? 'detach' : 'false'} );` );
 
 	if ( node.else ) {
-		fragment.builders.destroy.addBlock( deindent`
+		block.builders.destroy.addBlock( deindent`
 			if ( ${elseName} ) {
 				${elseName}.destroy( ${isToplevel ? 'detach' : 'false'} );
 			}
 		` );
 	}
 
-	const indexNames = new Map( fragment.indexNames );
-	const indexName = node.index || fragment.getUniqueName( `${node.context}_index` );
+	const indexNames = new Map( block.indexNames );
+	const indexName = node.index || block.getUniqueName( `${node.context}_index` );
 	indexNames.set( node.context, indexName );
 
-	const listNames = new Map( fragment.listNames );
+	const listNames = new Map( block.listNames );
 	listNames.set( node.context, listName );
 
 	const context = generator.getUniqueName( node.context );
-	const contexts = new Map( fragment.contexts );
+	const contexts = new Map( block.contexts );
 	contexts.set( node.context, context );
 
-	const indexes = new Map( fragment.indexes );
+	const indexes = new Map( block.indexes );
 	if ( node.index ) indexes.set( indexName, node.context );
 
-	const contextDependencies = new Map( fragment.contextDependencies );
+	const contextDependencies = new Map( block.contextDependencies );
 	contextDependencies.set( node.context, dependencies );
 
-	const blockParams = fragment.params.concat( listName, context, indexName );
+	const blockParams = block.params.concat( listName, context, indexName );
 
 	const getUniqueName = generator.getUniqueNameMaker( blockParams );
 
-	const childFragment = fragment.child({
+	const childBlock = block.child({
 		name: renderer,
 		expression: node.expression,
 		context: node.context,
@@ -211,21 +211,21 @@ export default function visitEachBlock ( generator, fragment, state, node ) {
 	});
 
 	node.children.forEach( child => {
-		visit( generator, childFragment, childState, child );
+		visit( generator, childBlock, childState, child );
 	});
 
-	generator.addBlock( childFragment );
+	generator.addBlock( childBlock );
 
 	if ( node.else ) {
-		const childFragment = fragment.child({
+		const childBlock = block.child({
 			name: renderElse,
-			getUniqueName: generator.getUniqueNameMaker( fragment.params )
+			getUniqueName: generator.getUniqueNameMaker( block.params )
 		});
 
 		node.else.children.forEach( child => {
-			visit( generator, childFragment, childState, child );
+			visit( generator, childBlock, childState, child );
 		});
 
-		generator.addBlock( childFragment );
+		generator.addBlock( childBlock );
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index e2090e68b993..ffdbef5eb711 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -1,21 +1,21 @@
 import deindent from '../../../utils/deindent.js';
 import visit from '../visit.js';
 
-function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0 ) {
+function getConditionsAndBlocks ( generator, block, state, node, _name, i = 0 ) {
 	generator.addSourcemapLocations( node.expression );
 	const name = generator.getUniqueName( `${_name}_${i}` );
 
 	const conditionsAndBlocks = [{
-		condition: generator.contextualise( fragment, node.expression ).snippet,
+		condition: generator.contextualise( block, node.expression ).snippet,
 		block: name
 	}];
 
-	generateBlock( generator, fragment, state, node, name );
+	generateBlock( generator, block, state, node, name );
 
 	if ( node.else && node.else.children.length === 1 &&
 		node.else.children[0].type === 'IfBlock' ) {
 		conditionsAndBlocks.push(
-			...getConditionsAndBlocks( generator, fragment, state, node.else.children[0], _name, i + 1 )
+			...getConditionsAndBlocks( generator, block, state, node.else.children[0], _name, i + 1 )
 		);
 	} else {
 		const name = generator.getUniqueName( `${_name}_${i + 1}` );
@@ -25,14 +25,14 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0
 		});
 
 		if ( node.else ) {
-			generateBlock( generator, fragment, state, node.else, name );
+			generateBlock( generator, block, state, node.else, name );
 		}
 	}
 	return conditionsAndBlocks;
 }
 
-function generateBlock ( generator, fragment, state, node, name ) {
-	const childFragment = fragment.child({
+function generateBlock ( generator, block, state, node, name ) {
+	const childBlock = block.child({
 		name
 	});
 
@@ -42,10 +42,10 @@ function generateBlock ( generator, fragment, state, node, name ) {
 
 	// walk the children here
 	node.children.forEach( node => {
-		visit( generator, childFragment, childState, node );
+		visit( generator, childBlock, childState, node );
 	});
 
-	generator.addBlock( childFragment );
+	generator.addBlock( childBlock );
 }
 
 export default function visitIfBlock ( generator, fragment, state, node ) {

From aa41135f21cd8eeaf8b76c69b643497d2d34da36 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:33:52 -0400
Subject: [PATCH 27/31] remove redundant addSourcemapLocations calls

---
 src/generators/dom/visitors/EachBlock.js | 2 --
 src/generators/dom/visitors/IfBlock.js   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
index 77d101429463..aab0d8e3eee6 100644
--- a/src/generators/dom/visitors/EachBlock.js
+++ b/src/generators/dom/visitors/EachBlock.js
@@ -14,8 +14,6 @@ export default function visitEachBlock ( generator, block, state, node ) {
 
 	const isToplevel = !state.parentNode;
 
-	generator.addSourcemapLocations( node.expression );
-
 	const { dependencies, snippet } = generator.contextualise( block, node.expression );
 
 	const anchor = block.getUniqueName( `${name}_anchor` );
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index ffdbef5eb711..d9ffbe57f91e 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -2,7 +2,6 @@ import deindent from '../../../utils/deindent.js';
 import visit from '../visit.js';
 
 function getConditionsAndBlocks ( generator, block, state, node, _name, i = 0 ) {
-	generator.addSourcemapLocations( node.expression );
 	const name = generator.getUniqueName( `${_name}_${i}` );
 
 	const conditionsAndBlocks = [{

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 28/31] 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 a3897af4c672..9e2cbc0ab6f6 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 d90bb3112fb7..d4c5a86dc6c0 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 aab0d8e3eee6..cef7478dfc55 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 d9ffbe57f91e..d3b1363e7dd1 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 );

From f88788cc295108eae80017b41522908dfc815647 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:55:30 -0400
Subject: [PATCH 29/31] rename fragment to block everywhere

---
 src/generators/dom/visit.js                   |  4 +-
 src/generators/dom/visitors/Element.js        | 32 ++++++++--------
 src/generators/dom/visitors/IfBlock.js        | 28 +++++++-------
 src/generators/dom/visitors/MustacheTag.js    | 18 ++++-----
 src/generators/dom/visitors/RawMustacheTag.js | 26 ++++++-------
 src/generators/dom/visitors/Text.js           |  6 +--
 src/generators/dom/visitors/YieldTag.js       | 12 +++---
 .../attributes/addComponentAttributes.js      | 22 +++++------
 .../attributes/addComponentBinding.js         | 16 ++++----
 .../attributes/addElementAttributes.js        | 38 +++++++++----------
 .../visitors/attributes/addElementBinding.js  | 32 ++++++++--------
 .../visitors/attributes/binding/getSetter.js  | 16 ++++----
 src/generators/dom/visitors/meta/Window.js    | 14 +++----
 13 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
index 918490329570..22a040af06c7 100644
--- a/src/generators/dom/visit.js
+++ b/src/generators/dom/visit.js
@@ -1,6 +1,6 @@
 import visitors from './visitors/index.js';
 
-export default function visit ( generator, fragment, state, node ) {
+export default function visit ( generator, block, state, node ) {
 	const visitor = visitors[ node.type ];
-	visitor( generator, fragment, state, node );
+	visitor( generator, block, state, node );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js
index 224d8d579867..7f3b8d4e65e6 100644
--- a/src/generators/dom/visitors/Element.js
+++ b/src/generators/dom/visitors/Element.js
@@ -9,16 +9,16 @@ const meta = {
 	':Window': visitWindow
 };
 
-export default function visitElement ( generator, fragment, state, node ) {
+export default function visitElement ( generator, block, state, node ) {
 	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, fragment, node );
+		return meta[ node.name ]( generator, block, node );
 	}
 
 	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		return visitComponent( generator, fragment, state, node );
+		return visitComponent( generator, block, state, node );
 	}
 
-	const name = fragment.getUniqueName( node.name );
+	const name = block.getUniqueName( node.name );
 
 	const local = {
 		name,
@@ -34,14 +34,14 @@ export default function visitElement ( generator, fragment, state, node ) {
 
 	const isToplevel = !state.parentNode;
 
-	addElementAttributes( generator, fragment, node, local );
+	addElementAttributes( generator, block, node, local );
 
 	if ( local.allUsedContexts.length ) {
 		const initialProps = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `root: root`;
 
-			const listName = fragment.listNames.get( contextName );
-			const indexName = fragment.indexNames.get( contextName );
+			const listName = block.listNames.get( contextName );
+			const indexName = block.indexNames.get( contextName );
 
 			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
 		}).join( ',\n' );
@@ -49,8 +49,8 @@ export default function visitElement ( generator, fragment, state, node ) {
 		const updates = local.allUsedContexts.map( contextName => {
 			if ( contextName === 'root' ) return `${name}.__svelte.root = root;`;
 
-			const listName = fragment.listNames.get( contextName );
-			const indexName = fragment.indexNames.get( contextName );
+			const listName = block.listNames.get( contextName );
+			const indexName = block.indexNames.get( contextName );
 
 			return `${name}.__svelte.${listName} = ${listName};\n${name}.__svelte.${indexName} = ${indexName};`;
 		}).join( '\n' );
@@ -82,7 +82,7 @@ export default function visitElement ( generator, fragment, state, node ) {
 
 	local.create.addLineAtStart( render );
 	if ( isToplevel ) {
-		fragment.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
+		block.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
 	}
 
 	// special case – bound <option> without a value attribute
@@ -92,11 +92,11 @@ export default function visitElement ( generator, fragment, state, node ) {
 		node.initialUpdate = statement;
 	}
 
-	fragment.builders.create.addBlock( local.create );
-	if ( !local.update.isEmpty() ) fragment.builders.update.addBlock( local.update );
-	if ( !local.destroy.isEmpty() ) fragment.builders.destroy.addBlock( local.destroy );
+	block.builders.create.addBlock( local.create );
+	if ( !local.update.isEmpty() ) block.builders.update.addBlock( local.update );
+	if ( !local.destroy.isEmpty() ) block.builders.destroy.addBlock( local.destroy );
 
-	fragment.createMountStatement( name, state.parentNode );
+	block.createMountStatement( name, state.parentNode );
 
 	const childState = Object.assign( {}, state, {
 		isTopLevel: false,
@@ -105,10 +105,10 @@ export default function visitElement ( generator, fragment, state, node ) {
 	});
 
 	node.children.forEach( child => {
-		visit( generator, fragment, childState, child );
+		visit( generator, block, childState, child );
 	});
 
 	if ( node.initialUpdate ) {
-		fragment.builders.create.addBlock( node.initialUpdate );
+		block.builders.create.addBlock( node.initialUpdate );
 	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
index d3b1363e7dd1..837fa559fef3 100644
--- a/src/generators/dom/visitors/IfBlock.js
+++ b/src/generators/dom/visitors/IfBlock.js
@@ -46,20 +46,20 @@ function generateBlock ( generator, block, state, node, name ) {
 	generator.addBlock( childBlock );
 }
 
-export default function visitIfBlock ( generator, fragment, state, node ) {
-	const params = fragment.params.join( ', ' );
+export default function visitIfBlock ( generator, block, state, node ) {
+	const params = block.params.join( ', ' );
 	const name = generator.getUniqueName( `if_block` );
-	const getBlock = fragment.getUniqueName( `get_block` );
-	const currentBlock = fragment.getUniqueName( `current_block` );
-	const _currentBlock = fragment.getUniqueName( `_current_block` );
+	const getBlock = block.getUniqueName( `get_block` );
+	const currentBlock = block.getUniqueName( `current_block` );
+	const _currentBlock = block.getUniqueName( `_current_block` );
 
 	const isToplevel = !state.parentNode;
-	const conditionsAndBlocks = getConditionsAndBlocks( generator, fragment, state, node, generator.getUniqueName( `create_if_block` ) );
+	const conditionsAndBlocks = getConditionsAndBlocks( generator, block, state, node, generator.getUniqueName( `create_if_block` ) );
 
 	const anchor = `${name}_anchor`;
-	fragment.createAnchor( anchor, state.parentNode );
+	block.createAnchor( anchor, state.parentNode );
 
-	fragment.builders.create.addBlock( deindent`
+	block.builders.create.addBlock( deindent`
 		function ${getBlock} ( ${params} ) {
 			${conditionsAndBlocks.map( ({ condition, block }) => {
 				return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
@@ -67,29 +67,29 @@ export default function visitIfBlock ( generator, fragment, state, node ) {
 		}
 
 		var ${currentBlock} = ${getBlock}( ${params} );
-		var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${fragment.component} );
+		var ${name} = ${currentBlock} && ${currentBlock}( ${params}, ${block.component} );
 	` );
 
 	const mountStatement = `if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );`;
 	if ( isToplevel ) {
-		fragment.builders.mount.addLine( mountStatement );
+		block.builders.mount.addLine( mountStatement );
 	} else {
-		fragment.builders.create.addLine( mountStatement );
+		block.builders.create.addLine( mountStatement );
 	}
 
-	fragment.builders.update.addBlock( deindent`
+	block.builders.update.addBlock( deindent`
 		var ${_currentBlock} = ${currentBlock};
 		${currentBlock} = ${getBlock}( ${params} );
 		if ( ${_currentBlock} === ${currentBlock} && ${name}) {
 			${name}.update( changed, ${params} );
 		} else {
 			if ( ${name} ) ${name}.destroy( true );
-			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${fragment.component} );
+			${name} = ${currentBlock} && ${currentBlock}( ${params}, ${block.component} );
 			if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
 		}
 	` );
 
-	fragment.builders.destroy.addLine(
+	block.builders.destroy.addLine(
 		`if ( ${name} ) ${name}.destroy( ${isToplevel ? 'detach' : 'false'} );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 3bcaeea2931c..5cbdfb76a875 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -1,18 +1,18 @@
 import deindent from '../../../utils/deindent.js';
 
-export default function visitMustacheTag ( generator, fragment, state, node ) {
-	const name = fragment.getUniqueName( 'text' );
+export default function visitMustacheTag ( generator, block, state, node ) {
+	const name = block.getUniqueName( 'text' );
 
-	const { snippet } = generator.contextualise( fragment, node.expression );
+	const { snippet } = generator.contextualise( block, node.expression );
 
-	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.parentNode, true );
+	block.builders.create.addLine( `var last_${name} = ${snippet};` );
+	block.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.parentNode, true );
 
-	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
 
-	fragment.builders.update.addBlock( deindent`
-		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-			${name}.data = last_${name} = ${fragment.tmp};
+	block.builders.update.addBlock( deindent`
+		if ( ( ${block.tmp} = ${snippet} ) !== last_${name} ) {
+			${name}.data = last_${name} = ${block.tmp};
 		}
 	` );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index aa14876b981b..c0751477e07b 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -1,39 +1,39 @@
 import deindent from '../../../utils/deindent.js';
 
-export default function visitRawMustacheTag ( generator, fragment, state, node ) {
-	const name = fragment.getUniqueName( 'raw' );
+export default function visitRawMustacheTag ( generator, block, state, node ) {
+	const name = block.getUniqueName( 'raw' );
 
-	const { snippet } = generator.contextualise( fragment, node.expression );
+	const { snippet } = generator.contextualise( block, node.expression );
 
 	// we would have used comments here, but the `insertAdjacentHTML` api only
 	// exists for `Element`s.
 	const before = `${name}_before`;
-	fragment.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
+	block.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
 
 	const after = `${name}_after`;
-	fragment.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
+	block.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
 
 	const isToplevel = !state.parentNode;
 
-	fragment.builders.create.addLine( `var last_${name} = ${snippet};` );
+	block.builders.create.addLine( `var last_${name} = ${snippet};` );
 	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
 	const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
 
 	if ( isToplevel ) {
-		fragment.builders.mount.addLine( mountStatement );
+		block.builders.mount.addLine( mountStatement );
 	} else {
-		fragment.builders.create.addLine( mountStatement );
+		block.builders.create.addLine( mountStatement );
 	}
 
-	if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+	if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
 
-	fragment.builders.update.addBlock( deindent`
-		if ( ( ${fragment.tmp} = ${snippet} ) !== last_${name} ) {
-			last_${name} = ${fragment.tmp};
+	block.builders.update.addBlock( deindent`
+		if ( ( ${block.tmp} = ${snippet} ) !== last_${name} ) {
+			last_${name} = ${block.tmp};
 			${detachStatement}
 			${mountStatement}
 		}
 	` );
 
-	fragment.builders.detachRaw.addBlock( detachStatement );
+	block.builders.detachRaw.addBlock( detachStatement );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
index f78852eacf9a..aae2dae3e50c 100644
--- a/src/generators/dom/visitors/Text.js
+++ b/src/generators/dom/visitors/Text.js
@@ -1,8 +1,8 @@
-export default function visitText ( generator, fragment, state, node ) {
+export default function visitText ( generator, block, state, node ) {
 	if ( state.namespace && !/\S/.test( node.data ) ) {
 		return;
 	}
 
-	const name = fragment.getUniqueName( `text` );
-	fragment.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.parentNode, false );
+	const name = block.getUniqueName( `text` );
+	block.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.parentNode, false );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
index ab4c4bea6587..f64b12f92c8b 100644
--- a/src/generators/dom/visitors/YieldTag.js
+++ b/src/generators/dom/visitors/YieldTag.js
@@ -1,12 +1,12 @@
-export default function visitYieldTag ( generator, fragment, state ) {
+export default function visitYieldTag ( generator, block, state ) {
 	const anchor = `yield_anchor`;
-	fragment.createAnchor( anchor, state.parentNode );
+	block.createAnchor( anchor, state.parentNode );
 
-	fragment.builders.mount.addLine(
-		`${fragment.component}._yield && ${fragment.component}._yield.mount( ${state.parentNode || 'target'}, ${anchor} );`
+	block.builders.mount.addLine(
+		`${block.component}._yield && ${block.component}._yield.mount( ${state.parentNode || 'target'}, ${anchor} );`
 	);
 
-	fragment.builders.destroy.addLine(
-		`${fragment.component}._yield && ${fragment.component}._yield.destroy( detach );`
+	block.builders.destroy.addLine(
+		`${block.component}._yield && ${block.component}._yield.destroy( detach );`
 	);
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/attributes/addComponentAttributes.js b/src/generators/dom/visitors/attributes/addComponentAttributes.js
index a713232f8ff5..b659592d5254 100644
--- a/src/generators/dom/visitors/attributes/addComponentAttributes.js
+++ b/src/generators/dom/visitors/attributes/addComponentAttributes.js
@@ -1,7 +1,7 @@
 import addComponentBinding from './addComponentBinding.js';
 import deindent from '../../../../utils/deindent.js';
 
-export default function addComponentAttributes ( generator, fragment, node, local ) {
+export default function addComponentAttributes ( generator, block, node, local ) {
 	local.staticAttributes = [];
 	local.dynamicAttributes = [];
 	local.bindings = [];
@@ -37,7 +37,7 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 
 				else {
 					// simple dynamic attributes
-					const { dependencies, string } = generator.contextualise( fragment, value.expression );
+					const { dependencies, string } = generator.contextualise( block, value.expression );
 
 					// TODO only update attributes that have changed
 					local.dynamicAttributes.push({
@@ -57,7 +57,7 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 						if ( chunk.type === 'Text' ) {
 							return JSON.stringify( chunk.data );
 						} else {
-							const { dependencies, string } = generator.contextualise( fragment, chunk.expression );
+							const { dependencies, string } = generator.contextualise( block, chunk.expression );
 							dependencies.forEach( dependency => {
 								if ( !~allDependencies.indexOf( dependency ) ) allDependencies.push( dependency );
 							});
@@ -78,11 +78,11 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 		else if ( attribute.type === 'EventHandler' ) {
 			// TODO verify that it's a valid callee (i.e. built-in or declared method)
 			generator.addSourcemapLocations( attribute.expression );
-			generator.code.prependRight( attribute.expression.start, `${fragment.component}.` );
+			generator.code.prependRight( attribute.expression.start, `${block.component}.` );
 
 			const usedContexts = [];
 			attribute.expression.arguments.forEach( arg => {
-				const { contexts } = generator.contextualise( fragment, arg, true );
+				const { contexts } = generator.contextualise( block, arg, true );
 
 				contexts.forEach( context => {
 					if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
@@ -94,8 +94,8 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 			const declarations = usedContexts.map( name => {
 				if ( name === 'root' ) return 'var root = this._context.root;';
 
-				const listName = fragment.listNames.get( name );
-				const indexName = fragment.indexNames.get( name );
+				const listName = block.listNames.get( name );
+				const indexName = block.indexNames.get( name );
 
 				return `var ${listName} = this._context.${listName}, ${indexName} = this._context.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
@@ -110,18 +110,18 @@ export default function addComponentAttributes ( generator, fragment, node, loca
 		}
 
 		else if ( attribute.type === 'Binding' ) {
-			addComponentBinding( generator, node, attribute, fragment, local );
+			addComponentBinding( generator, node, attribute, block, local );
 		}
 
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
 			local.create.addLine(
-				`${fragment.component}.refs.${attribute.name} = ${local.name};`
+				`${block.component}.refs.${attribute.name} = ${local.name};`
 			);
 
-			fragment.builders.destroy.addLine( deindent`
-				if ( ${fragment.component}.refs.${attribute.name} === ${local.name} ) ${fragment.component}.refs.${attribute.name} = null;
+			block.builders.destroy.addLine( deindent`
+				if ( ${block.component}.refs.${attribute.name} === ${local.name} ) ${block.component}.refs.${attribute.name} = null;
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index fb1f67ce4316..10482fee5c2a 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -2,9 +2,9 @@ import deindent from '../../../../utils/deindent.js';
 import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 
-export default function addComponentBinding ( generator, node, attribute, fragment, local ) {
+export default function addComponentBinding ( generator, node, attribute, block, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = generator.contextualise( fragment, attribute.value );
+	const { snippet, contexts, dependencies } = generator.contextualise( block, attribute.value );
 
 	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
 
@@ -12,14 +12,14 @@ export default function addComponentBinding ( generator, node, attribute, fragme
 		if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
 	});
 
-	const contextual = fragment.contexts.has( name );
+	const contextual = block.contexts.has( name );
 
 	let obj;
 	let prop;
 
 	if ( contextual ) {
-		obj = fragment.listNames.get( name );
-		prop = fragment.indexNames.get( name );
+		obj = block.listNames.get( name );
+		prop = block.indexNames.get( name );
 	} else if ( attribute.value.type === 'MemberExpression' ) {
 		prop = `'[✂${attribute.value.property.start}-${attribute.value.property.end}✂]'`;
 		obj = `[✂${attribute.value.object.start}-${attribute.value.object.end}✂]`;
@@ -35,16 +35,16 @@ export default function addComponentBinding ( generator, node, attribute, fragme
 		prop
 	});
 
-	const setter = getSetter({ fragment, name, keypath, context: '_context', attribute, dependencies, value: 'value' });
+	const setter = getSetter({ block, name, keypath, context: '_context', attribute, dependencies, value: 'value' });
 
 	generator.hasComplexBindings = true;
 
-	const updating = fragment.getUniqueName( `${local.name}_updating` );
+	const updating = block.getUniqueName( `${local.name}_updating` );
 
 	local.create.addBlock( deindent`
 		var ${updating} = false;
 
-		${fragment.component}._bindings.push( function () {
+		${block.component}._bindings.push( function () {
 			if ( ${local.name}._torndown ) return;
 			${local.name}.observe( '${attribute.name}', function ( value ) {
 				if ( ${updating} ) return;
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 6384eb27c54b..3036cab8c5b2 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -4,7 +4,7 @@ import deindent from '../../../../utils/deindent.js';
 import flattenReference from '../../../../utils/flattenReference.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 
-export default function addElementAttributes ( generator, fragment, node, local ) {
+export default function addElementAttributes ( generator, block, node, local ) {
 	node.attributes.forEach( attribute => {
 		const name = attribute.name;
 
@@ -42,7 +42,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 
 				// special case – autofocus. has to be handled in a bit of a weird way
 				if ( name === 'autofocus' ) {
-					fragment.autofocus = local.name;
+					block.autofocus = local.name;
 				}
 			}
 
@@ -92,7 +92,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 					dynamic = true;
 
 					// dynamic – but potentially non-string – attributes
-					const { snippet } = generator.contextualise( fragment, value.expression );
+					const { snippet } = generator.contextualise( block, value.expression );
 
 					const last = `last_${local.name}_${name.replace( /-/g, '_')}`;
 					local.create.addLine( `var ${last} = ${snippet};` );
@@ -106,11 +106,11 @@ export default function addElementAttributes ( generator, fragment, node, local
 
 					local.create.addLine( updater );
 
-					if ( !fragment.tmp ) fragment.tmp = fragment.getUniqueName( 'tmp' );
+					if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
 
 					local.update.addBlock( deindent`
-						if ( ( ${fragment.tmp} = ${snippet} ) !== ${last} ) {
-							${last} = ${fragment.tmp};
+						if ( ( ${block.tmp} = ${snippet} ) !== ${last} ) {
+							${last} = ${block.tmp};
 							${updater}
 						}
 					` );
@@ -125,7 +125,7 @@ export default function addElementAttributes ( generator, fragment, node, local
 						if ( chunk.type === 'Text' ) {
 							return JSON.stringify( chunk.data );
 						} else {
-							const { snippet } = generator.contextualise( fragment, chunk.expression );
+							const { snippet } = generator.contextualise( block, chunk.expression );
 							return `( ${snippet} )`;
 						}
 					}).join( ' + ' )
@@ -157,12 +157,12 @@ export default function addElementAttributes ( generator, fragment, node, local
 			const flattened = flattenReference( attribute.expression.callee );
 			if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
 				// allow event.stopPropagation(), this.select() etc
-				generator.code.prependRight( attribute.expression.start, `${fragment.component}.` );
+				generator.code.prependRight( attribute.expression.start, `${block.component}.` );
 			}
 
 			const usedContexts = [];
 			attribute.expression.arguments.forEach( arg => {
-				const { contexts } = generator.contextualise( fragment, arg, true );
+				const { contexts } = generator.contextualise( block, arg, true );
 
 				contexts.forEach( context => {
 					if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
@@ -174,23 +174,23 @@ export default function addElementAttributes ( generator, fragment, node, local
 			const declarations = usedContexts.map( name => {
 				if ( name === 'root' ) return 'var root = this.__svelte.root;';
 
-				const listName = fragment.listNames.get( name );
-				const indexName = fragment.indexNames.get( name );
+				const listName = block.listNames.get( name );
+				const indexName = block.indexNames.get( name );
 
 				return `var ${listName} = this.__svelte.${listName}, ${indexName} = this.__svelte.${indexName}, ${name} = ${listName}[${indexName}]`;
 			});
 
-			const handlerName = fragment.getUniqueName( `${name}_handler` );
+			const handlerName = block.getUniqueName( `${name}_handler` );
 			const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
 
 			if ( generator.events.has( name ) ) {
 				local.create.addBlock( deindent`
-					var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${fragment.component}, ${local.name}, function ( event ) {
+					var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${block.component}, ${local.name}, function ( event ) {
 						${handlerBody}
 					}.bind( ${local.name} ) );
 				` );
 
-				fragment.builders.destroy.addLine( deindent`
+				block.builders.destroy.addLine( deindent`
 					${handlerName}.teardown();
 				` );
 			} else {
@@ -202,25 +202,25 @@ export default function addElementAttributes ( generator, fragment, node, local
 					${generator.helper( 'addEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 
-				fragment.builders.destroy.addLine( deindent`
+				block.builders.destroy.addLine( deindent`
 					${generator.helper( 'removeEventListener' )}( ${local.name}, '${name}', ${handlerName} );
 				` );
 			}
 		}
 
 		else if ( attribute.type === 'Binding' ) {
-			addElementBinding( generator, node, attribute, fragment, local );
+			addElementBinding( generator, node, attribute, block, local );
 		}
 
 		else if ( attribute.type === 'Ref' ) {
 			generator.usesRefs = true;
 
 			local.create.addLine(
-				`${fragment.component}.refs.${name} = ${local.name};`
+				`${block.component}.refs.${name} = ${local.name};`
 			);
 
-			fragment.builders.destroy.addLine( deindent`
-				if ( ${fragment.component}.refs.${name} === ${local.name} ) ${fragment.component}.refs.${name} = null;
+			block.builders.destroy.addLine( deindent`
+				if ( ${block.component}.refs.${name} === ${local.name} ) ${block.component}.refs.${name} = null;
 			` );
 		}
 
diff --git a/src/generators/dom/visitors/attributes/addElementBinding.js b/src/generators/dom/visitors/attributes/addElementBinding.js
index 56e9c913ce80..9ef82b303f13 100644
--- a/src/generators/dom/visitors/attributes/addElementBinding.js
+++ b/src/generators/dom/visitors/attributes/addElementBinding.js
@@ -3,9 +3,9 @@ import flattenReference from '../../../../utils/flattenReference.js';
 import getSetter from './binding/getSetter.js';
 import getStaticAttributeValue from './binding/getStaticAttributeValue.js';
 
-export default function addElementBinding ( generator, node, attribute, fragment, local ) {
+export default function addElementBinding ( generator, node, attribute, block, local ) {
 	const { name, keypath } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = generator.contextualise( fragment, attribute.value );
+	const { snippet, contexts, dependencies } = generator.contextualise( block, attribute.value );
 
 	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
 
@@ -13,15 +13,15 @@ export default function addElementBinding ( generator, node, attribute, fragment
 		if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
 	});
 
-	const handler = fragment.getUniqueName( `${local.name}_change_handler` );
+	const handler = block.getUniqueName( `${local.name}_change_handler` );
 
 	const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
 	const type = getStaticAttributeValue( node, 'type' );
-	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, fragment, attribute, keypath ) : null;
-	const value = getBindingValue( generator, fragment, local, node, attribute, isMultipleSelect, bindingGroup, type );
+	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, keypath ) : null;
+	const value = getBindingValue( generator, block, local, node, attribute, isMultipleSelect, bindingGroup, type );
 	const eventName = getBindingEventName( node );
 
-	let setter = getSetter({ fragment, name, keypath, context: '__svelte', attribute, dependencies, value });
+	let setter = getSetter({ block, name, keypath, context: '__svelte', attribute, dependencies, value });
 	let updateElement;
 
 	// <select> special case
@@ -30,9 +30,9 @@ export default function addElementBinding ( generator, node, attribute, fragment
 			setter = `var selectedOption = ${local.name}.selectedOptions[0] || ${local.name}.options[0];\n${setter}`;
 		}
 
-		const value = fragment.getUniqueName( 'value' );
-		const i = fragment.getUniqueName( 'i' );
-		const option = fragment.getUniqueName( 'option' );
+		const value = block.getUniqueName( 'value' );
+		const i = block.getUniqueName( 'i' );
+		const option = block.getUniqueName( 'option' );
 
 		const ifStatement = isMultipleSelect ?
 			deindent`
@@ -67,11 +67,11 @@ export default function addElementBinding ( generator, node, attribute, fragment
 			`${local.name}.__value === ${snippet}`;
 
 		local.create.addLine(
-			`${fragment.component}._bindingGroups[${bindingGroup}].push( ${local.name} );`
+			`${block.component}._bindingGroups[${bindingGroup}].push( ${local.name} );`
 		);
 
 		local.destroy.addBlock(
-			`${fragment.component}._bindingGroups[${bindingGroup}].splice( ${fragment.component}._bindingGroups[${bindingGroup}].indexOf( ${local.name} ), 1 );`
+			`${block.component}._bindingGroups[${bindingGroup}].splice( ${block.component}._bindingGroups[${bindingGroup}].indexOf( ${local.name} ), 1 );`
 		);
 
 		updateElement = `${local.name}.checked = ${condition};`;
@@ -82,7 +82,7 @@ export default function addElementBinding ( generator, node, attribute, fragment
 		updateElement = `${local.name}.${attribute.name} = ${snippet};`;
 	}
 
-	const updating = fragment.getUniqueName( `${local.name}_updating` );
+	const updating = block.getUniqueName( `${local.name}_updating` );
 
 	local.create.addBlock( deindent`
 		var ${updating} = false;
@@ -104,7 +104,7 @@ export default function addElementBinding ( generator, node, attribute, fragment
 		}
 	` );
 
-	fragment.builders.destroy.addLine( deindent`
+	block.builders.destroy.addLine( deindent`
 		${generator.helper( 'removeEventListener' )}( ${local.name}, '${eventName}', ${handler} );
 	` );
 }
@@ -124,7 +124,7 @@ function getBindingEventName ( node ) {
 	return 'change';
 }
 
-function getBindingValue ( generator, fragment, local, node, attribute, isMultipleSelect, bindingGroup, type ) {
+function getBindingValue ( generator, block, local, node, attribute, isMultipleSelect, bindingGroup, type ) {
 	// <select multiple bind:value='selected>
 	if ( isMultipleSelect ) {
 		return `[].map.call( ${local.name}.selectedOptions, function ( option ) { return option.__value; })`;
@@ -138,7 +138,7 @@ function getBindingValue ( generator, fragment, local, node, attribute, isMultip
 	// <input type='checkbox' bind:group='foo'>
 	if ( attribute.name === 'group' ) {
 		if ( type === 'checkbox' ) {
-			return `${generator.helper( 'getBindingGroupValue' )}( ${fragment.component}._bindingGroups[${bindingGroup}] )`;
+			return `${generator.helper( 'getBindingGroupValue' )}( ${block.component}._bindingGroups[${bindingGroup}] )`;
 		}
 
 		return `${local.name}.__value`;
@@ -153,7 +153,7 @@ function getBindingValue ( generator, fragment, local, node, attribute, isMultip
 	return `${local.name}.${attribute.name}`;
 }
 
-function getBindingGroup ( generator, fragment, attribute, keypath ) {
+function getBindingGroup ( generator, keypath ) {
 	// TODO handle contextual bindings — `keypath` should include unique ID of
 	// each block that provides context
 	let index = generator.bindingGroups.indexOf( keypath );
diff --git a/src/generators/dom/visitors/attributes/binding/getSetter.js b/src/generators/dom/visitors/attributes/binding/getSetter.js
index 9a9641a7d48a..852ea83fa7f3 100644
--- a/src/generators/dom/visitors/attributes/binding/getSetter.js
+++ b/src/generators/dom/visitors/attributes/binding/getSetter.js
@@ -1,28 +1,28 @@
 import deindent from '../../../../../utils/deindent.js';
 
-export default function getSetter ({ fragment, name, keypath, context, attribute, dependencies, value }) {
-	if ( fragment.contexts.has( name ) ) {
+export default function getSetter ({ block, name, keypath, context, attribute, dependencies, value }) {
+	if ( block.contexts.has( name ) ) {
 		const prop = dependencies[0];
 		const tail = attribute.value.type === 'MemberExpression' ? getTailSnippet( attribute.value ) : '';
 
 		return deindent`
-			var list = this.${context}.${fragment.listNames.get( name )};
-			var index = this.${context}.${fragment.indexNames.get( name )};
+			var list = this.${context}.${block.listNames.get( name )};
+			var index = this.${context}.${block.indexNames.get( name )};
 			list[index]${tail} = ${value};
 
-			${fragment.component}._set({ ${prop}: ${fragment.component}.get( '${prop}' ) });
+			${block.component}._set({ ${prop}: ${block.component}.get( '${prop}' ) });
 		`;
 	}
 
 	if ( attribute.value.type === 'MemberExpression' ) {
 		return deindent`
-			var ${name} = ${fragment.component}.get( '${name}' );
+			var ${name} = ${block.component}.get( '${name}' );
 			${keypath} = ${value};
-			${fragment.component}._set({ ${name}: ${name} });
+			${block.component}._set({ ${name}: ${name} });
 		`;
 	}
 
-	return `${fragment.component}._set({ ${name}: ${value} });`;
+	return `${block.component}._set({ ${name}: ${value} });`;
 }
 
 function getTailSnippet ( node ) {
diff --git a/src/generators/dom/visitors/meta/Window.js b/src/generators/dom/visitors/meta/Window.js
index 898a21f8bb9d..e9ae4f6f371f 100644
--- a/src/generators/dom/visitors/meta/Window.js
+++ b/src/generators/dom/visitors/meta/Window.js
@@ -11,7 +11,7 @@ const associatedEvents = {
 	scrollY: 'scroll'
 };
 
-export default function visitWindow ( generator, fragment, node ) {
+export default function visitWindow ( generator, block, node ) {
 	const events = {};
 
 	node.attributes.forEach( attribute => {
@@ -25,16 +25,16 @@ export default function visitWindow ( generator, fragment, node ) {
 				generator.code.prependRight( attribute.expression.start, 'component.' );
 			}
 
-			const handlerName = fragment.getUniqueName( `onwindow${attribute.name}` );
+			const handlerName = block.getUniqueName( `onwindow${attribute.name}` );
 
-			fragment.builders.create.addBlock( deindent`
+			block.builders.create.addBlock( deindent`
 				var ${handlerName} = function ( event ) {
 					[✂${attribute.expression.start}-${attribute.expression.end}✂];
 				};
 				window.addEventListener( '${attribute.name}', ${handlerName} );
 			` );
 
-			fragment.builders.destroy.addBlock( deindent`
+			block.builders.destroy.addBlock( deindent`
 				window.removeEventListener( '${attribute.name}', ${handlerName} );
 			` );
 		}
@@ -62,11 +62,11 @@ export default function visitWindow ( generator, fragment, node ) {
 	});
 
 	Object.keys( events ).forEach( event => {
-		const handlerName = fragment.getUniqueName( `onwindow${event}` );
+		const handlerName = block.getUniqueName( `onwindow${event}` );
 
 		const props = events[ event ].join( ',\n' );
 
-		fragment.builders.create.addBlock( deindent`
+		block.builders.create.addBlock( deindent`
 			var ${handlerName} = function ( event ) {
 				component.set({
 					${props}
@@ -75,7 +75,7 @@ export default function visitWindow ( generator, fragment, node ) {
 			window.addEventListener( '${event}', ${handlerName} );
 		` );
 
-		fragment.builders.destroy.addBlock( deindent`
+		block.builders.destroy.addBlock( deindent`
 			window.removeEventListener( '${event}', ${handlerName} );
 		` );
 	});

From 8148230e49b4c288a50ea166dc870b46db934f86 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 16:58:07 -0400
Subject: [PATCH 30/31] align SSR compiler with DOM compiler

---
 .../{Fragment.js => Block.js}                      |  4 ++--
 src/generators/server-side-rendering/index.js      |  6 +++---
 .../server-side-rendering/visitors/Component.js    | 12 ++++++------
 .../server-side-rendering/visitors/EachBlock.js    | 14 +++++++-------
 .../server-side-rendering/visitors/Element.js      | 10 +++++-----
 .../server-side-rendering/visitors/IfBlock.js      | 12 ++++++------
 .../server-side-rendering/visitors/MustacheTag.js  |  4 ++--
 .../visitors/RawMustacheTag.js                     |  4 ++--
 .../server-side-rendering/visitors/Text.js         |  2 +-
 9 files changed, 34 insertions(+), 34 deletions(-)
 rename src/generators/server-side-rendering/{Fragment.js => Block.js} (85%)

diff --git a/src/generators/server-side-rendering/Fragment.js b/src/generators/server-side-rendering/Block.js
similarity index 85%
rename from src/generators/server-side-rendering/Fragment.js
rename to src/generators/server-side-rendering/Block.js
index 545619b9b8af..9f9a21345378 100644
--- a/src/generators/server-side-rendering/Fragment.js
+++ b/src/generators/server-side-rendering/Block.js
@@ -1,7 +1,7 @@
 import deindent from '../../utils/deindent.js';
 import flattenReference from '../../utils/flattenReference.js';
 
-export default class Fragment {
+export default class Block {
 	constructor ( options ) {
 		Object.assign( this, options );
 	}
@@ -25,6 +25,6 @@ export default class Fragment {
 	}
 
 	child ( options ) {
-		return new Fragment( Object.assign( {}, this, options, { parent: this } ) );
+		return new Block( Object.assign( {}, this, options, { parent: this } ) );
 	}
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index 722b854baaef..80caa90f86f9 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -1,7 +1,7 @@
 import deindent from '../../utils/deindent.js';
 import CodeBuilder from '../../utils/CodeBuilder.js';
 import Generator from '../Generator.js';
-import Fragment from './Fragment.js';
+import Block from './Block.js';
 import visit from './visit.js';
 
 class SsrGenerator extends Generator {
@@ -32,7 +32,7 @@ export default function ssr ( parsed, source, options ) {
 	};
 
 	// create main render() function
-	const mainFragment = new Fragment({
+	const mainBlock = new Block({
 		generator,
 		contexts: new Map(),
 		indexes: new Map(),
@@ -40,7 +40,7 @@ export default function ssr ( parsed, source, options ) {
 	});
 
 	parsed.html.children.forEach( node => {
-		visit( generator, mainFragment, node );
+		visit( generator, mainBlock, node );
 	});
 
 	builders.render.addLine(
diff --git a/src/generators/server-side-rendering/visitors/Component.js b/src/generators/server-side-rendering/visitors/Component.js
index abd5ef78b8be..2c718484c56a 100644
--- a/src/generators/server-side-rendering/visitors/Component.js
+++ b/src/generators/server-side-rendering/visitors/Component.js
@@ -1,11 +1,11 @@
 import flattenReference from '../../../utils/flattenReference.js';
 import visit from '../visit.js';
 
-export default function visitComponent ( generator, fragment, node ) {
+export default function visitComponent ( generator, block, node ) {
 	function stringify ( chunk ) {
 		if ( chunk.type === 'Text' ) return chunk.data;
 		if ( chunk.type === 'MustacheTag' ) {
-			const { snippet } = generator.contextualise( fragment, chunk.expression );
+			const { snippet } = generator.contextualise( block, chunk.expression );
 			return '${__escape( ' + snippet + ')}';
 		}
 	}
@@ -34,7 +34,7 @@ export default function visitComponent ( generator, fragment, node ) {
 				if ( chunk.type === 'Text' ) {
 					value = isNaN( chunk.data ) ? JSON.stringify( chunk.data ) : chunk.data;
 				} else {
-					const { snippet } = generator.contextualise( fragment, chunk.expression );
+					const { snippet } = generator.contextualise( block, chunk.expression );
 					value = snippet;
 				}
 			} else {
@@ -45,7 +45,7 @@ export default function visitComponent ( generator, fragment, node ) {
 		})
 		.concat( bindings.map( binding => {
 			const { name, keypath } = flattenReference( binding.value );
-			const value = fragment.contexts.has( name ) ? keypath : `root.${keypath}`;
+			const value = block.contexts.has( name ) ? keypath : `root.${keypath}`;
 			return `${binding.name}: ${value}`;
 		}))
 		.join( ', ' );
@@ -53,7 +53,7 @@ export default function visitComponent ( generator, fragment, node ) {
 	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
 
 	bindings.forEach( binding => {
-		fragment.addBinding( binding, expression );
+		block.addBinding( binding, expression );
 	});
 
 	let open = `\${${expression}.render({${props}}`;
@@ -67,7 +67,7 @@ export default function visitComponent ( generator, fragment, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( generator, fragment, child );
+		visit( generator, block, child );
 	});
 
 	generator.elementDepth -= 1;
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.js b/src/generators/server-side-rendering/visitors/EachBlock.js
index 37d2e7568ad6..5e59a10a4c2f 100644
--- a/src/generators/server-side-rendering/visitors/EachBlock.js
+++ b/src/generators/server-side-rendering/visitors/EachBlock.js
@@ -1,30 +1,30 @@
 import visit from '../visit.js';
 
-export default function visitEachBlock ( generator, fragment, node ) {
-	const { dependencies, snippet } = generator.contextualise( fragment, node.expression );
+export default function visitEachBlock ( generator, block, node ) {
+	const { dependencies, snippet } = generator.contextualise( block, node.expression );
 
 	const open = `\${ ${snippet}.map( ${ node.index ? `( ${node.context}, ${node.index} )` : node.context} => \``;
 	generator.append( open );
 
 	// TODO should this be the generator's job? It's duplicated between
 	// here and the equivalent DOM compiler visitor
-	const contexts = new Map( fragment.contexts );
+	const contexts = new Map( block.contexts );
 	contexts.set( node.context, node.context );
 
-	const indexes = new Map( fragment.indexes );
+	const indexes = new Map( block.indexes );
 	if ( node.index ) indexes.set( node.index, node.context );
 
-	const contextDependencies = new Map( fragment.contextDependencies );
+	const contextDependencies = new Map( block.contextDependencies );
 	contextDependencies.set( node.context, dependencies );
 
-	const childFragment = fragment.child({
+	const childBlock = block.child({
 		contexts,
 		indexes,
 		contextDependencies
 	});
 
 	node.children.forEach( child => {
-		visit( generator, childFragment, child );
+		visit( generator, childBlock, child );
 	});
 
 	const close = `\` ).join( '' )}`;
diff --git a/src/generators/server-side-rendering/visitors/Element.js b/src/generators/server-side-rendering/visitors/Element.js
index d0393b73c494..c473d6b62c88 100644
--- a/src/generators/server-side-rendering/visitors/Element.js
+++ b/src/generators/server-side-rendering/visitors/Element.js
@@ -7,13 +7,13 @@ const meta = {
 	':Window': visitWindow
 };
 
-export default function visitElement ( generator, fragment, node ) {
+export default function visitElement ( generator, block, node ) {
 	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, fragment, node );
+		return meta[ node.name ]( generator, block, node );
 	}
 
 	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		visitComponent( generator, fragment, node );
+		visitComponent( generator, block, node );
 		return;
 	}
 
@@ -30,7 +30,7 @@ export default function visitElement ( generator, fragment, node ) {
 					return chunk.data;
 				}
 
-				const { snippet } = generator.contextualise( fragment, chunk.expression );
+				const { snippet } = generator.contextualise( block, chunk.expression );
 				return '${' + snippet + '}';
 			}).join( '' ) + `"`;
 		}
@@ -49,7 +49,7 @@ export default function visitElement ( generator, fragment, node ) {
 	generator.elementDepth += 1;
 
 	node.children.forEach( child => {
-		visit( generator, fragment, child );
+		visit( generator, block, child );
 	});
 
 	generator.elementDepth -= 1;
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.js b/src/generators/server-side-rendering/visitors/IfBlock.js
index 418518d0a0d8..cd2575be6e38 100644
--- a/src/generators/server-side-rendering/visitors/IfBlock.js
+++ b/src/generators/server-side-rendering/visitors/IfBlock.js
@@ -1,23 +1,23 @@
 import visit from '../visit.js';
 
-export default function visitIfBlock ( generator, fragment, node ) {
-	const { snippet } = generator.contextualise( fragment, node.expression );
+export default function visitIfBlock ( generator, block, node ) {
+	const { snippet } = generator.contextualise( block, node.expression );
 
 	generator.append( '${ ' + snippet + ' ? `' );
 
-	const childFragment = fragment.child({
-		conditions: fragment.conditions.concat( snippet )
+	const childBlock = block.child({
+		conditions: block.conditions.concat( snippet )
 	});
 
 	node.children.forEach( child => {
-		visit( generator, childFragment, child );
+		visit( generator, childBlock, child );
 	});
 
 	generator.append( '` : `' );
 
 	if ( node.else ) {
 		node.else.children.forEach( child => {
-			visit( generator, childFragment, child );
+			visit( generator, childBlock, child );
 		});
 	}
 
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.js b/src/generators/server-side-rendering/visitors/MustacheTag.js
index 731451ae8c48..d433d0f1cb86 100644
--- a/src/generators/server-side-rendering/visitors/MustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.js
@@ -1,4 +1,4 @@
-export default function visitMustacheTag ( generator, fragment, node ) {
-	const { snippet } = generator.contextualise( fragment, node.expression );
+export default function visitMustacheTag ( generator, block, node ) {
+	const { snippet } = generator.contextualise( block, node.expression );
 	generator.append( '${__escape( ' + snippet + ' )}' );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.js b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
index ee3cb5da8684..27aa695fa104 100644
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.js
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
@@ -1,4 +1,4 @@
-export default function visitRawMustacheTag ( generator, fragment, node ) {
-	const { snippet } = generator.contextualise( fragment, node.expression );
+export default function visitRawMustacheTag ( generator, block, node ) {
+	const { snippet } = generator.contextualise( block, node.expression );
 	generator.append( '${' + snippet + '}' );
 }
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Text.js b/src/generators/server-side-rendering/visitors/Text.js
index c6f2dc85a64a..d7e30d41c576 100644
--- a/src/generators/server-side-rendering/visitors/Text.js
+++ b/src/generators/server-side-rendering/visitors/Text.js
@@ -1,3 +1,3 @@
-export default function visitText ( generator, fragment, node ) {
+export default function visitText ( generator, block, node ) {
 	generator.append( node.data.replace( /\${/g, '\\${' ) );
 }
\ No newline at end of file

From 67967b1a83c4903cf7e6367e45c662ec7dd1ff37 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Apr 2017 17:22:52 -0400
Subject: [PATCH 31/31] DRY out block.tmp stuff

---
 src/generators/dom/Block.js                            | 10 +++++++---
 src/generators/dom/visitors/MustacheTag.js             |  6 ++----
 src/generators/dom/visitors/RawMustacheTag.js          |  6 ++----
 .../dom/visitors/attributes/addElementAttributes.js    |  6 ++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/generators/dom/Block.js b/src/generators/dom/Block.js
index 9e2cbc0ab6f6..3f5b838bbbb4 100644
--- a/src/generators/dom/Block.js
+++ b/src/generators/dom/Block.js
@@ -104,17 +104,16 @@ export default class Block {
 		if ( this.builders.update.isEmpty() ) {
 			properties.addBlock( `update: ${this.generator.helper( 'noop' )},` );
 		} else {
+			if ( this._tmp ) this.builders.update.addBlockAtStart( `var ${this._tmp};` );
 			properties.addBlock( deindent`
 				update: function ( changed, ${this.params.join( ', ' )} ) {
-					${this.tmp ? `var ${this.tmp};` : ''}
-
 					${this.builders.update}
 				},
 			` );
 		}
 
 		if ( this.builders.destroy.isEmpty() ) {
-			properties.addBlock( `destroy: ${this.generator.helper( 'noop' )},` );
+			properties.addBlock( `destroy: ${this.generator.helper( 'noop' )}` );
 		} else {
 			properties.addBlock( deindent`
 				destroy: function ( detach ) {
@@ -133,4 +132,9 @@ export default class Block {
 			}
 		`;
 	}
+
+	tmp () {
+		if ( !this._tmp ) this._tmp = this.getUniqueName( 'tmp' );
+		return this._tmp;
+	}
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
index 5cbdfb76a875..e6b6ee593a03 100644
--- a/src/generators/dom/visitors/MustacheTag.js
+++ b/src/generators/dom/visitors/MustacheTag.js
@@ -8,11 +8,9 @@ export default function visitMustacheTag ( generator, block, state, node ) {
 	block.builders.create.addLine( `var last_${name} = ${snippet};` );
 	block.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, state.parentNode, true );
 
-	if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
-
 	block.builders.update.addBlock( deindent`
-		if ( ( ${block.tmp} = ${snippet} ) !== last_${name} ) {
-			${name}.data = last_${name} = ${block.tmp};
+		if ( ( ${block.tmp()} = ${snippet} ) !== last_${name} ) {
+			${name}.data = last_${name} = ${block.tmp()};
 		}
 	` );
 }
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
index c0751477e07b..13a939805625 100644
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ b/src/generators/dom/visitors/RawMustacheTag.js
@@ -25,11 +25,9 @@ export default function visitRawMustacheTag ( generator, block, state, node ) {
 		block.builders.create.addLine( mountStatement );
 	}
 
-	if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
-
 	block.builders.update.addBlock( deindent`
-		if ( ( ${block.tmp} = ${snippet} ) !== last_${name} ) {
-			last_${name} = ${block.tmp};
+		if ( ( ${block.tmp()} = ${snippet} ) !== last_${name} ) {
+			last_${name} = ${block.tmp()};
 			${detachStatement}
 			${mountStatement}
 		}
diff --git a/src/generators/dom/visitors/attributes/addElementAttributes.js b/src/generators/dom/visitors/attributes/addElementAttributes.js
index 3036cab8c5b2..8936db3d1795 100644
--- a/src/generators/dom/visitors/attributes/addElementAttributes.js
+++ b/src/generators/dom/visitors/attributes/addElementAttributes.js
@@ -106,11 +106,9 @@ export default function addElementAttributes ( generator, block, node, local ) {
 
 					local.create.addLine( updater );
 
-					if ( !block.tmp ) block.tmp = block.getUniqueName( 'tmp' );
-
 					local.update.addBlock( deindent`
-						if ( ( ${block.tmp} = ${snippet} ) !== ${last} ) {
-							${last} = ${block.tmp};
+						if ( ( ${block.tmp()} = ${snippet} ) !== ${last} ) {
+							${last} = ${block.tmp()};
 							${updater}
 						}
 					` );