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

first steps toward making the fragment api functional

Browse Source
pull/1783/head
Arpad Borsos 9 years ago
parent a59dc64880
commit 139030cd05
No known key found for this signature in database
GPG Key ID: 908EDF65263368B4
3 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File

22
compiler/generate/index.js
Unescape View File

@ -27,7 +27,8 @@ export default function generate ( parsed, source, options ) {
} }
renderers.push( deindent` renderers.push( deindent`
function ${fragment.name} ( ${fragment.params}, component, target${fragment.useAnchor ? ', anchor' : ''} ) { var ${fragment.name} = {
render: function ( ${fragment.params}, component, target${fragment.useAnchor ? ', anchor' : ''} ) {
${fragment.initStatements.join( '\n\n' )} ${fragment.initStatements.join( '\n\n' )}
return { return {
@ -39,7 +40,14 @@ export default function generate ( parsed, source, options ) {
${fragment.teardownStatements.join( '\n\n' )} ${fragment.teardownStatements.join( '\n\n' )}
} }
}; };
} },
update: function ( instance, changed, ${fragment.params} ) {
instance.update( changed, ${fragment.params} );
},
teardown: function ( instance, detach ) {
instance.teardown( detach );
},
};
` ); ` );
}, },
@ -211,7 +219,7 @@ export default function generate ( parsed, source, options ) {
generator.push({ generator.push({
useAnchor: false, useAnchor: false,
name: 'renderMainFragment', name: 'MainFragment',
namespace: null, namespace: null,
target: 'target', target: 'target',
elementDepth: 0, elementDepth: 0,
@ -285,7 +293,7 @@ export default function generate ( parsed, source, options ) {
setStatements.push( deindent` setStatements.push( deindent`
dispatchObservers( observers.immediate, newState, oldState ); dispatchObservers( observers.immediate, newState, oldState );
if ( mainFragment ) mainFragment.update( newState, state ); if ( mainFragment ) MainFragment.update( mainFragment, newState, state );
dispatchObservers( observers.deferred, newState, oldState ); dispatchObservers( observers.deferred, newState, oldState );
` ); ` );
@ -346,13 +354,13 @@ export default function generate ( parsed, source, options ) {
if ( generator.hasComplexBindings ) { if ( generator.hasComplexBindings ) {
initStatements.push( deindent` initStatements.push( deindent`
this.__bindings = []; this.__bindings = [];
var mainFragment = renderMainFragment( state, this, options.target ); var mainFragment = MainFragment.render( state, this, options.target );
while ( this.__bindings.length ) this.__bindings.pop()(); while ( this.__bindings.length ) this.__bindings.pop()();
` ); ` );
setStatements.push( `while ( this.__bindings.length ) this.__bindings.pop()();` ); setStatements.push( `while ( this.__bindings.length ) this.__bindings.pop()();` );
} else { } else {
initStatements.push( `var mainFragment = renderMainFragment( state, this, options.target );` ); initStatements.push( `var mainFragment = MainFragment.render( state, this, options.target );` );
} }
if ( generator.hasComponents ) { if ( generator.hasComponents ) {
@ -465,7 +473,7 @@ export default function generate ( parsed, source, options ) {
this.teardown = function teardown ( detach ) { this.teardown = function teardown ( detach ) {
this.fire( 'teardown' );${templateProperties.onteardown ? `\ntemplate.onteardown.call( this );` : ``} this.fire( 'teardown' );${templateProperties.onteardown ? `\ntemplate.onteardown.call( this );` : ``}
mainFragment.teardown( detach !== false ); MainFragment.teardown( mainFragment, detach !== false );
mainFragment = null; mainFragment = null;
state = {}; state = {};

12
compiler/generate/visitors/EachBlock.js
Unescape View File

@ -5,7 +5,7 @@ export default {
enter ( generator, node ) { enter ( generator, node ) {
const i = generator.counters.each++; const i = generator.counters.each++;
const name = `eachBlock_${i}`; const name = `eachBlock_${i}`;
const renderer = `renderEachBlock_${i}`; const renderer = `EachBlock_${i}`;
const listName = `${name}_value`; const listName = `${name}_value`;
@ -22,7 +22,7 @@ export default {
var ${name}_iterations = []; var ${name}_iterations = [];
for ( var i = 0; i < ${name}_value.length; i += 1 ) { for ( var i = 0; i < ${name}_value.length; i += 1 ) {
${name}_iterations[i] = ${renderer}( ${generator.current.params}, ${listName}, ${listName}[i], i, component, ${name}_fragment ); ${name}_iterations[i] = ${renderer}.render( ${generator.current.params}, ${listName}, ${listName}[i], i, component, ${name}_fragment );
} }
${name}_anchor.parentNode.insertBefore( ${name}_fragment, ${name}_anchor ); ${name}_anchor.parentNode.insertBefore( ${name}_fragment, ${name}_anchor );
@ -33,14 +33,14 @@ export default {
for ( var i = 0; i < ${name}_value.length; i += 1 ) { for ( var i = 0; i < ${name}_value.length; i += 1 ) {
if ( !${name}_iterations[i] ) { if ( !${name}_iterations[i] ) {
${name}_iterations[i] = ${renderer}( ${generator.current.params}, ${listName}, ${listName}[i], i, component, ${name}_fragment ); ${name}_iterations[i] = ${renderer}.render( ${generator.current.params}, ${listName}, ${listName}[i], i, component, ${name}_fragment );
} else { } else {
${name}_iterations[i].update( changed, ${generator.current.params}, ${listName}, ${listName}[i], i ); ${renderer}.update( ${name}_iterations[i], changed, ${generator.current.params}, ${listName}, ${listName}[i], i );
} }
} }
for ( var i = ${name}_value.length; i < ${name}_iterations.length; i += 1 ) { for ( var i = ${name}_value.length; i < ${name}_iterations.length; i += 1 ) {
${name}_iterations[i].teardown( true ); ${renderer}.teardown( ${name}_iterations[i], true );
} }
${name}_anchor.parentNode.insertBefore( ${name}_fragment, ${name}_anchor ); ${name}_anchor.parentNode.insertBefore( ${name}_fragment, ${name}_anchor );
@ -49,7 +49,7 @@ export default {
generator.current.teardownStatements.push( deindent` generator.current.teardownStatements.push( deindent`
for ( let i = 0; i < ${name}_iterations.length; i += 1 ) { for ( let i = 0; i < ${name}_iterations.length; i += 1 ) {
${name}_iterations[i].teardown( detach ); ${renderer}.teardown( ${name}_iterations[i], detach );
} }
if ( detach ) ${name}_anchor.parentNode.removeChild( ${name}_anchor ); if ( detach ) ${name}_anchor.parentNode.removeChild( ${name}_anchor );

10
compiler/generate/visitors/IfBlock.js
Unescape View File

@ -59,7 +59,7 @@ export default {
const getBlock = `getBlock_${i}`; const getBlock = `getBlock_${i}`;
const currentBlock = `currentBlock_${i}`; const currentBlock = `currentBlock_${i}`;
const conditionsAndBlocks = getConditionsAndBlocks( generator, node, `renderIfBlock_${i}` ); const conditionsAndBlocks = getConditionsAndBlocks( generator, node, `IfBlock_${i}` );
generator.current.initStatements.push( deindent` generator.current.initStatements.push( deindent`
var ${name}_anchor = document.createComment( ${JSON.stringify( `#if ${generator.source.slice( node.expression.start, node.expression.end )}` )} ); var ${name}_anchor = document.createComment( ${JSON.stringify( `#if ${generator.source.slice( node.expression.start, node.expression.end )}` )} );
@ -72,22 +72,22 @@ export default {
} }
var ${currentBlock} = ${getBlock}( ${params} ); var ${currentBlock} = ${getBlock}( ${params} );
var ${name} = ${currentBlock} && ${currentBlock}( ${params}, component, ${target}, ${name}_anchor ); var ${name} = ${currentBlock} && ${currentBlock}.render( ${params}, component, ${target}, ${name}_anchor );
` ); ` );
generator.current.updateStatements.push( deindent` generator.current.updateStatements.push( deindent`
var _${currentBlock} = ${currentBlock}; var _${currentBlock} = ${currentBlock};
${currentBlock} = ${getBlock}( ${params} ); ${currentBlock} = ${getBlock}( ${params} );
if ( _${currentBlock} === ${currentBlock} && ${name}) { if ( _${currentBlock} === ${currentBlock} && ${name}) {
${name}.update( changed, ${params} ); ${currentBlock}.update( ${name}, changed, ${params} );
} else { } else {
if ( ${name} ) ${name}.teardown( true ); if ( ${name} ) ${name}.teardown( true );
${name} = ${currentBlock} && ${currentBlock}( ${params}, component, ${target}, ${name}_anchor ); ${name} = ${currentBlock} && ${currentBlock}.render( ${params}, component, ${target}, ${name}_anchor );
} }
` ); ` );
const teardownStatements = [ const teardownStatements = [
`if ( ${name} ) ${name}.teardown( detach );` `if ( ${name} ) ${currentBlock}.teardown( ${name}, detach );`
]; ];
if ( generator.current.localElementDepth === 0 ) { if ( generator.current.localElementDepth === 0 ) {

Write Preview
Loading…
Cancel
Save