@argon-router/core 0.11.1 → 0.12.0

package/dist/index.js

@@ -1,8 +1,12 @@
-import { createEffect, createStore, createEvent, attach, sample, split, scopeBind, withFactory } from "effector";
+import { createEffect, attach, createStore, createEvent, sample, scopeBind, split, withFactory } from "effector";
+import { createAction, createAsyncAction } from "effector-action";
+import { compile } from "@argon-router/paths";
 import queryString from "query-string";
 import { or, not } from "patronum";
-function createRoute(config) {
+function createRoute() {
+  let config = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   let asyncImport;
+  const beforeOpen = config.beforeOpen ?? [];
   const openFx = createEffect(async (payload) => {
     await waitForAsyncBundleFx();
     await beforeOpenFx();
@@ -18,65 +22,80 @@ function createRoute(config) {
     return payload;
   }, {
     name: "openFx",
-    sid: "awhgwd"
+    sid: "sf5hhk"
+  });
+  const forceOpenParentFx = createEffect(async (payload) => {
+    const parent = config.parent;
+    if (parent) {
+      await parent.internal.forceOpenParentFx({
+        ...payload ?? {
+          params: {}
+        },
+        navigate: false
+      });
+    }
+    return payload;
+  }, {
+    name: "forceOpenParentFx",
+    sid: "acd7wj"
+  });
+  const navigatedFx = attach({
+    and: {
+      effect: openFx
+    },
+    or: {
+      name: "navigatedFx",
+      sid: "ci6eci"
+    }
   });
   const $params = createStore({}, {
     name: "$params",
-    sid: "-oahffx"
+    sid: "p3bnh9"
   });
   const $isOpened = createStore(false, {
     name: "$isOpened",
-    sid: "-6l68oe"
+    sid: "o5kkev"
   });
   const $isPending = openFx.pending;
   const open = createEvent({
     name: "open",
-    sid: "gjsrgc"
+    sid: "-bhgc3p"
   });
   const close = createEvent({
     name: "close",
-    sid: "-yagmc8"
+    sid: "vypd6z"
   });
   const opened = createEvent({
     name: "opened",
-    sid: "x0iwhi"
+    sid: "-uyucke"
   });
   const openedOnServer = createEvent({
     name: "openedOnServer",
-    sid: "346r3u"
+    sid: "mewjoi"
   });
   const openedOnClient = createEvent({
     name: "openedOnClient",
-    sid: "31q95t"
+    sid: "63cfjt"
   });
   const navigated = createEvent({
     name: "navigated",
-    sid: "-t30l0x"
+    sid: "mycajg"
   });
   const closed = createEvent({
     name: "closed",
-    sid: "uue4ce"
+    sid: "5idv7d"
   });
   const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
     name: "waitForAsyncBundleFx",
-    sid: "-nml5ho"
+    sid: "-6s0q41"
   });
   const beforeOpenFx = createEffect(async () => {
-    for (const fx of config.beforeOpen ?? []) {
+    for (const fx of beforeOpen) {
       await fx();
     }
   }, {
     name: "beforeOpenFx",
-    sid: "-vqlnbm"
-  });
-  const navigatedFx = attach({
-    and: {
-      effect: openFx
-    },
-    or: {
-      name: "navigatedFx",
-      sid: "a4yadj"
-    }
+    sid: "7f9gfq"
   });
   const defaultParams = {};
   sample({
@@ -85,7 +104,7 @@ function createRoute(config) {
       target: openFx
     }],
     or: {
-      sid: "ynxuww"
+      sid: "-yxhjaa"
     }
   });
   sample({
@@ -98,24 +117,36 @@ function createRoute(config) {
       target: navigatedFx
     }],
     or: {
-      sid: "z28ica"
+      sid: "-yj6vuw"
     }
   });
   sample({
     and: [{
-      clock: navigatedFx.doneData,
-      fn: (payload) => {
-        if (!payload) {
-          return defaultParams;
-        }
-        return "params" in payload ? {
-          ...payload.params
-        } : defaultParams;
+      clock: navigatedFx.done,
+      fn: (_ref) => {
+        let {
+          params
+        } = _ref;
+        return params;
       },
-      target: $params
+      target: forceOpenParentFx
     }],
     or: {
-      sid: "z5j9wg"
+      sid: "-yfw4aq"
+    }
+  });
+  createAction({
+    clock: [navigatedFx.doneData, forceOpenParentFx.doneData],
+    target: {
+      $params
+    },
+    fn: (target, payload) => {
+      if (!payload) {
+        return target.$params(defaultParams);
+      }
+      return target.$params("params" in payload ? {
+        ...payload.params
+      } : defaultParams);
     }
   });
   sample({
@@ -125,20 +156,20 @@ function createRoute(config) {
       target: $params
     }],
     or: {
-      sid: "-z1vw16"
+      sid: "-xhsvic"
     }
   });
