@solidjs/signals 2.0.0-rc.2 → 2.0.0-rc.20

package/dist/prod/map.js

@@ -1,220 +1,492 @@
 import { computed, runWithOwner, signal, setSignal } from "./core/core.js";
 
-import { createOwner } from "./core/owner.js";
-
-import "./core/scheduler.js";
+import "./core/verdict.js";
 
 import { CONFIG_AUTO_DISPOSE } from "./core/constants.js";
 
-import "./core/invariants.js";
+import { attrHooks } from "./core/attribution-hooks.js";
 
-import "./core/verdict.js";
+import "./core/scheduler.js";
+
+import { createOwner, getOwner } from "./core/owner.js";
 
 import "./core/effect.js";
 
 import { accessor } from "./signals.js";
 
-import { $TRACK } from "./store/store.js";
-
-import "./store/next/store.js";
+import { $TRACK, shallowView, $TARGET } from "./store/types.js";
 
-function mapArray(t, s, i) {
-    const e = typeof i?.keyed === "function" ? i.keyed : undefined;
-    const r = s.length > 1;
-    const n = s;
-    const h = {
-        jt: createOwner(),
-        Wt: 0,
-        xt: t,
-        Kt: [],
-        $t: n,
-        qt: [],
-        zt: [],
-        Jt: e,
-        Xt: e || i?.keyed === false ? [] : undefined,
-        Yt: r && i?.keyed !== false ? [] : undefined,
-        Zt: i?.keyed === false,
-        ts: i?.fallback
+function mapArray(t, e, i) {
+    const s = typeof i?.keyed === "function" ? i.keyed : undefined;
+    const n = e.length > 1;
+    const r = e;
+    const o = {
+        H: createOwner(),
+        it: 0,
+        st: t,
+        ot: [],
+        ft: r,
+        ht: [],
+        tn: [],
+        Xe: s,
+        ct: s || i?.keyed === false ? [] : undefined,
+        lt: n && i?.keyed !== false ? [] : undefined,
+        ut: i?.keyed === false,
+        L: i?.fallback
     };
-    const o = computed(updateKeyedMap.bind(h));
-    // Untracked reads inside the internal owner resolve via _parentComputed; routing
-    // them through node lets store-proxy lookups see pending writes (not stale _value).
-        h.jt.Ot = o;
-    o.T &= ~CONFIG_AUTO_DISPOSE;
-    return accessor(o);
+    const f = computed(updateKeyedMap.bind(o), undefined);
+    f.l &= ~CONFIG_AUTO_DISPOSE;
+    return accessor(f);
 }
 
 const pureOptions = {
     ownedWrite: true
 };
 
-// Exception safety (#2903): a map callback can throw NotReadyError mid-pass
-// (async read), and the computed re-runs the whole pass after settle. Every
-// pass therefore STAGES its work — new rows are created into temp arrays and
-// removals are deferred — and commits to `this` only after every mapper
-// succeeded. An aborted pass disposes just the owners it created and leaves
-// `_items`/`_mappings`/`_nodes`/`_rows`/`_indexes`/`_len` exactly as they
-// were, so the retry diffs against uncorrupted state. Consequence of the
-// strong-abort ordering: removed rows now dispose AFTER the pass's new rows
-// are created (you cannot destroy state before knowing the pass will land).
+function trySmallMove(t, e, i, s) {
+    const n = t.ot;
+    const r = t.it - 1;
+    const o = [];
+    const f = [];
+    const h = [];
+ // flat triples: oldStart, newStart, length
+        let c = 256;
+    let a = s;
+    let l = s;
+    let u = false;
+    while (a <= r && l <= i - 1) {
+        const t = n[a];
+        const s = e[l];
+        if (t === s) {
+            if (!u) {
+                h.push(a, l, 0);
+                u = true;
+            }
+            h[h.length - 1]++;
+            a++;
+            l++;
+            continue;
+        }
+        u = false;
+        // Bounded realignment lookahead, shorter distance wins.
+                let w = -1;
+        let d = Math.min(32 - o.length, r - a, c);
+        for (let t = 1; t <= d; t++) {
+            if (n[a + t] === s) {
+                w = t;
+                break;
+            }
+        }
+        c -= w === -1 ? d : w;
+        let p = -1;
+        d = Math.min(32 - f.length, i - 1 - l, c);
+        for (let i = 1; i <= d; i++) {
+            if (e[l + i] === t) {
+                p = i;
+                break;
+            }
+        }
+        c -= p === -1 ? d : p;
+        if (w !== -1 && (p === -1 || w <= p)) {
+            while (w-- > 0) o.push(a++);
+            continue;
+        }
+        if (p !== -1) {
+            while (p-- > 0) f.push(l++);
+            continue;
+        }
+        if (c <= 0 || o.length === 32 || f.length === 32) return false;
+        o.push(a++);
+        f.push(l++);
+    }
+    for (;a <= r; a++) {
+        if (o.length === 32) return false;
+        o.push(a);
+    }
+    for (;l <= i - 1; l++) {
+        if (f.length === 32) return false;
+        f.push(l);
+    }
+    return commitSmallMove(t, e, i, o, f, h);
+}
+
+/** PHASE 2 of the small-move path, in its OWN function so that a pass which
+ * only SCANS and bails (a full replace: the first structural pass of a page,
+ * typically) compiles nothing but the scan — V8 parses and compiles lazily
+ * per function, and cold `replace` measured +0.5 ms with both phases in one
+ * body. Pairs displaced sources with destinations (an unmatched destination
+ * is a replacement/insertion → general path), then commits: slice() the live
+ * arrays, copy shifted runs, patch displaced pairs, dispose leftovers. */ function commitSmallMove(t, e, i, s, n, r) {
+    const o = t.ot;
+    let f;
+    let h;
+    let c;
+    if (n.length !== 0) {
+        c = new Array(s.length);
+        for (h = 0; h < n.length; h++) {
+            let t = -1;
+            for (f = 0; f < s.length; f++) {
+                if (!c[f] && o[s[f]] === e[n[h]]) {
+                    t = f;
+                    break;
+                }
+            }
+            if (t === -1) return false;
+            c[t] = true;
+            n[h] = n[h] << 6 | t;
+ // pack pairing (found < 32)
+                }
+    }
+    // DUPLICATES: the general path pairs equal identities by OCCURRENCE ORDER
+    // (the chained index map). Displaced↔displaced pairing above is ascending
+    // on both sides, so it agrees; but an aligned run was matched by POSITION,
+    // and if a displaced identity also occurs inside a run the two algorithms
+    // can hand different occurrences different owners (row-local state moves;
+    // a shrink could dispose the wrong one). Decline that case — general path.
+        if (s.length !== 0 || n.length !== 0) {
+        const t = new Set;
+        for (f = 0; f < s.length; f++) t.add(o[s[f]]);
+        for (h = 0; h < n.length; h++) t.add(e[n[h] >> 6]);
+        for (let e = 0; e < r.length; e += 3) {
+            const i = r[e];
+            for (let s = 0, n = r[e + 2]; s < n; s++) if (t.has(o[i + s])) return false;
+        }
+    }
+    const a = t.ht;
+    const l = t.tn;
+    const u = a.slice(0, i);
+    const w = l.slice(0, i);
+    for (let t = 0; t < r.length; t += 3) {
+        const e = r[t];
+        const i = r[t + 1];
+        if (e !== i) {
+            for (let s = 0; s < r[t + 2]; s++) {
+                u[i + s] = a[e + s];
+                w[i + s] = l[e + s];
+            }
+        }
+    }
+    for (h = 0; h < n.length; h++) {
+        const t = n[h] >> 6;
+        const e = s[n[h] & 63];
+        u[t] = a[e];
+        w[t] = l[e];
+    }
+    t.ht = u;
+    t.tn = w;
+    t.it = i;
+    t.ot = e.slice(0);
+    // Dispose unmatched sources LAST (general-path ordering).
+        for (f = 0; f < s.length; f++) {
+        if (c === undefined || !c[f]) l[s[f]].dispose();
+    }
+    return true;
+}
+
+/** Stage a PURE REMOVAL without the key map: when the new window is the old
+ * window with items dropped, in order (one-item removals, every-nth, the
+ * table filters), a two-pointer walk lands every survivor in the window
+ * stage with one key call per item and returns the leavers; a shape that is
+ * not an ordered subsequence returns null with the node stage cleared, and
+ * the map path below starts from scratch (it rewrites every window slot of
+ * `temp` / `rows` / `indexes`, so only `tempNodes`' `!== undefined` probe
+ * needs the reset). The stage arrays are scratch — nothing live is touched. */ function stageRemoval(t, e, i, s, n, r, o, f, h) {
+    const c = t.Xe;
+    const a = t.ot;
+    const l = t.tn;
+    const u = [];
+    let w = i;
+    for (let d = i; d <= n; w++, d++) {
+        const n = c ? c(e[d]) : e[d];
+        while (w <= s && (c ? c(a[w]) : a[w]) !== n) u.push(l[w++]);
+        if (w > s) {
+            o.fill(undefined);
+            return null;
+        }
+        r[d] = t.ht[w];
+        o[d - i] = l[w];
+        if (f) f[d - i] = t.ct[w];
+        if (h) h[d - i] = t.lt[w];
+    }
+    for (;w <= s; w++) u.push(l[w]);
+    return u;
+}
+
+/** Land a staged window into the live bookkeeping arrays in place: shift the
+ * suffix by `dif` (a loop walked from the side that never overwrites an
+ * unread slot), take the window from the stage, write survivors' row and
+ * index signals. Its own function so the general path's body stays under
+ * the JIT's optimization budget — the inlined commit measured ~10% slower on
+ * full-window reorders (the small-move note has the same finding). */ function commitWindow(t, e, i, s, n, r, o, f, h) {
+    const c = t.tn;
+    const a = t.ct;
+    const l = t.lt;
+    const u = t.it;
+    const w = i - u;
+    let d, p;
+    if (w > 0) {
+        // Grow first: a store past the end from the top is a third slower than
+        // filling a pre-sized tail (measured on 1k refs, 2026-10-15).
+        c.length = i;
+        if (a) a.length = i;
+        if (l) l.length = i;
+        for (d = u - 1, p = i - 1; d > n; d--, p--) {
+            c[p] = c[d];
+            if (a) a[p] = a[d];
+            if (l) l[p] = l[d];
+        }
+    } else if (w < 0) {
+        for (d = n + 1, p = r + 1; d < u; d++, p++) {
+            c[p] = c[d];
+            if (a) a[p] = a[d];
+            if (l) l[p] = l[d];
+        }
+        c.length = i;
+        if (a) a.length = i;
+        if (l) l.length = i;
+    }
+    for (p = s; p <= r; p++) {
+        c[p] = o[p - s];
+        if (a) setSignal(a[p] = f[p - s], e[p]);
+        if (l) setSignal(l[p] = h[p - s], p);
+    }
+    for (p = r + 1; p < i; p++) {
+        if (a) setSignal(a[p], e[p]);
+        if (l && w !== 0) setSignal(l[p], p);
+    }
+}
+
 function updateKeyedMap() {
-    const t = this.xt() || [], s = t.length;
+    // Untracked reads inside the internal owner resolve via _parentComputed:
+    // routed through the node, a store-proxy lookup sees pending writes (not a
+    // stale _value) and an async read in a row callback registers the node as
+    // the flight's reader (pending tracking + post-settle retry) instead of
+    // vanishing. Set per pass: the first pass runs inside `computed()`, before
+    // the node exists to the caller.
+    this.H.Ke = getOwner();
+    let t = this.st() || [];
     t[$TRACK];
- // top level tracking
-        runWithOwner(this.jt, () => {
-        let i, e, r, n, 
+ // top level tracking (a store array's container node)
+    // A shallow store array diffs its backing: its slots are raw records, and
+    // a trap per slot read was most of a one-row write on a 1k-row list.
+        t = shallowView?.(t[$TARGET]) ?? t;
+    const e = t.length;
+    runWithOwner(this.H, () => {
+        let i, s, 
+        // The stage slot a mapper writes its row/index signal into: `j` on the
+        // create-all path, `j - start` on the general path, whose stage arrays
+        // are sized to the changed WINDOW, not the list.
+        n, r, o, 
         // Mappers write freshly-created row/index signals into the STAGE
         // arrays (`rows`/`indexes`), never into `this._rows`/`this._indexes`.
-        h = this.Xt ? this.Zt ? () => {
-            r[e] = signal(t[e], pureOptions);
-            return this.$t(accessor(r[e]), e);
+        f = this.ct ? this.ut ? () => {
+            r[n] = signal(t[s], pureOptions);
+            return this.ft(accessor(r[n]), s);
         } : () => {
-            r[e] = signal(t[e], pureOptions);
-            n && (n[e] = signal(e, pureOptions));
-            return this.$t(accessor(r[e]), n ? accessor(n[e]) : undefined);
-        } : this.Yt ? () => {
-            const s = t[e];
-            n[e] = signal(e, pureOptions);
-            return this.$t(s, accessor(n[e]));
+            r[n] = signal(t[s], pureOptions);
+            o && (o[n] = signal(s, pureOptions));
+            return this.ft(accessor(r[n]), o ? accessor(o[n]) : undefined);
+        } : this.lt ? () => {
+            const e = t[s];
+            o[n] = signal(s, pureOptions);
+            return this.ft(e, accessor(o[n]));
         } : () => {
-            const s = t[e];
-            return this.$t(s);
+            const e = t[s];
+            return this.ft(e);
         };
         // fast path for empty arrays
-                if (s === 0) {
-            if (this.Wt !== 0) {
-                this.jt.dispose(false);
-                this.zt = [];
-                this.Kt = [];
-                this.qt = [];
-                this.Wt = 0;
-                this.Xt && (this.Xt = []);
-                this.Yt && (this.Yt = []);
+                if (e === 0) {
+            if (this.it !== 0) {
+                this.H.dispose(false);
+                this.tn = [];
+                this.ot = [];
+                this.ht = [];
+                this.it = 0;
+                this.ct && (this.ct = []);
+                this.lt && (this.lt = []);
             }
-            if (this.ts && !this.qt[0]) {
+            if (this.L && !this.ht.length) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.zt[0]?.dispose();
-                this.qt[0] = runWithOwner(this.zt[0] = createOwner(), this.ts);
+                this.tn[0]?.dispose();
+                this.ht[0] = runWithOwner(this.tn[0] = createOwner(), this.L);
             }
         }
         // fast path for new create
-         else if (this.Wt === 0) {
-            const o = new Array(s);
-            const c = new Array(s);
-            r = this.Xt && new Array(s);
-            n = this.Yt && new Array(s);
+         else if (this.it === 0) {
+            const h = new Array(e);
+            const c = new Array(e);
+            r = this.ct && new Array(e);
+            o = this.lt && new Array(e);
             try {
-                for (e = 0; e < s; e++) o[e] = runWithOwner(c[e] = createOwner(), h);
+                for (s = 0; s < e; s++) {
+                    n = s;
+                    h[s] = runWithOwner(c[s] = createOwner(), f);
+                }
             } catch (t) {
-                for (i = 0; i <= e; i++) c[i]?.dispose();
+                for (i = 0; i <= s; i++) c[i]?.dispose();
                 throw t;
             }
             // commit
-                        if (this.zt[0]) this.zt[0].dispose();
+                        if (this.tn[0]) this.tn[0].dispose();
  // previous fallback
-                        this.qt = o;
-            this.zt = c;
-            r && (this.Xt = r);
-            n && (this.Yt = n);
-            this.Kt = t.slice(0);
-            this.Wt = s;
+                        this.ht = h;
+            this.tn = c;
+            r && (this.ct = r);
+            o && (this.lt = o);
+            this.ot = t.slice(0);
+            this.it = e;
         } else {
-            let o, c, a, f, u, p, w, l, d;
+            let h, c, a, l, u, w, d, p, m, 
+            // Dev (attribution engine installed): the items behind the exited and
+            // entered rows, for the list-identity census.
+            O, _;
+            // The pass's write to a per-slot signal (a row accessor in index mode,
+            // an index accessor in keyed mode). The list's frame lives in these
+            // writes as much as in the computed's result, so under a LANE pass they
+            // are the lane's frame too (F1): a plain `setSignal` staged them into
+            // the action's transaction and the row readers were served the
+            // committed value until the action landed — `<For>` without `keyed`
+            // showed the pre-action list for the whole action while the keyed modes
+            // showed the optimistic one. The engine publishes the write as a
+            // derived override on the slot (lanes stage, A17) and lands or
+            // supersedes it when a plain pass later writes a slot still carrying
+            // one (A18) — `landOnOverride`'s slot arm. Decided once per pass, not
+            // per slot: a lane pass marks the map (`_laneSlots`: its slots may
+            // carry overrides), a marked map routes every slot write through the
+            // engine while any lane is live — a slot's override resolves with its
+            // lane's transaction, or with the batch for an orphan lane
+            // (resolveOptimisticNodes, then cleanupCompletedLanes, both before the
+            // completion wakes any recompute), so a pass that finds no lane live
+            // knows the slots are clean and drops the mark — and an unmarked map
+            // takes `setSignal` directly. The engine is installed whenever a lane
+            // is active.
+            // CARVE 2: the lane-slot arm (`_landOnOverride`, F1) went with the engine.
+                        const y = setSignal;
             // skip common prefix
-                        for (o = 0, c = Math.min(this.Wt, s); o < c && (this.Kt[o] === t[o] || this.Xt && compare(this.Jt, this.Kt[o], t[o])); o++) {
-                if (this.Xt) setSignal(this.Xt[o], t[o]);
+                        for (h = 0, c = Math.min(this.it, e); h < c && (this.ot[h] === t[h] || this.ct && compare(this.Xe, this.ot[h], t[h])); h++) {
+                if (this.ct) y(this.ct[h], t[h]);
             }
             // skip common suffix — counted only; retained entries land in one pass
             // at commit instead of being staged and copied twice
-                        for (c = this.Wt - 1, a = s - 1; c >= o && a >= o && (this.Kt[c] === t[a] || this.Xt && compare(this.Jt, this.Kt[c], t[a])); c--, 
+                        for (c = this.it - 1, a = e - 1; c >= h && a >= h && (this.ot[c] === t[a] || this.ct && compare(this.Xe, this.ot[c], t[a])); c--, 
             a--) ;
             // no structural change (every position matched in place at equal
             // length — the common post-reconcile shape): keep the same mapped
             // array identity so downstream consumers don't re-run at all
-                        if (o === s && this.Wt === s) {
-                this.Kt = t.slice(0);
+                        if (h === e && this.it === e) {
+                this.ot = t.slice(0);
                 return;
             }
-            const O = s - this.Wt;
-            const m = new Array(s);
-            const _ = new Array(s);
-            r = this.Xt ? new Array(s) : undefined;
-            n = this.Yt ? new Array(s) : undefined;
-            // 0) prepare a map of all indices in the changed window of newItems,
-            // scanning backwards so we encounter them in natural order
-                        p = new Map;
-            w = new Array(a + 1);
-            for (e = a; e >= o; e--) {
-                f = t[e];
-                u = this.Jt ? this.Jt(f) : f;
-                i = p.get(u);
-                w[e] = i === undefined ? -1 : i;
-                p.set(u, e);
+            // SMALL-MOVE FAST PATH: extracted to its own function — inlining it
+            // here bloats updateKeyedMap past the JIT's optimization budget and
+            // deoptimizes the GENERAL path (measured 2x on reverse). Gated to
+            // LARGE trimmed windows: when the trims already shrank the window
+            // (plain removals, tail edits), the general path is window-
+            // proportional and cheap — the fast path would only re-walk what the
+            // trims proved.
+                        if (e <= this.it && c - h > 64 && this.ct === undefined && this.lt === undefined) {
+                // PROBE before the scan: a small move keeps a mid-window item within
+                // ±32 of its old position; a REPLACE (all fresh items — the shape
+                // every page's first structural pass usually is) has it nowhere.
+                // ~65 compares, no allocation, and the scan function is never
+                // compiled for a replace (its cold first-call compile was the cost).
+                const i = h + (a - h >> 1);
+                const s = t[i];
+                const n = Math.min(c, i + 32);
+                let r = Math.max(h, i - 32);
+                while (r <= n && this.ot[r] !== s) r++;
+                if (r <= n && trySmallMove(this, t, e, h)) return;
             }
-            // 1) step through the old changed window and see if items can be found
-            // in the new set; if so, stage them at their new positions; if not,
-            // queue them for disposal at commit
-                        for (i = o; i <= c; i++) {
-                f = this.Kt[i];
-                u = this.Jt ? this.Jt(f) : f;
-                e = p.get(u);
-                if (e !== undefined && e !== -1) {
-                    m[e] = this.qt[i];
-                    _[e] = this.zt[i];
-                    r && (r[e] = this.Xt[i]);
-                    n && (n[e] = this.Yt[i]);
-                    e = w[e];
-                    p.set(u, e);
-                } else (l ??= []).push(this.zt[i]);
-            }
-            // 2) create new rows into the temp arrays; an abort disposes only these
-                        try {
-                for (e = o; e <= a; e++) {
-                    if (_[e] !== undefined) continue;
-                    (d ??= []).push(_[e] = createOwner());
-                    m[e] = runWithOwner(_[e], h);
+            const A = e - this.it;
+            // WINDOW-SIZED STAGING, IN-PLACE COMMIT (2026-10-15). The strong-abort
+            // contract (#2903) only needs the pass to touch nothing live before
+            // every mapper has succeeded; it never needed four fresh newLen-sized
+            // arrays. Only the changed window [start, newEnd] is staged — the
+            // prefix and suffix are, by construction, the rows that did not move
+            // relative to each other — and at commit the bookkeeping arrays
+            // (`_nodes`, `_rows`, `_indexes`) take the window in place with the
+            // suffix shifted by a plain loop (`copyWithin` is a generic
+            // per-element builtin in V8 — 30× slower than the loop on 1k refs,
+            // measured 2026-10-15). `_mappings` alone is
+            // rebuilt: its fresh identity is the change signal downstream relies
+            // on. A one-row edit on a 500-row list used to allocate ~20 KB of
+            // staging plus a position-sized chain array per commit (uibench's
+            // one-item tree ops at 4–6× Octane, jfb-reorder `removefirst` at
+            // 2.5×); now it stages one slot.
+                        const g = a - h + 1;
+            const S = new Array(e);
+            const M = new Array(g);
+            r = this.ct ? new Array(g) : undefined;
+            o = this.lt ? new Array(g) : undefined;
+            // A shrinking pass is tried as a pure removal first (stageRemoval: no
+            // key map, one key call per item); anything else takes the map path.
+                        const k = A < 0 ? stageRemoval(this, t, h, c, a, S, M, r, o) : null;
+            if (k !== null) {
+                // (The list-churn census below wants removals AND creations in one
+                // pass; a pure removal has none, so no item ledger is kept here.)
+                if (k.length !== 0) p = k;
+            } else {
+                // 0) prepare a map of all indices in the changed window of newItems,
+                // scanning backwards so we encounter them in natural order
+                w = new Map;
+                d = new Array(g);
+                for (s = a; s >= h; s--) {
+                    l = t[s];
+                    u = this.Xe ? this.Xe(l) : l;
+                    i = w.get(u);
+                    d[s - h] = i === undefined ? -1 : i;
+                    w.set(u, s);
                 }
-            } catch (t) {
-                if (d) for (i = 0; i < d.length; i++) d[i].dispose();
-                throw t;
-            }
-            // 3) commit: land the retained prefix and suffix plus the staged window
-            // into the fresh arrays, swap them in (new identity for downstream
-            // change propagation), then dispose exited rows
-                        for (i = 0; i < o; i++) {
-                m[i] = this.qt[i];
-                _[i] = this.zt[i];
-                r && (r[i] = this.Xt[i]);
-                n && (n[i] = this.Yt[i]);
-            }
-            for (e = o; e <= a; e++) {
-                if (r) setSignal(r[e], t[e]);
-                if (n) setSignal(n[e], e);
-            }
-            for (e = a + 1; e < s; e++) {
-                m[e] = this.qt[e - O];
-                _[e] = this.zt[e - O];
-                if (r) {
-                    r[e] = this.Xt[e - O];
-                    setSignal(r[e], t[e]);
+                // 1) step through the old changed window and see if items can be found
+                // in the new set; if so, stage them at their new positions; if not,
+                // queue them for disposal at commit
+                                for (i = h; i <= c; i++) {
+                    l = this.ot[i];
+                    u = this.Xe ? this.Xe(l) : l;
+                    s = w.get(u);
+                    if (s !== undefined && s !== -1) {
+                        S[s] = this.ht[i];
+                        M[s - h] = this.tn[i];
+                        r && (r[s - h] = this.ct[i]);
+                        o && (o[s - h] = this.lt[i]);
+                        s = d[s - h];
+                        w.set(u, s);
+                    } else {
+                        (p ??= []).push(this.tn[i]);
+                        if (false && attrHooks !== null) ;
+                    }
                 }
-                if (n) {
-                    n[e] = this.Yt[e - O];
-                    if (O !== 0) setSignal(n[e], e);
+                // 2) create new rows into the window stage; an abort disposes only these
+                                try {
+                    for (s = h; s <= a; s++) {
+                        if (M[s - h] !== undefined) continue;
+                        (m ??= []).push(M[s - h] = createOwner());
+                        if (false && attrHooks !== null) ;
+                        n = s - h;
+                        S[s] = runWithOwner(M[s - h], f);
+                    }
+                } catch (t) {
+                    if (m) for (i = 0; i < m.length; i++) m[i].dispose();
+                    throw t;
                 }
             }
-            this.qt = m;
-            this.zt = _;
-            r && (this.Xt = r);
-            n && (this.Yt = n);
-            this.Wt = s;
+            // 3) commit: the retained prefix and suffix land in the fresh mapped
+            // array; the bookkeeping arrays take the staged window IN PLACE (own
+            // function: kept out of this body on purpose, see commitWindow); then
+            // the exited rows dispose
+                        for (i = 0; i < h; i++) S[i] = this.ht[i];
+            for (s = a + 1; s < e; s++) S[s] = this.ht[s - A];
+            commitWindow(this, t, e, h, c, a, M, r, o);
+            this.ht = S;
+            this.it = e;
             // save a copy of the mapped items for the next update
-                        this.Kt = t.slice(0);
-            if (l) for (i = 0; i < l.length; i++) l[i].dispose();
+                        this.ot = t.slice(0);
+            if (p) for (i = 0; i < p.length; i++) p[i].dispose();
+            if (false && attrHooks !== null && O !== undefined && _ !== undefined) ;
         }
     });
-    return this.qt;
+    return this.ht;
 }
 
 /**
@@ -230,27 +502,23 @@ function updateKeyedMap() {
  * const view = repeat(count, i => `Item ${i}`, { fallback: () => "empty" });
  * ```
  *
- * @description https://docs.solidjs.com/reference/reactive-utilities/repeat
- */ function repeat(t, s, i) {
-    const e = s;
-    const r = {
-        jt: createOwner(),
-        Wt: 0,
-        ss: 0,
-        es: t,
-        $t: e,
-        zt: [],
-        qt: [],
-        rs: i?.from,
-        ts: i?.fallback
+ * @description https://v2.solidjs.com/reference/solid-js/advanced/jsx-component-primitives/repeat
+ */ function repeat(t, e, i) {
+    const s = e;
+    const n = {
+        H: createOwner(),
+        it: 0,
+        wt: 0,
+        dt: t,
+        ft: s,
+        tn: [],
+        ht: [],
+        Ot: i?.from,
+        L: i?.fallback
     };
-    const n = computed(updateRepeat.bind(r));
-    // Same as mapArray: untracked reads inside the internal owner resolve via
-    // _parentComputed, so async reads in row callbacks register with the node
-    // (pending tracking + post-settle retry) instead of vanishing.
-        r.jt.Ot = n;
-    n.T &= ~CONFIG_AUTO_DISPOSE;
-    return accessor(n);
+    const r = computed(updateRepeat.bind(n));
+    r.l &= ~CONFIG_AUTO_DISPOSE;
+    return accessor(r);
 }
 
 // Same staged-commit discipline as `updateKeyedMap` (#2903): the retained
@@ -261,59 +529,61 @@ function updateKeyedMap() {
 // for the post-settle retry. The overlap math also subsumes the previous
 // disjoint-window/front-clear/end-clear/shift special cases.
 function updateRepeat() {
-    const t = this.es();
-    const s = this.rs?.() || 0;
-    runWithOwner(this.jt, () => {
+    // As in updateKeyedMap: the node is the row callbacks' reader, per pass.
+    this.H.Ke = getOwner();
+    const t = this.dt();
+    const e = this.Ot?.() || 0;
+    runWithOwner(this.H, () => {
         if (t === 0) {
-            if (this.Wt !== 0) {
-                this.jt.dispose(false);
-                this.zt = [];
-                this.qt = [];
-                this.Wt = 0;
+            if (this.it !== 0) {
+                this.H.dispose(false);
+                this.tn = [];
+                this.ht = [];
+                this.it = 0;
                 // Reset offset to match the cleared data (#2767, repro 2).
-                                this.ss = 0;
+                                this.wt = 0;
             }
-            if (this.ts && !this.qt[0]) {
+            if (this.L && !this.ht.length) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.zt[0]?.dispose();
-                this.qt[0] = runWithOwner(this.zt[0] = createOwner(), this.ts);
+                this.tn[0]?.dispose();
+                this.ht[0] = runWithOwner(this.tn[0] = createOwner(), this.L);
             }
             return;
         }
-        const i = s + t;
-        const e = this.ss + this.Wt;
+        const i = e + t;
+        const s = this.wt + this.it;
         // Retained overlap [keepStart, keepEnd) in global indexes; empty when the
         // windows are disjoint or when coming from empty/fallback.
-                const r = Math.max(s, this.ss);
-        const n = Math.min(i, e);
-        const h = new Array(t);
+                const n = Math.max(e, this.wt);
+        const r = Math.min(i, s);
         const o = new Array(t);
-        for (let t = r; t < n; t++) {
-            o[t - s] = this.zt[t - this.ss];
-            h[t - s] = this.qt[t - this.ss];
+        const f = new Array(t);
+        for (let t = n; t < r; t++) {
+            f[t - e] = this.tn[t - this.wt];
+            o[t - e] = this.ht[t - this.wt];
         }
         try {
-            for (let t = s; t < i; t++) {
-                if (t >= r && t < n) continue;
-                h[t - s] = runWithOwner(o[t - s] = createOwner(), () => this.$t(t));
+            for (let t = e; t < i; t++) {
+                if (t >= n && t < r) continue;
+                o[t - e] = runWithOwner(f[t - e] = createOwner(), () => this.ft(t));
             }
         } catch (t) {
-            for (let t = s; t < i; t++) if ((t < r || t >= n) && o[t - s]) o[t - s].dispose();
+            for (let t = e; t < i; t++) if ((t < n || t >= r) && f[t - e]) f[t - e].dispose();
             throw t;
         }
         // commit: dispose the previous fallback or the rows leaving the window
-                if (this.Wt === 0) this.zt[0]?.dispose(); else for (let t = this.ss; t < e; t++) if (t < s || t >= i) this.zt[t - this.ss].dispose();
-        this.qt = h;
-        this.zt = o;
-        this.ss = s;
-        this.Wt = t;
+                if (this.it === 0) this.tn[0]?.dispose(); else for (let t = this.wt; t < s; t++) if (t < e || t >= i) this.tn[t - this.wt].dispose();
+        this.ht = o;
+        this.tn = f;
+        this.wt = e;
+        this.it = t;
     });
-    return this.qt;
+    return this.ht;
 }
 
-function compare(t, s, i) {
-    return t ? t(s) === t(i) : true;
+function compare(t, e, i) {
+    return t ? t(e) === t(i) : true;
 }
 
 export { mapArray, repeat };