diff --git a/src/generators/shared/utils/wrapModule.ts b/src/generators/shared/utils/wrapModule.ts index 18d295ea25..77fea53446 100644 --- a/src/generators/shared/utils/wrapModule.ts +++ b/src/generators/shared/utils/wrapModule.ts @@ -93,10 +93,8 @@ function es( ${importHelpers} ${importBlock} - export default (function() { - ${code} - return ${name}; - }());`; + ${code} + export default ${name};`; } function amd( diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js index 972c8bad71..5d44708a27 100644 --- a/test/js/samples/collapses-text-around-comments/expected-bundle.js +++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js @@ -190,8 +190,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { data: function () { return { foo: 42 } @@ -199,66 +198,64 @@ var _actual = (function() { }; }()); - function encapsulateStyles(node) { - setAttribute(node, "svelte-3590263702", ""); - } +function encapsulateStyles(node) { + setAttribute(node, "svelte-3590263702", ""); +} - function add_css() { - var style = createElement("style"); - style.id = 'svelte-3590263702-style'; - style.textContent = "p[svelte-3590263702],[svelte-3590263702] p{color:red}"; - appendNode(style, document.head); - } +function add_css() { + var style = createElement("style"); + style.id = 'svelte-3590263702-style'; + style.textContent = "p[svelte-3590263702],[svelte-3590263702] p{color:red}"; + appendNode(style, document.head); +} - function create_main_fragment(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText(state.foo); - this.hydrate(); - }, - - hydrate: function() { - encapsulateStyles(p); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - update: function(changed, state) { - if (changed.foo) { - text.data = state.foo; - } - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } +function create_main_fragment(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText(state.foo); + this.hydrate(); + }, + + hydrate: function() { + encapsulateStyles(p); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + update: function(changed, state) { + if (changed.foo) { + text.data = state.foo; + } + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = assign(template.data(), options.data); +function SvelteComponent(options) { + init(this, options); + this._state = assign(template.data(), options.data); - if (!document.getElementById("svelte-3590263702-style")) add_css(); + if (!document.getElementById("svelte-3590263702-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js index 2ef55026da..83841b4eb8 100644 --- a/test/js/samples/collapses-text-around-comments/expected.js +++ b/test/js/samples/collapses-text-around-comments/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { data: function () { return { foo: 42 } @@ -10,64 +9,63 @@ export default (function() { }; }()); - function encapsulateStyles(node) { - setAttribute(node, "svelte-3590263702", ""); - } +function encapsulateStyles(node) { + setAttribute(node, "svelte-3590263702", ""); +} - function add_css() { - var style = createElement("style"); - style.id = 'svelte-3590263702-style'; - style.textContent = "p[svelte-3590263702],[svelte-3590263702] p{color:red}"; - appendNode(style, document.head); - } +function add_css() { + var style = createElement("style"); + style.id = 'svelte-3590263702-style'; + style.textContent = "p[svelte-3590263702],[svelte-3590263702] p{color:red}"; + appendNode(style, document.head); +} - function create_main_fragment(state, component) { - var p, text; +function create_main_fragment(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText(state.foo); - this.hydrate(); - }, + return { + create: function() { + p = createElement("p"); + text = createText(state.foo); + this.hydrate(); + }, - hydrate: function() { - encapsulateStyles(p); - }, + hydrate: function() { + encapsulateStyles(p); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - update: function(changed, state) { - if (changed.foo) { - text.data = state.foo; - } - }, + update: function(changed, state) { + if (changed.foo) { + text.data = state.foo; + } + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = assign(template.data(), options.data); +function SvelteComponent(options) { + init(this, options); + this._state = assign(template.data(), options.data); - if (!document.getElementById("svelte-3590263702-style")) add_css(); + if (!document.getElementById("svelte-3590263702-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js index 6b3d6488d1..a9769110cb 100644 --- a/test/js/samples/component-static/expected-bundle.js +++ b/test/js/samples/component-static/expected-bundle.js @@ -166,8 +166,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { components: { Nested: window.Nested @@ -175,60 +174,58 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - var nested = new template.components.Nested({ - _root: component._root, - data: { foo: "bar" } - }); + var nested = new template.components.Nested({ + _root: component._root, + data: { foo: "bar" } + }); - return { - create: function() { - nested._fragment.create(); - }, + return { + create: function() { + nested._fragment.create(); + }, - mount: function(target, anchor) { - nested._mount(target, anchor); - }, + mount: function(target, anchor) { + nested._mount(target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - nested._unmount(); - }, + unmount: function() { + nested._unmount(); + }, - destroy: function() { - nested.destroy(false); - } - }; - } + destroy: function() { + nested.destroy(false); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - this._aftercreate = []; - } + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - this._lock = true; - callAll(this._beforecreate); - callAll(this._oncreate); - callAll(this._aftercreate); - this._lock = false; - } + this._lock = true; + callAll(this._beforecreate); + callAll(this._oncreate); + callAll(this._aftercreate); + this._lock = false; } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js index e91a5f1db2..8a22292037 100644 --- a/test/js/samples/component-static/expected.js +++ b/test/js/samples/component-static/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, callAll, init, noop, proto } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { components: { Nested: window.Nested @@ -10,58 +9,57 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - var nested = new template.components.Nested({ - _root: component._root, - data: { foo: "bar" } - }); + var nested = new template.components.Nested({ + _root: component._root, + data: { foo: "bar" } + }); - return { - create: function() { - nested._fragment.create(); - }, + return { + create: function() { + nested._fragment.create(); + }, - mount: function(target, anchor) { - nested._mount(target, anchor); - }, + mount: function(target, anchor) { + nested._mount(target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - nested._unmount(); - }, + unmount: function() { + nested._unmount(); + }, - destroy: function() { - nested.destroy(false); - } - }; - } + destroy: function() { + nested.destroy(false); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - this._aftercreate = []; - } + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - this._lock = true; - callAll(this._beforecreate); - callAll(this._oncreate); - callAll(this._aftercreate); - this._lock = false; - } + this._lock = true; + callAll(this._beforecreate); + callAll(this._oncreate); + callAll(this._aftercreate); + this._lock = false; } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js index 2e8615f001..e6e9152b1e 100644 --- a/test/js/samples/computed-collapsed-if/expected-bundle.js +++ b/test/js/samples/computed-collapsed-if/expected-bundle.js @@ -166,8 +166,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { computed: { a: x => x * 2, @@ -176,43 +175,41 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; - this._recompute({ x: 1 }, this._state); +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + this._recompute({ x: 1 }, this._state); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); +assign(SvelteComponent.prototype, proto); - SvelteComponent.prototype._recompute = function _recompute(changed, state) { - if (changed.x) { - if (differs(state.a, (state.a = template.computed.a(state.x)))) changed.a = true; - if (differs(state.b, (state.b = template.computed.b(state.x)))) changed.b = true; - } - }; - return SvelteComponent; -}()); +SvelteComponent.prototype._recompute = function _recompute(changed, state) { + if (changed.x) { + if (differs(state.a, (state.a = template.computed.a(state.x)))) changed.a = true; + if (differs(state.b, (state.b = template.computed.b(state.x)))) changed.b = true; + } +}; -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js index 5d4313c10e..7b9207a955 100644 --- a/test/js/samples/computed-collapsed-if/expected.js +++ b/test/js/samples/computed-collapsed-if/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, differs, init, noop, proto } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { computed: { a: x => x * 2, @@ -11,41 +10,40 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; - this._recompute({ x: 1 }, this._state); +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + this._recompute({ x: 1 }, this._state); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); +assign(SvelteComponent.prototype, proto); - SvelteComponent.prototype._recompute = function _recompute(changed, state) { - if (changed.x) { - if (differs(state.a, (state.a = template.computed.a(state.x)))) changed.a = true; - if (differs(state.b, (state.b = template.computed.b(state.x)))) changed.b = true; - } +SvelteComponent.prototype._recompute = function _recompute(changed, state) { + if (changed.x) { + if (differs(state.a, (state.a = template.computed.a(state.x)))) changed.a = true; + if (differs(state.b, (state.b = template.computed.b(state.x)))) changed.b = true; } - return SvelteComponent; -}()); \ No newline at end of file +} +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js index 8ebbefee23..e37322f9e6 100644 --- a/test/js/samples/css-media-query/expected-bundle.js +++ b/test/js/samples/css-media-query/expected-bundle.js @@ -186,61 +186,58 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function encapsulateStyles(node) { - setAttribute(node, "svelte-2363328337", ""); - } +function encapsulateStyles(node) { + setAttribute(node, "svelte-2363328337", ""); +} - function add_css() { - var style = createElement("style"); - style.id = 'svelte-2363328337-style'; - style.textContent = "@media(min-width: 1px){div[svelte-2363328337],[svelte-2363328337] div{color:red}}"; - appendNode(style, document.head); - } +function add_css() { + var style = createElement("style"); + style.id = 'svelte-2363328337-style'; + style.textContent = "@media(min-width: 1px){div[svelte-2363328337],[svelte-2363328337] div{color:red}}"; + appendNode(style, document.head); +} - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - encapsulateStyles(div); - }, + hydrate: function() { + encapsulateStyles(div); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!document.getElementById("svelte-2363328337-style")) add_css(); + if (!document.getElementById("svelte-2363328337-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js index a9bd0d538d..58d4b5e991 100644 --- a/test/js/samples/css-media-query/expected.js +++ b/test/js/samples/css-media-query/expected.js @@ -1,59 +1,57 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; -export default (function() { - function encapsulateStyles(node) { - setAttribute(node, "svelte-2363328337", ""); - } +function encapsulateStyles(node) { + setAttribute(node, "svelte-2363328337", ""); +} - function add_css() { - var style = createElement("style"); - style.id = 'svelte-2363328337-style'; - style.textContent = "@media(min-width: 1px){div[svelte-2363328337],[svelte-2363328337] div{color:red}}"; - appendNode(style, document.head); - } +function add_css() { + var style = createElement("style"); + style.id = 'svelte-2363328337-style'; + style.textContent = "@media(min-width: 1px){div[svelte-2363328337],[svelte-2363328337] div{color:red}}"; + appendNode(style, document.head); +} - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - encapsulateStyles(div); - }, + hydrate: function() { + encapsulateStyles(div); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!document.getElementById("svelte-2363328337-style")) add_css(); + if (!document.getElementById("svelte-2363328337-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js index ebd6272c4f..22bcb5f37b 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js @@ -186,68 +186,65 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div, text; +function create_main_fragment(state, component) { + var div, text; - return { - create: function() { - div = createElement("div"); - text = createText("fades in"); - }, + return { + create: function() { + div = createElement("div"); + text = createText("fades in"); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - appendNode(text, div); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + appendNode(text, div); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - class SvelteComponent extends HTMLElement { - constructor(options = {}) { - super(); - init(this, options); - this._state = options.data || {}; +class SvelteComponent extends HTMLElement { + constructor(options = {}) { + super(); + init(this, options); + this._state = options.data || {}; - this.attachShadow({ mode: 'open' }); - this.shadowRoot.innerHTML = ``; + this.attachShadow({ mode: 'open' }); + this.shadowRoot.innerHTML = ``; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - this._fragment.create(); - this._fragment.mount(this.shadowRoot, null); + this._fragment.create(); + this._fragment.mount(this.shadowRoot, null); - if (options.target) this._mount(options.target, options.anchor || null); - } + if (options.target) this._mount(options.target, options.anchor || null); + } - static get observedAttributes() { - return []; - } + static get observedAttributes() { + return []; + } - attributeChangedCallback(attr, oldValue, newValue) { - this.set({ [attr]: newValue }); - } + attributeChangedCallback(attr, oldValue, newValue) { + this.set({ [attr]: newValue }); } +} - customElements.define("custom-element", SvelteComponent); - assign(SvelteComponent.prototype, proto, { - _mount(target, anchor) { - target.insertBefore(this, anchor); - }, +customElements.define("custom-element", SvelteComponent); +assign(SvelteComponent.prototype, proto, { + _mount(target, anchor) { + target.insertBefore(this, anchor); + }, - _unmount() { - this.parentNode.removeChild(this); - } - }); - return SvelteComponent; -}()); + _unmount() { + this.parentNode.removeChild(this); + } +}); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js index 5fe9dc2db9..6cea9a7856 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected.js @@ -1,66 +1,64 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div, text; +function create_main_fragment(state, component) { + var div, text; - return { - create: function() { - div = createElement("div"); - text = createText("fades in"); - }, + return { + create: function() { + div = createElement("div"); + text = createText("fades in"); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - appendNode(text, div); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + appendNode(text, div); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - class SvelteComponent extends HTMLElement { - constructor(options = {}) { - super(); - init(this, options); - this._state = options.data || {}; +class SvelteComponent extends HTMLElement { + constructor(options = {}) { + super(); + init(this, options); + this._state = options.data || {}; - this.attachShadow({ mode: 'open' }); - this.shadowRoot.innerHTML = ``; + this.attachShadow({ mode: 'open' }); + this.shadowRoot.innerHTML = ``; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - this._fragment.create(); - this._fragment.mount(this.shadowRoot, null); + this._fragment.create(); + this._fragment.mount(this.shadowRoot, null); - if (options.target) this._mount(options.target, options.anchor || null); - } + if (options.target) this._mount(options.target, options.anchor || null); + } - static get observedAttributes() { - return []; - } + static get observedAttributes() { + return []; + } - attributeChangedCallback(attr, oldValue, newValue) { - this.set({ [attr]: newValue }); - } + attributeChangedCallback(attr, oldValue, newValue) { + this.set({ [attr]: newValue }); } +} - customElements.define("custom-element", SvelteComponent); - assign(SvelteComponent.prototype, proto, { - _mount(target, anchor) { - target.insertBefore(this, anchor); - }, +customElements.define("custom-element", SvelteComponent); +assign(SvelteComponent.prototype, proto, { + _mount(target, anchor) { + target.insertBefore(this, anchor); + }, - _unmount() { - this.parentNode.removeChild(this); - } - }); - return SvelteComponent; -}()); \ No newline at end of file + _unmount() { + this.parentNode.removeChild(this); + } +}); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index ef42d21dae..882e55dfbb 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -198,159 +198,156 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var text, p, text_1; +function create_main_fragment(state, component) { + var text, p, text_1; - var comments = state.comments; + var comments = state.comments; - var each_blocks = []; + var each_blocks = []; - for (var i = 0; i < comments.length; i += 1) { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); - } - - return { - create: function() { - for (var i = 0; i < each_blocks.length; i += 1) { - each_blocks[i].create(); - } + for (var i = 0; i < comments.length; i += 1) { + each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + } - text = createText("\n\n"); - p = createElement("p"); - text_1 = createText(state.foo); - }, + return { + create: function() { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].create(); + } - mount: function(target, anchor) { - for (var i = 0; i < each_blocks.length; i += 1) { - each_blocks[i].mount(target, anchor); - } + text = createText("\n\n"); + p = createElement("p"); + text_1 = createText(state.foo); + }, - insertNode(text, target, anchor); - insertNode(p, target, anchor); - appendNode(text_1, p); - }, - - update: function(changed, state) { - var comments = state.comments; - - if (changed.comments || changed.elapsed || changed.time) { - for (var i = 0; i < comments.length; i += 1) { - if (each_blocks[i]) { - each_blocks[i].update(changed, state, comments, comments[i], i); - } else { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); - each_blocks[i].create(); - each_blocks[i].mount(text.parentNode, text); - } - } + mount: function(target, anchor) { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].mount(target, anchor); + } - for (; i < each_blocks.length; i += 1) { - each_blocks[i].unmount(); - each_blocks[i].destroy(); + insertNode(text, target, anchor); + insertNode(p, target, anchor); + appendNode(text_1, p); + }, + + update: function(changed, state) { + var comments = state.comments; + + if (changed.comments || changed.elapsed || changed.time) { + for (var i = 0; i < comments.length; i += 1) { + if (each_blocks[i]) { + each_blocks[i].update(changed, state, comments, comments[i], i); + } else { + each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i].create(); + each_blocks[i].mount(text.parentNode, text); } - each_blocks.length = comments.length; } - if (changed.foo) { - text_1.data = state.foo; - } - }, - - unmount: function() { - for (var i = 0; i < each_blocks.length; i += 1) { + for (; i < each_blocks.length; i += 1) { each_blocks[i].unmount(); + each_blocks[i].destroy(); } + each_blocks.length = comments.length; + } - detachNode(text); - detachNode(p); - }, + if (changed.foo) { + text_1.data = state.foo; + } + }, - destroy: function() { - destroyEach(each_blocks); + unmount: function() { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].unmount(); } - }; - } - // (1:0) {{#each comments as comment, i}} - function create_each_block(state, comments, comment, i, component) { - var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; - - return { - create: function() { - div = createElement("div"); - strong = createElement("strong"); - text = createText(i); - text_1 = createText("\n\n\t\t"); - span = createElement("span"); - text_2 = createText(text_2_value); - text_3 = createText(" wrote "); - text_4 = createText(text_4_value); - text_5 = createText(" ago:"); - text_6 = createText("\n\n\t\t"); - raw_before = createElement('noscript'); - this.hydrate(); - }, - - hydrate: function() { - div.className = "comment"; - span.className = "meta"; - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - appendNode(strong, div); - appendNode(text, strong); - appendNode(text_1, div); - appendNode(span, div); - appendNode(text_2, span); - appendNode(text_3, span); - appendNode(text_4, span); - appendNode(text_5, span); - appendNode(text_6, div); - appendNode(raw_before, div); - raw_before.insertAdjacentHTML("afterend", raw_value); - }, + detachNode(text); + detachNode(p); + }, - update: function(changed, state, comments, comment, i) { - if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { - text_2.data = text_2_value; - } + destroy: function() { + destroyEach(each_blocks); + } + }; +} - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { - text_4.data = text_4_value; - } +// (1:0) {{#each comments as comment, i}} +function create_each_block(state, comments, comment, i, component) { + var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; - if ((changed.comments) && raw_value !== (raw_value = comment.html)) { - detachAfter(raw_before); - raw_before.insertAdjacentHTML("afterend", raw_value); - } - }, + return { + create: function() { + div = createElement("div"); + strong = createElement("strong"); + text = createText(i); + text_1 = createText("\n\n\t\t"); + span = createElement("span"); + text_2 = createText(text_2_value); + text_3 = createText(" wrote "); + text_4 = createText(text_4_value); + text_5 = createText(" ago:"); + text_6 = createText("\n\n\t\t"); + raw_before = createElement('noscript'); + this.hydrate(); + }, + + hydrate: function() { + div.className = "comment"; + span.className = "meta"; + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + appendNode(strong, div); + appendNode(text, strong); + appendNode(text_1, div); + appendNode(span, div); + appendNode(text_2, span); + appendNode(text_3, span); + appendNode(text_4, span); + appendNode(text_5, span); + appendNode(text_6, div); + appendNode(raw_before, div); + raw_before.insertAdjacentHTML("afterend", raw_value); + }, + + update: function(changed, state, comments, comment, i) { + if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { + text_2.data = text_2_value; + } + + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { + text_4.data = text_4_value; + } - unmount: function() { + if ((changed.comments) && raw_value !== (raw_value = comment.html)) { detachAfter(raw_before); + raw_before.insertAdjacentHTML("afterend", raw_value); + } + }, - detachNode(div); - }, + unmount: function() { + detachAfter(raw_before); - destroy: noop - }; - } + detachNode(div); + }, + + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index 2f431dadaf..613fea0bf5 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -1,157 +1,155 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var text, p, text_1; +function create_main_fragment(state, component) { + var text, p, text_1; - var comments = state.comments; + var comments = state.comments; - var each_blocks = []; + var each_blocks = []; - for (var i = 0; i < comments.length; i += 1) { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); - } - - return { - create: function() { - for (var i = 0; i < each_blocks.length; i += 1) { - each_blocks[i].create(); - } + for (var i = 0; i < comments.length; i += 1) { + each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + } - text = createText("\n\n"); - p = createElement("p"); - text_1 = createText(state.foo); - }, + return { + create: function() { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].create(); + } - mount: function(target, anchor) { - for (var i = 0; i < each_blocks.length; i += 1) { - each_blocks[i].mount(target, anchor); - } + text = createText("\n\n"); + p = createElement("p"); + text_1 = createText(state.foo); + }, - insertNode(text, target, anchor); - insertNode(p, target, anchor); - appendNode(text_1, p); - }, - - update: function(changed, state) { - var comments = state.comments; - - if (changed.comments || changed.elapsed || changed.time) { - for (var i = 0; i < comments.length; i += 1) { - if (each_blocks[i]) { - each_blocks[i].update(changed, state, comments, comments[i], i); - } else { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); - each_blocks[i].create(); - each_blocks[i].mount(text.parentNode, text); - } - } + mount: function(target, anchor) { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].mount(target, anchor); + } - for (; i < each_blocks.length; i += 1) { - each_blocks[i].unmount(); - each_blocks[i].destroy(); + insertNode(text, target, anchor); + insertNode(p, target, anchor); + appendNode(text_1, p); + }, + + update: function(changed, state) { + var comments = state.comments; + + if (changed.comments || changed.elapsed || changed.time) { + for (var i = 0; i < comments.length; i += 1) { + if (each_blocks[i]) { + each_blocks[i].update(changed, state, comments, comments[i], i); + } else { + each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i].create(); + each_blocks[i].mount(text.parentNode, text); } - each_blocks.length = comments.length; - } - - if (changed.foo) { - text_1.data = state.foo; } - }, - unmount: function() { - for (var i = 0; i < each_blocks.length; i += 1) { + for (; i < each_blocks.length; i += 1) { each_blocks[i].unmount(); + each_blocks[i].destroy(); } + each_blocks.length = comments.length; + } - detachNode(text); - detachNode(p); - }, - - destroy: function() { - destroyEach(each_blocks); + if (changed.foo) { + text_1.data = state.foo; } - }; - } + }, - // (1:0) {{#each comments as comment, i}} - function create_each_block(state, comments, comment, i, component) { - var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; - - return { - create: function() { - div = createElement("div"); - strong = createElement("strong"); - text = createText(i); - text_1 = createText("\n\n\t\t"); - span = createElement("span"); - text_2 = createText(text_2_value); - text_3 = createText(" wrote "); - text_4 = createText(text_4_value); - text_5 = createText(" ago:"); - text_6 = createText("\n\n\t\t"); - raw_before = createElement('noscript'); - this.hydrate(); - }, - - hydrate: function() { - div.className = "comment"; - span.className = "meta"; - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - appendNode(strong, div); - appendNode(text, strong); - appendNode(text_1, div); - appendNode(span, div); - appendNode(text_2, span); - appendNode(text_3, span); - appendNode(text_4, span); - appendNode(text_5, span); - appendNode(text_6, div); - appendNode(raw_before, div); - raw_before.insertAdjacentHTML("afterend", raw_value); - }, + unmount: function() { + for (var i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].unmount(); + } - update: function(changed, state, comments, comment, i) { - if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { - text_2.data = text_2_value; - } + detachNode(text); + detachNode(p); + }, - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { - text_4.data = text_4_value; - } + destroy: function() { + destroyEach(each_blocks); + } + }; +} + +// (1:0) {{#each comments as comment, i}} +function create_each_block(state, comments, comment, i, component) { + var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; + + return { + create: function() { + div = createElement("div"); + strong = createElement("strong"); + text = createText(i); + text_1 = createText("\n\n\t\t"); + span = createElement("span"); + text_2 = createText(text_2_value); + text_3 = createText(" wrote "); + text_4 = createText(text_4_value); + text_5 = createText(" ago:"); + text_6 = createText("\n\n\t\t"); + raw_before = createElement('noscript'); + this.hydrate(); + }, + + hydrate: function() { + div.className = "comment"; + span.className = "meta"; + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + appendNode(strong, div); + appendNode(text, strong); + appendNode(text_1, div); + appendNode(span, div); + appendNode(text_2, span); + appendNode(text_3, span); + appendNode(text_4, span); + appendNode(text_5, span); + appendNode(text_6, div); + appendNode(raw_before, div); + raw_before.insertAdjacentHTML("afterend", raw_value); + }, + + update: function(changed, state, comments, comment, i) { + if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { + text_2.data = text_2_value; + } - if ((changed.comments) && raw_value !== (raw_value = comment.html)) { - detachAfter(raw_before); - raw_before.insertAdjacentHTML("afterend", raw_value); - } - }, + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { + text_4.data = text_4_value; + } - unmount: function() { + if ((changed.comments) && raw_value !== (raw_value = comment.html)) { detachAfter(raw_before); + raw_before.insertAdjacentHTML("afterend", raw_value); + } + }, - detachNode(div); - }, + unmount: function() { + detachAfter(raw_before); - destroy: noop - }; - } + detachNode(div); + }, - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; + destroy: noop + }; +} - this._fragment = create_main_fragment(this._state, this); +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js index f96f8fb00b..4d5e595318 100644 --- a/test/js/samples/event-handlers-custom/expected-bundle.js +++ b/test/js/samples/event-handlers-custom/expected-bundle.js @@ -186,8 +186,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { methods: { foo ( bar ) { @@ -202,54 +201,52 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { - var button, foo_handler, text; +function create_main_fragment(state, component) { + var button, foo_handler, text; - return { - create: function() { - button = createElement("button"); - text = createText("foo"); - this.hydrate(); - }, + return { + create: function() { + button = createElement("button"); + text = createText("foo"); + this.hydrate(); + }, - hydrate: function() { - foo_handler = template.events.foo.call(component, button, function(event) { - var state = component.get(); - component.foo( state.bar ); - }); - }, + hydrate: function() { + foo_handler = template.events.foo.call(component, button, function(event) { + var state = component.get(); + component.foo( state.bar ); + }); + }, - mount: function(target, anchor) { - insertNode(button, target, anchor); - appendNode(text, button); - }, + mount: function(target, anchor) { + insertNode(button, target, anchor); + appendNode(text, button); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(button); - }, + unmount: function() { + detachNode(button); + }, - destroy: function() { - foo_handler.teardown(); - } - }; - } + destroy: function() { + foo_handler.teardown(); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, template.methods, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, template.methods, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js index 41f66bb1d7..bf656c0411 100644 --- a/test/js/samples/event-handlers-custom/expected.js +++ b/test/js/samples/event-handlers-custom/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { methods: { foo ( bar ) { @@ -17,52 +16,51 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { - var button, foo_handler, text; +function create_main_fragment(state, component) { + var button, foo_handler, text; - return { - create: function() { - button = createElement("button"); - text = createText("foo"); - this.hydrate(); - }, + return { + create: function() { + button = createElement("button"); + text = createText("foo"); + this.hydrate(); + }, - hydrate: function() { - foo_handler = template.events.foo.call(component, button, function(event) { - var state = component.get(); - component.foo( state.bar ); - }); - }, + hydrate: function() { + foo_handler = template.events.foo.call(component, button, function(event) { + var state = component.get(); + component.foo( state.bar ); + }); + }, - mount: function(target, anchor) { - insertNode(button, target, anchor); - appendNode(text, button); - }, + mount: function(target, anchor) { + insertNode(button, target, anchor); + appendNode(text, button); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(button); - }, + unmount: function() { + detachNode(button); + }, - destroy: function() { - foo_handler.teardown(); - } - }; - } + destroy: function() { + foo_handler.teardown(); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, template.methods, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, template.methods, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js index b7cd0d587b..b413e274e0 100644 --- a/test/js/samples/if-block-no-update/expected-bundle.js +++ b/test/js/samples/if-block-no-update/expected-bundle.js @@ -190,110 +190,107 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var if_block_anchor; +function create_main_fragment(state, component) { + var if_block_anchor; - var current_block_type = select_block_type(state); - var if_block = current_block_type(state, component); + var current_block_type = select_block_type(state); + var if_block = current_block_type(state, component); - return { - create: function() { - if_block.create(); - if_block_anchor = createComment(); - }, - - mount: function(target, anchor) { - if_block.mount(target, anchor); - insertNode(if_block_anchor, target, anchor); - }, - - update: function(changed, state) { - if (current_block_type !== (current_block_type = select_block_type(state))) { - if_block.unmount(); - if_block.destroy(); - if_block = current_block_type(state, component); - if_block.create(); - if_block.mount(if_block_anchor.parentNode, if_block_anchor); - } - }, - - unmount: function() { + return { + create: function() { + if_block.create(); + if_block_anchor = createComment(); + }, + + mount: function(target, anchor) { + if_block.mount(target, anchor); + insertNode(if_block_anchor, target, anchor); + }, + + update: function(changed, state) { + if (current_block_type !== (current_block_type = select_block_type(state))) { if_block.unmount(); - detachNode(if_block_anchor); - }, - - destroy: function() { if_block.destroy(); + if_block = current_block_type(state, component); + if_block.create(); + if_block.mount(if_block_anchor.parentNode, if_block_anchor); } - }; - } + }, - // (1:0) {{#if foo}} - function create_if_block(state, component) { - var p, text; + unmount: function() { + if_block.unmount(); + detachNode(if_block_anchor); + }, - return { - create: function() { - p = createElement("p"); - text = createText("foo!"); - }, + destroy: function() { + if_block.destroy(); + } + }; +} - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, +// (1:0) {{#if foo}} +function create_if_block(state, component) { + var p, text; - unmount: function() { - detachNode(p); - }, + return { + create: function() { + p = createElement("p"); + text = createText("foo!"); + }, - destroy: noop - }; - } + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, - // (3:0) {{else}} - function create_if_block_1(state, component) { - var p, text; + destroy: noop + }; +} - return { - create: function() { - p = createElement("p"); - text = createText("not foo!"); - }, +// (3:0) {{else}} +function create_if_block_1(state, component) { + var p, text; - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + return { + create: function() { + p = createElement("p"); + text = createText("not foo!"); + }, - unmount: function() { - detachNode(p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - destroy: noop - }; - } + unmount: function() { + detachNode(p); + }, - function select_block_type(state) { - if (state.foo) return create_if_block; - return create_if_block_1; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function select_block_type(state) { + if (state.foo) return create_if_block; + return create_if_block_1; +} - this._fragment = create_main_fragment(this._state, this); +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js index 5d52e1cbad..a513519061 100644 --- a/test/js/samples/if-block-no-update/expected.js +++ b/test/js/samples/if-block-no-update/expected.js @@ -1,108 +1,106 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var if_block_anchor; +function create_main_fragment(state, component) { + var if_block_anchor; - var current_block_type = select_block_type(state); - var if_block = current_block_type(state, component); + var current_block_type = select_block_type(state); + var if_block = current_block_type(state, component); - return { - create: function() { - if_block.create(); - if_block_anchor = createComment(); - }, - - mount: function(target, anchor) { - if_block.mount(target, anchor); - insertNode(if_block_anchor, target, anchor); - }, - - update: function(changed, state) { - if (current_block_type !== (current_block_type = select_block_type(state))) { - if_block.unmount(); - if_block.destroy(); - if_block = current_block_type(state, component); - if_block.create(); - if_block.mount(if_block_anchor.parentNode, if_block_anchor); - } - }, - - unmount: function() { - if_block.unmount(); - detachNode(if_block_anchor); - }, + return { + create: function() { + if_block.create(); + if_block_anchor = createComment(); + }, + + mount: function(target, anchor) { + if_block.mount(target, anchor); + insertNode(if_block_anchor, target, anchor); + }, - destroy: function() { + update: function(changed, state) { + if (current_block_type !== (current_block_type = select_block_type(state))) { + if_block.unmount(); if_block.destroy(); + if_block = current_block_type(state, component); + if_block.create(); + if_block.mount(if_block_anchor.parentNode, if_block_anchor); } - }; - } - - // (1:0) {{#if foo}} - function create_if_block(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("foo!"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - // (3:0) {{else}} - function create_if_block_1(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("not foo!"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - function select_block_type(state) { - if (state.foo) return create_if_block; - return create_if_block_1; - } - - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; + }, - this._fragment = create_main_fragment(this._state, this); + unmount: function() { + if_block.unmount(); + detachNode(if_block_anchor); + }, - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + destroy: function() { + if_block.destroy(); } + }; +} + +// (1:0) {{#if foo}} +function create_if_block(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("foo!"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +// (3:0) {{else}} +function create_if_block_1(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("not foo!"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +function select_block_type(state) { + if (state.foo) return create_if_block; + return create_if_block_1; +} + +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js index 6c7e2d86b4..881aafd926 100644 --- a/test/js/samples/if-block-simple/expected-bundle.js +++ b/test/js/samples/if-block-simple/expected-bundle.js @@ -190,85 +190,82 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var if_block_anchor; - - var if_block = (state.foo) && create_if_block(state, component); - - return { - create: function() { - if (if_block) if_block.create(); - if_block_anchor = createComment(); - }, - - mount: function(target, anchor) { - if (if_block) if_block.mount(target, anchor); - insertNode(if_block_anchor, target, anchor); - }, - - update: function(changed, state) { - if (state.foo) { - if (!if_block) { - if_block = create_if_block(state, component); - if_block.create(); - if_block.mount(if_block_anchor.parentNode, if_block_anchor); - } - } else if (if_block) { - if_block.unmount(); - if_block.destroy(); - if_block = null; - } - }, +function create_main_fragment(state, component) { + var if_block_anchor; - unmount: function() { - if (if_block) if_block.unmount(); - detachNode(if_block_anchor); - }, + var if_block = (state.foo) && create_if_block(state, component); - destroy: function() { - if (if_block) if_block.destroy(); + return { + create: function() { + if (if_block) if_block.create(); + if_block_anchor = createComment(); + }, + + mount: function(target, anchor) { + if (if_block) if_block.mount(target, anchor); + insertNode(if_block_anchor, target, anchor); + }, + + update: function(changed, state) { + if (state.foo) { + if (!if_block) { + if_block = create_if_block(state, component); + if_block.create(); + if_block.mount(if_block_anchor.parentNode, if_block_anchor); + } + } else if (if_block) { + if_block.unmount(); + if_block.destroy(); + if_block = null; } - }; - } + }, - // (1:0) {{#if foo}} - function create_if_block(state, component) { - var p, text; + unmount: function() { + if (if_block) if_block.unmount(); + detachNode(if_block_anchor); + }, - return { - create: function() { - p = createElement("p"); - text = createText("foo!"); - }, + destroy: function() { + if (if_block) if_block.destroy(); + } + }; +} - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, +// (1:0) {{#if foo}} +function create_if_block(state, component) { + var p, text; - unmount: function() { - detachNode(p); - }, + return { + create: function() { + p = createElement("p"); + text = createText("foo!"); + }, - destroy: noop - }; - } + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; + unmount: function() { + detachNode(p); + }, - this._fragment = create_main_fragment(this._state, this); + destroy: noop + }; +} - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js index 311093e0fb..aba8b65ee7 100644 --- a/test/js/samples/if-block-simple/expected.js +++ b/test/js/samples/if-block-simple/expected.js @@ -1,83 +1,81 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var if_block_anchor; - - var if_block = (state.foo) && create_if_block(state, component); - - return { - create: function() { - if (if_block) if_block.create(); - if_block_anchor = createComment(); - }, - - mount: function(target, anchor) { - if (if_block) if_block.mount(target, anchor); - insertNode(if_block_anchor, target, anchor); - }, - - update: function(changed, state) { - if (state.foo) { - if (!if_block) { - if_block = create_if_block(state, component); - if_block.create(); - if_block.mount(if_block_anchor.parentNode, if_block_anchor); - } - } else if (if_block) { - if_block.unmount(); - if_block.destroy(); - if_block = null; +function create_main_fragment(state, component) { + var if_block_anchor; + + var if_block = (state.foo) && create_if_block(state, component); + + return { + create: function() { + if (if_block) if_block.create(); + if_block_anchor = createComment(); + }, + + mount: function(target, anchor) { + if (if_block) if_block.mount(target, anchor); + insertNode(if_block_anchor, target, anchor); + }, + + update: function(changed, state) { + if (state.foo) { + if (!if_block) { + if_block = create_if_block(state, component); + if_block.create(); + if_block.mount(if_block_anchor.parentNode, if_block_anchor); } - }, + } else if (if_block) { + if_block.unmount(); + if_block.destroy(); + if_block = null; + } + }, - unmount: function() { - if (if_block) if_block.unmount(); - detachNode(if_block_anchor); - }, + unmount: function() { + if (if_block) if_block.unmount(); + detachNode(if_block_anchor); + }, - destroy: function() { - if (if_block) if_block.destroy(); - } - }; - } + destroy: function() { + if (if_block) if_block.destroy(); + } + }; +} - // (1:0) {{#if foo}} - function create_if_block(state, component) { - var p, text; +// (1:0) {{#if foo}} +function create_if_block(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("foo!"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("foo!"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js index 3ebdbc1277..745f0a2f26 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js @@ -182,57 +182,54 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, - - hydrate: function() { + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, + + hydrate: function() { + setStyle(div, "color", state.color); + setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, + + update: function(changed, state) { + if (changed.color) { setStyle(div, "color", state.color); - setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); - }, + } - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, - - update: function(changed, state) { - if (changed.color) { - setStyle(div, "color", state.color); - } - - if (changed.x || changed.y) { - setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); - } - }, + if (changed.x || changed.y) { + setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/inline-style-optimized-multiple/expected.js b/test/js/samples/inline-style-optimized-multiple/expected.js index a23f9fdd7c..35de49a17c 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected.js +++ b/test/js/samples/inline-style-optimized-multiple/expected.js @@ -1,55 +1,53 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div; - - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, - - hydrate: function() { +function create_main_fragment(state, component) { + var div; + + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, + + hydrate: function() { + setStyle(div, "color", state.color); + setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, + + update: function(changed, state) { + if (changed.color) { setStyle(div, "color", state.color); - setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + } - update: function(changed, state) { - if (changed.color) { - setStyle(div, "color", state.color); - } - - if (changed.x || changed.y) { - setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); - } - }, + if (changed.x || changed.y) { + setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)"); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js index 105fb40076..2985f7cb15 100644 --- a/test/js/samples/inline-style-optimized-url/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js @@ -182,52 +182,49 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); - }, + hydrate: function() { + setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: function(changed, state) { - if (changed.data) { - setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); - } - }, + update: function(changed, state) { + if (changed.data) { + setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js index 2a4a108f74..659bc4b20b 100644 --- a/test/js/samples/inline-style-optimized-url/expected.js +++ b/test/js/samples/inline-style-optimized-url/expected.js @@ -1,50 +1,48 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); - }, + hydrate: function() { + setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: function(changed, state) { - if (changed.data) { - setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); - } - }, + update: function(changed, state) { + if (changed.data) { + setStyle(div, "background", "url(data:image/png;base64," + state.data + ")"); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js index 90857bb9cb..fa4dfc93a9 100644 --- a/test/js/samples/inline-style-optimized/expected-bundle.js +++ b/test/js/samples/inline-style-optimized/expected-bundle.js @@ -182,52 +182,49 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - setStyle(div, "color", state.color); - }, + hydrate: function() { + setStyle(div, "color", state.color); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: function(changed, state) { - if (changed.color) { - setStyle(div, "color", state.color); - } - }, + update: function(changed, state) { + if (changed.color) { + setStyle(div, "color", state.color); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/inline-style-optimized/expected.js b/test/js/samples/inline-style-optimized/expected.js index bb6f6dbd04..8b07a3eaad 100644 --- a/test/js/samples/inline-style-optimized/expected.js +++ b/test/js/samples/inline-style-optimized/expected.js @@ -1,50 +1,48 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - hydrate: function() { - setStyle(div, "color", state.color); - }, + hydrate: function() { + setStyle(div, "color", state.color); + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: function(changed, state) { - if (changed.color) { - setStyle(div, "color", state.color); - } - }, + update: function(changed, state) { + if (changed.color) { + setStyle(div, "color", state.color); + } + }, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js index 7480c32d80..e0770b55c7 100644 --- a/test/js/samples/inline-style-unoptimized/expected-bundle.js +++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js @@ -182,63 +182,60 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div, text, div_1, div_1_style_value; - - return { - create: function() { - div = createElement("div"); - text = createText("\n"); - div_1 = createElement("div"); - this.hydrate(); - }, - - hydrate: function() { +function create_main_fragment(state, component) { + var div, text, div_1, div_1_style_value; + + return { + create: function() { + div = createElement("div"); + text = createText("\n"); + div_1 = createElement("div"); + this.hydrate(); + }, + + hydrate: function() { + div.style.cssText = state.style; + div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value; + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + insertNode(text, target, anchor); + insertNode(div_1, target, anchor); + }, + + update: function(changed, state) { + if (changed.style) { div.style.cssText = state.style; - div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value; - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - insertNode(text, target, anchor); - insertNode(div_1, target, anchor); - }, - - update: function(changed, state) { - if (changed.style) { - div.style.cssText = state.style; - } - - if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) { - div_1.style.cssText = div_1_style_value; - } - }, - - unmount: function() { - detachNode(div); - detachNode(text); - detachNode(div_1); - }, - - destroy: noop - }; - } + } - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; + if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) { + div_1.style.cssText = div_1_style_value; + } + }, - this._fragment = create_main_fragment(this._state, this); + unmount: function() { + detachNode(div); + detachNode(text); + detachNode(div_1); + }, - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + destroy: noop + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js index 392f3de4be..9dcb2296bb 100644 --- a/test/js/samples/inline-style-unoptimized/expected.js +++ b/test/js/samples/inline-style-unoptimized/expected.js @@ -1,61 +1,59 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div, text, div_1, div_1_style_value; - - return { - create: function() { - div = createElement("div"); - text = createText("\n"); - div_1 = createElement("div"); - this.hydrate(); - }, - - hydrate: function() { +function create_main_fragment(state, component) { + var div, text, div_1, div_1_style_value; + + return { + create: function() { + div = createElement("div"); + text = createText("\n"); + div_1 = createElement("div"); + this.hydrate(); + }, + + hydrate: function() { + div.style.cssText = state.style; + div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value; + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + insertNode(text, target, anchor); + insertNode(div_1, target, anchor); + }, + + update: function(changed, state) { + if (changed.style) { div.style.cssText = state.style; - div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value; - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - insertNode(text, target, anchor); - insertNode(div_1, target, anchor); - }, - - update: function(changed, state) { - if (changed.style) { - div.style.cssText = state.style; - } - - if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) { - div_1.style.cssText = div_1_style_value; - } - }, - - unmount: function() { - detachNode(div); - detachNode(text); - detachNode(div_1); - }, - - destroy: noop - }; - } + } + + if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) { + div_1.style.cssText = div_1_style_value; + } + }, + + unmount: function() { + detachNode(div); + detachNode(text); + detachNode(div_1); + }, + + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js index 41959bc510..8a0c36accc 100644 --- a/test/js/samples/input-without-blowback-guard/expected-bundle.js +++ b/test/js/samples/input-without-blowback-guard/expected-bundle.js @@ -186,59 +186,56 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var input; +function create_main_fragment(state, component) { + var input; - function input_change_handler() { - component.set({ foo: input.checked }); - } + function input_change_handler() { + component.set({ foo: input.checked }); + } - return { - create: function() { - input = createElement("input"); - this.hydrate(); - }, + return { + create: function() { + input = createElement("input"); + this.hydrate(); + }, - hydrate: function() { - input.type = "checkbox"; - addListener(input, "change", input_change_handler); - }, + hydrate: function() { + input.type = "checkbox"; + addListener(input, "change", input_change_handler); + }, - mount: function(target, anchor) { - insertNode(input, target, anchor); + mount: function(target, anchor) { + insertNode(input, target, anchor); - input.checked = state.foo; - }, + input.checked = state.foo; + }, - update: function(changed, state) { - input.checked = state.foo; - }, + update: function(changed, state) { + input.checked = state.foo; + }, - unmount: function() { - detachNode(input); - }, + unmount: function() { + detachNode(input); + }, - destroy: function() { - removeListener(input, "change", input_change_handler); - } - }; - } + destroy: function() { + removeListener(input, "change", input_change_handler); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js index 6a8580da45..074a6126eb 100644 --- a/test/js/samples/input-without-blowback-guard/expected.js +++ b/test/js/samples/input-without-blowback-guard/expected.js @@ -1,57 +1,55 @@ /* generated by Svelte vX.Y.Z */ import { addListener, assign, createElement, detachNode, init, insertNode, proto, removeListener } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var input; +function create_main_fragment(state, component) { + var input; - function input_change_handler() { - component.set({ foo: input.checked }); - } + function input_change_handler() { + component.set({ foo: input.checked }); + } - return { - create: function() { - input = createElement("input"); - this.hydrate(); - }, + return { + create: function() { + input = createElement("input"); + this.hydrate(); + }, - hydrate: function() { - input.type = "checkbox"; - addListener(input, "change", input_change_handler); - }, + hydrate: function() { + input.type = "checkbox"; + addListener(input, "change", input_change_handler); + }, - mount: function(target, anchor) { - insertNode(input, target, anchor); + mount: function(target, anchor) { + insertNode(input, target, anchor); - input.checked = state.foo; - }, + input.checked = state.foo; + }, - update: function(changed, state) { - input.checked = state.foo; - }, + update: function(changed, state) { + input.checked = state.foo; + }, - unmount: function() { - detachNode(input); - }, + unmount: function() { + detachNode(input); + }, - destroy: function() { - removeListener(input, "change", input_change_handler); - } - }; - } + destroy: function() { + removeListener(input, "change", input_change_handler); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js index 163380555a..6475e22fa8 100644 --- a/test/js/samples/legacy-input-type/expected-bundle.js +++ b/test/js/samples/legacy-input-type/expected-bundle.js @@ -184,48 +184,45 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var input; +function create_main_fragment(state, component) { + var input; - return { - create: function() { - input = createElement("input"); - this.hydrate(); - }, + return { + create: function() { + input = createElement("input"); + this.hydrate(); + }, - hydrate: function() { - setInputType(input, "search"); - }, + hydrate: function() { + setInputType(input, "search"); + }, - mount: function(target, anchor) { - insertNode(input, target, anchor); - }, + mount: function(target, anchor) { + insertNode(input, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(input); - }, + unmount: function() { + detachNode(input); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/legacy-input-type/expected.js b/test/js/samples/legacy-input-type/expected.js index 8657249f57..c7785c6ed4 100644 --- a/test/js/samples/legacy-input-type/expected.js +++ b/test/js/samples/legacy-input-type/expected.js @@ -1,46 +1,44 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setInputType } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var input; +function create_main_fragment(state, component) { + var input; - return { - create: function() { - input = createElement("input"); - this.hydrate(); - }, + return { + create: function() { + input = createElement("input"); + this.hydrate(); + }, - hydrate: function() { - setInputType(input, "search"); - }, + hydrate: function() { + setInputType(input, "search"); + }, - mount: function(target, anchor) { - insertNode(input, target, anchor); - }, + mount: function(target, anchor) { + insertNode(input, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(input); - }, + unmount: function() { + detachNode(input); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js index 709f4c8e1c..139958519b 100644 --- a/test/js/samples/legacy-quote-class/expected-bundle.js +++ b/test/js/samples/legacy-quote-class/expected-bundle.js @@ -201,58 +201,55 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - claim: function(nodes) { - div = claimElement(nodes, "DIV", { "class": true }, false); - var div_nodes = children(div); + claim: function(nodes) { + div = claimElement(nodes, "DIV", { "class": true }, false); + var div_nodes = children(div); - div_nodes.forEach(detachNode); - this.hydrate(); - }, + div_nodes.forEach(detachNode); + this.hydrate(); + }, - hydrate: function() { - div.className = "foo"; - }, + hydrate: function() { + div.className = "foo"; + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - var nodes = children(options.target); - options.hydrate ? this._fragment.claim(nodes) : this._fragment.create(); - nodes.forEach(detachNode); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + var nodes = children(options.target); + options.hydrate ? this._fragment.claim(nodes) : this._fragment.create(); + nodes.forEach(detachNode); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/legacy-quote-class/expected.js b/test/js/samples/legacy-quote-class/expected.js index b0e08896bb..dd10330458 100644 --- a/test/js/samples/legacy-quote-class/expected.js +++ b/test/js/samples/legacy-quote-class/expected.js @@ -1,56 +1,54 @@ /* generated by Svelte vX.Y.Z */ import { assign, children, claimElement, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div; +function create_main_fragment(state, component) { + var div; - return { - create: function() { - div = createElement("div"); - this.hydrate(); - }, + return { + create: function() { + div = createElement("div"); + this.hydrate(); + }, - claim: function(nodes) { - div = claimElement(nodes, "DIV", { "class": true }, false); - var div_nodes = children(div); + claim: function(nodes) { + div = claimElement(nodes, "DIV", { "class": true }, false); + var div_nodes = children(div); - div_nodes.forEach(detachNode); - this.hydrate(); - }, + div_nodes.forEach(detachNode); + this.hydrate(); + }, - hydrate: function() { - div.className = "foo"; - }, + hydrate: function() { + div.className = "foo"; + }, - mount: function(target, anchor) { - insertNode(div, target, anchor); - }, + mount: function(target, anchor) { + insertNode(div, target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - detachNode(div); - }, + unmount: function() { + detachNode(div); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - var nodes = children(options.target); - options.hydrate ? this._fragment.claim(nodes) : this._fragment.create(); - nodes.forEach(detachNode); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + var nodes = children(options.target); + options.hydrate ? this._fragment.claim(nodes) : this._fragment.create(); + nodes.forEach(detachNode); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js index 3bf631a388..d784e6fabe 100644 --- a/test/js/samples/media-bindings/expected-bundle.js +++ b/test/js/samples/media-bindings/expected-bundle.js @@ -194,134 +194,131 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var audio, audio_updating = false, audio_animationframe, audio_paused_value = true; - - function audio_progress_loadedmetadata_handler() { - audio_updating = true; - component.set({ buffered: timeRangesToArray(audio.buffered) }); - audio_updating = false; - } - - function audio_loadedmetadata_handler() { - audio_updating = true; - component.set({ seekable: timeRangesToArray(audio.seekable) }); - audio_updating = false; - } +function create_main_fragment(state, component) { + var audio, audio_updating = false, audio_animationframe, audio_paused_value = true; - function audio_timeupdate_handler() { - audio_updating = true; - component.set({ played: timeRangesToArray(audio.played) }); - audio_updating = false; - } + function audio_progress_loadedmetadata_handler() { + audio_updating = true; + component.set({ buffered: timeRangesToArray(audio.buffered) }); + audio_updating = false; + } - function audio_timeupdate_handler_1() { - audio_updating = true; - cancelAnimationFrame(audio_animationframe); - if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler_1); - component.set({ currentTime: audio.currentTime }); - audio_updating = false; - } + function audio_loadedmetadata_handler() { + audio_updating = true; + component.set({ seekable: timeRangesToArray(audio.seekable) }); + audio_updating = false; + } - function audio_durationchange_handler() { - audio_updating = true; - component.set({ duration: audio.duration }); - audio_updating = false; - } + function audio_timeupdate_handler() { + audio_updating = true; + component.set({ played: timeRangesToArray(audio.played) }); + audio_updating = false; + } - function audio_pause_handler() { - audio_updating = true; - component.set({ paused: audio.paused }); - audio_updating = false; - } + function audio_timeupdate_handler_1() { + audio_updating = true; + cancelAnimationFrame(audio_animationframe); + if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler_1); + component.set({ currentTime: audio.currentTime }); + audio_updating = false; + } - return { - create: function() { - audio = createElement("audio"); - addListener(audio, "play", audio_pause_handler); - this.hydrate(); - }, + function audio_durationchange_handler() { + audio_updating = true; + component.set({ duration: audio.duration }); + audio_updating = false; + } - hydrate: function() { - component._root._beforecreate.push(audio_progress_loadedmetadata_handler); + function audio_pause_handler() { + audio_updating = true; + component.set({ paused: audio.paused }); + audio_updating = false; + } - addListener(audio, "progress", audio_progress_loadedmetadata_handler); - addListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); + return { + create: function() { + audio = createElement("audio"); + addListener(audio, "play", audio_pause_handler); + this.hydrate(); + }, - component._root._beforecreate.push(audio_loadedmetadata_handler); + hydrate: function() { + component._root._beforecreate.push(audio_progress_loadedmetadata_handler); - addListener(audio, "loadedmetadata", audio_loadedmetadata_handler); + addListener(audio, "progress", audio_progress_loadedmetadata_handler); + addListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); - component._root._beforecreate.push(audio_timeupdate_handler); + component._root._beforecreate.push(audio_loadedmetadata_handler); - addListener(audio, "timeupdate", audio_timeupdate_handler); + addListener(audio, "loadedmetadata", audio_loadedmetadata_handler); - component._root._beforecreate.push(audio_timeupdate_handler_1); + component._root._beforecreate.push(audio_timeupdate_handler); - addListener(audio, "timeupdate", audio_timeupdate_handler_1); + addListener(audio, "timeupdate", audio_timeupdate_handler); - component._root._beforecreate.push(audio_durationchange_handler); + component._root._beforecreate.push(audio_timeupdate_handler_1); - addListener(audio, "durationchange", audio_durationchange_handler); + addListener(audio, "timeupdate", audio_timeupdate_handler_1); - component._root._beforecreate.push(audio_pause_handler); + component._root._beforecreate.push(audio_durationchange_handler); - addListener(audio, "pause", audio_pause_handler); - }, + addListener(audio, "durationchange", audio_durationchange_handler); - mount: function(target, anchor) { - insertNode(audio, target, anchor); - }, + component._root._beforecreate.push(audio_pause_handler); - update: function(changed, state) { - if (!audio_updating && !isNaN(state.currentTime )) { - audio.currentTime = state.currentTime ; - } + addListener(audio, "pause", audio_pause_handler); + }, - if (audio_paused_value !== (audio_paused_value = state.paused)) { - audio[audio_paused_value ? "pause" : "play"](); - } - }, + mount: function(target, anchor) { + insertNode(audio, target, anchor); + }, - unmount: function() { - detachNode(audio); - }, + update: function(changed, state) { + if (!audio_updating && !isNaN(state.currentTime )) { + audio.currentTime = state.currentTime ; + } - destroy: function() { - removeListener(audio, "progress", audio_progress_loadedmetadata_handler); - removeListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); - removeListener(audio, "loadedmetadata", audio_loadedmetadata_handler); - removeListener(audio, "timeupdate", audio_timeupdate_handler); - removeListener(audio, "timeupdate", audio_timeupdate_handler_1); - removeListener(audio, "durationchange", audio_durationchange_handler); - removeListener(audio, "pause", audio_pause_handler); - removeListener(audio, "play", audio_pause_handler); + if (audio_paused_value !== (audio_paused_value = state.paused)) { + audio[audio_paused_value ? "pause" : "play"](); } - }; - } + }, + + unmount: function() { + detachNode(audio); + }, + + destroy: function() { + removeListener(audio, "progress", audio_progress_loadedmetadata_handler); + removeListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); + removeListener(audio, "loadedmetadata", audio_loadedmetadata_handler); + removeListener(audio, "timeupdate", audio_timeupdate_handler); + removeListener(audio, "timeupdate", audio_timeupdate_handler_1); + removeListener(audio, "durationchange", audio_durationchange_handler); + removeListener(audio, "pause", audio_pause_handler); + removeListener(audio, "play", audio_pause_handler); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - } + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - callAll(this._beforecreate); - } + callAll(this._beforecreate); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js index b7d7221469..531a2a1b58 100644 --- a/test/js/samples/media-bindings/expected.js +++ b/test/js/samples/media-bindings/expected.js @@ -1,132 +1,130 @@ /* generated by Svelte vX.Y.Z */ import { addListener, assign, callAll, createElement, detachNode, init, insertNode, proto, removeListener, timeRangesToArray } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var audio, audio_updating = false, audio_animationframe, audio_paused_value = true; - - function audio_progress_loadedmetadata_handler() { - audio_updating = true; - component.set({ buffered: timeRangesToArray(audio.buffered) }); - audio_updating = false; - } - - function audio_loadedmetadata_handler() { - audio_updating = true; - component.set({ seekable: timeRangesToArray(audio.seekable) }); - audio_updating = false; - } +function create_main_fragment(state, component) { + var audio, audio_updating = false, audio_animationframe, audio_paused_value = true; - function audio_timeupdate_handler() { - audio_updating = true; - component.set({ played: timeRangesToArray(audio.played) }); - audio_updating = false; - } + function audio_progress_loadedmetadata_handler() { + audio_updating = true; + component.set({ buffered: timeRangesToArray(audio.buffered) }); + audio_updating = false; + } - function audio_timeupdate_handler_1() { - audio_updating = true; - cancelAnimationFrame(audio_animationframe); - if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler_1); - component.set({ currentTime: audio.currentTime }); - audio_updating = false; - } + function audio_loadedmetadata_handler() { + audio_updating = true; + component.set({ seekable: timeRangesToArray(audio.seekable) }); + audio_updating = false; + } - function audio_durationchange_handler() { - audio_updating = true; - component.set({ duration: audio.duration }); - audio_updating = false; - } + function audio_timeupdate_handler() { + audio_updating = true; + component.set({ played: timeRangesToArray(audio.played) }); + audio_updating = false; + } - function audio_pause_handler() { - audio_updating = true; - component.set({ paused: audio.paused }); - audio_updating = false; - } + function audio_timeupdate_handler_1() { + audio_updating = true; + cancelAnimationFrame(audio_animationframe); + if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler_1); + component.set({ currentTime: audio.currentTime }); + audio_updating = false; + } - return { - create: function() { - audio = createElement("audio"); - addListener(audio, "play", audio_pause_handler); - this.hydrate(); - }, + function audio_durationchange_handler() { + audio_updating = true; + component.set({ duration: audio.duration }); + audio_updating = false; + } - hydrate: function() { - component._root._beforecreate.push(audio_progress_loadedmetadata_handler); + function audio_pause_handler() { + audio_updating = true; + component.set({ paused: audio.paused }); + audio_updating = false; + } - addListener(audio, "progress", audio_progress_loadedmetadata_handler); - addListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); + return { + create: function() { + audio = createElement("audio"); + addListener(audio, "play", audio_pause_handler); + this.hydrate(); + }, - component._root._beforecreate.push(audio_loadedmetadata_handler); + hydrate: function() { + component._root._beforecreate.push(audio_progress_loadedmetadata_handler); - addListener(audio, "loadedmetadata", audio_loadedmetadata_handler); + addListener(audio, "progress", audio_progress_loadedmetadata_handler); + addListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); - component._root._beforecreate.push(audio_timeupdate_handler); + component._root._beforecreate.push(audio_loadedmetadata_handler); - addListener(audio, "timeupdate", audio_timeupdate_handler); + addListener(audio, "loadedmetadata", audio_loadedmetadata_handler); - component._root._beforecreate.push(audio_timeupdate_handler_1); + component._root._beforecreate.push(audio_timeupdate_handler); - addListener(audio, "timeupdate", audio_timeupdate_handler_1); + addListener(audio, "timeupdate", audio_timeupdate_handler); - component._root._beforecreate.push(audio_durationchange_handler); + component._root._beforecreate.push(audio_timeupdate_handler_1); - addListener(audio, "durationchange", audio_durationchange_handler); + addListener(audio, "timeupdate", audio_timeupdate_handler_1); - component._root._beforecreate.push(audio_pause_handler); + component._root._beforecreate.push(audio_durationchange_handler); - addListener(audio, "pause", audio_pause_handler); - }, + addListener(audio, "durationchange", audio_durationchange_handler); - mount: function(target, anchor) { - insertNode(audio, target, anchor); - }, + component._root._beforecreate.push(audio_pause_handler); - update: function(changed, state) { - if (!audio_updating && !isNaN(state.currentTime )) { - audio.currentTime = state.currentTime ; - } + addListener(audio, "pause", audio_pause_handler); + }, - if (audio_paused_value !== (audio_paused_value = state.paused)) { - audio[audio_paused_value ? "pause" : "play"](); - } - }, + mount: function(target, anchor) { + insertNode(audio, target, anchor); + }, - unmount: function() { - detachNode(audio); - }, + update: function(changed, state) { + if (!audio_updating && !isNaN(state.currentTime )) { + audio.currentTime = state.currentTime ; + } - destroy: function() { - removeListener(audio, "progress", audio_progress_loadedmetadata_handler); - removeListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); - removeListener(audio, "loadedmetadata", audio_loadedmetadata_handler); - removeListener(audio, "timeupdate", audio_timeupdate_handler); - removeListener(audio, "timeupdate", audio_timeupdate_handler_1); - removeListener(audio, "durationchange", audio_durationchange_handler); - removeListener(audio, "pause", audio_pause_handler); - removeListener(audio, "play", audio_pause_handler); + if (audio_paused_value !== (audio_paused_value = state.paused)) { + audio[audio_paused_value ? "pause" : "play"](); } - }; - } + }, + + unmount: function() { + detachNode(audio); + }, + + destroy: function() { + removeListener(audio, "progress", audio_progress_loadedmetadata_handler); + removeListener(audio, "loadedmetadata", audio_progress_loadedmetadata_handler); + removeListener(audio, "loadedmetadata", audio_loadedmetadata_handler); + removeListener(audio, "timeupdate", audio_timeupdate_handler); + removeListener(audio, "timeupdate", audio_timeupdate_handler_1); + removeListener(audio, "durationchange", audio_durationchange_handler); + removeListener(audio, "pause", audio_pause_handler); + removeListener(audio, "play", audio_pause_handler); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - } + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - callAll(this._beforecreate); - } + callAll(this._beforecreate); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js index 443850a62a..2252eb1635 100644 --- a/test/js/samples/non-imported-component/expected-bundle.js +++ b/test/js/samples/non-imported-component/expected-bundle.js @@ -180,8 +180,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { components: { NonImported @@ -189,71 +188,69 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { - var text; - - var imported = new Imported({ - _root: component._root - }); - - var nonimported = new template.components.NonImported({ - _root: component._root - }); - - return { - create: function() { - imported._fragment.create(); - text = createText("\n"); - nonimported._fragment.create(); - }, - - mount: function(target, anchor) { - imported._mount(target, anchor); - insertNode(text, target, anchor); - nonimported._mount(target, anchor); - }, - - update: noop, - - unmount: function() { - imported._unmount(); - detachNode(text); - nonimported._unmount(); - }, - - destroy: function() { - imported.destroy(false); - nonimported.destroy(false); - } - }; - } +function create_main_fragment(state, component) { + var text; + + var imported = new Imported({ + _root: component._root + }); - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; + var nonimported = new template.components.NonImported({ + _root: component._root + }); - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - this._aftercreate = []; + return { + create: function() { + imported._fragment.create(); + text = createText("\n"); + nonimported._fragment.create(); + }, + + mount: function(target, anchor) { + imported._mount(target, anchor); + insertNode(text, target, anchor); + nonimported._mount(target, anchor); + }, + + update: noop, + + unmount: function() { + imported._unmount(); + detachNode(text); + nonimported._unmount(); + }, + + destroy: function() { + imported.destroy(false); + nonimported.destroy(false); } + }; +} - this._fragment = create_main_fragment(this._state, this); +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } - this._lock = true; - callAll(this._beforecreate); - callAll(this._oncreate); - callAll(this._aftercreate); - this._lock = false; - } + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); + + this._lock = true; + callAll(this._beforecreate); + callAll(this._oncreate); + callAll(this._aftercreate); + this._lock = false; } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js index eec42a057e..e424bb6ffd 100644 --- a/test/js/samples/non-imported-component/expected.js +++ b/test/js/samples/non-imported-component/expected.js @@ -2,8 +2,7 @@ import { assign, callAll, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; import Imported from 'Imported.html'; -export default (function() { - var template = (function() { +var template = (function() { return { components: { NonImported @@ -11,69 +10,68 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { - var text; +function create_main_fragment(state, component) { + var text; - var imported = new Imported({ - _root: component._root - }); + var imported = new Imported({ + _root: component._root + }); - var nonimported = new template.components.NonImported({ - _root: component._root - }); + var nonimported = new template.components.NonImported({ + _root: component._root + }); - return { - create: function() { - imported._fragment.create(); - text = createText("\n"); - nonimported._fragment.create(); - }, + return { + create: function() { + imported._fragment.create(); + text = createText("\n"); + nonimported._fragment.create(); + }, - mount: function(target, anchor) { - imported._mount(target, anchor); - insertNode(text, target, anchor); - nonimported._mount(target, anchor); - }, + mount: function(target, anchor) { + imported._mount(target, anchor); + insertNode(text, target, anchor); + nonimported._mount(target, anchor); + }, - update: noop, + update: noop, - unmount: function() { - imported._unmount(); - detachNode(text); - nonimported._unmount(); - }, + unmount: function() { + imported._unmount(); + detachNode(text); + nonimported._unmount(); + }, - destroy: function() { - imported.destroy(false); - nonimported.destroy(false); - } - }; - } + destroy: function() { + imported.destroy(false); + nonimported.destroy(false); + } + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - if (!options._root) { - this._oncreate = []; - this._beforecreate = []; - this._aftercreate = []; - } + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - this._lock = true; - callAll(this._beforecreate); - callAll(this._oncreate); - callAll(this._aftercreate); - this._lock = false; - } + this._lock = true; + callAll(this._beforecreate); + callAll(this._oncreate); + callAll(this._aftercreate); + this._lock = false; } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js index 510a76cf31..bebd336b6c 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js @@ -166,8 +166,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { // this test should be removed in v2 oncreate () {}, @@ -175,47 +174,45 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._handlers.destroy = [template.ondestroy]; + this._handlers.destroy = [template.ondestroy]; - var oncreate = template.oncreate.bind(this); + var oncreate = template.oncreate.bind(this); - if (!options._root) { - this._oncreate = [oncreate]; - } else { - this._root._oncreate.push(oncreate); - } + if (!options._root) { + this._oncreate = [oncreate]; + } else { + this._root._oncreate.push(oncreate); + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - callAll(this._oncreate); - } + callAll(this._oncreate); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js index ba5c4a62ea..d29f9fd752 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, callAll, init, noop, proto } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { // this test should be removed in v2 oncreate () {}, @@ -10,45 +9,44 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._handlers.destroy = [template.ondestroy] + this._handlers.destroy = [template.ondestroy] - var oncreate = template.oncreate.bind(this); + var oncreate = template.oncreate.bind(this); - if (!options._root) { - this._oncreate = [oncreate]; - } else { - this._root._oncreate.push(oncreate); - } + if (!options._root) { + this._oncreate = [oncreate]; + } else { + this._root._oncreate.push(oncreate); + } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); - callAll(this._oncreate); - } + callAll(this._oncreate); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js index 5b90eb1f6a..85bc643281 100644 --- a/test/js/samples/setup-method/expected-bundle.js +++ b/test/js/samples/setup-method/expected-bundle.js @@ -166,8 +166,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - var template = (function() { +var template = (function() { return { methods: { foo ( bar ) { @@ -186,37 +185,35 @@ var _actual = (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, template.methods, proto); +assign(SvelteComponent.prototype, template.methods, proto); - template.setup(SvelteComponent); - return SvelteComponent; -}()); +template.setup(SvelteComponent); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js index 8207a4ea6e..b3bd9fcc8e 100644 --- a/test/js/samples/setup-method/expected.js +++ b/test/js/samples/setup-method/expected.js @@ -1,8 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, init, noop, proto } from "svelte/shared.js"; -export default (function() { - var template = (function() { +var template = (function() { return { methods: { foo ( bar ) { @@ -21,35 +20,34 @@ export default (function() { }; }()); - function create_main_fragment(state, component) { +function create_main_fragment(state, component) { - return { - create: noop, + return { + create: noop, - mount: noop, + mount: noop, - update: noop, + update: noop, - unmount: noop, + unmount: noop, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, template.methods, proto); +assign(SvelteComponent.prototype, template.methods, proto); - template.setup(SvelteComponent); - return SvelteComponent; -}()); \ No newline at end of file +template.setup(SvelteComponent); +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js index 8d7482a7b7..977bdfe485 100644 --- a/test/js/samples/use-elements-as-anchors/expected-bundle.js +++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js @@ -190,273 +190,270 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -var _actual = (function() { - function create_main_fragment(state, component) { - var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor; - - var if_block = (state.a) && create_if_block(state, component); - - var if_block_1 = (state.b) && create_if_block_1(state, component); - - var if_block_2 = (state.c) && create_if_block_2(state, component); - - var if_block_3 = (state.d) && create_if_block_3(state, component); - - var if_block_4 = (state.e) && create_if_block_4(state, component); - - return { - create: function() { - div = createElement("div"); - if (if_block) if_block.create(); - text = createText("\n\n\t"); - p = createElement("p"); - text_1 = createText("this can be used as an anchor"); - text_2 = createText("\n\n\t"); - if (if_block_1) if_block_1.create(); - text_3 = createText("\n\n\t"); - if (if_block_2) if_block_2.create(); - text_4 = createText("\n\n\t"); - p_1 = createElement("p"); - text_5 = createText("so can this"); - text_6 = createText("\n\n\t"); - if (if_block_3) if_block_3.create(); - text_8 = createText("\n\n"); - if (if_block_4) if_block_4.create(); - if_block_4_anchor = createComment(); - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - if (if_block) if_block.mount(div, null); - appendNode(text, div); - appendNode(p, div); - appendNode(text_1, p); - appendNode(text_2, div); - if (if_block_1) if_block_1.mount(div, null); - appendNode(text_3, div); - if (if_block_2) if_block_2.mount(div, null); - appendNode(text_4, div); - appendNode(p_1, div); - appendNode(text_5, p_1); - appendNode(text_6, div); - if (if_block_3) if_block_3.mount(div, null); - insertNode(text_8, target, anchor); - if (if_block_4) if_block_4.mount(target, anchor); - insertNode(if_block_4_anchor, target, anchor); - }, - - update: function(changed, state) { - if (state.a) { - if (!if_block) { - if_block = create_if_block(state, component); - if_block.create(); - if_block.mount(div, text); - } - } else if (if_block) { - if_block.unmount(); - if_block.destroy(); - if_block = null; +function create_main_fragment(state, component) { + var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor; + + var if_block = (state.a) && create_if_block(state, component); + + var if_block_1 = (state.b) && create_if_block_1(state, component); + + var if_block_2 = (state.c) && create_if_block_2(state, component); + + var if_block_3 = (state.d) && create_if_block_3(state, component); + + var if_block_4 = (state.e) && create_if_block_4(state, component); + + return { + create: function() { + div = createElement("div"); + if (if_block) if_block.create(); + text = createText("\n\n\t"); + p = createElement("p"); + text_1 = createText("this can be used as an anchor"); + text_2 = createText("\n\n\t"); + if (if_block_1) if_block_1.create(); + text_3 = createText("\n\n\t"); + if (if_block_2) if_block_2.create(); + text_4 = createText("\n\n\t"); + p_1 = createElement("p"); + text_5 = createText("so can this"); + text_6 = createText("\n\n\t"); + if (if_block_3) if_block_3.create(); + text_8 = createText("\n\n"); + if (if_block_4) if_block_4.create(); + if_block_4_anchor = createComment(); + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + if (if_block) if_block.mount(div, null); + appendNode(text, div); + appendNode(p, div); + appendNode(text_1, p); + appendNode(text_2, div); + if (if_block_1) if_block_1.mount(div, null); + appendNode(text_3, div); + if (if_block_2) if_block_2.mount(div, null); + appendNode(text_4, div); + appendNode(p_1, div); + appendNode(text_5, p_1); + appendNode(text_6, div); + if (if_block_3) if_block_3.mount(div, null); + insertNode(text_8, target, anchor); + if (if_block_4) if_block_4.mount(target, anchor); + insertNode(if_block_4_anchor, target, anchor); + }, + + update: function(changed, state) { + if (state.a) { + if (!if_block) { + if_block = create_if_block(state, component); + if_block.create(); + if_block.mount(div, text); } + } else if (if_block) { + if_block.unmount(); + if_block.destroy(); + if_block = null; + } - if (state.b) { - if (!if_block_1) { - if_block_1 = create_if_block_1(state, component); - if_block_1.create(); - if_block_1.mount(div, text_3); - } - } else if (if_block_1) { - if_block_1.unmount(); - if_block_1.destroy(); - if_block_1 = null; + if (state.b) { + if (!if_block_1) { + if_block_1 = create_if_block_1(state, component); + if_block_1.create(); + if_block_1.mount(div, text_3); } + } else if (if_block_1) { + if_block_1.unmount(); + if_block_1.destroy(); + if_block_1 = null; + } - if (state.c) { - if (!if_block_2) { - if_block_2 = create_if_block_2(state, component); - if_block_2.create(); - if_block_2.mount(div, text_4); - } - } else if (if_block_2) { - if_block_2.unmount(); - if_block_2.destroy(); - if_block_2 = null; + if (state.c) { + if (!if_block_2) { + if_block_2 = create_if_block_2(state, component); + if_block_2.create(); + if_block_2.mount(div, text_4); } + } else if (if_block_2) { + if_block_2.unmount(); + if_block_2.destroy(); + if_block_2 = null; + } - if (state.d) { - if (!if_block_3) { - if_block_3 = create_if_block_3(state, component); - if_block_3.create(); - if_block_3.mount(div, null); - } - } else if (if_block_3) { - if_block_3.unmount(); - if_block_3.destroy(); - if_block_3 = null; + if (state.d) { + if (!if_block_3) { + if_block_3 = create_if_block_3(state, component); + if_block_3.create(); + if_block_3.mount(div, null); } + } else if (if_block_3) { + if_block_3.unmount(); + if_block_3.destroy(); + if_block_3 = null; + } - if (state.e) { - if (!if_block_4) { - if_block_4 = create_if_block_4(state, component); - if_block_4.create(); - if_block_4.mount(if_block_4_anchor.parentNode, if_block_4_anchor); - } - } else if (if_block_4) { - if_block_4.unmount(); - if_block_4.destroy(); - if_block_4 = null; + if (state.e) { + if (!if_block_4) { + if_block_4 = create_if_block_4(state, component); + if_block_4.create(); + if_block_4.mount(if_block_4_anchor.parentNode, if_block_4_anchor); } - }, - - unmount: function() { - detachNode(div); - if (if_block) if_block.unmount(); - if (if_block_1) if_block_1.unmount(); - if (if_block_2) if_block_2.unmount(); - if (if_block_3) if_block_3.unmount(); - detachNode(text_8); - if (if_block_4) if_block_4.unmount(); - detachNode(if_block_4_anchor); - }, - - destroy: function() { - if (if_block) if_block.destroy(); - if (if_block_1) if_block_1.destroy(); - if (if_block_2) if_block_2.destroy(); - if (if_block_3) if_block_3.destroy(); - if (if_block_4) if_block_4.destroy(); + } else if (if_block_4) { + if_block_4.unmount(); + if_block_4.destroy(); + if_block_4 = null; } - }; - } + }, + + unmount: function() { + detachNode(div); + if (if_block) if_block.unmount(); + if (if_block_1) if_block_1.unmount(); + if (if_block_2) if_block_2.unmount(); + if (if_block_3) if_block_3.unmount(); + detachNode(text_8); + if (if_block_4) if_block_4.unmount(); + detachNode(if_block_4_anchor); + }, + + destroy: function() { + if (if_block) if_block.destroy(); + if (if_block_1) if_block_1.destroy(); + if (if_block_2) if_block_2.destroy(); + if (if_block_3) if_block_3.destroy(); + if (if_block_4) if_block_4.destroy(); + } + }; +} - // (2:1) {{#if a}} - function create_if_block(state, component) { - var p, text; +// (2:1) {{#if a}} +function create_if_block(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("a"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("a"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - // (8:1) {{#if b}} - function create_if_block_1(state, component) { - var p, text; +// (8:1) {{#if b}} +function create_if_block_1(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("b"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("b"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - // (12:1) {{#if c}} - function create_if_block_2(state, component) { - var p, text; +// (12:1) {{#if c}} +function create_if_block_2(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("c"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("c"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - // (18:1) {{#if d}} - function create_if_block_3(state, component) { - var p, text; +// (18:1) {{#if d}} +function create_if_block_3(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("d"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("d"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - // (25:0) {{#if e}} - function create_if_block_4(state, component) { - var p, text; +// (25:0) {{#if e}} +function create_if_block_4(state, component) { + var p, text; - return { - create: function() { - p = createElement("p"); - text = createText("e"); - }, + return { + create: function() { + p = createElement("p"); + text = createText("e"); + }, - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, - unmount: function() { - detachNode(p); - }, + unmount: function() { + detachNode(p); + }, - destroy: noop - }; - } + destroy: noop + }; +} - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this._state, this); - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); - } + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); +assign(SvelteComponent.prototype, proto); -export default _actual; +export default SvelteComponent; diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js index 35db8336d6..e92d7ba6b6 100644 --- a/test/js/samples/use-elements-as-anchors/expected.js +++ b/test/js/samples/use-elements-as-anchors/expected.js @@ -1,271 +1,269 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -export default (function() { - function create_main_fragment(state, component) { - var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor; - - var if_block = (state.a) && create_if_block(state, component); - - var if_block_1 = (state.b) && create_if_block_1(state, component); - - var if_block_2 = (state.c) && create_if_block_2(state, component); - - var if_block_3 = (state.d) && create_if_block_3(state, component); - - var if_block_4 = (state.e) && create_if_block_4(state, component); - - return { - create: function() { - div = createElement("div"); - if (if_block) if_block.create(); - text = createText("\n\n\t"); - p = createElement("p"); - text_1 = createText("this can be used as an anchor"); - text_2 = createText("\n\n\t"); - if (if_block_1) if_block_1.create(); - text_3 = createText("\n\n\t"); - if (if_block_2) if_block_2.create(); - text_4 = createText("\n\n\t"); - p_1 = createElement("p"); - text_5 = createText("so can this"); - text_6 = createText("\n\n\t"); - if (if_block_3) if_block_3.create(); - text_8 = createText("\n\n"); - if (if_block_4) if_block_4.create(); - if_block_4_anchor = createComment(); - }, - - mount: function(target, anchor) { - insertNode(div, target, anchor); - if (if_block) if_block.mount(div, null); - appendNode(text, div); - appendNode(p, div); - appendNode(text_1, p); - appendNode(text_2, div); - if (if_block_1) if_block_1.mount(div, null); - appendNode(text_3, div); - if (if_block_2) if_block_2.mount(div, null); - appendNode(text_4, div); - appendNode(p_1, div); - appendNode(text_5, p_1); - appendNode(text_6, div); - if (if_block_3) if_block_3.mount(div, null); - insertNode(text_8, target, anchor); - if (if_block_4) if_block_4.mount(target, anchor); - insertNode(if_block_4_anchor, target, anchor); - }, - - update: function(changed, state) { - if (state.a) { - if (!if_block) { - if_block = create_if_block(state, component); - if_block.create(); - if_block.mount(div, text); - } - } else if (if_block) { - if_block.unmount(); - if_block.destroy(); - if_block = null; +function create_main_fragment(state, component) { + var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor; + + var if_block = (state.a) && create_if_block(state, component); + + var if_block_1 = (state.b) && create_if_block_1(state, component); + + var if_block_2 = (state.c) && create_if_block_2(state, component); + + var if_block_3 = (state.d) && create_if_block_3(state, component); + + var if_block_4 = (state.e) && create_if_block_4(state, component); + + return { + create: function() { + div = createElement("div"); + if (if_block) if_block.create(); + text = createText("\n\n\t"); + p = createElement("p"); + text_1 = createText("this can be used as an anchor"); + text_2 = createText("\n\n\t"); + if (if_block_1) if_block_1.create(); + text_3 = createText("\n\n\t"); + if (if_block_2) if_block_2.create(); + text_4 = createText("\n\n\t"); + p_1 = createElement("p"); + text_5 = createText("so can this"); + text_6 = createText("\n\n\t"); + if (if_block_3) if_block_3.create(); + text_8 = createText("\n\n"); + if (if_block_4) if_block_4.create(); + if_block_4_anchor = createComment(); + }, + + mount: function(target, anchor) { + insertNode(div, target, anchor); + if (if_block) if_block.mount(div, null); + appendNode(text, div); + appendNode(p, div); + appendNode(text_1, p); + appendNode(text_2, div); + if (if_block_1) if_block_1.mount(div, null); + appendNode(text_3, div); + if (if_block_2) if_block_2.mount(div, null); + appendNode(text_4, div); + appendNode(p_1, div); + appendNode(text_5, p_1); + appendNode(text_6, div); + if (if_block_3) if_block_3.mount(div, null); + insertNode(text_8, target, anchor); + if (if_block_4) if_block_4.mount(target, anchor); + insertNode(if_block_4_anchor, target, anchor); + }, + + update: function(changed, state) { + if (state.a) { + if (!if_block) { + if_block = create_if_block(state, component); + if_block.create(); + if_block.mount(div, text); } + } else if (if_block) { + if_block.unmount(); + if_block.destroy(); + if_block = null; + } - if (state.b) { - if (!if_block_1) { - if_block_1 = create_if_block_1(state, component); - if_block_1.create(); - if_block_1.mount(div, text_3); - } - } else if (if_block_1) { - if_block_1.unmount(); - if_block_1.destroy(); - if_block_1 = null; + if (state.b) { + if (!if_block_1) { + if_block_1 = create_if_block_1(state, component); + if_block_1.create(); + if_block_1.mount(div, text_3); } + } else if (if_block_1) { + if_block_1.unmount(); + if_block_1.destroy(); + if_block_1 = null; + } - if (state.c) { - if (!if_block_2) { - if_block_2 = create_if_block_2(state, component); - if_block_2.create(); - if_block_2.mount(div, text_4); - } - } else if (if_block_2) { - if_block_2.unmount(); - if_block_2.destroy(); - if_block_2 = null; + if (state.c) { + if (!if_block_2) { + if_block_2 = create_if_block_2(state, component); + if_block_2.create(); + if_block_2.mount(div, text_4); } + } else if (if_block_2) { + if_block_2.unmount(); + if_block_2.destroy(); + if_block_2 = null; + } - if (state.d) { - if (!if_block_3) { - if_block_3 = create_if_block_3(state, component); - if_block_3.create(); - if_block_3.mount(div, null); - } - } else if (if_block_3) { - if_block_3.unmount(); - if_block_3.destroy(); - if_block_3 = null; + if (state.d) { + if (!if_block_3) { + if_block_3 = create_if_block_3(state, component); + if_block_3.create(); + if_block_3.mount(div, null); } + } else if (if_block_3) { + if_block_3.unmount(); + if_block_3.destroy(); + if_block_3 = null; + } - if (state.e) { - if (!if_block_4) { - if_block_4 = create_if_block_4(state, component); - if_block_4.create(); - if_block_4.mount(if_block_4_anchor.parentNode, if_block_4_anchor); - } - } else if (if_block_4) { - if_block_4.unmount(); - if_block_4.destroy(); - if_block_4 = null; + if (state.e) { + if (!if_block_4) { + if_block_4 = create_if_block_4(state, component); + if_block_4.create(); + if_block_4.mount(if_block_4_anchor.parentNode, if_block_4_anchor); } - }, - - unmount: function() { - detachNode(div); - if (if_block) if_block.unmount(); - if (if_block_1) if_block_1.unmount(); - if (if_block_2) if_block_2.unmount(); - if (if_block_3) if_block_3.unmount(); - detachNode(text_8); - if (if_block_4) if_block_4.unmount(); - detachNode(if_block_4_anchor); - }, - - destroy: function() { - if (if_block) if_block.destroy(); - if (if_block_1) if_block_1.destroy(); - if (if_block_2) if_block_2.destroy(); - if (if_block_3) if_block_3.destroy(); - if (if_block_4) if_block_4.destroy(); + } else if (if_block_4) { + if_block_4.unmount(); + if_block_4.destroy(); + if_block_4 = null; } - }; - } - - // (2:1) {{#if a}} - function create_if_block(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("a"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - // (8:1) {{#if b}} - function create_if_block_1(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("b"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - // (12:1) {{#if c}} - function create_if_block_2(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("c"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - // (18:1) {{#if d}} - function create_if_block_3(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("d"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - // (25:0) {{#if e}} - function create_if_block_4(state, component) { - var p, text; - - return { - create: function() { - p = createElement("p"); - text = createText("e"); - }, - - mount: function(target, anchor) { - insertNode(p, target, anchor); - appendNode(text, p); - }, - - unmount: function() { - detachNode(p); - }, - - destroy: noop - }; - } - - function SvelteComponent(options) { - init(this, options); - this._state = options.data || {}; - - this._fragment = create_main_fragment(this._state, this); - - if (options.target) { - this._fragment.create(); - this._fragment.mount(options.target, options.anchor || null); + }, + + unmount: function() { + detachNode(div); + if (if_block) if_block.unmount(); + if (if_block_1) if_block_1.unmount(); + if (if_block_2) if_block_2.unmount(); + if (if_block_3) if_block_3.unmount(); + detachNode(text_8); + if (if_block_4) if_block_4.unmount(); + detachNode(if_block_4_anchor); + }, + + destroy: function() { + if (if_block) if_block.destroy(); + if (if_block_1) if_block_1.destroy(); + if (if_block_2) if_block_2.destroy(); + if (if_block_3) if_block_3.destroy(); + if (if_block_4) if_block_4.destroy(); } + }; +} + +// (2:1) {{#if a}} +function create_if_block(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("a"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +// (8:1) {{#if b}} +function create_if_block_1(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("b"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +// (12:1) {{#if c}} +function create_if_block_2(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("c"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +// (18:1) {{#if d}} +function create_if_block_3(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("d"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +// (25:0) {{#if e}} +function create_if_block_4(state, component) { + var p, text; + + return { + create: function() { + p = createElement("p"); + text = createText("e"); + }, + + mount: function(target, anchor) { + insertNode(p, target, anchor); + appendNode(text, p); + }, + + unmount: function() { + detachNode(p); + }, + + destroy: noop + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + this._fragment = create_main_fragment(this._state, this); + + if (options.target) { + this._fragment.create(); + this._fragment.mount(options.target, options.anchor || null); } +} - assign(SvelteComponent.prototype, proto); - return SvelteComponent; -}()); \ No newline at end of file +assign(SvelteComponent.prototype, proto); +export default SvelteComponent; \ No newline at end of file diff --git a/test/runtime/index.js b/test/runtime/index.js index e46f6c8fa7..122fe645b6 100644 --- a/test/runtime/index.js +++ b/test/runtime/index.js @@ -74,7 +74,7 @@ describe("runtime", () => { const { code } = svelte.compile(source, compileOptions); const startIndex = code.indexOf("function create_main_fragment"); // may change! if (startIndex === -1) throw new Error("missing create_main_fragment"); - const endIndex = code.lastIndexOf("return"); + const endIndex = code.lastIndexOf("export default"); const es5 = code.slice(0, startIndex).split('\n').map(x => spaces(x.length)).join('\n') + code.slice(startIndex, endIndex);