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

33
modules/@angular/core/src/metadata.ts
View File

@ -11,14 +11,11 @@
* to be used by the decorator versions of these annotations.
*/
import {ChangeDetectionStrategy} from '../src/change_detection/change_detection';
import {Type} from '../src/facade/lang';
import {AnimationEntryMetadata} from './animation/metadata';
import {AttributeMetadata, ContentChildMetadata, ContentChildrenMetadata, QueryMetadata, ViewChildMetadata, ViewChildrenMetadata, ViewQueryMetadata} from './metadata/di';
import {ComponentMetadata, ComponentMetadataType, DirectiveMetadata, DirectiveMetadataType, HostBindingMetadata, HostListenerMetadata, InputMetadata, OutputMetadata, PipeMetadata, PipeMetadataType} from './metadata/directives';
import {ModuleWithProviders, NgModuleMetadata, NgModuleMetadataType, SchemaMetadata} from './metadata/ng_module';
import {ViewEncapsulation} from './metadata/view';
import {Type} from './type';
import {TypeDecorator, makeDecorator, makeParamDecorator, makePropDecorator} from './util/decorators';
export {ANALYZE_FOR_ENTRY_COMPONENTS, AttributeMetadata, ContentChildMetadata, ContentChildrenMetadata, QueryMetadata, ViewChildMetadata, ViewChildrenMetadata, ViewQueryMetadata} from './metadata/di';
@ -28,6 +25,7 @@ export {CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, NgModuleMetadata, NgModuleM
export {ViewEncapsulation, ViewMetadata} from './metadata/view';
/**
* Interface for the {@link DirectiveMetadata} decorator function.
*
@ -218,10 +216,11 @@ export interface AttributeMetadataFactory {
* @deprecated
*/
export interface QueryMetadataFactory {
(selector: Type|string,
(selector: Type<any>|Function|string,
{descendants, read}?: {descendants?: boolean, read?: any}): ParameterDecorator;
new (selector: Type|string, {descendants, read}?: {descendants?: boolean, read?: any}):
QueryMetadata;
new (
selector: Type<any>|Function|string,
{descendants, read}?: {descendants?: boolean, read?: any}): QueryMetadata;
}
/**
@ -229,9 +228,11 @@ export interface QueryMetadataFactory {
* @stable
*/
export interface ContentChildrenMetadataFactory {
(selector: Type|string, {descendants, read}?: {descendants?: boolean, read?: any}): any;
new (selector: Type|string, {descendants, read}?: {descendants?: boolean, read?: any}):
ContentChildrenMetadata;
(selector: Type<any>|Function|string,
{descendants, read}?: {descendants?: boolean, read?: any}): any;
new (
selector: Type<any>|Function|string,
{descendants, read}?: {descendants?: boolean, read?: any}): ContentChildrenMetadata;
}
/**
@ -239,8 +240,8 @@ export interface ContentChildrenMetadataFactory {
* @stable
*/
export interface ContentChildMetadataFactory {
(selector: Type|string, {read}?: {read?: any}): any;
new (selector: Type|string, {read}?: {read?: any}): ContentChildMetadataFactory;
(selector: Type<any>|Function|string, {read}?: {read?: any}): any;
new (selector: Type<any>|Function|string, {read}?: {read?: any}): ContentChildMetadataFactory;
}
/**
@ -248,8 +249,8 @@ export interface ContentChildMetadataFactory {
* @stable
*/
export interface ViewChildrenMetadataFactory {
(selector: Type|string, {read}?: {read?: any}): any;
new (selector: Type|string, {read}?: {read?: any}): ViewChildrenMetadata;
(selector: Type<any>|Function|string, {read}?: {read?: any}): any;
new (selector: Type<any>|Function|string, {read}?: {read?: any}): ViewChildrenMetadata;
}
/**
@ -257,8 +258,8 @@ export interface ViewChildrenMetadataFactory {
* @stable
*/
export interface ViewChildMetadataFactory {
(selector: Type|string, {read}?: {read?: any}): any;
new (selector: Type|string, {read}?: {read?: any}): ViewChildMetadataFactory;
(selector: Type<any>|Function|string, {read}?: {read?: any}): any;
new (selector: Type<any>|Function|string, {read}?: {read?: any}): ViewChildMetadataFactory;
}