merge data, activate & deactivate hooks

Author: yyx990803

src/override.js

@@ -2,6 +2,7 @@ export default function (Vue) {
 
   const _ = Vue.util
 
+  // override Vue's init and destroy process to keep track of router instances
   const init = Vue.prototype._init
   Vue.prototype._init = function (options) {
     const root = options._parent || options.parent || this
@@ -32,4 +33,26 @@ export default function (Vue) {
       destroy.apply(this, arguments)
     }
   }
+
+  // 1.0 only: enable route mixins
+  const strats = Vue.config.optionMergeStrategies
+  const hooksToMergeRE = /^(data|activate|deactivate)$/
+  if (strats) {
+    strats.route = (parentVal, childVal) => {
+      if (!childVal) return parentVal
+      if (!parentVal) return childVal
+      const ret = {}
+      _.extend(ret, parentVal)
+      for (let key in childVal) {
+        let a = ret[key]
+        let b = childVal[key]
+        if (a && hooksToMergeRE.test(key)) {
+          ret[key] = (_.isArray(a) ? a : [a]).concat(b)
+        } else {
+          ret[key] = b
+        }
+      }
+      return ret
+    }
+  }
 }

src/pipeline.js

@@ -88,7 +88,7 @@ export function deactivate (view, transition, next) {
   if (!hook) {
     next()
   } else {
-    transition.callHook(hook, component, next)
+    transition.callHooks(hook, component, next)
   }
 }
 
@@ -226,7 +226,7 @@ export function activate (view, transition, depth, cb, reuse) {
   }
 
   if (activateHook) {
-    transition.callHook(activateHook, component, afterActivate, {
+    transition.callHooks(activateHook, component, afterActivate, {
       cleanup: cleanup
     })
   } else {
@@ -261,9 +261,21 @@ export function reuse (view, transition) {
 
 function loadData (component, transition, hook, cb, cleanup) {
   component.$loadingRouteData = true
-  transition.callHook(hook, component, (data, onError) => {
+  transition.callHooks(hook, component, (data, onError) => {
+    // merge data from multiple data hooks
+    if (Array.isArray(data) && data._needMerge) {
+      data = data.reduce(function (res, obj) {
+        if (isPlainObject(obj)) {
+          Object.keys(obj).forEach(key => {
+            res[key] = obj[key]
+          })
+        }
+        return res
+      }, Object.create(null))
+    }
+    // handle promise sugar syntax
     let promises = []
-    if (Object.prototype.toString.call(data) === '[object Object]') {
+    if (isPlainObject(data)) {
       Object.keys(data).forEach(key => {
         let val = data[key]
         if (isPromise(val)) {
@@ -289,3 +301,7 @@ function loadData (component, transition, hook, cb, cleanup) {
     expectData: true
   })
 }
+
+function isPlainObject (obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]'
+}

src/transition.js

@@ -230,10 +230,11 @@ export default class RouteTransition {
         return
       }
       nextCalled = true
-      if (!cb || transition.aborted) {
+      if (transition.aborted) {
+        cleanup && cleanup()
         return
       }
-      cb(data, onError)
+      cb && cb(data, onError)
     }
 
     // expose a clone of the transition object, so that each
@@ -263,7 +264,7 @@ export default class RouteTransition {
       if (typeof res === 'boolean') {
         res ? next() : abort()
       } else if (resIsPromise) {
-        res.then(function (ok) {
+        res.then((ok) => {
           ok ? next() : abort()
         }, onError)
       } else if (!hook.length) {
@@ -275,6 +276,36 @@ export default class RouteTransition {
       next(res)
     }
   }
+
+  /**
+   * Call a single hook or an array of async hooks in series.
+   *
+   * @param {Array} hooks
+   * @param {*} context
+   * @param {Function} cb
+   * @param {Object} [options]
+   */
+
+  callHooks (hooks, context, cb, options) {
+    if (Array.isArray(hooks)) {
+      let res = []
+      res._needMerge = true
+      let onError
+      this.runQueue(hooks, (hook, _, next) => {
+        if (!this.aborted) {
+          this.callHook(hook, context, (r, onError) => {
+            if (r) res.push(r)
+            onError = onError
+            next()
+          }, options)
+        }
+      }, () => {
+        cb(res, onError)
+      })
+    } else {
+      this.callHook(hooks, context, cb, options)
+    }
+  }
 }
 
 function isPlainOjbect (val) {