From 0b39cafc67d599adf42f3b15db06ea77ac388618 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 08:23:29 -0500 Subject: [PATCH 01/13] start implementing context --- src/generators/Generator.ts | 40 ++++++++++++---------- src/generators/dom/Block.ts | 10 +++--- src/generators/dom/index.ts | 4 +-- src/generators/nodes/AwaitBlock.ts | 23 ++++++------- src/generators/nodes/Component.ts | 8 ++--- src/generators/nodes/EachBlock.ts | 44 +++++++++++++----------- src/generators/nodes/Fragment.ts | 1 - src/generators/nodes/IfBlock.ts | 55 +++++++++++++++--------------- 8 files changed, 92 insertions(+), 93 deletions(-) diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index 1f48424c9529..5570fe035484 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -242,24 +242,26 @@ export default class Generator { if (name === 'event' && isEventHandler) { // noop } else if (contexts.has(name)) { - const contextName = contexts.get(name); - if (contextName !== name) { - // this is true for 'reserved' names like `state` and `component`, - // also destructured contexts - code.overwrite( - node.start, - node.start + name.length, - contextName, - { storeName: true, contentOnly: false } - ); - - const destructuredName = contextName.replace(/\[\d+\]/, ''); - if (destructuredName !== contextName) { - // so that hoisting the context works correctly - usedContexts.add(destructuredName); - } - } - + // const contextName = contexts.get(name); + // if (contextName !== name) { + // // this is true for 'reserved' names like `state` and `component`, + // // also destructured contexts + // code.overwrite( + // node.start, + // node.start + name.length, + // contextName, + // { storeName: true, contentOnly: false } + // ); + + // const destructuredName = contextName.replace(/\[\d+\]/, ''); + // if (destructuredName !== contextName) { + // // so that hoisting the context works correctly + // usedContexts.add(destructuredName); + // } + // } + + // TODO filthy, temporary hack + if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`); usedContexts.add(name); } else if (helpers.has(name)) { let object = node; @@ -268,6 +270,8 @@ export default class Generator { const alias = self.templateVars.get(`helpers-${name}`); if (alias !== name) code.overwrite(object.start, object.end, alias); } else if (indexes.has(name)) { + if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`); + const context = indexes.get(name); usedContexts.add(context); // TODO is this right? usedIndexes.add(name); diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index f92d9e0cb1b6..2a50b3cfdbad 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -17,7 +17,6 @@ export interface BlockOptions { contextTypes?: Map; indexes?: Map; changeableIndexes?: Map; - params?: string[]; indexNames?: Map; listNames?: Map; indexName?: string; @@ -41,7 +40,6 @@ export default class Block { indexes: Map; changeableIndexes: Map; dependencies: Set; - params: string[]; indexNames: Map; listNames: Map; indexName: string; @@ -90,10 +88,10 @@ export default class Block { this.changeableIndexes = options.changeableIndexes; this.dependencies = new Set(); - this.params = options.params; this.indexNames = options.indexNames; this.listNames = options.listNames; + this.indexName = options.indexName; this.listName = options.listName; this.builders = { @@ -116,7 +114,7 @@ export default class Block { this.aliases = new Map(); this.variables = new Map(); - this.getUniqueName = this.generator.getUniqueNameMaker(options.params); + this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more this.hasUpdateMethod = false; // determined later } @@ -254,7 +252,7 @@ export default class Block { properties.addBlock(`p: @noop,`); } else { properties.addBlock(deindent` - p: function update(changed, ${this.params.join(', ')}) { + p: function update(changed, state) { ${this.builders.update} }, `); @@ -328,7 +326,7 @@ export default class Block { return deindent` ${this.comment && `// ${escape(this.comment)}`} - function ${this.name}(${this.params.join(', ')}, #component${this.key ? `, ${localKey}` : ''}) { + function ${this.name}(#component, state${this.key ? `, ${localKey}` : ''}) { ${this.variables.size > 0 && `var ${Array.from(this.variables.keys()) .map(key => { diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index 08bdf0012f4f..090dffbf3e75 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -50,7 +50,7 @@ export class DomGenerator extends Generator { } getUniqueNameMaker(params: string[]) { - const localUsedNames = new Set(params); + const localUsedNames = new Set(params); // TODO is this ever called with params? function add(name: string) { localUsedNames.add(name); @@ -257,7 +257,7 @@ export default function dom( ${generator.slots.size && `this.slots = {};`} - this._fragment = @create_main_fragment(this._state, this); + this._fragment = @create_main_fragment(this, this._state); ${(templateProperties.oncreate) && deindent` this.root._oncreate.push(_oncreate); diff --git a/src/generators/nodes/AwaitBlock.ts b/src/generators/nodes/AwaitBlock.ts index 445767d27fdc..c5cce6575812 100644 --- a/src/generators/nodes/AwaitBlock.ts +++ b/src/generators/nodes/AwaitBlock.ts @@ -45,7 +45,6 @@ export default class AwaitBlock extends Node { child.block = block.child({ comment: createDebuggingComment(child, this.generator), name: this.generator.getUniqueName(`create_${status}_block`), - params: block.params.concat(context), context, contexts, contextTypes @@ -75,8 +74,6 @@ export default class AwaitBlock extends Node { const anchor = this.getOrCreateAnchor(block, parentNode, parentNodes); const updateMountNode = this.getUpdateMountNode(anchor); - const params = block.params.join(', '); - block.contextualise(this.expression); const { snippet } = this.metadata; @@ -106,11 +103,11 @@ export default class AwaitBlock extends Node { // but it's probably not worth it block.builders.init.addBlock(deindent` - function ${replace_await_block}(${token}, type, ${value}, ${params}) { + function ${replace_await_block}(${token}, type, ${value}, state) { if (${token} !== ${await_token}) return; var ${old_block} = ${await_block}; - ${await_block} = (${await_block_type} = type)(${params}, ${resolved} = ${value}, #component); + ${await_block} = (${await_block_type} = type)(state, ${resolved} = ${value}, #component); if (${old_block}) { ${old_block}.u(); @@ -122,33 +119,33 @@ export default class AwaitBlock extends Node { } } - function ${handle_promise}(${promise}, ${params}) { + function ${handle_promise}(${promise}, state) { var ${token} = ${await_token} = {}; if (@isPromise(${promise})) { ${promise}.then(function(${value}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_then_block}, ${value}, ${params}); + ${replace_await_block}(${token}, ${create_then_block}, ${value}, state); }, function (${error}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_catch_block}, ${error}, ${params}); + ${replace_await_block}(${token}, ${create_catch_block}, ${error}, state); }); // if we previously had a then/catch block, destroy it if (${await_block_type} !== ${create_pending_block}) { - ${replace_await_block}(${token}, ${create_pending_block}, null, ${params}); + ${replace_await_block}(${token}, ${create_pending_block}, null, state); return true; } } else { ${resolved} = ${promise}; if (${await_block_type} !== ${create_then_block}) { - ${replace_await_block}(${token}, ${create_then_block}, ${resolved}, ${params}); + ${replace_await_block}(${token}, ${create_then_block}, ${resolved}, state); return true; } } } - ${handle_promise}(${promise} = ${snippet}, ${params}); + ${handle_promise}(${promise} = ${snippet}, state); `); block.builders.create.addBlock(deindent` @@ -177,7 +174,7 @@ export default class AwaitBlock extends Node { conditions.push( `${promise} !== (${promise} = ${snippet})`, - `${handle_promise}(${promise}, ${params})` + `${handle_promise}(${promise}, state)` ); if (this.pending.block.hasUpdateMethod) { @@ -185,7 +182,7 @@ export default class AwaitBlock extends Node { if (${conditions.join(' && ')}) { // nothing } else { - ${await_block}.p(changed, ${params}, ${resolved}); + ${await_block}.p(changed, state, ${resolved}); } `); } else { diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index 493302c3d58d..83e88f2bdaca 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -279,12 +279,10 @@ export default class Component extends Node { const anchor = this.getOrCreateAnchor(block, parentNode, parentNodes); - const params = block.params.join(', '); - block.builders.init.addBlock(deindent` var ${switch_vars.value} = ${snippet}; - function ${switch_vars.props}(${params}) { + function ${switch_vars.props}(state) { ${statements.length > 0 && statements.join('\n')} return { ${componentInitProperties.join(',\n')} @@ -292,7 +290,7 @@ export default class Component extends Node { } if (${switch_vars.value}) { - var ${name} = new ${expression}(${switch_vars.props}(${params})); + var ${name} = new ${expression}(${switch_vars.props}(state)); ${beforecreate} } @@ -327,7 +325,7 @@ export default class Component extends Node { if (${name}) ${name}.destroy(); if (${switch_vars.value}) { - ${name} = new ${switch_vars.value}(${switch_vars.props}(${params})); + ${name} = new ${switch_vars.value}(${switch_vars.props}(state)); ${name}._fragment.c(); ${this.children.map(child => remount(generator, child, name))} diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts index 904536fda30c..9a094affe4f5 100644 --- a/src/generators/nodes/EachBlock.ts +++ b/src/generators/nodes/EachBlock.ts @@ -29,6 +29,7 @@ export default class EachBlock extends Node { this.var = block.getUniqueName(`each`); this.iterations = block.getUniqueName(`${this.var}_blocks`); + this.each_context = block.getUniqueName(`${this.var}_context`); const { dependencies } = this.metadata; block.addDependencies(dependencies); @@ -80,8 +81,7 @@ export default class EachBlock extends Node { indexName, indexNames, - listNames, - params: block.params.concat(listName, context, indexName), + listNames }); this.generator.blocks.push(this.block); @@ -117,7 +117,6 @@ export default class EachBlock extends Node { const create_each_block = this.block.name; const each_block_value = this.block.listName; const iterations = this.iterations; - const params = block.params.join(', '); const needsAnchor = this.next ? !this.next.isDomNode() : !parentNode || !this.parent.isDomNode(); const anchor = needsAnchor @@ -138,7 +137,6 @@ export default class EachBlock extends Node { each_block_value, length, iterations, - params, anchor, mountOrIntro, }; @@ -171,7 +169,7 @@ export default class EachBlock extends Node { // TODO neaten this up... will end up with an empty line in the block block.builders.init.addBlock(deindent` if (!${each_block_value}.${length}) { - ${each_block_else} = ${this.else.block.name}(${params}, #component); + ${each_block_else} = ${this.else.block.name}(#component, state); ${each_block_else}.c(); } `); @@ -187,9 +185,9 @@ export default class EachBlock extends Node { if (this.else.block.hasUpdateMethod) { block.builders.update.addBlock(deindent` if (!${each_block_value}.${length} && ${each_block_else}) { - ${each_block_else}.p( changed, ${params} ); + ${each_block_else}.p(changed, state); } else if (!${each_block_value}.${length}) { - ${each_block_else} = ${this.else.block.name}(${params}, #component); + ${each_block_else} = ${this.else.block.name}(#component, state); ${each_block_else}.c(); ${each_block_else}.${mountOrIntro}(${initialMountNode}, ${anchor}); } else if (${each_block_else}) { @@ -207,7 +205,7 @@ export default class EachBlock extends Node { ${each_block_else} = null; } } else if (!${each_block_else}) { - ${each_block_else} = ${this.else.block.name}(${params}, #component); + ${each_block_else} = ${this.else.block.name}(#component, state); ${each_block_else}.c(); ${each_block_else}.${mountOrIntro}(${initialMountNode}, ${anchor}); } @@ -244,7 +242,6 @@ export default class EachBlock extends Node { create_each_block, each_block_value, length, - params, anchor, mountOrIntro, } @@ -275,7 +272,7 @@ export default class EachBlock extends Node { block.builders.init.addBlock(deindent` for (var #i = 0; #i < ${each_block_value}.${length}; #i += 1) { var ${key} = ${each_block_value}[#i].${this.key}; - var ${iteration} = ${lookup}[${key}] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key}); + var ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); if (${last}) ${last}.next = ${iteration}; ${iteration}.last = ${last}; @@ -380,7 +377,7 @@ export default class EachBlock extends Node { var ${iteration} = ${lookup}[${key}]; ${dynamic && - `if (${iteration}) ${iteration}.p(changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i);`} + `if (${iteration}) ${iteration}.p(changed, state);`} if (${expected}) { if (${key} === ${expected}.key) { @@ -401,7 +398,7 @@ export default class EachBlock extends Node { if (!${expected}) ${iteration}.m(${updateMountNode}, ${anchor}); } else { // key is being inserted - ${iteration} = ${lookup}[${key}] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key}); + ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); ${iteration}.c(); ${iteration}.${mountOrIntro}(${updateMountNode}, ${expected}.first); @@ -416,7 +413,7 @@ export default class EachBlock extends Node { ${iteration}.next = null; ${iteration}.m(${updateMountNode}, ${anchor}); } else { - ${iteration} = ${lookup}[${key}] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key}); + ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); ${iteration}.c(); ${iteration}.${mountOrIntro}(${updateMountNode}, ${anchor}); } @@ -464,7 +461,6 @@ export default class EachBlock extends Node { each_block_value, length, iterations, - params, anchor, mountOrIntro, } @@ -473,7 +469,10 @@ export default class EachBlock extends Node { var ${iterations} = []; for (var #i = 0; #i < ${each_block_value}.${length}; #i += 1) { - ${iterations}[#i] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component); + ${iterations}[#i] = ${create_each_block}(#component, @assign({}, state, { + ${this.context}: ${each_block_value}[#i], + ${this.block.indexName}: #i + })); } `); @@ -517,24 +516,24 @@ export default class EachBlock extends Node { ? this.block.hasIntroMethod ? deindent` if (${iterations}[#i]) { - ${iterations}[#i].p(changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i); + ${iterations}[#i].p(changed, ${this.each_context}); } else { - ${iterations}[#i] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component); + ${iterations}[#i] = ${create_each_block}(#component, ${this.each_context}); ${iterations}[#i].c(); } ${iterations}[#i].i(${updateMountNode}, ${anchor}); ` : deindent` if (${iterations}[#i]) { - ${iterations}[#i].p(changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i); + ${iterations}[#i].p(changed, ${this.each_context}); } else { - ${iterations}[#i] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component); + ${iterations}[#i] = ${create_each_block}(#component, ${this.each_context}); ${iterations}[#i].c(); ${iterations}[#i].m(${updateMountNode}, ${anchor}); } ` : deindent` - ${iterations}[#i] = ${create_each_block}(${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component); + ${iterations}[#i] = ${create_each_block}(#component, ${this.each_context}); ${iterations}[#i].c(); ${iterations}[#i].${mountOrIntro}(${updateMountNode}, ${anchor}); `; @@ -569,6 +568,11 @@ export default class EachBlock extends Node { if (${condition}) { for (var #i = ${start}; #i < ${each_block_value}.${length}; #i += 1) { + var ${this.each_context} = @assign({}, state, { + ${this.context}: ${each_block_value}[#i], + ${this.block.indexName}: #i + }); + ${forLoopBody} } diff --git a/src/generators/nodes/Fragment.ts b/src/generators/nodes/Fragment.ts index 875d3b6a2477..e4eb55967981 100644 --- a/src/generators/nodes/Fragment.ts +++ b/src/generators/nodes/Fragment.ts @@ -16,7 +16,6 @@ export default class Fragment extends Node { indexes: new Map(), changeableIndexes: new Map(), - params: ['state'], indexNames: new Map(), listNames: new Map(), diff --git a/src/generators/nodes/IfBlock.ts b/src/generators/nodes/IfBlock.ts index 3cec2245d9bb..17cd92bc290d 100644 --- a/src/generators/nodes/IfBlock.ts +++ b/src/generators/nodes/IfBlock.ts @@ -100,7 +100,6 @@ export default class IfBlock extends Node { const anchor = needsAnchor ? block.getUniqueName(`${name}_anchor`) : (this.next && this.next.var) || 'null'; - const params = block.params.join(', '); const branches = getBranches(this.generator, block, parentNode, parentNodes, this); @@ -110,7 +109,7 @@ export default class IfBlock extends Node { const dynamic = branches[0].hasUpdateMethod; // can use [0] as proxy for all, since they necessarily have the same value const hasOutros = branches[0].hasOutroMethod; - const vars = { name, anchor, params, if_name, hasElse }; + const vars = { name, anchor, if_name, hasElse }; if (this.else) { if (hasOutros) { @@ -218,10 +217,10 @@ function simple( node: Node, branch, dynamic, - { name, anchor, params, if_name } + { name, anchor, if_name } ) { block.builders.init.addBlock(deindent` - var ${name} = (${branch.condition}) && ${branch.block}(${params}, #component); + var ${name} = (${branch.condition}) && ${branch.block}(#component, state); `); const mountOrIntro = branch.hasIntroMethod ? 'i' : 'm'; @@ -238,9 +237,9 @@ function simple( ? branch.hasIntroMethod ? deindent` if (${name}) { - ${name}.p(changed, ${params}); + ${name}.p(changed, state); } else { - ${name} = ${branch.block}(${params}, #component); + ${name} = ${branch.block}(#component, state); if (${name}) ${name}.c(); } @@ -248,9 +247,9 @@ function simple( ` : deindent` if (${name}) { - ${name}.p(changed, ${params}); + ${name}.p(changed, state); } else { - ${name} = ${branch.block}(${params}, #component); + ${name} = ${branch.block}(#component, state); ${name}.c(); ${name}.m(${updateMountNode}, ${anchor}); } @@ -258,14 +257,14 @@ function simple( : branch.hasIntroMethod ? deindent` if (!${name}) { - ${name} = ${branch.block}(${params}, #component); + ${name} = ${branch.block}(#component, state); ${name}.c(); } ${name}.i(${updateMountNode}, ${anchor}); ` : deindent` if (!${name}) { - ${name} = ${branch.block}(${params}, #component); + ${name} = ${branch.block}(#component, state); ${name}.c(); ${name}.m(${updateMountNode}, ${anchor}); } @@ -308,14 +307,14 @@ function compound( node: Node, branches, dynamic, - { name, anchor, params, hasElse, if_name } + { name, anchor, hasElse, if_name } ) { const select_block_type = generator.getUniqueName(`select_block_type`); const current_block_type = block.getUniqueName(`current_block_type`); const current_block_type_and = hasElse ? '' : `${current_block_type} && `; generator.blocks.push(deindent` - function ${select_block_type}(${params}) { + function ${select_block_type}(state) { ${branches .map(({ condition, block }) => `${condition ? `if (${condition}) ` : ''}return ${block};`) .join('\n')} @@ -323,8 +322,8 @@ function compound( `); block.builders.init.addBlock(deindent` - var ${current_block_type} = ${select_block_type}(${params}); - var ${name} = ${current_block_type_and}${current_block_type}(${params}, #component); + var ${current_block_type} = ${select_block_type}(state); + var ${name} = ${current_block_type_and}${current_block_type}(#component, state); `); const mountOrIntro = branches[0].hasIntroMethod ? 'i' : 'm'; @@ -348,22 +347,22 @@ function compound( ${name}.u(); ${name}.d(); }`} - ${name} = ${current_block_type_and}${current_block_type}(${params}, #component); + ${name} = ${current_block_type_and}${current_block_type}(#component, state); ${if_name}${name}.c(); ${if_name}${name}.${mountOrIntro}(${updateMountNode}, ${anchor}); `; if (dynamic) { block.builders.update.addBlock(deindent` - if (${current_block_type} === (${current_block_type} = ${select_block_type}(${params})) && ${name}) { - ${name}.p(changed, ${params}); + if (${current_block_type} === (${current_block_type} = ${select_block_type}(state)) && ${name}) { + ${name}.p(changed, state); } else { ${changeBlock} } `); } else { block.builders.update.addBlock(deindent` - if (${current_block_type} !== (${current_block_type} = ${select_block_type}(${params}))) { + if (${current_block_type} !== (${current_block_type} = ${select_block_type}(state))) { ${changeBlock} } `); @@ -384,7 +383,7 @@ function compoundWithOutros( node: Node, branches, dynamic, - { name, anchor, params, hasElse } + { name, anchor, hasElse } ) { const select_block_type = block.getUniqueName(`select_block_type`); const current_block_type_index = block.getUniqueName(`current_block_type_index`); @@ -406,7 +405,7 @@ function compoundWithOutros( var ${if_blocks} = []; - function ${select_block_type}(${params}) { + function ${select_block_type}(state) { ${branches .map(({ condition, block }, i) => `${condition ? `if (${condition}) ` : ''}return ${block ? i : -1};`) .join('\n')} @@ -415,13 +414,13 @@ function compoundWithOutros( if (hasElse) { block.builders.init.addBlock(deindent` - ${current_block_type_index} = ${select_block_type}(${params}); - ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](${params}, #component); + ${current_block_type_index} = ${select_block_type}(state); + ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](#component, state); `); } else { block.builders.init.addBlock(deindent` - if (~(${current_block_type_index} = ${select_block_type}(${params}))) { - ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](${params}, #component); + if (~(${current_block_type_index} = ${select_block_type}(state))) { + ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](#component, state); } `); } @@ -447,7 +446,7 @@ function compoundWithOutros( const createNewBlock = deindent` ${name} = ${if_blocks}[${current_block_type_index}]; if (!${name}) { - ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](${params}, #component); + ${name} = ${if_blocks}[${current_block_type_index}] = ${if_block_creators}[${current_block_type_index}](#component, state); ${name}.c(); } ${name}.${mountOrIntro}(${updateMountNode}, ${anchor}); @@ -474,9 +473,9 @@ function compoundWithOutros( if (dynamic) { block.builders.update.addBlock(deindent` var ${previous_block_index} = ${current_block_type_index}; - ${current_block_type_index} = ${select_block_type}(${params}); + ${current_block_type_index} = ${select_block_type}(state); if (${current_block_type_index} === ${previous_block_index}) { - ${if_current_block_type_index}${if_blocks}[${current_block_type_index}].p(changed, ${params}); + ${if_current_block_type_index}${if_blocks}[${current_block_type_index}].p(changed, state); } else { ${changeBlock} } @@ -484,7 +483,7 @@ function compoundWithOutros( } else { block.builders.update.addBlock(deindent` var ${previous_block_index} = ${current_block_type_index}; - ${current_block_type_index} = ${select_block_type}(${params}); + ${current_block_type_index} = ${select_block_type}(state); if (${current_block_type_index} !== ${previous_block_index}) { ${changeBlock} } From c0292cbca1333afa21a1a7ebaed43cafdfce1e1e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 08:24:55 -0500 Subject: [PATCH 02/13] update tests --- .../expected-bundle.js | 4 +-- .../expected.js | 4 +-- .../component-static/expected-bundle.js | 4 +-- test/js/samples/component-static/expected.js | 4 +-- .../computed-collapsed-if/expected-bundle.js | 4 +-- .../samples/computed-collapsed-if/expected.js | 4 +-- .../css-media-query/expected-bundle.js | 4 +-- test/js/samples/css-media-query/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../css-shadow-dom-keyframes/expected.js | 4 +-- .../deconflict-globals/expected-bundle.js | 4 +-- .../js/samples/deconflict-globals/expected.js | 4 +-- .../samples/do-use-dataset/expected-bundle.js | 4 +-- test/js/samples/do-use-dataset/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../dont-use-dataset-in-legacy/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../dont-use-dataset-in-svg/expected.js | 4 +-- .../expected-bundle.js | 32 ++++++++++------- .../each-block-changed-check/expected.js | 32 ++++++++++------- .../event-handlers-custom/expected-bundle.js | 4 +-- .../samples/event-handlers-custom/expected.js | 4 +-- .../head-no-whitespace/expected-bundle.js | 4 +-- .../js/samples/head-no-whitespace/expected.js | 4 +-- .../if-block-no-update/expected-bundle.js | 12 +++---- .../js/samples/if-block-no-update/expected.js | 12 +++---- .../if-block-simple/expected-bundle.js | 10 +++--- test/js/samples/if-block-simple/expected.js | 10 +++--- .../expected-bundle.js | 4 +-- .../expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../inline-style-optimized-url/expected.js | 4 +-- .../inline-style-optimized/expected-bundle.js | 4 +-- .../inline-style-optimized/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../inline-style-unoptimized/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../input-without-blowback-guard/expected.js | 4 +-- .../legacy-input-type/expected-bundle.js | 4 +-- test/js/samples/legacy-input-type/expected.js | 4 +-- .../legacy-quote-class/expected-bundle.js | 4 +-- .../js/samples/legacy-quote-class/expected.js | 4 +-- .../samples/media-bindings/expected-bundle.js | 4 +-- test/js/samples/media-bindings/expected.js | 4 +-- .../non-imported-component/expected-bundle.js | 4 +-- .../non-imported-component/expected.js | 4 +-- .../expected-bundle.js | 4 +-- .../onrender-onteardown-rewritten/expected.js | 4 +-- .../samples/setup-method/expected-bundle.js | 4 +-- test/js/samples/setup-method/expected.js | 4 +-- test/js/samples/svg-title/expected-bundle.js | 4 +-- test/js/samples/svg-title/expected.js | 4 +-- test/js/samples/title/expected-bundle.js | 4 +-- test/js/samples/title/expected.js | 4 +-- .../expected-bundle.js | 34 +++++++++---------- .../use-elements-as-anchors/expected.js | 34 +++++++++---------- .../window-binding-scroll/expected-bundle.js | 4 +-- .../samples/window-binding-scroll/expected.js | 4 +-- 58 files changed, 196 insertions(+), 180 deletions(-) diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js index 59cd2de1256b..33854eb0e6e2 100644 --- a/test/js/samples/collapses-text-around-comments/expected-bundle.js +++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js @@ -208,7 +208,7 @@ function add_css() { appendNode(style, document.head); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var p, text; return { @@ -247,7 +247,7 @@ function SvelteComponent(options) { if (!document.getElementById("svelte-2794052100-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js index aea4721e36cc..17e612b644c9 100644 --- a/test/js/samples/collapses-text-around-comments/expected.js +++ b/test/js/samples/collapses-text-around-comments/expected.js @@ -16,7 +16,7 @@ function add_css() { appendNode(style, document.head); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var p, text; return { @@ -55,7 +55,7 @@ function SvelteComponent(options) { if (!document.getElementById("svelte-2794052100-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js index 708ef5be95ac..5047d48b5e83 100644 --- a/test/js/samples/component-static/expected-bundle.js +++ b/test/js/samples/component-static/expected-bundle.js @@ -171,7 +171,7 @@ var proto = { /* generated by Svelte vX.Y.Z */ var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -209,7 +209,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js index d75cce1253cb..a689848dc0d1 100644 --- a/test/js/samples/component-static/expected.js +++ b/test/js/samples/component-static/expected.js @@ -3,7 +3,7 @@ import { assign, callAll, init, noop, proto } from "svelte/shared.js"; var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -41,7 +41,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js index b39f95a77b71..64b09b4353ce 100644 --- a/test/js/samples/computed-collapsed-if/expected-bundle.js +++ b/test/js/samples/computed-collapsed-if/expected-bundle.js @@ -177,7 +177,7 @@ function b(x) { return x * 3; } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -197,7 +197,7 @@ function SvelteComponent(options) { this._state = assign({}, options.data); this._recompute({ x: 1 }, this._state); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js index c2f5e3c2be9b..e4a2fe00ef32 100644 --- a/test/js/samples/computed-collapsed-if/expected.js +++ b/test/js/samples/computed-collapsed-if/expected.js @@ -9,7 +9,7 @@ function b(x) { return x * 3; } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -29,7 +29,7 @@ function SvelteComponent(options) { this._state = assign({}, options.data); this._recompute({ x: 1 }, this._state); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js index 91662053a4f1..66bb102184a4 100644 --- a/test/js/samples/css-media-query/expected-bundle.js +++ b/test/js/samples/css-media-query/expected-bundle.js @@ -200,7 +200,7 @@ function add_css() { appendNode(style, document.head); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -233,7 +233,7 @@ function SvelteComponent(options) { if (!document.getElementById("svelte-3905933315-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js index 37afa6b42a80..6e03ca0a0ae0 100644 --- a/test/js/samples/css-media-query/expected.js +++ b/test/js/samples/css-media-query/expected.js @@ -12,7 +12,7 @@ function add_css() { appendNode(style, document.head); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -45,7 +45,7 @@ function SvelteComponent(options) { if (!document.getElementById("svelte-3905933315-style")) add_css(); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js index 03e5cef1e24b..486c2d1d8225 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js @@ -181,7 +181,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -214,7 +214,7 @@ class SvelteComponent extends HTMLElement { this.attachShadow({ mode: 'open' }); this.shadowRoot.innerHTML = ``; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this._fragment.c(); this._fragment.m(this.shadowRoot, null); diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js index 496586e632ba..39dd83e5cb96 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -34,7 +34,7 @@ class SvelteComponent extends HTMLElement { this.attachShadow({ mode: 'open' }); this.shadowRoot.innerHTML = ``; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this._fragment.c(); this._fragment.m(this.shadowRoot, null); diff --git a/test/js/samples/deconflict-globals/expected-bundle.js b/test/js/samples/deconflict-globals/expected-bundle.js index ba22542c4b49..841aaf711138 100644 --- a/test/js/samples/deconflict-globals/expected-bundle.js +++ b/test/js/samples/deconflict-globals/expected-bundle.js @@ -179,7 +179,7 @@ function oncreate() { alert(JSON.stringify(data())); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -204,7 +204,7 @@ function SvelteComponent(options) { this._oncreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this.root._oncreate.push(_oncreate); diff --git a/test/js/samples/deconflict-globals/expected.js b/test/js/samples/deconflict-globals/expected.js index 8730f4e3c3ce..d740fe634dcd 100644 --- a/test/js/samples/deconflict-globals/expected.js +++ b/test/js/samples/deconflict-globals/expected.js @@ -11,7 +11,7 @@ function oncreate() { alert(JSON.stringify(data())); }; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -36,7 +36,7 @@ function SvelteComponent(options) { this._oncreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this.root._oncreate.push(_oncreate); diff --git a/test/js/samples/do-use-dataset/expected-bundle.js b/test/js/samples/do-use-dataset/expected-bundle.js index 2079e6607c98..b6667c9c912b 100644 --- a/test/js/samples/do-use-dataset/expected-bundle.js +++ b/test/js/samples/do-use-dataset/expected-bundle.js @@ -185,7 +185,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1; return { @@ -227,7 +227,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/do-use-dataset/expected.js b/test/js/samples/do-use-dataset/expected.js index 1ae7417469c6..27a335d0a64a 100644 --- a/test/js/samples/do-use-dataset/expected.js +++ b/test/js/samples/do-use-dataset/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1; return { @@ -43,7 +43,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); 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 index efcfcc8f30c6..643e30296840 100644 --- a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js @@ -189,7 +189,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1; return { @@ -231,7 +231,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected.js b/test/js/samples/dont-use-dataset-in-legacy/expected.js index 03eef26ced21..e9062d7ba1f6 100644 --- a/test/js/samples/dont-use-dataset-in-legacy/expected.js +++ b/test/js/samples/dont-use-dataset-in-legacy/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1; return { @@ -43,7 +43,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); 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 index cf43bbd1300d..5c9ef31f54f4 100644 --- a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js @@ -189,7 +189,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var svg, g, g_1; return { @@ -229,7 +229,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/dont-use-dataset-in-svg/expected.js b/test/js/samples/dont-use-dataset-in-svg/expected.js index b87f1522981a..9e541886bcfe 100644 --- a/test/js/samples/dont-use-dataset-in-svg/expected.js +++ b/test/js/samples/dont-use-dataset-in-svg/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createSvgElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var svg, g, g_1; return { @@ -41,7 +41,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index e35826e354d9..f90627f266af 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -201,7 +201,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var text, p, text_1; var comments = state.comments; @@ -209,7 +209,10 @@ function create_main_fragment(state, component) { var each_blocks = []; for (var i = 0; i < comments.length; i += 1) { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i] = create_each_block(component, assign({}, state, { + comment: comments[i], + i: i + })); } return { @@ -238,10 +241,15 @@ function create_main_fragment(state, component) { if (changed.comments || changed.elapsed || changed.time) { for (var i = 0; i < comments.length; i += 1) { + var each_context = assign({}, state, { + comment: comments[i], + i: i + }); + if (each_blocks[i]) { - each_blocks[i].p(changed, state, comments, comments[i], i); + each_blocks[i].p(changed, each_context); } else { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i] = create_each_block(component, each_context); each_blocks[i].c(); each_blocks[i].m(text.parentNode, text); } @@ -275,14 +283,14 @@ function create_main_fragment(state, component) { } // (1:0) {{#each comments as comment, i}} -function create_each_block(state, comments, comment, i, component) { - var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; +function create_each_block(component, state) { + var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; return { c: function create() { div = createElement("div"); strong = createElement("strong"); - text = createText(i); + text = createText(state.i); text_1 = createText("\n\n\t\t"); span = createElement("span"); text_2 = createText(text_2_value); @@ -314,16 +322,16 @@ function create_each_block(state, comments, comment, i, component) { raw_before.insertAdjacentHTML("afterend", raw_value); }, - p: function update(changed, state, comments, comment, i) { - if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { + p: function update(changed, state) { + if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { text_2.data = text_2_value; } - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.comment.time, state.time))) { text_4.data = text_4_value; } - if ((changed.comments) && raw_value !== (raw_value = comment.html)) { + if ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { detachAfter(raw_before); raw_before.insertAdjacentHTML("afterend", raw_value); } @@ -343,7 +351,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index 29a57322e014..414fcb3f061e 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var text, p, text_1; var comments = state.comments; @@ -9,7 +9,10 @@ function create_main_fragment(state, component) { var each_blocks = []; for (var i = 0; i < comments.length; i += 1) { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i] = create_each_block(component, assign({}, state, { + comment: comments[i], + i: i + })); } return { @@ -38,10 +41,15 @@ function create_main_fragment(state, component) { if (changed.comments || changed.elapsed || changed.time) { for (var i = 0; i < comments.length; i += 1) { + var each_context = assign({}, state, { + comment: comments[i], + i: i + }); + if (each_blocks[i]) { - each_blocks[i].p(changed, state, comments, comments[i], i); + each_blocks[i].p(changed, each_context); } else { - each_blocks[i] = create_each_block(state, comments, comments[i], i, component); + each_blocks[i] = create_each_block(component, each_context); each_blocks[i].c(); each_blocks[i].m(text.parentNode, text); } @@ -75,14 +83,14 @@ function create_main_fragment(state, component) { } // (1:0) {{#each comments as comment, i}} -function create_each_block(state, comments, comment, i, component) { - var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; +function create_each_block(component, state) { + var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; return { c: function create() { div = createElement("div"); strong = createElement("strong"); - text = createText(i); + text = createText(state.i); text_1 = createText("\n\n\t\t"); span = createElement("span"); text_2 = createText(text_2_value); @@ -114,16 +122,16 @@ function create_each_block(state, comments, comment, i, component) { raw_before.insertAdjacentHTML("afterend", raw_value); }, - p: function update(changed, state, comments, comment, i) { - if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { + p: function update(changed, state) { + if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { text_2.data = text_2_value; } - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.comment.time, state.time))) { text_4.data = text_4_value; } - if ((changed.comments) && raw_value !== (raw_value = comment.html)) { + if ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { detachAfter(raw_before); raw_before.insertAdjacentHTML("afterend", raw_value); } @@ -143,7 +151,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js index 43db3035a350..252257d9e2e5 100644 --- a/test/js/samples/event-handlers-custom/expected-bundle.js +++ b/test/js/samples/event-handlers-custom/expected-bundle.js @@ -191,7 +191,7 @@ var methods = { } }; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var button, foo_handler; return { @@ -228,7 +228,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js index f7862efb627b..785fefbeef32 100644 --- a/test/js/samples/event-handlers-custom/expected.js +++ b/test/js/samples/event-handlers-custom/expected.js @@ -11,7 +11,7 @@ var methods = { } }; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var button, foo_handler; return { @@ -48,7 +48,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/head-no-whitespace/expected-bundle.js b/test/js/samples/head-no-whitespace/expected-bundle.js index 91f894bc301c..60a9e85bf010 100644 --- a/test/js/samples/head-no-whitespace/expected-bundle.js +++ b/test/js/samples/head-no-whitespace/expected-bundle.js @@ -181,7 +181,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var meta, meta_1; return { @@ -218,7 +218,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js index 32a1a5da8816..9ba161c69d2d 100644 --- a/test/js/samples/head-no-whitespace/expected.js +++ b/test/js/samples/head-no-whitespace/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, detachNode, init, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var meta, meta_1; return { @@ -38,7 +38,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js index b309a25e9698..6caf1e5853f5 100644 --- a/test/js/samples/if-block-no-update/expected-bundle.js +++ b/test/js/samples/if-block-no-update/expected-bundle.js @@ -185,11 +185,11 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var if_block_anchor; var current_block_type = select_block_type(state); - var if_block = current_block_type(state, component); + var if_block = current_block_type(component, state); return { c: function create() { @@ -206,7 +206,7 @@ function create_main_fragment(state, component) { if (current_block_type !== (current_block_type = select_block_type(state))) { if_block.u(); if_block.d(); - if_block = current_block_type(state, component); + if_block = current_block_type(component, state); if_block.c(); if_block.m(if_block_anchor.parentNode, if_block_anchor); } @@ -224,7 +224,7 @@ function create_main_fragment(state, component) { } // (1:0) {{#if foo}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -246,7 +246,7 @@ function create_if_block(state, component) { } // (3:0) {{else}} -function create_if_block_1(state, component) { +function create_if_block_1(component, state) { var p; return { @@ -276,7 +276,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js index 8f030e4e5336..a6e7f09d8d84 100644 --- a/test/js/samples/if-block-no-update/expected.js +++ b/test/js/samples/if-block-no-update/expected.js @@ -1,11 +1,11 @@ /* generated by Svelte vX.Y.Z */ import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var if_block_anchor; var current_block_type = select_block_type(state); - var if_block = current_block_type(state, component); + var if_block = current_block_type(component, state); return { c: function create() { @@ -22,7 +22,7 @@ function create_main_fragment(state, component) { if (current_block_type !== (current_block_type = select_block_type(state))) { if_block.u(); if_block.d(); - if_block = current_block_type(state, component); + if_block = current_block_type(component, state); if_block.c(); if_block.m(if_block_anchor.parentNode, if_block_anchor); } @@ -40,7 +40,7 @@ function create_main_fragment(state, component) { } // (1:0) {{#if foo}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -62,7 +62,7 @@ function create_if_block(state, component) { } // (3:0) {{else}} -function create_if_block_1(state, component) { +function create_if_block_1(component, state) { var p; return { @@ -92,7 +92,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js index 5084639f4b9b..78b31ecb3d84 100644 --- a/test/js/samples/if-block-simple/expected-bundle.js +++ b/test/js/samples/if-block-simple/expected-bundle.js @@ -185,10 +185,10 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var if_block_anchor; - var if_block = (state.foo) && create_if_block(state, component); + var if_block = (state.foo) && create_if_block(component, state); return { c: function create() { @@ -204,7 +204,7 @@ function create_main_fragment(state, component) { p: function update(changed, state) { if (state.foo) { if (!if_block) { - if_block = create_if_block(state, component); + if_block = create_if_block(component, state); if_block.c(); if_block.m(if_block_anchor.parentNode, if_block_anchor); } @@ -227,7 +227,7 @@ function create_main_fragment(state, component) { } // (1:0) {{#if foo}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -252,7 +252,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js index 0b9fbece701e..4c999546c0fa 100644 --- a/test/js/samples/if-block-simple/expected.js +++ b/test/js/samples/if-block-simple/expected.js @@ -1,10 +1,10 @@ /* generated by Svelte vX.Y.Z */ import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var if_block_anchor; - var if_block = (state.foo) && create_if_block(state, component); + var if_block = (state.foo) && create_if_block(component, state); return { c: function create() { @@ -20,7 +20,7 @@ function create_main_fragment(state, component) { p: function update(changed, state) { if (state.foo) { if (!if_block) { - if_block = create_if_block(state, component); + if_block = create_if_block(component, state); if_block.c(); if_block.m(if_block_anchor.parentNode, if_block_anchor); } @@ -43,7 +43,7 @@ function create_main_fragment(state, component) { } // (1:0) {{#if foo}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -68,7 +68,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js index 753d61db71c4..b40b46e4c5da 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js @@ -185,7 +185,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -225,7 +225,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized-multiple/expected.js b/test/js/samples/inline-style-optimized-multiple/expected.js index 77173460e2e7..ce3ffda24391 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected.js +++ b/test/js/samples/inline-style-optimized-multiple/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -41,7 +41,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js index cf360881b1bd..ce83c0473cc9 100644 --- a/test/js/samples/inline-style-optimized-url/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js @@ -185,7 +185,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -220,7 +220,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js index bed00356f6be..376cad092af7 100644 --- a/test/js/samples/inline-style-optimized-url/expected.js +++ b/test/js/samples/inline-style-optimized-url/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -36,7 +36,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js index 38024df4ff8c..60d3574d4f69 100644 --- a/test/js/samples/inline-style-optimized/expected-bundle.js +++ b/test/js/samples/inline-style-optimized/expected-bundle.js @@ -185,7 +185,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -220,7 +220,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-optimized/expected.js b/test/js/samples/inline-style-optimized/expected.js index 7f873e296c1f..74c4b6f417f1 100644 --- a/test/js/samples/inline-style-optimized/expected.js +++ b/test/js/samples/inline-style-optimized/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -36,7 +36,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js index 320c733a43dc..368d9aeb1533 100644 --- a/test/js/samples/inline-style-unoptimized/expected-bundle.js +++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js @@ -185,7 +185,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1, div_1_style_value; return { @@ -231,7 +231,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js index 4c4d38d2bfe2..04e1226f6d1a 100644 --- a/test/js/samples/inline-style-unoptimized/expected.js +++ b/test/js/samples/inline-style-unoptimized/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, div_1, div_1_style_value; return { @@ -47,7 +47,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js index eacaca85a623..dcb3d2e0616b 100644 --- a/test/js/samples/input-without-blowback-guard/expected-bundle.js +++ b/test/js/samples/input-without-blowback-guard/expected-bundle.js @@ -189,7 +189,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var input; function input_change_handler() { @@ -231,7 +231,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js index 03f27ab6d972..d313c7c01d35 100644 --- a/test/js/samples/input-without-blowback-guard/expected.js +++ b/test/js/samples/input-without-blowback-guard/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { addListener, assign, createElement, detachNode, init, insertNode, proto, removeListener } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var input; function input_change_handler() { @@ -43,7 +43,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js index 7b730f08d921..b0174e2105f2 100644 --- a/test/js/samples/legacy-input-type/expected-bundle.js +++ b/test/js/samples/legacy-input-type/expected-bundle.js @@ -187,7 +187,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var input; return { @@ -218,7 +218,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/legacy-input-type/expected.js b/test/js/samples/legacy-input-type/expected.js index 719f550044e7..5236b758dcbf 100644 --- a/test/js/samples/legacy-input-type/expected.js +++ b/test/js/samples/legacy-input-type/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, createElement, detachNode, init, insertNode, noop, proto, setInputType } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var input; return { @@ -32,7 +32,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js index 499a82c46e4e..3956acd874d5 100644 --- a/test/js/samples/legacy-quote-class/expected-bundle.js +++ b/test/js/samples/legacy-quote-class/expected-bundle.js @@ -204,7 +204,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -243,7 +243,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { var nodes = children(options.target); diff --git a/test/js/samples/legacy-quote-class/expected.js b/test/js/samples/legacy-quote-class/expected.js index 0b49103c4762..76490fd6f98f 100644 --- a/test/js/samples/legacy-quote-class/expected.js +++ b/test/js/samples/legacy-quote-class/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, children, claimElement, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div; return { @@ -40,7 +40,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { var nodes = children(options.target); diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js index bbd56d81237b..75e852e83566 100644 --- a/test/js/samples/media-bindings/expected-bundle.js +++ b/test/js/samples/media-bindings/expected-bundle.js @@ -197,7 +197,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var audio, audio_is_paused = true, audio_updating = false, audio_animationframe; function audio_timeupdate_handler() { @@ -289,7 +289,7 @@ function SvelteComponent(options) { this._beforecreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js index ae80f288f683..527e233cfda3 100644 --- a/test/js/samples/media-bindings/expected.js +++ b/test/js/samples/media-bindings/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { addListener, assign, callAll, createElement, detachNode, init, insertNode, proto, removeListener, timeRangesToArray } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var audio, audio_is_paused = true, audio_updating = false, audio_animationframe; function audio_timeupdate_handler() { @@ -93,7 +93,7 @@ function SvelteComponent(options) { this._beforecreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js index f8e0722db702..1b85f2f9d9d2 100644 --- a/test/js/samples/non-imported-component/expected-bundle.js +++ b/test/js/samples/non-imported-component/expected-bundle.js @@ -183,7 +183,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var text; var imported = new Imported({ @@ -232,7 +232,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js index e7fc2c72558b..089e8db6e5b8 100644 --- a/test/js/samples/non-imported-component/expected.js +++ b/test/js/samples/non-imported-component/expected.js @@ -4,7 +4,7 @@ import Imported from 'Imported.html'; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var text; var imported = new Imported({ @@ -53,7 +53,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js index e53dd0de5e91..9f59cc8a9a14 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js @@ -173,7 +173,7 @@ function oncreate() {} function ondestroy() {} -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -200,7 +200,7 @@ function SvelteComponent(options) { this._oncreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this.root._oncreate.push(_oncreate); diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js index 51763c0b00a1..83e8d6200fd3 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected.js @@ -5,7 +5,7 @@ function oncreate() {}; function ondestroy() {}; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -32,7 +32,7 @@ function SvelteComponent(options) { this._oncreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); this.root._oncreate.push(_oncreate); diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js index 58ee3a67a03c..988103bc3244 100644 --- a/test/js/samples/setup-method/expected-bundle.js +++ b/test/js/samples/setup-method/expected-bundle.js @@ -185,7 +185,7 @@ function setup(Component) { Component.prototype.foo( 'baz' ); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -204,7 +204,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js index 092a32ed3b63..e4778f582657 100644 --- a/test/js/samples/setup-method/expected.js +++ b/test/js/samples/setup-method/expected.js @@ -17,7 +17,7 @@ function setup(Component) { Component.prototype.foo( 'baz' ); } -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { return { c: noop, @@ -36,7 +36,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/svg-title/expected-bundle.js b/test/js/samples/svg-title/expected-bundle.js index 12f06bcf9226..2ded30910d29 100644 --- a/test/js/samples/svg-title/expected-bundle.js +++ b/test/js/samples/svg-title/expected-bundle.js @@ -189,7 +189,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var svg, title, text; return { @@ -219,7 +219,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/svg-title/expected.js b/test/js/samples/svg-title/expected.js index 39ccf227c0ab..059d1d804d81 100644 --- a/test/js/samples/svg-title/expected.js +++ b/test/js/samples/svg-title/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createSvgElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var svg, title, text; return { @@ -31,7 +31,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/title/expected-bundle.js b/test/js/samples/title/expected-bundle.js index 6eb3471b5b2e..f52f89a71ad4 100644 --- a/test/js/samples/title/expected-bundle.js +++ b/test/js/samples/title/expected-bundle.js @@ -169,7 +169,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var title_value; document.title = title_value = "a " + state.custom + " title"; @@ -195,7 +195,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js index 6aa903d25ec2..d5546cd4c2d2 100644 --- a/test/js/samples/title/expected.js +++ b/test/js/samples/title/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { assign, init, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var title_value; document.title = title_value = "a " + state.custom + " title"; @@ -27,7 +27,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js index e2ee1e61fba2..6ece6bffa7eb 100644 --- a/test/js/samples/use-elements-as-anchors/expected-bundle.js +++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js @@ -193,18 +193,18 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor; - var if_block = (state.a) && create_if_block(state, component); + var if_block = (state.a) && create_if_block(component, state); - var if_block_1 = (state.b) && create_if_block_1(state, component); + var if_block_1 = (state.b) && create_if_block_1(component, state); - var if_block_2 = (state.c) && create_if_block_2(state, component); + var if_block_2 = (state.c) && create_if_block_2(component, state); - var if_block_3 = (state.d) && create_if_block_3(state, component); + var if_block_3 = (state.d) && create_if_block_3(component, state); - var if_block_4 = (state.e) && create_if_block_4(state, component); + var if_block_4 = (state.e) && create_if_block_4(component, state); return { c: function create() { @@ -248,7 +248,7 @@ function create_main_fragment(state, component) { p: function update(changed, state) { if (state.a) { if (!if_block) { - if_block = create_if_block(state, component); + if_block = create_if_block(component, state); if_block.c(); if_block.m(div, text); } @@ -260,7 +260,7 @@ function create_main_fragment(state, component) { if (state.b) { if (!if_block_1) { - if_block_1 = create_if_block_1(state, component); + if_block_1 = create_if_block_1(component, state); if_block_1.c(); if_block_1.m(div, text_3); } @@ -272,7 +272,7 @@ function create_main_fragment(state, component) { if (state.c) { if (!if_block_2) { - if_block_2 = create_if_block_2(state, component); + if_block_2 = create_if_block_2(component, state); if_block_2.c(); if_block_2.m(div, text_4); } @@ -284,7 +284,7 @@ function create_main_fragment(state, component) { if (state.d) { if (!if_block_3) { - if_block_3 = create_if_block_3(state, component); + if_block_3 = create_if_block_3(component, state); if_block_3.c(); if_block_3.m(div, null); } @@ -296,7 +296,7 @@ function create_main_fragment(state, component) { if (state.e) { if (!if_block_4) { - if_block_4 = create_if_block_4(state, component); + if_block_4 = create_if_block_4(component, state); if_block_4.c(); if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor); } @@ -329,7 +329,7 @@ function create_main_fragment(state, component) { } // (2:1) {{#if a}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -351,7 +351,7 @@ function create_if_block(state, component) { } // (8:1) {{#if b}} -function create_if_block_1(state, component) { +function create_if_block_1(component, state) { var p; return { @@ -373,7 +373,7 @@ function create_if_block_1(state, component) { } // (12:1) {{#if c}} -function create_if_block_2(state, component) { +function create_if_block_2(component, state) { var p; return { @@ -395,7 +395,7 @@ function create_if_block_2(state, component) { } // (18:1) {{#if d}} -function create_if_block_3(state, component) { +function create_if_block_3(component, state) { var p; return { @@ -417,7 +417,7 @@ function create_if_block_3(state, component) { } // (25:0) {{#if e}} -function create_if_block_4(state, component) { +function create_if_block_4(component, state) { var p; return { @@ -442,7 +442,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js index d2609c45b056..0ff85d63b09d 100644 --- a/test/js/samples/use-elements-as-anchors/expected.js +++ b/test/js/samples/use-elements-as-anchors/expected.js @@ -1,18 +1,18 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor; - var if_block = (state.a) && create_if_block(state, component); + var if_block = (state.a) && create_if_block(component, state); - var if_block_1 = (state.b) && create_if_block_1(state, component); + var if_block_1 = (state.b) && create_if_block_1(component, state); - var if_block_2 = (state.c) && create_if_block_2(state, component); + var if_block_2 = (state.c) && create_if_block_2(component, state); - var if_block_3 = (state.d) && create_if_block_3(state, component); + var if_block_3 = (state.d) && create_if_block_3(component, state); - var if_block_4 = (state.e) && create_if_block_4(state, component); + var if_block_4 = (state.e) && create_if_block_4(component, state); return { c: function create() { @@ -56,7 +56,7 @@ function create_main_fragment(state, component) { p: function update(changed, state) { if (state.a) { if (!if_block) { - if_block = create_if_block(state, component); + if_block = create_if_block(component, state); if_block.c(); if_block.m(div, text); } @@ -68,7 +68,7 @@ function create_main_fragment(state, component) { if (state.b) { if (!if_block_1) { - if_block_1 = create_if_block_1(state, component); + if_block_1 = create_if_block_1(component, state); if_block_1.c(); if_block_1.m(div, text_3); } @@ -80,7 +80,7 @@ function create_main_fragment(state, component) { if (state.c) { if (!if_block_2) { - if_block_2 = create_if_block_2(state, component); + if_block_2 = create_if_block_2(component, state); if_block_2.c(); if_block_2.m(div, text_4); } @@ -92,7 +92,7 @@ function create_main_fragment(state, component) { if (state.d) { if (!if_block_3) { - if_block_3 = create_if_block_3(state, component); + if_block_3 = create_if_block_3(component, state); if_block_3.c(); if_block_3.m(div, null); } @@ -104,7 +104,7 @@ function create_main_fragment(state, component) { if (state.e) { if (!if_block_4) { - if_block_4 = create_if_block_4(state, component); + if_block_4 = create_if_block_4(component, state); if_block_4.c(); if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor); } @@ -137,7 +137,7 @@ function create_main_fragment(state, component) { } // (2:1) {{#if a}} -function create_if_block(state, component) { +function create_if_block(component, state) { var p; return { @@ -159,7 +159,7 @@ function create_if_block(state, component) { } // (8:1) {{#if b}} -function create_if_block_1(state, component) { +function create_if_block_1(component, state) { var p; return { @@ -181,7 +181,7 @@ function create_if_block_1(state, component) { } // (12:1) {{#if c}} -function create_if_block_2(state, component) { +function create_if_block_2(component, state) { var p; return { @@ -203,7 +203,7 @@ function create_if_block_2(state, component) { } // (18:1) {{#if d}} -function create_if_block_3(state, component) { +function create_if_block_3(component, state) { var p; return { @@ -225,7 +225,7 @@ function create_if_block_3(state, component) { } // (25:0) {{#if e}} -function create_if_block_4(state, component) { +function create_if_block_4(component, state) { var p; return { @@ -250,7 +250,7 @@ function SvelteComponent(options) { init(this, options); this._state = assign({}, options.data); - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/window-binding-scroll/expected-bundle.js b/test/js/samples/window-binding-scroll/expected-bundle.js index a8a932c8b7cf..b310a6a839c7 100644 --- a/test/js/samples/window-binding-scroll/expected-bundle.js +++ b/test/js/samples/window-binding-scroll/expected-bundle.js @@ -189,7 +189,7 @@ var proto = { }; /* generated by Svelte vX.Y.Z */ -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1; function onwindowscroll(event) { @@ -244,7 +244,7 @@ function SvelteComponent(options) { this._state = assign({}, options.data); this._state.y = window.scrollY; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js index 70eae003d7b9..aa265f45997e 100644 --- a/test/js/samples/window-binding-scroll/expected.js +++ b/test/js/samples/window-binding-scroll/expected.js @@ -1,7 +1,7 @@ /* generated by Svelte vX.Y.Z */ import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js"; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1; function onwindowscroll(event) { @@ -56,7 +56,7 @@ function SvelteComponent(options) { this._state = assign({}, options.data); this._state.y = window.scrollY; - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); From a0aeb98685ff820b60191730f149d7550a6da0cf Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 10:00:23 -0500 Subject: [PATCH 03/13] various fixes --- src/generators/dom/Block.ts | 2 +- src/generators/nodes/AwaitBlock.ts | 16 ++++++++-------- src/generators/nodes/Component.ts | 4 ++-- src/generators/nodes/EachBlock.ts | 25 ++++++++++++++++--------- src/generators/nodes/Element.ts | 4 ++-- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index 2a50b3cfdbad..15ee602ee2bc 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -326,7 +326,7 @@ export default class Block { return deindent` ${this.comment && `// ${escape(this.comment)}`} - function ${this.name}(#component, state${this.key ? `, ${localKey}` : ''}) { + function ${this.name}(#component${this.key ? `, ${localKey}` : ''}, state) { ${this.variables.size > 0 && `var ${Array.from(this.variables.keys()) .map(key => { diff --git a/src/generators/nodes/AwaitBlock.ts b/src/generators/nodes/AwaitBlock.ts index c5cce6575812..5fa04d2c7490 100644 --- a/src/generators/nodes/AwaitBlock.ts +++ b/src/generators/nodes/AwaitBlock.ts @@ -35,7 +35,7 @@ export default class AwaitBlock extends Node { ].forEach(([status, arg]) => { const child = this[status]; - const context = block.getUniqueName(arg || '_'); // TODO can we remove the extra param from pending blocks? + const context = arg || '_'; const contexts = new Map(block.contexts); contexts.set(arg, context); @@ -103,11 +103,11 @@ export default class AwaitBlock extends Node { // but it's probably not worth it block.builders.init.addBlock(deindent` - function ${replace_await_block}(${token}, type, ${value}, state) { + function ${replace_await_block}(${token}, type, state) { if (${token} !== ${await_token}) return; var ${old_block} = ${await_block}; - ${await_block} = (${await_block_type} = type)(state, ${resolved} = ${value}, #component); + ${await_block} = (${await_block_type} = type)(#component, state); if (${old_block}) { ${old_block}.u(); @@ -125,21 +125,21 @@ export default class AwaitBlock extends Node { if (@isPromise(${promise})) { ${promise}.then(function(${value}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_then_block}, ${value}, state); + ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${value} })); }, function (${error}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_catch_block}, ${error}, state); + ${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, { ${this.catch.block.context}: ${error} })); }); // if we previously had a then/catch block, destroy it if (${await_block_type} !== ${create_pending_block}) { - ${replace_await_block}(${token}, ${create_pending_block}, null, state); + ${replace_await_block}(${token}, ${create_pending_block}, state); return true; } } else { ${resolved} = ${promise}; if (${await_block_type} !== ${create_then_block}) { - ${replace_await_block}(${token}, ${create_then_block}, ${resolved}, state); + ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${resolved} })); return true; } } @@ -182,7 +182,7 @@ export default class AwaitBlock extends Node { if (${conditions.join(' && ')}) { // nothing } else { - ${await_block}.p(changed, state, ${resolved}); + ${await_block}.p(changed, state); } `); } else { diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index 83e88f2bdaca..8039cc2a26c8 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -417,7 +417,7 @@ export default class Component extends Node { const listName = block.listNames.get(contextName); const indexName = block.indexNames.get(contextName); - return `${listName}: ${listName},\n${indexName}: ${indexName}`; + return `${listName}: state.${listName},\n${indexName}: state.${indexName}`; }) .join(',\n'); @@ -428,7 +428,7 @@ export default class Component extends Node { const listName = block.listNames.get(contextName); const indexName = block.indexNames.get(contextName); - return `${name_context}.${listName} = ${listName};\n${name_context}.${indexName} = ${indexName};`; + return `${name_context}.${listName} = state.${listName};\n${name_context}.${indexName} = state.${indexName};`; }) .join('\n'); diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts index 9a094affe4f5..5e6669254acd 100644 --- a/src/generators/nodes/EachBlock.ts +++ b/src/generators/nodes/EachBlock.ts @@ -35,12 +35,11 @@ export default class EachBlock extends Node { block.addDependencies(dependencies); const indexNames = new Map(block.indexNames); - const indexName = - this.index || block.getUniqueName(`${this.context}_index`); + const indexName = this.index || `${this.context}_index`; indexNames.set(this.context, indexName); const listNames = new Map(block.listNames); - const listName = block.getUniqueName( + const listName = ( (this.expression.type === 'MemberExpression' && !this.expression.computed) ? this.expression.property.name : this.expression.type === 'Identifier' ? this.expression.name : `each_value` @@ -50,9 +49,9 @@ export default class EachBlock extends Node { const contextTypes = new Map(block.contextTypes); contextTypes.set(this.context, 'each'); - const context = block.getUniqueName(this.context); + const context = this.context; const contexts = new Map(block.contexts); - contexts.set(this.context, context); + contexts.set(this.context, context); // TODO this is now redundant const indexes = new Map(block.indexes); if (this.index) indexes.set(this.index, this.context); @@ -272,7 +271,10 @@ export default class EachBlock extends Node { block.builders.init.addBlock(deindent` for (var #i = 0; #i < ${each_block_value}.${length}; #i += 1) { var ${key} = ${each_block_value}[#i].${this.key}; - var ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); + var ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, ${key}, @assign({}, state, { + ${this.context}: ${each_block_value}[#i], + ${this.block.indexName}: #i + })); if (${last}) ${last}.next = ${iteration}; ${iteration}.last = ${last}; @@ -376,8 +378,13 @@ export default class EachBlock extends Node { var ${key} = ${each_block_value}[#i].${this.key}; var ${iteration} = ${lookup}[${key}]; + var ${this.each_context} = @assign({}, state, { + ${this.context}: ${each_block_value}[#i], + ${this.block.indexName}: #i + }); + ${dynamic && - `if (${iteration}) ${iteration}.p(changed, state);`} + `if (${iteration}) ${iteration}.p(changed, ${this.each_context});`} if (${expected}) { if (${key} === ${expected}.key) { @@ -398,7 +405,7 @@ export default class EachBlock extends Node { if (!${expected}) ${iteration}.m(${updateMountNode}, ${anchor}); } else { // key is being inserted - ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); + ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, ${key}, ${this.each_context}); ${iteration}.c(); ${iteration}.${mountOrIntro}(${updateMountNode}, ${expected}.first); @@ -413,7 +420,7 @@ export default class EachBlock extends Node { ${iteration}.next = null; ${iteration}.m(${updateMountNode}, ${anchor}); } else { - ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, state, ${key}); + ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, ${key}, ${this.each_context}); ${iteration}.c(); ${iteration}.${mountOrIntro}(${updateMountNode}, ${anchor}); } diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts index a512b21d9479..13f8ccff5c27 100644 --- a/src/generators/nodes/Element.ts +++ b/src/generators/nodes/Element.ts @@ -386,10 +386,10 @@ export default class Element extends Node { const indexName = block.indexNames.get(contextName); initialProps.push( - `${listName}: ${listName},\n${indexName}: ${indexName}` + `${listName}: state.${listName},\n${indexName}: state.${indexName}` ); updates.push( - `${name}._svelte.${listName} = ${listName};\n${name}._svelte.${indexName} = ${indexName};` + `${name}._svelte.${listName} = state.${listName};\n${name}._svelte.${indexName} = state.${indexName};` ); }); From c3a08788e66ec7076a7e138f5b0278283965b271 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 10:19:52 -0500 Subject: [PATCH 04/13] get destructuring working --- src/generators/nodes/EachBlock.ts | 24 ++++++++++++------- .../visitors/EachBlock.ts | 4 +++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts index 5e6669254acd..7133ce8eac22 100644 --- a/src/generators/nodes/EachBlock.ts +++ b/src/generators/nodes/EachBlock.ts @@ -83,6 +83,18 @@ export default class EachBlock extends Node { listNames }); + this.contextProps = [ + `${context}: ${listName}[#i]`, + `${indexName}: #i` + ]; + + if (this.destructuredContexts) { + for (let i = 0; i < this.destructuredContexts.length; i += 1) { + contexts.set(this.destructuredContexts[i], `${context}[${i}]`); + this.contextProps.push(`${this.destructuredContexts[i]}: ${listName}[#i][${i}]`); + } + } + this.generator.blocks.push(this.block); this.initChildren(this.block, stripWhitespace, nextSibling); block.addDependencies(this.block.dependencies); @@ -272,8 +284,7 @@ export default class EachBlock extends Node { for (var #i = 0; #i < ${each_block_value}.${length}; #i += 1) { var ${key} = ${each_block_value}[#i].${this.key}; var ${iteration} = ${lookup}[${key}] = ${create_each_block}(#component, ${key}, @assign({}, state, { - ${this.context}: ${each_block_value}[#i], - ${this.block.indexName}: #i + ${this.contextProps.join(',\n')} })); if (${last}) ${last}.next = ${iteration}; @@ -379,8 +390,7 @@ export default class EachBlock extends Node { var ${iteration} = ${lookup}[${key}]; var ${this.each_context} = @assign({}, state, { - ${this.context}: ${each_block_value}[#i], - ${this.block.indexName}: #i + ${this.contextProps.join(',\n')} }); ${dynamic && @@ -477,8 +487,7 @@ export default class EachBlock extends Node { for (var #i = 0; #i < ${each_block_value}.${length}; #i += 1) { ${iterations}[#i] = ${create_each_block}(#component, @assign({}, state, { - ${this.context}: ${each_block_value}[#i], - ${this.block.indexName}: #i + ${this.contextProps.join(',\n')} })); } `); @@ -576,8 +585,7 @@ export default class EachBlock extends Node { if (${condition}) { for (var #i = ${start}; #i < ${each_block_value}.${length}; #i += 1) { var ${this.each_context} = @assign({}, state, { - ${this.context}: ${each_block_value}[#i], - ${this.block.indexName}: #i + ${this.contextProps.join(',\n')} }); ${forLoopBody} diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts index 59bd5fed0b6c..9a5ec300ca14 100644 --- a/src/generators/server-side-rendering/visitors/EachBlock.ts +++ b/src/generators/server-side-rendering/visitors/EachBlock.ts @@ -11,7 +11,9 @@ export default function visitEachBlock( block.contextualise(node.expression); const { dependencies, snippet } = node.metadata; - const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${node.context}, ${node.index})` : node.context} => \``; + const context = node.destructuredContexts ? `[${node.destructuredContexts.join(', ')}]` : node.context; + + const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${context}, ${node.index})` : `(${context})`} => \``; generator.append(open); // TODO should this be the generator's job? It's duplicated between From fcae19b5d834a7d3b6631172a9d46304217f611c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 10:32:02 -0500 Subject: [PATCH 05/13] fix --- src/generators/nodes/Component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index 8039cc2a26c8..661bfd7d1525 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -527,8 +527,8 @@ function mungeBinding(binding: Node, block: Block): Binding { let prop; if (contextual) { - obj = block.listNames.get(name); - prop = block.indexNames.get(name); + obj = `state.${block.listNames.get(name)}`; + prop = `state.${block.indexNames.get(name)}`; } else if (binding.value.type === 'MemberExpression') { prop = `[✂${binding.value.property.start}-${binding.value.property.end}✂]`; if (!binding.value.computed) prop = `'${prop}'`; From 242f08e328ce705d01ec908a8ea89bf1944740df Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 11:36:03 -0500 Subject: [PATCH 06/13] temporary hack around context issue --- src/generators/nodes/Component.ts | 82 ++++++++++++++++--------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index 1fc249e960ef..c3214578a7f4 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -93,7 +93,7 @@ export default class Component extends Node { const bindings = this.attributes .filter(a => a.type === 'Binding') - .map(a => mungeBinding(a, block)); + .map(a => mungeBinding(a, block, name_context)); const eventHandlers = this.attributes .filter((a: Node) => a.type === 'EventHandler') @@ -220,8 +220,10 @@ export default class Component extends Node { componentInitProperties.push(`data: ${name_initial_data}`); + block.addVariable('__state__TODO', 'state'); + block.builders.update.addLine(`__state__TODO = state`); const initialisers = [ - 'state = #component.get()', + 'state = __state__TODO', hasLocalBindings && 'newState = {}', hasStoreBindings && 'newStoreState = {}', ].filter(Boolean).join(', '); @@ -246,6 +248,41 @@ export default class Component extends Node { } } + // maintain component context + if (allContexts.size) { + const contexts = Array.from(allContexts); + + const initialProps = contexts + .map(contextName => { + if (contextName === 'state') return `state: state`; + + const listName = block.listNames.get(contextName); + const indexName = block.indexNames.get(contextName); + + return `${listName}: state.${listName},\n${indexName}: state.${indexName}`; + }) + .join(',\n'); + + const updates = contexts + .map(contextName => { + if (contextName === 'state') return `${name_context}.state = state;`; + + const listName = block.listNames.get(contextName); + const indexName = block.indexNames.get(contextName); + + return `${name_context}.${listName} = state.${listName};\n${name_context}.${indexName} = state.${indexName};`; + }) + .join('\n'); + + block.builders.init.addBlock(deindent` + var ${name_context} = { + ${initialProps} + }; + `); + + block.builders.update.addBlock(updates); + } + const isDynamicComponent = this.name === ':Component'; const switch_vars = isDynamicComponent && { @@ -391,41 +428,6 @@ export default class Component extends Node { ${ref && `if (#component.refs.${ref.name} === ${name}) #component.refs.${ref.name} = null;`} `); } - - // maintain component context - if (allContexts.size) { - const contexts = Array.from(allContexts); - - const initialProps = contexts - .map(contextName => { - if (contextName === 'state') return `state: state`; - - const listName = block.listNames.get(contextName); - const indexName = block.indexNames.get(contextName); - - return `${listName}: state.${listName},\n${indexName}: state.${indexName}`; - }) - .join(',\n'); - - const updates = contexts - .map(contextName => { - if (contextName === 'state') return `${name_context}.state = state;`; - - const listName = block.listNames.get(contextName); - const indexName = block.indexNames.get(contextName); - - return `${name_context}.${listName} = state.${listName};\n${name_context}.${indexName} = state.${indexName};`; - }) - .join('\n'); - - block.builders.init.addBlock(deindent` - var ${name_context} = { - ${initialProps} - }; - `); - - block.builders.update.addBlock(updates); - } } } @@ -502,7 +504,7 @@ function mungeAttribute(attribute: Node, block: Block): Attribute { }; } -function mungeBinding(binding: Node, block: Block): Binding { +function mungeBinding(binding: Node, block: Block, name_context: string): Binding { const { name } = getObject(binding.value); const { contexts } = block.contextualise(binding.value); const { dependencies, snippet } = binding.metadata; @@ -513,8 +515,8 @@ function mungeBinding(binding: Node, block: Block): Binding { let prop; if (contextual) { - obj = `state.${block.listNames.get(name)}`; - prop = `state.${block.indexNames.get(name)}`; + obj = `${name_context}.${block.listNames.get(name)}`; + prop = `${name_context}.${block.indexNames.get(name)}`; } else if (binding.value.type === 'MemberExpression') { prop = `[✂${binding.value.property.start}-${binding.value.property.end}✂]`; if (!binding.value.computed) prop = `'${prop}'`; From b94f63ed704427951c90fd18dddf40a4b9ce0308 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 15:02:25 -0500 Subject: [PATCH 07/13] everything working except some destructuring stuff --- src/generators/Generator.ts | 42 +++++----- src/generators/dom/Block.ts | 25 +++++- src/generators/nodes/AwaitBlock.ts | 12 +-- src/generators/nodes/EachBlock.ts | 80 ++++++++----------- .../expected-bundle.js | 10 ++- .../each-block-changed-check/expected.js | 10 ++- 6 files changed, 100 insertions(+), 79 deletions(-) diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index 5570fe035484..2463c33325a2 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -242,26 +242,30 @@ export default class Generator { if (name === 'event' && isEventHandler) { // noop } else if (contexts.has(name)) { - // const contextName = contexts.get(name); - // if (contextName !== name) { - // // this is true for 'reserved' names like `state` and `component`, - // // also destructured contexts - // code.overwrite( - // node.start, - // node.start + name.length, - // contextName, - // { storeName: true, contentOnly: false } - // ); - - // const destructuredName = contextName.replace(/\[\d+\]/, ''); - // if (destructuredName !== contextName) { - // // so that hoisting the context works correctly - // usedContexts.add(destructuredName); - // } + // if (self.constructor.name === 'DomGenerator') { // TODO filthy, temporary hack + const contextName = contexts.get(name); + if (contextName !== name) { + // this is true for 'reserved' names like `state` and `component`, + // also destructured contexts + + code.overwrite( + node.start, + node.start + name.length, + contextName, + { storeName: true, contentOnly: false } + ); + + const destructuredName = contextName.replace(/\[\d+\]/, ''); + if (destructuredName !== contextName) { + // so that hoisting the context works correctly + usedContexts.add(destructuredName); + } + } + + // TODO filthy, temporary hack + // if (!isEventHandler) code.prependRight(node.start, `state.`); // } - // TODO filthy, temporary hack - if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`); usedContexts.add(name); } else if (helpers.has(name)) { let object = node; @@ -270,7 +274,7 @@ export default class Generator { const alias = self.templateVars.get(`helpers-${name}`); if (alias !== name) code.overwrite(object.start, object.end, alias); } else if (indexes.has(name)) { - if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`); + if (self.constructor.name === 'DomGenerator' && !isEventHandler) code.prependRight(node.start, `state.`); const context = indexes.get(name); usedContexts.add(context); // TODO is this right? diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index 15ee602ee2bc..e1ed62c2428b 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -114,7 +114,12 @@ export default class Block { this.aliases = new Map(); this.variables = new Map(); - this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more + // this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more + + const getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more + this.getUniqueName = name => { + return getUniqueName(name); + } this.hasUpdateMethod = false; // determined later } @@ -189,6 +194,19 @@ export default class Block { this.builders.mount.addLine(`${this.autofocus}.focus();`); } + // TODO `this.contexts` is possibly redundant post-#1122 + const initializers = []; + const updaters = []; + this.contexts.forEach((alias, name) => { + // TODO only the ones that are actually used in this block... + const assignment = `${alias} = state.${name}`; + + initializers.push(assignment); + updaters.push(`${assignment};`); + + this.hasUpdateMethod = true; + }); + // minor hack – we need to ensure that any {{{triples}}} are detached first this.builders.unmount.addBlockAtStart(this.builders.detachRaw.toString()); @@ -248,11 +266,12 @@ export default class Block { } if (this.hasUpdateMethod) { - if (this.builders.update.isEmpty()) { + if (this.builders.update.isEmpty() && updaters.length === 0) { properties.addBlock(`p: @noop,`); } else { properties.addBlock(deindent` p: function update(changed, state) { + ${updaters} ${this.builders.update} }, `); @@ -327,6 +346,8 @@ export default class Block { return deindent` ${this.comment && `// ${escape(this.comment)}`} function ${this.name}(#component${this.key ? `, ${localKey}` : ''}, state) { + ${initializers.length > 0 && + `var ${initializers.join(', ')};`} ${this.variables.size > 0 && `var ${Array.from(this.variables.keys()) .map(key => { diff --git a/src/generators/nodes/AwaitBlock.ts b/src/generators/nodes/AwaitBlock.ts index 5fa04d2c7490..168109614f0d 100644 --- a/src/generators/nodes/AwaitBlock.ts +++ b/src/generators/nodes/AwaitBlock.ts @@ -125,10 +125,12 @@ export default class AwaitBlock extends Node { if (@isPromise(${promise})) { ${promise}.then(function(${value}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${value} })); + ${resolved} = { ${this.then.block.context}: ${value} }; + ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved})); }, function (${error}) { var state = #component.get(); - ${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, { ${this.catch.block.context}: ${error} })); + ${resolved} = { ${this.catch.block.context}: ${error} }; + ${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, ${resolved})); }); // if we previously had a then/catch block, destroy it @@ -137,9 +139,9 @@ export default class AwaitBlock extends Node { return true; } } else { - ${resolved} = ${promise}; + ${resolved} = { ${this.then.block.context}: ${promise} }; if (${await_block_type} !== ${create_then_block}) { - ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${resolved} })); + ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved})); return true; } } @@ -182,7 +184,7 @@ export default class AwaitBlock extends Node { if (${conditions.join(' && ')}) { // nothing } else { - ${await_block}.p(changed, state); + ${await_block}.p(changed, @assign({}, state, ${resolved})); } `); } else { diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts index 7133ce8eac22..4d3479d26d11 100644 --- a/src/generators/nodes/EachBlock.ts +++ b/src/generators/nodes/EachBlock.ts @@ -34,67 +34,57 @@ export default class EachBlock extends Node { const { dependencies } = this.metadata; block.addDependencies(dependencies); - const indexNames = new Map(block.indexNames); - const indexName = this.index || `${this.context}_index`; - indexNames.set(this.context, indexName); - - const listNames = new Map(block.listNames); - const listName = ( - (this.expression.type === 'MemberExpression' && !this.expression.computed) ? this.expression.property.name : - this.expression.type === 'Identifier' ? this.expression.name : - `each_value` - ); - listNames.set(this.context, listName); - - const contextTypes = new Map(block.contextTypes); - contextTypes.set(this.context, 'each'); - - const context = this.context; - const contexts = new Map(block.contexts); - contexts.set(this.context, context); // TODO this is now redundant - - const indexes = new Map(block.indexes); - if (this.index) indexes.set(this.index, this.context); - - const changeableIndexes = new Map(block.changeableIndexes); - if (this.index) changeableIndexes.set(this.index, this.key); - - if (this.destructuredContexts) { - for (let i = 0; i < this.destructuredContexts.length; i += 1) { - contexts.set(this.destructuredContexts[i], `${context}[${i}]`); - } - } - this.block = block.child({ comment: createDebuggingComment(this, this.generator), name: this.generator.getUniqueName('create_each_block'), context: this.context, key: this.key, - contexts, - contextTypes, - indexes, - changeableIndexes, + contexts: new Map(block.contexts), + contextTypes: new Map(block.contextTypes), + indexes: new Map(block.indexes), + changeableIndexes: new Map(block.changeableIndexes), - listName, - indexName, + listName: ( + (this.expression.type === 'MemberExpression' && !this.expression.computed) ? this.expression.property.name : + this.expression.type === 'Identifier' ? this.expression.name : + `each_value` + ), + indexName: this.index || `${this.context}_index`, - indexNames, - listNames + indexNames: new Map(block.indexNames), + listNames: new Map(block.listNames) }); - this.contextProps = [ - `${context}: ${listName}[#i]`, - `${indexName}: #i` - ]; + this.block.contextTypes.set(this.context, 'each'); + this.block.indexNames.set(this.context, this.block.indexName); + this.block.listNames.set(this.context, this.block.listName); + if (this.index) { + this.block.indexes.set(this.index, this.context); + this.block.changeableIndexes.set(this.index, this.key) + } + + const context = this.block.getUniqueName(this.context); + this.block.contexts.set(this.context, context); // TODO this is now redundant? if (this.destructuredContexts) { for (let i = 0; i < this.destructuredContexts.length; i += 1) { - contexts.set(this.destructuredContexts[i], `${context}[${i}]`); - this.contextProps.push(`${this.destructuredContexts[i]}: ${listName}[#i][${i}]`); + this.block.contexts.set(this.destructuredContexts[i], `${context}[${i}]`); } } + this.contextProps = [ + `${this.context}: ${this.block.listName}[#i]`, + `${this.block.indexName}: #i` + ]; + + // if (this.destructuredContexts) { + // for (let i = 0; i < this.destructuredContexts.length; i += 1) { + // contexts.set(this.destructuredContexts[i], `${context}[${i}]`); + // this.contextProps.push(`${this.destructuredContexts[i]}: ${this.block.listName}[#i][${i}]`); + // } + // } + this.generator.blocks.push(this.block); this.initChildren(this.block, stripWhitespace, nextSibling); block.addDependencies(this.block.dependencies); diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index f90627f266af..866f90aa553f 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -284,7 +284,8 @@ function create_main_fragment(component, state) { // (1:0) {{#each comments as comment, i}} function create_each_block(component, state) { - var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; + var comment = state.comment; + var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; return { c: function create() { @@ -323,15 +324,16 @@ function create_each_block(component, state) { }, p: function update(changed, state) { - if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { + comment = state.comment; + if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { text_2.data = text_2_value; } - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.comment.time, state.time))) { + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { text_4.data = text_4_value; } - if ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { + if ((changed.comments) && raw_value !== (raw_value = comment.html)) { detachAfter(raw_before); raw_before.insertAdjacentHTML("afterend", raw_value); } diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index 414fcb3f061e..6ea50f4ae453 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -84,7 +84,8 @@ function create_main_fragment(component, state) { // (1:0) {{#each comments as comment, i}} function create_each_block(component, state) { - var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; + var comment = state.comment; + var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; return { c: function create() { @@ -123,15 +124,16 @@ function create_each_block(component, state) { }, p: function update(changed, state) { - if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { + comment = state.comment; + if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { text_2.data = text_2_value; } - if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.comment.time, state.time))) { + if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) { text_4.data = text_4_value; } - if ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { + if ((changed.comments) && raw_value !== (raw_value = comment.html)) { detachAfter(raw_before); raw_before.insertAdjacentHTML("afterend", raw_value); } From 71f2c350ec85d3ee4e06ecda9272d4c327420ee0 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 15:22:24 -0500 Subject: [PATCH 08/13] remove _context stuff --- src/generators/dom/Block.ts | 10 +++++ src/generators/nodes/Component.ts | 67 ++++--------------------------- 2 files changed, 18 insertions(+), 59 deletions(-) diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index e1ed62c2428b..5c5e2bf570e0 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -207,6 +207,16 @@ export default class Block { this.hasUpdateMethod = true; }); + this.indexNames.forEach((alias, name) => { + // TODO only the ones that are actually used in this block... + const assignment = `${alias} = state.${alias}`; // TODO this is wrong!!! + + initializers.push(assignment); + updaters.push(`${assignment};`); + + this.hasUpdateMethod = true; + }); + // minor hack – we need to ensure that any {{{triples}}} are detached first this.builders.unmount.addBlockAtStart(this.builders.detachRaw.toString()); diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index c3214578a7f4..97893dea1207 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -81,7 +81,6 @@ export default class Component extends Node { const allContexts = new Set(); const statements: string[] = []; - const name_context = block.getUniqueName(`${name}_context`); let name_updating: string; let name_initial_data: string; @@ -93,11 +92,11 @@ export default class Component extends Node { const bindings = this.attributes .filter(a => a.type === 'Binding') - .map(a => mungeBinding(a, block, name_context)); + .map(a => mungeBinding(a, block)); const eventHandlers = this.attributes .filter((a: Node) => a.type === 'EventHandler') - .map(a => mungeEventHandler(generator, this, a, block, name_context, allContexts)); + .map(a => mungeEventHandler(generator, this, a, block, allContexts)); const ref = this.attributes.find((a: Node) => a.type === 'Ref'); if (ref) generator.usesRefs = true; @@ -156,8 +155,8 @@ export default class Component extends Node { const tail = binding.value.type === 'MemberExpression' ? getTailSnippet(binding.value) : ''; setFromChild = deindent` - var list = ${name_context}.${block.listNames.get(key)}; - var index = ${name_context}.${block.indexNames.get(key)}; + var list = state.${block.listNames.get(key)}; + var index = ${block.indexNames.get(key)}; list[index]${tail} = childState.${binding.name}; ${binding.dependencies @@ -248,41 +247,6 @@ export default class Component extends Node { } } - // maintain component context - if (allContexts.size) { - const contexts = Array.from(allContexts); - - const initialProps = contexts - .map(contextName => { - if (contextName === 'state') return `state: state`; - - const listName = block.listNames.get(contextName); - const indexName = block.indexNames.get(contextName); - - return `${listName}: state.${listName},\n${indexName}: state.${indexName}`; - }) - .join(',\n'); - - const updates = contexts - .map(contextName => { - if (contextName === 'state') return `${name_context}.state = state;`; - - const listName = block.listNames.get(contextName); - const indexName = block.indexNames.get(contextName); - - return `${name_context}.${listName} = state.${listName};\n${name_context}.${indexName} = state.${indexName};`; - }) - .join('\n'); - - block.builders.init.addBlock(deindent` - var ${name_context} = { - ${initialProps} - }; - `); - - block.builders.update.addBlock(updates); - } - const isDynamicComponent = this.name === ':Component'; const switch_vars = isDynamicComponent && { @@ -504,7 +468,7 @@ function mungeAttribute(attribute: Node, block: Block): Attribute { }; } -function mungeBinding(binding: Node, block: Block, name_context: string): Binding { +function mungeBinding(binding: Node, block: Block): Binding { const { name } = getObject(binding.value); const { contexts } = block.contextualise(binding.value); const { dependencies, snippet } = binding.metadata; @@ -515,8 +479,8 @@ function mungeBinding(binding: Node, block: Block, name_context: string): Bindin let prop; if (contextual) { - obj = `${name_context}.${block.listNames.get(name)}`; - prop = `${name_context}.${block.indexNames.get(name)}`; + obj = `state.${block.listNames.get(name)}`; + prop = `${block.indexNames.get(name)}`; } else if (binding.value.type === 'MemberExpression') { prop = `[✂${binding.value.property.start}-${binding.value.property.end}✂]`; if (!binding.value.computed) prop = `'${prop}'`; @@ -537,7 +501,7 @@ function mungeBinding(binding: Node, block: Block, name_context: string): Bindin }; } -function mungeEventHandler(generator: DomGenerator, node: Node, handler: Node, block: Block, name_context: string, allContexts: Set) { +function mungeEventHandler(generator: DomGenerator, node: Node, handler: Node, block: Block, allContexts: Set) { let body; if (handler.expression) { @@ -547,30 +511,15 @@ function mungeEventHandler(generator: DomGenerator, node: Node, handler: Node, b `${block.alias('component')}.` ); - const usedContexts: string[] = []; - handler.expression.arguments.forEach((arg: Node) => { const { contexts } = block.contextualise(arg, null, true); contexts.forEach(context => { - if (!~usedContexts.indexOf(context)) usedContexts.push(context); allContexts.add(context); }); }); - // TODO hoist event handlers? can do `this.__component.method(...)` - const declarations = usedContexts.map(name => { - if (name === 'state') return `var state = ${name_context}.state;`; - - const listName = block.listNames.get(name); - const indexName = block.indexNames.get(name); - - return `var ${listName} = ${name_context}.${listName}, ${indexName} = ${name_context}.${indexName}, ${name} = ${listName}[${indexName}]`; - }); - body = deindent` - ${declarations} - [✂${handler.expression.start}-${handler.expression.end}✂]; `; } else { From 7baba8bf8cb8083f1399a1b6446edc94cef0edd8 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 15:55:18 -0500 Subject: [PATCH 09/13] all tests passing --- src/generators/dom/Block.ts | 7 +------ src/generators/nodes/EachBlock.ts | 14 +++++++------- .../server-side-rendering/visitors/EachBlock.ts | 4 +--- .../each-block-changed-check/expected-bundle.js | 3 ++- .../samples/each-block-changed-check/expected.js | 3 ++- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index 5c5e2bf570e0..07fb763f82fa 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -114,12 +114,7 @@ export default class Block { this.aliases = new Map(); this.variables = new Map(); - // this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more - - const getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more - this.getUniqueName = name => { - return getUniqueName(name); - } + this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more this.hasUpdateMethod = false; // determined later } diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts index 4d3479d26d11..11a8a0c63279 100644 --- a/src/generators/nodes/EachBlock.ts +++ b/src/generators/nodes/EachBlock.ts @@ -69,7 +69,8 @@ export default class EachBlock extends Node { if (this.destructuredContexts) { for (let i = 0; i < this.destructuredContexts.length; i += 1) { - this.block.contexts.set(this.destructuredContexts[i], `${context}[${i}]`); + const context = this.block.getUniqueName(this.destructuredContexts[i]); + this.block.contexts.set(this.destructuredContexts[i], context); } } @@ -78,12 +79,11 @@ export default class EachBlock extends Node { `${this.block.indexName}: #i` ]; - // if (this.destructuredContexts) { - // for (let i = 0; i < this.destructuredContexts.length; i += 1) { - // contexts.set(this.destructuredContexts[i], `${context}[${i}]`); - // this.contextProps.push(`${this.destructuredContexts[i]}: ${this.block.listName}[#i][${i}]`); - // } - // } + if (this.destructuredContexts) { + for (let i = 0; i < this.destructuredContexts.length; i += 1) { + this.contextProps.push(`${this.destructuredContexts[i]}: ${this.block.listName}[#i][${i}]`); + } + } this.generator.blocks.push(this.block); this.initChildren(this.block, stripWhitespace, nextSibling); diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts index 9a5ec300ca14..491a9fbc1c9e 100644 --- a/src/generators/server-side-rendering/visitors/EachBlock.ts +++ b/src/generators/server-side-rendering/visitors/EachBlock.ts @@ -11,9 +11,7 @@ export default function visitEachBlock( block.contextualise(node.expression); const { dependencies, snippet } = node.metadata; - const context = node.destructuredContexts ? `[${node.destructuredContexts.join(', ')}]` : node.context; - - const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${context}, ${node.index})` : `(${context})`} => \``; + const open = `\${ ${node.else ? `${snippet}.length ? ` : ''}${snippet}.map(${node.index ? `(${node.context}, ${node.index})` : `(${node.context})`} => \``; generator.append(open); // TODO should this be the generator's job? It's duplicated between diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index 866f90aa553f..3b76fb9ad7fa 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -284,7 +284,7 @@ function create_main_fragment(component, state) { // (1:0) {{#each comments as comment, i}} function create_each_block(component, state) { - var comment = state.comment; + var comment = state.comment, i = state.i; var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; return { @@ -325,6 +325,7 @@ function create_each_block(component, state) { p: function update(changed, state) { comment = state.comment; + i = state.i; if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { text_2.data = text_2_value; } diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index 6ea50f4ae453..c86a3a2edfe1 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -84,7 +84,7 @@ function create_main_fragment(component, state) { // (1:0) {{#each comments as comment, i}} function create_each_block(component, state) { - var comment = state.comment; + var comment = state.comment, i = state.i; var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before; return { @@ -125,6 +125,7 @@ function create_each_block(component, state) { p: function update(changed, state) { comment = state.comment; + i = state.i; if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) { text_2.data = text_2_value; } From 27f6d560b5a790d6a38e90cca2170dd85ddbb20e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 16:04:15 -0500 Subject: [PATCH 10/13] remove some unused code etc --- src/generators/Generator.ts | 45 ++++++++----------- src/generators/dom/Block.ts | 2 +- src/generators/dom/index.ts | 4 +- .../expected-bundle.js | 2 +- .../each-block-changed-check/expected.js | 2 +- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index 2463c33325a2..d5c779a5f458 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -242,29 +242,24 @@ export default class Generator { if (name === 'event' && isEventHandler) { // noop } else if (contexts.has(name)) { - // if (self.constructor.name === 'DomGenerator') { // TODO filthy, temporary hack - const contextName = contexts.get(name); - if (contextName !== name) { - // this is true for 'reserved' names like `state` and `component`, - // also destructured contexts - - code.overwrite( - node.start, - node.start + name.length, - contextName, - { storeName: true, contentOnly: false } - ); - - const destructuredName = contextName.replace(/\[\d+\]/, ''); - if (destructuredName !== contextName) { - // so that hoisting the context works correctly - usedContexts.add(destructuredName); - } + const contextName = contexts.get(name); + if (contextName !== name) { + // this is true for 'reserved' names like `state` and `component`, + // also destructured contexts + + code.overwrite( + node.start, + node.start + name.length, + contextName, + { storeName: true, contentOnly: false } + ); + + const destructuredName = contextName.replace(/\[\d+\]/, ''); + if (destructuredName !== contextName) { + // so that hoisting the context works correctly + usedContexts.add(destructuredName); } - - // TODO filthy, temporary hack - // if (!isEventHandler) code.prependRight(node.start, `state.`); - // } + } usedContexts.add(name); } else if (helpers.has(name)) { @@ -274,8 +269,6 @@ export default class Generator { const alias = self.templateVars.get(`helpers-${name}`); if (alias !== name) code.overwrite(object.start, object.end, alias); } else if (indexes.has(name)) { - if (self.constructor.name === 'DomGenerator' && !isEventHandler) code.prependRight(node.start, `state.`); - const context = indexes.get(name); usedContexts.add(context); // TODO is this right? usedIndexes.add(name); @@ -381,8 +374,8 @@ export default class Generator { return alias; } - getUniqueNameMaker(params: string[]) { - const localUsedNames = new Set(params); + getUniqueNameMaker() { + const localUsedNames = new Set(); function add(name: string) { localUsedNames.add(name); diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts index 07fb763f82fa..0d786752dcd4 100644 --- a/src/generators/dom/Block.ts +++ b/src/generators/dom/Block.ts @@ -114,7 +114,7 @@ export default class Block { this.aliases = new Map(); this.variables = new Map(); - this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more + this.getUniqueName = this.generator.getUniqueNameMaker(); this.hasUpdateMethod = false; // determined later } diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts index 090dffbf3e75..2f88185fff55 100644 --- a/src/generators/dom/index.ts +++ b/src/generators/dom/index.ts @@ -49,8 +49,8 @@ export class DomGenerator extends Generator { this.metaBindings = []; } - getUniqueNameMaker(params: string[]) { - const localUsedNames = new Set(params); // TODO is this ever called with params? + getUniqueNameMaker() { + const localUsedNames = new Set(); function add(name: string) { localUsedNames.add(name); diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index 3b76fb9ad7fa..cc8a394ac19c 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -291,7 +291,7 @@ function create_each_block(component, state) { c: function create() { div = createElement("div"); strong = createElement("strong"); - text = createText(state.i); + text = createText(i); text_1 = createText("\n\n\t\t"); span = createElement("span"); text_2 = createText(text_2_value); diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js index c86a3a2edfe1..2eb66567a610 100644 --- a/test/js/samples/each-block-changed-check/expected.js +++ b/test/js/samples/each-block-changed-check/expected.js @@ -91,7 +91,7 @@ function create_each_block(component, state) { c: function create() { div = createElement("div"); strong = createElement("strong"); - text = createText(state.i); + text = createText(i); text_1 = createText("\n\n\t\t"); span = createElement("span"); text_2 = createText(text_2_value); From ec488fe3470c5e3f0f89e15fc5f30c2ab6c5a078 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 16:20:29 -0500 Subject: [PATCH 11/13] dont create context for pending block --- src/generators/Generator.ts | 1 - src/generators/nodes/AwaitBlock.ts | 40 +++++++++++++++++------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts index d5c779a5f458..cac7858c1910 100644 --- a/src/generators/Generator.ts +++ b/src/generators/Generator.ts @@ -246,7 +246,6 @@ export default class Generator { if (contextName !== name) { // this is true for 'reserved' names like `state` and `component`, // also destructured contexts - code.overwrite( node.start, node.start + name.length, diff --git a/src/generators/nodes/AwaitBlock.ts b/src/generators/nodes/AwaitBlock.ts index 168109614f0d..8cfa0a49e4f7 100644 --- a/src/generators/nodes/AwaitBlock.ts +++ b/src/generators/nodes/AwaitBlock.ts @@ -35,21 +35,19 @@ export default class AwaitBlock extends Node { ].forEach(([status, arg]) => { const child = this[status]; - const context = arg || '_'; - const contexts = new Map(block.contexts); - contexts.set(arg, context); - - const contextTypes = new Map(block.contextTypes); - contextTypes.set(arg, status); - child.block = block.child({ comment: createDebuggingComment(child, this.generator), name: this.generator.getUniqueName(`create_${status}_block`), - context, - contexts, - contextTypes + contexts: new Map(block.contexts), + contextTypes: new Map(block.contextTypes) }); + if (arg) { + child.block.context = arg; + child.block.contexts.set(arg, arg); // TODO should be using getUniqueName + child.block.contextTypes.set(arg, status); + } + child.initChildren(child.block, stripWhitespace, nextSibling); this.generator.blocks.push(child.block); @@ -107,7 +105,7 @@ export default class AwaitBlock extends Node { if (${token} !== ${await_token}) return; var ${old_block} = ${await_block}; - ${await_block} = (${await_block_type} = type)(#component, state); + ${await_block} = type && (${await_block_type} = type)(#component, state); if (${old_block}) { ${old_block}.u(); @@ -124,13 +122,21 @@ export default class AwaitBlock extends Node { if (@isPromise(${promise})) { ${promise}.then(function(${value}) { - var state = #component.get(); - ${resolved} = { ${this.then.block.context}: ${value} }; - ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved})); + ${this.then.block.context ? deindent` + var state = #component.get(); + ${resolved} = { ${this.then.block.context}: ${value} }; + ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved})); + ` : deindent` + ${replace_await_block}(${token}, null, null); + `} }, function (${error}) { - var state = #component.get(); - ${resolved} = { ${this.catch.block.context}: ${error} }; - ${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, ${resolved})); + ${this.catch.block.context ? deindent` + var state = #component.get(); + ${resolved} = { ${this.catch.block.context}: ${error} }; + ${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, ${resolved})); + ` : deindent` + ${replace_await_block}(${token}, null, null); + `} }); // if we previously had a then/catch block, destroy it From 9dcf59868d220912f7e4e8c1eee9725d54e2ef60 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 11 Feb 2018 16:22:42 -0500 Subject: [PATCH 12/13] revert to component.get() in _bind --- src/generators/nodes/Component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts index 97893dea1207..ee5561ad7208 100644 --- a/src/generators/nodes/Component.ts +++ b/src/generators/nodes/Component.ts @@ -219,10 +219,8 @@ export default class Component extends Node { componentInitProperties.push(`data: ${name_initial_data}`); - block.addVariable('__state__TODO', 'state'); - block.builders.update.addLine(`__state__TODO = state`); const initialisers = [ - 'state = __state__TODO', + 'state = #component.get()', hasLocalBindings && 'newState = {}', hasStoreBindings && 'newStoreState = {}', ].filter(Boolean).join(', '); From af5a73cc117899348530f537a122040abf535697 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 23 Feb 2018 08:57:01 -0500 Subject: [PATCH 13/13] update tests --- test/js/samples/component-static-immutable/expected-bundle.js | 4 ++-- test/js/samples/component-static-immutable/expected.js | 4 ++-- .../js/samples/component-static-immutable2/expected-bundle.js | 4 ++-- test/js/samples/component-static-immutable2/expected.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/js/samples/component-static-immutable/expected-bundle.js b/test/js/samples/component-static-immutable/expected-bundle.js index 18ca967e920e..b188229ec747 100644 --- a/test/js/samples/component-static-immutable/expected-bundle.js +++ b/test/js/samples/component-static-immutable/expected-bundle.js @@ -176,7 +176,7 @@ var proto = { /* generated by Svelte vX.Y.Z */ var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -214,7 +214,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/component-static-immutable/expected.js b/test/js/samples/component-static-immutable/expected.js index 028dc9e64c3b..647b06817966 100644 --- a/test/js/samples/component-static-immutable/expected.js +++ b/test/js/samples/component-static-immutable/expected.js @@ -3,7 +3,7 @@ import { _differsImmutable, assign, callAll, init, noop, proto } from "svelte/sh var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -41,7 +41,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/component-static-immutable2/expected-bundle.js b/test/js/samples/component-static-immutable2/expected-bundle.js index 18ca967e920e..b188229ec747 100644 --- a/test/js/samples/component-static-immutable2/expected-bundle.js +++ b/test/js/samples/component-static-immutable2/expected-bundle.js @@ -176,7 +176,7 @@ var proto = { /* generated by Svelte vX.Y.Z */ var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -214,7 +214,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c(); diff --git a/test/js/samples/component-static-immutable2/expected.js b/test/js/samples/component-static-immutable2/expected.js index 028dc9e64c3b..647b06817966 100644 --- a/test/js/samples/component-static-immutable2/expected.js +++ b/test/js/samples/component-static-immutable2/expected.js @@ -3,7 +3,7 @@ import { _differsImmutable, assign, callAll, init, noop, proto } from "svelte/sh var Nested = window.Nested; -function create_main_fragment(state, component) { +function create_main_fragment(component, state) { var nested = new Nested({ root: component.root, @@ -41,7 +41,7 @@ function SvelteComponent(options) { this._aftercreate = []; } - this._fragment = create_main_fragment(this._state, this); + this._fragment = create_main_fragment(this, this._state); if (options.target) { this._fragment.c();