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
105 lines
3.0 KiB
TypeScript
105 lines
3.0 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, Injector} from '@angular/core';
|
|
|
|
import {Options} from './common_options';
|
|
|
|
export type PerfLogEvent = {
|
|
[key: string]: any
|
|
} & {
|
|
ph?: 'X' | 'B' | 'E' | 'I',
|
|
ts?: number,
|
|
dur?: number,
|
|
name?: string,
|
|
pid?: string,
|
|
args?: {
|
|
encodedDataLength?: number,
|
|
usedHeapSize?: number,
|
|
majorGc?: boolean,
|
|
url?: string,
|
|
method?: string
|
|
}
|
|
};
|
|
|
|
/**
|
|
* A WebDriverExtension implements extended commands of the webdriver protocol
|
|
* for a given browser, independent of the WebDriverAdapter.
|
|
* Needs one implementation for every supported Browser.
|
|
*/
|
|
export abstract class WebDriverExtension {
|
|
static provideFirstSupported(childTokens: any[]): any[] {
|
|
const res = [
|
|
{
|
|
provide: _CHILDREN,
|
|
useFactory: (injector: Injector) => childTokens.map(token => injector.get(token)),
|
|
deps: [Injector]
|
|
},
|
|
{
|
|
provide: WebDriverExtension,
|
|
useFactory: (children: WebDriverExtension[], capabilities: {[key: string]: any}) => {
|
|
let delegate: WebDriverExtension;
|
|
children.forEach(extension => {
|
|
if (extension.supports(capabilities)) {
|
|
delegate = extension;
|
|
}
|
|
});
|
|
if (!delegate) {
|
|
throw new Error('Could not find a delegate for given capabilities!');
|
|
}
|
|
return delegate;
|
|
},
|
|
deps: [_CHILDREN, Options.CAPABILITIES]
|
|
}
|
|
];
|
|
return res;
|
|
}
|
|
|
|
gc(): Promise<any> { throw new Error('NYI'); }
|
|
|
|
timeBegin(name: string): Promise<any> { throw new Error('NYI'); }
|
|
|
|
timeEnd(name: string, restartName: string): Promise<any> { throw new Error('NYI'); }
|
|
|
|
/**
|
|
* Format:
|
|
* - cat: category of the event
|
|
* - name: event name: 'script', 'gc', 'render', ...
|
|
* - ph: phase: 'B' (begin), 'E' (end), 'X' (Complete event), 'I' (Instant event)
|
|
* - ts: timestamp in ms, e.g. 12345
|
|
* - pid: process id
|
|
* - args: arguments, e.g. {heapSize: 1234}
|
|
*
|
|
* Based on [Chrome Trace Event
|
|
*Format](https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit)
|
|
**/
|
|
readPerfLog(): Promise<PerfLogEvent[]> { throw new Error('NYI'); }
|
|
|
|
perfLogFeatures(): PerfLogFeatures { throw new Error('NYI'); }
|
|
|
|
supports(capabilities: {[key: string]: any}): boolean { return true; }
|
|
}
|
|
|
|
export class PerfLogFeatures {
|
|
render: boolean;
|
|
gc: boolean;
|
|
frameCapture: boolean;
|
|
userTiming: boolean;
|
|
|
|
constructor(
|
|
{render = false, gc = false, frameCapture = false, userTiming = false}:
|
|
{render?: boolean, gc?: boolean, frameCapture?: boolean, userTiming?: boolean} = {}) {
|
|
this.render = render;
|
|
this.gc = gc;
|
|
this.frameCapture = frameCapture;
|
|
this.userTiming = userTiming;
|
|
}
|
|
}
|
|
|
|
const _CHILDREN = new InjectionToken('WebDriverExtension.children');
|