@solidjs/signals 2.0.0-rc.16 → 2.0.0-rc.18

package/dist/observe/store/optimistic.js

@@ -1,12 +1,12 @@
-import { CONFIG_OVERRIDE, CONFIG_AUTO_DISPOSE, NOT_PENDING } from "../core/constants.js";
+import { CONFIG_OVERRIDE, CONFIG_GUESS, EFFECT_RENDER, CONFIG_CHILDREN_FORBIDDEN, NOT_PENDING, CONFIG_SLOT_NODE, CONFIG_AUTO_DISPOSE } from "../core/constants.js";
 
-import { computed, ext, untrack, read, isEqual } from "../core/core.js";
+import { computed, joinPassAt, ext, untrack, read, isEqual } from "../core/core.js";
 
 import { pendingGuessOf, optimisticWrite } from "../core/lanes.js";
 
 import { getOwner } from "../core/owner.js";
 
-import { GlobalQueue, txOf, list, insertSubs, laneDirty, notifyEpoch, schedule } from "../core/scheduler.js";
+import { GlobalQueue, txOf, insertSubs, joinFuture, resolveTx, passLane, list, laneDirty, notifyEpoch, schedule } from "../core/scheduler.js";
 
 import { runProjectionComputed } from "./projection.js";
 
@@ -93,16 +93,16 @@ function notifyOptimisticWrites(e, n) {
         // A chained draft holds the inner store's raws; a raw is the inner slot it
         // resolves to (as a read of it serves) — the row a held write staged is
         // the same row, not a guess over the slot (#3796).
-                const a = n[t];
-        const f = unwrapValue(o && a ? resolveChainedRaw(e, t, a) : a);
+                const u = n[t];
+        const f = unwrapValue(o && u ? resolveChainedRaw(e, t, u) : u);
         if (!(t in i)) {
             guess(getNode(e, t), t, false, f);
             guess(getHasNode(e, t), t, true, true);
             s = true;
         } else {
             const n = i[t];
-            const a = unwrapValue(o && n ? resolveChainedRaw(e, t, n) : n);
-            if (!isEqual(a, f) && !targetsEqual(a, f)) {
+            const u = unwrapValue(o && n ? resolveChainedRaw(e, t, n) : n);
+            if (!isEqual(u, f) && !targetsEqual(u, f)) {
                 guess(getNode(e, t), t, false, f);
                 if (r) s = true;
             }
@@ -122,29 +122,31 @@ function notifyOptimisticWrites(e, n) {
     if (s) {
         const o = r ? n.map(unwrapValue) : shallowKeys(n);
         // The rows the setter removed from the view it saw, by key: a later
-        // re-base over another action's truth must not bring them back.
+        // re-base over another action's truth must not bring them back. A set
+        // (empty or not) marks a keyed arrangement guess (`fold`).
                 let s = null;
-        const a = e.fam.key;
-        if (r && a !== null && a !== undefined) {
+        const u = e.fam.key;
+        if (r && u !== null && u !== undefined) {
+            s = new Set;
             const e = new Set;
             for (let n = 0; n < o.length; n++) {
-                const t = isWrappable(o[n]) ? a(o[n]) : undefined;
+                const t = isWrappable(o[n]) ? u(o[n]) : undefined;
                 if (t !== undefined) e.add(t);
             }
             for (let n = 0; n < i.length; n++) {
                 const t = unwrapValue(i[n]);
-                const r = isWrappable(t) ? a(t) : undefined;
-                if (r !== undefined && !e.has(r)) (s ??= new Set).add(r);
+                const r = isWrappable(t) ? u(t) : undefined;
+                if (r !== undefined && !e.has(r)) s.add(r);
             }
         }
         optimisticWrite(getContainerNode(e), new LaneView(o, t, s));
     }
     if (e.dk !== null) optimisticWrite(e.dk, {});
     markOverlaid(e);
-    const a = optStaged.get(e);
-    if (a === undefined) return null;
+    const u = optStaged.get(e);
+    if (u === undefined) return null;
     optStaged.delete(e);
-    return a;
+    return u;
 }
 
 /** The container comparator's lane arm (store.ts `containerEquals`): an
@@ -228,18 +230,18 @@ function arrangementEqual(e, n, t) {
             }
         }
         for (let s = 0; s < n.length; s++) {
-            const a = n[s];
+            const u = n[s];
             let f;
-            if (isWrappable(a)) {
+            if (isWrappable(u)) {
                 if (o !== null) {
-                    const e = t(a);
+                    const e = t(u);
                     if (e !== undefined) f = o.get(e);
                 } else if (s < i && isWrappable(unwrapValue(r[s]))) f = r[s];
             }
             if (f !== undefined) {
-                if (unwrapValue(f) !== a) reconcileDraft(f, a, t);
+                if (unwrapValue(f) !== u) reconcileDraft(f, u, t);
                 if (e[s] !== f) e[s] = f;
-            } else if (unwrapValue(e[s]) !== a) e[s] = a;
+            } else if (unwrapValue(e[s]) !== u) e[s] = u;
         }
         if (e.length !== n.length) e.length = n.length;
         return;
@@ -268,66 +270,105 @@ function arrangementEqual(e, n, t) {
  * node is born for it as the lane's derivation), on `length` only when the
  * committed length differs, and as the `LaneView`'s base for structural
  * reads. Unkeyed families compose
- * positionally — the guess stands as written (the documented residue). */ GlobalQueue.an = (e, n) => {
-    const t = e.O;
-    if (t === undefined || e.Vt !== $TRACK) return;
-    const i = e.T.V;
-    if (!(i instanceof LaneView)) return;
-    if (!Array.isArray(n) || !Array.isArray(i.rows)) {
-        i.base = n;
+ * positionally — the guess stands as written (the documented residue). */ GlobalQueue.an = (e, n, t) => {
+    if (!t) return fold(e, n);
+    const i = e.O;
+    if (i === undefined || e.Vt !== $TRACK) return;
+    const r = e.T.V;
+    if (!(r instanceof LaneView)) return;
+    if (!Array.isArray(n) || !Array.isArray(r.rows)) {
+        r.base = n;
         return;
     }
-    const r = t.fam?.key ?? null;
-    if (r === null) return;
-    const o = new Map;
+    const o = i.fam?.key ?? null;
+    if (o === null) return;
+    const s = new Map;
     for (let e = 0; e < n.length; e++) {
         const t = n[e];
-        const i = isWrappable(t) ? r(t) : undefined;
-        if (i !== undefined && !o.has(i)) o.set(i, t);
+        const i = isWrappable(t) ? o(t) : undefined;
+        if (i !== undefined && !s.has(i)) s.set(i, t);
     }
-    const s = new Set;
-    const a = [];
-    const f = i.rows;
-    for (let e = 0; e < f.length; e++) {
-        const n = f[e];
-        const t = isWrappable(n) ? r(n) : undefined;
-        const i = t !== undefined ? o.get(t) : undefined;
+    const u = new Set;
+    const f = [];
+    const a = r.rows;
+    for (let e = 0; e < a.length; e++) {
+        const n = a[e];
+        const t = isWrappable(n) ? o(n) : undefined;
+        const i = t !== undefined ? s.get(t) : undefined;
         if (i !== undefined) {
-            a.push(i);
-            s.add(t);
-        } else a.push(n);
+            f.push(i);
+            u.add(t);
+        } else f.push(n);
     }
-    const u = i.removed;
+    const l = r.removed;
     for (let e = 0; e < n.length; e++) {
         const t = n[e];
-        const i = isWrappable(t) ? r(t) : undefined;
-        if (i !== undefined && !s.has(i) && (u === null || !u.has(i))) a.push(t);
+        const i = isWrappable(t) ? o(t) : undefined;
+        if (i !== undefined && !u.has(i) && (l === null || !l.has(i))) f.push(t);
     }
-    i.rows = a;
-    i.base = a;
-    const l = txOf(e);
-    const c = committed(t);
-    const d = t.n;
-    for (let e = 0; e < a.length; e++) {
-        const n = d?.[e];
+    r.rows = f;
+    r.base = f;
+    const c = txOf(e);
+    const d = committed(i);
+    const p = i.n;
+    for (let e = 0; e < f.length; e++) {
+        const n = p?.[e];
         // A slot the lane does not own shows the committed row: it becomes the
         // lane's only where the composed row is another row (by key — the same
         // key's new object is the same row, its target adopted it).
                 if (n === undefined) {
-            if (!sameRow(c[e], a[e], r)) laneSet(getNode(t, e), a[e], l);
-        } else if (!sameRow(n.l & CONFIG_OVERRIDE ? n.T.V : c[e], a[e], r)) laneSet(n, a[e], l);
+            if (!sameRow(d[e], f[e], o)) laneSet(getNode(i, e), f[e], c);
+        } else if (!sameRow(n.l & CONFIG_OVERRIDE ? n.T.V : d[e], f[e], o)) laneSet(n, f[e], c);
     }
-    if (d !== null) {
-        for (let e = a.length; ;e++) {
-            const n = d[e];
+    if (p !== null) {
+        for (let e = f.length; ;e++) {
+            const n = p[e];
             if (n === undefined) break;
-            laneSet(n, undefined, l);
+            laneSet(n, undefined, c);
         }
-        const e = d.length;
-        if (e !== undefined && (e.l & CONFIG_OVERRIDE || c.length !== a.length)) laneSet(e, a.length, l);
+        const e = p.length;
+        if (e !== undefined && (e.l & CONFIG_OVERRIDE || d.length !== f.length)) laneSet(e, f.length, c);
     }
 };
 
+/** D-34 for a keyed arrangement guess: rows by key, not positions. A
+ * current truth that differs folds into the hold beneath it instead of
+ * voiding the lane: the guess stays the lane's value and the screen's until
+ * the hold commits, where rows match by key, and the graph outside the lane
+ * re-derives from the truth now (`foldedRead`). A confirmation is silent
+ * (A17): only truth readers are told. True: the lane stages the truth
+ * beneath (`laneWrite`). */ function fold(e, n) {
+    const t = e.O?.k;
+    const i = txOf(e);
+    // A guess the screen never showed is void at the correction (D-34); a
+    // keyed arrangement guess's view carries its removed-keys set.
+        if (!i.It || !(t?.l & CONFIG_OVERRIDE) || !t.T.V?.removed) return false;
+    const r = e.T.V;
+    if ((!e.Ye || !e.Ye(r, n)) && !GlobalQueue.sn(r, n)) {
+        i.folded = foldedRead;
+        insertSubs(e);
+    } else GlobalQueue.tn?.(i);
+    joinFuture(resolveTx(i._parent ?? i));
+    return true;
+}
+
+/** A folded lane's guess read by a deriving pass outside the lane, tracked
+ * or not (`untrack` is about dependencies, not about which world a pass
+ * derives from), or by `latest()` (`c` null): the hold's world — the truth
+ * staged beneath the guess, else the value it covered — and the pass joins
+ * the hold. Lane passes and the screen keep the guess: held truth is masked
+ * from lane passes only (#3164). The store's own derive reconciles its
+ * landings against the arrangement the guesses made: it is the author, not
+ * a reader. */ function foldedRead(e, n) {
+    if (e !== null) {
+        if (!(n.l & CONFIG_GUESS) || passLane !== null || e.i === EFFECT_RENDER || e.l & CONFIG_CHILDREN_FORBIDDEN || n.O?.fam?.node === e) return NOT_PENDING;
+        const t = txOf(n);
+        joinPassAt(e, resolveTx(t._parent ?? t));
+    }
+    if (n.ue !== NOT_PENDING) return n.ue;
+    return n.l & CONFIG_SLOT_NODE ? GlobalQueue.fn(n) : n.Ie;
+}
+
 function sameRow(e, n, t) {
     if (e === n) return true;
     if (!isWrappable(e) || !isWrappable(n)) return false;
@@ -521,11 +562,11 @@ i = false) {
     if (s !== null) {
         for (const e of Reflect.ownKeys(s)) {
             const o = s[e];
-            let a;
-            if (o.l & CONFIG_OVERRIDE) a = t(o); else if (!i || (a = pendingGuessOf(o)) === NOT_PENDING) continue;
-            const f = !!a;
-            const u = r ?? n;
-            if (!f && e in u) delete ensure()[e];
+            let u;
+            if (o.l & CONFIG_OVERRIDE) u = t(o); else if (!i || (u = pendingGuessOf(o)) === NOT_PENDING) continue;
+            const f = !!u;
+            const a = r ?? n;
+            if (!f && e in a) delete ensure()[e];
         }
     }
     return r ?? n;
@@ -538,7 +579,7 @@ function createOptimisticStore(e, n, t) {
     // createProjectionInternal).
         const o = i ? n || {} : e;
     const s = r?.key === undefined ? "id" : r.key;
-    const a = {
+    const u = {
         map: new WeakMap,
         node: null,
         live: new Set,
@@ -546,9 +587,9 @@ function createOptimisticStore(e, n, t) {
         opt: true,
         key: typeof s === "function" ? s : s === null ? null : e => isWrappable(e) ? e[s] : undefined
     };
-    const f = wrap(o, null, null, a);
+    const f = wrap(o, null, null, u);
     nameStore(f, r?.name, r?.loc);
-    if (a.shallow) {
+    if (u.shallow) {
         f[$TARGET].s = true;
         markRawIngest(o);
     }
@@ -564,11 +605,11 @@ function createOptimisticStore(e, n, t) {
             loc: r.loc
         };
         const i = computed(() => {
-            if (!a.node) a.node = getOwner();
+            if (!u.node) u.node = getOwner();
             runProjectionComputed(f, n, s);
         }, t);
         i.l &= ~CONFIG_AUTO_DISPOSE;
-        a.node = i;
+        u.node = i;
     }
     return [ f, e => storeSetter(f, e) ];
 }