reactive-route 0.0.1-alpha.28 → 0.0.1-alpha.29

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

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

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

@@ -26,7 +26,7 @@ module.exports = __toCommonJS(vue_exports);
 var import_vue = require("vue");
 var adapters = {
   batch: (cb) => cb(),
-  autorun: import_vue.watchEffect,
+  autorun: (cb) => (0, import_vue.watchEffect)(cb, { flush: "post" }),
   replaceObject: (obj, newObj) => {
     for (const variableKey in obj) {
       if (obj.hasOwnProperty(variableKey)) {
@@ -35,5 +35,6 @@ var adapters = {
     }
     Object.assign(obj, newObj);
   },
-  makeObservable: import_vue.reactive
+  makeObservable: import_vue.reactive,
+  immediateSetComponent: true
 };

package/dist/cjs/index.js

@@ -219,7 +219,7 @@ function createRouter(config) {
     return router.redirect(getInitialRoute({ routes: router.routes, ...params }));
   };
   router.redirect = async function redirect(config2) {
-    const { route: routeName, noHistoryPush } = config2;
+    const { route: routeName, replace } = config2;
     let currentRoute;
     let currentPathname;
     let currentUrl;
@@ -264,7 +264,7 @@ function createRouter(config) {
           });
           router.routesHistory.push(nextUrl);
         });
