reactive-route 0.0.1-alpha.0 → 0.0.1-alpha.2

package/dist/cjs/index.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var core_exports = {};
 __export(core_exports, {
   createRouterConfig: () => createRouterConfig,
+  createRouterStore: () => createRouterStore,
   findRouteByPathname: () => findRouteByPathname,
   getInitialRoute: () => getInitialRoute,
   history: () => history,
@@ -53,6 +54,9 @@ function createRouterConfig(config) {
   return addNames(config);
 }
 
+// packages/core/createRouterStore.ts
+var import_query_string2 = __toESM(require("query-string"));
+
 // packages/core/utils/constants.ts
 var constants = {
   dynamicSeparator: ":",
@@ -73,37 +77,6 @@ function isDynamicRoute(route) {
   return "params" in route;
 }
 
-// packages/core/utils/findRouteByPathname.ts
-function completeStaticMatch(pathname, path) {
-  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
-}
-function findRouteByPathname({
-  pathname,
-  routes
-}) {
-  let dynamicRouteMatch;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
-  for (const routeName in routes) {
-    if (!Object.hasOwn(routes, routeName)) continue;
-    const route = routes[routeName];
-    if (completeStaticMatch(pathname, route.path)) return route;
-    if (dynamicRouteMatch) continue;
-    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
-    if (routePathnameArray.length !== pathnameArray.length) continue;
-    const someParamInvalid = routePathnameArray.some((paramName, i) => {
-      const paramFromUrl = pathnameArray[i];
-      if (!isDynamic(paramName)) return paramName !== paramFromUrl;
-      const validator = route.params?.[clearDynamic(paramName)];
-      if (typeof validator !== "function") {
-        throw new Error(`findRoute: missing validator for param "${paramName}"`);
-      }
-      return !validator(paramFromUrl);
-    });
-    if (!someParamInvalid) dynamicRouteMatch = route;
-  }
-  return dynamicRouteMatch;
-}
-
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
   const { route, pathname } = params;
@@ -138,16 +111,6 @@ function getQueryValues(params) {
   return query;
 }
 
-// packages/core/utils/getInitialRoute.ts
-function getInitialRoute(params) {
-  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
-  return {
-    route: route.name,
-    query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
-  };
-}
-
 // packages/core/utils/history.ts
 var import_history = require("history");
 var history = constants.isClient ? (0, import_history.createBrowserHistory)() : null;
@@ -184,3 +147,224 @@ function replaceDynamicValues({
     return encodeURIComponent(value);
   });
 }
+
+// packages/core/createRouterStore.ts
+function createRouterStore({
+  batch,
+  routes,
+  autorun,
+  replaceObject,
+  routeError500,
+  makeObservable,
+  lifecycleParams
+}) {
+  const routerStore = makeObservable({
+    routesHistory: [],
+    currentRoute: {},
+    isRedirecting: false,
+    redirectTo: void 0,
+    utils: {
+      batch,
+      autorun,
+      replaceObject,
+      makeObservable
+    }
+  });
+  routerStore.redirectTo = async function redirectTo(config) {
+    const { route: routeName, noHistoryPush, asClient } = config;
+    const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
+    let currentRoute;
+    let currentPathname;
+    let currentUrl;
+    let currentSearch;
+    let currentQuery;
+    if (routerStore.currentRoute?.name) {
+      currentRoute = routes[routerStore.currentRoute.name];
+      currentPathname = replaceDynamicValues({
+        route: currentRoute,
+        params: routerStore.currentRoute.params
+      });
+      currentUrl = import_query_string2.default.stringifyUrl({
+        url: currentPathname,
+        query: routerStore.currentRoute.query
+      });
+      currentQuery = routerStore.currentRoute.query;
+      currentSearch = import_query_string2.default.stringify(routerStore.currentRoute.query);
+    }
+    const nextRoute = routes[routeName];
+    const nextPathname = replaceDynamicValues({
+      route: nextRoute,
+      params: "params" in config ? config.params : void 0
+    });
+    let nextQuery;
+    let nextUrl = nextPathname;
+    let nextSearch;
+    if ("query" in config && config.query) {
+      const clearedQuery = getQueryValues({
+        route: nextRoute,
+        pathname: `${nextPathname}?${import_query_string2.default.stringify(config.query)}`
+      });
+      if (Object.keys(clearedQuery).length > 0) {
+        nextQuery = clearedQuery;
+        nextSearch = import_query_string2.default.stringify(clearedQuery);
+        nextUrl = import_query_string2.default.stringifyUrl({ url: nextPathname, query: clearedQuery });
+      }
+    }
+    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentPathname === nextPathname) {
+      if (currentSearch !== nextSearch) {
+        batch(() => {
+          replaceObject(routerStore.currentRoute.query, nextQuery || {});
+          routerStore.routesHistory.push(nextUrl);
+        });
+        if (history && !noHistoryPush) {
+          history.push({
+            hash: history.location.hash,
+            search: nextSearch,
+            pathname: nextPathname
+          });
+        }
+      }
+      return Promise.resolve();
+    }
+    batch(() => {
+      routerStore.isRedirecting = true;
+    });
+    try {
+      await currentRoute?.beforeLeave?.(
+        {
+          nextUrl,
+          nextRoute,
+          nextQuery,
+          nextSearch,
+          nextPathname,
+          currentUrl,
+          currentQuery,
+          currentRoute,
+          currentSearch,
+          currentPathname
+        },
+        ...lifecycleParams || []
+      );
+      const redirectConfig = await nextRoute.beforeEnter?.(
+        {
+          nextUrl,
+          nextRoute,
+          nextQuery,
+          nextSearch,
+          nextPathname,
+          currentUrl,
+          currentQuery,
+          currentRoute,
+          currentSearch,
+          currentPathname
+        },
+        ...lifecycleParams || []
+      );
+      if (typeof redirectConfig === "object") {
+        if (isClient) return redirectTo({ ...redirectConfig, asClient });
+        const redirectRoute = routes[redirectConfig.route];
+        const redirectParams = "params" in redirectConfig && redirectConfig.params ? redirectConfig.params : void 0;
+        let redirectUrl = replaceDynamicValues({
+          params: redirectParams,
+          route: redirectRoute
+        });
+        if ("query" in redirectConfig && redirectConfig.query) {
+          const clearedQuery = getQueryValues({
+            route: nextRoute,
+            pathname: `${nextPathname}?${import_query_string2.default.stringify(redirectConfig.query)}`
+          });
+          if (Object.keys(clearedQuery).length > 0) {
+            redirectUrl = import_query_string2.default.stringifyUrl({ url: redirectUrl, query: clearedQuery });
+          }
+        }
+        throw Object.assign(new Error(redirectUrl), { name: constants.errorRedirect });
+      }
+      await loadComponentToConfig({ route: routes[nextRoute.name] });
+    } catch (error) {
+      if (error?.name === constants.errorPrevent) return Promise.resolve();
+      if (error?.name === constants.errorRedirect) {
+        throw error;
+      }
+      console.error(error);
+      await loadComponentToConfig({ route: routeError500 });
+      batch(() => {
+        replaceObject(routerStore.currentRoute, {
+          name: routeError500.name,
+          path: routeError500.path,
+          props: routes[routeError500.name].props,
+          query: {},
+          params: {},
+          pageName: routes[routeError500.name].pageName
+        });
+        routerStore.isRedirecting = false;
+      });
+      return Promise.resolve();
+    }
+    batch(() => {
+      replaceObject(routerStore.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
+      });
+      const lastUrl = routerStore.routesHistory[routerStore.routesHistory.length - 1];
+      if (lastUrl !== nextUrl) {
+        routerStore.routesHistory.push(nextUrl);
+      }
+      if (history && !noHistoryPush) {
+        history.push({
+          hash: history.location.hash,
+          search: "query" in config ? `?${import_query_string2.default.stringify(config.query)}` : "",
+          pathname: nextPathname
+        });
+      }
+      routerStore.isRedirecting = false;
+    });
+    return Promise.resolve();
+  };
+  return routerStore;
+}
+
+// packages/core/utils/findRouteByPathname.ts
+function completeStaticMatch(pathname, path) {
+  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
+}
+function findRouteByPathname({
+  pathname,
+  routes
+}) {
+  let dynamicRouteMatch;
+  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
+  for (const routeName in routes) {
+    if (!Object.hasOwn(routes, routeName)) continue;
+    const route = routes[routeName];
+    if (completeStaticMatch(pathname, route.path)) return route;
+    if (dynamicRouteMatch) continue;
+    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+    if (routePathnameArray.length !== pathnameArray.length) continue;
+    const someParamInvalid = routePathnameArray.some((paramName, i) => {
+      const paramFromUrl = pathnameArray[i];
+      if (!isDynamic(paramName)) return paramName !== paramFromUrl;
+      const validator = route.params?.[clearDynamic(paramName)];
+      if (typeof validator !== "function") {
+        throw new Error(`findRoute: missing validator for param "${paramName}"`);
+      }
+      return !validator(paramFromUrl);
+    });
+    if (!someParamInvalid) dynamicRouteMatch = route;
+  }
+  return dynamicRouteMatch;
+}
+
+// packages/core/utils/getInitialRoute.ts
+function getInitialRoute(params) {
+  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
+  return {
+    route: route.name,
+    query: getQueryValues({ route, pathname: params.pathname }),
+    params: getDynamicValues({ route, pathname: params.pathname })
+  };
+}

