@noego/forge 0.1.27 → 0.1.28

package/dist/client.mjs

@@ -47,24 +47,24 @@ function ut(e, t, r, n) {
     });
   }
   return new (r || (r = Promise))(function(o, a) {
-    function u(l) {
+    function c(l) {
       try {
-        c(n.next(l));
+        s(n.next(l));
       } catch (p) {
         a(p);
       }
     }
-    function s(l) {
+    function u(l) {
       try {
-        c(n.throw(l));
+        s(n.throw(l));
       } catch (p) {
         a(p);
       }
     }
-    function c(l) {
-      l.done ? o(l.value) : i(l.value).then(u, s);
+    function s(l) {
+      l.done ? o(l.value) : i(l.value).then(c, u);
     }
-    c((n = n.apply(e, t || [])).next());
+    s((n = n.apply(e, t || [])).next());
   });
 }
 function je(e, t) {
@@ -72,59 +72,59 @@ function je(e, t) {
     if (o[0] & 1) throw o[1];
     return o[1];
   }, trys: [], ops: [] }, n, i, o, a = Object.create((typeof Iterator == "function" ? Iterator : Object).prototype);
-  return a.next = u(0), a.throw = u(1), a.return = u(2), typeof Symbol == "function" && (a[Symbol.iterator] = function() {
+  return a.next = c(0), a.throw = c(1), a.return = c(2), typeof Symbol == "function" && (a[Symbol.iterator] = function() {
     return this;
   }), a;
-  function u(c) {
+  function c(s) {
     return function(l) {
-      return s([c, l]);
+      return u([s, l]);
     };
   }
-  function s(c) {
+  function u(s) {
     if (n) throw new TypeError("Generator is already executing.");
-    for (; a && (a = 0, c[0] && (r = 0)), r; ) try {
-      if (n = 1, i && (o = c[0] & 2 ? i.return : c[0] ? i.throw || ((o = i.return) && o.call(i), 0) : i.next) && !(o = o.call(i, c[1])).done) return o;
-      switch (i = 0, o && (c = [c[0] & 2, o.value]), c[0]) {
+    for (; a && (a = 0, s[0] && (r = 0)), r; ) try {
+      if (n = 1, i && (o = s[0] & 2 ? i.return : s[0] ? i.throw || ((o = i.return) && o.call(i), 0) : i.next) && !(o = o.call(i, s[1])).done) return o;
+      switch (i = 0, o && (s = [s[0] & 2, o.value]), s[0]) {
         case 0:
         case 1:
-          o = c;
+          o = s;
           break;
         case 4:
-          return r.label++, { value: c[1], done: !1 };
+          return r.label++, { value: s[1], done: !1 };
         case 5:
-          r.label++, i = c[1], c = [0];
+          r.label++, i = s[1], s = [0];
           continue;
         case 7:
-          c = r.ops.pop(), r.trys.pop();
+          s = r.ops.pop(), r.trys.pop();
           continue;
         default:
-          if (o = r.trys, !(o = o.length > 0 && o[o.length - 1]) && (c[0] === 6 || c[0] === 2)) {
+          if (o = r.trys, !(o = o.length > 0 && o[o.length - 1]) && (s[0] === 6 || s[0] === 2)) {
             r = 0;
             continue;
           }
-          if (c[0] === 3 && (!o || c[1] > o[0] && c[1] < o[3])) {
-            r.label = c[1];
+          if (s[0] === 3 && (!o || s[1] > o[0] && s[1] < o[3])) {
+            r.label = s[1];
             break;
           }
-          if (c[0] === 6 && r.label < o[1]) {
-            r.label = o[1], o = c;
+          if (s[0] === 6 && r.label < o[1]) {
+            r.label = o[1], o = s;
             break;
           }
           if (o && r.label < o[2]) {
-            r.label = o[2], r.ops.push(c);
+            r.label = o[2], r.ops.push(s);
             break;
           }
           o[2] && r.ops.pop(), r.trys.pop();
           continue;
       }
-      c = t.call(e, r);
+      s = t.call(e, r);
     } catch (l) {
-      c = [6, l], i = 0;
+      s = [6, l], i = 0;
     } finally {
       n = o = 0;
     }
-    if (c[0] & 5) throw c[1];
-    return { value: c[0] ? c[1] : void 0, done: !0 };
+    if (s[0] & 5) throw s[1];
+    return { value: s[0] ? s[1] : void 0, done: !0 };
   }
 }
 function q(e) {
@@ -143,8 +143,8 @@ function z(e, t) {
   var n = r.call(e), i, o = [], a;
   try {
     for (; (t === void 0 || t-- > 0) && !(i = n.next()).done; ) o.push(i.value);
-  } catch (u) {
-    a = { error: u };
+  } catch (c) {
+    a = { error: c };
   } finally {
     try {
       i && !i.done && (r = n.return) && r.call(n);
@@ -165,7 +165,7 @@ function W(e) {
 function ct(e, t, r) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
   var n = r.apply(e, t || []), i, o = [];
-  return i = Object.create((typeof AsyncIterator == "function" ? AsyncIterator : Object).prototype), u("next"), u("throw"), u("return", a), i[Symbol.asyncIterator] = function() {
+  return i = Object.create((typeof AsyncIterator == "function" ? AsyncIterator : Object).prototype), c("next"), c("throw"), c("return", a), i[Symbol.asyncIterator] = function() {
     return this;
   }, i;
   function a(d) {
@@ -173,31 +173,31 @@ function ct(e, t, r) {
       return Promise.resolve(v).then(d, p);
     };
   }
-  function u(d, v) {
+  function c(d, v) {
     n[d] && (i[d] = function(f) {
-      return new Promise(function(S, w) {
-        o.push([d, f, S, w]) > 1 || s(d, f);
+      return new Promise(function(S, _) {
+        o.push([d, f, S, _]) > 1 || u(d, f);
       });
     }, v && (i[d] = v(i[d])));
   }
-  function s(d, v) {
+  function u(d, v) {
     try {
-      c(n[d](v));
+      s(n[d](v));
     } catch (f) {
       h(o[0][3], f);
     }
   }
-  function c(d) {
+  function s(d) {
     d.value instanceof W ? Promise.resolve(d.value.v).then(l, p) : h(o[0][2], d);
   }
   function l(d) {
-    s("next", d);
+    u("next", d);
   }
   function p(d) {
-    s("throw", d);
+    u("throw", d);
   }
   function h(d, v) {
-    d(v), o.shift(), o.length && s(o[0][0], o[0][1]);
+    d(v), o.shift(), o.length && u(o[0][0], o[0][1]);
   }
 }
 function lt(e) {
@@ -208,18 +208,18 @@ function lt(e) {
   }, r);
   function n(o) {
     r[o] = e[o] && function(a) {
-      return new Promise(function(u, s) {
-        a = e[o](a), i(u, s, a.done, a.value);
+      return new Promise(function(c, u) {
+        a = e[o](a), i(c, u, a.done, a.value);
       });
     };
   }
-  function i(o, a, u, s) {
-    Promise.resolve(s).then(function(c) {
-      o({ value: c, done: u });
+  function i(o, a, c, u) {
+    Promise.resolve(u).then(function(s) {
+      o({ value: s, done: c });
     }, a);
   }
 }
-function b(e) {
+function w(e) {
   return typeof e == "function";
 }
 function me(e) {
@@ -255,15 +255,15 @@ var te = (function() {
       if (a)
         if (this._parentage = null, Array.isArray(a))
           try {
-            for (var u = q(a), s = u.next(); !s.done; s = u.next()) {
-              var c = s.value;
-              c.remove(this);
+            for (var c = q(a), u = c.next(); !u.done; u = c.next()) {
+              var s = u.value;
+              s.remove(this);
             }
           } catch (f) {
             t = { error: f };
           } finally {
             try {
-              s && !s.done && (r = u.return) && r.call(u);
+              u && !u.done && (r = c.return) && r.call(c);
             } finally {
               if (t) throw t.error;
             }
@@ -271,7 +271,7 @@ var te = (function() {
         else
           a.remove(this);
       var l = this.initialTeardown;
-      if (b(l))
+      if (w(l))
         try {
           l();
         } catch (f) {
@@ -333,10 +333,10 @@ var te = (function() {
   })(), e;
 })(), Le = te.EMPTY;
 function Ne(e) {
-  return e instanceof te || e && "closed" in e && b(e.remove) && b(e.add) && b(e.unsubscribe);
+  return e instanceof te || e && "closed" in e && w(e.remove) && w(e.add) && w(e.unsubscribe);
 }
 function Ee(e) {
-  b(e) ? e() : e.unsubscribe();
+  w(e) ? e() : e.unsubscribe();
 }
 var ft = {
   Promise: void 0
@@ -427,7 +427,7 @@ var ye = (function(e) {
   G(t, e);
   function t(r, n, i) {
     var o = e.call(this) || this, a;
-    return b(r) || !r ? a = {
+    return w(r) || !r ? a = {
       next: r ?? void 0,
       error: n ?? void 0,
       complete: i ?? void 0
@@ -469,8 +469,8 @@ var x = (function() {
   }, e.prototype.subscribe = function(t, r, n) {
     var i = this, o = bt(t) ? t : new B(t, r, n);
     return Z(function() {
-      var a = i, u = a.operator, s = a.source;
-      o.add(u ? u.call(o, s) : s ? i._subscribe(o) : i._trySubscribe(o));
+      var a = i, c = a.operator, u = a.source;
+      o.add(c ? c.call(o, u) : u ? i._subscribe(o) : i._trySubscribe(o));
     }), o;
   }, e.prototype._trySubscribe = function(t) {
     try {
@@ -482,11 +482,11 @@ var x = (function() {
     var n = this;
     return r = xe(r), new r(function(i, o) {
       var a = new B({
-        next: function(u) {
+        next: function(c) {
           try {
-            t(u);
-          } catch (s) {
-            o(s), a.unsubscribe();
+            t(c);
+          } catch (u) {
+            o(u), a.unsubscribe();
           }
         },
         error: o,
@@ -524,13 +524,13 @@ function xe(e) {
   return (t = e ?? ft.Promise) !== null && t !== void 0 ? t : Promise;
 }
 function yt(e) {
-  return e && b(e.next) && b(e.error) && b(e.complete);
+  return e && w(e.next) && w(e.error) && w(e.complete);
 }
 function bt(e) {
   return e && e instanceof ye || yt(e) && Ne(e);
 }
 function wt(e) {
-  return b(e == null ? void 0 : e.lift);
+  return w(e == null ? void 0 : e.lift);
 }
 function j(e) {
   return function(t) {
@@ -550,31 +550,31 @@ function C(e, t, r, n, i) {
 }
 var gt = (function(e) {
   G(t, e);
-  function t(r, n, i, o, a, u) {
-    var s = e.call(this, r) || this;
-    return s.onFinalize = a, s.shouldUnsubscribe = u, s._next = n ? function(c) {
+  function t(r, n, i, o, a, c) {
+    var u = e.call(this, r) || this;
+    return u.onFinalize = a, u.shouldUnsubscribe = c, u._next = n ? function(s) {
       try {
-        n(c);
+        n(s);
       } catch (l) {
         r.error(l);
       }
-    } : e.prototype._next, s._error = o ? function(c) {
+    } : e.prototype._next, u._error = o ? function(s) {
       try {
-        o(c);
+        o(s);
       } catch (l) {
         r.error(l);
       } finally {
         this.unsubscribe();
       }
-    } : e.prototype._error, s._complete = i ? function() {
+    } : e.prototype._error, u._complete = i ? function() {
       try {
         i();
-      } catch (c) {
-        r.error(c);
+      } catch (s) {
+        r.error(s);
       } finally {
         this.unsubscribe();
       }
-    } : e.prototype._complete, s;
+    } : e.prototype._complete, u;
   }
   return t.prototype.unsubscribe = function() {
     var r;
@@ -606,15 +606,15 @@ var gt = (function(e) {
       if (n._throwIfClosed(), !n.isStopped) {
         n.currentObservers || (n.currentObservers = Array.from(n.observers));
         try {
-          for (var a = q(n.currentObservers), u = a.next(); !u.done; u = a.next()) {
-            var s = u.value;
-            s.next(r);
+          for (var a = q(n.currentObservers), c = a.next(); !c.done; c = a.next()) {
+            var u = c.value;
+            u.next(r);
           }
-        } catch (c) {
-          i = { error: c };
+        } catch (s) {
+          i = { error: s };
         } finally {
           try {
-            u && !u.done && (o = a.return) && o.call(a);
+            c && !c.done && (o = a.return) && o.call(a);
           } finally {
             if (i) throw i.error;
           }
@@ -653,9 +653,9 @@ var gt = (function(e) {
   }, t.prototype._subscribe = function(r) {
     return this._throwIfClosed(), this._checkFinalizedStatuses(r), this._innerSubscribe(r);
   }, t.prototype._innerSubscribe = function(r) {
-    var n = this, i = this, o = i.hasError, a = i.isStopped, u = i.observers;
-    return o || a ? Le : (this.currentObservers = null, u.push(r), new te(function() {
-      n.currentObservers = null, de(u, r);
+    var n = this, i = this, o = i.hasError, a = i.isStopped, c = i.observers;
+    return o || a ? Le : (this.currentObservers = null, c.push(r), new te(function() {
+      n.currentObservers = null, de(c, r);
     }));
   }, t.prototype._checkFinalizedStatuses = function(r) {
     var n = this, i = n.hasError, o = n.thrownError, a = n.isStopped;
@@ -698,32 +698,32 @@ var gt = (function(e) {
     return o._bufferSize = r, o._windowTime = n, o._timestampProvider = i, o._buffer = [], o._infiniteTimeWindow = !0, o._infiniteTimeWindow = n === 1 / 0, o._bufferSize = Math.max(1, r), o._windowTime = Math.max(1, n), o;
   }
   return t.prototype.next = function(r) {
-    var n = this, i = n.isStopped, o = n._buffer, a = n._infiniteTimeWindow, u = n._timestampProvider, s = n._windowTime;
-    i || (o.push(r), !a && o.push(u.now() + s)), this._trimBuffer(), e.prototype.next.call(this, r);
+    var n = this, i = n.isStopped, o = n._buffer, a = n._infiniteTimeWindow, c = n._timestampProvider, u = n._windowTime;
+    i || (o.push(r), !a && o.push(c.now() + u)), this._trimBuffer(), e.prototype.next.call(this, r);
   }, t.prototype._subscribe = function(r) {
     this._throwIfClosed(), this._trimBuffer();
-    for (var n = this._innerSubscribe(r), i = this, o = i._infiniteTimeWindow, a = i._buffer, u = a.slice(), s = 0; s < u.length && !r.closed; s += o ? 1 : 2)
-      r.next(u[s]);
+    for (var n = this._innerSubscribe(r), i = this, o = i._infiniteTimeWindow, a = i._buffer, c = a.slice(), u = 0; u < c.length && !r.closed; u += o ? 1 : 2)
+      r.next(c[u]);
     return this._checkFinalizedStatuses(r), n;
   }, t.prototype._trimBuffer = function() {
-    var r = this, n = r._bufferSize, i = r._timestampProvider, o = r._buffer, a = r._infiniteTimeWindow, u = (a ? 1 : 2) * n;
-    if (n < 1 / 0 && u < o.length && o.splice(0, o.length - u), !a) {
-      for (var s = i.now(), c = 0, l = 1; l < o.length && o[l] <= s; l += 2)
-        c = l;
-      c && o.splice(0, c + 1);
+    var r = this, n = r._bufferSize, i = r._timestampProvider, o = r._buffer, a = r._infiniteTimeWindow, c = (a ? 1 : 2) * n;
+    if (n < 1 / 0 && c < o.length && o.splice(0, o.length - c), !a) {
+      for (var u = i.now(), s = 0, l = 1; l < o.length && o[l] <= u; l += 2)
+        s = l;
+      s && o.splice(0, s + 1);
     }
   }, t;
 })(re), ge = (function(e) {
   return e && typeof e.length == "number" && typeof e != "function";
 });
 function ke(e) {
-  return b(e == null ? void 0 : e.then);
+  return w(e == null ? void 0 : e.then);
 }
 function $e(e) {
-  return b(e[be]);
+  return w(e[be]);
 }
 function Me(e) {
-  return Symbol.asyncIterator && b(e == null ? void 0 : e[Symbol.asyncIterator]);
+  return Symbol.asyncIterator && w(e == null ? void 0 : e[Symbol.asyncIterator]);
 }
 function De(e) {
   return new TypeError("You provided " + (e !== null && typeof e == "object" ? "an invalid object" : "'" + e + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
@@ -733,7 +733,7 @@ function Et() {
 }
 var We = Et();
 function qe(e) {
-  return b(e == null ? void 0 : e[We]);
+  return w(e == null ? void 0 : e[We]);
 }
 function ze(e) {
   return ct(this, arguments, function() {
@@ -767,7 +767,7 @@ function ze(e) {
   });
 }
 function Be(e) {
-  return b(e == null ? void 0 : e.getReader);
+  return w(e == null ? void 0 : e.getReader);
 }
 function L(e) {
   if (e instanceof x)
@@ -791,7 +791,7 @@ function L(e) {
 function Ot(e) {
   return new x(function(t) {
     var r = e[be]();
-    if (b(r.subscribe))
+    if (w(r.subscribe))
       return r.subscribe(t);
     throw new TypeError("Provided object does not correctly implement Symbol.observable");
   });
@@ -821,8 +821,8 @@ function Tt(e) {
         if (t.next(a), t.closed)
           return;
       }
-    } catch (u) {
-      r = { error: u };
+    } catch (c) {
+      r = { error: c };
     } finally {
       try {
         o && !o.done && (n = i.return) && n.call(i);
@@ -846,28 +846,28 @@ function It(e) {
 function Pt(e, t) {
   var r, n, i, o;
   return ut(this, void 0, void 0, function() {
-    var a, u;
-    return je(this, function(s) {
-      switch (s.label) {
+    var a, c;
+    return je(this, function(u) {
+      switch (u.label) {
         case 0:
-          s.trys.push([0, 5, 6, 11]), r = lt(e), s.label = 1;
+          u.trys.push([0, 5, 6, 11]), r = lt(e), u.label = 1;
         case 1:
           return [4, r.next()];
         case 2:
-          if (n = s.sent(), !!n.done) return [3, 4];
+          if (n = u.sent(), !!n.done) return [3, 4];
           if (a = n.value, t.next(a), t.closed)
             return [2];
-          s.label = 3;
+          u.label = 3;
         case 3:
           return [3, 1];
         case 4:
           return [3, 11];
         case 5:
-          return u = s.sent(), i = { error: u }, [3, 11];
+          return c = u.sent(), i = { error: c }, [3, 11];
         case 6:
-          return s.trys.push([6, , 9, 10]), n && !n.done && (o = r.return) ? [4, o.call(r)] : [3, 8];
+          return u.trys.push([6, , 9, 10]), n && !n.done && (o = r.return) ? [4, o.call(r)] : [3, 8];
         case 7:
-          s.sent(), s.label = 8;
+          u.sent(), u.label = 8;
         case 8:
           return [3, 10];
         case 9:
@@ -935,14 +935,14 @@ function Lt(e, t) {
         var i, o, a;
         try {
           i = n.next(), o = i.value, a = i.done;
-        } catch (u) {
-          r.error(u);
+        } catch (c) {
+          r.error(c);
           return;
         }
         a ? r.complete() : r.next(o);
       }, 0, !0);
     }), function() {
-      return b(n == null ? void 0 : n.return) && n.return();
+      return w(n == null ? void 0 : n.return) && n.return();
     };
   });
 }
@@ -1019,27 +1019,27 @@ function Dt(e) {
     return Mt(e, t);
   });
 }
-function Wt(e, t, r, n, i, o, a, u) {
-  var s = [], c = 0, l = 0, p = !1, h = function() {
-    p && !s.length && !c && t.complete();
+function Wt(e, t, r, n, i, o, a, c) {
+  var u = [], s = 0, l = 0, p = !1, h = function() {
+    p && !u.length && !s && t.complete();
   }, d = function(f) {
-    return c < n ? v(f) : s.push(f);
+    return s < n ? v(f) : u.push(f);
   }, v = function(f) {
-    c++;
+    s++;
     var S = !1;
-    L(r(f, l++)).subscribe(C(t, function(w) {
-      t.next(w);
+    L(r(f, l++)).subscribe(C(t, function(_) {
+      t.next(_);
     }, function() {
       S = !0;
     }, void 0, function() {
       if (S)
         try {
-          c--;
-          for (var w = function() {
-            var g = s.shift();
+          s--;
+          for (var _ = function() {
+            var g = u.shift();
             a || v(g);
-          }; s.length && c < n; )
-            w();
+          }; u.length && s < n; )
+            _();
           h();
         } catch (g) {
           t.error(g);
@@ -1052,7 +1052,7 @@ function Wt(e, t, r, n, i, o, a, u) {
   };
 }
 function Ke(e, t, r) {
-  return r === void 0 && (r = 1 / 0), b(t) ? Ke(function(n, i) {
+  return r === void 0 && (r = 1 / 0), w(t) ? Ke(function(n, i) {
     return Se(function(o, a) {
       return t(n, o, i, a);
     })(L(e(n, i)));
@@ -1062,27 +1062,27 @@ function Ke(e, t, r) {
 }
 var qt = ["addListener", "removeListener"], zt = ["addEventListener", "removeEventListener"], Bt = ["on", "off"];
 function he(e, t, r, n) {
-  if (b(r) && (n = r, r = void 0), n)
+  if (w(r) && (n = r, r = void 0), n)
     return he(e, t, r).pipe(Dt(n));
-  var i = z(Ht(e) ? zt.map(function(u) {
-    return function(s) {
-      return e[u](t, s, r);
+  var i = z(Ht(e) ? zt.map(function(c) {
+    return function(u) {
+      return e[c](t, u, r);
     };
   }) : Gt(e) ? qt.map(Te(e, t)) : Vt(e) ? Bt.map(Te(e, t)) : [], 2), o = i[0], a = i[1];
   if (!o && ge(e))
-    return Ke(function(u) {
-      return he(u, t, r);
+    return Ke(function(c) {
+      return he(c, t, r);
     })(L(e));
   if (!o)
     throw new TypeError("Invalid event target");
-  return new x(function(u) {
-    var s = function() {
-      for (var c = [], l = 0; l < arguments.length; l++)
-        c[l] = arguments[l];
-      return u.next(1 < c.length ? c : c[0]);
+  return new x(function(c) {
+    var u = function() {
+      for (var s = [], l = 0; l < arguments.length; l++)
+        s[l] = arguments[l];
+      return c.next(1 < s.length ? s : s[0]);
     };
-    return o(s), function() {
-      return a(s);
+    return o(u), function() {
+      return a(u);
     };
   });
 }
@@ -1094,13 +1094,13 @@ function Te(e, t) {
   };
 }
 function Gt(e) {
-  return b(e.addListener) && b(e.removeListener);
+  return w(e.addListener) && w(e.removeListener);
 }
 function Vt(e) {
-  return b(e.on) && b(e.off);
+  return w(e.on) && w(e.off);
 }
 function Ht(e) {
-  return b(e.addEventListener) && b(e.removeEventListener);
+  return w(e.addEventListener) && w(e.removeEventListener);
 }
 function ae(e, t) {
   return j(function(r, n) {
@@ -1114,8 +1114,8 @@ function Yt(e, t) {
   return t === void 0 && (t = we), e = e ?? Jt, j(function(r, n) {
     var i, o = !0;
     r.subscribe(C(n, function(a) {
-      var u = t(a);
-      (o || !e(i, u)) && (o = !1, i = u, n.next(a));
+      var c = t(a);
+      (o || !e(i, c)) && (o = !1, i = c, n.next(a));
     }));
   });
 }
@@ -1126,33 +1126,33 @@ function Kt(e) {
   e === void 0 && (e = {});
   var t = e.connector, r = t === void 0 ? function() {
     return new re();
-  } : t, n = e.resetOnError, i = n === void 0 ? !0 : n, o = e.resetOnComplete, a = o === void 0 ? !0 : o, u = e.resetOnRefCountZero, s = u === void 0 ? !0 : u;
-  return function(c) {
+  } : t, n = e.resetOnError, i = n === void 0 ? !0 : n, o = e.resetOnComplete, a = o === void 0 ? !0 : o, c = e.resetOnRefCountZero, u = c === void 0 ? !0 : c;
+  return function(s) {
     var l, p, h, d = 0, v = !1, f = !1, S = function() {
       p == null || p.unsubscribe(), p = void 0;
-    }, w = function() {
+    }, _ = function() {
       S(), l = h = void 0, v = f = !1;
     }, g = function() {
-      var _ = l;
-      w(), _ == null || _.unsubscribe();
+      var b = l;
+      _(), b == null || b.unsubscribe();
     };
-    return j(function(_, T) {
+    return j(function(b, T) {
       d++, !f && !v && S();
       var I = h = h ?? r();
       T.add(function() {
-        d--, d === 0 && !f && !v && (p = se(g, s));
+        d--, d === 0 && !f && !v && (p = se(g, u));
       }), I.subscribe(T), !l && d > 0 && (l = new B({
         next: function(P) {
           return I.next(P);
         },
         error: function(P) {
-          f = !0, S(), p = se(w, i, P), I.error(P);
+          f = !0, S(), p = se(_, i, P), I.error(P);
         },
         complete: function() {
-          v = !0, S(), p = se(w, a), I.complete();
+          v = !0, S(), p = se(_, a), I.complete();
         }
-      }), L(_).subscribe(l));
-    })(c);
+      }), L(b).subscribe(l));
+    })(s);
   };
 }
 function se(e, t) {
@@ -1173,40 +1173,40 @@ function se(e, t) {
 }
 function Xe(e, t) {
   return j(function(r, n) {
-    var i = null, o = 0, a = !1, u = function() {
+    var i = null, o = 0, a = !1, c = function() {
       return a && !i && n.complete();
     };
-    r.subscribe(C(n, function(s) {
+    r.subscribe(C(n, function(u) {
       i == null || i.unsubscribe();
-      var c = 0, l = o++;
-      L(e(s, l)).subscribe(i = C(n, function(p) {
-        return n.next(t ? t(s, p, l, c++) : p);
+      var s = 0, l = o++;
+      L(e(u, l)).subscribe(i = C(n, function(p) {
+        return n.next(t ? t(u, p, l, s++) : p);
       }, function() {
-        i = null, u();
+        i = null, c();
       }));
     }, function() {
-      a = !0, u();
+      a = !0, c();
     }));
   });
 }
 function Xt(e, t, r) {
-  var n = b(e) || t || r ? { next: e, error: t, complete: r } : e;
+  var n = w(e) || t || r ? { next: e, error: t, complete: r } : e;
   return n ? j(function(i, o) {
     var a;
     (a = n.subscribe) === null || a === void 0 || a.call(n);
-    var u = !0;
-    i.subscribe(C(o, function(s) {
-      var c;
-      (c = n.next) === null || c === void 0 || c.call(n, s), o.next(s);
+    var c = !0;
+    i.subscribe(C(o, function(u) {
+      var s;
+      (s = n.next) === null || s === void 0 || s.call(n, u), o.next(u);
     }, function() {
+      var u;
+      c = !1, (u = n.complete) === null || u === void 0 || u.call(n), o.complete();
+    }, function(u) {
       var s;
-      u = !1, (s = n.complete) === null || s === void 0 || s.call(n), o.complete();
-    }, function(s) {
-      var c;
-      u = !1, (c = n.error) === null || c === void 0 || c.call(n, s), o.error(s);
+      c = !1, (s = n.error) === null || s === void 0 || s.call(n, u), o.error(u);
     }, function() {
-      var s, c;
-      u && ((s = n.unsubscribe) === null || s === void 0 || s.call(n)), (c = n.finalize) === null || c === void 0 || c.call(n);
+      var u, s;
+      c && ((u = n.unsubscribe) === null || u === void 0 || u.call(n)), (s = n.finalize) === null || s === void 0 || s.call(n);
     }));
   }) : we;
 }
@@ -1225,8 +1225,8 @@ function er(e, t) {
     Se((i) => {
       const o = i.target, a = (o == null ? void 0 : o.tagName) === "A" ? o : o == null ? void 0 : o.closest("A");
       if (!a) return null;
-      const u = a.getAttribute("href");
-      return !u || !u.startsWith("/") && !u.startsWith(".") ? null : u;
+      const c = a.getAttribute("href");
+      return !c || !c.startsWith("/") && !c.startsWith(".") ? null : c;
     }),
     // Drop non-link hovers
     ae((i) => i !== null),
@@ -1236,25 +1236,25 @@ function er(e, t) {
     Yt(),
     // Check that route requires server data
     ae((i) => {
-      const o = i.split("?")[0], a = "get", u = e.find(
+      const o = i.split("?")[0], a = "get", c = e.find(
         (l) => l.method.toLowerCase() === a && t.find((p) => p.parser(o) && p.pattern === l.path)
       );
-      if (!u) return !1;
-      const s = t.find((l) => l.parser(o) && l.pattern === u.path);
-      return !!R(V)[s == null ? void 0 : s.pattern];
+      if (!c) return !1;
+      const u = t.find((l) => l.parser(o) && l.pattern === c.path);
+      return !!R(V)[u == null ? void 0 : u.pattern];
     }),
     // switchMap cancels prior prefetch when hovering a new link
     Xe((i) => {
       const o = N.get(i);
       if (o && Date.now() - o.createdAt < Q)
         return [];
-      const a = new AbortController(), u = new _t(1), s = {
-        response$: u,
+      const a = new AbortController(), c = new _t(1), u = {
+        response$: c,
         createdAt: Date.now(),
         abortController: a
       };
-      N.set(i, s);
-      const c = {
+      N.set(i, u);
+      const s = {
         method: "GET",
         headers: {
           "Content-Type": "application/json",
@@ -1262,10 +1262,10 @@ function er(e, t) {
         },
         signal: a.signal
       };
-      return c[ne] = !0, Je(
-        fetch(i, c).then(
-          (l) => (u.next(l), u.complete(), i),
-          (l) => (u.error(l), N.delete(i), null)
+      return s[ne] = !0, Je(
+        fetch(i, s).then(
+          (l) => (c.next(l), c.complete(), i),
+          (l) => (c.error(l), N.delete(i), null)
         )
       ).pipe(
         Xt({
@@ -1478,10 +1478,10 @@ function _e(e) {
 const m = _e("forge:nav"), ar = 1e4;
 function sr(e, t, r) {
   let n = null, i = !1;
-  const o = new Promise((a, u) => {
+  const o = new Promise((a, c) => {
     n = setTimeout(
       () => {
-        i = !0, m.error("Timeout fired after", t, "ms"), r(), u(new Error(`Navigation timed out after ${t}ms`));
+        i = !0, m.error("Timeout fired after", t, "ms"), r(), c(new Error(`Navigation timed out after ${t}ms`));
       },
       t
     ), m.debug("Timeout scheduled for", t, "ms, timeoutId:", n);
@@ -1550,63 +1550,63 @@ const A = Ce({
     if (!n.ok) return !1;
     const i = await n.json(), o = R(A).navigationId;
     return e !== o ? (m.debug("Discarding stale poll response", { pollNavigationId: e, currentNavigationId: o }), !1) : (A.update((a) => {
-      var u;
-      return a.active.data = { layout: ((u = a.active.data) == null ? void 0 : u.layout) || [], view: i.view }, a;
+      var c;
+      return a.active.data = { layout: ((c = a.active.data) == null ? void 0 : c.layout) || [], view: i.view }, a;
     }), !0);
   } catch {
     return !1;
   }
 };
 k.update((e) => (e.poll = lr, e));
-async function et(e, t, r, n, i) {
+async function et(e, t, r, n, i, o) {
   if (!t.controller) return;
-  let o = J(e, t.controller).toString();
-  i && (o = o.replace(/\.svelte\.ts$/, ".js").replace(/\.ts$/, ".js"), /\.[a-z]+$/.test(o) || (o += ".js")), o.startsWith("/") || (o = "/" + o);
+  let a = J(e, t.controller).toString();
+  i && (a = a.replace(/\.svelte\.ts$/, ".js").replace(/\.ts$/, ".js"), /\.[a-z]+$/.test(a) || (a += ".js")), a.startsWith("/") || (a = "/" + a);
   const u = (await import(
     /* @vite-ignore */
-    o
-  )).default, s = new u();
+    a
+  )).default, s = o ? await Promise.resolve(o(u)) : new u();
   return typeof s.initialize == "function" && await Promise.resolve(s.initialize(r, n)), s;
 }
 function J(...e) {
   let t = e.map((r, n) => n === 0 ? r.replace(/\/+$/, "") : r.replace(/^\/+|\/+$/g, "")).join("/");
   return t.startsWith("/") || (t = "/" + t), t.split("?")[0];
 }
-async function fr(e, t, r, n, i, o) {
+async function fr(e, t, r, n, i, o, a) {
   try {
-    const a = typeof t == "string" && t.indexOf("assets") !== -1, u = (r.layout || []).map((w) => {
-      let g = J(t, w).toString();
-      return a && (g = g.endsWith(".svelte") ? g.replace(/\.svelte$/, ".js") : /[.][a-z]+$/.test(g) ? g : g + ".js"), g;
+    const c = typeof t == "string" && t.indexOf("assets") !== -1, u = (r.layout || []).map((g) => {
+      let b = J(t, g).toString();
+      return c && (b = b.endsWith(".svelte") ? b.replace(/\.svelte$/, ".js") : /[.][a-z]+$/.test(b) ? b : b + ".js"), b;
     });
     let s = J(t, r.view).toString();
-    a && (s = s.endsWith(".svelte") ? s.replace(/\.svelte$/, ".js") : /[.][a-z]+$/.test(s) ? s : s + ".js");
-    const c = await Promise.all(u.map((w) => import(
+    c && (s = s.endsWith(".svelte") ? s.replace(/\.svelte$/, ".js") : /[.][a-z]+$/.test(s) ? s : s + ".js");
+    const l = await Promise.all(u.map((g) => import(
       /* @vite-ignore */
-      w
-    ).then((g) => g.default)));
+      g
+    ).then((b) => b.default)));
     s.startsWith("/") || (s = "/" + s);
-    const l = await import(
+    const p = await import(
       /* @vite-ignore */
       s
-    ).then((w) => w.default), p = window.__INITIAL_DATA__ || { layout: [], view: {} }, h = typeof t == "string" && t.indexOf("assets") !== -1, d = R(k), v = { params: n, urlParams: i, query: o, page: d }, f = await et(t, r, p.view, v, h), S = {
-      layouts: c,
-      view: l,
+    ).then((g) => g.default), h = window.__INITIAL_DATA__ || { layout: [], view: {} }, d = typeof t == "string" && t.indexOf("assets") !== -1, v = R(k), f = { params: n, urlParams: i, query: o, page: v }, S = await et(t, r, h.view, f, d, a), _ = {
+      layouts: l,
+      view: p,
       viewPath: r.view || null,
       // Store original path for debugging
       layoutPaths: r.layout || [],
       // Store original paths for debugging
-      data: p,
+      data: h,
       params: n,
       urlParams: i,
       query: o,
-      controller: f
+      controller: S
     };
-    A.update((w) => (w.active = S, w.phase = "idle", w)), ot(it, { target: e, props: { root: A } });
-  } catch (a) {
-    m.error("Client-side route loading failed:", a);
+    A.update((g) => (g.active = _, g.phase = "idle", g)), ot(it, { target: e, props: { root: A } });
+  } catch (c) {
+    m.error("Client-side route loading failed:", c);
   }
 }
-function ce(e, t, r, n, i, o, a = !1, u = !0) {
+function ce(e, t, r, n, i, o, a = !1, c = !0) {
   cr({
     url: e,
     base_path: t,
@@ -1615,7 +1615,7 @@ function ce(e, t, r, n, i, o, a = !1, u = !0) {
     urlParams: i,
     query: o,
     server_loading: a,
-    updateUrl: u
+    updateUrl: c
   });
 }
 async function dr(e) {
@@ -1627,21 +1627,21 @@ async function dr(e) {
     params: i,
     urlParams: o,
     query: a,
-    server_loading: u,
-    updateUrl: s
-  } = e, c = ++E, l = new AbortController();
+    server_loading: c,
+    updateUrl: u
+  } = e, s = ++E, l = new AbortController();
   H = l, m.debug("Starting navigation", {
-    navigationId: c,
+    navigationId: s,
     url: t,
-    updateUrl: s,
-    server_loading: u,
+    updateUrl: u,
+    server_loading: c,
     currentNavigationId: E,
     hasAbortController: !!H
-  }), A.update((h) => (h.phase = "loading", h.navigationId = c, h));
+  }), A.update((h) => (h.phase = "loading", h.navigationId = s, h));
   try {
     let h = { layout: [], view: {} };
-    if (u) {
-      m.debug("Fetching server data", { navigationId: c, url: t });
+    if (c) {
+      m.debug("Fetching server data", { navigationId: s, url: t });
       let y = null;
       const O = Qt(t);
       if (O)
@@ -1662,7 +1662,7 @@ async function dr(e) {
         M[ne] = !0, y = await fetch(t, M);
       }
       if (m.debug("Fetch response received", {
-        navigationId: c,
+        navigationId: s,
         url: t,
         ok: y.ok,
         status: y.status,
@@ -1676,11 +1676,11 @@ async function dr(e) {
         throw new Error(`Network response was not ok: ${y.status}`);
       h = await y.json(), m.debug("Server data received:", h);
     }
-    if (c !== E) {
-      m.debug("Stale navigation after fetch, aborting", { navigationId: c, currentNavigationId: E });
+    if (s !== E) {
+      m.debug("Stale navigation after fetch, aborting", { navigationId: s, currentNavigationId: E });
       return;
     }
-    m.debug("Loading components", { navigationId: c, view: n.view, layouts: n.layout });
+    m.debug("Loading components", { navigationId: s, view: n.view, layouts: n.layout });
     const d = typeof r == "string" && r.indexOf("assets") !== -1, v = (n.layout || []).map((y) => {
       let O = J(r, y).toString();
       return d && (O = O.endsWith(".svelte") ? O.replace(/\.svelte$/, ".js") : /[.][a-z]+$/.test(O) ? O : O + ".js"), O;
@@ -1690,29 +1690,29 @@ async function dr(e) {
     const S = await Promise.all(v.map((y) => import(
       /* @vite-ignore */
       y
-    ).then((O) => O.default))), w = await import(
+    ).then((O) => O.default))), _ = await import(
       /* @vite-ignore */
       f
     ).then((y) => y.default);
     if (m.debug("Components loaded", {
-      navigationId: c,
+      navigationId: s,
       currentNavigationId: E,
       layoutsCount: S.length,
-      viewLoaded: !!w
-    }), c !== E) {
-      m.debug("Stale navigation after component load, aborting", { navigationId: c, currentNavigationId: E });
+      viewLoaded: !!_
+    }), s !== E) {
+      m.debug("Stale navigation after component load, aborting", { navigationId: s, currentNavigationId: E });
       return;
     }
-    const g = R(k), _ = { params: i, urlParams: o, query: a, page: g }, T = await et(r, n, h.view, _, d);
-    if (c !== E) {
-      m.debug("Stale navigation after controller resolution, aborting", { navigationId: c, currentNavigationId: E }), (p = T == null ? void 0 : T.destroy) == null || p.call(T);
+    const g = R(k), b = { params: i, urlParams: o, query: a, page: g }, T = await et(r, n, h.view, b, d, controllerFactory);
+    if (s !== E) {
+      m.debug("Stale navigation after controller resolution, aborting", { navigationId: s, currentNavigationId: E }), (p = T == null ? void 0 : T.destroy) == null || p.call(T);
       return;
     }
     const I = R(A).active.controller;
     I != null && I.destroy && I.destroy();
     const P = {
       layouts: S,
-      view: w,
+      view: _,
       viewPath: n.view || null,
       // Store original path for debugging
       layoutPaths: n.layout || [],
@@ -1724,21 +1724,21 @@ async function dr(e) {
       controller: T
     };
     m.debug("Committing new state", {
-      navigationId: c,
+      navigationId: s,
       currentNavigationId: E,
       layoutsCount: P.layouts.length,
       viewSet: !!P.view,
       dataKeys: Object.keys(P.data || {})
     }), A.update((y) => (y.active = P, y.phase = "idle", m.debug("ROOT.active updated", {
-      navigationId: c,
+      navigationId: s,
       layoutsCount: y.active.layouts.length,
       viewSet: !!y.active.view,
       dataKeys: Object.keys(y.active.data || {}),
       paramsKeys: Object.keys(y.active.params || {})
-    }), y)), typeof window < "u" && window.scroll(0, 0), s && (m.debug("Updating browser URL", { url: t }), window.history.pushState({}, "", t)), m.debug("Navigation complete", { navigationId: c, url: t });
+    }), y)), typeof window < "u" && window.scroll(0, 0), u && (m.debug("Updating browser URL", { url: t }), window.history.pushState({}, "", t)), m.debug("Navigation complete", { navigationId: s, url: t });
   } catch (h) {
     if (m.error("Navigation failed", {
-      navigationId: c,
+      navigationId: s,
       currentNavigationId: E,
       url: t,
       error: h instanceof Error ? h.message : String(h)
@@ -1756,40 +1756,40 @@ function hr(e, t, r) {
     return;
   }
   document.addEventListener("click", (n) => {
-    var a, u;
-    const i = window.location.pathname, o = ((a = n.target) == null ? void 0 : a.tagName) === "A" ? n.target : (u = n.target) == null ? void 0 : u.closest("A");
+    var a, c;
+    const i = window.location.pathname, o = ((a = n.target) == null ? void 0 : a.tagName) === "A" ? n.target : (c = n.target) == null ? void 0 : c.closest("A");
     if (o) {
-      let s = o.getAttribute("href");
-      if (i === s) {
+      let u = o.getAttribute("href");
+      if (i === u) {
         n.preventDefault();
         return;
       }
-      if (s && s.startsWith("/") || s.startsWith(".")) {
-        const c = s.split("?")[0], l = o.getAttribute("method") || "get", p = t.find((h) => h.method.toLowerCase() === l && r.find((d) => d.parser(c) && d.pattern === h.path));
+      if (u && u.startsWith("/") || u.startsWith(".")) {
+        const s = u.split("?")[0], l = o.getAttribute("method") || "get", p = t.find((h) => h.method.toLowerCase() === l && r.find((d) => d.parser(s) && d.pattern === h.path));
         if (p) {
           n.preventDefault();
-          const h = r.find((_) => _.parser(c) && _.pattern === p.path), d = (h == null ? void 0 : h.parser(c)) || {}, v = new URLSearchParams(s.split("?")[1] || ""), f = Object.fromEntries(v.entries()) || {}, S = { ...d, ...f }, g = R(V)[h == null ? void 0 : h.pattern];
-          k.update((_) => (_.url = s, _.pathname = c, _.params = d, _.query = f, _)), F.debug("Click navigation to", s), ce(s, e, p, S, d, f, g, !0);
+          const h = r.find((b) => b.parser(s) && b.pattern === p.path), d = (h == null ? void 0 : h.parser(s)) || {}, v = new URLSearchParams(u.split("?")[1] || ""), f = Object.fromEntries(v.entries()) || {}, S = { ...d, ...f }, g = R(V)[h == null ? void 0 : h.pattern];
+          k.update((b) => (b.url = u, b.pathname = s, b.params = d, b.query = f, b)), F.debug("Click navigation to", u), ce(u, e, p, S, d, f, g, !0);
         } else
-          F.warn("No matching route found", s, "- using fallback navigation");
+          F.warn("No matching route found", u, "- using fallback navigation");
       }
     }
   }), window.addEventListener("popstate", (n) => {
-    const i = window.location.pathname, o = window.location.pathname + window.location.search, a = "get", u = t.find((s) => s.method.toLowerCase() === a && r.find((c) => c.parser(i) && c.pattern === s.path));
-    if (u) {
-      const s = r.find((f) => f.parser(i) && f.pattern === u.path), c = (s == null ? void 0 : s.parser(i)) || {}, l = new URLSearchParams(window.location.search), p = Object.fromEntries(l.entries()) || {};
-      k.update((f) => (f.url = o, f.pathname = window.location.pathname, f.params = c, f.query = p, f));
-      const h = { ...c, ...p }, v = R(V)[s == null ? void 0 : s.pattern];
-      F.debug("Popstate navigation to", o), ce(o, e, u, h, c, p, v, !1);
+    const i = window.location.pathname, o = window.location.pathname + window.location.search, a = "get", c = t.find((u) => u.method.toLowerCase() === a && r.find((s) => s.parser(i) && s.pattern === u.path));
+    if (c) {
+      const u = r.find((f) => f.parser(i) && f.pattern === c.path), s = (u == null ? void 0 : u.parser(i)) || {}, l = new URLSearchParams(window.location.search), p = Object.fromEntries(l.entries()) || {};
+      k.update((f) => (f.url = o, f.pathname = window.location.pathname, f.params = s, f.query = p, f));
+      const h = { ...s, ...p }, v = R(V)[u == null ? void 0 : u.pattern];
+      F.debug("Popstate navigation to", o), ce(o, e, c, h, s, p, v, !1);
     } else
       F.warn("No matching route found", i, "- using fallback navigation"), window.location.href = i;
   }), window.addEventListener("forge-redirect", ((n) => {
     const i = n.detail.path, o = i.split("?")[0];
     F.debug("Handling forge-redirect to:", i);
-    const a = "get", u = t.find((s) => s.method.toLowerCase() === a && r.find((c) => c.parser(o) && c.pattern === s.path));
-    if (u) {
-      const s = r.find((f) => f.parser(o) && f.pattern === u.path), c = (s == null ? void 0 : s.parser(o)) || {}, l = new URLSearchParams(i.split("?")[1] || ""), p = Object.fromEntries(l.entries()) || {}, h = { ...c, ...p }, v = R(V)[s == null ? void 0 : s.pattern];
-      k.update((f) => (f.url = i, f.pathname = o, f.params = c, f.query = p, f)), ce(i, e, u, h, c, p, v, !0);
+    const a = "get", c = t.find((u) => u.method.toLowerCase() === a && r.find((s) => s.parser(o) && s.pattern === u.path));
+    if (c) {
+      const u = r.find((f) => f.parser(o) && f.pattern === c.path), s = (u == null ? void 0 : u.parser(o)) || {}, l = new URLSearchParams(i.split("?")[1] || ""), p = Object.fromEntries(l.entries()) || {}, h = { ...s, ...p }, v = R(V)[u == null ? void 0 : u.pattern];
+      k.update((f) => (f.url = i, f.pathname = o, f.params = s, f.query = p, f)), ce(i, e, c, h, s, p, v, !0);
     } else
       F.warn("No matching route found", o, "- using fallback navigation"), window.location.href = o;
   })), er(t, r);
@@ -1853,17 +1853,17 @@ function br() {
     for (const a of ee)
       try {
         if (a.length === 2) {
-          const u = new Headers(n.headers), s = Object.fromEntries(u.entries());
-          await new Promise((c, l) => {
+          const c = new Headers(n.headers), u = Object.fromEntries(c.entries());
+          await new Promise((s, l) => {
             try {
-              a(s, (p) => {
+              a(u, (p) => {
                 if (p)
                   l(p);
                 else {
                   const h = new Headers();
-                  Object.entries(s).forEach(([d, v]) => {
+                  Object.entries(u).forEach(([d, v]) => {
                     v !== void 0 && h.set(d, v);
-                  }), n.headers = h, c();
+                  }), n.headers = h, s();
                 }
               });
             } catch (p) {
@@ -1871,11 +1871,11 @@ function br() {
             }
           });
         } else {
-          const u = await a(n, e);
-          u && typeof u == "object" && (n = u);
+          const c = await a(n, e);
+          c && typeof c == "object" && (n = c);
         }
-      } catch (u) {
-        throw D.error("Middleware error", u), u;
+      } catch (c) {
+        throw D.error("Middleware error", c), c;
       }
     const i = n == null ? void 0 : n[ne];
     D.debug("Fetch override request", {
@@ -1892,19 +1892,19 @@ function br() {
       type: o.type,
       hasForgeSymbol: i
     }), i && o.redirected) {
-      const a = typeof e == "string" ? e : e.url, u = o.url;
+      const a = typeof e == "string" ? e : e.url, c = o.url;
       if (D.debug("Redirect detected", {
         requested: a,
-        final: u,
+        final: c,
         redirected: o.redirected
-      }), yr(u)) {
-        const s = new URL(u), c = s.pathname + s.search;
-        return D.debug("Redirect detected to:", c, "- will navigate after current request completes"), new Response(JSON.stringify({ layout: [], view: {} }), {
+      }), yr(c)) {
+        const u = new URL(c), s = u.pathname + u.search;
+        return D.debug("Redirect detected to:", s, "- will navigate after current request completes"), new Response(JSON.stringify({ layout: [], view: {} }), {
           status: 200,
           headers: {
             "Content-Type": "application/json",
             "X-Forge-Redirect": "true",
-            "X-Forge-Redirect-Path": c
+            "X-Forge-Redirect-Path": s
           }
         });
       }
@@ -1947,11 +1947,19 @@ async function Ar(e, t) {
     throw new Error("No component directory provided");
   let n = window.__ROUTING__;
   if (le = st(n), window && window.location) {
-    const i = (window.location.pathname || "/").split("?")[0], o = le.find((u) => u.parser(i));
-    let a = o ? n.find((u) => u.path === o.pattern) : null;
+    const i = (window.location.pathname || "/").split("?")[0], o = le.find((c) => c.parser(i));
+    let a = o ? n.find((c) => c.path === o.pattern) : null;
     if (o && a) {
-      const u = o.parser(i) || {}, s = new URLSearchParams(window.location.search), c = Object.fromEntries(s.entries()) || {}, l = { ...u, ...c };
-      Zt(), fr(e, r, a, l, u, c), hr(r, n, le);
+      const c = o.parser(i) || {}, u = new URLSearchParams(window.location.search), s = Object.fromEntries(u.entries()) || {}, l = { ...c, ...s };
+      Zt(), fr(
+        e,
+        r,
+        a,
+        l,
+        c,
+        s,
+        t.controller_factory
+      ), hr(r, n, le);
     } else
       D.warn("No matching route", i);
   }