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

nicer way of generating aliases for non-helper functions

Browse Source
pull/389/head
Conduitry 8 years ago
parent e25d4e752c
commit 331a1a2bb2
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File

30
src/generators/dom/index.js
Unescape View File

@ -131,15 +131,17 @@ class DomGenerator extends Generator {
node.children = []; node.children = [];
} }
helper ( name, isSharedHelper ) { helper ( name ) {
if ( this.options.dev && `${name}Dev` in shared ) { if ( this.options.dev && `${name}Dev` in shared ) {
name = `${name}Dev`; name = `${name}Dev`;
} }
if ( isSharedHelper !== false ) { this.uses[ name ] = true;
this.uses[ name ] = true;
} return this.alias( name );
}
alias ( name ) {
if ( !( name in this.aliases ) ) { if ( !( name in this.aliases ) ) {
let alias = name; let alias = name;
let i = 1; let i = 1;
@ -190,7 +192,7 @@ export default function dom ( parsed, source, options, names ) {
} }
generator.push({ generator.push({
name: generator.helper( 'renderMainFragment', false ), name: generator.alias( 'renderMainFragment' ),
namespace, namespace,
target: 'target', target: 'target',
localElementDepth: 0, localElementDepth: 0,
@ -240,12 +242,12 @@ export default function dom ( parsed, source, options, names ) {
}); });
builders.main.addBlock( deindent` builders.main.addBlock( deindent`
function ${generator.helper( 'applyComputations', false )} ( state, newState, oldState, isInitial ) { function ${generator.alias( 'applyComputations' )} ( state, newState, oldState, isInitial ) {
${builder} ${builder}
} }
` ); ` );
builders._set.addLine( `${generator.helper( 'applyComputations', false )}( this._state, newState, oldState, false )` ); builders._set.addLine( `${generator.alias( 'applyComputations' )}( this._state, newState, oldState, false )` );
} }
// TODO is the `if` necessary? // TODO is the `if` necessary?
@ -261,13 +263,13 @@ export default function dom ( parsed, source, options, names ) {
if ( parsed.css && options.css !== false ) { if ( parsed.css && options.css !== false ) {
builders.main.addBlock( deindent` builders.main.addBlock( deindent`
var ${generator.helper( 'addedCss', false )} = false; var ${generator.alias( 'addedCss' )} = false;
function ${generator.helper( 'addCss', false )} () { function ${generator.alias( 'addCss' )} () {
var style = ${generator.helper( 'createElement' )}( 'style' ); var style = ${generator.helper( 'createElement' )}( 'style' );
style.textContent = ${JSON.stringify( processCss( parsed, generator.code ) )}; style.textContent = ${JSON.stringify( processCss( parsed, generator.code ) )};
${generator.helper( 'appendNode' )}( style, document.head ); ${generator.helper( 'appendNode' )}( style, document.head );
${generator.helper( 'addedCss', false )} = true; ${generator.alias( 'addedCss' )} = true;
} }
` ); ` );
} }
@ -278,7 +280,7 @@ export default function dom ( parsed, source, options, names ) {
builders.init.addLine( `this._torndown = false;` ); builders.init.addLine( `this._torndown = false;` );
if ( parsed.css && options.css !== false ) { if ( parsed.css && options.css !== false ) {
builders.init.addLine( `if ( !${generator.helper( 'addedCss', false )} ) ${generator.helper( 'addCss', false )}();` ); builders.init.addLine( `if ( !${generator.alias( 'addedCss' )} ) ${generator.alias( 'addCss' )}();` );
} }
if ( generator.hasComponents ) { if ( generator.hasComponents ) {
@ -288,7 +290,7 @@ export default function dom ( parsed, source, options, names ) {
if ( generator.hasComplexBindings ) { if ( generator.hasComplexBindings ) {
builders.init.addBlock( deindent` builders.init.addBlock( deindent`
this._bindings = []; this._bindings = [];
this._fragment = ${generator.helper( 'renderMainFragment', false )}( this._state, this ); this._fragment = ${generator.alas( 'renderMainFragment' )}( this._state, this );
if ( options.target ) this._fragment.mount( options.target, null ); if ( options.target ) this._fragment.mount( options.target, null );
while ( this._bindings.length ) this._bindings.pop()(); while ( this._bindings.length ) this._bindings.pop()();
` ); ` );
@ -296,7 +298,7 @@ export default function dom ( parsed, source, options, names ) {
builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` ); builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
} else { } else {
builders.init.addBlock( deindent` builders.init.addBlock( deindent`
this._fragment = ${generator.helper( 'renderMainFragment', false )}( this._state, this ); this._fragment = ${generator.alias( 'renderMainFragment' )}( this._state, this );
if ( options.target ) this._fragment.mount( options.target, null ); if ( options.target ) this._fragment.mount( options.target, null );
` ); ` );
} }
@ -329,7 +331,7 @@ export default function dom ( parsed, source, options, names ) {
if ( templateProperties.computed ) { if ( templateProperties.computed ) {
constructorBlock.addLine( constructorBlock.addLine(
`${generator.helper( 'applyComputations', false )}( this._state, this._state, {}, true );` `${generator.alias( 'applyComputations' )}( this._state, this._state, {}, true );`
); );
} }

Write Preview
Loading…
Cancel
Save