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

package/dist/observe/store/projection.js

@@ -18,7 +18,7 @@ import { wrap, nameStore, storeSetter, runDirect } from "./store.js";
 
 import { setLookup } from "./target.js";
 
-import { $TARGET, markRawIngest, setWriteOverride } from "./types.js";
+import { $TARGET, markRawIngest, setWriteOverride, isWrappable } from "./types.js";
 
 /**
  * Store — projections (plan sec. 31, S3; INTERNALS §7/§7b).
@@ -178,33 +178,33 @@ function forEachFamilyNode(e, t) {
     const s = e[$TARGET];
     const c = s.fam;
     const u = c.run = (c.run || 0) + 1;
-    let a;
+    let l;
     // Open loading window (seedLoadingValue): the observable store IS commit #0
     // for the whole first flight — the derive works a detached shadow of the
     // seed so draft writes cannot tear through to readers (#2988). Every
     // commit point reconciles the shadow through the normal commit path.
-        const l = i._e ? cloneState(s.v, s.s) : null;
+        const a = i.De ? cloneState(s.v, s.s) : null;
     // The question a write of this run answers: inside a slice, the slice's
     // (the sync pass); in a continuation — the flight still registered — the
     // flight's (`handleAsync` stamped it with the action that asked).
-        const asking = () => question || (i.m !== null && i.m.De !== null ? i.m.Oe : 0);
+        const asking = () => question || (i.m !== null && i.m.Te !== null ? i.m._e : 0);
     const f = wrapDraft(e, () => c.run === u && !isDisposed(i), o, s.s, 
     // A write after the run returned (a continuation, a callback) arms the
     // drain itself when no landing will.
     () => {
-        if (!(i.G & STATUS_PENDING) && !i._e) schedule();
+        if (!(i.S & STATUS_PENDING) && !i.De) schedule();
     }, asking);
     // The creation run commits directly (a memo's first value is its
     // `_value`); every later run — a re-derive in a flush, an async landing
     // — stages and commits with the flush like a memo's recompute.
         const d = u === 1;
     const pass = () => storeSetter(f, o => {
-        a = t(l ?? o);
+        l = t(a ?? o);
         const commit = t => {
             // Shadow run: commit a detached snapshot, never the shadow itself
             // (adoption takes the value by identity — handing it the live
             // shadow would fuse the draft to the observable store).
-            if (l && (t === undefined || t === l)) t = cloneState(l, s.s);
+            if (a && (t === undefined || t === a)) t = cloneState(a, s.s);
             if (t !== o && t !== undefined) {
                 const write = () => {
                     const n = question;
@@ -219,19 +219,19 @@ function forEachFamilyNode(e, t) {
             }
             // A landing (not the sync pass's own commit): the readers held
             // pending on the derive settle.
-                        if (!d || !(i.G & STATUS_UNINITIALIZED)) settleFamily(c);
+                        if (!d || !(i.S & STATUS_UNINITIALIZED)) settleFamily(c);
         };
-        const u = handleAsync(i, a, commit, (e, t) => {
+        const u = handleAsync(i, l, commit, (e, t) => {
             // The flight rejected: the leaves' readers learn it from here —
             // they do not subscribe to the derive. Pending again (a NotReady
             // rejection): the wake, as for the pass. Errored: every live
             // reader re-derives and meets the error at its pull (memo parity,
             // #2897) — and the flush that runs them advances the clock, so a
             // later tracked re-read may retry (core `read`).
-            if (d && i.G & STATUS_UNINITIALIZED) return;
+            if (d && i.S & STATUS_UNINITIALIZED) return;
             if (t) wakeFamily(c, e); else errorFamily(c);
         });
-        if (!i._e) commit(u);
+        if (!i.De) commit(u);
     }, false);
     try {
         d ? runDirect(pass) : pass();
@@ -239,49 +239,55 @@ function forEachFamilyNode(e, t) {
         // A flight went up (NotReady out of the pass — the derive's own, with
         // the derive as its source): the leaves' readers learn it from here —
         // they do not subscribe to the derive.
-        if (e instanceof NotReadyError && !d) wakeFamily(c, e);
+        // A synchronous error the same way (#3956: a rerun that finds the
+        // entry failed throws): every live reader re-derives and meets it.
+        if (!d) e instanceof NotReadyError ? wakeFamily(c, e) : errorFamily(c);
         throw e;
     }
     // A pass that returned with a flight up (an iterator's sync first yield):
     // the wake, as for the throw. Not a sync pass that superseded one — the
     // status it reads is the dead flight's, cleared when this pass settles
     // (#3181: a reader the settle walk had just released, re-parked for good).
-        if (i.G & STATUS_PENDING && i.m.De !== null && !i._e && !d) wakeFamily(c, i.m?.v);
+        if (i.S & STATUS_PENDING && i.m.Te !== null && !i.De && !d) wakeFamily(c, i.m?.F);
     return i;
 }
 
 function createProjectionInternal(e, t, r) {
-    const n = {
+    const n = r?.key === undefined ? "id" : r.key;
+    const o = {
         map: new WeakMap,
         node: null,
         live: new Set,
-        shallow: !!r?.shallow
+        shallow: !!r?.shallow,
+        // The row key, for a child paired after the adoption (store.ts
+        // `adoptChild`, #3712) as the adoption pairs them.
+        key: typeof n === "function" ? n : n === null ? null : e => isWrappable(e) ? e[n] : undefined
     };
-    const o = wrap(t, null, null, n);
-    if (n.shallow) {
-        o[$TARGET].s = true;
+    const i = wrap(t, null, null, o);
+    if (o.shallow) {
+        i[$TARGET].s = true;
         markRawIngest(t);
     }
-    let i;
-    if (r?.seedLoadingValue) i = {
+    let s;
+    if (r?.seedLoadingValue) s = {
         loadingValue: undefined
     };
     if (r?.name) {
-        i = {
-            ...i,
+        s = {
+            ...s,
             name: r.name
         };
-        nameStore(o, r.name);
+        nameStore(i, r.name);
     }
-    const s = computed(() => {
-        if (!n.node) n.node = getOwner();
-        runProjectionComputed(o, e, r?.key === undefined ? "id" : r.key);
-    }, i);
-    s.u &= ~CONFIG_AUTO_DISPOSE;
-    n.node = s;
+    const c = computed(() => {
+        if (!o.node) o.node = getOwner();
+        runProjectionComputed(i, e, n);
+    }, s);
+    c.i &= ~CONFIG_AUTO_DISPOSE;
+    o.node = c;
     return {
-        store: o,
-        node: s
+        store: i,
+        node: c
     };
 }
 

package/dist/observe/store/reconcile.js

@@ -2,7 +2,9 @@ import { isEqual } from "../core/core.js";
 
 import { isOwned, $OWNER, storeLookup, lookupTarget } from "./target.js";
 
-import { userWriting, optHooks, unwrapValue, adoptPB, sameKey, materializePB, notifyFold, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
+import { userWriting, unwrapValue, adoptPB, sameKey, materializePB, notifyFold, sameRow, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
+
+import { optHooks } from "./hooks.js";
 
 import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "./types.js";
 
@@ -73,33 +75,33 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
     // — key matching from the arrangement the guesses made (R28), so a row
     // the guess added keeps its proxy when the server returns it.
         const i = l?.opt === true ? optHooks.view(e, f) : f;
-    const u = Array.isArray(n);
-    const s = e.s === true;
+    const s = Array.isArray(n);
+    const u = e.s === true;
     const r = f;
     adoptPB(e, n, false);
-    if (s) markRawIngest(n);
-    if (Array.isArray(i) !== u) {
+    if (u) markRawIngest(n);
+    if (Array.isArray(i) !== s) {
         notifyFold(e, r, n);
         return;
     }
-    if (u) {
+    if (s) {
         const f = i;
-        const u = n;
+        const s = n;
         const a = e.n;
         let c = 0;
-        if (t && !s) {
+        if (t && !u) {
             const i = f.length;
-            const s = u.length;
+            const u = s.length;
             let d = false;
             let p = 0;
             // Aligned prefix: same row (by reference or key) at the same index.
-                        for (const y = Math.min(i, s); p < y; p++) {
-                const i = u[p];
-                const s = f[p];
-                if (s !== i && !(s !== null && typeof s === "object" && i !== null && typeof i === "object" && sameKey(t(s), t(i)))) break;
+                        for (const y = Math.min(i, u); p < y; p++) {
+                const i = s[p];
+                const u = f[p];
+                if (u !== i && !sameRow(u, i, t)) break;
  // misaligned: fall to the keyed remainder below
-                                if ((s !== i || i !== null && typeof i === "object" && isOwned(i)) && i !== null && typeof i === "object") descend(unwrapValue(s), i, t, l, o);
-                if (e.dk !== null && !d && !(i !== null && typeof i === "object" ? targetsEqual(s, i) : isEqual(s, i))) {
+                                if ((u !== i || i !== null && typeof i === "object" && isOwned(i)) && i !== null && typeof i === "object") descend(unwrapValue(u), i, t, l, o);
+                if (e.dk !== null && !d && !(i !== null && typeof i === "object" ? targetsEqual(u, i) : isEqual(u, i))) {
                     bumpDeep(e);
                     d = true;
                 }
@@ -111,12 +113,12 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                     }
                 }
             }
-            if (e.dk !== null && !d && p < u.length) bumpDeep(e);
+            if (e.dk !== null && !d && p < s.length) bumpDeep(e);
             const y = p;
  // misalignment point (== nlen on aligned ticks)
                         let w = null;
-            for (;p < u.length; p++) {
-                const e = u[p];
+            for (;p < s.length; p++) {
+                const e = s[p];
                 if (e !== null && typeof e === "object") {
                     const n = t(e);
                     let i;
@@ -156,12 +158,12 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                 }
             }
         } else {
-            const i = Math.min(f.length, u.length);
-            const d = u.length;
+            const i = Math.min(f.length, s.length);
+            const d = s.length;
             let p = false;
             for (let y = 0; y < d; y++) {
-                const d = u[y];
-                if (!s && y < i && d !== null && typeof d === "object") descend(unwrapValue(f[y]), d, t, l, o);
+                const d = s[y];
+                if (!u && y < i && d !== null && typeof d === "object") descend(unwrapValue(f[y]), d, t, l, o);
                 if (e.dk !== null && !p && !(d !== null && typeof d === "object" ? targetsEqual(f[y], d) : isEqual(f[y], d))) {
                     bumpDeep(e);
                     p = true;
@@ -179,7 +181,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
                 if (a !== null && c < e.nc) {
             for (const e of Reflect.ownKeys(a)) {
                 const t = typeof e === "string" ? +e : NaN;
-                if (!(t >= 0 && t < u.length)) notifyKeyDiff(a[e], e, r, n, false);
+                if (!(t >= 0 && t < s.length)) notifyKeyDiff(a[e], e, r, n, false);
             }
         }
         notifyFoldTail(e, r, n);
@@ -189,15 +191,15 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
     let c = 0;
     let d = false;
     for (const f in n) {
-        const u = n[f];
+        const s = n[f];
         const p = r[f];
-        const y = u !== null && typeof u === "object";
-        if (p === u && (!y || !isOwned(u)) && (a === null || a[f] === undefined || !hasAccessorFlag(a[f]))) {
+        const y = s !== null && typeof s === "object";
+        if (p === s && (!y || !isOwned(s)) && (a === null || a[f] === undefined || !hasAccessorFlag(a[f]))) {
             if (a !== null && a[f] !== undefined) c++;
             continue;
         }
-        if (y && !s) descend(unwrapValue(i[f]), u, t, l, o);
-        if (e.dk !== null && !d && !(y ? targetsEqual(p, u) : isEqual(p, u))) {
+        if (y && !u) descend(unwrapValue(i[f]), s, t, l, o);
+        if (e.dk !== null && !d && !(y ? targetsEqual(p, s) : isEqual(p, s))) {
             bumpDeep(e);
             d = true;
         }
@@ -205,7 +207,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
             const e = a[f];
             if (e !== undefined) {
                 c++;
-                notifyKeyValue(e, f, p, u, r, n);
+                notifyKeyValue(e, f, p, s, r, n);
             }
         }
     }
@@ -214,7 +216,7 @@ import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue } from "
         const f = p[e];
         if (f === $OWNER) continue;
         const i = n[f];
-        if (!s && i !== null && typeof i === "object") descend(unwrapValue(r[f]), i, t, l, o);
+        if (!u && i !== null && typeof i === "object") descend(unwrapValue(r[f]), i, t, l, o);
         if (a !== null) {
             const e = a[f];
             if (e !== undefined) {