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

package/dist/observe/store/store.js

@@ -251,7 +251,7 @@ function releaseSlot(e) {
 // holds: its release waits for the commit that resolves it. So does a leaf of
 // a held container (#4146): a mainline write it carried is in the held
 // staging too, where it would read as the hold's until the landing.
-const slotKept = e => e.ue !== NOT_PENDING || e.l & CONFIG_OVERRIDE || e.O.k?.l & CONFIG_HELD;
+const slotKept = e => e.ie !== NOT_PENDING || e.l & CONFIG_OVERRIDE || e.O.k?.l & CONFIG_HELD;
 
 setSlotUnobserved(e => {
     if (slotKept(e)) deferredReleases.add(e); else releaseSlot(e);
@@ -262,9 +262,9 @@ setSlotUnobserved(e => {
  * pending one — and held by the container's transaction when the container
  * is held (#3706: the unit of the hold is the key — a key the batch left
  * unchanged stages nothing and holds no one). */ function bornStaged(e, t, n, r) {
-    if (t.Ye && t.Ye(t.Ie, n)) return;
+    if (t.je && t.je(t.le, n)) return;
     queuePendingNode(t);
-    t.ue = n;
+    t.ie = n;
     const o = e.k;
     if (o === null) return;
  // a node-less staging holds nothing (`stageOn`)
@@ -343,8 +343,8 @@ function getHasNode(e, t) {
         // pending backing staged — so whoever asked for it reads the frame it
         // would have read had the node been there from the write.
                 if (e.pb !== null && !directCommit) {
-            t.Ie = preBatch(e);
-            t.ue = e.pb;
+            t.le = preBatch(e);
+            t.ie = e.pb;
             queuePendingNode(t);
         }
     }
@@ -363,8 +363,8 @@ function getHasNode(e, t) {
  * (`storeParkHook`) — the one case the staging home exists for. */ function stageOn(e, t) {
     if (e.k === null && passLane === null && (context === null || globalQueue.q) && !deriveHolds(e)) return;
     const n = getContainerNode(e);
-    if (n.ue === NOT_PENDING) queuePendingNode(n);
-    n.ue = t;
+    if (n.ie === NOT_PENDING) queuePendingNode(n);
+    n.ie = t;
     // A28 (4): a write issued inside a pass outside a flush (a creation-time
     // derive) is promoted at the pass's end — the batch with it.
         if (context !== null) notePromotedWrite(n);
@@ -408,7 +408,7 @@ function bumpDeep(e) {
     // the node; the comparator is the store's, done).
     if (e.l & CONFIG_OVERRIDE) setSignal(e, t); else {
         if (e.l & CONFIG_HELD) joinFuture(txOf(e));
-        if (snapshotCaptureActive) captureWriteSnapshot(e, e.Ie);
+        if (snapshotCaptureActive) captureWriteSnapshot(e, e.le);
         insertSubs(e);
         schedule();
     }
@@ -543,7 +543,7 @@ const plainProto = e => {
     const n = overlayOnto(e, e.sc === 2 ? wideClone(e.v, e) : cloneRaw(e.v, e), t);
     e.pb = n;
     // The staging IS the pending backing: re-point the container node.
-        if (e.k?.ue === t) e.k.ue = n;
+        if (e.k?.ie === t) e.k.ie = n;
     return n;
 }
 
@@ -555,7 +555,7 @@ const plainProto = e => {
     // An optimistic edit composes on the view the user saw and becomes
     // guesses at the setter's exit: nothing is staged, nothing folds
     // (optimistic.ts).
-        if (userWrite && e.fam?.opt === true && !pendingNotify.has(e)) return e.pb = optHooks.draft(e);
+        if (optHooks && userWrite && e.fam?.opt === true && !pendingNotify.has(e)) return e.pb = optHooks.draft(e);
     if (t !== null && !isOwned(t)) {
         // An adopted object awaiting its fold is the user's: the draft writes a
         // clone of it. The clone is the batch's staging — unless the adoption is
@@ -564,7 +564,7 @@ const plainProto = e => {
         // mainline setter mid-hold publishes mainline; the held keys stay held).
         t = e.pb = cloneRaw(t, e);
         const n = e.k;
-        if (n !== null && !(n.l & CONFIG_HELD)) n.ue = t;
+        if (n !== null && !(n.l & CONFIG_HELD)) n.ie = t;
     } else if (t === null) {
         const n = e.v;
         if (!directCommit) queueFold(e);
@@ -645,7 +645,7 @@ const plainProto = e => {
     } else r = e.v;
     if (directCommit) {
         e.pb = null;
-        if (e.k !== null) e.k.Ie = t;
+        if (e.k !== null) e.k.le = t;
     } else {
         // Eager (INTERNALS §3): the backing swaps now — handlers read the
         // adopted object before the flush — while the container node, when
@@ -741,7 +741,7 @@ let foldIndex = null;
             if (r.pb === null) continue;
  // folded already (a direct commit)
                         const o = r.k;
-            if (o !== null && o.ue !== NOT_PENDING) {
+            if (o !== null && o.ie !== NOT_PENDING) {
                 // held: commits with its hold
                 foldList.push(r);
                 foldOlds.push(t[n]);
@@ -776,9 +776,9 @@ let foldIndex = null;
     if (t.ch) {
         const n = e.Vt;
         const r = t.v;
-        if (t.h?.[n] === e) e.Ie = untrack(() => n in r); else if (t.n?.[n] === e) e.Ie = untrack(() => unwrapValue(r[n]));
+        if (t.h?.[n] === e) e.le = untrack(() => n in r); else if (t.n?.[n] === e) e.le = untrack(() => unwrapValue(r[n]));
     }
-    return e.Ie;
+    return e.le;
 };
 
 installStoreHooks(storePark, () => {
@@ -812,7 +812,7 @@ function runDirect(e) {
             const n = e.k;
             const r = e.pb;
             if (r !== null) {
-                if (r === e.v) ; else if (e.ovl && (e.v !== t || !overlayRebuilds(e, r) && n?.T?.lt !== t)) {
+                if (r === e.v) ; else if (e.ovl && (e.v !== t || !overlayRebuilds(e, r) && n?.T?.st !== t)) {
                     // Overlay flatten (#3044): the backing keeps its identity, so the
                     // `t.v === old` gate below skips path copying (the parent slot
                     // already points here) and the adopted-notify (setter
@@ -830,9 +830,9 @@ function runDirect(e) {
                             if (hasOwn.call(r, t)) copyOwn(n, r, t); else delete n[t];
                         }
                     } else {
-                        for (const e of Reflect.ownKeys(r)) copyOwn(n, r, e);
+                        for (const e of Reflect.ownKeys(r)) if (e !== $OWNER) copyOwn(n, r, e);
                         for (const e of Reflect.ownKeys(t)) {
-                            if (!hasOwn.call(r, e)) delete n[e];
+                            if (e !== $OWNER && !hasOwn.call(r, e)) delete n[e];
                         }
                     }
                 } else {
@@ -850,7 +850,7 @@ function runDirect(e) {
                 // subscribes to was a transient staging home (INTERNALS §5: an
                 // observer-less write holds a transient record until the fold,
                 // discarded with it) — gone with the batch.
-                if (n.o === null) e.k = null; else if (n.Ie instanceof LaneView) n.Ie.base = e.v; else n.Ie = e.v;
+                if (n.o === null) e.k = null; else if (n.le instanceof LaneView) n.le.base = e.v; else n.le = e.v;
             }
             if (e.v !== t && e.u) {
                 const n = parentSlotKey(e, t);
@@ -883,29 +883,39 @@ function reportReplacedContainers(e, t, n, r) {
     const o = r ?? Reflect.ownKeys(n);
     const i = Array.isArray(n);
     const l = storeRootOwner(e);
+    // Items the array held before the write: an index that now holds one of
+    // them was moved into place (an in-place splice / shift), not replaced.
+        let u = null;
     for (const r of o) {
         if (i && r === "length" || r === $OWNER) continue;
         if (e.del?.has(r)) continue;
         const o = unwrapValue(t[r]);
-        const u = unwrapValue(n[r]);
-        if (o === null || u === null || typeof o !== "object" || typeof u !== "object" || o === u || targetsEqual(o, u)) continue;
-        const f = Array.isArray(u);
-        if (f !== Array.isArray(o)) continue;
-        let s;
-        let a = 0;
-        if (f) {
-            s = u.length;
-            if (s > REPLACED_CENSUS_MAX) continue;
+        const f = unwrapValue(n[r]);
+        if (o === null || f === null || typeof o !== "object" || typeof f !== "object" || o === f || targetsEqual(o, f)) continue;
+        if (i) {
+            if (u === null) {
+                u = new Set;
+                for (const e of t) u.add(unwrapValue(e));
+            }
+            if (u.has(f)) continue;
+        }
+        const s = Array.isArray(f);
+        if (s !== Array.isArray(o)) continue;
+        let a;
+        let c = 0;
+        if (s) {
+            a = f.length;
+            if (a > REPLACED_CENSUS_MAX) continue;
             const e = new Set;
             for (const t of o) e.add(unwrapValue(t));
-            for (const t of u) if (e.has(unwrapValue(t))) a++;
+            for (const t of f) if (e.has(unwrapValue(t))) c++;
         } else {
-            const e = Object.keys(u);
-            s = e.length;
-            if (s > REPLACED_CENSUS_MAX) continue;
-            for (const t of e) if (sameLeaf(o[t], u[t])) a++;
+            const e = Object.keys(f);
+            a = e.length;
+            if (a > REPLACED_CENSUS_MAX) continue;
+            for (const t of e) if (sameLeaf(o[t], f[t])) c++;
         }
-        attrHooks.storeReplaced(storePathOf(e) + "." + String(r), f, s, a, f ? o.length : Object.keys(o).length, l);
+        attrHooks.storeReplaced(storePathOf(e) + "." + String(r), s, a, c, s ? o.length : Object.keys(o).length, l);
     }
 }
 
@@ -935,7 +945,7 @@ function heldDerivation(e, t, n) {
     // Optimistic channel: a user's writes on an optimistic family become
     // guesses on the nodes (lanes); the draft is discarded, the committed
     // backing never touched.
-        if (userWrite && e.fam?.opt === true) {
+        if (optHooks && userWrite && e.fam?.opt === true) {
         // The draft is discarded first: the diff reads the target (its nodes
         // are born from the committed frame, not the draft).
         e.pb = null;
@@ -1185,7 +1195,7 @@ function inDraft(e) {
  * "adoption is eager by contract" — and the node keeps the frame committed
  * readers under a hold still see), `t.v` otherwise. */ function committed(e) {
     const t = e.k;
-    if (t !== null) return t.ue !== NOT_PENDING ? asBacking(t.Ie) : e.v;
+    if (t !== null) return t.ie !== NOT_PENDING ? asBacking(t.le) : e.v;
     // A node-less staging (`stageOn`): the fold queue remembers the frame.
         return e.pb !== null ? preBatch(e) : e.v;
 }
@@ -1197,7 +1207,7 @@ function inDraft(e) {
  * committed frame. */ function stagingReader() {
     let e = context;
     if (e === null) return null;
-    if (e.Pt) e = e.Ht ?? null;
+    if (e.Pt) e = e.ht ?? null;
     return e === null || e.l & CONFIG_CHILDREN_FORBIDDEN ? null : e;
 }
 
@@ -1271,7 +1281,7 @@ function inDraft(e) {
         // probe) judges the container like any node — for a key the batch
         // changed; an unchanged key is committed and final (A22: pending is per
         // key). A held container's committed frame is the node's.
-                if (verdict === null || !i && t !== undefined && !keyChanged(e, t, n)) return i ? asBacking(o.Ie) : e.v;
+                if (verdict === null || !i && t !== undefined && !keyChanged(e, t, n)) return i ? asBacking(o.le) : e.v;
         return o === null ? committed(e) : asBacking(read(o));
     }
     // A pass reading a key the batch left unchanged: the same value in both
@@ -1304,7 +1314,7 @@ function inDraft(e) {
 
 /** Did the HELD staging (the container node's, not a mainline layer above
  * it) change `key`? */ function heldKeyChanged(e, t, n = true) {
-    return changedBetween(e, e.k.Ie, e.k.ue, t, n) && !adoptChild(e, t);
+    return changedBetween(e, e.k.le, e.k.ie, t, n) && !adoptChild(e, t);
 }
 
 /** The values of a held frame, built once per frame: neither the committed
@@ -1331,14 +1341,14 @@ function rawsOf(e) {
  * `version` holds. A record's keys pair by name; an array's by the family's
  * key — without a family the pairing is not known here and the hold stands. */ function adoptChild(e, t) {
     const n = e.k;
-    const r = asBacking(n.Ie);
+    const r = asBacking(n.le);
     const o = r[t];
-    const i = n.ue[t];
+    const i = n.ie[t];
     const l = Array.isArray(r) ? e.fam?.key : null;
     if (e.s || l === undefined || !sameRow(o, i, l) || !isWrappable(o) || !isWrappable(i) || Array.isArray(o) !== Array.isArray(i) || lookupTarget(o, e.fam) !== undefined || lookupTarget(i, e.fam) !== undefined || 
     // A raw in both frames (the same objects swapped or reordered) is its
     // own row: pairing it with another would alias the two after the commit.
-    rawsOf(r).has(i) || rawsOf(n.ue).has(o)) return false;
+    rawsOf(r).has(i) || rawsOf(n.ie).has(o)) return false;
     // A raw-marked value wraps to itself, a proxy to its own target: neither
     // is a fresh target around `ov`.
         const u = wrap(o, e, t)[$TARGET];
@@ -1383,7 +1393,7 @@ function changedBetween(e, t, n, r, o) {
  * tracked or not, applies the hold and A28 rules a signal's read does. A
  * projection's unheld staging is ahead for a handler (`familyAhead`). */ function nodeValue(e, t, n) {
     let r = read(e);
-    if (e.ue !== NOT_PENDING && !(e.l & CONFIG_HELD) && context === null && n.fam !== null) r = e.ue;
+    if (e.ie !== NOT_PENDING && !(e.l & CONFIG_HELD) && context === null && n.fam !== null) r = e.ie;
     return r === FORCE ? t : r;
 }
 
@@ -1403,7 +1413,7 @@ function changedBetween(e, t, n, r, o) {
             if (l) {
                 // The link's committed value follows the inner store's (what a lane
                 // over it covers — its reveal and revert compare against it, S4).
-                o.Ie = n;
+                o.le = n;
                 if (o.l & CONFIG_OVERRIDE) u = t;
             } else u = t;
         }
@@ -1476,7 +1486,7 @@ function changedBetween(e, t, n, r, o) {
  * classification, as core reads it — `heldNotFinal`). */ function holdWithDerive(e, t) {
     const n = e.fam?.node;
     if (n !== undefined && n !== null && !userWrite && // the derive's own write (its draft or landing), not a user setter's
-    n.l & CONFIG_HELD && t.ue !== NOT_PENDING && 
+    n.l & CONFIG_HELD && t.ie !== NOT_PENDING && 
     // A node carrying a guess is the lane's: its staging is the truth beneath
     // the guess (`setSignal` → `laneWrite`), never re-homed by the store.
     !(t.l & (CONFIG_HELD | CONFIG_OVERRIDE))) {
@@ -1508,10 +1518,10 @@ function changedBetween(e, t, n, r, o) {
         // A container's arrangement guess is not a backing: the view composes
         // over the base it is shown over.
         const t = asBacking(read(getContainerNode(e)));
-        return e.fam?.opt === true ? optHooks.view(e, t) : t;
+        return optHooks && e.fam?.opt === true ? optHooks.view(e, t) : t;
     }
     const t = readSource(e);
-    return optRead(e) ? optHooks.view(e, t) : t;
+    return optHooks && optRead(e) ? optHooks.view(e, t) : t;
 }
 
 /** A read on an optimistic family that composes the lanes' values: not the
@@ -1678,11 +1688,11 @@ const traps = {
                 const o = read(r);
                 if (!e.ch || n !== e.v) return !!o;
                 const i = t in n;
-                r.Ie = i;
+                r.le = i;
  // the link follows the inner store (S4)
                                 if (r.l & CONFIG_OVERRIDE) return !!o;
                 return i;
-            } else if (optRead(e)) {
+            } else if (optHooks && optRead(e)) {
                 const n = optHooks.has(e, t);
                 if (n !== undefined) return n;
             }
@@ -1718,7 +1728,7 @@ const traps = {
             if (!r && (!e.ch || n.l & CONFIG_OVERRIDE || !(t in i))) return undefined;
         } else i = readSource(e, t, true);
         let l;
-        if (!o && optRead(e)) {
+        if (optHooks && !o && optRead(e)) {
             const n = optHooks.descriptor(e, t);
             if (n === null) return undefined;
             l = n;
@@ -1825,7 +1835,7 @@ const traps = {
     const n = e.k;
     if (n === null) return false;
     const r = n.Ct;
-    return r !== null && r.u === t && (!(t.R & REACTIVE_RECOMPUTING_DEPS) || r.Te === t.Ne);
+    return r !== null && r.u === t && (!(t.R & REACTIVE_RECOMPUTING_DEPS) || r.Ie === t.Ne);
 }
 
 function storeSetter(e, t, n = true) {
@@ -1863,7 +1873,7 @@ function storeSetter(e, t, n = true) {
         // A returned replacement: on an optimistic family a user's is itself an
         // optimistic edit — diffed against the view as guesses (`next` parity);
         // otherwise it is adopted as the incoming truth.
-        if (n && r.fam?.opt === true && !writeOverride) optHooks.writes(r, unwrapValue(l)); else adoptPB(r, unwrapValue(l));
+        if (optHooks && n && r.fam?.opt === true && !writeOverride) optHooks.writes(r, unwrapValue(l)); else adoptPB(r, unwrapValue(l));
     }
     // A34 (3), #3612 — the derived store's twin of `setMemo`: a user write to
     // a derivation another transaction holds is nobody's proposal; it becomes
@@ -2030,7 +2040,7 @@ function snapshotWalk(e, t, n) {
             if (o.ovl) materializePB(o);
             i = o.pb;
         }
-        if (optRead(o)) i = optHooks.view(o, i);
+        if (optHooks && optRead(o)) i = optHooks.view(o, i);
         if (i === r) break;
         r = i;
     }

package/dist/observe/store/utils.js

@@ -1,4 +1,4 @@
-import { SUPPORTS_PROXY } from "../core/constants.js";
+import { SUPPORTS_PROXY, CONFIG_KEY_BAG } from "../core/constants.js";
 
 import { createMemo } from "../signals.js";
 
@@ -921,7 +921,12 @@ const omitTraps = {
         f++;
         i = o;
         if (typeof o === "function") {
-            n[r] = createMemo(o);
+            // Observe tiers name it and exempt it from UNSTABLE_MEMO_OUTPUT (see
+            // CONFIG_KEY_BAG); prod passes no options.
+            n[r] = createMemo(o, {
+                name: "merge",
+                St: CONFIG_KEY_BAG
+            });
             t[r++] = SOURCE_MEMO;
             continue;
         }