add lastState property

Author: spielcrypto

package.json

@@ -30,7 +30,7 @@
         "navigo": "^7.1.1",
         "spiel-render": "^1.0.1",
         "typescript": "^2.7.2",
-        "ultradom": "git+ssh://[email protected]/jorgebucaran/ultradom.git#options"
+        "ultradom": "^2.2.0"
     },
     "devDependencies": {
         "@types/chai": "^4.1.2",

src/router.ts

@@ -53,7 +53,12 @@ export class Router {
      * @param absolute True allow to pass absolute path
      * @example router.go("http://localhost/example", true)
      */
-    public go(path: string, absolute?: boolean) {
+    public go(path: string, state?: object | null, absolute?: boolean) {
+        if (state) {
+            path = `${(path.indexOf("?") !== -1) ?
+                `${path}&` :
+                `${path}?`}state=${encodeURIComponent(JSON.stringify(state))}`;
+        }
         this.router.navigate(path, absolute);
     }
 
@@ -115,13 +120,38 @@ export class Router {
     private setPatch(route: IRouters, params: object, query: string) {
         const page = route.page;
         const state: State = {};
+        if (query) {
+            state.lastState = this.checkState(query);
+        }
         Object.assign(state, page.state);
         state.params = params;
-        state.query = query;
+        state.query = this.checkQuery(query);
         state.defaultProps = route.defaultProps || this.defaultProps;
         render(page.view, state, this.element);
     }
 
+    private checkQuery(query: string) {
+        if (query && query.indexOf("&state=") !== -1) {
+            query = query.substr(0, query.indexOf("&state="));
+        }
+
+        return query;
+    }
+
+    private checkState(query: string) {
+        let state: string | object = "";
+        const index = query.indexOf("state=");
+
+        if (index !== -1 ) {
+            state = query.substr(index);
+            state = decodeURIComponent(state);
+            state = state.replace("state=", "");
+            state = JSON.parse(state);
+        }
+
+        return state;
+    }
+
     private checkNotFound() {
         this.router.notFound(() => {
             if (this.configRouters.notFound && this.configRouters.notFoundPath &&

test/Router/Router.spec.ts

@@ -120,7 +120,7 @@ describe("Router", () => {
       setTimeout(() => {
         const title = document.getElementsByTagName("h1")[0];
         const defaultProps = document.getElementsByTagName("h2")[0];
-        expect(title.textContent).has.to.be.equal("Really test 4 state=good");
+        expect(title.textContent).has.to.be.equal("Really test 4 query=really good");
         expect(defaultProps.textContent).has.to.be.equal("default");
         srouter.go("/home");
         done();
@@ -241,7 +241,7 @@ describe("Router", () => {
       });
       srouter.router.resume();
       srouter.resolve();
-      srouter.go("http://localhost:9876/", true);
+      srouter.go("http://localhost:9876/", null, true);
       setTimeout(() => {
         const element = document.getElementsByTagName("h1")[0];
         expect(element.textContent).has.to.be.equal("Hello world");

test/Router/mocks/TestPage1.tsx

@@ -17,7 +17,7 @@ export class TestPage1 {
                 >go to child</button>
                 <button id="grandchild"
                     onclick = {() => {
-                        srouter.go("/home/child/2/child2/test?state=good");
+                        srouter.go("/home/child/2/child2/test?query=really", {text: "good"});
                     }}
                 >go to child 2</button>
                 <button id="brother"

test/Router/mocks/TestPage3.tsx

@@ -8,7 +8,7 @@ export class TestPage3 {
     public view(state: State): JSXElements {
         return (
             <div>
-                <h1>{state.title} {state.params.word} {state.params.number} {state.query}</h1>
+                <h1>{state.title} {state.params.word} {state.params.number} {state.query} {state.lastState.text}</h1>
                 <h2>{state.defaultProps}</h2>
                 <button
                     onclick = {() => {