mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-12-01 17:30:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #553 from sveltejs/gh-538

Browse Source 
correctly handle when helper functions have been internally renamed (#538)
This commit is contained in:
Rich Harris 2017-05-02 18:06:58 -04:00 committed by GitHub
commit 8ff66f34f8
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,9 @@ import { walk } from 'estree-walker';
import deindent from '../../utils/deindent.js';
import CodeBuilder from '../../utils/CodeBuilder.js';
import visit from './visit.js';
import { nameMap, sharedMap } from './sharedNames.js';
import Generator from '../Generator.js';
import preprocess from './preprocess.js';
import * as shared from '../../shared/index.js';
class DomGenerator extends Generator {
constructor ( parsed, source, name, options ) {
@ -25,7 +25,7 @@ class DomGenerator extends Generator {
}
helper ( name ) {
if ( this.options.dev && `${name}Dev` in shared ) {
if ( this.options.dev && sharedMap.has( `${name}Dev` ) ) {
name = `${name}Dev`;
}
@ -275,7 +275,7 @@ export default function dom ( parsed, source, options ) {
);
} else {
generator.uses.forEach( key => {
const str = shared[ key ].toString(); // eslint-disable-line import/namespace
const str = sharedMap.get( key );
const code = new MagicString( str );
const fn = parse( str ).body[0];
@ -286,11 +286,12 @@ export default function dom ( parsed, source, options ) {
if ( node._scope ) scope = node._scope;
if ( node.type === 'Identifier' && isReference( node, parent ) && !scope.has( node.name ) ) {
if ( node.name in shared ) {
if ( nameMap.has( node.name ) ) {
// this helper function depends on another one
generator.uses.add( node.name );
const dependency = nameMap.get( node.name );
generator.uses.add( dependency );
const alias = generator.alias( node.name );
const alias = generator.alias( dependency );
if ( alias !== node.name ) code.overwrite( node.start, node.end, alias );
}
}
@ -301,7 +302,7 @@ export default function dom ( parsed, source, options ) {
}
});
const alias = generator.alias( fn.id.name );
const alias = generator.alias( key );
if ( alias !== fn.id.name ) code.overwrite( fn.id.start, fn.id.end, alias );
builders.main.addBlock( code.toString() );

12
src/generators/dom/sharedNames.js Normal file
View File

@ -0,0 +1,12 @@
import * as shared from '../../shared/index.js';
export const nameMap = new Map();
export const sharedMap = new Map();
Object.keys(shared).forEach( key => {
const value = shared[ key ]; // eslint-disable-line import/namespace
if ( typeof value === 'function' ) {
nameMap.set( value.name, key );
}
sharedMap.set( key, value.toString() );
});