-  split({
-    and: [{
-      source: navigatedFx.doneData,
-      match: () => typeof window === "undefined" ? "server" : "client",
-      cases: {
-        server: openedOnServer,
-        client: openedOnClient
+  createAction({
+    clock: [navigatedFx.doneData, forceOpenParentFx.doneData],
+    target: {
+      openedOnServer,
+      openedOnClient
+    },
+    fn: (target, payload) => {
+      if (typeof window === "undefined") {
+        return target.openedOnServer(payload);
       }
-    }],
-    or: {
-      sid: "-yyl4h0"
+      return target.openedOnClient(payload);
     }
   });
   sample({
@@ -147,7 +178,7 @@ function createRoute(config) {
       target: opened
     }],
     or: {
-      sid: "-yhji2t"
+      sid: "-w72d2n"
     }
   });
   sample({
@@ -156,7 +187,7 @@ function createRoute(config) {
       target: closed
     }],
     or: {
-      sid: "-y38unf"
+      sid: "-w4be3u"
     }
   });
   sample({
@@ -165,13 +196,14 @@ function createRoute(config) {
       target: $isOpened
     }],
     or: {
-      sid: "-y0hvom"
+      sid: "-ls2oed"
     }
   });
   return {
     $params,
     $isOpened,
     $isPending,
+    // @ts-expect-error :((
     open,
     closed,
     opened,
@@ -182,12 +214,14 @@ function createRoute(config) {
       navigated,
       close,
       openFx,
+      forceOpenParentFx,
       setAsyncImport: (value) => asyncImport = value
     },
     "@@unitShape": () => ({
       params: $params,
       isPending: $isPending,
       isOpened: $isOpened,
+      // @ts-expect-error :((
       onOpen: open
     })
   };
@@ -208,7 +242,7 @@ function trackQueryControlsFactory(_ref) {
   return trackQueryFactory({
     $activeRoutes: createStore([], {
       name: "$activeRoutes",
-      sid: "ni3bf8"
+      sid: "og6k7m"
     }),
     $query,
     navigate
@@ -227,27 +261,27 @@ function trackQueryFactory(_ref2) {
     } = config;
     const $entered = createStore(false, {
       name: "$entered",
-      sid: "-i5493b"
+      sid: "-792y0u"
     });
     const entered = createEvent({
       name: "entered",
-      sid: "9i8bun"
+      sid: "agbkn1"
     });
     const exited = createEvent({
       name: "exited",
-      sid: "-p2hcsy"
+      sid: "-o4e40k"
     });
     const enter = createEvent({
       name: "enter",
-      sid: "30cmky"
+      sid: "3yfvdc"
     });
     const exit = createEvent({
       name: "exit",
-      sid: "-2657ec"
+      sid: "-181yly"
     });
     const changeEntered = createEvent({
       name: "changeEntered",
-      sid: "-5jm7r1"
+      sid: "-4liyyn"
     });
     sample({
       and: [{
@@ -255,7 +289,7 @@ function trackQueryFactory(_ref2) {
         target: $entered
       }],
       or: {
-        sid: "-j6nk9y"
+        sid: "-iu0amn"
       }
     });
     sample({
@@ -280,7 +314,7 @@ function trackQueryFactory(_ref2) {
         target: [entered, changeEntered.prepend(() => true)]
       }],
       or: {
-        sid: "-iscwuk"
+        sid: "-ir9bnu"
       }
     });
     sample({
@@ -301,7 +335,7 @@ function trackQueryFactory(_ref2) {
         target: [exited.prepend(() => void 0), changeEntered.prepend(() => false)]
       }],
       or: {
-        sid: "-ibv31q"
+        sid: "-iarhv0"
       }
     });
     sample({
@@ -319,7 +353,7 @@ function trackQueryFactory(_ref2) {
         target: navigate
       }],
       or: {
-        sid: "-hsmaa3"
+        sid: "-hqywi0"
       }
     });
     sample({
@@ -345,7 +379,7 @@ function trackQueryFactory(_ref2) {
         target: navigate
       }],
       or: {
-        sid: "-whgzm0"
+        sid: "-wf9t8k"
       }
     });
     return {
@@ -356,298 +390,46 @@ function trackQueryFactory(_ref2) {
     };
   };
 }
