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

package/dist/cjs/adapters/kr-observable/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/kr-observable.ts
+var kr_observable_exports = {};
+__export(kr_observable_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(kr_observable_exports);
+var import_kr_observable = require("kr-observable");
+var import_react = require("kr-observable/react");
+var adapters = {
+  batch: (cb) => cb(),
+  autorun: import_kr_observable.autorun,
+  replaceObject: (obj, newObj) => {
+    for (const variableKey in obj) {
+      if (obj.hasOwnProperty(variableKey)) {
+        delete obj[variableKey];
+      }
+    }
+    Object.assign(obj, newObj);
+  },
+  makeObservable: import_kr_observable.makeObservable,
+  makeAutoObservable: import_kr_observable.makeObservable,
+  observer: import_react.observer
+};

package/dist/cjs/adapters/kr-observable/package.json

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

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

@@ -24,9 +24,11 @@ __export(mobx_exports, {
 });
 module.exports = __toCommonJS(mobx_exports);
 var import_mobx = require("mobx");
+var import_mobx_react_lite = require("mobx-react-lite");
 var adapters = {
   batch: import_mobx.runInAction,
   autorun: import_mobx.autorun,
+  observer: import_mobx_react_lite.observer,
   replaceObject: (obj, newObj) => {
     (0, import_mobx.runInAction)(() => {
       for (const variableKey in obj) {
@@ -36,7 +38,7 @@ var adapters = {
       }
       Object.assign(obj, newObj);
     });
-    return obj;
   },
-  makeObservable: import_mobx.observable
+  makeObservable: import_mobx.observable,
+  makeAutoObservable: import_mobx.makeAutoObservable
 };

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

@@ -43,5 +43,6 @@ var adapters = {
       })
     );
   },
-  makeObservable: import_store.createMutable
+  makeObservable: import_store.createMutable,
+  makeAutoObservable: import_store.createMutable
 };

package/dist/cjs/react/index.js

