fix: view engine - fix some corner cases

modules/@angular/core/src/view/refs.ts

@@ -103,10 +103,15 @@ class ViewContainerRef_ implements ViewContainerRef {
     }
   }
 
-  get(index: number): ViewRef {
-    const ref = new ViewRef_(this._data.embeddedViews[index]);
-    ref.attachToViewContainerRef(this);
-    return ref;
+  get(index: number): ViewRef { return this._getViewRef(this._data.embeddedViews[index]); }
+
+  private _getViewRef(view: ViewData) {
+    if (view) {
+      const ref = new ViewRef_(view);
+      ref.attachToViewContainerRef(this);
+      return ref;
+    }
+    return null;
   }
 
   get length(): number { return this._data.embeddedViews.length; };
@@ -147,14 +152,19 @@ class ViewContainerRef_ implements ViewContainerRef {
 
   remove(index?: number): void {
     const viewData = Services.detachEmbeddedView(this._data, index);
-    Services.destroyView(viewData);
+    if (viewData) {
+      Services.destroyView(viewData);
+    }
   }
 
   detach(index?: number): ViewRef {
-    const view = this.get(index);
-    Services.detachEmbeddedView(this._data, index);
-    (view as ViewRef_).detachFromContainer();
-    return view;
+    const view = Services.detachEmbeddedView(this._data, index);
+    if (view) {
+      const viewRef = this._getViewRef(view);
+      viewRef.detachFromContainer();
+      return viewRef;
+    }
+    return null;
   }
 }
 

modules/@angular/core/src/view/types.ts

@@ -38,7 +38,7 @@ export interface ViewDefinition {
    * Especially providers are after elements / anchors.
    */
   reverseChildNodes: NodeDef[];
-  lastRootNode: NodeDef;
+  lastRenderRootNode: NodeDef;
   bindingCount: number;
   disposableCount: number;
   /**

modules/@angular/core/src/view/util.ts

@@ -230,7 +230,7 @@ export function visitRootRenderNodes(
     view: ViewData, action: RenderNodeAction, parentNode: any, nextSibling: any, target: any[]) {
   // We need to re-compute the parent node in case the nodes have been moved around manually
   if (action === RenderNodeAction.RemoveChild) {
-    parentNode = view.renderer.parentNode(renderNode(view, view.def.lastRootNode));
+    parentNode = view.renderer.parentNode(renderNode(view, view.def.lastRenderRootNode));
   }
   visitSiblingRenderNodes(
       view, action, 0, view.def.nodes.length - 1, parentNode, nextSibling, target);

modules/@angular/core/src/view/view.ts

@@ -37,7 +37,7 @@ export function viewDef(
   let currentParent: NodeDef = null;
   let currentElementHasPublicProviders = false;
   let currentElementHasPrivateProviders = false;
-  let lastRootNode: NodeDef = null;
+  let lastRenderRootNode: NodeDef = null;
   for (let i = 0; i < nodes.length; i++) {
     while (currentParent && i > currentParent.index + currentParent.childCount) {
       const newParent = currentParent.parent;
@@ -92,8 +92,8 @@ export function viewDef(
     viewBindingCount += node.bindings.length;
     viewDisposableCount += node.disposableCount;
 
-    if (!currentRenderParent) {
-      lastRootNode = node;
+    if (!currentRenderParent && (node.type === NodeType.Element || node.type === NodeType.Text)) {
+      lastRenderRootNode = node;
     }
     if (node.type === NodeType.Provider || node.type === NodeType.Directive) {
       if (!currentElementHasPublicProviders) {
@@ -141,7 +141,7 @@ export function viewDef(
     updateRenderer: updateRenderer || NOOP,
     handleEvent: handleEvent || NOOP,
     bindingCount: viewBindingCount,
-    disposableCount: viewDisposableCount, lastRootNode
+    disposableCount: viewDisposableCount, lastRenderRootNode
   };
 }
 
@@ -189,7 +189,8 @@ function calculateReverseChildIndex(
 function validateNode(parent: NodeDef, node: NodeDef, nodeCount: number) {
   const template = node.element && node.element.template;
   if (template) {
-    if (template.lastRootNode && template.lastRootNode.flags & NodeFlags.HasEmbeddedViews) {
+    if (template.lastRenderRootNode &&
+        template.lastRenderRootNode.flags & NodeFlags.HasEmbeddedViews) {
       throw new Error(
           `Illegal State: Last root node of a template can't have embedded views, at index ${node.index}!`);
     }
@@ -476,6 +477,9 @@ function checkNoChangesQuery(view: ViewData, nodeDef: NodeDef) {
 }
 
 export function destroyView(view: ViewData) {
+  if (view.state & ViewState.Destroyed) {
+    return;
+  }
   execEmbeddedViewsAction(view, ViewAction.Destroy);
   execComponentViewsAction(view, ViewAction.Destroy);
   callLifecycleHooksChildrenFirst(view, NodeFlags.OnDestroy);

modules/@angular/core/src/view/view_attach.ts

@@ -33,8 +33,11 @@ export function attachEmbeddedView(elementData: ElementData, viewIndex: number,
 
 export function detachEmbeddedView(elementData: ElementData, viewIndex: number): ViewData {
   const embeddedViews = elementData.embeddedViews;
-  if (viewIndex == null) {
-    viewIndex = embeddedViews.length;
+  if (viewIndex == null || viewIndex >= embeddedViews.length) {
+    viewIndex = embeddedViews.length - 1;
+  }
+  if (viewIndex < 0) {
+    return null;
   }
   const view = embeddedViews[viewIndex];
   removeFromArray(embeddedViews, viewIndex);
@@ -76,7 +79,7 @@ export function moveEmbeddedView(
 
 function renderAttachEmbeddedView(elementData: ElementData, prevView: ViewData, view: ViewData) {
   const prevRenderNode =
-      prevView ? renderNode(prevView, prevView.def.lastRootNode) : elementData.renderElement;
+      prevView ? renderNode(prevView, prevView.def.lastRenderRootNode) : elementData.renderElement;
   const parentNode = view.renderer.parentNode(prevRenderNode);
   const nextSibling = view.renderer.nextSibling(prevRenderNode);
   // Note: We can't check if `nextSibling` is present, as on WebWorkers it will always be!