-function prepareParser(tokens) {
-  return (input) => {
-    const rawTokens = input.split("/").map((part) => part.trim()).filter((part) => part !== "");
-    let params = null;
-    function setKey(key, value) {
-      if (!params) {
-        params = {};
-      }
-      params[key] = value;
-    }
-    if (tokens.length === 0) {
-      return rawTokens.length === 0 ? {
-        path: input,
-        params: null
-      } : null;
-    }
-    for (let i = 0; i < tokens.length; i++) {
-      const token = tokens[i];
-      switch (token.type) {
-        case "const": {
-          if (token.name !== rawTokens.shift()) {
-            return null;
-          }
-          continue;
-        }
-        case "parameter": {
-          const {
-            arrayProps,
-            genericProps,
-            required
-          } = token.payload;
-          if (arrayProps) {
-            const array = [];
-            let rawToken2;
-            while (true) {
-              rawToken2 = rawTokens.shift();
-              if (!rawToken2) {
-                break;
-              }
-              switch (genericProps == null ? void 0 : genericProps.type) {
-                case "number": {
-                  if (isNaN(+rawToken2)) {
-                    return null;
-                  }
-                  array.push(+rawToken2);
-                  break;
-                }
-                case "union": {
-                  if (!genericProps.items.includes(rawToken2)) {
-                    return null;
-                  }
-                  array.push(rawToken2);
-                  break;
-                }
-                default: {
-                  array.push(rawToken2);
-                  break;
-                }
-              }
-              if (array.length >= (arrayProps.max ?? Infinity)) {
-                break;
-              }
-            }
-            if (array.length < (arrayProps.min ?? 0)) {
-              return null;
-            }
-            if (rawTokens.length > 0 && !tokens[i + 1]) {
-              return null;
-            }
-            setKey(token.name, array);
-            break;
-          }
-          const rawToken = rawTokens.shift();
-          if (required && !rawToken) {
-            return null;
-          }
-          if (!rawToken) {
-            setKey(token.name, void 0);
-            continue;
-          }
-          switch (genericProps == null ? void 0 : genericProps.type) {
-            case "number": {
-              if (isNaN(+rawToken)) {
-                return null;
-              }
-              setKey(token.name, +rawToken);
-              break;
-            }
-            case "union": {
-              if (!genericProps.items.includes(rawToken)) {
-                return null;
-              }
-              setKey(token.name, rawToken);
-              break;
-            }
-            default: {
-              setKey(token.name, rawToken);
-              break;
-            }
-          }
-        }
-      }
-    }
-    if (rawTokens.length > 0) {
-      return null;
-    }
-    return {
-      path: input,
-      params
-    };
-  };
-}
-function getTokenParameters(params) {
-  if (!params) {
-    return null;
-  }
-  const name = params[1];
-  let genericProps;
-  let arrayProps;
-  let modificator;
-  for (const parameter of params.slice(2)) {
-    if (!parameter) {
-      continue;
-    }
-    if (parameter.includes("<")) {
-      genericProps = parameter.replaceAll(/\s/g, "").replace("<", "").replace(">", "");
-      continue;
-    }
-    if (parameter.includes("{")) {
-      arrayProps = parameter.replace("{", "").replace("}", "").split(",").map((item) => parseInt(item));
-    }
-    if (["*", "?", "+"].includes(parameter)) {
-      modificator = parameter;
-      continue;
-    }
-  }
-  return {
-    name,
-    genericProps,
-    arrayProps,
-    modificator
-  };
-}
-function prepareBuilder(tokens) {
-  return (params) => {
-    const result = [];
-    if (tokens.length === 0) {
-      return "/";
-    }
-    for (const token of tokens) {
-      switch (token.type) {
-        case "const": {
-          result.push(token.name);
-          break;
-        }
-        case "parameter": {
-          if (!params[token.name]) {
-            continue;
-          }
-          if (Array.isArray(params[token.name])) {
-            for (const param of params[token.name]) {
-              result.push(param.toString());
-            }
-          } else {
-            result.push(params[token.name].toString());
-          }
-          break;
-        }
-      }
-    }
-    return `/${result.join("/")}`;
-  };
-}
-function compile(path) {
-  const tokens = [];
-  const regexp = /:(\w+)(<[\s?\w|]+>)?({\d+\,\d+})?([+*?])?/;
-  const parsedTokens = path.split("/").filter(Boolean);
-  for (let i = 0; i < parsedTokens.length; i++) {
-    const parsedToken = parsedTokens[i];
-    if (!parsedToken) {
-      continue;
-    }
-    const parameters = getTokenParameters(parsedToken.match(regexp));
-    if (!parameters) {
-      tokens.push({
-        type: "const",
-        name: parsedToken,
-        payload: void 0
-      });
-      continue;
-    }
-    const {
-      arrayProps,
-      genericProps,
-      modificator,
-      name
-    } = parameters;
-    if (!name) {
-      throw new Error(`Invalid path: "${path}". Name for argument must be provided`);
-    }
-    const token = {
-      type: "parameter",
-      name,
-      payload: {
-        required: true
-      }
-    };
-    if (genericProps && genericProps === "number") {
-      token.payload.genericProps = {
-        type: "number"
-      };
-    }
-    if (genericProps && genericProps.includes("|")) {
-      token.payload.genericProps = {
-        type: "union",
-        items: genericProps.split("|")
-      };
-    }
-    switch (modificator) {
-      case "*": {
-        token.payload.arrayProps = {};
-        break;
-      }
-      case "+": {
-        token.payload.arrayProps = {
-          min: 1
-        };
-        break;
-      }
-      case "?": {
-        token.payload.required = false;
-        break;
-      }
-    }
-    if (arrayProps) {
-      token.payload.arrayProps = {
-        ...token.payload.arrayProps,
-        min: arrayProps[0],
-        max: arrayProps[1]
-      };
-    }
-    tokens.push(token);
-  }
-  return {
-    /**
-     * @param input Input path
-     * @returns `{ path: string; params: Params }` | `null`
-     */
-    parse: prepareParser(tokens),
-    /**
-     * @param params Route parameters
-     * @returns string
-     */
-    build: prepareBuilder(tokens)
-  };
-}
 function createRouterControls() {
   const $history = createStore(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
-    sid: "-ld7lzl"
+    sid: "-kw5zle"
   });
   const $locationState = createStore({
     query: {},
     path: null
   }, {
     name: "$locationState",
-    sid: "-4u3w85"
+    sid: "-2xxend"
+  });
+  const $subscription = createStore(null, {
+    name: "$subscription",
+    sid: "27a2zr"
   });
   const $query = $locationState.map((state) => state.query);
   const $path = $locationState.map((state) => state.path);
   const setHistory = createEvent({
     name: "setHistory",
-    sid: "-ormmkk"
+    sid: "-lxcw7e"
   });
   const navigate = createEvent({
     name: "navigate",
-    sid: "tawqep"
+    sid: "w56grv"
   });
   const back = createEvent({
     name: "back",
-    sid: "bxy8rt"
+    sid: "es7z4z"
   });
   const forward = createEvent({
     name: "forward",
-    sid: "-bpmzb1"
+    sid: "12ktc8"
   });
   const locationUpdated = createEvent({
     name: "locationUpdated",
-    sid: "lkzldx"
+    sid: "yd7e16"
   });
   const navigateFx = attach({
     and: {
@@ -674,34 +456,70 @@ function createRouterControls() {
     },
     or: {
       name: "navigateFx",
-      sid: "-ov1xn7"
+      sid: "-m0s7a1"
     }
   });
-  const subscribeHistoryFx = createEffect((history) => {
-    const historyLocationUpdated = scopeBind(locationUpdated);
-    historyLocationUpdated({
-      pathname: history.location.pathname,
-      query: {
-        ...queryString.parse(history.location.search)
+  const subscribeHistoryFx = createAsyncAction({
+    target: {
+      locationUpdated,
+      $subscription
+    },
+    source: {
+      $subscription
+    },
+    fn: async (target, getSource, history) => {
+      if (!history) {
+        throw Error("Cannot initialize router controls with empty history adapter. Please provide some provider or check your code for passing of nullable value");
       }
-    });
-    if (!history) {
-      throw new Error();
-    }
-    history.listen((_ref2) => {
-      let {
-        location
-      } = _ref2;
-      historyLocationUpdated({
-        pathname: location.pathname,
+      const source = await getSource();
+      if (source.subscription) {
+        source.subscription.unsubscribe();
+      }
+      target.locationUpdated({
+        pathname: history.location.pathname,
         query: {
-          ...queryString.parse(location.search)
+          ...queryString.parse(history.location.search)
         }
       });
-    });
-  }, {
-    name: "subscribeHistoryFx",
-    sid: "-m60vds"
+      target.$subscription(history.listen((location) => {
+        target.locationUpdated({
+          pathname: location.pathname,
+          query: {
+            ...queryString.parse(location.search)
+          }
+        });
+      }));
+    }
+  });
+  const goBackFx = attach({
+    and: {
+      source: $history,
+      effect: (history) => {
+        if (!history) {
+          throw new Error("history not found");
+        }
+        history.goBack();
+      }
+    },
+    or: {
+      name: "goBackFx",
+      sid: "k3gxue"
+    }
+  });
+  const goForwardFx = attach({
+    and: {
+      source: $history,
+      effect: (history) => {
+        if (!history) {
+          throw new Error("history not found");
+        }
+        history.goForward();
+      }
+    },
+    or: {
+      name: "goForwardFx",
+      sid: "1m1c40"
+    }
   });
   sample({
     and: [{
@@ -709,7 +527,7 @@ function createRouterControls() {
       target: $history
     }],
     or: {
-      sid: "ii4q"
+      sid: "1ycdhl"
     }
   });
   sample({
@@ -719,7 +537,7 @@ function createRouterControls() {
       target: subscribeHistoryFx
     }],
     or: {
-      sid: "39h3j"
+      sid: "213cge"
     }
   });
   sample({
@@ -732,7 +550,7 @@ function createRouterControls() {
       target: $locationState
     }],
     or: {
-      sid: "i3x4a"
+      sid: "2fxsh5"
     }
   });
   sample({
@@ -746,7 +564,25 @@ function createRouterControls() {
       target: navigateFx
     }],
     or: {
-      sid: "ylqx4"
+      sid: "2wfm9z"
+    }
+  });
+  sample({
+    and: [{
+      clock: back,
+      target: goBackFx
+    }],
+    or: {
+      sid: "3btuw3"
+    }
+  });
+  sample({
+    and: [{
+      clock: forward,
+      target: goForwardFx
+    }],
+    or: {
+      sid: "3ektuw"
     }
   });
   return {
@@ -765,6 +601,31 @@ function createRouterControls() {
     })
   };
 }
+const is = {
+  route(input) {
+    return is.pathRoute(input) || is.pathlessRoute(input);
+  },
+  pathRoute(input) {
+    return typeof input === "object" && input !== null && "@@type" in input && input["@@type"] === "path-route";
+  },
+  pathlessRoute(input) {
+    return typeof input === "object" && input !== null && "@@type" in input && input["@@type"] === "pathless-route";
+  },
+  router(input) {
+    return typeof input === "object" && input !== null && "@@type" in input && input["@@type"] === "router";
+  }
+};
+const inputIs = {
+  pathlessRoute(route) {
+    return "route" in route;
+  },
+  pathRoute(route) {
+    return !this.pathlessRoute(route) && !this.router(route);
+  },
+  router(route) {
+    return is.router(route);
+  }
+};
 function createRouter(config) {
   const {
     base = "/",
@@ -773,34 +634,87 @@ function createRouter(config) {
   const {
     $path,
     $query,
+    $history,
     back,
     forward,
     navigate,
     setHistory,
     locationUpdated
-  } = createRouterControls();
-  const mappedRoutes = routes.map((route) => {
-    let internalRoute = route;
+  } = config.controls ?? createRouterControls();
+  function getPathWithBase(path) {
+    if (base === "/") {
+      return path;
+    }
+    return path === "/" ? base : `${base}${path}`;
+  }
+  const connectToParentRouter = createEvent({
+    name: "connectToParentRouter",
+    sid: "t0jaae"
+  });
+  let parent = null;
+  const knownRoutes = [];
+  function mapRoute(inputRoute) {
+    if (inputIs.pathlessRoute(inputRoute)) {
+      const {
+        build: build2,
+        parse: parse2
+      } = compile(getPathWithBase(inputRoute.path));
+      const route2 = {
+        route: inputRoute.route,
+        path: inputRoute.path,
+        build: build2,
+        parse: parse2
+      };
+      return route2;
+    }
+    if (inputIs.router(inputRoute)) {
+      sample({
+        and: [{
+          clock: setHistory,
+          target: inputRoute.setHistory
+        }],
+        or: {
+          sid: "ez3kyw"
+        }
+      });
+      return null;
+    }
+    let internalRoute = inputRoute;
     const path = [];
     path.unshift(internalRoute.path);
     while (internalRoute.parent) {
+      if (is.pathlessRoute(internalRoute.parent)) {
+        break;
+      }
       internalRoute = internalRoute.parent;
       if (internalRoute.path !== "/") {
         path.unshift(internalRoute.path);
       }
     }
-    const joinedPath = base === "/" ? path.join("") : [base, ...path].join("");
+    const joinedPath = getPathWithBase(path.join(""));
     const {
       build,
       parse
     } = compile(joinedPath);
-    return {
-      route,
+    const route = {
+      route: inputRoute,
       path: joinedPath,
       build,
       parse
     };
-  });
+    return route;
+  }
+  const ownRoutes = routes.reduce((acc, inputRoute) => {
+    const mappedRoute = mapRoute(inputRoute);
+    if (mappedRoute) {
+      knownRoutes.push(mappedRoute);
+      acc.push(mappedRoute);
+    }
+    if (inputIs.router(inputRoute)) {
+      knownRoutes.push(...inputRoute.knownRoutes);
+    }
+    return acc;
+  }, []);
   const $activeRoutes = $path.map((path) => {
     const result = [];
     if (!path) {
@@ -809,7 +723,7 @@ function createRouter(config) {
     for (const {
       route,
       parse
-    } of mappedRoutes) {
+    } of ownRoutes) {
       if (parse(path)) {
         result.push(route);
       }
@@ -830,7 +744,7 @@ function createRouter(config) {
         for (const {
           route,
           parse
-        } of mappedRoutes) {
+        } of ownRoutes) {
           const matchResult = parse(path);
           const [routeClosed, routeNavigated] = [scopeBind(route.internal.close), scopeBind(route.internal.navigated)];
           if (!matchResult) {
@@ -846,31 +760,35 @@ function createRouter(config) {
     },
     or: {
       name: "openRoutesByPathFx",
-      sid: "-3zl7vq"
+      sid: "-bl0nuq"
     }
   });
-  for (const {
-    route,
-    build
-  } of mappedRoutes) {
-    sample({
-      and: [{
-        clock: route.internal.openFx.doneData,
-        filter: (payload) => (payload == null ? void 0 : payload.navigate) !== false,
-        fn: (payload) => {
-          return {
-            path: build(payload && "params" in payload ? payload.params : void 0),
-            query: (payload == null ? void 0 : payload.query) ?? {},
-            replace: payload == null ? void 0 : payload.replace
-          };
-        },
-        target: navigate
-      }],
-      or: {
-        sid: "exzzqg"
+  function registerRouteApi(_ref2) {
+    let {
+      route,
+      build
+    } = _ref2;
+    createAction({
+      clock: route.internal.openFx.doneData,
+      target: {
+        navigate
+      },
+      fn: (target, payload) => {
+        if ((payload == null ? void 0 : payload.navigate) === false) {
+          return;
+        }
+        const navigateParams = {
+          path: build(payload && "params" in payload ? payload.params : void 0),
+          query: (payload == null ? void 0 : payload.query) ?? {},
+          replace: payload == null ? void 0 : payload.replace
+        };
+        return target.navigate(navigateParams);
       }
     });
   }
+  for (const route of ownRoutes) {
+    registerRouteApi(route);
+  }
   sample({
     and: [{
       clock: locationUpdated,
@@ -881,24 +799,47 @@ function createRouter(config) {
       target: openRoutesByPathFx
     }],
     or: {
-      sid: "ficdn3"
+      sid: "ukhip5"
     }
   });
-  return {
+  const router = {
+    "@@type": "router",
     $query,
     $path,
+    $history,
     $activeRoutes,
     back,
     forward,
     navigate,
-    routes,
     setHistory,
-    mappedRoutes,
+    ownRoutes,
+    knownRoutes,
+    internal: {
+      connectToParentRouter,
+      get parent() {
+        return parent;
+      },
+      set parent(router2) {
+        parent = router2;
+      },
+      base
+    },
     trackQuery: trackQueryFactory({
       $activeRoutes,
       $query,
       navigate
     }),
+    registerRoute: (route) => {
+      const mappedRoute = mapRoute(route);
+      if (mappedRoute) {
+        knownRoutes.push(mappedRoute);
+        ownRoutes.push(mappedRoute);
+        registerRouteApi(mappedRoute);
+      }
+      if (inputIs.router(route)) {
+        knownRoutes.push(...route.knownRoutes);
+      }
+    },
     "@@unitShape": () => ({
       query: $query,
       path: $path,
@@ -908,6 +849,7 @@ function createRouter(config) {
       onNavigate: navigate
     })
   };
+  return router;
 }
 function createVirtualRoute() {
   let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
@@ -1006,6 +948,7 @@ function createVirtualRoute() {
     }
   });
   return {
+    "@@type": "pathless-route",
     $params,
     $isOpened,
     $isPending,
@@ -1037,7 +980,7 @@ function chainRoute(props) {
   let asyncImport;
   const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
     name: "waitForAsyncBundleFx",
-    sid: "qdkcuo"
+    sid: "t7u37u"
   });
   const openFx = createEffect(async (payload) => {
     await waitForAsyncBundleFx();
@@ -1046,13 +989,13 @@ function chainRoute(props) {
     }
   }, {
     name: "openFx",
-    sid: "-fwntqy"
+    sid: "-34g13p"
   });
   const transformer = (payload) => {
     if (!payload) {
-      return null;
+      return {};
     }
-    return "params" in payload ? payload.params : null;
+    return "params" in payload ? payload.params : {};
   };
   const virtualRoute = createVirtualRoute({
     transformer
@@ -1063,7 +1006,7 @@ function chainRoute(props) {
       target: openFx
     }],
     or: {
-      sid: "-s9xf6p"
+      sid: "-1tngcz"
     }
   });
   sample({
@@ -1073,7 +1016,7 @@ function chainRoute(props) {
       target: virtualRoute.$params
     }],
     or: {
-      sid: "-1u78yc"
+      sid: "-1qwhe6"
     }
   });
   if (openOn) {
@@ -1081,11 +1024,13 @@ function chainRoute(props) {
       and: [{
         clock: openOn,
         source: virtualRoute.$params,
-        fn: (params) => params,
+        fn: (params) => ({
+          params
+        }),
         target: virtualRoute.open
       }],
       or: {
-        sid: "-1qcor3"
+        sid: "-1bi8qc"
       }
     });
   }
@@ -1096,7 +1041,7 @@ function chainRoute(props) {
         target: virtualRoute.close
       }],
       or: {
-        sid: "-19uuy9"
+        sid: "-v0exi"
       }
     });
     sample({
@@ -1105,7 +1050,7 @@ function chainRoute(props) {
         target: virtualRoute.cancelled
       }],
       or: {
-        sid: "-vk7iv"
+        sid: "-s9fyp"
       }
     });
   }
@@ -1163,11 +1108,86 @@ function group(routes) {
   });
   return virtual;
 }
+function historyAdapter(history) {
+  return {
+    location: history.location,
+    push: history.push.bind(history),
+    replace: history.replace.bind(history),
+    goBack: history.back.bind(history),
+    goForward: history.forward.bind(history),
+    listen: (callback) => {
+      const unlisten = history.listen((_ref) => {
+        let {
+          location
+        } = _ref;
+        return callback(location);
+      });
+      return Object.assign(unlisten, {
+        unsubscribe: unlisten
+      });
+    }
+  };
+}
+function extractLocation(location) {
+  const url = new URL(decodeURIComponent(location.search));
+  return {
+    pathname: url.pathname,
+    search: url.search,
+    hash: url.hash
+  };
+}
+function queryAdapter(history) {
+  return {
+    location: extractLocation(history.location),
+    push: (to) => {
+      if (typeof to === "string") {
+        const url = new URL(history.location.pathname);
+        url.search = to;
+        history.push(url.toString());
+      } else {
+        const url = new URL(history.location.pathname);
+        url.search = `${to.pathname ?? ""}${to.search ?? ""}${to.hash ?? ""}`;
+        history.push(url.toString());
+      }
+    },
+    replace: (to) => {
+      if (typeof to === "string") {
+        const url = new URL(history.location.pathname);
+        url.search = to;
+        history.replace(url.toString());
+      } else {
+        const url = new URL(history.location.pathname);
+        url.search = `${to.pathname ?? ""}${to.search ?? ""}${to.hash ?? ""}`;
+        history.replace(url.toString());
+      }
+    },
+    goBack: () => {
+      history.back();
+    },
+    goForward: () => {
+      history.forward();
+    },
+    listen: (callback) => {
+      const unlisten = history.listen((_ref) => {
+        let {
+          location
+        } = _ref;
+        return callback(extractLocation(location));
+      });
+      return Object.assign(unlisten, {
+        unsubscribe: unlisten
+      });
+    }
+  };
+}
 export {
   chainRoute,
   createRoute,
   createRouter,
   createRouterControls,
   createVirtualRoute,
-  group
+  group,
+  historyAdapter,
+  is,
+  queryAdapter
 };