@solidjs/signals 2.0.0-rc.15 → 2.0.0-rc.17

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, laneValueOf, optimisticWrite } from "../core/lanes.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";
 
@@ -18,6 +18,8 @@ import { $OWNER } from "./target.js";
 
 import { $TARGET, markRawIngest, $TRACK, isWrappable } from "./types.js";
 
+import { laneValueOf } from "../core/truth.js";
+
 /**
  * Store — optimistic stores on lanes (plan sec. 31, S4; INTERNALS §3/§7, RUL-3).
  *
@@ -81,7 +83,7 @@ function notifyOptimisticWrites(e, n) {
     // inner store's truth for its key before guessing over it.
         const o = e.ch ? e.v : null;
     const guess = (e, n, i, r) => {
-        if (o !== null) e.Ae = i ? n in t : unwrapValue(t[n]);
+        if (o !== null) e.Ie = i ? n in t : unwrapValue(t[n]);
         // By value: a function leaf is a value, not an updater (#3017).
                 optimisticWrite(e, () => r);
     };
@@ -91,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;
             }
@@ -120,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
@@ -226,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;
@@ -266,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._n = (e, n) => {
-    const t = e.yt;
-    if (t === undefined || e.bt !== $TRACK) return;
-    const i = e.m.B;
-    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.i & CONFIG_OVERRIDE ? n.m.B : 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.i & 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;
@@ -337,12 +380,12 @@ function sameRow(e, n, t) {
  * node that was not the lane's becomes its derivation (its committed value
  * untouched beneath; the lane's end commits the latest). */ function laneSet(e, n, t) {
     const i = ext(e);
-    if (!(e.i & CONFIG_OVERRIDE)) {
-        e.i |= CONFIG_OVERRIDE;
+    if (!(e.l & CONFIG_OVERRIDE)) {
+        e.l |= CONFIG_OVERRIDE;
         list(e, t);
-    } else if (i.B === n) return;
-    i.B = n;
-    if (e.t !== null) {
+    } else if (i.V === n) return;
+    i.V = n;
+    if (e.o !== null) {
         insertSubs(e);
         laneDirty(e, t);
     }
@@ -387,7 +430,7 @@ function sweepOverlaid() {
             // The container shows its backing again (a shown arrangement guess
             // that ended without a landing left its `LaneView` as the value).
                         const t = e.k;
-            if (t !== null && t.Ae instanceof LaneView) t.Ae = t.Ae.base;
+            if (t !== null && t.Ie instanceof LaneView) t.Ie = t.Ie.base;
         }
         if (n.size === 0) overlaidFamilies.delete(e);
     }
@@ -404,11 +447,11 @@ function sweepOverlaid() {
     if (i !== null) for (const e of Reflect.ownKeys(i)) {
         const r = i[e];
         const o = untrack(() => unwrapValue(n[e]));
-        if (r.en && r.en(r.Ae, o)) continue;
-        r.Ae = o;
+        if (r.Ye && r.Ye(r.Ie, o)) continue;
+        r.Ie = o;
         // (The lane's end notified it this epoch when the shown value and the
         // covered one differed — its readers re-derive already.)
-                if (r.t !== null && r.Pt !== notifyEpoch) {
+                if (r.o !== null && r.Ot !== notifyEpoch) {
             insertSubs(r);
             t = true;
         }
@@ -417,9 +460,9 @@ function sweepOverlaid() {
     if (r !== null) for (const e of Reflect.ownKeys(r)) {
         const i = r[e];
         const o = untrack(() => e in n);
-        if (i.Ae === o) continue;
-        i.Ae = o;
-        if (i.t !== null && i.Pt !== notifyEpoch) {
+        if (i.Ie === o) continue;
+        i.Ie = o;
+        if (i.o !== null && i.Ot !== notifyEpoch) {
             insertSubs(i);
             t = true;
         }
@@ -427,9 +470,9 @@ function sweepOverlaid() {
     // The arrangement the readers saw (the shown guess) against the inner's
     // now: a structural reader re-derives when they differ.
         const o = e.k;
-    if (o !== null && o.t !== null && o.Ae instanceof LaneView && o.Pt !== notifyEpoch) {
+    if (o !== null && o.o !== null && o.Ie instanceof LaneView && o.Ot !== notifyEpoch) {
         const i = Array.isArray(n) ? untrack(() => n.map(unwrapValue)) : n;
-        if (!arrangementEqual(o.Ae.rows, i, e.fam?.key ?? null)) {
+        if (!arrangementEqual(o.Ie.rows, i, e.fam?.key ?? null)) {
             insertSubs(o);
             t = true;
         }
@@ -438,12 +481,12 @@ function sweepOverlaid() {
 }
 
 function carriesLane(e) {
-    if (e.k !== null && e.k.i & CONFIG_OVERRIDE) return true;
-    if (e.dk !== null && e.dk.i & CONFIG_OVERRIDE) return true;
+    if (e.k !== null && e.k.l & CONFIG_OVERRIDE) return true;
+    if (e.dk !== null && e.dk.l & CONFIG_OVERRIDE) return true;
     const n = e.n;
-    if (n !== null) for (const e of Reflect.ownKeys(n)) if (n[e].i & CONFIG_OVERRIDE) return true;
+    if (n !== null) for (const e of Reflect.ownKeys(n)) if (n[e].l & CONFIG_OVERRIDE) return true;
     const t = e.h;
-    if (t !== null) for (const e of Reflect.ownKeys(t)) if (t[e].i & CONFIG_OVERRIDE) return true;
+    if (t !== null) for (const e of Reflect.ownKeys(t)) if (t[e].l & CONFIG_OVERRIDE) return true;
     return false;
 }
 
@@ -461,9 +504,9 @@ function overlaid(e) {
  * the backing answers. */ function optimisticHas(e, n) {
     if (!overlaid(e)) return undefined;
     const t = e.h?.[n];
-    if (t !== undefined && t.i & CONFIG_OVERRIDE) return !!shown(t);
+    if (t !== undefined && t.l & CONFIG_OVERRIDE) return !!shown(t);
     const i = e.n?.[n];
-    if (i !== undefined && i.i & CONFIG_OVERRIDE) return shown(i) !== undefined;
+    if (i !== undefined && i.l & CONFIG_OVERRIDE) return shown(i) !== undefined;
     return undefined;
 }
 
@@ -474,7 +517,7 @@ function overlaid(e) {
     if (t === undefined) return undefined;
     if (!t) return null;
     const i = e.n?.[n];
-    const r = i !== undefined && i.i & CONFIG_OVERRIDE ? shown(i) : e.v[n];
+    const r = i !== undefined && i.l & CONFIG_OVERRIDE ? shown(i) : e.v[n];
     // An array's `length` is reported as the array has it (non-configurable).
         if (n === "length" && Array.isArray(e.v)) return {
         value: r,
@@ -507,7 +550,7 @@ i = false) {
         for (const e of Reflect.ownKeys(o)) {
             const r = o[e];
             let s;
-            if (r.i & CONFIG_OVERRIDE) s = t(r); else if (!i || (s = pendingGuessOf(r)) === NOT_PENDING) continue;
+            if (r.l & CONFIG_OVERRIDE) s = t(r); else if (!i || (s = pendingGuessOf(r)) === NOT_PENDING) continue;
             if (e === "length" && Array.isArray(n)) {
                 if (n.length !== s) ensure().length = s;
             } else if (!isEqual(n[e], s) || !hasOwn.call(n, e)) {
@@ -519,11 +562,11 @@ i = false) {
     if (s !== null) {
         for (const e of Reflect.ownKeys(s)) {
             const o = s[e];
-            let a;
-            if (o.i & 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;
@@ -532,9 +575,11 @@ i = false) {
 function createOptimisticStore(e, n, t) {
     const i = typeof e === "function";
     const r = i ? t : n;
-    const o = i ? n : e;
+    // Seedless derived form: the root starts as an empty record (see
+    // 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,
@@ -542,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);
-    nameStore(f, r?.name);
-    if (a.shallow) {
+    const f = wrap(o, null, null, u);
+    nameStore(f, r?.name, r?.loc);
+    if (u.shallow) {
         f[$TARGET].s = true;
         markRawIngest(o);
     }
@@ -554,16 +599,17 @@ function createOptimisticStore(e, n, t) {
         if (r?.seedLoadingValue) t = {
             loadingValue: undefined
         };
-        if (r?.name) t = {
+        if (r?.name || r?.loc) t = {
             ...t,
-            name: r.name
+            name: r.name,
+            loc: r.loc
         };
         const i = computed(() => {
-            if (!a.node) a.node = getOwner();
+            if (!u.node) u.node = getOwner();
             runProjectionComputed(f, n, s);
         }, t);
-        i.i &= ~CONFIG_AUTO_DISPOSE;
-        a.node = i;
+        i.l &= ~CONFIG_AUTO_DISPOSE;
+        u.node = i;
     }
     return [ f, e => storeSetter(f, e) ];
 }