reactive-route 0.0.1-alpha.32 → 0.0.1-alpha.34

package/core/createRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAqQtB"}
+{"version":3,"file":"createRouter.d.ts","sourceRoot":"","sources":["../../packages/core/createRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,wBAAgB,YAAY,CAC1B,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,UAAU,GAAG,eAAe,EAAE,SAAS,CAAC,EACxE,MAAM,EAAE;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CAC9B,GAAG,UAAU,CAAC,OAAO,CAAC,CAuPtB"}

package/core/types/TypeRouter.d.ts

@@ -6,15 +6,13 @@ export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalErr
     routes: TRoutes;
     adapters: TypeAdapters;
     currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
-    routesHistory: Array<string>;
     isRedirecting: boolean;
-    redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<void>;
+    redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<string>;
     restoreFromURL(params: {
         pathname: string;
         replace?: boolean;
-    }): Promise<void>;
+    }): Promise<string>;
     restoreFromServer(obj: {
-        routesHistory: Array<string>;
         currentRoute: TypeCurrentRoute<TRoutes[keyof TRoutes]>;
     }): Promise<void>;
     lifecycleParams?: Array<any>;

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

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

package/core/utils/getInitialRoute.d.ts

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

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

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

package/index.cjs

@@ -131,7 +131,8 @@ function getInitialRoute(params) {
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
+    params: getDynamicValues({ route, pathname: params.pathname }),
+    replace: params.replace
   };
 }
 
