@blumjs/router - npm Package Compare versions

Comparing version 3.0.3 to 3.1.0

dist/index.d.ts

@@ -1,4 +0,4 @@
-import { back, historyPush, _setActiveModal, _setActivePanel, _setActivePopout, _setActiveView, _setRoutes } from "./router";
+import { back, historyPush, _setActiveModal, _setActivePanel, _setActivePopout, _setActiveView } from "./router";
 import { createDisableBackBrowserRouteMiddleware, createRouteMiddleware, useInitRouter, useRouter } from "./useRoutes";
 import { setActiveModal, setActivePanel, setActivePopout, setActiveView, setActiveViewPanel } from "./virtual-router";
-export { useRouter, useInitRouter, createDisableBackBrowserRouteMiddleware, createRouteMiddleware, setActiveModal, setActiveView, setActiveViewPanel, setActivePanel, setActivePopout, back, _setActiveView, _setActivePanel, _setActiveModal, _setActivePopout, _setRoutes, historyPush, };
+export { useRouter, useInitRouter, createDisableBackBrowserRouteMiddleware, createRouteMiddleware, setActiveModal, setActiveView, setActiveViewPanel, setActivePanel, setActivePopout, back, _setActiveView, _setActivePanel, _setActiveModal, _setActivePopout, historyPush, };

dist/index.js

