From e2ef1fdb9627cab3a74aa9f7b3d59515859ec8d7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 17 Sep 2017 12:59:30 -0400 Subject: [PATCH] dont update components with only static bindings --- src/generators/dom/visitors/Component.ts | 14 +- .../component-static/expected-bundle.js | 232 ++++++++++++++++++ test/js/samples/component-static/expected.js | 67 +++++ test/js/samples/component-static/input.html | 9 + 4 files changed, 316 insertions(+), 6 deletions(-) create mode 100644 test/js/samples/component-static/expected-bundle.js create mode 100644 test/js/samples/component-static/expected.js create mode 100644 test/js/samples/component-static/input.html diff --git a/src/generators/dom/visitors/Component.ts b/src/generators/dom/visitors/Component.ts index e2f368703b..5085ee9969 100644 --- a/src/generators/dom/visitors/Component.ts +++ b/src/generators/dom/visitors/Component.ts @@ -206,12 +206,14 @@ export default function visitComponent( componentInitProperties.push(`data: ${initialPropString}`); } - block.builders.update.addBlock(deindent` - var ${name}_changes = {}; - ${updates.join('\n')} - ${name}._set( ${name}_changes ); - ${bindings.length && `${name_updating} = {};`} - `); + if (updates.length) { + block.builders.update.addBlock(deindent` + var ${name}_changes = {}; + ${updates.join('\n')} + ${name}._set( ${name}_changes ); + ${bindings.length && `${name_updating} = {};`} + `); + } } const expression = node.name === ':Self' diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js new file mode 100644 index 0000000000..3e2ef5ceb2 --- /dev/null +++ b/test/js/samples/component-static/expected-bundle.js @@ -0,0 +1,232 @@ +function noop() {} + +function assign(target) { + var k, + source, + i = 1, + len = arguments.length; + for (; i < len; i++) { + source = arguments[i]; + for (k in source) target[k] = source[k]; + } + + return target; +} + +function blankObject() { + return Object.create(null); +} + +function destroy(detach) { + this.destroy = noop; + this.fire('destroy'); + this.set = this.get = noop; + + if (detach !== false) this._fragment.unmount(); + this._fragment.destroy(); + this._fragment = this._state = null; +} + +function differs(a, b) { + return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); +} + +function dispatchObservers(component, group, changed, newState, oldState) { + for (var key in group) { + if (!changed[key]) continue; + + var newValue = newState[key]; + var oldValue = oldState[key]; + + var callbacks = group[key]; + if (!callbacks) continue; + + for (var i = 0; i < callbacks.length; i += 1) { + var callback = callbacks[i]; + if (callback.__calling) continue; + + callback.__calling = true; + callback.call(component, newValue, oldValue); + callback.__calling = false; + } + } +} + +function fire(eventName, data) { + var handlers = + eventName in this._handlers && this._handlers[eventName].slice(); + if (!handlers) return; + + for (var i = 0; i < handlers.length; i += 1) { + handlers[i].call(this, data); + } +} + +function get(key) { + return key ? this._state[key] : this._state; +} + +function init(component, options) { + component.options = options; + + component._observers = { pre: blankObject(), post: blankObject() }; + component._handlers = blankObject(); + component._root = options._root || component; + component._yield = options._yield; + component._bind = options._bind; +} + +function observe(key, callback, options) { + var group = options && options.defer + ? this._observers.post + : this._observers.pre; + + (group[key] || (group[key] = [])).push(callback); + + if (!options || options.init !== false) { + callback.__calling = true; + callback.call(this, this._state[key]); + callback.__calling = false; + } + + return { + cancel: function() { + var index = group[key].indexOf(callback); + if (~index) group[key].splice(index, 1); + } + }; +} + +function on(eventName, handler) { + if (eventName === 'teardown') return this.on('destroy', handler); + + var handlers = this._handlers[eventName] || (this._handlers[eventName] = []); + handlers.push(handler); + + return { + cancel: function() { + var index = handlers.indexOf(handler); + if (~index) handlers.splice(index, 1); + } + }; +} + +function set(newState) { + this._set(assign({}, newState)); + if (this._root._lock) return; + this._root._lock = true; + callAll(this._root._beforecreate); + callAll(this._root._oncreate); + callAll(this._root._aftercreate); + this._root._lock = false; +} + +function _set(newState) { + var oldState = this._state, + changed = {}, + dirty = false; + + for (var key in newState) { + if (differs(newState[key], oldState[key])) changed[key] = dirty = true; + } + if (!dirty) return; + + this._state = assign({}, oldState, newState); + this._recompute(changed, this._state, oldState, false); + if (this._bind) this._bind(changed, this._state); + dispatchObservers(this, this._observers.pre, changed, this._state, oldState); + this._fragment.update(changed, this._state); + dispatchObservers(this, this._observers.post, changed, this._state, oldState); +} + +function callAll(fns) { + while (fns && fns.length) fns.pop()(); +} + +function _mount(target, anchor) { + this._fragment.mount(target, anchor); +} + +function _unmount() { + this._fragment.unmount(); +} + +var proto = { + destroy: destroy, + get: get, + fire: fire, + observe: observe, + on: on, + set: set, + teardown: destroy, + _recompute: noop, + _set: _set, + _mount: _mount, + _unmount: _unmount +}; + +/* generated by Svelte vX.Y.Z */ + +var template = (function() { + return { + components: { + Nested: window.Nested + } + }; +}()); + +function create_main_fragment(state, component) { + + var nested = new template.components.Nested({ + _root: component._root, + data: { foo: "bar" } + }); + + return { + create: function() { + nested._fragment.create(); + }, + + mount: function(target, anchor) { + nested._mount(target, anchor); + }, + + update: noop, + + unmount: function() { + nested._unmount(); + }, + + destroy: function() { + nested.destroy(false); + } + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } + + 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); + +export default SvelteComponent; diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js new file mode 100644 index 0000000000..e6f5d12eb7 --- /dev/null +++ b/test/js/samples/component-static/expected.js @@ -0,0 +1,67 @@ +/* generated by Svelte vX.Y.Z */ + +import { assign, callAll, init, noop, proto } from "svelte/shared.js"; + +var template = (function() { + return { + components: { + Nested: window.Nested + } + }; +}()); + +function create_main_fragment(state, component) { + + var nested = new template.components.Nested({ + _root: component._root, + data: { foo: "bar" } + }); + + return { + create: function() { + nested._fragment.create(); + }, + + mount: function(target, anchor) { + nested._mount(target, anchor); + }, + + update: noop, + + unmount: function() { + nested._unmount(); + }, + + destroy: function() { + nested.destroy(false); + } + }; +} + +function SvelteComponent(options) { + init(this, options); + this._state = options.data || {}; + + if (!options._root) { + this._oncreate = []; + this._beforecreate = []; + this._aftercreate = []; + } + + 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); + +export default SvelteComponent; \ No newline at end of file diff --git a/test/js/samples/component-static/input.html b/test/js/samples/component-static/input.html new file mode 100644 index 0000000000..44a2bf2bc1 --- /dev/null +++ b/test/js/samples/component-static/input.html @@ -0,0 +1,9 @@ + + + \ No newline at end of file