refactor: fix extended error usage

Author: posva

src/history/abstract.js

@@ -3,6 +3,7 @@
 import type Router from '../index'
 import { History } from './base'
 import { NavigationDuplicated } from './errors'
+import { isExtendedError } from '../util/warn'
 
 export class AbstractHistory extends History {
   index: number
@@ -15,18 +16,26 @@ export class AbstractHistory extends History {
   }
 
   push (location: RawLocation, onComplete?: Function, onAbort?: Function) {
-    this.transitionTo(location, route => {
-      this.stack = this.stack.slice(0, this.index + 1).concat(route)
-      this.index++
-      onComplete && onComplete(route)
-    }, onAbort)
+    this.transitionTo(
+      location,
+      route => {
+        this.stack = this.stack.slice(0, this.index + 1).concat(route)
+        this.index++
+        onComplete && onComplete(route)
+      },
+      onAbort
+    )
   }
 
   replace (location: RawLocation, onComplete?: Function, onAbort?: Function) {
-    this.transitionTo(location, route => {
-      this.stack = this.stack.slice(0, this.index).concat(route)
-      onComplete && onComplete(route)
-    }, onAbort)
+    this.transitionTo(
+      location,
+      route => {
+        this.stack = this.stack.slice(0, this.index).concat(route)
+        onComplete && onComplete(route)
+      },
+      onAbort
+    )
   }
 
   go (n: number) {
@@ -42,7 +51,7 @@ export class AbstractHistory extends History {
         this.updateRoute(route)
       },
       err => {
-        if (err instanceof NavigationDuplicated) {
+        if (isExtendedError(NavigationDuplicated, err)) {
           this.index = targetIndex
         }
       }

src/history/base.js

@@ -4,7 +4,7 @@ import { _Vue } from '../install'
 import type Router from '../index'
 import { inBrowser } from '../util/dom'
 import { runQueue } from '../util/async'
-import { warn, isError } from '../util/warn'
+import { warn, isError, isExtendedError } from '../util/warn'
 import { START, isSameRoute } from '../util/route'
 import {
   flatten,
@@ -92,9 +92,11 @@ export class History {
       // When the user navigates through history through back/forward buttons
       // we do not want to throw the error. We only throw it if directly calling
       // push/replace. That's why it's not included in isError
-      if (!(err instanceof NavigationDuplicated) && isError(err)) {
+      if (!isExtendedError(NavigationDuplicated, err) && isError(err)) {
         if (this.errorCbs.length) {
-          this.errorCbs.forEach(cb => { cb(err) })
+          this.errorCbs.forEach(cb => {
+            cb(err)
+          })
         } else {
           warn(false, 'uncaught error during route navigation:')
           console.error(err)

src/history/errors.js

@@ -1,6 +1,6 @@
 export class NavigationDuplicated extends Error {
   constructor () {
     super('Navigating to current location is not allowed')
-    this.name = this.constructor.name
+    this.name = 'NavigationDuplicated'
   }
 }

src/util/warn.js

@@ -15,3 +15,7 @@ export function warn (condition: any, message: string) {
 export function isError (err: any): boolean {
   return Object.prototype.toString.call(err).indexOf('Error') > -1
 }
+
+export function isExtendedError (constructor: Function, err: any): boolean {
+  return err instanceof constructor || (err && err.name === constructor.name)
+}

test/unit/specs/node.spec.js

@@ -59,7 +59,8 @@ describe('Usage in Node', () => {
     router.replace('/bar', success, error)
     expect(success).toHaveBeenCalledTimes(4)
     expect(error).toHaveBeenCalledTimes(0)
-    spyOn(console, 'warn')
+
+    expect(router.history.current.path).toBe('/bar')
     router.back()
     expect(router.history.current.path).toBe('/bar')
     router.back()