feat(core): add sugar to use ContentChildren and ViewChildren as prop decorators

Closes #4237
This commit is contained in:
vsavkin
2015-09-17 18:45:49 -07:00
committed by Victor Savkin
parent 5dbe292615
commit 2e9de0b169
2 changed files with 52 additions and 7 deletions

View File

@ -8,7 +8,9 @@ import {
PropertyMetadata,
EventMetadata,
HostBindingMetadata,
HostListenerMetadata
HostListenerMetadata,
ContentChildrenMetadata,
ViewChildrenMetadata
} from 'angular2/src/core/metadata';
import {reflector} from 'angular2/src/core/reflection/reflection';
@ -44,6 +46,7 @@ export class DirectiveResolver {
var properties = [];
var events = [];
var host = {};
var queries = {};
StringMapWrapper.forEach(propertyMetadata, (metadata: any[], propName: string) => {
metadata.forEach(a => {
@ -75,17 +78,28 @@ export class DirectiveResolver {
var args = isPresent(a.args) ? a.args.join(', ') : '';
host[`(${a.eventName})`] = `${propName}(${args})`;
}
if (a instanceof ContentChildrenMetadata) {
queries[propName] = a;
}
if (a instanceof ViewChildrenMetadata) {
queries[propName] = a;
}
});
});
return this._merge(dm, properties, events, host);
return this._merge(dm, properties, events, host, queries);
}
private _merge(dm: DirectiveMetadata, properties: string[], events: string[],
host: StringMap<string, string>): DirectiveMetadata {
host: StringMap<string, string>,
queries: StringMap<string, any>): DirectiveMetadata {
var mergedProperties =
isPresent(dm.properties) ? ListWrapper.concat(dm.properties, properties) : properties;
var mergedEvents = isPresent(dm.events) ? ListWrapper.concat(dm.events, events) : events;
var mergedHost = isPresent(dm.host) ? StringMapWrapper.merge(dm.host, host) : host;
var mergedQueries =
isPresent(dm.queries) ? StringMapWrapper.merge(dm.queries, queries) : queries;
if (dm instanceof ComponentMetadata) {
return new ComponentMetadata({
@ -98,6 +112,7 @@ export class DirectiveResolver {
exportAs: dm.exportAs,
moduleId: dm.moduleId,
compileChildren: dm.compileChildren,
queries: mergedQueries,
changeDetection: dm.changeDetection,
viewBindings: dm.viewBindings
});
@ -111,7 +126,8 @@ export class DirectiveResolver {
bindings: dm.bindings,
exportAs: dm.exportAs,
moduleId: dm.moduleId,
compileChildren: dm.compileChildren
compileChildren: dm.compileChildren,
queries: mergedQueries
});
}
}