@common-stack/client-react 0.6.1-alpha.3 → 3.0.1-alpha.0

package/lib/route/react-navigation/get-navigation-utils.test.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const get_navigation_utils_1 = require("./get-navigation-utils");
 const stack_1 = require("@react-navigation/stack");
 const bottom_tabs_1 = require("@react-navigation/bottom-tabs");
-const react_client_feature_native_1 = require("../../connector/react-client-feature.native");
+const connector_native_1 = require("../../connector/connector.native");
 const MyComponent = () => { };
 describe('getRoutes utility with basic routes', () => {
     const routerConfig1 = {
@@ -91,15 +91,25 @@ describe('getRoutes utility with basic routes', () => {
             exact: false,
             container: (0, stack_1.createStackNavigator)(),
             name: 'MainStack',
+            props: {
+                initialRouteName: 'Guest', screenOptions: {
+                    headerShown: false,
+                },
+            },
+        },
+        ['/l']: {
+            container: (0, bottom_tabs_1.createBottomTabNavigator)(),
+            exact: false,
+            name: 'Layout',
             props: {
                 initialRouteName: 'Guest',
                 screenOptions: {
                     headerShown: false,
+                    // tabBarIcon: ({ color }) => <Ionicons name="person" size={24} color={color} />,
                 },
             },
         },
-        ['//:guest']: {
-            container: (0, bottom_tabs_1.createBottomTabNavigator)(),
+        ['/l/:guest']: {
             exact: false,
             name: 'Guest',
             props: {
@@ -111,10 +121,9 @@ describe('getRoutes utility with basic routes', () => {
                 },
             },
         },
-        ['//:guest/home']: {
+        ['/l/:guest/home']: {
             name: 'Home',
             props: {
-                initialParams: {},
                 component: MyComponent,
                 options: {
                     headerShown: true,
@@ -124,7 +133,7 @@ describe('getRoutes utility with basic routes', () => {
                 },
             },
         },
-        ['//:guest/home/:about']: {
+        ['/l/:guest/home/:about']: {
             exact: false,
             container: (0, stack_1.createStackNavigator)(),
             name: 'About',
@@ -132,7 +141,7 @@ describe('getRoutes utility with basic routes', () => {
                 initialRouteName: 'Hello',
             },
         },
-        ['//:guest/home/:about/info']: {
+        ['/l/:guest/home/:about/info']: {
             name: 'Info',
             props: {
                 initialParams: {},
@@ -143,21 +152,31 @@ describe('getRoutes utility with basic routes', () => {
             },
         },
     };
-    it('getNavigation ', () => {
+    const routerConfig3 = {};
+    xit('getNavigation ', () => {
         const Navigation = (0, get_navigation_utils_1.getNavigation)('/', routerConfig1);
         expect(Navigation).toMatchSnapshot();
     });
-    it('with feature', () => {
-        const feature = new react_client_feature_native_1.ReactClientFeature({ routeConfigIn: [routerConfig1] });
-        const Navigation = feature.getConfiguredRoutes('/');
+    it('get sorted navigation with add params', () => {
+        const navigation = (0, get_navigation_utils_1.getSortedNavigations)('/', routerConfig2);
+        expect(navigation).toMatchSnapshot();
+    });
+    it('get ', () => {
+    });
+    xit('with feature', () => {
+        const feature = new connector_native_1.Feature({ routeConfig: routerConfig1 });
+        const Navigation = feature.getConfiguredRoutes2('/');
         expect(Navigation).toMatchSnapshot();
-        const Render = feature.getRoutes('/', 'MainStack');
+        const Render = feature.getRoutes2();
         expect(Render).toMatchSnapshot();
     });
-    it('Add routeParams parameter', () => {
-        const feature = new react_client_feature_native_1.ReactClientFeature({ routeConfigIn: [routerConfig2] });
-        const Nav = feature.getConfiguredRoutes('/');
+    xit('Add routeParams parameter', () => {
+        const feature = new connector_native_1.Feature({ routeConfig: routerConfig2 });
+        const Nav = feature.getConfiguredRoutes2('/');
         expect(Nav).toMatchSnapshot();
     });
 });
+describe('messnager routes', () => {
+    const routerConfig1 = {};
+});
 //# sourceMappingURL=get-navigation-utils.test.js.map

package/lib/route/react-navigation/get-navigation-utils.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-navigation-utils.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.test.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-navigation-utils.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.test.tsx"],"names":[],"mappings":"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"}

package/lib/route/react-navigation/react-navigation-render.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const resolveRootRoute: (rootRoute: any, rootRouteName: string) => JSX.Element;
+import React from 'react';
+declare const resolveRootRoute: (rootRoute: any, rootRouteName: string) => React.JSX.Element;
 export default resolveRootRoute;

package/lib/route/react-navigation/react-navigation-render.js

@@ -22,11 +22,11 @@ const childrenToRoutes = (children, parentNavigator, parentRouteName) => (childr
 const withRouteParam = (Component, routeParams) => (args) => {
     var _a, _b, _c;
     // For nested routes we have params inside params along with screen
-    const params = ((_b = (_a = args === null || args === void 0 ? void 0 : args.route) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.params) || ((_c = args === null || args === void 0 ? void 0 : args.route) === null || _c === void 0 ? void 0 : _c.params);
-    const notDefinedKeys = params && (routeParams === null || routeParams === void 0 ? void 0 : routeParams.filter((p) => {
+    const params = ((_b = (_a = args === null || args === void 0 ? void 0 : args.route) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.params) || ((_c = args === null || args === void 0 ? void 0 : args.route) === null || _c === void 0 ? void 0 : _c.params) || args.initialParams || {};
+    const notDefinedKeys = routeParams === null || routeParams === void 0 ? void 0 : routeParams.filter((p) => {
         const found = Object.keys(params).includes(p);
         return !found;
-    }));
+    });
     if (notDefinedKeys === null || notDefinedKeys === void 0 ? void 0 : notDefinedKeys.length) {
         throw new Error(`Route params ${notDefinedKeys} are not passed via props`);
     }

package/lib/route/react-navigation/react-navigation-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":"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"}

package/lib/route/react-navigation/types.d.ts

@@ -8,8 +8,8 @@ interface Navigator<T extends (...args: any) => any> {
         name: string;
     })[];
 }
-export declare type TabNavigator = Navigator<typeof createBottomTabNavigator>;
-export declare type StackNavigationNavigator = Navigator<typeof createStackNavigator>;
+export type TabNavigator = Navigator<typeof createBottomTabNavigator>;
+export type StackNavigationNavigator = Navigator<typeof createStackNavigator>;
 interface StackNavigationScreen {
     props: Omit<ComponentProps<ReturnType<typeof createStackNavigator>['Screen']>, 'name'> & {
         component: any;
@@ -20,8 +20,8 @@ interface TabNavigationScreen {
         component: any;
     };
 }
-export declare type NavigatorItem = StackNavigationNavigator | StackNavigationScreen | TabNavigator | TabNavigationScreen;
-export declare type RootAppNavigators = {
+export type NavigatorItem = StackNavigationNavigator | StackNavigationScreen | TabNavigator | TabNavigationScreen;
+export type RootAppNavigators = {
     [routeName: string]: NavigatorItem;
 };
 export declare const isStackOrTab: (s: NavigatorItem) => s is Navigator<any>;

package/lib/route/render-routes-native.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+declare function renderRoutes(opts: any): React.JSX.Element;
+export { renderRoutes };

package/lib/route/{render-routes.native.js → render-routes-native.js}

@@ -106,17 +106,13 @@ function render({ route, opts, props }) {
     if (Component) {
         const defaultPageInitialProps = opts.isServer ? {} : window.g_initialProps;
         const newProps = Object.assign(Object.assign(Object.assign(Object.assign({}, props), opts.extraProps), (opts.pageInitialProps || defaultPageInitialProps)), { route, routes: opts.rootRoutes });
-        // @ts-ignore
-        let ret = React.createElement(Component, Object.assign({}, newProps), routes);
-        // route.wrappers
+        let element = React.createElement(Component, Object.assign({}, newProps), routes);
         if (wrappers) {
-            let len = wrappers.length - 1;
-            while (len >= 0) {
-                ret = (0, react_1.createElement)(wrappers[len], newProps, ret);
-                len -= 1;
-            }
+            element = wrappers.reduceRight((acc, Wrapper) => {
+                return React.createElement(Wrapper, Object.assign({}, newProps), acc);
+            }, element);
         }
-        return ret;
+        return element;
     }
     return routes;
 }
@@ -129,7 +125,7 @@ function getRouteElement({ route, index, opts }) {
         path: route.path,
     };
     if (route.redirect) {
-        return React.createElement(react_router_native_1.Redirect, Object.assign({}, routeProps, { from: route.path, to: route.redirect }));
+        return React.createElement(react_router_native_1.Route, { key: route.key || index, path: route.path, element: React.createElement(react_router_native_1.Navigate, { to: route.redirect, replace: true }) });
     }
     // avoid mount and unmount with url hash change
     // @sri not supproted yet
@@ -144,19 +140,20 @@ function getRouteElement({ route, index, opts }) {
     //   // client Render for enable ssr, but not sure SSR success
     //   route.component = wrapInitialPropsFetch(route, opts);
     // }
-    return (React.createElement(react_router_native_1.Route, Object.assign({}, routeProps, { render: (props) => {
-            return render({ route, opts, props });
-        } })));
+    return (React.createElement(react_router_native_1.Route, { key: route.key || index, path: route.path, element: React.createElement(RouteElementWrapper, { route: route, render: render, opts: opts }) }));
+}
+function RouteElementWrapper({ route, render, opts }) {
+    const element = render({ route, opts, props: {} });
+    return React.createElement(React.Fragment, null, element);
 }
 function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(react_router_native_1.Switch, null, opts.routes.map((route, index) => {
-        const renderedR = getRouteElement({
+    return opts.routes ? (React.createElement(react_router_native_1.Routes, null, opts.routes.map((route, index) => {
+        return getRouteElement({
             route,
             index,
             opts: Object.assign(Object.assign({}, opts), { rootRoutes: opts.rootRoutes || opts.routes }),
         });
-        return renderedR;
     }))) : null;
 }
 exports.renderRoutes = renderRoutes;
-//# sourceMappingURL=render-routes.native.js.map
+//# sourceMappingURL=render-routes-native.js.map

package/lib/route/render-routes-native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render-routes-native.js","sourceRoot":"","sources":["../../src/route/render-routes-native.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,iCAA2D;AAG3D,6DAA8D;AAE9D,SAAS,qBAAqB,CAAC,KAAa,EAAE,IAAyB;IACrE,MAAM,EAAE,SAAS,KAAyB,KAAK,EAAzB,eAAe,UAAK,KAAK,EAAzC,aAAiC,CAAQ,CAAC;IAChD,IAAI,SAAS,GAAQ,KAAK,CAAC,SAAS,CAAC;IACrC,SAAS,8BAA8B,CAAC,KAAU;QAChD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE,CAAE,MAAc,CAAC,cAAc,CAAC,CAAC;QAEvF,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb;;;;;eAKG;YACH,MAAM,qBAAqB,GAAG,GAAS,EAAE;gBACvC,oCAAoC;gBACpC,IAAI,SAAS,CAAC,OAAO,EAAE;oBACrB,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;oBACnD,qCAAqC;oBACrC,SAAS,GAAG,gBAAgB,CAAC,OAAO,IAAI,gBAAgB,CAAC;iBAC1D;gBAED,sBAAsB;gBACtB,uBAAuB;gBACvB,qBAAqB;gBACrB,yBAAyB;gBACzB,WAAW;gBACX,wCAAwC;gBACxC,wBAAwB;gBACxB,KAAK;gBACL,sBAAsB;gBACtB,oCAAoC;gBACpC,iDAAiD;gBACjD,2CAA2C;gBAC3C,qCAAqC;gBACrC,gCAAgC;gBAChC,mBAAmB;gBACnB,QAAQ;gBAER,4DAA4D;gBAC5D,yBAAyB;gBACzB,OAAO;gBACP,mCAAmC;gBACnC,IAAI;YACN,CAAC,CAAA,CAAC;YACF,kCAAkC;YAClC,IAAI,CAAE,MAAc,CAAC,cAAc,EAAE;gBACnC,qBAAqB,EAAE,CAAC;aACzB;QACH,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACvD,OAAO,oBAAC,SAAS,oBAAK,KAAK,EAAM,YAAY,EAAI,CAAC;IACpD,CAAC;IACD,4BAA4B;IAC5B,8BAA8B,CAAC,sBAAsB,GAAG,IAAI,CAAC;IAC7D,8BAA8B,CAAC,WAAW,GAAG,gCAAgC,CAAC;IAC9E,OAAO,8BAA8B,CAAC;AACxC,CAAC;AAED,SAAS,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAA+D;IACjG,MAAM,MAAM,GAAG,YAAY,iCACtB,IAAI,KACP,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAC1B,UAAU,EAAE,IAAI,CAAC,UAAU,IAC3B,CAAC;IACH,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEjD,IAAI,SAAS,EAAE;QACb,MAAM,uBAAuB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,MAAc,CAAC,cAAc,CAAC;QACpF,MAAM,QAAQ,+DACT,KAAK,GACL,IAAI,CAAC,UAAU,GACf,CAAC,IAAI,CAAC,gBAAgB,IAAI,uBAAuB,CAAC,KACrD,KAAK,EACL,MAAM,EAAE,IAAI,CAAC,UAAU,GACxB,CAAC;QAEF,IAAI,OAAO,GAAG,oBAAC,SAAS,oBAAK,QAAQ,GAAG,MAAM,CAAa,CAAC;QAC5D,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBAC9C,OAAO,oBAAC,OAAO,oBAAK,QAAQ,GAAG,GAAG,CAAW,CAAC;YAChD,CAAC,EAAE,OAAO,CAAC,CAAC;SACb;QAED,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAwB;IACnE,MAAM,UAAU,GAAG;QACjB,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,KAAK;QACvB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IACF,IAAI,KAAK,CAAC,QAAQ,EAAE;QAClB,OAAO,oBAAC,2BAAK,IAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAC,8BAAQ,IAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,SAAG,GAAI,CAAC;KAChH;IACD,+CAA+C;IAC/C,yBAAyB;IACzB,OAAO;IACP,mCAAmC;IACnC,qBAAqB;IACrB,sBAAsB;IACtB,6BAA6B;IAC7B,yDAAyD;IACzD,mEAAmE;IACnE,MAAM;IACN,8DAA8D;IAC9D,0DAA0D;IAC1D,IAAI;IACJ,OAAO,CACL,oBAAC,2BAAK,IACJ,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,KAAK,EACvB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EACL,oBAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAI,GAEnE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,OAAO,0CAAG,OAAO,CAAI,CAAC;AACxB,CAAC;AAED,SAAS,YAAY,CAAC,IAAI;IACxB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACnB,oBAAC,4BAAM,QACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAChC,OAAO,eAAe,CAAC;YACrB,KAAK;YACL,KAAK;YACL,IAAI,kCACC,IAAI,KACP,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,GAC3C;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CACK,CACV,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAEQ,oCAAY"}

package/lib/route/render-routes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IRouterRederOptions } from '../interfaces/new-router';
-declare function renderRoutes(opts: IRouterRederOptions): JSX.Element;
+declare function renderRoutes(options: IRouterRederOptions): any;
 export { renderRoutes as renderRoutes2 };

package/lib/route/render-routes.js

@@ -46,7 +46,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderRoutes2 = void 0;
 const React = __importStar(require("react"));
 const react_1 = require("react");
-const react_router_1 = require("react-router");
+// import { Plugin, ApplyPluginsType } from '@umijs/runtime';
+const react_router_dom_1 = require("react-router-dom");
+const utils_1 = require("../utils");
 function wrapInitialPropsFetch(route, opts) {
     const { component } = route, restRouteParams = __rest(route, ["component"]);
     let Component = route.component;
@@ -102,7 +104,7 @@ function wrapInitialPropsFetch(route, opts) {
 }
 function render({ route, opts, props, }) {
     const routes = renderRoutes(Object.assign(Object.assign({}, opts), { routes: route.routes || [], rootRoutes: opts.rootRoutes }));
-    let { component: Component, wrappers } = route;
+    const { component: Component, wrappers } = route;
     if (Component) {
         const defaultPageInitialProps = opts.isServer
             ? {}
@@ -133,7 +135,7 @@ function getRouteElement({ route, index, opts }) {
         path: route.path,
     };
     if (route.redirect) {
-        return React.createElement(react_router_1.Redirect, Object.assign({}, routeProps, { from: route.path, to: route.redirect }));
+        return React.createElement(react_router_dom_1.Route, { key: route.key || index, path: route.path, element: React.createElement(react_router_dom_1.Navigate, { to: route.redirect, replace: true }) });
     }
     else {
         // avoid mount and unmount with url hash change
@@ -149,20 +151,108 @@ function getRouteElement({ route, index, opts }) {
         //   // client Render for enable ssr, but not sure SSR success
         //   route.component = wrapInitialPropsFetch(route, opts);
         // }
-        return (React.createElement(react_router_1.Route, Object.assign({}, routeProps, { render: (props) => {
-                return render({ route, opts, props });
-            } })));
+        const routeProps = {
+            key: route.key || index,
+            path: route.path,
+            caseSensitive: route.sensitive,
+        };
+        const renderComponent = (props) => {
+            return render({ route, opts, props });
+        };
+        return (React.createElement(react_router_dom_1.Route, Object.assign({}, routeProps, { element: (0, react_1.createElement)(renderComponent) })));
     }
 }
-function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(react_router_1.Switch, null, opts.routes.map((route, index) => {
-        const renderedR = getRouteElement({
-            route,
-            index,
-            opts: Object.assign(Object.assign({}, opts), { rootRoutes: opts.rootRoutes || opts.routes }),
+function createRouteElement(route, _a, children) {
+    var { isServer, withRoutesElement } = _a, options = __rest(_a, ["isServer", "withRoutesElement"]);
+    if (typeof route.redirect === "string") {
+        return React.createElement(react_router_dom_1.Navigate, { to: route.redirect, replace: true });
+    }
+    if (!route.component) {
+        return null;
+    }
+    const Component = route.component;
+    const routeProps = Object.assign(Object.assign({}, options), { route });
+    function ComponentWithRoute(innerProps) {
+        const [initialProps, setInitialProps] = (0, react_1.useState)({});
+        const location = (0, react_router_dom_1.useLocation)();
+        (0, react_1.useEffect)(() => {
+            handleInitialProps(routeProps);
+        }, []);
+        const handleInitialProps = (param) => __awaiter(this, void 0, void 0, function* () {
+            if (typeof Component.getInitialProps === "function") {
+                const initialProps = yield Component.getInitialProps(param);
+                setInitialProps(initialProps);
+            }
         });
-        return renderedR;
-    }))) : null;
+        const cloneChild = (ui, props) => {
+            if (ui) {
+                return (0, react_1.cloneElement)(ui, props);
+            }
+            else {
+                return (0, react_1.createElement)(React.Fragment, props);
+            }
+        };
+        if (isServer) {
+            // Since React.useEffect will not run in server side,
+            // this function will be called manually.
+            handleInitialProps(routeProps);
+        }
+        let childrenElement = null;
+        if (children) {
+            childrenElement = !!withRoutesElement ?
+                React.Children.map(children, (child, key) => cloneChild(child.props.element, { key })) :
+                children.map((child, key) => cloneChild(child.element, { key }));
+        }
+        return (React.createElement(Component, Object.assign({}, routeProps, initialProps, innerProps, { location: location }), childrenElement));
+    }
+    let routeElement = React.createElement(ComponentWithRoute, null);
+    const wrappers = route.wrappers || [];
+    let len = wrappers.length - 1;
+    while (len >= 0) {
+        const Wrapper = wrappers[len];
+        routeElement = React.createElement(Wrapper, Object.assign({}, routeProps), routeElement);
+        len -= 1;
+    }
+    return routeElement;
+}
+function getRoute({ key, options, route, }) {
+    const routeObject = {
+        path: !!route.index ? null : route.path,
+        index: !!route.index,
+        caseSensitive: !!route.sensitive,
+        children: getRoutes({ options, routes: route.routes }),
+    };
+    routeObject.element = createRouteElement(route, Object.assign(Object.assign({}, options), { key }), routeObject.children);
+    return routeObject;
+}
+function renderRoute(params) {
+    const routeObject = getRoute(params);
+    return !!params.options.withRoutesElement ?
+        React.createElement(react_router_dom_1.Route, Object.assign({ key: params.key }, routeObject)) : routeObject;
+}
+function getRoutes({ routes, options }) {
+    if (routes) {
+        const sortedRoutes = (0, utils_1.sortByPaths)(routes);
+        return (sortedRoutes.map((route, key) => {
+            return renderRoute({
+                key,
+                options,
+                route,
+            });
+        }));
+    }
+    return null;
+}
+function renderRoutes(options) {
+    if (options.routes) {
+        const routes = getRoutes({
+            options,
+            routes: options.routes,
+        });
+        return !!options.withRoutesElement ?
+            React.createElement(react_router_dom_1.Routes, null, routes) : routes;
+    }
+    return null;
 }
 exports.renderRoutes2 = renderRoutes;
 //# sourceMappingURL=render-routes.js.map

package/lib/route/render-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-routes.js","sourceRoot":"","sources":["../../src/route/render-routes.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-routes.js","sourceRoot":"","sources":["../../src/route/render-routes.tsx"],"names":[],"mappings":"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"}