@solidjs/signals 2.0.0-rc.10 → 2.0.0-rc.13

package/dist/observe/map.js

@@ -1,8 +1,10 @@
-import { computed, runWithOwner, signal, setSignal } from "./core/core.js";
+import { computed, runWithOwner, signal, currentOptimisticLane, setSignal } from "./core/core.js";
+
+import { activeLanes } from "./core/lanes.js";
 
 import { createOwner } from "./core/owner.js";
 
-import "./core/scheduler.js";
+import { GlobalQueue } from "./core/scheduler.js";
 
 import { CONFIG_AUTO_DISPOSE } from "./core/constants.js";
 
@@ -22,26 +24,26 @@ import { $TRACK } from "./store/store.js";
 
 import "./store/next/store.js";
 
-function mapArray(t, s, e) {
-    const i = typeof e?.keyed === "function" ? e.keyed : undefined;
-    const r = s.length > 1;
-    const n = s;
+function mapArray(t, e, i) {
+    const s = typeof i?.keyed === "function" ? i.keyed : undefined;
+    const r = e.length > 1;
+    const n = e;
     const o = {
         ie: createOwner(),
-        ts: 0,
-        ss: t,
-        es: [],
-        rs: n,
-        ns: [],
-        hs: [],
-        zt: i,
-        fs: i || e?.keyed === false ? [] : undefined,
-        cs: r && e?.keyed !== false ? [] : undefined,
-        us: e?.keyed === false,
-        ls: e?.fallback
+        oi: 0,
+        hi: t,
+        fi: [],
+        ci: n,
+        ai: [],
+        ui: [],
+        zt: s,
+        li: s || i?.keyed === false ? [] : undefined,
+        pi: r && i?.keyed !== false ? [] : undefined,
+        di: i?.keyed === false,
+        mi: i?.fallback
     };
-    const h = computed(updateKeyedMap.bind(o), e?.name ? {
-        name: e.name
+    const h = computed(updateKeyedMap.bind(o), i?.name ? {
+        name: i.name
     } : undefined);
     // Untracked reads inside the internal owner resolve via _parentComputed; routing
     // them through node lets store-proxy lookups see pending writes (not stale _value).
@@ -54,21 +56,21 @@ const pureOptions = {
     ownedWrite: true
 };
 
-function trySmallMove(t, s, e, i) {
-    const r = t.es;
-    const n = t.ts - 1;
+function trySmallMove(t, e, i, s) {
+    const r = t.fi;
+    const n = t.oi - 1;
     const o = [];
     const h = [];
     const f = [];
  // flat triples: oldStart, newStart, length
         let c = 256;
-    let a = i;
-    let u = i;
+    let a = s;
+    let u = s;
     let l = false;
-    while (a <= n && u <= e - 1) {
+    while (a <= n && u <= i - 1) {
         const t = r[a];
-        const i = s[u];
-        if (t === i) {
+        const s = e[u];
+        if (t === s) {
             if (!l) {
                 f.push(a, u, 0);
                 l = true;
@@ -80,30 +82,30 @@ function trySmallMove(t, s, e, i) {
         }
         l = false;
         // Bounded realignment lookahead, shorter distance wins.
-                let d = -1;
-        let p = Math.min(32 - o.length, n - a, c);
-        for (let t = 1; t <= p; t++) {
-            if (r[a + t] === i) {
-                d = t;
+                let p = -1;
+        let d = Math.min(32 - o.length, n - a, c);
+        for (let t = 1; t <= d; t++) {
+            if (r[a + t] === s) {
+                p = t;
                 break;
             }
         }
-        c -= d === -1 ? p : d;
-        let w = -1;
-        p = Math.min(32 - h.length, e - 1 - u, c);
-        for (let e = 1; e <= p; e++) {
-            if (s[u + e] === t) {
-                w = e;
+        c -= p === -1 ? d : p;
+        let m = -1;
+        d = Math.min(32 - h.length, i - 1 - u, c);
+        for (let i = 1; i <= d; i++) {
+            if (e[u + i] === t) {
+                m = i;
                 break;
             }
         }
-        c -= w === -1 ? p : w;
-        if (d !== -1 && (w === -1 || d <= w)) {
-            while (d-- > 0) o.push(a++);
+        c -= m === -1 ? d : m;
+        if (p !== -1 && (m === -1 || p <= m)) {
+            while (p-- > 0) o.push(a++);
             continue;
         }
-        if (w !== -1) {
-            while (w-- > 0) h.push(u++);
+        if (m !== -1) {
+            while (m-- > 0) h.push(u++);
             continue;
         }
         if (c <= 0 || o.length === 32 || h.length === 32) return false;
@@ -114,11 +116,11 @@ function trySmallMove(t, s, e, i) {
         if (o.length === 32) return false;
         o.push(a);
     }
-    for (;u <= e - 1; u++) {
+    for (;u <= i - 1; u++) {
         if (h.length === 32) return false;
         h.push(u);
     }
-    return commitSmallMove(t, s, e, o, h, f);
+    return commitSmallMove(t, e, i, o, h, f);
 }
 
 /** PHASE 2 of the small-move path, in its OWN function so that a pass which
@@ -127,17 +129,17 @@ function trySmallMove(t, s, e, 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, s, e, i, r, n) {
-    const o = t.es;
+ * arrays, copy shifted runs, patch displaced pairs, dispose leftovers. */ function commitSmallMove(t, e, i, s, r, n) {
+    const o = t.fi;
     let h;
     let f;
     let c;
     if (r.length !== 0) {
-        c = new Array(i.length);
+        c = new Array(s.length);
         for (f = 0; f < r.length; f++) {
             let t = -1;
-            for (h = 0; h < i.length; h++) {
-                if (!c[h] && o[i[h]] === s[r[f]]) {
+            for (h = 0; h < s.length; h++) {
+                if (!c[h] && o[s[h]] === e[r[f]]) {
                     t = h;
                     break;
                 }
@@ -154,126 +156,147 @@ function trySmallMove(t, s, e, 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 || r.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(s[r[f] >> 6]);
-        for (let s = 0; s < n.length; s += 3) {
-            const e = n[s];
-            for (let i = 0, r = n[s + 2]; i < r; i++) if (t.has(o[e + i])) return false;
+        for (h = 0; h < s.length; h++) t.add(o[s[h]]);
+        for (f = 0; f < r.length; f++) t.add(e[r[f] >> 6]);
+        for (let e = 0; e < n.length; e += 3) {
+            const i = n[e];
+            for (let s = 0, r = n[e + 2]; s < r; s++) if (t.has(o[i + s])) return false;
         }
     }
-    const a = t.ns;
-    const u = t.hs;
-    const l = a.slice(0, e);
-    const d = u.slice(0, e);
+    const a = t.ai;
+    const u = t.ui;
+    const l = a.slice(0, i);
+    const p = u.slice(0, i);
     for (let t = 0; t < n.length; t += 3) {
-        const s = n[t];
-        const e = n[t + 1];
-        if (s !== e) {
-            for (let i = 0; i < n[t + 2]; i++) {
-                l[e + i] = a[s + i];
-                d[e + i] = u[s + i];
+        const e = n[t];
+        const i = n[t + 1];
+        if (e !== i) {
+            for (let s = 0; s < n[t + 2]; s++) {
+                l[i + s] = a[e + s];
+                p[i + s] = u[e + s];
             }
         }
     }
     for (f = 0; f < r.length; f++) {
         const t = r[f] >> 6;
-        const s = i[r[f] & 63];
-        l[t] = a[s];
-        d[t] = u[s];
+        const e = s[r[f] & 63];
+        l[t] = a[e];
+        p[t] = u[e];
     }
-    t.ns = l;
-    t.hs = d;
-    t.ts = e;
-    t.es = s.slice(0);
+    t.ai = l;
+    t.ui = p;
+    t.oi = i;
+    t.fi = 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 (h = 0; h < s.length; h++) {
+        if (c === undefined || !c[h]) u[s[h]].dispose();
     }
     return true;
 }
 
 function updateKeyedMap() {
-    const t = this.ss() || [], s = t.length;
+    const t = this.hi() || [], e = t.length;
     t[$TRACK];
  // top level tracking
         runWithOwner(this.ie, () => {
-        let e, i, r, n, 
+        let i, s, r, n, 
         // Mappers write freshly-created row/index signals into the STAGE
         // arrays (`rows`/`indexes`), never into `this._rows`/`this._indexes`.
-        o = this.fs ? this.us ? () => {
-            r[i] = signal(t[i], pureOptions);
-            return this.rs(accessor(r[i]), i);
+        o = this.li ? this.di ? () => {
+            r[s] = signal(t[s], pureOptions);
+            return this.ci(accessor(r[s]), s);
         } : () => {
-            r[i] = signal(t[i], pureOptions);
-            n && (n[i] = signal(i, pureOptions));
-            return this.rs(accessor(r[i]), n ? accessor(n[i]) : undefined);
-        } : this.cs ? () => {
-            const s = t[i];
-            n[i] = signal(i, pureOptions);
-            return this.rs(s, accessor(n[i]));
+            r[s] = signal(t[s], pureOptions);
+            n && (n[s] = signal(s, pureOptions));
+            return this.ci(accessor(r[s]), n ? accessor(n[s]) : undefined);
+        } : this.pi ? () => {
+            const e = t[s];
+            n[s] = signal(s, pureOptions);
+            return this.ci(e, accessor(n[s]));
         } : () => {
-            const s = t[i];
-            return this.rs(s);
+            const e = t[s];
+            return this.ci(e);
         };
         // fast path for empty arrays
-                if (s === 0) {
-            if (this.ts !== 0) {
+                if (e === 0) {
+            if (this.oi !== 0) {
                 this.ie.dispose(false);
-                this.hs = [];
-                this.es = [];
-                this.ns = [];
-                this.ts = 0;
-                this.fs && (this.fs = []);
-                this.cs && (this.cs = []);
+                this.ui = [];
+                this.fi = [];
+                this.ai = [];
+                this.oi = 0;
+                this.li && (this.li = []);
+                this.pi && (this.pi = []);
             }
-            if (this.ls && !this.ns[0]) {
+            if (this.mi && !this.ai[0]) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.hs[0]?.dispose();
-                this.ns[0] = runWithOwner(this.hs[0] = createOwner(), this.ls);
+                this.ui[0]?.dispose();
+                this.ai[0] = runWithOwner(this.ui[0] = createOwner(), this.mi);
             }
         }
         // fast path for new create
-         else if (this.ts === 0) {
-            const h = new Array(s);
-            const f = new Array(s);
-            r = this.fs && new Array(s);
-            n = this.cs && new Array(s);
+         else if (this.oi === 0) {
+            const h = new Array(e);
+            const f = new Array(e);
+            r = this.li && new Array(e);
+            n = this.pi && new Array(e);
             try {
-                for (i = 0; i < s; i++) h[i] = runWithOwner(f[i] = createOwner(), o);
+                for (s = 0; s < e; s++) h[s] = runWithOwner(f[s] = createOwner(), o);
             } catch (t) {
-                for (e = 0; e <= i; e++) f[e]?.dispose();
+                for (i = 0; i <= s; i++) f[i]?.dispose();
                 throw t;
             }
             // commit
-                        if (this.hs[0]) this.hs[0].dispose();
+                        if (this.ui[0]) this.ui[0].dispose();
  // previous fallback
-                        this.ns = h;
-            this.hs = f;
-            r && (this.fs = r);
-            n && (this.cs = n);
-            this.es = t.slice(0);
-            this.ts = s;
+                        this.ai = h;
+            this.ui = f;
+            r && (this.li = r);
+            n && (this.pi = n);
+            this.fi = t.slice(0);
+            this.oi = e;
         } else {
-            let h, f, c, a, u, l, d, p, w, 
+            let h, f, c, a, u, l, p, d, m, 
             // Dev (attribution engine installed): the items behind the exited and
             // entered rows, for the list-identity census.
-            m, O;
+            w, 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.
+                        const _ = (this.wi = currentOptimisticLane !== null || this.wi && activeLanes.size !== 0) ? GlobalQueue.Vn : setSignal;
             // skip common prefix
-                        for (h = 0, f = Math.min(this.ts, s); h < f && (this.es[h] === t[h] || this.fs && compare(this.zt, this.es[h], t[h])); h++) {
-                if (this.fs) setSignal(this.fs[h], t[h]);
+                        for (h = 0, f = Math.min(this.oi, e); h < f && (this.fi[h] === t[h] || this.li && compare(this.zt, this.fi[h], t[h])); h++) {
+                if (this.li) _(this.li[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.ts - 1, c = s - 1; f >= h && c >= h && (this.es[f] === t[c] || this.fs && compare(this.zt, this.es[f], t[c])); f--, 
+                        for (f = this.oi - 1, c = e - 1; f >= h && c >= h && (this.fi[f] === t[c] || this.li && compare(this.zt, this.fi[f], t[c])); f--, 
             c--) ;
             // 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 === s && this.ts === s) {
-                this.es = t.slice(0);
+                        if (h === e && this.oi === e) {
+                this.fi = t.slice(0);
                 return;
             }
             // SMALL-MOVE FAST PATH: extracted to its own function — inlining it
@@ -283,103 +306,103 @@ 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 (s <= this.ts && f - h > 64 && this.fs === undefined && this.cs === undefined) {
+                        if (e <= this.oi && f - h > 64 && this.li === undefined && this.pi === 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 e = h + (c - h >> 1);
-                const i = t[e];
-                const r = Math.min(f, e + 32);
-                let n = Math.max(h, e - 32);
-                while (n <= r && this.es[n] !== i) n++;
-                if (n <= r && trySmallMove(this, t, s, h)) return;
+                const i = h + (c - h >> 1);
+                const s = t[i];
+                const r = Math.min(f, i + 32);
+                let n = Math.max(h, i - 32);
+                while (n <= r && this.fi[n] !== s) n++;
+                if (n <= r && trySmallMove(this, t, e, h)) return;
             }
-            const _ = s - this.ts;
-            const y = new Array(s);
-            const A = new Array(s);
-            r = this.fs ? new Array(s) : undefined;
-            n = this.cs ? new Array(s) : undefined;
+            const y = e - this.oi;
+            const A = new Array(e);
+            const M = new Array(e);
+            r = this.li ? new Array(e) : undefined;
+            n = this.pi ? 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];
+            p = new Array(c + 1);
+            for (s = c; s >= h; s--) {
+                a = t[s];
                 u = this.zt ? this.zt(a) : a;
-                e = l.get(u);
-                d[i] = e === undefined ? -1 : e;
-                l.set(u, i);
+                i = l.get(u);
+                p[s] = i === undefined ? -1 : i;
+                l.set(u, s);
             }
             // 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 (e = h; e <= f; e++) {
-                a = this.es[e];
+                        for (i = h; i <= f; i++) {
+                a = this.fi[i];
                 u = this.zt ? this.zt(a) : a;
-                i = l.get(u);
-                if (i !== undefined && i !== -1) {
-                    y[i] = this.ns[e];
-                    A[i] = this.hs[e];
-                    r && (r[i] = this.fs[e]);
-                    n && (n[i] = this.cs[e]);
-                    i = d[i];
-                    l.set(u, i);
+                s = l.get(u);
+                if (s !== undefined && s !== -1) {
+                    A[s] = this.ai[i];
+                    M[s] = this.ui[i];
+                    r && (r[s] = this.li[i]);
+                    n && (n[s] = this.pi[i]);
+                    s = p[s];
+                    l.set(u, s);
                 } else {
-                    (p ??= []).push(this.hs[e]);
-                    if (true && attrHooks !== null) (m ??= []).push(a);
+                    (d ??= []).push(this.ui[i]);
+                    if (true && attrHooks !== null) (w ??= []).push(a);
                 }
             }
             // 2) create new rows into the temp arrays; an abort disposes only these
                         try {
-                for (i = h; i <= c; i++) {
-                    if (A[i] !== undefined) continue;
-                    (w ??= []).push(A[i] = createOwner());
-                    if (true && attrHooks !== null) (O ??= []).push(t[i]);
-                    y[i] = runWithOwner(A[i], o);
+                for (s = h; s <= c; s++) {
+                    if (M[s] !== undefined) continue;
+                    (m ??= []).push(M[s] = createOwner());
+                    if (true && attrHooks !== null) (O ??= []).push(t[s]);
+                    A[s] = runWithOwner(M[s], o);
                 }
             } catch (t) {
-                if (w) for (e = 0; e < w.length; e++) w[e].dispose();
+                if (m) for (i = 0; i < m.length; i++) m[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 (e = 0; e < h; e++) {
-                y[e] = this.ns[e];
-                A[e] = this.hs[e];
-                r && (r[e] = this.fs[e]);
-                n && (n[e] = this.cs[e]);
+                        for (i = 0; i < h; i++) {
+                A[i] = this.ai[i];
+                M[i] = this.ui[i];
+                r && (r[i] = this.li[i]);
+                n && (n[i] = this.pi[i]);
             }
-            for (i = h; i <= c; i++) {
-                if (r) setSignal(r[i], t[i]);
-                if (n) setSignal(n[i], i);
+            for (s = h; s <= c; s++) {
+                if (r) _(r[s], t[s]);
+                if (n) _(n[s], s);
             }
-            for (i = c + 1; i < s; i++) {
-                y[i] = this.ns[i - _];
-                A[i] = this.hs[i - _];
+            for (s = c + 1; s < e; s++) {
+                A[s] = this.ai[s - y];
+                M[s] = this.ui[s - y];
                 if (r) {
-                    r[i] = this.fs[i - _];
-                    setSignal(r[i], t[i]);
+                    r[s] = this.li[s - y];
+                    _(r[s], t[s]);
                 }
                 if (n) {
-                    n[i] = this.cs[i - _];
-                    if (_ !== 0) setSignal(n[i], i);
+                    n[s] = this.pi[s - y];
+                    if (y !== 0) _(n[s], s);
                 }
             }
-            this.ns = y;
-            this.hs = A;
-            r && (this.fs = r);
-            n && (this.cs = n);
-            this.ts = s;
+            this.ai = A;
+            this.ui = M;
+            r && (this.li = r);
+            n && (this.pi = n);
+            this.oi = e;
             // save a copy of the mapped items for the next update
-                        this.es = t.slice(0);
-            if (p) for (e = 0; e < p.length; e++) p[e].dispose();
-            if (true && attrHooks !== null && m !== undefined && O !== undefined) attrHooks.listChurn(this.ie.Yt, m, O, s, this.zt !== undefined);
+                        this.fi = t.slice(0);
+            if (d) for (i = 0; i < d.length; i++) d[i].dispose();
+            if (true && attrHooks !== null && w !== undefined && O !== undefined) attrHooks.listChurn(this.ie.Yt, w, O, e, this.zt !== undefined);
         }
     });
-    return this.ns;
+    return this.ai;
 }
 
 /**
@@ -396,18 +419,18 @@ function updateKeyedMap() {
  * ```
  *
  * @description https://docs.solidjs.com/reference/reactive-utilities/repeat
- */ function repeat(t, s, e) {
-    const i = s;
+ */ function repeat(t, e, i) {
+    const s = e;
     const r = {
         ie: createOwner(),
-        ts: 0,
-        ds: 0,
-        ps: t,
-        rs: i,
-        hs: [],
-        ns: [],
-        ws: e?.from,
-        ls: e?.fallback
+        oi: 0,
+        Oi: 0,
+        _i: t,
+        ci: s,
+        ui: [],
+        ai: [],
+        yi: i?.from,
+        mi: i?.fallback
     };
     const n = computed(updateRepeat.bind(r));
     // Same as mapArray: untracked reads inside the internal owner resolve via
@@ -426,59 +449,59 @@ 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.ps();
-    const s = this.ws?.() || 0;
+    const t = this._i();
+    const e = this.yi?.() || 0;
     runWithOwner(this.ie, () => {
         if (t === 0) {
-            if (this.ts !== 0) {
+            if (this.oi !== 0) {
                 this.ie.dispose(false);
-                this.hs = [];
-                this.ns = [];
-                this.ts = 0;
+                this.ui = [];
+                this.ai = [];
+                this.oi = 0;
                 // Reset offset to match the cleared data (#2767, repro 2).
-                                this.ds = 0;
+                                this.Oi = 0;
             }
-            if (this.ls && !this.ns[0]) {
+            if (this.mi && !this.ai[0]) {
                 // an aborted fallback attempt leaves an owner without a mapping;
                 // dispose it before re-creating
-                this.hs[0]?.dispose();
-                this.ns[0] = runWithOwner(this.hs[0] = createOwner(), this.ls);
+                this.ui[0]?.dispose();
+                this.ai[0] = runWithOwner(this.ui[0] = createOwner(), this.mi);
             }
             return;
         }
-        const e = s + t;
-        const i = this.ds + this.ts;
+        const i = e + t;
+        const s = this.Oi + this.oi;
         // 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.ds);
-        const n = Math.min(e, i);
+                const r = Math.max(e, this.Oi);
+        const n = Math.min(i, s);
         const o = new Array(t);
         const h = new Array(t);
         for (let t = r; t < n; t++) {
-            h[t - s] = this.hs[t - this.ds];
-            o[t - s] = this.ns[t - this.ds];
+            h[t - e] = this.ui[t - this.Oi];
+            o[t - e] = this.ai[t - this.Oi];
         }
         try {
-            for (let t = s; t < e; t++) {
+            for (let t = e; t < i; t++) {
                 if (t >= r && t < n) continue;
-                o[t - s] = runWithOwner(h[t - s] = createOwner(), () => this.rs(t));
+                o[t - e] = runWithOwner(h[t - e] = createOwner(), () => this.ci(t));
             }
         } catch (t) {
-            for (let t = s; t < e; t++) if ((t < r || t >= n) && h[t - s]) h[t - s].dispose();
+            for (let t = e; t < i; t++) if ((t < r || t >= n) && h[t - e]) h[t - e].dispose();
             throw t;
         }
         // commit: dispose the previous fallback or the rows leaving the window
-                if (this.ts === 0) this.hs[0]?.dispose(); else for (let t = this.ds; t < i; t++) if (t < s || t >= e) this.hs[t - this.ds].dispose();
-        this.ns = o;
-        this.hs = h;
-        this.ds = s;
-        this.ts = t;
+                if (this.oi === 0) this.ui[0]?.dispose(); else for (let t = this.Oi; t < s; t++) if (t < e || t >= i) this.ui[t - this.Oi].dispose();
+        this.ai = o;
+        this.ui = h;
+        this.Oi = e;
+        this.oi = t;
     });
-    return this.ns;
+    return this.ai;
 }
 
-function compare(t, s, e) {
-    return t ? t(s) === t(e) : true;
+function compare(t, e, i) {
+    return t ? t(e) === t(i) : true;
 }
 
 export { mapArray, repeat };