fix #574, captureStackTrace will have additional stackframe from Zone will break binding.js (#575)

JiaLiPassion · mhevery · commit 41f530685e12 · 2017-01-11T16:11:18.000-08:00
diff --git a/lib/zone.ts b/lib/zone.ts
@@ -1423,7 +1423,9 @@ const Zone: ZoneType = (function(global: any) {
 
   if (NativeError.hasOwnProperty('captureStackTrace')) {
     Object.defineProperty(ZoneAwareError, 'captureStackTrace', {
-      value: function(targetObject: Object, constructorOpt?: Function) {
+      // add named function here because we need to remove this
+      // stack frame when prepareStackTrace below
+      value: function zoneCaptureStackTrace(targetObject: Object, constructorOpt?: Function) {
         NativeError.captureStackTrace(targetObject, constructorOpt);
       }
     });
@@ -1434,7 +1436,23 @@ const Zone: ZoneType = (function(global: any) {
       return NativeError.prepareStackTrace;
     },
     set: function(value) {
-      return NativeError.prepareStackTrace = value;
+      if (!value || typeof value !== 'function') {
+        return NativeError.prepareStackTrace = value;
+      }
+      return NativeError.prepareStackTrace = function(error, structuredStackTrace) {
+        // remove additional stack information from ZoneAwareError.captureStackTrace
+        if (structuredStackTrace) {
+          for (let i = 0; i < structuredStackTrace.length; i++) {
+            const st = structuredStackTrace[i];
+            // remove the first function which name is value
+            if (st.getFunctionName() === 'zoneCaptureStackTrace') {
+              structuredStackTrace.splice(i, 1);
+              break;
+            }
+          }
+        }
+        return value.apply(this, [error, structuredStackTrace]);
+      };
     }
   });
 
diff --git a/test/node/Error.spec.ts b/test/node/Error.spec.ts
@@ -25,4 +25,16 @@ describe('ZoneAwareError', () => {
     Error.captureStackTrace(obj);
     expect(obj.stack[0].getFileName()).not.toBeUndefined();
   });
+
+  it('should not add additional stacktrace from Zone when use prepareStackTrace', () => {
+    (<any>Error).prepareStackTrace = function(error, stack) {
+      return stack;
+    };
+    let obj: any = new Object();
+    Error.captureStackTrace(obj);
+    expect(obj.stack.length).not.toBe(0);
+    obj.stack.forEach(function(st) {
+      expect(st.getFunctionName()).not.toEqual('zoneCaptureStackTrace');
+    });
+  });
 });
