Introduce route class

Author: quantuminformation

demo/typescriptImport/index.ts

@@ -1,17 +1,15 @@
 import WarpRouter from 'warp-router'
 import {Configuration} from "../../src/Configuration";
+import {Route} from "../../src/Route";
 
 function createDemo() {
-  let routes: Map<string,() => string> = new Map()
-  routes.set("", function () {
+  let routes: Map<string,Route> = new Map()
+  routes.set("", new Route(function () {
     return "This is the home page"
-  })
-  routes.set("#page1", function () {
-    return "This is page 1"
-  })
-  routes.set("#page2", function () {
-    return "This is page 2"
-  })
+  }))
+  routes.set("#page1", new Route(function () {
+    return "This uses a custom context"
+  }))
 
   const configuration = new Configuration()
   configuration.defaultRoute = ""

demo/typescriptImport/package.json

@@ -10,5 +10,8 @@
     "typescript": "^2.1.4",
     "webpack": "^2.2.0",
     "webpack-build-notifier": "^0.1.13"
+  },
+  "dependencies": {
+    "money-input": "0.0.1"
   }
 }

src/Route.ts

@@ -0,0 +1,9 @@
+export type RoutingFunction = ((context?: any) => (void | string))
+
+export class Route {
+  cacheResult: false
+
+  constructor(public routingFunction: RoutingFunction, public context= null) {
+
+  }
+}

src/WarpRouter.ts

@@ -1,15 +1,16 @@
 import {Configuration} from "./Configuration";
+import {Route} from "./Route";
 export default class WarpRouter {
 
   private hostElement: HTMLElement
 
   /**
    *
    * @param selector where the router will be embedded
-   * @param routes
+   * @param routes can take a function that will generate a string
    */
   constructor(public selector: string,
-              public routes: Map<string,() => string>,
+              public routes: Map<string, Route>,
               public configuration: Configuration = new Configuration()) {
 
     this.hostElement = <HTMLElement> document.querySelector(selector)
@@ -21,10 +22,13 @@ export default class WarpRouter {
   }
 
 
-  applyRouteContentFunction(route: string) {
+  applyRouteContentFunction(routeString: string) {
     try {
-      const contentFunction = this.routes.get(route)
-      this.hostElement.innerHTML = contentFunction()
+      const route: Route = this.routes.get(routeString)
+      const result = route.routingFunction()
+      if (typeof result === "string") {
+        this.hostElement.innerHTML = result
+      }
     }
     catch (e) {
       throw new Error("Unrecognised route")