13686bb518
fixes #12869 fixes #12889 fixes #13885 fixes #13870 Before this change there was a single injector tree. Now we have 2 injector trees, one for the modules and one for the components. This fixes lazy loading modules. See the design docs for details: https://docs.google.com/document/d/1OEUIwc-s69l1o97K0wBd_-Lth5BBxir1KuCRWklTlI4 BREAKING CHANGES `ComponentFactory.create()` takes an extra optional `NgModuleRef` parameter. No change should be required in user code as the correct module will be used when none is provided DEPRECATIONS The following methods were used internally and are no more required: - `RouterOutlet.locationFactoryResolver` - `RouterOutlet.locationInjector`
66 lines
2.1 KiB
TypeScript
66 lines
2.1 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
* found in the LICENSE file at https://angular.io/license
|
|
*/
|
|
|
|
import {Compiler, InjectionToken, Injector, NgModuleFactory, NgModuleFactoryLoader, NgModuleRef} from '@angular/core';
|
|
import {Observable} from 'rxjs/Observable';
|
|
import {fromPromise} from 'rxjs/observable/fromPromise';
|
|
import {of } from 'rxjs/observable/of';
|
|
import {map} from 'rxjs/operator/map';
|
|
import {mergeMap} from 'rxjs/operator/mergeMap';
|
|
import {LoadChildren, Route} from './config';
|
|
import {flatten, wrapIntoObservable} from './utils/collection';
|
|
|
|
/**
|
|
* @docsNotRequired
|
|
* @experimental
|
|
*/
|
|
export const ROUTES = new InjectionToken<Route[][]>('ROUTES');
|
|
|
|
export class LoadedRouterConfig {
|
|
constructor(public routes: Route[], public module: NgModuleRef<any>) {}
|
|
}
|
|
|
|
export class RouterConfigLoader {
|
|
constructor(
|
|
private loader: NgModuleFactoryLoader, private compiler: Compiler,
|
|
private onLoadStartListener?: (r: Route) => void,
|
|
private onLoadEndListener?: (r: Route) => void) {}
|
|
|
|
load(parentInjector: Injector, route: Route): Observable<LoadedRouterConfig> {
|
|
if (this.onLoadStartListener) {
|
|
this.onLoadStartListener(route);
|
|
}
|
|
|
|
const moduleFactory$ = this.loadModuleFactory(route.loadChildren);
|
|
|
|
return map.call(moduleFactory$, (factory: NgModuleFactory<any>) => {
|
|
if (this.onLoadEndListener) {
|
|
this.onLoadEndListener(route);
|
|
}
|
|
|
|
const module = factory.create(parentInjector);
|
|
|
|
return new LoadedRouterConfig(flatten(module.injector.get(ROUTES)), module);
|
|
});
|
|
}
|
|
|
|
private loadModuleFactory(loadChildren: LoadChildren): Observable<NgModuleFactory<any>> {
|
|
if (typeof loadChildren === 'string') {
|
|
return fromPromise(this.loader.load(loadChildren));
|
|
} else {
|
|
return mergeMap.call(wrapIntoObservable(loadChildren()), (t: any) => {
|
|
if (t instanceof NgModuleFactory) {
|
|
return of (t);
|
|
} else {
|
|
return fromPromise(this.compiler.compileModuleAsync(t));
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|