@common-stack/client-react 0.5.31 → 0.5.34

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { useEffect, useState } from 'react';
-import { Route, Routes, Navigate } from 'react-router-native';
+import { useEffect, useState, createElement } from 'react';
+import { Switch, Route, Redirect } from 'react-router-native';
 function wrapInitialPropsFetch(route, opts) {
     const { component, ...restRouteParams } = route;
     let Component = route.component;
@@ -70,13 +70,17 @@ function render({ route, opts, props }) {
             route,
             routes: opts.rootRoutes,
         };
-        let element = React.createElement(Component, { ...newProps }, routes);
+        // @ts-ignore
+        let ret = React.createElement(Component, { ...newProps }, routes);
+        // route.wrappers
         if (wrappers) {
-            element = wrappers.reduceRight((acc, Wrapper) => {
-                return React.createElement(Wrapper, { ...newProps }, acc);
-            }, element);
+            let len = wrappers.length - 1;
+            while (len >= 0) {
+                ret = createElement(wrappers[len], newProps, ret);
+                len -= 1;
+            }
         }
-        return element;
+        return ret;
     }
     return routes;
 }
@@ -89,7 +93,7 @@ function getRouteElement({ route, index, opts }) {
         path: route.path,
     };
     if (route.redirect) {
-        return React.createElement(Route, { key: route.key || index, path: route.path, element: React.createElement(Navigate, { to: route.redirect, replace: true }) });
+        return React.createElement(Redirect, { ...routeProps, from: route.path, to: route.redirect });
     }
     // avoid mount and unmount with url hash change
     // @sri not supproted yet