@@ -25,125 +25,83 @@ __export(react_exports, {
 module.exports = __toCommonJS(react_exports);
 
 // packages/react/Router.tsx
-var import_mobx2 = require("mobx");
-var import_mobx_react_lite = require("mobx-react-lite");
-var import_reactive_route = require("reactive-route");
-
-// packages/react/useStore.ts
-var import_mobx = require("mobx");
 var import_react = require("react");
-function useStore(ViewModel, props) {
-  const isFirstRenderRef = (0, import_react.useRef)(true);
-  const [vm] = (0, import_react.useState)(() => {
-    const instance = new ViewModel(props || {});
-    (0, import_mobx.runInAction)(() => {
-      instance.beforeMount?.();
-    });
-    return instance;
-  });
-  (0, import_react.useEffect)(() => {
-    if (isFirstRenderRef.current) {
-      isFirstRenderRef.current = false;
-    } else if (props) {
-      (0, import_mobx.runInAction)(() => {
-        vm.props = props || {};
-      });
-    }
-  }, [props]);
-  (0, import_react.useEffect)(() => {
-    vm.afterMount?.();
-    return () => {
-      vm.autorunDisposers?.forEach((disposer) => disposer());
-    };
-  }, []);
-  return vm;
-}
-
-// packages/react/Router.tsx
+var import_reactive_route = require("reactive-route");
 var import_jsx_runtime = require("react/jsx-runtime");
-var VM = class {
-  constructor(props) {
-    this.props = props;
-    (0, import_mobx2.makeAutoObservable)(
-      this,
-      { loadedComponent: false, setLoadedComponent: false, props: false },
-      { autoBind: true }
-    );
-  }
-  autorunDisposers = [];
-  loadedComponentName = void 0;
-  loadedComponentPage = void 0;
-  loadedComponent;
-  currentProps = {};
-  get adapters() {
-    return this.props.routerStore.adapters;
-  }
-  beforeMount() {
-    this.props.beforeMount?.();
-    this.redirectOnHistoryPop();
-    this.setLoadedComponent();
-    this.autorunDisposers.push(this.adapters.autorun(this.setLoadedComponent));
-  }
-  redirectOnHistoryPop() {
+function RouterInner(props) {
+  const disposerRef = (0, import_react.useRef)(null);
+  const redirectOnHistoryPop = (0, import_react.useCallback)(() => {
     if (!import_reactive_route.history) return;
     import_reactive_route.history.listen((params) => {
       if (params.action !== "POP") return;
-      const previousRoutePathname = this.props.routerStore.routesHistory[this.props.routerStore.routesHistory.length - 2];
+      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        this.adapters.batch(() => this.props.routerStore.routesHistory.pop());
+        props.routerStore.adapters.batch(() => props.routerStore.routesHistory.pop());
       }
-      void this.props.routerStore.redirectTo({
+      void props.routerStore.redirectTo({
         noHistoryPush: true,
         ...(0, import_reactive_route.getInitialRoute)({
-          routes: this.props.routes,
+          routes: props.routes,
           pathname: import_reactive_route.history.location.pathname,
           fallback: "error404"
         })
       });
     });
-  }
-  setLoadedComponent = () => {
-    const { loadedComponentName, loadedComponentPage } = this;
-    const { currentRoute, isRedirecting } = this.props.routerStore;
-    const currentRouteName = currentRoute.name;
-    const currentRoutePage = currentRoute.pageName;
+  }, []);
+  const [config] = (0, import_react.useState)(
+    () => props.routerStore.adapters.makeObservable({
+      loadedComponentName: void 0,
+      loadedComponentPage: void 0,
+      currentProps: {}
+    })
+  );
+  const setLoadedComponent = (0, import_react.useCallback)(() => {
+    const { loadedComponentName, loadedComponentPage } = config;
+    const { currentRoute, isRedirecting } = props.routerStore;
+    const componentConfig = props.routes[currentRoute.name];
     let preventRedirect = false;
     if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRouteName) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRouteName != null) {
-      if (loadedComponentPage === currentRoutePage) {
-        const componentConfig = this.props.routes[currentRouteName];
-        this.adapters.batch(() => {
-          this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
+    else if (loadedComponentPage != null && currentRoute.name != null) {
+      if (loadedComponentPage === currentRoute.pageName) {
+        props.routerStore.adapters.batch(() => {
+          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+          config[Symbol.for("$adm")]?.batch();
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.adapters.batch(() => {
-      if (!loadedComponentName) {
-        this.setComponent(currentRouteName);
-      } else {
-        this.props.beforeUpdatePageComponent?.();
-        this.setComponent(currentRouteName);
-      }
+    props.routerStore.adapters.batch(() => {
+      if (loadedComponentName) props.beforeUpdatePageComponent?.();
+      props.beforeSetPageComponent?.(componentConfig);
+      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+      config.loadedComponentName = currentRoute.name;
+      config.loadedComponentPage = componentConfig.pageName;
+      config[Symbol.for("$adm")]?.batch();
     });
-  };
-  setComponent(currentRouteName) {
-    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)(
+  }, []);
+  (0, import_react.useState)(() => {
+    props.routerStore.adapters.batch(() => {
+      props.beforeMount?.();
+      redirectOnHistoryPop();
+      setLoadedComponent();
+      disposerRef.current = props.routerStore.adapters.autorun(setLoadedComponent);
+    });
+  });
+  (0, import_react.useEffect)(() => {
+    return () => {
+      disposerRef.current?.();
+    };
+  }, []);
+  if (!config.loadedComponentName) return null;
+  const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
+  if (LoadedComponent) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps });
+  return null;
+}
+var Router = (0, import_react.memo)(
   (props) => {
-    const vm = useStore(VM, props);
-    const LoadedComponent = vm.loadedComponentName ? vm.loadedComponent : null;
-    if (LoadedComponent) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...vm.currentProps });
-    return null;
+    const Component = props.routerStore.adapters.observer ? props.routerStore.adapters.observer(RouterInner) : RouterInner;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
   }
 );

package/dist/cjs/solid/index.js

@@ -29,7 +29,6 @@ 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_store = require("solid-js/store");
 var import_web3 = require("solid-js/web");
 
 // packages/solid/useStore.ts
@@ -47,7 +46,7 @@ function useStore(ViewModel, props) {
 var VM = class {
   constructor(props) {
     this.props = props;
-    return (0, import_store.createMutable)(this);
+    return this.adapters.makeAutoObservable(this);
   }
   loadedComponentName = void 0;
   loadedComponentPage = void 0;

package/dist/esm/adapters/kr-observable/index.js

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

package/dist/esm/adapters/kr-observable/package.json

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

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

@@ -1,8 +1,10 @@
 // packages/adapters/mobx.ts
-import { autorun, observable, runInAction } from "mobx";
+import { autorun, makeAutoObservable, observable, runInAction } from "mobx";
+import { observer } from "mobx-react-lite";
 var adapters = {
   batch: runInAction,
   autorun,
+  observer,
   replaceObject: (obj, newObj) => {
     runInAction(() => {
       for (const variableKey in obj) {
@@ -12,9 +14,9 @@ var adapters = {
       }
       Object.assign(obj, newObj);
     });
-    return obj;
   },
-  makeObservable: observable
+  makeObservable: observable,
+  makeAutoObservable
 };
 export {
   adapters

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

@@ -19,7 +19,8 @@ var adapters = {
       })
     );
   },
-  makeObservable: createMutable
+  makeObservable: createMutable,
+  makeAutoObservable: createMutable
 };
 export {
   adapters

package/dist/esm/react/index.js

@@ -1,124 +1,82 @@
 // packages/react/Router.tsx
-import { makeAutoObservable } from "mobx";
-import { observer } from "mobx-react-lite";
+import { memo, useCallback, useEffect, useRef, useState } from "react";
 import { getInitialRoute, history } from "reactive-route";
-
-// packages/react/useStore.ts
-import { runInAction } from "mobx";
-import { useEffect, useRef, useState } from "react";
-function useStore(ViewModel, props) {
-  const isFirstRenderRef = useRef(true);
-  const [vm] = useState(() => {
-    const instance = new ViewModel(props || {});
-    runInAction(() => {
-      instance.beforeMount?.();
-    });
-    return instance;
-  });
-  useEffect(() => {
-    if (isFirstRenderRef.current) {
-      isFirstRenderRef.current = false;
-    } else if (props) {
-      runInAction(() => {
-        vm.props = props || {};
-      });
-    }
-  }, [props]);
-  useEffect(() => {
-    vm.afterMount?.();
-    return () => {
-      vm.autorunDisposers?.forEach((disposer) => disposer());
-    };
-  }, []);
-  return vm;
-}
-
-// packages/react/Router.tsx
 import { jsx } from "react/jsx-runtime";
-var VM = class {
-  constructor(props) {
-    this.props = props;
-    makeAutoObservable(
-      this,
-      { loadedComponent: false, setLoadedComponent: false, props: false },
-      { autoBind: true }
-    );
-  }
-  autorunDisposers = [];
-  loadedComponentName = void 0;
-  loadedComponentPage = void 0;
-  loadedComponent;
-  currentProps = {};
-  get adapters() {
-    return this.props.routerStore.adapters;
-  }
-  beforeMount() {
-    this.props.beforeMount?.();
-    this.redirectOnHistoryPop();
-    this.setLoadedComponent();
-    this.autorunDisposers.push(this.adapters.autorun(this.setLoadedComponent));
-  }
-  redirectOnHistoryPop() {
+function RouterInner(props) {
+  const disposerRef = useRef(null);
+  const redirectOnHistoryPop = useCallback(() => {
     if (!history) return;
     history.listen((params) => {
       if (params.action !== "POP") return;
-      const previousRoutePathname = this.props.routerStore.routesHistory[this.props.routerStore.routesHistory.length - 2];
+      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        this.adapters.batch(() => this.props.routerStore.routesHistory.pop());
+        props.routerStore.adapters.batch(() => props.routerStore.routesHistory.pop());
       }
-      void this.props.routerStore.redirectTo({
+      void props.routerStore.redirectTo({
         noHistoryPush: true,
         ...getInitialRoute({
-          routes: this.props.routes,
+          routes: props.routes,
           pathname: history.location.pathname,
           fallback: "error404"
         })
       });
     });
-  }
-  setLoadedComponent = () => {
-    const { loadedComponentName, loadedComponentPage } = this;
-    const { currentRoute, isRedirecting } = this.props.routerStore;
-    const currentRouteName = currentRoute.name;
-    const currentRoutePage = currentRoute.pageName;
+  }, []);
+  const [config] = useState(
+    () => props.routerStore.adapters.makeObservable({
+      loadedComponentName: void 0,
+      loadedComponentPage: void 0,
+      currentProps: {}
+    })
+  );
+  const setLoadedComponent = useCallback(() => {
+    const { loadedComponentName, loadedComponentPage } = config;
+    const { currentRoute, isRedirecting } = props.routerStore;
+    const componentConfig = props.routes[currentRoute.name];
     let preventRedirect = false;
     if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRouteName) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRouteName != null) {
-      if (loadedComponentPage === currentRoutePage) {
-        const componentConfig = this.props.routes[currentRouteName];
-        this.adapters.batch(() => {
-          this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
+    else if (loadedComponentPage != null && currentRoute.name != null) {
+      if (loadedComponentPage === currentRoute.pageName) {
+        props.routerStore.adapters.batch(() => {
+          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+          config[Symbol.for("$adm")]?.batch();
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    this.adapters.batch(() => {
-      if (!loadedComponentName) {
-        this.setComponent(currentRouteName);
-      } else {
-        this.props.beforeUpdatePageComponent?.();
-        this.setComponent(currentRouteName);
-      }
+    props.routerStore.adapters.batch(() => {
+      if (loadedComponentName) props.beforeUpdatePageComponent?.();
+      props.beforeSetPageComponent?.(componentConfig);
+      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+      config.loadedComponentName = currentRoute.name;
+      config.loadedComponentPage = componentConfig.pageName;
+      config[Symbol.for("$adm")]?.batch();
     });
-  };
-  setComponent(currentRouteName) {
-    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(
+  }, []);
+  useState(() => {
+    props.routerStore.adapters.batch(() => {
+      props.beforeMount?.();
+      redirectOnHistoryPop();
+      setLoadedComponent();
+      disposerRef.current = props.routerStore.adapters.autorun(setLoadedComponent);
+    });
+  });
+  useEffect(() => {
+    return () => {
+      disposerRef.current?.();
+    };
+  }, []);
+  if (!config.loadedComponentName) return null;
+  const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
+  if (LoadedComponent) return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps });
+  return null;
+}
+var Router = memo(
   (props) => {
-    const vm = useStore(VM, props);
-    const LoadedComponent = vm.loadedComponentName ? vm.loadedComponent : null;
-    if (LoadedComponent) return /* @__PURE__ */ jsx(LoadedComponent, { ...vm.currentProps });
-    return null;
+    const Component = props.routerStore.adapters.observer ? props.routerStore.adapters.observer(RouterInner) : RouterInner;
+    return /* @__PURE__ */ jsx(Component, { ...props });
   }
 );
 export {

package/dist/esm/solid/index.js

@@ -3,7 +3,6 @@ import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
 import { getInitialRoute, history } from "reactive-route";
 import { Show } from "solid-js";
-import { createMutable } from "solid-js/store";
 import { Dynamic } from "solid-js/web";
 
 // packages/solid/useStore.ts
@@ -21,7 +20,7 @@ function useStore(ViewModel, props) {
 var VM = class {
   constructor(props) {
     this.props = props;
-    return createMutable(this);
+    return this.adapters.makeAutoObservable(this);
   }
   loadedComponentName = void 0;
   loadedComponentPage = void 0;

package/dist/types/adapters/kr-observable.d.ts

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

package/dist/types/adapters/kr-observable.d.ts.map

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

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

@@ -1 +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"}
+{"version":3,"file":"mobx.d.ts","sourceRoot":"","sources":["../../../packages/adapters/mobx.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,QAAQ,EAAE,YAgBtB,CAAC"}

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

@@ -1 +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"}
+{"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,YAqBtB,CAAC"}

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

@@ -6,6 +6,9 @@ export type TypeAdapters = {
     autorun: (cb: () => void) => any;
     replaceObject: <TObj extends Record<string, any>>(obj: TObj, newObj: TObj) => void;
     makeObservable: <TObj extends Record<string, any>>(obj: TObj) => TObj;
+    makeAutoObservable: (...args: Array<any>) => any;
+    observer?: (comp: any) => any;
+    subscribe?: (target: any, cb: () => void, keys: Set<any>) => any;
 };
 export type TypeCreateRouterStore<TRoutes extends Record<string, TypeRoute>> = {
     routes: TRoutes;

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,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"}
+{"version":3,"file":"InterfaceRouterStore.d.ts","sourceRoot":"","sources":["../../../../packages/core/types/InterfaceRouterStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,GAAG,CAAC;IACjC,aAAa,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC;IACnF,cAAc,EAAE,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,IAAI,CAAC;IACtE,kBAAkB,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;IACjD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC;CAClE,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/react/Router.d.ts

@@ -1,5 +1,3 @@
 import { TypePropsRouter, TypeRoute } from 'reactive-route';
-export declare const Router: (<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>) => any) & {
-    displayName: string;
-};
+export declare const Router: import("react").MemoExoticComponent<(<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>) => any)>;
 //# 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,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"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA4HtF,eAAO,MAAM,MAAM,wCAChB,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,eAAe,CAAC,OAAO,CAAC,KAKpC,GAAG,EAE3C,CAAC"}

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,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"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmGtF,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAWhG"}

package/dist/types/tsconfig.types.tsbuildinfo

@@ -1 +1 @@
-{"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"}
+{"root":["../../packages/adapters/kr-observable.ts","../../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/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.5",
+  "version": "0.0.1-alpha.7",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -18,7 +18,10 @@
     "format:js": "biome check --no-errors-on-unmatched --write",
     "check-types": "tsc --project tsconfig.json",
     "check-types-example": "tsc --project examples/react-mobx/tsconfig.json",
-    "prepare": "husky"
+    "prepare": "husky",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
   },
   "lint-staged": {
     "(*.js|*.ts|*.tsx|*.mjs)": [
@@ -30,32 +33,35 @@
     "query-string": "7.1.3"
   },
   "devDependencies": {
-    "@types/node": "22.14.1",
-    "@types/lodash": "4.17.16",
-    "vitest": "3.2.4",
-    "@testing-library/react": "16.3.0",
-    "@vitest/coverage-istanbul": "3.2.4",
-    "vite-plugin-solid": "2.11.8",
-    "global-jsdom": "26.0.0",
-    "babel-preset-solid": "1.9.9",
-    "@solidjs/testing-library": "0.8.10",
-    "lodash": "4.17.21",
-    "mobx": "6.13.7",
-    "mobx-react-lite": "4.1.0",
-    "react": "19.1.1",
-    "solid-js": "1.9.9",
     "@babel/core": "7.28.3",
     "@babel/preset-env": "7.28.3",
     "@babel/preset-typescript": "7.27.1",
+    "@biomejs/biome": "2.2.2",
     "@espcom/esbuild-plugin-replace": "1.3.0",
+    "@solidjs/testing-library": "0.8.10",
+    "@testing-library/react": "16.3.0",
+    "@types/lodash": "4.17.16",
+    "@types/node": "22.14.1",
+    "@vitest/coverage-istanbul": "3.2.4",
+    "babel-preset-solid": "1.9.9",
     "badge-maker": "5.0.2",
     "esbuild": "0.25.9",
-    "regenerator-runtime": "0.14.1",
-    "@biomejs/biome": "2.2.2",
+    "global-jsdom": "26.0.0",
     "husky": "9.1.7",
+    "kr-observable": "3.0.23",
     "lint-staged": "16.1.6",
+    "lodash": "4.17.21",
+    "mobx": "6.13.7",
+    "mobx-react-lite": "4.1.0",
+    "react": "19.1.1",
+    "regenerator-runtime": "0.14.1",
+    "solid-js": "1.9.9",
     "tsx": "4.20.5",
     "typescript": "5.9.2",
+    "vite-plugin-solid": "2.11.8",
+    "vitepress": "1.6.4",
+    "vitepress-plugin-group-icons": "1.6.3",
+    "vitest": "3.2.4",
     "xml-splitter": "1.2.1"
   },
   "packageManager": "pnpm@10.9.0",
@@ -84,6 +90,11 @@
       "types": "./dist/types/adapters/solid.d.ts",
       "require": "./dist/cjs/adapters/solid/index.js",
       "import": "./dist/esm/adapters/solid/index.js"
+    },
+    "./adapters/kr-observable": {
+      "types": "./dist/types/adapters/kr-observable.d.ts",
+      "require": "./dist/cjs/adapters/kr-observable/index.js",
+      "import": "./dist/esm/adapters/kr-observable/index.js"
     }
   },
   "main": "dist/cjs/index.js",

package/dist/types/react/useStore.d.ts

@@ -1,8 +0,0 @@
-export interface ViewModelConstructor {
-    autorunDisposers?: Array<() => void>;
-    props?: Record<string, any>;
-    beforeMount?: () => void;
-    afterMount?: () => void;
-}
-export declare function useStore<TViewModel extends new (props: ConstructorParameters<TViewModel>[0]) => ViewModelConstructor>(ViewModel: TViewModel, props: ConstructorParameters<TViewModel>[0]): InstanceType<TViewModel>;
-//# sourceMappingURL=useStore.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useStore.d.ts","sourceRoot":"","sources":["../../../packages/react/useStore.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;IACrC,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,CAgC9F"}