@argon-router/core 0.8.3 → 0.10.0

package/dist/index.js

@@ -1,1186 +1,918 @@
-import { createEffect as S, createStore as k, createEvent as g, sample as h, split as V, attach as K, scopeBind as N } from "effector";
-function C(e, t) {
-  var r = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    t && (n = n.filter(function(a) {
-      return Object.getOwnPropertyDescriptor(e, a).enumerable;
-    })), r.push.apply(r, n);
-  }
-  return r;
-}
-function P(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? C(Object(r), !0).forEach(function(n) {
-      ne(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : C(Object(r)).forEach(function(n) {
-      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
-    });
-  }
-  return e;
-}
-function ne(e, t, r) {
-  return (t = ae(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
-}
-function ae(e) {
-  var t = oe(e, "string");
-  return typeof t == "symbol" ? t : t + "";
-}
-function oe(e, t) {
-  if (typeof e != "object" || !e) return e;
-  var r = e[Symbol.toPrimitive];
-  if (r !== void 0) {
-    var n = r.call(e, t);
-    if (typeof n != "object") return n;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (t === "string" ? String : Number)(e);
-}
-function ze(e) {
-  let t;
-  const r = S(() => {
-    var m;
-    return (m = t) === null || m === void 0 ? void 0 : m();
-  }, {
+import { createEffect, createStore, createEvent, sample, split, attach, scopeBind, withFactory } from "effector";
+import queryString from "query-string";
+import { or, not } from "patronum";
+function createRoute(config) {
+  let asyncImport;
+  const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
     name: "waitForAsyncBundleFx",
-    sid: "-au0m0h"
-  }), n = S(async () => {
-    for (const j of (m = e.beforeOpen) !== null && m !== void 0 ? m : []) {
-      var m;
-      await j();
+    sid: "1y76ms"
+  });
+  const beforeOpenFx = createEffect(async () => {
+    for (const fx of config.beforeOpen ?? []) {
+      await fx();
     }
   }, {
     name: "beforeOpenFx",
-    sid: "-iy13uf"
-  }), a = S(async (m) => {
-    await r(), await n();
-    const j = e.parent;
-    return j && await j.internal.openFx(P(P({}, m ?? {
-      params: {}
-    }), {}, {
-      navigate: !1
-    })), m;
+    sid: "-65tb76"
+  });
+  const openFx = createEffect(async (payload) => {
+    await waitForAsyncBundleFx();
+    await beforeOpenFx();
+    const parent = config.parent;
+    if (parent) {
+      await parent.internal.openFx({
+        ...payload ?? {
+          params: {}
+        },
+        navigate: false
+      });
+    }
+    return payload;
   }, {
     name: "openFx",
-    sid: "cbmc2y"
-  }), o = k({}, {
+    sid: "p3u4q7"
+  });
+  const $params = createStore({}, {
     name: "$params",
-    sid: "-cxehz9"
-  }), i = k(!1, {
+    sid: "-a34rm3"
+  });
+  const $isOpened = createStore(false, {
     name: "$isOpened",
-    sid: "-561dht"
-  }), s = a.pending, c = g({
+    sid: "7m6f5g"
+  });
+  const $isPending = openFx.pending;
+  const open = createEvent({
     name: "open",
-    sid: "hyxmmx"
-  }), d = g({
+    sid: "ur5fa6"
+  });
+  const close = createEvent({
     name: "close",
-    sid: "-wvbr5n"
-  }), y = g({
+    sid: "-k33yie"
+  });
+  const opened = createEvent({
     name: "opened",
-    sid: "-qni80y"
-  }), u = g({
+    sid: "-nt8hns"
+  });
+  const openedOnServer = createEvent({
     name: "openedOnServer",
-    sid: "eh9oki"
-  }), b = g({
+    sid: "hbjexo"
+  });
+  const openedOnClient = createEvent({
     name: "openedOnClient",
-    sid: "eet6mh"
-  }), l = g({
+    sid: "h92wzn"
+  });
+  const navigated = createEvent({
     name: "navigated",
-    sid: "-rnvpuc"
-  }), f = g({
+    sid: "-8amrhe"
+  });
+  const closed = createEvent({
     name: "closed",
-    sid: "w9iziz"
+    sid: "-pql6th"
   });
-  h({
+  sample({
     and: [{
-      clock: c,
-      target: a
+      clock: open,
+      target: openFx
     }],
     or: {
-      sid: "u86cfp"
+      sid: "ymah4t"
     }
   });
-  const p = {};
-  return h({
+  const defaultParams = {};
+  sample({
     and: [{
-      clock: l,
-      fn: (m) => m && "params" in m ? P({}, m.params) : p,
-      target: o
+      clock: navigated,
+      fn: (payload) => {
+        if (!payload) {
+          return defaultParams;
+        }
+        return "params" in payload ? {
+          ...payload.params
+        } : defaultParams;
+      },
+      target: $params
     }],
     or: {
-      sid: "ymu9q6"
+      sid: "z1opqx"
     }
-  }), V({
+  });
+  split({
     and: [{
-      source: l,
-      match: () => typeof window > "u" ? "server" : "client",
+      source: navigated,
+      match: () => typeof window === "undefined" ? "server" : "client",
       cases: {
-        server: u,
-        client: b
+        server: openedOnServer,
+        client: openedOnClient
       }
     }],
     or: {
-      sid: "z4zhb3"
+      sid: "-zha4na"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: [b, u],
-      target: y
+      clock: [openedOnClient, openedOnServer],
+      target: opened
     }],
     or: {
-      sid: "-zf2y9u"
+      sid: "-z08i93"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: d,
-      target: f
+      clock: close,
+      target: closed
     }],
     or: {
-      sid: "-z0saug"
+      sid: "-yxhjaa"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: [y.map(() => !0), f.map(() => !1)],
-      target: i
+      clock: [opened.map(() => true), closed.map(() => false)],
+      target: $isOpened
     }],
     or: {
-      sid: "-yy1bvn"
+      sid: "-yj6vuw"
     }
-  }), P(P({
-    $params: o,
-    $isOpened: i,
-    $isPending: s,
-    open: c,
-    closed: f,
-    opened: y,
-    openedOnClient: b,
-    openedOnServer: u
-  }, e), {}, {
+  });
+  return {
+    $params,
+    $isOpened,
+    $isPending,
+    open,
+    closed,
+    opened,
+    openedOnClient,
+    openedOnServer,
+    ...config,
     internal: {
-      navigated: l,
-      close: d,
-      openFx: a,
-      setAsyncImport: (m) => t = m
+      navigated,
+      close,
+      openFx,
+      setAsyncImport: (value) => asyncImport = value
     },
     "@@unitShape": () => ({
-      params: o,
-      isPending: s,
-      isOpened: i,
-      onOpen: c
+      params: $params,
+      isPending: $isPending,
+      isOpened: $isOpened,
+      onOpen: open
     })
-  });
+  };
 }
-const ie = Symbol("any"), se = Symbol("number"), ce = Symbol("string"), ue = Symbol("array"), fe = Symbol("boolean"), w = {
-  any: ie,
-  number: se,
-  string: ce,
-  array: ue,
-  boolean: fe
+const anySymbol = Symbol("any");
+const numberSymbol = Symbol("number");
+const stringSymbol = Symbol("string");
+const arraySymbol = Symbol("array");
+const booleanSymbol = Symbol("boolean");
+const parameters = {
+  any: anySymbol,
+  number: numberSymbol,
+  string: stringSymbol,
+  array: arraySymbol,
+  boolean: booleanSymbol
 };
-function D(e, t) {
-  for (const r of e)
-    if (t.includes(r))
-      return !0;
-  return !1;
+function isForRouteActive(forRoutes, activeRoutes) {
+  for (const route of forRoutes) {
+    if (activeRoutes.includes(route)) {
+      return true;
+    }
+  }
+  return false;
 }
-function z(e, t) {
-  for (const r in t) {
-    const n = t[r];
-    if (Array.isArray(n) && (!e[r] || JSON.stringify(n) !== e[r]))
-      return !1;
-    switch (typeof n) {
+function isHaveValidParams(query, neededParameters) {
+  for (const key in neededParameters) {
+    const parameterType = neededParameters[key];
+    if (Array.isArray(parameterType) && (!query[key] || JSON.stringify(parameterType) !== query[key])) {
+      return false;
+    }
+    switch (typeof parameterType) {
       case "number": {
-        if (!e[r] || n.toString() !== e[r])
-          return !1;
+        if (!query[key] || parameterType.toString() !== query[key]) {
+          return false;
+        }
         break;
       }
       case "object": {
-        if (!e[r] || JSON.stringify(n) !== e[r])
-          return !1;
+        if (!query[key] || JSON.stringify(parameterType) !== query[key]) {
+          return false;
+        }
         break;
       }
       case "string": {
-        if (!e[r] || n !== e[r])
-          return !1;
+        if (!query[key] || parameterType !== query[key]) {
+          return false;
+        }
         break;
       }
       case "boolean": {
-        if (!e[r] || !["0", "1", "false", "true"].includes(e[r]))
-          return !1;
+        if (!query[key] || !["0", "1", "false", "true"].includes(query[key])) {
+          return false;
+        }
         break;
       }
     }
-    switch (n) {
-      case w.any: {
-        if (!e[r])
-          return !1;
+    switch (parameterType) {
+      case parameters.any: {
+        if (!query[key]) {
+          return false;
+        }
         break;
       }
-      case w.string: {
-        if (!e[r] || Array.isArray(e[r]))
-          return !1;
+      case parameters.string: {
+        if (!query[key] || Array.isArray(query[key])) {
+          return false;
+        }
         break;
       }
-      case w.array: {
-        if (!e[r] || !Array.isArray(e[r]))
-          return !1;
+      case parameters.array: {
+        if (!query[key] || !Array.isArray(query[key])) {
+          return false;
+        }
         break;
       }
-      case w.number: {
-        if (!e[r] || Array.isArray(e[r]) || isNaN(parseInt(e[r])) && isNaN(parseFloat(e[r])))
-          return !1;
+      case parameters.number: {
+        if (!query[key] || Array.isArray(query[key]) || isNaN(parseInt(query[key])) && isNaN(parseFloat(query[key]))) {
+          return false;
+        }
         break;
       }
-      case w.boolean: {
-        if (!e[r] || Array.isArray(e[r]) || !["0", "1", "false", "true"].includes(e[r]))
-          return !1;
+      case parameters.boolean: {
+        if (!query[key] || Array.isArray(query[key]) || !["0", "1", "false", "true"].includes(query[key])) {
+          return false;
+        }
         break;
       }
     }
   }
-  return !0;
+  return true;
 }
-function le(e, t) {
-  const r = {};
-  for (const n in t) {
-    const a = t[n], o = e[n];
-    if (Array.isArray(a)) {
-      const i = e[n];
-      r[n] = i;
+function transformParams(query, neededParameters) {
+  const result = {};
+  for (const key in neededParameters) {
+    const parameterType = neededParameters[key];
+    const data = query[key];
+    if (Array.isArray(parameterType)) {
+      const arrayData = query[key];
+      result[key] = arrayData;
       continue;
     }
-    switch (typeof a) {
+    switch (typeof parameterType) {
       case "number": {
-        r[n] = isNaN(parseInt(o)) ? parseFloat(o) : parseInt(o);
+        result[key] = isNaN(parseInt(data)) ? parseFloat(data) : parseInt(data);
         break;
       }
       case "object": {
-        r[n] = JSON.parse(o);
+        result[key] = JSON.parse(data);
         break;
       }
-      case "string":
-        r[n] = o;
+      case "string": {
+        result[key] = data;
+      }
       case "boolean": {
-        r[n] = o === "1" || o === "true";
+        result[key] = data === "1" || data === "true";
         break;
       }
     }
-    switch (a) {
-      case w.any:
-      case w.string:
-      case w.array: {
-        r[n] = e[n];
+    switch (parameterType) {
+      case parameters.any:
+      case parameters.string:
+      case parameters.array: {
+        result[key] = query[key];
         break;
       }
-      case w.number: {
-        const i = e[n];
-        r[n] = isNaN(parseInt(i)) ? parseFloat(i) : parseInt(i);
+      case parameters.number: {
+        const data2 = query[key];
+        result[key] = isNaN(parseInt(data2)) ? parseFloat(data2) : parseInt(data2);
         break;
       }
-      case w.boolean: {
-        const i = e[n];
-        r[n] = i === "1" || i === "true";
+      case parameters.boolean: {
+        const data2 = query[key];
+        result[key] = data2 === "1" || data2 === "true";
         break;
       }
     }
   }
-  return r;
+  return result;
 }
-function de(e) {
+function trackQueryControlsFactory(_ref) {
   let {
-    $query: t,
-    navigate: r
-  } = e;
-  return L({
-    $activeRoutes: k([], {
+    $query,
+    navigate
+  } = _ref;
+  return trackQueryFactory({
+    $activeRoutes: createStore([], {
       name: "$activeRoutes",
-      sid: "7ol7tr"
+      sid: "85ms46"
     }),
-    $query: t,
-    navigate: r
+    $query,
+    navigate
   });
 }
-function L(e) {
+function trackQueryFactory(_ref2) {
   let {
-    $activeRoutes: t,
-    $query: r,
-    navigate: n
-  } = e;
-  return (a) => {
+    $activeRoutes,
+    $query,
+    navigate
+  } = _ref2;
+  return (config) => {
     const {
-      parameters: o,
-      forRoutes: i
-    } = a, s = k(!1, {
+      parameters: parameters2,
+      forRoutes
+    } = config;
+    const $entered = createStore(false, {
       name: "$entered",
-      sid: "-okbvx4"
-    }), c = g({
+      sid: "-mo5ecc"
+    });
+    const entered = createEvent({
       name: "entered",
-      sid: "-1bbi51"
-    }), d = g({
+      sid: "kuzfr"
+    });
+    const exited = createEvent({
       name: "exited",
-      sid: "-lw34uy"
-    }), y = g({
+      sid: "-jzwna6"
+    });
+    const exit = createEvent({
       name: "exit",
-      sid: "5l9ghz"
-    }), u = g({
+      sid: "7hfy2r"
+    });
+    const changeEntered = createEvent({
       name: "changeEntered",
-      sid: "en4cc0"
+      sid: "qh8w6v"
     });
-    return h({
+    sample({
       and: [{
-        clock: u,
-        target: s
+        clock: changeEntered,
+        target: $entered
       }],
       or: {
-        sid: "-gssa85"
+        sid: "-gf1fe4"
       }
-    }), h({
+    });
+    sample({
       and: [{
         source: {
-          activeRoutes: t,
-          query: r
+          activeRoutes: $activeRoutes,
+          query: $query
         },
-        filter: (b) => {
+        filter: (_ref3) => {
           let {
-            activeRoutes: l,
-            query: f
-          } = b;
-          return (!i || D(i, l)) && z(f, o);
+            activeRoutes,
+            query
+          } = _ref3;
+          return (!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && isHaveValidParams(query, parameters2);
         },
-        fn: (b) => {
+        fn: (_ref4) => {
           let {
-            query: l
-          } = b;
-          return le(l, o);
+            query
+          } = _ref4;
+          return transformParams(query, parameters2);
         },
-        target: [c, u.prepend(() => !0)]
+        target: [entered, changeEntered.prepend(() => true)]
       }],
       or: {
-        sid: "-gehmsr"
+        sid: "-gcagfb"
       }
-    }), h({
+    });
+    sample({
       and: [{
         source: {
-          activeRoutes: t,
-          query: r,
-          entered: s
+          activeRoutes: $activeRoutes,
+          query: $query,
+          entered: $entered
         },
-        filter: (b) => {
+        filter: (_ref5) => {
           let {
-            activeRoutes: l,
-            query: f,
-            entered: p
-          } = b;
-          return p && !((!i || D(i, l)) && z(f, o));
+            activeRoutes,
+            query,
+            entered: entered2
+          } = _ref5;
+          return entered2 && !((!forRoutes || isForRouteActive(forRoutes, activeRoutes)) && isHaveValidParams(query, parameters2));
         },
-        target: [d.prepend(() => {
-        }), u.prepend(() => !1)]
+        target: [exited.prepend(() => void 0), changeEntered.prepend(() => false)]
       }],
       or: {
-        sid: "-fxzszx"
+        sid: "-fvsmmh"
       }
-    }), h({
+    });
+    sample({
       and: [{
-        clock: y,
-        source: r,
-        fn: (b, l) => {
-          if (l && l.ignoreParams) {
-            const f = {};
-            for (const p of l.ignoreParams)
-              b[p] && (f[p] = b[p]);
+        clock: exit,
+        source: $query,
+        fn: (query, payload) => {
+          if (payload && payload.ignoreParams) {
+            const copy = {};
+            for (const key of payload.ignoreParams) {
+              if (query[key]) {
+                copy[key] = query[key];
+              }
+            }
             return {
-              query: f
+              query: copy
             };
           }
           return {
             query: {}
           };
         },
-        target: n
+        target: navigate
       }],
       or: {
-        sid: "-fer08a"
+        sid: "-f105e9"
       }
-    }), {
-      entered: c,
-      exited: d,
-      exit: y
+    });
+    return {
+      entered,
+      exited,
+      exit
     };
   };
 }
-function pe(e) {
-  return (t) => {
-    const r = t.split("/").map((s) => s.trim()).filter((s) => s !== "");
-    let n = null;
-    function a(s, c) {
-      n || (n = {}), n[s] = c;
+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 (e.length === 0) return r.length === 0 ? {
-      path: t,
-      params: null
-    } : null;
-    for (let s = 0; s < e.length; s++) {
-      const c = e[s];
-      switch (c.type) {
+    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 (c.name !== r.shift()) return null;
+          if (token.name !== rawTokens.shift()) {
+            return null;
+          }
           continue;
         }
         case "parameter": {
           const {
-            arrayProps: d,
-            genericProps: y,
-            required: u
-          } = c.payload;
-          if (d) {
-            var o;
-            const l = [];
-            let f;
-            for (; ; ) {
-              var i;
-              if (f = r.shift(), !f) break;
-              switch (y == null ? void 0 : y.type) {
+            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(+f)) return null;
-                  l.push(+f);
+                  if (isNaN(+rawToken2)) {
+                    return null;
+                  }
+                  array.push(+rawToken2);
                   break;
                 }
                 case "union": {
-                  if (!y.items.includes(f)) return null;
-                  l.push(f);
+                  if (!genericProps.items.includes(rawToken2)) {
+                    return null;
+                  }
+                  array.push(rawToken2);
                   break;
                 }
                 default: {
-                  l.push(f);
+                  array.push(rawToken2);
                   break;
                 }
               }
-              if (l.length >= ((i = d.max) !== null && i !== void 0 ? i : 1 / 0)) break;
+              if (array.length >= (arrayProps.max ?? Infinity)) {
+                break;
+              }
             }
-            if (l.length < ((o = d.min) !== null && o !== void 0 ? o : 0) || r.length > 0 && !e[s + 1]) return null;
-            a(c.name, l);
+            if (array.length < (arrayProps.min ?? 0)) {
+              return null;
+            }
+            if (rawTokens.length > 0 && !tokens[i + 1]) {
+              return null;
+            }
+            setKey(token.name, array);
             break;
           }
-          const b = r.shift();
-          if (u && !b) return null;
-          if (!b) {
-            a(c.name, void 0);
+          const rawToken = rawTokens.shift();
+          if (required && !rawToken) {
+            return null;
+          }
+          if (!rawToken) {
+            setKey(token.name, void 0);
             continue;
           }
-          switch (y == null ? void 0 : y.type) {
+          switch (genericProps == null ? void 0 : genericProps.type) {
             case "number": {
-              if (isNaN(+b)) return null;
-              a(c.name, +b);
+              if (isNaN(+rawToken)) {
+                return null;
+              }
+              setKey(token.name, +rawToken);
               break;
             }
             case "union": {
-              if (!y.items.includes(b)) return null;
-              a(c.name, b);
+              if (!genericProps.items.includes(rawToken)) {
+                return null;
+              }
+              setKey(token.name, rawToken);
               break;
             }
             default: {
-              a(c.name, b);
+              setKey(token.name, rawToken);
               break;
             }
           }
         }
       }
     }
-    return r.length > 0 ? null : {
-      path: t,
-      params: n
+    if (rawTokens.length > 0) {
+      return null;
+    }
+    return {
+      path: input,
+      params
     };
   };
 }
-function me(e) {
-  if (!e) return null;
-  const t = e[1];
-  let r, n, a;
-  for (const o of e.slice(2)) if (o) {
-    if (o.includes("<")) {
-      r = o.replace("<", "").replace(">", "");
+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 (o.includes("{") && (n = o.replace("{", "").replace("}", "").split(",").map((i) => parseInt(i))), ["*", "?", "+"].includes(o)) {
-      a = o;
+    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: t,
-    genericProps: r,
-    arrayProps: n,
-    modificator: a
+    name,
+    genericProps,
+    arrayProps,
+    modificator
   };
 }
-function ye(e) {
-  return (t) => {
-    const r = [];
-    if (e.length === 0) return "/";
-    for (const n of e) switch (n.type) {
-      case "const": {
-        r.push(n.name);
-        break;
-      }
-      case "parameter": {
-        if (!t[n.name]) continue;
-        if (Array.isArray(t[n.name])) for (const a of t[n.name]) r.push(a.toString());
-        else r.push(t[n.name].toString());
-        break;
+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 "/".concat(r.join("/"));
+    return `/${result.join("/")}`;
   };
 }
-function q(e, t) {
-  var r = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    t && (n = n.filter(function(a) {
-      return Object.getOwnPropertyDescriptor(e, a).enumerable;
-    })), r.push.apply(r, n);
-  }
-  return r;
-}
-function U(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? q(Object(r), !0).forEach(function(n) {
-      be(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : q(Object(r)).forEach(function(n) {
-      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
-    });
-  }
-  return e;
-}
-function be(e, t, r) {
-  return (t = ge(t)) in e ? Object.defineProperty(e, t, {
-    value: r,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[t] = r, e;
-}
-function ge(e) {
-  var t = he(e, "string");
-  return typeof t == "symbol" ? t : t + "";
-}
-function he(e, t) {
-  if (typeof e != "object" || !e) return e;
-  var r = e[Symbol.toPrimitive];
-  if (r !== void 0) {
-    var n = r.call(e, t);
-    if (typeof n != "object") return n;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (t === "string" ? String : Number)(e);
-}
-function Oe(e) {
-  const t = [], r = /:(\w+)(<[\w|]+>)?({\d+\,\d+})?([+*?])?/, n = e.split("/").filter(Boolean);
-  for (let a = 0; a < n.length; a++) {
-    const o = n[a];
-    if (!o) continue;
-    const i = me(o.match(r));
-    if (!i) {
-      t.push({
+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 parameters2 = getTokenParameters(parsedToken.match(regexp));
+    if (!parameters2) {
+      tokens.push({
         type: "const",
-        name: o,
+        name: parsedToken,
         payload: void 0
       });
       continue;
     }
     const {
-      arrayProps: s,
-      genericProps: c,
-      modificator: d,
-      name: y
-    } = i;
-    if (!y) throw new Error('Invalid path: "'.concat(e, '". Name for argument must be provided'));
-    const u = {
+      arrayProps,
+      genericProps,
+      modificator,
+      name
+    } = parameters2;
+    if (!name) {
+      throw new Error(`Invalid path: "${path}". Name for argument must be provided`);
+    }
+    const token = {
       type: "parameter",
-      name: y,
+      name,
       payload: {
-        required: !0
+        required: true
       }
     };
-    switch (c && c === "number" && (u.payload.genericProps = {
-      type: "number"
-    }), c && c.includes("|") && (u.payload.genericProps = {
-      type: "union",
-      items: c.split("|")
-    }), d) {
+    if (genericProps && genericProps === "number") {
+      token.payload.genericProps = {
+        type: "number"
+      };
+    }
+    if (genericProps && genericProps.includes("|")) {
+      token.payload.genericProps = {
+        type: "union",
+        items: genericProps.split("|")
+      };
+    }
+    switch (modificator) {
       case "*": {
-        u.payload.arrayProps = {};
+        token.payload.arrayProps = {};
         break;
       }
       case "+": {
-        u.payload.arrayProps = {
+        token.payload.arrayProps = {
           min: 1
         };
         break;
       }
       case "?": {
-        u.payload.required = !1;
+        token.payload.required = false;
         break;
       }
     }
-    s && (u.payload.arrayProps = U(U({}, u.payload.arrayProps), {}, {
-      min: s[0],
-      max: s[1]
-    })), t.push(u);
+    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: pe(t),
+    parse: prepareParser(tokens),
     /**
      * @param params Route parameters
      * @returns string
      */
-    build: ye(t)
-  };
-}
-const M = "%[a-f0-9]{2}", B = new RegExp("(" + M + ")|([^%]+?)", "gi"), _ = new RegExp("(" + M + ")+", "gi");
-function A(e, t) {
-  try {
-    return [decodeURIComponent(e.join(""))];
-  } catch {
-  }
-  if (e.length === 1)
-    return e;
-  t = t || 1;
-  const r = e.slice(0, t), n = e.slice(t);
-  return Array.prototype.concat.call([], A(r), A(n));
-}
-function we(e) {
-  try {
-    return decodeURIComponent(e);
-  } catch {
-    let t = e.match(B) || [];
-    for (let r = 1; r < t.length; r++)
-      e = A(t, r).join(""), t = e.match(B) || [];
-    return e;
-  }
-}
-function Fe(e) {
-  const t = {
-    "%FE%FF": "��",
-    "%FF%FE": "��"
+    build: prepareBuilder(tokens)
   };
-  let r = _.exec(e);
-  for (; r; ) {
-    try {
-      t[r[0]] = decodeURIComponent(r[0]);
-    } catch {
-      const a = we(r[0]);
-      a !== r[0] && (t[r[0]] = a);
-    }
-    r = _.exec(e);
-  }
-  t["%C2"] = "�";
-  const n = Object.keys(t);
-  for (const a of n)
-    e = e.replace(new RegExp(a, "g"), t[a]);
-  return e;
-}
-function je(e) {
-  if (typeof e != "string")
-    throw new TypeError("Expected `encodedURI` to be of type `string`, got `" + typeof e + "`");
-  try {
-    return decodeURIComponent(e);
-  } catch {
-    return Fe(e);
-  }
-}
-function ke(e, t) {
-  const r = {};
-  if (Array.isArray(t))
-    for (const n of t) {
-      const a = Object.getOwnPropertyDescriptor(e, n);
-      a != null && a.enumerable && Object.defineProperty(r, n, a);
-    }
-  else
-    for (const n of Reflect.ownKeys(e)) {
-      const a = Object.getOwnPropertyDescriptor(e, n);
-      if (a.enumerable) {
-        const o = e[n];
-        t(n, o, e) && Object.defineProperty(r, n, a);
-      }
-    }
-  return r;
 }
-function Q(e, t) {
-  if (!(typeof e == "string" && typeof t == "string"))
-    throw new TypeError("Expected the arguments to be of type `string`");
-  if (e === "" || t === "")
-    return [];
-  const r = e.indexOf(t);
-  return r === -1 ? [] : [e.slice(0, r), e.slice(r + t.length)];
-}
-const Se = (e) => e == null, Pe = (e) => encodeURIComponent(e).replaceAll(/[!'()*]/g, (t) => `%${t.charCodeAt(0).toString(16).toUpperCase()}`), E = Symbol("encodeFragmentIdentifier");
-function ve(e) {
-  switch (e.arrayFormat) {
-    case "index":
-      return (t) => (r, n) => {
-        const a = r.length;
-        return n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), "[", a, "]"].join("")] : [...r, [O(t, e), "[", O(a, e), "]=", O(n, e)].join("")];
-      };
-    case "bracket":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), "[]"].join("")] : [...r, [O(t, e), "[]=", O(n, e)].join("")];
-    case "colon-list-separator":
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, [O(t, e), ":list="].join("")] : [...r, [O(t, e), ":list=", O(n, e)].join("")];
-    case "comma":
-    case "separator":
-    case "bracket-separator": {
-      const t = e.arrayFormat === "bracket-separator" ? "[]=" : "=";
-      return (r) => (n, a) => a === void 0 || e.skipNull && a === null || e.skipEmptyString && a === "" ? n : (a = a === null ? "" : a, n.length === 0 ? [[O(r, e), t, O(a, e)].join("")] : [[n, O(a, e)].join(e.arrayFormatSeparator)]);
-    }
-    default:
-      return (t) => (r, n) => n === void 0 || e.skipNull && n === null || e.skipEmptyString && n === "" ? r : n === null ? [...r, O(t, e)] : [...r, [O(t, e), "=", O(n, e)].join("")];
-  }
-}
-function xe(e) {
-  let t;
-  switch (e.arrayFormat) {
-    case "index":
-      return (r, n, a) => {
-        if (t = /\[(\d*)]$/.exec(r), r = r.replace(/\[\d*]$/, ""), !t) {
-          a[r] = n;
-          return;
-        }
-        a[r] === void 0 && (a[r] = {}), a[r][t[1]] = n;
-      };
-    case "bracket":
-      return (r, n, a) => {
-        if (t = /(\[])$/.exec(r), r = r.replace(/\[]$/, ""), !t) {
-          a[r] = n;
-          return;
-        }
-        if (a[r] === void 0) {
-          a[r] = [n];
-          return;
-        }
-        a[r] = [...a[r], n];
-      };
-    case "colon-list-separator":
-      return (r, n, a) => {
-        if (t = /(:list)$/.exec(r), r = r.replace(/:list$/, ""), !t) {
-          a[r] = n;
-          return;
-        }
-        if (a[r] === void 0) {
-          a[r] = [n];
-          return;
-        }
-        a[r] = [...a[r], n];
-      };
-    case "comma":
-    case "separator":
-      return (r, n, a) => {
-        const o = typeof n == "string" && n.includes(e.arrayFormatSeparator), i = typeof n == "string" && !o && F(n, e).includes(e.arrayFormatSeparator);
-        n = i ? F(n, e) : n;
-        const s = o || i ? n.split(e.arrayFormatSeparator).map((c) => F(c, e)) : n === null ? n : F(n, e);
-        a[r] = s;
-      };
-    case "bracket-separator":
-      return (r, n, a) => {
-        const o = /(\[])$/.test(r);
-        if (r = r.replace(/\[]$/, ""), !o) {
-          a[r] = n && F(n, e);
-          return;
-        }
-        const i = n === null ? [] : F(n, e).split(e.arrayFormatSeparator);
-        if (a[r] === void 0) {
-          a[r] = i;
-          return;
-        }
-        a[r] = [...a[r], ...i];
-      };
-    default:
-      return (r, n, a) => {
-        if (a[r] === void 0) {
-          a[r] = n;
-          return;
-        }
-        a[r] = [...[a[r]].flat(), n];
-      };
-  }
-}
-function J(e) {
-  if (typeof e != "string" || e.length !== 1)
-    throw new TypeError("arrayFormatSeparator must be single character string");
-}
-function O(e, t) {
-  return t.encode ? t.strict ? Pe(e) : encodeURIComponent(e) : e;
-}
-function F(e, t) {
-  return t.decode ? je(e) : e;
-}
-function G(e) {
-  return Array.isArray(e) ? e.sort() : typeof e == "object" ? G(Object.keys(e)).sort((t, r) => Number(t) - Number(r)).map((t) => e[t]) : e;
-}
-function W(e) {
-  const t = e.indexOf("#");
-  return t !== -1 && (e = e.slice(0, t)), e;
-}
-function $e(e) {
-  let t = "";
-  const r = e.indexOf("#");
-  return r !== -1 && (t = e.slice(r)), t;
-}
-function T(e, t, r) {
-  return r === "string" && typeof e == "string" ? e : typeof r == "function" && typeof e == "string" ? r(e) : t.parseBooleans && e !== null && (e.toLowerCase() === "true" || e.toLowerCase() === "false") ? e.toLowerCase() === "true" : r === "number" && !Number.isNaN(Number(e)) && typeof e == "string" && e.trim() !== "" || t.parseNumbers && !Number.isNaN(Number(e)) && typeof e == "string" && e.trim() !== "" ? Number(e) : e;
-}
-function R(e) {
-  e = W(e);
-  const t = e.indexOf("?");
-  return t === -1 ? "" : e.slice(t + 1);
-}
-function I(e, t) {
-  t = {
-    decode: !0,
-    sort: !0,
-    arrayFormat: "none",
-    arrayFormatSeparator: ",",
-    parseNumbers: !1,
-    parseBooleans: !1,
-    types: /* @__PURE__ */ Object.create(null),
-    ...t
-  }, J(t.arrayFormatSeparator);
-  const r = xe(t), n = /* @__PURE__ */ Object.create(null);
-  if (typeof e != "string" || (e = e.trim().replace(/^[?#&]/, ""), !e))
-    return n;
-  for (const a of e.split("&")) {
-    if (a === "")
-      continue;
-    const o = t.decode ? a.replaceAll("+", " ") : a;
-    let [i, s] = Q(o, "=");
-    i === void 0 && (i = o), s = s === void 0 ? null : ["comma", "separator", "bracket-separator"].includes(t.arrayFormat) ? s : F(s, t), r(F(i, t), s, n);
-  }
-  for (const [a, o] of Object.entries(n))
-    if (typeof o == "object" && o !== null && t.types[a] !== "string")
-      for (const [i, s] of Object.entries(o)) {
-        const c = t.types[a] ? t.types[a].replace("[]", "") : void 0;
-        o[i] = T(s, t, c);
-      }
-    else typeof o == "object" && o !== null && t.types[a] === "string" ? n[a] = Object.values(o).join(t.arrayFormatSeparator) : n[a] = T(o, t, t.types[a]);
-  return t.sort === !1 ? n : (t.sort === !0 ? Object.keys(n).sort() : Object.keys(n).sort(t.sort)).reduce((a, o) => {
-    const i = n[o];
-    return a[o] = i && typeof i == "object" && !Array.isArray(i) ? G(i) : i, a;
-  }, /* @__PURE__ */ Object.create(null));
-}
-function X(e, t) {
-  if (!e)
-    return "";
-  t = {
-    encode: !0,
-    strict: !0,
-    arrayFormat: "none",
-    arrayFormatSeparator: ",",
-    ...t
-  }, J(t.arrayFormatSeparator);
-  const r = (i) => t.skipNull && Se(e[i]) || t.skipEmptyString && e[i] === "", n = ve(t), a = {};
-  for (const [i, s] of Object.entries(e))
-    r(i) || (a[i] = s);
-  const o = Object.keys(a);
-  return t.sort !== !1 && o.sort(t.sort), o.map((i) => {
-    const s = e[i];
-    return s === void 0 ? "" : s === null ? O(i, t) : Array.isArray(s) ? s.length === 0 && t.arrayFormat === "bracket-separator" ? O(i, t) + "[]" : s.reduce(n(i), []).join("&") : O(i, t) + "=" + O(s, t);
-  }).filter((i) => i.length > 0).join("&");
-}
-function Y(e, t) {
-  var a;
-  t = {
-    decode: !0,
-    ...t
-  };
-  let [r, n] = Q(e, "#");
-  return r === void 0 && (r = e), {
-    url: ((a = r == null ? void 0 : r.split("?")) == null ? void 0 : a[0]) ?? "",
-    query: I(R(e), t),
-    ...t && t.parseFragmentIdentifier && n ? {
-      fragmentIdentifier: F(n, t)
-    } : {}
-  };
-}
-function Z(e, t) {
-  t = {
-    encode: !0,
-    strict: !0,
-    [E]: !0,
-    ...t
-  };
-  const r = W(e.url).split("?")[0] || "", n = R(e.url), a = {
-    ...I(n, {
-      sort: !1
-    }),
-    ...e.query
-  };
-  let o = X(a, t);
-  o && (o = `?${o}`);
-  let i = $e(e.url);
-  if (typeof e.fragmentIdentifier == "string") {
-    const s = new URL(r);
-    s.hash = e.fragmentIdentifier, i = t[E] ? s.hash : `#${e.fragmentIdentifier}`;
-  }
-  return `${r}${o}${i}`;
-}
-function ee(e, t, r) {
-  r = {
-    parseFragmentIdentifier: !0,
-    [E]: !1,
-    ...r
-  };
-  const {
-    url: n,
-    query: a,
-    fragmentIdentifier: o
-  } = Y(e, r);
-  return Z({
-    url: n,
-    query: ke(a, t),
-    fragmentIdentifier: o
-  }, r);
-}
-function Ne(e, t, r) {
-  const n = Array.isArray(t) ? (a) => !t.includes(a) : (a, o) => !t(a, o);
-  return ee(e, n, r);
-}
-const x = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null,
-  exclude: Ne,
-  extract: R,
-  parse: I,
-  parseUrl: Y,
-  pick: ee,
-  stringify: X,
-  stringifyUrl: Z
-}, Symbol.toStringTag, { value: "Module" }));
-function H(e, t) {
-  var r = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    t && (n = n.filter(function(a) {
-      return Object.getOwnPropertyDescriptor(e, a).enumerable;
-    })), r.push.apply(r, n);
-  }
-  return r;
-}
-function $(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? H(Object(r), !0).forEach(function(n) {
-      Ae(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : H(Object(r)).forEach(function(n) {
-      Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
-    });
-  }
-  return e;
-}
-function Ae(e, t, r) {
-  return (t = Ee(t)) in e ? Object.defineProperty(e, t, { value: r, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = r, e;
-}
-function Ee(e) {
-  var t = Re(e, "string");
-  return typeof t == "symbol" ? t : t + "";
-}
-function Re(e, t) {
-  if (typeof e != "object" || !e) return e;
-  var r = e[Symbol.toPrimitive];
-  if (r !== void 0) {
-    var n = r.call(e, t);
-    if (typeof n != "object") return n;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (t === "string" ? String : Number)(e);
-}
-function Ie() {
-  const e = k(null, {
+function createRouterControls() {
+  const $history = createStore(null, {
     and: {
       serialize: "ignore"
     },
     name: "$history",
     sid: "-ld7lzl"
-  }), t = k({
+  });
+  const $locationState = createStore({
     query: {},
     path: null
   }, {
     name: "$locationState",
     sid: "-4u3w85"
-  }), r = t.map((u) => u.query), n = t.map((u) => u.path), a = g({
+  });
+  const $query = $locationState.map((state) => state.query);
+  const $path = $locationState.map((state) => state.path);
+  const setHistory = createEvent({
     name: "setHistory",
     sid: "-ormmkk"
-  }), o = g({
+  });
+  const navigate = createEvent({
     name: "navigate",
     sid: "tawqep"
-  }), i = g({
+  });
+  const back = createEvent({
     name: "back",
     sid: "bxy8rt"
-  }), s = g({
+  });
+  const forward = createEvent({
     name: "forward",
     sid: "-bpmzb1"
-  }), c = g({
+  });
+  const locationUpdated = createEvent({
     name: "locationUpdated",
     sid: "lkzldx"
-  }), d = K({
+  });
+  const navigateFx = attach({
     and: {
-      source: e,
-      effect: (u, b) => {
+      source: $history,
+      effect: (history, _ref) => {
         let {
-          path: l,
-          query: f,
-          replace: p
-        } = b;
-        if (!u)
+          path,
+          query,
+          replace
+        } = _ref;
+        if (!history) {
           throw new Error("history not found");
-        const m = {
-          pathname: l,
-          search: "?".concat(x.stringify(f))
+        }
+        const payload = {
+          pathname: path,
+          search: `?${queryString.stringify(query)}`
         };
-        p ? u.replace(m) : u.push(m);
+        if (replace) {
+          history.replace(payload);
+        } else {
+          history.push(payload);
+        }
       }
     },
     or: {
       name: "navigateFx",
       sid: "-ov1xn7"
     }
-  }), y = S((u) => {
-    const b = N(c);
-    if (b({
-      pathname: u.location.pathname,
-      query: $({}, x.parse(u.location.search))
-    }), !u)
+  });
+  const subscribeHistoryFx = createEffect((history) => {
+    const historyLocationUpdated = scopeBind(locationUpdated);
+    historyLocationUpdated({
+      pathname: history.location.pathname,
+      query: {
+        ...queryString.parse(history.location.search)
+      }
+    });
+    if (!history) {
       throw new Error();
-    u.listen((l) => {
+    }
+    history.listen((_ref2) => {
       let {
-        location: f
-      } = l;
-      b({
-        pathname: f.pathname,
-        query: $({}, x.parse(f.search))
+        location
+      } = _ref2;
+      historyLocationUpdated({
+        pathname: location.pathname,
+        query: {
+          ...queryString.parse(location.search)
+        }
       });
     });
   }, {
     name: "subscribeHistoryFx",
     sid: "-m60vds"
   });
-  return h({
+  sample({
     and: [{
-      clock: a,
-      target: e
+      clock: setHistory,
+      target: $history
     }],
     or: {
       sid: "ii4q"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: e,
+      clock: $history,
       filter: Boolean,
-      target: y
+      target: subscribeHistoryFx
     }],
     or: {
       sid: "39h3j"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: c,
-      fn: (u) => ({
-        path: u.pathname,
-        query: u.query
+      clock: locationUpdated,
+      fn: (location) => ({
+        path: location.pathname,
+        query: location.query
       }),
-      target: t
+      target: $locationState
     }],
     or: {
       sid: "i3x4a"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: o,
-      source: n,
-      fn: (u, b) => $({
-        path: u
-      }, b),
-      target: d
+      clock: navigate,
+      source: $path,
+      fn: (path, payload) => ({
+        path,
+        ...payload
+      }),
+      target: navigateFx
     }],
     or: {
       sid: "ylqx4"
     }
-  }), {
-    $history: e,
-    $locationState: t,
-    $query: r,
-    $path: n,
-    setHistory: a,
-    navigate: o,
-    back: i,
-    forward: s,
-    locationUpdated: c,
-    trackQuery: de({
-      $query: r,
-      navigate: o
+  });
+  return {
+    $history,
+    $locationState,
+    $query,
+    $path,
+    setHistory,
+    navigate,
+    back,
+    forward,
+    locationUpdated,
+    trackQuery: trackQueryControlsFactory({
+      $query,
+      navigate
     })
   };
 }
-function qe(e) {
+function createRouter(config) {
   const {
-    base: t = "/",
-    routes: r
-  } = e, {
-    $path: n,
-    $query: a,
-    back: o,
-    forward: i,
-    navigate: s,
-    setHistory: c,
-    locationUpdated: d
-  } = Ie(), y = r.map((l) => {
-    let f = l;
-    const p = [];
-    for (p.unshift(f.path); f.parent; )
-      f = f.parent, f.path !== "/" && p.unshift(f.path);
-    const m = t === "/" ? p.join("") : [t, ...p].join(""), {
-      build: j,
-      parse: v
-    } = Oe(m);
+    base = "/",
+    routes
+  } = config;
+  const {
+    $path,
+    $query,
+    back,
+    forward,
+    navigate,
+    setHistory,
+    locationUpdated
+  } = createRouterControls();
+  const mappedRoutes = routes.map((route) => {
+    let internalRoute = route;
+    const path = [];
+    path.unshift(internalRoute.path);
+    while (internalRoute.parent) {
+      internalRoute = internalRoute.parent;
+      if (internalRoute.path !== "/") {
+        path.unshift(internalRoute.path);
+      }
+    }
+    const joinedPath = base === "/" ? path.join("") : [base, ...path].join("");
+    const {
+      build,
+      parse
+    } = compile(joinedPath);
     return {
-      route: l,
-      path: m,
-      build: j,
-      parse: v
+      route,
+      path: joinedPath,
+      build,
+      parse
     };
-  }), u = n.map((l) => {
-    const f = [];
-    if (!l)
-      return f;
+  });
+  const $activeRoutes = $path.map((path) => {
+    const result = [];
+    if (!path) {
+      return result;
+    }
     for (const {
-      route: p,
-      parse: m
-    } of y)
-      m(l) && f.push(p);
-    return f;
-  }), b = K({
+      route,
+      parse
+    } of mappedRoutes) {
+      if (parse(path)) {
+        result.push(route);
+      }
+    }
+    return result;
+  });
+  const openRoutesByPathFx = attach({
     and: {
       source: {
-        query: a,
-        path: n
+        query: $query,
+        path: $path
       },
-      effect: async (l) => {
+      effect: async (_ref) => {
         let {
-          query: f,
-          path: p
-        } = l;
+          query,
+          path
+        } = _ref;
         for (const {
-          route: m,
-          parse: j
-        } of y) {
-          const v = j(p), [re, te] = [N(m.internal.close), N(m.internal.navigated)];
-          v ? te({
-            query: f,
-            params: v.params
-          }) : re();
+          route,
+          parse
+        } of mappedRoutes) {
+          const matchResult = parse(path);
+          const [routeClosed, routeNavigated] = [scopeBind(route.internal.close), scopeBind(route.internal.navigated)];
+          if (!matchResult) {
+            routeClosed();
+          } else {
+            routeNavigated({
+              query,
+              params: matchResult.params
+            });
+          }
         }
       }
     },
@@ -1190,234 +922,314 @@ function qe(e) {
     }
   });
   for (const {
-    route: l,
-    build: f
-  } of y)
-    h({
+    route,
+    build
+  } of mappedRoutes) {
+    sample({
       and: [{
-        clock: l.internal.openFx.doneData,
-        filter: (p) => (p == null ? void 0 : p.navigate) !== !1,
-        fn: (p) => {
-          var m;
+        clock: route.internal.openFx.doneData,
+        filter: (payload) => (payload == null ? void 0 : payload.navigate) !== false,
+        fn: (payload) => {
           return {
-            path: f(p && "params" in p ? p.params : void 0),
-            query: (m = p == null ? void 0 : p.query) !== null && m !== void 0 ? m : {},
-            replace: p == null ? void 0 : p.replace
+            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: s
+        target: navigate
       }],
       or: {
         sid: "exzzqg"
       }
     });
-  return h({
+  }
+  sample({
     and: [{
-      clock: d,
-      fn: (l) => ({
-        path: l.pathname,
-        query: l.query
+      clock: locationUpdated,
+      fn: (location) => ({
+        path: location.pathname,
+        query: location.query
       }),
-      target: b
+      target: openRoutesByPathFx
     }],
     or: {
       sid: "ficdn3"
     }
-  }), {
-    $query: a,
-    $path: n,
-    $activeRoutes: u,
-    back: o,
-    forward: i,
-    navigate: s,
-    routes: r,
-    setHistory: c,
-    mappedRoutes: y,
-    trackQuery: L({
-      $activeRoutes: u,
-      $query: a,
-      navigate: s
+  });
+  return {
+    $query,
+    $path,
+    $activeRoutes,
+    back,
+    forward,
+    navigate,
+    routes,
+    setHistory,
+    mappedRoutes,
+    trackQuery: trackQueryFactory({
+      $activeRoutes,
+      $query,
+      navigate
     }),
     "@@unitShape": () => ({
-      query: a,
-      path: n,
-      activeRoutes: u,
-      onBack: o,
-      onForward: i,
-      onNavigate: s
+      query: $query,
+      path: $path,
+      activeRoutes: $activeRoutes,
+      onBack: back,
+      onForward: forward,
+      onNavigate: navigate
     })
   };
 }
-function Ce(e) {
-  const t = k(null, {
+function createVirtualRoute() {
+  let pending = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : createStore(false, {
+    and: {
+      name: "pending",
+      sid: "r89aiv"
+    },
+    name: "pending",
+    sid: "r89aiv"
+  });
+  const $params = createStore(null, {
     name: "$params",
-    sid: "-grvyb1"
-  }), r = k(!1, {
+    sid: "-ftspin"
+  });
+  const $isOpened = createStore(false, {
     name: "$isOpened",
-    sid: "-w4cbyq"
-  }), n = e, a = g({
+    sid: "-v6936c"
+  });
+  const $isPending = pending;
+  const open = createEvent({
     name: "open",
-    sid: "8yat5e"
-  }), o = g({
+    sid: "juc47v"
+  });
+  const opened = createEvent({
     name: "opened",
-    sid: "-rsfhnq"
-  }), i = g({
+    sid: "-quc8vc"
+  });
+  const openedOnServer = createEvent({
     name: "openedOnServer",
-    sid: "m42ioq"
-  }), s = g({
+    sid: "n25rh4"
+  });
+  const openedOnClient = createEvent({
     name: "openedOnClient",
-    sid: "-bstrdb"
-  }), c = g({
+    sid: "-auqikx"
+  });
+  const close = createEvent({
     name: "close",
-    sid: "41ihvs"
-  }), d = g({
+    sid: "4zlqo6"
+  });
+  const closed = createEvent({
     name: "closed",
-    sid: "vdm6z6"
-  }), y = g({
+    sid: "wbpfrk"
+  });
+  const cancelled = createEvent({
     name: "cancelled",
-    sid: "-r20ekt"
+    sid: "-q3x5sf"
   });
-  return h({
+  sample({
     and: [{
-      clock: a,
-      target: o
+      clock: open,
+      target: opened
     }],
     or: {
-      sid: "-ukycs8"
+      sid: "-u8b34x"
     }
-  }), V({
+  });
+  split({
     and: [{
-      source: o,
-      match: () => typeof window > "u" ? "server" : "client",
+      source: opened,
+      match: () => typeof window === "undefined" ? "server" : "client",
       cases: {
-        server: i,
-        client: s
+        server: openedOnServer,
+        client: openedOnClient
       }
     }],
     or: {
-      sid: "-u6npcu"
+      sid: "-u5k464"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: c,
-      target: d
+      clock: close,
+      target: closed
     }],
     or: {
-      sid: "-tq5vk0"
+      sid: "-tp2ada"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: [o.map(() => !0), d.map(() => !1)],
-      target: r
+      clock: [opened.map(() => true), closed.map(() => false)],
+      target: $isOpened
     }],
     or: {
-      sid: "-tnewl7"
+      sid: "-tarmxw"
     }
-  }), {
-    $params: t,
-    $isOpened: r,
-    $isPending: n,
-    open: a,
-    opened: o,
-    openedOnClient: s,
-    openedOnServer: i,
-    close: c,
-    closed: d,
-    cancelled: y,
+  });
+  return {
+    $params,
+    $isOpened,
+    $isPending,
+    open,
+    opened,
+    openedOnClient,
+    openedOnServer,
+    close,
+    closed,
+    cancelled,
     // @ts-expect-error emulated path for virtual route
     path: null,
     "@@unitShape": () => ({
-      params: t,
-      isOpened: r,
-      isPending: n,
-      onOpen: a
+      params: $params,
+      isOpened: $isOpened,
+      isPending: $isPending,
+      onOpen: open
     })
   };
 }
-function Ue(e) {
+function chainRoute(props) {
   const {
-    route: t,
-    beforeOpen: r,
-    openOn: n,
-    cancelOn: a
-  } = e;
-  let o;
-  const i = S(() => {
-    var d;
-    return (d = o) === null || d === void 0 ? void 0 : d();
-  }, {
+    route,
+    beforeOpen,
+    openOn,
+    cancelOn
+  } = props;
+  let asyncImport;
+  const waitForAsyncBundleFx = createEffect(() => asyncImport == null ? void 0 : asyncImport(), {
     name: "waitForAsyncBundleFx",
-    sid: "-utsi21"
-  }), s = S(async (d) => {
-    await i();
-    for (const y of [].concat(r))
-      await y(d);
+    sid: "-tvp99n"
+  });
+  const openFx = createEffect(async (payload) => {
+    await waitForAsyncBundleFx();
+    for (const trigger of [].concat(beforeOpen)) {
+      await trigger(payload);
+    }
   }, {
     name: "openFx",
-    sid: "-kgdclv"
-  }), c = Ce(s.pending);
-  return h({
+    sid: "-9kc1je"
+  });
+  const virtualRoute = createVirtualRoute(openFx.pending);
+  sample({
     and: [{
-      clock: t.opened,
-      target: s
+      clock: route.opened,
+      target: openFx
     }],
     or: {
-      sid: "102heu"
+      sid: "1162lk"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: t.opened,
-      fn: (d) => d && "params" in d ? d.params : null,
-      target: c.$params
+      clock: route.opened,
+      fn: (payload) => payload && "params" in payload ? payload.params : null,
+      target: virtualRoute.$params
     }],
     or: {
-      sid: "12tgdn"
+      sid: "13x1kd"
     }
-  }), n && h({
-    and: [{
-      clock: n,
-      source: {
-        params: c.$params
-      },
-      fn: (d) => {
-        let {
-          params: y
-        } = d;
-        return {
-          params: y
-        };
-      },
-      target: c.open
-    }],
-    or: {
-      sid: "1jba87"
+  });
+  if (openOn) {
+    sample({
+      and: [{
+        clock: openOn,
+        source: {
+          params: virtualRoute.$params
+        },
+        fn: (_ref) => {
+          let {
+            params
+          } = _ref;
+          return {
+            params
+          };
+        },
+        target: virtualRoute.open
+      }],
+      or: {
+        sid: "1kevex"
+      }
+    });
+  }
+  if (cancelOn) {
+    sample({
+      and: [{
+        clock: [route.closed].concat(cancelOn),
+        target: virtualRoute.close
+      }],
+      or: {
+        sid: "20wp7r"
+      }
+    });
+    sample({
+      and: [{
+        clock: [].concat(cancelOn),
+        target: virtualRoute.cancelled
+      }],
+      or: {
+        sid: "2f7cn5"
+      }
+    });
+  }
+  return Object.assign(virtualRoute, {
+    internal: {
+      setAsyncImport: (value) => asyncImport = value
     }
-  }), a && (h({
+  });
+}
+function group(routes) {
+  const $isPending = withFactory({
+    sid: "-uirglg",
+    fn: () => or(...routes.map((route) => route.$isPending)),
+    name: "$isPending",
+    method: "or"
+  });
+  const virtual = createVirtualRoute($isPending);
+  sample({
     and: [{
-      clock: [t.closed].concat(a),
-      target: c.close
+      clock: routes.map((route) => route.$isOpened),
+      filter: withFactory({
+        sid: "6pispd",
+        fn: () => or(...routes.map((route) => route.$isOpened)),
+        name: "filter",
+        method: "or"
+      }),
+      fn: () => void 0,
+      target: virtual.open
     }],
     or: {
-      sid: "1zt411"
+      sid: "-xn8czd"
     }
-  }), h({
+  });
+  sample({
     and: [{
-      clock: [].concat(a),
-      target: c.cancelled
+      clock: routes.map((route) => route.$isOpened),
+      filter: withFactory({
+        sid: "a0u5gq",
+        fn: () => not(withFactory({
+          sid: "xb4bx2",
+          fn: () => or(...routes.map((route) => route.$isOpened)),
+          name: "fn",
+          method: "or"
+        })),
+        name: "filter",
+        method: "not"
+      }),
+      fn: () => void 0,
+      target: virtual.close
     }],
     or: {
-      sid: "22k2zu"
-    }
-  })), Object.assign(c, {
-    internal: {
-      setAsyncImport: (d) => o = d
+      sid: "-x7u4d9"
     }
   });
+  return virtual;
 }
 export {
-  Ue as chainRoute,
-  ze as createRoute,
-  qe as createRouter,
-  Ie as createRouterControls,
-  w as parameters
+  chainRoute,
+  createRoute,
+  createRouter,
+  createRouterControls,
+  createVirtualRoute,
+  group,
+  parameters
 };