refactor(core): remove ViewResolver
and ViewResolverMock
The methods on `ViewResolverMock` have been merged into `DirectiveResolver`. BREAKING CHANGE: - ES5 users can no longer use the `View(…)` function to provide `ViewMetadata`. This mirrors the removal of the `@View` decorator a while ago.
This commit is contained in:
@ -6,12 +6,12 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
import {Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector} from '@angular/core';
|
||||
import {AnimationEntryMetadata, Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector, ViewMetadata, resolveForwardRef} from '@angular/core';
|
||||
|
||||
import {DirectiveResolver} from '../src/directive_resolver';
|
||||
import {Map} from '../src/facade/collection';
|
||||
import {Type, isPresent} from '../src/facade/lang';
|
||||
|
||||
import {BaseException} from '../src/facade/exceptions';
|
||||
import {Type, isArray, isPresent, stringify} from '../src/facade/lang';
|
||||
|
||||
|
||||
/**
|
||||
@ -22,33 +22,75 @@ import {Type, isPresent} from '../src/facade/lang';
|
||||
export class MockDirectiveResolver extends DirectiveResolver {
|
||||
private _providerOverrides = new Map<Type, any[]>();
|
||||
private viewProviderOverrides = new Map<Type, any[]>();
|
||||
private _views = new Map<Type, ViewMetadata>();
|
||||
private _inlineTemplates = new Map<Type, string>();
|
||||
private _animations = new Map<Type, AnimationEntryMetadata[]>();
|
||||
private _directiveOverrides = new Map<Type, Map<Type, Type>>();
|
||||
|
||||
constructor(private _injector: Injector) { super(); }
|
||||
|
||||
private get _compiler(): Compiler { return this._injector.get(Compiler); }
|
||||
|
||||
private _clearCacheFor(component: Type) { this._compiler.clearCacheFor(component); }
|
||||
|
||||
resolve(type: Type, throwIfNotFound = true): DirectiveMetadata {
|
||||
var dm = super.resolve(type, throwIfNotFound);
|
||||
const dm = super.resolve(type, throwIfNotFound);
|
||||
if (!dm) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var providerOverrides = this._providerOverrides.get(type);
|
||||
var viewProviderOverrides = this.viewProviderOverrides.get(type);
|
||||
const providerOverrides = this._providerOverrides.get(type);
|
||||
const viewProviderOverrides = this.viewProviderOverrides.get(type);
|
||||
|
||||
var providers = dm.providers;
|
||||
let providers = dm.providers;
|
||||
if (isPresent(providerOverrides)) {
|
||||
var originalViewProviders: any[] = isPresent(dm.providers) ? dm.providers : [];
|
||||
const originalViewProviders: any[] = isPresent(dm.providers) ? dm.providers : [];
|
||||
providers = originalViewProviders.concat(providerOverrides);
|
||||
}
|
||||
|
||||
if (dm instanceof ComponentMetadata) {
|
||||
var viewProviders = dm.viewProviders;
|
||||
let viewProviders = dm.viewProviders;
|
||||
if (isPresent(viewProviderOverrides)) {
|
||||
var originalViewProviders: any[] = isPresent(dm.viewProviders) ? dm.viewProviders : [];
|
||||
const originalViewProviders: any[] = isPresent(dm.viewProviders) ? dm.viewProviders : [];
|
||||
viewProviders = originalViewProviders.concat(viewProviderOverrides);
|
||||
}
|
||||
|
||||
let view = this._views.get(type);
|
||||
if (!view) {
|
||||
view = dm;
|
||||
}
|
||||
|
||||
const directives: any[] = [];
|
||||
if (isPresent(view.directives)) {
|
||||
flattenArray(view.directives, directives);
|
||||
}
|
||||
let animations = view.animations;
|
||||
let templateUrl = view.templateUrl;
|
||||
const directiveOverrides = this._directiveOverrides.get(type);
|
||||
|
||||
const inlineAnimations = this._animations.get(type);
|
||||
if (isPresent(inlineAnimations)) {
|
||||
animations = inlineAnimations;
|
||||
}
|
||||
|
||||
let inlineTemplate = this._inlineTemplates.get(type);
|
||||
if (isPresent(inlineTemplate)) {
|
||||
templateUrl = null;
|
||||
} else {
|
||||
inlineTemplate = view.template;
|
||||
}
|
||||
|
||||
if (isPresent(directiveOverrides) && isPresent(view.directives)) {
|
||||
directiveOverrides.forEach((to, from) => {
|
||||
var srcIndex = directives.indexOf(from);
|
||||
if (srcIndex == -1) {
|
||||
throw new BaseException(
|
||||
`Overriden directive ${stringify(from)} not found in the template of ${stringify(type)}`);
|
||||
}
|
||||
directives[srcIndex] = to;
|
||||
});
|
||||
}
|
||||
|
||||
return new ComponentMetadata({
|
||||
selector: dm.selector,
|
||||
inputs: dm.inputs,
|
||||
@ -60,7 +102,16 @@ export class MockDirectiveResolver extends DirectiveResolver {
|
||||
changeDetection: dm.changeDetection,
|
||||
providers: providers,
|
||||
viewProviders: viewProviders,
|
||||
entryComponents: dm.entryComponents
|
||||
entryComponents: dm.entryComponents,
|
||||
template: inlineTemplate,
|
||||
templateUrl: templateUrl,
|
||||
directives: directives.length > 0 ? directives : null,
|
||||
animations: animations,
|
||||
styles: view.styles,
|
||||
styleUrls: view.styleUrls,
|
||||
pipes: view.pipes,
|
||||
encapsulation: view.encapsulation,
|
||||
interpolation: view.interpolation
|
||||
});
|
||||
}
|
||||
|
||||
@ -77,11 +128,58 @@ export class MockDirectiveResolver extends DirectiveResolver {
|
||||
|
||||
setProvidersOverride(type: Type, providers: any[]): void {
|
||||
this._providerOverrides.set(type, providers);
|
||||
this._compiler.clearCacheFor(type);
|
||||
this._clearCacheFor(type);
|
||||
}
|
||||
|
||||
setViewProvidersOverride(type: Type, viewProviders: any[]): void {
|
||||
this.viewProviderOverrides.set(type, viewProviders);
|
||||
this._compiler.clearCacheFor(type);
|
||||
this._clearCacheFor(type);
|
||||
}
|
||||
|
||||
/**
|
||||
* Overrides the {@link ViewMetadata} for a component.
|
||||
*/
|
||||
setView(component: Type, view: ViewMetadata): void {
|
||||
this._views.set(component, view);
|
||||
this._clearCacheFor(component);
|
||||
}
|
||||
/**
|
||||
* Overrides the inline template for a component - other configuration remains unchanged.
|
||||
*/
|
||||
setInlineTemplate(component: Type, template: string): void {
|
||||
this._inlineTemplates.set(component, template);
|
||||
this._clearCacheFor(component);
|
||||
}
|
||||
|
||||
setAnimations(component: Type, animations: AnimationEntryMetadata[]): void {
|
||||
this._animations.set(component, animations);
|
||||
this._clearCacheFor(component);
|
||||
}
|
||||
|
||||
/**
|
||||
* Overrides a directive from the component {@link ViewMetadata}.
|
||||
*/
|
||||
overrideViewDirective(component: Type, from: Type, to: Type): void {
|
||||
var overrides = this._directiveOverrides.get(component);
|
||||
|
||||
if (!overrides) {
|
||||
overrides = new Map<Type, Type>();
|
||||
this._directiveOverrides.set(component, overrides);
|
||||
}
|
||||
|
||||
overrides.set(from, to);
|
||||
this._clearCacheFor(component);
|
||||
}
|
||||
}
|
||||
|
||||
function flattenArray(tree: any[], out: Array<Type|any[]>): void {
|
||||
if (!isPresent(tree)) return;
|
||||
for (var i = 0; i < tree.length; i++) {
|
||||
var item = resolveForwardRef(tree[i]);
|
||||
if (isArray(item)) {
|
||||
flattenArray(item, out);
|
||||
} else {
|
||||
out.push(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user