mirror of
https://github.com/angular/angular
synced 2026-05-24 09:28:37 +00:00
d169c2434e
- Introduce `InjectionToken<T>` which is a parameterized and type-safe
version of `OpaqueToken`.
DEPRECATION:
- `OpaqueToken` is now deprecated, use `InjectionToken<T>` instead.
- `Injector.get(token: any, notFoundValue?: any): any` is now deprecated
use the same method which is now overloaded as
`Injector.get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T): T;`.
Migration
- Replace `OpaqueToken` with `InjectionToken<?>` and parameterize it.
- Migrate your code to only use `Type<?>` or `InjectionToken<?>` as
injection tokens. Using other tokens will not be supported in the
future.
BREAKING CHANGE:
- Because `injector.get()` is now parameterize it is possible that code
which used to work no longer type checks. Example would be if one
injects `Foo` but configures it as `{provide: Foo, useClass: MockFoo}`.
The injection instance will be that of `MockFoo` but the type will be
`Foo` instead of `any` as in the past. This means that it was possible
to call a method on `MockFoo` in the past which now will fail type
check. See this example:
```
class Foo {}
class MockFoo extends Foo {
setupMock();
}
var PROVIDERS = [
{provide: Foo, useClass: MockFoo}
];
...
function myTest(injector: Injector) {
var foo = injector.get(Foo);
// This line used to work since `foo` used to be `any` before this
// change, it will now be `Foo`, and `Foo` does not have `setUpMock()`.
// The fix is to downcast: `injector.get(Foo) as MockFoo`.
foo.setUpMock();
}
```
PR Close #13785
54 lines
2 KiB
TypeScript
54 lines
2 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, ComponentFactoryResolver, InjectionToken, Injector, NgModuleFactory, NgModuleFactoryLoader} 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';
|
|
|
|
|
|
/**
|
|
* @experimental
|
|
*/
|
|
export const ROUTES = new InjectionToken<Route[][]>('ROUTES');
|
|
|
|
export class LoadedRouterConfig {
|
|
constructor(
|
|
public routes: Route[], public injector: Injector,
|
|
public factoryResolver: ComponentFactoryResolver, public injectorFactory: Function) {}
|
|
}
|
|
|
|
export class RouterConfigLoader {
|
|
constructor(private loader: NgModuleFactoryLoader, private compiler: Compiler) {}
|
|
|
|
load(parentInjector: Injector, loadChildren: LoadChildren): Observable<LoadedRouterConfig> {
|
|
return map.call(this.loadModuleFactory(loadChildren), (r: NgModuleFactory<any>) => {
|
|
const ref = r.create(parentInjector);
|
|
const injectorFactory = (parent: Injector) => r.create(parent).injector;
|
|
return new LoadedRouterConfig(
|
|
flatten(ref.injector.get(ROUTES)), ref.injector, ref.componentFactoryResolver,
|
|
injectorFactory);
|
|
});
|
|
}
|
|
|
|
private loadModuleFactory(loadChildren: LoadChildren): Observable<NgModuleFactory<any>> {
|
|
if (typeof loadChildren === 'string') {
|
|
return fromPromise(this.loader.load(loadChildren));
|
|
} else {
|
|
const offlineMode = this.compiler instanceof Compiler;
|
|
return mergeMap.call(
|
|
wrapIntoObservable(loadChildren()),
|
|
(t: any) => offlineMode ? of (<any>t) : fromPromise(this.compiler.compileModuleAsync(t)));
|
|
}
|
|
}
|
|
}
|