@@ -11,6 +11,7 @@ import {WebpackResourceLoader} from './resource_loader';
1111import { createResolveDependenciesFromContextMap } from './utils' ;
1212import { WebpackCompilerHost } from './compiler_host' ;
1313import { resolveEntryModuleFromMain } from './entry_resolver' ;
14+ import { StaticSymbol } from '@angular/compiler-cli' ;
1415
1516
1617/**
@@ -25,6 +26,18 @@ export interface AotPluginOptions {
2526}
2627
2728
29+ export interface LazyRoute {
30+ moduleRoute : ModuleRoute ;
31+ moduleRelativePath : string ;
32+ moduleAbsolutePath : string ;
33+ }
34+
35+
36+ export interface LazyRouteMap {
37+ [ path : string ] : LazyRoute ;
38+ }
39+
40+
2841export class ModuleRoute {
2942 constructor ( public readonly path : string , public readonly className : string = null ) { }
3043
@@ -57,6 +70,7 @@ export class AotPlugin {
5770
5871 private _typeCheck : boolean = true ;
5972 private _basePath : string ;
73+ private _genDir : string ;
6074
6175
6276 constructor ( options : AotPluginOptions ) {
@@ -68,7 +82,7 @@ export class AotPlugin {
6882 get compilerOptions ( ) { return this . _compilerOptions ; }
6983 get done ( ) { return this . _donePromise ; }
7084 get entryModule ( ) { return this . _entryModule ; }
71- get genDir ( ) { return this . _basePath ; }
85+ get genDir ( ) { return this . _genDir ; }
7286 get program ( ) { return this . _program ; }
7387 get typeCheck ( ) { return this . _typeCheck ; }
7488
@@ -113,6 +127,7 @@ export class AotPlugin {
113127 genDir
114128 } ) ;
115129 this . _basePath = basePath ;
130+ this . _genDir = genDir ;
116131
117132 if ( options . hasOwnProperty ( 'typeChecking' ) ) {
118133 this . _typeCheck = options . typeChecking ;
@@ -168,9 +183,9 @@ export class AotPlugin {
168183
169184 // Virtual file system.
170185 compiler . resolvers . normal . plugin ( 'resolve' , ( request : any , cb ?: ( ) => void ) => {
171- // Populate the file system cache with the virtual module.
172- this . _compilerHost . populateWebpackResolver ( compiler . resolvers . normal ) ;
173- if ( cb ) {
186+ if ( request . request . match ( / \. t s $ / ) ) {
187+ this . done . then ( ( ) => cb ( ) ) ;
188+ } else {
174189 cb ( ) ;
175190 }
176191 } ) ;
@@ -227,49 +242,85 @@ export class AotPlugin {
227242 throw new Error ( message ) ;
228243 }
229244 } )
245+ . then ( ( ) => {
246+ // Populate the file system cache with the virtual module.
247+ this . _compilerHost . populateWebpackResolver ( this . _compiler . resolvers . normal ) ;
248+ } )
230249 . then ( ( ) => {
231250 // Process the lazy routes
232- this . _lazyRoutes =
233- this . _processNgModule ( this . _entryModule , null )
234- . map ( module => ModuleRoute . fromString ( module ) )
235- . reduce ( ( lazyRoutes : any , module : ModuleRoute ) => {
236- lazyRoutes [ `${ module . path } ] = path . join (
237- this . genDir , module . path + '.ngfactory.ts' ) ;
238- return lazyRoutes ;
239- } , { } ) ;
251+ this . _lazyRoutes = { } ;
252+ const allLazyRoutes = this . _processNgModule ( this . _entryModule , null ) ;
253+ Object . keys ( allLazyRoutes )
254+ . forEach ( k => {
255+ const lazyRoute = allLazyRoutes [ k ] ;
256+ this . _lazyRoutes [ k + '.ngfactory' ] = lazyRoute . moduleAbsolutePath + '.ngfactory.ts' ;
257+ } ) ;
240258 } )
241- . then ( ( ) => cb ( ) , ( err : any ) => cb ( err )
10000
) ;
259+ . then ( ( ) => cb ( ) , ( err : any ) => { cb ( err ) ; } ) ;
242260 }
243261
244- private _resolveModule ( module : ModuleRoute , containingFile : string ) {
262+ private _resolveModulePath ( module : ModuleRoute , containingFile : string ) {
245263 if ( module . path . startsWith ( '.' ) ) {
246264 return path . join ( path . dirname ( containingFile ) , module . path ) ;
247265 }
248266 return module . path ;
249267 }
250268
251- private _processNgModule ( module : ModuleRoute , containingFile : string | null ) : string [ ] {
269+ private _processNgModule ( module : ModuleRoute , containingFile : string | null ) : LazyRouteMap {
252270 const modulePath = containingFile ? module . path : ( './' + path . basename ( module . path ) ) ;
253271 if ( containingFile === null ) {
254272 containingFile = module . path + '.ts' ;
255273 }
274+ const relativeModulePath = this . _resolveModulePath ( module , containingFile ) ;
256275
257- const resolvedModulePath = this . _resolveModule ( module , containingFile ) ;
258276 const staticSymbol = this . _reflectorHost
259277 . findDeclaration ( modulePath , module . className , containingFile ) ;
260278 const entryNgModuleMetadata = this . getNgModuleMetadata ( staticSymbol ) ;
261- const loadChildren = this . extractLoadChildren ( entryNgModuleMetadata ) ;
262- const result = loadChildren . map ( route => {
263- return this . _resolveModule ( new ModuleRoute ( route ) , resolvedModulePath ) ;
264- } ) ;
279+ const loadChildrenRoute : LazyRoute [ ] = this . extractLoadChildren ( entryNgModuleMetadata )
280+ . map ( route => {
281+ const mr = ModuleRoute . fromString ( route ) ;
282+ const relativePath = this . _resolveModulePath ( mr , relativeModulePath ) ;
283+ const absolutePath = path . join ( this . genDir , relativePath ) ;
284+ return {
285+ moduleRoute : mr ,
286+ moduleRelativePath : relativePath ,
287+ moduleAbsolutePath : absolutePath
288+ } ;
289+ } ) ;
290+ const resultMap : LazyRouteMap = loadChildrenRoute
291+ . reduce ( ( acc : LazyRouteMap , curr : LazyRoute ) => {
292+ const key = curr . moduleRoute . path ;
293+ if ( acc [ key ] ) {
294+ if ( acc [ key ] . moduleAbsolutePath != curr . moduleAbsolutePath ) {
295+ throw new Error ( `Duplicated path in loadChildren detected: "${ key } +
296+ 'loadChildren, but they point to different modules. Webpack cannot distinguish ' +
297+ 'between the two based on context and would fail to load the proper one.' ) ;
298+ }
299+ } else {
300+ acc [ key ] = curr ;
301+ }
302+ return acc ;
303+ } , { } ) ;
265304
266305 // Also concatenate every child of child modules.
267- for ( const route of loadChildren ) {
268- const childModule = ModuleRoute . fromString ( route ) ;
269- const children = this . _processNgModule ( childModule , resolvedModulePath + '.ts' ) ;
270- result . push ( ...children ) ;
306+ for ( const lazyRoute of loadChildrenRoute ) {
307+ const mr = lazyRoute . moduleRoute ;
308+ const children = this . _processNgModule ( mr , relativeModulePath ) ;
309+ Object . keys ( children ) . forEach ( p => {
310+ const child = children [ p ] ;
311+ const key = child . moduleRoute . path ;
312+ if ( resultMap [ key ] ) {
313+ if ( resultMap [ key ] . moduleAbsolutePath != child . moduleAbsolutePath ) {
314+ throw new Error ( `Duplicated path in loadChildren detected: "${ key } +
315+ 'loadChildren, but they point to different modules. Webpack cannot distinguish ' +
316+ 'between the two based on context and would fail to load the proper one.' ) ;
317+ }
318+ } else {
319+ resultMap [ key ] = child ;
320+ }
321+ } ) ;
271322 }
272- return result ;
323+ return resultMap ;
273324 }
274325
275326 private getNgModuleMetadata ( staticSymbol : ngCompiler . StaticSymbol ) {
@@ -281,10 +332,23 @@ export class AotPlugin {
281332 }
282333
283334 private extractLoadChildren ( ngModuleDecorator : any ) : any [ ] {
284- const routes = ngModuleDecorator . imports . reduce ( ( mem : any [ ] , m : any ) => {
335+ const routes = ( ngModuleDecorator . imports || [ ] ) . reduce ( ( mem : any [ ] , m : any ) => {
285336 return mem . concat ( this . collectRoutes ( m . providers ) ) ;
286337 } , this . collectRoutes ( ngModuleDecorator . providers ) ) ;
287- return this . collectLoadChildren ( routes ) ;
338+ return this . collectLoadChildren ( routes )
339+ . concat ( ( ngModuleDecorator . imports || [ ] )
340+ // Also recursively extractLoadChildren of modules we import.
341+ . map ( ( staticSymbol : any ) => {
342+ if ( staticSymbol instanceof StaticSymbol ) {
343+ const entryNgModuleMetadata = this . getNgModuleMetadata ( staticSymbol ) ;
344+ return this . extractLoadChildren ( entryNgModuleMetadata ) ;
345+ } else {
346+ return [ ] ;
347+ }
348+ } )
349+ // Poor man's flat map.
350+ . reduce ( ( acc : any [ ] , i : any ) => acc . concat ( i ) , [ ] ) )
351+ . filter ( x => ! ! x ) ;
288352 }
289353
290354 private collectRoutes ( providers : any [ ] ) : any [ ] {
0 commit comments