reactive-route 0.0.1-alpha.22 → 0.0.1-alpha.24

package/README.md

@@ -4,6 +4,7 @@
 [![npm](https://img.shields.io/npm/v/reactive-route)](https://www.npmjs.com/package/reactive-route)
 ![size-core](https://github.com/dkazakov8/reactive-route/blob/master/assets/core.svg)
 ![size-react](https://github.com/dkazakov8/reactive-route/blob/master/assets/react.svg)
+![size-preact](https://github.com/dkazakov8/reactive-route/blob/master/assets/preact.svg)
 ![size-solid](https://github.com/dkazakov8/reactive-route/blob/master/assets/solid.svg)
 
 > [!WARNING]

package/dist/cjs/index.js

@@ -23,10 +23,7 @@ __export(core_exports, {
   RedirectError: () => RedirectError,
   createRouter: () => createRouter,
   createRoutes: () => createRoutes,
-  findRouteByPathname: () => findRouteByPathname,
-  getInitialRoute: () => getInitialRoute,
   history: () => history,
-  isDynamicRoute: () => isDynamicRoute,
   loadComponentToConfig: () => loadComponentToConfig,
   replaceDynamicValues: () => replaceDynamicValues
 });
@@ -46,9 +43,6 @@ function isDynamic(param) {
 function clearDynamic(param) {
   return param.replace(new RegExp(`^${constants.dynamicSeparator}`), "");
 }
-function isDynamicRoute(route) {
-  return "params" in route;
-}
 
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
@@ -148,13 +142,11 @@ var history = constants.isClient ? (0, import_history.createBrowserHistory)() :
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
-  if (!route.component && route.loader) {
-    const loadingFn = route.loader;
-    return loadingFn().then((module2) => {
-      const { default: component, pageName, ...rest } = module2;
+  if (!route.component) {
+    return route.loader().then((module2) => {
+      const { default: component, ...rest } = module2;
       route.component = component;
       route.otherExports = rest;
-      route.pageName = pageName;
     });
   }
   return Promise.resolve();
@@ -196,23 +188,26 @@ function replaceDynamicValues({
 
 // packages/core/createRouter.ts
 function createRouter({
-  adapters,
   routes,
+  adapters,
   lifecycleParams
 }) {
   const router = adapters.makeObservable({
     routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
-    redirectTo: void 0,
+    redirect: void 0,
     restoreFromURL: void 0,
     restoreFromServer: void 0,
     get adapters() {
       return adapters;
+    },
+    get routes() {
+      return routes;
     }
   });
   router.restoreFromServer = function restoreFromServer(obj) {
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
@@ -222,9 +217,9 @@ function createRouter({
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
   router.restoreFromURL = function restoreFromURL(params) {
-    return router.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
+    return router.redirect(getInitialRoute({ routes, ...params }));
   };
-  router.redirectTo = async function redirectTo(config) {
+  router.redirect = async function redirect(config) {
     const { route: routeName, noHistoryPush } = config;
     let currentRoute;
     let currentPathname;
@@ -263,8 +258,8 @@ function createRouter({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        adapters.batch(() => {
-          adapters.replaceObject(router.currentRoute, {
+        router.adapters.batch(() => {
+          router.adapters.replaceObject(router.currentRoute, {
             ...router.currentRoute,
             query: nextQuery || {}
           });
@@ -280,7 +275,7 @@ function createRouter({
       }
       return Promise.resolve();
     }
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.isRedirecting = true;
     });
     try {
@@ -320,7 +315,7 @@ function createRouter({
       };
       await currentRoute?.beforeLeave?.(config2, ...lifecycleParams || []);
       const redirectConfig = await nextRoute.beforeEnter?.(config2, ...lifecycleParams || []);
-      if (redirectConfig) return redirectTo(redirectConfig);
+      if (redirectConfig) return redirect(redirectConfig);
       await loadComponentToConfig({ route: routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
@@ -331,27 +326,27 @@ function createRouter({
       }
       console.error(error);
       await loadComponentToConfig({ route: routes.internalError });
-      adapters.batch(() => {
-        adapters.replaceObject(router.currentRoute, {
+      router.adapters.batch(() => {
+        router.adapters.replaceObject(router.currentRoute, {
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: adapters.makeObservable({}),
-          params: adapters.makeObservable({}),
-          pageName: routes[routes.internalError.name].pageName
+          query: router.adapters.makeObservable({}),
+          params: router.adapters.makeObservable({}),
+          pageId: routes[routes.internalError.name].pageId
         });
         router.isRedirecting = false;
       });
       return Promise.resolve();
     }
-    adapters.batch(() => {
-      adapters.replaceObject(router.currentRoute, {
+    router.adapters.batch(() => {
+      router.adapters.replaceObject(router.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,
         query: getQueryValues({ route: nextRoute, pathname: nextUrl }),
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
-        pageName: routes[nextRoute.name].pageName
+        pageId: routes[nextRoute.name].pageId
       });
       const lastUrl = router.routesHistory[router.routesHistory.length - 1];
       if (lastUrl !== nextUrl) {

package/dist/cjs/preact/index.js

@@ -38,12 +38,9 @@ function RouterInner(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.adapters.batch(() => props.router.routesHistory.pop());
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...(0, import_reactive_route.getInitialRoute)({
-          routes: props.routes,
-          pathname: import_reactive_route.history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: import_reactive_route.history.location.pathname,
+        noHistoryPush: true
       });
     });
   }, []);
@@ -62,7 +59,7 @@ function RouterInner(props) {
     if (isRedirecting) preventRedirect = true;
     else if (loadedComponentName === currentRoute.name) preventRedirect = true;
     else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageName) {
+      if (loadedComponentPage === currentRoute.pageId) {
         props.router.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
@@ -75,7 +72,7 @@ function RouterInner(props) {
       props.beforeSetPageComponent?.(componentConfig);
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageName;
+      config.loadedComponentPage = componentConfig.pageId;
     });
   }, []);
   (0, import_hooks.useState)(() => {
@@ -93,7 +90,8 @@ function RouterInner(props) {
   }, []);
   if (!config.loadedComponentName) return null;
   const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps });
+  if (LoadedComponent)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
   return null;
 }
 function Router(props) {

package/dist/cjs/react/index.js

@@ -38,12 +38,9 @@ function RouterInner(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.adapters.batch(() => props.router.routesHistory.pop());
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...(0, import_reactive_route.getInitialRoute)({
-          routes: props.routes,
-          pathname: import_reactive_route.history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: import_reactive_route.history.location.pathname,
+        noHistoryPush: true
       });
     });
   }, []);
@@ -62,7 +59,7 @@ function RouterInner(props) {
     if (isRedirecting) preventRedirect = true;
     else if (loadedComponentName === currentRoute.name) preventRedirect = true;
     else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageName) {
+      if (loadedComponentPage === currentRoute.pageId) {
         props.router.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
@@ -75,7 +72,7 @@ function RouterInner(props) {
       props.beforeSetPageComponent?.(componentConfig);
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageName;
+      config.loadedComponentPage = componentConfig.pageId;
     });
   }, []);
   (0, import_react.useState)(() => {
@@ -93,7 +90,8 @@ function RouterInner(props) {
   }, []);
   if (!config.loadedComponentName) return null;
   const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps });
+  if (LoadedComponent)
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
   return null;
 }
 function RouterWrapper(props) {

package/dist/cjs/solid/index.js

@@ -36,6 +36,7 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
+  let currentProps = {};
   function redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
     import_reactive_route.history.listen((params) => {
@@ -44,18 +45,15 @@ function Router(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.routesHistory.pop();
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...(0, import_reactive_route.getInitialRoute)({
-          routes: props.routes,
-          pathname: import_reactive_route.history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: import_reactive_route.history.location.pathname,
+        noHistoryPush: true
       });
     });
   }
   function setLoadedComponent() {
     const currentRouteName = props.router.currentRoute.name;
-    const currentRoutePage = props.router.currentRoute.pageName;
+    const currentRoutePage = props.router.currentRoute.pageId;
     const componentConfig = props.routes[currentRouteName];
     let preventRedirect = false;
     if (props.router.isRedirecting) preventRedirect = true;
@@ -64,6 +62,7 @@ function Router(props) {
     } else if (config.loadedComponentPage != null && currentRouteName != null) {
       if (config.loadedComponentPage === currentRoutePage) {
         props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        currentProps = "props" in componentConfig ? componentConfig.props : {};
         preventRedirect = true;
       }
     }
@@ -75,8 +74,9 @@ function Router(props) {
       props.beforeSetPageComponent?.(componentConfig);
       props.router.adapters.batch(() => {
         props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        currentProps = "props" in componentConfig ? componentConfig.props : {};
         config.loadedComponentName = currentRouteName;
-        config.loadedComponentPage = componentConfig.pageName;
+        config.loadedComponentPage = componentConfig.pageId;
       });
     });
   }
@@ -99,7 +99,14 @@ function Router(props) {
           get component() {
             return props.routes[config.loadedComponentName]?.component || void 0;
           }
-        }, () => config.currentProps));
+        }, () => Object.keys(config.currentProps).reduce((acc, key) => {
+          acc[key] = currentProps[key];
+          return acc;
+        }, {}), {
+          get router() {
+            return props.router;
+          }
+        }));
       }
     })
   );

package/dist/core/createRouter.d.ts

@@ -1,4 +1,9 @@
-import { InterfaceRouterStore, TypeCreateRouterStore } from './types/InterfaceRouterStore';
+import { TypeAdapters } from './types/TypeAdapters';
 import { TypeRoute } from './types/TypeRoute';
-export declare function createRouter<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>({ adapters, routes, lifecycleParams, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
+import { TypeRouter } from './types/TypeRouter';
+export declare function createRouter<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>({ routes, adapters, lifecycleParams, }: {
+    routes: TRoutes;
+    adapters: TypeAdapters;
+    lifecycleParams?: Array<any>;
+}): TypeRouter<TRoutes>;
 //# sourceMappingURL=createRouter.d.ts.map

package/dist/core/createRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAY9C,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,QAAQ,EACR,MAAM,EACN,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAiPhE"}
+{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAYhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,MAAM,EACN,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAoPtB"}

package/dist/core/createRoutes.d.ts

@@ -4,7 +4,7 @@ export declare function createRoutes<TConfig extends {
 }>(config: TConfig): {
     [Key in keyof TConfig]: TConfig[Key] & {
         name: Key;
-        pageName?: string;
+        pageId?: string;
         component?: any;
         otherExports?: Record<string, any>;
     };

package/dist/core/createRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../../packages/core/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,YAAY,CAC1B,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY;CAAE,EAEvF,MAAM,EAAE,OAAO,GACd;KACA,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;QACrC,IAAI,EAAE,GAAG,CAAC;QACV,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../../packages/core/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,YAAY,CAC1B,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY;CAAE,EAEvF,MAAM,EAAE,OAAO,GACd;KACA,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;QACrC,IAAI,EAAE,GAAG,CAAC;QACV,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}

package/dist/core/index.d.ts

@@ -1,13 +1,11 @@
 export { createRouter } from './createRouter';
 export { createRoutes } from './createRoutes';
-export type { InterfaceRouterStore, TypeAdapters } from './types/InterfaceRouterStore';
+export type { TypeAdapters } from './types/TypeAdapters';
 export type { TypeCurrentRoute } from './types/TypeCurrentRoute';
 export type { TypePropsRouter } from './types/TypePropsRouter';
-export type { TypeRedirectToParams } from './types/TypeRedirectToParams';
+export type { TypeRedirectParams } from './types/TypeRedirectParams';
 export type { TypeRoute } from './types/TypeRoute';
-export { isDynamicRoute } from './utils/dynamic';
-export { findRouteByPathname } from './utils/findRouteByPathname';
-export { getInitialRoute } from './utils/getInitialRoute';
+export type { TypeRouter } from './types/TypeRouter';
 export { history } from './utils/history';
 export { loadComponentToConfig } from './utils/loadComponentToConfig';
 export { RedirectError } from './utils/RedirectError';

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACvF,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/core/types/TypeAdapters.d.ts

@@ -0,0 +1,9 @@
+export type TypeAdapters = {
+    batch: (cb: () => void) => void;
+    autorun: (cb: () => void) => any;
+    replaceObject: <TObj extends Record<string, any>>(obj: TObj, newObj: TObj) => void;
+    makeObservable: <TObj extends Record<string, any>>(obj: TObj) => TObj;
+    observer?: (comp: any) => any;
+    immediateSetComponent?: boolean;
+};
+//# sourceMappingURL=TypeAdapters.d.ts.map

package/dist/core/types/TypeAdapters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeAdapters.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeAdapters.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;IACnF,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC"}

package/dist/core/types/TypeCurrentRoute.d.ts

@@ -5,6 +5,6 @@ export type TypeCurrentRoute<TRoute extends TypeRoute> = {
     props: TRoute['props'];
     query: Partial<Record<keyof TRoute['query'], string>>;
     params: Record<keyof TRoute['params'], string>;
-    pageName: TRoute['pageName'];
+    pageId: TRoute['pageId'];
 };
 //# sourceMappingURL=TypeCurrentRoute.d.ts.map

package/dist/core/types/TypeCurrentRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeCurrentRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeCurrentRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,SAAS,IAAI;IACvD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"TypeCurrentRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeCurrentRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,SAAS,IAAI;IACvD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC1B,CAAC"}

package/dist/core/types/TypePropsRouter.d.ts

@@ -1,8 +1,8 @@
-import { InterfaceRouterStore } from './InterfaceRouterStore';
 import { TypeRoute } from './TypeRoute';
+import { TypeRouter } from './TypeRouter';
 export type TypePropsRouter<TRoutes extends Record<string, TypeRoute>> = {
     routes: TRoutes;
-    router: InterfaceRouterStore<TRoutes>;
+    router: TypeRouter<TRoutes>;
     beforeMount?: () => void;
     beforeSetPageComponent?: (componentConfig: TRoutes[keyof TRoutes]) => void;
     beforeUpdatePageComponent?: () => void;

package/dist/core/types/TypePropsRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypePropsRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypePropsRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,sBAAsB,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3E,yBAAyB,CAAC,EAAE,MAAM,IAAI,CAAC;CACxC,CAAC"}
+{"version":3,"file":"TypePropsRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypePropsRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,sBAAsB,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3E,yBAAyB,CAAC,EAAE,MAAM,IAAI,CAAC;CACxC,CAAC"}

package/dist/core/types/{TypeRedirectToParams.d.ts → TypeRedirectParams.d.ts}

@@ -1,6 +1,6 @@
 import { TypeRoute } from './TypeRoute';
 import { TypeValidator } from './TypeValidator';
-export type TypeRedirectToParams<TRoutes extends Record<string, TypeRoute>, TRouteName extends keyof TRoutes> = TRoutes[TRouteName]['params'] extends Record<string, TypeValidator> ? TRoutes[TRouteName]['query'] extends Record<string, TypeValidator> ? {
+export type TypeRedirectParams<TRoutes extends Record<string, TypeRoute>, TRouteName extends keyof TRoutes> = TRoutes[TRouteName]['params'] extends Record<string, TypeValidator> ? TRoutes[TRouteName]['query'] extends Record<string, TypeValidator> ? {
     route: TRouteName;
     params: Record<keyof TRoutes[TRouteName]['params'], string>;
     query?: Partial<Record<keyof TRoutes[TRouteName]['query'], string>>;
@@ -17,4 +17,4 @@ export type TypeRedirectToParams<TRoutes extends Record<string, TypeRoute>, TRou
     route: TRouteName;
     noHistoryPush?: boolean;
 };
-//# sourceMappingURL=TypeRedirectToParams.d.ts.map
+//# sourceMappingURL=TypeRedirectParams.d.ts.map

package/dist/core/types/TypeRedirectParams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeRedirectParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,CAC5B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACzC,UAAU,SAAS,MAAM,OAAO,IAC9B,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACnE,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACH,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC"}

package/dist/core/types/TypeRoute.d.ts

@@ -1,7 +1,6 @@
 import { TypeRouteRaw } from './TypeRouteRaw';
 export type TypeRoute = TypeRouteRaw & {
     name: string;
-    pageName?: string;
     component?: any;
     otherExports?: Record<string, any>;
 };

package/dist/core/types/TypeRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,CAAC"}
+{"version":3,"file":"TypeRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,CAAC"}

package/dist/core/types/TypeRouteRaw.d.ts

@@ -5,6 +5,7 @@ export type TypeRouteRaw = {
     loader: () => Promise<{
         default: any;
     }>;
+    pageId?: string;
     props?: Record<string, any>;
     query?: Record<string, TypeValidator>;
     params?: Record<string, TypeValidator>;

package/dist/core/types/TypeRouteRaw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeRouteRaw.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouteRaw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACzF,CAAC"}
+{"version":3,"file":"TypeRouteRaw.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouteRaw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACzF,CAAC"}

package/dist/core/types/TypeRouter.d.ts

@@ -0,0 +1,21 @@
+import { TypeAdapters } from './TypeAdapters';
+import { TypeCurrentRoute } from './TypeCurrentRoute';
+import { TypeRedirectParams } from './TypeRedirectParams';
+import { TypeRoute } from './TypeRoute';
+export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
+    routes: TRoutes;
+    adapters: TypeAdapters;
+    currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+    routesHistory: Array<string>;
+    isRedirecting: boolean;
+    redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<void>;
+    restoreFromURL(params: {
+        pathname: string;
+        noHistoryPush?: boolean;
+    }): Promise<void>;
+    restoreFromServer(obj: {
+        routesHistory: Array<string>;
+        currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+    }): Promise<void>;
+};
+//# sourceMappingURL=TypeRouter.d.ts.map

package/dist/core/types/TypeRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IAAI;IACjG,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,UAAU,SAAS,MAAM,OAAO,EACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,iBAAiB,CAAC,GAAG,EAAE;QACrB,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;KACxD,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB,CAAC"}

package/dist/core/utils/getInitialRoute.d.ts

@@ -1,7 +1,7 @@
-import { TypeRedirectToParams } from '../types/TypeRedirectToParams';
+import { TypeRedirectParams } from '../types/TypeRedirectParams';
 import { TypeRoute } from '../types/TypeRoute';
 export declare function getInitialRoute<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>>(params: {
     routes: TRoutes;
     pathname: string;
-}): TypeRedirectToParams<TRoutes, keyof TRoutes>;
+}): TypeRedirectParams<TRoutes, keyof TRoutes>;
 //# sourceMappingURL=getInitialRoute.d.ts.map

package/dist/core/utils/getInitialRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAU7F"}
+{"version":3,"file":"getInitialRoute.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/getInitialRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,CAU3F"}

package/dist/core/utils/loadComponentToConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadComponentToConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/loadComponentToConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBjF"}
+{"version":3,"file":"loadComponentToConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/loadComponentToConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAajF"}

package/dist/core/utils/replaceDynamicValues.d.ts

@@ -1,7 +1,6 @@
 import { TypeCurrentRoute } from '../types/TypeCurrentRoute';
 import { TypeRoute } from '../types/TypeRoute';
-import { TypeRouteWithParams } from '../types/TypeRouteWithParams';
-export declare function replaceDynamicValues<TRouteItem extends TypeRoute | TypeRouteWithParams | TypeCurrentRoute<TypeRoute>>({ route, params, }: {
+export declare function replaceDynamicValues<TRouteItem extends TypeRoute | TypeCurrentRoute<TypeRoute>>({ route, params, }: {
     route: TRouteItem;
     params?: Record<keyof TRouteItem['params'], string>;
 }): string;

package/dist/core/utils/replaceDynamicValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/replaceDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAMnE,wBAAgB,oBAAoB,CAClC,UAAU,SAAS,SAAS,GAAG,mBAAmB,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAChF,EACA,KAAK,EACL,MAAkB,GACnB,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,MAAM,CAcT"}
+{"version":3,"file":"replaceDynamicValues.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/replaceDynamicValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM/C,wBAAgB,oBAAoB,CAAC,UAAU,SAAS,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,EAC/F,KAAK,EACL,MAAkB,GACnB,EAAE;IACD,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,MAAM,CAcT"}

package/dist/esm/index.js

@@ -12,9 +12,6 @@ function isDynamic(param) {
 function clearDynamic(param) {
   return param.replace(new RegExp(`^${constants.dynamicSeparator}`), "");
 }
-function isDynamicRoute(route) {
-  return "params" in route;
-}
 
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
@@ -114,13 +111,11 @@ var history = constants.isClient ? createBrowserHistory() : null;
 // packages/core/utils/loadComponentToConfig.ts
 function loadComponentToConfig(params) {
   const { route } = params;
-  if (!route.component && route.loader) {
-    const loadingFn = route.loader;
-    return loadingFn().then((module) => {
-      const { default: component, pageName, ...rest } = module;
+  if (!route.component) {
+    return route.loader().then((module) => {
+      const { default: component, ...rest } = module;
       route.component = component;
       route.otherExports = rest;
-      route.pageName = pageName;
     });
   }
   return Promise.resolve();
@@ -162,23 +157,26 @@ function replaceDynamicValues({
 
 // packages/core/createRouter.ts
 function createRouter({
-  adapters,
   routes,
+  adapters,
   lifecycleParams
 }) {
   const router = adapters.makeObservable({
     routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
-    redirectTo: void 0,
+    redirect: void 0,
     restoreFromURL: void 0,
     restoreFromServer: void 0,
     get adapters() {
       return adapters;
+    },
+    get routes() {
+      return routes;
     }
   });
   router.restoreFromServer = function restoreFromServer(obj) {
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
@@ -188,9 +186,9 @@ function createRouter({
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
   router.restoreFromURL = function restoreFromURL(params) {
-    return router.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
+    return router.redirect(getInitialRoute({ routes, ...params }));
   };
-  router.redirectTo = async function redirectTo(config) {
+  router.redirect = async function redirect(config) {
     const { route: routeName, noHistoryPush } = config;
     let currentRoute;
     let currentPathname;
@@ -229,8 +227,8 @@ function createRouter({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        adapters.batch(() => {
-          adapters.replaceObject(router.currentRoute, {
+        router.adapters.batch(() => {
+          router.adapters.replaceObject(router.currentRoute, {
             ...router.currentRoute,
             query: nextQuery || {}
           });
@@ -246,7 +244,7 @@ function createRouter({
       }
       return Promise.resolve();
     }
-    adapters.batch(() => {
+    router.adapters.batch(() => {
       router.isRedirecting = true;
     });
     try {
@@ -286,7 +284,7 @@ function createRouter({
       };
       await currentRoute?.beforeLeave?.(config2, ...lifecycleParams || []);
       const redirectConfig = await nextRoute.beforeEnter?.(config2, ...lifecycleParams || []);
-      if (redirectConfig) return redirectTo(redirectConfig);
+      if (redirectConfig) return redirect(redirectConfig);
       await loadComponentToConfig({ route: routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
@@ -297,27 +295,27 @@ function createRouter({
       }
       console.error(error);
       await loadComponentToConfig({ route: routes.internalError });
-      adapters.batch(() => {
-        adapters.replaceObject(router.currentRoute, {
+      router.adapters.batch(() => {
+        router.adapters.replaceObject(router.currentRoute, {
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: adapters.makeObservable({}),
-          params: adapters.makeObservable({}),
-          pageName: routes[routes.internalError.name].pageName
+          query: router.adapters.makeObservable({}),
+          params: router.adapters.makeObservable({}),
+          pageId: routes[routes.internalError.name].pageId
         });
         router.isRedirecting = false;
       });
       return Promise.resolve();
     }
-    adapters.batch(() => {
-      adapters.replaceObject(router.currentRoute, {
+    router.adapters.batch(() => {
+      router.adapters.replaceObject(router.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,
         query: getQueryValues({ route: nextRoute, pathname: nextUrl }),
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
-        pageName: routes[nextRoute.name].pageName
+        pageId: routes[nextRoute.name].pageId
       });
       const lastUrl = router.routesHistory[router.routesHistory.length - 1];
       if (lastUrl !== nextUrl) {
@@ -353,10 +351,7 @@ export {
   RedirectError,
   createRouter,
   createRoutes,
-  findRouteByPathname,
-  getInitialRoute,
   history,
-  isDynamicRoute,
   loadComponentToConfig,
   replaceDynamicValues
 };

package/dist/esm/preact/index.js

@@ -1,6 +1,6 @@
 // packages/preact/Router.tsx
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import { getInitialRoute, history } from "reactive-route";
+import { history } from "reactive-route";
 import { jsx } from "preact/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
@@ -12,12 +12,9 @@ function RouterInner(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.adapters.batch(() => props.router.routesHistory.pop());
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...getInitialRoute({
-          routes: props.routes,
-          pathname: history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: history.location.pathname,
+        noHistoryPush: true
       });
     });
   }, []);
@@ -36,7 +33,7 @@ function RouterInner(props) {
     if (isRedirecting) preventRedirect = true;
     else if (loadedComponentName === currentRoute.name) preventRedirect = true;
     else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageName) {
+      if (loadedComponentPage === currentRoute.pageId) {
         props.router.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
@@ -49,7 +46,7 @@ function RouterInner(props) {
       props.beforeSetPageComponent?.(componentConfig);
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageName;
+      config.loadedComponentPage = componentConfig.pageId;
     });
   }, []);
   useState(() => {
@@ -67,7 +64,8 @@ function RouterInner(props) {
   }, []);
   if (!config.loadedComponentName) return null;
   const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent) return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps });
+  if (LoadedComponent)
+    return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
   return null;
 }
 function Router(props) {

package/dist/esm/react/index.js

@@ -1,6 +1,6 @@
 // packages/react/Router.tsx
 import { memo, useCallback, useEffect, useRef, useState } from "react";
-import { getInitialRoute, history } from "reactive-route";
+import { history } from "reactive-route";
 import { jsx } from "react/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
@@ -12,12 +12,9 @@ function RouterInner(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.adapters.batch(() => props.router.routesHistory.pop());
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...getInitialRoute({
-          routes: props.routes,
-          pathname: history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: history.location.pathname,
+        noHistoryPush: true
       });
     });
   }, []);
@@ -36,7 +33,7 @@ function RouterInner(props) {
     if (isRedirecting) preventRedirect = true;
     else if (loadedComponentName === currentRoute.name) preventRedirect = true;
     else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageName) {
+      if (loadedComponentPage === currentRoute.pageId) {
         props.router.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
@@ -49,7 +46,7 @@ function RouterInner(props) {
       props.beforeSetPageComponent?.(componentConfig);
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
       config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageName;
+      config.loadedComponentPage = componentConfig.pageId;
     });
   }, []);
   useState(() => {
@@ -67,7 +64,8 @@ function RouterInner(props) {
   }, []);
   if (!config.loadedComponentName) return null;
   const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
-  if (LoadedComponent) return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps });
+  if (LoadedComponent)
+    return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
   return null;
 }
 function RouterWrapper(props) {

package/dist/esm/solid/index.js

@@ -1,7 +1,7 @@
 // packages/solid/Router.tsx
 import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
-import { getInitialRoute, history } from "reactive-route";
+import { history } from "reactive-route";
 import { Show } from "solid-js";
 import { Dynamic } from "solid-js/web";
 function Router(props) {
@@ -10,6 +10,7 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
+  let currentProps = {};
   function redirectOnHistoryPop() {
     if (!history) return;
     history.listen((params) => {
@@ -18,18 +19,15 @@ function Router(props) {
       if (previousRoutePathname === params.location.pathname) {
         props.router.routesHistory.pop();
       }
-      void props.router.redirectTo({
-        noHistoryPush: true,
-        ...getInitialRoute({
-          routes: props.routes,
-          pathname: history.location.pathname
-        })
+      void props.router.restoreFromURL({
+        pathname: history.location.pathname,
+        noHistoryPush: true
       });
     });
   }
   function setLoadedComponent() {
     const currentRouteName = props.router.currentRoute.name;
-    const currentRoutePage = props.router.currentRoute.pageName;
+    const currentRoutePage = props.router.currentRoute.pageId;
     const componentConfig = props.routes[currentRouteName];
     let preventRedirect = false;
     if (props.router.isRedirecting) preventRedirect = true;
@@ -38,6 +36,7 @@ function Router(props) {
     } else if (config.loadedComponentPage != null && currentRouteName != null) {
       if (config.loadedComponentPage === currentRoutePage) {
         props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        currentProps = "props" in componentConfig ? componentConfig.props : {};
         preventRedirect = true;
       }
     }
@@ -49,8 +48,9 @@ function Router(props) {
       props.beforeSetPageComponent?.(componentConfig);
       props.router.adapters.batch(() => {
         props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        currentProps = "props" in componentConfig ? componentConfig.props : {};
         config.loadedComponentName = currentRouteName;
-        config.loadedComponentPage = componentConfig.pageName;
+        config.loadedComponentPage = componentConfig.pageId;
       });
     });
   }
@@ -73,7 +73,14 @@ function Router(props) {
           get component() {
             return props.routes[config.loadedComponentName]?.component || void 0;
           }
-        }, () => config.currentProps));
+        }, () => Object.keys(config.currentProps).reduce((acc, key) => {
+          acc[key] = currentProps[key];
+          return acc;
+        }, {}), {
+          get router() {
+            return props.router;
+          }
+        }));
       }
     })
   );

package/dist/preact/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAkGtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgGrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}

package/dist/react/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAuGtF,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgGrE,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}

package/dist/solid/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAItF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAgGhG"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAsGhG"}

package/dist/tsconfig.types.react.tsbuildinfo

@@ -1 +1 @@
-{"root":["../packages/adapters/kr-observable-preact.ts","../packages/adapters/kr-observable-react.ts","../packages/adapters/kr-observable-solid.ts","../packages/adapters/mobx-preact.ts","../packages/adapters/mobx-react.ts","../packages/adapters/mobx-solid.ts","../packages/adapters/solid.ts","../packages/core/createRouter.ts","../packages/core/createRoutes.ts","../packages/core/index.ts","../packages/core/types/InterfaceRouterStore.ts","../packages/core/types/TypeCurrentRoute.ts","../packages/core/types/TypeLifecycleConfig.ts","../packages/core/types/TypePropsRouter.ts","../packages/core/types/TypeRedirectToParams.ts","../packages/core/types/TypeRoute.ts","../packages/core/types/TypeRouteRaw.ts","../packages/core/types/TypeRouteWithParams.ts","../packages/core/types/TypeValidator.ts","../packages/core/utils/PreventError.ts","../packages/core/utils/RedirectError.ts","../packages/core/utils/addNames.ts","../packages/core/utils/constants.ts","../packages/core/utils/dynamic.ts","../packages/core/utils/findRouteByPathname.ts","../packages/core/utils/getDynamicValues.ts","../packages/core/utils/getInitialRoute.ts","../packages/core/utils/getQueryValues.ts","../packages/core/utils/getTypedEntries.ts","../packages/core/utils/history.ts","../packages/core/utils/loadComponentToConfig.ts","../packages/core/utils/queryString.ts","../packages/core/utils/replaceDynamicValues.ts","../packages/preact/Router.tsx","../packages/preact/index.ts","../packages/react/Router.tsx","../packages/react/index.ts"],"version":"5.9.2"}
+{"root":["../packages/adapters/kr-observable-preact.ts","../packages/adapters/kr-observable-react.ts","../packages/adapters/kr-observable-solid.ts","../packages/adapters/mobx-preact.ts","../packages/adapters/mobx-react.ts","../packages/adapters/mobx-solid.ts","../packages/adapters/solid.ts","../packages/core/createRouter.ts","../packages/core/createRoutes.ts","../packages/core/index.ts","../packages/core/types/TypeAdapters.ts","../packages/core/types/TypeCurrentRoute.ts","../packages/core/types/TypeLifecycleConfig.ts","../packages/core/types/TypePropsRouter.ts","../packages/core/types/TypeRedirectParams.ts","../packages/core/types/TypeRoute.ts","../packages/core/types/TypeRouteRaw.ts","../packages/core/types/TypeRouter.ts","../packages/core/types/TypeValidator.ts","../packages/core/utils/PreventError.ts","../packages/core/utils/RedirectError.ts","../packages/core/utils/addNames.ts","../packages/core/utils/constants.ts","../packages/core/utils/dynamic.ts","../packages/core/utils/findRouteByPathname.ts","../packages/core/utils/getDynamicValues.ts","../packages/core/utils/getInitialRoute.ts","../packages/core/utils/getQueryValues.ts","../packages/core/utils/getTypedEntries.ts","../packages/core/utils/history.ts","../packages/core/utils/loadComponentToConfig.ts","../packages/core/utils/queryString.ts","../packages/core/utils/replaceDynamicValues.ts","../packages/preact/Router.tsx","../packages/preact/index.ts","../packages/react/Router.tsx","../packages/react/index.ts"],"version":"5.9.2"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.22",
+  "version": "0.0.1-alpha.24",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -40,12 +40,14 @@
     "vite-plugin-babel": "1.3.2",
     "@biomejs/biome": "2.2.2",
     "@espcom/esbuild-plugin-replace": "1.3.1",
+    "@espcom/esbuild-plugin-compress": "1.2.0",
     "@solidjs/testing-library": "0.8.10",
     "@testing-library/react": "16.3.0",
     "@testing-library/preact": "3.2.4",
     "@types/lodash": "4.17.16",
     "@types/node": "22.14.1",
     "@vitest/coverage-istanbul": "3.2.4",
+    "vite-tsconfig-paths": "5.1.4",
     "@preact/preset-vite": "2.10.2",
     "badge-maker": "5.0.2",
     "esbuild": "0.25.10",
@@ -62,7 +64,7 @@
     "solid-js": "1.9.9",
     "tsx": "4.20.5",
     "typescript": "5.9.2",
-    "vitepress": "1.6.4",
+    "vitepress": "2.0.0-alpha.12",
     "vitepress-plugin-group-icons": "1.6.3",
     "vitest": "3.2.4",
     "xml-splitter": "1.2.1"

package/dist/core/types/InterfaceRouterStore.d.ts

@@ -1,28 +0,0 @@
-import { TypeCurrentRoute } from './TypeCurrentRoute';
-import { TypeRedirectToParams } from './TypeRedirectToParams';
-import { TypeRoute } from './TypeRoute';
-export type TypeAdapters = {
-    batch: (cb: () => void) => void;
-    autorun: (cb: () => void) => any;
-    replaceObject: <TObj extends Record<string, any>>(obj: TObj, newObj: TObj) => void;
-    makeObservable: <TObj extends Record<string, any>>(obj: TObj) => TObj;
-    observer?: (comp: any) => any;
-    immediateSetComponent?: boolean;
-};
-export type TypeCreateRouterStore<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
-    routes: TRoutes;
-    lifecycleParams?: Array<any>;
-    adapters: TypeAdapters;
-};
-export type InterfaceRouterStore<TRoutes extends Record<string | 'notFound' | 'internalError', TypeRoute>> = {
-    adapters: TypeAdapters;
-    currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
-    routesHistory: Array<string>;
-    isRedirecting: boolean;
-    redirectTo<TRouteName extends keyof TRoutes>(config: TypeRedirectToParams<TRoutes, TRouteName>): Promise<void>;
-    restoreFromURL(params: {
-        pathname: string;
-    }): Promise<void>;
-    restoreFromServer(obj: InterfaceRouterStore<TRoutes>): Promise<void>;
-};
-//# sourceMappingURL=InterfaceRouterStore.d.ts.map

package/dist/core/types/InterfaceRouterStore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"InterfaceRouterStore.d.ts","sourceRoot":"","sources":["../../../packages/core/types/InterfaceRouterStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;IACnF,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IACtE;IACF,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,IACtE;IACF,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,UAAU,SAAS,MAAM,OAAO,EACzC,MAAM,EAAE,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE,CAAC"}

package/dist/core/types/TypeRedirectToParams.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypeRedirectToParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectToParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACzC,UAAU,SAAS,MAAM,OAAO,IAC9B,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACnE,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACH,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC"}

package/dist/core/types/TypeRouteWithParams.d.ts

@@ -1,6 +0,0 @@
-import { TypeRoute } from './TypeRoute';
-export type TypeRouteWithParams = Omit<TypeRoute, 'params'> & {
-    params: Record<string, string>;
-    query: Record<string, string>;
-};
-//# sourceMappingURL=TypeRouteWithParams.d.ts.map

package/dist/core/types/TypeRouteWithParams.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypeRouteWithParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRouteWithParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG;IAC5D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC"}