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
50 lines
1.6 KiB
TypeScript
50 lines
1.6 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 {InjectionToken} from '@angular/core';
|
|
|
|
import {Options} from './common_options';
|
|
import {Metric} from './metric';
|
|
import {Validator} from './validator';
|
|
|
|
|
|
/**
|
|
* SampleDescription merges all available descriptions about a sample
|
|
*/
|
|
export class SampleDescription {
|
|
static PROVIDERS = [{
|
|
provide: SampleDescription,
|
|
useFactory:
|
|
(metric: Metric, id: string, forceGc: boolean, userAgent: string, validator: Validator,
|
|
defaultDesc: {[key: string]: string}, userDesc: {[key: string]: string}) =>
|
|
new SampleDescription(
|
|
id,
|
|
[
|
|
{'forceGc': forceGc, 'userAgent': userAgent}, validator.describe(), defaultDesc,
|
|
userDesc
|
|
],
|
|
metric.describe()),
|
|
deps: [
|
|
Metric, Options.SAMPLE_ID, Options.FORCE_GC, Options.USER_AGENT, Validator,
|
|
Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION
|
|
]
|
|
}];
|
|
description: {[key: string]: any};
|
|
|
|
constructor(
|
|
public id: string, descriptions: Array<{[key: string]: any}>,
|
|
public metrics: {[key: string]: any}) {
|
|
this.description = {};
|
|
descriptions.forEach(description => {
|
|
Object.keys(description).forEach(prop => { this.description[prop] = description[prop]; });
|
|
});
|
|
}
|
|
|
|
toJson() { return {'id': this.id, 'description': this.description, 'metrics': this.metrics}; }
|
|
}
|