@@ -6,7 +6,7 @@ import { walk } from 'estree-walker';
6
6
import deindent from '../../utils/deindent.js' ;
7
7
import CodeBuilder from '../../utils/CodeBuilder.js' ;
8
8
import visit from './visit.js' ;
9
- import { nameMap , sharedMap } from './sharedNames .js' ;
9
+ import shared from './shared .js' ;
10
10
import Generator from '../Generator.js' ;
11
11
import preprocess from './preprocess.js' ;
12
12
@@ -25,7 +25,7 @@ class DomGenerator extends Generator {
25
25
}
26
26
27
27
helper ( name ) {
28
- if ( this . options . dev && sharedMap . has ( `${ name } Dev` ) ) {
28
+ if ( this . options . dev && `${ name } Dev` in shared ) {
29
29
name = `${ name } Dev` ;
30
30
}
31
31
@@ -275,20 +275,20 @@ export default function dom ( parsed, source, options ) {
275
275
) ;
276
276
} else {
277
277
generator . uses . forEach ( key => {
278
- const str = sharedMap . get ( key ) ;
278
+ const str = shared [ key ] ;
279
279
const code = new MagicString ( str ) ;
280
- const fn = parseExpressionAt ( str , 0 ) ;
280
+ const expression = parseExpressionAt ( str , 0 ) ;
281
281
282
- let scope = annotateWithScopes ( fn ) ;
282
+ let scope = annotateWithScopes ( expression ) ;
283
283
284
- walk ( fn , {
284
+ walk ( expression , {
285
285
enter ( node , parent ) {
286
286
if ( node . _scope ) scope = node . _scope ;
287
287
288
288
if ( node . type === 'Identifier' && isReference ( node , parent ) && ! scope . has ( node . name ) ) {
289
- if ( nameMap . has ( node . name ) ) {
289
+ if ( node . name in shared ) {
290
290
// this helper function depends on another one
291
- const dependency = nameMap . get ( node . name ) ;
291
+ const dependency = node . name ;
292
292
generator . uses . add ( dependency ) ;
293
293
294
294
const alias = generator . alias ( dependency ) ;
@@ -309,8 +309,8 @@ export default function dom ( parsed, source, options ) {
309
309
`var ${ generator . alias ( 'transitionManager' ) } = window.${ global } || ( window.${ global } = ${ code } );`
310
310
) ;
311
311
} else {
312
- const alias = generator . alias ( fn . id . name ) ;
313
- if ( alias !== fn . id . name ) code . overwrite ( fn . id . start , fn . id . end , alias ) ;
312
+ const alias = generator . alias ( expression . id . name ) ;
313
+ if ( alias !== expression . id . name ) code . overwrite ( expression . id . start , expression . id . end , alias ) ;
314
314
315
315
builders . main . addBlock ( code . toString ( ) ) ;
316
316
}
0 commit comments