@@ -1,3 +0,3 @@
-import T, { useEffect as $ } from "react";
-function xt(e, t) {
+import T, { useEffect as B } from "react";
+function Vt(e, t) {
   for (let n in e)
@@ -9,35 +9,35 @@ t(e[n], n);
 }
-function I(e, t) {
+function H(e, t) {
   if (!e)
     throw Error(t);
 }
-function H({ node: e = [], from: t, source: n, parent: r = t || n, to: a, target: s, child: o = a || s, scope: m = {}, meta: y = {}, family: p = { type: "regular" }, regional: S } = {}) {
-  let c = ue(r), d = ue(p.links), i = ue(p.owners), u = [];
-  k(e, (f) => f && M(u, f));
-  let l = { id: Ht(), seq: u, next: ue(o), meta: y, scope: m, family: { type: p.type || "crosslink", links: d, owners: i } };
-  return k(d, (f) => M(Se(f), l)), k(i, (f) => M(_e(f), l)), k(c, (f) => M(f.next, l)), S && G && Be(Z(G), [l]), l;
+function N({ node: e = [], from: t, source: n, parent: r = t || n, to: i, target: s, child: o = i || s, scope: m = {}, meta: y = {}, family: p = { type: "regular" }, regional: S } = {}) {
+  let c = le(r), d = le(p.links), u = le(p.owners), a = [];
+  k(e, (f) => f && D(a, f));
+  let l = { id: Bt(), seq: a, next: le(o), meta: y, scope: m, family: { type: p.type || "crosslink", links: d, owners: u } };
+  return k(d, (f) => D(Se(f), l)), k(u, (f) => D(_e(f), l)), k(c, (f) => D(f.next, l)), S && G && Pe(Z(G), [l]), l;
 }
 function te(e, t, n) {
-  let r, a = D, s = null, o = b;
-  if (e.target && (t = e.params, n = e.defer, r = e.meta, a = "page" in e ? e.page : a, e.stack && (s = e.stack), o = P(e) || o, e = e.target), o && b && o !== b && (b = null), Array.isArray(e))
-    for (let u = 0; u < e.length; u++)
-      N("pure", a, C(e[u]), s, t[u], o, r);
+  let r, i = M, s = null, o = b;
+  if (e.target && (t = e.params, n = e.defer, r = e.meta, i = "page" in e ? e.page : i, e.stack && (s = e.stack), o = I(e) || o, e = e.target), o && b && o !== b && (b = null), Array.isArray(e))
+    for (let a = 0; a < e.length; a++)
+      $("pure", i, C(e[a]), s, t[a], o, r);
   else
-    N("pure", a, C(e), s, t, o, r);
+    $("pure", i, C(e), s, t, o, r);
   if (n && !se)
     return;
-  let m, y, p, S, c, d, i = { isRoot: se, currentPage: D, scope: b, isWatch: fe, isPure: de };
+  let m, y, p, S, c, d, u = { isRoot: se, currentPage: M, scope: b, isWatch: fe, isPure: de };
   se = 0;
   e:
-    for (; S = Ut(); ) {
-      let { idx: u, stack: l, type: f } = S;
-      p = l.node, D = c = l.page, b = P(l), c ? d = c.reg : b && (d = b.reg);
+    for (; S = Jt(); ) {
+      let { idx: a, stack: l, type: f } = S;
+      p = l.node, M = c = l.page, b = I(l), c ? d = c.reg : b && (d = b.reg);
       let O = !!c, R = !!b, g = { fail: 0, scope: p.scope };
       m = y = 0;
-      for (let v = u; v < p.seq.length && !m; v++) {
+      for (let v = a; v < p.seq.length && !m; v++) {
         let w = p.seq[v];
         if (w.order) {
           let { priority: h, barrierID: _ } = w.order, E = _ ? c ? `${c.fullID}_${_}` : _ : 0;
-          if (v !== u || f !== h) {
-            _ ? Ae.has(E) || (Ae.add(E), De(v, l, h, _)) : De(v, l, h);
+          if (v !== a || f !== h) {
+            _ ? Ae.has(E) || (Ae.add(E), Me(v, l, h, _)) : Me(v, l, h);
             continue e;
@@ -79,3 +79,3 @@ }
               case "store":
-                Jt(c, b, p, E.target).current = _;
+                Xt(c, b, p, E.target).current = _;
             }
@@ -88,4 +88,4 @@ break;
               fe = x(p, "op") === "watch", de = h.pure;
-              let _ = h.safe ? (0, h.fn)(Z(l), g.scope, l) : Xt(g, h.fn, l);
-              h.filter ? y = !_ : l.value = _, fe = i.isWatch, de = i.isPure;
+              let _ = h.safe ? (0, h.fn)(Z(l), g.scope, l) : er(g, h.fn, l);
+              h.filter ? y = !_ : l.value = _, fe = u.isWatch, de = u.isPure;
             }
@@ -96,10 +96,10 @@ }
       if (!m) {
-        let v = Z(l), w = P(l);
+        let v = Z(l), w = I(l);
         if (k(p.next, (h) => {
-          N("child", c, h, l, v, w);
+          $("child", c, h, l, v, w);
         }), w) {
-          x(p, "needFxCounter") && N("child", c, w.fxCount, l, v, w), x(p, "storeChange") && N("child", c, w.storeChange, l, v, w), x(p, "warnSerialize") && N("child", c, w.warnSerializeNode, l, v, w);
+          x(p, "needFxCounter") && $("child", c, w.fxCount, l, v, w), x(p, "storeChange") && $("child", c, w.storeChange, l, v, w), x(p, "warnSerialize") && $("child", c, w.warnSerializeNode, l, v, w);
           let h = w.additionalLinks[p.id];
           h && k(h, (_) => {
-            N("child", c, _, l, v, w);
+            $("child", c, _, l, v, w);
           });
@@ -109,15 +109,15 @@ }
     }
-  se = i.isRoot, D = i.currentPage, b = P(i);
+  se = u.isRoot, M = u.currentPage, b = I(u);
 }
-function kt(e, t) {
-  let n, r, a = e;
+function Dt(e, t) {
+  let n, r, i = e;
   if (t) {
-    let s = Dt(t);
+    let s = Ct(t);
     e.length === 0 ? (n = s.path, r = s.fullName) : (n = s.path.concat([e]), r = s.fullName.length === 0 ? e : s.fullName + "/" + e);
   } else
     n = e.length === 0 ? [] : [e], r = e;
-  return { shortName: a, fullName: r, path: n };
+  return { shortName: i, fullName: r, path: n };
 }
 function X(e, ...t) {
-  let n = ut();
+  let n = lt();
   if (n) {
@@ -130,13 +130,13 @@ let r = n.handlers[e];
 function A(e, t) {
-  let n = U({ or: t, and: typeof e == "string" ? { name: e } : e }), r = (o, ...m) => (oe(!x(r, "derived"), "call of derived event", "createEvent"), oe(!de, "unit call from pure function", "operators like sample"), D ? ((y, p, S, c) => {
-    let d = D, i = null;
+  let n = U({ or: t, and: typeof e == "string" ? { name: e } : e }), r = (o, ...m) => (oe(!x(r, "derived"), "call of derived event", "createEvent"), oe(!de, "unit call from pure function", "operators like sample"), M ? ((y, p, S, c) => {
+    let d = M, u = null;
     if (p)
-      for (i = D; i && i.template !== p; )
-        i = B(i);
-    Qe(i);
-    let u = y.create(S, c);
-    return Qe(d), u;
-  })(r, a, o, m) : r.create(o, m)), a = ut(), s = Object.assign(r, { graphite: H({ meta: vt("event", r, n), regional: 1 }), create: (o) => (te({ target: r, params: o, scope: b }), o), watch: (o) => pt(r, o), map: (o) => Le(r, re, o, [q()]), filter: (o) => Le(r, "filter", o.fn ? o : o.fn, [q(ze, 1)]), filterMap: (o) => Le(r, "filterMap", o, [q(), F((m) => !j(m), 1)]), prepend(o) {
-    let m = A("* → " + r.shortName, { parent: B(r) });
-    return X("eventPrepend", C(m)), Ge(m, r, [q()], "prepend", o), Zt(r, m), m;
+      for (u = M; u && u.template !== p; )
+        u = P(u);
+    Qe(u);
+    let a = y.create(S, c);
+    return Qe(d), a;
+  })(r, i, o, m) : r.create(o, m)), i = lt(), s = Object.assign(r, { graphite: N({ meta: vt("event", r, n), regional: 1 }), create: (o) => (te({ target: r, params: o, scope: b }), o), watch: (o) => pt(r, o), map: (o) => Le(r, re, o, [q()]), filter: (o) => Le(r, "filter", o.fn ? o : o.fn, [q(ze, 1)]), filterMap: (o) => Le(r, "filterMap", o, [q(), F((m) => !j(m), 1)]), prepend(o) {
+    let m = A("* → " + r.shortName, { parent: P(r) });
+    return X("eventPrepend", C(m)), Ge(m, r, [q()], "prepend", o), tr(r, m), m;
   } });
@@ -146,40 +146,40 @@ return n != null && n.domain && n.domain.hooks.event(s), s;
 function Fe(e, t, n, r) {
-  return zt(n, t, "first argument"), I(V(r), "second argument should be a function"), oe(!x(e, "derived"), `${t} in derived store`, `${t} in store created via createStore`), k(Array.isArray(n) ? n : [n], (a) => {
-    e.off(a), me(e).set(a, dt(mt(a, e, "on", jt, r)));
+  return qt(n, t, "first argument"), H(V(r), "second argument should be a function"), oe(!x(e, "derived"), `${t} in derived store`, `${t} in store created via createStore`), k(Array.isArray(n) ? n : [n], (i) => {
+    e.off(i), me(e).set(i, dt(mt(i, e, "on", Wt, r)));
   }), e;
 }
 function he(e, t) {
-  let n = U(t), r = Ft(e), a = A({ named: "updates", derived: 1 });
+  let n = U(t), r = Ut(e), i = A({ named: "updates", derived: 1 });
   X("storeBase", r);
-  let s = r.id, o = { subscribers: /* @__PURE__ */ new Map(), updates: a, defaultState: e, stateRef: r, getState() {
-    let u, l = r;
-    if (D) {
-      let f = D;
+  let s = r.id, o = { subscribers: /* @__PURE__ */ new Map(), updates: i, defaultState: e, stateRef: r, getState() {
+    let a, l = r;
+    if (M) {
+      let f = M;
       for (; f && !f.reg[s]; )
-        f = B(f);
-      f && (u = f);
+        f = P(f);
+      f && (a = f);
     }
-    return !u && b && (K(b, r, 1), u = b), u && (l = u.reg[s]), ct(l);
-  }, setState: (u) => te({ target: o, params: u, defer: 1, scope: b }), reset: (...u) => (k(u, (l) => Fe(o, ".reset", l, () => o.defaultState)), o), on: (u, l) => Fe(o, ".on", u, l), off(u) {
-    let l = me(o).get(u);
-    return l && (l(), me(o).delete(u)), o;
-  }, map(u, l) {
+    return !a && b && (K(b, r, 1), a = b), a && (l = a.reg[s]), ct(l);
+  }, setState: (a) => te({ target: o, params: a, defer: 1, scope: b }), reset: (...a) => (k(a, (l) => Fe(o, ".reset", l, () => o.defaultState)), o), on: (a, l) => Fe(o, ".on", a, l), off(a) {
+    let l = me(o).get(a);
+    return l && (l(), me(o).delete(a)), o;
+  }, map(a, l) {
     let f, O;
-    z(u) && (f = u, u = u.fn), oe(j(l), "second argument of store.map", "updateFilter");
+    z(a) && (f = a, a = a.fn), oe(j(l), "second argument of store.map", "updateFilter");
     let R = o.getState();
-    j(R) || (O = u(R, l));
-    let g = he(O, { name: `${o.shortName} → *`, derived: 1, and: f }), v = mt(o, g, re, Ye, u);
-    return Kt(ve(g), { type: re, fn: u, from: r }), ve(g).noInit = 1, X("storeMap", r, v), g;
-  }, watch(u, l) {
-    if (!l || !Ne(u)) {
-      let f = pt(o, u);
-      return X("storeWatch", r, u) || u(o.getState()), f;
+    j(R) || (O = a(R, l));
+    let g = he(O, { name: `${o.shortName} → *`, derived: 1, and: f }), v = mt(o, g, re, Ye, a);
+    return Yt(ve(g), { type: re, fn: a, from: r }), ve(g).noInit = 1, X("storeMap", r, v), g;
+  }, watch(a, l) {
+    if (!l || !$e(a)) {
+      let f = pt(o, a);
+      return X("storeWatch", r, a) || a(o.getState()), f;
     }
-    return I(V(l), "second argument should be a function"), u.watch((f) => l(o.getState(), f));
+    return H(V(l), "second argument should be a function"), a.watch((f) => l(o.getState(), f));
   } }, m = vt("store", o, n), y = o.defaultConfig.updateFilter;
-  o.graphite = H({ scope: { state: r, fn: y }, node: [F((u, l, f) => (f.scope && !f.scope.reg[r.id] && (f.b = 1), u)), Wt(r), F((u, l, { a: f, b: O }) => !j(u) && (u !== f || O), 1), y && q(Ye, 1), ye({ from: ne, target: r })], child: a, meta: m, regional: 1 });
-  let p = x(o, "serialize"), S = x(o, "derived"), c = p === "ignore", d = !p || c ? 0 : p, i = x(o, "sid");
-  return i && (c || ee(o, "storeChange", 1), r.sid = i, d && (r.meta = { ...r == null ? void 0 : r.meta, serialize: d })), i || c || S || ee(o, "warnSerialize", 1), I(S || !j(e), "current state can't be undefined, use null instead"), Be(o, [a]), n != null && n.domain && n.domain.hooks.store(o), S || (o.reinit = A(), o.reset(o.reinit)), o;
+  o.graphite = N({ scope: { state: r, fn: y }, node: [F((a, l, f) => (f.scope && !f.scope.reg[r.id] && (f.b = 1), a)), Ft(r), F((a, l, { a: f, b: O }) => !j(a) && (a !== f || O), 1), y && q(Ye, 1), ye({ from: ne, target: r })], child: i, meta: m, regional: 1 });
+  let p = x(o, "serialize"), S = x(o, "derived"), c = p === "ignore", d = !p || c ? 0 : p, u = x(o, "sid");
+  return u && (c || ee(o, "storeChange", 1), r.sid = u, d && (r.meta = { ...r == null ? void 0 : r.meta, serialize: d })), u || c || S || ee(o, "warnSerialize", 1), H(S || !j(e), "current state can't be undefined, use null instead"), Pe(o, [i]), n != null && n.domain && n.domain.hooks.store(o), S || (o.reinit = A(), o.reset(o.reinit)), o;
 }
-function Vt() {
+function Mt() {
   let e = {};
@@ -192,50 +192,50 @@ return e.req = new Promise((t, n) => {
 function at(e, t) {
-  let n = U(V(e) ? { handler: e } : e, t), r = A(V(e) ? { handler: e } : e, t), a = C(r);
-  ee(a, "op", r.kind = "effect"), r.use = (i) => (I(V(i), ".use argument should be a function"), S.scope.handler = i, r), r.use.getCurrent = () => S.scope.handler;
-  let s = r.finally = A({ named: "finally", derived: 1 }), o = r.done = s.filterMap({ named: "done", fn({ status: i, params: u, result: l }) {
-    if (i === "done")
-      return { params: u, result: l };
-  } }), m = r.fail = s.filterMap({ named: "fail", fn({ status: i, params: u, error: l }) {
-    if (i === "fail")
-      return { params: u, error: l };
-  } }), y = r.doneData = o.map({ named: "doneData", fn: ({ result: i }) => i }), p = r.failData = m.map({ named: "failData", fn: ({ error: i }) => i }), S = H({ scope: { handlerId: x(a, "sid"), handler: r.defaultConfig.handler || (() => I(0, `no handler used in ${r.getType()}`)) }, node: [F((i, u, l) => {
-    let f = u, O = f.handler;
-    if (P(l)) {
-      let R = P(l).handlers[f.handlerId];
+  let n = U(V(e) ? { handler: e } : e, t), r = A(V(e) ? { handler: e } : e, t), i = C(r);
+  ee(i, "op", r.kind = "effect"), r.use = (u) => (H(V(u), ".use argument should be a function"), S.scope.handler = u, r), r.use.getCurrent = () => S.scope.handler;
+  let s = r.finally = A({ named: "finally", derived: 1 }), o = r.done = s.filterMap({ named: "done", fn({ status: u, params: a, result: l }) {
+    if (u === "done")
+      return { params: a, result: l };
+  } }), m = r.fail = s.filterMap({ named: "fail", fn({ status: u, params: a, error: l }) {
+    if (u === "fail")
+      return { params: a, error: l };
+  } }), y = r.doneData = o.map({ named: "doneData", fn: ({ result: u }) => u }), p = r.failData = m.map({ named: "failData", fn: ({ error: u }) => u }), S = N({ scope: { handlerId: x(i, "sid"), handler: r.defaultConfig.handler || (() => H(0, `no handler used in ${r.getType()}`)) }, node: [F((u, a, l) => {
+    let f = a, O = f.handler;
+    if (I(l)) {
+      let R = I(l).handlers[f.handlerId];
       R && (O = R);
     }
-    return i.handler = O, i;
-  }, 0, 1), F(({ params: i, req: u, handler: l, args: f = [i] }, O, R) => {
-    let g = tr(R), v = Ze(i, u, 1, s, R, g), w = Ze(i, u, 0, s, R, g), [h, _] = er(l, w, f);
+    return u.handler = O, u;
+  }, 0, 1), F(({ params: u, req: a, handler: l, args: f = [u] }, O, R) => {
+    let g = nr(R), v = Ze(u, a, 1, s, R, g), w = Ze(u, a, 0, s, R, g), [h, _] = rr(l, w, f);
     h && (z(_) && V(_.then) ? _.then(v, w) : v(_));
   }, 0, 1)], meta: { op: "fx", fx: "runner" } });
-  a.scope.runner = S, M(a.seq, F((i, { runner: u }, l) => {
-    let f = B(l) ? { params: i, req: { rs(O) {
+  i.scope.runner = S, D(i.seq, F((u, { runner: a }, l) => {
+    let f = P(l) ? { params: u, req: { rs(O) {
     }, rj(O) {
-    } } } : i;
-    return l.meta || (l.meta = { fxID: Nt() }), te({ target: u, params: f, defer: 1, scope: P(l), meta: l.meta }), f.params;
-  }, 0, 1)), r.create = (i) => {
-    let u = Vt(), l = { params: i, req: u };
+    } } } : u;
+    return l.meta || (l.meta = { fxID: Pt() }), te({ target: a, params: f, defer: 1, scope: I(l), meta: l.meta }), f.params;
+  }, 0, 1)), r.create = (u) => {
+    let a = Mt(), l = { params: u, req: a };
     if (b && !fe) {
       let f = b;
-      u.req.finally(() => {
-        Yt(f);
+      a.req.finally(() => {
+        Qt(f);
       }).catch(() => {
       });
     }
-    return te({ target: r, params: l, scope: b }), u.req;
+    return te({ target: r, params: l, scope: b }), a.req;
   };
-  let c = r.inFlight = he(0, { serialize: "ignore" }).on(r, (i) => i + 1).on(s, (i) => i - 1).map({ fn: (i) => i, named: "inFlight" });
+  let c = r.inFlight = he(0, { serialize: "ignore" }).on(r, (u) => u + 1).on(s, (u) => u - 1).map({ fn: (u) => u, named: "inFlight" });
   ee(s, "needFxCounter", "dec"), ee(r, "needFxCounter", 1);
-  let d = r.pending = c.map({ fn: (i) => i > 0, named: "pending" });
-  return Be(r, [s, o, m, y, p, d, c]), n != null && n.domain && n.domain.hooks.effect(r), r;
+  let d = r.pending = c.map({ fn: (u) => u > 0, named: "pending" });
+  return Pe(r, [s, o, m, y, p, d, c]), n != null && n.domain && n.domain.hooks.effect(r), r;
 }
-let Mt = typeof Symbol < "u" && Symbol.observable || "@@observable", re = "map", ne = "stack", C = (e) => e.graphite || e, Se = (e) => e.family.owners, _e = (e) => e.family.links, ve = (e) => e.stateRef, Z = (e) => e.value, me = (e) => e.subscribers, B = (e) => e.parent, P = (e) => e.scope, x = (e, t) => C(e).meta[t], ee = (e, t, n) => C(e).meta[t] = n, Dt = (e) => e.compositeName, Ne = (e) => (V(e) || z(e)) && "kind" in e;
-const le = (e) => (t) => Ne(t) && t.kind === e;
-let $e = le("store"), Tt = le("event"), Ke = le("effect"), it = le("domain"), Ct = le("scope");
-var Pt = { __proto__: null, unit: Ne, store: $e, event: Tt, effect: Ke, domain: it, scope: Ct, attached: (e) => Ke(e) && x(e, "attached") == 1 };
+let Tt = typeof Symbol < "u" && Symbol.observable || "@@observable", re = "map", ne = "stack", C = (e) => e.graphite || e, Se = (e) => e.family.owners, _e = (e) => e.family.links, ve = (e) => e.stateRef, Z = (e) => e.value, me = (e) => e.subscribers, P = (e) => e.parent, I = (e) => e.scope, x = (e, t) => C(e).meta[t], ee = (e, t, n) => C(e).meta[t] = n, Ct = (e) => e.compositeName, $e = (e) => (V(e) || z(e)) && "kind" in e;
+const ue = (e) => (t) => $e(t) && t.kind === e;
+let Be = ue("store"), It = ue("event"), Ke = ue("effect"), it = ue("domain"), Ht = ue("scope");
+var Nt = { __proto__: null, unit: $e, store: Be, event: It, effect: Ke, domain: it, scope: Ht, attached: (e) => Ke(e) && x(e, "attached") == 1 };
 let ce = (e, t) => {
   let n = e.indexOf(t);
   n !== -1 && e.splice(n, 1);
-}, M = (e, t) => e.push(t), oe = (e, t, n) => !e && console.error(`${t} is deprecated${n ? `, use ${n} instead` : ""}`);
+}, D = (e, t) => e.push(t), oe = (e, t, n) => !e && console.error(`${t} is deprecated${n ? `, use ${n} instead` : ""}`);
 const ge = () => {
@@ -245,19 +245,19 @@ let e = 0;
 };
-let It = ge(), lt = ge(), Ht = ge(), Nt = ge(), G = null, ut = () => G, $t = (e) => (e && G && G.sidRoot && (e = `${G.sidRoot}|${e}`), e), Be = (e, t) => {
+let $t = ge(), ut = ge(), Bt = ge(), Pt = ge(), G = null, lt = () => G, zt = (e) => (e && G && G.sidRoot && (e = `${G.sidRoot}|${e}`), e), Pe = (e, t) => {
   let n = C(e);
   k(t, (r) => {
-    let a = C(r);
-    n.family.type !== "domain" && (a.family.type = "crosslink"), M(Se(a), n), M(_e(n), a);
+    let i = C(r);
+    n.family.type !== "domain" && (i.family.type = "crosslink"), D(Se(i), n), D(_e(n), i);
   });
-}, ue = (e = []) => (Array.isArray(e) ? e : [e]).flat().map(C), z = (e) => typeof e == "object" && e !== null, V = (e) => typeof e == "function", j = (e) => e === void 0, Bt = (e) => I(z(e) || V(e), "expect first argument be an object");
-const Ue = (e, t, n, r) => I(!(!z(e) && !V(e) || !("family" in e) && !("graphite" in e)), `${t}: expect ${n} to be a unit (store, event or effect)${r}`);
-let zt = (e, t, n) => {
-  Array.isArray(e) ? k(e, (r, a) => Ue(r, t, `${a} item of ${n}`, "")) : Ue(e, t, n, " or array of units");
-}, Ye = (e, { fn: t }, { a: n }) => t(e, n), jt = (e, { fn: t }, { a: n }) => t(n, e), ze = (e, { fn: t }) => t(e);
+}, le = (e = []) => (Array.isArray(e) ? e : [e]).flat().map(C), z = (e) => typeof e == "object" && e !== null, V = (e) => typeof e == "function", j = (e) => e === void 0, jt = (e) => H(z(e) || V(e), "expect first argument be an object");
+const Ue = (e, t, n, r) => H(!(!z(e) && !V(e) || !("family" in e) && !("graphite" in e)), `${t}: expect ${n} to be a unit (store, event or effect)${r}`);
+let qt = (e, t, n) => {
+  Array.isArray(e) ? k(e, (r, i) => Ue(r, t, `${i} item of ${n}`, "")) : Ue(e, t, n, " or array of units");
+}, Ye = (e, { fn: t }, { a: n }) => t(e, n), Wt = (e, { fn: t }, { a: n }) => t(n, e), ze = (e, { fn: t }) => t(e);
 const st = (e, t, n, r) => {
-  let a = { id: lt(), type: e, data: t };
-  return n && (a.order = { priority: n }, r && (a.order.barrierID = ++qt)), a;
+  let i = { id: ut(), type: e, data: t };
+  return n && (i.order = { priority: n }, r && (i.order.barrierID = ++Gt)), i;
 };
-let qt = 0, ye = ({ from: e = "store", store: t, target: n, to: r = n ? "store" : ne, batch: a, priority: s }) => st("mov", { from: e, store: t, to: r, target: n }, s, a), ae = ({ fn: e, batch: t, priority: n, safe: r = 0, filter: a = 0, pure: s = 0 }) => st("compute", { fn: e, safe: r, filter: a, pure: s }, n, t), je = ({ fn: e }) => ae({ fn: e, priority: "effect" }), F = (e, t, n) => ae({ fn: e, safe: 1, filter: t, priority: n && "effect" }), Wt = (e, t, n) => ye({ store: e, to: t ? ne : "a", priority: n && "sampler", batch: 1 }), q = (e = ze, t) => ae({ fn: e, pure: 1, filter: t }), Gt = { mov: ye, compute: ae, filter: ({ fn: e, pure: t }) => ae({ fn: e, filter: 1, pure: t }), run: je }, Ft = (e) => ({ id: lt(), current: e }), ct = ({ current: e }) => e, Kt = (e, t) => {
-  e.before || (e.before = []), M(e.before, t);
+let Gt = 0, ye = ({ from: e = "store", store: t, target: n, to: r = n ? "store" : ne, batch: i, priority: s }) => st("mov", { from: e, store: t, to: r, target: n }, s, i), ae = ({ fn: e, batch: t, priority: n, safe: r = 0, filter: i = 0, pure: s = 0 }) => st("compute", { fn: e, safe: r, filter: i, pure: s }, n, t), je = ({ fn: e }) => ae({ fn: e, priority: "effect" }), F = (e, t, n) => ae({ fn: e, safe: 1, filter: t, priority: n && "effect" }), Ft = (e, t, n) => ye({ store: e, to: t ? ne : "a", priority: n && "sampler", batch: 1 }), q = (e = ze, t) => ae({ fn: e, pure: 1, filter: t }), Kt = { mov: ye, compute: ae, filter: ({ fn: e, pure: t }) => ae({ fn: e, filter: 1, pure: t }), run: je }, Ut = (e) => ({ id: ut(), current: e }), ct = ({ current: e }) => e, Yt = (e, t) => {
+  e.before || (e.before = []), D(e.before, t);
 }, W = null;
@@ -274,4 +274,4 @@ const qe = (e, t) => {
 for (; Je < 6; )
-  M(We, { first: null, last: null, size: 0 }), Je += 1;
-const Ut = () => {
+  D(We, { first: null, last: null, size: 0 }), Je += 1;
+const Jt = () => {
   for (let e = 0; e < 6; e++) {
@@ -290,5 +290,5 @@ let t = We[e];
   }
-}, N = (e, t, n, r, a, s, o) => De(0, { a: null, b: null, node: n, parent: r, value: a, page: t, scope: s, meta: o }, e), De = (e, t, n, r = 0) => {
-  let a = Te(n), s = We[a], o = { v: { idx: e, stack: t, type: n, id: r }, l: null, r: null };
-  a === 3 || a === 4 ? W = qe(W, o) : (s.size === 0 ? s.first = o : s.last.r = o, s.last = o), s.size += 1;
+}, $ = (e, t, n, r, i, s, o) => Me(0, { a: null, b: null, node: n, parent: r, value: i, page: t, scope: s, meta: o }, e), Me = (e, t, n, r = 0) => {
+  let i = Te(n), s = We[i], o = { v: { idx: e, stack: t, type: n, id: r }, l: null, r: null };
+  i === 3 || i === 4 ? W = qe(W, o) : (s.size === 0 ? s.first = o : s.last.r = o, s.last = o), s.size += 1;
 }, Te = (e) => {
@@ -312,6 +312,6 @@ switch (e) {
 }, Ae = /* @__PURE__ */ new Set();
-let b, se = 1, fe = 0, de = 0, D = null, Yt = (e) => {
+let b, se = 1, fe = 0, de = 0, M = null, Qt = (e) => {
   b = e;
 }, Qe = (e) => {
-  D = e;
+  M = e;
 };
@@ -321,3 +321,3 @@ const ft = (e, t) => {
     for (; e && !e.reg[t]; )
-      e = B(e);
+      e = P(e);
     if (e)
@@ -328,8 +328,8 @@ return e;
 };
-let Jt = (e, t, n, r, a) => {
+let Xt = (e, t, n, r, i) => {
   let s = ft(e, r.id);
-  return s ? s.reg[r.id] : t ? (K(t, r, a), t.reg[r.id]) : r;
+  return s ? s.reg[r.id] : t ? (K(t, r, i), t.reg[r.id]) : r;
 };
-const Qt = (e) => e;
-let K = (e, t, n, r, a) => {
+const Zt = (e) => e;
+let K = (e, t, n, r, i) => {
   var s;
@@ -341,4 +341,4 @@ let o = e.reg, m = t.sid, y = t == null || (s = t.meta) === null || s === void 0 ? void 0 : s.serialize;
   if (m && m in e.sidValuesMap && !(m in e.sidIdMap))
-    p.current = (e.fromSerialize && y !== "ignore" && (y == null ? void 0 : y.read) || Qt)(e.sidValuesMap[m]);
-  else if (t.before && !a) {
+    p.current = (e.fromSerialize && y !== "ignore" && (y == null ? void 0 : y.read) || Zt)(e.sidValuesMap[m]);
+  else if (t.before && !i) {
     let S = 0, c = n || !t.noInit || r;
@@ -348,7 +348,7 @@ k(t.before, (d) => {
         case re: {
-          let i = d.from;
-          if (i || d.fn) {
-            i && K(e, i, n, r);
-            let u = i && o[i.id].current;
-            c && (p.current = d.fn ? d.fn(u) : u);
+          let u = d.from;
+          if (u || d.fn) {
+            u && K(e, u, n, r);
+            let a = u && o[u.id].current;
+            c && (p.current = d.fn ? d.fn(a) : a);
           }
@@ -364,3 +364,3 @@ break;
 };
-const Xt = (e, t, n) => {
+const er = (e, t, n) => {
   try {
@@ -372,3 +372,3 @@ return t(Z(n), e.scope, n);
 };
-let U = (e, t = {}) => (z(e) && (U(e.or, t), xt(e, (n, r) => {
+let U = (e, t = {}) => (z(e) && (U(e.or, t), Vt(e, (n, r) => {
   j(n) || r === "or" || r === "and" || (t[r] = n);
@@ -381,11 +381,11 @@ }), U(e.and, t)), t);
   e.next.length = 0, e.seq.length = 0, e.scope = null;
-  let a = _e(e);
-  for (; r = a.pop(); )
+  let i = _e(e);
+  for (; r = i.pop(); )
     Xe(r, e), (t || n && x(e, "op") !== "sample" || r.family.type === "crosslink") && Ce(r, t, x(r, "op") !== "on" && n);
-  for (a = Se(e); r = a.pop(); )
+  for (i = Se(e); r = i.pop(); )
     Xe(r, e), n && r.family.type === "crosslink" && Ce(r, t, x(r, "op") !== "on" && n);
 }, Q = (e) => e.clear();
-let Pe = (e, { deep: t } = {}) => {
+let Ie = (e, { deep: t } = {}) => {
   let n = 0;
-  if (e.ownerSet && e.ownerSet.delete(e), $e(e))
+  if (e.ownerSet && e.ownerSet.delete(e), Be(e))
     Q(me(e));
@@ -399,22 +399,22 @@ else if (it(e)) {
 }, dt = (e) => {
-  let t = () => Pe(e);
+  let t = () => Ie(e);
   return t.unsubscribe = t, t;
-}, Ge = (e, t, n, r, a) => H({ node: n, parent: e, child: t, scope: { fn: a }, meta: { op: r }, family: { owners: [e, t], links: t }, regional: 1 }), pt = (e, t) => (I(V(t), ".watch argument should be a function"), dt(H({ scope: { fn: t }, node: [je({ fn: ze })], parent: e, meta: { op: "watch" }, family: { owners: e }, regional: 1 }))), Zt = (e, t, n = "event") => {
-  B(e) && B(e).hooks[n](t);
+}, Ge = (e, t, n, r, i) => N({ node: n, parent: e, child: t, scope: { fn: i }, meta: { op: r }, family: { owners: [e, t], links: t }, regional: 1 }), pt = (e, t) => (H(V(t), ".watch argument should be a function"), dt(N({ scope: { fn: t }, node: [je({ fn: ze })], parent: e, meta: { op: "watch" }, family: { owners: e }, regional: 1 }))), tr = (e, t, n = "event") => {
+  P(e) && P(e).hooks[n](t);
 }, vt = (e, t, n) => {
-  let r = U(n), a = e === "domain", s = It(), { sid: o = null, named: m = null, domain: y = null, parent: p = y } = r, S = m || r.name || (a ? "" : s), c = kt(S, p), d = { op: t.kind = e, name: t.shortName = S, sid: t.sid = $t(o), named: m, unitId: t.id = s, serialize: r.serialize, derived: r.derived, config: r };
-  return t.parent = p, t.compositeName = c, t.defaultConfig = r, t.thru = (i) => (oe(0, "thru", "js pipe"), i(t)), t.getType = () => c.fullName, !a && (t.subscribe = (i) => (Bt(i), t.watch(V(i) ? i : (u) => i.next && i.next(u))), t[Mt] = () => t), d;
+  let r = U(n), i = e === "domain", s = $t(), { sid: o = null, named: m = null, domain: y = null, parent: p = y } = r, S = m || r.name || (i ? "" : s), c = Dt(S, p), d = { op: t.kind = e, name: t.shortName = S, sid: t.sid = zt(o), named: m, unitId: t.id = s, serialize: r.serialize, derived: r.derived, config: r };
+  return t.parent = p, t.compositeName = c, t.defaultConfig = r, t.thru = (u) => (oe(0, "thru", "js pipe"), u(t)), t.getType = () => c.fullName, !i && (t.subscribe = (u) => (jt(u), t.watch(V(u) ? u : (a) => u.next && u.next(a))), t[Tt] = () => t), d;
 };
 const Le = (e, t, n, r) => {
-  let a;
-  z(n) && (a = n, n = n.fn);
-  let s = A({ name: `${e.shortName} → *`, derived: 1, and: a });
+  let i;
+  z(n) && (i = n, n = n.fn);
+  let s = A({ name: `${e.shortName} → *`, derived: 1, and: i });
   return Ge(e, s, r, t, n), s;
-}, mt = (e, t, n, r, a) => {
+}, mt = (e, t, n, r, i) => {
   let s = ve(t), o = ye({ store: s, to: "a", priority: "read" });
   n === re && (o.data.softRead = 1);
   let m = [o, q(r)];
-  return X("storeOnMap", s, m, $e(e) && ve(e)), Ge(e, t, m, n, a);
+  return X("storeOnMap", s, m, Be(e) && ve(e)), Ge(e, t, m, n, i);
 };
-let er = (e, t, n) => {
+let rr = (e, t, n) => {
   try {
@@ -425,13 +425,13 @@ return [1, e(...n)];
   }
-}, tr = (e) => {
-  let t = P(e), n = { ref: t };
-  return t && M(t.activeEffects, n), n;
-}, Ze = (e, t, n, r, a, s) => (o) => {
-  s.ref && ce(s.ref.activeEffects, s), te({ target: [r, rr], params: [n ? { status: "done", params: e, result: o } : { status: "fail", params: e, error: o }, { value: o, fn: n ? t.rs : t.rj }], defer: 1, page: a.page, scope: s.ref, meta: a.meta });
+}, nr = (e) => {
+  let t = I(e), n = { ref: t };
+  return t && D(t.activeEffects, n), n;
+}, Ze = (e, t, n, r, i, s) => (o) => {
+  s.ref && ce(s.ref.activeEffects, s), te({ target: [r, or], params: [n ? { status: "done", params: e, result: o } : { status: "fail", params: e, error: o }, { value: o, fn: n ? t.rs : t.rj }], defer: 1, page: i.page, scope: s.ref, meta: i.meta });
 };
-const rr = H({ node: [je({ fn: ({ fn: e, value: t }) => e(t) })], meta: { op: "fx", fx: "sidechain" } }), Lr = at(() => {
+const or = N({ node: [je({ fn: ({ fn: e, value: t }) => e(t) })], meta: { op: "fx", fx: "sidechain" } }), Lr = at(() => {
   window.isBackFromBrowser = !1, window.history.back();
 }), ht = at((e) => {
   window.history.pushState(e, "");
-}), nr = A(), or = A(), ar = A(), ir = A(), St = A(), _t = A(), Ie = A(), lr = he({
+}), ar = A(), ir = A(), St = A(), _t = A(), gt = A(), yt = A(), He = A(), ur = he({
   activeView: null,
@@ -443,28 +443,26 @@ activePanel: null,
   isBackHandled: !0
-}).on(nr, (e, t) => ({
+}).on(ar, (e, t) => ({
   ...e,
   activeView: t
-})).on(or, (e, t) => ({
+})).on(ir, (e, t) => ({
   ...e,
   activePanel: t
-})).on(ar, (e, t) => ({
+})).on(_t, (e, t) => ({
   ...e,
   activeModal: t
-})).on(ir, (e, t) => ({
+})).on(gt, (e, t) => ({
   ...e,
   activePopout: t
-})).on(_t, (e) => ({
+})).on(yt, (e) => ({
   ...e,
   isRouteInit: !0
-})).on(St, (e, t) => ({
+})).on(St, (e, { view: t, panel: n }) => ({
   ...e,
-  activeView: t.hasOwnProperty("view") ? t.view : e.activeView,
-  activePanel: t.hasOwnProperty("panel") ? t.panel : e.activePanel,
-  activeModal: t.hasOwnProperty("modal") ? t.modal : e.activeModal,
-  activePopout: t.hasOwnProperty("popout") ? t.popout : e.activePopout
-})).on(Ie, (e, t) => ({
+  activeView: t,
+  activePanel: n
+})).on(He, (e, t) => ({
   ...e,
   isBackHandled: t
 }));
-function ur(e) {
+function lr(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
@@ -505,12 +503,12 @@ }
   }
-  var n = typeof Object.is == "function" ? Object.is : t, r = e.useState, a = e.useEffect, s = e.useLayoutEffect, o = e.useDebugValue;
+  var n = typeof Object.is == "function" ? Object.is : t, r = e.useState, i = e.useEffect, s = e.useLayoutEffect, o = e.useDebugValue;
   function m(c, d) {
-    var i = d(), u = r({ inst: { value: i, getSnapshot: d } }), l = u[0].inst, f = u[1];
+    var u = d(), a = r({ inst: { value: u, getSnapshot: d } }), l = a[0].inst, f = a[1];
     return s(function() {
-      l.value = i, l.getSnapshot = d, y(l) && f({ inst: l });
-    }, [c, i, d]), a(function() {
+      l.value = u, l.getSnapshot = d, y(l) && f({ inst: l });
+    }, [c, u, d]), i(function() {
       return y(l) && f({ inst: l }), c(function() {
         y(l) && f({ inst: l });
       });
-    }, [c]), o(i), i;
+    }, [c]), o(u), u;
   }
@@ -521,4 +519,4 @@ function y(c) {
     try {
-      var i = d();
-      return !n(c, i);
+      var u = d();
+      return !n(c, u);
     } catch {
@@ -566,6 +564,6 @@ return !0;
     }
-    function a(g, v) {
+    function i(g, v) {
       return g === v && (g !== 0 || 1 / g === 1 / v) || g !== g && v !== v;
     }
-    var s = typeof Object.is == "function" ? Object.is : a, o = e.useState, m = e.useEffect, y = e.useLayoutEffect, p = e.useDebugValue, S = !1, c = !1;
+    var s = typeof Object.is == "function" ? Object.is : i, o = e.useState, m = e.useEffect, y = e.useLayoutEffect, p = e.useDebugValue, S = !1, c = !1;
     function d(g, v, w) {
@@ -585,11 +583,11 @@ S || e.startTransition !== void 0 && (S = !0, n("You are using an outdated, pre-release alpha of React 18 that does not support useSyncExternalStore. The use-sync-external-store shim will not work correctly. Upgrade to a newer pre-release."));
       return y(function() {
-        L.value = h, L.getSnapshot = v, i(L) && Y({
+        L.value = h, L.getSnapshot = v, u(L) && Y({
           inst: L
         });
       }, [g, h, v]), m(function() {
-        i(L) && Y({
+        u(L) && Y({
           inst: L
         });
         var we = function() {
-          i(L) && Y({
+          u(L) && Y({
             inst: L
@@ -601,3 +599,3 @@ });
     }
-    function i(g) {
+    function u(g) {
       var v = g.getSnapshot, w = g.value;
@@ -611,6 +609,6 @@ try {
     }
-    function u(g, v, w) {
+    function a(g, v, w) {
       return v();
     }
-    var l = typeof window < "u" && typeof window.document < "u" && typeof window.document.createElement < "u", f = !l, O = f ? u : d, R = e.useSyncExternalStore !== void 0 ? e.useSyncExternalStore : O;
+    var l = typeof window < "u" && typeof window.document < "u" && typeof window.document.createElement < "u", f = !l, O = f ? a : d, R = e.useSyncExternalStore !== void 0 ? e.useSyncExternalStore : O;
     Ve.useSyncExternalStore = R, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error());
@@ -622,3 +620,3 @@ }()), Ve;
 })(cr);
-const pr = /* @__PURE__ */ ur(ie);
+const pr = /* @__PURE__ */ lr(ie);
 /**
@@ -642,16 +640,16 @@ * @license React
   }
-  var r = typeof Object.is == "function" ? Object.is : n, a = t.useSyncExternalStore, s = e.useRef, o = e.useEffect, m = e.useMemo, y = e.useDebugValue;
-  return xe.useSyncExternalStoreWithSelector = function(p, S, c, d, i) {
-    var u = s(null);
-    if (u.current === null) {
+  var r = typeof Object.is == "function" ? Object.is : n, i = t.useSyncExternalStore, s = e.useRef, o = e.useEffect, m = e.useMemo, y = e.useDebugValue;
+  return xe.useSyncExternalStoreWithSelector = function(p, S, c, d, u) {
+    var a = s(null);
+    if (a.current === null) {
       var l = { hasValue: !1, value: null };
-      u.current = l;
+      a.current = l;
     } else
-      l = u.current;
-    u = m(function() {
+      l = a.current;
+    a = m(function() {
       function O(h) {
         if (!R) {
-          if (R = !0, g = h, h = d(h), i !== void 0 && l.hasValue) {
+          if (R = !0, g = h, h = d(h), u !== void 0 && l.hasValue) {
             var _ = l.value;
-            if (i(_, h))
+            if (u(_, h))
               return v = _;
@@ -664,3 +662,3 @@ }
         var E = d(h);
-        return i !== void 0 && i(_, E) ? _ : (g = h, v = E);
+        return u !== void 0 && u(_, E) ? _ : (g = h, v = E);
       }
@@ -673,4 +671,4 @@ var R = !1, g, v, w = c === void 0 ? null : c;
       }];
-    }, [S, c, d, i]);
-    var f = a(p, u[0], u[1]);
+    }, [S, c, d, u]);
+    var f = i(p, a[0], a[1]);
     return o(function() {
@@ -681,3 +679,3 @@ l.hasValue = !0, l.value = f;
 }
-var Me = {};
+var De = {};
 /**
@@ -700,4 +698,4 @@ * @license React
     }
-    var r = typeof Object.is == "function" ? Object.is : n, a = t.useSyncExternalStore, s = e.useRef, o = e.useEffect, m = e.useMemo, y = e.useDebugValue;
-    function p(S, c, d, i, u) {
+    var r = typeof Object.is == "function" ? Object.is : n, i = t.useSyncExternalStore, s = e.useRef, o = e.useEffect, m = e.useMemo, y = e.useDebugValue;
+    function p(S, c, d, u, a) {
       var l = s(null), f;
@@ -712,6 +710,6 @@ l.current === null ? (f = {
             w = !0, h = J;
-            var Ee = i(J);
-            if (u !== void 0 && f.hasValue) {
+            var Ee = u(J);
+            if (a !== void 0 && f.hasValue) {
               var Oe = f.value;
-              if (u(Oe, Ee))
+              if (a(Oe, Ee))
                 return _ = Oe, Oe;
@@ -721,7 +719,7 @@ }
           }
-          var Lt = h, Re = _;
-          if (r(Lt, J))
+          var kt = h, Re = _;
+          if (r(kt, J))
             return Re;
-          var be = i(J);
-          return u !== void 0 && u(Re, be) ? Re : (h = J, _ = be, be);
+          var be = u(J);
+          return a !== void 0 && a(Re, be) ? Re : (h = J, _ = be, be);
         }, L = d === void 0 ? null : d, Y = function() {
@@ -733,3 +731,3 @@ return E(c());
         return [Y, we];
-      }, [c, d, i, u]), R = O[0], g = O[1], v = a(S, R, g);
+      }, [c, d, u, a]), R = O[0], g = O[1], v = i(S, R, g);
       return o(function() {
@@ -739,4 +737,4 @@ f.hasValue = !0, f.value = v;
     }
-    Me.useSyncExternalStoreWithSelector = p, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error());
-  }()), Me;
+    De.useSyncExternalStoreWithSelector = p, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error());
+  }()), De;
 }
@@ -747,14 +745,14 @@ (function(e) {
 function hr(e, t, n, r) {
-  let a = [Gt.run({ fn: (s) => t(s) })];
-  if (r && a.unshift(r), n) {
-    let s = H({ node: a }), o = e.graphite.id, m = n.additionalLinks, y = m[o] || [];
+  let i = [Kt.run({ fn: (s) => t(s) })];
+  if (r && i.unshift(r), n) {
+    let s = N({ node: i }), o = e.graphite.id, m = n.additionalLinks, y = m[o] || [];
     return m[o] = y, y.push(s), () => {
       let p = y.indexOf(s);
-      p !== -1 && y.splice(p, 1), Pe(s);
+      p !== -1 && y.splice(p, 1), Ie(s);
     };
   }
   {
-    let s = H({ node: a, parent: [e], family: { owners: e } });
+    let s = N({ node: i, parent: [e], family: { owners: e } });
     return () => {
-      Pe(s);
+      Ie(s);
     };
@@ -764,4 +762,4 @@ }
 function Sr(e, t) {
-  Pt.store(e) || yt("expect useStore argument to be a store");
-  let n = T.useCallback((a) => hr(e, a, t), [e, t]), r = T.useCallback(() => yr(e, t), [e, t]);
+  Nt.store(e) || Et("expect useStore argument to be a store");
+  let n = T.useCallback((i) => hr(e, i, t), [e, t]), r = T.useCallback(() => yr(e, t), [e, t]);
   return gr(n, r, r);
@@ -771,8 +769,8 @@ }
   let t = T.useContext(wr);
-  return e && !t && yt("No scope found, consider adding <Provider> to app root"), t;
+  return e && !t && Et("No scope found, consider adding <Provider> to app root"), t;
 }
-function gt(e, t) {
+function wt(e, t) {
   return Sr(e, _r(t == null ? void 0 : t.forceScope));
 }
-let yt = (e) => {
+let Et = (e) => {
   throw Error(e);
@@ -782,11 +780,11 @@ };
 const { useSyncExternalStore: gr } = pr, yr = (e, t) => t ? t.getState(e) : e.getState(), wr = T.createContext(null), Er = (e, t, n) => {
-  $(() => {
-    const r = (a) => {
-      a instanceof KeyboardEvent && a.key === n ? t(a) : n || t(a);
+  B(() => {
+    const r = (i) => {
+      i instanceof KeyboardEvent && i.key === n ? t(i) : n || t(i);
     };
     return window.addEventListener(e, r), () => window.removeEventListener(e, r);
   }, [e, n, t]);
-}, wt = A(), Et = A(), Or = A(), Ot = A(), Rt = A();
+}, Ot = A(), Rt = A(), Or = A(), bt = A(), At = A();
 A();
-const pe = A(), bt = A(), At = A(), He = A(), Rr = he({
+const pe = A(), Lt = A(), xt = A(), Ne = A(), Rr = he({
   isRoutesHandled: !0,
@@ -798,12 +796,12 @@ notHandledRoutes: [],
   virtualPopout: null
-}).on(wt, (e, t) => ({
+}).on(Ot, (e, t) => ({
   ...e,
   virtualView: t
-})).on(Et, (e, t) => ({
+})).on(Rt, (e, t) => ({
   ...e,
   virtualPanel: t
-})).on(Ot, (e, t) => ({
+})).on(bt, (e, t) => ({
   ...e,
   virtualModal: t
-})).on(Rt, (e, t) => ({
+})).on(At, (e, t) => ({
   ...e,
@@ -814,9 +812,9 @@ virtualPopout: t
   notHandledRoutes: [...e.notHandledRoutes, t]
-})).on(bt, (e, t) => ({
+})).on(Lt, (e, t) => ({
   ...e,
   notHandledRoutes: [t, ...e.notHandledRoutes]
-})).on(At, (e) => ({
+})).on(xt, (e) => ({
   ...e,
   notHandledRoutes: []
-})).on(He, (e, t) => ({
+})).on(Ne, (e, t) => ({
   ...e,
@@ -829,27 +827,27 @@ isRoutesHandled: t
 })), xr = (e, ...t) => {
-  const { activeView: n, activePanel: r, activeModal: a, activePopout: s, isRouteInit: o, isBackHandled: m } = br();
-  $(() => {
-    o || (wt(e.view), Et(e.panel), e.modal && Ot(e.modal), e.popout && Rt(e.popout));
+  const { activeView: n, activePanel: r, activeModal: i, activePopout: s, isRouteInit: o, isBackHandled: m } = br();
+  B(() => {
+    o || (Ot(e.view), Rt(e.panel), e.modal && bt(e.modal), e.popout && At(e.popout));
   }, [o, e.view, e.panel, e.modal, e.popout]);
-  const { virtualView: y, virtualPanel: p, virtualModal: S, virtualPopout: c, notHandledRoutes: d, isRoutesHandled: i } = gt(Rr);
-  $(() => {
+  const { virtualView: y, virtualPanel: p, virtualModal: S, virtualPopout: c, notHandledRoutes: d, isRoutesHandled: u } = wt(Rr);
+  B(() => {
     pe({ view: y, panel: p });
-  }, [y, p]), $(() => {
+  }, [y, p]), B(() => {
     pe({ modal: S });
-  }, [S]), $(() => {
+  }, [S]), B(() => {
     pe({ popout: c });
-  }, [c]), $(() => {
-    m && i && d.length > 0 && (He(!1), d.forEach((u) => {
-      St(u);
-    }), At(), He(!0), o || _t());
-  }, [m, o, d, i]), $(() => {
+  }, [c]), B(() => {
+    m && u && d.length > 0 && (console.log("routes quque", d), Ne(!1), d.forEach((a) => {
+      a.view && a.panel && St({ view: a.view, panel: a.panel }), a.modal && _t(a.modal), a.popout && gt(a.popout);
+    }), xt(), Ne(!0), o || yt());
+  }, [m, o, d, u]), B(() => {
     o && ht({
       view: n,
       panel: r,
-      modal: a,
+      modal: i,
       popout: s
     });
-  }, [n, r, a, s, o]), Er("popstate", async () => {
+  }, [n, r, i, s, o]), Er("popstate", async () => {
     o && (await (async () => {
-      Ie(!1);
+      He(!1);
       const { view: l, panel: f, modal: O, popout: R } = window.history.state ?? {
@@ -861,3 +859,3 @@ view: void 0,
       };
-      console.log("prevRoutes", l, f, O, R), console.log("storeRoutes", n, r, a, s);
+      console.log("prevRoutes", l, f, O, R), console.log("storeRoutes", n, r, i, s);
       for (const g in t)
@@ -867,16 +865,15 @@ if (!await t[g]({
           panel: r,
-          modal: a,
+          modal: i,
           popout: s
         }, { view: l, panel: f, modal: O, popout: R }))
           return;
-      bt({ view: l, panel: f, modal: O, popout: R }), Ie(!0);
+      Lt({ view: l, panel: f, modal: O, popout: R }), He(!0);
     })(), window.isBackFromBrowser = !0);
   });
-}, br = () => gt(lr), kr = (e) => e, Vr = (e, t) => (n, r) => ["view", "panel", "modal", "popout"].some((s) => n[s] === e && n[s] !== r[s]) && window.isBackFromBrowser ? (t && t(n, r), ht(n), !1) : !0;
+}, br = () => wt(ur), kr = (e) => e, Vr = (e, t) => (n, r) => ["view", "panel", "modal", "popout"].some((s) => n[s] === e && n[s] !== r[s]) && window.isBackFromBrowser ? (t && t(n, r), ht(n), !1) : !0;
 export {
-  ar as _setActiveModal,
-  or as _setActivePanel,
-  ir as _setActivePopout,
-  nr as _setActiveView,
-  St as _setRoutes,
+  _t as _setActiveModal,
+  ir as _setActivePanel,
+  gt as _setActivePopout,
+  ar as _setActiveView,
   Lr as back,
@@ -886,6 +883,6 @@ Vr as createDisableBackBrowserRouteMiddleware,
   ht as historyPush,
-  Ot as setActiveModal,
-  Et as setActivePanel,
-  Rt as setActivePopout,
-  wt as setActiveView,
+  bt as setActiveModal,
+  Rt as setActivePanel,
+  At as setActivePopout,
+  Ot as setActiveView,
   Or as setActiveViewPanel,
@@ -892,0 +889,0 @@ xr as useInitRouter,

dist/router/event.d.ts

@@ -1,8 +0,10 @@
-import { SetRoutes } from "src/types";
 export declare const _setActiveView: import("effector").Event<string>;
 export declare const _setActivePanel: import("effector").Event<string>;
+export declare const _setActiveViewPanel: import("effector").Event<{
+    view: string;
+    panel: string;
+}>;
 export declare const _setActiveModal: import("effector").Event<string | null>;
 export declare const _setActivePopout: import("effector").Event<string | null>;
-export declare const _setRoutes: import("effector").Event<SetRoutes>;
 export declare const initRoute: import("effector").Event<void>;
 export declare const setBackHandled: import("effector").Event<boolean>;

package.json

 {
   "name": "@blumjs/router",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "",
@@ -5,0 +5,0 @@ "exports": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

63720

decreased by-0.35%

Lines of code

1060

decreased by-0.19%

No dependency changes