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

add generator.helper method, use it in place of generator.uses[...]

Browse Source
pull/306/head
Rich Harris 9 years ago
parent 7dff587a06
commit eb44659589
8 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File

5
src/generators/Generator.js
Unescape View File

@ -193,6 +193,11 @@ export default class Generator {
return counter( this.names ); return counter( this.names );
} }
helper ( name ) {
this.uses[ name ] = true;
return name;
}
parseJs () { parseJs () {
const { source } = this; const { source } = this;
const { js } = this.parsed; const { js } = this.parsed;

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

@ -151,9 +151,8 @@ export default {
` ); ` );
} }
generator.uses.teardownEach = true;
generator.current.builders.teardown.addBlock( generator.current.builders.teardown.addBlock(
`teardownEach( ${iterations}, ${isToplevel ? 'detach' : 'false'} );` ); `${generator.helper( 'teardownEach' )}( ${iterations}, ${isToplevel ? 'detach' : 'false'} );` );
if ( node.else ) { if ( node.else ) {
generator.current.builders.teardown.addBlock( deindent` generator.current.builders.teardown.addBlock( deindent`

12
src/generators/dom/visitors/Element.js
Unescape View File

@ -61,25 +61,21 @@ export default {
if ( local.namespace ) { if ( local.namespace ) {
if ( local.namespace === 'http://www.w3.org/2000/svg' ) { if ( local.namespace === 'http://www.w3.org/2000/svg' ) {
generator.uses.createSvgElement = true; render = `var ${name} = ${generator.helper( 'createSvgElement' )}( '${node.name}' )`;
render = `var ${name} = createSvgElement( '${node.name}' )`;
} else { } else {
render = `var ${name} = document.createElementNS( '${local.namespace}', '${node.name}' );`; render = `var ${name} = document.createElementNS( '${local.namespace}', '${node.name}' );`;
} }
} else { } else {
generator.uses.createElement = true; render = `var ${name} = ${generator.helper( 'createElement' )}( '${node.name}' );`;
render = `var ${name} = createElement( '${node.name}' );`;
} }
if ( generator.cssId && !generator.elementDepth ) { if ( generator.cssId && !generator.elementDepth ) {
generator.uses.setAttribute = true; render += `\n${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );`;
render += `\nsetAttribute( ${name}, '${generator.cssId}', '' );`;
} }
local.init.addLineAtStart( render ); local.init.addLineAtStart( render );
if ( isToplevel ) { if ( isToplevel ) {
generator.uses.detachNode = true; generator.current.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
generator.current.builders.detach.addLine( `detachNode( ${name} );` );
} }
// special case – bound <option> without a value attribute // special case – bound <option> without a value attribute

3
src/generators/dom/visitors/MustacheTag.js
Unescape View File

@ -8,8 +8,7 @@ export default {
const { snippet } = generator.contextualise( node.expression ); const { snippet } = generator.contextualise( node.expression );
generator.current.builders.init.addLine( `var last_${name} = ${snippet}` ); generator.current.builders.init.addLine( `var last_${name} = ${snippet}` );
generator.addElement( name, `createText( last_${name} )`, true ); generator.addElement( name, `${generator.helper( 'createText' )}( last_${name} )`, true );
generator.uses.createText = true;
generator.current.builders.update.addBlock( deindent` generator.current.builders.update.addBlock( deindent`
if ( ( __tmp = ${snippet} ) !== last_${name} ) { if ( ( __tmp = ${snippet} ) !== last_${name} ) {

9
src/generators/dom/visitors/RawMustacheTag.js
Unescape View File

@ -9,20 +9,17 @@ export default {
// we would have used comments here, but the `insertAdjacentHTML` api only // we would have used comments here, but the `insertAdjacentHTML` api only
// exists for `Element`s. // exists for `Element`s.
generator.uses.createElement = true;
const before = `${name}_before`; const before = `${name}_before`;
generator.addElement( before, `createElement( 'noscript' )`, true ); generator.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
const after = `${name}_after`; const after = `${name}_after`;
generator.addElement( after, `createElement( 'noscript' )`, true ); generator.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, true );
const isToplevel = generator.current.localElementDepth === 0; const isToplevel = generator.current.localElementDepth === 0;
generator.current.builders.init.addLine( `var last_${name} = ${snippet};` ); generator.current.builders.init.addLine( `var last_${name} = ${snippet};` );
const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`; const mountStatement = `${before}.insertAdjacentHTML( 'afterend', last_${name} );`;
generator.uses.detachBetween = true; const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
const detachStatement = `detachBetween( ${before}, ${after} );`;
if ( isToplevel ) { if ( isToplevel ) {
generator.current.builders.mount.addLine( mountStatement ); generator.current.builders.mount.addLine( mountStatement );

4
src/generators/dom/visitors/Text.js
Unescape View File

@ -5,8 +5,6 @@ export default {
} }
const name = generator.current.getUniqueName( `text` ); const name = generator.current.getUniqueName( `text` );
generator.addElement( name, `createText( ${JSON.stringify( node.data )} )`, false ); generator.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, false );
generator.uses.createText = true;
} }
}; };

23
src/generators/dom/visitors/attributes/addElementAttributes.js
Unescape View File

@ -21,7 +21,7 @@ export default function addElementAttributes ( generator, node, local ) {
// xlink is a special case... we could maybe extend this to generic // xlink is a special case... we could maybe extend this to generic
// namespaced attributes but I'm not sure that's applicable in // namespaced attributes but I'm not sure that's applicable in
// HTML5? // HTML5?
const helper = isXlink ? 'setXlinkAttribute' : 'setAttribute'; const method = isXlink ? 'setXlinkAttribute' : 'setAttribute';
if ( attribute.value === true ) { if ( attribute.value === true ) {
// attributes without values, e.g. <textarea readonly> // attributes without values, e.g. <textarea readonly>
@ -30,9 +30,8 @@ export default function addElementAttributes ( generator, node, local ) {
`${local.name}.${propertyName} = true;` `${local.name}.${propertyName} = true;`
); );
} else { } else {
generator.uses[ helper ] = true;
local.init.addLine( local.init.addLine(
`${helper}( ${local.name}, '${name}', true );` `${generator.helper( method )}( ${local.name}, '${name}', true );`
); );
} }
@ -48,9 +47,8 @@ export default function addElementAttributes ( generator, node, local ) {
`${local.name}.${propertyName} = '';` `${local.name}.${propertyName} = '';`
); );
} else { } else {
generator.uses[ helper ] = true;
local.init.addLine( local.init.addLine(
`${helper}( ${local.name}, '${name}', '' );` `${generator.helper( method )}( ${local.name}, '${name}', '' );`
); );
} }
} }
@ -79,9 +77,8 @@ export default function addElementAttributes ( generator, node, local ) {
} }
if ( addAttribute ) { if ( addAttribute ) {
generator.uses[ helper ] = true;
local.init.addLine( local.init.addLine(
`${helper}( ${local.name}, '${name}', ${result} );` `${generator.helper( method )}( ${local.name}, '${name}', ${result} );`
); );
} }
} }
@ -99,8 +96,7 @@ export default function addElementAttributes ( generator, node, local ) {
if ( propertyName ) { if ( propertyName ) {
updater = `${local.name}.${propertyName} = ${last};`; updater = `${local.name}.${propertyName} = ${last};`;
} else { } else {
generator.uses[ helper ] = true; updater = `${generator.helper( method )}( ${local.name}, '${name}', ${last} );`; // TODO use snippet both times – see note below
updater = `${helper}( ${local.name}, '${name}', ${last} );`; // TODO use snippet both times – see note below
} }
local.init.addLine( updater ); local.init.addLine( updater );
@ -133,8 +129,7 @@ export default function addElementAttributes ( generator, node, local ) {
if (propertyName) { if (propertyName) {
updater = `${local.name}.${propertyName} = ${value};`; updater = `${local.name}.${propertyName} = ${value};`;
} else { } else {
generator.uses[ helper ] = true; updater = `${generator.helper( method )}( ${local.name}, '${name}', ${value} );`;
updater = `${helper}( ${local.name}, '${name}', ${value} );`;
} }
local.init.addLine( updater ); local.init.addLine( updater );
@ -194,18 +189,16 @@ export default function addElementAttributes ( generator, node, local ) {
${handlerName}.teardown(); ${handlerName}.teardown();
` ); ` );
} else { } else {
generator.uses.addEventListener = true;
generator.uses.removeEventListener = true;
local.init.addBlock( deindent` local.init.addBlock( deindent`
function ${handlerName} ( event ) { function ${handlerName} ( event ) {
${handlerBody} ${handlerBody}
} }
addEventListener( ${local.name}, '${name}', ${handlerName} ); ${generator.helper( 'addEventListener' )}( ${local.name}, '${name}', ${handlerName} );
` ); ` );
generator.current.builders.teardown.addLine( deindent` generator.current.builders.teardown.addLine( deindent`
removeEventListener( ${local.name}, '${name}', ${handlerName} ); ${generator.helper( 'removeEventListener' )}( ${local.name}, '${name}', ${handlerName} );
` ); ` );
} }
} }

6
src/generators/dom/visitors/attributes/binding/index.js
Unescape View File

@ -138,8 +138,6 @@ export default function createBinding ( generator, node, attribute, current, loc
updateElement = `${local.name}.${attribute.name} = ${contextual ? attribute.value : `root.${attribute.value}`};`; updateElement = `${local.name}.${attribute.name} = ${contextual ? attribute.value : `root.${attribute.value}`};`;
} }
generator.uses.addEventListener = true;
generator.uses.removeEventListener = true;
local.init.addBlock( deindent` local.init.addBlock( deindent`
var ${local.name}_updating = false; var ${local.name}_updating = false;
@ -149,7 +147,7 @@ export default function createBinding ( generator, node, attribute, current, loc
${local.name}_updating = false; ${local.name}_updating = false;
} }
addEventListener( ${local.name}, '${eventName}', ${handler} ); ${generator.helper( 'addEventListener' )}( ${local.name}, '${eventName}', ${handler} );
` ); ` );
node.initialUpdate = updateElement; node.initialUpdate = updateElement;
@ -159,7 +157,7 @@ export default function createBinding ( generator, node, attribute, current, loc
); );
generator.current.builders.teardown.addLine( deindent` generator.current.builders.teardown.addLine( deindent`
removeEventListener( ${local.name}, '${eventName}', ${handler} ); ${generator.helper( 'removeEventListener' )}( ${local.name}, '${eventName}', ${handler} );
` ); ` );
} }
} }

Write Preview
Loading…
Cancel
Save