From cc4b269a20a0af64a4bdec8bd94f10c16d620a03 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 24 Apr 2018 21:06:51 -0400 Subject: [PATCH] rename state -> ctx in various places --- src/generators/nodes/Element.ts | 4 ++-- src/generators/server-side-rendering/Block.ts | 4 ++-- src/generators/server-side-rendering/visitors/Component.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts index a99e066f23..8305884137 100644 --- a/src/generators/nodes/Element.ts +++ b/src/generators/nodes/Element.ts @@ -461,7 +461,7 @@ export default class Element extends Node { if (!${this.var}.paused) ${animation_frame} = requestAnimationFrame(${handler});` } ${usesContext && `var context = ${this.var}._svelte;`} - ${usesState && `var state = #component.get();`} + ${usesState && `var ctx = #component.get();`} ${usesStore && `var $ = #component.store.get();`} ${needsLock && `${lock} = true;`} ${mutations.length > 0 && mutations} @@ -482,7 +482,7 @@ export default class Element extends Node { }); const allInitialStateIsDefined = group.bindings - .map(binding => `'${binding.object}' in state`) + .map(binding => `'${binding.object}' in ctx`) .join(' && '); if (this.name === 'select' || group.bindings.find(binding => binding.name === 'indeterminate' || binding.isReadOnlyMediaAttribute)) { diff --git a/src/generators/server-side-rendering/Block.ts b/src/generators/server-side-rendering/Block.ts index 1e85b0c1d8..086eef45bf 100644 --- a/src/generators/server-side-rendering/Block.ts +++ b/src/generators/server-side-rendering/Block.ts @@ -20,7 +20,7 @@ export default class Block { } addBinding(binding: Node, name: string) { - const conditions = [`!('${binding.name}' in state)`].concat( + const conditions = [`!('${binding.name}' in ctx)`].concat( // TODO handle contextual bindings... this.conditions.map(c => `(${c})`) ); @@ -31,7 +31,7 @@ export default class Block { if (${conditions.join('&&')}) { tmp = ${name}.data(); if ('${prop}' in tmp) { - state.${binding.name} = tmp.${prop}; + ctx.${binding.name} = tmp.${prop}; settled = false; } } diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts index a020c81164..7ff2584a15 100644 --- a/src/generators/server-side-rendering/visitors/Component.ts +++ b/src/generators/server-side-rendering/visitors/Component.ts @@ -45,7 +45,7 @@ export default function visitComponent( const keypath = block.contexts.has(name) ? `${name}${tail}` - : `state.${name}${tail}`; + : `ctx.${name}${tail}`; return `${binding.name}: ${keypath}`; });