reactive-route 0.0.1-alpha.16 → 0.0.1-alpha.18

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

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

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

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

package/dist/adapters/mobx-preact.d.ts

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

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

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

package/dist/adapters/mobx-solid.d.ts

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

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

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

package/dist/cjs/adapters/kr-observable-preact/index.js

@@ -0,0 +1,39 @@
+"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-preact.ts
+var kr_observable_preact_exports = {};
+__export(kr_observable_preact_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(kr_observable_preact_exports);
+var import_kr_observable = require("kr-observable");
+var import_preact = require("kr-observable/preact");
+var adapters = {
+  batch: (cb) => cb(),
+  autorun: import_kr_observable.autorun,
+  replaceObject: (obj, newObj) => {
+    for (const variableKey in obj) {
+      delete obj[variableKey];
+    }
+    Object.assign(obj, newObj);
+  },
+  makeObservable: import_kr_observable.makeObservable,
+  observer: import_preact.observer
+};

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

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

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

@@ -0,0 +1,43 @@
+"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-preact.ts
+var mobx_preact_exports = {};
+__export(mobx_preact_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(mobx_preact_exports);
+var import_mobx = require("mobx");
+var import_mobx_preact = require("mobx-preact");
+var adapters = {
+  batch: import_mobx.runInAction,
+  autorun: import_mobx.autorun,
+  observer: import_mobx_preact.observer,
+  replaceObject: (obj, newObj) => {
+    (0, import_mobx.runInAction)(() => {
+      for (const variableKey in obj) {
+        if (obj.hasOwnProperty(variableKey)) {
+          delete obj[variableKey];
+        }
+      }
+      Object.assign(obj, newObj);
+    });
+  },
+  makeObservable: import_mobx.observable
+};

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

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

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

@@ -0,0 +1,41 @@
+"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-solid.ts
+var mobx_solid_exports = {};
+__export(mobx_solid_exports, {
+  adapters: () => adapters
+});
+module.exports = __toCommonJS(mobx_solid_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);
+    });
+  },
+  makeObservable: import_mobx.observable
+};

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

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

package/dist/cjs/index.js

