cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(Type): merge Type and ConcreType<?> into Type<?> (#10616)

Browse Source 
Closes #9729

BREAKING CHANGE:

`Type` is now `Type<T>` which means that in most cases you have to
use `Type<any>` in place of `Type`.

We don't expect that any user applications use the `Type` type.
This commit is contained in:
Miško Hevery
2016-08-10 18:21:28 -07:00
committed by vikerman
parent 6f4ee6101c
commit b96869afd2
91 changed files with 637 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/@angular/upgrade/src/upgrade_adapter.ts
View File

@ -102,7 +102,7 @@ export class UpgradeAdapter {
/* @internal */
private idPrefix: string = `NG2_UPGRADE_${upgradeCount++}_`;
/* @internal */
private upgradedComponents: Type[] = [];
private upgradedComponents: Type<any>[] = [];
/**
* An internal map of ng1 components which need to up upgraded to ng2.
*
@ -113,11 +113,11 @@ export class UpgradeAdapter {
*/
private ng1ComponentsToBeUpgraded: {[name: string]: UpgradeNg1ComponentAdapterBuilder} = {};
/* @internal */
private providers: Array<Type|Provider|any[]|any> = [];
private providers: Array<Type<any>|Provider|any[]|any> = [];
// the ng2AppModule param should be required once the deprecated @Component.directives prop is
// removed
constructor(private ng2AppModule?: Type) {
constructor(private ng2AppModule?: Type<any>) {
if (arguments.length && !ng2AppModule) {
throw new BaseException(
'UpgradeAdapter constructor called with undefined instead of a ng module type');
@ -179,7 +179,7 @@ export class UpgradeAdapter {
* });
* ```
*/
downgradeNg2Component(type: Type): Function {
downgradeNg2Component(type: Type<any>): Function {
this.upgradedComponents.push(type);
var info: ComponentInfo = getComponentInfo(type);
return ng1ComponentDirective(info, `${this.idPrefix}${info.selector}_c`);
@ -262,7 +262,7 @@ export class UpgradeAdapter {
* });
* ```
*/
upgradeNg1Component(name: string): Type {
upgradeNg1Component(name: string): Type<any> {
if ((<any>this.ng1ComponentsToBeUpgraded).hasOwnProperty(name)) {
return this.ng1ComponentsToBeUpgraded[name].type;
} else {
@ -489,7 +489,9 @@ export class UpgradeAdapter {
* @deprecated Use NgModules and `new UpgradeAdapter(ng2AppModule)` to configure top-level
*providers
*/
public addProvider(provider: Type|Provider|any[]|any): void { this.providers.push(provider); }
public addProvider(provider: Type<any>|Provider|any[]|any): void {
this.providers.push(provider);
}
/**
* Allows AngularJS v1 service to be accessible from Angular v2.