refactor

Author: olegman

src/index.ts

@@ -4,6 +4,6 @@ import Link from './link';
 import RootRoute from './root-route';
 import Middleware from './middleware';
 import Redirect from './redirect';
-import { RouterError } from 'router-async';
+import { RouterError, Context } from 'router-async';
 
-export { Router, Route, Link, RootRoute, Middleware, Redirect, RouterError };
+export { Router, Route, Link, RootRoute, Middleware, Redirect, RouterError, Context };

src/middleware.tsx

@@ -20,6 +20,7 @@ export default class Middleware extends React.Component<Props, State> {
         action: React.PropTypes.func
     };
     render() {
-        return React.Children.only(this.props.children);
+        const childs = Array.isArray(this.props.children ? this.props.children : [this.props.children]);
+        return React.Children.only(childs);
     }
 }

src/router.tsx

@@ -1,4 +1,4 @@
-import RouterAsync from 'router-async';
+import { Router as RouterAsync, Context } from 'router-async';
 import * as React from 'react';
 import { deepMap } from './helpers';
 
@@ -43,11 +43,16 @@ export default class Router extends React.Component<Props, State> {
         this.router = props.router;
         this.history = props.history;
     }
-    static async init({ path, routes, hooks, ctx = {} }) {
+    static async init({ path, routes, hooks, ctx = new Context() }) {
         const plainRoutes = Router.buildRoutes(routes);
         const router = new RouterAsync({ routes: plainRoutes, hooks });
-        const { result, redirect, status } = await router.resolve({ path, ctx });
+        const { route, status, params, redirect, result } = await router.resolve({ path, ctx });
         let props = {
+            path,
+            route,
+            status,
+            params,
+            redirect,
             ctx
         };
         return {
@@ -57,7 +62,7 @@ export default class Router extends React.Component<Props, State> {
             status,
             router,
             props,
-            callback: this.makeCallback(router)
+            callback: this.makeCallback(router, { path, route, status, params, redirect, result, ctx })
         }
     }
     static buildRoutes(routes) {
@@ -103,7 +108,7 @@ export default class Router extends React.Component<Props, State> {
     get location() {
         return this.state.location;
     }
-    async navigate(path, ctx = {}) {
+    async navigate(path, ctx = new Context()) {
         try {
             const { redirect } = await this.router.match({ path, ctx });
             if (redirect) {
@@ -112,25 +117,29 @@ export default class Router extends React.Component<Props, State> {
                 this.history.push(path);
             }
         } catch (error) {
-            if (this.props.errorHandler) {
-                this.props.errorHandler(error, this);
-            } else {
+            this.history.push(path);
+            if (!this.props.errorHandler) {
                 console.error('Match Error', path, error);
                 throw error;
             }
         }
     }
     private _locationChanged = async (location, action) => {
         try {
-            const { result, ctx } = await this.router.resolve({ path: location.pathname });
+            const { path, route, status, params, redirect, result, ctx } = await this.router.resolve({ path: location.pathname });
             let props = {
+                path,
+                route,
+                status,
+                params,
+                redirect,
                 ctx
             };
             this.setState({
                 Component: result,
                 location,
                 props
-            }, Router.makeCallback(this.router));
+            }, Router.makeCallback(this.router, { path, route, status, params, redirect, result, ctx }));
         } catch (error) {
             if (this.props.errorHandler) {
                 this.props.errorHandler(error, this);

yarn.lock

@@ -90,9 +90,9 @@ react@^15.3.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-router-async@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.0.1.tgz#884b5bcbdffbd23bf4a202ab6a99b3a0bb37bcde"
+router-async:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.0.4.tgz#290575273b9ee4206ed6b587221d3a23d5116ef1"
   dependencies:
     path-to-regexp "^1.6.0"