refactor(compiler): inline view.viewChildren in generated code
This commit is contained in:
@ -27,6 +27,8 @@ export class CompileView implements NameResolver {
|
||||
public viewType: ViewType;
|
||||
public viewQueries: Map<any, CompileQuery[]>;
|
||||
|
||||
public viewChildren: o.Expression[] = [];
|
||||
|
||||
public nodes: CompileNode[] = [];
|
||||
// root nodes or AppElements for ViewContainers
|
||||
public rootNodesOrAppElements: o.Expression[] = [];
|
||||
|
@ -194,21 +194,25 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
|
||||
parent, this.view, nodeIndex, renderNode, ast, component, directives, ast.providers,
|
||||
ast.hasViewContainer, false, ast.references, this.targetDependencies);
|
||||
this.view.nodes.push(compileElement);
|
||||
var compViewExpr: o.ReadVarExpr = null;
|
||||
var compViewExpr: o.ReadPropExpr = null;
|
||||
if (isPresent(component)) {
|
||||
let nestedComponentIdentifier =
|
||||
new CompileIdentifierMetadata({name: getViewFactoryName(component, 0)});
|
||||
this.targetDependencies.push(
|
||||
new ViewFactoryDependency(component.type, nestedComponentIdentifier));
|
||||
|
||||
compViewExpr = o.variable(`compView_${nodeIndex}`); // fix highlighting: `
|
||||
compViewExpr = o.THIS_EXPR.prop(`compView_${nodeIndex}`); // fix highlighting: `
|
||||
this.view.fields.push(new o.ClassField(
|
||||
compViewExpr.name,
|
||||
o.importType(resolveIdentifier(Identifiers.AppView), [o.importType(component.type)])));
|
||||
this.view.viewChildren.push(compViewExpr);
|
||||
compileElement.setComponentView(compViewExpr);
|
||||
this.view.createMethod.addStmt(
|
||||
compViewExpr
|
||||
.set(o.importExpr(nestedComponentIdentifier).callFn([
|
||||
ViewProperties.viewUtils, compileElement.injector, compileElement.appElement
|
||||
]))
|
||||
.toDeclStmt());
|
||||
.toStmt());
|
||||
}
|
||||
compileElement.beforeChildren();
|
||||
this._addRootNodeAndProject(compileElement);
|
||||
@ -452,7 +456,7 @@ function createViewClass(
|
||||
'detectChangesInternal', [new o.FnParam(DetectChangesVars.throwOnChange.name, o.BOOL_TYPE)],
|
||||
generateDetectChangesMethod(view)),
|
||||
new o.ClassMethod('dirtyParentQueriesInternal', [], view.dirtyParentQueriesMethod.finish()),
|
||||
new o.ClassMethod('destroyInternal', [], view.destroyMethod.finish()),
|
||||
new o.ClassMethod('destroyInternal', [], generateDestroyMethod(view)),
|
||||
new o.ClassMethod('detachInternal', [], view.detachMethod.finish())
|
||||
].filter((method) => method.body.length > 0);
|
||||
var superClass = view.genConfig.genDebugInfo ? Identifiers.DebugAppView : Identifiers.AppView;
|
||||
@ -467,6 +471,14 @@ function createViewClass(
|
||||
return viewClass;
|
||||
}
|
||||
|
||||
function generateDestroyMethod(view: CompileView): o.Statement[] {
|
||||
const stmts: o.Statement[] = [];
|
||||
view.viewChildren.forEach(
|
||||
(viewChild) => { stmts.push(viewChild.callMethod('destroy', []).toStmt()); });
|
||||
stmts.push(...view.destroyMethod.finish());
|
||||
return stmts;
|
||||
}
|
||||
|
||||
function createViewFactory(
|
||||
view: CompileView, viewClass: o.ClassStmt, renderCompTypeVar: o.ReadVarExpr): o.Statement {
|
||||
var viewFactoryArgs = [
|
||||
@ -569,8 +581,9 @@ function generateDetectChangesMethod(view: CompileView): o.Statement[] {
|
||||
stmts.push(new o.IfStmt(o.not(DetectChangesVars.throwOnChange), afterContentStmts));
|
||||
}
|
||||
stmts.push(...view.detectChangesRenderPropertiesMethod.finish());
|
||||
stmts.push(o.THIS_EXPR.callMethod('detectViewChildrenChanges', [DetectChangesVars.throwOnChange])
|
||||
.toStmt());
|
||||
view.viewChildren.forEach((viewChild) => {
|
||||
stmts.push(viewChild.callMethod('detectChanges', [DetectChangesVars.throwOnChange]).toStmt());
|
||||
});
|
||||
var afterViewStmts =
|
||||
view.updateViewQueriesMethod.finish().concat(view.afterViewLifecycleCallbacksMethod.finish());
|
||||
if (afterViewStmts.length > 0) {
|
||||
|
@ -34,7 +34,6 @@ export abstract class AppView<T> {
|
||||
allNodes: any[];
|
||||
disposables: Function[];
|
||||
contentChildren: AppView<any>[] = [];
|
||||
viewChildren: AppView<any>[] = [];
|
||||
viewContainerElement: AppElement = null;
|
||||
|
||||
numberOfChecks: number = 0;
|
||||
@ -102,9 +101,6 @@ export abstract class AppView<T> {
|
||||
this.allNodes = allNodes;
|
||||
this.disposables = disposables;
|
||||
if (this.type === ViewType.COMPONENT) {
|
||||
// Note: the render nodes have been attached to their host element
|
||||
// in the ViewFactory already.
|
||||
this.declarationAppElement.parentView.viewChildren.push(this);
|
||||
this.dirtyParentQueriesInternal();
|
||||
}
|
||||
}
|
||||
@ -145,10 +141,6 @@ export abstract class AppView<T> {
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
children[i]._destroyRecurse();
|
||||
}
|
||||
children = this.viewChildren;
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
children[i]._destroyRecurse();
|
||||
}
|
||||
this.destroyLocal();
|
||||
|
||||
this.cdMode = ChangeDetectorStatus.Destroyed;
|
||||
@ -214,7 +206,8 @@ export abstract class AppView<T> {
|
||||
detectChanges(throwOnChange: boolean): void {
|
||||
var s = _scope_check(this.clazz);
|
||||
if (this.cdMode === ChangeDetectorStatus.Checked ||
|
||||
this.cdMode === ChangeDetectorStatus.Errored)
|
||||
this.cdMode === ChangeDetectorStatus.Errored ||
|
||||
this.cdMode === ChangeDetectorStatus.Detached)
|
||||
return;
|
||||
if (this.cdMode === ChangeDetectorStatus.Destroyed) {
|
||||
this.throwDestroyedError('detectChanges');
|
||||
@ -231,7 +224,6 @@ export abstract class AppView<T> {
|
||||
*/
|
||||
detectChangesInternal(throwOnChange: boolean): void {
|
||||
this.detectContentChildrenChanges(throwOnChange);
|
||||
this.detectViewChildrenChanges(throwOnChange);
|
||||
}
|
||||
|
||||
detectContentChildrenChanges(throwOnChange: boolean) {
|
||||
@ -242,14 +234,6 @@ export abstract class AppView<T> {
|
||||
}
|
||||
}
|
||||
|
||||
detectViewChildrenChanges(throwOnChange: boolean) {
|
||||
for (var i = 0; i < this.viewChildren.length; ++i) {
|
||||
var child = this.viewChildren[i];
|
||||
if (child.cdMode === ChangeDetectorStatus.Detached) continue;
|
||||
child.detectChanges(throwOnChange);
|
||||
}
|
||||
}
|
||||
|
||||
markContentChildAsMoved(renderAppElement: AppElement): void { this.dirtyParentQueriesInternal(); }
|
||||
|
||||
addToContentChildren(renderAppElement: AppElement): void {
|
||||
|
Reference in New Issue
Block a user