fix(core): defer block render failures should report to application error handler (#60149)

atscott · mmalerba · commit fd12220a3566 · 2025-03-04T22:06:17.000Z
This commit updates error reporting of defer blocks to go to the application root error handler rather than the `ErrorHandler` token that may be provided by users. This ensures Angular has control over what happens when these errors are reported. PR Close #60149
diff --git a/packages/core/src/defer/rendering.ts b/packages/core/src/defer/rendering.ts
@@ -16,7 +16,7 @@ import {
 import {assertLContainer, assertTNodeForLView} from '../render3/assert';
 import {ChainedInjector} from '../render3/chained_injector';
 import {markViewDirty} from '../render3/instructions/mark_view_dirty';
-import {handleError} from '../render3/instructions/shared';
+import {handleUncaughtError} from '../render3/instructions/shared';
 import {DEHYDRATED_VIEWS, LContainer} from '../render3/interfaces/container';
 import {TContainerNode, TNode} from '../render3/interfaces/node';
 import {isDestroyed} from '../render3/interfaces/type_checks';
@@ -214,7 +214,7 @@ export function renderDeferBlockState(
     try {
       applyStateFn(newState, lDetails, lContainer, tNode, hostLView);
     } catch (error: unknown) {
-      handleError(hostLView, error);
+      handleUncaughtError(hostLView, error);
     }
   }
 }
diff --git a/packages/core/src/defer/triggering.ts b/packages/core/src/defer/triggering.ts
@@ -25,7 +25,7 @@ import {PendingTasksInternal} from '../pending_tasks';
 import {assertLContainer} from '../render3/assert';
 import {getComponentDef, getDirectiveDef, getPipeDef} from '../render3/def_getters';
 import {getTemplateLocationDetails} from '../render3/instructions/element_validation';
-import {handleError} from '../render3/instructions/shared';
+import {handleUncaughtError} from '../render3/instructions/shared';
 import {DirectiveDefList, PipeDefList} from '../render3/interfaces/definition';
 import {TNode} from '../render3/interfaces/node';
 import {INJECTOR, LView, TView, TVIEW} from '../render3/interfaces/view';
@@ -261,7 +261,7 @@ export function triggerResourceLoading(
               `but no \`@error\` block was configured${templateLocation}. ` +
               'Consider using the `@error` block to render an error state.',
         );
-        handleError(lView, error);
+        handleUncaughtError(lView, error);
       }
     } else {
       tDetails.loadingState = DeferDependenciesLoadingState.COMPLETE;
diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts
@@ -310,6 +310,7 @@ function executeListenerWithErrorHandling(
     // Only explicitly returning false from a listener should preventDefault
     return listenerFn(e) !== false;
   } catch (error) {
+    // TODO(atscott): This should report to the application error handler, not the ErrorHandler on LView injector
     handleError(lView, error);
     return false;
   } finally {
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injector} from '../../di/injector';
-import {ErrorHandler} from '../../error_handler';
+import {ErrorHandler, INTERNAL_APPLICATION_ERROR_HANDLER} from '../../error_handler';
 import {hasSkipHydrationAttrOnRElement} from '../../hydration/skip_hydration';
 import {PRESERVE_HOST_CONTENT, PRESERVE_HOST_CONTENT_DEFAULT} from '../../hydration/tokens';
 import {processTextNodeMarkersBeforeHydration} from '../../hydration/utils';
@@ -607,10 +607,25 @@ export function loadComponentRenderer(
 }
 
 /** Handles an error thrown in an LView. */
+export function handleUncaughtError(lView: LView, error: any): void {
+  const injector = lView[INJECTOR];
+  if (!injector) {
+    return;
+  }
+  const errorHandler = injector.get(INTERNAL_APPLICATION_ERROR_HANDLER, null);
+  errorHandler?.(error);
+}
+
+/**
+ * Handles an error thrown in an LView.
+ * @deprecated Use handleUncaughtError to report to application error handler
+ */
 export function handleError(lView: LView, error: any): void {
   const injector = lView[INJECTOR];
-  const errorHandler = injector ? injector.get(ErrorHandler, null) : null;
-  errorHandler && errorHandler.handleError(error);
+  if (!injector) {
+    return;
+  }
+  injector.get(ErrorHandler, null)?.handleError(error);
 }
 
 /**
diff --git a/packages/core/test/acceptance/defer_spec.ts b/packages/core/test/acceptance/defer_spec.ts
@@ -832,6 +832,7 @@ describe('@defer', () => {
       };
 
       TestBed.configureTestingModule({
+        rethrowApplicationErrors: false,
         providers: [{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor}],
       });
 
@@ -892,6 +893,7 @@ describe('@defer', () => {
 
       const reportedErrors: Error[] = [];
       TestBed.configureTestingModule({
+        rethrowApplicationErrors: false,
         providers: [
           {
             provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR,
@@ -966,6 +968,7 @@ describe('@defer', () => {
 
       const reportedErrors: Error[] = [];
       TestBed.configureTestingModule({
+        rethrowApplicationErrors: false,
         providers: [
           {
             provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR,
@@ -1054,6 +1057,7 @@ describe('@defer', () => {
           }
 
           TestBed.configureTestingModule({
+            rethrowApplicationErrors: false,
             providers: [
               {provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
               {
diff --git a/packages/core/test/bundling/defer/bundle.golden_symbols.json b/packages/core/test/bundling/defer/bundle.golden_symbols.json
@@ -342,8 +342,8 @@
   "getTNode",
   "getTNodeFromLView",
   "getTView",
-  "handleError",
   "handleStoppedNotification",
+  "handleUncaughtError",
   "handleUnhandledError",
   "hasApplyArgsData",
   "hasInSkipHydrationBlockFlag",

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import {`
`16`	`16`	`import {assertLContainer, assertTNodeForLView} from '../render3/assert';`
`17`	`17`	`import {ChainedInjector} from '../render3/chained_injector';`
`18`	`18`	`import {markViewDirty} from '../render3/instructions/mark_view_dirty';`
`19`		`-import {handleError} from '../render3/instructions/shared';`
	`19`	`+import {handleUncaughtError} from '../render3/instructions/shared';`
`20`	`20`	`import {DEHYDRATED_VIEWS, LContainer} from '../render3/interfaces/container';`
`21`	`21`	`import {TContainerNode, TNode} from '../render3/interfaces/node';`
`22`	`22`	`import {isDestroyed} from '../render3/interfaces/type_checks';`
`@@ -214,7 +214,7 @@ export function renderDeferBlockState(`
`214`	`214`	`try {`
`215`	`215`	`applyStateFn(newState, lDetails, lContainer, tNode, hostLView);`
`216`	`216`	`} catch (error: unknown) {`
`217`		`- handleError(hostLView, error);`
	`217`	`+ handleUncaughtError(hostLView, error);`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,7 @@ describe('@defer', () => {`
`832`	`832`	`};`
`833`	`833`
`834`	`834`	`TestBed.configureTestingModule({`
	`835`	`+ rethrowApplicationErrors: false,`
`835`	`836`	`providers: [{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor}],`
`836`	`837`	`});`
`837`	`838`
`@@ -892,6 +893,7 @@ describe('@defer', () => {`
`892`	`893`
`893`	`894`	`const reportedErrors: Error[] = [];`
`894`	`895`	`TestBed.configureTestingModule({`
	`896`	`+ rethrowApplicationErrors: false,`
`895`	`897`	`providers: [`
`896`	`898`	`{`
`897`	`899`	`provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR,`
`@@ -966,6 +968,7 @@ describe('@defer', () => {`
`966`	`968`
`967`	`969`	`const reportedErrors: Error[] = [];`
`968`	`970`	`TestBed.configureTestingModule({`
	`971`	`+ rethrowApplicationErrors: false,`
`969`	`972`	`providers: [`
`970`	`973`	`{`
`971`	`974`	`provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR,`
`@@ -1054,6 +1057,7 @@ describe('@defer', () => {`
`1054`	`1057`	`}`
`1055`	`1058`
`1056`	`1059`	`TestBed.configureTestingModule({`
	`1060`	`+ rethrowApplicationErrors: false,`
`1057`	`1061`	`providers: [`
`1058`	`1062`	`{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},`
`1059`	`1063`	`{`