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

package/dist/observe/map.js

@@ -18,75 +18,75 @@ import { accessor } from "./signals.js";
 
 import { $TRACK } from "./store/types.js";
 
-function mapArray(t, e, s) {
-    const i = typeof s?.keyed === "function" ? s.keyed : undefined;
-    const r = e.length > 1;
-    const n = e;
+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(),
         wt: 0,
-        Mt: t,
-        $t: [],
-        qt: n,
-        zt: [],
-        nn: [],
-        bt: i,
-        Jt: i || s?.keyed === false ? [] : undefined,
-        Xt: r && s?.keyed !== false ? [] : undefined,
-        Yt: s?.keyed === false,
-        P: s?.fallback
+        yt: t,
+        Mt: [],
+        Wt: r,
+        vt: [],
+        je: [],
+        Vt: s,
+        Kt: s || i?.keyed === false ? [] : undefined,
+        xt: n && i?.keyed !== false ? [] : undefined,
+        Ut: i?.keyed === false,
+        L: i?.fallback
     };
-    const h = computed(updateKeyedMap.bind(o), s?.name ? {
-        name: s.name
+    const f = computed(updateKeyedMap.bind(o), i?.name ? {
+        name: i.name
     } : undefined);
-    h.u &= ~CONFIG_AUTO_DISPOSE;
-    return accessor(h);
+    f.l &= ~CONFIG_AUTO_DISPOSE;
+    return accessor(f);
 }
 
 const pureOptions = {
     ownedWrite: true
 };
 
-function trySmallMove(t, e, s, i) {
-    const r = t.$t;
-    const n = t.wt - 1;
+function trySmallMove(t, e, i, s) {
+    const n = t.Mt;
+    const r = t.wt - 1;
     const o = [];
-    const h = [];
     const f = [];
+    const h = [];
  // flat triples: oldStart, newStart, length
         let c = 256;
-    let a = i;
-    let u = i;
-    let l = false;
-    while (a <= n && u <= s - 1) {
-        const t = r[a];
-        const i = e[u];
-        if (t === i) {
-            if (!l) {
-                f.push(a, u, 0);
-                l = true;
+    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;
             }
-            f[f.length - 1]++;
+            h[h.length - 1]++;
             a++;
-            u++;
+            l++;
             continue;
         }
-        l = false;
+        u = false;
         // Bounded realignment lookahead, shorter distance wins.
                 let d = -1;
-        let p = Math.min(32 - o.length, n - a, c);
+        let p = Math.min(32 - o.length, r - a, c);
         for (let t = 1; t <= p; t++) {
-            if (r[a + t] === i) {
+            if (n[a + t] === s) {
                 d = t;
                 break;
             }
         }
         c -= d === -1 ? p : d;
         let w = -1;
-        p = Math.min(32 - h.length, s - 1 - u, c);
-        for (let s = 1; s <= p; s++) {
-            if (e[u + s] === t) {
-                w = s;
+        p = Math.min(32 - f.length, i - 1 - l, c);
+        for (let i = 1; i <= p; i++) {
+            if (e[l + i] === t) {
+                w = i;
                 break;
             }
         }
@@ -96,22 +96,22 @@ function trySmallMove(t, e, s, i) {
             continue;
         }
         if (w !== -1) {
-            while (w-- > 0) h.push(u++);
+            while (w-- > 0) f.push(l++);
             continue;
         }
-        if (c <= 0 || o.length === 32 || h.length === 32) return false;
+        if (c <= 0 || o.length === 32 || f.length === 32) return false;
         o.push(a++);
-        h.push(u++);
+        f.push(l++);
     }
-    for (;a <= n; a++) {
+    for (;a <= r; a++) {
         if (o.length === 32) return false;
         o.push(a);
     }
-    for (;u <= s - 1; u++) {
-        if (h.length === 32) return false;
-        h.push(u);
+    for (;l <= i - 1; l++) {
+        if (f.length === 32) return false;
+        f.push(l);
     }
-    return commitSmallMove(t, e, s, o, h, f);
+    return commitSmallMove(t, e, i, o, f, h);
 }
 
 /** PHASE 2 of the small-move path, in its OWN function so that a pass which
@@ -120,24 +120,24 @@ function trySmallMove(t, e, s, i) {
  * 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, s, i, r, n) {
-    const o = t.$t;
-    let h;
+ * arrays, copy shifted runs, patch displaced pairs, dispose leftovers. */ function commitSmallMove(t, e, i, s, n, r) {
+    const o = t.Mt;
     let f;
+    let h;
     let c;
-    if (r.length !== 0) {
-        c = new Array(i.length);
-        for (f = 0; f < r.length; f++) {
+    if (n.length !== 0) {
+        c = new Array(s.length);
+        for (h = 0; h < n.length; h++) {
             let t = -1;
-            for (h = 0; h < i.length; h++) {
-                if (!c[h] && o[i[h]] === e[r[f]]) {
-                    t = h;
+            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;
-            r[f] = r[f] << 6 | t;
+            n[h] = n[h] << 6 | t;
  // pack pairing (found < 32)
                 }
     }
@@ -147,46 +147,119 @@ function trySmallMove(t, e, s, i) {
     // 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 (i.length !== 0 || r.length !== 0) {
+        if (s.length !== 0 || n.length !== 0) {
         const t = new Set;
-        for (h = 0; h < i.length; h++) t.add(o[i[h]]);
-        for (f = 0; f < r.length; f++) t.add(e[r[f] >> 6]);
-        for (let e = 0; e < n.length; e += 3) {
-            const s = n[e];
-            for (let i = 0, r = n[e + 2]; i < r; i++) if (t.has(o[s + i])) return false;
+        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.zt;
-    const u = t.nn;
-    const l = a.slice(0, s);
-    const d = u.slice(0, s);
-    for (let t = 0; t < n.length; t += 3) {
-        const e = n[t];
-        const s = n[t + 1];
-        if (e !== s) {
-            for (let i = 0; i < n[t + 2]; i++) {
-                l[s + i] = a[e + i];
-                d[s + i] = u[e + i];
+    const a = t.vt;
+    const l = t.je;
+    const u = a.slice(0, i);
+    const d = 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];
+                d[i + s] = l[e + s];
             }
         }
     }
-    for (f = 0; f < r.length; f++) {
-        const t = r[f] >> 6;
-        const e = i[r[f] & 63];
-        l[t] = a[e];
-        d[t] = u[e];
+    for (h = 0; h < n.length; h++) {
+        const t = n[h] >> 6;
+        const e = s[n[h] & 63];
+        u[t] = a[e];
+        d[t] = l[e];
     }
-    t.zt = l;
-    t.nn = d;
-    t.wt = s;
-    t.$t = e.slice(0);
+    t.vt = u;
+    t.je = d;
+    t.wt = i;
+    t.Mt = e.slice(0);
     // Dispose unmatched sources LAST (general-path ordering).
-        for (h = 0; h < i.length; h++) {
-        if (c === undefined || !c[h]) u[i[h]].dispose();
+        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.Vt;
+    const a = t.Mt;
+    const l = t.je;
+    const u = [];
+    let d = i;
+    for (let p = i; p <= n; d++, p++) {
+        const n = c ? c(e[p]) : e[p];
+        while (d <= s && (c ? c(a[d]) : a[d]) !== n) u.push(l[d++]);
+        if (d > s) {
+            o.fill(undefined);
+            return null;
+        }
+        r[p] = t.vt[d];
+        o[p - i] = l[d];
+        if (f) f[p - i] = t.Kt[d];
+        if (h) h[p - i] = t.xt[d];
+    }
+    for (;d <= s; d++) u.push(l[d]);
+    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.je;
+    const a = t.Kt;
+    const l = t.xt;
+    const u = t.wt;
+    const d = i - u;
+    let p, w;
+    if (d > 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 (p = u - 1, w = i - 1; p > n; p--, w--) {
+            c[w] = c[p];
+            if (a) a[w] = a[p];
+            if (l) l[w] = l[p];
+        }
+    } else if (d < 0) {
+        for (p = n + 1, w = r + 1; p < u; p++, w++) {
+            c[w] = c[p];
+            if (a) a[w] = a[p];
+            if (l) l[w] = l[p];
+        }
+        c.length = i;
+        if (a) a.length = i;
+        if (l) l.length = i;
+    }
+    for (w = s; w <= r; w++) {
+        c[w] = o[w - s];
+        if (a) setSignal(a[w] = f[w - s], e[w]);
+        if (l) setSignal(l[w] = h[w - s], w);
+    }
+    for (w = r + 1; w < i; w++) {
+        if (a) setSignal(a[w], e[w]);
+        if (l && d !== 0) setSignal(l[w], w);
+    }
+}
+
 function updateKeyedMap() {
     // Untracked reads inside the internal owner resolve via _parentComputed:
     // routed through the node, a store-proxy lookup sees pending writes (not a
@@ -194,73 +267,80 @@ function updateKeyedMap() {
     // 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.gt = getOwner();
-    const t = this.Mt() || [], e = t.length;
+    this.H.Ht = getOwner();
+    const t = this.yt() || [], e = t.length;
     t[$TRACK];
  // top level tracking (a store array's container node)
         runWithOwner(this.H, () => {
-        let s, i, r, n, 
+        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`.
-        o = this.Jt ? this.Yt ? () => {
-            r[i] = signal(t[i], pureOptions);
-            return this.qt(accessor(r[i]), i);
+        f = this.Kt ? this.Ut ? () => {
+            r[n] = signal(t[s], pureOptions);
+            return this.Wt(accessor(r[n]), s);
         } : () => {
-            r[i] = signal(t[i], pureOptions);
-            n && (n[i] = signal(i, pureOptions));
-            return this.qt(accessor(r[i]), n ? accessor(n[i]) : undefined);
-        } : this.Xt ? () => {
-            const e = t[i];
-            n[i] = signal(i, pureOptions);
-            return this.qt(e, accessor(n[i]));
+            r[n] = signal(t[s], pureOptions);
+            o && (o[n] = signal(s, pureOptions));
+            return this.Wt(accessor(r[n]), o ? accessor(o[n]) : undefined);
+        } : this.xt ? () => {
+            const e = t[s];
+            o[n] = signal(s, pureOptions);
+            return this.Wt(e, accessor(o[n]));
         } : () => {
-            const e = t[i];
-            return this.qt(e);
+            const e = t[s];
+            return this.Wt(e);
         };
         // fast path for empty arrays
                 if (e === 0) {
             if (this.wt !== 0) {
                 this.H.dispose(false);
-                this.nn = [];
-                this.$t = [];
-                this.zt = [];
+                this.je = [];
+                this.Mt = [];
+                this.vt = [];
                 this.wt = 0;
-                this.Jt && (this.Jt = []);
-                this.Xt && (this.Xt = []);
+                this.Kt && (this.Kt = []);
+                this.xt && (this.xt = []);
             }
-            if (this.P && !this.zt[0]) {
+            if (this.L && !this.vt[0]) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.nn[0]?.dispose();
-                this.zt[0] = runWithOwner(this.nn[0] = createOwner(), this.P);
+                this.je[0]?.dispose();
+                this.vt[0] = runWithOwner(this.je[0] = createOwner(), this.L);
             }
         }
         // fast path for new create
          else if (this.wt === 0) {
             const h = new Array(e);
-            const f = new Array(e);
-            r = this.Jt && new Array(e);
-            n = this.Xt && new Array(e);
+            const c = new Array(e);
+            r = this.Kt && new Array(e);
+            o = this.xt && new Array(e);
             try {
-                for (i = 0; i < e; i++) h[i] = runWithOwner(f[i] = createOwner(), o);
+                for (s = 0; s < e; s++) {
+                    n = s;
+                    h[s] = runWithOwner(c[s] = createOwner(), f);
+                }
             } catch (t) {
-                for (s = 0; s <= i; s++) f[s]?.dispose();
+                for (i = 0; i <= s; i++) c[i]?.dispose();
                 throw t;
             }
             // commit
-                        if (this.nn[0]) this.nn[0].dispose();
+                        if (this.je[0]) this.je[0].dispose();
  // previous fallback
-                        this.zt = h;
-            this.nn = f;
-            r && (this.Jt = r);
-            n && (this.Xt = n);
-            this.$t = t.slice(0);
+                        this.vt = h;
+            this.je = c;
+            r && (this.Kt = r);
+            o && (this.xt = o);
+            this.Mt = t.slice(0);
             this.wt = e;
         } else {
-            let h, f, c, a, u, l, d, p, w, 
+            let h, c, a, l, u, d, p, w, m, 
             // Dev (attribution engine installed): the items behind the exited and
             // entered rows, for the list-identity census.
-            m, O;
+            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
@@ -282,20 +362,20 @@ function updateKeyedMap() {
             // 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 _ = setSignal;
+                        const y = setSignal;
             // skip common prefix
-                        for (h = 0, f = Math.min(this.wt, e); h < f && (this.$t[h] === t[h] || this.Jt && compare(this.bt, this.$t[h], t[h])); h++) {
-                if (this.Jt) _(this.Jt[h], t[h]);
+                        for (h = 0, c = Math.min(this.wt, e); h < c && (this.Mt[h] === t[h] || this.Kt && compare(this.Vt, this.Mt[h], t[h])); h++) {
+                if (this.Kt) y(this.Kt[h], t[h]);
             }
             // skip common suffix — counted only; retained entries land in one pass
             // at commit instead of being staged and copied twice
-                        for (f = this.wt - 1, c = e - 1; f >= h && c >= h && (this.$t[f] === t[c] || this.Jt && compare(this.bt, this.$t[f], t[c])); f--, 
-            c--) ;
+                        for (c = this.wt - 1, a = e - 1; c >= h && a >= h && (this.Mt[c] === t[a] || this.Kt && compare(this.Vt, this.Mt[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 (h === e && this.wt === e) {
-                this.$t = t.slice(0);
+                this.Mt = t.slice(0);
                 return;
             }
             // SMALL-MOVE FAST PATH: extracted to its own function — inlining it
@@ -305,103 +385,108 @@ function updateKeyedMap() {
             // (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.wt && f - h > 64 && this.Jt === undefined && this.Xt === undefined) {
+                        if (e <= this.wt && c - h > 64 && this.Kt === undefined && this.xt === 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 s = h + (c - h >> 1);
-                const i = t[s];
-                const r = Math.min(f, s + 32);
-                let n = Math.max(h, s - 32);
-                while (n <= r && this.$t[n] !== i) n++;
-                if (n <= r && trySmallMove(this, t, e, h)) return;
-            }
-            const y = e - this.wt;
-            const A = new Array(e);
-            const M = new Array(e);
-            r = this.Jt ? new Array(e) : undefined;
-            n = this.Xt ? new Array(e) : undefined;
-            // 0) prepare a map of all indices in the changed window of newItems,
-            // scanning backwards so we encounter them in natural order
-                        l = new Map;
-            d = new Array(c + 1);
-            for (i = c; i >= h; i--) {
-                a = t[i];
-                u = this.bt ? this.bt(a) : a;
-                s = l.get(u);
-                d[i] = s === undefined ? -1 : s;
-                l.set(u, i);
-            }
-            // 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 (s = h; s <= f; s++) {
-                a = this.$t[s];
-                u = this.bt ? this.bt(a) : a;
-                i = l.get(u);
-                if (i !== undefined && i !== -1) {
-                    A[i] = this.zt[s];
-                    M[i] = this.nn[s];
-                    r && (r[i] = this.Jt[s]);
-                    n && (n[i] = this.Xt[s]);
-                    i = d[i];
-                    l.set(u, i);
-                } else {
-                    (p ??= []).push(this.nn[s]);
-                    if (true && attrHooks !== null) (m ??= []).push(a);
-                }
+                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.Mt[r] !== s) r++;
+                if (r <= n && trySmallMove(this, t, e, h)) return;
             }
-            // 2) create new rows into the temp arrays; an abort disposes only these
-                        try {
-                for (i = h; i <= c; i++) {
-                    if (M[i] !== undefined) continue;
-                    (w ??= []).push(M[i] = createOwner());
-                    if (true && attrHooks !== null) (O ??= []).push(t[i]);
-                    A[i] = runWithOwner(M[i], o);
+            const g = e - this.wt;
+            // 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 A = a - h + 1;
+            const S = new Array(e);
+            const M = new Array(A);
+            r = this.Kt ? new Array(A) : undefined;
+            o = this.xt ? new Array(A) : 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 = g < 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) w = k;
+            } else {
+                // 0) prepare a map of all indices in the changed window of newItems,
+                // scanning backwards so we encounter them in natural order
+                d = new Map;
+                p = new Array(A);
+                for (s = a; s >= h; s--) {
+                    l = t[s];
+                    u = this.Vt ? this.Vt(l) : l;
+                    i = d.get(u);
+                    p[s - h] = i === undefined ? -1 : i;
+                    d.set(u, s);
                 }
-            } catch (t) {
-                if (w) for (s = 0; s < w.length; s++) w[s].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 (s = 0; s < h; s++) {
-                A[s] = this.zt[s];
-                M[s] = this.nn[s];
-                r && (r[s] = this.Jt[s]);
-                n && (n[s] = this.Xt[s]);
-            }
-            for (i = h; i <= c; i++) {
-                if (r) _(r[i], t[i]);
-                if (n) _(n[i], i);
-            }
-            for (i = c + 1; i < e; i++) {
-                A[i] = this.zt[i - y];
-                M[i] = this.nn[i - y];
-                if (r) {
-                    r[i] = this.Jt[i - y];
-                    _(r[i], t[i]);
+                // 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.Mt[i];
+                    u = this.Vt ? this.Vt(l) : l;
+                    s = d.get(u);
+                    if (s !== undefined && s !== -1) {
+                        S[s] = this.vt[i];
+                        M[s - h] = this.je[i];
+                        r && (r[s - h] = this.Kt[i]);
+                        o && (o[s - h] = this.xt[i]);
+                        s = p[s - h];
+                        d.set(u, s);
+                    } else {
+                        (w ??= []).push(this.je[i]);
+                        if (true && attrHooks !== null) (O ??= []).push(l);
+                    }
                 }
-                if (n) {
-                    n[i] = this.Xt[i - y];
-                    if (y !== 0) _(n[i], i);
+                // 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 (true && attrHooks !== null) (_ ??= []).push(t[s]);
+                        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.zt = A;
-            this.nn = M;
-            r && (this.Jt = r);
-            n && (this.Xt = n);
+            // 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.vt[i];
+            for (s = a + 1; s < e; s++) S[s] = this.vt[s - g];
+            commitWindow(this, t, e, h, c, a, M, r, o);
+            this.vt = S;
             this.wt = e;
             // save a copy of the mapped items for the next update
-                        this.$t = t.slice(0);
-            if (p) for (s = 0; s < p.length; s++) p[s].dispose();
-            if (true && attrHooks !== null && m !== undefined && O !== undefined) attrHooks.listChurn(this.H.gt, m, O, e, this.bt !== undefined);
+                        this.Mt = t.slice(0);
+            if (w) for (i = 0; i < w.length; i++) w[i].dispose();
+            if (true && attrHooks !== null && O !== undefined && _ !== undefined) attrHooks.listChurn(this.H.Ht, O, _, e, this.Vt !== undefined);
         }
     });
-    return this.zt;
+    return this.vt;
 }
 
 /**
@@ -417,23 +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, e, s) {
-    const i = e;
-    const r = {
+ * @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(),
         wt: 0,
-        ts: 0,
-        es: t,
-        qt: i,
-        nn: [],
-        zt: [],
-        ss: s?.from,
-        P: s?.fallback
+        $t: 0,
+        qt: t,
+        Wt: s,
+        je: [],
+        vt: [],
+        zt: i?.from,
+        L: i?.fallback
     };
-    const n = computed(updateRepeat.bind(r));
-    n.u &= ~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
@@ -445,60 +530,60 @@ function updateKeyedMap() {
 // disjoint-window/front-clear/end-clear/shift special cases.
 function updateRepeat() {
     // As in updateKeyedMap: the node is the row callbacks' reader, per pass.
-    this.H.gt = getOwner();
-    const t = this.es();
-    const e = this.ss?.() || 0;
+    this.H.Ht = getOwner();
+    const t = this.qt();
+    const e = this.zt?.() || 0;
     runWithOwner(this.H, () => {
         if (t === 0) {
             if (this.wt !== 0) {
                 this.H.dispose(false);
-                this.nn = [];
-                this.zt = [];
+                this.je = [];
+                this.vt = [];
                 this.wt = 0;
                 // Reset offset to match the cleared data (#2767, repro 2).
-                                this.ts = 0;
+                                this.$t = 0;
             }
-            if (this.P && !this.zt[0]) {
+            if (this.L && !this.vt[0]) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.nn[0]?.dispose();
-                this.zt[0] = runWithOwner(this.nn[0] = createOwner(), this.P);
+                this.je[0]?.dispose();
+                this.vt[0] = runWithOwner(this.je[0] = createOwner(), this.L);
             }
             return;
         }
-        const s = e + t;
-        const i = this.ts + this.wt;
+        const i = e + t;
+        const s = this.$t + this.wt;
         // Retained overlap [keepStart, keepEnd) in global indexes; empty when the
         // windows are disjoint or when coming from empty/fallback.
-                const r = Math.max(e, this.ts);
-        const n = Math.min(s, i);
+                const n = Math.max(e, this.$t);
+        const r = Math.min(i, s);
         const o = new Array(t);
-        const h = new Array(t);
-        for (let t = r; t < n; t++) {
-            h[t - e] = this.nn[t - this.ts];
-            o[t - e] = this.zt[t - this.ts];
+        const f = new Array(t);
+        for (let t = n; t < r; t++) {
+            f[t - e] = this.je[t - this.$t];
+            o[t - e] = this.vt[t - this.$t];
         }
         try {
-            for (let t = e; t < s; t++) {
-                if (t >= r && t < n) continue;
-                o[t - e] = runWithOwner(h[t - e] = createOwner(), () => this.qt(t));
+            for (let t = e; t < i; t++) {
+                if (t >= n && t < r) continue;
+                o[t - e] = runWithOwner(f[t - e] = createOwner(), () => this.Wt(t));
             }
         } catch (t) {
-            for (let t = e; t < s; t++) if ((t < r || t >= n) && h[t - e]) h[t - e].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.nn[0]?.dispose(); else for (let t = this.ts; t < i; t++) if (t < e || t >= s) this.nn[t - this.ts].dispose();
-        this.zt = o;
-        this.nn = h;
-        this.ts = e;
+                if (this.wt === 0) this.je[0]?.dispose(); else for (let t = this.$t; t < s; t++) if (t < e || t >= i) this.je[t - this.$t].dispose();
+        this.vt = o;
+        this.je = f;
+        this.$t = e;
         this.wt = t;
     });
-    return this.zt;
+    return this.vt;
 }
 
-function compare(t, e, s) {
-    return t ? t(e) === t(s) : true;
+function compare(t, e, i) {
+    return t ? t(e) === t(i) : true;
 }
 
 export { mapArray, repeat };