refactor: improve errorCaptured propagation behavior

Author: yyx990803

Diff for: src/core/util/error.js

@@ -8,12 +8,15 @@ export function handleError (err: Error, vm: any, info: string) {
   if (vm) {
     let cur = vm
     while ((cur = cur.$parent)) {
-      if (cur.$options.errorCaptured) {
-        try {
-          const propagate = cur.$options.errorCaptured.call(cur, err, vm, info)
-          if (!propagate) return
-        } catch (e) {
-          globalHandleError(e, cur, 'errorCaptured hook')
+      const hooks = cur.$options.errorCaptured
+      if (hooks) {
+        for (let i = 0; i < hooks.length; i++) {
+          try {
+            const capture = hooks[i].call(cur, err, vm, info) === false
+            if (capture) return
+          } catch (e) {
+            globalHandleError(e, cur, 'errorCaptured hook')
+          }
         }
       }
     }

Diff for: src/shared/constants.js

@@ -16,5 +16,6 @@ export const LIFECYCLE_HOOKS = [
   'beforeDestroy',
   'destroyed',
   'activated',
-  'deactivated'
+  'deactivated',
+  'errorCaptured'
 ]

Diff for: test/unit/features/options/errorCaptured.spec.js

@@ -31,8 +31,8 @@ describe('Options errorCaptured', () => {
     }).$mount()
 
     expect(spy).toHaveBeenCalledWith(err, child, 'created hook')
-    // should not propagate by default
-    expect(globalSpy).not.toHaveBeenCalled()
+    // should propagate by default
+    expect(globalSpy).toHaveBeenCalledWith(err, child, 'created hook')
   })
 
   it('should be able to render the error in itself', done => {
@@ -67,7 +67,7 @@ describe('Options errorCaptured', () => {
     }).then(done)
   })
 
-  it('should propagate to global handler when returning true', () => {
+  it('should not propagate to global handler when returning true', () => {
     const spy = jasmine.createSpy()
 
     let child
@@ -84,14 +84,14 @@ describe('Options errorCaptured', () => {
     new Vue({
       errorCaptured (err, vm, info) {
         spy(err, vm, info)
-        return true
+        return false
       },
       render: h => h(Child, {})
     }).$mount()
 
     expect(spy).toHaveBeenCalledWith(err, child, 'created hook')
-    // should propagate
-    expect(globalSpy).toHaveBeenCalledWith(err, child, 'created hook')
+    // should not propagate
+    expect(globalSpy).not.toHaveBeenCalled()
   })
 
   it('should propagate to global handler if itself throws error', () => {
@@ -118,4 +118,95 @@ describe('Options errorCaptured', () => {
     expect(globalSpy).toHaveBeenCalledWith(err, child, 'created hook')
     expect(globalSpy).toHaveBeenCalledWith(err2, vm, 'errorCaptured hook')
   })
+
+  it('should work across multiple parents, mixins and extends', () => {
+    const calls = []
+
+    const Child = {
+      created () {
+        throw new Error('child')
+      },
+      render () {}
+    }
+
+    const ErrorBoundaryBase = {
+      errorCaptured () {
+        calls.push(1)
+      }
+    }
+
+    const mixin = {
+      errorCaptured () {
+        calls.push(2)
+      }
+    }
+
+    const ErrorBoundaryExtended = {
+      extends: ErrorBoundaryBase,
+      mixins: [mixin],
+      errorCaptured () {
+        calls.push(3)
+      },
+      render: h => h(Child)
+    }
+
+    Vue.config.errorHandler = () => {
+      calls.push(5)
+    }
+
+    new Vue({
+      errorCaptured () {
+        calls.push(4)
+      },
+      render: h => h(ErrorBoundaryExtended)
+    }).$mount()
+
+    expect(calls).toEqual([1, 2, 3, 4, 5])
+  })
+
+  it('should work across multiple parents, mixins and extends with return false', () => {
+    const calls = []
+
+    const Child = {
+      created () {
+        throw new Error('child')
+      },
+      render () {}
+    }
+
+    const ErrorBoundaryBase = {
+      errorCaptured () {
+        calls.push(1)
+      }
+    }
+
+    const mixin = {
+      errorCaptured () {
+        calls.push(2)
+      }
+    }
+
+    const ErrorBoundaryExtended = {
+      extends: ErrorBoundaryBase,
+      mixins: [mixin],
+      errorCaptured () {
+        calls.push(3)
+        return false
+      },
+      render: h => h(Child)
+    }
+
+    Vue.config.errorHandler = () => {
+      calls.push(5)
+    }
+
+    new Vue({
+      errorCaptured () {
+        calls.push(4)
+      },
+      render: h => h(ErrorBoundaryExtended)
+    }).$mount()
+
+    expect(calls).toEqual([1, 2, 3])
+  })
 })