@@ -218,8 +218,7 @@ function createRouterStore({
     return routerStore.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
   };
   routerStore.redirectTo = async function redirectTo(config) {
-    const { route: routeName, noHistoryPush, asClient } = config;
-    const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
+    const { route: routeName, noHistoryPush } = config;
     let currentRoute;
     let currentPathname;
     let currentUrl;
@@ -261,7 +260,10 @@ function createRouterStore({
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         adapters.batch(() => {
-          adapters.replaceObject(routerStore.currentRoute.query, nextQuery || {});
+          adapters.replaceObject(routerStore.currentRoute, {
+            ...routerStore.currentRoute,
+            query: nextQuery || {}
+          });
           routerStore.routesHistory.push(nextUrl);
         });
         if (history && !noHistoryPush) {
@@ -278,38 +280,22 @@ function createRouterStore({
       routerStore.isRedirecting = true;
     });
     try {
-      await currentRoute?.beforeLeave?.(
-        {
-          nextUrl,
-          nextRoute,
-          nextQuery,
-          nextSearch,
-          nextPathname,
-          currentUrl,
-          currentQuery,
-          currentRoute,
-          currentSearch,
-          currentPathname
-        },
-        ...lifecycleParams || []
-      );
-      const redirectConfig = await nextRoute.beforeEnter?.(
-        {
-          nextUrl,
-          nextRoute,
-          nextQuery,
-          nextSearch,
-          nextPathname,
-          currentUrl,
-          currentQuery,
-          currentRoute,
-          currentSearch,
-          currentPathname
-        },
-        ...lifecycleParams || []
-      );
+      const config2 = {
+        nextUrl,
+        nextRoute,
+        nextQuery,
+        nextSearch,
+        nextPathname,
+        currentUrl,
+        currentQuery,
+        currentRoute,
+        currentSearch,
+        currentPathname
+      };
+      await currentRoute?.beforeLeave?.(config2, ...lifecycleParams || []);
+      const redirectConfig = await nextRoute.beforeEnter?.(config2, ...lifecycleParams || []);
       if (typeof redirectConfig === "object") {
-        if (isClient) return redirectTo({ ...redirectConfig, asClient });
+        if (constants.isClient) return redirectTo(redirectConfig);
         const redirectRoute = routes[redirectConfig.route];
         const redirectParams = "params" in redirectConfig && redirectConfig.params ? redirectConfig.params : void 0;
         let redirectUrl = replaceDynamicValues({
@@ -340,8 +326,8 @@ function createRouterStore({
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: {},
-          params: {},
+          query: adapters.makeObservable({}),
+          params: adapters.makeObservable({}),
           pageName: routes[routes.internalError.name].pageName
         });
         routerStore.isRedirecting = false;

package/dist/cjs/preact/index.js

@@ -0,0 +1,104 @@
+"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/preact/index.ts
+var preact_exports = {};
+__export(preact_exports, {
+  Router: () => Router
+});
+module.exports = __toCommonJS(preact_exports);
+
+// packages/preact/Router.tsx
+var import_hooks = require("preact/hooks");
+var import_reactive_route = require("reactive-route");
+var import_jsx_runtime = require("preact/jsx-runtime");
+function RouterInner(props) {
+  const disposerRef = (0, import_hooks.useRef)(null);
+  const redirectOnHistoryPop = (0, import_hooks.useCallback)(() => {
+    if (!import_reactive_route.history) return;
+    import_reactive_route.history.listen((params) => {
+      if (params.action !== "POP") return;
+      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
+      if (previousRoutePathname === params.location.pathname) {
+        props.routerStore.adapters.batch(() => props.routerStore.routesHistory.pop());
+      }
+      void props.routerStore.redirectTo({
+        noHistoryPush: true,
+        ...(0, import_reactive_route.getInitialRoute)({
+          routes: props.routes,
+          pathname: import_reactive_route.history.location.pathname
+        })
+      });
+    });
+  }, []);
+  const [config] = (0, import_hooks.useState)(
+    () => props.routerStore.adapters.makeObservable({
+      loadedComponentName: void 0,
+      loadedComponentPage: void 0,
+      currentProps: {}
+    })
+  );
+  const setLoadedComponent = (0, import_hooks.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 === 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 || {} : {};
+        });
+        preventRedirect = true;
+      }
+    }
+    if (preventRedirect) return;
+    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;
+    });
+  }, []);
+  (0, import_hooks.useState)(() => {
+    props.routerStore.adapters.batch(() => {
+      props.beforeMount?.();
+      redirectOnHistoryPop();
+      setLoadedComponent();
+      disposerRef.current = props.routerStore.adapters.autorun(setLoadedComponent);
+    });
+  });
+  (0, import_hooks.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;
+}
+function Router(props) {
+  const [Component] = (0, import_hooks.useState)(
+    () => props.routerStore.adapters.observer ? props.routerStore.adapters.observer(RouterInner) : RouterInner
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
+}

package/dist/cjs/preact/package.json

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

package/dist/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;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,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;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"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"TypeRedirectToParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectToParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,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,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,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,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,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,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC"}
+{"version":3,"file":"TypeRedirectToParams.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypeRedirectToParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,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"}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+// packages/adapters/mobx-solid.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);
+    });
+  },
+  makeObservable: observable
+};
+export {
+  adapters
+};

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

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

package/dist/esm/index.js

