revert: feat(transformers): collect information about di dependencies and providers
This reverts commit 86c40f8474.
Reason: new issues were discovered during the g3sync. @vsavkin is working on fixing them.
This commit is contained in:
Igor Minar
parent
22929a1671
commit
b86829f492
|
|
@ -2,10 +2,8 @@ import {
|
|||
isPresent,
|
||||
isBlank,
|
||||
normalizeBool,
|
||||
normalizeBlank,
|
||||
serializeEnum,
|
||||
Type,
|
||||
isString,
|
||||
RegExpWrapper,
|
||||
StringWrapper
|
||||
} from 'angular2/src/facade/lang';
|
||||
|
|
@ -24,17 +22,7 @@ import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/i
|
|||
// group 2: "event" from "(event)"
|
||||
var HOST_REG_EXP = /^(?:(?:\[([^\]]+)\])|(?:\(([^\)]+)\)))$/g;
|
||||
|
||||
export abstract class CompileMetadataWithIdentifier {
|
||||
static fromJson(data: {[key: string]: any}): CompileMetadataWithIdentifier {
|
||||
return _COMPILE_METADATA_FROM_JSON[data['class']](data);
|
||||
}
|
||||
|
||||
abstract toJson(): {[key: string]: any};
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return unimplemented(); }
|
||||
}
|
||||
|
||||
export abstract class CompileMetadataWithType extends CompileMetadataWithIdentifier {
|
||||
export abstract class CompileMetadataWithType {
|
||||
static fromJson(data: {[key: string]: any}): CompileMetadataWithType {
|
||||
return _COMPILE_METADATA_FROM_JSON[data['class']](data);
|
||||
}
|
||||
|
|
@ -42,223 +30,39 @@ export abstract class CompileMetadataWithType extends CompileMetadataWithIdentif
|
|||
abstract toJson(): {[key: string]: any};
|
||||
|
||||
get type(): CompileTypeMetadata { return unimplemented(); }
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return unimplemented(); }
|
||||
}
|
||||
|
||||
export class CompileIdentifierMetadata implements CompileMetadataWithIdentifier {
|
||||
runtime: any;
|
||||
name: string;
|
||||
prefix: string;
|
||||
moduleUrl: string;
|
||||
constructor({runtime, name, moduleUrl,
|
||||
prefix}: {runtime?: any, name?: string, moduleUrl?: string, prefix?: string} = {}) {
|
||||
this.runtime = runtime;
|
||||
this.name = name;
|
||||
this.prefix = prefix;
|
||||
this.moduleUrl = moduleUrl;
|
||||
}
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompileIdentifierMetadata {
|
||||
return new CompileIdentifierMetadata(
|
||||
{name: data['name'], prefix: data['prefix'], moduleUrl: data['moduleUrl']});
|
||||
}
|
||||
|
||||
toJson(): {[key: string]: any} {
|
||||
return {
|
||||
// Note: Runtime type can't be serialized...
|
||||
'class': 'Identifier',
|
||||
'name': this.name,
|
||||
'moduleUrl': this.moduleUrl,
|
||||
'prefix': this.prefix
|
||||
};
|
||||
}
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return this; }
|
||||
}
|
||||
|
||||
export class CompileDiDependencyMetadata {
|
||||
isAttribute: boolean;
|
||||
isSelf: boolean;
|
||||
isHost: boolean;
|
||||
isSkipSelf: boolean;
|
||||
isOptional: boolean;
|
||||
query: CompileQueryMetadata;
|
||||
viewQuery: CompileQueryMetadata;
|
||||
token: CompileIdentifierMetadata | string;
|
||||
|
||||
constructor({isAttribute, isSelf, isHost, isSkipSelf, isOptional, query, viewQuery, token}: {
|
||||
isAttribute?: boolean,
|
||||
isSelf?: boolean,
|
||||
isHost?: boolean,
|
||||
isSkipSelf?: boolean,
|
||||
isOptional?: boolean,
|
||||
query?: CompileQueryMetadata,
|
||||
viewQuery?: CompileQueryMetadata,
|
||||
token?: CompileIdentifierMetadata | string
|
||||
} = {}) {
|
||||
this.isAttribute = normalizeBool(isAttribute);
|
||||
this.isSelf = normalizeBool(isSelf);
|
||||
this.isHost = normalizeBool(isHost);
|
||||
this.isSkipSelf = normalizeBool(isSkipSelf);
|
||||
this.isOptional = normalizeBool(isOptional);
|
||||
this.query = query;
|
||||
this.viewQuery = viewQuery;
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompileDiDependencyMetadata {
|
||||
return new CompileDiDependencyMetadata(
|
||||
{token: objFromJson(data['token'], CompileIdentifierMetadata.fromJson)});
|
||||
}
|
||||
|
||||
toJson(): {[key: string]: any} {
|
||||
return {
|
||||
// Note: Runtime type can't be serialized...
|
||||
'token': objToJson(this.token)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export class CompileProviderMetadata {
|
||||
token: CompileIdentifierMetadata | string;
|
||||
useClass: CompileTypeMetadata;
|
||||
useValue: any;
|
||||
useExisting: CompileIdentifierMetadata | string;
|
||||
useFactory: CompileFactoryMetadata;
|
||||
deps: CompileDiDependencyMetadata[];
|
||||
multi: boolean;
|
||||
|
||||
constructor({token, useClass, useValue, useExisting, useFactory, deps, multi}: {
|
||||
token?: CompileIdentifierMetadata | string,
|
||||
useClass?: CompileTypeMetadata,
|
||||
useValue?: any,
|
||||
useExisting?: CompileIdentifierMetadata | string,
|
||||
useFactory?: CompileFactoryMetadata,
|
||||
deps?: CompileDiDependencyMetadata[],
|
||||
multi?: boolean
|
||||
}) {
|
||||
this.token = token;
|
||||
this.useClass = useClass;
|
||||
this.useValue = useValue;
|
||||
this.useExisting = useExisting;
|
||||
this.useFactory = useFactory;
|
||||
this.deps = deps;
|
||||
this.multi = multi;
|
||||
}
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompileProviderMetadata {
|
||||
return new CompileProviderMetadata({
|
||||
token: objFromJson(data['token'], CompileIdentifierMetadata.fromJson),
|
||||
useClass: objFromJson(data['useClass'], CompileTypeMetadata.fromJson)
|
||||
});
|
||||
}
|
||||
|
||||
toJson(): {[key: string]: any} {
|
||||
return {
|
||||
// Note: Runtime type can't be serialized...
|
||||
'token': objToJson(this.token),
|
||||
'useClass': objToJson(this.useClass)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export class CompileFactoryMetadata implements CompileIdentifierMetadata {
|
||||
runtime: Function;
|
||||
name: string;
|
||||
prefix: string;
|
||||
moduleUrl: string;
|
||||
diDeps: CompileDiDependencyMetadata[];
|
||||
|
||||
constructor({runtime, name, moduleUrl, diDeps}: {
|
||||
runtime?: Function,
|
||||
name?: string,
|
||||
moduleUrl?: string,
|
||||
diDeps?: CompileDiDependencyMetadata[]
|
||||
}) {
|
||||
this.runtime = runtime;
|
||||
this.name = name;
|
||||
this.moduleUrl = moduleUrl;
|
||||
this.diDeps = diDeps;
|
||||
}
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return this; }
|
||||
|
||||
toJson() { return null; }
|
||||
}
|
||||
|
||||
/**
|
||||
* Metadata regarding compilation of a type.
|
||||
*/
|
||||
export class CompileTypeMetadata implements CompileIdentifierMetadata, CompileMetadataWithType {
|
||||
export class CompileTypeMetadata {
|
||||
runtime: Type;
|
||||
name: string;
|
||||
prefix: string;
|
||||
moduleUrl: string;
|
||||
isHost: boolean;
|
||||
diDeps: CompileDiDependencyMetadata[];
|
||||
|
||||
constructor({runtime, name, moduleUrl, prefix, isHost, diDeps}: {
|
||||
runtime?: Type,
|
||||
name?: string,
|
||||
moduleUrl?: string,
|
||||
prefix?: string,
|
||||
isHost?: boolean,
|
||||
diDeps?: CompileDiDependencyMetadata[]
|
||||
} = {}) {
|
||||
constructor({runtime, name, moduleUrl, isHost}:
|
||||
{runtime?: Type, name?: string, moduleUrl?: string, isHost?: boolean} = {}) {
|
||||
this.runtime = runtime;
|
||||
this.name = name;
|
||||
this.moduleUrl = moduleUrl;
|
||||
this.prefix = prefix;
|
||||
this.isHost = normalizeBool(isHost);
|
||||
this.diDeps = normalizeBlank(diDeps);
|
||||
}
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompileTypeMetadata {
|
||||
return new CompileTypeMetadata({
|
||||
name: data['name'],
|
||||
moduleUrl: data['moduleUrl'],
|
||||
prefix: data['prefix'],
|
||||
isHost: data['isHost'],
|
||||
diDeps: arrayFromJson(data['diDeps'], CompileDiDependencyMetadata.fromJson)
|
||||
});
|
||||
return new CompileTypeMetadata(
|
||||
{name: data['name'], moduleUrl: data['moduleUrl'], isHost: data['isHost']});
|
||||
}
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return this; }
|
||||
get type(): CompileTypeMetadata { return this; }
|
||||
|
||||
toJson(): {[key: string]: any} {
|
||||
return {
|
||||
// Note: Runtime type can't be serialized...
|
||||
'class': 'Type',
|
||||
'name': this.name,
|
||||
'moduleUrl': this.moduleUrl,
|
||||
'prefix': this.prefix,
|
||||
'isHost': this.isHost,
|
||||
'diDeps': arrayToJson(this.diDeps)
|
||||
'isHost': this.isHost
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export class CompileQueryMetadata {
|
||||
selectors: Array<CompileIdentifierMetadata | string>;
|
||||
descendants: boolean;
|
||||
first: boolean;
|
||||
propertyName: string;
|
||||
|
||||
constructor({selectors, descendants, first, propertyName}: {
|
||||
selectors?: Array<CompileIdentifierMetadata | string>,
|
||||
descendants?: boolean,
|
||||
first?: boolean,
|
||||
propertyName?: string
|
||||
} = {}) {
|
||||
this.selectors = selectors;
|
||||
this.descendants = descendants;
|
||||
this.first = first;
|
||||
this.propertyName = propertyName;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Metadata regarding compilation of a template.
|
||||
*/
|
||||
|
|
@ -316,8 +120,7 @@ export class CompileTemplateMetadata {
|
|||
*/
|
||||
export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
||||
static create({type, isComponent, dynamicLoadable, selector, exportAs, changeDetection, inputs,
|
||||
outputs, host, lifecycleHooks, providers, viewProviders, queries, viewQueries,
|
||||
template}: {
|
||||
outputs, host, lifecycleHooks, template}: {
|
||||
type?: CompileTypeMetadata,
|
||||
isComponent?: boolean,
|
||||
dynamicLoadable?: boolean,
|
||||
|
|
@ -328,10 +131,6 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
outputs?: string[],
|
||||
host?: {[key: string]: string},
|
||||
lifecycleHooks?: LifecycleHooks[],
|
||||
providers?: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>,
|
||||
viewProviders?: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>,
|
||||
queries?: CompileQueryMetadata[],
|
||||
viewQueries?: CompileQueryMetadata[],
|
||||
template?: CompileTemplateMetadata
|
||||
} = {}): CompileDirectiveMetadata {
|
||||
var hostListeners: {[key: string]: string} = {};
|
||||
|
|
@ -381,13 +180,10 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
hostProperties: hostProperties,
|
||||
hostAttributes: hostAttributes,
|
||||
lifecycleHooks: isPresent(lifecycleHooks) ? lifecycleHooks : [],
|
||||
providers: providers,
|
||||
viewProviders: viewProviders,
|
||||
queries: queries,
|
||||
viewQueries: viewQueries,
|
||||
template: template
|
||||
});
|
||||
}
|
||||
|
||||
type: CompileTypeMetadata;
|
||||
isComponent: boolean;
|
||||
dynamicLoadable: boolean;
|
||||
|
|
@ -400,14 +196,9 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
hostProperties: {[key: string]: string};
|
||||
hostAttributes: {[key: string]: string};
|
||||
lifecycleHooks: LifecycleHooks[];
|
||||
providers: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>;
|
||||
viewProviders: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>;
|
||||
queries: CompileQueryMetadata[];
|
||||
viewQueries: CompileQueryMetadata[];
|
||||
template: CompileTemplateMetadata;
|
||||
constructor({type, isComponent, dynamicLoadable, selector, exportAs, changeDetection, inputs,
|
||||
outputs, hostListeners, hostProperties, hostAttributes, lifecycleHooks, providers,
|
||||
viewProviders, queries, viewQueries, template}: {
|
||||
outputs, hostListeners, hostProperties, hostAttributes, lifecycleHooks, template}: {
|
||||
type?: CompileTypeMetadata,
|
||||
isComponent?: boolean,
|
||||
dynamicLoadable?: boolean,
|
||||
|
|
@ -420,10 +211,6 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
hostProperties?: {[key: string]: string},
|
||||
hostAttributes?: {[key: string]: string},
|
||||
lifecycleHooks?: LifecycleHooks[],
|
||||
providers?: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>,
|
||||
viewProviders?: Array<CompileProviderMetadata | CompileTypeMetadata | any[]>,
|
||||
queries?: CompileQueryMetadata[],
|
||||
viewQueries?: CompileQueryMetadata[],
|
||||
template?: CompileTemplateMetadata
|
||||
} = {}) {
|
||||
this.type = type;
|
||||
|
|
@ -438,15 +225,9 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
this.hostProperties = hostProperties;
|
||||
this.hostAttributes = hostAttributes;
|
||||
this.lifecycleHooks = lifecycleHooks;
|
||||
this.providers = normalizeBlank(providers);
|
||||
this.viewProviders = normalizeBlank(viewProviders);
|
||||
this.queries = queries;
|
||||
this.viewQueries = viewQueries;
|
||||
this.template = template;
|
||||
}
|
||||
|
||||
get identifier(): CompileIdentifierMetadata { return this.type; }
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompileDirectiveMetadata {
|
||||
return new CompileDirectiveMetadata({
|
||||
isComponent: data['isComponent'],
|
||||
|
|
@ -465,8 +246,7 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
lifecycleHooks:
|
||||
(<any[]>data['lifecycleHooks']).map(hookValue => LIFECYCLE_HOOKS_VALUES[hookValue]),
|
||||
template: isPresent(data['template']) ? CompileTemplateMetadata.fromJson(data['template']) :
|
||||
data['template'],
|
||||
providers: arrayFromJson(data['providers'], CompileProviderMetadata.fromJson)
|
||||
data['template']
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -486,8 +266,7 @@ export class CompileDirectiveMetadata implements CompileMetadataWithType {
|
|||
'hostProperties': this.hostProperties,
|
||||
'hostAttributes': this.hostAttributes,
|
||||
'lifecycleHooks': this.lifecycleHooks.map(hook => serializeEnum(hook)),
|
||||
'template': isPresent(this.template) ? this.template.toJson() : this.template,
|
||||
'providers': arrayToJson(this.providers)
|
||||
'template': isPresent(this.template) ? this.template.toJson() : this.template
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -514,11 +293,7 @@ export function createHostComponentMeta(componentType: CompileTypeMetadata,
|
|||
lifecycleHooks: [],
|
||||
isComponent: true,
|
||||
dynamicLoadable: false,
|
||||
selector: '*',
|
||||
providers: [],
|
||||
viewProviders: [],
|
||||
queries: [],
|
||||
viewQueries: []
|
||||
selector: '*'
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -533,7 +308,6 @@ export class CompilePipeMetadata implements CompileMetadataWithType {
|
|||
this.name = name;
|
||||
this.pure = normalizeBool(pure);
|
||||
}
|
||||
get identifier(): CompileIdentifierMetadata { return this.type; }
|
||||
|
||||
static fromJson(data: {[key: string]: any}): CompilePipeMetadata {
|
||||
return new CompilePipeMetadata({
|
||||
|
|
@ -555,23 +329,5 @@ export class CompilePipeMetadata implements CompileMetadataWithType {
|
|||
|
||||
var _COMPILE_METADATA_FROM_JSON = {
|
||||
'Directive': CompileDirectiveMetadata.fromJson,
|
||||
'Pipe': CompilePipeMetadata.fromJson,
|
||||
'Type': CompileTypeMetadata.fromJson,
|
||||
'Identifier': CompileIdentifierMetadata.fromJson
|
||||
'Pipe': CompilePipeMetadata.fromJson
|
||||
};
|
||||
|
||||
function arrayFromJson(obj: any[], fn: (a: {[key: string]: any}) => any): any {
|
||||
return isBlank(obj) ? null : obj.map(fn);
|
||||
}
|
||||
|
||||
function arrayToJson(obj: any[]): string | {[key: string]: any} {
|
||||
return isBlank(obj) ? null : obj.map(o => o.toJson());
|
||||
}
|
||||
|
||||
function objFromJson(obj: any, fn: (a: {[key: string]: any}) => any): any {
|
||||
return (isString(obj) || isBlank(obj)) ? obj : fn(obj);
|
||||
}
|
||||
|
||||
function objToJson(obj: any): string | {[key: string]: any} {
|
||||
return (isString(obj) || isBlank(obj)) ? obj : obj.toJson();
|
||||
}
|
||||
|
|
@ -109,7 +109,6 @@ export class TemplateCompiler {
|
|||
hostProperties: directive.hostProperties,
|
||||
hostAttributes: directive.hostAttributes,
|
||||
lifecycleHooks: directive.lifecycleHooks,
|
||||
providers: directive.providers,
|
||||
template: normalizedTemplate
|
||||
}));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
import {ChangeDetector} from './interfaces';
|
||||
import {ChangeDetectionStrategy} from './constants';
|
||||
import {Injectable} from 'angular2/src/core/di';
|
||||
|
||||
@Injectable()
|
||||
export abstract class ChangeDetectorRef {
|
||||
/**
|
||||
* Marks all {@link ChangeDetectionStrategy#OnPush} ancestors as to be checked.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import {unimplemented} from 'angular2/src/facade/exceptions';
|
||||
import {Injectable} from 'angular2/src/core/di';
|
||||
import {AppElement} from './element';
|
||||
|
||||
/**
|
||||
|
|
@ -12,7 +11,6 @@ import {AppElement} from './element';
|
|||
* An `ElementRef` is backed by a render-specific element. In the browser, this is usually a DOM
|
||||
* element.
|
||||
*/
|
||||
@Injectable()
|
||||
export abstract class ElementRef {
|
||||
/**
|
||||
* The underlying native element or `null` if direct access to native elements is not supported
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import {ElementRef, ElementRef_} from './element_ref';
|
||||
import {Injectable} from 'angular2/src/core/di';
|
||||
|
||||
/**
|
||||
* Represents an Embedded Template that can be used to instantiate Embedded Views.
|
||||
|
|
@ -13,7 +12,6 @@ import {Injectable} from 'angular2/src/core/di';
|
|||
* {@link ViewContainerRef#createEmbeddedView}, which will create the View and attach it to the
|
||||
* View Container.
|
||||
*/
|
||||
@Injectable()
|
||||
export abstract class TemplateRef {
|
||||
/**
|
||||
* The location in the View where the Embedded View logically belongs to.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {unimplemented} from 'angular2/src/facade/exceptions';
|
||||
import {ResolvedProvider, Injectable} from 'angular2/src/core/di';
|
||||
import {ResolvedProvider} from 'angular2/src/core/di';
|
||||
import {isPresent, isBlank} from 'angular2/src/facade/lang';
|
||||
|
||||
import {AppElement} from './element';
|
||||
|
|
@ -36,7 +36,6 @@ import {
|
|||
*
|
||||
* <!-- TODO(i): we are also considering ElementRef#viewContainer api -->
|
||||
*/
|
||||
@Injectable()
|
||||
export abstract class ViewContainerRef {
|
||||
/**
|
||||
* Anchor element that specifies the location of this container in the containing View.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
|
||||
import {Injector, Injectable} from 'angular2/src/core/di';
|
||||
import {Injector} from 'angular2/src/core/di/injector';
|
||||
|
||||
export class RenderComponentType {
|
||||
constructor(public id: string, public encapsulation: ViewEncapsulation,
|
||||
|
|
@ -13,7 +13,6 @@ export class RenderDebugInfo {
|
|||
|
||||
export interface ParentRenderer { renderComponent(componentType: RenderComponentType): Renderer; }
|
||||
|
||||
@Injectable()
|
||||
export abstract class Renderer implements ParentRenderer {
|
||||
abstract renderComponent(componentType: RenderComponentType): Renderer;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import {Map, MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {isPresent, isBlank, normalizeBlank, Type, CONST_EXPR} from 'angular2/src/facade/lang';
|
||||
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {Injectable} from 'angular2/core';
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -34,7 +33,6 @@ import {Injectable} from 'angular2/core';
|
|||
* bootstrap(AppCmp, ROUTER_PROVIDERS);
|
||||
* ```
|
||||
*/
|
||||
@Injectable()
|
||||
export class RouteParams {
|
||||
constructor(public params: {[key: string]: string}) {}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ let _resolveToFalse = PromiseWrapper.resolve(false);
|
|||
* `Instruction`.
|
||||
* The router uses the `RouteRegistry` to get an `Instruction`.
|
||||
*/
|
||||
@Injectable()
|
||||
export class Router {
|
||||
navigating: boolean = false;
|
||||
lastNavigationAttempt: string;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ import {
|
|||
import {
|
||||
CompileDirectiveMetadata,
|
||||
CompileTypeMetadata,
|
||||
CompileTemplateMetadata,
|
||||
CompileProviderMetadata
|
||||
CompileTemplateMetadata
|
||||
} from 'angular2/src/compiler/directive_metadata';
|
||||
import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
|
||||
import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection';
|
||||
|
|
@ -29,8 +28,8 @@ export function main() {
|
|||
var fullDirectiveMeta: CompileDirectiveMetadata;
|
||||
|
||||
beforeEach(() => {
|
||||
fullTypeMeta = new CompileTypeMetadata(
|
||||
{name: 'SomeType', moduleUrl: 'someUrl', isHost: true, diDeps: []});
|
||||
fullTypeMeta =
|
||||
new CompileTypeMetadata({name: 'SomeType', moduleUrl: 'someUrl', isHost: true});
|
||||
fullTemplateMeta = new CompileTemplateMetadata({
|
||||
encapsulation: ViewEncapsulation.Emulated,
|
||||
template: '<a></a>',
|
||||
|
|
@ -49,8 +48,7 @@ export function main() {
|
|||
inputs: ['someProp'],
|
||||
outputs: ['someEvent'],
|
||||
host: {'(event1)': 'handler1', '[prop1]': 'expr1', 'attr1': 'attrValue2'},
|
||||
lifecycleHooks: [LifecycleHooks.OnChanges],
|
||||
providers: [new CompileProviderMetadata({token: 'token', useClass: fullTypeMeta})]
|
||||
lifecycleHooks: [LifecycleHooks.OnChanges]
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -515,15 +515,6 @@ var NG_COMPILER = [
|
|||
"CompileDirectiveMetadata.template=",
|
||||
"CompileDirectiveMetadata.type",
|
||||
"CompileDirectiveMetadata.type=",
|
||||
"CompileDirectiveMetadata.identifier",
|
||||
"CompileDirectiveMetadata.providers",
|
||||
"CompileDirectiveMetadata.providers=",
|
||||
"CompileDirectiveMetadata.queries",
|
||||
"CompileDirectiveMetadata.queries=",
|
||||
"CompileDirectiveMetadata.viewProviders",
|
||||
"CompileDirectiveMetadata.viewProviders=",
|
||||
"CompileDirectiveMetadata.viewQueries",
|
||||
"CompileDirectiveMetadata.viewQueries=",
|
||||
"CompileTemplateMetadata.encapsulation",
|
||||
"CompileTemplateMetadata.encapsulation=",
|
||||
"CompileTemplateMetadata.ngContentSelectors",
|
||||
|
|
@ -544,12 +535,6 @@ var NG_COMPILER = [
|
|||
"CompileTypeMetadata.name=",
|
||||
"CompileTypeMetadata.runtime",
|
||||
"CompileTypeMetadata.runtime=",
|
||||
"CompileTypeMetadata.diDeps",
|
||||
"CompileTypeMetadata.diDeps=",
|
||||
"CompileTypeMetadata.type",
|
||||
"CompileTypeMetadata.identifier",
|
||||
"CompileTypeMetadata.prefix",
|
||||
"CompileTypeMetadata.prefix=",
|
||||
"DirectiveAst.directive",
|
||||
"DirectiveAst.directive=",
|
||||
"DirectiveAst.exportAsVars",
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ export class MdDialog {
|
|||
/**
|
||||
* Reference to an opened dialog.
|
||||
*/
|
||||
@Injectable()
|
||||
export class MdDialogRef {
|
||||
// Reference to the MdDialogContainer component.
|
||||
containerRef: ComponentRef;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ class ReflectionInfoVisitor extends RecursiveAstVisitor<ReflectionInfoModel> {
|
|||
|
||||
@override
|
||||
ReflectionInfoModel visitClassDeclaration(ClassDeclaration node) {
|
||||
if (node.isAbstract) return null;
|
||||
if (!node.metadata
|
||||
.any((a) => _annotationMatcher.hasMatch(a.name, assetId))) {
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ class NgMeta {
|
|||
static const _TYPE_VALUE = 'type';
|
||||
static const _VALUE_KEY = 'value';
|
||||
|
||||
/// Metadata for each identifier
|
||||
/// Type: [CompileDirectiveMetadata]|[CompilePipeMetadata]|[CompileTypeMetadata]|[CompileIdentifierMetadata]
|
||||
final Map<String, dynamic> identifiers;
|
||||
/// Metadata for each type annotated as a directive/pipe.
|
||||
/// Type: [CompileDirectiveMetadata]/[CompilePipeMetadata]
|
||||
final Map<String, dynamic> types;
|
||||
|
||||
/// List of other types and names associated with a given name.
|
||||
final Map<String, List<String>> aliases;
|
||||
|
|
@ -43,11 +43,12 @@ class NgMeta {
|
|||
// The NgDeps generated from
|
||||
final NgDepsModel ngDeps;
|
||||
|
||||
NgMeta({Map<String, List<String>> aliases,
|
||||
Map<String, dynamic> identifiers,
|
||||
NgMeta(
|
||||
{Map<String, dynamic> types,
|
||||
Map<String, List<String>> aliases,
|
||||
this.ngDeps: null})
|
||||
:this.aliases = aliases != null ? aliases : {},
|
||||
this.identifiers = identifiers != null ? identifiers : {};
|
||||
: this.types = types != null ? types : {},
|
||||
this.aliases = aliases != null ? aliases : {};
|
||||
|
||||
NgMeta.empty() : this();
|
||||
|
||||
|
|
@ -68,13 +69,13 @@ class NgMeta {
|
|||
return false;
|
||||
}
|
||||
|
||||
bool get isEmpty => identifiers.isEmpty && aliases.isEmpty && isNgDepsEmpty;
|
||||
bool get isEmpty => types.isEmpty && aliases.isEmpty && isNgDepsEmpty;
|
||||
|
||||
/// Parse from the serialized form produced by [toJson].
|
||||
factory NgMeta.fromJson(Map json) {
|
||||
var ngDeps = null;
|
||||
final types = {};
|
||||
final aliases = {};
|
||||
final identifiers = {};
|
||||
for (var key in json.keys) {
|
||||
if (key == _NG_DEPS_KEY) {
|
||||
var ngDepsJsonMap = json[key];
|
||||
|
|
@ -84,9 +85,7 @@ class NgMeta {
|
|||
'Unexpected value $ngDepsJsonMap for key "$key" in NgMeta.');
|
||||
continue;
|
||||
}
|
||||
ngDeps = new NgDepsModel()
|
||||
..mergeFromJsonMap(ngDepsJsonMap);
|
||||
|
||||
ngDeps = new NgDepsModel()..mergeFromJsonMap(ngDepsJsonMap);
|
||||
} else {
|
||||
var entry = json[key];
|
||||
if (entry is! Map) {
|
||||
|
|
@ -94,13 +93,13 @@ class NgMeta {
|
|||
continue;
|
||||
}
|
||||
if (entry[_KIND_KEY] == _TYPE_VALUE) {
|
||||
identifiers[key] = CompileMetadataWithIdentifier.fromJson(entry[_VALUE_KEY]);
|
||||
types[key] = CompileMetadataWithType.fromJson(entry[_VALUE_KEY]);
|
||||
} else if (entry[_KIND_KEY] == _ALIAS_VALUE) {
|
||||
aliases[key] = entry[_VALUE_KEY];
|
||||
}
|
||||
}
|
||||
}
|
||||
return new NgMeta(identifiers: identifiers, aliases: aliases, ngDeps: ngDeps);
|
||||
return new NgMeta(types: types, aliases: aliases, ngDeps: ngDeps);
|
||||
}
|
||||
|
||||
/// Serialized representation of this instance.
|
||||
|
|
@ -108,7 +107,7 @@ class NgMeta {
|
|||
var result = {};
|
||||
result[_NG_DEPS_KEY] = isNgDepsEmpty ? null : ngDeps.writeToJsonMap();
|
||||
|
||||
identifiers.forEach((k, v) {
|
||||
types.forEach((k, v) {
|
||||
result[k] = {_KIND_KEY: _TYPE_VALUE, _VALUE_KEY: v.toJson()};
|
||||
});
|
||||
|
||||
|
|
@ -121,8 +120,8 @@ class NgMeta {
|
|||
/// Merge into this instance all information from [other].
|
||||
/// This does not include `ngDeps`.
|
||||
void addAll(NgMeta other) {
|
||||
types.addAll(other.types);
|
||||
aliases.addAll(other.aliases);
|
||||
identifiers.addAll(other.identifiers);
|
||||
}
|
||||
|
||||
/// Returns the metadata for every type associated with the given [alias].
|
||||
|
|
@ -134,8 +133,8 @@ class NgMeta {
|
|||
log.warning('Circular alias dependency for "$name".');
|
||||
return;
|
||||
}
|
||||
if (identifiers.containsKey(name)) {
|
||||
result.add(identifiers[name]);
|
||||
if (types.containsKey(name)) {
|
||||
result.add(types[name]);
|
||||
} else if (aliases.containsKey(name)) {
|
||||
aliases[name].forEach(helper);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -21,24 +21,22 @@ import 'url_resolver.dart';
|
|||
class TypeMetadataReader {
|
||||
final _DirectiveMetadataVisitor _directiveVisitor;
|
||||
final _PipeMetadataVisitor _pipeVisitor;
|
||||
final _CompileTypeMetadataVisitor _typeVisitor;
|
||||
final TemplateCompiler _templateCompiler;
|
||||
|
||||
TypeMetadataReader._(
|
||||
this._directiveVisitor, this._pipeVisitor, this._templateCompiler, this._typeVisitor);
|
||||
this._directiveVisitor, this._pipeVisitor, this._templateCompiler);
|
||||
|
||||
/// Accepts an [AnnotationMatcher] which tests that an [Annotation]
|
||||
/// is a [Directive], [Component], or [View].
|
||||
factory TypeMetadataReader(AnnotationMatcher annotationMatcher,
|
||||
InterfaceMatcher interfaceMatcher, TemplateCompiler templateCompiler) {
|
||||
var lifecycleVisitor = new _LifecycleHookVisitor(interfaceMatcher);
|
||||
var typeVisitor = new _CompileTypeMetadataVisitor(annotationMatcher);
|
||||
var directiveVisitor =
|
||||
new _DirectiveMetadataVisitor(annotationMatcher, lifecycleVisitor, typeVisitor);
|
||||
new _DirectiveMetadataVisitor(annotationMatcher, lifecycleVisitor);
|
||||
var pipeVisitor = new _PipeMetadataVisitor(annotationMatcher);
|
||||
|
||||
return new TypeMetadataReader._(
|
||||
directiveVisitor, pipeVisitor, templateCompiler, typeVisitor);
|
||||
directiveVisitor, pipeVisitor, templateCompiler);
|
||||
}
|
||||
|
||||
/// Reads *un-normalized* [CompileDirectiveMetadata]/[CompilePipeMetadata] from the
|
||||
|
|
@ -54,19 +52,13 @@ class TypeMetadataReader {
|
|||
Future<dynamic> readTypeMetadata(ClassDeclaration node, AssetId assetId) {
|
||||
_directiveVisitor.reset(assetId);
|
||||
_pipeVisitor.reset(assetId);
|
||||
_typeVisitor.reset(assetId);
|
||||
|
||||
node.accept(_directiveVisitor);
|
||||
node.accept(_pipeVisitor);
|
||||
node.accept(_typeVisitor);
|
||||
|
||||
if (_directiveVisitor.hasMetadata) {
|
||||
final metadata = _directiveVisitor.createMetadata();
|
||||
return _templateCompiler.normalizeDirectiveMetadata(metadata);
|
||||
} else if (_pipeVisitor.hasMetadata) {
|
||||
return new Future.value(_pipeVisitor.createMetadata());
|
||||
} else if (_typeVisitor.isInjectable) {
|
||||
return new Future.value(_typeVisitor.type);
|
||||
} else {
|
||||
return new Future.value(null);
|
||||
}
|
||||
|
|
@ -132,67 +124,6 @@ bool _expressionToBool(Expression node, String nodeDescription) {
|
|||
return value;
|
||||
}
|
||||
|
||||
class _CompileTypeMetadataVisitor extends Object
|
||||
with RecursiveAstVisitor<CompileTypeMetadata> {
|
||||
|
||||
bool _isInjectable = false;
|
||||
CompileTypeMetadata _type;
|
||||
AssetId _assetId;
|
||||
final AnnotationMatcher _annotationMatcher;
|
||||
|
||||
_CompileTypeMetadataVisitor(this._annotationMatcher);
|
||||
|
||||
bool get isInjectable => _isInjectable;
|
||||
|
||||
CompileTypeMetadata get type => _type;
|
||||
|
||||
void reset(AssetId assetId) {
|
||||
this._assetId = assetId;
|
||||
this._isInjectable = false;
|
||||
this._type = null;
|
||||
}
|
||||
|
||||
@override
|
||||
Object visitAnnotation(Annotation node) {
|
||||
final isComponent = _annotationMatcher.isComponent(node, _assetId);
|
||||
final isDirective = _annotationMatcher.isDirective(node, _assetId);
|
||||
final isInjectable = _annotationMatcher.isInjectable(node, _assetId);
|
||||
|
||||
_isInjectable = _isInjectable || isComponent || isDirective || isInjectable;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@override
|
||||
Object visitClassDeclaration(ClassDeclaration node) {
|
||||
node.metadata.accept(this);
|
||||
if (this._isInjectable) {
|
||||
_type = new CompileTypeMetadata(
|
||||
moduleUrl: toAssetUri(_assetId),
|
||||
name: node.name.toString(),
|
||||
diDeps: _getCompileDiDependencyMetadata(node),
|
||||
runtime: null // Intentionally `null`, cannot be provided here.
|
||||
);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
List<CompileDiDependencyMetadata> _getCompileDiDependencyMetadata(ClassDeclaration node) {
|
||||
final constructor = node.getConstructor(null);
|
||||
if (constructor == null) return [];
|
||||
|
||||
return constructor.parameters.parameters.map((p) {
|
||||
final typeToken = p is SimpleFormalParameter && p.type != null ? _readIdentifier(p.type.name) : null;
|
||||
final injectTokens = p.metadata.where((m) => m.name.toString() == "Inject").map((m) => _readIdentifier(m.arguments.arguments[0]));
|
||||
final token = injectTokens.isNotEmpty ? injectTokens.first : typeToken;
|
||||
return new CompileDiDependencyMetadata(token: token);
|
||||
}).toList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// Visitor responsible for processing a [Directive] annotated
|
||||
/// [ClassDeclaration] and creating a [CompileDirectiveMetadata] object.
|
||||
class _DirectiveMetadataVisitor extends Object
|
||||
|
|
@ -203,12 +134,10 @@ class _DirectiveMetadataVisitor extends Object
|
|||
|
||||
final _LifecycleHookVisitor _lifecycleVisitor;
|
||||
|
||||
final _CompileTypeMetadataVisitor _typeVisitor;
|
||||
|
||||
/// The [AssetId] we are currently processing.
|
||||
AssetId _assetId;
|
||||
|
||||
_DirectiveMetadataVisitor(this._annotationMatcher, this._lifecycleVisitor, this._typeVisitor) {
|
||||
_DirectiveMetadataVisitor(this._annotationMatcher, this._lifecycleVisitor) {
|
||||
reset(null);
|
||||
}
|
||||
|
||||
|
|
@ -225,14 +154,12 @@ class _DirectiveMetadataVisitor extends Object
|
|||
List<String> _inputs;
|
||||
List<String> _outputs;
|
||||
Map<String, String> _host;
|
||||
List<CompileProviderMetadata> _providers;
|
||||
List<LifecycleHooks> _lifecycleHooks;
|
||||
CompileTemplateMetadata _cmpTemplate;
|
||||
CompileTemplateMetadata _viewTemplate;
|
||||
|
||||
void reset(AssetId assetId) {
|
||||
_lifecycleVisitor.reset(assetId);
|
||||
_typeVisitor.reset(assetId);
|
||||
_assetId = assetId;
|
||||
|
||||
_type = null;
|
||||
|
|
@ -244,7 +171,6 @@ class _DirectiveMetadataVisitor extends Object
|
|||
_inputs = <String>[];
|
||||
_outputs = <String>[];
|
||||
_host = <String, String>{};
|
||||
_providers = <CompileProviderMetadata>[];
|
||||
_lifecycleHooks = null;
|
||||
_cmpTemplate = null;
|
||||
_viewTemplate = null;
|
||||
|
|
@ -266,7 +192,6 @@ class _DirectiveMetadataVisitor extends Object
|
|||
inputs: _inputs,
|
||||
outputs: _outputs,
|
||||
host: _host,
|
||||
providers: _providers,
|
||||
lifecycleHooks: _lifecycleHooks,
|
||||
template: _template);
|
||||
}
|
||||
|
|
@ -391,34 +316,6 @@ class _DirectiveMetadataVisitor extends Object
|
|||
}
|
||||
}
|
||||
|
||||
void _populateProviders(Expression providerValues) {
|
||||
_checkMeta();
|
||||
|
||||
final providers = (providerValues as ListLiteral).elements.map((el) {
|
||||
if (el is PrefixedIdentifier || el is SimpleIdentifier) {
|
||||
return new CompileProviderMetadata(token: _readIdentifier(el));
|
||||
|
||||
} else if (el is InstanceCreationExpression && el.constructorName.toString() == "Provider") {
|
||||
final token = el.argumentList.arguments.first;
|
||||
|
||||
var useClass;
|
||||
el.argumentList.arguments.skip(1).forEach((arg) {
|
||||
if (arg.name.toString() == "useClass:") {
|
||||
final id = _readIdentifier(arg.expression);
|
||||
useClass = new CompileTypeMetadata(prefix: id.prefix, name: id.name);
|
||||
}
|
||||
});
|
||||
return new CompileProviderMetadata(token: _readIdentifier(token), useClass: useClass);
|
||||
|
||||
} else {
|
||||
throw new ArgumentError(
|
||||
'Incorrect value. Expected a Provider or a String, but got "${el}".');
|
||||
}
|
||||
});
|
||||
|
||||
_providers.addAll(providers);
|
||||
}
|
||||
|
||||
//TODO Use AnnotationMatcher instead of string matching
|
||||
bool _isAnnotation(Annotation node, String annotationName) {
|
||||
var id = node.name;
|
||||
|
|
@ -459,10 +356,12 @@ class _DirectiveMetadataVisitor extends Object
|
|||
@override
|
||||
Object visitClassDeclaration(ClassDeclaration node) {
|
||||
node.metadata.accept(this);
|
||||
node.accept(_typeVisitor);
|
||||
_type = _typeVisitor.type;
|
||||
|
||||
if (this._hasMetadata) {
|
||||
_type = new CompileTypeMetadata(
|
||||
moduleUrl: toAssetUri(_assetId),
|
||||
name: node.name.toString(),
|
||||
runtime: null // Intentionally `null`, cannot be provided here.
|
||||
);
|
||||
_lifecycleHooks = node.implementsClause != null
|
||||
? node.implementsClause.accept(_lifecycleVisitor)
|
||||
: const [];
|
||||
|
|
@ -506,9 +405,6 @@ class _DirectiveMetadataVisitor extends Object
|
|||
case 'events':
|
||||
_populateEvents(node.expression);
|
||||
break;
|
||||
case 'providers':
|
||||
_populateProviders(node.expression);
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
@ -791,19 +687,3 @@ class _PipeMetadataVisitor extends Object with RecursiveAstVisitor<Object> {
|
|||
_pure = _expressionToBool(pureValue, 'Pipe#pure');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dynamic _readIdentifier(dynamic el) {
|
||||
if (el is PrefixedIdentifier) {
|
||||
return new CompileIdentifierMetadata(name: '${el.identifier}', prefix: '${el.prefix}');
|
||||
|
||||
} else if (el is SimpleIdentifier) {
|
||||
return new CompileIdentifierMetadata(name: '$el');
|
||||
|
||||
} else if (el is SimpleStringLiteral){
|
||||
return el.value;
|
||||
|
||||
} else {
|
||||
throw new ArgumentError('Incorrect identifier "${el}".');
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@ import 'dart:async';
|
|||
import 'package:analyzer/analyzer.dart';
|
||||
import 'package:barback/barback.dart' show AssetId;
|
||||
|
||||
import 'package:angular2/src/compiler/directive_metadata.dart' show CompileIdentifierMetadata;
|
||||
import 'package:angular2/src/compiler/template_compiler.dart';
|
||||
import 'package:angular2/src/transform/common/annotation_matcher.dart';
|
||||
import 'package:angular2/src/transform/common/asset_reader.dart';
|
||||
|
|
@ -15,7 +14,6 @@ import 'package:angular2/src/transform/common/interface_matcher.dart';
|
|||
import 'package:angular2/src/transform/common/logging.dart';
|
||||
import 'package:angular2/src/transform/common/ng_compiler.dart';
|
||||
import 'package:angular2/src/transform/common/ng_meta.dart';
|
||||
import 'package:angular2/src/transform/common/url_resolver.dart';
|
||||
import 'package:angular2/src/transform/common/zone.dart' as zone;
|
||||
|
||||
import 'inliner.dart';
|
||||
|
|
@ -91,15 +89,14 @@ class _NgMetaVisitor extends Object with SimpleAstVisitor<Object> {
|
|||
@override
|
||||
Object visitClassDeclaration(ClassDeclaration node) {
|
||||
_normalizations.add(
|
||||
_reader.readTypeMetadata(node, assetId).then((compileMetadataWithIdentifier) {
|
||||
if (compileMetadataWithIdentifier!= null) {
|
||||
ngMeta.identifiers[compileMetadataWithIdentifier.identifier.name] =
|
||||
compileMetadataWithIdentifier;
|
||||
_reader.readTypeMetadata(node, assetId).then((compileMetadataWithType) {
|
||||
if (compileMetadataWithType != null) {
|
||||
ngMeta.types[compileMetadataWithType.type.name] =
|
||||
compileMetadataWithType;
|
||||
}
|
||||
}).catchError((err) {
|
||||
log.error('ERROR: $err', asset: assetId);
|
||||
}));
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -111,11 +108,6 @@ class _NgMetaVisitor extends Object with SimpleAstVisitor<Object> {
|
|||
// doesn't support decorators on variable declarations (see
|
||||
// angular/angular#1747 and angular/ts2dart#249 for context).
|
||||
outer: for (var variable in node.variables.variables) {
|
||||
if (variable.isConst) {
|
||||
ngMeta.identifiers[variable.name.name] =
|
||||
new CompileIdentifierMetadata(name: variable.name.name, moduleUrl: toAssetUri(assetId));
|
||||
}
|
||||
|
||||
var initializer = variable.initializer;
|
||||
if (initializer != null && initializer is ListLiteral) {
|
||||
var otherNames = [];
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ class _CompileDataCreator {
|
|||
var hasTemplate = ngDeps != null &&
|
||||
ngDeps.reflectables != null &&
|
||||
ngDeps.reflectables.any((reflectable) {
|
||||
if (ngMeta.identifiers.containsKey(reflectable.name)) {
|
||||
final metadata = ngMeta.identifiers[reflectable.name];
|
||||
if (ngMeta.types.containsKey(reflectable.name)) {
|
||||
final metadata = ngMeta.types[reflectable.name];
|
||||
return metadata is CompileDirectiveMetadata &&
|
||||
metadata.template != null;
|
||||
}
|
||||
|
|
@ -91,8 +91,8 @@ class _CompileDataCreator {
|
|||
final platformPipes = await _readPlatformTypes(this.platformPipes, 'pipes');
|
||||
|
||||
for (var reflectable in ngDeps.reflectables) {
|
||||
if (ngMeta.identifiers.containsKey(reflectable.name)) {
|
||||
final compileDirectiveMetadata = ngMeta.identifiers[reflectable.name];
|
||||
if (ngMeta.types.containsKey(reflectable.name)) {
|
||||
final compileDirectiveMetadata = ngMeta.types[reflectable.name];
|
||||
if (compileDirectiveMetadata is CompileDirectiveMetadata &&
|
||||
compileDirectiveMetadata.template != null) {
|
||||
final compileDatum = new NormalizedComponentWithViewDirectives(
|
||||
|
|
@ -106,9 +106,6 @@ class _CompileDataCreator {
|
|||
compileDatum.pipes
|
||||
.addAll(_resolveTypeMetadata(ngMetaMap, reflectable.pipes));
|
||||
compileData[reflectable] = compileDatum;
|
||||
|
||||
_resolveDiDependencyMetadata(ngMetaMap, compileDirectiveMetadata.type, compileDirectiveMetadata.type.diDeps);
|
||||
_resolveProviderMetadata(ngMetaMap, compileDirectiveMetadata);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -120,16 +117,16 @@ class _CompileDataCreator {
|
|||
var resolvedMetadata = [];
|
||||
for (var dep in prefixedTypes) {
|
||||
if (!ngMetaMap.containsKey(dep.prefix)) {
|
||||
log.error(
|
||||
log.warning(
|
||||
'Missing prefix "${dep.prefix}" '
|
||||
'needed by "${dep}" from metadata map,',
|
||||
'needed by "${dep}" from metadata map',
|
||||
asset: entryPoint);
|
||||
return null;
|
||||
continue;
|
||||
}
|
||||
final depNgMeta = ngMetaMap[dep.prefix];
|
||||
|
||||
if (depNgMeta.identifiers.containsKey(dep.name)) {
|
||||
resolvedMetadata.add(depNgMeta.identifiers[dep.name]);
|
||||
if (depNgMeta.types.containsKey(dep.name)) {
|
||||
resolvedMetadata.add(depNgMeta.types[dep.name]);
|
||||
} else if (depNgMeta.aliases.containsKey(dep.name)) {
|
||||
resolvedMetadata.addAll(depNgMeta.flatten(dep.name));
|
||||
} else {
|
||||
|
|
@ -144,86 +141,6 @@ class _CompileDataCreator {
|
|||
return resolvedMetadata;
|
||||
}
|
||||
|
||||
void _resolveProviderMetadata(Map<String, NgMeta> ngMetaMap, CompileDirectiveMetadata dirMeta) {
|
||||
final neededBy = dirMeta.type;
|
||||
|
||||
if (dirMeta.providers == null) return;
|
||||
|
||||
final resolvedProviders = [];
|
||||
for (var provider in dirMeta.providers) {
|
||||
final alias = _resolveAlias(ngMetaMap, neededBy, provider.token);
|
||||
if (alias != null) {
|
||||
resolvedProviders.addAll(alias.map((a) => new CompileProviderMetadata(token:a)));
|
||||
} else {
|
||||
provider.token = _resolveIdentifier(ngMetaMap, neededBy, provider.token);
|
||||
if (provider.useClass != null) {
|
||||
provider.useClass = _resolveIdentifier(ngMetaMap, neededBy, provider.useClass);
|
||||
}
|
||||
resolvedProviders.add(provider);
|
||||
}
|
||||
}
|
||||
dirMeta.providers = resolvedProviders;
|
||||
}
|
||||
|
||||
void _resolveDiDependencyMetadata(
|
||||
Map<String, NgMeta> ngMetaMap,CompileTypeMetadata neededBy, List<CompileDiDependencyMetadata> deps) {
|
||||
if (deps == null) return;
|
||||
for (var dep in deps) {
|
||||
dep.token = _resolveIdentifier(ngMetaMap, neededBy, dep.token);
|
||||
}
|
||||
}
|
||||
|
||||
dynamic _resolveAlias(Map<String, NgMeta> ngMetaMap, CompileTypeMetadata neededBy, dynamic id) {
|
||||
if (id is String || id == null) return null;
|
||||
|
||||
final prefix = id.prefix == null ? "" : id.prefix;
|
||||
|
||||
if (!ngMetaMap.containsKey(prefix)) {
|
||||
log.error(
|
||||
'Missing prefix "${prefix}" '
|
||||
'needed by "${neededBy.name}" from metadata map',
|
||||
asset: entryPoint);
|
||||
return null;
|
||||
}
|
||||
|
||||
final depNgMeta = ngMetaMap[prefix];
|
||||
if (depNgMeta.aliases.containsKey(id.name)) {
|
||||
return depNgMeta.flatten(id.name);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
dynamic _resolveIdentifier(Map<String, NgMeta> ngMetaMap, CompileTypeMetadata neededBy, dynamic id) {
|
||||
if (id is String || id == null) return id;
|
||||
|
||||
final prefix = id.prefix == null ? "" : id.prefix;
|
||||
|
||||
if (!ngMetaMap.containsKey(prefix)) {
|
||||
log.error(
|
||||
'Missing prefix "${prefix}" '
|
||||
'needed by "${neededBy.name}" from metadata map',
|
||||
asset: entryPoint);
|
||||
return null;
|
||||
}
|
||||
|
||||
final depNgMeta = ngMetaMap[prefix];
|
||||
if (depNgMeta.identifiers.containsKey(id.name)) {
|
||||
return depNgMeta.identifiers[id.name];
|
||||
} else if (_isPrimitive(id.name)) {
|
||||
return id;
|
||||
} else {
|
||||
log.error(
|
||||
'Missing identifier "${id.name}" '
|
||||
'needed by "${neededBy.name}" from metadata map',
|
||||
asset: entryPoint);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
bool _isPrimitive(String typeName) =>
|
||||
typeName == "String" || typeName == "Object" || typeName == "num" || typeName == "int" || typeName == "double" || typeName == "bool";
|
||||
|
||||
Future<List<dynamic>> _readPlatformTypes(
|
||||
List<String> inputPlatformTypes, String configOption) async {
|
||||
if (inputPlatformTypes == null) return const [];
|
||||
|
|
@ -251,8 +168,8 @@ class _CompileDataCreator {
|
|||
if (jsonString != null && jsonString.isNotEmpty) {
|
||||
var newMetadata = new NgMeta.fromJson(JSON.decode(jsonString));
|
||||
|
||||
if (newMetadata.identifiers.containsKey(token)) {
|
||||
return [newMetadata.identifiers[token]];
|
||||
if (newMetadata.types.containsKey(token)) {
|
||||
return [newMetadata.types[token]];
|
||||
} else if (newMetadata.aliases.containsKey(token)) {
|
||||
return newMetadata.flatten(token);
|
||||
} else {
|
||||
|
|
@ -277,6 +194,7 @@ class _CompileDataCreator {
|
|||
return map;
|
||||
}
|
||||
final resolver = const TransformerUrlResolver();
|
||||
|
||||
ngMeta.ngDeps.imports
|
||||
.where((model) => !isDartCoreUri(model.uri))
|
||||
.forEach((model) {
|
||||
|
|
@ -324,7 +242,6 @@ class _CompileDataCreator {
|
|||
var ngMeta = retVal[prefix] = new NgMeta.empty();
|
||||
for (var importAssetUri in prefixToImports[prefix]) {
|
||||
var metaAssetId = fromUri(toMetaExtension(importAssetUri));
|
||||
|
||||
if (await reader.hasInput(metaAssetId)) {
|
||||
try {
|
||||
var jsonString = await reader.readAsString(metaAssetId);
|
||||
|
|
|
|||
|
|
@ -42,11 +42,10 @@ Future<Outputs> processTemplates(AssetReader reader, AssetId assetId,
|
|||
var viewDefResults = await createCompileData(
|
||||
reader, assetId, platformDirectives, platformPipes);
|
||||
if (viewDefResults == null) return null;
|
||||
final compileTypeMetadatas = viewDefResults.ngMeta.identifiers.values;
|
||||
final compileTypeMetadatas = viewDefResults.ngMeta.types.values;
|
||||
if (compileTypeMetadatas.isNotEmpty) {
|
||||
var processor = new reg.Processor();
|
||||
compileTypeMetadatas.forEach(processor.process);
|
||||
if (viewDefResults.ngMeta.ngDeps != null) {
|
||||
viewDefResults.ngMeta.ngDeps.getters
|
||||
.addAll(processor.getterNames.map((e) => e.sanitizedName));
|
||||
viewDefResults.ngMeta.ngDeps.setters
|
||||
|
|
@ -54,7 +53,6 @@ Future<Outputs> processTemplates(AssetReader reader, AssetId assetId,
|
|||
viewDefResults.ngMeta.ngDeps.methods
|
||||
.addAll(processor.methodNames.map((e) => e.sanitizedName));
|
||||
}
|
||||
}
|
||||
var templateCompiler = zone.templateCompiler;
|
||||
if (templateCompiler == null) {
|
||||
templateCompiler = createTemplateCompiler(reader,
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import 'package:guinness/guinness.dart';
|
|||
main() => allTests();
|
||||
|
||||
void allTests() {
|
||||
var mockDirMetadata = [
|
||||
var mockData = [
|
||||
CompileDirectiveMetadata.create(type: new CompileTypeMetadata(name: 'N1')),
|
||||
CompileDirectiveMetadata.create(type: new CompileTypeMetadata(name: 'N2')),
|
||||
CompileDirectiveMetadata.create(type: new CompileTypeMetadata(name: 'N3')),
|
||||
|
|
@ -28,16 +28,14 @@ void allTests() {
|
|||
|
||||
it('should be lossless', () {
|
||||
var a = new NgMeta.empty();
|
||||
a.identifiers['T0'] = mockDirMetadata[0];
|
||||
a.identifiers['T1'] = mockDirMetadata[1];
|
||||
a.identifiers['T2'] = mockDirMetadata[2];
|
||||
a.identifiers['T3'] = mockDirMetadata[3];
|
||||
|
||||
a.types['T0'] = mockData[0];
|
||||
a.types['T1'] = mockData[1];
|
||||
a.types['T2'] = mockData[2];
|
||||
a.types['T3'] = mockData[3];
|
||||
a.aliases['a1'] = ['T1'];
|
||||
a.aliases['a2'] = ['a1'];
|
||||
a.aliases['a3'] = ['T3', 'a2'];
|
||||
a.aliases['a4'] = ['a3', 'T3'];
|
||||
|
||||
_checkSimilar(a, new NgMeta.fromJson(a.toJson()));
|
||||
});
|
||||
});
|
||||
|
|
@ -45,36 +43,35 @@ void allTests() {
|
|||
describe('flatten', () {
|
||||
it('should include recursive aliases.', () {
|
||||
var a = new NgMeta.empty();
|
||||
a.identifiers['T0'] = mockDirMetadata[0];
|
||||
a.identifiers['T1'] = mockDirMetadata[1];
|
||||
a.identifiers['T2'] = mockDirMetadata[2];
|
||||
a.identifiers['T3'] = mockDirMetadata[3];
|
||||
a.types['T0'] = mockData[0];
|
||||
a.types['T1'] = mockData[1];
|
||||
a.types['T2'] = mockData[2];
|
||||
a.types['T3'] = mockData[3];
|
||||
a.aliases['a1'] = ['T1'];
|
||||
a.aliases['a2'] = ['a1'];
|
||||
a.aliases['a3'] = ['T3', 'a2'];
|
||||
a.aliases['a4'] = ['a3', 'T0'];
|
||||
|
||||
expect(a.flatten('a4')).toEqual([mockDirMetadata[3], mockDirMetadata[1], mockDirMetadata[0]]);
|
||||
expect(a.flatten('a4')).toEqual([mockData[3], mockData[1], mockData[0]]);
|
||||
});
|
||||
|
||||
it('should detect cycles.', () {
|
||||
var a = new NgMeta.empty();
|
||||
a.identifiers['T0'] = mockDirMetadata[0];
|
||||
a.types['T0'] = mockData[0];
|
||||
a.aliases['a1'] = ['T0', 'a1'];
|
||||
a.aliases['a2'] = ['a1'];
|
||||
expect(a.flatten('a1')).toEqual([mockDirMetadata[0]]);
|
||||
expect(a.flatten('a1')).toEqual([mockData[0]]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('merge', () {
|
||||
it('should merge all identifiers on addAll', () {
|
||||
it('should merge all types on addAll', () {
|
||||
var a = new NgMeta.empty();
|
||||
var b = new NgMeta.empty();
|
||||
a.identifiers['T0'] = mockDirMetadata[0];
|
||||
b.identifiers['T1'] = mockDirMetadata[1];
|
||||
a.types['T0'] = mockData[0];
|
||||
b.types['T1'] = mockData[1];
|
||||
a.addAll(b);
|
||||
expect(a.identifiers).toContain('T1');
|
||||
expect(a.identifiers['T1']).toEqual(mockDirMetadata[1]);
|
||||
expect(a.types).toContain('T1');
|
||||
expect(a.types['T1']).toEqual(mockData[1]);
|
||||
});
|
||||
|
||||
it('should merge all aliases on addAll', () {
|
||||
|
|
@ -90,12 +87,12 @@ void allTests() {
|
|||
}
|
||||
|
||||
_checkSimilar(NgMeta a, NgMeta b) {
|
||||
expect(a.identifiers.length).toEqual(b.identifiers.length);
|
||||
expect(a.types.length).toEqual(b.types.length);
|
||||
expect(a.aliases.length).toEqual(b.aliases.length);
|
||||
for (var k in a.identifiers.keys) {
|
||||
expect(b.identifiers).toContain(k);
|
||||
var at = a.identifiers[k];
|
||||
var bt = b.identifiers[k];
|
||||
for (var k in a.types.keys) {
|
||||
expect(b.types).toContain(k);
|
||||
var at = a.types[k];
|
||||
var bt = b.types[k];
|
||||
expect(at.type.name).toEqual(bt.type.name);
|
||||
}
|
||||
for (var k in a.aliases.keys) {
|
||||
|
|
|
|||
|
|
@ -41,15 +41,15 @@ void allTests() {
|
|||
// Establish some test NgMeta objects with one Component each.
|
||||
var fooComponentMeta = createFoo(moduleBase);
|
||||
fooNgMeta = new NgMeta(ngDeps: new NgDepsModel());
|
||||
fooNgMeta.identifiers[fooComponentMeta.type.name] = fooComponentMeta;
|
||||
fooNgMeta.types[fooComponentMeta.type.name] = fooComponentMeta;
|
||||
|
||||
var barComponentMeta = createBar(moduleBase);
|
||||
barNgMeta = new NgMeta(ngDeps: new NgDepsModel());
|
||||
barNgMeta.identifiers[barComponentMeta.type.name] = barComponentMeta;
|
||||
barNgMeta.types[barComponentMeta.type.name] = barComponentMeta;
|
||||
|
||||
var bazComponentMeta = createBaz(moduleBase);
|
||||
bazNgMeta = new NgMeta(ngDeps: new NgDepsModel());
|
||||
barNgMeta.identifiers[bazComponentMeta.type.name] = bazComponentMeta;
|
||||
barNgMeta.types[bazComponentMeta.type.name] = bazComponentMeta;
|
||||
|
||||
fooAssetId = new AssetId('a', toSummaryExtension('lib/foo.dart'));
|
||||
barAssetId = new AssetId('a', toSummaryExtension('lib/bar.dart'));
|
||||
|
|
@ -63,11 +63,11 @@ void allTests() {
|
|||
updateReader();
|
||||
|
||||
var extracted = await _testLink(reader, fooAssetId);
|
||||
expect(extracted.identifiers).toContain('FooComponent');
|
||||
expect(extracted.identifiers).toContain('BarComponent');
|
||||
expect(extracted.types).toContain('FooComponent');
|
||||
expect(extracted.types).toContain('BarComponent');
|
||||
|
||||
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
|
||||
expect(extracted.types['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.types['BarComponent'].selector).toEqual('bar');
|
||||
});
|
||||
|
||||
it('should include `DirectiveMetadata` recursively from exported files.',
|
||||
|
|
@ -77,13 +77,13 @@ void allTests() {
|
|||
updateReader();
|
||||
|
||||
var extracted = await _testLink(reader, fooAssetId);
|
||||
expect(extracted.identifiers).toContain('FooComponent');
|
||||
expect(extracted.identifiers).toContain('BarComponent');
|
||||
expect(extracted.identifiers).toContain('BazComponent');
|
||||
expect(extracted.types).toContain('FooComponent');
|
||||
expect(extracted.types).toContain('BarComponent');
|
||||
expect(extracted.types).toContain('BazComponent');
|
||||
|
||||
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
|
||||
expect(extracted.identifiers['BazComponent'].selector).toEqual('baz');
|
||||
expect(extracted.types['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.types['BarComponent'].selector).toEqual('bar');
|
||||
expect(extracted.types['BazComponent'].selector).toEqual('baz');
|
||||
});
|
||||
|
||||
it('should handle `DirectiveMetadata` export cycles gracefully.', () async {
|
||||
|
|
@ -93,9 +93,9 @@ void allTests() {
|
|||
updateReader();
|
||||
|
||||
var extracted = await _testLink(reader, bazAssetId);
|
||||
expect(extracted.identifiers).toContain('FooComponent');
|
||||
expect(extracted.identifiers).toContain('BarComponent');
|
||||
expect(extracted.identifiers).toContain('BazComponent');
|
||||
expect(extracted.types).toContain('FooComponent');
|
||||
expect(extracted.types).toContain('BarComponent');
|
||||
expect(extracted.types).toContain('BazComponent');
|
||||
});
|
||||
|
||||
it(
|
||||
|
|
@ -109,11 +109,11 @@ void allTests() {
|
|||
|
||||
var extracted = await _testLink(reader, fooAssetId);
|
||||
|
||||
expect(extracted.identifiers).toContain('FooComponent');
|
||||
expect(extracted.identifiers).toContain('BarComponent');
|
||||
expect(extracted.types).toContain('FooComponent');
|
||||
expect(extracted.types).toContain('BarComponent');
|
||||
|
||||
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
|
||||
expect(extracted.types['FooComponent'].selector).toEqual('foo');
|
||||
expect(extracted.types['BarComponent'].selector).toEqual('bar');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import 'package:barback/barback.dart';
|
|||
import 'package:dart_style/dart_style.dart';
|
||||
import 'package:guinness/guinness.dart';
|
||||
|
||||
import 'package:angular2/src/compiler/directive_metadata.dart' show CompileIdentifierMetadata;
|
||||
import 'package:angular2/src/core/change_detection/change_detection.dart';
|
||||
import 'package:angular2/src/platform/server/html_adapter.dart';
|
||||
import 'package:angular2/src/core/linker/interfaces.dart' show LifecycleHooks;
|
||||
|
|
@ -318,10 +317,10 @@ void allTests() {
|
|||
it('should include hooks for implemented types (single)', () async {
|
||||
var ngMeta = await _testCreateModel('interfaces_files/soup.dart');
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent'].lifecycleHooks)
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['ChangingSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.types['ChangingSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.types['ChangingSoupComponent'].lifecycleHooks)
|
||||
.toContain(LifecycleHooks.OnChanges);
|
||||
});
|
||||
|
||||
|
|
@ -329,10 +328,10 @@ void allTests() {
|
|||
var ngMeta = await _testCreateModel(
|
||||
'multiple_interface_lifecycle_files/soup.dart');
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['MultiSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['MultiSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.identifiers['MultiSoupComponent'].lifecycleHooks)
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['MultiSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.types['MultiSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.types['MultiSoupComponent'].lifecycleHooks)
|
||||
..toContain(LifecycleHooks.OnChanges)
|
||||
..toContain(LifecycleHooks.OnDestroy)
|
||||
..toContain(LifecycleHooks.OnInit);
|
||||
|
|
@ -346,18 +345,18 @@ void allTests() {
|
|||
'absolute_url_expression_files/hello.dart',
|
||||
reader: fakeReader);
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['HelloCmp']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['HelloCmp'].selector).toEqual('hello-app');
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['HelloCmp']).toBeNotNull();
|
||||
expect(ngMeta.types['HelloCmp'].selector).toEqual('hello-app');
|
||||
});
|
||||
|
||||
it('should populate all provided values for Components & Directives',
|
||||
() async {
|
||||
var ngMeta = await _testCreateModel('unusual_component_files/hello.dart');
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
|
||||
var component = ngMeta.identifiers['UnusualComp'];
|
||||
var component = ngMeta.types['UnusualComp'];
|
||||
expect(component).toBeNotNull();
|
||||
expect(component.selector).toEqual('unusual-comp');
|
||||
expect(component.isComponent).toBeTrue();
|
||||
|
|
@ -371,7 +370,7 @@ void allTests() {
|
|||
expect(component.hostAttributes).toContain('hostKey');
|
||||
expect(component.hostAttributes['hostKey']).toEqual('hostValue');
|
||||
|
||||
var directive = ngMeta.identifiers['UnusualDirective'];
|
||||
var directive = ngMeta.types['UnusualDirective'];
|
||||
expect(directive).toBeNotNull();
|
||||
expect(directive.selector).toEqual('unusual-directive');
|
||||
expect(directive.isComponent).toBeFalse();
|
||||
|
|
@ -389,10 +388,10 @@ void allTests() {
|
|||
it('should include hooks for implemented types (single)', () async {
|
||||
var ngMeta = await _testCreateModel('interfaces_files/soup.dart');
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.identifiers['ChangingSoupComponent'].lifecycleHooks)
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['ChangingSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.types['ChangingSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.types['ChangingSoupComponent'].lifecycleHooks)
|
||||
.toContain(LifecycleHooks.OnChanges);
|
||||
});
|
||||
|
||||
|
|
@ -400,10 +399,10 @@ void allTests() {
|
|||
var ngMeta = await _testCreateModel(
|
||||
'multiple_interface_lifecycle_files/soup.dart');
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['MultiSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['MultiSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.identifiers['MultiSoupComponent'].lifecycleHooks)
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['MultiSoupComponent']).toBeNotNull();
|
||||
expect(ngMeta.types['MultiSoupComponent'].selector).toEqual('[soup]');
|
||||
expect(ngMeta.types['MultiSoupComponent'].lifecycleHooks)
|
||||
..toContain(LifecycleHooks.OnChanges)
|
||||
..toContain(LifecycleHooks.OnDestroy)
|
||||
..toContain(LifecycleHooks.OnInit);
|
||||
|
|
@ -417,10 +416,10 @@ void allTests() {
|
|||
'absolute_url_expression_files/hello.dart',
|
||||
reader: fakeReader);
|
||||
|
||||
expect(ngMeta.identifiers.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.identifiers['HelloCmp']).toBeNotNull();
|
||||
expect(ngMeta.identifiers['HelloCmp'].template).toBeNotNull();
|
||||
expect(ngMeta.identifiers['HelloCmp'].template.templateUrl)
|
||||
expect(ngMeta.types.isNotEmpty).toBeTrue();
|
||||
expect(ngMeta.types['HelloCmp']).toBeNotNull();
|
||||
expect(ngMeta.types['HelloCmp'].template).toBeNotNull();
|
||||
expect(ngMeta.types['HelloCmp'].template.templateUrl)
|
||||
.toEqual('asset:other_package/lib/template.html');
|
||||
});
|
||||
|
||||
|
|
@ -446,27 +445,6 @@ void allTests() {
|
|||
});
|
||||
});
|
||||
|
||||
describe("identifiers", () {
|
||||
it("should populate `identifier` with class types.", () async {
|
||||
var model = (await _testCreateModel('identifiers/classes.dart'));
|
||||
final moduleUrl = "asset:angular2/test/transform/directive_processor/identifiers/classes.dart";
|
||||
expect(model.identifiers['Service1'].name).toEqual('Service1');
|
||||
expect(model.identifiers['Service1'].moduleUrl).toEqual(moduleUrl);
|
||||
expect(model.identifiers['Service2'].name).toEqual('Service2');
|
||||
expect(model.identifiers['Service2'].moduleUrl).toEqual(moduleUrl);
|
||||
});
|
||||
|
||||
it("should populate `identifier` with constants.", () async {
|
||||
var model = (await _testCreateModel('identifiers/constants.dart'));
|
||||
final moduleUrl = "asset:angular2/test/transform/directive_processor/identifiers/constants.dart";
|
||||
expect(model.identifiers['a']).
|
||||
toHaveSameProps(new CompileIdentifierMetadata(name: 'a', moduleUrl: moduleUrl));
|
||||
expect(model.identifiers['b']).
|
||||
toHaveSameProps(new CompileIdentifierMetadata(name: 'b', moduleUrl: moduleUrl));
|
||||
expect(model.identifiers['c']).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe('directives', () {
|
||||
final reflectableNamed = (NgDepsModel model, String name) {
|
||||
return model.reflectables
|
||||
|
|
@ -559,114 +537,27 @@ void allTests() {
|
|||
..prefix = 'dep2');
|
||||
});
|
||||
|
||||
it('should populate `diDependency`.',
|
||||
() async {
|
||||
var cmp =
|
||||
(await _testCreateModel('directives_files/components.dart')).identifiers['ComponentWithDiDeps'];
|
||||
|
||||
expect(cmp).toBeNotNull();
|
||||
var deps = cmp.type.diDeps;
|
||||
expect(deps).toBeNotNull();
|
||||
expect(deps.length).toEqual(2);
|
||||
expect(deps[0].token.name).toEqual("ServiceDep");
|
||||
expect(deps[1].token.name).toEqual("ServiceDep");
|
||||
});
|
||||
|
||||
it('should populate `diDependency` using a string token.',
|
||||
() async {
|
||||
var cmp =
|
||||
(await _testCreateModel('directives_files/components.dart')).identifiers['ComponentWithDiDepsStrToken'];
|
||||
|
||||
var deps = cmp.type.diDeps;
|
||||
expect(deps).toBeNotNull();
|
||||
expect(deps.length).toEqual(1);
|
||||
expect(deps[0].token).toEqual("StringDep");
|
||||
});
|
||||
|
||||
it('should populate `services`.',
|
||||
() async {
|
||||
var service =
|
||||
(await _testCreateModel('directives_files/services.dart')).identifiers['Service'];
|
||||
|
||||
expect(service).toBeNotNull();
|
||||
|
||||
var deps = service.diDeps;
|
||||
expect(deps).toBeNotNull();
|
||||
expect(deps.length).toEqual(2);
|
||||
expect(deps[0].token.name).toEqual("ServiceDep");
|
||||
expect(deps[1].token.name).toEqual("ServiceDep");
|
||||
});
|
||||
|
||||
it('should populate `providers` using types.',
|
||||
() async {
|
||||
var cmp =
|
||||
(await _testCreateModel('directives_files/components.dart')).identifiers['ComponentWithProvidersTypes'];
|
||||
|
||||
expect(cmp).toBeNotNull();
|
||||
expect(cmp.providers).toBeNotNull();
|
||||
expect(cmp.providers.length).toEqual(2);
|
||||
|
||||
var firstToken = cmp.providers.first.token;
|
||||
expect(firstToken.prefix).toEqual(null);
|
||||
expect(firstToken.name).toEqual("ServiceDep");
|
||||
|
||||
var secondToken = cmp.providers[1].token;
|
||||
expect(secondToken.prefix).toEqual("dep2");
|
||||
expect(secondToken.name).toEqual("ServiceDep");
|
||||
});
|
||||
|
||||
it('should populate `providers` using useClass.',
|
||||
() async {
|
||||
var cmp =
|
||||
(await _testCreateModel('directives_files/components.dart')).identifiers['ComponentWithProvidersUseClass'];
|
||||
|
||||
expect(cmp).toBeNotNull();
|
||||
expect(cmp.providers).toBeNotNull();
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
var token = cmp.providers.first.token;
|
||||
var useClass = cmp.providers.first.useClass;
|
||||
expect(token.prefix).toEqual(null);
|
||||
expect(token.name).toEqual("ServiceDep");
|
||||
|
||||
expect(useClass.prefix).toEqual(null);
|
||||
expect(useClass.name).toEqual("ServiceDep");
|
||||
});
|
||||
|
||||
it('should populate `providers` using a string token.',
|
||||
() async {
|
||||
var cmp =
|
||||
(await _testCreateModel('directives_files/components.dart')).identifiers['ComponentWithProvidersStringToken'];
|
||||
|
||||
expect(cmp).toBeNotNull();
|
||||
expect(cmp.providers).toBeNotNull();
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
var token = cmp.providers.first.token;
|
||||
expect(token).toEqual("StringDep");
|
||||
});
|
||||
|
||||
it('should merge `outputs` from the annotation and fields.', () async {
|
||||
var model = await _testCreateModel('directives_files/components.dart');
|
||||
expect(model.identifiers['ComponentWithOutputs'].outputs).toEqual(
|
||||
expect(model.types['ComponentWithOutputs'].outputs).toEqual(
|
||||
{'a': 'a', 'b': 'b', 'c': 'renamed', 'd': 'd', 'e': 'get-renamed'});
|
||||
});
|
||||
|
||||
it('should merge `inputs` from the annotation and fields.', () async {
|
||||
var model = await _testCreateModel('directives_files/components.dart');
|
||||
expect(model.identifiers['ComponentWithInputs'].inputs).toEqual(
|
||||
expect(model.types['ComponentWithInputs'].inputs).toEqual(
|
||||
{'a': 'a', 'b': 'b', 'c': 'renamed', 'd': 'd', 'e': 'set-renamed'});
|
||||
});
|
||||
|
||||
it('should merge host bindings from the annotation and fields.', () async {
|
||||
var model = await _testCreateModel('directives_files/components.dart');
|
||||
expect(model.identifiers['ComponentWithHostBindings'].hostProperties)
|
||||
expect(model.types['ComponentWithHostBindings'].hostProperties)
|
||||
.toEqual({'a': 'a', 'b': 'b', 'renamed': 'c', 'd': 'd', 'get-renamed': 'e'});
|
||||
});
|
||||
|
||||
it('should merge host listeners from the annotation and fields.', () async {
|
||||
var model = await _testCreateModel('directives_files/components.dart');
|
||||
expect(model.identifiers['ComponentWithHostListeners'].hostListeners).toEqual({
|
||||
expect(model.types['ComponentWithHostListeners'].hostListeners).toEqual({
|
||||
'a': 'onA()',
|
||||
'b': 'onB()',
|
||||
'c': 'onC(\$event.target,\$event.target.value)'
|
||||
|
|
@ -726,13 +617,13 @@ void allTests() {
|
|||
describe('pipes', () {
|
||||
it('should read the pipe name', () async {
|
||||
var model = await _testCreateModel('pipe_files/pipes.dart');
|
||||
expect(model.identifiers['NameOnlyPipe'].name).toEqual('nameOnly');
|
||||
expect(model.identifiers['NameOnlyPipe'].pure).toBe(false);
|
||||
expect(model.types['NameOnlyPipe'].name).toEqual('nameOnly');
|
||||
expect(model.types['NameOnlyPipe'].pure).toBe(false);
|
||||
});
|
||||
|
||||
it('should read the pure flag', () async {
|
||||
var model = await _testCreateModel('pipe_files/pipes.dart');
|
||||
expect(model.identifiers['NameAndPurePipe'].pure).toBe(true);
|
||||
expect(model.types['NameAndPurePipe'].pure).toBe(true);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
library angular2.test.transform.directive_processor.directive_files.components;
|
||||
|
||||
import 'package:angular2/angular2.dart'
|
||||
show Component, Directive, View, NgElement, Output, Input, Provider;
|
||||
show Component, Directive, View, NgElement, Output, Input;
|
||||
import 'dep1.dart';
|
||||
import 'dep2.dart' as dep2;
|
||||
|
||||
|
|
@ -84,35 +84,3 @@ class ComponentWithHostListeners {
|
|||
@HostListener('c', ['\$event.target', '\$event.target.value']) void onC(
|
||||
t, v) {}
|
||||
}
|
||||
|
||||
@Component(
|
||||
selector: 'component-with-providers-types',
|
||||
template: '',
|
||||
providers: [ServiceDep, dep2.ServiceDep])
|
||||
class ComponentWithProvidersTypes {}
|
||||
|
||||
@Component(
|
||||
selector: 'component-with-providers-string-token',
|
||||
template: '',
|
||||
providers: [const Provider("StringDep", useClass: ServiceDep)])
|
||||
class ComponentWithProvidersStringToken {}
|
||||
|
||||
@Component(
|
||||
selector: 'component-with-providers-use-class',
|
||||
template: '',
|
||||
providers: [const Provider(ServiceDep, useClass: ServiceDep)])
|
||||
class ComponentWithProvidersUseClass {}
|
||||
|
||||
@Component(
|
||||
selector: 'component-with-di-deps',
|
||||
template: '')
|
||||
class ComponentWithDiDeps {
|
||||
ComponentWithDiDeps(ServiceDep arg1, @Inject(ServiceDep) arg2);
|
||||
}
|
||||
|
||||
@Component(
|
||||
selector: 'component-with-di-deps-string-token',
|
||||
template: '')
|
||||
class ComponentWithDiDepsStrToken {
|
||||
ComponentWithDiDepsStrToken(@Inject("StringDep") arg1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
library angular2.test.transform.directive_processor.directive_files.dep1;
|
||||
|
||||
import 'package:angular2/angular2.dart' show Component, Directive, View, Pipe, Injectable;
|
||||
import 'package:angular2/angular2.dart' show Component, Directive, View, Pipe;
|
||||
|
||||
@Component(selector: 'dep1')
|
||||
@View(template: 'Dep1')
|
||||
|
|
@ -8,6 +8,3 @@ class Dep {}
|
|||
|
||||
@Pipe(name: 'dep1')
|
||||
class PipeDep {}
|
||||
|
||||
@Injectable()
|
||||
class ServiceDep {}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
library angular2.test.transform.directive_processor.directive_files.dep2;
|
||||
|
||||
import 'package:angular2/angular2.dart' show Component, Directive, View, Pipe, Injectable;
|
||||
import 'package:angular2/angular2.dart' show Component, Directive, View, Pipe;
|
||||
|
||||
@Component(selector: 'dep2')
|
||||
@View(template: 'Dep2')
|
||||
|
|
@ -8,6 +8,3 @@ class Dep {}
|
|||
|
||||
@Pipe(name: 'dep2')
|
||||
class PipeDep {}
|
||||
|
||||
@Injectable()
|
||||
class ServiceDep {}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
library angular2.test.transform.directive_processor.directive_files.components;
|
||||
|
||||
import 'package:angular2/angular2.dart'
|
||||
show Injectable, Inject;
|
||||
import 'dep1.dart';
|
||||
|
||||
@Injectable()
|
||||
class Service {
|
||||
Service(ServiceDep arg1, @Inject(ServiceDep) arg2);
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
library angular2.test.transform.directive_processor.identifiers.classes;
|
||||
|
||||
import 'package:angular2/angular2.dart' show Injectable;
|
||||
|
||||
@Injectable()
|
||||
class Service1 {}
|
||||
|
||||
@Injectable()
|
||||
class Service2 {}
|
||||
|
||||
class Service3 {}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
library angular2.test.transform.directive_processor.identifiers.constants;
|
||||
|
||||
const a = "a";
|
||||
const b = "b";
|
||||
var c = "c";
|
||||
|
|
@ -7,8 +7,8 @@ import 'foo.dart' as prefix;
|
|||
@View(template: '')
|
||||
class MyComponent {
|
||||
final prefix.MyContext c;
|
||||
final prefix.MyDep generatedValue;
|
||||
MyComponent(this.c, prefix.MyDep inValue) {
|
||||
generatedValue = inValue;
|
||||
final String generatedValue;
|
||||
MyComponent(this.c, String inValue) {
|
||||
generatedValue = 'generated ' + inValue;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
|
|||
import 'package:angular2/src/core/metadata.dart';
|
||||
import 'foo.dart' as prefix;
|
||||
import 'package:angular2/src/core/metadata.template.dart' as i0;
|
||||
import 'foo.template.dart' as i1;
|
||||
export 'bar.dart';
|
||||
|
||||
var _visited = false;
|
||||
|
|
@ -23,10 +22,9 @@ void initReflector() {
|
|||
],
|
||||
const [
|
||||
const [prefix.MyContext],
|
||||
const [prefix.MyDep]
|
||||
const [String]
|
||||
],
|
||||
(prefix.MyContext c, prefix.MyDep inValue) =>
|
||||
(prefix.MyContext c, String inValue) =>
|
||||
new MyComponent(c, inValue)));
|
||||
i0.initReflector();
|
||||
i1.initReflector();
|
||||
}
|
||||
|
|
@ -1,11 +1,6 @@
|
|||
library foo;
|
||||
|
||||
import 'package:angular2/angular2.dart';
|
||||
|
||||
@Injectable()
|
||||
class MyDep {}
|
||||
|
||||
class MyContext {
|
||||
final MyDep selector;
|
||||
final String selector;
|
||||
const MyContext(this.selector);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,7 @@ import 'package:angular2/src/transform/common/code/ng_deps_code.dart';
|
|||
import 'package:angular2/src/transform/common/code/source_module.dart';
|
||||
import 'package:angular2/src/transform/common/zone.dart' as zone;
|
||||
import 'package:angular2/src/transform/template_compiler/generator.dart';
|
||||
import 'package:angular2/src/transform/template_compiler/compile_data_creator.dart';
|
||||
|
||||
import 'package:angular2/src/transform/common/model/parameter_model.pb.dart';
|
||||
import '../common/compile_directive_metadata/ng_for.ng_meta.dart' as ngMeta;
|
||||
import '../common/ng_meta_helper.dart';
|
||||
import '../common/read_file.dart';
|
||||
|
|
@ -59,7 +57,7 @@ void allTests() {
|
|||
fooNgMeta = new NgMeta(ngDeps: new NgDepsModel()
|
||||
..libraryUri = 'test.foo'
|
||||
..reflectables.add(new ReflectionInfoModel()..name = fooComponentMeta.type.name));
|
||||
fooNgMeta.identifiers[fooComponentMeta.type.name] = fooComponentMeta;
|
||||
fooNgMeta.types[fooComponentMeta.type.name] = fooComponentMeta;
|
||||
|
||||
barComponentMeta = createBar(moduleBase);
|
||||
barPipeMeta = createBarPipe(moduleBase);
|
||||
|
|
@ -67,14 +65,14 @@ void allTests() {
|
|||
..libraryUri = 'test.bar'
|
||||
..reflectables.add(new ReflectionInfoModel()..name = barPipeMeta.type.name)
|
||||
..reflectables.add(new ReflectionInfoModel()..name = barComponentMeta.type.name));
|
||||
barNgMeta.identifiers[barComponentMeta.type.name] = barComponentMeta;
|
||||
barNgMeta.identifiers[barPipeMeta.type.name] = barPipeMeta;
|
||||
barNgMeta.types[barComponentMeta.type.name] = barComponentMeta;
|
||||
barNgMeta.types[barPipeMeta.type.name] = barPipeMeta;
|
||||
|
||||
bazComponentMeta = createBaz(moduleBase);
|
||||
bazNgMeta = new NgMeta(ngDeps: new NgDepsModel()
|
||||
..libraryUri = 'test.baz'
|
||||
..reflectables.add(new ReflectionInfoModel()..name = bazComponentMeta.type.name));
|
||||
barNgMeta.identifiers[bazComponentMeta.type.name] = bazComponentMeta;
|
||||
barNgMeta.types[bazComponentMeta.type.name] = bazComponentMeta;
|
||||
|
||||
fooAssetId = new AssetId('a', 'lib/foo.ng_meta.json');
|
||||
barAssetId = new AssetId('a', 'lib/bar.ng_meta.json');
|
||||
|
|
@ -116,145 +114,6 @@ void allTests() {
|
|||
expect(_generatedCode(outputs)).not.toContain('notifyDispatcher');
|
||||
});
|
||||
|
||||
it('should generate generate diDeps of injectable services.', () async {
|
||||
bazNgMeta.identifiers['Service2'] = new CompileTypeMetadata(
|
||||
name: 'Service2',
|
||||
moduleUrl: 'moduleUrl');
|
||||
|
||||
barNgMeta.identifiers['Service'] = new CompileTypeMetadata(
|
||||
name: 'Service',
|
||||
moduleUrl: 'moduleUrl',
|
||||
diDeps: [new CompileDiDependencyMetadata(token: new CompileIdentifierMetadata(name: 'Service2'))]);
|
||||
barNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/baz.dart');
|
||||
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(template: "import 'bar.dart';");
|
||||
fooComponentMeta.providers = [
|
||||
new CompileProviderMetadata(
|
||||
token: new CompileIdentifierMetadata(name: 'Service'),
|
||||
useClass: new CompileTypeMetadata(name: 'Service')
|
||||
)
|
||||
];
|
||||
|
||||
final viewAnnotation = new AnnotationModel()..name = 'View'..isView = true;
|
||||
final reflectable = fooNgMeta.ngDeps.reflectables.first;
|
||||
reflectable.annotations.add(viewAnnotation);
|
||||
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/bar.dart');
|
||||
|
||||
updateReader();
|
||||
|
||||
final viewDefResults = await createCompileData(reader, fooAssetId, [], []);
|
||||
final cmp = viewDefResults.viewDefinitions.values.first.component;
|
||||
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
expect(cmp.providers[0].useClass.name).toEqual("Service");
|
||||
expect(cmp.providers[0].useClass.diDeps.first.token.name).toEqual("Service2");
|
||||
});
|
||||
|
||||
it('should generate providers from types.', () async {
|
||||
barNgMeta.identifiers['Service'] = new CompileTypeMetadata(name: 'Service', moduleUrl: 'moduleUrl');
|
||||
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(template: "import 'bar.dart';");
|
||||
fooComponentMeta.providers = [new CompileProviderMetadata(token: new CompileIdentifierMetadata(name: 'Service'))];
|
||||
fooComponentMeta.type.diDeps = [new CompileDiDependencyMetadata(token: new CompileIdentifierMetadata(name: 'Service'))];
|
||||
|
||||
final viewAnnotation = new AnnotationModel()..name = 'View'..isView = true;
|
||||
final reflectable = fooNgMeta.ngDeps.reflectables.first;
|
||||
reflectable.annotations.add(viewAnnotation);
|
||||
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/bar.dart');
|
||||
|
||||
updateReader();
|
||||
|
||||
final viewDefResults = await createCompileData(reader, fooAssetId, [], []);
|
||||
final cmp = viewDefResults.viewDefinitions.values.first.component;
|
||||
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
expect(cmp.providers[0].token.name).toEqual("Service");
|
||||
expect(cmp.providers[0].token.moduleUrl).toEqual("moduleUrl");
|
||||
|
||||
expect(cmp.type.diDeps.length).toEqual(1);
|
||||
expect(cmp.type.diDeps[0].token.name).toEqual("Service");
|
||||
expect(cmp.type.diDeps[0].token.moduleUrl).toEqual("moduleUrl");
|
||||
});
|
||||
|
||||
it('should generate providers from Provider objects (references).', () async {
|
||||
barNgMeta.identifiers['Service1'] = new CompileTypeMetadata(name: 'Service1', moduleUrl: 'moduleUrl');
|
||||
barNgMeta.identifiers['Service2'] = new CompileTypeMetadata(name: 'Service2', moduleUrl: 'moduleUrl');
|
||||
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(template: "import 'bar.dart';");
|
||||
fooComponentMeta.providers = [new CompileProviderMetadata(token: new CompileIdentifierMetadata(name: 'Service1'), useClass:
|
||||
new CompileTypeMetadata(name: 'Service2'))];
|
||||
|
||||
final viewAnnotation = new AnnotationModel()..name = 'View'..isView = true;
|
||||
final reflectable = fooNgMeta.ngDeps.reflectables.first;
|
||||
reflectable.annotations.add(viewAnnotation);
|
||||
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/bar.dart');
|
||||
|
||||
updateReader();
|
||||
|
||||
final viewDefResults = await createCompileData(reader, fooAssetId, [], []);
|
||||
final cmp = viewDefResults.viewDefinitions.values.first.component;
|
||||
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
expect(cmp.providers[0].token.name).toEqual("Service1");
|
||||
expect(cmp.providers[0].token.moduleUrl).toEqual("moduleUrl");
|
||||
expect(cmp.providers[0].useClass.name).toEqual("Service2");
|
||||
expect(cmp.providers[0].useClass.moduleUrl).toEqual("moduleUrl");
|
||||
});
|
||||
|
||||
it('should generate providers from Provider objects (literals).', () async {
|
||||
barNgMeta.identifiers['Service'] = new CompileTypeMetadata(name: 'Service', moduleUrl: 'moduleUrl');
|
||||
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(template: "import 'bar.dart';");
|
||||
fooComponentMeta.providers = [new CompileProviderMetadata(token: "StrService", useClass:
|
||||
new CompileTypeMetadata(name: 'Service'))];
|
||||
fooComponentMeta.type.diDeps = [new CompileDiDependencyMetadata(token: "StrService")];
|
||||
|
||||
final viewAnnotation = new AnnotationModel()..name = 'View'..isView = true;
|
||||
final reflectable = fooNgMeta.ngDeps.reflectables.first;
|
||||
reflectable.annotations.add(viewAnnotation);
|
||||
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/bar.dart');
|
||||
|
||||
updateReader();
|
||||
|
||||
final viewDefResults = await createCompileData(reader, fooAssetId, [], []);
|
||||
final cmp = viewDefResults.viewDefinitions.values.first.component;
|
||||
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
|
||||
expect(cmp.providers[0].token).toEqual("StrService");
|
||||
expect(cmp.providers[0].useClass.name).toEqual("Service");
|
||||
expect(cmp.providers[0].useClass.moduleUrl).toEqual("moduleUrl");
|
||||
|
||||
expect(cmp.type.diDeps.length).toEqual(1);
|
||||
expect(cmp.type.diDeps[0].token).toEqual("StrService");
|
||||
});
|
||||
|
||||
it('should include providers mentioned in aliases.', () async {
|
||||
barNgMeta.identifiers['Service'] = new CompileTypeMetadata(name: 'Service', moduleUrl: 'moduleUrl');
|
||||
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(template: "import 'bar.dart';");
|
||||
|
||||
fooNgMeta.aliases['providerAlias'] = ['Service'];
|
||||
|
||||
fooComponentMeta.providers = [new CompileProviderMetadata(token: new CompileIdentifierMetadata(name: 'providerAlias'))];
|
||||
|
||||
final viewAnnotation = new AnnotationModel()..name = 'View'..isView = true;
|
||||
final reflectable = fooNgMeta.ngDeps.reflectables.first;
|
||||
reflectable.annotations.add(viewAnnotation);
|
||||
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'package:a/bar.dart');
|
||||
|
||||
updateReader();
|
||||
|
||||
final viewDefResults = await createCompileData(reader, fooAssetId, [], []);
|
||||
final cmp = viewDefResults.viewDefinitions.values.first.component;
|
||||
|
||||
expect(cmp.providers.length).toEqual(1);
|
||||
expect(cmp.providers[0].token.name).toEqual("Service");
|
||||
});
|
||||
|
||||
it('should parse simple expressions in inline templates.', () async {
|
||||
fooComponentMeta.template = new CompileTemplateMetadata(
|
||||
template: '<div [a]="b">{{greeting}}</div>',
|
||||
|
|
@ -510,7 +369,7 @@ void allTests() {
|
|||
..name = 'View'
|
||||
..isView = true;
|
||||
|
||||
barNgMeta.identifiers['PLATFORM'] = barComponentMeta;
|
||||
barNgMeta.types['PLATFORM'] = barComponentMeta;
|
||||
updateReader();
|
||||
|
||||
final outputs = await process(fooAssetId,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ var broccoli = require('broccoli');
|
|||
var fs = require('fs');
|
||||
var makeBrowserTree = require('./trees/browser_tree');
|
||||
var makeNodeTree = require('./trees/node_tree');
|
||||
var makeDartTree = require('./trees/dart_tree');
|
||||
var path = require('path');
|
||||
var printSlowTrees = require('broccoli-slow-trees');
|
||||
var Q = require('q');
|
||||
|
|
@ -110,7 +111,6 @@ export class AngularBuilder {
|
|||
logs: this.options.logs,
|
||||
projects: projects
|
||||
};
|
||||
var makeDartTree = require('./trees/dart_tree');
|
||||
let tree = makeDartTree(options);
|
||||
return new broccoli.Builder(tree);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,10 @@ var insert = require('gulp-insert');
|
|||
var fs = require('fs-extra');
|
||||
var browserify = require('browserify');
|
||||
var path = require('path');
|
||||
var Builder = require('systemjs-builder');
|
||||
|
||||
module.exports.bundle = function(buildConfig, moduleName, outputFile, outputConfig,
|
||||
sfx) {
|
||||
var Builder = require('systemjs-builder');
|
||||
|
||||
var sfx = sfx || false;
|
||||
var builder = new Builder();
|
||||
builder.config(buildConfig);
|
||||
|
|
|
|||
|
|
@ -825,12 +825,8 @@ const COMPILER = [
|
|||
'BoundTextAst.visit(visitor:TemplateAstVisitor, context:any):any',
|
||||
'CompileDirectiveMetadata',
|
||||
'CompileDirectiveMetadata.changeDetection:ChangeDetectionStrategy',
|
||||
'CompileDirectiveMetadata.constructor({type,isComponent,dynamicLoadable,selector,exportAs,changeDetection,inputs,outputs,hostListeners,hostProperties,hostAttributes,lifecycleHooks,providers,viewProviders,queries,viewQueries,template}:{type?:CompileTypeMetadata, isComponent?:boolean, dynamicLoadable?:boolean, selector?:string, exportAs?:string, changeDetection?:ChangeDetectionStrategy, inputs?:{[key:string]:string}, outputs?:{[key:string]:string}, hostListeners?:{[key:string]:string}, hostProperties?:{[key:string]:string}, hostAttributes?:{[key:string]:string}, lifecycleHooks?:LifecycleHooks[], providers?:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>, viewProviders?:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>, queries?:CompileQueryMetadata[], viewQueries?:CompileQueryMetadata[], template?:CompileTemplateMetadata})',
|
||||
'CompileDirectiveMetadata.create({type,isComponent,dynamicLoadable,selector,exportAs,changeDetection,inputs,outputs,host,lifecycleHooks,providers,viewProviders,queries,viewQueries,template}:{type?:CompileTypeMetadata, isComponent?:boolean, dynamicLoadable?:boolean, selector?:string, exportAs?:string, changeDetection?:ChangeDetectionStrategy, inputs?:string[], outputs?:string[], host?:{[key:string]:string}, lifecycleHooks?:LifecycleHooks[], providers?:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>, viewProviders?:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>, queries?:CompileQueryMetadata[], viewQueries?:CompileQueryMetadata[], template?:CompileTemplateMetadata}):CompileDirectiveMetadata',
|
||||
'CompileDirectiveMetadata.providers:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>',
|
||||
'CompileDirectiveMetadata.queries:CompileQueryMetadata[]',
|
||||
'CompileDirectiveMetadata.viewProviders:Array<CompileProviderMetadata|CompileTypeMetadata|any[]>',
|
||||
'CompileDirectiveMetadata.viewQueries:CompileQueryMetadata[]',
|
||||
'CompileDirectiveMetadata.constructor({type,isComponent,dynamicLoadable,selector,exportAs,changeDetection,inputs,outputs,hostListeners,hostProperties,hostAttributes,lifecycleHooks,template}:{type?:CompileTypeMetadata, isComponent?:boolean, dynamicLoadable?:boolean, selector?:string, exportAs?:string, changeDetection?:ChangeDetectionStrategy, inputs?:{[key:string]:string}, outputs?:{[key:string]:string}, hostListeners?:{[key:string]:string}, hostProperties?:{[key:string]:string}, hostAttributes?:{[key:string]:string}, lifecycleHooks?:LifecycleHooks[], template?:CompileTemplateMetadata})',
|
||||
'CompileDirectiveMetadata.create({type,isComponent,dynamicLoadable,selector,exportAs,changeDetection,inputs,outputs,host,lifecycleHooks,template}:{type?:CompileTypeMetadata, isComponent?:boolean, dynamicLoadable?:boolean, selector?:string, exportAs?:string, changeDetection?:ChangeDetectionStrategy, inputs?:string[], outputs?:string[], host?:{[key:string]:string}, lifecycleHooks?:LifecycleHooks[], template?:CompileTemplateMetadata}):CompileDirectiveMetadata',
|
||||
'CompileDirectiveMetadata.dynamicLoadable:boolean',
|
||||
'CompileDirectiveMetadata.exportAs:string',
|
||||
'CompileDirectiveMetadata.fromJson(data:{[key:string]:any}):CompileDirectiveMetadata',
|
||||
|
|
@ -845,7 +841,6 @@ const COMPILER = [
|
|||
'CompileDirectiveMetadata.template:CompileTemplateMetadata',
|
||||
'CompileDirectiveMetadata.toJson():{[key:string]:any}',
|
||||
'CompileDirectiveMetadata.type:CompileTypeMetadata',
|
||||
'CompileDirectiveMetadata.identifier:CompileIdentifierMetadata',
|
||||
'CompileTemplateMetadata',
|
||||
'CompileTemplateMetadata.constructor({encapsulation,template,templateUrl,styles,styleUrls,ngContentSelectors}:{encapsulation?:ViewEncapsulation, template?:string, templateUrl?:string, styles?:string[], styleUrls?:string[], ngContentSelectors?:string[]})',
|
||||
'CompileTemplateMetadata.encapsulation:ViewEncapsulation',
|
||||
|
|
@ -857,17 +852,13 @@ const COMPILER = [
|
|||
'CompileTemplateMetadata.templateUrl:string',
|
||||
'CompileTemplateMetadata.toJson():{[key:string]:any}',
|
||||
'CompileTypeMetadata',
|
||||
'CompileTypeMetadata.constructor({runtime,name,moduleUrl,prefix,isHost,diDeps}:{runtime?:Type, name?:string, moduleUrl?:string, prefix?:string, isHost?:boolean, diDeps?:CompileDiDependencyMetadata[]})',
|
||||
'CompileTypeMetadata.constructor({runtime,name,moduleUrl,isHost}:{runtime?:Type, name?:string, moduleUrl?:string, isHost?:boolean})',
|
||||
'CompileTypeMetadata.fromJson(data:{[key:string]:any}):CompileTypeMetadata',
|
||||
'CompileTypeMetadata.isHost:boolean',
|
||||
'CompileTypeMetadata.moduleUrl:string',
|
||||
'CompileTypeMetadata.name:string',
|
||||
'CompileTypeMetadata.runtime:Type',
|
||||
'CompileTypeMetadata.toJson():{[key:string]:any}',
|
||||
'CompileTypeMetadata.diDeps:CompileDiDependencyMetadata[]',
|
||||
'CompileTypeMetadata.prefix:string',
|
||||
'CompileTypeMetadata.identifier:CompileIdentifierMetadata',
|
||||
'CompileTypeMetadata.type:CompileTypeMetadata',
|
||||
'DirectiveAst',
|
||||
'DirectiveAst.constructor(directive:CompileDirectiveMetadata, inputs:BoundDirectivePropertyAst[], hostProperties:BoundElementPropertyAst[], hostEvents:BoundEventAst[], exportAsVars:VariableAst[], sourceSpan:ParseSourceSpan)',
|
||||
'DirectiveAst.visit(visitor:TemplateAstVisitor, context:any):any',
|
||||
|
|
|
|||
Loading…
Reference in New Issue