-        if (history && !noHistoryPush) {
+        if (history && !replace) {
           history.push({
             hash: history.location.hash,
             search: nextSearch,
@@ -351,7 +351,7 @@ function createRouter(config) {
       if (lastUrl !== nextUrl) {
         router.routesHistory.push(nextUrl);
       }
-      if (history && !noHistoryPush) {
+      if (history && !replace) {
         history.push({
           hash: history.location.hash,
           search: "query" in config2 ? `?${queryString.stringify(config2.query)}` : "",

package/dist/cjs/preact/index.js

@@ -40,7 +40,7 @@ function RouterInner(props) {
       }
       void props.router.restoreFromURL({
         pathname: import_reactive_route.history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }, []);

package/dist/cjs/react/index.js

@@ -40,7 +40,7 @@ function RouterInner(props) {
       }
       void props.router.restoreFromURL({
         pathname: import_reactive_route.history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }, []);

package/dist/cjs/solid/index.js

@@ -47,7 +47,7 @@ function Router(props) {
       }
       void props.router.restoreFromURL({
         pathname: import_reactive_route.history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }

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

@@ -4,17 +4,17 @@ export type TypeRedirectParams<TRoutes extends Record<string, TypeRoute>, TRoute
     route: TRouteName;
     params: Record<keyof TRoutes[TRouteName]['params'], string>;
     query?: Partial<Record<keyof TRoutes[TRouteName]['query'], string>>;
-    noHistoryPush?: boolean;
+    replace?: boolean;
 } : {
     route: TRouteName;
     params: Record<keyof TRoutes[TRouteName]['params'], string>;
-    noHistoryPush?: boolean;
+    replace?: boolean;
 } : TRoutes[TRouteName]['query'] extends Record<string, TypeValidator> ? {
     route: TRouteName;
     query?: Partial<Record<keyof TRoutes[TRouteName]['query'], string>>;
-    noHistoryPush?: boolean;
+    replace?: boolean;
 } : {
     route: TRouteName;
-    noHistoryPush?: boolean;
+    replace?: boolean;
 };
 //# sourceMappingURL=TypeRedirectParams.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TypeRedirectParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,CAC5B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACzC,UAAU,SAAS,MAAM,OAAO,IAC9B,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACnE,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACH,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC"}
+{"version":3,"file":"TypeRedirectParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,kBAAkB,CAC5B,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACzC,UAAU,SAAS,MAAM,OAAO,IAC9B,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GACnE,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACH,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAChE;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC"}

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

@@ -11,7 +11,7 @@ export type TypeRouter<TRoutes extends Record<string | 'notFound' | 'internalErr
     redirect<TRouteName extends keyof TRoutes>(config: TypeRedirectParams<TRoutes, TRouteName>): Promise<void>;
     restoreFromURL(params: {
         pathname: string;
-        noHistoryPush?: boolean;
+        replace?: boolean;
     }): Promise<void>;
     restoreFromServer(obj: {
         routesHistory: Array<string>;

package/dist/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,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,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;CAC9B,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,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;CAC9B,CAAC"}

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

@@ -2,7 +2,7 @@
 import { reactive, watchEffect } from "vue";
 var adapters = {
   batch: (cb) => cb(),
-  autorun: watchEffect,
+  autorun: (cb) => watchEffect(cb, { flush: "post" }),
   replaceObject: (obj, newObj) => {
     for (const variableKey in obj) {
       if (obj.hasOwnProperty(variableKey)) {
@@ -11,7 +11,8 @@ var adapters = {
     }
     Object.assign(obj, newObj);
   },
-  makeObservable: reactive
+  makeObservable: reactive,
+  immediateSetComponent: true
 };
 export {
   adapters

package/dist/esm/index.js

@@ -188,7 +188,7 @@ function createRouter(config) {
     return router.redirect(getInitialRoute({ routes: router.routes, ...params }));
   };
   router.redirect = async function redirect(config2) {
-    const { route: routeName, noHistoryPush } = config2;
+    const { route: routeName, replace } = config2;
     let currentRoute;
     let currentPathname;
     let currentUrl;
@@ -233,7 +233,7 @@ function createRouter(config) {
           });
           router.routesHistory.push(nextUrl);
         });
-        if (history && !noHistoryPush) {
+        if (history && !replace) {
           history.push({
             hash: history.location.hash,
             search: nextSearch,
@@ -320,7 +320,7 @@ function createRouter(config) {
       if (lastUrl !== nextUrl) {
         router.routesHistory.push(nextUrl);
       }
-      if (history && !noHistoryPush) {
+      if (history && !replace) {
         history.push({
           hash: history.location.hash,
           search: "query" in config2 ? `?${queryString.stringify(config2.query)}` : "",

package/dist/esm/preact/index.js

@@ -14,7 +14,7 @@ function RouterInner(props) {
       }
       void props.router.restoreFromURL({
         pathname: history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }, []);

package/dist/esm/react/index.js

@@ -14,7 +14,7 @@ function RouterInner(props) {
       }
       void props.router.restoreFromURL({
         pathname: history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }, []);

package/dist/esm/solid/index.js

@@ -21,7 +21,7 @@ function Router(props) {
       }
       void props.router.restoreFromURL({
         pathname: history.location.pathname,
-        noHistoryPush: true
+        replace: true
       });
     });
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.28",
+  "version": "0.0.1-alpha.29",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "upgrade-lib": "bash -c 'pnpm upgrade -r $@' bash",
     "test": "vitest run&&node --import tsx ./scripts/genCoverageBadge.ts",
     "test-watch": "vitest --coverage=false",
-    "test-vue": "vitest run --config ./vitest.vue.config.mjs --coverage=false",
+    "test-vue": "vitest --config ./vitest.vue.config.mjs --coverage=false",
     "e2e": "playwright test",
     "e2e:ui": "playwright test --ui",
     "e2e:install": "playwright install --with-deps",

package/vitepress/guide/router-configuration.md

@@ -68,7 +68,7 @@ await router.redirect({
   // with query parameters
   query: { q: 's' },
   // if you want to replace history state instead of pushing
-  noHistoryPush: true,
+  replace: true,
 });
 ```
 

package/vitest.vue.config.mjs

@@ -2,7 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
-    projects: ['packages/vue/vitest.config.mjs'],
+    projects: ['packages/vue/vitest.config.mjs' /*, 'packages/vue/vitest.ssr.config.mjs'*/],
     coverage: {
       clean: false,
       enabled: true,