Add Router.setConfig and Router.useRoutes (#147)

* Update yarn.lock

* Add Router.setConfig and Router.useRoutes

* Add docs

Author: caseyWebb

docs/router.md

@@ -27,12 +27,18 @@ Top-most router
 #### Router.tail
 Deepest router
 
+#### Router.setConfig({ base = '', hashbang = false })
+Sets router configuration
+
 #### Router.use(fn)
 Convenience function for `Router.middleware.push(fn)`
 
 #### Router.usePlugin(fn)
 Convenience function for `Router.plugins.push(fn)`
 
+#### Router.useRoutes(routes)
+Convenience function for `Object.assign(Router.routes, routes)`
+
 #### Router.update(path, [push = true], [options = { push: true, force: false, with: {} }])
 Convenience function for `Router.get(0).update(...)`
 

src/route.js

@@ -114,4 +114,8 @@ export default class Route {
 
     await routeBeforeRender
   }
+
+  static createRoutes(routes) {
+    return Object.entries(routes).map(([r, m]) => new Route(r, m))
+  }
 }

src/router.js

@@ -14,28 +14,40 @@ class Router {
   constructor(params) {
     this.component = ko.observable()
     this.isNavigating = ko.observable(true)
+    this.routes = Route.createRoutes(params.routes || {})
 
-    Router.link(this, params)
-
-    this.passthrough = params
+    Router.link(this)
 
     if (this.isRoot) {
+      Router.setConfig(params)
+      this.routes.push(...Route.createRoutes(Router.routes))
       document.addEventListener(events.click, Router.onclick)
       window.addEventListener(events.popstate, Router.onpopstate)
-    }
-
-    const routes = Object.assign(this.isRoot ? Router.routes : {}, params.routes)
-    this.routes = Object.entries(routes).map(([r, m]) => new Route(r, m))
-    if (!this.isRoot && this.$parent.ctx.route.children) {
+    } else if (this.$parent.ctx.route.children) {
       this.routes.push(...this.$parent.ctx.route.children)
     }
-    delete params.routes
+
+    this.passthrough = Object.entries(params).reduce((accum, [k, v]) =>
+      k === 'base' || k === 'hashbang' || k === 'routes'
+        ? accum
+        : Object.assign(accum, { [k]: v }),
+      {})
 
     this.update(this.getPathFromLocation(), false)
   }
 
-  static async update(...args) {
-    return await routers[0].update(...args)
+  get base() {
+    return this.isRoot
+      ? (Router.config.hashbang ? '/#!' : '') + Router.config.base
+      : this.$parent.base + this.$parent.ctx.pathname
+  }
+
+  get $parent() {
+    return routers[this.depth - 1]
+  }
+
+  get $child() {
+    return routers[this.depth + 1]
   }
 
   async update(url, args) {
@@ -152,6 +164,15 @@ class Router {
     }
   }
 
+  static setConfig({ base, hashbang }) {
+    if (base) {
+      Router.config.base = base
+    }
+    if (hashbang) {
+      Router.config.hashbang = hashbang
+    }
+  }
+
   static use(...fns) {
     Router.middleware.push(...fns)
   }
@@ -160,6 +181,10 @@ class Router {
     Router.plugins.push(...fns)
   }
 
+  static useRoutes(routes) {
+    Object.assign(Router.routes, routes)
+  }
+
   static get(i) {
     return routers[i]
   }
@@ -172,32 +197,15 @@ class Router {
     return routers[routers.length - 1]
   }
 
-  static link(router, params) {
-    routers.push(router)
-    router.depth = routers.length - 1
+  static async update(...args) {
+    return await routers[0].update(...args)
+  }
+
+  static link(router) {
+    router.depth = routers.length
     router.isRoot = router.depth === 0
+    routers.push(router)
     router.$root = routers[0]
-
-    if (router.isRoot) {
-      if (params.base) {
-        Router.config.base = params.base
-        delete params.base
-      }
-      router.base = Router.config.base
-      if (params.hashbang) {
-        Router.config.hashbang = params.hashbang
-        delete params.hashbang
-      }
-      if (Router.config.hashbang) {
-        router.base += '/#!'
-      }
-    } else {
-      const $parent = routers[router.depth - 1]
-      const { ctx: { pathname }, base } = $parent
-      router.$parent = $parent
-      router.$parent.$child = router
-      router.base = base + pathname
-    }
   }
 
   static unlink() {

test/routing/index.js

@@ -39,12 +39,12 @@ ko.components.register('routing', {
         r
       ])
 
-      Router.routes = mapValues({
+      Router.useRoutes(mapValues({
         ..._static
       }, (r) => [
         (ctx) => extend(ctx, { t, next }),
         r
-      ])
+      ]))
 
       next()
     }