Merge pull request #1028 from emilos/master

Add state() method handling for components
sveltejs · Dec 16, 2017 · b49e6da · b49e6da
2 parents 7d949a6 + d398b34
commit b49e6da
Show file tree

Hide file tree

Showing 33 changed files with 67 additions and 30 deletions.
diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
@@ -610,6 +610,10 @@ export default class Generator {
 					addDeclaration('setup', templateProperties.setup.value);
 				}
 
+				if (templateProperties.store) {
+					addDeclaration('store', templateProperties.store.value);
+				}
+
 				if (templateProperties.tag) {
 					this.tag = templateProperties.tag.value.value;
 				}

diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
@@ -181,8 +181,7 @@ export default function dom(
 	// generate initial state object
 	const expectedProperties = Array.from(generator.expectedProperties);
 	const globals = expectedProperties.filter(prop => globalWhitelist.has(prop));
-	const storeProps = options.store ? expectedProperties.filter(prop => prop[0] === '$') : [];
-
+	const storeProps = options.store || templateProperties.store ? expectedProperties.filter(prop => prop[0] === '$') : [];
 	const initialState = [];
 
 	if (globals.length > 0) {
@@ -206,6 +205,7 @@ export default function dom(
 		${options.dev && !generator.customElement &&
 			`if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");`}
 		@init(this, options);
+		${templateProperties.store && `this.store = %store();`}
 		${generator.usesRefs && `this.refs = {};`}
 		this._state = @assign(${initialState.join(', ')});
 		${storeProps.length > 0 && `this.store._add(this, [${storeProps.map(prop => `"${prop.slice(1)}"`)}]);`}

diff --git a/src/generators/server-side-rendering/index.ts b/src/generators/server-side-rendering/index.ts
@@ -72,15 +72,20 @@ export default function ssr(
 	// generate initial state object
 	const expectedProperties = Array.from(generator.expectedProperties);
 	const globals = expectedProperties.filter(prop => globalWhitelist.has(prop));
-	const storeProps = options.store ? expectedProperties.filter(prop => prop[0] === '$') : [];
+	const storeProps = options.store || templateProperties.store ? expectedProperties.filter(prop => prop[0] === '$') : [];
 
 	const initialState = [];
 	if (globals.length > 0) {
 		initialState.push(`{ ${globals.map(prop => `${prop} : ${prop}`).join(', ')} }`);
 	}
 
 	if (storeProps.length > 0) {
-		initialState.push(`options.store._init([${storeProps.map(prop => `"${prop.slice(1)}"`)}])`);
+		const initialize = `_init([${storeProps.map(prop => `"${prop.slice(1)}"`)}])`
+		if (options.store) {
+			initialState.push(`options.store.${initialize}`);
+		} else if (templateProperties.store) {
+			initialState.push(`%store().${initialize}`);
+		}
 	}
 
 	if (templateProperties.data) {

diff --git a/src/shared/index.js b/src/shared/index.js
@@ -71,7 +71,7 @@ export function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 export function observe(key, callback, options) {

diff --git a/src/validate/js/propValidators/index.ts b/src/validate/js/propValidators/index.ts
@@ -14,6 +14,7 @@ import props from './props';
 import tag from './tag';
 import transitions from './transitions';
 import setup from './setup';
+import store from './store';
 
 export default {
 	data,
@@ -32,4 +33,5 @@ export default {
 	tag,
 	transitions,
 	setup,
+	store,
 };
diff --git a/src/validate/js/propValidators/store.ts b/src/validate/js/propValidators/store.ts
@@ -0,0 +1,6 @@
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function store(validator: Validator, prop: Node) {
+	// not sure there's anything we need to check here...
+}
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -97,7 +97,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js
@@ -73,7 +73,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -73,7 +73,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
@@ -93,7 +93,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
@@ -85,7 +85,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/do-use-dataset/expected-bundle.js b/test/js/samples/do-use-dataset/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
@@ -93,7 +93,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
@@ -93,7 +93,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -105,7 +105,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -85,7 +85,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js
@@ -89,7 +89,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js
@@ -93,7 +93,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js
@@ -91,7 +91,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js
@@ -108,7 +108,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js
@@ -101,7 +101,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
@@ -87,7 +87,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -73,7 +73,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js
@@ -73,7 +73,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -97,7 +97,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/js/samples/window-binding-scroll/expected-bundle.js b/test/js/samples/window-binding-scroll/expected-bundle.js
@@ -93,7 +93,7 @@ function init(component, options) {
 
 	component.options = options;
 	component.root = options.root || component;
-	component.store = component.root.options.store;
+	component.store = component.root.store || component.root.options.store;
 }
 
 function observe(key, callback, options) {

diff --git a/test/runtime/samples/store-root/_config.js b/test/runtime/samples/store-root/_config.js
@@ -0,0 +1,9 @@
+export default {
+	html: `<h1>Hello world!</h1>`,
+
+	test(assert, component, target) {
+		component.store.set({ name: 'everybody' });
+
+		assert.htmlEqual(target.innerHTML, `<h1>Hello everybody!</h1>`);
+	}
+};
diff --git a/test/runtime/samples/store-root/main.html b/test/runtime/samples/store-root/main.html
@@ -0,0 +1,11 @@
+<h1>Hello {{$name}}!</h1>
+<script>
+import { Store } from '../../../../store.js';
+export default {
+	store () {
+		return new Store({
+			name: 'world'
+		});
+	}
+}
+</script>