Merge pull request #855 from sveltejs/shared-init

extract some shared init logic
sveltejs · Sep 17, 2017 · f394cac · f394cac
2 parents 9d8f2c4 + 33dbc18
commit f394cac
Show file tree

Hide file tree

Showing 43 changed files with 480 additions and 633 deletions.
diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
@@ -154,7 +154,7 @@ export default function dom(
 		${options.dev && `this._debugName = '${debugName}';`}
 		${options.dev && !generator.customElement &&
 			`if (!options || (!options.target && !options._root)) throw new Error("'target' is a required option");`}
-		this.options = options;
+		@init(this, options);
 		${generator.usesRefs && `this.refs = {};`}
 		this._state = ${templateProperties.data
 			? `@assign(@template.data(), options.data)`
@@ -169,17 +169,8 @@ export default function dom(
 		${generator.bindingGroups.length &&
 			`this._bindingGroups = [${Array(generator.bindingGroups.length).fill('[]').join(', ')}];`}
 
-		this._observers = {
-			pre: Object.create(null),
-			post: Object.create(null)
-		};
-
-		this._handlers = Object.create(null);
 		${templateProperties.ondestroy && `this._handlers.destroy = [@template.ondestroy]`}
 
-		this._root = options._root || this;
-		this._yield = options._yield;
-		this._bind = options._bind;
 		${generator.slots.size && `this._slotted = options.slots || {};`}
 
 		${generator.customElement ?

diff --git a/src/generators/dom/visitors/EachBlock.ts b/src/generators/dom/visitors/EachBlock.ts
@@ -160,7 +160,7 @@ function keyed(
 	const last = block.getUniqueName(`${each_block}_last`);
 	const expected = block.getUniqueName(`${each_block}_expected`);
 
-	block.addVariable(lookup, `Object.create(null)`);
+	block.addVariable(lookup, `@blankObject()`);
 	block.addVariable(head);
 	block.addVariable(last);
 

diff --git a/src/shared/index.js b/src/shared/index.js
@@ -4,6 +4,10 @@ export * from './dom.js';
 export * from './transitions.js';
 export * from './utils.js';
 
+export function blankObject() {
+	return Object.create(null);
+}
+
 export function destroy(detach) {
 	this.destroy = noop;
 	this.fire('destroy');
@@ -46,10 +50,6 @@ export function dispatchObservers(component, group, changed, newState, oldState)
 	}
 }
 
-export function get(key) {
-	return key ? this._state[key] : this._state;
-}
-
 export function fire(eventName, data) {
 	var handlers =
 		eventName in this._handlers && this._handlers[eventName].slice();
@@ -60,6 +60,20 @@ export function fire(eventName, data) {
 	}
 }
 
+export function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+export 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;
+}
+
 export function observe(key, callback, options) {
 	var group = options && options.defer
 		? this._observers.post

diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -37,6 +37,10 @@ function setAttribute(node, attribute, value) {
 	node.setAttribute(attribute, value);
 }
 
+function blankObject() {
+	return Object.create(null);
+}
+
 function destroy(detach) {
 	this.destroy = noop;
 	this.fire('destroy');
@@ -72,10 +76,6 @@ function dispatchObservers(component, group, changed, newState, oldState) {
 	}
 }
 
-function get(key) {
-	return key ? this._state[key] : this._state;
-}
-
 function fire(eventName, data) {
 	var handlers =
 		eventName in this._handlers && this._handlers[eventName].slice();
@@ -86,6 +86,20 @@ function fire(eventName, 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
@@ -175,7 +189,7 @@ var proto = {
 	_unmount: _unmount
 };
 
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
 var template = (function() {
 	return {
@@ -230,20 +244,9 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = assign(template.data(), options.data);
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	if (!document.getElementById("svelte-3590263702-style")) add_css();
 
 	this._fragment = create_main_fragment(this._state, this);

diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
@@ -1,6 +1,6 @@
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
-import { appendNode, assign, createElement, createText, detachNode, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
 
 var template = (function() {
 	return {
@@ -55,20 +55,9 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = assign(template.data(), options.data);
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	if (!document.getElementById("svelte-3590263702-style")) add_css();
 
 	this._fragment = create_main_fragment(this._state, this);

diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -13,6 +13,10 @@ function assign(target) {
 	return target;
 }
 
+function blankObject() {
+	return Object.create(null);
+}
+
 function destroy(detach) {
 	this.destroy = noop;
 	this.fire('destroy');
@@ -48,10 +52,6 @@ function dispatchObservers(component, group, changed, newState, oldState) {
 	}
 }
 
-function get(key) {
-	return key ? this._state[key] : this._state;
-}
-
 function fire(eventName, data) {
 	var handlers =
 		eventName in this._handlers && this._handlers[eventName].slice();
@@ -62,6 +62,20 @@ function fire(eventName, 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
@@ -151,7 +165,7 @@ var proto = {
 	_unmount: _unmount
 };
 
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
 var template = (function() {
 	return {
@@ -178,21 +192,10 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = options.data || {};
 	this._recompute({}, this._state, {}, true);
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	this._fragment = create_main_fragment(this._state, this);
 
 	if (options.target) {

diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js
@@ -1,6 +1,6 @@
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
-import { assign, differs, noop, proto } from "svelte/shared.js";
+import { assign, differs, init, noop, proto } from "svelte/shared.js";
 
 var template = (function() {
 	return {
@@ -27,21 +27,10 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = options.data || {};
 	this._recompute({}, this._state, {}, true);
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	this._fragment = create_main_fragment(this._state, this);
 
 	if (options.target) {

diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
@@ -33,6 +33,10 @@ function setAttribute(node, attribute, value) {
 	node.setAttribute(attribute, value);
 }
 
+function blankObject() {
+	return Object.create(null);
+}
+
 function destroy(detach) {
 	this.destroy = noop;
 	this.fire('destroy');
@@ -68,10 +72,6 @@ function dispatchObservers(component, group, changed, newState, oldState) {
 	}
 }
 
-function get(key) {
-	return key ? this._state[key] : this._state;
-}
-
 function fire(eventName, data) {
 	var handlers =
 		eventName in this._handlers && this._handlers[eventName].slice();
@@ -82,6 +82,20 @@ function fire(eventName, 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
@@ -171,7 +185,7 @@ var proto = {
 	_unmount: _unmount
 };
 
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
 function encapsulateStyles(node) {
 	setAttribute(node, "svelte-2363328337", "");
@@ -212,20 +226,9 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = options.data || {};
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	if (!document.getElementById("svelte-2363328337-style")) add_css();
 
 	this._fragment = create_main_fragment(this._state, this);

diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
@@ -1,6 +1,6 @@
-/* generated by Svelte v1.39.2 */
+/* generated by Svelte v1.39.3 */
 
-import { appendNode, assign, createElement, detachNode, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+import { appendNode, assign, createElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
 
 function encapsulateStyles(node) {
 	setAttribute(node, "svelte-2363328337", "");
@@ -41,20 +41,9 @@ function create_main_fragment(state, component) {
 }
 
 function SvelteComponent(options) {
-	this.options = options;
+	init(this, options);
 	this._state = options.data || {};
 
-	this._observers = {
-		pre: Object.create(null),
-		post: Object.create(null)
-	};
-
-	this._handlers = Object.create(null);
-
-	this._root = options._root || this;
-	this._yield = options._yield;
-	this._bind = options._bind;
-
 	if (!document.getElementById("svelte-2363328337-style")) add_css();
 
 	this._fragment = create_main_fragment(this._state, this);