package/dist/cjs/react/index.js

@@ -75,11 +75,14 @@ var VM = class {
   loadedComponentPage = void 0;
   loadedComponent;
   currentProps = {};
+  get utils() {
+    return this.props.routerStore.utils;
+  }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
     this.setLoadedComponent();
-    this.autorunDisposers.push((0, import_mobx2.autorun)(this.setLoadedComponent));
+    this.autorunDisposers.push(this.utils.autorun(this.setLoadedComponent));
   }
   redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
@@ -87,7 +90,7 @@ var VM = class {
       if (params.action !== "POP") return;
       const previousRoutePathname = this.props.routerStore.routesHistory[this.props.routerStore.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        (0, import_mobx2.runInAction)(() => this.props.routerStore.routesHistory.pop());
+        this.utils.batch(() => this.props.routerStore.routesHistory.pop());
       }
       void this.props.routerStore.redirectTo({
         noHistoryPush: true,
@@ -110,14 +113,14 @@ var VM = class {
     else if (loadedComponentPage != null && currentRouteName != null) {
       if (loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        (0, import_mobx2.runInAction)(() => {
+        this.utils.batch(() => {
           this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    (0, import_mobx2.runInAction)(() => {
+    this.utils.batch(() => {
       if (!loadedComponentName) {
         this.setComponent(currentRouteName);
       } else {
@@ -127,15 +130,13 @@ var VM = class {
     });
   };
   setComponent(currentRouteName) {
-    (0, import_mobx2.runInAction)(() => {
-      const componentConfig = this.props.routes[currentRouteName];
-      const RouteComponent = componentConfig.component;
-      this.props.beforeSetPageComponent?.(componentConfig);
-      this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      this.loadedComponentName = currentRouteName;
-      this.loadedComponentPage = componentConfig.pageName;
-      this.loadedComponent = RouteComponent;
-    });
+    const componentConfig = this.props.routes[currentRouteName];
+    const RouteComponent = componentConfig.component;
+    this.props.beforeSetPageComponent?.(componentConfig);
+    this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+    this.loadedComponentName = currentRouteName;
+    this.loadedComponentPage = componentConfig.pageName;
+    this.loadedComponent = RouteComponent;
   }
 };
 var Router = (0, import_mobx_react_lite.observer)(

package/dist/cjs/solid/index.js

@@ -29,46 +29,13 @@ var import_web = require("solid-js/web");
 var import_web2 = require("solid-js/web");
 var import_reactive_route = require("reactive-route");
 var import_solid_js2 = require("solid-js");
-var import_store2 = require("solid-js/store");
-var import_web3 = require("solid-js/web");
-
-// packages/solid/replaceObject.ts
 var import_store = require("solid-js/store");
-function replaceObject(obj, newObj) {
-  (0, import_store.modifyMutable)(obj, (0, import_store.produce)((state) => {
-    if (typeof state === "object" && state != null) {
-      for (const variableKey in state) {
-        delete state[variableKey];
-      }
-    }
-    Object.assign(state || {}, newObj);
-  }));
-}
+var import_web3 = require("solid-js/web");
 
 // packages/solid/useStore.ts
 var import_solid_js = require("solid-js");
-var getAllProperties = (object) => {
-  const properties = /* @__PURE__ */ new Set();
-  do {
-    for (const key of Reflect.ownKeys(object)) {
-      properties.add([object, key]);
-    }
-  } while ((object = Reflect.getPrototypeOf(object)) && object !== Object.prototype);
-  return properties;
-};
-function autoBind(self) {
-  for (const [object, key] of getAllProperties(self.constructor.prototype)) {
-    if (key === "constructor") continue;
-    const descriptor = Reflect.getOwnPropertyDescriptor(object, key);
-    if (descriptor && typeof descriptor.value === "function") {
-      self[key] = self[key].bind(self);
-    }
-  }
-  return self;
-}
 function useStore(ViewModel, props) {
   const vm = new ViewModel(props);
-  autoBind(vm);
   vm.beforeMount?.();
   (0, import_solid_js.onMount)(() => {
     vm.afterMount?.();
@@ -80,15 +47,18 @@ function useStore(ViewModel, props) {
 var VM = class {
   constructor(props) {
     this.props = props;
-    return (0, import_store2.createMutable)(this);
+    return (0, import_store.createMutable)(this);
   }
   loadedComponentName = void 0;
   loadedComponentPage = void 0;
   currentProps = {};
+  get utils() {
+    return this.props.routerStore.utils;
+  }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
-    (0, import_solid_js2.createRenderEffect)(() => this.setLoadedComponent());
+    this.utils.autorun(() => this.setLoadedComponent());
   }
   redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
@@ -118,12 +88,12 @@ var VM = class {
     } else if (this.loadedComponentPage != null && currentRouteName != null) {
       if (this.loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    (0, import_solid_js2.batch)(() => {
+    this.utils.batch(() => {
       if (!this.loadedComponentName) {
         this.setComponent();
       } else {
@@ -136,8 +106,8 @@ var VM = class {
     const currentRouteName = this.props.routerStore.currentRoute.name;
     const componentConfig = this.props.routes[currentRouteName];
     this.props.beforeSetPageComponent?.(componentConfig);
-    (0, import_solid_js2.batch)(() => {
-      replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+    this.utils.batch(() => {
+      this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
       this.loadedComponentName = currentRouteName;
       this.loadedComponentPage = componentConfig.pageName;
     });

package/dist/esm/index.js

@@ -11,6 +11,9 @@ function createRouterConfig(config) {
   return addNames(config);
 }
 
+// packages/core/createRouterStore.ts
+import queryString2 from "query-string";
+
 // packages/core/utils/constants.ts
 var constants = {
   dynamicSeparator: ":",
@@ -31,37 +34,6 @@ function isDynamicRoute(route) {
   return "params" in route;
 }
 
-// packages/core/utils/findRouteByPathname.ts
-function completeStaticMatch(pathname, path) {
-  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
-}
-function findRouteByPathname({
-  pathname,
-  routes
-}) {
-  let dynamicRouteMatch;
-  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
-  for (const routeName in routes) {
-    if (!Object.hasOwn(routes, routeName)) continue;
-    const route = routes[routeName];
-    if (completeStaticMatch(pathname, route.path)) return route;
-    if (dynamicRouteMatch) continue;
-    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
-    if (routePathnameArray.length !== pathnameArray.length) continue;
-    const someParamInvalid = routePathnameArray.some((paramName, i) => {
-      const paramFromUrl = pathnameArray[i];
-      if (!isDynamic(paramName)) return paramName !== paramFromUrl;
-      const validator = route.params?.[clearDynamic(paramName)];
-      if (typeof validator !== "function") {
-        throw new Error(`findRoute: missing validator for param "${paramName}"`);
-      }
-      return !validator(paramFromUrl);
-    });
-    if (!someParamInvalid) dynamicRouteMatch = route;
-  }
-  return dynamicRouteMatch;
-}
-
 // packages/core/utils/getDynamicValues.ts
 function getDynamicValues(params) {
   const { route, pathname } = params;
@@ -96,16 +68,6 @@ function getQueryValues(params) {
   return query;
 }
 
-// packages/core/utils/getInitialRoute.ts
-function getInitialRoute(params) {
-  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
-  return {
-    route: route.name,
-    query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
-  };
-}
-
 // packages/core/utils/history.ts
 import { createBrowserHistory } from "history";
 var history = constants.isClient ? createBrowserHistory() : null;
@@ -142,8 +104,230 @@ function replaceDynamicValues({
     return encodeURIComponent(value);
   });
 }
+
+// packages/core/createRouterStore.ts
+function createRouterStore({
+  batch,
+  routes,
+  autorun,
+  replaceObject,
+  routeError500,
+  makeObservable,
+  lifecycleParams
+}) {
+  const routerStore = makeObservable({
+    routesHistory: [],
+    currentRoute: {},
+    isRedirecting: false,
+    redirectTo: void 0,
+    utils: {
+      batch,
+      autorun,
+      replaceObject,
+      makeObservable
+    }
+  });
+  routerStore.redirectTo = async function redirectTo(config) {
+    const { route: routeName, noHistoryPush, asClient } = config;
+    const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
+    let currentRoute;
+    let currentPathname;
+    let currentUrl;
+    let currentSearch;
+    let currentQuery;
+    if (routerStore.currentRoute?.name) {
+      currentRoute = routes[routerStore.currentRoute.name];
+      currentPathname = replaceDynamicValues({
+        route: currentRoute,
+        params: routerStore.currentRoute.params
+      });
+      currentUrl = queryString2.stringifyUrl({
+        url: currentPathname,
+        query: routerStore.currentRoute.query
+      });
+      currentQuery = routerStore.currentRoute.query;
+      currentSearch = queryString2.stringify(routerStore.currentRoute.query);
+    }
+    const nextRoute = routes[routeName];
+    const nextPathname = replaceDynamicValues({
+      route: nextRoute,
+      params: "params" in config ? config.params : void 0
+    });
+    let nextQuery;
+    let nextUrl = nextPathname;
+    let nextSearch;
+    if ("query" in config && config.query) {
+      const clearedQuery = getQueryValues({
+        route: nextRoute,
+        pathname: `${nextPathname}?${queryString2.stringify(config.query)}`
+      });
+      if (Object.keys(clearedQuery).length > 0) {
+        nextQuery = clearedQuery;
+        nextSearch = queryString2.stringify(clearedQuery);
+        nextUrl = queryString2.stringifyUrl({ url: nextPathname, query: clearedQuery });
+      }
+    }
+    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentPathname === nextPathname) {
+      if (currentSearch !== nextSearch) {
+        batch(() => {
+          replaceObject(routerStore.currentRoute.query, nextQuery || {});
+          routerStore.routesHistory.push(nextUrl);
+        });
+        if (history && !noHistoryPush) {
+          history.push({
+            hash: history.location.hash,
+            search: nextSearch,
+            pathname: nextPathname
+          });
+        }
+      }
+      return Promise.resolve();
+    }
+    batch(() => {
+      routerStore.isRedirecting = true;
+    });
+    try {
+      await currentRoute?.beforeLeave?.(
+        {
+          nextUrl,
+          nextRoute,
+          nextQuery,
+          nextSearch,
+          nextPathname,
+          currentUrl,
+          currentQuery,
+          currentRoute,
+          currentSearch,
+          currentPathname
+        },
+        ...lifecycleParams || []
+      );
+      const redirectConfig = await nextRoute.beforeEnter?.(
+        {
+          nextUrl,
+          nextRoute,
+          nextQuery,
+          nextSearch,
+          nextPathname,
+          currentUrl,
+          currentQuery,
+          currentRoute,
+          currentSearch,
+          currentPathname
+        },
+        ...lifecycleParams || []
+      );
+      if (typeof redirectConfig === "object") {
+        if (isClient) return redirectTo({ ...redirectConfig, asClient });
+        const redirectRoute = routes[redirectConfig.route];
+        const redirectParams = "params" in redirectConfig && redirectConfig.params ? redirectConfig.params : void 0;
+        let redirectUrl = replaceDynamicValues({
+          params: redirectParams,
+          route: redirectRoute
+        });
+        if ("query" in redirectConfig && redirectConfig.query) {
+          const clearedQuery = getQueryValues({
+            route: nextRoute,
+            pathname: `${nextPathname}?${queryString2.stringify(redirectConfig.query)}`
+          });
+          if (Object.keys(clearedQuery).length > 0) {
+            redirectUrl = queryString2.stringifyUrl({ url: redirectUrl, query: clearedQuery });
+          }
+        }
+        throw Object.assign(new Error(redirectUrl), { name: constants.errorRedirect });
+      }
+      await loadComponentToConfig({ route: routes[nextRoute.name] });
+    } catch (error) {
+      if (error?.name === constants.errorPrevent) return Promise.resolve();
+      if (error?.name === constants.errorRedirect) {
+        throw error;
+      }
+      console.error(error);
+      await loadComponentToConfig({ route: routeError500 });
+      batch(() => {
+        replaceObject(routerStore.currentRoute, {
+          name: routeError500.name,
+          path: routeError500.path,
+          props: routes[routeError500.name].props,
+          query: {},
+          params: {},
+          pageName: routes[routeError500.name].pageName
+        });
+        routerStore.isRedirecting = false;
+      });
+      return Promise.resolve();
+    }
+    batch(() => {
+      replaceObject(routerStore.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
+      });
+      const lastUrl = routerStore.routesHistory[routerStore.routesHistory.length - 1];
+      if (lastUrl !== nextUrl) {
+        routerStore.routesHistory.push(nextUrl);
+      }
+      if (history && !noHistoryPush) {
+        history.push({
+          hash: history.location.hash,
+          search: "query" in config ? `?${queryString2.stringify(config.query)}` : "",
+          pathname: nextPathname
+        });
+      }
+      routerStore.isRedirecting = false;
+    });
+    return Promise.resolve();
+  };
+  return routerStore;
+}
+
+// packages/core/utils/findRouteByPathname.ts
+function completeStaticMatch(pathname, path) {
+  return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
+}
+function findRouteByPathname({
+  pathname,
+  routes
+}) {
+  let dynamicRouteMatch;
+  const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
+  for (const routeName in routes) {
+    if (!Object.hasOwn(routes, routeName)) continue;
+    const route = routes[routeName];
+    if (completeStaticMatch(pathname, route.path)) return route;
+    if (dynamicRouteMatch) continue;
+    const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
+    if (routePathnameArray.length !== pathnameArray.length) continue;
+    const someParamInvalid = routePathnameArray.some((paramName, i) => {
+      const paramFromUrl = pathnameArray[i];
+      if (!isDynamic(paramName)) return paramName !== paramFromUrl;
+      const validator = route.params?.[clearDynamic(paramName)];
+      if (typeof validator !== "function") {
+        throw new Error(`findRoute: missing validator for param "${paramName}"`);
+      }
+      return !validator(paramFromUrl);
+    });
+    if (!someParamInvalid) dynamicRouteMatch = route;
+  }
+  return dynamicRouteMatch;
+}
+
+// packages/core/utils/getInitialRoute.ts
+function getInitialRoute(params) {
+  const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes[params.fallback];
+  return {
+    route: route.name,
+    query: getQueryValues({ route, pathname: params.pathname }),
+    params: getDynamicValues({ route, pathname: params.pathname })
+  };
+}
 export {
   createRouterConfig,
+  createRouterStore,
   findRouteByPathname,
   getInitialRoute,
   history,

package/dist/esm/react/index.js

@@ -1,5 +1,5 @@
 // packages/react/Router.tsx
-import { autorun, makeAutoObservable, runInAction as runInAction2 } from "mobx";
+import { makeAutoObservable } from "mobx";
 import { observer } from "mobx-react-lite";
 import { getInitialRoute, history } from "reactive-route";
 
@@ -49,11 +49,14 @@ var VM = class {
   loadedComponentPage = void 0;
   loadedComponent;
   currentProps = {};
+  get utils() {
+    return this.props.routerStore.utils;
+  }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
     this.setLoadedComponent();
-    this.autorunDisposers.push(autorun(this.setLoadedComponent));
+    this.autorunDisposers.push(this.utils.autorun(this.setLoadedComponent));
   }
   redirectOnHistoryPop() {
     if (!history) return;
@@ -61,7 +64,7 @@ var VM = class {
       if (params.action !== "POP") return;
       const previousRoutePathname = this.props.routerStore.routesHistory[this.props.routerStore.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        runInAction2(() => this.props.routerStore.routesHistory.pop());
+        this.utils.batch(() => this.props.routerStore.routesHistory.pop());
       }
       void this.props.routerStore.redirectTo({
         noHistoryPush: true,
@@ -84,14 +87,14 @@ var VM = class {
     else if (loadedComponentPage != null && currentRouteName != null) {
       if (loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        runInAction2(() => {
+        this.utils.batch(() => {
           this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    runInAction2(() => {
+    this.utils.batch(() => {
       if (!loadedComponentName) {
         this.setComponent(currentRouteName);
       } else {
@@ -101,15 +104,13 @@ var VM = class {
     });
   };
   setComponent(currentRouteName) {
-    runInAction2(() => {
-      const componentConfig = this.props.routes[currentRouteName];
-      const RouteComponent = componentConfig.component;
-      this.props.beforeSetPageComponent?.(componentConfig);
-      this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      this.loadedComponentName = currentRouteName;
-      this.loadedComponentPage = componentConfig.pageName;
-      this.loadedComponent = RouteComponent;
-    });
+    const componentConfig = this.props.routes[currentRouteName];
+    const RouteComponent = componentConfig.component;
+    this.props.beforeSetPageComponent?.(componentConfig);
+    this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+    this.loadedComponentName = currentRouteName;
+    this.loadedComponentPage = componentConfig.pageName;
+    this.loadedComponent = RouteComponent;
   }
 };
 var Router = observer(

package/dist/esm/solid/index.js

@@ -2,47 +2,14 @@
 import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
 import { getInitialRoute, history } from "reactive-route";
-import { batch, createRenderEffect, Show } from "solid-js";
+import { Show } from "solid-js";
 import { createMutable } from "solid-js/store";
 import { Dynamic } from "solid-js/web";
 
-// packages/solid/replaceObject.ts
-import { modifyMutable, produce } from "solid-js/store";
-function replaceObject(obj, newObj) {
-  modifyMutable(obj, produce((state) => {
-    if (typeof state === "object" && state != null) {
-      for (const variableKey in state) {
-        delete state[variableKey];
-      }
-    }
-    Object.assign(state || {}, newObj);
-  }));
-}
-
 // packages/solid/useStore.ts
 import { onMount } from "solid-js";
-var getAllProperties = (object) => {
-  const properties = /* @__PURE__ */ new Set();
-  do {
-    for (const key of Reflect.ownKeys(object)) {
-      properties.add([object, key]);
-    }
-  } while ((object = Reflect.getPrototypeOf(object)) && object !== Object.prototype);
-  return properties;
-};
-function autoBind(self) {
-  for (const [object, key] of getAllProperties(self.constructor.prototype)) {
-    if (key === "constructor") continue;
-    const descriptor = Reflect.getOwnPropertyDescriptor(object, key);
-    if (descriptor && typeof descriptor.value === "function") {
-      self[key] = self[key].bind(self);
-    }
-  }
-  return self;
-}
 function useStore(ViewModel, props) {
   const vm = new ViewModel(props);
-  autoBind(vm);
   vm.beforeMount?.();
   onMount(() => {
     vm.afterMount?.();
@@ -59,10 +26,13 @@ var VM = class {
   loadedComponentName = void 0;
   loadedComponentPage = void 0;
   currentProps = {};
+  get utils() {
+    return this.props.routerStore.utils;
+  }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
-    createRenderEffect(() => this.setLoadedComponent());
+    this.utils.autorun(() => this.setLoadedComponent());
   }
   redirectOnHistoryPop() {
     if (!history) return;
@@ -92,12 +62,12 @@ var VM = class {
     } else if (this.loadedComponentPage != null && currentRouteName != null) {
       if (this.loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    batch(() => {
+    this.utils.batch(() => {
       if (!this.loadedComponentName) {
         this.setComponent();
       } else {
@@ -110,8 +80,8 @@ var VM = class {
     const currentRouteName = this.props.routerStore.currentRoute.name;
     const componentConfig = this.props.routes[currentRouteName];
     this.props.beforeSetPageComponent?.(componentConfig);
-    batch(() => {
-      replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+    this.utils.batch(() => {
+      this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
       this.loadedComponentName = currentRouteName;
       this.loadedComponentPage = componentConfig.pageName;
     });

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

@@ -1,7 +1,7 @@
 import { TypeRouteRaw } from './types/TypeRouteRaw';
-type TypeRouteItemFinalGeneric<TConfig extends {
+export declare function createRouterConfig<TConfig extends {
     [Key in keyof TConfig]: TypeRouteRaw;
-}> = {
+}>(config: TConfig): {
     [Key in keyof TConfig]: TConfig[Key] & {
         name: Key;
         pageName?: string;
@@ -9,8 +9,4 @@ type TypeRouteItemFinalGeneric<TConfig extends {
         otherExports?: Record<string, any>;
     };
 };
-export declare function createRouterConfig<TConfig extends {
-    [Key in keyof TConfig]: TypeRouteRaw;
-}>(config: TConfig): TypeRouteItemFinalGeneric<TConfig>;
-export {};
 //# sourceMappingURL=createRouterConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createRouterConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/createRouterConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,KAAK,yBAAyB,CAAC,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,YAAY;CAAE,IAAI;KACxF,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,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,OAAO,SAAS;KACb,GAAG,IAAI,MAAM,OAAO,GAAG,YAAY;CACrC,EACD,MAAM,EAAE,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAErD"}
+{"version":3,"file":"createRouterConfig.d.ts","sourceRoot":"","sources":["../../../packages/core/createRouterConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,wBAAgB,kBAAkB,CAAC,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,YAAY;CAAE,EACzF,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"}

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

@@ -1,13 +1,4 @@
-import { InterfaceRouterStore } from './types/InterfaceRouterStore';
+import { InterfaceRouterStore, TypeCreateRouterStore } from './types/InterfaceRouterStore';
 import { TypeRoute } from './types/TypeRoute';
-type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = {
-    routes: TRoutes;
-    routeError500: TRoutes[keyof TRoutes];
-    lifecycleParams?: Array<any>;
-    batch: (cb: () => void) => void;
-    makeObservable: <TObj extends Record<string, any>>(obj: TObj) => TObj;
-    replaceObject: <TObj extends Record<string, any>>(obj: TObj, newObj: TObj) => void;
-};
-export declare function createRouterStore<TRoutes extends Record<string, TypeRoute>>({ batch, routes, routeError500, makeObservable, lifecycleParams, replaceObject, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
-export {};
+export declare function createRouterStore<TRoutes extends Record<string, TypeRoute>>({ batch, routes, autorun, replaceObject, routeError500, makeObservable, lifecycleParams, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
 //# sourceMappingURL=createRouterStore.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createRouterStore.d.ts","sourceRoot":"","sources":["../../../packages/core/createRouterStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAQ9C,KAAK,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACtE,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;CACpF,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC3E,KAAK,EACL,MAAM,EACN,aAAa,EACb,cAAc,EACd,eAAe,EACf,aAAa,GACd,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAsOhE"}
+{"version":3,"file":"createRouterStore.d.ts","sourceRoot":"","sources":["../../../packages/core/createRouterStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE3F,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAQ9C,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC3E,KAAK,EACL,MAAM,EACN,OAAO,EACP,aAAa,EACb,aAAa,EACb,cAAc,EACd,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CA4OhE"}

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

@@ -1,6 +1,8 @@
 export { createRouterConfig } from './createRouterConfig';
+export { createRouterStore } from './createRouterStore';
 export type { InterfaceRouterStore } from './types/InterfaceRouterStore';
 export type { TypeCurrentRoute } from './types/TypeCurrentRoute';
+export type { TypePropsRouter } from './types/TypePropsRouter';
 export type { TypeRedirectToParams } from './types/TypeRedirectToParams';
 export type { TypeRoute } from './types/TypeRoute';
 export { isDynamicRoute } from './utils/dynamic';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,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,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,YAAY,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,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,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

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

@@ -1,10 +1,23 @@
 import { TypeCurrentRoute } from './TypeCurrentRoute';
 import { TypeRedirectToParams } from './TypeRedirectToParams';
 import { TypeRoute } from './TypeRoute';
+type TypeUtils = {
+    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;
+};
+export type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = TypeUtils & {
+    routes: TRoutes;
+    routeError500: TRoutes[keyof TRoutes];
+    lifecycleParams?: Array<any>;
+};
 export type InterfaceRouterStore<TRoutes extends Record<string, TypeRoute>> = {
     routesHistory: Array<string>;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
     isRedirecting: boolean;
     redirectTo<TRouteName extends keyof TRoutes>(config: TypeRedirectToParams<TRoutes, TRouteName>): Promise<void>;
+    utils: TypeUtils;
 };
+export {};
 //# sourceMappingURL=InterfaceRouterStore.d.ts.map

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

@@ -1 +1 @@
-{"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,oBAAoB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC5E,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,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;CAClB,CAAC"}
+{"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,KAAK,SAAS,GAAG;IACf,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;CACvE,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,SAAS,GAAG;IACzF,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC5E,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC;IACvD,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,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC"}

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

@@ -0,0 +1,13 @@
+export type TypeLifecycleConfig = {
+    nextUrl: string;
+    nextRoute: any;
+    nextPathname: string;
+    nextQuery?: any;
+    nextSearch?: string;
+    currentUrl?: string;
+    currentQuery?: any;
+    currentRoute?: any;
+    currentSearch?: string;
+    currentPathname?: string;
+};
+//# sourceMappingURL=TypeLifecycleConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TypeLifecycleConfig.d.ts","sourceRoot":"","sources":["../../../../packages/core/types/TypeLifecycleConfig.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}

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

@@ -0,0 +1,10 @@
+import { InterfaceRouterStore } from './InterfaceRouterStore';
+import { TypeRoute } from './TypeRoute';
+export type TypePropsRouter<TRoutes extends Record<string, TypeRoute>> = {
+    routes: TRoutes;
+    routerStore: InterfaceRouterStore<TRoutes>;
+    beforeMount?: () => void;
+    beforeSetPageComponent?: (componentConfig: TRoutes[keyof TRoutes]) => void;
+    beforeUpdatePageComponent?: () => void;
+};
+//# sourceMappingURL=TypePropsRouter.d.ts.map

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

@@ -0,0 +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,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,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/types/core/types/TypeRouteRaw.d.ts

@@ -1,3 +1,4 @@
+import { TypeLifecycleConfig } from './TypeLifecycleConfig';
 import { TypeValidator } from './TypeValidator';
 export type TypeRouteRaw = {
     path: string;
@@ -7,29 +8,7 @@ export type TypeRouteRaw = {
     props?: Record<string, any>;
     query?: Record<string, TypeValidator>;
     params?: Record<string, TypeValidator>;
-    beforeEnter?: (config: {
-        nextUrl: string;
-        nextRoute: any;
-        nextPathname: string;
-        nextQuery?: any;
-        nextSearch?: string;
-        currentUrl?: string;
-        currentQuery?: any;
-        currentRoute?: any;
-        currentSearch?: string;
-        currentPathname?: string;
-    }, ...args: Array<any>) => Promise<any>;
-    beforeLeave?: (config: {
-        nextUrl: string;
-        nextRoute: any;
-        nextPathname: string;
-        nextQuery?: any;
-        nextSearch?: string;
-        currentUrl?: string;
-        currentQuery?: any;
-        currentRoute?: any;
-        currentSearch?: string;
-        currentPathname?: string;
-    }, ...args: Array<any>) => Promise<any> | null;
+    beforeEnter?: (config: TypeLifecycleConfig, ...args: Array<any>) => Promise<any>;
+    beforeLeave?: (config: TypeLifecycleConfig, ...args: Array<any>) => Promise<any> | null;
 };
 //# sourceMappingURL=TypeRouteRaw.d.ts.map

package/dist/types/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,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,CACZ,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,GAAG,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EACD,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAChB,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,GAAG,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EACD,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAChB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CAC1B,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,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/types/react/Router.d.ts

@@ -1,13 +1,5 @@
-import { InterfaceRouterStore, TypeRoute } from 'reactive-route';
-type TypeProps<TRoutes extends Record<string, TypeRoute>> = {
-    routes: TRoutes;
-    routerStore: InterfaceRouterStore<TRoutes>;
-    beforeMount?: () => void;
-    beforeSetPageComponent?: (componentConfig: TRoutes[keyof TRoutes]) => void;
-    beforeUpdatePageComponent?: () => void;
-};
-export declare const Router: (<TRoutes extends Record<string, TypeRoute>>(props: TypeProps<TRoutes>) => any) & {
+import { TypePropsRouter, TypeRoute } from 'reactive-route';
+export declare const Router: (<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>) => any) & {
     displayName: string;
 };
-export {};
 //# sourceMappingURL=Router.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/react/Router.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA4B,oBAAoB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI3F,KAAK,SAAS,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC1D,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,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;AAkGF,eAAO,MAAM,MAAM,IAChB,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,SAAS,CAAC,OAAO,CAAC;;CAStE,CAAC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/react/Router.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAsGtF,eAAO,MAAM,MAAM,IAChB,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,eAAe,CAAC,OAAO,CAAC;;CAS5E,CAAC"}

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

@@ -1,11 +1,3 @@
-import { InterfaceRouterStore, TypeRoute } from 'reactive-route';
-type TypeProps<TRoutes extends Record<string, TypeRoute>> = {
-    routes: TRoutes;
-    routerStore: InterfaceRouterStore<TRoutes>;
-    beforeMount?: () => void;
-    beforeSetPageComponent?: (componentConfig: TRoutes[keyof TRoutes]) => void;
-    beforeUpdatePageComponent?: () => void;
-};
-export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypeProps<TRoutes>): import("solid-js").JSX.Element;
-export {};
+import { TypePropsRouter, TypeRoute } from 'reactive-route';
+export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): import("solid-js").JSX.Element;
 //# sourceMappingURL=Router.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,oBAAoB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ3F,KAAK,SAAS,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC1D,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3C,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;AAqFF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,kCAW1F"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAoGtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAWhG"}

package/dist/types/solid/useStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useStore.d.ts","sourceRoot":"","sources":["../../../packages/solid/useStore.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB;AA+BD,wBAAgB,QAAQ,CACtB,UAAU,SAAS,KACjB,KAAK,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KACxC,oBAAoB,EACzB,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,CAY9F"}
+{"version":3,"file":"useStore.d.ts","sourceRoot":"","sources":["../../../packages/solid/useStore.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB;AAED,wBAAgB,QAAQ,CACtB,UAAU,SAAS,KACjB,KAAK,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KACxC,oBAAoB,EACzB,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,CAU9F"}

package/dist/types/tsconfig.types.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../packages/core/createRouterConfig.ts","../../packages/core/createRouterStore.ts","../../packages/core/index.ts","../../packages/core/types/InterfaceRouterStore.ts","../../packages/core/types/TypeCurrentRoute.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/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/replaceDynamicValues.ts","../../packages/react/Router.tsx","../../packages/react/index.ts","../../packages/react/useStore.ts","../../packages/solid/Router.tsx","../../packages/solid/index.ts","../../packages/solid/replaceObject.ts","../../packages/solid/useStore.ts"],"version":"5.9.2"}
+{"root":["../../packages/core/createRouterConfig.ts","../../packages/core/createRouterStore.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/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/replaceDynamicValues.ts","../../packages/react/Router.tsx","../../packages/react/index.ts","../../packages/react/useStore.ts","../../packages/solid/Router.tsx","../../packages/solid/index.ts","../../packages/solid/useStore.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.0",
+  "version": "0.0.1-alpha.2",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -17,11 +17,12 @@
     "analyze:js": "biome check --no-errors-on-unmatched .",
     "format:js": "biome check --no-errors-on-unmatched --write",
     "check-types": "tsc --project tsconfig.json",
+    "check-types-example": "tsc --project ./examples/simple_ssr/tsconfig.json",
     "prepare": "husky"
   },
   "dependencies": {
     "history": "5.3.0",
-    "query-string": "9.2.2"
+    "query-string": "7.1.3"
   },
   "devDependencies": {
     "@types/node": "22.14.1",

package/dist/types/solid/replaceObject.d.ts

@@ -1,2 +0,0 @@
-export declare function replaceObject<TObj extends Record<string, any>>(obj: TObj, newObj: TObj): void;
-//# sourceMappingURL=replaceObject.d.ts.map

package/dist/types/solid/replaceObject.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"replaceObject.d.ts","sourceRoot":"","sources":["../../../packages/solid/replaceObject.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,QActF"}