msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

less indirection when mounting

Browse Source
pull/489/head
Rich-Harris 9 years ago
parent 1d5018bf1e
commit 30d4c1c166
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

5
src/generators/dom/Block.js
Unescape View File

@ -30,6 +30,7 @@ export default class Block {
// unique names // unique names
this.component = this.getUniqueName( 'component' ); this.component = this.getUniqueName( 'component' );
this.target = this.getUniqueName( 'target' );
} }
addElement ( name, renderStatement, parentNode, needsIdentifier = false ) { addElement ( name, renderStatement, parentNode, needsIdentifier = false ) {
@ -66,7 +67,7 @@ export default class Block {
if ( parentNode ) { if ( parentNode ) {
this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` ); this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` );
} else { } else {
this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, target, anchor );` ); this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, ${this.target}, anchor );` );
} }
} }
@ -99,7 +100,7 @@ export default class Block {
properties.addBlock( `mount: ${this.generator.helper( 'noop' )},` ); properties.addBlock( `mount: ${this.generator.helper( 'noop' )},` );
} else { } else {
properties.addBlock( deindent` properties.addBlock( deindent`
mount: function ( target, anchor ) { mount: function ( ${this.target}, anchor ) {
${this.builders.mount} ${this.builders.mount}
}, },
` ); ` );

2
src/generators/dom/visitors/Component/Component.js
Unescape View File

@ -162,7 +162,7 @@ export default function visitComponent ( generator, block, state, node ) {
` ); ` );
if ( isToplevel ) { if ( isToplevel ) {
block.builders.mount.addLine( `${name}._fragment.mount( target, anchor );` ); block.builders.mount.addLine( `${name}._fragment.mount( ${block.target}, anchor );` );
} }
if ( local.dynamicAttributes.length ) { if ( local.dynamicAttributes.length ) {

35
src/generators/dom/visitors/EachBlock.js
Unescape View File

@ -28,10 +28,6 @@ export default function visitEachBlock ( generator, block, state, node ) {
block.builders.create.addLine( `var ${vars.iterations} = [];` ); block.builders.create.addLine( `var ${vars.iterations} = [];` );
if ( node.key ) { if ( node.key ) {
vars.lookup = block.getUniqueName( `${vars.each_block}_lookup` );
vars._lookup = block.getUniqueName( `_${vars.each_block}_lookup` );
block.builders.create.addLine( `var ${vars.lookup} = Object.create( null );` );
keyed( generator, block, state, node, vars, snippet ); keyed( generator, block, state, node, vars, snippet );
} else { } else {
unkeyed( generator, block, state, node, vars, snippet ); unkeyed( generator, block, state, node, vars, snippet );
@ -40,7 +36,7 @@ export default function visitEachBlock ( generator, block, state, node ) {
if ( isToplevel ) { if ( isToplevel ) {
block.builders.mount.addBlock( deindent` block.builders.mount.addBlock( deindent`
for ( var ${vars.i} = 0; ${vars.i} < ${vars.iterations}.length; ${vars.i} += 1 ) { for ( var ${vars.i} = 0; ${vars.i} < ${vars.iterations}.length; ${vars.i} += 1 ) {
${vars.iterations}[${vars.i}].mount( ${vars.anchor}.parentNode, ${vars.anchor} ); ${vars.iterations}[${vars.i}].mount( ${block.target}, ${vars.anchor} );
} }
` ); ` );
} }
@ -51,16 +47,17 @@ export default function visitEachBlock ( generator, block, state, node ) {
if ( node.else ) { if ( node.else ) {
block.builders.create.addLine( `var ${vars.each_block_else} = null;` ); block.builders.create.addLine( `var ${vars.each_block_else} = null;` );
// TODO neaten this up... will end up with an empty line in the block
block.builders.create.addBlock( deindent` block.builders.create.addBlock( deindent`
if ( !${vars.listName}.length ) { if ( !${vars.listName}.length ) {
${vars.each_block_else} = ${vars.create_each_block_else}( ${vars.params}, ${block.component} ); ${vars.each_block_else} = ${vars.create_each_block_else}( ${vars.params}, ${block.component} );
${!isToplevel ? `${vars.each_block_else}.mount( ${vars.anchor}.parentNode, ${vars.anchor} );` : ''} ${!isToplevel ? `${vars.each_block_else}.mount( ${state.parentNode}, ${vars.anchor} );` : ''}
} }
` ); ` );
block.builders.mount.addBlock( deindent` block.builders.mount.addBlock( deindent`
if ( ${vars.each_block_else} ) { if ( ${vars.each_block_else} ) {
${vars.each_block_else}.mount( ${vars.anchor}.parentNode, ${vars.anchor} ); ${vars.each_block_else}.mount( ${state.parentNode || block.target}, ${vars.anchor} );
} }
` ); ` );
@ -142,17 +139,21 @@ function keyed ( generator, block, state, node, vars, snippet ) {
const fragment = block.getUniqueName( 'fragment' ); const fragment = block.getUniqueName( 'fragment' );
const value = block.getUniqueName( 'value' ); const value = block.getUniqueName( 'value' );
const key = block.getUniqueName( 'key' ); const key = block.getUniqueName( 'key' );
const lookup = block.getUniqueName( `${vars.each_block}_lookup` );
const _lookup = block.getUniqueName( `_${vars.each_block}_lookup` );
block.builders.create.addLine( `var ${lookup} = Object.create( null );` );
const create = new CodeBuilder(); const create = new CodeBuilder();
create.addBlock( deindent` create.addBlock( deindent`
var ${key} = ${vars.listName}[${vars.i}].${node.key}; var ${key} = ${vars.listName}[${vars.i}].${node.key};
${vars.iterations}[${vars.i}] = ${vars.lookup}[ ${key} ] = ${vars.create_each_block}( ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i}, ${block.component}${node.key ? `, ${key}` : `` } ); ${vars.iterations}[${vars.i}] = ${lookup}[ ${key} ] = ${vars.create_each_block}( ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i}, ${block.component}${node.key ? `, ${key}` : `` } );
` ); ` );
if ( state.parentNode ) { if ( state.parentNode ) {
create.addLine( create.addLine(
`${vars.iterations}[${vars.i}].mount( ${vars.anchor}.parentNode, ${vars.anchor} );` `${vars.iterations}[${vars.i}].mount( ${state.parentNode}, ${vars.anchor} );`
); );
} }
@ -165,7 +166,7 @@ function keyed ( generator, block, state, node, vars, snippet ) {
block.builders.update.addBlock( deindent` block.builders.update.addBlock( deindent`
var ${vars.listName} = ${snippet}; var ${vars.listName} = ${snippet};
var ${vars._iterations} = []; var ${vars._iterations} = [];
var ${vars._lookup} = Object.create( null ); var ${_lookup} = Object.create( null );
var ${fragment} = document.createDocumentFragment(); var ${fragment} = document.createDocumentFragment();
@ -174,11 +175,11 @@ function keyed ( generator, block, state, node, vars, snippet ) {
var ${value} = ${vars.listName}[${vars.i}]; var ${value} = ${vars.listName}[${vars.i}];
var ${key} = ${value}.${node.key}; var ${key} = ${value}.${node.key};
if ( ${vars.lookup}[ ${key} ] ) { if ( ${lookup}[ ${key} ] ) {
${vars._iterations}[${vars.i}] = ${vars._lookup}[ ${key} ] = ${vars.lookup}[ ${key} ]; ${vars._iterations}[${vars.i}] = ${_lookup}[ ${key} ] = ${lookup}[ ${key} ];
${vars._lookup}[ ${key} ].update( changed, ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i} ); ${_lookup}[ ${key} ].update( changed, ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i} );
} else { } else {
${vars._iterations}[${vars.i}] = ${vars._lookup}[ ${key} ] = ${vars.create_each_block}( ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i}, ${block.component}${node.key ? `, ${key}` : `` } ); ${vars._iterations}[${vars.i}] = ${_lookup}[ ${key} ] = ${vars.create_each_block}( ${vars.params}, ${vars.listName}, ${vars.listName}[${vars.i}], ${vars.i}, ${block.component}${node.key ? `, ${key}` : `` } );
} }
${vars._iterations}[${vars.i}].mount( ${fragment}, null ); ${vars._iterations}[${vars.i}].mount( ${fragment}, null );
@ -187,7 +188,7 @@ function keyed ( generator, block, state, node, vars, snippet ) {
// remove old iterations // remove old iterations
for ( var ${vars.i} = 0; ${vars.i} < ${vars.iterations}.length; ${vars.i} += 1 ) { for ( var ${vars.i} = 0; ${vars.i} < ${vars.iterations}.length; ${vars.i} += 1 ) {
var ${vars.iteration} = ${vars.iterations}[${vars.i}]; var ${vars.iteration} = ${vars.iterations}[${vars.i}];
if ( !${vars._lookup}[ ${vars.iteration}.key ] ) { if ( !${_lookup}[ ${vars.iteration}.key ] ) {
${vars.iteration}.destroy( true ); ${vars.iteration}.destroy( true );
} }
} }
@ -195,7 +196,7 @@ function keyed ( generator, block, state, node, vars, snippet ) {
${vars.anchor}.parentNode.insertBefore( ${fragment}, ${vars.anchor} ); ${vars.anchor}.parentNode.insertBefore( ${fragment}, ${vars.anchor} );
${vars.iterations} = ${vars._iterations}; ${vars.iterations} = ${vars._iterations};
${vars.lookup} = ${vars._lookup}; ${lookup} = ${_lookup};
` ); ` );
} }
@ -208,7 +209,7 @@ function unkeyed ( generator, block, state, node, vars, snippet ) {
if ( state.parentNode ) { if ( state.parentNode ) {
create.addLine( create.addLine(
`${vars.iterations}[${vars.i}].mount( ${vars.anchor}.parentNode, ${vars.anchor} );` `${vars.iterations}[${vars.i}].mount( ${state.parentNode}, ${vars.anchor} );`
); );
} }

2
src/generators/dom/visitors/YieldTag.js
Unescape View File

@ -3,7 +3,7 @@ export default function visitYieldTag ( generator, block, state ) {
block.createAnchor( anchor, state.parentNode ); block.createAnchor( anchor, state.parentNode );
block.builders.mount.addLine( block.builders.mount.addLine(
`${block.component}._yield && ${block.component}._yield.mount( ${state.parentNode || 'target'}, ${anchor} );` `${block.component}._yield && ${block.component}._yield.mount( ${state.parentNode || block.target}, ${anchor} );`
); );
block.builders.destroy.addLine( block.builders.destroy.addLine(

Write Preview
Loading…
Cancel
Save