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

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.

Author: mhevery

modules/@angular/common/src/common_directives.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '@angular/core';
+import {Provider} from '@angular/core';
 
 import {CORE_DIRECTIVES} from './directives';
 
@@ -55,4 +55,4 @@ import {CORE_DIRECTIVES} from './directives';
  *
  * @experimental Contains forms which are experimental.
  */
-export const COMMON_DIRECTIVES: Type[][] = [CORE_DIRECTIVES];
+export const COMMON_DIRECTIVES: any[] = CORE_DIRECTIVES;

modules/@angular/common/src/directives/core_directives.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '../facade/lang';
+import {Type} from '@angular/core';
 
 import {NgClass} from './ng_class';
 import {NgFor} from './ng_for';
@@ -58,7 +58,7 @@ import {NgTemplateOutlet} from './ng_template_outlet';
  *
  * @stable
  */
-export const CORE_DIRECTIVES: Type[] = [
+export const CORE_DIRECTIVES: Type<any>[] = [
   NgClass,
   NgFor,
   NgIf,

modules/@angular/common/src/forms-deprecated.ts

@@ -57,7 +57,7 @@ export {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from './forms-deprecated
  *
  * @experimental
  */
-export const FORM_PROVIDERS: Type[] = [FormBuilder, RadioControlRegistry];
+export const FORM_PROVIDERS: Type<any>[] = [FormBuilder, RadioControlRegistry];
 
 
 /**

modules/@angular/common/src/forms-deprecated/directives.ts

@@ -58,7 +58,7 @@ export {MaxLengthValidator, MinLengthValidator, PatternValidator, RequiredValida
  * ```
  * @experimental
  */
-export const FORM_DIRECTIVES: Type[] = [
+export const FORM_DIRECTIVES: Type<any>[] = [
   NgControlName,
   NgControlGroup,
 

modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts

@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '@angular/core';
-import {Type, stringify} from '../facade/lang';
+import {BaseException, Type} from '@angular/core';
+import {stringify} from '../facade/lang';
 
 export class InvalidPipeArgumentException extends BaseException {
-  constructor(type: Type, value: Object) {
+  constructor(type: Type<any>, value: Object) {
     super(`Invalid argument '${value}' for pipe '${stringify(type)}'`);
   }
 }

modules/@angular/common/src/pipes/number_pipe.ts

@@ -6,18 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Pipe, PipeTransform} from '@angular/core';
+import {Pipe, PipeTransform, Type} from '@angular/core';
 
 import {NumberFormatStyle, NumberFormatter} from '../facade/intl';
-import {NumberWrapper, Type, isBlank, isNumber, isPresent, isString} from '../facade/lang';
+import {NumberWrapper, isBlank, isNumber, isPresent, isString} from '../facade/lang';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 var defaultLocale: string = 'en-US';
 const _NUMBER_FORMAT_REGEXP = /^(\d+)?\.((\d+)(\-(\d+))?)?$/;
 
 function formatNumber(
-    pipe: Type, value: number | string, style: NumberFormatStyle, digits: string,
+    pipe: Type<any>, value: number | string, style: NumberFormatStyle, digits: string,
     currency: string = null, currencyAsSymbol: boolean = false): string {
   if (isBlank(value)) return null;
   // Convert strings to numbers

modules/@angular/compiler/src/compile_metadata.ts

@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, SchemaMetadata, ViewEncapsulation} from '@angular/core';
+import {ChangeDetectionStrategy, SchemaMetadata, Type, ViewEncapsulation} from '@angular/core';
 
 import {LifecycleHooks, reflector} from '../core_private';
+
 import {ListWrapper, StringMapWrapper} from './facade/collection';
 import {BaseException, unimplemented} from './facade/exceptions';
-import {Type, isBlank, isPresent, isStringMap, normalizeBlank, normalizeBool} from './facade/lang';
-
+import {isBlank, isPresent, isStringMap, normalizeBlank, normalizeBool} from './facade/lang';
 import {CssSelector} from './selector';
 import {getUrlScheme} from './url_resolver';
 import {sanitizeIdentifier, splitAtColon} from './util';
@@ -308,7 +308,7 @@ export class CompileTypeMetadata extends CompileIdentifierMetadata {
   lifecycleHooks: LifecycleHooks[];
 
   constructor({runtime, name, moduleUrl, prefix, isHost, value, diDeps, lifecycleHooks}: {
-    runtime?: Type,
+    runtime?: Type<any>,
     name?: string,
     moduleUrl?: string,
     prefix?: string,
@@ -685,8 +685,8 @@ export class CompileNgModuleMetadata implements CompileMetadataWithIdentifier {
 }
 
 export class TransitiveCompileNgModuleMetadata {
-  directivesSet = new Set<Type>();
-  pipesSet = new Set<Type>();
+  directivesSet = new Set<Type<any>>();
+  pipesSet = new Set<Type<any>>();
   constructor(
       public modules: CompileNgModuleMetadata[], public providers: CompileProviderMetadata[],
       public entryComponents: CompileTypeMetadata[], public directives: CompileDirectiveMetadata[],

modules/@angular/compiler/src/compiler.ts

@@ -52,7 +52,7 @@ const _NO_XHR: XHR = {
  * A set of providers that provide `RuntimeCompiler` and its dependencies to use for
  * template compilation.
  */
-export const COMPILER_PROVIDERS: Array<any|Type|{[k: string]: any}|any[]> = [
+export const COMPILER_PROVIDERS: Array<any|Type<any>|{[k: string]: any}|any[]> = [
   {provide: Reflector, useValue: reflector},
   {provide: ReflectorReader, useExisting: Reflector},
   {provide: XHR, useValue: _NO_XHR},
@@ -79,8 +79,11 @@ export const COMPILER_PROVIDERS: Array<any|Type|{[k: string]: any}|any[]> = [
 ];
 
 
-export function analyzeAppProvidersForDeprecatedConfiguration(appProviders: any[] = []):
-    {compilerOptions: CompilerOptions, moduleDeclarations: Type[], deprecationMessages: string[]} {
+export function analyzeAppProvidersForDeprecatedConfiguration(appProviders: any[] = []): {
+  compilerOptions: CompilerOptions,
+  moduleDeclarations: Type<any>[],
+  deprecationMessages: string[]
+} {
   let platformDirectives: any[] = [];
   let platformPipes: any[] = [];
 

modules/@angular/compiler/src/directive_resolver.ts

@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException, ComponentMetadata, DirectiveMetadata, HostBindingMetadata, HostListenerMetadata, Injectable, InputMetadata, OutputMetadata, QueryMetadata, resolveForwardRef} from '@angular/core';
-
+import {ComponentMetadata, DirectiveMetadata, HostBindingMetadata, HostListenerMetadata, Injectable, InputMetadata, OutputMetadata, QueryMetadata, Type, resolveForwardRef} from '@angular/core';
 import {ReflectorReader, reflector} from '../core_private';
-
 import {StringMapWrapper} from './facade/collection';
-import {Type, isPresent, stringify} from './facade/lang';
+import {BaseException} from './facade/exceptions';
+import {isPresent, stringify} from './facade/lang';
 import {splitAtColon} from './util';
 
 function _isDirectiveMetadata(type: any): type is DirectiveMetadata {
@@ -32,7 +31,7 @@ export class DirectiveResolver {
   /**
    * Return {@link DirectiveMetadata} for a given `Type`.
    */
-  resolve(type: Type, throwIfNotFound = true): DirectiveMetadata {
+  resolve(type: Type<any>, throwIfNotFound = true): DirectiveMetadata {
     var typeMetadata = this._reflector.annotations(resolveForwardRef(type));
     if (isPresent(typeMetadata)) {
       var metadata = typeMetadata.find(_isDirectiveMetadata);
@@ -49,7 +48,7 @@ export class DirectiveResolver {
 
   private _mergeWithPropertyMetadata(
       dm: DirectiveMetadata, propertyMetadata: {[key: string]: any[]},
-      directiveType: Type): DirectiveMetadata {
+      directiveType: Type<any>): DirectiveMetadata {
     var inputs: string[] = [];
     var outputs: string[] = [];
     var host: {[key: string]: string} = {};
@@ -90,7 +89,7 @@ export class DirectiveResolver {
 
   private _merge(
       dm: DirectiveMetadata, inputs: string[], outputs: string[], host: {[key: string]: string},
-      queries: {[key: string]: any}, directiveType: Type): DirectiveMetadata {
+      queries: {[key: string]: any}, directiveType: Type<any>): DirectiveMetadata {
     let mergedInputs: string[];
 
     if (isPresent(dm.inputs)) {

modules/@angular/compiler/src/lifecycle_reflector.ts

@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, DoCheck, OnChanges, OnDestroy, OnInit} from '@angular/core';
+import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, DoCheck, OnChanges, OnDestroy, OnInit, Type} from '@angular/core';
 
 import {LifecycleHooks, reflector} from '../core_private';
 
 import {MapWrapper} from './facade/collection';
-import {Type} from './facade/lang';
 
-const LIFECYCLE_INTERFACES: Map<any, Type> = MapWrapper.createFromPairs([
+const LIFECYCLE_INTERFACES: Map<any, Type<any>> = MapWrapper.createFromPairs([
   [LifecycleHooks.OnInit, OnInit],
   [LifecycleHooks.OnDestroy, OnDestroy],
   [LifecycleHooks.DoCheck, DoCheck],