refactor(core): reuse element end first creation pass (#59843)

pkozlowski-opensource · alxhub · commit 802397d99798 · 2025-02-05T08:56:28.000-08:00
Reuse element end first creation pass in ComponentRef impl. PR Close #59843
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
@@ -79,7 +79,7 @@ import {executeContentQueries} from './queries/query_execution';
 import {enterView, leaveView} from './state';
 import {debugStringifyTypeForError, stringifyForError} from './util/stringify_utils';
 import {getComponentLViewByIndex, getTNode} from './util/view_utils';
-import {elementStartFirstCreatePass} from './view/elements';
+import {elementEndFirstCreatePass, elementStartFirstCreatePass} from './view/elements';
 import {ViewRef} from './view_ref';
 
 export class ComponentFactoryResolver extends AbstractComponentFactoryResolver {
@@ -346,6 +346,8 @@ export class ComponentFactory<T> extends AbstractComponentFactory<T> {
           0,
         );
 
+        // ---- element instruction
+
         // TODO(crisbeto): in practice `hostRNode` should always be defined, but there are some
         // tests where the renderer is mocked out and `undefined` is returned. We should update the
         // tests so that this check can be removed.
@@ -358,8 +360,7 @@ export class ComponentFactory<T> extends AbstractComponentFactory<T> {
         createDirectivesInstances(rootTView, rootLView, hostTNode);
         executeContentQueries(rootTView, hostTNode, rootLView);
 
-        // TODO(pk): code / logic duplication with the elementEnd and similar instructions
-        registerPostOrderHooks(rootTView, hostTNode);
+        elementEndFirstCreatePass(rootTView, hostTNode);
 
         if (projectableNodes !== undefined) {
           projectNodes(hostTNode, this.ngContentSelectors, projectableNodes);
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
@@ -61,7 +61,7 @@ import {
   setCurrentTNodeAsNotParent,
   wasLastNodeCreated,
 } from '../state';
-import {elementStartFirstCreatePass} from '../view/elements';
+import {elementEndFirstCreatePass, elementStartFirstCreatePass} from '../view/elements';
 
 import {validateElementIsKnown} from './element_validation';
 import {setDirectiveInputsWhichShadowsStyling} from './property';
@@ -182,10 +182,7 @@ export function ɵɵelementEnd(): typeof ɵɵelementEnd {
 
   const tView = getTView();
   if (tView.firstCreatePass) {
-    registerPostOrderHooks(tView, currentTNode);
-    if (isContentQueryHost(currentTNode)) {
-      tView.queries!.elementEnd(currentTNode);
-    }
+    elementEndFirstCreatePass(tView, tNode);
   }
 
   if (tNode.classesWithoutHost != null && hasClassInput(tNode)) {
diff --git a/packages/core/src/render3/view/elements.ts b/packages/core/src/render3/view/elements.ts
@@ -7,7 +7,9 @@
  */
 
 import {assertFirstCreatePass} from '../assert';
-import {TAttributes, TNodeType, type TElementNode} from '../interfaces/node';
+import {registerPostOrderHooks} from '../hooks';
+import {TAttributes, TNode, TNodeType, type TElementNode} from '../interfaces/node';
+import {isContentQueryHost} from '../interfaces/type_checks';
 import type {LView, TView} from '../interfaces/view';
 import {computeStaticStyling} from '../styling/static_styling';
 import {getOrCreateTNode} from '../tnode_manipulation';
@@ -59,3 +61,11 @@ export function elementStartFirstCreatePass(
 
   return tNode;
 }
+
+export function elementEndFirstCreatePass(tView: TView, tNode: TNode) {
+  ngDevMode && assertFirstCreatePass(tView);
+  registerPostOrderHooks(tView, tNode);
+  if (isContentQueryHost(tNode)) {
+    tView.queries!.elementEnd(tNode);
+  }
+}
diff --git a/packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json b/packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json
@@ -275,6 +275,7 @@
   "detectChangesInternal",
   "diPublicInInjector",
   "documentElement",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
@@ -430,7 +431,6 @@
   "producerUpdateValueVersion",
   "refreshContentQueries",
   "refreshView",
-  "registerPostOrderHooks",
   "rememberChangeHistoryAndInvokeOnChangesHook",
   "remove",
   "removeClass",
diff --git a/packages/core/test/bundling/animations/bundle.golden_symbols.json b/packages/core/test/bundling/animations/bundle.golden_symbols.json
@@ -296,6 +296,7 @@
   "detectChangesInternal",
   "diPublicInInjector",
   "documentElement",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
@@ -456,7 +457,6 @@
   "producerUpdateValueVersion",
   "refreshContentQueries",
   "refreshView",
-  "registerPostOrderHooks",
   "rememberChangeHistoryAndInvokeOnChangesHook",
   "remove",
   "removeClass",
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -227,6 +227,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
@@ -370,7 +371,6 @@
   "producerUpdateValueVersion",
   "refreshContentQueries",
   "refreshView",
-  "registerPostOrderHooks",
   "rememberChangeHistoryAndInvokeOnChangesHook",
   "remove",
   "removeElements",
diff --git a/packages/core/test/bundling/defer/bundle.golden_symbols.json b/packages/core/test/bundling/defer/bundle.golden_symbols.json
@@ -276,6 +276,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -329,6 +329,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -317,6 +317,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementPropertyInternal",
   "elementStartFirstCreatePass",
   "enterDI",
diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json
@@ -249,6 +249,7 @@
   "isApplicationBootstrapConfig",
   "isComponentDef",
   "isComponentHost",
+  "isContentQueryHost",
   "isDestroyed",
   "isDetachedByI18n",
   "isEnvironmentProviders",
diff --git a/packages/core/test/bundling/hydration/bundle.golden_symbols.json b/packages/core/test/bundling/hydration/bundle.golden_symbols.json
@@ -325,6 +325,7 @@
   "isAsyncIterable",
   "isComponentDef",
   "isComponentHost",
+  "isContentQueryHost",
   "isDestroyed",
   "isDetachedByI18n",
   "isDisconnectedNode",
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -384,6 +384,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "emptyPathMatch",
   "encodeUriQuery",
@@ -637,7 +638,6 @@
   "refCount",
   "refreshContentQueries",
   "refreshView",
-  "registerPostOrderHooks",
   "rememberChangeHistoryAndInvokeOnChangesHook",
   "remove",
   "removeElements",
diff --git a/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json b/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json
@@ -278,6 +278,7 @@
   "isApplicationBootstrapConfig",
   "isComponentDef",
   "isComponentHost",
+  "isContentQueryHost",
   "isDestroyed",
   "isDetachedByI18n",
   "isEnvironmentProviders",
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -269,6 +269,7 @@
   "detectChangesInViewIfRequired",
   "detectChangesInternal",
   "diPublicInInjector",
+  "elementEndFirstCreatePass",
   "elementStartFirstCreatePass",
   "enterDI",
   "enterView",
