mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-11-29 16:36:44 +01:00
Code Issues Releases Wiki Activity

Merge pull request #389 from sveltejs/gh-388-deconflict-non-helper-functions

Browse Source 
Deconflict non helper functions
This commit is contained in:
Rich Harris 2017-03-18 08:58:00 -04:00 committed by GitHub
commit ec3c81f58c
4 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/generators/dom/index.js
View File

@ -138,6 +138,10 @@ class DomGenerator extends Generator {
this.uses[ name ] = true;
return this.alias( name );
}
alias ( name ) {
if ( !( name in this.aliases ) ) {
let alias = name;
let i = 1;
@ -188,7 +192,7 @@ export default function dom ( parsed, source, options, names ) {
}
generator.push({
name: 'renderMainFragment',
name: generator.alias( 'renderMainFragment' ),
namespace,
target: 'target',
localElementDepth: 0,
@ -238,12 +242,12 @@ export default function dom ( parsed, source, options, names ) {
});
builders.main.addBlock( deindent`
function applyComputations ( state, newState, oldState, isInitial ) {
function ${generator.alias( 'applyComputations' )} ( state, newState, oldState, isInitial ) {
${builder}
}
` );
builders._set.addLine( `applyComputations( this._state, newState, oldState, false )` );
builders._set.addLine( `${generator.alias( 'applyComputations' )}( this._state, newState, oldState, false )` );
}
// TODO is the `if` necessary?
@ -259,13 +263,13 @@ export default function dom ( parsed, source, options, names ) {
if ( parsed.css && options.css !== false ) {
builders.main.addBlock( deindent`
var addedCss = false;
function addCss () {
var ${generator.alias( 'addedCss' )} = false;
function ${generator.alias( 'addCss' )} () {
var style = ${generator.helper( 'createElement' )}( 'style' );
style.textContent = ${JSON.stringify( processCss( parsed, generator.code ) )};
${generator.helper( 'appendNode' )}( style, document.head );
addedCss = true;
${generator.alias( 'addedCss' )} = true;
}
` );
}
@ -276,7 +280,7 @@ export default function dom ( parsed, source, options, names ) {
builders.init.addLine( `this._torndown = false;` );
if ( parsed.css && options.css !== false ) {
builders.init.addLine( `if ( !addedCss ) addCss();` );
builders.init.addLine( `if ( !${generator.alias( 'addedCss' )} ) ${generator.alias( 'addCss' )}();` );
}
if ( generator.hasComponents ) {
@ -286,7 +290,7 @@ export default function dom ( parsed, source, options, names ) {
if ( generator.hasComplexBindings ) {
builders.init.addBlock( deindent`
this._bindings = [];
this._fragment = renderMainFragment( this._state, this );
this._fragment = ${generator.alias( 'renderMainFragment' )}( this._state, this );
if ( options.target ) this._fragment.mount( options.target, null );
while ( this._bindings.length ) this._bindings.pop()();
` );
@ -294,7 +298,7 @@ export default function dom ( parsed, source, options, names ) {
builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
} else {
builders.init.addBlock( deindent`
this._fragment = renderMainFragment( this._state, this );
this._fragment = ${generator.alias( 'renderMainFragment' )}( this._state, this );
if ( options.target ) this._fragment.mount( options.target, null );
` );
}
@ -327,7 +331,7 @@ export default function dom ( parsed, source, options, names ) {
if ( templateProperties.computed ) {
constructorBlock.addLine(
`applyComputations( this._state, this._state, {}, true );`
`${generator.alias( 'applyComputations' )}( this._state, this._state, {}, true );`
);
}
@ -419,4 +423,4 @@ export default function dom ( parsed, source, options, names ) {
}
return generator.generate( builders.main.toString(), options, { name, format } );
}
}

8
test/generator/samples/deconflict-non-helpers/_config.js Normal file
View File

@ -0,0 +1,8 @@
export default {
html: `ABCD`,
test ( assert, component ) {
assert.equal( component.get( 'compute' ), 'ABCD' );
component.destroy();
}
};

17
test/generator/samples/deconflict-non-helpers/main.html Normal file
View File

@ -0,0 +1,17 @@
{{compute}}
<script>
import { addCss, addedCss, applyComputations, renderMainFragment } from './module.js';
export default {
data() {
return {
value: addCss + addedCss + applyComputations + renderMainFragment
};
},
computed: {
compute: value => value.toUpperCase()
}
};
</script>
<style>
</style>

4
test/generator/samples/deconflict-non-helpers/module.js Normal file
View File

@ -0,0 +1,4 @@
export const addCss = 'a';
export const addedCss = 'b';
export const applyComputations = 'c';
export const renderMainFragment = 'd';