fetchium 0.3.1 → 0.4.1

package/dist/esm/development/{QueryClient-DfxP7pt2.js → QueryClient-CkO_s9Uh.js}

@@ -1,10 +1,10 @@
-import { notifier as dt, relay as $t, setScopeOwner as be, reactiveMethod as Ce, signal as Lt, context as Ut, getContext as Oe, task as Se, reactiveSignal as Re, isSignal as Ae, watcher as xe } from "signalium";
+import { notifier as Z, relay as Lt, setScopeOwner as Ce, reactiveMethod as Se, signal as Ut, context as qt, getContext as Oe, reactiveSignal as st, task as Re, isSignal as xe, watcher as Ae } from "signalium";
 import { registerCustomHash as Ne, hashValue as N, registerCustomSnapshot as De } from "signalium/utils";
-import { d as qt } from "./shared-DcuVH8Pf.js";
-import { SyncQueryStore as Ie, MemoryPersistentStore as ke } from "./stores/sync.js";
+import { d as Vt } from "./shared-DcuVH8Pf.js";
+import { SyncQueryStore as Ie, MemoryPersistentStore as Fe } from "./stores/sync.js";
 var K = /* @__PURE__ */ ((e) => (e.Always = "always", e.Online = "online", e.OfflineFirst = "offlineFirst", e))(K || {}), d = /* @__PURE__ */ ((e) => (e[e.UNDEFINED = 1] = "UNDEFINED", e[e.NULL = 2] = "NULL", e[e.NUMBER = 4] = "NUMBER", e[e.STRING = 8] = "STRING", e[e.BOOLEAN = 16] = "BOOLEAN", e[e.OBJECT = 32] = "OBJECT", e[e.ARRAY = 64] = "ARRAY", e[e.ID = 128] = "ID", e[e.RECORD = 256] = "RECORD", e[e.UNION = 512] = "UNION", e[e.ENTITY = 1024] = "ENTITY", e[e.HAS_FORMAT = 4096] = "HAS_FORMAT", e[e.IS_EAGER_FORMAT = 8192] = "IS_EAGER_FORMAT", e[e.PARSE_RESULT = 16384] = "PARSE_RESULT", e[e.LIVE = 32768] = "LIVE", e))(d || {});
-const k = /* @__PURE__ */ Symbol("array"), F = /* @__PURE__ */ Symbol("record"), Vt = /* @__PURE__ */ Symbol("QUERY_ID");
-var lt = /* @__PURE__ */ ((e) => (e[e.Array = 0] = "Array", e[e.Value = 1] = "Value", e))(lt || {});
+const F = /* @__PURE__ */ Symbol("array"), k = /* @__PURE__ */ Symbol("record"), Kt = /* @__PURE__ */ Symbol("QUERY_ID");
+var ht = /* @__PURE__ */ ((e) => (e[e.Array = 0] = "Array", e[e.Value = 1] = "Value", e))(ht || {});
 class Q {
   type;
   entityDefs;
@@ -42,12 +42,12 @@ class Q {
     );
   }
 }
-const O = /* @__PURE__ */ new WeakMap();
+const S = /* @__PURE__ */ new WeakMap();
 function P(e) {
-  return O.get(e);
+  return S.get(e);
 }
