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

package/dist/esm/react/index.js

@@ -8,11 +8,11 @@ function RouterInner(props) {
     if (!history) return;
     history.listen((params) => {
       if (params.action !== "POP") return;
-      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
+      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        props.routerStore.adapters.batch(() => props.routerStore.routesHistory.pop());
+        props.router.adapters.batch(() => props.router.routesHistory.pop());
       }
-      void props.routerStore.redirectTo({
+      void props.router.redirectTo({
         noHistoryPush: true,
         ...getInitialRoute({
           routes: props.routes,
@@ -22,7 +22,7 @@ function RouterInner(props) {
     });
   }, []);
   const [config] = useState(
-    () => props.routerStore.adapters.makeObservable({
+    () => props.router.adapters.makeObservable({
       loadedComponentName: void 0,
       loadedComponentPage: void 0,
       currentProps: {}
@@ -30,21 +30,21 @@ function RouterInner(props) {
   );
   const setLoadedComponent = useCallback(() => {
     const { loadedComponentName, loadedComponentPage } = config;
-    const { currentRoute, isRedirecting } = props.routerStore;
+    const { currentRoute, isRedirecting } = props.router;
     const componentConfig = props.routes[currentRoute.name];
     let preventRedirect = false;
     if (isRedirecting) preventRedirect = true;
     else if (loadedComponentName === currentRoute.name) preventRedirect = true;
     else if (loadedComponentPage != null && currentRoute.name != null) {
       if (loadedComponentPage === currentRoute.pageName) {
-        props.routerStore.adapters.batch(() => {
+        props.router.adapters.batch(() => {
           config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
         });
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    props.routerStore.adapters.batch(() => {
+    props.router.adapters.batch(() => {
       if (loadedComponentName) props.beforeUpdatePageComponent?.();
       props.beforeSetPageComponent?.(componentConfig);
       config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
@@ -53,11 +53,11 @@ function RouterInner(props) {
     });
   }, []);
   useState(() => {
-    props.routerStore.adapters.batch(() => {
+    props.router.adapters.batch(() => {
       props.beforeMount?.();
       redirectOnHistoryPop();
       setLoadedComponent();
-      disposerRef.current = props.routerStore.adapters.autorun(setLoadedComponent);
+      disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
     });
   });
   useEffect(() => {
@@ -71,7 +71,7 @@ function RouterInner(props) {
   return null;
 }
 function RouterWrapper(props) {
-  const Component = props.routerStore.adapters.observer ? props.routerStore.adapters.observer(RouterInner) : RouterInner;
+  const Component = props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner;
   return /* @__PURE__ */ jsx(Component, { ...props });
 }
 var Router = memo(RouterWrapper);

package/dist/esm/solid/index.js

@@ -5,7 +5,7 @@ import { getInitialRoute, history } from "reactive-route";
 import { Show } from "solid-js";
 import { Dynamic } from "solid-js/web";
 function Router(props) {
-  const config = props.routerStore.adapters.makeObservable({
+  const config = props.router.adapters.makeObservable({
     loadedComponentName: void 0,
     loadedComponentPage: void 0,
     currentProps: {}
@@ -14,11 +14,11 @@ function Router(props) {
     if (!history) return;
     history.listen((params) => {
       if (params.action !== "POP") return;
-      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
+      const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
       if (previousRoutePathname === params.location.pathname) {
-        props.routerStore.routesHistory.pop();
+        props.router.routesHistory.pop();
       }
-      void props.routerStore.redirectTo({
+      void props.router.redirectTo({
         noHistoryPush: true,
         ...getInitialRoute({
           routes: props.routes,
@@ -28,27 +28,27 @@ function Router(props) {
     });
   }
   function setLoadedComponent() {
-    const currentRouteName = props.routerStore.currentRoute.name;
-    const currentRoutePage = props.routerStore.currentRoute.pageName;
+    const currentRouteName = props.router.currentRoute.name;
+    const currentRoutePage = props.router.currentRoute.pageName;
     const componentConfig = props.routes[currentRouteName];
     let preventRedirect = false;
-    if (props.routerStore.isRedirecting) preventRedirect = true;
+    if (props.router.isRedirecting) preventRedirect = true;
     else if (config.loadedComponentName === currentRouteName) {
       preventRedirect = true;
     } else if (config.loadedComponentPage != null && currentRouteName != null) {
       if (config.loadedComponentPage === currentRoutePage) {
-        props.routerStore.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
         preventRedirect = true;
       }
     }
     if (preventRedirect) return;
-    props.routerStore.adapters.batch(() => {
+    props.router.adapters.batch(() => {
       if (config.loadedComponentName) {
         props.beforeUpdatePageComponent?.();
       }
       props.beforeSetPageComponent?.(componentConfig);
-      props.routerStore.adapters.batch(() => {
-        props.routerStore.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
+      props.router.adapters.batch(() => {
+        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
         config.loadedComponentName = currentRouteName;
         config.loadedComponentPage = componentConfig.pageName;
       });
@@ -56,12 +56,12 @@ function Router(props) {
   }
   props.beforeMount?.();
   redirectOnHistoryPop();
-  if (props.routerStore.adapters.immediateSetComponent) {
-    props.routerStore.adapters.batch(() => {
+  if (props.router.adapters.immediateSetComponent) {
+    props.router.adapters.batch(() => {
       setLoadedComponent();
     });
   }
-  props.routerStore.adapters.autorun(() => setLoadedComponent());
+  props.router.adapters.autorun(() => setLoadedComponent());
   return (
     // @ts-ignore
     _$createComponent(Show, {

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

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

package/dist/tsconfig.types.react.tsbuildinfo

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.20",
+  "version": "0.0.1-alpha.22",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -29,8 +29,7 @@
     ]
   },
   "dependencies": {
-    "history": "5.3.0",
-    "query-string": "7.1.3"
+    "history": "5.3.0"
   },
   "devDependencies": {
     "@types/babel__core": "7.20.5",
@@ -90,10 +89,10 @@
       "require": "./dist/cjs/solid/index.js",
       "import": "./dist/esm/solid/index.js"
     },
-    "./adapters/mobx": {
-      "types": "./dist/adapters/mobx.d.ts",
-      "require": "./dist/cjs/adapters/mobx/index.js",
-      "import": "./dist/esm/adapters/mobx/index.js"
+    "./adapters/mobx-react": {
+      "types": "./dist/adapters/mobx-react.d.ts",
+      "require": "./dist/cjs/adapters/mobx-react/index.js",
+      "import": "./dist/esm/adapters/mobx-react/index.js"
     },
     "./adapters/mobx-preact": {
       "types": "./dist/adapters/mobx-preact.d.ts",
@@ -110,10 +109,15 @@
       "require": "./dist/cjs/adapters/solid/index.js",
       "import": "./dist/esm/adapters/solid/index.js"
     },
-    "./adapters/kr-observable": {
-      "types": "./dist/adapters/kr-observable.d.ts",
-      "require": "./dist/cjs/adapters/kr-observable/index.js",
-      "import": "./dist/esm/adapters/kr-observable/index.js"
+    "./adapters/kr-observable-react": {
+      "types": "./dist/adapters/kr-observable-react.d.ts",
+      "require": "./dist/cjs/adapters/kr-observable-react/index.js",
+      "import": "./dist/esm/adapters/kr-observable-react/index.js"
+    },
+    "./adapters/kr-observable-solid": {
+      "types": "./dist/adapters/kr-observable-solid.d.ts",
+      "require": "./dist/cjs/adapters/kr-observable-solid/index.js",
+      "import": "./dist/esm/adapters/kr-observable-solid/index.js"
     },
     "./adapters/kr-observable-preact": {
       "types": "./dist/adapters/kr-observable-preact.d.ts",

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

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

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

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

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

@@ -1 +0,0 @@
-{"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,CAChC,OAAO,SAAS;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,UAAU,GAAG,eAAe,GAAG,YAAY;CAAE,EAEvF,MAAM,EAAE,OAAO,GACd;KACA,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG;QACrC,IAAI,EAAE,GAAG,CAAC;QACV,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACpC;CACF,CAEA"}

package/dist/core/createRouterStore.d.ts

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"createRouterStore.d.ts","sourceRoot":"","sources":["../../packages/core/createRouterStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAG3F,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAS9C,wBAAgB,iBAAiB,CAC/B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,EACA,QAAQ,EACR,MAAM,EACN,eAAe,GAChB,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,CA4OhE"}