fetchium 0.1.1 → 0.2.0

package/dist/esm/development/{QueryClient-Dtde3pss.js → QueryClient-BajBmpnA.js}

@@ -2,7 +2,7 @@ import { notifier as ft, relay as Tt, setScopeOwner as we, reactiveMethod as Ee,
 import { registerCustomHash as xe, hashValue as N } from "signalium/utils";
 import { d as $t } from "./shared-DcuVH8Pf.js";
 import { SyncQueryStore as Ae, MemoryPersistentStore as Ne } from "./stores/sync.js";
-var V = /* @__PURE__ */ ((e) => (e.Always = "always", e.Online = "online", e.OfflineFirst = "offlineFirst", e))(V || {}), l = /* @__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))(l || {});
+var V = /* @__PURE__ */ ((e) => (e.Always = "always", e.Online = "online", e.OfflineFirst = "offlineFirst", e))(V || {}), 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 D = /* @__PURE__ */ Symbol("array"), F = /* @__PURE__ */ Symbol("record"), Lt = /* @__PURE__ */ Symbol("QUERY_ID");
 var ut = /* @__PURE__ */ ((e) => (e[e.Array = 0] = "Array", e[e.Value = 1] = "Value", e))(ut || {});
 class B {
@@ -14,8 +14,8 @@ class B {
   onCreate;
   onUpdate;
   onDelete;
-  constructor(t, n, i, r, s, o, a, c) {
-    this.type = t, this.entityDefs = n, this.constraintFieldRefs = i, this.sort = r, this.valueType = s, this.onCreate = o, this.onUpdate = a, this.onDelete = c;
+  constructor(t, n, i, s, r, o, a, c) {
+    this.type = t, this.entityDefs = n, this.constraintFieldRefs = i, this.sort = s, this.valueType = r, this.onCreate = o, this.onUpdate = a, this.onDelete = c;
   }
   static array(t, n, i) {
     return new B(
@@ -29,15 +29,15 @@ class B {
       void 0
     );
   }
-  static value(t, n, i, r, s, o) {
+  static value(t, n, i, s, r, o) {
     return new B(
       1,
       t,
       n,
       void 0,
       i,
-      r,
       s,
+      r,
       o
     );
   }
@@ -62,8 +62,8 @@ class Ie {
   }
   _tick = () => {
     const { _currentFlush: t, _nextFlush: n, _onEvict: i } = this;
-    for (const [r, s] of t)
-      i(r, s);
+    for (const [s, r] of t)
+      i(s, r);
     this._currentFlush = n, this._nextFlush = /* @__PURE__ */ new Map();
   };
   destroy() {
@@ -86,9 +86,9 @@ class De {
       o.set(t, i), this._nextTickScheduled || (this._nextTickScheduled = !0, setTimeout(this._flushNextTick, 0));
       return;
     }
-    const { _buckets: r } = this;
-    let s = r.get(n);
-    s || (s = new Ie(n, this._onEvict, this._multiplier), r.set(n, s)), s.schedule(t, i);
+    const { _buckets: s } = this;
+    let r = s.get(n);
+    r || (r = new Ie(n, this._onEvict, this._multiplier), s.set(n, r)), r.schedule(t, i);
   }
   cancel(t, n) {
     if (n !== 1 / 0) {
@@ -102,8 +102,8 @@ class De {
   _flushNextTick = () => {
     const { _nextTickEntries: t, _onEvict: n } = this;
     this._nextTickScheduled = !1;
-    for (const [i, r] of t)
-      n(i, r);
+    for (const [i, s] of t)
+      n(i, s);
     t.clear();
   };
   destroy() {
@@ -121,7 +121,7 @@ class Fe {
   destroy() {
   }
 }
-const W = /* @__PURE__ */ Symbol("fieldRef"), I = /* @__PURE__ */ Symbol("fieldRefPath"), lt = /* @__PURE__ */ Symbol("DEFINITION_TARGET"), z = /* @__PURE__ */ Symbol("CANCEL_PROXY"), Me = /\[([^\]]+)\]/g;
+const W = /* @__PURE__ */ Symbol("fieldRef"), I = /* @__PURE__ */ Symbol("fieldRefPath"), dt = /* @__PURE__ */ Symbol("DEFINITION_TARGET"), z = /* @__PURE__ */ Symbol("CANCEL_PROXY"), Me = /\[([^\]]+)\]/g;
 function Ut(e) {
   const t = {
     [W]: !0,
@@ -154,37 +154,37 @@ function Vt(e) {
 function Kt(e) {
   let t = !1;
   return new Proxy(e, {
-    set(n, i, r) {
-      return n[i] = r, !0;
+    set(n, i, s) {
+      return n[i] = s, !0;
     },
     get(n, i) {
       if (t)
         throw new Error("Definition proxy accessed after extraction. Avoid arrow functions that capture `this`.");
-      return i === lt ? n : i === z ? () => {
+      return i === dt ? n : i === z ? () => {
         t = !0;
       } : typeof i == "symbol" ? n[i] : Ut([i]);
     }
   });
 }
 function Te(e) {
-  const t = e[lt];
+  const t = e[dt];
   e[z]();
   const n = {};
-  for (const s of Object.getOwnPropertyNames(t))
-    n[s] = t[s];
+  for (const r of Object.getOwnPropertyNames(t))
+    n[r] = t[r];
   const i = {};
-  let r = Object.getPrototypeOf(t);
-  for (; r && r !== Object.prototype; ) {
-    for (const s of Object.getOwnPropertyNames(r)) {
-      if (s === "constructor") continue;
-      const o = Object.getOwnPropertyDescriptor(r, s);
-      typeof o.value == "function" && !(s in i) && (i[s] = o.value);
+  let s = Object.getPrototypeOf(t);
+  for (; s && s !== Object.prototype; ) {
+    for (const r of Object.getOwnPropertyNames(s)) {
+      if (r === "constructor") continue;
+      const o = Object.getOwnPropertyDescriptor(s, r);
+      typeof o.value == "function" && !(r in i) && (i[r] = o.value);
     }
-    r = Object.getPrototypeOf(r);
+    s = Object.getPrototypeOf(s);
   }
   return { fields: n, methods: i };
 }
-function dt(e, t) {
+function ht(e, t) {
   let n = t;
   for (const i of e) {
     if (n == null) return;
@@ -194,13 +194,13 @@ function dt(e, t) {
 }
 function Pe(e, t) {
   return e.replace(Me, (n, i) => {
-    const r = i.split("."), s = dt(r, t);
-    return s != null ? encodeURIComponent(String(s)) : "";
+    const s = i.split("."), r = ht(s, t);
+    return r != null ? encodeURIComponent(String(r)) : "";
   });
 }
 function J(e, t) {
   if (qt(e))
-    return dt(Vt(e), t);
+    return ht(Vt(e), t);
   if (typeof e == "string")
     return Pe(e, t);
   if (Array.isArray(e))
@@ -214,11 +214,11 @@ function J(e, t) {
   return e;
 }
 function it(e, t, n) {
-  const i = e.fields, r = e.methods, s = { params: t }, o = {};
+  const i = e.fields, s = e.methods, r = { params: t }, o = {};
   for (const [a, c] of Object.entries(i))
-    o[a] = J(c, s);
+    o[a] = J(c, r);
   o.params = t, o.context = n;
-  for (const [a, c] of Object.entries(r))
+  for (const [a, c] of Object.entries(s))
     o[a] = c.bind(o);
   return o;
 }
@@ -228,79 +228,79 @@ class Bt {
     return Kt(this);
   }
 }
-const Qt = Object.entries, rt = Object.keys;
+const Qt = Object.entries, st = Object.keys;
 let Yt = () => {
 };
 {
-  const t = (i, r) => {
-    if (i.size !== r.size) return !1;
-    for (const s of i)
-      if (!r.has(s)) return !1;
+  const t = (i, s) => {
+    if (i.size !== s.size) return !1;
+    for (const r of i)
+      if (!s.has(r)) return !1;
     return !0;
-  }, n = (i, r) => {
-    if (i === r) return !0;
-    if (typeof i != typeof r) return !1;
+  }, n = (i, s) => {
+    if (i === s) return !0;
+    if (typeof i != typeof s) return !1;
     if (typeof i == "number") {
-      const s = r;
-      if ((i & 65535) !== (s & 65535)) return !1;
-      const o = i >> 16, a = s >> 16;
+      const r = s;
+      if ((i & 65535) !== (r & 65535)) return !1;
+      const o = i >> 16, a = r >> 16;
       return !(o !== 0 && a !== 0 && o !== a);
     }
-    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) {
-      const s = i.mask, o = r.mask;
-      if ((s & 65535) !== (o & 65535)) return !1;
-      const a = s >> 16, c = o >> 16;
+    if (typeof i == "string") return i === s;
+    if (i instanceof Set && s instanceof Set)
+      return t(i, s);
+    if (i instanceof m && s instanceof m) {
+      const r = i.mask, o = s.mask;
+      if ((r & 65535) !== (o & 65535)) return !1;
+      const a = r >> 16, c = o >> 16;
       if (a !== 0 && c !== 0 && a !== c) return !1;
-      if (i.shape === r.shape) return !0;
-      if (i.shape !== void 0 && r.shape !== void 0 && typeof i.shape == "object" && typeof r.shape == "object") {
-        const f = i.shape, d = r.shape;
+      if (i.shape === s.shape) return !0;
+      if (i.shape !== void 0 && s.shape !== void 0 && typeof i.shape == "object" && typeof s.shape == "object") {
+        const f = i.shape, h = s.shape;
         for (const u of Object.keys(f))
-          if (u in d && !n(f[u], d[u])) return !1;
-        for (const u of Object.keys(d))
-          if (u in f && !n(f[u], d[u])) return !1;
+          if (u in h && !n(f[u], h[u])) return !1;
+        for (const u of Object.keys(h))
+          if (u in f && !n(f[u], h[u])) return !1;
       }
       return !0;
     }
     return !1;
   };
-  Yt = (i, r, s, o) => {
-    if (!n(s, o))
+  Yt = (i, s, r, o) => {
+    if (!n(r, o))
       throw new Error(
-        `[fetchium] Entity typename '${i}' has incompatible type for field '${r}' across different entity definitions`
+        `[fetchium] Entity typename '${i}' has incompatible type for field '${s}' across different entity definitions`
       );
   };
 }
 function Ct(e) {
-  return typeof e == "number" ? e | l.UNDEFINED : e instanceof m ? (e.mask & l.UNDEFINED) !== 0 ? e : m.cloneWith(e, l.UNDEFINED) : e;
+  return typeof e == "number" ? e | d.UNDEFINED : e instanceof m ? (e.mask & d.UNDEFINED) !== 0 ? e : m.cloneWith(e, d.UNDEFINED) : e;
 }
 function St(e) {
-  return e instanceof m && (e.mask & l.OBJECT) !== 0 && (e.mask & (l.ENTITY | l.ARRAY | l.UNION | l.RECORD | l.LIVE)) === 0;
+  return e instanceof m && (e.mask & d.OBJECT) !== 0 && (e.mask & (d.ENTITY | d.ARRAY | d.UNION | d.RECORD | d.LIVE)) === 0;
 }
 function Gt(e, t, n) {
   const i = /* @__PURE__ */ new Set();
-  for (const s of e)
-    if (s !== void 0)
-      for (const o of Object.keys(s))
+  for (const r of e)
+    if (r !== void 0)
+      for (const o of Object.keys(r))
         i.add(o);
-  const r = {};
-  for (const s of i) {
+  const s = {};
+  for (const r of i) {
     let o = 0, a;
     const c = [];
     let f = !0;
-    for (const d of e) {
-      const u = d?.[s];
-      u !== void 0 ? (o++, a === void 0 && (a = u), a !== void 0 && u !== a && !St(u) && Yt(n, s, a, u), St(u) ? c.push(u.shape) : (f = !1, c.push(void 0))) : (f = !1, c.push(void 0));
+    for (const h of e) {
+      const u = h?.[r];
+      u !== void 0 ? (o++, a === void 0 && (a = u), a !== void 0 && u !== a && !St(u) && Yt(n, r, a, u), St(u) ? c.push(u.shape) : (f = !1, c.push(void 0))) : (f = !1, c.push(void 0));
     }
     if (f && o > 0) {
-      const d = Gt(c, t, n), u = new m(l.OBJECT, d);
-      r[s] = o < t ? Ct(u) : u;
+      const h = Gt(c, t, n), u = new m(d.OBJECT, h);
+      s[r] = o < t ? Ct(u) : u;
     } else
-      r[s] = o < t ? Ct(a) : a;
+      s[r] = o < t ? Ct(a) : a;
   }
-  return r;
+  return s;
 }
 class m {
   mask;
@@ -331,12 +331,12 @@ class m {
    * Live data configuration (shared by LiveArray and LiveValue).
    */
   _liveConfig = void 0;
-  constructor(t, n, i, r, s, o) {
-    this.mask = t, this.shape = n, this.values = i, this.typenameField = r, this.typenameValue = s, this.idField = o;
+  constructor(t, n, i, s, r, o) {
+    this.mask = t, this.shape = n, this.values = i, this.typenameField = s, this.typenameValue = r, this.idField = o;
   }
   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 = Gt(i, n, r);
+    const n = t.length, i = t.map((f) => f.shape), s = t[0].typenameValue ?? "(unknown)", r = Gt(i, n, s);
     let o, a, c;
     for (const f of t) {
       if (o === void 0 && f.idField !== void 0)
@@ -348,8 +348,8 @@ class m {
       a === void 0 && (a = f.typenameField), c === void 0 && (c = f.typenameValue);
     }
     return new m(
-      l.ENTITY | l.OBJECT,
-      s,
+      d.ENTITY | d.OBJECT,
+      r,
       void 0,
       a,
       c,
@@ -375,10 +375,10 @@ class $ extends Set {
     super(t), this.lowercaseMap = /* @__PURE__ */ new Map();
     for (const n of t)
       if (typeof n == "string") {
-        const i = n.toLowerCase(), r = this.lowercaseMap.get(i);
-        if (r !== void 0)
+        const i = n.toLowerCase(), s = this.lowercaseMap.get(i);
+        if (s !== void 0)
           throw new Error(
-            `Case-insensitive enum cannot have multiple values with the same lowercase form: '${r}' and '${n}' both become '${i}'`
+            `Case-insensitive enum cannot have multiple values with the same lowercase form: '${s}' and '${n}' both become '${i}'`
           );
         this.lowercaseMap.set(i, n);
       }
@@ -410,114 +410,114 @@ xe($, (e) => {
     t += N(n);
   return t >>> 0;
 });
-function ht(e, t) {
+function lt(e, t) {
   return new m(e, t);
 }
 function $e(e) {
-  return ht(l.ARRAY, e);
+  return lt(d.ARRAY, e);
 }
 function Le(e) {
-  return ht(l.RECORD | l.OBJECT, e);
+  return lt(d.RECORD | d.OBJECT, e);
 }
 function Ue(e) {
-  return ht(l.PARSE_RESULT, e);
+  return lt(d.PARSE_RESULT, e);
 }
 function Ht(e, t) {
-  let n = e, i, r, s;
+  let n = e, i, s, r;
   for (const [o, a] of Qt(t))
     switch (typeof a) {
       case "number":
-        if ((a & l.ID) !== 0) {
+        if ((a & d.ID) !== 0) {
           if (i !== void 0)
             throw new Error(`Duplicate id field: ${o}`);
           i = o;
         }
         break;
       case "string":
-        if (r !== void 0 && r !== o)
+        if (s !== void 0 && s !== o)
           throw new Error(`Duplicate typename field: ${o}`);
-        r = o, s = a;
+        s = o, r = a;
         break;
       case "object":
         if (a instanceof $ || a instanceof Set)
           break;
-        a.mask & l.LIVE && (n |= l.LIVE);
+        a.mask & d.LIVE && (n |= d.LIVE);
         break;
     }
-  return new m(n, t, void 0, r, s, i);
+  return new m(n, t, void 0, s, r, i);
 }
 function qe(e) {
-  return Ht(l.OBJECT, e);
+  return Ht(d.OBJECT, e);
 }
 function Ot(e, t, n) {
   const i = e.mask;
-  if ((i & l.UNION) !== 0) {
-    const r = e;
-    if (r.typenameField !== void 0) {
-      if (n !== void 0 && n !== r.typenameField)
+  if ((i & d.UNION) !== 0) {
+    const s = e;
+    if (s.typenameField !== void 0) {
+      if (n !== void 0 && n !== s.typenameField)
         throw new Error(
-          `Union typename field conflict: Cannot merge unions with different typename fields ('${n}' vs '${r.typenameField}')`
+          `Union typename field conflict: Cannot merge unions with different typename fields ('${n}' vs '${s.typenameField}')`
         );
-      n = r.typenameField;
+      n = s.typenameField;
     }
-    const s = r.shape;
-    if (s !== void 0)
-      for (const o of [...rt(s), D, F]) {
-        const a = s[o];
+    const r = s.shape;
+    if (r !== void 0)
+      for (const o of [...st(r), D, F]) {
+        const a = r[o];
         if (t[o] !== void 0 && t[o] !== a)
           throw new Error(
             `Union merge conflict: Duplicate typename value '${String(o)}' found when merging nested unions (${String(t[o])} vs ${String(a)})`
           );
         t[o] = a;
       }
-  } else if ((i & l.ARRAY) !== 0) {
+  } else if ((i & d.ARRAY) !== 0) {
     if (t[D] !== void 0)
       throw new Error("Array shape already defined");
     t[D] = e.shape;
-  } else if ((i & l.RECORD) !== 0) {
+  } else if ((i & d.RECORD) !== 0) {
     if (t[F] !== void 0)
       throw new Error("Record shape already defined");
     t[F] = e.shape;
   } else {
-    const r = e.typenameField, s = e.typenameValue;
-    if (s === void 0)
+    const s = e.typenameField, r = e.typenameValue;
+    if (r === void 0)
       throw new Error(
         "Object definitions must have a typename to be in a union with other objects, records, or arrays"
       );
-    if (n !== void 0 && r !== n)
+    if (n !== void 0 && s !== n)
       throw new Error("Object definitions must have the same typename field to be in the same union");
-    n = r, t[s] = e;
+    n = s, t[r] = e;
   }
   return n;
 }
 function yt(...e) {
   const t = e;
-  let n = 0, i = 0, r, s, o, a, c = 0;
-  for (const d of t) {
-    if (typeof d == "number") {
-      n |= d;
+  let n = 0, i = 0, s, r, o, a, c = 0;
+  for (const h of t) {
+    if (typeof h == "number") {
+      n |= h;
       continue;
     }
-    if (d instanceof Set) {
-      if (s === void 0)
-        s = new Set(d);
+    if (h instanceof Set) {
+      if (r === void 0)
+        r = new Set(h);
       else
-        for (const u of d)
-          s.add(u);
+        for (const u of h)
+          r.add(u);
       continue;
     }
-    if (i++, c |= d.mask, i === 1) {
-      r = d;
+    if (i++, c |= h.mask, i === 1) {
+      s = h;
       continue;
     }
-    i === 2 && (o = /* @__PURE__ */ Object.create(null), a = Ot(r, o, a)), a = Ot(d, o, a);
+    i === 2 && (o = /* @__PURE__ */ Object.create(null), a = Ot(s, o, a)), a = Ot(h, o, a);
   }
   if (i === 0)
-    return s === void 0 ? n : n === 0 ? s : new m(n | l.UNION, void 0, s);
+    return r === void 0 ? n : n === 0 ? r : new m(n | d.UNION, void 0, r);
   if (i === 1)
-    return m.cloneWith(r, n);
-  const f = n | c | l.UNION;
-  return new m(f, o, s, a);
+    return m.cloneWith(s, n);
+  const f = n | c | d.UNION;
+  return new m(f, o, r, a);
 }
 function pt(e, t, n) {
   const i = e;
@@ -525,18 +525,18 @@ function pt(e, t, n) {
     return i | t;
   if (i instanceof Set)
     return yt(e, t);
-  let r = n.get(i);
-  return r === void 0 && (r = m.cloneWith(i, t), n.set(i, r)), r;
+  let s = n.get(i);
+  return s === void 0 && (s = m.cloneWith(i, t), n.set(i, s)), s;
 }
 const Ve = /* @__PURE__ */ new WeakMap(), Ke = /* @__PURE__ */ new WeakMap(), Be = /* @__PURE__ */ new WeakMap();
 function Qe(e) {
-  return pt(e, l.UNDEFINED | l.NULL, Be);
+  return pt(e, d.UNDEFINED | d.NULL, Be);
 }
 function Ye(e) {
-  return pt(e, l.UNDEFINED, Ve);
+  return pt(e, d.UNDEFINED, Ve);
 }
 function Ge(e) {
-  return pt(e, l.NULL, Ke);
+  return pt(e, d.NULL, Ke);
 }
 function He(e) {
   return e;
@@ -548,17 +548,17 @@ const Wt = ((...e) => new Set(e));
 Wt.caseInsensitive = (...e) => new $(e);
 const gt = 16;
 let ze = 0;
-const st = [], zt = [], Jt = /* @__PURE__ */ new Map(), Xt = /* @__PURE__ */ new Map(), Z = /* @__PURE__ */ new WeakSet();
+const rt = [], zt = [], Jt = /* @__PURE__ */ new Map(), Xt = /* @__PURE__ */ new Map(), Z = /* @__PURE__ */ new WeakSet();
 class Q {
   _raw;
   _formatted;
   _parsed;
   _formatId;
   constructor(t, n, i) {
-    this._raw = t, this._formatId = n, i ? (this._formatted = st[n](t), this._parsed = !0) : this._parsed = !1, Z.add(this);
+    this._raw = t, this._formatId = n, i ? (this._formatted = rt[n](t), this._parsed = !0) : this._parsed = !1, Z.add(this);
   }
   getValue() {
-    return this._parsed || (this._formatted = st[this._formatId](this._raw), this._parsed = !0), this._formatted;
+    return this._parsed || (this._formatted = rt[this._formatId](this._raw), this._parsed = !0), this._formatted;
   }
   toJSON() {
     return this._parsed ? zt[this._formatId](this._formatted) : this._raw;
@@ -574,23 +574,23 @@ function Rt(e) {
   const t = e >> gt;
   return Xt.get(t);
 }
-function Zt(e, t, n, i, r) {
-  const s = ze++;
-  st[s] = n, zt[s] = i, Xt.set(s, e);
-  const o = r?.eager ?? !0, c = s << gt | t | l.HAS_FORMAT | (o ? l.IS_EAGER_FORMAT : 0);
+function Zt(e, t, n, i, s) {
+  const r = ze++;
+  rt[r] = n, zt[r] = i, Xt.set(r, e);
+  const o = s?.eager ?? !0, c = r << gt | t | d.HAS_FORMAT | (o ? d.IS_EAGER_FORMAT : 0);
   Jt.set(e, c);
 }
 Zt(
   "date",
-  l.STRING,
+  d.STRING,
   (e) => {
     const t = e.match(/^(\d{4})-(\d{2})-(\d{2})$/);
     if (!t)
       throw new Error(`Invalid date string: ${e}. Expected YYYY-MM-DD format.`);
-    const [, n, i, r] = t, s = new Date(Date.UTC(parseInt(n, 10), parseInt(i, 10) - 1, parseInt(r, 10)));
-    if (isNaN(s.getTime()))
+    const [, n, i, s] = t, r = new Date(Date.UTC(parseInt(n, 10), parseInt(i, 10) - 1, parseInt(s, 10)));
+    if (isNaN(r.getTime()))
       throw new Error(`Invalid date string: ${e}`);
-    return s;
+    return r;
   },
   (e) => {
     const t = e.getUTCFullYear(), n = String(e.getUTCMonth() + 1).padStart(2, "0"), i = String(e.getUTCDate()).padStart(2, "0");
@@ -599,7 +599,7 @@ Zt(
 );
 Zt(
   "date-time",
-  l.STRING,
+  d.STRING,
   (e) => {
     const t = new Date(e);
     if (isNaN(t.getTime()))
@@ -612,30 +612,30 @@ const xt = /* @__PURE__ */ new WeakMap();
 function j(e) {
   let t = xt.get(e);
   if (t === void 0) {
-    const n = new e(), i = n[lt] ?? n;
+    const n = new e(), i = n[dt] ?? n;
     n[z] && n[z]();
-    const r = {};
-    for (const [f, d] of Qt(i)) {
-      if (!(typeof d == "number" || typeof d == "string" || d instanceof Set || d instanceof m || d instanceof $))
+    const s = {};
+    for (const [f, h] of Qt(i)) {
+      if (!(typeof h == "number" || typeof h == "string" || h instanceof Set || h instanceof m || h instanceof $))
         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 d == "object" ? d?.constructor?.name ?? typeof d : typeof d}`
+          `[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 h == "object" ? h?.constructor?.name ?? typeof h : typeof h}`
         );
-      r[f] = d;
+      s[f] = h;
     }
-    const s = Object.getPrototypeOf(e.prototype);
-    if (s != null) {
-      const f = s.constructor;
+    const r = Object.getPrototypeOf(e.prototype);
+    if (r != null) {
+      const f = r.constructor;
       if (f !== Bt && typeof f == "function") {
         const u = j(f).shape;
-        for (const h of rt(u))
-          if (h in r && r[h] !== u[h])
-            throw new Error(`Cannot extend: field '${h}' already exists in type definition`);
+        for (const l of st(u))
+          if (l in s && s[l] !== u[l])
+            throw new Error(`Cannot extend: field '${l}' already exists in type definition`);
       }
     }
     const o = {}, a = e.prototype;
     for (const f of Object.getOwnPropertyNames(a))
       f !== "constructor" && typeof a[f] == "function" && (o[f] = a[f]);
-    t = Ht(l.ENTITY | l.OBJECT, r), t._entityClass = e, rt(o).length > 0 && (t._methods = o), typeof o.__subscribe == "function" && (t._entityConfig = { hasSubscribe: !0 });
+    t = Ht(d.ENTITY | d.OBJECT, s), t._entityClass = e, st(o).length > 0 && (t._methods = o), typeof o.__subscribe == "function" && (t._entityConfig = { hasSubscribe: !0 });
     const c = e;
     c.cache && (t._entityCache = c.cache), xt.set(e, t);
   }
@@ -649,20 +649,20 @@ function te(e, t) {
   const n = /* @__PURE__ */ new Map();
   if (Array.isArray(t))
     for (const i of t) {
-      const [r, s] = i, a = j(r).typenameValue;
+      const [s, r] = i, a = j(s).typenameValue;
       if (a === void 0) continue;
       const c = [];
-      for (const [f, d] of Object.entries(s))
-        c.push([f, d]);
+      for (const [f, h] of Object.entries(r))
+        c.push([f, h]);
       c.length > 0 && n.set(a, c);
     }
   else {
-    const r = Object.entries(t);
-    if (r.length === 0) return;
-    const s = r.map(([o, a]) => [o, a]);
+    const s = Object.entries(t);
+    if (s.length === 0) return;
+    const r = s.map(([o, a]) => [o, a]);
     for (const o of e) {
       const a = o.typenameValue;
-      a !== void 0 && n.set(a, s);
+      a !== void 0 && n.set(a, r);
     }
   }
   return n.size > 0 ? n : void 0;
@@ -671,19 +671,19 @@ function ee(e) {
   return Array.isArray(e) ? e.map((t) => j(t)) : [j(e)];
 }
 function Ze(e, t) {
-  const n = ee(e), i = n.length === 1 ? n[0] : yt(...n.map((o) => o)), r = l.ARRAY | l.LIVE, s = new m(r, i);
-  return s._liveConfig = B.array(
+  const n = ee(e), i = n.length === 1 ? n[0] : yt(...n.map((o) => o)), s = d.ARRAY | d.LIVE, r = new m(s, i);
+  return r._liveConfig = B.array(
     n,
     te(n, t?.constraints),
     t?.sort
-  ), s;
+  ), r;
 }
 function tn(e, t, n) {
-  const i = ee(t), r = e, s = l.LIVE, o = new m(s, void 0);
+  const i = ee(t), s = e, r = d.LIVE, o = new m(r, void 0);
   return o._liveConfig = B.value(
     i,
     te(i, n?.constraints),
-    r,
+    s,
     n.onCreate,
     n.onUpdate,
     n.onDelete
@@ -694,12 +694,12 @@ const en = {
   typename: He,
   const: We,
   enum: Wt,
-  id: l.ID | l.STRING | l.NUMBER,
-  string: l.STRING,
-  number: l.NUMBER,
-  boolean: l.BOOLEAN,
-  null: l.NULL,
-  undefined: l.UNDEFINED,
+  id: d.ID | d.STRING | d.NUMBER,
+  string: d.STRING,
+  number: d.NUMBER,
+  boolean: d.BOOLEAN,
+  null: d.NULL,
+  undefined: d.UNDEFINED,
   array: $e,
   object: qe,
   record: Le,
@@ -722,44 +722,44 @@ function K(e) {
   if (typeof e == "boolean")
     return String(e);
   if (typeof e == "number") {
-    if ((e & l.HAS_FORMAT) !== 0) {
-      const r = Rt(e);
-      if (r)
-        return `"${r}"`;
+    if ((e & d.HAS_FORMAT) !== 0) {
+      const s = Rt(e);
+      if (s)
+        return `"${s}"`;
     }
     const i = [];
-    return e & l.UNDEFINED && i.push("undefined"), e & l.NULL && i.push("null"), e & l.NUMBER && i.push("number"), e & l.STRING && i.push("string"), e & l.BOOLEAN && i.push("boolean"), e & l.OBJECT && i.push("object"), e & l.ARRAY && i.push("array"), i.length === 0 ? "unknown" : i.length === 1 ? i[0] : i.join(" | ");
+    return e & d.UNDEFINED && i.push("undefined"), e & d.NULL && i.push("null"), e & d.NUMBER && i.push("number"), e & d.STRING && i.push("string"), e & d.BOOLEAN && i.push("boolean"), e & d.OBJECT && i.push("object"), e & d.ARRAY && i.push("array"), i.length === 0 ? "unknown" : i.length === 1 ? i[0] : i.join(" | ");
   }
   let t = e.mask;
-  if (t & l.UNION) {
+  if (t & d.UNION) {
     const n = e, i = [];
     if (n.values !== void 0 && n.values.size > 0)
-      for (const s of n.values) {
-        const o = typeof s == "string" ? `"${s}"` : String(s);
+      for (const r of n.values) {
+        const o = typeof r == "string" ? `"${r}"` : String(r);
         i.push(o);
       }
     if (n.shape !== void 0) {
       n.shape[D] !== void 0 && i.push(`Array<${K(n.shape[D])}>`), n.shape[F] !== void 0 && i.push(`Record<string, ${K(n.shape[F])}>`);
-      for (const [s, o] of Object.entries(n.shape))
-        s !== D && s !== F && i.push(s);
+      for (const [r, o] of Object.entries(n.shape))
+        r !== D && r !== F && i.push(r);
     }
-    if (t = n.mask, (t & l.HAS_FORMAT) !== 0) {
-      const s = Rt(t);
-      s && i.push(`"${s}"`);
+    if (t = n.mask, (t & d.HAS_FORMAT) !== 0) {
+      const r = Rt(t);
+      r && i.push(`"${r}"`);
     }
-    return t & l.UNDEFINED && i.push("undefined"), t & l.NULL && i.push("null"), t & l.NUMBER && i.push("number"), t & l.STRING && i.push("string"), t & l.BOOLEAN && i.push("boolean"), i.length === 0 ? "union" : i.join(" | ");
+    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(" | ");
   }
-  if (t & l.ENTITY)
+  if (t & d.ENTITY)
     return `Entity<${e.typenameValue}>`;
-  if (t & l.ARRAY) {
+  if (t & d.ARRAY) {
     const n = e.shape;
     return `Array<${K(n)}>`;
   }
-  if (t & l.RECORD) {
+  if (t & d.RECORD) {
     const n = e.shape;
     return `Record<string, ${K(n)}>`;
   }
-  if (t & l.OBJECT) {
+  if (t & d.OBJECT) {
     const n = e.typenameValue;
     return n ? `Object<${n}>` : "object";
   }
@@ -772,18 +772,18 @@ function q(e, t, n) {
 }
 const ne = Array.isArray;
 function At(e) {
-  if (e === null) return l.NULL;
+  if (e === null) return d.NULL;
   switch (typeof e) {
     case "number":
-      return l.NUMBER;
+      return d.NUMBER;
     case "string":
-      return l.STRING;
+      return d.STRING;
     case "boolean":
-      return l.BOOLEAN;
+      return d.BOOLEAN;
     case "undefined":
-      return l.UNDEFINED;
+      return d.UNDEFINED;
     case "object":
-      return ne(e) ? l.ARRAY : l.OBJECT;
+      return ne(e) ? d.ARRAY : d.OBJECT;
     default:
       throw new Error(`Invalid type: ${typeof e}`);
   }
@@ -800,8 +800,8 @@ function P(e) {
     return new Date(e.getTime());
   if (e instanceof Map) {
     const n = /* @__PURE__ */ new Map();
-    for (const [i, r] of e)
-      n.set(P(i), P(r));
+    for (const [i, s] of e)
+      n.set(P(i), P(s));
     return n;
   }
   if (e instanceof Set) {
@@ -826,23 +826,23 @@ class ot {
   isPartialEvent = !1;
   seen = void 0;
   seenByKey = void 0;
-  reset(t, n, i, r = !1) {
-    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()));
+  reset(t, n, i, s = !1) {
+    this.queryClient = t, this.preloadedEntities = n, this.warn = i, this.isPartialEvent = s, t !== void 0 && (this.seen === void 0 ? (this.seen = /* @__PURE__ */ new Map(), this.seenByKey = /* @__PURE__ */ new Map()) : (this.seen.clear(), this.seenByKey.clear()));
   }
 }
 function ie(e, t, n) {
   return M(e, t, n, "");
 }
-function rn(e, t, n) {
+function sn(e, t, n) {
   return vt(e, t, n);
 }
 function Nt(e, t, n, i) {
-  const r = e >> gt;
-  if ((e & l.IS_EAGER_FORMAT) !== 0)
+  const s = e >> gt;
+  if ((e & d.IS_EAGER_FORMAT) !== 0)
     try {
-      return new Q(t, r, !0);
+      return new Q(t, s, !0);
     } catch (o) {
-      if ((e & l.UNDEFINED) !== 0) {
+      if ((e & d.UNDEFINED) !== 0) {
         n.warn("Invalid formatted value for optional type, defaulting to undefined", {
           value: t,
           path: i,
@@ -852,133 +852,133 @@ function Nt(e, t, n, i) {
       }
       throw o;
     }
-  return new Q(t, r, !1);
+  return new Q(t, s, !1);
 }
 function M(e, t, n, i) {
-  const r = t;
-  if (r instanceof $) {
-    const c = r.get(e);
-    if (c === void 0) throw q(i, r, e);
+  const s = t;
+  if (s instanceof $) {
+    const c = s.get(e);
+    if (c === void 0) throw q(i, s, e);
     return c;
   }
-  if (r instanceof Set) {
-    if (!r.has(e)) throw q(i, r, e);
+  if (s instanceof Set) {
+    if (!s.has(e)) throw q(i, s, e);
     return e;
   }
-  if (typeof r == "string") {
-    if (e == null) return r;
-    if (e !== r) throw q(i, r, e);
+  if (typeof s == "string") {
+    if (e == null) return s;
+    if (e !== s) throw q(i, s, e);
     return e;
   }
-  if (typeof r == "number") {
+  if (typeof s == "number") {
     const c = At(e);
-    if ((r & c) === 0) {
-      if ((r & l.UNDEFINED) !== 0) {
+    if ((s & c) === 0) {
+      if ((s & d.UNDEFINED) !== 0) {
         n.warn("Invalid value for optional type, defaulting to undefined", { value: e, path: i });
         return;
       }
-      throw q(i, r, e);
+      throw q(i, s, e);
     }
-    return (r & l.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? Nt(r, e, n, i) : e;
+    return (s & d.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? Nt(s, e, n, i) : e;
   }
-  const s = r.mask, o = r._liveConfig;
+  const r = s.mask, o = s._liveConfig;
   if (o !== void 0 && o.type === ut.Value)
     return o.valueType !== void 0 ? M(e, o.valueType, n, i) : e;
-  if ((s & l.PARSE_RESULT) !== 0)
+  if ((r & d.PARSE_RESULT) !== 0)
     try {
-      return { success: !0, value: M(e, r.shape, n, i) };
+      return { success: !0, value: M(e, s.shape, n, i) };
     } catch (c) {
       return { success: !1, error: c instanceof Error ? c : new Error(String(c)) };
     }
   const a = At(e);
-  if ((s & a) === 0 && !r.values?.has(e)) {
-    if ((s & l.UNDEFINED) !== 0) {
+  if ((r & a) === 0 && !s.values?.has(e)) {
+    if ((r & d.UNDEFINED) !== 0) {
       n.warn("Invalid value for optional type, defaulting to undefined", { value: e, path: i });
       return;
     }
-    throw q(i, s, e);
+    throw q(i, r, e);
   }
-  return a < l.OBJECT ? (s & l.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? Nt(s, e, n, i) : e : (s & l.UNION) !== 0 ? sn(a, e, r, n, i) : a === l.ARRAY ? re(e, r.shape, n, i) : (s & l.RECORD) !== 0 ? se(e, r.shape, n, i) : (s & l.ENTITY) !== 0 && n.queryClient !== void 0 ? vt(e, r, n) : oe(e, r, n, i);
+  return a < d.OBJECT ? (r & d.HAS_FORMAT) !== 0 && e !== null && e !== void 0 ? Nt(r, e, n, i) : e : (r & d.UNION) !== 0 ? rn(a, e, s, n, i) : a === d.ARRAY ? se(e, s.shape, n, i) : (r & d.RECORD) !== 0 ? re(e, s.shape, n, i) : (r & d.ENTITY) !== 0 && n.queryClient !== void 0 ? vt(e, s, n) : oe(e, s, n, i);
 }
-function sn(e, t, n, i, r) {
-  if (e === l.ARRAY) {
-    const s = n.shape[D];
-    return s === void 0 || typeof s == "number" ? t : re(t, s, i, r);
+function rn(e, t, n, i, s) {
+  if (e === d.ARRAY) {
+    const r = n.shape[D];
+    return r === void 0 || typeof r == "number" ? t : se(t, r, i, s);
   } else {
-    const s = n.typenameField, o = s ? t[s] : void 0;
+    const r = n.typenameField, o = r ? t[r] : void 0;
     if (o === void 0 || typeof o != "string") {
       const c = n.shape[F];
       if (c === void 0)
         throw new Error(
-          `Typename field '${s}' is required for union discrimination but was not found in the data`
+          `Typename field '${r}' is required for union discrimination but was not found in the data`
         );
-      return se(t, c, i, r);
+      return re(t, c, i, s);
     }
     const a = n.shape[o];
     if (a === void 0 || typeof a == "number")
       throw new Error(`Unknown typename '${o}' in union`);
-    return a.mask & l.ENTITY && i.queryClient !== void 0 ? vt(t, a, i) : oe(t, a, i, r);
+    return a.mask & d.ENTITY && i.queryClient !== void 0 ? vt(t, a, i) : oe(t, a, i, s);
   }
 }
-function re(e, t, n, i) {
-  const r = [];
-  for (let s = 0; s < e.length; s++)
+function se(e, t, n, i) {
+  const s = [];
+  for (let r = 0; r < e.length; r++)
     try {
-      r.push(M(e[s], t, n, `${i}[${s}]`));
+      s.push(M(e[r], t, n, `${i}[${r}]`));
     } catch (o) {
       n.warn("Failed to parse array item, filtering out", {
-        index: s,
-        value: e[s],
+        index: r,
+        value: e[r],
         error: o instanceof Error ? o.message : String(o)
       });
     }
-  return r;
+  return s;
 }
-function se(e, t, n, i) {
-  for (const [r, s] of mt(e))
-    e[r] = M(s, t, n, `${i}["${r}"]`);
+function re(e, t, n, i) {
+  for (const [s, r] of mt(e))
+    e[s] = M(r, t, n, `${i}["${s}"]`);
   return e;
 }
 function oe(e, t, n, i) {
   if (S.has(e))
     return e;
-  const r = t.shape;
-  for (const [s, o] of mt(r))
-    e[s] = M(e[s], o, n, `${i}.${s}`);
+  const s = t.shape;
+  for (const [r, o] of mt(s))
+    e[r] = M(e[r], o, n, `${i}.${r}`);
   return e;
 }
 function vt(e, t, n) {
-  const i = n.queryClient, r = n.preloadedEntities;
-  let s, o;
-  if (r !== void 0)
-    s = e.__entityRef, o = s;
+  const i = n.queryClient, s = n.preloadedEntities;
+  let r, o;
+  if (s !== void 0)
+    r = e.__entityRef, o = r;
   else {
     const p = e[t.idField];
     if (p == null || typeof p != "string" && typeof p != "number")
       throw new Error(`Entity id must be a string or number: ${t.typenameValue} (got ${typeof p})`);
-    o = p, s = N([t.typenameValue, o]);
+    o = p, r = N([t.typenameValue, o]);
   }
-  const a = n.seenByKey.get(s);
+  const a = n.seenByKey.get(r);
   if (a !== void 0)
     return a.data;
-  if (r !== void 0) {
-    const w = i.entityMap.getEntity(s)?.data ?? r.get(s);
+  if (s !== void 0) {
+    const w = i.entityMap.getEntity(r)?.data ?? s.get(r);
     if (w === void 0)
-      throw new Error(`Cached entity ${s} not found in preloaded map`);
+      throw new Error(`Cached entity ${r} not found in preloaded map`);
     e = w;
   }
   const c = {};
   typeof t.idField == "symbol" && (c[t.idField] = o);
-  const f = i.entityMap.getEntity(s), d = n.isPartialEvent && f !== void 0, u = {
-    key: s,
+  const f = i.entityMap.getEntity(r), h = n.isPartialEvent && f !== void 0, u = {
+    key: r,
     shape: t,
     data: c,
-    rawKeys: d ? new Set(Object.keys(e)) : void 0
+    rawKeys: h ? new Set(Object.keys(e)) : void 0
   };
-  n.seen.set(c, u), n.seenByKey.set(s, u);
-  const h = `[[${t.typenameValue}:${o}]]`, g = t.shape;
+  n.seen.set(c, u), n.seenByKey.set(r, u);
+  const l = `[[${t.typenameValue}:${o}]]`, g = t.shape;
   for (const [p, w] of mt(g))
-    d && !(p in e) || (c[p] = M(e[p], w, n, `${h}.${p}`));
+    h && !(p in e) || (c[p] = M(e[p], w, n, `${l}.${p}`));
   return c;
 }
 function on(e, t) {
@@ -988,12 +988,12 @@ function an(e, t, n) {
   if (t === void 0) return !0;
   for (const i of Object.keys(t)) {
     if (i === n) continue;
-    const r = t[i];
-    if (r instanceof m) {
-      if ((r.mask & l.UNDEFINED) !== 0) continue;
+    const s = t[i];
+    if (s instanceof m) {
+      if ((s.mask & d.UNDEFINED) !== 0) continue;
       if (!(i in e) || e[i] === void 0) return !1;
-    } else if (typeof r == "number") {
-      if ((r & l.UNDEFINED) !== 0) continue;
+    } else if (typeof s == "number") {
+      if ((s & d.UNDEFINED) !== 0) continue;
       if (!(i in e) || e[i] === void 0) return !1;
     } else if (!(i in e) || e[i] === void 0) return !1;
   }
@@ -1049,7 +1049,7 @@ const fn = {
     return Object.getOwnPropertyDescriptor(e, t);
   }
 };
-class ln {
+class dn {
   _notifier;
   _queryClient;
   _proxies = /* @__PURE__ */ new Map();
@@ -1066,8 +1066,8 @@ class ln {
   _entityCache;
   _extraMethods;
   _extraGetters;
-  constructor(t, n, i, r, s, o) {
-    this._notifier = ft(), this._queryClient = o, this.key = t, this.typename = n, this.id = i, this.idField = r, this.data = s, this.entityRefs = void 0;
+  constructor(t, n, i, s, r, o) {
+    this._notifier = ft(), this._queryClient = o, this.key = t, this.typename = n, this.id = i, this.idField = s, this.data = r, this.entityRefs = void 0;
   }
   retain() {
     this.refCount++;
@@ -1093,11 +1093,11 @@ class ln {
   setChildRefs(t, n) {
     const i = this.entityRefs;
     if (t !== void 0 && t.size > 0)
-      for (const r of t.keys())
-        (i === void 0 || !i.has(r)) && r.retain();
+      for (const s of t.keys())
+        (i === void 0 || !i.has(s)) && s.retain();
     if (i !== void 0 && i.size > 0)
-      for (const r of i.keys())
-        (t === void 0 || !t.has(r)) && r.release();
+      for (const s of i.keys())
+        (t === void 0 || !t.has(s)) && s.release();
     this.entityRefs = t, n && this.save();
   }
   addChildRef(t) {
@@ -1113,7 +1113,7 @@ class ln {
   getProxy(t) {
     const n = t;
     let i = this._proxies.get(n);
-    return i === void 0 && (i = hn(this, this.key, t, this._notifier, this._queryClient), this._proxies.set(n, i)), i;
+    return i === void 0 && (i = ln(this, this.key, t, this._notifier, this._queryClient), this._proxies.set(n, i)), i;
   }
   get proxy() {
     return this._proxies.values().next().value;
@@ -1131,30 +1131,30 @@ class ln {
     this._notifier.consume();
   }
 }
-function dn(e, t, n) {
+function hn(e, t, n) {
   const i = [];
-  for (const r of e) {
-    if (typeof r != "object" || r === null) continue;
-    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);
+  for (const s of e) {
+    if (typeof s != "object" || s === null) continue;
+    const r = S.get(s);
+    if (r === void 0) continue;
+    const o = n.entityMap.getEntity(r);
+    o !== void 0 && o.satisfiesDef(t) && i.push(s);
   }
   return i;
 }
-function hn(e, t, n, i, r) {
-  const s = n.shape ?? {}, o = n, a = o._methods, c = o._entityClass, f = o._entityConfig, d = c ? c.prototype : Bt.prototype, u = n.typenameField, h = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), p = () => ({ __entityRef: t });
+function ln(e, t, n, i, s) {
+  const r = n.shape ?? {}, o = n, a = o._methods, c = o._entityClass, f = o._entityConfig, h = c ? c.prototype : Bt.prototype, u = n.typenameField, l = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), p = () => ({ __entityRef: t });
   let w;
   f?.hasSubscribe && a && "__subscribe" in a && (w = Tt((E) => {
     const y = (b) => {
-      b.__eventSource = t, r.applyMutationEvent(b);
+      b.__eventSource = t, s.applyMutationEvent(b);
     }, _ = a.__subscribe.call(v, y);
     return E.value = v, _;
   }));
   let v;
-  if (u && !(u in s))
+  if (u && !(u in r))
     throw new Error(`typenameField "${u}" must be declared in the entity shape`);
-  const O = Object.keys(s);
+  const O = Object.keys(r);
   if (O.includes("__typename") || O.push("__typename"), a)
     for (const E of Object.keys(a))
       O.includes(E) || O.push(E);
@@ -1174,12 +1174,12 @@ function hn(e, t, n, i, r) {
   }
   const U = {
     getPrototypeOf() {
-      return d;
+      return h;
     },
     get(E, y) {
       if (typeof y == "symbol") return;
       if (y === "toJSON") return p;
-      if (y === "__context") return r.getContext();
+      if (y === "__context") return s.getContext();
       if (y === "__typename") return e.typename;
       if (w?.value, i.consume(), typeof y == "string") {
         const b = e._extraGetters;
@@ -1187,30 +1187,30 @@ function hn(e, t, n, i, r) {
           return b[y]();
         const x = e._extraMethods;
         if (x !== void 0 && y in x) {
-          let C = h.get(y);
-          return C || (C = x[y].bind(v), h.set(y, C)), C;
+          let C = l.get(y);
+          return C || (C = x[y].bind(v), l.set(y, C)), C;
         }
         if (a && y in a) {
-          let C = h.get(y);
-          return C || (C = Ee(v, a[y].bind(v)), h.set(y, C)), C;
+          let C = l.get(y);
+          return C || (C = Ee(v, a[y].bind(v)), l.set(y, C)), C;
         }
       }
       const _ = e.data[y];
       if (typeof _ == "object" && _ !== null && Z.has(_))
         return A(_.getValue());
       if (Array.isArray(_) && typeof y == "string") {
-        const b = s[y];
-        if (b instanceof m && (b.mask & l.ARRAY) !== 0) {
+        const b = r[y];
+        if (b instanceof m && (b.mask & d.ARRAY) !== 0) {
           const x = b.shape;
-          if (x instanceof m && (x.mask & l.ENTITY) !== 0) {
+          if (x instanceof m && (x.mask & d.ENTITY) !== 0) {
             const C = x.typenameValue;
             if (C !== void 0) {
-              const Et = r.getEntityDefsForTypename(C);
+              const Et = s.getEntityDefsForTypename(C);
               if (Et !== void 0 && Et.length > 1) {
                 const tt = g.get(y);
                 if (tt !== void 0 && tt.source === _)
                   return A(tt.filtered);
-                const bt = dn(_, x, r);
+                const bt = hn(_, x, s);
                 return g.set(y, { source: _, filtered: bt }), A(bt);
               }
             }
@@ -1231,7 +1231,7 @@ function hn(e, t, n, i, r) {
         const b = e._extraMethods;
         if (b && y in b || a && y in a) return !0;
       }
-      return y in s;
+      return y in r;
     },
     ownKeys() {
       return L();
@@ -1239,7 +1239,7 @@ function hn(e, t, n, i, r) {
     getOwnPropertyDescriptor(E, y) {
       if (y === "__typename")
         return { enumerable: !0, configurable: !0, value: e.typename, writable: !1 };
-      if (y in s)
+      if (y in r)
         return { enumerable: !0, configurable: !0, value: U.get(E, y, v), writable: !1 };
       if (typeof y == "string") {
         const _ = e._extraGetters;
@@ -1253,7 +1253,7 @@ function hn(e, t, n, i, r) {
       }
     }
   };
-  return v = new Proxy({}, U), S.set(v, t), we(v, r), v;
+  return v = new Proxy({}, U), S.set(v, t), we(v, s), v;
 }
 class yn {
   instances = /* @__PURE__ */ new Map();
@@ -1267,9 +1267,9 @@ class yn {
   getEntity(t) {
     return this.instances.get(t);
   }
-  getOrCreateEntity(t, n, i, r) {
-    let s = this.instances.get(t);
-    if (s === void 0) {
+  getOrCreateEntity(t, n, i, s) {
+    let r = this.instances.get(t);
+    if (r === void 0) {
       const o = i.idField;
       if (o === void 0)
         throw new Error(`Entity id field is required ${i.typenameValue}`);
@@ -1277,9 +1277,9 @@ class yn {
       if (typeof a != "string" && typeof a != "number")
         throw new Error(`Entity id must be string or number: ${i.typenameValue}`);
       const c = i;
-      s = new ln(t, i.typenameValue, a, o, n, r), s._entityCache = c._entityCache, this.instances.set(t, s);
+      r = new dn(t, i.typenameValue, a, o, n, s), r._entityCache = c._entityCache, this.instances.set(t, r);
     }
-    return s.parseId = r.currentParseId, s;
+    return r.parseId = s.currentParseId, r;
   }
   remove(t) {
     this.instances.delete(t);
@@ -1376,16 +1376,16 @@ const pn = new ae(), Tn = jt(pn);
 function _t(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);
+  const i = typeof e == "object" && e.retryDelay ? e.retryDelay : (s) => 1e3 * Math.pow(2, s);
   return { retries: n, retryDelay: i };
 }
 class Pn {
   static cache;
   /**
-   * The controller class responsible for sending requests for this query type.
+   * The adapter class responsible for sending requests for this query type.
    * Must be set on each concrete Query subclass (or inherited from a base like RESTQuery).
    */
-  static controller;
+  static adapter;
   params;
   config;
   constructor() {
@@ -1402,31 +1402,31 @@ class G {
     return it(this.captured, t, n);
   }
   resolveOptions(t) {
-    const { methods: n } = this.captured, i = n.getConfig ? n.getConfig.call(t) : t.config, r = _t(i?.retry);
-    return { config: i, retryConfig: r };
+    const { methods: n } = this.captured, i = n.getConfig ? n.getConfig.call(t) : t.config, s = _t(i?.retry);
+    return { config: i, retryConfig: s };
   }
   static for(t) {
     let n = It.get(t);
     if (n !== void 0)
       return n;
-    const i = new t(), r = Te(i), s = String(r.methods.getIdentityKey.call(r.fields)), o = r.fields.result, a = o instanceof m ? o : en.object(o), c = (a.mask & l.ENTITY) !== 0, f = t.cache, d = r.fields.fetchNext, u = t.controller;
+    const i = new t(), s = Te(i), r = String(s.methods.getIdentityKey.call(s.fields)), o = s.fields.result, a = o instanceof m ? o : en.object(o), c = (a.mask & d.ENTITY) !== 0, f = t.cache, h = s.fields.fetchNext, u = t.adapter;
     if (!u)
       throw new Error(
-        `Query class "${t.name}" must define a static \`controller\` property. Extend RESTQuery (from fetchium/rest) or set \`static controller = MyController\` on your query class.`
+        `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(
-      l.ENTITY | l.OBJECT,
+    const l = typeof u.prototype.sendNext == "function", g = c ? a : new m(
+      d.ENTITY | d.OBJECT,
       a.shape,
       void 0,
       void 0,
-      s,
+      r,
       // typenameValue — unique per query class
       Lt
       // idField — symbol, injected onto payload before parse
     );
     return n = new G(
-      { id: s, shape: g, cache: f, rawFetchNext: d, hasSendNext: h, isEntityResult: c, controllerClass: u },
-      r
+      { id: r, shape: g, cache: f, rawFetchNext: h, hasSendNext: l, isEntityResult: c, adapterClass: u },
+      s
     ), It.set(t, n), n;
   }
 }
@@ -1438,8 +1438,8 @@ function $n(e, ...t) {
   const n = G.for(e), i = be(An);
   if (i === void 0)
     throw new Error("QueryClient not found");
-  const r = t[0];
-  return i.getQuery(n, r);
+  const s = t[0];
+  return i.getQuery(n, s);
 }
 function fe(e, t) {
   return new Promise((n, i) => {
@@ -1447,11 +1447,11 @@ function fe(e, t) {
       i(t.reason);
       return;
     }
-    const r = setTimeout(n, e);
+    const s = setTimeout(n, e);
     t?.addEventListener(
       "abort",
       () => {
-        clearTimeout(r), i(t.reason);
+        clearTimeout(s), i(t.reason);
       },
       { once: !0 }
     );
@@ -1461,17 +1461,17 @@ async function at(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++) {
+  let s;
+  for (let r = 0; r <= i; r++) {
     n?.throwIfAborted();
     try {
       return await e();
     } catch (o) {
-      if (r = o, s >= i) throw o;
-      await fe(t.retryDelay(s), n);
+      if (s = o, r >= i) throw o;
+      await fe(t.retryDelay(r), n);
     }
   }
-  throw r;
+  throw s;
 }
 class gn {
   def;
@@ -1491,7 +1491,7 @@ class gn {
   /** Resolved per-instance options (depend on actual params). */
   config = void 0;
   retryConfig = _t(void 0);
-  /** Controller for aborting in-flight fetches and retry waits. */
+  /** Cancels in-flight fetches and retry waits. */
   _abortController = void 0;
   /** Cached execution context, recreated only when storageKey (params) changes. */
   _executionCtx = void 0;
@@ -1511,10 +1511,10 @@ class gn {
       throw new Error("Relay state not initialized");
     return this._relayState;
   }
-  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 = kt(r);
-    this._queryId = s !== void 0 ? N(s) : 0, this.relay = Tt(
+  constructor(t, n, i, s) {
+    this.def = t, this.queryClient = n, this.queryKey = i, this.params = s, this._extraMethods = { __refetch: this.refetch }, t.statics.hasSendNext && (this._extraMethods.__fetchNext = this.fetchNext);
+    const r = kt(s);
+    this._queryId = r !== void 0 ? N(r) : 0, this.relay = Tt(
       (o) => {
         this._relayState = o;
         const a = () => {
@@ -1522,13 +1522,13 @@ class gn {
           const f = this.config?.gcTime ?? $t;
           this.queryClient.gcManager.schedule(this.queryKey, f, X.Query);
         }, c = (f = !1) => {
-          const { wasPaused: d, isPaused: u, initialized: h } = this;
-          if (this.wasPaused = u, u && !d && h) {
+          const { wasPaused: h, isPaused: u, initialized: l } = this;
+          if (this.wasPaused = u, u && !h && l) {
             a();
             return;
           }
           const g = kt(this.params), p = wt(this.def, g), w = p !== this.storageKey;
-          w && (this.currentParams = g, this.storageKey = p), this.getOrCreateExecutionContext(), this.initialized ? d || f ? (this.queryClient.activateQuery(this), f && this.updatedAt !== void 0 && this.setupSubscription(), (this.config?.refreshStaleOnReconnect ?? !0) && this.isStale && this.runDebounced()) : w && (this.setupSubscription(), this.runDebounced()) : (this.queryClient.activateQuery(this), this.initialize());
+          w && (this.currentParams = g, this.storageKey = p), this.getOrCreateExecutionContext(), this.initialized ? h || f ? (this.queryClient.activateQuery(this), f && this.updatedAt !== void 0 && this.setupSubscription(), (this.config?.refreshStaleOnReconnect ?? !0) && this.isStale && this.runDebounced()) : w && (this.setupSubscription(), this.runDebounced()) : (this.queryClient.activateQuery(this), this.initialize());
         };
         return c(!0), {
           update: c,
@@ -1539,19 +1539,19 @@ class gn {
     );
   }
   /** Apply raw data (fresh or cached) to the root entity and return the proxy. */
-  applyData(t, n, i = !1, r) {
-    const s = this.def;
+  applyData(t, n, i = !1, s) {
+    const r = this.def;
     return this.rootEntity = this.queryClient.parseAndApplyRootEntity(
       t,
       this._queryId,
-      s.statics.shape,
+      r.statics.shape,
       n,
       i,
-      r
+      s
     ), this.rootEntity._extraMethods === void 0 && (this.rootEntity._extraMethods = this._extraMethods, this.rootEntity._extraGetters = {
       __hasNext: () => this.hasNext,
       __isFetchingNext: () => this._fetchNextPromise !== void 0
-    }), this.rootEntity.getProxy(s.statics.shape);
+    }), this.rootEntity.getProxy(r.statics.shape);
   }
   /** Save query metadata (the __entityRef pointer, updatedAt, ref set). */
   saveQueryMetadata() {
@@ -1571,8 +1571,8 @@ class gn {
     let i;
     try {
       i = await t.loadCachedQuery(this.def, this.storageKey), i !== void 0 && (this.updatedAt = i.updatedAt, n.value = this.applyData(i.value, !1, !1, i.preloadedEntities));
-    } catch (r) {
-      t.store.deleteQuery(this.storageKey), t.getContext().log?.warn?.("Failed to initialize query, the query cache may be corrupted or invalid", r);
+    } catch (s) {
+      t.store.deleteQuery(this.storageKey), t.getContext().log?.warn?.("Failed to initialize query, the query cache may be corrupted or invalid", s);
     }
     if (!this.isPaused)
       try {
@@ -1580,8 +1580,8 @@ class gn {
           if (await fe(0), this.isPaused) return;
           this.runQueryImmediately();
         }
-      } catch (r) {
-        n.setError(r);
+      } catch (s) {
+        n.setError(s);
       }
   }
   setupSubscription() {
@@ -1607,16 +1607,16 @@ class gn {
     const t = this.def;
     if (this.isPaused)
       throw new Error("Query is paused due to network status");
-    const n = this.getOrCreateExecutionContext(), i = this.queryClient.getController(t.statics.controllerClass), r = this._abortController?.signal ?? new AbortController().signal;
+    const n = this.getOrCreateExecutionContext(), i = this.queryClient.getAdapter(t.statics.adapterClass), s = this._abortController?.signal ?? new AbortController().signal;
     return at(
       async () => {
-        const s = await i.send(n, r);
+        const r = await i.send(n, s);
         this.updatedAt = Date.now();
-        const o = this.applyData(s, !0);
+        const o = this.applyData(r, !0);
         return this.saveQueryMetadata(), this.unsubscribe === void 0 && this.setupSubscription(), o;
       },
       this.retryConfig,
-      r
+      s
     );
   }
   runQueryImmediately() {
@@ -1641,7 +1641,7 @@ class gn {
   }
   /** In-flight fetchNext promise for deduplication. */
   _fetchNextPromise = void 0;
-  /** Controller for aborting in-flight fetchNext requests. */
+  /** Cancels in-flight fetchNext requests. */
   _fetchNextAbort = void 0;
   fetchNext = () => {
     if (this.updatedAt === void 0)
@@ -1655,7 +1655,7 @@ class gn {
   };
   get hasNext() {
     if (this.rootEntity === void 0 || !this._executionCtx) return !1;
-    const t = this.queryClient.getController(this.def.statics.controllerClass);
+    const t = this.queryClient.getAdapter(this.def.statics.adapterClass);
     return t.hasNext ? (this._executionCtx.resultData = this.rootEntity.data, t.hasNext(this._executionCtx)) : !1;
   }
   async runFetchNext() {
@@ -1663,12 +1663,12 @@ class gn {
     this._fetchNextAbort = new AbortController();
     const n = this._fetchNextAbort.signal, i = this.getOrCreateExecutionContext();
     i.resultData = this.rootEntity.data;
-    const r = this.queryClient.getController(t.statics.controllerClass);
+    const s = this.queryClient.getAdapter(t.statics.adapterClass);
     return at(
       async () => {
-        const s = await r.sendNext(i, n);
+        const r = await s.sendNext(i, n);
         this.updatedAt = Date.now();
-        const o = this.applyData(s, !0, !0);
+        const o = this.applyData(r, !0, !0);
         return this.saveQueryMetadata(), o;
       },
       this.retryConfig,
@@ -1728,8 +1728,8 @@ class mn {
     if (!(n instanceof m))
       return t;
     const i = this.queryClient.getContext().log?.warn ?? (() => {
-    }), r = new ot();
-    return r.reset(void 0, void 0, i), ie(t, n, r);
+    }), s = new ot();
+    return s.reset(void 0, void 0, i), ie(t, n, s);
   }
   // ======================================================
   // Effects processing
@@ -1737,36 +1737,36 @@ class mn {
   processEffects(t, n) {
     let i;
     if (this.def.hasGetEffects) {
-      const s = it(
+      const r = it(
         this.def.captured,
         t ?? {},
         this.queryClient.getContext()
       );
-      s.result = n, i = s.getEffects();
+      r.result = n, i = r.getEffects();
     } else if (this.def.effects !== void 0) {
-      const s = { params: t, result: n };
-      i = J(this.def.effects, s);
+      const r = { params: t, result: n };
+      i = J(this.def.effects, r);
     }
     if (i === void 0) return;
-    const r = this.queryClient;
-    et(i.creates, "create", r), et(i.updates, "update", r), et(i.deletes, "delete", r), i.invalidates && r.invalidateQueries(i.invalidates);
+    const s = this.queryClient;
+    et(i.creates, "create", s), et(i.updates, "update", s), et(i.deletes, "delete", s), i.invalidates && s.invalidateQueries(i.invalidates);
   }
   // ======================================================
   // Retry logic
   // ======================================================
   executeWithRetry(t) {
-    const n = _t(this.def.config?.retry, !0), i = this.queryClient.getController(this.def.controllerClass);
+    const n = _t(this.def.config?.retry, !0), i = this.queryClient.getAdapter(this.def.adapterClass);
     if (!i.sendMutation)
       throw new Error(
-        `Controller "${this.def.controllerClass.name}" does not implement sendMutation(). Add a sendMutation() method to handle mutations.`
+        `Adapter "${this.def.adapterClass.name}" does not implement sendMutation(). Add a sendMutation() method to handle mutations.`
       );
     return at(async () => {
-      const r = new AbortController(), s = it(
+      const s = new AbortController(), r = it(
         this.def.captured,
         t ?? {},
         this.queryClient.getContext()
       );
-      return await i.sendMutation(s, r.signal);
+      return await i.sendMutation(r, s.signal);
     }, n);
   }
 }
@@ -1775,17 +1775,17 @@ function vn(e) {
 }
 function et(e, t, n) {
   if (e)
-    for (const [i, r] of e) {
-      const s = vn(i);
-      s !== void 0 && n.applyMutationEvent({ type: t, typename: s, data: r });
+    for (const [i, s] of e) {
+      const r = vn(i);
+      r !== void 0 && n.applyMutationEvent({ type: t, typename: r, data: s });
     }
 }
 const ue = "__eventSource";
-function le(e) {
+function de(e) {
   return { field: e, segments: e.indexOf(".") !== -1 ? e.split(".") : void 0 };
 }
 function _n(e) {
-  return e.map(le);
+  return e.map(de);
 }
 function wn(e, t) {
   if (t.segments === void 0) return e[t.field];
@@ -1796,33 +1796,33 @@ function wn(e, t) {
   }
   return n;
 }
-function de(e, t) {
+function he(e, t) {
   const n = [];
   for (let i = 0; i < t.length; i++) {
-    const r = t[i], s = wn(e, r);
-    if (s === void 0) return;
-    n.push(r.field, s);
+    const s = t[i], r = wn(e, s);
+    if (r === void 0) return;
+    n.push(s.field, r);
   }
   return N(n);
 }
 function En(e, t) {
   if (e === void 0) return;
   const n = /* @__PURE__ */ new Map();
-  for (const [i, r] of e) {
-    const s = r.slice().sort((c, f) => c[0] < f[0] ? -1 : c[0] > f[0] ? 1 : 0), o = [];
+  for (const [i, s] of e) {
+    const r = s.slice().sort((c, f) => c[0] < f[0] ? -1 : c[0] > f[0] ? 1 : 0), o = [];
     let a = !0;
-    for (const [c, f] of s) {
-      let d;
+    for (const [c, f] of r) {
+      let h;
       if (qt(f)) {
         const u = Vt(f);
-        d = dt(u, t);
+        h = ht(u, t);
       } else
-        d = f;
-      if (d === void 0) {
+        h = f;
+      if (h === void 0) {
         a = !1;
         break;
       }
-      o.push(c, d);
+      o.push(c, h);
     }
     a && n.set(i, N(o));
   }
@@ -1838,7 +1838,7 @@ class bn {
   fieldPaths;
   _bindings = /* @__PURE__ */ new Map();
   constructor(t) {
-    this.fields = t, this.fieldPaths = t.map(le);
+    this.fields = t, this.fieldPaths = t.map(de);
   }
   register(t, n) {
     let i = this._bindings.get(t);
@@ -1869,29 +1869,29 @@ class Cn {
     this.getOrCreateGroup(n).register(t, i);
   }
   unregister(t, n, i) {
-    const r = Ft(n), s = this._groups.get(r);
-    s !== void 0 && (s.unregister(t, i), s.isEmpty && this._groups.delete(r));
+    const s = Ft(n), r = this._groups.get(s);
+    r !== void 0 && (r.unregister(t, i), r.isEmpty && this._groups.delete(s));
   }
   registerBinding(t, n) {
     const i = t._constraintHashes.get(n);
     if (i === void 0) return;
-    const r = Dt(t._constraintFieldRefs, n);
-    r !== void 0 && this.register(i, r, t);
+    const s = Dt(t._constraintFieldRefs, n);
+    s !== void 0 && this.register(i, s, t);
   }
   unregisterBinding(t, n) {
     const i = t._constraintHashes.get(n);
     if (i === void 0) return;
-    const r = Dt(t._constraintFieldRefs, n);
-    r !== void 0 && this.unregister(i, r, t);
+    const s = Dt(t._constraintFieldRefs, n);
+    s !== void 0 && this.unregister(i, s, t);
   }
-  routeEvent(t, n, i, r, s, o) {
+  routeEvent(t, n, i, s, r, o) {
     for (const a of this._groups.values()) {
-      const c = de(n, a.fieldPaths);
+      const c = he(n, a.fieldPaths);
       if (c === void 0) continue;
       const f = a.getMatching(c);
       if (f !== void 0)
-        for (const d of f)
-          d.onEvent(t, i, r, s, o);
+        for (const h of f)
+          h.onEvent(t, i, s, r, o);
     }
   }
 }
@@ -1904,15 +1904,15 @@ function Mt(e) {
     }
   return t;
 }
-class he {
+class le {
   _queryClient;
   _parent;
   _constraintHashes;
   _entityDefsByTypename;
   _constraintFieldRefs;
   instance;
-  constructor(t, n, i, r, s, o) {
-    this._queryClient = i, this._parent = r, this._constraintHashes = s, this._constraintFieldRefs = n, this.instance = o, this._entityDefsByTypename = /* @__PURE__ */ new Map();
+  constructor(t, n, i, s, r, o) {
+    this._queryClient = i, this._parent = s, this._constraintHashes = r, 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);
     Z.add(this);
@@ -1934,17 +1934,17 @@ class he {
    * root level by applyMutationEvent. The binding just checks if the entity's
    * current data satisfies this binding's shape and forwards to the instance.
    */
-  onEvent(t, n, i, r, s) {
+  onEvent(t, n, i, s, r) {
     const o = this._entityDefsByTypename.get(t);
     if (o === void 0) return;
     const a = this._queryClient.entityMap.getEntity(n);
     if (i === "delete") {
-      const f = a !== void 0 ? a.getProxy(o) : s;
-      f !== void 0 && (this.instance.onEvent(n, f, s ?? a?.data ?? {}, "delete"), r?.());
+      const f = a !== void 0 ? a.getProxy(o) : r;
+      f !== void 0 && (this.instance.onEvent(n, f, r ?? a?.data ?? {}, "delete"), s?.());
       return;
     }
     if (a === void 0 || !a.satisfiesDef(o)) return;
-    r?.();
+    s?.();
     const c = a.getProxy(o);
     this.instance.onEvent(n, c, a.data, i);
   }
@@ -1961,38 +1961,38 @@ class Sn {
   _outputSignal;
   _queryClient;
   _parent;
-  constructor(t, n, i, r, s, o) {
+  constructor(t, n, i, s, r, o) {
     this._notifier = ft(), this._items = i, this._keys = Mt(i), this._queryClient = t, this._parent = n;
-    const a = r !== void 0 && s !== void 0, c = o !== void 0;
+    const a = s !== void 0 && r !== void 0, c = o !== void 0;
     (a || c) && (this._outputSignal = Se(() => {
       this._notifier.consume();
       let f = this._items;
       if (a) {
-        const d = [];
+        const h = [];
         for (const u of f) {
           if (typeof u != "object" || u === null) {
-            d.push(u);
+            h.push(u);
             continue;
           }
-          const h = T(u);
-          if (h === void 0) {
-            d.push(u);
+          const l = T(u);
+          if (l === void 0) {
+            h.push(u);
             continue;
           }
-          const g = t.entityMap.getEntity(h);
+          const g = t.entityMap.getEntity(l);
           if (g === void 0) {
-            d.push(u);
+            h.push(u);
             continue;
           }
-          g.consume(), de(g.data, r) === s && d.push(u);
+          g.consume(), he(g.data, s) === r && h.push(u);
         }
-        f = d;
+        f = h;
       }
       return c && (f = (f === this._items ? f.slice() : f).sort(o)), f;
     }));
   }
-  onEvent(t, n, i, r) {
-    switch (r) {
+  onEvent(t, n, i, s) {
+    switch (s) {
       case "create":
         this.add(t, n);
         break;
@@ -2030,19 +2030,19 @@ class Sn {
   reset(t) {
     const n = this._items, i = Array.isArray(t) ? t : [];
     this._items = i, this._keys = Mt(i);
-    for (const r of i)
-      if (typeof r == "object" && r !== null) {
-        const s = T(r);
-        if (s !== void 0) {
-          const o = this._queryClient.entityMap.getEntity(s);
+    for (const s of i)
+      if (typeof s == "object" && s !== null) {
+        const r = T(s);
+        if (r !== void 0) {
+          const o = this._queryClient.entityMap.getEntity(r);
           o !== void 0 && this._parent.addChildRef(o);
         }
       }
-    for (const r of n)
-      if (typeof r == "object" && r !== null) {
-        const s = T(r);
-        if (s !== void 0) {
-          const o = this._queryClient.entityMap.getEntity(s);
+    for (const s of n)
+      if (typeof s == "object" && s !== null) {
+        const r = T(s);
+        if (r !== void 0) {
+          const o = this._queryClient.entityMap.getEntity(r);
           o !== void 0 && this._parent.removeChildRef(o);
         }
       }
@@ -2075,11 +2075,11 @@ class On {
   _onCreate;
   _onUpdate;
   _onDelete;
-  constructor(t, n, i, r, s, o) {
-    this._notifier = ft(), 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;
+  constructor(t, n, i, s, r, o) {
+    this._notifier = ft(), this._value = i, this._createdKeys = /* @__PURE__ */ new Set(), this._deletedKeys = /* @__PURE__ */ new Set(), this._queryClient = t, this._parent = n, this._onCreate = s, this._onUpdate = r, this._onDelete = o;
   }
-  onEvent(t, n, i, r) {
-    switch (r) {
+  onEvent(t, n, i, s) {
+    switch (s) {
       case "create":
         if (this._createdKeys.has(t)) return;
         this._createdKeys.add(t), this._value = this._onCreate(this._value, n);
@@ -2106,72 +2106,72 @@ class On {
   append(t) {
   }
 }
-function ye(e, t, n, i, r) {
-  let s = e.constraintFieldRefs;
-  if (s === void 0) {
-    s = /* @__PURE__ */ new Map();
+function ye(e, t, n, i, s) {
+  let r = e.constraintFieldRefs;
+  if (r === void 0) {
+    r = /* @__PURE__ */ new Map();
     for (const f of e.entityDefs) {
-      const d = f.typenameValue;
-      d !== void 0 && s.set(d, [[ue, n.key]]);
+      const h = f.typenameValue;
+      h !== void 0 && r.set(h, [[ue, n.key]]);
     }
   }
-  const o = En(s, i) ?? /* @__PURE__ */ new Map();
+  const o = En(r, i) ?? /* @__PURE__ */ new Map();
   let a;
   if (e.type === ut.Array) {
-    let f, d;
+    let f, h;
     if (e.constraintFieldRefs !== void 0 && o.size > 0 && o.size === 1)
       for (const [u] of e.constraintFieldRefs) {
-        const h = o.get(u);
-        if (h !== void 0) {
-          d = h;
+        const l = o.get(u);
+        if (l !== void 0) {
+          h = l;
           const g = e.constraintFieldRefs.get(u);
           g !== void 0 && (f = _n(g.map(([p]) => p)));
           break;
         }
       }
     a = new Sn(
-      r,
+      s,
       n,
       Array.isArray(t) ? t : [],
       f,
-      d,
+      h,
       e.sort
     );
   } else
     a = new On(
-      r,
+      s,
       n,
       t,
       e.onCreate,
       e.onUpdate,
       e.onDelete
     );
-  const c = new he(
+  const c = new le(
     e.entityDefs,
-    s,
     r,
+    s,
     n,
     o,
     a
   );
-  return n.liveCollections.push(c), r.registerLiveCollection(c), c;
+  return n.liveCollections.push(c), s.registerLiveCollection(c), c;
 }
 const pe = Object.entries, ge = Object.prototype;
 function nt(e, t, n, i = !1) {
-  const r = e.queryClient;
-  r.currentParseId++;
-  const s = e.seen, o = /* @__PURE__ */ new Map();
-  return { data: Y(t, s, r, n, o, i), entityRefs: o };
+  const s = e.queryClient;
+  s.currentParseId++;
+  const r = e.seen, o = /* @__PURE__ */ new Map();
+  return { data: Y(t, r, s, n, o, i), entityRefs: o };
 }
-function Y(e, t, n, i, r, s) {
+function Y(e, t, n, i, s, r) {
   if (typeof e != "object" || e === null) return e;
   const o = t.get(e);
   if (o !== void 0)
-    return Rn(o, t, n, i, r, s);
+    return Rn(o, t, n, i, s, r);
   if (Array.isArray(e)) {
     for (let a = 0; a < e.length; a++) {
       const c = e[a];
-      typeof c == "object" && c !== null && !(c instanceof Q) && !S.has(c) && (e[a] = Y(c, t, n, i, r, s));
+      typeof c == "object" && c !== null && !(c instanceof Q) && !S.has(c) && (e[a] = Y(c, t, n, i, s, r));
     }
     return e;
   }
@@ -2179,7 +2179,7 @@ function Y(e, t, n, i, r, s) {
     const a = e;
     for (const c of Object.keys(a)) {
       const f = a[c];
-      typeof f == "object" && f !== null && !(f instanceof Q) && !S.has(f) && (a[c] = Y(f, t, n, i, r, s));
+      typeof f == "object" && f !== null && !(f instanceof Q) && !S.has(f) && (a[c] = Y(f, t, n, i, s, r));
     }
   }
   return e;
@@ -2187,21 +2187,21 @@ function Y(e, t, n, i, r, s) {
 function me(e) {
   return typeof e == "object" && e !== null && !(e instanceof Q) && !S.has(e);
 }
-function Rn(e, t, n, i, r, s) {
-  const { key: o, data: a, shape: c, rawKeys: f } = e, d = 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();
+function Rn(e, t, n, i, s, r) {
+  const { key: o, data: a, shape: c, rawKeys: f } = e, h = c.shape, u = n.prepareEntity(o, a, c), l = u.data, g = l !== a, p = g && f !== void 0 && u.entityRefs !== void 0 ? new Map(u.entityRefs) : /* @__PURE__ */ new Map();
   if (g ? (ve(
-    d,
-    a,
     h,
+    a,
+    l,
     f,
     u,
-    h,
+    l,
     t,
     n,
     i,
     p,
-    s
-  ), u.notify()) : _e(d, a, u, a, t, n, i, p, s), s && u.liveCollections.length > 0)
+    r
+  ), u.notify()) : _e(h, a, u, a, t, n, i, p, r), r && u.liveCollections.length > 0)
     for (const v of u.liveCollections) {
       const O = v.instance.getRawValue();
       if (Array.isArray(O))
@@ -2215,37 +2215,37 @@ function Rn(e, t, n, i, r, s) {
     }
   u.setChildRefs(p.size > 0 ? p : void 0, i);
   const w = u.getProxy(c);
-  return r.set(u, (r.get(u) ?? 0) + 1), w;
+  return s.set(u, (s.get(u) ?? 0) + 1), w;
 }
-function ve(e, t, n, i, r, s, o, a, c, f, d) {
-  for (const [u, h] of pe(e))
+function ve(e, t, n, i, s, r, o, a, c, f, h) {
+  for (const [u, l] of pe(e))
     if (!(i !== void 0 && !i.has(u)))
-      if (me(t[u]) && (t[u] = Y(t[u], o, a, c, f, d)), h instanceof m && h._liveConfig !== void 0) {
+      if (me(t[u]) && (t[u] = Y(t[u], o, a, c, f, h)), l instanceof m && l._liveConfig !== void 0) {
         const g = n[u];
-        g instanceof he ? d ? g.append(t[u]) : g.reset(t[u]) : n[u] = ye(
-          h._liveConfig,
+        g instanceof le ? h ? g.append(t[u]) : g.reset(t[u]) : n[u] = ye(
+          l._liveConfig,
           t[u],
-          r,
           s,
+          r,
           a
         );
       } else {
         const g = t[u], p = n[u];
         if (ct(g) && ct(p)) {
-          const w = h instanceof m && h.shape !== void 0 ? h.shape : void 0;
+          const w = l instanceof m && l.shape !== void 0 ? l.shape : void 0;
           if (w !== void 0)
             ve(
               w,
               g,
               p,
               void 0,
-              r,
               s,
+              r,
               o,
               a,
               c,
               f,
-              d
+              h
             );
           else
             for (const v of Object.keys(g))
@@ -2255,22 +2255,22 @@ function ve(e, t, n, i, r, s, o, a, c, f, d) {
           n[u] = g;
       }
 }
-function _e(e, t, n, i, r, s, o, a, c) {
-  for (const [f, d] of pe(e))
+function _e(e, t, n, i, s, r, o, a, c) {
+  for (const [f, h] of pe(e))
     if (f in t)
-      if (me(t[f]) && (t[f] = Y(t[f], r, s, o, a, c)), d instanceof m && d._liveConfig !== void 0)
+      if (me(t[f]) && (t[f] = Y(t[f], s, r, o, a, c)), h instanceof m && h._liveConfig !== void 0)
         t[f] = ye(
-          d._liveConfig,
+          h._liveConfig,
           t[f],
           n,
           i,
-          s
+          r
         );
       else {
         const u = t[f];
         if (ct(u)) {
-          const h = d instanceof m && d.shape !== void 0 ? d.shape : void 0;
-          h !== void 0 && _e(h, u, n, i, r, s, o, a, c);
+          const l = h instanceof m && h.shape !== void 0 ? h.shape : void 0;
+          l !== void 0 && _e(l, u, n, i, s, r, o, a, c);
         }
       }
 }
@@ -2306,46 +2306,46 @@ class Un {
   typenameRegistry = /* @__PURE__ */ new Map();
   constraintRegistry = /* @__PURE__ */ new Map();
   mergedDefCache = /* @__PURE__ */ new Map();
-  controllers = /* @__PURE__ */ new Map();
+  adapters = /* @__PURE__ */ new Map();
   networkUnsubscribe;
   constructor(t = {}) {
     const {
       store: n = new Ae(new Ne()),
       log: i,
-      evictionMultiplier: r,
-      controllers: s,
+      evictionMultiplier: s,
+      adapters: r,
       networkManager: o,
       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 Fe() : new De(this.handleEviction, r)), this.networkManager = t.networkManager ?? new ae(), this.entityMap = new yn((u, h, g) => this.store.saveEntity(u, h, g));
-    for (const u of t.controllers ?? [])
-      this.controllers.set(u.constructor, u), u.register(this);
-    const f = this.networkManager.getOnlineSignal(), d = Re(() => f.value);
-    this.networkUnsubscribe = d.addListener(
+    this.isServer = typeof window > "u", this.store = n, this.context = { ...c, log: i ?? console, evictionMultiplier: s }, this.gcManager = t.gcManager ?? (this.isServer ? new Fe() : new De(this.handleEviction, s)), this.networkManager = t.networkManager ?? new ae(), this.entityMap = new yn((u, l, g) => this.store.saveEntity(u, l, g));
+    for (const u of t.adapters ?? [])
+      this.adapters.set(u.constructor, u), u.register(this);
+    const f = this.networkManager.getOnlineSignal(), h = Re(() => f.value);
+    this.networkUnsubscribe = h.addListener(
       () => {
         const u = f.value;
-        for (const h of this.controllers.values())
-          h.onNetworkStatusChange?.(u);
+        for (const l of this.adapters.values())
+          l.onNetworkStatusChange?.(u);
       },
       { skipInitial: !0 }
     ), this.store.purgeStaleQueries?.();
   }
   /**
-   * Returns the registered controller instance for the given controller class.
-   * Throws if no controller of that class has been registered.
+   * Returns the registered adapter instance for the given adapter class.
+   * Throws if no adapter of that class has been registered.
    */
-  getController(t) {
-    let n = this.controllers.get(t);
+  getAdapter(t) {
+    let n = this.adapters.get(t);
     if (!n) {
       try {
         n = new t();
       } catch {
         throw new Error(
-          `No controller registered for ${t.name} and auto-instantiation failed. Pass an instance via QueryClient config: new QueryClient({ store, controllers: [new ${t.name}(...)] })`
+          `No adapter registered for ${t.name} and auto-instantiation failed. Pass an instance via QueryClient config: new QueryClient({ store, adapters: [new ${t.name}(...)] })`
         );
       }
-      this.controllers.set(t, n), n.register(this);
+      this.adapters.set(t, n), n.register(this);
     }
     return n;
   }
@@ -2375,14 +2375,14 @@ class Un {
     if (i !== void 0)
       return n = m.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;
-    this.store.saveQuery(t, n, i, r, o);
+  saveQueryData(t, n, i, s, r) {
+    const o = r !== void 0 && r.size > 0 ? new Set([...r.keys()].map((a) => a.key)) : void 0;
+    this.store.saveQuery(t, n, i, s, o);
   }
   activateQuery(t) {
-    const { def: n, queryKey: i, storageKey: r, config: s } = t;
-    this.store.activateQuery(n, r);
-    const o = s?.gcTime ?? $t;
+    const { def: n, queryKey: i, storageKey: s, config: r } = t;
+    this.store.activateQuery(n, s);
+    const o = r?.gcTime ?? $t;
     this.gcManager.cancel(i, o);
   }
   loadCachedQuery(t, n) {
@@ -2394,8 +2394,8 @@ class Un {
    */
   getQuery(t, n) {
     const i = wt(t, n);
-    let r = this.queryInstances.get(i);
-    return r === void 0 && (r = new gn(t, this, i, n), this.queryInstances.set(i, r)), r.relay;
+    let s = this.queryInstances.get(i);
+    return s === void 0 && (s = new gn(t, this, i, n), this.queryInstances.set(i, s)), s.relay;
   }
   /**
    * Gets or creates a MutationResult for the given mutation definition.
@@ -2411,9 +2411,9 @@ class Un {
    * Does NOT touch the entity store. Call applyRefs() after to commit entities.
    */
   parseData(t, n, i) {
-    const r = this.context.log?.warn ?? (() => {
-    }), s = new ot();
-    return s.reset(this, i, r), { data: ie(t, n, s), ctx: s };
+    const s = this.context.log?.warn ?? (() => {
+    }), r = new ot();
+    return r.reset(this, i, s), { data: ie(t, n, r), ctx: r };
   }
   /**
    * Apply entities from parseData() via a single depth-first walk: creates/
@@ -2428,9 +2428,9 @@ class Un {
    * QUERY_ID onto the payload. Returns the root EntityInstance (created or
    * found in the store by the standard entity pipeline).
    */
-  parseAndApplyRootEntity(t, n, i, r, s = !1, o) {
+  parseAndApplyRootEntity(t, n, i, s, r = !1, o) {
     typeof i.idField == "symbol" && typeof t == "object" && t !== null && !("__entityRef" in t) && (t[Lt] = n);
-    const a = this.parseData(t, i, o), c = nt(a.ctx, a.data, r, s), f = S.get(c.data);
+    const a = this.parseData(t, i, o), c = nt(a.ctx, a.data, s, r), f = S.get(c.data);
     return this.entityMap.getEntity(f);
   }
   prepareEntity(t, n, i) {
@@ -2440,15 +2440,15 @@ class Un {
   // Mutation Events
   // ======================================================
   applyMutationEvent(t) {
-    const { type: n, typename: i } = t, r = this.getMergedDef(i);
-    if (r === void 0) return;
-    const s = r.idField;
-    if (s === void 0 || typeof s == "symbol") return;
-    const o = t.data, a = t.id !== void 0 ? t.id : n === "delete" && (typeof o == "string" || typeof o == "number") ? o : o[s];
+    const { type: n, typename: i } = t, s = this.getMergedDef(i);
+    if (s === void 0) return;
+    const r = s.idField;
+    if (r === void 0 || typeof r == "symbol") return;
+    const o = t.data, a = t.id !== void 0 ? t.id : n === "delete" && (typeof o == "string" || typeof o == "number") ? o : o[r];
     if (a === void 0) return;
-    const c = N([i, a]), f = t.__eventSource, d = typeof o == "object" && o !== null ? o : {}, u = this.entityMap.getEntity(c);
+    const c = N([i, a]), f = t.__eventSource, h = typeof o == "object" && o !== null ? o : {}, u = this.entityMap.getEntity(c);
     if (n === "delete") {
-      const w = u !== void 0 ? u.data : d;
+      const w = u !== void 0 ? u.data : h;
       this.routeEvent(i, w, c, n, f, void 0, w);
       return;
     }
@@ -2462,7 +2462,7 @@ class Un {
         /* isPartialEvent */
         !0
       );
-      const O = rn(d, r, v);
+      const O = sn(h, s, v);
       nt(v, O, !0);
     } catch (w) {
       if (this.context.log?.warn?.("Failed to apply mutation event", w), u === void 0) {
@@ -2471,23 +2471,23 @@ class Un {
       }
       return;
     }
-    const h = this.entityMap.getEntity(c);
-    if (h === void 0) return;
-    this.entityMap.save(h);
+    const l = this.entityMap.getEntity(c);
+    if (l === void 0) return;
+    this.entityMap.save(l);
     const g = u === void 0;
     let p = !1;
-    this.routeEvent(i, h.data, c, n, f, () => {
+    this.routeEvent(i, l.data, c, n, f, () => {
       p = !0;
-    }), g && !p && h.evict();
+    }), g && !p && l.evict();
   }
   // ======================================================
   // Query Invalidation
   // ======================================================
   invalidateQueries(t) {
     for (const n of t) {
-      const i = Array.isArray(n), r = i ? n[0] : n, s = i ? n[1] : void 0, a = G.for(r).statics.id;
+      const i = Array.isArray(n), s = i ? n[0] : n, r = i ? n[1] : void 0, a = G.for(s).statics.id;
       for (const [, c] of this.queryInstances)
-        c.def.statics.id === a && (s === void 0 || Nn(c.resolvedParams, s)) && c.markStale();
+        c.def.statics.id === a && (r === void 0 || Nn(c.resolvedParams, r)) && c.markStale();
     }
   }
   // ======================================================
@@ -2495,9 +2495,9 @@ class Un {
   // ======================================================
   handleEviction = (t, n) => {
     if (n === X.Query) {
-      const r = this.queryInstances.get(t);
-      if (r === void 0) return;
-      r.rootEntity?.evict(), this.queryInstances.delete(t);
+      const s = this.queryInstances.get(t);
+      if (s === void 0) return;
+      s.rootEntity?.evict(), this.queryInstances.delete(t);
       return;
     }
     const i = this.entityMap.getEntity(t);
@@ -2520,17 +2520,17 @@ class Un {
       i !== void 0 && i.unregisterBinding(t, n);
     }
   }
-  routeEvent(t, n, i, r, s, o, a) {
+  routeEvent(t, n, i, s, r, o, a) {
     const c = this.constraintRegistry.get(t);
     if (c === void 0) return;
-    const f = s !== void 0 ? { ...n, [ue]: s } : n;
-    c.routeEvent(t, f, i, r, o, a);
+    const f = r !== void 0 ? { ...n, [ue]: r } : n;
+    c.routeEvent(t, f, i, s, o, a);
   }
   destroy() {
     this.networkUnsubscribe?.(), this.gcManager.destroy(), this.networkManager.destroy();
-    for (const t of this.controllers.values())
+    for (const t of this.adapters.values())
       t.destroy?.();
-    this.controllers.clear(), this.queryInstances.clear(), this.mutationInstances.clear(), this.constraintRegistry.clear(), this.typenameRegistry.clear(), this.mergedDefCache.clear();
+    this.adapters.clear(), this.queryInstances.clear(), this.mutationInstances.clear(), this.constraintRegistry.clear(), this.typenameRegistry.clear(), this.mergedDefCache.clear();
   }
 }
 const An = jt(void 0);
@@ -2545,7 +2545,7 @@ export {
   Bt as E,
   De as G,
   B as L,
-  l as M,
+  d as M,
   ae as N,
   Lt as Q,
   F as R,
@@ -2569,4 +2569,4 @@ export {
   Zt as r,
   en as t
 };
-//# sourceMappingURL=QueryClient-Dtde3pss.js.map
+//# sourceMappingURL=QueryClient-BajBmpnA.js.map