@instantdb/core 0.22.86-experimental.split-store.20183617880.1 → 0.22.86-experimental.split-store.20247643606.1

package/dist/standalone/index.js

@@ -64,7 +64,7 @@ function st(t) {
 function it(t) {
   return Object.getPrototypeOf(t) === Map.prototype;
 }
-function L(t) {
+function U(t) {
   var e;
   return (e = t.copy) !== null && e !== void 0 ? e : t.original;
 }
@@ -116,7 +116,7 @@ function he(t, e, n) {
 }
 function De(t, e) {
   const n = S(t);
-  return (n ? L(n) : t)[e];
+  return (n ? U(n) : t)[e];
 }
 function Q(t, e) {
   return t === e ? t !== 0 || 1 / t === 1 / e : t !== t && e !== e;
@@ -449,13 +449,13 @@ const Ae = (t, e, n = !1) => {
     throw new Error("Strict mode: Mutable data cannot be accessed directly, please use 'unsafe(callback)' wrap.");
 }, ze = {
   get size() {
-    return L(S(this)).size;
+    return U(S(this)).size;
   },
   has(t) {
-    return L(S(this)).has(t);
+    return U(S(this)).has(t);
   },
   set(t, e) {
-    const n = S(this), r = L(n);
+    const n = S(this), r = U(n);
     return (!r.has(t) || !Q(r.get(t), e)) && (j(n), V(n), n.assignedMap.set(t, !0), n.copy.set(t, e), ct(n, t, e, fe)), this;
   },
   delete(t) {
@@ -475,13 +475,13 @@ const Ae = (t, e, n = !1) => {
   },
   forEach(t, e) {
     const n = S(this);
-    L(n).forEach((r, s) => {
+    U(n).forEach((r, s) => {
       t.call(e, this.get(s), s, this);
     });
   },
   get(t) {
     var e, n;
-    const r = S(this), s = L(r).get(t), i = ((n = (e = r.options).mark) === null || n === void 0 ? void 0 : n.call(e, s, F)) === F.mutable;
+    const r = S(this), s = U(r).get(t), i = ((n = (e = r.options).mark) === null || n === void 0 ? void 0 : n.call(e, s, F)) === F.mutable;
     if (r.options.strict && Ae(s, r.options, i), i || r.finalized || !q(s, r.options) || s !== r.original.get(t))
       return s;
     const o = rt.createDraft({
@@ -494,7 +494,7 @@ const Ae = (t, e, n = !1) => {
     return j(r), r.copy.set(t, o), o;
   },
   keys() {
-    return L(S(this)).keys();
+    return U(S(this)).keys();
   },
   values() {
     const t = this.keys();
@@ -653,7 +653,7 @@ const rr = Reflect.ownKeys(ve), rn = /* @__PURE__ */ new WeakSet(), sn = {
       if (o = t.options.mark(u, F), o === F.mutable)
         return t.options.strict && Ae(u, t.options, !0), u;
     }
-    const a = L(t);
+    const a = U(t);
     if (a instanceof Map && nr.includes(e)) {
       if (e === "size")
         return Object.getOwnPropertyDescriptor(ze, "size").get.call(t.proxy);
@@ -700,20 +700,20 @@ const rr = Reflect.ownKeys(ve), rn = /* @__PURE__ */ new WeakSet(), sn = {
     let s;
     if (t.type === 1 && e !== "length" && !(Number.isInteger(s = Number(e)) && s >= 0 && (e === 0 || s === 0 || String(s) === String(e))))
       throw new Error("Only supports setting array indices and the 'length' property.");
-    const i = wt(L(t), e);
+    const i = wt(U(t), e);
     if (i != null && i.set)
       return i.set.call(t.proxy, n), !0;
-    const o = De(L(t), e), a = S(o);
+    const o = De(U(t), e), a = S(o);
     return a && Q(a.original, n) ? (t.copy[e] = n, t.assignedMap = (r = t.assignedMap) !== null && r !== void 0 ? r : /* @__PURE__ */ new Map(), t.assignedMap.set(e, !1), !0) : (Q(n, o) && (n !== void 0 || ce(t.original, e)) || (j(t), V(t), ce(t.original, e) && Q(n, t.original[e]) ? t.assignedMap.delete(e) : t.assignedMap.set(e, !0), t.copy[e] = n, ct(t, e, n, fe)), !0);
   },
   has(t, e) {
-    return e in L(t);
+    return e in U(t);
   },
   ownKeys(t) {
-    return Reflect.ownKeys(L(t));
+    return Reflect.ownKeys(U(t));
   },
   getOwnPropertyDescriptor(t, e) {
-    const n = L(t), r = Reflect.getOwnPropertyDescriptor(n, e);
+    const n = U(t), r = Reflect.getOwnPropertyDescriptor(n, e);
     return r && {
       writable: !0,
       configurable: t.type !== 1 || e !== "length",
@@ -756,10 +756,10 @@ function ut(t) {
       var h, p;
       const y = S(c);
       let b = l.type === 3 ? l.setMap : l.copy;
-      const _ = G(b, r), g = S(_);
-      if (g) {
-        let T = g.original;
-        g.operated && (T = ot(_)), Ke(g), qe(g, fe, f, d), l.options.enableAutoFreeze && (l.options.updatedValues = (h = l.options.updatedValues) !== null && h !== void 0 ? h : /* @__PURE__ */ new WeakMap(), l.options.updatedValues.set(T, g.original)), he(b, r, T);
+      const g = G(b, r), _ = S(g);
+      if (_) {
+        let T = _.original;
+        _.operated && (T = ot(g)), Ke(_), qe(_, fe, f, d), l.options.enableAutoFreeze && (l.options.updatedValues = (h = l.options.updatedValues) !== null && h !== void 0 ? h : /* @__PURE__ */ new WeakMap(), l.options.updatedValues.set(T, _.original)), he(b, r, T);
       }
       (p = y.callbacks) === null || p === void 0 || p.forEach((T) => {
         T(f, d);
@@ -877,9 +877,9 @@ const or = (t) => function e(n, r, s) {
     for (const M of l.mark) {
       if (typeof M != "function")
         throw new Error(`Invalid mark: ${M}, 'mark' should be a function.`);
-      const U = M(m, O);
-      if (U)
-        return U;
+      const x = M(m, O);
+      if (x)
+        return x;
     }
   } : l.mark, h = (i = l.enablePatches) !== null && i !== void 0 ? i : !1, p = (o = l.strict) !== null && o !== void 0 ? o : !1, b = {
     enableAutoFreeze: (a = l.enableAutoFreeze) !== null && a !== void 0 ? a : !1,
@@ -889,47 +889,47 @@ const or = (t) => function e(n, r, s) {
   };
   if (!q(f, b) && typeof f == "object" && f !== null)
     throw new Error("Invalid base state: create() only supports plain objects, arrays, Set, Map or using mark() to mark the state as immutable.");
-  const [_, g] = ir(f, b);
+  const [g, _] = ir(f, b);
   if (typeof r != "function") {
     if (!q(f, b))
       throw new Error("Invalid base state: create() only supports plain objects, arrays, Set, Map or using mark() to mark the state as immutable.");
-    return [_, g];
+    return [g, _];
   }
   let T;
   try {
-    T = u(_);
+    T = u(g);
   } catch (m) {
-    throw Ne(S(_)), m;
+    throw Ne(S(g)), m;
   }
   const A = (m) => {
-    const O = S(_);
+    const O = S(g);
     if (!J(m)) {
-      if (m !== void 0 && !Q(m, _) && (O != null && O.operated))
+      if (m !== void 0 && !Q(m, g) && (O != null && O.operated))
         throw new Error("Either the value is returned as a new non-draft value, or only the draft is modified without returning any value.");
-      const U = m == null ? void 0 : m[Bn];
-      if (U) {
-        const $e = U[0];
+      const x = m == null ? void 0 : m[Bn];
+      if (x) {
+        const $e = x[0];
         return b.strict && typeof m == "object" && m !== null && Ve({
           rootDraft: O,
           value: m,
           useRawReturn: !0
-        }), g([$e]);
+        }), _([$e]);
       }
       if (m !== void 0)
-        return typeof m == "object" && m !== null && Ve({ rootDraft: O, value: m }), g([m]);
+        return typeof m == "object" && m !== null && Ve({ rootDraft: O, value: m }), _([m]);
     }
-    if (m === _ || m === void 0)
-      return g([]);
+    if (m === g || m === void 0)
+      return _([]);
     const M = S(m);
     if (b === M.options) {
       if (M.operated)
         throw new Error("Cannot return a modified child draft.");
-      return g([St(m)]);
+      return _([St(m)]);
     }
-    return g([m]);
+    return _([m]);
   };
   return T instanceof Promise ? T.then(A, (m) => {
-    throw Ne(S(_)), m;
+    throw Ne(S(g)), m;
   }) : A(T);
 }, Oe = or();
 Object.prototype.constructor.toString();
@@ -1365,49 +1365,47 @@ class H {
   getAttr(e) {
     return this.attrs[e];
   }
-  // XXX: Might be better to create all of the indexes at once as soon as someone
-  //      requests one index
   get blobAttrs() {
     if (this._blobAttrs)
       return this._blobAttrs;
-    console.log("blobAttrs"), this._blobAttrs = /* @__PURE__ */ new Map();
+    this._blobAttrs = /* @__PURE__ */ new Map();
     for (const e of Object.values(this.attrs))
       if (dt(e)) {
         const [n, r, s] = e["forward-identity"];
-        D(this.blobAttrs, [r, s], e);
+        L(this.blobAttrs, [r, s], e);
       }
     return this._blobAttrs;
   }
   get primaryKeys() {
     if (this._primaryKeys)
       return this._primaryKeys;
-    console.log("primayKeys"), this._primaryKeys = /* @__PURE__ */ new Map();
+    this._primaryKeys = /* @__PURE__ */ new Map();
     for (const e of Object.values(this.attrs))
       if (e["primary?"]) {
         const [n, r] = e["forward-identity"];
-        D(this._primaryKeys, [r], e);
+        L(this._primaryKeys, [r], e);
       }
     return this._primaryKeys;
   }
   get forwardIdents() {
     if (this._forwardIdents)
       return this._forwardIdents;
-    console.log("fwdIdents"), this._forwardIdents = /* @__PURE__ */ new Map();
+    this._forwardIdents = /* @__PURE__ */ new Map();
     for (const e of Object.values(this.attrs)) {
       const n = e["forward-identity"], [r, s, i] = n;
-      D(this._forwardIdents, [s, i], e);
+      L(this._forwardIdents, [s, i], e);
     }
     return this._forwardIdents;
   }
   get revIdents() {
     if (this._revIdents)
       return this._revIdents;
-    console.log("revIdents"), this._revIdents = /* @__PURE__ */ new Map();
+    this._revIdents = /* @__PURE__ */ new Map();
     for (const e of Object.values(this.attrs)) {
       const n = e["reverse-identity"];
       if (n) {
         const [r, s, i] = n;
-        D(this._revIdents, [s, i], e);
+        L(this._revIdents, [s, i], e);
       }
     }
     return this._revIdents;
@@ -1437,15 +1435,15 @@ function K(t, e) {
   const [n, ...r] = e;
   t.has(n) && K(t.get(n), r);
 }
-function D(t, e, n) {
-  if (e.length === 0) throw new Error("path must have at least one element");
-  if (e.length === 1) {
-    t.set(e[0], n);
-    return;
+function L(t, e, n) {
+  let r = t;
+  const s = e.length - 1;
+  for (let i = 0; i < s; i++) {
+    const o = e[i];
+    let a = r.get(o);
+    a === void 0 && (a = /* @__PURE__ */ new Map(), r.set(o, a)), r = a;
   }
-  const [r, ...s] = e;
-  let i = t.get(r);
-  i || (i = /* @__PURE__ */ new Map(), t.set(r, i)), D(i, s, n);
+  s > -1 && r.set(e[s], n);
 }
 function ln(t, e, n) {
   const r = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
@@ -1456,13 +1454,13 @@ function ln(t, e, n) {
       console.warn("no such attr", c, a);
       continue;
     }
-    l["checked-data-type"] === "date" && n && (u = Ie(u), o[2] = u), ft(l) && D(i, [u, c, a], o), D(r, [a, c, u], o), D(s, [c, a, u], o);
+    l["checked-data-type"] === "date" && n && (u = Ie(u), o[2] = u), ft(l) && L(i, [u, c, a], o), L(r, [a, c, u], o), L(s, [c, a, u], o);
   }
   return { eav: r, aev: s, vae: i };
 }
 function fn(t) {
   return {
-    triples: R(t.eav, 3),
+    triples: D(t.eav, 3),
     cardinalityInference: t.cardinalityInference,
     useDateObjects: t.useDateObjects,
     version: 1
@@ -1500,7 +1498,7 @@ function pe(t, e) {
     const [o, a] = e[0], c = t.aev.get(o);
     if (!c)
       return null;
-    n = (s = R(c, 2).find((l) => l[2] === a)) == null ? void 0 : s[0];
+    n = (s = D(c, 2).find((l) => l[2] === a)) == null ? void 0 : s[0];
   } else
     n = e[0];
   if (!n)
@@ -1510,7 +1508,7 @@ function pe(t, e) {
     const [o, a] = r, c = t.aev.get(o);
     if (!c)
       return null;
-    const l = (i = R(c, 2).find((y) => y[2] === a)) == null ? void 0 : i[0];
+    const l = (i = D(c, 2).find((y) => y[2] === a)) == null ? void 0 : i[0];
     if (!l)
       return null;
     const [f, d, h, ...p] = e;
@@ -1544,7 +1542,7 @@ function bn(t, e, n) {
     return;
   a["checked-data-type"] === "date" && t.useDateObjects && (o = Ie(o));
   const c = re(t.eav, [s, i, o]), u = (c == null ? void 0 : c[3]) ?? yn(t, a, r), l = [s, i, o, u];
-  kr(a) ? (D(t.eav, [s, i], /* @__PURE__ */ new Map([[o, l]])), D(t.aev, [i, s], /* @__PURE__ */ new Map([[o, l]]))) : (D(t.eav, [s, i, o], l), D(t.aev, [i, s, o], l)), ft(a) && D(t.vae, [o, i, s], l);
+  kr(a) ? (L(t.eav, [s, i], /* @__PURE__ */ new Map([[o, l]])), L(t.aev, [i, s], /* @__PURE__ */ new Map([[o, l]]))) : (L(t.eav, [s, i, o], l), L(t.aev, [i, s, o], l)), ft(a) && L(t.vae, [o, i, s], l);
 }
 function Cr(t, e, n) {
   var h;
@@ -1565,7 +1563,7 @@ function Cr(t, e, n) {
     f,
     yn(t, a, u)
   ];
-  D(t.eav, [s, i], /* @__PURE__ */ new Map([[f, d]]));
+  L(t.eav, [s, i], /* @__PURE__ */ new Map([[f, d]]));
 }
 function Qe(t, e, n) {
   var u, l;
@@ -1576,7 +1574,7 @@ function Qe(t, e, n) {
   if (a) {
     for (const f of a.keys()) {
       const d = e.getAttr(f);
-      d && d["on-delete-reverse"] === "cascade" && R(a.get(f), 1).forEach(
+      d && d["on-delete-reverse"] === "cascade" && D(a.get(f), 1).forEach(
         ([h, p, y]) => {
           var b;
           return Qe(t, e, [y, (b = d["reverse-identity"]) == null ? void 0 : b[1]]);
@@ -1589,11 +1587,11 @@ function Qe(t, e, n) {
     }
     a.size === 0 && K(t.eav, [o]);
   }
-  const c = t.vae.get(o) && R(t.vae.get(o), 2);
+  const c = t.vae.get(o) && D(t.vae.get(o), 2);
   c && c.forEach((f) => {
-    var b, _, g;
+    var b, g, _;
     const [d, h, p] = f, y = e.getAttr(h);
-    (!s || !y || ((b = y["reverse-identity"]) == null ? void 0 : b[1]) === s) && (K(t.eav, [d, h, p]), K(t.aev, [h, d, p]), K(t.vae, [p, h, d])), y && y["on-delete"] === "cascade" && ((_ = y["reverse-identity"]) == null ? void 0 : _[1]) === s && Qe(t, e, [d, (g = y["forward-identity"]) == null ? void 0 : g[1]]);
+    (!s || !y || ((b = y["reverse-identity"]) == null ? void 0 : b[1]) === s) && (K(t.eav, [d, h, p]), K(t.aev, [h, d, p]), K(t.vae, [p, h, d])), y && y["on-delete"] === "cascade" && ((g = y["reverse-identity"]) == null ? void 0 : g[1]) === s && Qe(t, e, [d, (_ = y["forward-identity"]) == null ? void 0 : _[1]]);
   }), ((l = t.vae.get(o)) == null ? void 0 : l.size) === 0 && K(t.vae, [o]);
 }
 function _n(t, e, n) {
@@ -1610,7 +1608,7 @@ function Mr(t, [e]) {
   t.addAttr(e);
 }
 function gn(t) {
-  return R(t.eav, 3);
+  return D(t.eav, 3);
 }
 function Pr(t, e, [n]) {
   if (!e.getAttr(n)) return;
@@ -1652,7 +1650,7 @@ function $r(t, e, n) {
       throw new Error(`unhandled transaction action: ${r}`);
   }
 }
-function R(t, e, n = []) {
+function D(t, e, n = []) {
   if (!t || e === 0)
     return n;
   if (e === 1) {
@@ -1661,7 +1659,7 @@ function R(t, e, n = []) {
     return n;
   }
   for (const r of t.values())
-    R(r, e - 1, n);
+    D(r, e - 1, n);
   return n;
 }
 function ye(t, e, n) {
@@ -1689,7 +1687,7 @@ function ye(t, e, n) {
     return r;
   }
   if (n != null && n.$comparator)
-    return R(e, 1).filter(n.$op);
+    return D(e, 1).filter(n.$op);
   const s = n.in || n.$in || [n];
   for (const o of s) {
     const a = e.get(o);
@@ -1706,11 +1704,11 @@ function Rr(t, [e, n, r]) {
   switch (Dr(e, n, r)) {
     case "e": {
       const a = t.eav.get(e);
-      return R(a, 2);
+      return D(a, 2);
     }
     case "ea": {
       const a = (i = t.eav.get(e)) == null ? void 0 : i.get(n);
-      return R(a, 1);
+      return D(a, 1);
     }
     case "eav": {
       const a = (o = t.eav.get(e)) == null ? void 0 : o.get(n);
@@ -1727,7 +1725,7 @@ function Rr(t, [e, n, r]) {
     }
     case "a": {
       const a = t.aev.get(n);
-      return R(a, 2);
+      return D(a, 2);
     }
     case "av": {
       const a = t.aev.get(n);
@@ -1746,7 +1744,7 @@ function Rr(t, [e, n, r]) {
       return a;
     }
     default:
-      return R(t.eav, 3);
+      return D(t.eav, 3);
   }
 }
 function xr(t, e, n) {
@@ -1755,7 +1753,7 @@ function xr(t, e, n) {
   if (!e)
     return r;
   for (const [i, o] of e.entries()) {
-    const a = (s = t.eav.get(n)) == null ? void 0 : s.get(o.id), c = R(a, 1);
+    const a = (s = t.eav.get(n)) == null ? void 0 : s.get(o.id), c = D(a, 1);
     for (const u of c)
       r[i] = u[2];
   }
@@ -2241,10 +2239,10 @@ function Ss(t, e, n, { etype: r, level: s, form: i }, o) {
   const a = Object.keys(i).filter((c) => c !== "$");
   return a.length ? Object.entries(o).map(function([u, l]) {
     return a.map(function(h) {
-      var y, b, _;
-      const p = !!(e.cardinalityInference && ((_ = (b = (y = n.linkIndex) == null ? void 0 : y[r]) == null ? void 0 : b[h]) != null && _.isSingular));
+      var y, b, g;
+      const p = !!(e.cardinalityInference && ((g = (b = (y = n.linkIndex) == null ? void 0 : y[r]) == null ? void 0 : b[h]) != null && g.isSingular));
       try {
-        const [g, T, A] = ms(
+        const [_, T, A] = ms(
           t,
           n,
           r,
@@ -2252,16 +2250,16 @@ function Ss(t, e, n, { etype: r, level: s, form: i }, o) {
           h,
           u
         ), m = vn(e, n, {
-          etype: g,
+          etype: _,
           level: T,
           form: i[h],
           join: A
         }), O = p ? m[0] : m;
         return { [h]: O };
-      } catch (g) {
-        if (g instanceof ne)
+      } catch (_) {
+        if (_ instanceof ne)
           return { [h]: p ? void 0 : [] };
-        throw g;
+        throw _;
       }
     }).reduce(function(h, p) {
       return { ...h, ...p };
@@ -2323,28 +2321,28 @@ function Cs(t, e, { etype: n, pageInfo: r, dq: s, form: i }) {
   let u = Br(t, s);
   const l = r == null ? void 0 : r["start-cursor"], f = Es(e, n, l, o);
   if (f && ((y = f == null ? void 0 : f["forward-identity"]) == null ? void 0 : y[2]) !== "id") {
-    const b = f["checked-data-type"] === "date", _ = f.id;
-    u = u.map(([g]) => {
-      var A, m, O, M, U;
-      let T = (U = (M = (O = (m = (A = t.eav.get(g)) == null ? void 0 : A.get(_)) == null ? void 0 : m.values()) == null ? void 0 : O.next()) == null ? void 0 : M.value) == null ? void 0 : U[2];
-      return b && (T = He(T)), [g, T];
+    const b = f["checked-data-type"] === "date", g = f.id;
+    u = u.map(([_]) => {
+      var A, m, O, M, x;
+      let T = (x = (M = (O = (m = (A = t.eav.get(_)) == null ? void 0 : A.get(g)) == null ? void 0 : m.values()) == null ? void 0 : O.next()) == null ? void 0 : M.value) == null ? void 0 : x[2];
+      return b && (T = He(T)), [_, T];
     });
   }
   u.sort(
-    c === "asc" ? function(_, g) {
-      return ke(_, g, f == null ? void 0 : f["checked-data-type"]);
-    } : function(_, g) {
+    c === "asc" ? function(g, _) {
       return ke(g, _, f == null ? void 0 : f["checked-data-type"]);
+    } : function(g, _) {
+      return ke(_, g, f == null ? void 0 : f["checked-data-type"]);
     }
   );
   let d = {};
   const h = Is(e, n, s);
   for (const b of u) {
-    const [_] = b;
-    if (d[_] || !a && l && f && vs(l, f, c, b))
+    const [g] = b;
+    if (d[g] || !a && l && f && vs(l, f, c, b))
       continue;
-    const g = xr(t, h, _);
-    g && (d[_] = g);
+    const _ = xr(t, h, g);
+    _ && (d[g] = _);
   }
   return d;
 }
@@ -2375,8 +2373,8 @@ function Ps(t, e, { etype: n, level: r, form: s, join: i, pageInfo: o }) {
     r > 0 && console.warn(
       "WARNING: Limits in child queries are only run client-side. Data returned from the server will not have a limit."
     );
-    const _ = Object.entries(l);
-    return _.length <= f ? l : Object.fromEntries(_.slice(0, f));
+    const g = Object.entries(l);
+    return g.length <= f ? l : Object.fromEntries(g.slice(0, f));
   }
   return l;
 }
@@ -2541,7 +2539,7 @@ function Ks(t, e, n) {
 function Ze(t) {
   return typeof t == "string" && !Ee(t) ? null : typeof t == "string" && Ee(t) ? kn(t) : Fs(t);
 }
-function x(t, e, n) {
+function R(t, e, n) {
   const r = Ze(n);
   if (r === null)
     return n;
@@ -2552,7 +2550,7 @@ function x(t, e, n) {
 }
 function In(t, e, n, r) {
   var o;
-  const s = x(t, e, n);
+  const s = R(t, e, n);
   return Array.isArray(s) ? [[
     "add-triple",
     s,
@@ -2565,16 +2563,18 @@ function qs({ attrsStore: t }, [e, n, r]) {
     const a = Array.isArray(o) ? o : [o], c = E(t, e, i), u = Z(t, e, i);
     return a.map((l) => c ? [
       "add-triple",
-      x(t, e, n),
+      R(t, e, n),
       c.id,
-      // XXX: Better error here
-      x(t, c["reverse-identity"][1], l)
+      // Uses `!` because if we get here, we should have created the attr if it doesn't
+      // already exist
+      R(t, c["reverse-identity"][1], l)
     ] : [
       "add-triple",
-      // XXX: Better error here
-      x(t, u["forward-identity"][1], l),
+      // Uses `!` because if we get here, we should have created the attr if it doesn't
+      // already exist
+      R(t, u["forward-identity"][1], l),
       u == null ? void 0 : u.id,
-      x(t, e, n)
+      R(t, e, n)
     ]);
   });
   return In(t, e, n, s);
@@ -2584,16 +2584,18 @@ function zs({ attrsStore: t }, [e, n, r]) {
     const a = Array.isArray(o) ? o : [o], c = E(t, e, i), u = Z(t, e, i);
     return a.map((l) => c ? [
       "retract-triple",
-      x(t, e, n),
+      R(t, e, n),
       c.id,
-      // XXX: Better error here
-      x(t, c["reverse-identity"][1], l)
+      // Uses `!` because if we get here, we should have created the attr if it doesn't
+      // already exist
+      R(t, c["reverse-identity"][1], l)
     ] : [
       "retract-triple",
-      // XXX: Better error here
-      x(t, u["forward-identity"][1], l),
+      // Uses `!` because if we get here, we should have created the attr if it doesn't
+      // already exist
+      R(t, u["forward-identity"][1], l),
       u.id,
-      x(t, e, n)
+      R(t, e, n)
     ]);
   });
   return In(t, e, n, s);
@@ -2605,7 +2607,7 @@ function Vs(t, e, n, r) {
     for (const a of t || []) {
       const c = a == null ? void 0 : a.aev.get(i);
       if (c) {
-        for (const [u, l, f] of R(c, 2))
+        for (const [u, l, f] of D(c, 2))
           if (f === o)
             return !0;
       }
@@ -2625,14 +2627,14 @@ function Cn({ stores: t, attrsStore: e }, [n, r, s, i]) {
   return (i == null ? void 0 : i.upsert) === !1 ? { mode: "update" } : (i == null ? void 0 : i.upsert) === !0 ? null : Vs(t, e, n, r) ? { mode: "update" } : null;
 }
 function Ws(t, e) {
-  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = x(n, r, s);
+  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = R(n, r, s);
   return [["id", c]].concat(Object.entries(a)).map(([l, f]) => {
     const d = E(n, r, l);
     return d["checked-data-type"] === "date" && t.useDateObjects && (f = Ie(f)), ["add-triple", c, d.id, f, { mode: "create" }];
   });
 }
 function Qs(t, e) {
-  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = x(n, r, s), u = Cn(t, [r, c, i, o]);
+  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = R(n, r, s), u = Cn(t, [r, c, i, o]);
   return [["id", c]].concat(Object.entries(a)).map(([f, d]) => {
     const h = E(n, r, f);
     return h["checked-data-type"] === "date" && t.useDateObjects && (d = Ie(d)), [
@@ -2645,10 +2647,10 @@ function Qs(t, e) {
   });
 }
 function Gs({ attrsStore: t }, [e, n]) {
-  return [["delete-entity", x(t, e, n), e]];
+  return [["delete-entity", R(t, e, n), e]];
 }
 function Bs(t, e) {
-  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = x(n, r, s), u = Cn(t, [r, c, i, o]), l = Object.entries(a).map(([d, h]) => {
+  const { attrsStore: n } = t, [r, s, i, o] = e, a = lt(i), c = R(n, r, s), u = Cn(t, [r, c, i, o]), l = Object.entries(a).map(([d, h]) => {
     const p = E(n, r, d);
     return [
       "deep-merge-triple",
@@ -2667,7 +2669,7 @@ function Bs(t, e) {
   ]].concat(l);
 }
 function Hs({ attrsStore: t }, [e, n, r]) {
-  return [["rule-params", x(t, e, n), e, r]];
+  return [["rule-params", R(t, e, n), e, r]];
 }
 function Js(t) {
   const [e, n, r, s, i] = t;
@@ -2812,8 +2814,8 @@ function ci({ attrsStore: t, schema: e }, n) {
   function a(p, y) {
     return Z(t, p, y) || s.find(
       (b) => {
-        var _, g;
-        return ((_ = b["reverse-identity"]) == null ? void 0 : _[1]) === p && ((g = b["reverse-identity"]) == null ? void 0 : g[2]) === y;
+        var g, _;
+        return ((g = b["reverse-identity"]) == null ? void 0 : g[1]) === p && ((_ = b["reverse-identity"]) == null ? void 0 : _[2]) === y;
       }
     );
   }
@@ -2829,38 +2831,38 @@ function ci({ attrsStore: t, schema: e }, n) {
     !o(p, y);
   }
   function f(p, y) {
-    const b = o(p, y), _ = a(p, y);
-    u(b), u(_), !b && !_ && c($t(e, p, y, oi));
+    const b = o(p, y), g = a(p, y);
+    u(b), u(g), !b && !g && c($t(e, p, y, oi));
   }
   for (const p of n)
-    for (const { etype: y, lookupPair: b, linkLabel: _ } of ai(p)) {
-      const g = b[0];
-      if (_) {
-        f(y, _);
-        const T = o(y, _), A = a(y, _);
+    for (const { etype: y, lookupPair: b, linkLabel: g } of ai(p)) {
+      const _ = b[0];
+      if (g) {
+        f(y, g);
+        const T = o(y, g), A = a(y, g);
         u(T), u(A);
-        const m = ((d = T == null ? void 0 : T["reverse-identity"]) == null ? void 0 : d[1]) || ((h = A == null ? void 0 : A["forward-identity"]) == null ? void 0 : h[1]) || _;
-        if (l(m, g))
-          f(m, Ye(g));
+        const m = ((d = T == null ? void 0 : T["reverse-identity"]) == null ? void 0 : d[1]) || ((h = A == null ? void 0 : A["forward-identity"]) == null ? void 0 : h[1]) || g;
+        if (l(m, _))
+          f(m, Ye(_));
         else {
-          const O = o(m, g);
+          const O = o(m, _);
           O || c(
-            be(e, m, g, Xe)
+            be(e, m, _, Xe)
           ), u(O);
         }
-      } else if (l(y, g))
-        f(y, Ye(g));
+      } else if (l(y, _))
+        f(y, Ye(_));
       else {
-        const T = o(y, g);
-        T || c(be(e, y, g, Xe)), u(T);
+        const T = o(y, _);
+        T || c(be(e, y, _, Xe)), u(T);
       }
     }
   for (const p of n) {
-    const [y, b, _, g] = p;
+    const [y, b, g, _] = p;
     if (ni.has(y)) {
       const T = o(b, "id");
       u(T), T || c(be(e, b, "id", { "unique?": !0 }));
-      for (const A of Object.keys(g)) {
+      for (const A of Object.keys(_)) {
         const m = o(b, A);
         if (u(m), si.has(y) && (m || c(
           be(
@@ -3159,12 +3161,12 @@ async function yi(t, e, n) {
     for (const [h, p] of Object.entries(r)) {
       const y = typeof p == "string" ? JSON.parse(p) : p;
       if (y.lastAccessed) {
-        const _ = {
+        const g = {
           createdAt: y.lastAccessed,
           updatedAt: y.lastAccessed,
           size: ((d = (f = (l = y.result) == null ? void 0 : l.store) == null ? void 0 : f.triples) == null ? void 0 : d.length) ?? 0
         };
-        a[h] = _;
+        a[h] = g;
       }
       const b = n.put(y, h);
       s.add(b);
@@ -3198,8 +3200,8 @@ async function bi(t, e) {
     p.onsuccess = () => {
       const b = p.result;
       if (b) {
-        const _ = b.key, g = b.value;
-        y.push([_, g]), b.continue();
+        const g = b.key, _ = b.value;
+        y.push([g, _]), b.continue();
       } else
         l(y);
     }, p.onerror = (b) => {
@@ -3637,7 +3639,7 @@ function Kt(t) {
     }, e;
   }, {});
 }
-const Rn = "v0.22.86-experimental.split-store.20183617880.1";
+const Rn = "v0.22.86-experimental.split-store.20247643606.1";
 function Mi(t, e) {
   return {
     info: t ? (...n) => console.info(...n, e()) : () => {
@@ -4645,8 +4647,8 @@ class Bi {
       i.txId = a["tx-id"];
       const c = [], u = {};
       for (const b of a.changes) {
-        const _ = u[b.triple[0]] ?? [];
-        u[b.triple[0]] = _, _.push(b);
+        const g = u[b.triple[0]] ?? [];
+        u[b.triple[0]] = g, g.push(b);
       }
       const l = s.values ?? {
         entities: [],
@@ -4654,43 +4656,43 @@ class Bi {
       }, f = l.entities;
       s.values = l;
       const d = [];
-      e: for (const [b, _] of Object.entries(u))
-        for (let g = 0; g < f.length; g++) {
-          const T = f[g];
+      e: for (const [b, g] of Object.entries(u))
+        for (let _ = 0; _ < f.length; _++) {
+          const T = f[_];
           if (Er(T.store, b)) {
-            Bt(T.store, l.attrsStore, _);
+            Bt(T.store, l.attrsStore, g);
             const A = Le(s, T.store, l.attrsStore), m = Vi(
               T.store,
               l.attrsStore,
-              _
+              g
             )[b];
             A ? (d.push({
               oldEntity: T.entity,
               newEntity: A,
               changedFields: m || {}
-            }), T.entity = A) : c.push(g), delete u[b];
+            }), T.entity = A) : c.push(_), delete u[b];
             continue e;
           }
         }
       const h = [];
-      for (const [b, _] of Object.entries(u)) {
-        const g = this.createStore([]);
-        Bt(g, l.attrsStore, _);
-        const T = Le(s, g, l.attrsStore);
+      for (const [b, g] of Object.entries(u)) {
+        const _ = this.createStore([]);
+        Bt(_, l.attrsStore, g);
+        const T = Le(s, _, l.attrsStore);
         if (!T) {
           this.log.error("No entity found after applying change", {
             sub: s,
-            changes: _,
-            store: g
+            changes: g,
+            store: _
           });
           continue;
         }
         f.push({
-          store: g,
+          store: _,
           entity: T,
           serverCreatedAt: Gt(
             s,
-            g,
+            _,
             l.attrsStore,
             T.id
           )
@@ -5248,20 +5250,20 @@ class oo {
         const { q: d, result: h } = n, p = P(d);
         if (!this._hasQueryListeners() && !this.querySubs.currentValue[p])
           break;
-        const y = (a = (o = h == null ? void 0 : h[0]) == null ? void 0 : o.data) == null ? void 0 : a["page-info"], b = (u = (c = h == null ? void 0 : h[0]) == null ? void 0 : c.data) == null ? void 0 : u.aggregate, _ = Nt(h), g = Se(
-          this.ensureAttrs(),
+        const y = (a = (o = h == null ? void 0 : h[0]) == null ? void 0 : o.data) == null ? void 0 : a["page-info"], b = (u = (c = h == null ? void 0 : h[0]) == null ? void 0 : c.data) == null ? void 0 : u.aggregate, g = Nt(h), _ = this.ensureAttrs(), T = Se(
           _,
+          g,
           r,
           this.config.useDateObjects
         );
-        this.querySubs.updateInPlace((T) => {
-          if (!T[p]) {
+        this.querySubs.updateInPlace((A) => {
+          if (!A[p]) {
             this._log.info("Missing value in querySubs", { hash: p, q: d });
             return;
           }
-          T[p].result = {
-            store: g,
-            attrsStore: this.ensureAttrs(),
+          A[p].result = {
+            store: T,
+            attrsStore: _,
             pageInfo: y,
             aggregate: b,
             processedTxId: n["processed-tx-id"]
@@ -5293,18 +5295,18 @@ class oo {
           this._pendingMutations(),
           p
         );
-        y !== this._pendingMutations() && this.kv.updateInPlace((g) => {
-          g.pendingMutations = y;
+        y !== this._pendingMutations() && this.kv.updateInPlace((_) => {
+          _.pendingMutations = y;
         });
-        const b = Jt(y.entries()), _ = d.map((g) => {
+        const b = Jt(y.entries()), g = d.map((_) => {
           var yt, bt, _t, gt;
-          const T = g["instaql-query"], A = g["instaql-result"], m = P(T), O = Nt(A), M = this.ensureAttrs(), U = Se(
+          const T = _["instaql-query"], A = _["instaql-result"], m = P(T), O = Nt(A), M = this.ensureAttrs(), x = Se(
             M,
             O,
             r,
             this.config.useDateObjects
           ), { store: $e, attrsStore: zn } = this._applyOptimisticUpdates(
-            U,
+            x,
             M,
             b,
             p
@@ -5318,14 +5320,14 @@ class oo {
             aggregate: Wn
           };
         });
-        _.forEach(
-          ({ hash: g, q: T, store: A, attrsStore: m, pageInfo: O, aggregate: M }) => {
-            this.querySubs.updateInPlace((U) => {
-              if (!U[g]) {
-                this._log.error("Missing value in querySubs", { hash: g, q: T });
+        g.forEach(
+          ({ hash: _, q: T, store: A, attrsStore: m, pageInfo: O, aggregate: M }) => {
+            this.querySubs.updateInPlace((x) => {
+              if (!x[_]) {
+                this._log.error("Missing value in querySubs", { hash: _, q: T });
                 return;
               }
-              U[g].result = {
+              x[_].result = {
                 store: A,
                 attrsStore: m,
                 pageInfo: O,
@@ -5334,8 +5336,8 @@ class oo {
               };
             });
           }
-        ), this._cleanupPendingMutationsQueries(), _.forEach(({ hash: g }) => {
-          this.notifyOne(g);
+        ), this._cleanupPendingMutationsQueries(), g.forEach(({ hash: _ }) => {
+          this.notifyOne(_);
         });
         break;
       }
@@ -5348,22 +5350,22 @@ class oo {
         ).get(d);
         if (!y)
           break;
-        this._updatePendingMutations((_) => {
-          _.set(d, {
-            ..._.get(d),
+        this._updatePendingMutations((g) => {
+          g.set(d, {
+            ...g.get(d),
             "tx-id": h,
             confirmed: Date.now()
           });
         });
         const b = [];
-        for (const _ of y["tx-steps"])
-          if (_[0] === "add-attr") {
-            const g = _[1];
-            b.push(g);
+        for (const g of y["tx-steps"])
+          if (g[0] === "add-attr") {
+            const _ = g[1];
+            b.push(_);
           }
         if (b.length) {
-          const _ = Object.values(this.ensureAttrs());
-          this._setAttrs([..._, ...b]), this._setAttrs(b);
+          const g = Object.values(this.ensureAttrs());
+          this._setAttrs([...g, ...b]), this._setAttrs(b);
         }
         this._finishTransaction("synced", d), this._cleanupPendingMutationsTimeout();
         break;
@@ -5578,15 +5580,15 @@ class oo {
       for (const h of l) {
         const [p] = h;
         if (p === "add-attr") {
-          const [b, _] = h, g = s(_);
-          if (g && _.id !== g.id) {
-            o.attrIdMap[_.id] = g.id, a = !0;
+          const [b, g] = h, _ = s(g);
+          if (_ && g.id !== _.id) {
+            o.attrIdMap[g.id] = _.id, a = !0;
             continue;
           }
-          if (_["value-type"] === "ref") {
-            const T = i(_);
+          if (g["value-type"] === "ref") {
+            const T = i(g);
             if (T) {
-              o.attrIdMap[_.id] = T.id, o.refSwapAttrIds.add(_.id), a = !0;
+              o.attrIdMap[g.id] = T.id, o.refSwapAttrIds.add(g.id), a = !0;
               continue;
             }
           }
@@ -5650,9 +5652,9 @@ class oo {
     const { store: l, attrsStore: f, pageInfo: d, aggregate: h, processedTxId: p } = c, y = this._rewriteMutationsSorted(
       f,
       o
-    ), { store: b, attrsStore: _ } = this._applyOptimisticUpdates(l, f, y, p);
+    ), { store: b, attrsStore: g } = this._applyOptimisticUpdates(l, f, y, p);
     return { data: On(
-      { store: b, attrsStore: _, pageInfo: d, aggregate: h },
+      { store: b, attrsStore: g, pageInfo: d, aggregate: h },
       a
     ), querySubVersion: r, pendingMutationsVersion: i };
   }