ref(angular): Extract zonejs error unwrapper into a dedicated function (getsentry#6443)

theofidry · web-flow · commit 93eac4ecbba8 · 2022-12-07T11:45:04.000+01:00
diff --git a/packages/angular/src/errorhandler.ts b/packages/angular/src/errorhandler.ts
@@ -21,6 +21,15 @@ export interface ErrorHandlerOptions {
   extractor?(error: unknown, defaultExtractor: (error: unknown) => unknown): unknown;
 }
 
+// https://github.com/angular/angular/blob/master/packages/core/src/util/errors.ts
+function tryToUnwrapZonejsError(error: unknown): unknown | Error {
+  // TODO: once Angular14 is the minimum requirement ERROR_ORIGINAL_ERROR and
+  //  getOriginalError from error.ts can be used directly.
+  return error && (error as { ngOriginalError: Error }).ngOriginalError
+    ? (error as { ngOriginalError: Error }).ngOriginalError
+    : error;
+}
+
 /**
  * Implementation of Angular's ErrorHandler provider that can be used as a drop-in replacement for the stock one.
  */
@@ -86,13 +95,7 @@ class SentryErrorHandler implements AngularErrorHandler {
    * Default implementation of error extraction that handles default error wrapping, HTTP responses, ErrorEvent and few other known cases.
    */
   protected _defaultExtractor(errorCandidate: unknown): unknown {
-    let error = errorCandidate;
-
-    // Try to unwrap zone.js error.
-    // https://github.com/angular/angular/blob/master/packages/core/src/util/errors.ts
-    if (error && (error as { ngOriginalError: Error }).ngOriginalError) {
-      error = (error as { ngOriginalError: Error }).ngOriginalError;
-    }
+    const error = tryToUnwrapZonejsError(errorCandidate);
 
     // We can handle messages and Error objects directly.
     if (typeof error === 'string' || error instanceof Error) {
