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
91 lines
2.5 KiB
TypeScript
91 lines
2.5 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 {APP_BOOTSTRAP_LISTENER, ApplicationRef, ComponentRef, InjectionToken} from '@angular/core';
|
|
import {ExtraOptions, ROUTER_CONFIGURATION, ROUTER_INITIALIZER, Router, RouterPreloader} from '@angular/router';
|
|
import {UpgradeModule} from '@angular/upgrade/static';
|
|
|
|
|
|
|
|
/**
|
|
* @whatItDoes Creates an initializer that in addition to setting up the Angular 2
|
|
* router sets up the ngRoute integration.
|
|
*
|
|
* @howToUse
|
|
*
|
|
* ```
|
|
* @NgModule({
|
|
* imports: [
|
|
* RouterModule.forRoot(SOME_ROUTES),
|
|
* UpgradeModule
|
|
* ],
|
|
* providers: [
|
|
* RouterUpgradeInitializer
|
|
* ]
|
|
* })
|
|
* export class AppModule {
|
|
* ngDoBootstrap() {}
|
|
* }
|
|
* ```
|
|
*
|
|
* @experimental
|
|
*/
|
|
export const RouterUpgradeInitializer = {
|
|
provide: ROUTER_INITIALIZER,
|
|
useFactory: initialRouterNavigation,
|
|
deps: [UpgradeModule, ApplicationRef, RouterPreloader, ROUTER_CONFIGURATION]
|
|
};
|
|
|
|
/**
|
|
* @internal
|
|
*/
|
|
export function initialRouterNavigation(
|
|
ngUpgrade: UpgradeModule, ref: ApplicationRef, preloader: RouterPreloader,
|
|
opts: ExtraOptions): Function {
|
|
return () => {
|
|
if (!ngUpgrade.$injector) {
|
|
throw new Error(`
|
|
RouterUpgradeInitializer can be used only after UpgradeModule.bootstrap has been called.
|
|
Remove RouterUpgradeInitializer and call setUpLocationSync after UpgradeModule.bootstrap.
|
|
`);
|
|
}
|
|
|
|
const router = ngUpgrade.injector.get(Router);
|
|
const ref = ngUpgrade.injector.get(ApplicationRef);
|
|
|
|
(router as any).resetRootComponentType(ref.componentTypes[0]);
|
|
preloader.setUpPreloading();
|
|
if (opts.initialNavigation === false) {
|
|
router.setUpLocationChangeListener();
|
|
} else {
|
|
router.initialNavigation();
|
|
}
|
|
|
|
setUpLocationSync(ngUpgrade);
|
|
};
|
|
}
|
|
|
|
/**
|
|
* @whatItDoes Sets up a location synchronization.
|
|
*
|
|
* History.pushState does not fire onPopState, so the angular2 location
|
|
* doesn't detect it. The workaround is to attach a location change listener
|
|
*
|
|
* @experimental
|
|
*/
|
|
export function setUpLocationSync(ngUpgrade: UpgradeModule): void {
|
|
const router: Router = ngUpgrade.injector.get(Router);
|
|
const url = document.createElement('a');
|
|
|
|
ngUpgrade.$injector.get('$rootScope')
|
|
.$on('$locationChangeStart', (_: any, next: string, __: string) => {
|
|
url.href = next;
|
|
router.navigateByUrl(url.pathname);
|
|
});
|
|
}
|