@@ -104,15 +108,13 @@ function getRouteElement({ route, index, opts }) {
     //   // client Render for enable ssr, but not sure SSR success
     //   route.component = wrapInitialPropsFetch(route, opts);
     // }
-    return (React.createElement(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);
+    return (React.createElement(Route, { ...routeProps, render: (props) => {
+            return render({ route, opts, props });
+        } }));
 }
 function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(Routes, null, opts.routes.map((route, index) => {
-        return getRouteElement({
+    return opts.routes ? (React.createElement(Switch, null, opts.routes.map((route, index) => {
+        const renderedR = getRouteElement({
             route,
             index,
             opts: {
@@ -120,7 +122,8 @@ function renderRoutes(opts) {
                 rootRoutes: opts.rootRoutes || opts.routes,
             },
         });
+        return renderedR;
     }))) : null;
 }
 export { 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":"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"}

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

@@ -1,5 +1,5 @@
-import { cleanup, getByText, render, screen, waitFor } from '@testing-library/react';
-import { Link, useParams, createMemoryRouter, RouterProvider, Outlet, useLoaderData } from 'react-router-dom';
+import { cleanup, getByText, render, screen, waitFor, } from '@testing-library/react';
+import { Link, MemoryRouter } from 'react-router-dom';
 import React from 'react';
 import { renderRoutes2 as renderRoutes } from './render-routes';
 function TestInitialProps({ foo }) {
@@ -53,38 +53,8 @@ TestInitialPropsParent.getInitialProps = async () => {
     });
 };
 const routerConfig = {
-    isServer: false,
     ssrProps: {},
-    loaderArgs: { foo: 'bar' },
     routes: [
-        {
-            path: '/with-loader',
-            loader: async ({ foo }) => {
-                return { title: 'Loader', foo };
-            },
-            component: (props) => {
-                const loaderData = useLoaderData();
-                return (React.createElement(React.Fragment, null,
-                    React.createElement("h1", { "data-testid": "root" }, loaderData.title),
-                    React.createElement("h2", { "data-testid": "foo" }, loaderData.foo),
-                    React.createElement(Outlet, null)));
-            },
-            routes: [
-                {
-                    path: '/with-loader/child/:id',
-                    loader: async ({ params }) => {
-                        const list = ['one', 'two', 'three'];
-                        return { number: list[params.id] };
-                    },
-                    component: (props) => {
-                        const loaderData = useLoaderData();
-                        return (React.createElement(React.Fragment, null,
-                            React.createElement("h1", { "data-testid": "test" }, "Child"),
-                            React.createElement("h2", { "data-testid": "number" }, loaderData.number)));
-                    }
-                },
-            ],
-        },
         {
             path: '/layout',
             component: (props) => (React.createElement(React.Fragment, null,
@@ -98,11 +68,6 @@ const routerConfig = {
                         React.createElement("h1", { "data-testid": "test" }, "Foo"),
                         React.createElement("h2", { "data-testid": "routes-embed" }, props.routes.map((r) => r.path).join(',')))),
                 },
-                {
-                    path: '/layout/top',
-                    component: (props) => (React.createElement(React.Fragment, null,
-                        React.createElement("h1", { "data-testid": "top" }, "Top"))),
-                },
             ],
         },
         {
@@ -117,56 +82,8 @@ const routerConfig = {
         {
             path: '/users/:id',
             component: (props) => {
-                let params = useParams();
-                return React.createElement(React.Fragment, null,
-                    React.createElement("h1", { "data-testid": "test" }, params.id),
-                    React.createElement(Outlet, null));
+                return React.createElement("h1", { "data-testid": "test" }, props.match.params.id);
             },
-            routes: [
-                {
-                    path: '/users/:id/dashboard',
-                    component: (props) => {
-                        let params = useParams();
-                        return React.createElement("h2", { "data-testid": "test2" },
-                            "Dashboard of ",
-                            params.id);
-                    },
-                },
-                {
-                    path: '/users/:id/profile',
-                    component: (props) => {
-                        let params = useParams();
-                        return React.createElement("h2", { "data-testid": "test2" },
-                            "Profile of ",
-                            params.id);
-                    },
-                }
-            ]
-        },
-        {
-            path: '/nested-routes',
-            routes: [
-                {
-                    path: '/nested-routes/first',
-                    component: () => React.createElement("h2", { "data-testid": "child" }, "First"),
-                },
-                {
-                    path: '/nested-routes/second',
-                    component: () => React.createElement(React.Fragment, null,
-                        React.createElement("h2", { "data-testid": "child" }, "Second"),
-                        React.createElement(Outlet, null)),
-                    routes: [
-                        {
-                            path: '/nested-routes/second/one',
-                            component: () => React.createElement("h3", { "data-testid": "nest-child" }, "One"),
-                        },
-                        {
-                            path: '/nested-routes/second/two',
-                            component: () => React.createElement("h3", { "data-testid": "nest-child" }, "Two"),
-                        },
-                    ],
-                },
-            ],
         },
         { path: '/bar', component: () => React.createElement("h1", { "data-testid": "test" }, "Bar") },
         {
@@ -177,7 +94,7 @@ const routerConfig = {
         {
             path: '/bar-strict/',
             strict: true,
-            component: () => React.createElement("h1", { "data-testid": "test" }, "Bar Strict mode will not work"),
+            component: () => React.createElement("h1", { "data-testid": "test" }, "Bar Strict"),
         },
         {
             path: '/bar-sensitive',
@@ -242,25 +159,7 @@ const routerConfig = {
     ],
     // plugin: new Plugin(),
 };
-// const setComponent = (configs) => {
-//   return configs.map((config) => {
-//     config.component = (props) => {
-//       const configParam = useParams();
-//       if (Array.isArray(config.routes)) {
-//         // console.log(props);
-//         return <section><h1>{config.path}</h1><span>{JSON.stringify(configParam)}</span><Outlet /></section>
-//       } else {
-//         return <section><h1>{config.path}</h1><span>{JSON.stringify(configParam)}</span><p>{config.key}</p></section>
-//       }
-//     }
-//     if (Array.isArray(config.routes)) {
-//       config.routes = setComponent(config.routes);
-//     }
-//     return config
-//   })
-// }
-// routerConfig.routes = setComponent(testRoutes);
-const routes = renderRoutes(routerConfig);
+let routes = renderRoutes(routerConfig);
 beforeEach(() => {
     window.g_useSSR = true;
     window.g_initialProps = null;
@@ -272,181 +171,78 @@ afterEach(async () => {
     delete window.g_initialProps;
     await cleanup();
 });
-// test('/o/:orgName/dashboard', async () => {
-//   const router = createMemoryRouter(routes, {initialEntries: ['/o/toka/dashboard']});
-//   const { container } = render(<RouterProvider router={router} />)
-//   expect(container).toMatchSnapshot();
-// });
 test('/layout', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/layout'] });
-    const { container } = render(React.createElement(RouterProvider, { router: router }));
-    // const { container } = render(
-    //   <MemoryRouter initialEntries={['/layout']}>
-    //     {routes}
-    //   </MemoryRouter>
-    // );
-    // expect(container).toMatchSnapshot();
+    const { container } = render(React.createElement(MemoryRouter, { initialEntries: ['/layout'] }, routes));
+    expect(container).toMatchSnapshot();
     expect((await screen.findByTestId('layout')).innerHTML).toEqual('Layout');
     expect((await screen.findByTestId('routes')).innerHTML).toContain('/layout,/layout-without-component,/users/:id');
     expect((await screen.findByTestId('routes-embed')).innerHTML).toContain('/layout,/layout-without-component,/users/:id');
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Foo');
 });
-test('/layout/top', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/layout/top'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    expect((await screen.findByTestId('top')).innerHTML).toEqual('Top');
-});
 test('/layout-without-component', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/layout-without-component/foo'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/layout-without-component/foo']}>
-    //     {routes}
-    //   </MemoryRouter>,
-    // );
+    render(React.createElement(MemoryRouter, { initialEntries: ['/layout-without-component/foo'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Foo');
 });
-test('/with-loader', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/with-loader'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    expect((await screen.findByTestId('root')).innerHTML).toEqual('Loader');
-    expect((await screen.findByTestId('foo')).innerHTML).toEqual('bar');
-});
-test('/with-loader/child', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/with-loader/child/1'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    expect((await screen.findByTestId('root')).innerHTML).toEqual('Loader');
-    expect((await screen.findByTestId('foo')).innerHTML).toEqual('bar');
-    expect((await screen.findByTestId('test')).innerHTML).toEqual('Child');
-    expect((await screen.findByTestId('number')).innerHTML).toEqual('two');
-});
-test('/nested-routes/first', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/nested-routes/first'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    expect((await screen.findByTestId('child')).innerHTML).toEqual('First');
-});
-test('/nested-routes/second/one', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/nested-routes/second/one'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    expect((await screen.findByTestId('nest-child')).innerHTML).toEqual('One');
-});
 test('/bar', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/bar'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(<MemoryRouter initialEntries={['/bar']}>{routes}</MemoryRouter>);
+    render(React.createElement(MemoryRouter, { initialEntries: ['/bar'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Bar');
 });
 test('/BAR', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/BAR'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(<MemoryRouter initialEntries={['/BAR']}>{routes}</MemoryRouter>);
+    render(React.createElement(MemoryRouter, { initialEntries: ['/BAR'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Bar');
 });
 test('/bar-exact/foo', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/bar-exact/foo'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/bar-exact/foo']}>{routes}</MemoryRouter>,
-    // );
+    render(React.createElement(MemoryRouter, { initialEntries: ['/bar-exact/foo'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Fallback');
 });
 test('/bar-strict', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/bar-strict'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/bar-strict']}>{routes}</MemoryRouter>,
-    // );
-    expect((await screen.findByTestId('test')).innerHTML).toEqual('Bar Strict mode will not work');
+    render(React.createElement(MemoryRouter, { initialEntries: ['/bar-strict'] }, routes));
+    expect((await screen.findByTestId('test')).innerHTML).toEqual('Fallback');
 });
 test('/BAR-sensitive', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/BAR-sensitive'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/BAR-sensitive']}>{routes}</MemoryRouter>,
-    // );
+    render(React.createElement(MemoryRouter, { initialEntries: ['/BAR-sensitive'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Fallback');
 });
 test('/users/123', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/users/123'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(<MemoryRouter initialEntries={['/users/123']}>{routes}</MemoryRouter>);
+    render(React.createElement(MemoryRouter, { initialEntries: ['/users/123'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('123');
 });
-test('/users/123/dashboard', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/users/123/dashboard'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(<MemoryRouter initialEntries={['/users/123']}>{routes}</MemoryRouter>);
-    expect((await screen.findByTestId('test2')).innerHTML).toEqual('Dashboard of 123');
-});
 test('/redirect', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/redirect'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // const newRoutes = renderRoutes({...routerConfig, withRoutesElement: true});
-    // render(<MemoryRouter initialEntries={['/redirect']}>{newRoutes}</MemoryRouter>);
+    render(React.createElement(MemoryRouter, { initialEntries: ['/redirect'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Redirect');
 });
 test('/props-route', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/props-route'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/props-route']}>{routes}</MemoryRouter>,
-    // );
+    render(React.createElement(MemoryRouter, { initialEntries: ['/props-route'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('/props-route bar');
 });
 test('/pass-props', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/pass-props'] });
-    const { container } = render(React.createElement(RouterProvider, { router: router }));
-    // const { container } = render(
-    //   <MemoryRouter initialEntries={['/pass-props']}>{routes}</MemoryRouter>,
-    // );
+    const { container } = render(React.createElement(MemoryRouter, { initialEntries: ['/pass-props'] }, routes));
     await waitFor(() => getByText(container, 'bar'));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('bar');
 });
 test('/get-initial-props-with-mount', async () => {
     const newRoutes = renderRoutes(routerConfig);
-    const router = createMemoryRouter(newRoutes, { initialEntries: ['/get-initial-props-with-mount'] });
     expect(mountCount).toEqual(0);
     expect(renderCount).toEqual(0);
-    const { container } = render(React.createElement(RouterProvider, { router: router }));
-    // const { container } = render(
-    //   <MemoryRouter initialEntries={['/get-initial-props-with-mount']}>
-    //     {newRoutes}
-    //   </MemoryRouter>,
-    // );
+    const { container } = render(React.createElement(MemoryRouter, { initialEntries: ['/get-initial-props-with-mount'] }, newRoutes));
     await waitFor(() => getByText(container, 'bar'));
     expect(mountCount).toEqual(1);
     expect(renderCount).toEqual(2);
 });
 test('/get-initial-props-embed', async () => {
     const newRoutes = renderRoutes(routerConfig);
-    const router = createMemoryRouter(newRoutes, { initialEntries: ['/get-initial-props-embed'] });
-    const { container } = render(React.createElement(RouterProvider, { router: router }));
-    // const { container } = render(
-    //   <MemoryRouter initialEntries={['/get-initial-props-embed']}>
-    //     {newRoutes}
-    //   </MemoryRouter>,
-    // );
+    const { container } = render(React.createElement(MemoryRouter, { initialEntries: ['/get-initial-props-embed'] }, newRoutes));
     await waitFor(() => getByText(container, 'bar'));
     await waitFor(() => getByText(container, 'parent'));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('bar');
     expect((await screen.findByTestId('test-parent')).innerHTML).toEqual('parent');
 });
 test('/wrappers', () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/wrappers'] });
-    const { container } = render(React.createElement(RouterProvider, { router: router }));
-    // const { container } = render(
-    //   <MemoryRouter initialEntries={['/wrappers']}>{routes}</MemoryRouter>,
-    // );
+    const { container } = render(React.createElement(MemoryRouter, { initialEntries: ['/wrappers'] }, routes));
     expect(container.innerHTML).toEqual('<h1>wrapper 1 /wrappers</h1><h1>wrapper 2</h1><h1>foo</h1>');
 });
 test('/fallback-20140924', async () => {
-    const router = createMemoryRouter(routes, { initialEntries: ['/fallback-20140924'] });
-    render(React.createElement(RouterProvider, { router: router }));
-    // render(
-    //   <MemoryRouter initialEntries={['/fallback-20140924']}>
-    //     {routes}
-    //   </MemoryRouter>,
-    // );
+    render(React.createElement(MemoryRouter, { initialEntries: ['/fallback-20140924'] }, routes));
     expect((await screen.findByTestId('test')).innerHTML).toEqual('Fallback');
 });
 //# sourceMappingURL=render-routes.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"render-routes.test.js","sourceRoot":"","sources":["../../src/route/render-routes.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGhE,SAAS,gBAAgB,CAAC,EAAE,GAAG,EAAmB;IAChD,OAAO,2CAAgB,MAAM,IAAE,GAAG,CAAM,CAAC;AAC3C,CAAC;AAED,IAAI,UAAU,GAAG,CAAC,CAAC;AACnB,IAAI,WAAW,GAAG,CAAC,CAAC;AACpB,SAAS,8BAA8B,CAAC,EAAE,GAAG,EAAmB;IAC9D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,OAAO,GAAG,EAAE;YACV,UAAU,EAAE,CAAC;QACf,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL;QACE,2CAAgB,OAAO,IAAE,GAAG,CAAM;QAClC,2BAAG,IAAI,EAAC,MAAM,eAAa;QAC3B,oBAAC,IAAI,IAAC,EAAE,EAAC,oBAAoB,mBAAoB;QACjD,4BAAI,EAAE,EAAC,KAAK,aAAY,CACpB,CACP,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,EAAE,GAAG,EAAmB;IACzD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,UAAU,EAAE,CAAC;IACf,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,WAAW,EAAE,CAAC;IACd,OAAO,2CAAgB,MAAM,IAAE,GAAG,CAAM,CAAC;AAC3C,CAAC;AAED,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC;gBACN,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,gBAAgB,CAAC,eAAe,GAAG,eAAe,CAAC;AACnD,8BAA8B,CAAC,eAAe,GAAG,eAAe,CAAC;AACjE,yBAAyB,CAAC,eAAe,GAAG,eAAe,CAAC;AAE5D,SAAS,sBAAsB,CAAC,EAC9B,GAAG,EACH,QAAQ,GAIT;IACC,OAAO,CACL;QACE,2CAAgB,aAAa,IAAE,GAAG,CAAM;QACvC,QAAQ,CACR,CACJ,CAAC;AACJ,CAAC;AAED,sBAAsB,CAAC,eAAe,GAAG,KAAK,IAAI,EAAE;IAClD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC;gBACN,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;QACL,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AACF,MAAM,YAAY,GAAG;IACnB,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;IAC1B,MAAM,EAAE;QACN;YACE,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBACxB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;YAClC,CAAC;YACD,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;gBACxB,MAAM,UAAU,GAAQ,aAAa,EAAE,CAAC;gBACxC,OAAO,CACL;oBACE,2CAAgB,MAAM,IAAE,UAAU,CAAC,KAAK,CAAM;oBAC9C,2CAAgB,KAAK,IAAE,UAAU,CAAC,GAAG,CAAM;oBAC3C,oBAAC,MAAM,OAAG,CACT,CACJ,CAAA;YACH,CAAC;YACD,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,wBAAwB;oBAC9B,MAAM,EAAE,KAAK,EAAE,EAAC,MAAM,EAAC,EAAE,EAAE;wBACzB,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;wBACrC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAA;oBACpC,CAAC;oBACD,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;wBACxB,MAAM,UAAU,GAAQ,aAAa,EAAE,CAAC;wBACxC,OAAO,CACL;4BACE,2CAAgB,MAAM,YAAW;4BACjC,2CAAgB,QAAQ,IAAE,UAAU,CAAC,MAAM,CAAM,CAChD,CACJ,CAAA;oBACH,CAAC;iBACF;aACF;SACF;QACD;YACE,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,CACzB;gBACE,2CAAgB,QAAQ,aAAY;gBACpC,2CAAgB,QAAQ,IACrB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAC5C;gBACJ,KAAK,CAAC,QAAQ,CACd,CACJ;YACD,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,CACzB;wBACE,2CAAgB,MAAM,UAAS;wBAC/B,2CAAgB,cAAc,IAC3B,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAC5C,CACJ,CACJ;iBACF;gBACD;oBACE,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,CACzB;wBACE,2CAAgB,KAAK,UAAS,CAC7B,CACJ;iBACF;aACF;SACF;QACD;YACE,IAAI,EAAE,2BAA2B;YACjC,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,+BAA+B;oBACrC,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,UAAS;iBACjD;aACF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;gBACxB,IAAI,MAAM,GAAG,SAAS,EAAE,CAAC;gBACzB,OAAO;oBAAE,2CAAgB,MAAM,IAAE,MAAM,CAAC,EAAE,CAAM;oBAAA,oBAAC,MAAM,OAAG,CAAG,CAAC;YAChE,CAAC;YACD,MAAM,EAAC;gBACL;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;wBACxB,IAAI,MAAM,GAAG,SAAS,EAAE,CAAC;wBACzB,OAAO,2CAAgB,OAAO;;4BAAe,MAAM,CAAC,EAAE,CAAM,CAAC;oBAC/D,CAAC;iBACF;gBACD;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;wBACxB,IAAI,MAAM,GAAG,SAAS,EAAE,CAAC;wBACzB,OAAO,2CAAgB,OAAO;;4BAAa,MAAM,CAAC,EAAE,CAAM,CAAC;oBAC7D,CAAC;iBACF;aACF;SACF;QACD;YACE,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAC;gBACL;oBACE,IAAI,EAAE,sBAAsB;oBAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,OAAO,YAAW;iBACpD;gBACD;oBACE,IAAI,EAAE,uBAAuB;oBAC7B,SAAS,EAAE,GAAG,EAAE,CAAC;wBAAE,2CAAgB,OAAO,aAAY;wBAAA,oBAAC,MAAM,OAAG,CAAG;oBACnE,MAAM,EAAC;wBACL;4BACE,IAAI,EAAE,2BAA2B;4BACjC,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,YAAY,UAAS;yBACvD;wBACD;4BACE,IAAI,EAAE,2BAA2B;4BACjC,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,YAAY,UAAS;yBACvD;qBACF;iBACF;aACF;SACF;QACD,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,UAAS,EAAE;QAClE;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,gBAAe;SACvD;QACD;YACE,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,oCAAmC;SAC3E;QACD;YACE,IAAI,EAAE,gBAAgB;YACtB,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,oBAAmB;SAC3D;QACD,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QACrC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,eAAc,EAAE;QACrE,EAAE,IAAI,EAAE,oBAAoB,EAAE,SAAS,EAAE,gBAAuB,EAAE;QAClE;YACE,IAAI,EAAE,oCAAoC;YAC1C,SAAS,EAAE,8BAAqC;SACjD;QACD;YACE,IAAI,EAAE,+BAA+B;YACrC,SAAS,EAAE,yBAAgC;SAC5C;QACD;YACE,IAAI,EAAE,0BAA0B;YAChC,SAAS,EAAE,sBAA6B;YACxC,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,0BAA0B;oBAChC,SAAS,EAAE,gBAAuB;iBACnC;aACF;SACF;QACD;YACE,IAAI,EAAE,cAAc;YACpB,GAAG,EAAE,KAAK;YACV,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CACpB,2CAAgB,MAAM,IACnB,GAAI,KAAa,CAAC,KAAK,CAAC,IAAI,IAAK,KAAa,CAAC,KAAK,CAAC,GAAG,EAAE,CACxD,CACN;SACF;QACD;YACE,IAAI,EAAE,aAAa;YACnB,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE;gBACxB,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClD,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;gBACnD,CAAC,CAAC,CAAC;YACL,CAAC;YACD,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,2CAAgB,MAAM,IAAE,KAAK,CAAC,GAAG,CAAM;iBACnE;aACF;SACF;QACD;YACE,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG,EAAE,CAAC,sCAAY;YAC7B,QAAQ,EAAE;gBACR,CAAC,KAAU,EAAE,EAAE,CAAC,CACd;oBACE;;wBAAe,KAAK,CAAC,KAAK,CAAC,IAAI,CAAM;oBACpC,KAAK,CAAC,QAAQ,CACd,CACJ;gBACD,CAAC,KAAU,EAAE,EAAE,CAAC,CACd;oBACE,4CAAkB;oBACjB,KAAK,CAAC,QAAQ,CACd,CACJ;aACF;SACF;QACD,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,2CAAgB,MAAM,eAAc,EAAE;KAC1D;IACD,wBAAwB;CACzB,CAAC;AAEF,sCAAsC;AACtC,qCAAqC;AACrC,sCAAsC;AACtC,yCAAyC;AACzC,4CAA4C;AAC5C,iCAAiC;AACjC,+GAA+G;AAC/G,iBAAiB;AACjB,wHAAwH;AACxH,UAAU;AACV,QAAQ;AACR,0CAA0C;AAC1C,qDAAqD;AACrD,QAAQ;AACR,oBAAoB;AACpB,OAAO;AACP,IAAI;AACJ,kDAAkD;AAClD,MAAM,MAAM,GAAG,YAAY,CAAC,YAAmB,CAAC,CAAC;AAEjD,UAAU,CAAC,GAAG,EAAE;IACb,MAAc,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC/B,MAAc,CAAC,cAAc,GAAG,IAAI,CAAC;IACtC,UAAU,GAAG,CAAC,CAAC;IACf,WAAW,GAAG,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,OAAQ,MAAc,CAAC,QAAQ,CAAC;IAChC,OAAQ,MAAc,CAAC,cAAc,CAAC;IACtC,MAAM,OAAO,EAAE,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,8CAA8C;AAC9C,wFAAwF;AACxF,qEAAqE;AACrE,yCAAyC;AACzC,MAAM;AAEN,IAAI,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;IACzB,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC,CAAC;IACzE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAChE,gCAAgC;IAChC,gDAAgD;IAChD,eAAe;IACf,oBAAoB;IACpB,KAAK;IACL,uCAAuC;IACvC,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1E,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,CAC/D,8CAA8C,CAC/C,CAAC;IACF,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,CACrE,8CAA8C,CAC/C,CAAC;IACF,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;IAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,aAAa,CAAC,EAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,+BAA+B,CAAC,EAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,sEAAsE;IACtE,eAAe;IACf,qBAAqB;IACrB,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;IAC9B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,cAAc,CAAC,EAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxE,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACpC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,sBAAsB,CAAC,EAAC,CAAC,CAAC;IACtF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxE,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACtC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,sBAAsB,CAAC,EAAC,CAAC,CAAC;IACtF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,2BAA2B,CAAC,EAAC,CAAC,CAAC;IAC3F,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;IACtB,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;IACtE,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,2EAA2E;IAC3E,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;IACtB,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;IACtE,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,2EAA2E;IAC3E,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,gBAAgB,CAAC,EAAC,CAAC,CAAC;IAChF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,+EAA+E;IAC/E,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;IAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,aAAa,CAAC,EAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,4EAA4E;IAC5E,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACjG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,gBAAgB,CAAC,EAAC,CAAC,CAAC;IAChF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,+EAA+E;IAC/E,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;IAC5B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,YAAY,CAAC,EAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,iFAAiF;IACjF,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACtC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,sBAAsB,CAAC,EAAC,CAAC,CAAC;IACtF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,iFAAiF;IACjF,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACrF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;IAC3B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,8EAA8E;IAC9E,mFAAmF;IACnF,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;IAC9B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,cAAc,CAAC,EAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,6EAA6E;IAC7E,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAC3D,kBAAkB,CACnB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;IAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,aAAa,CAAC,EAAC,CAAC,CAAC;IAC7E,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAChE,gCAAgC;IAChC,4EAA4E;IAC5E,KAAK;IACL,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,EAAE,EAAC,cAAc,EAAE,CAAC,+BAA+B,CAAC,EAAC,CAAC,CAAC;IAClG,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAE/B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAChE,gCAAgC;IAChC,sEAAsE;IACtE,kBAAkB;IAClB,qBAAqB;IACrB,KAAK;IACL,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IAEjD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IAC1C,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,EAAE,EAAC,cAAc,EAAE,CAAC,0BAA0B,CAAC,EAAC,CAAC,CAAC;IAC7F,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAChE,gCAAgC;IAChC,iEAAiE;IACjE,kBAAkB;IAClB,qBAAqB;IACrB,KAAK;IACL,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IACjD,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpD,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrE,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAClE,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;IACrB,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC;IAC3E,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAChE,gCAAgC;IAChC,0EAA0E;IAC1E,KAAK;IACL,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CACjC,4DAA4D,CAC7D,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACpC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAC,cAAc,EAAE,CAAC,oBAAoB,CAAC,EAAC,CAAC,CAAC;IACpF,MAAM,CAAC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM,GAAI,CAAC,CAAA;IAC1C,UAAU;IACV,2DAA2D;IAC3D,eAAe;IACf,qBAAqB;IACrB,KAAK;IACL,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"render-routes.test.js","sourceRoot":"","sources":["../../src/route/render-routes.test.tsx"],"names":[],"mappings":"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"}

package/lib/router-factory/index.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Routes } from 'react-router-dom';
+import { Switch } from 'react-router';
 import { Feature } from '../connector';
-const routerFactory = (routes) => React.createElement(Routes, null, routes);
+const routerFactory = (routes) => React.createElement(Switch, null, routes);
 export const FeatureWithRouterFactory = new Feature({
     routerFactory,
 });

package/lib/router-factory/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router-factory/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAC,MAAM,QAAE,MAAM,CAAU,CAAC;AAE5D,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,OAAO,CAAC;IAChD,aAAa;CACC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router-factory/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAC,MAAM,QAAE,MAAM,CAAU,CAAC;AAE5D,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,OAAO,CAAC;IAChD,aAAa;CACC,CAAC,CAAC"}

package/lib/router-factory/index.native.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Routes } from 'react-router';
+import { Switch } from 'react-router';
 import { Feature } from '../connector/connector.native';
-const routerFactory = (routes) => React.createElement(Routes, null, routes);
+const routerFactory = (routes) => React.createElement(Switch, null, routes);
 export const FeatureWithRouterFactory = new Feature({
     routerFactory,
 });

package/lib/utils/sort-keys.d.ts

@@ -1,2 +1 @@
 export declare function sortKeys(routeData: any): any;
-export declare function sortByPaths(routes: any): any[];

package/lib/utils/sort-keys.js

@@ -2,17 +2,6 @@ import defaultSortKeys from 'sort-keys';
 export function sortKeys(routeData) {
     return defaultSortKeys(routeData, { compare });
 }
-export function sortByPaths(routes) {
-    const routeData = {};
-    routes.forEach((route) => {
-        if (typeof route.path === 'undefined') {
-            route.path = "*";
-        }
-        routeData[route.path] = route;
-    });
-    const sortedRoutes = defaultSortKeys(routeData, { compare });
-    return Object.keys(sortedRoutes).map(key => sortedRoutes[key]);
-}
 const compare = ((a, b) => {
     const aStr = String(a).toLowerCase();
     const bStr = String(b).toLowerCase();

package/lib/utils/sort-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-keys.js","sourceRoot":"","sources":["../../src/utils/sort-keys.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sort-keys.js","sourceRoot":"","sources":["../../src/utils/sort-keys.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,WAAW,CAAC;AAExC,MAAM,UAAU,QAAQ,CAAC,SAAS;IAChC,OAAO,eAAe,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;AAChD,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IACxB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,eAAe,GAAG,eAAe,KAAK,CAAC,CAAC,EAAE;QAC5C,IAAI,eAAe,GAAG,eAAe,GAAG,CAAC,EAAE;YACzC,IAAI,eAAe,KAAK,eAAe,EAAE;gBACvC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACjC;YACD,OAAO,eAAe,GAAG,eAAe,CAAC;SAC1C;QACD,IAAI,eAAe,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC,CAAC;SACX;aAAM,IAAI,eAAe,GAAG,CAAC,EAAE;YAC9B,OAAO,CAAC,CAAC;SACV;KACF;IAED,4DAA4D;IAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,wEAAwE;IACxE,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO,IAAI,GAAG,IAAI,CAAC;QACnB,8CAA8C;KAC/C;SAAM,IAAI,IAAI,EAAE;QACf,OAAO,CAAC,CAAC,CAAC;QACV,8CAA8C;KAC/C;SAAM,IAAI,IAAI,EAAE;QACf,OAAO,CAAC,CAAC;KACV;IAED,mDAAmD;IACnD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,GAAG;IAC5B,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;QAChB,OAAO,CAAC,CAAC,CAAC;KACX;IACD,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,EAAE,EAAE;QACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,IAAI,GAAG,KAAK,GAAG,EAAE,EAAE,wCAAwC;gBACzD,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;aACnB;iBAAM;gBACL,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;aACnB;SACF;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE;YACvB,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;SACnB;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE;YACvB,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/utils/sort-keys.test.js

@@ -1,4 +1,4 @@
-import { sortKeys, sortByPaths } from './sort-keys';
+import { sortKeys } from './sort-keys';
 function MyComponent(props) {
     return {};
 }
@@ -20,40 +20,12 @@ describe('utility with basic routes', () => {
         ["/o/:orgName/account/line2/"]: { exact: false, component: MyComponent },
         ["/o/orgname"]: { exact: false, component: MyComponent },
     };
-    const routerConfig64 = [
-        { path: '//menu', component: MyComponent },
-        { path: '/login', component: MyComponent },
-        { path: '/:orgName/usermenu/logout', component: MyComponent },
-        { path: '/callback', component: MyComponent },
-        { path: "/", component: MyComponent },
-        { path: "/:orgName/usermenu/profile", component: MyComponent },
-        { path: "/authenticate-popup", component: MyComponent },
-        { path: "/reset-password", component: MyComponent },
-        { path: "/:orgName/usermenu/account/", component: MyComponent },
-        { path: "/o/orgname2", component: MyComponent },
-        { path: "/o/profile", component: MyComponent },
-        { path: "/o/profile/upload-photo", component: MyComponent },
-        { path: "/o/:orgName/account/line/", component: MyComponent },
-        { path: "/o/:orgName/account/line2/", component: MyComponent },
-        { path: "/o/orgname", component: MyComponent },
-    ];
-    let sortedRoutes = {};
-    let keys = [];
-    beforeAll(() => {
-        sortedRoutes = sortKeys(routerConfig);
-        keys = Object.keys(sortedRoutes);
-    });
     it('sort will have `root` at the top', () => {
-        expect(keys[0]).toEqual('/');
-        expect(keys[0]).toMatchSnapshot();
+        const sortedRoutes = sortKeys(routerConfig);
+        const keys = Object.keys(sortedRoutes)[0];
+        // expect(keys).toEqual('/')
+        expect(keys).toMatchSnapshot();
         expect(sortedRoutes).toMatchSnapshot();
     });
-    it('sort will be same as sortByPaths for react-router 6.4', () => {
-        const sortedRoutes2 = sortByPaths(routerConfig64);
-        const paths = sortedRoutes2.map(route => route.path);
-        expect(keys.length).toEqual(paths.length);
-        expect(keys[0]).toEqual(paths[0]);
-        expect(keys[keys.length - 1]).toEqual(paths[keys.length - 1]);
-    });
 });
 //# sourceMappingURL=sort-keys.test.js.map

package/lib/utils/sort-keys.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-keys.test.js","sourceRoot":"","sources":["../../src/utils/sort-keys.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sort-keys.test.js","sourceRoot":"","sources":["../../src/utils/sort-keys.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,SAAS,WAAW,CAAC,KAAK;IACtB,OAAO,EAAE,CAAC;AACd,CAAC;AACD,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAGvC,MAAM,YAAY,GAAG;QACjB,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACnD,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACnD,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACtD,CAAC,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACtE,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QAC/C,CAAC,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACvE,CAAC,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QAChE,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QAC5D,CAAC,6BAA6B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACzE,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACzD,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACvD,CAAC,yBAAyB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACpE,CAAC,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACvE,CAAC,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACxE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;KAC3D,CAAC;IAEF,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,4BAA4B;QAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,CAAC,CAAC,eAAe,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}