add router.addRoutes() feature

Author: yyx990803

src/components/link.js

@@ -5,6 +5,7 @@ import { _Vue } from '../install'
 
 // work around weird flow bug
 const toTypes: Array<Function> = [String, Object]
+const eventTypes: Array<Function> = [String, Array]
 
 export default {
   name: 'router-link',
@@ -22,7 +23,7 @@ export default {
     replace: Boolean,
     activeClass: String,
     event: {
-      type: [String, Array],
+      type: eventTypes,
       default: 'click'
     }
   },

src/components/view.js

@@ -75,9 +75,7 @@ function resolveProps (route, config) {
     case 'function':
       return config(route)
     case 'boolean':
-      if (config) {
-        return route.params
-      }
+      return config ? route.params : undefined
     default:
       warn(false, `props in "${route.path}" is a ${typeof config}, expecting an object, function or boolean.`)
   }

src/history/abstract.js

@@ -38,6 +38,11 @@ export class AbstractHistory extends History {
     })
   }
 
+  getCurrentLocation () {
+    const current = this.stack[this.stack.length - 1]
+    return current ? current.fullPath : '/'
+  }
+
   ensureURL () {
     // noop
   }

src/history/base.js

@@ -19,6 +19,7 @@ export class History {
   push: (loc: RawLocation) => void;
   replace: (loc: RawLocation) => void;
   ensureURL: (push?: boolean) => void;
+  getCurrentLocation: () => string;
 
   constructor (router: VueRouter, base: ?string) {
     this.router = router
@@ -44,7 +45,11 @@ export class History {
   confirmTransition (route: Route, onComplete: Function, onAbort?: Function) {
     const current = this.current
     const abort = () => { onAbort && onAbort() }
-    if (isSameRoute(route, current)) {
+    if (
+      isSameRoute(route, current) &&
+      // in the case the route map has been dynamically appended to
+      route.matched.length === current.matched.length
+    ) {
       this.ensureURL()
       return abort()
     }

src/history/hash.js

@@ -56,6 +56,10 @@ export class HashHistory extends History {
       push ? pushHash(current) : replaceHash(current)
     }
   }
+
+  getCurrentLocation () {
+    return getHash()
+  }
 }
 
 function ensureSlash (): boolean {

src/history/html5.js

@@ -70,6 +70,10 @@ export class HTML5History extends History {
     }
   }
 
+  getCurrentLocation (): string {
+    return getLocation(this.base)
+  }
+
   handleScroll (to: Route, from: Route, isPop: boolean) {
     const router = this.router
     if (!router.app) {

src/index.js

@@ -2,13 +2,14 @@
 
 import { install } from './install'
 import { createMatcher } from './create-matcher'
-import { HashHistory, getHash } from './history/hash'
-import { HTML5History, getLocation } from './history/html5'
+import { HashHistory } from './history/hash'
+import { HTML5History } from './history/html5'
 import { AbstractHistory } from './history/abstract'
 import { inBrowser, supportsHistory } from './util/dom'
 import { assert } from './util/warn'
 import { cleanPath } from './util/path'
 import { normalizeLocation } from './util/location'
+import { START } from './util/route'
 
 export default class VueRouter {
   static install: () => void;
@@ -51,7 +52,9 @@ export default class VueRouter {
         this.history = new AbstractHistory(this, options.base)
         break
       default:
-        process.env.NODE_ENV !== 'production' && assert(false, `invalid mode: ${mode}`)
+        if (process.env.NODE_ENV !== 'production') {
+          assert(false, `invalid mode: ${mode}`)
+        }
     }
   }
 
@@ -71,14 +74,18 @@ export default class VueRouter {
     const history = this.history
 
     if (history instanceof HTML5History) {
-      history.transitionTo(getLocation(history.base))
+      history.transitionTo(history.getCurrentLocation())
     } else if (history instanceof HashHistory) {
       const setupHashListener = () => {
         window.addEventListener('hashchange', () => {
           history.onHashChange()
         })
       }
-      history.transitionTo(getHash(), setupHashListener, setupHashListener)
+      history.transitionTo(
+        history.getCurrentLocation(),
+        setupHashListener,
+        setupHashListener
+      )
     }
 
     history.listen(route => {
@@ -148,6 +155,14 @@ export default class VueRouter {
       href
     }
   }
+
+  addRoutes (routes: Array<RouteConfig>) {
+    routes = this.options.routes = (this.options.routes || []).concat(routes)
+    this.match = createMatcher(routes)
+    if (this.history.current !== START) {
+      this.history.transitionTo(this.history.getCurrentLocation())
+    }
+  }
 }
 
 function createHref (base: string, fullPath: string, mode) {

test/unit/specs/add-routes.spec.js

@@ -0,0 +1,34 @@
+import Router from '../../../src/index'
+
+describe('router.addRoutes', () => {
+  it('should work', () => {
+    const router = new Router({
+      mode: 'abstract',
+      routes: [
+        { path: '/a', component: { name: 'A' }}
+      ]
+    })
+
+    router.push('/a')
+    let components = router.getMatchedComponents()
+    expect(components.length).toBe(1)
+    expect(components[0].name).toBe('A')
+
+    router.push('/b')
+    components = router.getMatchedComponents()
+    expect(components.length).toBe(0)
+
+    router.addRoutes([
+      { path: '/b', component: { name: 'B' }}
+    ])
+    components = router.getMatchedComponents()
+    expect(components.length).toBe(1)
+    expect(components[0].name).toBe('B')
+
+    // make sure it preserves previous routes
+    router.push('/a')
+    components = router.getMatchedComponents()
+    expect(components.length).toBe(1)
+    expect(components[0].name).toBe('A')
+  })
+})

types/router.d.ts

@@ -28,6 +28,7 @@ declare class VueRouter {
   back (): void;
   forward (): void;
   getMatchedComponents (to?: RawLocation): Component[];
+  addRoutes (routes: RouteConfig[]): void;
   resolve (to: RawLocation, current?: Route, append?: boolean): {
     normalizedTo: Location;
     resolved: Route;