Simplify router types

packages/kbn-typed-react-router-config/src/create_router.ts

@@ -15,25 +15,28 @@ import {
 } from 'react-router-config';
 import qs from 'query-string';
 import { findLastIndex, merge, compact } from 'lodash';
-import { deepExactRt, mergeRt } from '@kbn/io-ts-utils';
-import { FlattenRoutesOf, Route, Router } from './types';
+import { mergeRt, deepExactRt } from '@kbn/io-ts-utils';
+import { FlattenRoutesOf, Route, RouteWithPath, Router, RouteMap } from './types';
 
 function toReactRouterPath(path: string) {
   return path.replace(/(?:{([^\/]+)})/g, ':$1');
 }
 
-export function createRouter<TRoutes extends Route[]>(routes: TRoutes): Router<TRoutes> {
+export function createRouter<TRoutes extends RouteMap>(routes: TRoutes): Router<TRoutes> {
   const routesByReactRouterConfig = new Map<ReactRouterConfig, Route>();
   const reactRouterConfigsByRoute = new Map<Route, ReactRouterConfig>();
 
-  const reactRouterConfigs = routes.map((route) => toReactRouterConfigRoute(route));
+  const reactRouterConfigs = Object.entries(routes).map(([path, route]) =>
+    toReactRouterConfigRoute({ ...route, path })
+  );
 
-  function toReactRouterConfigRoute(route: Route): ReactRouterConfig {
+  function toReactRouterConfigRoute(route: RouteWithPath): ReactRouterConfig {
     const reactRouterConfig: ReactRouterConfig = {
       component: () => route.element,
       routes:
-        (route.children as Route[] | undefined)?.map((child) => toReactRouterConfigRoute(child)) ??
-        [],
+        Object.entries((route.children as RouteMap | undefined) ?? {})?.map(([path, child]) =>
+          toReactRouterConfigRoute({ ...child, path })
+        ) ?? [],
       exact: !route.children?.length,
       path: toReactRouterPath(route.path),
     };

packages/kbn-typed-react-router-config/src/index.ts

@@ -8,10 +8,8 @@
 export * from './create_router';
 export * from './types';
 export * from './outlet';
-export * from './route';
 export * from './route_renderer';
 export * from './router_provider';
-export * from './unconst';
 export * from './use_current_route';
 export * from './use_match_routes';
 export * from './use_params';

packages/kbn-typed-react-router-config/src/router_provider.tsx

@@ -8,15 +8,15 @@
 import { History } from 'history';
 import React from 'react';
 import { Router as ReactRouter } from 'react-router-dom';
-import { Route, Router } from './types';
+import { RouteMap, Router } from './types';
 import { RouterContextProvider } from './use_router';
 
 export function RouterProvider({
   children,
   router,
   history,
 }: {
-  router: Router<Route[]>;
+  router: Router<RouteMap>;
   history: History;
   children: React.ReactNode;
 }) {