@@ -175,8 +175,7 @@ function createRouterStore({
     return routerStore.redirectTo(getInitialRoute({ routes, pathname: params.pathname }));
   };
   routerStore.redirectTo = async function redirectTo(config) {
-    const { route: routeName, noHistoryPush, asClient } = config;
-    const isClient = typeof asClient === "boolean" ? asClient : constants.isClient;
+    const { route: routeName, noHistoryPush } = config;
     let currentRoute;
     let currentPathname;
     let currentUrl;
@@ -218,7 +217,10 @@ function createRouterStore({
     if (currentPathname === nextPathname) {
       if (currentSearch !== nextSearch) {
         adapters.batch(() => {
-          adapters.replaceObject(routerStore.currentRoute.query, nextQuery || {});
+          adapters.replaceObject(routerStore.currentRoute, {
+            ...routerStore.currentRoute,
+            query: nextQuery || {}
+          });
           routerStore.routesHistory.push(nextUrl);
         });
         if (history && !noHistoryPush) {
@@ -235,38 +237,22 @@ function createRouterStore({
       routerStore.isRedirecting = true;
     });
     try {
-      await currentRoute?.beforeLeave?.(
-        {
-          nextUrl,
-          nextRoute,
-          nextQuery,
-          nextSearch,
-          nextPathname,
-          currentUrl,
-          currentQuery,
-          currentRoute,
-          currentSearch,
-          currentPathname
-        },
-        ...lifecycleParams || []
-      );
-      const redirectConfig = await nextRoute.beforeEnter?.(
-        {
-          nextUrl,
-          nextRoute,
-          nextQuery,
-          nextSearch,
-          nextPathname,
-          currentUrl,
-          currentQuery,
-          currentRoute,
-          currentSearch,
-          currentPathname
-        },
-        ...lifecycleParams || []
-      );
+      const config2 = {
+        nextUrl,
+        nextRoute,
+        nextQuery,
+        nextSearch,
+        nextPathname,
+        currentUrl,
+        currentQuery,
+        currentRoute,
+        currentSearch,
+        currentPathname
+      };
+      await currentRoute?.beforeLeave?.(config2, ...lifecycleParams || []);
+      const redirectConfig = await nextRoute.beforeEnter?.(config2, ...lifecycleParams || []);
       if (typeof redirectConfig === "object") {
-        if (isClient) return redirectTo({ ...redirectConfig, asClient });
+        if (constants.isClient) return redirectTo(redirectConfig);
         const redirectRoute = routes[redirectConfig.route];
         const redirectParams = "params" in redirectConfig && redirectConfig.params ? redirectConfig.params : void 0;
         let redirectUrl = replaceDynamicValues({
@@ -297,8 +283,8 @@ function createRouterStore({
           name: routes.internalError.name,
           path: routes.internalError.path,
           props: routes[routes.internalError.name].props,
-          query: {},
-          params: {},
+          query: adapters.makeObservable({}),
+          params: adapters.makeObservable({}),
           pageName: routes[routes.internalError.name].pageName
         });
         routerStore.isRedirecting = false;

package/dist/esm/preact/index.js

@@ -0,0 +1,81 @@
+// packages/preact/Router.tsx
+import { useCallback, useEffect, useRef, useState } from "preact/hooks";
+import { getInitialRoute, history } from "reactive-route";
+import { jsx } from "preact/jsx-runtime";
+function RouterInner(props) {
+  const disposerRef = useRef(null);
+  const redirectOnHistoryPop = useCallback(() => {
+    if (!history) return;
+    history.listen((params) => {
+      if (params.action !== "POP") return;
+      const previousRoutePathname = props.routerStore.routesHistory[props.routerStore.routesHistory.length - 2];
+      if (previousRoutePathname === params.location.pathname) {
+        props.routerStore.adapters.batch(() => props.routerStore.routesHistory.pop());
+      }
+      void props.routerStore.redirectTo({
+        noHistoryPush: true,
+        ...getInitialRoute({
+          routes: props.routes,
+          pathname: history.location.pathname
+        })
+      });
+    });
+  }, []);
+  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 === 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 || {} : {};
+        });
+        preventRedirect = true;
+      }
+    }
+    if (preventRedirect) return;
+    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;
+    });
+  }, []);
+  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;
+}
+function Router(props) {
+  const [Component] = useState(
+    () => props.routerStore.adapters.observer ? props.routerStore.adapters.observer(RouterInner) : RouterInner
+  );
+  return /* @__PURE__ */ jsx(Component, { ...props });
+}
+export {
+  Router
+};

package/dist/esm/preact/package.json

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

package/dist/preact/Router.d.ts

@@ -0,0 +1,3 @@
+import { TypePropsRouter, TypeRoute } from 'reactive-route';
+export declare function Router<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): any;
+//# sourceMappingURL=Router.d.ts.map

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

@@ -0,0 +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"}

package/dist/preact/index.d.ts

@@ -0,0 +1,2 @@
+export { Router } from './Router';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/preact/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/dist/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,kCA4FhG"}
+{"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,kCA0FhG"}

package/dist/tsconfig.types.react.tsbuildinfo

@@ -1 +1 @@
-{"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"],"version":"5.9.2"}
+{"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.16",
+  "version": "0.0.1-alpha.18",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -33,32 +33,36 @@
     "query-string": "7.1.3"
   },
   "devDependencies": {
-    "@babel/core": "7.28.3",
+    "@types/babel__core": "7.20.5",
+    "@babel/core": "7.28.4",
     "@babel/preset-env": "7.28.3",
     "@babel/preset-typescript": "7.27.1",
+    "babel-preset-solid": "1.9.9",
+    "vite-plugin-babel": "1.3.2",
     "@biomejs/biome": "2.2.2",
-    "@espcom/esbuild-plugin-replace": "1.3.0",
+    "@espcom/esbuild-plugin-replace": "1.3.1",
     "@solidjs/testing-library": "0.8.10",
     "@testing-library/react": "16.3.0",
+    "@testing-library/preact": "3.2.4",
     "@types/lodash": "4.17.16",
     "@types/node": "22.14.1",
     "@vitest/coverage-istanbul": "3.2.4",
-    "babel-preset-solid": "1.9.9",
+    "@preact/preset-vite": "2.10.2",
     "badge-maker": "5.0.2",
-    "esbuild": "0.25.9",
-    "global-jsdom": "26.0.0",
+    "esbuild": "0.25.10",
     "husky": "9.1.7",
-    "kr-observable": "3.1.1",
+    "kr-observable": "3.1.2",
     "lint-staged": "16.1.6",
     "lodash": "4.17.21",
     "mobx": "6.13.7",
+    "mobx-preact": "3.0.0",
     "mobx-react-lite": "4.1.0",
     "react": "19.1.1",
-    "regenerator-runtime": "0.14.1",
+    "preact": "10.27.2",
+    "preact-render-to-string": "6.6.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",
@@ -76,6 +80,11 @@
       "require": "./dist/cjs/react/index.js",
       "import": "./dist/esm/react/index.js"
     },
+    "./preact": {
+      "types": "./dist/preact/index.d.ts",
+      "require": "./dist/cjs/preact/index.js",
+      "import": "./dist/esm/preact/index.js"
+    },
     "./solid": {
       "types": "./dist/solid/index.d.ts",
       "require": "./dist/cjs/solid/index.js",
@@ -86,6 +95,11 @@
       "require": "./dist/cjs/adapters/mobx/index.js",
       "import": "./dist/esm/adapters/mobx/index.js"
     },
+    "./adapters/mobx-preact": {
+      "types": "./dist/adapters/mobx-preact.d.ts",
+      "require": "./dist/cjs/adapters/mobx-preact/index.js",
+      "import": "./dist/esm/adapters/mobx-preact/index.js"
+    },
     "./adapters/solid": {
       "types": "./dist/adapters/solid.d.ts",
       "require": "./dist/cjs/adapters/solid/index.js",
@@ -95,6 +109,11 @@
       "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-preact": {
+      "types": "./dist/adapters/kr-observable-preact.d.ts",
+      "require": "./dist/cjs/adapters/kr-observable-preact/index.js",
+      "import": "./dist/esm/adapters/kr-observable-preact/index.js"
     }
   },
   "main": "dist/cjs/index.js",