-var Z = /* @__PURE__ */ ((e) => (e[e.Query = 0] = "Query", e[e.Entity = 1] = "Entity", e))(Z || {});
-class Fe {
+var tt = /* @__PURE__ */ ((e) => (e[e.Query = 0] = "Query", e[e.Entity = 1] = "Entity", e))(tt || {});
+class ke {
   constructor(t, n, i) {
     this._onEvict = n, this._intervalId = setInterval(this._tick, t * 6e4 * i);
   }
@@ -88,7 +88,7 @@ class Me {
     }
     const { _buckets: r } = this;
     let s = r.get(n);
-    s || (s = new Fe(n, this._onEvict, this._multiplier), r.set(n, s)), s.schedule(t, i);
+    s || (s = new ke(n, this._onEvict, this._multiplier), r.set(n, s)), s.schedule(t, i);
   }
   cancel(t, n) {
     if (n !== 1 / 0) {
@@ -121,8 +121,8 @@ class Te {
   destroy() {
   }
 }
-const z = /* @__PURE__ */ Symbol("fieldRef"), I = /* @__PURE__ */ Symbol("fieldRefPath"), ht = /* @__PURE__ */ Symbol("DEFINITION_TARGET"), J = /* @__PURE__ */ Symbol("CANCEL_PROXY"), Pe = /\[([^\]]+)\]/g;
-function Kt(e) {
+const z = /* @__PURE__ */ Symbol("fieldRef"), I = /* @__PURE__ */ Symbol("fieldRefPath"), yt = /* @__PURE__ */ Symbol("DEFINITION_TARGET"), J = /* @__PURE__ */ Symbol("CANCEL_PROXY"), Pe = /\[([^\]]+)\]/g;
+function Bt(e) {
   const t = {
     [z]: !0,
     [I]: e
@@ -139,19 +139,19 @@ const je = {
     }
     if (typeof t == "symbol") return;
     const n = e[I];
-    return Kt([...n, t]);
+    return Bt([...n, t]);
   },
   has(e, t) {
     return t === z || t === I;
   }
 };
-function Bt(e) {
+function Qt(e) {
   return typeof e == "object" && e !== null && e[z] === !0;
 }
-function Qt(e) {
+function Yt(e) {
   return e[I];
 }
-function Yt(e) {
+function Gt(e) {
   let t = !1;
   return new Proxy(e, {
     set(n, i, r) {
@@ -160,14 +160,14 @@ function Yt(e) {
     get(n, i) {
       if (t)
         throw new Error("Definition proxy accessed after extraction. Avoid arrow functions that capture `this`.");
-      return i === ht ? n : i === J ? () => {
+      return i === yt ? n : i === J ? () => {
         t = !0;
-      } : typeof i == "symbol" ? n[i] : Kt([i]);
+      } : typeof i == "symbol" ? n[i] : Bt([i]);
     }
   });
 }
 function $e(e) {
-  const t = e[ht];
+  const t = e[yt];
   e[J]();
   const n = {};
   for (const s of Object.getOwnPropertyNames(t))
@@ -184,7 +184,7 @@ function $e(e) {
   }
   return { fields: n, methods: i };
 }
-function yt(e, t) {
+function pt(e, t) {
   let n = t;
   for (const i of e) {
     if (n == null) return;
@@ -194,13 +194,13 @@ function yt(e, t) {
 }
 function Le(e, t) {
   return e.replace(Pe, (n, i) => {
-    const r = i.split("."), s = yt(r, t);
+    const r = i.split("."), s = pt(r, t);
     return s != null ? encodeURIComponent(String(s)) : "";
   });
 }
 function X(e, t) {
-  if (Bt(e))
-    return yt(Qt(e), t);
+  if (Qt(e))
+    return pt(Yt(e), t);
   if (typeof e == "string")
     return Le(e, t);
   if (Array.isArray(e))
@@ -213,23 +213,23 @@ function X(e, t) {
   }
   return e;
 }
-function rt(e, t, n) {
+function ot(e, t, n) {
   const i = e.fields, r = e.methods, s = { params: t }, o = {};
   for (const [a, c] of Object.entries(i))
     o[a] = X(c, s);
-  o.params = t, o.context = n;
+  o.params = t, o.context = n, o.responseNotifier = Z();
   for (const [a, c] of Object.entries(r))
     o[a] = c.bind(o);
   return o;
 }
-class pt {
+class gt {
   static cache;
   constructor() {
-    return Yt(this);
+    return Gt(this);
   }
 }
-const Gt = Object.entries, st = Object.keys;
-let Ht = () => {
+const Ht = Object.entries, at = Object.keys;
+let Wt = () => {
 };
 {
   const t = (i, r) => {
@@ -249,7 +249,7 @@ let Ht = () => {
     if (typeof i == "string") return i === r;
     if (i instanceof Set && r instanceof Set)
       return t(i, r);
-    if (i instanceof m && r instanceof m) {
+    if (i instanceof v && r instanceof v) {
       const s = i.mask, o = r.mask;
       if ((s & 65535) !== (o & 65535)) return !1;
       const a = s >> 16, c = o >> 16;
@@ -266,20 +266,20 @@ let Ht = () => {
     }
     return !1;
   };
-  Ht = (i, r, s, o) => {
+  Wt = (i, r, s, o) => {
     if (!n(s, o))
       throw new Error(
         `[fetchium] Entity typename '${i}' has incompatible type for field '${r}' across different entity definitions`
       );
   };
 }
-function Rt(e) {
-  return typeof e == "number" ? e | d.UNDEFINED : e instanceof m ? (e.mask & d.UNDEFINED) !== 0 ? e : m.cloneWith(e, d.UNDEFINED) : e;
+function xt(e) {
+  return typeof e == "number" ? e | d.UNDEFINED : e instanceof v ? (e.mask & d.UNDEFINED) !== 0 ? e : v.cloneWith(e, d.UNDEFINED) : e;
 }
 function At(e) {
-  return e instanceof m && (e.mask & d.OBJECT) !== 0 && (e.mask & (d.ENTITY | d.ARRAY | d.UNION | d.RECORD | d.LIVE)) === 0;
+  return e instanceof v && (e.mask & d.OBJECT) !== 0 && (e.mask & (d.ENTITY | d.ARRAY | d.UNION | d.RECORD | d.LIVE)) === 0;
 }
-function Wt(e, t, n) {
+function zt(e, t, n) {
   const i = /* @__PURE__ */ new Set();
   for (const s of e)
     if (s !== void 0)
@@ -292,17 +292,17 @@ function Wt(e, t, n) {
     let f = !0;
     for (const l of e) {
       const u = l?.[s];
-      u !== void 0 ? (o++, a === void 0 && (a = u), a !== void 0 && u !== a && !At(u) && Ht(n, s, a, u), At(u) ? c.push(u.shape) : (f = !1, c.push(void 0))) : (f = !1, c.push(void 0));
+      u !== void 0 ? (o++, a === void 0 && (a = u), a !== void 0 && u !== a && !At(u) && Wt(n, s, a, u), At(u) ? c.push(u.shape) : (f = !1, c.push(void 0))) : (f = !1, c.push(void 0));
     }
     if (f && o > 0) {
-      const l = Wt(c, t, n), u = new m(d.OBJECT, l);
-      r[s] = o < t ? Rt(u) : u;
+      const l = zt(c, t, n), u = new v(d.OBJECT, l);
+      r[s] = o < t ? xt(u) : u;
     } else
-      r[s] = o < t ? Rt(a) : a;
+      r[s] = o < t ? xt(a) : a;
   }
   return r;
 }
-class m {
+class v {
   mask;
   shape;
   typenameField = void 0;
@@ -336,7 +336,7 @@ class m {
   }
   static merge(t) {
     if (t.length === 1) return t[0];
-    const n = t.length, i = t.map((f) => f.shape), r = t[0].typenameValue ?? "(unknown)", s = Wt(i, n, r);
+    const n = t.length, i = t.map((f) => f.shape), r = t[0].typenameValue ?? "(unknown)", s = zt(i, n, r);
     let o, a, c;
     for (const f of t) {
       if (o === void 0 && f.idField !== void 0)
@@ -347,7 +347,7 @@ class m {
         );
       a === void 0 && (a = f.typenameField), c === void 0 && (c = f.typenameValue);
     }
-    return new m(
+    return new v(
       d.ENTITY | d.OBJECT,
       s,
       void 0,
@@ -357,7 +357,7 @@ class m {
     );
   }
   static cloneWith(t, n) {
-    const i = new m(
+    const i = new v(
       n | t.mask,
       t.shape,
       t.values,
@@ -410,21 +410,21 @@ Ne(L, (e) => {
     t += N(n);
   return t >>> 0;
 });
-function gt(e, t) {
-  return new m(e, t);
+function vt(e, t) {
+  return new v(e, t);
 }
 function qe(e) {
-  return gt(d.ARRAY, e);
+  return vt(d.ARRAY, e);
 }
 function Ve(e) {
-  return gt(d.RECORD | d.OBJECT, e);
+  return vt(d.RECORD | d.OBJECT, e);
 }
 function Ke(e) {
-  return gt(d.PARSE_RESULT, e);
+  return vt(d.PARSE_RESULT, e);
 }
-function zt(e, t) {
+function Jt(e, t) {
   let n = e, i, r, s;
-  for (const [o, a] of Gt(t))
+  for (const [o, a] of Ht(t))
     switch (typeof a) {
       case "number":
         if ((a & d.ID) !== 0) {
@@ -444,12 +444,12 @@ function zt(e, t) {
         a.mask & d.LIVE && (n |= d.LIVE);
         break;
     }
-  return new m(n, t, void 0, r, s, i);
+  return new v(n, t, void 0, r, s, i);
 }
 function Be(e) {
-  return zt(d.OBJECT, e);
+  return Jt(d.OBJECT, e);
 }
-function xt(e, t, n) {
+function Nt(e, t, n) {
   const i = e.mask;
   if ((i & d.UNION) !== 0) {
     const r = e;
@@ -462,7 +462,7 @@ function xt(e, t, n) {
     }
     const s = r.shape;
     if (s !== void 0)
-      for (const o of [...st(s), k, F]) {
+      for (const o of [...at(s), F, k]) {
         const a = s[o];
         if (t[o] !== void 0 && t[o] !== a)
           throw new Error(
@@ -471,13 +471,13 @@ function xt(e, t, n) {
         t[o] = a;
       }
   } else if ((i & d.ARRAY) !== 0) {
-    if (t[k] !== void 0)
+    if (t[F] !== void 0)
       throw new Error("Array shape already defined");
-    t[k] = e.shape;
+    t[F] = e.shape;
   } else if ((i & d.RECORD) !== 0) {
-    if (t[F] !== void 0)
+    if (t[k] !== void 0)
       throw new Error("Record shape already defined");
-    t[F] = e.shape;
+    t[k] = e.shape;
   } else {
     const r = e.typenameField, s = e.typenameValue;
     if (s === void 0)
@@ -510,33 +510,33 @@ function mt(...e) {
       r = l;
       continue;
     }
-    i === 2 && (o = /* @__PURE__ */ Object.create(null), a = xt(r, o, a)), a = xt(l, o, a);
+    i === 2 && (o = /* @__PURE__ */ Object.create(null), a = Nt(r, o, a)), a = Nt(l, o, a);
   }
   if (i === 0)
-    return s === void 0 ? n : n === 0 ? s : new m(n | d.UNION, void 0, s);
+    return s === void 0 ? n : n === 0 ? s : new v(n | d.UNION, void 0, s);
   if (i === 1)
-    return m.cloneWith(r, n);
+    return v.cloneWith(r, n);
   const f = n | c | d.UNION;
-  return new m(f, o, s, a);
+  return new v(f, o, s, a);
 }
-function vt(e, t, n) {
+function _t(e, t, n) {
   const i = e;
   if (typeof i == "number")
     return i | t;
   if (i instanceof Set)
     return mt(e, t);
   let r = n.get(i);
-  return r === void 0 && (r = m.cloneWith(i, t), n.set(i, r)), r;
+  return r === void 0 && (r = v.cloneWith(i, t), n.set(i, r)), r;
 }
 const Qe = /* @__PURE__ */ new WeakMap(), Ye = /* @__PURE__ */ new WeakMap(), Ge = /* @__PURE__ */ new WeakMap();
 function He(e) {
-  return vt(e, d.UNDEFINED | d.NULL, Ge);
+  return _t(e, d.UNDEFINED | d.NULL, Ge);
 }
 function We(e) {
-  return vt(e, d.UNDEFINED, Qe);
+  return _t(e, d.UNDEFINED, Qe);
 }
 function ze(e) {
-  return vt(e, d.NULL, Ye);
+  return _t(e, d.NULL, Ye);
 }
 function Je(e) {
   return e;
@@ -544,43 +544,43 @@ function Je(e) {
 function Xe(e) {
   return /* @__PURE__ */ new Set([e]);
 }
-const Jt = ((...e) => new Set(e));
-Jt.caseInsensitive = (...e) => new L(e);
-const _t = 16;
+const Xt = ((...e) => new Set(e));
+Xt.caseInsensitive = (...e) => new L(e);
+const wt = 16;
 let Ze = 0;
-const ot = [], Xt = [], Zt = /* @__PURE__ */ new Map(), te = /* @__PURE__ */ new Map(), tt = /* @__PURE__ */ new WeakSet();
+const ct = [], Zt = [], te = /* @__PURE__ */ new Map(), ee = /* @__PURE__ */ new Map(), et = /* @__PURE__ */ new WeakSet();
 class Y {
   _raw;
   _formatted;
   _parsed;
   _formatId;
   constructor(t, n, i) {
-    this._raw = t, this._formatId = n, i ? (this._formatted = ot[n](t), this._parsed = !0) : this._parsed = !1, tt.add(this);
+    this._raw = t, this._formatId = n, i ? (this._formatted = ct[n](t), this._parsed = !0) : this._parsed = !1, et.add(this);
   }
   getValue() {
-    return this._parsed || (this._formatted = ot[this._formatId](this._raw), this._parsed = !0), this._formatted;
+    return this._parsed || (this._formatted = ct[this._formatId](this._raw), this._parsed = !0), this._formatted;
   }
   toJSON() {
-    return this._parsed ? Xt[this._formatId](this._formatted) : this._raw;
+    return this._parsed ? Zt[this._formatId](this._formatted) : this._raw;
   }
 }
 function tn(e) {
-  const t = Zt.get(e);
+  const t = te.get(e);
   if (t === void 0)
     throw new Error(`Format ${e} not registered`);
   return t;
 }
-function Nt(e) {
-  const t = e >> _t;
-  return te.get(t);
+function Dt(e) {
+  const t = e >> wt;
+  return ee.get(t);
 }
-function ee(e, t, n, i, r) {
+function ne(e, t, n, i, r) {
   const s = Ze++;
-  ot[s] = n, Xt[s] = i, te.set(s, e);
-  const o = r?.eager ?? !0, c = s << _t | t | d.HAS_FORMAT | (o ? d.IS_EAGER_FORMAT : 0);
-  Zt.set(e, c);
+  ct[s] = n, Zt[s] = i, ee.set(s, e);
+  const o = r?.eager ?? !0, c = s << wt | t | d.HAS_FORMAT | (o ? d.IS_EAGER_FORMAT : 0);
+  te.set(e, c);
 }
-ee(
+ne(
   "date",
   d.STRING,
   (e) => {
@@ -597,7 +597,7 @@ ee(
     return `${t}-${n}-${i}`;
   }
 );
-ee(
+ne(
   "date-time",
   d.STRING,
   (e) => {
@@ -608,15 +608,15 @@ ee(
   },
   (e) => e.toISOString()
 );
-const Dt = /* @__PURE__ */ new WeakMap();
+const It = /* @__PURE__ */ new WeakMap();
 function $(e) {
-  let t = Dt.get(e);
+  let t = It.get(e);
   if (t === void 0) {
-    const n = new e(), i = n[ht] ?? n;
+    const n = new e(), i = n[yt] ?? n;
     n[J] && n[J]();
     const r = {};
-    for (const [f, l] of Gt(i)) {
-      if (!(typeof l == "number" || typeof l == "string" || l instanceof Set || l instanceof m || l instanceof L))
+    for (const [f, l] of Ht(i)) {
+      if (!(typeof l == "number" || typeof l == "string" || l instanceof Set || l instanceof v || l instanceof L))
         throw new Error(
           `[fetchium] Entity '${e.name}' field '${f}' has an invalid type definition. All entity fields must be type definitions (e.g. t.string, t.number, t.entity(...), etc). Got: ${typeof l == "object" ? l?.constructor?.name ?? typeof l : typeof l}`
         );
@@ -625,9 +625,9 @@ function $(e) {
     const s = Object.getPrototypeOf(e.prototype);
     if (s != null) {
       const f = s.constructor;
-      if (f !== pt && typeof f == "function") {
+      if (f !== gt && typeof f == "function") {
         const u = $(f).shape;
-        for (const h of st(u))
+        for (const h of at(u))
           if (h in r && r[h] !== u[h])
             throw new Error(`Cannot extend: field '${h}' already exists in type definition`);
       }
@@ -635,16 +635,16 @@ function $(e) {
     const o = {}, a = e.prototype;
     for (const f of Object.getOwnPropertyNames(a))
       f !== "constructor" && typeof a[f] == "function" && (o[f] = a[f]);
-    t = zt(d.ENTITY | d.OBJECT, r), t._entityClass = e, st(o).length > 0 && (t._methods = o), typeof o.__subscribe == "function" && (t._entityConfig = { hasSubscribe: !0 });
+    t = Jt(d.ENTITY | d.OBJECT, r), t._entityClass = e, at(o).length > 0 && (t._methods = o), typeof o.__subscribe == "function" && (t._entityConfig = { hasSubscribe: !0 });
     const c = e;
-    c.cache && (t._entityCache = c.cache), Dt.set(e, t);
+    c.cache && (t._entityCache = c.cache), It.set(e, t);
   }
   return t;
 }
 function en(e) {
   return $(e);
 }
-function ne(e, t) {
+function ie(e, t) {
   if (t == null) return;
   const n = /* @__PURE__ */ new Map();
   if (Array.isArray(t))
@@ -667,22 +667,22 @@ function ne(e, t) {
   }
   return n.size > 0 ? n : void 0;
 }
-function ie(e) {
+function re(e) {
   return Array.isArray(e) ? e.map((t) => $(t)) : [$(e)];
 }
 function nn(e, t) {
-  const n = ie(e), i = n.length === 1 ? n[0] : mt(...n.map((o) => o)), r = d.ARRAY | d.LIVE, s = new m(r, i);
+  const n = re(e), i = n.length === 1 ? n[0] : mt(...n.map((o) => o)), r = d.ARRAY | d.LIVE, s = new v(r, i);
   return s._liveConfig = Q.array(
     n,
-    ne(n, t?.constraints),
+    ie(n, t?.constraints),
     t?.sort
   ), s;
 }
 function rn(e, t, n) {
-  const i = ie(t), r = e, s = d.LIVE, o = new m(s, void 0);
+  const i = re(t), r = e, s = d.LIVE, o = new v(s, void 0);
   return o._liveConfig = Q.value(
     i,
-    ne(i, n?.constraints),
+    ie(i, n?.constraints),
     r,
     n.onCreate,
     n.onUpdate,
@@ -693,7 +693,7 @@ const sn = {
   format: tn,
   typename: Je,
   const: Xe,
-  enum: Jt,
+  enum: Xt,
   id: d.ID | d.STRING | d.NUMBER,
   string: d.STRING,
   number: d.NUMBER,
@@ -723,7 +723,7 @@ function B(e) {
     return String(e);
   if (typeof e == "number") {
     if ((e & d.HAS_FORMAT) !== 0) {
-      const r = Nt(e);
+      const r = Dt(e);
       if (r)
         return `"${r}"`;
     }
@@ -739,12 +739,12 @@ function B(e) {
         i.push(o);
       }
     if (n.shape !== void 0) {
-      n.shape[k] !== void 0 && i.push(`Array<${B(n.shape[k])}>`), n.shape[F] !== void 0 && i.push(`Record<string, ${B(n.shape[F])}>`);
+      n.shape[F] !== void 0 && i.push(`Array<${B(n.shape[F])}>`), n.shape[k] !== void 0 && i.push(`Record<string, ${B(n.shape[k])}>`);
       for (const [s, o] of Object.entries(n.shape))
-        s !== k && s !== F && i.push(s);
+        s !== F && s !== k && i.push(s);
     }
     if (t = n.mask, (t & d.HAS_FORMAT) !== 0) {
-      const s = Nt(t);
+      const s = Dt(t);
       s && i.push(`"${s}"`);
     }
     return t & d.UNDEFINED && i.push("undefined"), t & d.NULL && i.push("null"), t & d.NUMBER && i.push("number"), t & d.STRING && i.push("string"), t & d.BOOLEAN && i.push("boolean"), i.length === 0 ? "union" : i.join(" | ");
@@ -770,8 +770,8 @@ function V(e, t, n) {
     `Validation error at ${e}: expected ${B(t)}, got ${typeof n == "object" ? n === null ? "null" : Array.isArray(n) ? "array" : "object" : typeof n}`
   );
 }
-const re = Array.isArray;
-function It(e) {
+const se = Array.isArray;
+function Ft(e) {
   if (e === null) return d.NULL;
   switch (typeof e) {
     case "number":
@@ -783,7 +783,7 @@ function It(e) {
     case "undefined":
       return d.UNDEFINED;
     case "object":
-      return re(e) ? d.ARRAY : d.OBJECT;
+      return se(e) ? d.ARRAY : d.OBJECT;
     default:
       throw new Error(`Invalid type: ${typeof e}`);
   }
@@ -794,7 +794,7 @@ function $n(e) {
 function j(e) {
   if (e === null || typeof e != "object")
     return e;
-  if (re(e))
+  if (se(e))
     return e.map((n) => j(n));
   if (e instanceof Date)
     return new Date(e.getTime());
@@ -815,9 +815,9 @@ function j(e) {
     t[n] = j(e[n]);
   return t;
 }
-const wt = Object.entries, on = () => {
+const Et = Object.entries, on = () => {
 };
-class at {
+class ft {
   queryClient = void 0;
   preloadedEntities = void 0;
   warn = on;
@@ -830,14 +830,14 @@ class at {
     this.queryClient = t, this.preloadedEntities = n, this.warn = i, this.isPartialEvent = r, t !== void 0 && (this.seen === void 0 ? (this.seen = /* @__PURE__ */ new Map(), this.seenByKey = /* @__PURE__ */ new Map()) : (this.seen.clear(), this.seenByKey.clear()));
   }
 }
-function se(e, t, n) {
+function oe(e, t, n) {
   return M(e, t, n, "");
 }
 function an(e, t, n) {
-  return Et(e, t, n);
+  return bt(e, t, n);
 }
 function kt(e, t, n, i) {
-  const r = e >> _t;
+  const r = e >> wt;
   if ((e & d.IS_EAGER_FORMAT) !== 0)
     try {
       return new Y(t, r, !0);
@@ -871,7 +871,7 @@ function M(e, t, n, i) {
     return e;
   }
   if (typeof r == "number") {
-    const c = It(e);
+    const c = Ft(e);
     if ((r & c) === 0) {
       if ((r & d.UNDEFINED) !== 0) {
         n.warn("Invalid value for optional type, defaulting to undefined", { value: e, path: i });
@@ -882,7 +882,7 @@ function M(e, t, n, i) {
     return (r & d.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? kt(r, e, n, i) : e;
   }
   const s = r.mask, o = r._liveConfig;
-  if (o !== void 0 && o.type === lt.Value)
+  if (o !== void 0 && o.type === ht.Value)
     return o.valueType !== void 0 ? M(e, o.valueType, n, i) : e;
   if ((s & d.PARSE_RESULT) !== 0)
     try {
@@ -890,7 +890,7 @@ function M(e, t, n, i) {
     } catch (c) {
       return { success: !1, error: c instanceof Error ? c : new Error(String(c)) };
     }
-  const a = It(e);
+  const a = Ft(e);
   if ((s & a) === 0 && !r.values?.has(e)) {
     if ((s & d.UNDEFINED) !== 0) {
       n.warn("Invalid value for optional type, defaulting to undefined", { value: e, path: i });
@@ -898,29 +898,29 @@ function M(e, t, n, i) {
     }
     throw V(i, s, e);
   }
-  return a < d.OBJECT ? (s & d.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? kt(s, e, n, i) : e : (s & d.UNION) !== 0 ? cn(a, e, r, n, i) : a === d.ARRAY ? oe(e, r.shape, n, i) : (s & d.RECORD) !== 0 ? ae(e, r.shape, n, i) : (s & d.ENTITY) !== 0 && n.queryClient !== void 0 ? Et(e, r, n) : ce(e, r, n, i);
+  return a < d.OBJECT ? (s & d.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? kt(s, e, n, i) : e : (s & d.UNION) !== 0 ? cn(a, e, r, n, i) : a === d.ARRAY ? ae(e, r.shape, n, i) : (s & d.RECORD) !== 0 ? ce(e, r.shape, n, i) : (s & d.ENTITY) !== 0 && n.queryClient !== void 0 ? bt(e, r, n) : fe(e, r, n, i);
 }
 function cn(e, t, n, i, r) {
   if (e === d.ARRAY) {
-    const s = n.shape[k];
-    return s === void 0 || typeof s == "number" ? t : oe(t, s, i, r);
+    const s = n.shape[F];
+    return s === void 0 || typeof s == "number" ? t : ae(t, s, i, r);
   } else {
     const s = n.typenameField, o = s ? t[s] : void 0;
     if (o === void 0 || typeof o != "string") {
-      const c = n.shape[F];
+      const c = n.shape[k];
       if (c === void 0)
         throw new Error(
           `Typename field '${s}' is required for union discrimination but was not found in the data`
         );
-      return ae(t, c, i, r);
+      return ce(t, c, i, r);
     }
     const a = n.shape[o];
     if (a === void 0 || typeof a == "number")
       throw new Error(`Unknown typename '${o}' in union`);
-    return a.mask & d.ENTITY && i.queryClient !== void 0 ? Et(t, a, i) : ce(t, a, i, r);
+    return a.mask & d.ENTITY && i.queryClient !== void 0 ? bt(t, a, i) : fe(t, a, i, r);
   }
 }
-function oe(e, t, n, i) {
+function ae(e, t, n, i) {
   const r = [];
   for (let s = 0; s < e.length; s++)
     try {
@@ -934,20 +934,20 @@ function oe(e, t, n, i) {
     }
   return r;
 }
-function ae(e, t, n, i) {
-  for (const [r, s] of wt(e))
+function ce(e, t, n, i) {
+  for (const [r, s] of Et(e))
     e[r] = M(s, t, n, `${i}["${r}"]`);
   return e;
 }
-function ce(e, t, n, i) {
-  if (O.has(e))
+function fe(e, t, n, i) {
+  if (S.has(e))
     return e;
   const r = t.shape;
-  for (const [s, o] of wt(r))
+  for (const [s, o] of Et(r))
     e[s] = M(e[s], o, n, `${i}.${s}`);
   return e;
 }
-function Et(e, t, n) {
+function bt(e, t, n) {
   const i = n.queryClient, r = n.preloadedEntities;
   let s, o;
   if (r !== void 0)
@@ -977,7 +977,7 @@ function Et(e, t, n) {
   };
   n.seen.set(c, u), n.seenByKey.set(s, u);
   const h = `[[${t.typenameValue}:${o}]]`, g = t.shape;
-  for (const [p, _] of wt(g))
+  for (const [p, _] of Et(g))
     l && !(p in e) || (c[p] = M(e[p], _, n, `${h}.${p}`));
   return c;
 }
@@ -989,7 +989,7 @@ function un(e, t, n) {
   for (const i of Object.keys(t)) {
     if (i === n) continue;
     const r = t[i];
-    if (r instanceof m) {
+    if (r instanceof v) {
       if ((r.mask & d.UNDEFINED) !== 0) continue;
       if (!(i in e) || e[i] === void 0) return !1;
     } else if (typeof r == "number") {
@@ -1000,10 +1000,10 @@ function un(e, t, n) {
   return !0;
 }
 const dn = Object.prototype, W = /* @__PURE__ */ new WeakMap();
-function x(e) {
+function A(e) {
   if (typeof e != "object" || e === null) return e;
-  if (tt.has(e)) return x(e.getValue());
-  if (O.has(e)) return e;
+  if (et.has(e)) return A(e.getValue());
+  if (S.has(e)) return e;
   if (Array.isArray(e)) {
     let t = W.get(e);
     return t === void 0 && (t = new Proxy(e, ln), W.set(e, t)), t;
@@ -1019,7 +1019,7 @@ const ln = {
     if (typeof t == "string") {
       const i = Number(t);
       if (Number.isInteger(i) && i >= 0 && i < e.length)
-        return x(e[i]);
+        return A(e[i]);
     }
     return Reflect.get(e, t, n);
   },
@@ -1031,7 +1031,7 @@ const ln = {
   }
 }, hn = {
   get(e, t, n) {
-    return typeof t == "string" ? x(e[t]) : Reflect.get(e, t, n);
+    return typeof t == "string" ? A(e[t]) : Reflect.get(e, t, n);
   },
   set() {
     throw new Error("Cannot mutate a read-only object");
@@ -1060,7 +1060,7 @@ const ln = {
   return o ? a : s;
 };
 De(
-  pt,
+  gt,
   yn
 );
 class pn {
@@ -1081,7 +1081,7 @@ class pn {
   _extraMethods;
   _extraGetters;
   constructor(t, n, i, r, s, o) {
-    this._notifier = dt(), this._queryClient = o, this.key = t, this.typename = n, this.id = i, this.idField = r, this.data = s, this.entityRefs = void 0;
+    this._notifier = Z(), this._queryClient = o, this.key = t, this.typename = n, this.id = i, this.idField = r, this.data = s, this.entityRefs = void 0;
   }
   retain() {
     this.refCount++;
@@ -1093,7 +1093,7 @@ class pn {
     if (this.refCount < 0)
       throw new Error(`Entity ${this.typename}:${this.id} released more times than retained`);
     const t = this._entityCache?.gcTime;
-    t !== void 0 ? this._queryClient.gcManager.schedule(this.key, t, Z.Entity) : this.evict();
+    t !== void 0 ? this._queryClient.gcManager.schedule(this.key, t, tt.Entity) : this.evict();
   }
   evict() {
     const t = this.liveCollections.slice();
@@ -1127,7 +1127,7 @@ class pn {
   getProxy(t) {
     const n = t;
     let i = this._proxies.get(n);
-    return i === void 0 && (i = mn(this, this.key, t, this._notifier, this._queryClient), this._proxies.set(n, i)), i;
+    return i === void 0 && (i = vn(this, this.key, t, this._notifier, this._queryClient), this._proxies.set(n, i)), i;
   }
   get proxy() {
     return this._proxies.values().next().value;
@@ -1149,34 +1149,34 @@ function gn(e, t, n) {
   const i = [];
   for (const r of e) {
     if (typeof r != "object" || r === null) continue;
-    const s = O.get(r);
+    const s = S.get(r);
     if (s === void 0) continue;
     const o = n.entityMap.getEntity(s);
     o !== void 0 && o.satisfiesDef(t) && i.push(r);
   }
   return i;
 }
-function mn(e, t, n, i, r) {
-  const s = n.shape ?? {}, o = n, a = o._methods, c = o._entityClass, f = o._entityConfig, l = c ? c.prototype : pt.prototype, u = n.typenameField, h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), p = () => ({ __entityRef: t });
+function vn(e, t, n, i, r) {
+  const s = n.shape ?? {}, o = n, a = o._methods, c = o._entityClass, f = o._entityConfig, l = c ? c.prototype : gt.prototype, u = n.typenameField, h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), p = () => ({ __entityRef: t });
   let _;
-  f?.hasSubscribe && a && "__subscribe" in a && (_ = $t((E) => {
+  f?.hasSubscribe && a && "__subscribe" in a && (_ = Lt((E) => {
     const y = (w) => {
       w.__eventSource = t, r.applyMutationEvent(w);
-    }, b = a.__subscribe.call(v, y);
-    return E.value = v, b;
+    }, b = a.__subscribe.call(m, y);
+    return E.value = m, b;
   }));
-  let v;
+  let m;
   if (u && !(u in s))
     throw new Error(`typenameField "${u}" must be declared in the entity shape`);
-  const S = Object.keys(s);
-  if (S.includes("__typename") || S.push("__typename"), a)
+  const O = Object.keys(s);
+  if (O.includes("__typename") || O.push("__typename"), a)
     for (const E of Object.keys(a))
-      S.includes(E) || S.push(E);
-  let T, R = S;
+      O.includes(E) || O.push(E);
+  let T, R = O;
   function U() {
     const E = e._extraMethods;
     if (E !== T) {
-      if (T = E, R = S.slice(), E !== void 0)
+      if (T = E, R = O.slice(), E !== void 0)
         for (const b of Object.keys(E))
           R.includes(b) || R.push(b);
       const y = e._extraGetters;
@@ -1199,40 +1199,40 @@ function mn(e, t, n, i, r) {
         const D = e._extraGetters;
         if (D !== void 0 && y in D)
           return D[y]();
-        const A = e._extraMethods;
-        if (A !== void 0 && y in A) {
+        const x = e._extraMethods;
+        if (x !== void 0 && y in x) {
           let C = h.get(y);
-          return C || (C = A[y].bind(v), h.set(y, C)), C;
+          return C || (C = x[y].bind(m), h.set(y, C)), C;
         }
         if (a && y in a) {
           let C = h.get(y);
-          return C || (C = Ce(v, a[y].bind(v)), h.set(y, C)), C;
+          return C || (C = Se(m, a[y].bind(m)), h.set(y, C)), C;
         }
       }
       const w = e.data[y];
-      if (typeof w == "object" && w !== null && tt.has(w))
-        return x(w.getValue());
+      if (typeof w == "object" && w !== null && et.has(w))
+        return A(w.getValue());
       if (Array.isArray(w) && typeof y == "string") {
         const D = s[y];
-        if (D instanceof m && (D.mask & d.ARRAY) !== 0) {
-          const A = D.shape;
-          if (A instanceof m && (A.mask & d.ENTITY) !== 0) {
-            const C = A.typenameValue;
+        if (D instanceof v && (D.mask & d.ARRAY) !== 0) {
+          const x = D.shape;
+          if (x instanceof v && (x.mask & d.ENTITY) !== 0) {
+            const C = x.typenameValue;
             if (C !== void 0) {
               const Ot = r.getEntityDefsForTypename(C);
               if (Ot !== void 0 && Ot.length > 1) {
-                const et = g.get(y);
-                if (et !== void 0 && et.source === w)
-                  return x(et.filtered);
-                const St = gn(w, A, r);
-                return g.set(y, { source: w, filtered: St }), x(St);
+                const nt = g.get(y);
+                if (nt !== void 0 && nt.source === w)
+                  return A(nt.filtered);
+                const Rt = gn(w, x, r);
+                return g.set(y, { source: w, filtered: Rt }), A(Rt);
               }
             }
           }
         }
-        return x(w);
+        return A(w);
       }
-      return x(w);
+      return A(w);
     },
     set() {
       throw new Error("Entity properties are read-only");
@@ -1254,22 +1254,22 @@ function mn(e, t, n, i, r) {
       if (y === "__typename")
         return { enumerable: !0, configurable: !0, value: e.typename, writable: !1 };
       if (y in s)
-        return { enumerable: !0, configurable: !0, value: q.get(E, y, v), writable: !1 };
+        return { enumerable: !0, configurable: !0, value: q.get(E, y, m), writable: !1 };
       if (typeof y == "string") {
         const b = e._extraGetters;
         if (b && y in b)
-          return { enumerable: !0, configurable: !0, value: q.get(E, y, v), writable: !1 };
+          return { enumerable: !0, configurable: !0, value: q.get(E, y, m), writable: !1 };
         const w = e._extraMethods;
         if (w && y in w)
-          return { enumerable: !0, configurable: !0, value: q.get(E, y, v), writable: !1 };
+          return { enumerable: !0, configurable: !0, value: q.get(E, y, m), writable: !1 };
         if (a && y in a)
-          return { enumerable: !1, configurable: !0, value: q.get(E, y, v), writable: !1 };
+          return { enumerable: !1, configurable: !0, value: q.get(E, y, m), writable: !1 };
       }
     }
   };
-  return v = new Proxy({}, q), O.set(v, t), be(v, r), v;
+  return m = new Proxy({}, q), S.set(m, t), Ce(m, r), m;
 }
-class vn {
+class mn {
   instances = /* @__PURE__ */ new Map();
   persistEntity;
   constructor(t) {
@@ -1307,13 +1307,13 @@ class vn {
     this.persistEntity(t.key, t.data, n);
   }
 }
-class fe {
+class ue {
   onlineSignal;
   manualOverride = void 0;
   eventListenersAttached = !1;
   constructor(t) {
     const n = t ?? this.detectOnlineStatus();
-    this.onlineSignal = Lt(n), this.canAttachListeners() && this.attachEventListeners();
+    this.onlineSignal = Ut(n), this.canAttachListeners() && this.attachEventListeners();
   }
   /**
    * Returns true if the network is currently online
@@ -1371,8 +1371,8 @@ class fe {
     }, window.addEventListener("online", this.handleOnline), window.addEventListener("offline", this.handleOffline), this.eventListenersAttached = !0);
   }
 }
-class ue {
-  static onlineSignal = Lt(!0);
+class de {
+  static onlineSignal = Ut(!0);
   get isOnline() {
     return !0;
   }
@@ -1381,13 +1381,13 @@ class ue {
   clearManualOverride() {
   }
   getOnlineSignal() {
-    return ue.onlineSignal;
+    return de.onlineSignal;
   }
   destroy() {
   }
 }
-const _n = new fe(), Ln = Ut(_n);
-function bt(e, t = typeof window > "u") {
+const _n = new ue(), Ln = qt(_n);
+function Ct(e, t = typeof window > "u") {
   let n;
   e === !1 ? n = 0 : e === void 0 || e === !0 ? n = t ? 0 : 3 : typeof e == "number" ? n = e : n = e.retries;
   const i = typeof e == "object" && e.retryDelay ? e.retryDelay : (r) => 1e3 * Math.pow(2, r);
@@ -1403,94 +1403,94 @@ class Un {
   params;
   config;
   constructor() {
-    return Yt(this);
+    return Gt(this);
   }
 }
-const Ft = /* @__PURE__ */ new WeakMap();
+const Mt = /* @__PURE__ */ new WeakMap();
 class H {
   constructor(t, n) {
     this.captured = n, this.statics = t;
   }
   statics;
   createExecutionContext(t, n) {
-    return rt(this.captured, t, n);
+    return ot(this.captured, t, n);
   }
   resolveOptions(t) {
-    const { methods: n } = this.captured, i = n.getConfig ? n.getConfig.call(t) : t.config, r = bt(i?.retry);
+    const { methods: n } = this.captured, i = n.getConfig ? n.getConfig.call(t) : t.config, r = Ct(i?.retry);
     return { config: i, retryConfig: r };
   }
   static for(t) {
-    let n = Ft.get(t);
+    let n = Mt.get(t);
     if (n !== void 0)
       return n;
-    const i = new t(), r = $e(i), s = String(r.methods.getIdentityKey.call(r.fields)), o = r.fields.result, a = o instanceof m ? o : sn.object(o), c = (a.mask & d.ENTITY) !== 0, f = t.cache, l = r.fields.fetchNext, u = t.adapter;
+    const i = new t(), r = $e(i), s = String(r.methods.getIdentityKey.call(r.fields)), o = r.fields.result, a = o instanceof v ? o : sn.object(o), c = (a.mask & d.ENTITY) !== 0, f = t.cache, l = r.fields.fetchNext, u = t.adapter;
     if (!u)
       throw new Error(
         `Query class "${t.name}" must define a static \`adapter\` property. Extend RESTQuery (from fetchium/rest) or set \`static adapter = MyAdapter\` on your query class.`
       );
-    const h = typeof u.prototype.sendNext == "function", g = c ? a : new m(
+    const h = typeof u.prototype.sendNext == "function", g = c ? a : new v(
       d.ENTITY | d.OBJECT,
       a.shape,
       void 0,
       void 0,
       s,
       // typenameValue — unique per query class
-      Vt
+      Kt
       // idField — symbol, injected onto payload before parse
     );
     return n = new H(
       { id: s, shape: g, cache: f, rawFetchNext: l, hasSendNext: h, isEntityResult: c, adapterClass: u },
       r
-    ), Ft.set(t, n), n;
+    ), Mt.set(t, n), n;
   }
 }
 const qn = (e, t) => {
   const n = H.for(e);
-  return Ct(n, t);
+  return St(n, t);
 };
 function Vn(e, ...t) {
-  const n = H.for(e), i = Oe(kn);
+  const n = H.for(e), i = Oe(Fn);
   if (i === void 0)
     throw new Error("QueryClient not found");
   const r = t[0];
   return i.getQuery(n, r);
 }
-function ct(e) {
+function ut(e) {
   if (e.reason !== void 0) return e.reason;
   if (typeof DOMException < "u")
     return new DOMException("The operation was aborted", "AbortError");
   const t = new Error("The operation was aborted");
   return t.name = "AbortError", t;
 }
-function de(e, t) {
+function le(e, t) {
   return new Promise((n, i) => {
     if (t?.aborted) {
-      i(ct(t));
+      i(ut(t));
       return;
     }
     const r = setTimeout(n, e);
     t?.addEventListener(
       "abort",
       () => {
-        clearTimeout(r), i(ct(t));
+        clearTimeout(r), i(ut(t));
       },
       { once: !0 }
     );
   });
 }
-async function ft(e, t, n) {
+async function dt(e, t, n) {
   if (t.retries < 0)
     throw new Error("retries must be non-negative");
   const i = Math.max(0, t.retries);
   let r;
   for (let s = 0; s <= i; s++) {
     if (n?.aborted)
-      throw ct(n);
+      throw ut(n);
     try {
       return await e();
     } catch (o) {
       if (r = o, s >= i) throw o;
-      await de(t.retryDelay(s), n);
+      await le(t.retryDelay(s), n);
     }
   }
   throw r;
@@ -1506,14 +1506,24 @@ class wn {
   updatedAt = void 0;
   params = void 0;
   unsubscribe = void 0;
+  lastSubscribeFn = void 0;
   _relayState = void 0;
   _isActive = !1;
   wasPaused = !1;
   currentParams = void 0;
   debounceTimer = void 0;
-  /** Resolved per-instance options (depend on actual params). */
-  config = void 0;
-  retryConfig = bt(void 0);
+  // Invalidates on any signal consumed by getConfig() (such as
+  // responseNotifier, fired by the adapter after each fetch). Param
+  // changes are handled separately: getOrCreateExecutionContext
+  // replaces this wholesale to force recomputation against the new ctx.
+  _resolvedOptions = st(() => this.def.resolveOptions(this._executionCtx));
+  get config() {
+    if (this._executionCtx !== void 0)
+      return this._resolvedOptions.value.config;
+  }
+  get retryConfig() {
+    return this._executionCtx === void 0 ? Ct(void 0) : this._resolvedOptions.value.retryConfig;
+  }
   /** Cancels in-flight fetches and retry waits. */
   _abortController = void 0;
   /** Cached execution context, recreated only when storageKey (params) changes. */
@@ -1536,14 +1546,14 @@ class wn {
   }
   constructor(t, n, i, r) {
     this.def = t, this.queryClient = n, this.queryKey = i, this.params = r, this._extraMethods = { __refetch: this.refetch }, t.statics.hasSendNext && (this._extraMethods.__fetchNext = this.fetchNext);
-    const s = jt(r);
-    this._queryId = s !== void 0 ? N(s) : 0, this.relay = $t(
+    const s = $t(r);
+    this._queryId = s !== void 0 ? N(s) : 0, this.relay = Lt(
       (o) => {
         this._relayState = o;
         const a = () => {
-          this._isActive = !1, clearTimeout(this.debounceTimer), this.debounceTimer = void 0, this._abortController?.abort(), this._abortController = void 0, this._fetchNextAbort?.abort(), this._fetchNextAbort = void 0, this._fetchNextPromise = void 0, this.unsubscribe?.(), this.unsubscribe = void 0;
-          const f = this.config?.gcTime ?? qt;
-          this.queryClient.gcManager.schedule(this.queryKey, f, Z.Query);
+          this._isActive = !1, clearTimeout(this.debounceTimer), this.debounceTimer = void 0, this._abortController?.abort(), this._abortController = void 0, this._fetchNextAbort?.abort(), this._fetchNextAbort = void 0, this._fetchNextPromise = void 0, this.unsubscribe?.(), this.unsubscribe = void 0, this.lastSubscribeFn = void 0;
+          const f = this.config?.gcTime ?? Vt;
+          this.queryClient.gcManager.schedule(this.queryKey, f, tt.Query);
         }, c = (f = !1) => {
           const { wasPaused: l, isPaused: u, initialized: h } = this;
           if (this.wasPaused = u, u && !l && h) {
@@ -1551,8 +1561,8 @@ class wn {
             return;
           }
           this._isActive = !0;
-          const g = jt(this.params), p = Ct(this.def, g), _ = p !== this.storageKey;
-          _ && (this.currentParams = g, this.storageKey = p), this.getOrCreateExecutionContext(), this.initialized ? l || f ? (this.queryClient.activateQuery(this), f && this.updatedAt !== void 0 && this.setupSubscription(), this.relayState.isPending && this._abortController === void 0 ? this.runQueryImmediately() : (this.config?.refreshStaleOnReconnect ?? !0) && this.isStale && this.runDebounced()) : _ && (this.setupSubscription(), this.runDebounced()) : (this.queryClient.activateQuery(this), this.initialize());
+          const g = $t(this.params), p = St(this.def, g), _ = p !== this.storageKey;
+          _ && (this.currentParams = g, this.storageKey = p), this.getOrCreateExecutionContext(), this.initialized ? l || f ? (this.queryClient.activateQuery(this), f && this.updatedAt !== void 0 && this.reconcileSubscription(), this.relayState.isPending && this._abortController === void 0 ? this.runQueryImmediately() : (this.config?.refreshStaleOnReconnect ?? !0) && this.isStale && this.runDebounced()) : _ && (this.lastSubscribeFn = void 0, this.reconcileSubscription(), this.runDebounced()) : (this.queryClient.activateQuery(this), this.initialize());
         };
         return c(!0), {
           update: c,
@@ -1600,18 +1610,17 @@ class wn {
     }
     if (!this.isPaused)
       try {
-        if (i !== void 0 && this.setupSubscription(), i === void 0 || this.isStale) {
-          if (await de(0), this.isPaused) return;
+        if (i !== void 0 && this.reconcileSubscription(), i === void 0 || this.isStale) {
+          if (await le(0), this.isPaused) return;
           this.runQueryImmediately();
         }
       } catch (r) {
         n.setError(r);
       }
   }
-  setupSubscription() {
-    this.unsubscribe?.(), this.unsubscribe = void 0;
+  reconcileSubscription() {
     const t = this.config?.subscribe;
-    if (!t) return;
+    if (t === this.lastSubscribeFn || (this.unsubscribe?.(), this.unsubscribe = void 0, this.lastSubscribeFn = t, !t)) return;
     const n = this._executionCtx;
     this.unsubscribe = t.call(n, (i) => {
       i.__eventSource = this.queryKey, this.queryClient.applyMutationEvent(i);
@@ -1621,23 +1630,23 @@ class wn {
     return (this._executionCtx === void 0 || this._executionCtxKey !== this.storageKey) && (this._executionCtxKey = this.storageKey, this._executionCtx = this.def.createExecutionContext(
       this.currentParams ?? {},
       this.queryClient.getContext()
-    ), this._executionCtx.refetch = () => this.refetch(), this._executionCtx.rawFetchNext = this.def.statics.rawFetchNext), this.resolveAndApplyOptions(), this._executionCtx;
-  }
-  resolveAndApplyOptions() {
-    const t = this.def.resolveOptions(this._executionCtx);
-    this.config = t.config, this.retryConfig = t.retryConfig;
+    ), this._executionCtx.refetch = () => this.refetch(), this._executionCtx.rawFetchNext = this.def.statics.rawFetchNext, this._resolvedOptions = st(() => this.def.resolveOptions(this._executionCtx))), this._executionCtx;
   }
   async runQuery() {
     const t = this.def;
     if (this.isPaused)
       throw new Error("Query is paused due to network status");
     const n = this.getOrCreateExecutionContext(), i = this.queryClient.getAdapter(t.statics.adapterClass), r = this._abortController?.signal ?? new AbortController().signal;
-    return ft(
+    return dt(
       async () => {
-        const s = await i.send(n, r);
-        this.updatedAt = Date.now();
-        const o = this.applyData(s, !0);
-        return this.saveQueryMetadata(), this.unsubscribe === void 0 && this.setupSubscription(), o;
+        try {
+          const s = await i.send(n, r);
+          this.updatedAt = Date.now();
+          const o = this.applyData(s, !0);
+          return this.saveQueryMetadata(), o;
+        } finally {
+          this.reconcileSubscription();
+        }
       },
       this.retryConfig,
       r
@@ -1688,7 +1697,7 @@ class wn {
     const n = this._fetchNextAbort.signal, i = this.getOrCreateExecutionContext();
     i.resultData = this.rootEntity.data;
     const r = this.queryClient.getAdapter(t.statics.adapterClass);
-    return ft(
+    return dt(
       async () => {
         const s = await r.sendNext(i, n);
         this.updatedAt = Date.now();
@@ -1732,7 +1741,7 @@ class En {
     this.def = t, this.queryClient = n, this.task = this.createTask();
   }
   createTask() {
-    return Se(
+    return Re(
       async (t) => {
         if (this._inFlight)
           throw new Error("A mutation is already in progress. Await the previous call before starting a new one.");
@@ -1749,11 +1758,11 @@ class En {
   }
   validateResponse(t) {
     const n = this.def.responseShape;
-    if (!(n instanceof m))
+    if (!(n instanceof v))
       return t;
     const i = this.queryClient.getContext().log?.warn ?? (() => {
-    }), r = new at();
-    return r.reset(void 0, void 0, i), se(t, n, r);
+    }), r = new ft();
+    return r.reset(void 0, void 0, i), oe(t, n, r);
   }
   // ======================================================
   // Effects processing
@@ -1761,7 +1770,7 @@ class En {
   processEffects(t, n) {
     let i;
     if (this.def.hasGetEffects) {
-      const s = rt(
+      const s = ot(
         this.def.captured,
         t ?? {},
         this.queryClient.getContext()
@@ -1773,19 +1782,19 @@ class En {
     }
     if (i === void 0) return;
     const r = this.queryClient;
-    nt(i.creates, "create", r), nt(i.updates, "update", r), nt(i.deletes, "delete", r), i.invalidates && r.invalidateQueries(i.invalidates);
+    it(i.creates, "create", r), it(i.updates, "update", r), it(i.deletes, "delete", r), i.invalidates && r.invalidateQueries(i.invalidates);
   }
   // ======================================================
   // Retry logic
   // ======================================================
   executeWithRetry(t) {
-    const n = bt(this.def.config?.retry, !0), i = this.queryClient.getAdapter(this.def.adapterClass);
+    const n = Ct(this.def.config?.retry, !0), i = this.queryClient.getAdapter(this.def.adapterClass);
     if (!i.sendMutation)
       throw new Error(
         `Adapter "${this.def.adapterClass.name}" does not implement sendMutation(). Add a sendMutation() method to handle mutations.`
       );
-    return ft(async () => {
-      const r = new AbortController(), s = rt(
+    return dt(async () => {
+      const r = new AbortController(), s = ot(
         this.def.captured,
         t ?? {},
         this.queryClient.getContext()
@@ -1797,21 +1806,21 @@ class En {
 function bn(e) {
   return typeof e == "string" ? e : $(e).typenameValue;
 }
-function nt(e, t, n) {
+function it(e, t, n) {
   if (e)
     for (const [i, r] of e) {
       const s = bn(i);
       s !== void 0 && n.applyMutationEvent({ type: t, typename: s, data: r });
     }
 }
-const le = "__eventSource";
-function he(e) {
+const he = "__eventSource";
+function ye(e) {
   return { field: e, segments: e.indexOf(".") !== -1 ? e.split(".") : void 0 };
 }
 function Cn(e) {
-  return e.map(he);
+  return e.map(ye);
 }
-function On(e, t) {
+function Sn(e, t) {
   if (t.segments === void 0) return e[t.field];
   let n = e;
   for (const i of t.segments) {
@@ -1820,16 +1829,16 @@ function On(e, t) {
   }
   return n;
 }
-function ye(e, t) {
+function pe(e, t) {
   const n = [];
   for (let i = 0; i < t.length; i++) {
-    const r = t[i], s = On(e, r);
+    const r = t[i], s = Sn(e, r);
     if (s === void 0) return;
     n.push(r.field, s);
   }
   return N(n);
 }
-function Sn(e, t) {
+function On(e, t) {
   if (e === void 0) return;
   const n = /* @__PURE__ */ new Map();
   for (const [i, r] of e) {
@@ -1837,9 +1846,9 @@ function Sn(e, t) {
     let a = !0;
     for (const [c, f] of s) {
       let l;
-      if (Bt(f)) {
-        const u = Qt(f);
-        l = yt(u, t);
+      if (Qt(f)) {
+        const u = Yt(f);
+        l = pt(u, t);
       } else
         l = f;
       if (l === void 0) {
@@ -1852,7 +1861,7 @@ function Sn(e, t) {
   }
   return n.size > 0 ? n : void 0;
 }
-function Mt(e, t) {
+function Tt(e, t) {
   const n = e.get(t);
   if (n !== void 0)
     return n.map(([i]) => i).sort();
@@ -1862,7 +1871,7 @@ class Rn {
   fieldPaths;
   _bindings = /* @__PURE__ */ new Map();
   constructor(t) {
-    this.fields = t, this.fieldPaths = t.map(he);
+    this.fields = t, this.fieldPaths = t.map(ye);
   }
   register(t, n) {
     let i = this._bindings.get(t);
@@ -1879,13 +1888,13 @@ class Rn {
     return this._bindings.size === 0;
   }
 }
-function Tt(e) {
+function Pt(e) {
   return N(e);
 }
-class An {
+class xn {
   _groups = /* @__PURE__ */ new Map();
   getOrCreateGroup(t) {
-    const n = Tt(t);
+    const n = Pt(t);
     let i = this._groups.get(n);
     return i === void 0 && (i = new Rn(t), this._groups.set(n, i)), i;
   }
@@ -1893,24 +1902,24 @@ class An {
     this.getOrCreateGroup(n).register(t, i);
   }
   unregister(t, n, i) {
-    const r = Tt(n), s = this._groups.get(r);
+    const r = Pt(n), s = this._groups.get(r);
     s !== void 0 && (s.unregister(t, i), s.isEmpty && this._groups.delete(r));
   }
   registerBinding(t, n) {
     const i = t._constraintHashes.get(n);
     if (i === void 0) return;
-    const r = Mt(t._constraintFieldRefs, n);
+    const r = Tt(t._constraintFieldRefs, n);
     r !== void 0 && this.register(i, r, t);
   }
   unregisterBinding(t, n) {
     const i = t._constraintHashes.get(n);
     if (i === void 0) return;
-    const r = Mt(t._constraintFieldRefs, n);
+    const r = Tt(t._constraintFieldRefs, n);
     r !== void 0 && this.unregister(i, r, t);
   }
   routeEvent(t, n, i, r, s, o) {
     for (const a of this._groups.values()) {
-      const c = ye(n, a.fieldPaths);
+      const c = pe(n, a.fieldPaths);
       if (c === void 0) continue;
       const f = a.getMatching(c);
       if (f !== void 0)
@@ -1919,7 +1928,7 @@ class An {
     }
   }
 }
-function Pt(e) {
+function jt(e) {
   const t = /* @__PURE__ */ new Set();
   for (const n of e)
     if (typeof n == "object" && n !== null) {
@@ -1928,7 +1937,7 @@ function Pt(e) {
     }
   return t;
 }
-class pe {
+class ge {
   _queryClient;
   _parent;
   _constraintHashes;
@@ -1939,7 +1948,7 @@ class pe {
     this._queryClient = i, this._parent = r, this._constraintHashes = s, this._constraintFieldRefs = n, this.instance = o, this._entityDefsByTypename = /* @__PURE__ */ new Map();
     for (const a of t)
       a.typenameValue !== void 0 && this._entityDefsByTypename.set(a.typenameValue, a);
-    tt.add(this);
+    et.add(this);
   }
   getValue() {
     return this.instance.getValue();
@@ -1978,7 +1987,7 @@ class pe {
     n !== -1 && t.splice(n, 1);
   }
 }
-class xn {
+class An {
   _notifier;
   _items;
   _keys;
@@ -1986,9 +1995,9 @@ class xn {
   _queryClient;
   _parent;
   constructor(t, n, i, r, s, o) {
-    this._notifier = dt(), this._items = i, this._keys = Pt(i), this._queryClient = t, this._parent = n;
+    this._notifier = Z(), this._items = i, this._keys = jt(i), this._queryClient = t, this._parent = n;
     const a = r !== void 0 && s !== void 0, c = o !== void 0;
-    (a || c) && (this._outputSignal = Re(() => {
+    (a || c) && (this._outputSignal = st(() => {
       this._notifier.consume();
       let f = this._items;
       if (a) {
@@ -2008,7 +2017,7 @@ class xn {
             l.push(u);
             continue;
           }
-          g.consume(), ye(g.data, r) === s && l.push(u);
+          g.consume(), pe(g.data, r) === s && l.push(u);
         }
         f = l;
       }
@@ -2053,7 +2062,7 @@ class xn {
   }
   reset(t) {
     const n = this._items, i = Array.isArray(t) ? t : [];
-    this._items = i, this._keys = Pt(i);
+    this._items = i, this._keys = jt(i);
     for (const r of i)
       if (typeof r == "object" && r !== null) {
         const s = P(r);
@@ -2100,7 +2109,7 @@ class Nn {
   _onUpdate;
   _onDelete;
   constructor(t, n, i, r, s, o) {
-    this._notifier = dt(), this._value = i, this._createdKeys = /* @__PURE__ */ new Set(), this._deletedKeys = /* @__PURE__ */ new Set(), this._queryClient = t, this._parent = n, this._onCreate = r, this._onUpdate = s, this._onDelete = o;
+    this._notifier = Z(), this._value = i, this._createdKeys = /* @__PURE__ */ new Set(), this._deletedKeys = /* @__PURE__ */ new Set(), this._queryClient = t, this._parent = n, this._onCreate = r, this._onUpdate = s, this._onDelete = o;
   }
   onEvent(t, n, i, r) {
     switch (r) {
@@ -2130,18 +2139,18 @@ class Nn {
   append(t) {
   }
 }
-function ge(e, t, n, i, r) {
+function ve(e, t, n, i, r) {
   let s = e.constraintFieldRefs;
   if (s === void 0) {
     s = /* @__PURE__ */ new Map();
     for (const f of e.entityDefs) {
       const l = f.typenameValue;
-      l !== void 0 && s.set(l, [[le, n.key]]);
+      l !== void 0 && s.set(l, [[he, n.key]]);
     }
   }
-  const o = Sn(s, i) ?? /* @__PURE__ */ new Map();
+  const o = On(s, i) ?? /* @__PURE__ */ new Map();
   let a;
-  if (e.type === lt.Array) {
+  if (e.type === ht.Array) {
     let f, l;
     if (e.constraintFieldRefs !== void 0 && o.size > 0 && o.size === 1)
       for (const [u] of e.constraintFieldRefs) {
@@ -2153,7 +2162,7 @@ function ge(e, t, n, i, r) {
           break;
         }
       }
-    a = new xn(
+    a = new An(
       r,
       n,
       Array.isArray(t) ? t : [],
@@ -2170,7 +2179,7 @@ function ge(e, t, n, i, r) {
       e.onUpdate,
       e.onDelete
     );
-  const c = new pe(
+  const c = new ge(
     e.entityDefs,
     s,
     r,
@@ -2180,8 +2189,8 @@ function ge(e, t, n, i, r) {
   );
   return n.liveCollections.push(c), r.registerLiveCollection(c), c;
 }
-const me = Object.entries, ve = Object.prototype;
-function it(e, t, n, i = !1) {
+const me = Object.entries, _e = Object.prototype;
+function rt(e, t, n, i = !1) {
   const r = e.queryClient;
   r.currentParseId++;
   const s = e.seen, o = /* @__PURE__ */ new Map();
@@ -2195,25 +2204,25 @@ function G(e, t, n, i, r, s) {
   if (Array.isArray(e)) {
     for (let a = 0; a < e.length; a++) {
       const c = e[a];
-      typeof c == "object" && c !== null && !(c instanceof Y) && !O.has(c) && (e[a] = G(c, t, n, i, r, s));
+      typeof c == "object" && c !== null && !(c instanceof Y) && !S.has(c) && (e[a] = G(c, t, n, i, r, s));
     }
     return e;
   }
-  if (Object.getPrototypeOf(e) === ve && !O.has(e)) {
+  if (Object.getPrototypeOf(e) === _e && !S.has(e)) {
     const a = e;
     for (const c of Object.keys(a)) {
       const f = a[c];
-      typeof f == "object" && f !== null && !(f instanceof Y) && !O.has(f) && (a[c] = G(f, t, n, i, r, s));
+      typeof f == "object" && f !== null && !(f instanceof Y) && !S.has(f) && (a[c] = G(f, t, n, i, r, s));
     }
   }
   return e;
 }
-function _e(e) {
-  return typeof e == "object" && e !== null && !(e instanceof Y) && !O.has(e);
+function we(e) {
+  return typeof e == "object" && e !== null && !(e instanceof Y) && !S.has(e);
 }
 function Dn(e, t, n, i, r, s) {
   const { key: o, data: a, shape: c, rawKeys: f } = e, l = c.shape, u = n.prepareEntity(o, a, c), h = u.data, g = h !== a, p = g && f !== void 0 && u.entityRefs !== void 0 ? new Map(u.entityRefs) : /* @__PURE__ */ new Map();
-  if (g ? (we(
+  if (g ? (Ee(
     l,
     a,
     h,
@@ -2225,13 +2234,13 @@ function Dn(e, t, n, i, r, s) {
     i,
     p,
     s
-  ), u.notify()) : Ee(l, a, u, a, t, n, i, p, s), s && u.liveCollections.length > 0)
-    for (const v of u.liveCollections) {
-      const S = v.instance.getRawValue();
-      if (Array.isArray(S))
-        for (const T of S) {
+  ), u.notify()) : be(l, a, u, a, t, n, i, p, s), s && u.liveCollections.length > 0)
+    for (const m of u.liveCollections) {
+      const O = m.instance.getRawValue();
+      if (Array.isArray(O))
+        for (const T of O) {
           if (typeof T != "object" || T === null) continue;
-          const R = O.get(T);
+          const R = S.get(T);
           if (R === void 0) continue;
           const U = n.entityMap.getEntity(R);
           U !== void 0 && p.set(U, (p.get(U) ?? 0) + 1);
@@ -2241,12 +2250,12 @@ function Dn(e, t, n, i, r, s) {
   const _ = u.getProxy(c);
   return r.set(u, (r.get(u) ?? 0) + 1), _;
 }
-function we(e, t, n, i, r, s, o, a, c, f, l) {
+function Ee(e, t, n, i, r, s, o, a, c, f, l) {
   for (const [u, h] of me(e))
     if (!(i !== void 0 && !i.has(u)))
-      if (_e(t[u]) && (t[u] = G(t[u], o, a, c, f, l)), h instanceof m && h._liveConfig !== void 0) {
+      if (we(t[u]) && (t[u] = G(t[u], o, a, c, f, l)), h instanceof v && h._liveConfig !== void 0) {
         const g = n[u];
-        g instanceof pe ? l ? g.append(t[u]) : g.reset(t[u]) : n[u] = ge(
+        g instanceof ge ? l ? g.append(t[u]) : g.reset(t[u]) : n[u] = ve(
           h._liveConfig,
           t[u],
           r,
@@ -2255,10 +2264,10 @@ function we(e, t, n, i, r, s, o, a, c, f, l) {
         );
       } else {
         const g = t[u], p = n[u];
-        if (ut(g) && ut(p)) {
-          const _ = h instanceof m && h.shape !== void 0 ? h.shape : void 0;
+        if (lt(g) && lt(p)) {
+          const _ = h instanceof v && h.shape !== void 0 ? h.shape : void 0;
           if (_ !== void 0)
-            we(
+            Ee(
               _,
               g,
               p,
@@ -2272,18 +2281,18 @@ function we(e, t, n, i, r, s, o, a, c, f, l) {
               l
             );
           else
-            for (const v of Object.keys(g))
-              p[v] = g[v];
+            for (const m of Object.keys(g))
+              p[m] = g[m];
           n[u] = p;
         } else
           n[u] = g;
       }
 }
-function Ee(e, t, n, i, r, s, o, a, c) {
+function be(e, t, n, i, r, s, o, a, c) {
   for (const [f, l] of me(e))
     if (f in t)
-      if (_e(t[f]) && (t[f] = G(t[f], r, s, o, a, c)), l instanceof m && l._liveConfig !== void 0)
-        t[f] = ge(
+      if (we(t[f]) && (t[f] = G(t[f], r, s, o, a, c)), l instanceof v && l._liveConfig !== void 0)
+        t[f] = ve(
           l._liveConfig,
           t[f],
           n,
@@ -2292,23 +2301,23 @@ function Ee(e, t, n, i, r, s, o, a, c) {
         );
       else {
         const u = t[f];
-        if (ut(u)) {
-          const h = l instanceof m && l.shape !== void 0 ? l.shape : void 0;
-          h !== void 0 && Ee(h, u, n, i, r, s, o, a, c);
+        if (lt(u)) {
+          const h = l instanceof v && l.shape !== void 0 ? l.shape : void 0;
+          h !== void 0 && be(h, u, n, i, r, s, o, a, c);
         }
       }
 }
-function ut(e) {
-  return typeof e == "object" && e !== null && !Array.isArray(e) && Object.getPrototypeOf(e) === ve && !O.has(e);
+function lt(e) {
+  return typeof e == "object" && e !== null && !Array.isArray(e) && Object.getPrototypeOf(e) === _e && !S.has(e);
 }
 function Kn(e) {
   if (e !== void 0)
     return typeof e == "string" ? e : typeof e == "function" ? e() : e.value;
 }
 function In(e) {
-  return Ae(e);
+  return xe(e);
 }
-function jt(e) {
+function $t(e) {
   if (e === void 0)
     return;
   const t = {};
@@ -2316,7 +2325,7 @@ function jt(e) {
     In(i) ? t[n] = i.value : t[n] = i;
   return t;
 }
-const Ct = (e, t) => N([e.statics.id, t]);
+const St = (e, t) => N([e.statics.id, t]);
 class Bn {
   entityMap;
   queryInstances = /* @__PURE__ */ new Map();
@@ -2334,7 +2343,7 @@ class Bn {
   networkUnsubscribe;
   constructor(t = {}) {
     const {
-      store: n = new Ie(new ke()),
+      store: n = new Ie(new Fe()),
       log: i,
       evictionMultiplier: r,
       adapters: s,
@@ -2342,10 +2351,10 @@ class Bn {
       gcManager: a,
       ...c
     } = t;
-    this.isServer = typeof window > "u", this.store = n, this.context = { ...c, log: i ?? console, evictionMultiplier: r }, this.gcManager = t.gcManager ?? (this.isServer ? new Te() : new Me(this.handleEviction, r)), this.networkManager = t.networkManager ?? new fe(), this.entityMap = new vn((u, h, g) => this.store.saveEntity(u, h, g));
+    this.isServer = typeof window > "u", this.store = n, this.context = { ...c, log: i ?? console, evictionMultiplier: r }, this.gcManager = t.gcManager ?? (this.isServer ? new Te() : new Me(this.handleEviction, r)), this.networkManager = t.networkManager ?? new ue(), this.entityMap = new mn((u, h, g) => this.store.saveEntity(u, h, g));
     for (const u of t.adapters ?? [])
       this.adapters.set(u.constructor, u), u.register(this);
-    const f = this.networkManager.getOnlineSignal(), l = xe(() => f.value);
+    const f = this.networkManager.getOnlineSignal(), l = Ae(() => f.value);
     this.networkUnsubscribe = l.addListener(
       () => {
         const u = f.value;
@@ -2421,7 +2430,7 @@ class Bn {
     if (n !== void 0) return n;
     const i = this.typenameRegistry.get(t);
     if (i !== void 0)
-      return n = m.merge(i), this.mergedDefCache.set(t, n), n;
+      return n = v.merge(i), this.mergedDefCache.set(t, n), n;
   }
   saveQueryData(t, n, i, r, s) {
     const o = s !== void 0 && s.size > 0 ? new Set([...s.keys()].map((a) => a.key)) : void 0;
@@ -2430,7 +2439,7 @@ class Bn {
   activateQuery(t) {
     const { def: n, queryKey: i, storageKey: r, config: s } = t;
     this.store.activateQuery(n, r);
-    const o = s?.gcTime ?? qt;
+    const o = s?.gcTime ?? Vt;
     this.gcManager.cancel(i, o);
   }
   loadCachedQuery(t, n) {
@@ -2441,7 +2450,7 @@ class Bn {
    * that triggers fetches and prepopulates with cached data
    */
   getQuery(t, n) {
-    const i = Ct(t, n);
+    const i = St(t, n);
     let r = this.queryInstances.get(i);
     return r === void 0 && (r = new wn(t, this, i, n), this.queryInstances.set(i, r)), r.relay;
   }
@@ -2460,8 +2469,8 @@ class Bn {
    */
   parseData(t, n, i) {
     const r = this.context.log?.warn ?? (() => {
-    }), s = new at();
-    return s.reset(this, i, r), { data: se(t, n, s), ctx: s };
+    }), s = new ft();
+    return s.reset(this, i, r), { data: oe(t, n, s), ctx: s };
   }
   /**
    * Apply entities from parseData() via a single depth-first walk: creates/
@@ -2469,7 +2478,7 @@ class Bn {
    * refs. Returns the reified data and root-level entity refs.
    */
   applyRefs(t, n = !0, i = !1) {
-    return it(t.ctx, t.data, n, i);
+    return rt(t.ctx, t.data, n, i);
   }
   /**
    * Parse and apply data as a root entity. For non-entity results, injects
@@ -2477,8 +2486,8 @@ class Bn {
    * found in the store by the standard entity pipeline).
    */
   parseAndApplyRootEntity(t, n, i, r, s = !1, o) {
-    typeof i.idField == "symbol" && typeof t == "object" && t !== null && !("__entityRef" in t) && (t[Vt] = n);
-    const a = this.parseData(t, i, o), c = it(a.ctx, a.data, r, s), f = O.get(c.data);
+    typeof i.idField == "symbol" && typeof t == "object" && t !== null && !("__entityRef" in t) && (t[Kt] = n);
+    const a = this.parseData(t, i, o), c = rt(a.ctx, a.data, r, s), f = S.get(c.data);
     return this.entityMap.getEntity(f);
   }
   prepareEntity(t, n, i) {
@@ -2502,20 +2511,20 @@ class Bn {
     }
     try {
       const _ = this.context.log?.warn ?? (() => {
-      }), v = new at();
-      v.reset(
+      }), m = new ft();
+      m.reset(
         this,
         void 0,
         _,
         /* isPartialEvent */
         !0
       );
-      const S = an(l, r, v);
-      it(v, S, !0);
+      const O = an(l, r, m);
+      rt(m, O, !0);
     } catch (_) {
       if (this.context.log?.warn?.("Failed to apply mutation event", _), u === void 0) {
-        const v = this.entityMap.getEntity(c);
-        v !== void 0 && v.evict();
+        const m = this.entityMap.getEntity(c);
+        m !== void 0 && m.evict();
       }
       return;
     }
@@ -2535,14 +2544,14 @@ class Bn {
     for (const n of t) {
       const i = Array.isArray(n), r = i ? n[0] : n, s = i ? n[1] : void 0, a = H.for(r).statics.id;
       for (const [, c] of this.queryInstances)
-        c.def.statics.id === a && (s === void 0 || Fn(c.resolvedParams, s)) && c.markStale();
+        c.def.statics.id === a && (s === void 0 || kn(c.resolvedParams, s)) && c.markStale();
     }
   }
   // ======================================================
   // In-Memory GC
   // ======================================================
   handleEviction = (t, n) => {
-    if (n === Z.Query) {
+    if (n === tt.Query) {
       const r = this.queryInstances.get(t);
       if (r === void 0) return;
       r.rootEntity?.evict(), this.queryInstances.delete(t);
@@ -2556,7 +2565,7 @@ class Bn {
   // ======================================================
   getOrCreateMatcher(t) {
     let n = this.constraintRegistry.get(t);
-    return n === void 0 && (n = new An(), this.constraintRegistry.set(t, n)), n;
+    return n === void 0 && (n = new xn(), this.constraintRegistry.set(t, n)), n;
   }
   registerLiveCollection(t) {
     for (const [n, i] of t._entityDefsByTypename)
@@ -2571,7 +2580,7 @@ class Bn {
   routeEvent(t, n, i, r, s, o, a) {
     const c = this.constraintRegistry.get(t);
     if (c === void 0) return;
-    const f = s !== void 0 ? { ...n, [le]: s } : n;
+    const f = s !== void 0 ? { ...n, [he]: s } : n;
     c.routeEvent(t, f, i, r, o, a);
   }
   destroy() {
@@ -2581,40 +2590,40 @@ class Bn {
     this.adapters.clear(), this.queryInstances.clear(), this.mutationInstances.clear(), this.constraintRegistry.clear(), this.typenameRegistry.clear(), this.mergedDefCache.clear();
   }
 }
-const kn = Ut(void 0);
-function Fn(e, t) {
+const Fn = qt(void 0);
+function kn(e, t) {
   if (e === void 0) return !1;
   for (const n in t)
     if (e[n] !== t[n]) return !1;
   return !0;
 }
 export {
-  k as A,
-  pt as E,
+  F as A,
+  gt as E,
   Me as G,
   Q as L,
   d as M,
-  fe as N,
-  Vt as Q,
-  F as R,
-  m as V,
-  lt as a,
+  ue as N,
+  Kt as Q,
+  k as R,
+  v as V,
+  ht as a,
   Ln as b,
   K as c,
   Te as d,
-  ue as e,
+  de as e,
   Un as f,
   Bn as g,
-  kn as h,
+  Fn as h,
   _n as i,
   $n as j,
   Vn as k,
-  Yt as l,
+  Gt as l,
   $e as m,
   X as n,
   Kn as o,
   qn as q,
-  ee as r,
+  ne as r,
   sn as t
 };
-//# sourceMappingURL=QueryClient-DfxP7pt2.js.map
+//# sourceMappingURL=QueryClient-CkO_s9Uh.js.map