@@ -185,7 +186,6 @@ function replaceDynamicValues({
 // packages/core/createRouter.ts
 function createRouter(config) {
   const router = config.adapters.makeObservable({
-    routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirect: void 0,
@@ -204,7 +204,6 @@ function createRouter(config) {
   });
   router.restoreFromServer = function restoreFromServer(obj) {
     router.adapters.batch(() => {
-      router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
     const preloadedRouteName = Object.keys(router.routes).find(
@@ -251,7 +250,7 @@ function createRouter(config) {
         nextUrl = `${nextPathname}?${nextSearch}`;
       }
     }
-    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentUrl === nextUrl) return nextUrl;
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         router.adapters.batch(() => {
@@ -259,13 +258,12 @@ function createRouter(config) {
             ...router.currentRoute,
             query: nextQuery || {}
           });
-          router.routesHistory.push(nextUrl);
         });
         if (constants.isClient) {
           window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.isRedirecting = true;
@@ -311,7 +309,7 @@ function createRouter(config) {
       await loadComponentToConfig({ route: router.routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
-        return Promise.resolve();
+        return currentUrl;
       }
       if (error instanceof RedirectError) {
         throw error;
@@ -329,7 +327,7 @@ function createRouter(config) {
         });
         router.isRedirecting = false;
       });
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.adapters.replaceObject(router.currentRoute, {
@@ -340,23 +338,15 @@ function createRouter(config) {
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
         pageId: router.routes[nextRoute.name].pageId
       });
-      const lastUrl = router.routesHistory[router.routesHistory.length - 1];
-      if (lastUrl !== nextUrl) {
-        router.routesHistory.push(nextUrl);
-        if (constants.isClient) {
-          window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
-        }
+      if (constants.isClient) {
+        window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
-    return Promise.resolve();
+    return nextUrl;
   };
   function popHandler() {
     const currentUrl = `${location.pathname}${location.search}`;
-    const previousUrl = router.routesHistory[router.routesHistory.length - 2];
-    if (previousUrl === currentUrl) {
-      router.adapters.batch(() => router.routesHistory.pop());
-    }
     void router.restoreFromURL({ pathname: currentUrl, replace: true });
   }
   if (constants.isClient) {

package/index.mjs

@@ -100,7 +100,8 @@ function getInitialRoute(params) {
   return {
     route: route.name,
     query: getQueryValues({ route, pathname: params.pathname }),
-    params: getDynamicValues({ route, pathname: params.pathname })
+    params: getDynamicValues({ route, pathname: params.pathname }),
+    replace: params.replace
   };
 }
 
@@ -154,7 +155,6 @@ function replaceDynamicValues({
 // packages/core/createRouter.ts
 function createRouter(config) {
   const router = config.adapters.makeObservable({
-    routesHistory: [],
     currentRoute: {},
     isRedirecting: false,
     redirect: void 0,
@@ -173,7 +173,6 @@ function createRouter(config) {
   });
   router.restoreFromServer = function restoreFromServer(obj) {
     router.adapters.batch(() => {
-      router.routesHistory.push(...obj.routesHistory || []);
       Object.assign(router.currentRoute, obj.currentRoute);
     });
     const preloadedRouteName = Object.keys(router.routes).find(
@@ -220,7 +219,7 @@ function createRouter(config) {
         nextUrl = `${nextPathname}?${nextSearch}`;
       }
     }
-    if (currentUrl === nextUrl) return Promise.resolve();
+    if (currentUrl === nextUrl) return nextUrl;
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         router.adapters.batch(() => {
@@ -228,13 +227,12 @@ function createRouter(config) {
             ...router.currentRoute,
             query: nextQuery || {}
           });
-          router.routesHistory.push(nextUrl);
         });
         if (constants.isClient) {
           window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
         }
       }
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.isRedirecting = true;
@@ -280,7 +278,7 @@ function createRouter(config) {
       await loadComponentToConfig({ route: router.routes[nextRoute.name] });
     } catch (error) {
       if (error instanceof PreventError) {
-        return Promise.resolve();
+        return currentUrl;
       }
       if (error instanceof RedirectError) {
         throw error;
@@ -298,7 +296,7 @@ function createRouter(config) {
         });
         router.isRedirecting = false;
       });
-      return Promise.resolve();
+      return nextUrl;
     }
     router.adapters.batch(() => {
       router.adapters.replaceObject(router.currentRoute, {
@@ -309,23 +307,15 @@ function createRouter(config) {
         params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
         pageId: router.routes[nextRoute.name].pageId
       });
-      const lastUrl = router.routesHistory[router.routesHistory.length - 1];
-      if (lastUrl !== nextUrl) {
-        router.routesHistory.push(nextUrl);
-        if (constants.isClient) {
-          window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
-        }
+      if (constants.isClient) {
+        window.history[replace ? "replaceState" : "pushState"](null, "", nextUrl);
       }
       router.isRedirecting = false;
     });
-    return Promise.resolve();
+    return nextUrl;
   };
   function popHandler() {
     const currentUrl = `${location.pathname}${location.search}`;
-    const previousUrl = router.routesHistory[router.routesHistory.length - 2];
-    if (previousUrl === currentUrl) {
-      router.adapters.batch(() => router.routesHistory.pop());
-    }
     void router.restoreFromURL({ pathname: currentUrl, replace: true });
   }
   if (constants.isClient) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.32",
+  "version": "0.0.1-alpha.34",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",

package/solid/Router.d.ts.map

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

package/solid/index.cjs

@@ -42,7 +42,10 @@ function Router(props) {
       (0, import_reactive_route.routerSetLoadedComponent)(props, config);
     });
   }
-  props.router.adapters.autorun(() => (0, import_reactive_route.routerSetLoadedComponent)(props, config));
+  const disposer = props.router.adapters.autorun(() => (0, import_reactive_route.routerSetLoadedComponent)(props, config));
+  (0, import_solid_js.onCleanup)(() => {
+    if (typeof disposer === "function") disposer();
+  });
   return (
     // @ts-ignore
     (0, import_web.createComponent)(import_solid_js.Show, {

package/solid/index.mjs

@@ -2,7 +2,7 @@
 import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
 import { routerSetLoadedComponent } from "reactive-route";
-import { Show } from "solid-js";
+import { onCleanup, Show } from "solid-js";
 import { Dynamic } from "solid-js/web";
 function Router(props) {
   const config = props.router.adapters.makeObservable({
@@ -16,7 +16,10 @@ function Router(props) {
       routerSetLoadedComponent(props, config);
     });
   }
-  props.router.adapters.autorun(() => routerSetLoadedComponent(props, config));
+  const disposer = props.router.adapters.autorun(() => routerSetLoadedComponent(props, config));
+  onCleanup(() => {
+    if (typeof disposer === "function") disposer();
+  });
   return (
     // @ts-ignore
     _$createComponent(Show, {