test

Author: JiaLiPassion

lib/common/error-rewrite.ts

@@ -48,6 +48,7 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   let zoneAwareFrame2: string;
   let zoneAwareFrame1WithoutNew: string;
   let zoneAwareFrame2WithoutNew: string;
+  let zoneAwareFrame3WithoutNew: string;
 
   global['Error'] = ZoneAwareError;
   const stackRewrite = 'stackRewrite';
@@ -79,7 +80,8 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
     let i = 0;
     // Find the first frame
     while (!(frames[i] === zoneAwareFrame1 || frames[i] === zoneAwareFrame2 ||
-             frames[i] === zoneAwareFrame1WithoutNew || frames[i] === zoneAwareFrame2WithoutNew) &&
+             frames[i] === zoneAwareFrame1WithoutNew || frames[i] === zoneAwareFrame2WithoutNew ||
+             frames[i] === zoneAwareFrame3WithoutNew) &&
            i < frames.length) {
       i++;
     }
@@ -263,59 +265,59 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
 
   let detectZone: Zone = Zone.current.fork({
     name: 'detect',
-    onHandleError: function(parentZD: ZoneDelegate, current: Zone, target: Zone, error: any):
-        boolean {
-          if (error.originalStack && Error === ZoneAwareError) {
-            let frames = error.originalStack.split(/\n/);
-            let runFrame = false, runGuardedFrame = false, runTaskFrame = false;
-            while (frames.length) {
-              let frame = frames.shift();
-              // On safari it is possible to have stack frame with no line number.
-              // This check makes sure that we don't filter frames on name only (must have
-              // line number)
-              if (/:\d+:\d+/.test(frame)) {
-                // Get rid of the path so that we don't accidentally find function name in path.
-                // In chrome the separator is `(` and `@` in FF and safari
-                // Chrome: at Zone.run (zone.js:100)
-                // Chrome: at Zone.run (http://localhost:9876/base/build/lib/zone.js:100:24)
-                // FireFox: Zone.prototype.run@http://localhost:9876/base/build/lib/zone.js:101:24
-                // Safari: run@http://localhost:9876/base/build/lib/zone.js:101:24
-                let fnName: string = frame.split('(')[0].split('@')[0];
-                let frameType = FrameType.transition;
-                if (fnName.indexOf('ZoneAwareError') !== -1) {
-                  if (fnName.indexOf('new ZoneAwareError') !== -1) {
-                    zoneAwareFrame1 = frame;
-                    zoneAwareFrame2 = frame.replace('Error.', '');
-                  } else {
-                    zoneAwareFrame1WithoutNew = frame;
-                    zoneAwareFrame2WithoutNew = frame.replace('Error.', '');
-                  }
-                  blackListedStackFrames[zoneAwareFrame2] = FrameType.blackList;
-                }
-                if ((ZoneAwareError as any)[stackRewrite] && zoneAwareFrame1 &&
-                    zoneAwareFrame1WithoutNew) {
-                  break;
-                }
-                if (fnName.indexOf('runGuarded') !== -1) {
-                  runGuardedFrame = true;
-                } else if (fnName.indexOf('runTask') !== -1) {
-                  runTaskFrame = true;
-                } else if (fnName.indexOf('run') !== -1) {
-                  runFrame = true;
-                } else {
-                  frameType = FrameType.blackList;
-                }
-                blackListedStackFrames[frame] = frameType;
-                // Once we find all of the frames we can stop looking.
-                if (runFrame && runGuardedFrame && runTaskFrame) {
-                  (ZoneAwareError as any)[stackRewrite] = true;
-                  break;
+    onHandleError: function(
+        parentZD: ZoneDelegate, current: Zone, target: Zone, error: any): boolean {
+      if (error.originalStack && Error === ZoneAwareError) {
+        let frames = error.originalStack.split(/\n/);
+        let runFrame = false, runGuardedFrame = false, runTaskFrame = false;
+        while (frames.length) {
+          let frame = frames.shift();
+          // On safari it is possible to have stack frame with no line number.
+          // This check makes sure that we don't filter frames on name only (must have
+          // line number)
+          if (/:\d+:\d+/.test(frame)) {
+            // Get rid of the path so that we don't accidentally find function name in path.
+            // In chrome the separator is `(` and `@` in FF and safari
+            // Chrome: at Zone.run (zone.js:100)
+            // Chrome: at Zone.run (http://localhost:9876/base/build/lib/zone.js:100:24)
+            // FireFox: Zone.prototype.run@http://localhost:9876/base/build/lib/zone.js:101:24
+            // Safari: run@http://localhost:9876/base/build/lib/zone.js:101:24
+            let fnName: string = frame.split('(')[0].split('@')[0];
+            let frameType = FrameType.transition;
+            if (fnName.indexOf('ZoneAwareError') !== -1) {
+              if (fnName.indexOf('new ZoneAwareError') !== -1) {
+                zoneAwareFrame1 = frame;
+                zoneAwareFrame2 = frame.replace('new ZoneAwareError', 'new Error.ZoneAwareError');
+              } else {
+                zoneAwareFrame1WithoutNew = frame;
+                zoneAwareFrame2WithoutNew = frame.replace('Error.', '');
+                if (frame.indexOf('Error.ZoneAwareError') === -1) {
+                  zoneAwareFrame3WithoutNew =
+                      frame.replace('ZoneAwareError', 'Error.ZoneAwareError');
                 }
               }
+              blackListedStackFrames[zoneAwareFrame2] = FrameType.blackList;
+            }
+            if (fnName.indexOf('runGuarded') !== -1) {
+              runGuardedFrame = true;
+            } else if (fnName.indexOf('runTask') !== -1) {
+              runTaskFrame = true;
+            } else if (fnName.indexOf('run') !== -1) {
+              runFrame = true;
+            } else {
+              frameType = FrameType.blackList;
+            }
+            blackListedStackFrames[frame] = frameType;
+            // Once we find all of the frames we can stop looking.
+            if (runFrame && runGuardedFrame && runTaskFrame) {
+              (ZoneAwareError as any)[stackRewrite] = true;
+              break;
             }
           }
-          return false;
         }
+      }
+      return false;
+    }
   }) as Zone;
   // carefully constructor a stack frame which contains all of the frames of interest which
   // need to be detected and blacklisted.
@@ -395,5 +397,6 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   console.log('zoneAwareFrame2', zoneAwareFrame2);
   console.log('zoneAwareFrame1WithoutNew', zoneAwareFrame1WithoutNew);
   console.log('zoneAwareFrame2WithoutNew', zoneAwareFrame2WithoutNew);
+  console.log('zoneAwareFrame3WithoutNew', zoneAwareFrame3WithoutNew);
   Error.stackTraceLimit = originalStackTraceLimit;
 });