reactive-route 0.0.1-alpha.3 → 0.0.1-alpha.5

package/dist/cjs/adapters/mobx/index.js

@@ -0,0 +1,42 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// packages/adapters/mobx.ts
+var mobx_exports = {};
+__export(mobx_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(mobx_exports);
+var import_mobx = require("mobx");
+var adapters = {
+  batch: import_mobx.runInAction,
+  autorun: import_mobx.autorun,
+  replaceObject: (obj, newObj) => {
+    (0, import_mobx.runInAction)(() => {
+      for (const variableKey in obj) {
+        if (obj.hasOwnProperty(variableKey)) {
+          delete obj[variableKey];
+        }
+      }
+      Object.assign(obj, newObj);
+    });
+    return obj;
+  },
+  makeObservable: import_mobx.observable
+};

package/dist/cjs/adapters/mobx/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package/dist/cjs/adapters/solid/index.js

@@ -0,0 +1,47 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// packages/adapters/solid.ts
+var solid_exports = {};
+__export(solid_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(solid_exports);
+var import_solid_js = require("solid-js");
+var import_store = require("solid-js/store");
+var adapters = {
+  batch: import_solid_js.batch,
+  autorun: import_solid_js.createRenderEffect,
+  replaceObject: (obj, newObj) => {
+    (0, import_store.modifyMutable)(
+      obj,
+      (0, import_store.produce)((state) => {
+        if (typeof state === "object" && state != null) {
+          for (const variableKey in state) {
+            if (state.hasOwnProperty(variableKey)) {
+              delete state[variableKey];
+            }
+          }
+        }
+        Object.assign(state || {}, newObj);
+      })
+    );
+  },
+  makeObservable: import_store.createMutable
+};

package/dist/cjs/adapters/solid/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package/dist/cjs/index.js

@@ -90,6 +90,37 @@ function getDynamicValues(params) {
   return dynamicParams;
 }
 
+// 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/getQueryValues.ts
 var import_query_string = __toESM(require("query-string"));
 
@@ -111,6 +142,16 @@ 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;
@@ -150,29 +191,22 @@ function replaceDynamicValues({
 
 // packages/core/createRouterStore.ts
 function createRouterStore({
-  batch,
+  adapters,
   routes,
-  autorun,
-  replaceObject,
   routeError500,
-  makeObservable,
   lifecycleParams
 }) {
-  const routerStore = makeObservable({
+  const routerStore = adapters.makeObservable({
     routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirectTo: void 0,
+    restoreFromURL: void 0,
     restoreFromServer: void 0,
-    utils: {
-      batch,
-      autorun,
-      replaceObject,
-      makeObservable
-    }
+    adapters
   });
   routerStore.restoreFromServer = function restoreFromServer(obj) {
-    batch(() => {
+    adapters.batch(() => {
       routerStore.routesHistory.push(...obj.routesHistory || []);
       Object.assign(routerStore.currentRoute, obj.currentRoute);
     });
@@ -181,6 +215,9 @@ function createRouterStore({
     );
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
+  routerStore.restoreFromURL = function restoreFromURL(params) {
+    return routerStore.redirectTo(getInitialRoute({ routes, ...params }));
+  };
   routerStore.redirectTo = async function redirectTo(config) {
     const { route: routeName, noHistoryPush, asClient } = config;
     const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
@@ -224,8 +261,8 @@ function createRouterStore({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        batch(() => {
-          replaceObject(routerStore.currentRoute.query, nextQuery || {});
+        adapters.batch(() => {
+          adapters.replaceObject(routerStore.currentRoute.query, nextQuery || {});
           routerStore.routesHistory.push(nextUrl);
         });
         if (history && !noHistoryPush) {
@@ -238,7 +275,7 @@ function createRouterStore({
       }
       return Promise.resolve();
     }
-    batch(() => {
+    adapters.batch(() => {
       routerStore.isRedirecting = true;
     });
     try {
@@ -299,8 +336,8 @@ function createRouterStore({
       }
       console.error(error);
       await loadComponentToConfig({ route: routeError500 });
-      batch(() => {
-        replaceObject(routerStore.currentRoute, {
+      adapters.batch(() => {
+        adapters.replaceObject(routerStore.currentRoute, {
           name: routeError500.name,
           path: routeError500.path,
           props: routes[routeError500.name].props,
@@ -312,8 +349,8 @@ function createRouterStore({
       });
       return Promise.resolve();
     }
-    batch(() => {
-      replaceObject(routerStore.currentRoute, {
+    adapters.batch(() => {
+      adapters.replaceObject(routerStore.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,
@@ -338,44 +375,3 @@ function createRouterStore({
   };
   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,14 +75,14 @@ var VM = class {
   loadedComponentPage = void 0;
   loadedComponent;
   currentProps = {};
-  get utils() {
-    return this.props.routerStore.utils;
+  get adapters() {
+    return this.props.routerStore.adapters;
   }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
     this.setLoadedComponent();
-    this.autorunDisposers.push(this.utils.autorun(this.setLoadedComponent));
+    this.autorunDisposers.push(this.adapters.autorun(this.setLoadedComponent));
   }
   redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
@@ -90,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) {
-        this.utils.batch(() => this.props.routerStore.routesHistory.pop());
+        this.adapters.batch(() => this.props.routerStore.routesHistory.pop());
       }
       void this.props.routerStore.redirectTo({
         noHistoryPush: true,
@@ -113,14 +113,14 @@ var VM = class {
     else if (loadedComponentPage != null && currentRouteName != null) {
       if (loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        this.utils.batch(() => {
+        this.adapters.batch(() => {
           this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.utils.batch(() => {
+    this.adapters.batch(() => {
       if (!loadedComponentName) {
         this.setComponent(currentRouteName);
       } else {

package/dist/cjs/solid/index.js

@@ -52,13 +52,13 @@ var VM = class {
   loadedComponentName = void 0;
   loadedComponentPage = void 0;
   currentProps = {};
-  get utils() {
-    return this.props.routerStore.utils;
+  get adapters() {
+    return this.props.routerStore.adapters;
   }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
-    this.utils.autorun(() => this.setLoadedComponent());
+    this.adapters.autorun(() => this.setLoadedComponent());
   }
   redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
@@ -88,12 +88,12 @@ var VM = class {
     } else if (this.loadedComponentPage != null && currentRouteName != null) {
       if (this.loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        this.adapters.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.utils.batch(() => {
+    this.adapters.batch(() => {
       if (!this.loadedComponentName) {
         this.setComponent();
       } else {
@@ -106,8 +106,8 @@ var VM = class {
     const currentRouteName = this.props.routerStore.currentRoute.name;
     const componentConfig = this.props.routes[currentRouteName];
     this.props.beforeSetPageComponent?.(componentConfig);
-    this.utils.batch(() => {
-      this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+    this.adapters.batch(() => {
+      this.adapters.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
       this.loadedComponentName = currentRouteName;
       this.loadedComponentPage = componentConfig.pageName;
     });

package/dist/esm/adapters/mobx/index.js

@@ -0,0 +1,21 @@
+// packages/adapters/mobx.ts
+import { autorun, observable, runInAction } from "mobx";
+var adapters = {
+  batch: runInAction,
+  autorun,
+  replaceObject: (obj, newObj) => {
+    runInAction(() => {
+      for (const variableKey in obj) {
+        if (obj.hasOwnProperty(variableKey)) {
+          delete obj[variableKey];
+        }
+      }
+      Object.assign(obj, newObj);
+    });
+    return obj;
+  },
+  makeObservable: observable
+};
+export {
+  adapters
+};

package/dist/esm/adapters/mobx/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/dist/esm/adapters/solid/index.js

@@ -0,0 +1,26 @@
+// packages/adapters/solid.ts
+import { batch, createRenderEffect } from "solid-js";
+import { createMutable, modifyMutable, produce } from "solid-js/store";
+var adapters = {
+  batch,
+  autorun: createRenderEffect,
+  replaceObject: (obj, newObj) => {
+    modifyMutable(
+      obj,
+      produce((state) => {
+        if (typeof state === "object" && state != null) {
+          for (const variableKey in state) {
+            if (state.hasOwnProperty(variableKey)) {
+              delete state[variableKey];
+            }
+          }
+        }
+        Object.assign(state || {}, newObj);
+      })
+    );
+  },
+  makeObservable: createMutable
+};
+export {
+  adapters
+};

package/dist/esm/adapters/solid/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/dist/esm/index.js

@@ -47,6 +47,37 @@ function getDynamicValues(params) {
   return dynamicParams;
 }
 
+// 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/getQueryValues.ts
 import queryString from "query-string";
 
@@ -68,6 +99,16 @@ 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;
@@ -107,29 +148,22 @@ function replaceDynamicValues({
 
 // packages/core/createRouterStore.ts
 function createRouterStore({
-  batch,
+  adapters,
   routes,
-  autorun,
-  replaceObject,
   routeError500,
-  makeObservable,
   lifecycleParams
 }) {
-  const routerStore = makeObservable({
+  const routerStore = adapters.makeObservable({
     routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirectTo: void 0,
+    restoreFromURL: void 0,
     restoreFromServer: void 0,
-    utils: {
-      batch,
-      autorun,
-      replaceObject,
-      makeObservable
-    }
+    adapters
   });
   routerStore.restoreFromServer = function restoreFromServer(obj) {
-    batch(() => {
+    adapters.batch(() => {
       routerStore.routesHistory.push(...obj.routesHistory || []);
       Object.assign(routerStore.currentRoute, obj.currentRoute);
     });
@@ -138,6 +172,9 @@ function createRouterStore({
     );
     return loadComponentToConfig({ route: routes[preloadedRouteName] });
   };
+  routerStore.restoreFromURL = function restoreFromURL(params) {
+    return routerStore.redirectTo(getInitialRoute({ routes, ...params }));
+  };
   routerStore.redirectTo = async function redirectTo(config) {
     const { route: routeName, noHistoryPush, asClient } = config;
     const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
@@ -181,8 +218,8 @@ function createRouterStore({
     if (currentUrl === nextUrl) return Promise.resolve();
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
-        batch(() => {
-          replaceObject(routerStore.currentRoute.query, nextQuery || {});
+        adapters.batch(() => {
+          adapters.replaceObject(routerStore.currentRoute.query, nextQuery || {});
           routerStore.routesHistory.push(nextUrl);
         });
         if (history && !noHistoryPush) {
@@ -195,7 +232,7 @@ function createRouterStore({
       }
       return Promise.resolve();
     }
-    batch(() => {
+    adapters.batch(() => {
       routerStore.isRedirecting = true;
     });
     try {
@@ -256,8 +293,8 @@ function createRouterStore({
       }
       console.error(error);
       await loadComponentToConfig({ route: routeError500 });
-      batch(() => {
-        replaceObject(routerStore.currentRoute, {
+      adapters.batch(() => {
+        adapters.replaceObject(routerStore.currentRoute, {
           name: routeError500.name,
           path: routeError500.path,
           props: routes[routeError500.name].props,
@@ -269,8 +306,8 @@ function createRouterStore({
       });
       return Promise.resolve();
     }
-    batch(() => {
-      replaceObject(routerStore.currentRoute, {
+    adapters.batch(() => {
+      adapters.replaceObject(routerStore.currentRoute, {
         name: nextRoute.name,
         path: nextRoute.path,
         props: routes[nextRoute.name].props,
@@ -295,47 +332,6 @@ function createRouterStore({
   };
   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,

package/dist/esm/react/index.js

@@ -49,14 +49,14 @@ var VM = class {
   loadedComponentPage = void 0;
   loadedComponent;
   currentProps = {};
-  get utils() {
-    return this.props.routerStore.utils;
+  get adapters() {
+    return this.props.routerStore.adapters;
   }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
     this.setLoadedComponent();
-    this.autorunDisposers.push(this.utils.autorun(this.setLoadedComponent));
+    this.autorunDisposers.push(this.adapters.autorun(this.setLoadedComponent));
   }
   redirectOnHistoryPop() {
     if (!history) return;
@@ -64,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) {
-        this.utils.batch(() => this.props.routerStore.routesHistory.pop());
+        this.adapters.batch(() => this.props.routerStore.routesHistory.pop());
       }
       void this.props.routerStore.redirectTo({
         noHistoryPush: true,
@@ -87,14 +87,14 @@ var VM = class {
     else if (loadedComponentPage != null && currentRouteName != null) {
       if (loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        this.utils.batch(() => {
+        this.adapters.batch(() => {
           this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.utils.batch(() => {
+    this.adapters.batch(() => {
       if (!loadedComponentName) {
         this.setComponent(currentRouteName);
       } else {

package/dist/esm/solid/index.js

@@ -26,13 +26,13 @@ var VM = class {
   loadedComponentName = void 0;
   loadedComponentPage = void 0;
   currentProps = {};
-  get utils() {
-    return this.props.routerStore.utils;
+  get adapters() {
+    return this.props.routerStore.adapters;
   }
   beforeMount() {
     this.props.beforeMount?.();
     this.redirectOnHistoryPop();
-    this.utils.autorun(() => this.setLoadedComponent());
+    this.adapters.autorun(() => this.setLoadedComponent());
   }
   redirectOnHistoryPop() {
     if (!history) return;
@@ -62,12 +62,12 @@ var VM = class {
     } else if (this.loadedComponentPage != null && currentRouteName != null) {
       if (this.loadedComponentPage === currentRoutePage) {
         const componentConfig = this.props.routes[currentRouteName];
-        this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        this.adapters.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.utils.batch(() => {
+    this.adapters.batch(() => {
       if (!this.loadedComponentName) {
         this.setComponent();
       } else {
@@ -80,8 +80,8 @@ var VM = class {
     const currentRouteName = this.props.routerStore.currentRoute.name;
     const componentConfig = this.props.routes[currentRouteName];
     this.props.beforeSetPageComponent?.(componentConfig);
-    this.utils.batch(() => {
-      this.utils.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
+    this.adapters.batch(() => {
+      this.adapters.replaceObject(this.currentProps, "props" in componentConfig ? componentConfig.props : {});
       this.loadedComponentName = currentRouteName;
       this.loadedComponentPage = componentConfig.pageName;
     });

package/dist/types/adapters/mobx.d.ts

@@ -0,0 +1,3 @@
+import { TypeAdapters } from 'reactive-route';
+export declare const adapters: TypeAdapters;
+//# sourceMappingURL=mobx.d.ts.map

package/dist/types/adapters/mobx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mobx.d.ts","sourceRoot":"","sources":["../../../packages/adapters/mobx.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAgBtB,CAAC"}

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

@@ -0,0 +1,3 @@
+import { TypeAdapters } from 'reactive-route';
+export declare const adapters: TypeAdapters;
+//# sourceMappingURL=solid.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"solid.d.ts","sourceRoot":"","sources":["../../../packages/adapters/solid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,eAAO,MAAM,QAAQ,EAAE,YAoBtB,CAAC"}

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

@@ -1,4 +1,4 @@
 import { InterfaceRouterStore, TypeCreateRouterStore } from './types/InterfaceRouterStore';
 import { TypeRoute } from './types/TypeRoute';
-export declare function createRouterStore<TRoutes extends Record<string, TypeRoute>>({ batch, routes, autorun, replaceObject, routeError500, makeObservable, lifecycleParams, }: TypeCreateRouterStore<TRoutes>): InterfaceRouterStore<TRoutes>;
+export declare function createRouterStore<TRoutes extends Record<string, TypeRoute>>({ adapters, routes, routeError500, 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,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,CA0PhE"}
+{"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;AAS9C,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC3E,QAAQ,EACR,MAAM,EACN,aAAa,EACb,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CA0PhE"}

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

@@ -1,6 +1,6 @@
 export { createRouterConfig } from './createRouterConfig';
 export { createRouterStore } from './createRouterStore';
-export type { InterfaceRouterStore } from './types/InterfaceRouterStore';
+export type { InterfaceRouterStore, TypeAdapters } from './types/InterfaceRouterStore';
 export type { TypeCurrentRoute } from './types/TypeCurrentRoute';
 export type { TypePropsRouter } from './types/TypePropsRouter';
 export type { TypeRedirectToParams } from './types/TypeRedirectToParams';

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,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"}
+{"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,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,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}

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

@@ -1,24 +1,28 @@
 import { TypeCurrentRoute } from './TypeCurrentRoute';
 import { TypeRedirectToParams } from './TypeRedirectToParams';
 import { TypeRoute } from './TypeRoute';
-type TypeUtils = {
+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;
 };
-export type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = TypeUtils & {
+export type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = {
     routes: TRoutes;
     routeError500: TRoutes[keyof TRoutes];
     lifecycleParams?: Array<any>;
+    adapters: TypeAdapters;
 };
 export type InterfaceRouterStore<TRoutes extends Record<string, TypeRoute>> = {
-    routesHistory: Array<string>;
+    adapters: TypeAdapters;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
+    routesHistory: Array<string>;
     isRedirecting: boolean;
     redirectTo<TRouteName extends keyof TRoutes>(config: TypeRedirectToParams<TRoutes, TRouteName>): Promise<void>;
-    utils: TypeUtils;
+    restoreFromURL(params: {
+        pathname: string;
+        fallback: TRoutes[keyof TRoutes]['name'];
+    }): Promise<void>;
     restoreFromServer(obj: InterfaceRouterStore<TRoutes>): Promise<void>;
 };
-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,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;IACjB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE,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,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;CACvE,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC7E,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IAC5E,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;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE,CAAC"}

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/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"}
+{"root":["../../packages/adapters/mobx.ts","../../packages/adapters/solid.ts","../../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.3",
+  "version": "0.0.1-alpha.5",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -17,9 +17,14 @@
     "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",
+    "check-types-example": "tsc --project examples/react-mobx/tsconfig.json",
     "prepare": "husky"
   },
+  "lint-staged": {
+    "(*.js|*.ts|*.tsx|*.mjs)": [
+      "pnpm run format:js"
+    ]
+  },
   "dependencies": {
     "history": "5.3.0",
     "query-string": "7.1.3"
@@ -69,6 +74,16 @@
       "types": "./dist/types/solid/index.d.ts",
       "require": "./dist/cjs/solid/index.js",
       "import": "./dist/esm/solid/index.js"
+    },
+    "./adapters/mobx": {
+      "types": "./dist/types/adapters/mobx.d.ts",
+      "require": "./dist/cjs/adapters/mobx/index.js",
+      "import": "./dist/esm/adapters/mobx/index.js"
+    },
+    "./adapters/solid": {
+      "types": "./dist/types/adapters/solid.d.ts",
+      "require": "./dist/cjs/adapters/solid/index.js",
+      "import": "./dist/esm/adapters/solid/index.js"
     }
   },
   "main": "dist/cjs/index.js",