refactor(core): consolidate TNode creation checks (angular#61563)

This change de-duplicates code executed during TNode creation
and reponsible for asserting a TNode index.

PR Close angular#61563

Author: pkozlowski-opensource

packages/core/src/render3/assert.ts

@@ -7,7 +7,14 @@
  */
 
 import {RuntimeError, RuntimeErrorCode} from '../errors';
-import {assertDefined, assertEqual, assertNumber, throwError} from '../util/assert';
+import {
+  assertDefined,
+  assertEqual,
+  assertIndexInRange,
+  assertLessThan,
+  assertNumber,
+  throwError,
+} from '../util/assert';
 
 import {getComponentDef, getNgModuleDef} from './def_getters';
 import {LContainer} from './interfaces/container';
@@ -34,6 +41,16 @@ export function assertTNodeForLView(tNode: TNode, lView: LView) {
   assertTNodeForTView(tNode, lView[TVIEW]);
 }
 
+export function assertTNodeCreationIndex(lView: LView, index: number) {
+  const adjustedIndex = index + HEADER_OFFSET;
+  assertIndexInRange(lView, adjustedIndex);
+  assertLessThan(
+    adjustedIndex,
+    lView[TVIEW].bindingStartIndex,
+    'TNodes should be created before any bindings',
+  );
+}
+
 export function assertTNodeForTView(tNode: TNode, tView: TView) {
   assertTNode(tNode);
   const tData = tView.data;

packages/core/src/render3/instructions/element.ts

@@ -23,17 +23,17 @@ import {
   markRNodeAsSkippedByHydration,
   setSegmentHead,
 } from '../../hydration/utils';
-import {assertDefined, assertEqual} from '../../util/assert';
+import {assertDefined} from '../../util/assert';
+import {assertTNodeCreationIndex} from '../assert';
 import {clearElementContents, createElementNode} from '../dom_node_manipulation';
 import {hasClassInput, hasStyleInput, TNode, TNodeType} from '../interfaces/node';
 import {RElement} from '../interfaces/renderer_dom';
-import {isComponentHost, isDirectiveHost} from '../interfaces/type_checks';
-import {HYDRATION, LView, RENDERER, TView} from '../interfaces/view';
+import {isComponentHost} from '../interfaces/type_checks';
+import {HYDRATION, LView, RENDERER, TVIEW, TView} from '../interfaces/view';
 import {assertTNodeType} from '../node_assert';
 import {
   decreaseElementDepthCount,
   enterSkipHydrationBlock,
-  getBindingIndex,
   getBindingsEnabled,
   getCurrentTNode,
   getLView,
@@ -70,13 +70,9 @@ export function ɵɵelementStart(
   localRefsIndex?: number,
 ): typeof ɵɵelementStart {
   const lView = getLView();
-  const tView = getTView();
-  ngDevMode &&
-    assertEqual(
-      getBindingIndex(),
-      tView.bindingStartIndex,
-      'elements should be created before any bindings',
-    );
+
+  ngDevMode && assertTNodeCreationIndex(lView, index);
+
   const tNode = elementLikeStartShared(
     lView,
     index,
@@ -88,7 +84,7 @@ export function ɵɵelementStart(
     localRefsIndex,
   );
 
-  if (ngDevMode && tView.firstCreatePass) {
+  if (ngDevMode && lView[TVIEW].firstCreatePass) {
     validateElementIsKnown(lView, tNode);
   }
 

packages/core/src/render3/instructions/element_container.ts

@@ -13,11 +13,12 @@ import {
   markRNodeAsClaimedByHydration,
   setSegmentHead,
 } from '../../hydration/utils';
-import {assertDefined, assertEqual, assertNumber} from '../../util/assert';
+import {assertDefined, assertEqual, assertLessThan, assertNumber} from '../../util/assert';
+import {assertTNodeCreationIndex} from '../assert';
 import {createCommentNode} from '../dom_node_manipulation';
 import {TNode, TNodeType} from '../interfaces/node';
 import {RComment} from '../interfaces/renderer_dom';
-import {HYDRATION, LView, RENDERER, TView} from '../interfaces/view';
+import {HEADER_OFFSET, HYDRATION, LView, RENDERER, TVIEW, TView} from '../interfaces/view';
 import {assertTNodeType} from '../node_assert';
 import {
   getBindingIndex,
@@ -50,13 +51,7 @@ export function ɵɵelementContainerStart(
   localRefsIndex?: number,
 ): typeof ɵɵelementContainerStart {
   const lView = getLView();
-  const tView = getTView();
-  ngDevMode &&
-    assertEqual(
-      getBindingIndex(),
-      tView.bindingStartIndex,
-      'element containers should be created before any bindings',
-    );
+  ngDevMode && assertTNodeCreationIndex(lView, index);
   elementLikeStartShared(
     lView,
     index,

packages/core/src/render3/instructions/shared.ts

@@ -583,7 +583,6 @@ export function elementLikeStartShared(
   localRefsIndex: number | undefined,
 ) {
   const adjustedIndex = HEADER_OFFSET + index;
-  ngDevMode && assertIndexInRange(lView, adjustedIndex);
 
   const tView = lView[TVIEW];
   const tNode = tView.firstCreatePass

packages/core/src/render3/instructions/text.ts

@@ -8,14 +8,14 @@
 import {validateMatchingNode} from '../../hydration/error_handling';
 import {locateNextRNode} from '../../hydration/node_lookup_utils';
 import {canHydrateNode, markRNodeAsClaimedByHydration} from '../../hydration/utils';
-import {assertEqual, assertIndexInRange} from '../../util/assert';
+import {assertIndexInRange} from '../../util/assert';
+import {assertTNodeCreationIndex} from '../assert';
+import {createTextNode} from '../dom_node_manipulation';
 import {TElementNode, TNode, TNodeType} from '../interfaces/node';
 import {RText} from '../interfaces/renderer_dom';
 import {HEADER_OFFSET, HYDRATION, LView, RENDERER, TView} from '../interfaces/view';
 import {appendChild} from '../node_manipulation';
-import {createTextNode} from '../dom_node_manipulation';
 import {
-  getBindingIndex,
   getLView,
   getTView,
   lastNodeWasCreated,
@@ -37,13 +37,7 @@ export function ɵɵtext(index: number, value: string = ''): void {
   const tView = getTView();
   const adjustedIndex = index + HEADER_OFFSET;
 
-  ngDevMode &&
-    assertEqual(
-      getBindingIndex(),
-      tView.bindingStartIndex,
-      'text nodes should be created before any bindings',
-    );
-  ngDevMode && assertIndexInRange(lView, adjustedIndex);
+  ngDevMode && assertTNodeCreationIndex(lView, index);
 
   const tNode = tView.firstCreatePass
     ? getOrCreateTNode(tView, adjustedIndex, TNodeType.Text, value, null)