From 7703e220515846ff3f4784ac937c4a267858ee57 Mon Sep 17 00:00:00 2001 From: daszgfz Date: Tue, 26 Nov 2019 18:03:35 -0500 Subject: [PATCH] doh --- src/compiler/compile/Component.ts | 2 +- .../action-custom-event-handler/expected.js | 23 +++++------ test/js/samples/action/expected.js | 30 ++++++-------- .../samples/dont-invalidate-this/expected.js | 12 ++---- .../each-block-keyed-animated/expected.js | 40 +++++++++---------- test/js/samples/event-modifiers/expected.js | 24 +++++------ test/js/samples/hoisted-const/expected.js | 12 ++---- test/js/samples/hoisted-let/expected.js | 12 ++---- test/js/samples/setup-method/expected.js | 10 ++--- .../samples/ssr-no-oncreate-etc/expected.js | 16 ++++---- test/js/samples/transition-local/expected.js | 12 +++--- 11 files changed, 86 insertions(+), 107 deletions(-) diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts index c6b2ce5905..15f125eebf 100644 --- a/src/compiler/compile/Component.ts +++ b/src/compiler/compile/Component.ts @@ -1137,7 +1137,7 @@ export default class Component { for (const [name, node] of top_level_function_declarations) { if (is_hoistable(node)) { const variable = this.var_lookup.get(name); - if ('argument' in variable && !variable.argument) { + if (!('argument' in variable && variable.argument)) { variable.hoistable = true; hoistable_nodes.add(node); diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js index 1754599143..6c3a2a5b0b 100644 --- a/test/js/samples/action-custom-event-handler/expected.js +++ b/test/js/samples/action-custom-event-handler/expected.js @@ -21,10 +21,10 @@ function create_fragment(ctx) { }, m(target, anchor) { insert(target, button, anchor); - foo_action = /*foo*/ ctx[2].call(null, button, /*foo_function*/ ctx[3]) || ({}); + foo_action = foo.call(null, button, /*foo_function*/ ctx[1]) || ({}); }, p(ctx, [dirty]) { - if (is_function(foo_action.update) && dirty & /*bar*/ 1) foo_action.update.call(null, /*foo_function*/ ctx[3]); + if (is_function(foo_action.update) && dirty & /*bar*/ 1) foo_action.update.call(null, /*foo_function*/ ctx[1]); }, i: noop, o: noop, @@ -35,24 +35,23 @@ function create_fragment(ctx) { }; } -function instance($$self, $$props, $$invalidate) { - let { bar } = $$props; - - function handleFoo(bar) { - console.log(bar); - } +function handleFoo(bar) { + console.log(bar); +} - function foo(node, callback) { - - } +function foo(node, callback) { + +} +function instance($$self, $$props, $$invalidate) { + let { bar } = $$props; const foo_function = () => handleFoo(bar); $$self.$set = $$props => { if ("bar" in $$props) $$invalidate(0, bar = $$props.bar); }; - return [bar, handleFoo, foo, foo_function]; + return [bar, foo_function]; } class Component extends SvelteComponent { diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js index 6069ec3fb6..78fc4855c6 100644 --- a/test/js/samples/action/expected.js +++ b/test/js/samples/action/expected.js @@ -23,7 +23,7 @@ function create_fragment(ctx) { }, m(target, anchor) { insert(target, a, anchor); - link_action = /*link*/ ctx[0].call(null, a) || ({}); + link_action = link.call(null, a) || ({}); }, p: noop, i: noop, @@ -35,29 +35,25 @@ function create_fragment(ctx) { }; } -function instance($$self) { - function link(node) { - function onClick(event) { - event.preventDefault(); - history.pushState(null, null, event.target.href); - } - - node.addEventListener("click", onClick); - - return { - destroy() { - node.removeEventListener("click", onClick); - } - }; +function link(node) { + function onClick(event) { + event.preventDefault(); + history.pushState(null, null, event.target.href); } - return [link]; + node.addEventListener("click", onClick); + + return { + destroy() { + node.removeEventListener("click", onClick); + } + }; } class Component extends SvelteComponent { constructor(options) { super(); - init(this, options, instance, create_fragment, safe_not_equal, {}); + init(this, options, null, create_fragment, safe_not_equal, {}); } } diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js index a9776e2b36..98f638dfcf 100644 --- a/test/js/samples/dont-invalidate-this/expected.js +++ b/test/js/samples/dont-invalidate-this/expected.js @@ -17,7 +17,7 @@ function create_fragment(ctx) { return { c() { input = element("input"); - dispose = listen(input, "input", /*make_uppercase*/ ctx[0]); + dispose = listen(input, "input", make_uppercase); }, m(target, anchor) { insert(target, input, anchor); @@ -32,18 +32,14 @@ function create_fragment(ctx) { }; } -function instance($$self) { - function make_uppercase() { - this.value = this.value.toUpperCase(); - } - - return [make_uppercase]; +function make_uppercase() { + this.value = this.value.toUpperCase(); } class Component extends SvelteComponent { constructor(options) { super(); - init(this, options, instance, create_fragment, safe_not_equal, {}); + init(this, options, null, create_fragment, safe_not_equal, {}); } } diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js index 4218b141de..3b697d6860 100644 --- a/test/js/samples/each-block-keyed-animated/expected.js +++ b/test/js/samples/each-block-keyed-animated/expected.js @@ -19,14 +19,14 @@ import { function get_each_context(ctx, list, i) { const child_ctx = ctx.slice(); - child_ctx[2] = list[i]; + child_ctx[1] = list[i]; return child_ctx; } // (19:0) {#each things as thing (thing.id)} function create_each_block(key_1, ctx) { let div; - let t_value = /*thing*/ ctx[2].name + ""; + let t_value = /*thing*/ ctx[1].name + ""; let t; let rect; let stop_animation = noop; @@ -44,7 +44,7 @@ function create_each_block(key_1, ctx) { append(div, t); }, p(ctx, dirty) { - if (dirty & /*things*/ 1 && t_value !== (t_value = /*thing*/ ctx[2].name + "")) set_data(t, t_value); + if (dirty & /*things*/ 1 && t_value !== (t_value = /*thing*/ ctx[1].name + "")) set_data(t, t_value); }, r() { rect = div.getBoundingClientRect(); @@ -55,7 +55,7 @@ function create_each_block(key_1, ctx) { }, a() { stop_animation(); - stop_animation = create_animation(div, rect, /*foo*/ ctx[1], {}); + stop_animation = create_animation(div, rect, foo, {}); }, d(detaching) { if (detaching) detach(div); @@ -68,7 +68,7 @@ function create_fragment(ctx) { let each_1_lookup = new Map(); let each_1_anchor; let each_value = /*things*/ ctx[0]; - const get_key = ctx => /*thing*/ ctx[2].id; + const get_key = ctx => /*thing*/ ctx[1].id; for (let i = 0; i < each_value.length; i += 1) { let child_ctx = get_each_context(ctx, each_value, i); @@ -109,28 +109,28 @@ function create_fragment(ctx) { }; } -function instance($$self, $$props, $$invalidate) { - let { things } = $$props; +function foo(node, animation, params) { + const dx = animation.from.left - animation.to.left; + const dy = animation.from.top - animation.to.top; - function foo(node, animation, params) { - const dx = animation.from.left - animation.to.left; - const dy = animation.from.top - animation.to.top; + return { + delay: params.delay, + duration: 100, + tick: (t, u) => { + node.dx = u * dx; + node.dy = u * dy; + } + }; +} - return { - delay: params.delay, - duration: 100, - tick: (t, u) => { - node.dx = u * dx; - node.dy = u * dy; - } - }; - } +function instance($$self, $$props, $$invalidate) { + let { things } = $$props; $$self.$set = $$props => { if ("things" in $$props) $$invalidate(0, things = $$props.things); }; - return [things, foo]; + return [things]; } class Component extends SvelteComponent { diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js index fbce1d49a5..3f324bb76d 100644 --- a/test/js/samples/event-modifiers/expected.js +++ b/test/js/samples/event-modifiers/expected.js @@ -37,10 +37,10 @@ function create_fragment(ctx) { button2.textContent = "or me!"; dispose = [ - listen(button0, "click", stop_propagation(prevent_default(/*handleClick*/ ctx[1]))), - listen(button1, "click", /*handleClick*/ ctx[1], { once: true, capture: true }), - listen(button2, "click", /*handleClick*/ ctx[1], true), - listen(div, "touchstart", /*handleTouchstart*/ ctx[0], { passive: true }) + listen(button0, "click", stop_propagation(prevent_default(handleClick))), + listen(button1, "click", handleClick, { once: true, capture: true }), + listen(button2, "click", handleClick, true), + listen(div, "touchstart", handleTouchstart, { passive: true }) ]; }, m(target, anchor) { @@ -61,22 +61,18 @@ function create_fragment(ctx) { }; } -function instance($$self) { - function handleTouchstart() { - - } - - function handleClick() { - - } +function handleTouchstart() { + +} - return [handleTouchstart, handleClick]; +function handleClick() { + } class Component extends SvelteComponent { constructor(options) { super(); - init(this, options, instance, create_fragment, safe_not_equal, {}); + init(this, options, null, create_fragment, safe_not_equal, {}); } } diff --git a/test/js/samples/hoisted-const/expected.js b/test/js/samples/hoisted-const/expected.js index 496e562d56..2842b54751 100644 --- a/test/js/samples/hoisted-const/expected.js +++ b/test/js/samples/hoisted-const/expected.js @@ -15,7 +15,7 @@ function create_fragment(ctx) { return { c() { b = element("b"); - b.textContent = `${/*get_answer*/ ctx[0]()}`; + b.textContent = `${get_answer()}`; }, m(target, anchor) { insert(target, b, anchor); @@ -31,18 +31,14 @@ function create_fragment(ctx) { const ANSWER = 42; -function instance($$self) { - function get_answer() { - return ANSWER; - } - - return [get_answer]; +function get_answer() { + return ANSWER; } class Component extends SvelteComponent { constructor(options) { super(); - init(this, options, instance, create_fragment, safe_not_equal, {}); + init(this, options, null, create_fragment, safe_not_equal, {}); } } diff --git a/test/js/samples/hoisted-let/expected.js b/test/js/samples/hoisted-let/expected.js index 9a7c552230..285b124118 100644 --- a/test/js/samples/hoisted-let/expected.js +++ b/test/js/samples/hoisted-let/expected.js @@ -15,7 +15,7 @@ function create_fragment(ctx) { return { c() { b = element("b"); - b.textContent = `${/*get_answer*/ ctx[0]()}`; + b.textContent = `${get_answer()}`; }, m(target, anchor) { insert(target, b, anchor); @@ -31,18 +31,14 @@ function create_fragment(ctx) { let ANSWER = 42; -function instance($$self) { - function get_answer() { - return ANSWER; - } - - return [get_answer]; +function get_answer() { + return ANSWER; } class Component extends SvelteComponent { constructor(options) { super(); - init(this, options, instance, create_fragment, safe_not_equal, {}); + init(this, options, null, create_fragment, safe_not_equal, {}); } } diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js index 6970c3538f..8e30a03a7d 100644 --- a/test/js/samples/setup-method/expected.js +++ b/test/js/samples/setup-method/expected.js @@ -3,11 +3,11 @@ import { SvelteComponent, init, safe_not_equal } from "svelte/internal"; const SOME_CONSTANT = 42; -function instance($$self, $$props, $$invalidate) { - function foo(bar) { - console.log(bar); - } +function foo(bar) { + console.log(bar); +} +function instance($$self, $$props, $$invalidate) { return [foo]; } @@ -18,7 +18,7 @@ class Component extends SvelteComponent { } get foo() { - return this.$$.ctx[0]; + return foo; } } diff --git a/test/js/samples/ssr-no-oncreate-etc/expected.js b/test/js/samples/ssr-no-oncreate-etc/expected.js index a1d8d4c88b..276587eeca 100644 --- a/test/js/samples/ssr-no-oncreate-etc/expected.js +++ b/test/js/samples/ssr-no-oncreate-etc/expected.js @@ -7,6 +7,14 @@ function preload(input) { return output; } +function foo() { + console.log("foo"); +} + +function swipe(node, callback) { + +} + const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => { onMount(() => { console.log("onMount"); @@ -16,14 +24,6 @@ const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) console.log("onDestroy"); }); - function foo() { - console.log("foo"); - } - - function swipe(node, callback) { - - } - return ``; }); diff --git a/test/js/samples/transition-local/expected.js b/test/js/samples/transition-local/expected.js index c41f32c96b..a5d3b6318f 100644 --- a/test/js/samples/transition-local/expected.js +++ b/test/js/samples/transition-local/expected.js @@ -65,7 +65,7 @@ function create_if_block_1(ctx) { if (local) { if (!div_intro) { add_render_callback(() => { - div_intro = create_in_transition(div, /*foo*/ ctx[2], {}); + div_intro = create_in_transition(div, foo, {}); div_intro.start(); }); } @@ -114,20 +114,20 @@ function create_fragment(ctx) { }; } +function foo() { + +} + function instance($$self, $$props, $$invalidate) { let { x } = $$props; let { y } = $$props; - function foo() { - - } - $$self.$set = $$props => { if ("x" in $$props) $$invalidate(0, x = $$props.x); if ("y" in $$props) $$invalidate(1, y = $$props.y); }; - return [x, y, foo]; + return [x, y]; } class Component extends SvelteComponent {