fix(manual_typings/globals): remove Type alias from globals and add it to every module which relies on it

Hotell · Hotell · commit 9040a2cc6733 · 2016-11-07T12:57:39.000+01:00
Closes #170
diff --git a/manual_typings/globals.d.ts b/manual_typings/globals.d.ts
@@ -5,8 +5,7 @@ import * as angular from 'angular';
 ///////////////////////////////////////////////////////////////////////////////
 declare global {
   type StringMap = {[key: string]: string};
-  type Type = Function;
-  type ProvideSpreadType = string|Type;
+  type ProvideSpreadType = string|Function;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/directives/core_directives.ts b/src/common/directives/core_directives.ts
@@ -1,4 +1,4 @@
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { NgForm } from './ng_form'
 import { NgModel } from './ng_model'
 import { NgSelect } from './ng_select'
@@ -43,7 +43,7 @@ import { NgSelect } from './ng_select'
  * }
  * ```
  */
-export const CORE_DIRECTIVES: Type[] = [
+export const CORE_DIRECTIVES: Function[] = [
   NgForm,
   NgModel,
   NgSelect
diff --git a/src/core/di/forward_ref.ts b/src/core/di/forward_ref.ts
@@ -1,4 +1,6 @@
-import { Type, stringify, isFunction } from '../../facade/lang';
+import { stringify, isFunction } from '../../facade/lang';
+import { Type } from '../../facade/type';
+
 
 /**
  * An interface that a function passed into {@link forwardRef} has to implement.
@@ -9,7 +11,7 @@ import { Type, stringify, isFunction } from '../../facade/lang';
  */
 export interface ForwardRefFn {
   (): any;
-  __forward_ref__?: Type,
+  __forward_ref__?: Function,
   toString?():string
 }
 
@@ -27,7 +29,7 @@ export interface ForwardRefFn {
 export function forwardRef(forwardRefFn: ForwardRefFn): Type {
   forwardRefFn.__forward_ref__ = forwardRef;
   forwardRefFn.toString = function() { return stringify(this()); };
-  return forwardRefFn as Type;
+  return forwardRefFn as any as Type;
 }
 
 /**
diff --git a/src/core/di/key.ts b/src/core/di/key.ts
@@ -8,6 +8,7 @@ import {OpaqueToken} from './opaque_token';
 import {ListWrapper} from '../../facade/collections';
 import {isType} from '../../facade/lang';
 import {getTypeName} from '../../facade/lang';
+import { Type } from '../../facade/type';
 
 /**
  * @TODO
diff --git a/src/core/di/provider.ts b/src/core/di/provider.ts
@@ -1,5 +1,4 @@
 import {
-  Type,
   isString,
   isBlank,
   isType,
@@ -10,6 +9,7 @@ import {
   normalizeBool,
   isArray
 } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { reflector } from '../reflection/reflection';
 import { OpaqueToken } from './opaque_token';
 import {
@@ -31,7 +31,7 @@ import { isInjectMetadata } from './provider_util';
 
 export type PropMetaInst =  InputMetadata | OutputMetadata | HostBindingMetadata | HostListenerMetadata;
 export type ParamMetaInst = HostMetadata | InjectMetadata | SelfMetadata | SkipSelfMetadata;
-export type ProviderType = Type | string | OpaqueToken;
+export type ProviderType = Type | OpaqueToken | Function | string ;
 export type ProviderAliasOptions = {useClass?: Type,useValue?: any,useFactory?: Function, deps?: Object[]};
 
 export class Provider {
@@ -219,7 +219,7 @@ class ProviderBuilder{
   static createFromType(
     type: ProviderType,
     { useClass, useValue, useFactory, deps }: ProviderAliasOptions
-  ): [string,Type] {
+  ): [string,Type|Function] {
 
     // ...provide('myFactory',{useFactory: () => () => { return new Foo(); } })
     if ( isPresent( useFactory ) ) {
@@ -322,7 +322,7 @@ class ProviderBuilder{
 export function provide(
   type: ProviderType,
   { useClass, useValue, useFactory, deps }: ProviderAliasOptions = {}
-  ): [string,Type] {
+): [string,Type|Function] {
   return ProviderBuilder.createFromType( type, { useClass, useValue, useFactory, deps } );
 }
 
diff --git a/src/core/di/provider_util.ts b/src/core/di/provider_util.ts
@@ -1,4 +1,5 @@
 import { isString, isPresent } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { DirectiveMetadata, ComponentMetadata, NgModuleMetadata } from '../directives/metadata_directives';
 import { PipeMetadata } from '../pipes/metadata';
 
diff --git a/src/core/di/reflective_provider.ts b/src/core/di/reflective_provider.ts
@@ -1,4 +1,5 @@
 import { isType, isArray, isString, getFuncName, isBlank, isPresent } from '../../facade/lang';
+import { Type } from '../../facade/type';
 
 import { reflector } from '../reflection/reflection';
 
@@ -50,7 +51,7 @@ export function resolveReflectiveProvider( provider: Provider ): {method: string
  * @returns {any}
  * @private
  */
-export function _getAngular1ModuleMetadataByType( injectable: Type ): { providerName: string, providerMethod: string, moduleMethod: string} {
+export function _getAngular1ModuleMetadataByType( injectable: Type|Function ): { providerName: string, providerMethod: string, moduleMethod: string} {
   // only the first class annotations is injectable
   const [annotation] = reflector.annotations( injectable );
 
diff --git a/src/core/directives/controller/controller_factory.ts b/src/core/directives/controller/controller_factory.ts
@@ -1,4 +1,5 @@
 import { StringMapWrapper } from '../../../facade/collections';
+import { Type } from '../../../facade/type';
 import { EventEmitter } from '../../../facade/async';
 import { DirectiveMetadata, ComponentMetadata } from '../metadata_directives';
 import { ChangeDetectorRef } from '../../change_detection/change_detector_ref';
diff --git a/src/core/directives/decorators.ts b/src/core/directives/decorators.ts
@@ -1,5 +1,5 @@
 import { makeDecorator, makePropDecorator, TypeDecorator } from '../util/decorators';
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { ContentChildrenMetadata, ContentChildMetadata, ViewChildrenMetadata, ViewChildMetadata } from './metadata_di';
 import {
   ComponentMetadata,
diff --git a/src/core/directives/directive_provider.ts b/src/core/directives/directive_provider.ts
@@ -1,6 +1,7 @@
 import { DirectiveResolver } from '../linker/directive_resolver';
 import { assign, isFunction, noop, resolveDirectiveNameFromSelector, stringify, isJsObject } from '../../facade/lang';
 import { StringMapWrapper } from '../../facade/collections';
+import { Type } from '../../facade/type';
 import { resolveImplementedLifeCycleHooks, ImplementedLifeCycleHooks } from '../linker/directive_lifecycles_reflector';
 import { ChildrenChangeHook } from '../linker/directive_lifecycle_interfaces';
 import { DirectiveMetadata, ComponentMetadata, LegacyDirectiveDefinition } from './metadata_directives';
diff --git a/src/core/directives/metadata_di.ts b/src/core/directives/metadata_di.ts
@@ -1,6 +1,7 @@
-import { Type, stringify, isString } from '../../facade/lang';
+import { stringify, isString } from '../../facade/lang';
 import { resolveForwardRef } from '../di/forward_ref';
 import { DependencyMetadata } from '../di/metadata';
+import { Type } from '../../facade/type';
 
 /**
  * Declares an injectable parameter to be a live list of directives or variable
diff --git a/src/core/directives/metadata_directives.ts b/src/core/directives/metadata_directives.ts
@@ -1,4 +1,4 @@
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { InjectableMetadata } from '../di/metadata';
 import { ChangeDetectionStrategy } from '../change_detection/constants';
 
diff --git a/src/core/directives/query/children_resolver.ts b/src/core/directives/query/children_resolver.ts
@@ -13,6 +13,7 @@ import {
   ContentChildrenMetadata
 } from '../metadata_di';
 import { DirectiveCtrl } from '../constants';
+import { Type } from '../../../facade/type';
 
 
 /**
diff --git a/src/core/linker/directive_lifecycles_reflector.ts b/src/core/linker/directive_lifecycles_reflector.ts
@@ -1,4 +1,4 @@
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { LifecycleHooks } from './directive_lifecycle_interfaces';
 
 export function hasLifecycleHook(lcInterface: LifecycleHooks, token: any): boolean {
diff --git a/src/core/linker/directive_resolver.ts b/src/core/linker/directive_resolver.ts
@@ -1,4 +1,4 @@
-import { Type, isPresent, stringify, assign, isType, getFuncName, isBlank } from '../../facade/lang';
+import { isPresent, stringify, assign, isType, getFuncName, isBlank } from '../../facade/lang';
 import { StringMapWrapper, ListWrapper } from '../../facade/collections';
 import { reflector } from '../reflection/reflection';
 import {
@@ -21,6 +21,7 @@ import { ParamMetaInst, PropMetaInst, getInjectableName } from '../di/provider';
 import { resolveForwardRef } from '../di/forward_ref';
 import { getErrorMsg } from '../../facade/exceptions';
 import { ChangeDetectionStrategy } from '../change_detection/constants';
+import { Type } from '../../facade/type';
 
 
 // asset:<package-name>/<realm>/<path-to-module>
diff --git a/src/core/linker/pipe_resolver.ts b/src/core/linker/pipe_resolver.ts
@@ -1,8 +1,9 @@
-import { Type, isPresent, stringify } from '../../facade/lang';
+import { isPresent, stringify } from '../../facade/lang';
 import { ListWrapper } from '../../facade/collections';
 import { PipeMetadata } from '../pipes/metadata';
 import { reflector } from '../reflection/reflection';
 import { resolveForwardRef } from '../di/forward_ref';
+import { Type } from '../../facade/type';
 
 function _isPipeMetadata( type: any ): boolean {
   return type instanceof PipeMetadata;
diff --git a/src/core/pipes/pipe_provider.ts b/src/core/pipes/pipe_provider.ts
@@ -1,7 +1,8 @@
-import {Type, isFunction} from "../../facade/lang";
+import {isFunction} from "../../facade/lang";
 import {PipeResolver} from '../linker/pipe_resolver';
 import {PipeMetadata} from "./metadata";
 import {PipeTransform} from "./pipe_interfaces";
+import { Type } from '../../facade/type';
 
 /**
  * @internal
diff --git a/src/core/reflection/platform_reflection_capabilities.ts b/src/core/reflection/platform_reflection_capabilities.ts
@@ -1,4 +1,4 @@
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { GetterFn, SetterFn, MethodFn } from './types';
 
 export interface PlatformReflectionCapabilities {
@@ -18,8 +18,8 @@ export interface PlatformReflectionCapabilities {
   ownPropMetadata( typeOrFunc: Type ): {[key: string]: any[]},
   registerPropMetadata( propMetadata, typeOrFunc: Type ): void,
 
-  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type ): void,
-  downgradedNg2ComponentName( typeOrFunc: Type ): string
+  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type|Function ): void,
+  downgradedNg2ComponentName( typeOrFunc: Type|Function ): string
 
   getter( name: string ): GetterFn;
   setter( name: string ): SetterFn;
diff --git a/src/core/reflection/reflection_capabilities.ts b/src/core/reflection/reflection_capabilities.ts
@@ -1,7 +1,8 @@
-import { Type, isPresent, global, stringify, ConcreteType } from '../../facade/lang';
+import { isPresent, global, stringify } from '../../facade/lang';
 import { GetterFn, SetterFn, MethodFn } from './types';
 import { PlatformReflectionCapabilities } from './platform_reflection_capabilities';
 import { ListWrapper } from '../../facade/collections';
+import { Type } from '../../facade/type';
 // import {BaseException} from 'angular2/src/facade/exceptions';
 
 
@@ -51,7 +52,7 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
 
   isReflectionEnabled(): boolean { return true; }
 
-  factory( t: ConcreteType ): Function {
+  factory( t: Type ): Function {
     switch ( t.length ) {
       case 0:
         return () => new t();
@@ -259,15 +260,15 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
     return this._reflect.getOwnMetadata( PROP_META_KEY, typeOrFunc );
   }
 
-  registerPropMetadata( propMetadata, typeOrFunc: Type ): void {
+  registerPropMetadata( propMetadata, typeOrFunc: Type|Function ): void {
     this._reflect.defineMetadata( PROP_META_KEY, propMetadata, typeOrFunc );
   }
 
-  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type ): void {
+  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type|Function ): void {
     this._reflect.defineMetadata( DOWNGRADED_COMPONENT_NAME_KEY, componentName, typeOrFunc );
   }
 
-  downgradedNg2ComponentName( typeOrFunc: Type ): string {
+  downgradedNg2ComponentName( typeOrFunc: Type|Function ): string {
     return this._reflect.getOwnMetadata( DOWNGRADED_COMPONENT_NAME_KEY, typeOrFunc );
   }
 
diff --git a/src/core/reflection/reflector.ts b/src/core/reflection/reflector.ts
@@ -1,4 +1,4 @@
-import { Type } from '../../facade/lang';
+import { Type } from '../../facade/type';
 import { ReflectorReader } from './reflector_reader';
 import { PlatformReflectionCapabilities } from './platform_reflection_capabilities';
 
@@ -93,15 +93,15 @@ export class Reflector extends ReflectorReader {
     return this.reflectionCapabilities.ownPropMetadata( typeOrFunc );
   }
 
-  registerPropMetadata( parameters, typeOrFunc: Type ): void {
-    this.reflectionCapabilities.registerPropMetadata( parameters, typeOrFunc );
+  registerPropMetadata( parameters, typeOrFunc: Type|Function ): void {
+    this.reflectionCapabilities.registerPropMetadata( parameters, typeOrFunc as Type );
   }
 
-  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type ): void {
-    this.reflectionCapabilities.registerDowngradedNg2ComponentName( componentName, typeOrFunc );
+  registerDowngradedNg2ComponentName( componentName: string, typeOrFunc: Type|Function ): void {
+    this.reflectionCapabilities.registerDowngradedNg2ComponentName( componentName, typeOrFunc as Type );
   }
 
-  downgradedNg2ComponentName( typeOrFunc: Type ): string {
+  downgradedNg2ComponentName( typeOrFunc: Type|Function ): string {
     return this.reflectionCapabilities.downgradedNg2ComponentName( typeOrFunc );
   }
 
diff --git a/src/core/reflection/types.ts b/src/core/reflection/types.ts
@@ -1,5 +1,3 @@
-import { Type } from '../../facade/lang';
-
 export type SetterFn = ( obj: any, value: any ) => void;
 export type GetterFn = ( obj: any ) => any;
 export type MethodFn = ( obj: any, args: any[] ) => any;
diff --git a/src/core/util/bundler.ts b/src/core/util/bundler.ts
@@ -9,6 +9,7 @@ import {
   _registerTypeProvider
 } from '../di/reflective_provider';
 import { ListWrapper } from '../../facade/collections';
+import { Type } from '../../facade/type';
 
 function _bundleComponent( ComponentClass: Type, otherProviders: any[] = [], existingAngular1Module?: ng.IModule ): ng.IModule {
 
diff --git a/src/core/util/decorators.ts b/src/core/util/decorators.ts
@@ -1,7 +1,8 @@
-import { Type, isFunction, isPresent } from '../../facade/lang';
+import { isFunction, isPresent } from '../../facade/lang';
 import { reflector } from '../reflection/reflection';
 import { InjectableMetadata } from '../di/metadata';
 import { globalKeyRegistry } from '../di/key';
+import { Type } from '../../facade/type';
 
 /**
  * An interface implemented by all Angular type decorators,
diff --git a/src/facade/exceptions.ts b/src/facade/exceptions.ts
@@ -1,4 +1,5 @@
 import { getFuncName } from './lang';
+import { Type } from './type';
 
 export class BaseException extends Error {
   public stack: any;
diff --git a/src/facade/facade.ts b/src/facade/facade.ts
@@ -1,5 +1,5 @@
 // Public API for Facade
 // None :)
 
-export {Type} from './lang';
+export {Type} from './type';
 export {EventEmitter} from './async';
diff --git a/src/facade/lang.ts b/src/facade/lang.ts
@@ -1,5 +1,6 @@
 import { Subscription } from 'rxjs/Subscription';
 import { Observable } from 'rxjs/Observable';
+import { Type } from './type';
 
 export interface BrowserNodeGlobal {
   Object: typeof Object,
@@ -36,21 +37,6 @@ var _global: BrowserNodeGlobal = globalScope;
 
 export {_global as global};
 
-export const Type = Function;
-
-/**
- * Runtime representation a type that a Component or other object is instances of.
- *
- * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
- * the `MyCustomComponent` constructor function.
- */
-export interface Type extends Function {}
-
-/**
- * Runtime representation of a type that is constructable (non-abstract).
- */
-export interface ConcreteType extends Type { new (...args): any; }
-
 
 // ===============
 // implementations
diff --git a/src/facade/type.ts b/src/facade/type.ts
@@ -0,0 +1,22 @@
+/**
+ * @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
+ */
+
+/**
+ * @whatItDoes Represents a type that a Component or other object is instances of.
+ *
+ * @description
+ *
+ * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by
+ * the `MyCustomComponent` constructor function.
+ *
+ * @stable
+ */
+export const Type = Function;
+
+// @TODO
+export interface Type extends Function { new (...args: any[]): any; }
diff --git a/src/platform/browser_utils.ts b/src/platform/browser_utils.ts
@@ -1,5 +1,6 @@
 import { assertionsEnabled } from '../facade/lang';
 import { bundle } from '../core/util/bundler';
+import { Type } from '../facade/type';
 
 type AppRoot = string | Element | Document;
 
diff --git a/src/router-deprecated/route_definition.ts b/src/router-deprecated/route_definition.ts
@@ -1,3 +1,4 @@
+import { Type } from '../facade/type';
 /**
  * `RouteDefinition` defines a route within a {@link RouteConfig} decorator.
  *
diff --git a/src/router-deprecated/route_registry.ts b/src/router-deprecated/route_registry.ts
@@ -2,6 +2,7 @@ import { Injectable } from '../core/di/decorators';
 import { RouteDefinition } from './route_definition';
 import { Instruction } from './instructions';
 import { OpaqueToken } from '../core/di/opaque_token';
+import { Type } from '../facade/type';
 
 
 /**
diff --git a/src/testing/utils.ts b/src/testing/utils.ts
diff --git a/src/upgrade/upgrade_adapter.ts b/src/upgrade/upgrade_adapter.ts
diff --git a/test/core/di/forward_ref.spec.ts b/test/core/di/forward_ref.spec.ts
diff --git a/test/core/di/provider.spec.ts b/test/core/di/provider.spec.ts
diff --git a/test/upgrade/upgrade_adapter.spec.ts b/test/upgrade/upgrade_adapter.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ import * as angular from 'angular';`
`5`	`5`	`///////////////////////////////////////////////////////////////////////////////`
`6`	`6`	`declare global {`
`7`	`7`	`type StringMap = {[key: string]: string};`
`8`		`- type Type = Function;`
`9`		`- type ProvideSpreadType = string\|Type;`
	`8`	`+ type ProvideSpreadType = string\|Function;`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`///////////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { isString, isPresent } from '../../facade/lang';`
	`2`	`+import { Type } from '../../facade/type';`
`2`	`3`	`import { DirectiveMetadata, ComponentMetadata, NgModuleMetadata } from '../directives/metadata_directives';`
`3`	`4`	`import { PipeMetadata } from '../pipes/metadata';`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { StringMapWrapper } from '../../../facade/collections';`
	`2`	`+import { Type } from '../../../facade/type';`
`2`	`3`	`import { EventEmitter } from '../../../facade/async';`
`3`	`4`	`import { DirectiveMetadata, ComponentMetadata } from '../metadata_directives';`
`4`	`5`	`import { ChangeDetectorRef } from '../../change_detection/change_detector_ref';`