hooks: treat hooks with no argument and non-promise return values as synchronous

Author: yyx990803

src/transition.js

@@ -184,6 +184,9 @@ export default class RouteTransition {
    * Call a user provided route transition hook and handle
    * the response (e.g. if the user returns a promise).
    *
+   * If the user neither expects an argument nor returns a
+   * promise, the hook is assumed to be synchronous.
+   *
    * @param {Function} hook
    * @param {*} [context]
    * @param {Function} [cb]
@@ -263,10 +266,12 @@ export default class RouteTransition {
         res.then(function (ok) {
           ok ? next() : abort()
         }, onError)
+      } else if (!hook.length) {
+        next(res)
       }
     } else if (resIsPromise) {
       res.then(next, onError)
-    } else if (expectData && isPlainOjbect(res)) {
+    } else if ((expectData && isPlainOjbect(res)) || !hook.length) {
       next(res)
     }
   }

test/unit/lib/pipeline-test-util.js

@@ -24,14 +24,26 @@ exports.test = function (configs, cb) {
     var config = configs[route]
     Object.keys(config).forEach(function (hook) {
       var fn = config[hook]
-      config[hook] = function (transition) {
-        var event = route + '.' + hook
-        calls.push(event)
-        var res = typeof fn === 'function'
-          ? fn(transition)
-          : fn
-        emitter.emit(event)
-        return res
+      if (fn.length) {
+        config[hook] = function (transition) {
+          var event = route + '.' + hook
+          calls.push(event)
+          var res = typeof fn === 'function'
+            ? fn(transition)
+            : fn
+          emitter.emit(event)
+          return res
+        }
+      } else {
+        config[hook] = function () {
+          var event = route + '.' + hook
+          calls.push(event)
+          var res = typeof fn === 'function'
+            ? fn()
+            : fn
+          emitter.emit(event)
+          return res
+        }
       }
     })
   })

test/unit/specs/pipeline/activate.js

@@ -24,6 +24,21 @@ describe('activate', function () {
     })
   })
 
+  it('sync (no arg)', function (done) {
+    test({
+      a: {
+        activate: function () {
+          // noop
+        }
+      }
+    }, function (router, calls, emitter) {
+      router.go('/a')
+      expect(router.app.$el.textContent).toBe('A ')
+      assertCalls(calls, ['a.activate'])
+      done()
+    })
+  })
+
   it('async', function (done) {
     test({
       a: {

test/unit/specs/pipeline/deactivate.js

@@ -21,6 +21,23 @@ describe('deactivate', function () {
     })
   })
 
+  it('sync (no arg)', function (done) {
+    test({
+      a: {
+        deactivate: function () {
+          // noop
+        }
+      }
+    }, function (router, calls, emitter) {
+      router.go('/a')
+      expect(router.app.$el.textContent).toBe('A ')
+      router.go('/b')
+      expect(router.app.$el.textContent).toBe('')
+      assertCalls(calls, ['a.deactivate'])
+      done()
+    })
+  })
+
   it('async', function (done) {
     test({
       a: {