@sheetxl/sdk 0.8.0-beta.16 → 0.8.0-beta.18

package/browser/esm/{BqT-ASHP0NVSUUnY.mjs → n4LOSiYtWTzqQa4w.mjs}

@@ -1,16 +1,16 @@
 /**
-* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.16
+* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.18
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { n as e, u as t } from "./D807piM0VSokWz-L.mjs";
-import { $ as n, $a as r, $i as i, Ba as a, Ca as o, Ct as s, Di as c, Ea as l, Fa as u, G as d, Ga as f, Gi as p, H as m, Ha as h, Ia as g, J as _, Ja as v, Ji as y, Jr as b, K as x, Ka as S, Ki as C, Kr as w, Kt as T, La as E, Ma as D, Mt as O, N as k, Na as A, Nt as j, P as ee, Pa as M, Pr as N, Q as te, Qa as P, Qi as ne, Qn as re, Ra as ie, Rt as ae, St as oe, U as se, Ua as ce, V as le, Va as ue, W as de, Wa as fe, Wi as pe, X as me, Xa as F, Xi as he, Y as ge, Ya as _e, Z as ve, Za as ye, _i as be, _t as I, aa as xe, ao as Se, ar as Ce, at as we, bi as Te, bt as Ee, c as De, ca as Oe, ci as L, cr as R, ct as ke, d as Ae, dr as je, dt as Me, ea as Ne, ei as Pe, eo as Fe, et as Ie, fi as Le, fr as Re, ft as ze, g as Be, gt as Ve, h as He, ht as Ue, it as We, jt as z, l as Ge, la as Ke, li as qe, lr as Je, lt as Ye, m as Xe, mi as Ze, mt as Qe, n as $e, na as et, no as tt, nt, o as rt, oa as it, or as at, ot, pa as st, pi as B, pt as ct, q as lt, qa as ut, rt as dt, sa as ft, sr as pt, st as mt, t as ht, ta as gt, to as _t, tt as vt, u as V, ui as yt, ur as bt, ut as xt, vi as St, vt as Ct, wa as wt, xt as Tt, yi as Et, yt as Dt, za as Ot, zr as kt } from "./CkZoDPUCK5jMUaeJ.mjs";
-import { Mt as At, Nt as jt, Ot as Mt, Tt as Nt, kt as Pt, mt as Ft, zt as It } from "./CMChv-fCFh68VQQt.mjs";
-import { A as Lt, O as Rt, S as zt, _ as Bt, a as Vt, b as Ht, g as Ut, j as Wt, k as Gt, t as Kt } from "./BWY1qiidTUBVPJoD.mjs";
-import { n as qt } from "./9YWdxmSjzLN4j_ts.mjs";
-import { _ as Jt, a as Yt, c as Xt, d as Zt, f as Qt, g as $t, h as H, i as en, l as tn, m as nn, n as rn, o as an, p as on, s as sn, t as cn, u as ln } from "./WcHfawW2lkTHtWUd.mjs";
-import { a as un, i as dn, l as fn, n as pn, r as mn, s as hn } from "./4MbBwfmW2hDXk9_w.mjs";
+import { n as e, u as t } from "./BtVpErObXYKJCwHG.mjs";
+import { $ as n, $a as r, $i as i, $n as a, Ba as o, Br as s, Ct as c, Da as l, Fa as u, Fr as d, G as f, Ga as p, Gi as m, H as h, Ha as g, Ia as _, J as v, Ja as y, K as b, Ka as x, Ki as S, La as C, Mt as w, N as T, Na as E, Nt as D, Oi as O, P as k, Pa as A, Q as ee, Qa as te, Ra as ne, Rt as j, St as M, Ta as re, U as ie, Ua as ae, V as oe, Va as se, W as ce, Wa as le, X as ue, Xa as de, Y as fe, Ya as N, Yi as pe, Yr as me, Z as he, Za as P, Zi as ge, _t as _e, at as ve, bi as ye, bt as be, c as xe, ca as F, cr as Se, ct as I, d as Ce, di as we, dr as Te, dt as Ee, ea as De, eo as L, et as R, fr as Oe, ft as ke, g as Ae, gt as je, h as Me, hi as Ne, ht as Pe, it as Fe, jt as z, l as Ie, la as Le, li as Re, lr as ze, lt as Be, m as Ve, ma as He, mi as B, mt as Ue, n as We, na as Ge, no as Ke, nt as qe, o as Je, oa as Ye, oo as Xe, or as Ze, ot as Qe, pi as $e, pr as et, pt as tt, q as nt, qa as rt, qi as it, qr as at, qt as ot, ra as st, ro as ct, rt as lt, sa as ut, sr as dt, st as ft, t as pt, ta as mt, ti as ht, to as gt, tt as _t, u as V, ua as vt, ui as yt, ur as bt, ut as xt, vi as St, vt as Ct, wa as wt, xi as Tt, xt as Et, yi as Dt, yt as Ot, za as kt } from "./_lh_Rr5SwLthmbmu.mjs";
+import { Mt as At, Nt as jt, Ot as Mt, Tt as Nt, kt as Pt, mt as Ft, zt as It } from "./0Mw5Ew_7tAiWgc5J.mjs";
+import { A as Lt, O as Rt, S as zt, _ as Bt, a as Vt, b as Ht, g as Ut, j as Wt, k as Gt, t as Kt } from "./By7_c19Kv2YQaDVF.mjs";
+import { n as qt } from "./CXQLYHAhE5MLKxZ4.mjs";
+import { _ as Jt, a as Yt, c as Xt, d as Zt, f as Qt, g as $t, h as H, i as en, l as tn, m as nn, n as rn, o as an, p as on, s as sn, t as cn, u as ln } from "./DJuiV0Y8olnwuqB-.mjs";
+import { a as un, i as dn, l as fn, n as pn, r as mn, s as hn } from "./D2P43UD6TGSXErhr.mjs";
 import { FormulaContext as gn, FormulaError as U, IRange as W, ScalarType as _n, WildCard as vn, isLazyValue as yn } from "@sheetxl/primitives";
 import { CommonUtils as G, CoordUtils as K, OutOfBoundsError as bn, RangeAxis as xn, hashText as Sn, keyedRandom as Cn, messageKey as wn } from "@sheetxl/utils";
 var Tn = class e {
@@ -20,7 +20,7 @@ var Tn = class e {
 	_materialize() {
 		let e = this._grid;
 		if (!e) {
-			e = new u({
+			e = new _({
 				axis: this._axis,
 				maxCoords: this._maxCoords
 			});
@@ -76,17 +76,17 @@ var Tn = class e {
 		if (t) return t.entries(e);
 		if (e?.processRowSkip || e?.processColumnSkip) return this._materialize().entries(e);
 		let n = this._value;
-		if (n == null) return r;
-		let i = e?.bounds;
-		if (i && ((i.colStart ?? 0) > 0 || (i.rowStart ?? 0) > 0 || (i.colEnd ?? 0) < 0 || (i.rowEnd ?? 0) < 0)) return r;
-		let o = e?.axis ? e.axis === xn.Column : this._axis === xn.Column, s = e ? a(e.reuseResult) : void 0, c = this, l = !1, u = null;
+		if (n == null) return L;
+		let r = e?.bounds;
+		if (r && ((r.colStart ?? 0) > 0 || (r.rowStart ?? 0) > 0 || (r.colEnd ?? 0) < 0 || (r.rowEnd ?? 0) < 0)) return L;
+		let i = e?.axis ? e.axis === xn.Column : this._axis === xn.Column, a = e ? se(e.reuseResult) : void 0, o = this, s = !1, c = null;
 		return {
-			next: (t) => u ? u.next(t) : t ? (u = c._materialize().entries(e), u.next(t)) : l ? Fe : (l = !0, ie(0, 0, n, o, s)),
+			next: (t) => c ? c.next(t) : t ? (c = o._materialize().entries(e), c.next(t)) : s ? gt : (s = !0, kt(0, 0, n, i, a)),
 			[Symbol.iterator]() {
 				return this;
 			},
-			return: (e) => Fe,
-			throw: (e) => Fe
+			return: (e) => gt,
+			throw: (e) => gt
 		};
 	}
 	keys(e) {
@@ -238,7 +238,7 @@ var Tn = class e {
 	_getOrCreate2D(e) {
 		if (!e) throw Error(On);
 		let t = this._mapScopeTo2Ds.get(e);
-		return t || (t = new v(this._options2D), this._mapScopeTo2Ds.set(e, t), this._last2DKey = e, this._last2DMap = t), t;
+		return t || (t = new N(this._options2D), this._mapScopeTo2Ds.set(e, t), this._last2DKey = e, this._last2DMap = t), t;
 	}
 	_cleanupEmpty2D(e, t) {
 		t?.isEmpty() && (this._mapScopeTo2Ds.delete(e), this._last2DKey === e && (this._last2DKey = void 0, this._last2DMap = void 0));
@@ -257,7 +257,7 @@ var Tn = class e {
 		return n.isLambdaCallable = !0, n.checkArity = (n) => n >= t && n <= e.length, n.paramCount = e.length, n;
 	}
 	_function() {
-		return this._asFunction ??= R(this);
+		return this._asFunction ??= ze(this);
 	}
 	execute(...e) {
 		return this._function().execute(...e);
@@ -295,7 +295,7 @@ var Tn = class e {
 			try {
 				return e.execute(...t);
 			} catch (e) {
-				if (Re(e)) throw e;
+				if (et(e)) throw e;
 				return U.isError(e) ? e : new U.Value(e?.message, { cause: e });
 			}
 		};
@@ -336,17 +336,17 @@ var Tn = class e {
 		let a = i === "display", o = this._compiled;
 		if (o.error && !o.ast) return o.error.input;
 		let s = r === void 0 ? o.getTokens() : Ut(o.ast, r);
-		s = ct(s, o.symbols, !a, a, a ? {
+		s = tt(s, o.symbols, !a, a, a ? {
 			scope: this._gridId,
 			rowIndex: e,
 			colIndex: t
 		} : null);
-		let c = a ? this._displayLocale() : qe;
-		return n ? Ve(s, this._getEntireCoords?.(), c) : Qe(s, this._getEntireCoords?.(), e, t, c);
+		let c = a ? this._displayLocale() : yt;
+		return n ? je(s, this._getEntireCoords?.(), c) : Ue(s, this._getEntireCoords?.(), e, t, c);
 	}
 	_displayLocale() {
 		let e = this._context.getRuntime().getLocaleProfile();
-		return yt(Le(e.decimal));
+		return we($e(e.decimal));
 	}
 	getRecord() {
 		let e = this._record;
@@ -399,7 +399,7 @@ var Tn = class e {
 	}
 	getTokensAt(e, t, n) {
 		let r = this._compiled, i = n === void 0 ? r.getTokens() : Ut(r.ast, n);
-		return i = ct(i, r.symbols, !1, !0), Ue(i, e, t);
+		return i = tt(i, r.symbols, !1, !0), Pe(i, e, t);
 	}
 	getError() {
 		return this._compiled.error ?? null;
@@ -453,7 +453,7 @@ var Tn = class e {
 		let n = this._compiled.getTokens(), r = t._compiled.getTokens();
 		if (n.length !== r.length) return !1;
 		let i = this._context.getEntireCoords();
-		return Ve(n, i) === Ve(r, i);
+		return je(n, i) === je(r, i);
 	}
 	getReferences(e, t) {
 		let n = this._compiled, r = n.referenceIndices, i = r.length;
@@ -492,7 +492,7 @@ var Tn = class e {
 	}
 	getReferencesAt(e, t) {
 		let n = this.getReferences(e, t);
-		return n.length === 0 ? G.EmptyArray : ze(n, e, t);
+		return n.length === 0 ? G.EmptyArray : ke(n, e, t);
 	}
 	getFormatReferences() {
 		let e = this._formatReferences;
@@ -519,44 +519,44 @@ var Tn = class e {
 		if (a.length === 0) return null;
 		let o = i.referencesExecute;
 		t < 0 && (t = a.length + t);
-		let s = a[t];
-		if (s === void 0) throw Error(`Invalid reference index: ${t}`);
-		let c = o[s], l = c.node, u = l.inputs ?? G.EmptyArray, d = c.op === B.Named, f = u.length === 2, p, m, h = !1;
-		n && U.isError(n) && (n = null), n && "nameId" in n && !d && (n = null);
-		let g = n && "nameId" in n ? null : n, _ = !!g && g.colIndex !== void 0;
-		if (g) {
-			if (_) {
-				let e = g;
-				p = {
+		let c = a[t];
+		if (c === void 0) throw Error(`Invalid reference index: ${t}`);
+		let l = o[c], u = l.node, f = u.inputs ?? G.EmptyArray, p = l.op === B.Named, m = f.length === 2, h, g, _ = !1;
+		n && U.isError(n) && (n = null), n && "nameId" in n && !p && (n = null);
+		let v = n && "nameId" in n ? null : n, y = !!v && v.colIndex !== void 0;
+		if (v) {
+			if (y) {
+				let e = v;
+				h = {
 					colIndex: e.colIndex,
 					rowIndex: e.rowIndex,
 					$colIndex: e.$colIndex ?? !1,
 					$rowIndex: e.$rowIndex ?? !1
-				}, e.scope && (p.scope = e.scope), h = !1;
+				}, e.scope && (h.scope = e.scope), _ = !1;
 			} else {
-				let e = g;
-				p = {
+				let e = v;
+				h = {
 					colIndex: e.colStart,
 					rowIndex: e.rowStart,
 					$colIndex: e.$colStart ?? !1,
 					$rowIndex: e.$rowStart ?? !1
-				}, e.scope && (p.scope = e.scope), h = f || !K.isSingleCell(e), h && (m = {
+				}, e.scope && (h.scope = e.scope), _ = m || !K.isSingleCell(e), _ && (g = {
 					colIndex: e.colEnd,
 					rowIndex: e.rowEnd,
 					$colIndex: e.$colEnd ?? !1,
 					$rowIndex: e.$rowEnd ?? !1
-				}, e.colEnd === 2 ** 53 - 1 && (m.colIndex = -(2 ** 53 - 1)), e.rowEnd === 2 ** 53 - 1 && (m.rowIndex = -(2 ** 53 - 1)));
+				}, e.colEnd === 2 ** 53 - 1 && (g.colIndex = -(2 ** 53 - 1)), e.rowEnd === 2 ** 53 - 1 && (g.rowIndex = -(2 ** 53 - 1)));
 			}
 		}
-		let v = _ && f, y = -1, x = -1, S = -1, C = -1;
-		if (f) y = u[0].evalIndex, x = u[1].evalIndex;
-		else if (l.type === "cell") y = l.evalIndex;
-		else if (c.op === B.TableReference) S = l.evalIndex;
+		let b = y && m, x = -1, S = -1, C = -1, w = -1;
+		if (m) x = f[0].evalIndex, S = f[1].evalIndex;
+		else if (u.type === "cell") x = u.evalIndex;
+		else if (l.op === B.TableReference) C = u.evalIndex;
 		else {
-			if (!d) throw Error(`Invalidate reference index: ${t}`);
-			C = l.evalIndex;
+			if (!p) throw Error(`Invalidate reference index: ${t}`);
+			w = u.evalIndex;
 		}
-		let w = (...e) => {
+		let T = (...e) => {
 			if (r?.scopeDeleted) return null;
 			let t = this._compiled.symbols;
 			for (let n = 0; n < e.length; n++) {
@@ -564,12 +564,12 @@ var Tn = class e {
 				if (r) return t && !t.resolve(z.Sheet, r) ? null : r;
 			}
 			return null;
-		}, T = l, E = this._compiled.ast, D = L(E, (e) => {
+		}, E = u, D = this._compiled.ast, O = Re(D, (e) => {
 			if (!e || !e.isReference) return;
-			if (v && e === T) return N(p);
+			if (b && e === E) return d(h);
 			let t = e.type;
-			if (C !== -1 && e.evalIndex === C && t === B.Named) {
-				if (!n) return b();
+			if (w !== -1 && e.evalIndex === w && t === B.Named) {
+				if (!n) return me();
 				if (n && "nameId" in n) {
 					let t = n, r = this._compiled.symbols?.bind(z.NamedFormula, t.nameId) ?? t.nameId, i = { ...e };
 					return i.value = {
@@ -578,31 +578,31 @@ var Tn = class e {
 						nameId: r
 					}, i;
 				}
-				return h ? kt(":", N(p), N(m), !0) : N(p);
+				return _ ? s(":", d(h), d(g), !0) : d(h);
 			}
-			if (S !== -1 && e.evalIndex === S && t === B.TableReference) return n ? h ? kt(":", N(p), N(m), !0) : N(p) : b();
+			if (C !== -1 && e.evalIndex === C && t === B.TableReference) return n ? _ ? s(":", d(h), d(g), !0) : d(h) : me();
 			if (!n && zt.includes(e.value)) {
-				let t = e.inputs ?? G.EmptyArray, n = t[0], r = t[1], i = n.evalIndex === y, a = r.evalIndex === x;
+				let t = e.inputs ?? G.EmptyArray, n = t[0], r = t[1], i = n.evalIndex === x, a = r.evalIndex === S;
 				if (i || a) {
-					let t = b(void 0, void 0, w(n, r));
+					let t = me(void 0, void 0, T(n, r));
 					return t.evalIndex = e.evalIndex, t;
 				}
 			}
 			if (t !== "cell" && t !== "error") return;
-			let r = e.evalIndex, i, a = r === y;
-			if ((a || r === x) && !v) {
+			let r = e.evalIndex, i, a = r === x;
+			if ((a || r === S) && !b) {
 				if (n) {
-					if (f === h) {
-						let t = a ? p : m;
+					if (m === _) {
+						let t = a ? h : g;
 						i = { ...e }, i.value = t, i.image = null;
-					} else i = kt(":", N(p), N(m), !0);
-				} else i = b(void 0, void 0, w(e)), i.evalIndex = e.evalIndex;
+					} else i = s(":", d(h), d(g), !0);
+				} else i = me(void 0, void 0, T(e)), i.evalIndex = e.evalIndex;
 				return i;
 			}
 		});
-		if (D === E) return this;
-		let O = Vt(i.runtime, i.symbols, D, !1, i.error, i.getFunction);
-		return new e(O, this._context, this._calcScope, this._gridId, this._getEntireCoords, this._resolvers);
+		if (O === D) return this;
+		let k = Vt(i.runtime, i.symbols, O, !1, i.error, i.getFunction);
+		return new e(k, this._context, this._calcScope, this._gridId, this._getEntireCoords, this._resolvers);
 	}
 	reanchorReferences(t, n) {
 		let r = this._compiled, i = this._gridId, a = this._compiled.symbols.bind(z.Sheet, t), o = r.transform((e, t) => {
@@ -663,70 +663,70 @@ var Tn = class e {
 		let i = this._resolvers?.getStructureReferenceCoords;
 		return i ? i(e, t, n, this._gridId) : U.BuiltIn.Name;
 	}
-	resolvedPrecedentsAt(e, t, n = !1, r, i) {
-		let a = this._compiled, o = a.referencesRoot, s = o.length;
-		if (s === 0) return G.EmptyArray;
-		let c = a.referencesRelative, l = a.referencesAbsolute, u = c.length;
-		for (let n = 0; n < u; n++) In(c[n], e, t, l[n]);
-		let d = a.referencesExecute, f = d.length, p = [];
-		for (let n = 0; n < f; n++) {
-			let r = d[n], i = r.op;
-			if (!i) {
-				let e = l[r.value];
-				p[r.index] = e;
+	resolvedPrecedentsAt(e, t, n = !1, r, a) {
+		let o = this._compiled, s = o.referencesRoot, c = s.length;
+		if (c === 0) return G.EmptyArray;
+		let l = o.referencesRelative, u = o.referencesAbsolute, d = l.length;
+		for (let n = 0; n < d; n++) In(l[n], e, t, u[n]);
+		let f = o.referencesExecute, p = f.length, m = [];
+		for (let n = 0; n < p; n++) {
+			let r = f[n], a = r.op;
+			if (!a) {
+				let e = u[r.value];
+				m[r.index] = e;
 				continue;
 			}
-			if (i === B.Named) {
-				p[r.index] = this._resolveNamedPrecedents(r.node.value, e, t);
+			if (a === B.Named) {
+				m[r.index] = this._resolveNamedPrecedents(r.node.value, e, t);
 				continue;
 			}
-			if (i === B.Error) {
-				p[r.index] = Pe(r.node.value);
+			if (a === B.Error) {
+				m[r.index] = ht(r.node.value);
 				continue;
 			}
-			if (i === B.TableReference) {
+			if (a === B.TableReference) {
 				let n = r.node.value, i;
-				n && (i = this._resolveStructuredRef(n, e, t)), i ||= U.BuiltIn.Ref, p[r.index] = i;
+				n && (i = this._resolveStructuredRef(n, e, t)), i ||= U.BuiltIn.Ref, m[r.index] = i;
 				continue;
 			}
-			if (i === "@" || i === "#") {
-				let e = p[r.inputs[0]];
-				p[r.index] = e === void 0 ? U.BuiltIn.Value : e;
+			if (a === "@" || a === "#") {
+				let e = m[r.inputs[0]];
+				m[r.index] = e === void 0 ? U.BuiltIn.Value : e;
 				continue;
 			}
-			let a = r.inputs;
-			if (!a) continue;
-			let o = p[a[0]];
-			if (o === void 0) {
-				p[r.index] = U.BuiltIn.Value;
+			let o = r.inputs;
+			if (!o) continue;
+			let s = m[o[0]];
+			if (s === void 0) {
+				m[r.index] = U.BuiltIn.Value;
 				continue;
 			}
-			if (U.isError(o)) {
-				p[r.index] = o;
+			if (U.isError(s)) {
+				m[r.index] = s;
 				continue;
 			}
-			let s, c = p[a[1]];
-			if (c !== void 0) {
-				if (U.isError(c)) p[r.index] = c;
+			let c, l = m[o[1]];
+			if (l !== void 0) {
+				if (U.isError(l)) m[r.index] = l;
 				else {
-					if (i === " ") {
-						let e = o.scope ? c.scope ? null : o.scope : c.scope;
-						s = e && this._gridId && e !== this._gridId ? U.BuiltIn.Value : ne(o, c);
-					} else if (i === ":" || i === ".:." || i === ":." || i === ".:") s = Ke(o, c);
-					else if (i === ",") {
-						let e = a.length;
+					if (a === " ") {
+						let e = s.scope ? l.scope ? null : s.scope : l.scope;
+						c = e && this._gridId && e !== this._gridId ? U.BuiltIn.Value : i(s, l);
+					} else if (a === ":" || a === ".:." || a === ":." || a === ".:") c = vt(s, l);
+					else if (a === ",") {
+						let e = o.length;
 						for (let t = 0; t < e; t++) {
-							let e = p[a[t]];
-							e === void 0 || Array.isArray(e) || U.isError(e) || (s = s ? Ke(s, e) : e);
+							let e = m[o[t]];
+							e === void 0 || Array.isArray(e) || U.isError(e) || (c = c ? vt(c, e) : e);
 						}
 					}
-					p[r.index] = s ?? U.BuiltIn.Null;
+					m[r.index] = c ?? U.BuiltIn.Null;
 				}
-			} else p[r.index] = U.BuiltIn.Value;
+			} else m[r.index] = U.BuiltIn.Value;
 		}
-		let m = [], h = 0;
-		for (let e = 0; e < s; e++) h = Ln(o[e], d, p, m, h, r, i);
-		return m;
+		let h = [], g = 0;
+		for (let e = 0; e < c; e++) g = Ln(s[e], f, m, h, g, r, a);
+		return h;
 	}
 	getPrecedentTemplate() {
 		let e = this._precedentTemplate;
@@ -741,7 +741,7 @@ var Tn = class e {
 			}
 			let a = t.op, d, f = null;
 			if (a) {
-				if (a === B.Error) d = Pe(t.node.value);
+				if (a === B.Error) d = ht(t.node.value);
 				else if (a === ":" || a === ".:." || a === ":." || a === ".:") {
 					let e = t.inputs;
 					if (e && e.length === 2) {
@@ -769,7 +769,7 @@ var Tn = class e {
 		let i = this._context, a = this._compiled;
 		if (n !== void 0) {
 			let r;
-			if (L(a.ast, (e) => {
+			if (Re(a.ast, (e) => {
 				e.evalIndex === n && (r = e);
 			}), !r) throw Error(`Invalid evalIndex: ${n}`);
 			if (a.bindings.length > 0 && !a.error) {
@@ -793,7 +793,7 @@ var Tn = class e {
 						let n = r.node.value;
 						o[r.node.evalIndex] = this._evaluateNamed(n, e, t);
 					}
-				} else if (a === B.Error) o[s.evalIndex] = Pe(r.node.value);
+				} else if (a === B.Error) o[s.evalIndex] = ht(r.node.value);
 				else if (a === B.TableReference) {
 					let n = r.node.value, a;
 					a = n ? this._resolveStructuredRef(n, e, t) : U.BuiltIn.Ref, U.isError(a) || a?.colStart === void 0 ? o[s.evalIndex] = a ?? U.BuiltIn.Ref : o[s.evalIndex] = i.getReference(a);
@@ -808,9 +808,9 @@ var Tn = class e {
 	wrapImplicit(t, n, r) {
 		let i = this._compiled, a = i.ast;
 		if (!a || !a.isReference || a.type === "cell" || a.type === B.Error || a.value === "@" || !r) return this;
-		let o = C(n) + et(t);
+		let o = it(n) + st(t);
 		if (r.has(o)) return this;
-		let s = w("@", a, !0), c = Vt(i.runtime, i.symbols, s, !1, i.error, i.getFunction);
+		let s = at("@", a, !0), c = Vt(i.runtime, i.symbols, s, !1, i.error, i.getFunction);
 		return new e(c, this._context, this._calcScope, this._gridId, this._getEntireCoords, this._resolvers);
 	}
 	_executeNode(e, t, n, r, i = null) {
@@ -820,24 +820,24 @@ var Tn = class e {
 				let n = e.value, r = t[o[0].evalIndex], i = t[o[1].evalIndex];
 				if (!0 === e.firstCell && !e.isReference && this._demandsFirstCell() && (r = Fn(r), i = Fn(i)), (n === "+" || n === "-") && (r = Pn(a, r), typeof r == "number" && (i = Pn(a, i), typeof i == "number"))) {
 					let t = n === "+" ? r + i : r - i;
-					return He(!0 === e.snapsCancellation ? Me(t, r) : t, null);
+					return Me(!0 === e.snapsCancellation ? Ee(t, r) : t, null);
 				}
 				if (!e.isReference) {
 					if (r && U.isError(r)) return r;
 					if (i && U.isError(i)) return i;
 				}
 				let s = e.fn ??= !0 === e.snapsCancellation ? Wt[e.value] : Rt[e.value];
-				return l = s ? s(a, r, i) : U.BuiltIn.Value, l = He(l, null), l;
+				return l = s ? s(a, r, i) : U.BuiltIn.Value, l = Me(l, null), l;
 			}
 			case B.Function: {
 				let a = e.binder;
 				if (a !== void 0) return a.kind === "let" ? t[o[s - 1].evalIndex] : this._createLambdaValue(e, t, i, n, r);
 				if (!0 === e.hasLazyArgs) {
-					let a = Je.enter();
+					let a = bt.enter();
 					try {
-						this._fillLazyArgs(o, s, t, i, n, r, a), !0 === e.passOmitted && Bn(o, s), l = this._callFunction(e, zn, s), l instanceof Je && (l = l._force());
+						this._fillLazyArgs(o, s, t, i, n, r, a), !0 === e.passOmitted && Bn(o, s), l = this._callFunction(e, zn, s), l instanceof bt && (l = l._force());
 					} finally {
-						Je.leave(a);
+						bt.leave(a);
 					}
 				} else {
 					for (let e = 0; e < s; e++) zn[e] = t[o[e].evalIndex];
@@ -860,7 +860,7 @@ var Tn = class e {
 					if (typeof n == "object" && n && Ct(n.scope)) return U.BuiltIn.Name;
 				}
 				let e = !1;
-				for (let n = 0; n < s; n++) if (Xe(t[o[n].evalIndex])) {
+				for (let n = 0; n < s; n++) if (Ve(t[o[n].evalIndex])) {
 					e = !0;
 					break;
 				}
@@ -868,7 +868,7 @@ var Tn = class e {
 					let e = [];
 					for (let n = 0; n < s; n++) {
 						let r = t[o[n].evalIndex];
-						Xe(r) ? e.push(...r) : e.push(r);
+						Ve(r) ? e.push(...r) : e.push(r);
 					}
 					let n = V(e.length);
 					for (let t = 0; t < e.length; t++) n[t] = e[t];
@@ -909,7 +909,7 @@ var Tn = class e {
 			let t = e[r];
 			if (!0 === t?.lazyArg) continue;
 			let i = n[t.evalIndex];
-			!c && (!0 === i?.isIRange ? i.size > 1 : Xe(i)) && (c = !0);
+			!c && (!0 === i?.isIRange ? i.size > 1 : Ve(i)) && (c = !0);
 		}
 		if (c) {
 			s = [];
@@ -920,7 +920,7 @@ var Tn = class e {
 		}
 		for (let c = 0; c < t; c++) {
 			let t = e[c];
-			zn[c] = !0 === t?.lazyArg ? s ? s[c] : Je.deferred(o, c, this, t, n, r, i, a) : n[t.evalIndex];
+			zn[c] = !0 === t?.lazyArg ? s ? s[c] : bt.deferred(o, c, this, t, n, r, i, a) : n[t.evalIndex];
 		}
 	}
 	_createLambdaValue(e, t, n, r, i) {
@@ -966,7 +966,7 @@ var Tn = class e {
 			i.set(n[e].slot, r === void 0 ? jn : r);
 		}
 		let a = this._evaluateBody(e, i);
-		return He(a, this._context);
+		return Me(a, this._context);
 	}
 	_evaluateBody(e, t) {
 		let n = this._calcScope;
@@ -990,7 +990,7 @@ var Tn = class e {
 			return this._runList(a, t, r, i, n), t[e.evalIndex];
 		} catch (e) {
 			if (U.isError(e)) return e;
-			if (Re(e)) throw e;
+			if (et(e)) throw e;
 			return e instanceof RangeError ? U.BuiltIn.Num : new U.Value(e?.message, { cause: e });
 		}
 	}
@@ -1003,7 +1003,7 @@ var Tn = class e {
 	}
 	_listWithin(e) {
 		let t;
-		L(this._compiled.ast, (n, r, i) => {
+		Re(this._compiled.ast, (n, r, i) => {
 			if (n === e) {
 				for (let e = i.length - 1; e >= 0; e--) if (i[e].deferred !== void 0) {
 					t = i[e];
@@ -1012,7 +1012,7 @@ var Tn = class e {
 			}
 		});
 		let n = /* @__PURE__ */ new Set();
-		L(e, (e) => {
+		Re(e, (e) => {
 			n.add(e);
 		});
 		let r = t?.deferred?.filter((e) => n.has(e)) ?? [];
@@ -1049,7 +1049,7 @@ var Tn = class e {
 			try {
 				r = e.execute();
 			} catch (e) {
-				if (Re(e)) throw e;
+				if (et(e)) throw e;
 				r = Hn(e);
 			}
 			a.argsValues = null, a.argsLength = 0;
@@ -1079,7 +1079,7 @@ var Tn = class e {
 					r = e.execute(...i);
 			}
 		} catch (e) {
-			if (Re(e)) throw e;
+			if (et(e)) throw e;
 			r = Hn(e);
 		}
 		let o = this._calcScope;
@@ -1091,7 +1091,7 @@ var Tn = class e {
 	}
 	finalizeValue(e) {
 		let t = this._context;
-		if (bt(e) || yn(e)) return U.BuiltIn.Calc;
+		if (Te(e) || yn(e)) return U.BuiltIn.Calc;
 		if (e && e.colStart !== void 0) try {
 			if (e.scope) {
 				let n = t.getReference(e);
@@ -1099,12 +1099,12 @@ var Tn = class e {
 			}
 			e = t.getValueAt(e.rowStart, e.colStart, e.scope);
 		} catch (e) {
-			if (Re(e)) throw e;
+			if (et(e)) throw e;
 			return U.isError(e) ? e : new U.Value(e?.message, { cause: e });
 		}
 		if (Array.isArray(e) && e.isSheetSpan) return U.BuiltIn.Ref;
 		if (Array.isArray(e)) {
-			if (Xe(e)) {
+			if (Ve(e)) {
 				let t = V(e.length);
 				for (let n = 0; n < e.length; n++) t[n] = this.finalizeValue(e[n]);
 				return t;
@@ -1117,7 +1117,7 @@ var Tn = class e {
 			}
 		}
 		var n;
-		return e?.isIRange ? e.size <= 1 ? (e = e.size === 0 ? null : e.getValueAt(0, 0, Rn), (e = He(e, t)) === null && (e = 0)) : (n = e, Mn.has(n) || (e = e.fillEmpty(0))) : (e = He(e, t)) === null && (e = 0), e;
+		return e?.isIRange ? e.size <= 1 ? (e = e.size === 0 ? null : e.getValueAt(0, 0, Rn), (e = Me(e, t)) === null && (e = 0)) : (n = e, Mn.has(n) || (e = e.fillEmpty(0))) : (e = Me(e, t)) === null && (e = 0), e;
 	}
 	finalizeValueForCell(e) {
 		let t = this.finalizeValue(e);
@@ -1127,7 +1127,7 @@ var Tn = class e {
 		let e = this._compiled;
 		if (e.error) return e.error.toString();
 		let t = this._calcScope;
-		return t?.node ? this.getTextAt(t.node.rowIndex, t.node.colIndex) : Ve(e.getTokens(), null);
+		return t?.node ? this.getTextAt(t.node.rowIndex, t.node.colIndex) : je(e.getTokens(), null);
 	}
 	get [Symbol.toStringTag]() {
 		return "[FormulaBlock]";
@@ -1173,11 +1173,11 @@ var Ln = (e, t, n, r, i, a, o) => {
 }, Vn = (e) => {
 	let t = { ...e };
 	return delete t.inLazy, delete t.lazyArg, delete t.hasLazyArgs, delete t.deferred, e.inputs && (t.inputs = e.inputs.map((e) => e && Vn(e))), t;
-}, Hn = (e) => U.isError(e) ? e : e instanceof RangeError ? U.BuiltIn.Num : new U.Value(e?.message, { cause: e }), Un = Ge(4096), Wn = 0, Gn = () => Un, Kn = (e, t) => {
+}, Hn = (e) => U.isError(e) ? e : e instanceof RangeError ? U.BuiltIn.Num : new U.Value(e?.message, { cause: e }), Un = Ie(4096), Wn = 0, Gn = () => Un, Kn = (e, t) => {
 	if (t === 0) return void (e.inputsAt = -1);
 	let n = Wn, r = n + t;
 	if (r > Un.length) {
-		let e = Ge(Math.max(r, 2 * Un.length));
+		let e = Ie(Math.max(r, 2 * Un.length));
 		for (let t = 0; t < n; t++) e[t] = Un[t];
 		Un = e;
 	}
@@ -1765,7 +1765,7 @@ var ti = {
 		return i === void 0 && (i = this._newNode(e, t, this.gridId, null), r.setValueAt(e, t, i)), i;
 	}
 	_newSparseStore() {
-		let e = new u({ axis: W.Axis.Column }), t = this._anchor;
+		let e = new _({ axis: W.Axis.Column }), t = this._anchor;
 		return t !== null && e.setValueAt(t.rowIndex, t.colIndex, t), this._nodes = e, e;
 	}
 	_mintDense() {
@@ -1825,7 +1825,7 @@ var ti = {
 			let i = this._nodes ?? this._newSparseStore(), a = this.ref, o = Math.max(e, a.rowStart), s = Math.min(t, a.rowEnd), c = Math.max(n, a.colStart), l = Math.min(r, a.colEnd);
 			if (o > s || c > l) return;
 			let u = this.gridId, d = null;
-			for (let e = c; e <= l; e++) for (let t = o; t <= s; t++) i.getValueAt(t, e) === void 0 && (d === null && (d = new _e.Builder()), d.pushAt(e, t, this._newNode(t, e, u, null)));
+			for (let e = c; e <= l; e++) for (let t = o; t <= s; t++) i.getValueAt(t, e) === void 0 && (d === null && (d = new de.Builder()), d.pushAt(e, t, this._newNode(t, e, u, null)));
 			if (d !== null) {
 				let e = d.build();
 				e && i.setValues(e.tuples);
@@ -1867,7 +1867,7 @@ var ti = {
 				continue;
 			}
 			In(s, e, t, ti), In(l, e, t, oi);
-			let u = Ke(ti, oi, c);
+			let u = vt(ti, oi, c);
 			i[n] = u ?? U.BuiltIn.Null;
 		}
 		return this._scratchRow = e, this._scratchCol = t, i;
@@ -2097,7 +2097,7 @@ var ti = {
 			if (c !== null && o.originRow === 0 && o.originCol === 0 && s.rowStart === n && s.colStart === r && s.rowEnd === t.rowEnd && s.colEnd === t.colEnd) return e._nodes = null, this._nodes = c, void this.forEachNode((e) => {
 				this._adoptNode(e, e.rowIndex, e.colIndex, null);
 			});
-			let l = s.rowStart + o.originRow, u = s.colStart + o.originCol, d = n - l, f = r - u, p = new _e.Builder();
+			let l = s.rowStart + o.originRow, u = s.colStart + o.originCol, d = n - l, f = r - u, p = new de.Builder();
 			e.forEachNodeIn(l, l + i - 1, u, u + a - 1, (e) => {
 				let t = e.rowIndex + d, n = e.colIndex + f;
 				this._adoptNode(e, t, n, null), p.pushAt(n, t, e);
@@ -2116,7 +2116,7 @@ var ti = {
 		}
 		if (s.length === 0) return;
 		s.sort(ii);
-		let c = new _e.Builder();
+		let c = new de.Builder();
 		for (let e = 0; e < s.length; e++) {
 			let t = s[e];
 			e > 0 && s[e - 1].rowIndex === t.rowIndex && s[e - 1].colIndex === t.colIndex || c.pushAt(t.colIndex, t.rowIndex, t);
@@ -2126,7 +2126,7 @@ var ti = {
 	}
 	toJSON(e = !1, t = this.ref) {
 		let n = t;
-		return [i(n), this.formula.getTextAt(n.rowStart, n.colStart, e)];
+		return [De(n), this.formula.getTextAt(n.rowStart, n.colStart, e)];
 	}
 	getCoords() {
 		return this.ref;
@@ -2510,12 +2510,12 @@ var ti = {
 			let i = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords(), a = i && e > i.rowEnd + 1 ? {
 				...i,
 				rowEnd: e - 1
-			} : i, o = new u({
+			} : i, o = new _({
 				axis: this._axis,
 				maxCoords: a
 			});
 			for (let e = 0; e < r; e++) o.setValueAt(t[e], 0, n[e]);
-			return new $e(this._runtime, o, {
+			return new We(this._runtime, o, {
 				colStart: 0,
 				rowStart: 0,
 				colEnd: 0,
@@ -2548,21 +2548,21 @@ var ti = {
 		return this._calcScope.node ? this._container.evaluateWhatIf(e) : null;
 	}
 	async _initialize(e) {
-		let n = await Se.assertUsable("calcs", 0), r = this._container, i = r.getRuntime();
-		this._runtime = new tt("Calculation Runtime", {
+		let n = await Xe.assertUsable("calcs", 0), r = this._container, i = r.getRuntime();
+		this._runtime = new ct("Calculation Runtime", {
 			isDate1904: () => i.isDate1904(),
 			isR1C1: () => i.isR1C1(),
 			getNow: () => r.getNow(),
 			getRandom: () => i.getRandom(),
 			getLocale: () => i.getLocale()
-		}, n), this._calcScope = r.getScope(), this._coerceToNumber = De(this._runtime, _n.Number, rt);
-		let { initializeFunctions: a } = await import("./DlVnybrgwZWxWN3_.mjs"), o = this, s = Object.freeze(a(() => o, this._functionProviders)), c = new re({
+		}, n), this._calcScope = r.getScope(), this._coerceToNumber = xe(this._runtime, _n.Number, Je);
+		let { initializeFunctions: o } = await import("./-nOfWMHdlTb9ShjF.mjs"), s = this, c = Object.freeze(o(() => s, this._functionProviders)), l = new a({
 			transactions: e ?? new t({ transient: !0 }),
 			context: this,
-			readonlyFunctions: s,
-			createScopedContext: (e) => o._createScoped(e)
+			readonlyFunctions: c,
+			createScopedContext: (e) => s._createScoped(e)
 		});
-		return this._functions = c, { functions: c };
+		return this._functions = l, { functions: l };
 	}
 	_createScoped(t) {
 		let n = this._container, r = n.getSymbols().bind(z.Sheet, t);
@@ -2607,7 +2607,7 @@ var ti = {
 		}, e;
 	}
 	getFunction(e) {
-		let t = I(e);
+		let t = _e(e);
 		if (t !== void 0) {
 			let e = this._functions.getByName(t);
 			if (e && !e.isLambda()) return e;
@@ -2645,15 +2645,15 @@ var ti = {
 	defer(e, t) {
 		if (typeof e != "function") throw new U.Value("defer needs an executor function");
 		let n = this._container.getDeferred?.();
-		if (n) return pt(n.defer(e, t, Ce(), at())), n.previous;
-		pt(null);
+		if (n) return Se(n.defer(e, t, Ze(), dt())), n.previous;
+		Se(null);
 	}
 	formatResults(e) {
 		let t = this._calcScope.node;
 		t && (t.numFmt = e);
 	}
 	filterHidden(e, t) {
-		if (!(e?.isIReferenceRange && e instanceof ht)) return e;
+		if (!(e?.isIReferenceRange && e instanceof pt)) return e;
 		let n = e.getCoords(), r = this._gridIdOf(n), i = r ? this._container.getGrid(r) : null;
 		if (!i || t?.onlyWhileFiltered && !i.isFiltered()) return e;
 		let a = t?.axes, o = a === W.AxisSelection.Column ? null : i.getHiddenSkip(W.Axis.Row, n.rowStart, n.rowEnd), s = a === W.AxisSelection.Column || a === W.AxisSelection.Both ? i.getHiddenSkip(W.Axis.Column, n.colStart, n.colEnd) : null;
@@ -2763,17 +2763,17 @@ var ti = {
 		return Cn(this._passSeed, this._gridKey, e.rowIndex, e.colIndex, t);
 	}
 	compare(e, t, n) {
-		return wt.compare(e, t, this.getRuntime().getLocaleProfile(), n);
+		return re.compare(e, t, this.getRuntime().getLocaleProfile(), n);
 	}
 	_fromTuples(e, t = null, n = !1, r = !1) {
 		if (!e) return null;
-		let i = ue(e.bounds, !0), a = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords(), o = new u({
+		let i = g(e.bounds, !0), a = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords(), o = new _({
 			axis: this._axis,
 			maxCoords: a
 		});
 		o.setValues(e.tuples);
 		let s = t ? { type: t } : void 0;
-		return new $e(this._runtime, o, i, s, n, r);
+		return new We(this._runtime, o, i, s, n, r);
 	}
 	getValueAt(e, t, n = null, r) {
 		let i = this._container, a = this._calcScope, o, s;
@@ -2796,7 +2796,7 @@ var ti = {
 			}
 			break;
 		}
-		return s === void 0 && (this._onRead?.(o, e, t, e, t), s = i.getGridValues(o)?.getValueAt(e, t) ?? null, i.getDeferred?.()?.hasHolders() && (s = Te(s))), r && r.type, s;
+		return s === void 0 && (this._onRead?.(o, e, t, e, t), s = i.getGridValues(o)?.getValueAt(e, t) ?? null, i.getDeferred?.()?.hasHolders() && (s = Tt(s))), r && r.type, s;
 	}
 	getSpillAt(e, t, n) {
 		let r = this._container, i = this._calcScope, a;
@@ -2830,11 +2830,11 @@ var ti = {
 			...r,
 			rowEnd: Math.max(r.rowEnd, e - 1),
 			colEnd: Math.max(r.colEnd, t - 1)
-		} : r, a = new u({
+		} : r, a = new _({
 			axis: this._axis,
 			maxCoords: i
-		}), o = new $e(this._runtime, a, null, void 0, !1);
-		return e > 0 && t > 0 && (typeof n == "function" ? (o = o.resize(e, t), o = o.map(n, Ti)) : Array.isArray(n) ? (o = o.replace(n), o = o.resize(e, t)) : o = n == null ? o.resize(e, t) : new $e(this._runtime, a, {
+		}), o = new We(this._runtime, a, null, void 0, !1);
+		return e > 0 && t > 0 && (typeof n == "function" ? (o = o.resize(e, t), o = o.map(n, Ti)) : Array.isArray(n) ? (o = o.replace(n), o = o.resize(e, t)) : o = n == null ? o.resize(e, t) : new We(this._runtime, a, {
 			colStart: 0,
 			rowStart: 0,
 			colEnd: t - 1,
@@ -2862,7 +2862,7 @@ var ti = {
 		let r, i = Array.isArray(e);
 		if (n ??= i, !i && e !== void 0) {
 			let r = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords();
-			return new $e(this._runtime, new Tn(e, {
+			return new We(this._runtime, new Tn(e, {
 				axis: this._axis,
 				maxCoords: r
 			}), {
@@ -2877,13 +2877,13 @@ var ti = {
 			if (e[0]?.isIRange) throw U.BuiltIn.Value;
 			r = [e];
 		}
-		let a = this._axis, o = a === W.Axis.Column, s = this._fromTuples(g(r, o, Ot(0, 0, void 0, void 0, o), !0), t, n, !i);
-		if (s) return s;
-		let c = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords(), l = new u({
+		let a = this._axis, s = a === W.Axis.Column, c = this._fromTuples(C(r, s, o(0, 0, void 0, void 0, s), !0), t, n, !i);
+		if (c) return c;
+		let l = this._container.getGrid(this._calcScope.gridId)?.getEntireCoords(), u = new _({
 			axis: a,
-			maxCoords: c
+			maxCoords: l
 		}), d = t ? { type: t } : void 0;
-		return new $e(this._runtime, l, K.EmptyRange, d, n);
+		return new We(this._runtime, u, K.EmptyRange, d, n);
 	}
 	getRow() {
 		let e = this._calcScope;
@@ -2912,7 +2912,7 @@ var ti = {
 		if (typeof e == "string") {
 			let r = s?.(), i;
 			try {
-				let n = Ne(e, r, xe, () => {
+				let n = mt(e, r, Ye, () => {
 					throw U.BuiltIn.Ref;
 				}, t);
 				if (n.length > 1) throw U.BuiltIn.Ref;
@@ -2965,7 +2965,7 @@ var ti = {
 					scope: c
 				};
 				if (r.isGridless?.(c)) {
-					let e = new u({ axis: this._axis });
+					let e = new _({ axis: this._axis });
 					return this._toReference(e, t, void 0, c, !1, null);
 				}
 				e = t;
@@ -2975,15 +2975,15 @@ var ti = {
 				s = a?.getEntireCoords.bind(a);
 			}
 		}
-		let l = r.getGridValues(i), d, f = n.node, p = -1;
-		if (f && (p = xi(Jt(f), e)), p !== -1) {
-			let t = qn(f, p);
-			if (t != null && t.isIReferenceRange) d = t;
-			else if (t === void 0 || l.isPendingOverlay) d = this._toReference(l, e, s, i, !1, vi(l, a));
+		let l = r.getGridValues(i), u, d = n.node, f = -1;
+		if (d && (f = xi(Jt(d), e)), f !== -1) {
+			let t = qn(d, f);
+			if (t != null && t.isIReferenceRange) u = t;
+			else if (t === void 0 || l.isPendingOverlay) u = this._toReference(l, e, s, i, !1, vi(l, a));
 			else {
 				let n = t;
 				n !== null && n.isIRange && (n = n.getValueAt(0, 0));
-				let r = new u({
+				let r = new _({
 					axis: this._axis,
 					maxCoords: s?.()
 				});
@@ -2991,16 +2991,16 @@ var ti = {
 					let t = this._axis === W.Axis.Column, i = t ? e.colStart : e.rowStart, a = t ? e.rowStart : e.colStart;
 					r.setValues([[i, [[a, [n]]]]]);
 				}
-				d = this._toReference(r, e, s, i, !1, null);
+				u = this._toReference(r, e, s, i, !1, null);
 			}
 		} else {
 			let t = e.scope ? e : {
 				...e,
 				scope: i
 			};
-			r.addDynamicPrecedent(f, t, pi), d = this._toReference(l, e, s, i, !0, vi(l, a));
+			r.addDynamicPrecedent(d, t, pi), u = this._toReference(l, e, s, i, !0, vi(l, a));
 		}
-		return d;
+		return u;
 	}
 	_expandSheetSpan(e) {
 		if (typeof e != "object" || !e || !0 === e.isIRange) return null;
@@ -3026,7 +3026,7 @@ var ti = {
 		let o = this._onRead ?? (i ? this._dynamicRead : null);
 		o && (e = new gi(e, r, o));
 		try {
-			let i = new ht(this._runtime, e, t, void 0, n, this._container.resolveScope);
+			let i = new pt(this._runtime, e, t, void 0, n, this._container.resolveScope);
 			return i._setCoordsReadHook(this._positionRead), a !== null && i._setErrorIndex(o === null ? a : { hasErrorIn: (e) => (o(r, e.rowStart, e.colStart, e.rowEnd, e.colEnd), a.hasErrorIn(e)) }), i;
 		} catch (e) {
 			throw e instanceof bn ? U.BuiltIn.Ref : e;
@@ -3035,7 +3035,7 @@ var ti = {
 	getAddress(e, t = !1) {
 		e ||= (this._calcScope.positionRead = !0, wi.rowIndex = this._calcScope.rowIndex, wi.colIndex = this._calcScope.colIndex, wi.scope = null, wi);
 		let n = this.getEntireCoords().scope;
-		return e.colIndex === void 0 ? he(e, n, t) : y(e, n, t);
+		return e.colIndex === void 0 ? ge(e, n, t) : pe(e, n, t);
 	}
 	parseAsSerialDate(e, t) {
 		if (e === void 0) return;
@@ -3071,7 +3071,7 @@ var ti = {
 		return Er.create(e, t, this._createSparseColumn, n);
 	}
 	getPivotAt(e) {
-		if (!(e instanceof ht)) return null;
+		if (!(e instanceof pt)) return null;
 		let t = e.getCoords(), n = this._gridIdOf(t), r = (n ? this._container.getGrid(n) : null)?.getPivots();
 		if (!r) return null;
 		for (let e = 0; e < r.length; e++) {
@@ -3085,16 +3085,16 @@ var ti = {
 		return null;
 	}
 	parseAsLiteral(e) {
-		return D(e) ?? A(e);
+		return E(e) ?? A(e);
 	}
 	toText(e) {
-		return Be(e, this._runtime);
+		return Ae(e, this._runtime);
 	}
 	getRuntime() {
 		return this._runtime;
 	}
 	createRichData(e, t) {
-		return st.fromJSON({
+		return He.fromJSON({
 			type: e,
 			data: t
 		}, this._container.getRichDataContext?.());
@@ -3220,7 +3220,7 @@ function ki(e, t, n) {
 		colEnd: c[1]
 	};
 }
-var Ai = class extends ke {
+var Ai = class extends I {
 	constructor(e) {
 		let t = (e = { ...e }).container;
 		super({
@@ -3228,15 +3228,15 @@ var Ai = class extends ke {
 			send: (e, n, r) => t.sendRequest(e, n, r),
 			calculation: e.calculation
 		}), this._touchedOthers = null, this._iterationId = 0, this._resized = null, this._hiddenRows = null, this._hiddenColumns = null, this._filtered = !1, this._pivots = null, this._demanded = [], this._isProcessingJSON = !1, this._snapshots = null, this._options = e, this._context = e.context, this._container = e.container;
-		let n = { ...Ae }, r = e.getEntireCoords ?? (() => n);
+		let n = { ...Ce }, r = e.getEntireCoords ?? (() => n);
 		if (this._getEntireCoords = r, this._unanchored = !0 === e.unanchored, this._shadowOf = e.shadowOf ?? null, this._arrayFirstCell = !0 === e.arrayFirstCell, this._paged = !0 === e.paged, !this._context || !this._container) throw Error("Invalid Options");
 		let i = e?.onCalculated;
 		this._onCalculated = i ? (e) => {
-			i(Ye(dt.results(e, "onCalculated"), this._container.getImager(this._gridId)));
-		} : () => {}, this._values = new u({
+			i(Be(lt.results(e, "onCalculated"), this._container.getImager(this._gridId)));
+		} : () => {}, this._values = new _({
 			axis: W.Axis.Column,
 			createRun: nn
-		}), this._iterationId = 0, this._contentfulSpatial = new v({ updateEntryOptions: {
+		}), this._iterationId = 0, this._contentfulSpatial = new N({ updateEntryOptions: {
 			isSplitOnExpand: !0,
 			isMergeOnShift: !0
 		} });
@@ -3244,7 +3244,7 @@ var Ai = class extends ke {
 			isSplitOnExpand: !0,
 			isMergeOnShift: !1
 		} };
-		this._spillSpatial = new v(a), this._errorSpatial = new v(a), this._calcStatusSpatial = new v(a), this._circularSpatial = new v(a), this._notifyValues = new v(), this._notifyBlank = null, this._notifySpillsInsert = [], this._notifySpillsRemove = [], this._notifyFormats = new v(), this._notifyCalcStatus = new v(), this._notifyCircular = new v(), this._touchedFormulas = [], this._container.registerGrid(this), this._publishMaps();
+		this._spillSpatial = new N(a), this._errorSpatial = new N(a), this._calcStatusSpatial = new N(a), this._circularSpatial = new N(a), this._notifyValues = new N(), this._notifyBlank = null, this._notifySpillsInsert = [], this._notifySpillsRemove = [], this._notifyFormats = new N(), this._notifyCalcStatus = new N(), this._notifyCircular = new N(), this._touchedFormulas = [], this._container.registerGrid(this), this._publishMaps();
 	}
 	_land(e, t) {
 		return this._container.landRequest(e, () => (e !== void 0 && this._versionMaps(e), t()));
@@ -3369,7 +3369,7 @@ var Ai = class extends ke {
 					cycleId: this._container.getCycleId(),
 					commitId: e.commitId
 				};
-				let r = T(e.destination, e.coords, e.fitDestination, e.transpose);
+				let r = ot(e.destination, e.coords, e.fitDestination, e.transpose);
 				return r.scope = this._gridId, this._land(t, () => {
 					e.isCut ? this._moveTo(n, e.coords, r) : this._copyTo(n, e.coords, r);
 					let t = this._mutationResults(e.commitId);
@@ -3495,8 +3495,8 @@ var Ai = class extends ke {
 		let t = this, r = this.getId(), i = { ...e };
 		i.range = { ...i.range }, i.range.scope = r, delete i.onShift;
 		let a = t._values, o = i.range, s = i.direction, c = s === W.Direction.Left || s === W.Direction.Right, l = s === W.Direction.Down || s === W.Direction.Right, u = l ? 1 : -1, d = t._spillSpatial, f = t._contentfulSpatial;
-		de(d, o, c, l);
-		let p = [], m = this._container.getPrecedents().search(o), h = ge(o, d, a, f, void 0, !1, !1, void 0, (e, t, n, i) => {
+		ce(d, o, c, l);
+		let p = [], m = this._container.getPrecedents().search(o), h = fe(o, d, a, f, void 0, !1, !1, void 0, (e, t, n, i) => {
 			p.push({
 				colStart: e,
 				rowStart: t,
@@ -3514,7 +3514,7 @@ var Ai = class extends ke {
 			colEnd: c && u === 1 ? y.colEnd : o.colEnd,
 			rowEnd: c || u !== 1 ? o.rowEnd : y.rowEnd,
 			scope: r
-		}, x = l ? Ie(v, b) : n(v, o);
+		}, x = l ? R(v, b) : n(v, o);
 		x && (Yi(_, v, x.formulas.inserts, x.formulas.removes), t._touchFormulas(x.formulas.removes), t._touchFormulas(x.formulas.inserts));
 		let S = c ? o.colEnd - o.colStart + 1 : o.rowEnd - o.rowStart + 1, C = S * u, w = {
 			colStart: o.colStart,
@@ -3522,7 +3522,7 @@ var Ai = class extends ke {
 			colEnd: c ? y.colEnd : o.colEnd,
 			rowEnd: c ? o.rowEnd : y.rowEnd,
 			scope: r
-		}, T, E = te(() => v, () => {
+		}, T, E = ee(() => v, () => {
 			let e = g.getDynamics();
 			return T = new Map(e), T;
 		}, w, {
@@ -3533,7 +3533,7 @@ var Ai = class extends ke {
 		E && (Yi(_, v, E.formulas.inserts, E.formulas.removes), t._touchFormulas(E.formulas.removes), t._touchFormulas(E.formulas.inserts)), i.onUpdates = (e, t) => {
 			D = e, O = t;
 		}, _.shift(i), (D || O) && (Zi(v, D, O), t._touchFormulas(O), t._touchFormulas(D)), g.setFormulas(_), g.setPrecedents(v), T && g.setDynamics(T), g.bumpCalcEpochs(!0), h?.(l, c ? 0 : C, c ? C : 0);
-		let k = c ? o.colStart : o.rowStart, A = c ? o.colEnd : o.rowEnd, j = (e, t = e.ref) => {
+		let k = c ? o.colStart : o.rowStart, A = c ? o.colEnd : o.rowEnd, te = (e, t = e.ref) => {
 			let n = e.gridId;
 			n && g.getGrid(n) && (e.unanchored ? g.invalidateNamed(n) : ((e, t) => {
 				let n = c ? e.colStart : e.rowStart, i = c ? e.colEnd : e.rowEnd;
@@ -3558,14 +3558,14 @@ var Ai = class extends ke {
 		};
 		for (let e = 0; e < m.length; e++) {
 			let t = m[e].value, n = t.formulaEntry.value, r = t.index < 0 || n.unanchored ? n.ref : ki(n, t.index, o);
-			r !== null && j(n, r);
+			r !== null && te(n, r);
 		}
-		let ee = E?.dynamicDependents;
-		for (let e = 0; e < (ee?.length ?? 0); e++) j(ee[e].value);
-		let M = E?.formulas.inserts;
-		for (let e = 0; e < (M?.length ?? 0); e++) {
-			let t = M[e];
-			t.scope !== r && j(t.value);
+		let ne = E?.dynamicDependents;
+		for (let e = 0; e < (ne?.length ?? 0); e++) te(ne[e].value);
+		let j = E?.formulas.inserts;
+		for (let e = 0; e < (j?.length ?? 0); e++) {
+			let t = j[e];
+			t.scope !== r && te(t.value);
 		}
 		for (let e = 0; e < (D?.length ?? 0); e++) {
 			let t = D[e];
@@ -3612,9 +3612,9 @@ var Ai = class extends ke {
 			let i = a[r], l = i.value, u = l.getReferencedSymbolIds(), d = l;
 			for (let r = 0; r < u.length; r++) {
 				let i = u[r];
-				if (!Ee(i)) continue;
+				if (!be(i)) continue;
 				let a = o.get(i);
-				a === void 0 && (a = Dt(i, e, t, n) ?? null, o.set(i, a)), a !== null && (d = d.replaceScopeIds(i, a));
+				a === void 0 && (a = Ot(i, e, t, n) ?? null, o.set(i, a)), a !== null && (d = d.replaceScopeIds(i, a));
 			}
 			d !== l && (s.push(i), c.push({
 				...i,
@@ -3727,7 +3727,7 @@ var Ai = class extends ke {
 		o || (o = /* @__PURE__ */ new Map(), ji.set(r, o));
 		let s = o.get(t);
 		if (!s) {
-			let e = _t(r);
+			let e = Ke(r);
 			s = t === 0 ? e : (n, r) => e(n + t, r) - t, o.set(t, s);
 		}
 		return s;
@@ -3758,7 +3758,7 @@ var Ai = class extends ke {
 				columns: t.anchor.column - n.colStart
 			}, s = {
 				...n,
-				value: new ot(n, o, "pivot", a)
+				value: new Qe(n, o, "pivot", a)
 			};
 			i.insert(s), this._notifySpillsInsert.push(s);
 		}
@@ -3882,7 +3882,7 @@ var Ai = class extends ke {
 			}
 			this._pushWithSpills(c, y);
 		}
-		return c = S(c, 2, xn.Row), c.sort(K.rowFirstRangeComparator), c;
+		return c = rt(c, 2, xn.Row), c.sort(K.rowFirstRangeComparator), c;
 	}
 	_pushWithSpills(e, t) {
 		e.push(t);
@@ -3936,7 +3936,7 @@ var Ai = class extends ke {
 			for (let e = 0; e < f.length; e++) {
 				let t = f[e];
 				if (t?.colStart === void 0) continue;
-				let n = t.scope, r = u(n), i = it(t, c.rowStart + x, c.colStart + S), a = it(t, c.rowStart + C, c.colStart + w), s = {
+				let n = t.scope, r = u(n), i = ut(t, c.rowStart + x, c.colStart + S), a = ut(t, c.rowStart + C, c.colStart + w), s = {
 					colStart: Math.max(Math.min(i.colStart, a.colStart), r.colStart),
 					rowStart: Math.max(Math.min(i.rowStart, a.rowStart), r.rowStart),
 					colEnd: Math.min(Math.max(i.colEnd, a.colEnd), r.colEnd),
@@ -3947,7 +3947,7 @@ var Ai = class extends ke {
 			}
 			d.push(...T);
 		}
-		return d = S(d, 2, xn.Row), d.sort(K.rowFirstRangeComparator), d;
+		return d = rt(d, 2, xn.Row), d.sort(K.rowFirstRangeComparator), d;
 	}
 	_directAcrossGrids(e, t) {
 		let n = this._gridId, r = e.scope, i = r && r !== n ? this._container.getGrid(r) ?? null : this;
@@ -3968,11 +3968,11 @@ var Ai = class extends ke {
 		return o;
 	}
 	getDependentsAt(e) {
-		let t = fe(e, (e) => this._directAcrossGrids(e, !0));
+		let t = p(e, (e) => this._directAcrossGrids(e, !0));
 		return t.sort(K.rowFirstRangeComparator), t;
 	}
 	getPrecedentsAt(e) {
-		let t = fe(e, (e) => this._directAcrossGrids(e, !1));
+		let t = p(e, (e) => this._directAcrossGrids(e, !1));
 		return t.sort(K.rowFirstRangeComparator), t;
 	}
 	_graphNeighborsNow(e, t, n) {
@@ -4083,15 +4083,15 @@ var Ai = class extends ke {
 		if (i === "scalar") {
 			let i = e.evaluateAt(t, n, r);
 			if (i && i.colStart !== void 0) i = e.finalizeValue(i);
-			else if (Xe(i)) return e.finalizeValue(i);
-			let a = He(i, this._context);
+			else if (Ve(i)) return e.finalizeValue(i);
+			let a = Me(i, this._context);
 			return a === null ? 0 : a;
 		}
 		return tn(e.finalizeValue(e.evaluateAt(t, n, r)));
 	}
 	_setReferenceNow(e, t, n, r) {
 		let i = this._formulaAt(e, t), a = r;
-		r && r.colStart !== void 0 ? a = Oe(a, e, t) : r && r.colIndex !== void 0 && (a = ft(a, e, t));
+		r && r.colStart !== void 0 ? a = Le(a, e, t) : r && r.colIndex !== void 0 && (a = F(a, e, t));
 		let o = i.value.formula.setReferenceAt(n, a).getTextAt(e, t);
 		return this._land(void 0, () => {
 			o ? this._setInputsNow(null, [{
@@ -4112,7 +4112,7 @@ var Ai = class extends ke {
 	_setReferenceModeNow(e, t, n, r, i) {
 		let a = this.getReferencesAt(e, t)[n];
 		if (!a || "nameId" in a) throw Error(`Reference at index ${n} is not a cell reference and cannot have its style changed.`);
-		return this._setReferenceNow(e, t, n, O(a, r, i));
+		return this._setReferenceNow(e, t, n, w(a, r, i));
 	}
 	_isVolatileNow(e, t) {
 		let n = this._formulaAt(e, t);
@@ -4145,7 +4145,7 @@ var Ai = class extends ke {
 				rowStart: f,
 				colEnd: i,
 				rowEnd: m,
-				value: new ot(h, 0, t.value.getKind())
+				value: new Qe(h, 0, t.value.getKind())
 			});
 		}
 		return {
@@ -4173,21 +4173,21 @@ var Ai = class extends ke {
 		if (!o || o.isEmpty()) return;
 		let s = this.getEntireCoords(), c = s.colStart, l = s.rowStart, u = s.colEnd, d = s.rowEnd, f = a.createCopiedEntries(t, n), p = f.inserts, m = p.length;
 		if (m === 0 && (f.removes?.length ?? 0) === 0) return;
-		let g = 0, _ = e.spillSpatial, v = [];
-		for (; g < m;) {
-			let e = p[g];
+		let h = 0, g = e.spillSpatial, _ = [];
+		for (; h < m;) {
+			let e = p[h];
 			e.scope = i;
 			let n = e.value, r = n.ref, a = r.colStart, o = r.rowStart, s = r.colEnd, f = r.rowEnd;
-			this._createCopySpillEntries(_, t, r, v, null);
-			let y = n.formula.getReferences(o, a), b = y.length;
+			this._createCopySpillEntries(g, t, r, _, null);
+			let v = n.formula.getReferences(o, a), b = v.length;
 			for (let t = 0; t < b; t++) {
-				let i = y[t];
+				let i = v[t];
 				if (!i || "nameId" in i || "tableId" in i) continue;
-				let g = i, _ = g.colStart, v = g.rowStart, b = g.colEnd, x = g.rowEnd, S = g.$colStart ? _ : _ + a, C = g.$rowStart ? v : v + o, w = g.$colEnd ? b : b + s, T = g.$rowEnd ? x : x + f;
-				if (_ === -(2 ** 53 - 1) && (S = c, w = u), v === -(2 ** 53 - 1) && (C = l, T = d), S < c || w > u || C < l || T > d) {
-					let i = c - S, g = l - C, _ = u - w, v = d - T;
-					Vi.colStart = Math.max(a, a + i), Vi.rowStart = Math.max(o, o + g), Vi.colEnd = Math.min(s, s + _), Vi.rowEnd = Math.min(f, f + v);
-					let b = ut(e, Vi, h);
+				let h = i, g = h.colStart, _ = h.rowStart, b = h.colEnd, x = h.rowEnd, S = h.$colStart ? g : g + a, C = h.$rowStart ? _ : _ + o, w = h.$colEnd ? b : b + s, T = h.$rowEnd ? x : x + f;
+				if (g === -(2 ** 53 - 1) && (S = c, w = u), _ === -(2 ** 53 - 1) && (C = l, T = d), S < c || w > u || C < l || T > d) {
+					let i = c - S, h = l - C, g = u - w, _ = d - T;
+					Vi.colStart = Math.max(a, a + i), Vi.rowStart = Math.max(o, o + h), Vi.colEnd = Math.min(s, s + g), Vi.rowEnd = Math.min(f, f + _);
+					let b = y(e, Vi, ae);
 					if (b) {
 						let t = b.length;
 						e = b[t - 1], n = e.value, r = n.ref, a = r.colStart, o = r.rowStart, s = r.colEnd, f = r.rowEnd;
@@ -4195,13 +4195,13 @@ var Ai = class extends ke {
 							let t = b[e];
 							p.push(t), m++;
 						}
-					} else n = n.setReferenceAt(t, null), e.value = n, y = n.formula.getReferences(o, a);
+					} else n = n.setReferenceAt(t, null), e.value = n, v = n.formula.getReferences(o, a);
 				}
 			}
-			p[g++] = e;
+			p[h++] = e;
 		}
-		let y = this._container, b = y.getFormulas().clone(), x = y.getPrecedents().clone();
-		y.setFormulas(b), y.setPrecedents(x), i !== r && this._reanchorFormulas(p, void 0, i), Yi(b, x, p, f.removes), this._touchFormulas(f.removes), this._touchFormulas(p), v && this._spillSpatial._updateNodes(v, []), y.markDirty([{
+		let v = this._container, b = v.getFormulas().clone(), x = v.getPrecedents().clone();
+		v.setFormulas(b), v.setPrecedents(x), i !== r && this._reanchorFormulas(p, void 0, i), Yi(b, x, p, f.removes), this._touchFormulas(f.removes), this._touchFormulas(p), _ && this._spillSpatial._updateNodes(_, []), v.markDirty([{
 			...n,
 			scope: i
 		}]);
@@ -4211,7 +4211,7 @@ var Ai = class extends ke {
 		this._removeNow(n);
 		let o = this._container, s = o.getPrecedents().clone(), c = o.getFormulas().clone();
 		o.setPrecedents(s), o.setFormulas(c);
-		let l = vt(s, t, n);
+		let l = _t(s, t, n);
 		l && (Yi(c, s, l.formulas.inserts, l.formulas.removes), this._touchFormulas(l.formulas.removes), this._touchFormulas(l.formulas.inserts));
 		let u = { cutFrom: t }, d = a.createCopiedEntries(t, n, u).inserts, f = d.length, p = this._gridId;
 		if (p !== i) {
@@ -4256,7 +4256,7 @@ var Ai = class extends ke {
 		}
 		let m;
 		Yi(c, s, d), this._touchFormulas(d);
-		let h = me(s, () => {
+		let h = ue(s, () => {
 			let e = o.getDynamics();
 			return m = new Map(e), m;
 		}, t, n);
@@ -4278,15 +4278,15 @@ var Ai = class extends ke {
 		e.values.copyTo(g, {
 			colIndex: n.colStart,
 			rowIndex: n.rowStart
-		}, t), x(this._errorSpatial, g, n);
+		}, t), b(this._errorSpatial, g, n);
 		let _ = e.spillSpatial, v = [], y = [];
 		for (let e = 0; e < f; e++) {
 			let n = d[e];
 			this._createCopySpillEntries(_, t, n, v, y);
 		}
-		let b = [];
-		v.length > 0 && (this._spillSpatial._updateNodes(v, []), r._spillSpatial._updateNodes([], y), se(o.getCycleId(), y, G.EmptyArray, r._contentfulSpatial, r._spillSpatial, r._values, (e, t, n, r) => {
-			b.push({
+		let x = [];
+		v.length > 0 && (this._spillSpatial._updateNodes(v, []), r._spillSpatial._updateNodes([], y), ie(o.getCycleId(), y, G.EmptyArray, r._contentfulSpatial, r._spillSpatial, r._values, (e, t, n, r) => {
+			x.push({
 				colStart: e,
 				rowStart: t,
 				colEnd: n,
@@ -4303,20 +4303,20 @@ var Ai = class extends ke {
 		}]);
 	}
 	_notifyCalculated(e, t, n) {
-		let r, i = !1;
-		i || (typeof t == "boolean" ? i = t : t && (r = t, i = r.full ?? !1));
-		let a = this._notifyValues, o = a.all(), s = this._notifyCalcStatus.all([]);
-		s.length > 0 && this._notifyCalcStatus.clear();
-		let c = this._notifyCircular.all([]), l, u;
-		c.length > 0 && this._notifyCircular.clear(), i ? l = this._spillSpatial.all() : (l = this._notifySpillsInsert, u = this._notifySpillsRemove), this._notifySpillsInsert = [], this._notifySpillsRemove = [];
-		let d = this._notifyFormats.all();
-		d.length > 0 && this._notifyFormats.clear();
-		let f = {}, p = null, m = o.length;
-		if (m > 0) {
-			a.clear();
-			let e = o, t = null;
-			for (let e = 0; e < m; e++) {
-				let n = o[e], r = n.colStart, i = n.colEnd;
+		let i, a = !1;
+		a || (typeof t == "boolean" ? a = t : t && (i = t, a = i.full ?? !1));
+		let o = this._notifyValues, s = o.all(), c = this._notifyCalcStatus.all([]);
+		c.length > 0 && this._notifyCalcStatus.clear();
+		let l = this._notifyCircular.all([]), u, d;
+		l.length > 0 && this._notifyCircular.clear(), a ? u = this._spillSpatial.all() : (u = this._notifySpillsInsert, d = this._notifySpillsRemove), this._notifySpillsInsert = [], this._notifySpillsRemove = [];
+		let f = this._notifyFormats.all();
+		f.length > 0 && this._notifyFormats.clear();
+		let p = {}, m = null, h = s.length;
+		if (h > 0) {
+			o.clear();
+			let e = s, t = null;
+			for (let e = 0; e < h; e++) {
+				let n = s[e], r = n.colStart, i = n.colEnd;
 				if (r !== i) {
 					t ||= [];
 					for (let e = r + 1; e <= i; e++) t.push({
@@ -4328,56 +4328,56 @@ var Ai = class extends ke {
 					n.colEnd = r;
 				}
 			}
-			t && (e = o.concat(t)), e.sort(K.columnFirstRangeComparator);
-			let n = new _e.Builder((e, t) => new P.ArrayList(e.slice(0, t))), r, i = !0 === this._container.getDeferred?.()?.hasHolders(), s = this._values, c = s.getAxis() === W.Axis.Column, l = e.length;
-			for (let t = 0; t < l; t++) {
-				let a = e[t];
-				p = K.unionRanges(p, a, Fi);
-				let o = s.getRuns({ bounds: a }), l = o.next(), u = a.colStart, d = a.rowStart, f = a.colEnd, m = a.rowEnd, h = c ? d : u, g = c ? f : m, _ = c ? m : f, v = c ? u : d, y = h;
-				for (; !l.done;) {
-					let e = l.value, t = e[0];
-					for (; v < t;) r ||= [], r.push({
-						colStart: c ? v : y,
-						rowStart: c ? y : v,
-						colEnd: c ? v : _,
-						rowEnd: c ? _ : v
+			t && (e = s.concat(t)), e.sort(K.columnFirstRangeComparator);
+			let n = new de.Builder((e, t) => new r.ArrayList(e.slice(0, t))), i, a = !0 === this._container.getDeferred?.()?.hasHolders(), c = this._values, l = c.getAxis() === W.Axis.Column, u = e.length;
+			for (let t = 0; t < u; t++) {
+				let r = e[t];
+				m = K.unionRanges(m, r, Fi);
+				let o = c.getRuns({ bounds: r }), s = o.next(), u = r.colStart, d = r.rowStart, f = r.colEnd, p = r.rowEnd, h = l ? d : u, g = l ? f : p, _ = l ? p : f, v = l ? u : d, y = h;
+				for (; !s.done;) {
+					let e = s.value, t = e[0];
+					for (; v < t;) i ||= [], i.push({
+						colStart: l ? v : y,
+						rowStart: l ? y : v,
+						colEnd: l ? v : _,
+						rowEnd: l ? _ : v
 					}), v++, y = h;
-					let a = e[1], s = e[2], u = Math.max(a, h), d = Math.min(a + s.length - 1, _);
-					n.pushMultipleAt(t, u, i ? Qi(s) : s), y < u && (r ||= [], r.push({
-						colStart: c ? t : y,
-						rowStart: c ? y : t,
-						colEnd: c ? t : u - 1,
-						rowEnd: c ? u - 1 : t
-					})), y = d + 1, d >= _ ? (v = t + 1, y = h) : v = t, l = o.next();
+					let r = e[1], c = e[2], u = Math.max(r, h), d = Math.min(r + c.length - 1, _);
+					n.pushMultipleAt(t, u, a ? Qi(c) : c), y < u && (i ||= [], i.push({
+						colStart: l ? t : y,
+						rowStart: l ? y : t,
+						colEnd: l ? t : u - 1,
+						rowEnd: l ? u - 1 : t
+					})), y = d + 1, d >= _ ? (v = t + 1, y = h) : v = t, s = o.next();
 				}
-				for (; v <= g;) y <= _ && (r ||= [], r.push({
-					colStart: c ? v : y,
-					rowStart: c ? y : v,
-					colEnd: c ? v : _,
-					rowEnd: c ? _ : v
+				for (; v <= g;) y <= _ && (i ||= [], i.push({
+					colStart: l ? v : y,
+					rowStart: l ? y : v,
+					colEnd: l ? v : _,
+					rowEnd: l ? _ : v
 				})), v++, y = h;
 			}
-			let u = n.build();
-			u && (f.valueInserts = u), r && (f.valueRemoves = r);
+			let d = n.build();
+			d && (p.valueInserts = d), i && (p.valueRemoves = i);
 		}
-		if (s.length > 0) {
-			let e = this._calcStatusSpatial, t, n = s.length;
+		if (c.length > 0) {
+			let e = this._calcStatusSpatial, t, n = c.length;
 			for (let r = 0; r < n; r++) {
-				let n = s[r];
+				let n = c[r];
 				e.insertNonOverlapping(n, { onIntersect: (e, n) => (t ||= [], t.push({
 					colStart: n.colStart,
 					rowStart: n.rowStart,
 					colEnd: n.colEnd,
 					rowEnd: n.rowEnd,
 					value: n.value
-				}), p = K.unionRanges(p, n), !1 === n.value && (n.value = null), n) });
+				}), m = K.unionRanges(m, n), !1 === n.value && (n.value = null), n) });
 			}
-			t && t.length > 0 && (f.calcStatusUpdates = t, p = K.unionRangesArrays(t, p ?? void 0, Fi));
+			t && t.length > 0 && (p.calcStatusUpdates = t, m = K.unionRangesArrays(t, m ?? void 0, Fi));
 		}
-		if (c.length > 0) {
-			let e = this._circularSpatial, t, n = c.length;
+		if (l.length > 0) {
+			let e = this._circularSpatial, t, n = l.length;
 			for (let r = 0; r < n; r++) {
-				let n = c[r];
+				let n = l[r];
 				e.insertNonOverlapping(n, { onIntersect: (e, n) => {
 					t ||= [];
 					let r = !1 === n.value;
@@ -4387,41 +4387,41 @@ var Ai = class extends ke {
 						colEnd: n.colEnd,
 						rowEnd: n.rowEnd,
 						value: r ? null : n.value
-					}), p = K.unionRanges(p, n), r && (n.value = null), n;
+					}), m = K.unionRanges(m, n), r && (n.value = null), n;
 				} });
 			}
-			t && t.length > 0 && (f.circularUpdates = t, p = K.unionRangesArrays(t, p ?? void 0, Fi));
+			t && t.length > 0 && (p.circularUpdates = t, m = K.unionRangesArrays(t, m ?? void 0, Fi));
 		}
-		let h, g, v = u ? u.length : 0;
-		if (v > 0) {
-			h = [];
-			for (let e = 0; e < v; e++) {
-				let t = u[e], n = t.value?.getBlockedCoords() ?? t;
-				h.push({
+		let g, _, y = d ? d.length : 0;
+		if (y > 0) {
+			g = [];
+			for (let e = 0; e < y; e++) {
+				let t = d[e], n = t.value?.getBlockedCoords() ?? t;
+				g.push({
 					colStart: n.colStart,
 					rowStart: n.rowStart,
 					colEnd: n.colEnd,
 					rowEnd: n.rowEnd
 				});
 			}
-			h && (f.spillRemoves = h, p = K.unionRangesArrays(h, p ?? void 0, Fi));
+			g && (p.spillRemoves = g, m = K.unionRangesArrays(g, m ?? void 0, Fi));
 		}
-		let y = l.length;
-		if (y > 0) {
+		let b = u.length;
+		if (b > 0) {
 			let t = this._spillSpatial, n;
-			for (let r = y - 1; r >= 0; r--) {
-				let a = l[r], o = a.value;
-				if (!i && o.getCycleId() !== e) continue;
-				let s = t.search(a), c = s.length;
+			for (let r = b - 1; r >= 0; r--) {
+				let i = u[r], o = i.value;
+				if (!a && o.getCycleId() !== e) continue;
+				let s = t.search(i), c = s.length;
 				for (let t = 0; t < c; t++) {
 					let r = s[t];
-					if (_(a.rowStart, a.colStart, r) && (i || r.value.getCycleId() === e)) {
-						g || (g = [], n = /* @__PURE__ */ new Set());
-						let e = C(r.colStart) + et(r.rowStart);
+					if (v(i.rowStart, i.colStart, r) && (a || r.value.getCycleId() === e)) {
+						_ || (_ = [], n = /* @__PURE__ */ new Set());
+						let e = it(r.colStart) + st(r.rowStart);
 						if (n.has(e)) continue;
 						n.add(e);
-						let t = r.value.getBlockedCoords() ?? a;
-						g.push({
+						let t = r.value.getBlockedCoords() ?? i;
+						_.push({
 							colStart: t.colStart,
 							rowStart: t.rowStart,
 							colEnd: t.colEnd,
@@ -4431,40 +4431,40 @@ var Ai = class extends ke {
 					}
 				}
 			}
-			g && (f.spillInserts = g, p = K.unionRangesArrays(g, p ?? void 0, Fi));
+			_ && (p.spillInserts = _, m = K.unionRangesArrays(_, m ?? void 0, Fi));
 		}
-		d.length > 0 && (f.formatInserts = d, p = K.unionRangesArrays(d, p ?? void 0, Fi)), this._takeFormulaResults(f, i), f.formulaRemoves && (p = K.unionRangesArrays(f.formulaRemoves, p ?? void 0, Fi));
-		let b = this._notifyBlank;
-		b !== null && (p = K.unionRanges(p, b, Fi), this._notifyBlank = null), p && (f.bounds = {
-			colStart: p.colStart,
-			rowStart: p.rowStart,
-			colEnd: p.colEnd,
-			rowEnd: p.rowEnd
-		}), f.cycleId = Object.keys(f).length === 0 ? e - 1 : e, i && (f.isFull = !0);
-		let x = n === void 0 ? this._container.getCalculatedCommitId() : n;
-		return x !== null && (f.commitId = x), this._holdsBody() && (f.blankRegion = this._blankRegion()), this._onCalculated(f), Promise.resolve(f);
+		f.length > 0 && (p.formatInserts = f, m = K.unionRangesArrays(f, m ?? void 0, Fi)), this._takeFormulaResults(p, a), p.formulaRemoves && (m = K.unionRangesArrays(p.formulaRemoves, m ?? void 0, Fi));
+		let x = this._notifyBlank;
+		x !== null && (m = K.unionRanges(m, x, Fi), this._notifyBlank = null), m && (p.bounds = {
+			colStart: m.colStart,
+			rowStart: m.rowStart,
+			colEnd: m.colEnd,
+			rowEnd: m.rowEnd
+		}), p.cycleId = Object.keys(p).length === 0 ? e - 1 : e, a && (p.isFull = !0);
+		let S = n === void 0 ? this._container.getCalculatedCommitId() : n;
+		return S !== null && (p.commitId = S), this._holdsBody() && (p.blankRegion = this._blankRegion()), this._onCalculated(p), Promise.resolve(p);
 	}
 	_setInputsNow(e, t, n, r) {
-		let i = this._gridId, a = this._container, o = this._context, s = a.getFormulas(), c = s.getSpatialAt(i), l = !!c && !c.isEmpty(), u = t ? t.length : 0, f = this._values, p = f.getAxis() !== W.Axis.Row, m = this._spillSpatial, h = this._errorSpatial, g = this._notifyCalcStatus.size(), _ = this._contentfulSpatial, v = [], y, b, x, S = l ? [] : null;
+		let i = this._gridId, a = this._container, o = this._context, s = a.getFormulas(), c = s.getSpatialAt(i), l = !!c && !c.isEmpty(), u = t ? t.length : 0, d = this._values, p = d.getAxis() !== W.Axis.Row, m = this._spillSpatial, h = this._errorSpatial, _ = this._notifyCalcStatus.size(), v = this._contentfulSpatial, y = [], b, x, S, C = l ? [] : null;
 		if (e && e.tuples) {
-			y = e.tuples;
+			b = e.tuples;
 			let t = e.bounds;
-			if (t ? (b = ue(t, p), b.scope = i) : b = {
+			if (t ? (x = g(t, p), x.scope = i) : x = {
 				colStart: -(2 ** 53 - 1),
 				rowStart: -(2 ** 53 - 1),
 				colEnd: 2 ** 53 - 1,
 				rowEnd: 2 ** 53 - 1,
 				scope: i
-			}, S) {
-				l && v.push(b);
+			}, C) {
+				l && y.push(x);
 				let e = {
 					majorStart: 0,
 					minorStart: 0,
 					majorEnd: 0,
 					minorEnd: 0
-				}, t = y.length;
+				}, t = b.length;
 				for (let n = 0; n < t; n++) {
-					let t = y[n], r = t[0];
+					let t = b[n], r = t[0];
 					e.majorStart = r, e.majorEnd = r;
 					let a = t[1], o = a.length;
 					for (let t = 0; t < o; t++) {
@@ -4472,39 +4472,39 @@ var Ai = class extends ke {
 						e.minorStart = n[0];
 						let r = n[1];
 						e.minorEnd = e.minorStart + r.length - 1;
-						let o = ue(e, p);
-						o.scope = i, S && s.search(o).length > 0 && S.push(o);
+						let o = g(e, p);
+						o.scope = i, C && s.search(o).length > 0 && C.push(o);
 					}
 				}
 			}
-			x = we(e.tuples, p, i);
+			S = ve(e.tuples, p, i);
 		}
-		let C = (e, t) => {
+		let w = (e, t) => {
 			e && this._notifySpillsInsert.push(e), t && this._notifySpillsRemove.push(t);
 		};
-		if (n || y) {
+		if (n || b) {
 			let e;
-			n && (e = ge(n, m, f, _, C, !1, !0, this._notifyValues, (e, t, n, r) => {
-				v.push({
+			n && (e = fe(n, m, d, v, w, !1, !0, this._notifyValues, (e, t, n, r) => {
+				y.push({
 					colStart: e,
 					rowStart: t,
 					colEnd: n,
 					rowEnd: r,
 					scope: i
 				});
-			})), se(-1, n ? [n] : G.EmptyArray, x, _, m, f, (e, t, n, r) => {
-				v.push({
+			})), ie(-1, n ? [n] : G.EmptyArray, S, v, m, d, (e, t, n, r) => {
+				y.push({
 					colStart: e,
 					rowStart: t,
 					colEnd: n,
 					rowEnd: r,
 					scope: i
 				});
-			}, this._notifyValues, C, this._notifyCalcStatus, h, p, !1, this._circularSpatial, this._calcStatusSpatial), n && (f.delete(n), d(h, n)), e?.(), y && (f.setValues(y), lt(h, y, p));
+			}, this._notifyValues, w, this._notifyCalcStatus, h, p, !1, this._circularSpatial, this._calcStatusSpatial), n && (d.delete(n), f(h, n)), e?.(), b && (d.setValues(b), nt(h, b, p));
 		}
-		let w = a.getScope(), T, E, D, O, k, A = (e, t) => {
+		let T = a.getScope(), E, D, O, k, A, ee = (e, t) => {
 			let n = e.rowStart, s = e.colStart;
-			w && (w.rowIndex = n, w.colIndex = s);
+			T && (T.rowIndex = n, T.colIndex = s);
 			let c = a.createFormulaBlock(i, o, t, n, s), l = new fi(e, i, c, a, this._unanchored), u = r?.arrayFixed;
 			u && u.colStart === s && u.rowStart === n && (H(l.getAnchorNode()).fixedRef = {
 				colStart: u.colStart,
@@ -4517,54 +4517,54 @@ var Ai = class extends ke {
 				scope: i,
 				value: l
 			};
-			T ||= [], T.push(d);
-		}, j = (e) => {
+			E ||= [], E.push(d);
+		}, te = (e) => {
 			let t = {
 				...e,
 				scope: i,
 				value: null
 			};
-			D.insertNonOverlapping(t, {
+			O.insertNonOverlapping(t, {
 				noMerge: !0,
 				onUpdates(e, t, n) {
-					E ||= [];
+					D ||= [];
 					for (let e = 0; e < t.length; e++) {
 						let n = t[e];
-						if (E.push(n), k) for (let e = k.length - 1; e >= 0; e--) k[e].value === n.value && k.splice(e, 1);
+						if (D.push(n), A) for (let e = A.length - 1; e >= 0; e--) A[e].value === n.value && A.splice(e, 1);
 					}
 					let r = e ? e.length : 0;
 					for (let t = 0; t < r; t++) {
 						let n = e[t];
-						n.value !== null && (k ||= [], k.push(n));
+						n.value !== null && (A ||= [], A.push(n));
 					}
 				}
 			});
-		}, ee = S ? S.length : 0, M;
+		}, ne = C ? C.length : 0, j;
 		if (u > 0) {
-			M = V(u);
+			j = V(u);
 			for (let e = 0; e < u; e++) {
 				let n = t[e], r = n.value, i = K.sanitizeRange(n);
-				M[e] = i, r !== null && A(i, r);
+				j[e] = i, r !== null && ee(i, r);
 			}
 		}
-		let N = r?.cloneKey ?? null;
-		(ee > 0 || u > 0) && (D = a.getFormulas().clone(N));
-		for (let e = 0; e < ee; e++) j(S[e]);
-		for (let e = 0; e < u; e++) j(M[e]);
-		let te = E ? E.length : 0;
-		if (te > 0) {
+		let M = r?.cloneKey ?? null;
+		(ne > 0 || u > 0) && (O = a.getFormulas().clone(M));
+		for (let e = 0; e < ne; e++) te(C[e]);
+		for (let e = 0; e < u; e++) te(j[e]);
+		let re = D ? D.length : 0;
+		if (re > 0) {
 			let e = a.getDynamics(), t = null;
-			for (let n = 0; n < te; n++) {
-				let r = E[n].value, i = e.get(r);
-				i && (O ||= a.getPrecedents().clone(N), O.removeAll(i, Gi), t ||= new Map(e), t.delete(r));
+			for (let n = 0; n < re; n++) {
+				let r = D[n].value, i = e.get(r);
+				i && (k ||= a.getPrecedents().clone(M), k.removeAll(i, Gi), t ||= new Map(e), t.delete(r));
 			}
 			t && a.setDynamics(t);
 		}
-		let P = [];
-		if (T || E) {
-			O ||= a.getPrecedents().clone(N), Yi(D, O, T, E), k && Zi(O, k, null);
-			let e = T ? this._joinInserted(D, O, T, (e) => {
-				v.push({
+		let ae = [];
+		if (E || D) {
+			k ||= a.getPrecedents().clone(M), Yi(O, k, E, D), A && Zi(k, A, null);
+			let e = E ? this._joinInserted(O, k, E, (e) => {
+				y.push({
 					colStart: e.colStart,
 					rowStart: e.rowStart,
 					colEnd: e.colEnd,
@@ -4572,8 +4572,8 @@ var Ai = class extends ke {
 					scope: i
 				});
 			}) : null;
-			this._touchFormulas(E), this._touchFormulas(T), this._touchFormulas(k), this._touchFormulas(e);
-			let t = k ? function(e, ...t) {
+			this._touchFormulas(D), this._touchFormulas(E), this._touchFormulas(A), this._touchFormulas(e);
+			let t = A ? function(e, ...t) {
 				let n = [];
 				if (!e) return n;
 				for (let r = 0; r < e.length; r++) {
@@ -4590,20 +4590,20 @@ var Ai = class extends ke {
 					}
 				}
 				return n;
-			}(E, S, M) : E;
-			se(-1, t, T, _, m, f, (e, t, n, r) => {
-				v.push({
+			}(D, C, j) : D;
+			ie(-1, t, E, v, m, d, (e, t, n, r) => {
+				y.push({
 					colStart: e,
 					rowStart: t,
 					colEnd: n,
 					rowEnd: r,
 					scope: i
 				});
-			}, this._notifyValues, C, this._notifyCalcStatus, h, p, !0, this._circularSpatial, this._calcStatusSpatial);
+			}, this._notifyValues, w, this._notifyCalcStatus, h, p, !0, this._circularSpatial, this._calcStatusSpatial);
 		}
-		if (O && a.setPrecedents(O), D && (T || E || k) && a.setFormulas(D), T) for (let e = 0; e < T.length; e++) {
-			let t = T[e];
-			P.push({
+		if (k && a.setPrecedents(k), O && (E || D || A) && a.setFormulas(O), E) for (let e = 0; e < E.length; e++) {
+			let t = E[e];
+			ae.push({
 				colStart: t.colStart,
 				rowStart: t.rowStart,
 				colEnd: t.colEnd,
@@ -4611,9 +4611,9 @@ var Ai = class extends ke {
 				scope: i
 			});
 		}
-		if (E) for (let e = 0; e < E.length; e++) {
-			let t = E[e];
-			P.push({
+		if (D) for (let e = 0; e < D.length; e++) {
+			let t = D[e];
+			ae.push({
 				colStart: t.colStart,
 				rowStart: t.rowStart,
 				colEnd: t.colEnd,
@@ -4621,7 +4621,7 @@ var Ai = class extends ke {
 				scope: i
 			});
 		}
-		return this._notifyCalcStatus.size() !== g && (a.getDeferred?.()?.noteRepaint(i), a.requestCalculateGrid(i)), v.length > 0 && a.markDirty(v), P;
+		return this._notifyCalcStatus.size() !== _ && (a.getDeferred?.()?.noteRepaint(i), a.requestCalculateGrid(i)), y.length > 0 && a.markDirty(y), ae;
 	}
 	_rederivePrecedentsNow(e) {
 		let t = this._container, n = t.getPrecedents().clone();
@@ -4646,15 +4646,15 @@ var Ai = class extends ke {
 			let t = l(e);
 			for (let n = 0; n < t.length; n++) if (t[n].value === e.value) return !0;
 			return !1;
-		}, d = !1, p = (e) => {
+		}, d = !1, f = (e) => {
 			let n = e.value, r = a.get(n);
 			r && (t.removeAll(r, Gi), a === o && (a = new Map(a)), a.delete(n), d = !0), !d && !s.isEmpty() && s.search(e).length > 0 && (d = !0);
-		}, m = null;
+		}, p = null;
 		for (let i = 0; i < n.length; i++) {
 			let a = n[i];
 			if (!c(a) || !u(a)) continue;
 			d = !1;
-			let o = f(l, a, (e, t, n, r) => {
+			let o = x(l, a, (e, t, n, r) => {
 				if (!c(e) || !c(t)) return;
 				let i = {
 					colStart: n.colStart,
@@ -4664,12 +4664,12 @@ var Ai = class extends ke {
 				};
 				return e.value.getMerged(t.value, i, r);
 			}, (n, r) => {
-				for (let e = 0; e < n.length; e++) p(n[e]);
+				for (let e = 0; e < n.length; e++) f(n[e]);
 				Zi(t, null, n), e.removeAll(n, Gi), e.load([r]), Zi(t, [r], null);
 			});
-			o !== a && ((m ??= []).push(o), d && r(o));
+			o !== a && ((p ??= []).push(o), d && r(o));
 		}
-		return a !== o && i.setDynamics(a), m;
+		return a !== o && i.setDynamics(a), p;
 	}
 	_clearAll() {
 		this._contentfulSpatial.clear(), this._values.clear(), this._spillSpatial.clear(), this._errorSpatial.clear(), this._calcStatusSpatial.clear(), this._circularSpatial.clear(), this._notifyValues.clear(), this._notifyBlank = null, this._notifySpillsInsert = [], this._notifySpillsRemove = [], this._notifyFormats.clear(), this._notifyCalcStatus.clear(), this._touchedFormulas = [];
@@ -4704,8 +4704,8 @@ var Ai = class extends ke {
 				let t = e.data;
 				this._values.setValues(t);
 				let n = this._values.getAxis() === W.Axis.Column;
-				lt(this._errorSpatial, t, n);
-				let r = we(t, n, this._gridId);
+				nt(this._errorSpatial, t, n);
+				let r = ve(t, n, this._gridId);
 				this._contentfulSpatial.load(r);
 			}
 			let t = this._gridId, n = this._container, r = n.getPrecedents(), i = n.getFormulas(), a = {
@@ -4717,29 +4717,29 @@ var Ai = class extends ke {
 				if (l) {
 					let e = l.length;
 					for (let t = 0; t < e; t++) {
-						let e = l[t], n = e[0], r = p(n, a).split(":")[0];
+						let e = l[t], n = e[0], r = S(n, a).split(":")[0];
 						u.add(r);
-						let i = gt(e, a);
+						let i = Ge(e, a);
 						i && d.add(`${i.rowStart},${i.colStart}`);
 					}
 				}
-				let f = o.length, m = Array(f), h = [], g = n.getRuntime(), _ = this._context, v = n.getScope();
+				let f = o.length, p = Array(f), h = [], g = n.getRuntime(), _ = this._context, v = n.getScope();
 				v.colIndex = 0, v.rowIndex = 0, v.gridId = t;
 				let y = n.isLegacyIntersect();
 				for (let e = 0; e < f; e++) {
-					let r = gt(o[e], a);
+					let r = Ge(o[e], a);
 					r.scope = t;
 					let i = r.value, s = r.rowStart, c = r.colStart;
 					v.colIndex = c, v.rowIndex = s;
-					let l = y && !(d.size > 0 && d.has(`${s},${c}`)), f = n.createFormulaBlock(t, _, i, s, c, void 0, l), p = f.resolvedPrecedentsAt(s, c, !0, Ii, Li), g = p.length;
+					let l = y && !(d.size > 0 && d.has(`${s},${c}`)), f = n.createFormulaBlock(t, _, i, s, c, void 0, l), m = f.resolvedPrecedentsAt(s, c, !0, Ii, Li), g = m.length;
 					g === 1 && (f = f.wrapImplicit(s, c, u));
 					let b = new fi(r, t, f, n, this._unanchored);
-					b.fromLoad = !0, r.value = b, m[e] = r;
+					b.fromLoad = !0, r.value = b, p[e] = r;
 					let x = r.rowEnd, S = r.colEnd - c, C = x - s, w = [], T = f.getReferences(s, c);
 					for (let e = 0; e < g; e++) {
-						let n = p[e];
+						let n = m[e];
 						if (U.isError(n)) continue;
-						let i = ve(T[e], Li[e], Ii[e]), a = i.$absColEnd, o = i.$absRowEnd, s = {
+						let i = he(T[e], Li[e], Ii[e]), a = i.$absColEnd, o = i.$absRowEnd, s = {
 							colStart: n.colStart,
 							rowStart: n.rowStart,
 							colEnd: n.colEnd + (a ? 0 : S),
@@ -4759,10 +4759,10 @@ var Ai = class extends ke {
 						w.push(n), h.push(s);
 					}
 				}
-				if (i.load(m), r.load(h), n.bumpCalcEpochs(!0), s.formulaInserts = this._formulaRecords(m), l) {
+				if (i.load(p), r.load(h), n.bumpCalcEpochs(!0), s.formulaInserts = this._formulaRecords(p), l) {
 					let e = [], o = [], c = /* @__PURE__ */ new Map(), u = this._values, d = l.length;
 					for (let n = 0; n < d; n++) {
-						let r = gt(l[n], a), s = r.value ?? "dynamic", d = s === "error", f = r.colStart, p = r.rowStart;
+						let r = Ge(l[n], a), s = r.value ?? "dynamic", d = s === "error", f = r.colStart, p = r.rowStart;
 						Ri.colStart = f, Ri.rowStart = p, Ri.colEnd = f, Ri.rowEnd = p, Ri.scope = t;
 						let m = i.search(Ri);
 						if (m.length !== 1) continue;
@@ -4772,13 +4772,13 @@ var Ai = class extends ke {
 							colEnd: v,
 							rowEnd: y
 						};
-						s === "fixed" && (H(_).fixedRef = b, h.densify()), _.cachedValue = d ? U.BuiltIn.Spill : new $e(g, u, b);
+						s === "fixed" && (H(_).fixedRef = b, h.densify()), _.cachedValue = d ? U.BuiltIn.Spill : new We(g, u, b);
 						let x = {
 							colStart: f,
 							rowStart: p,
 							colEnd: v,
 							rowEnd: y,
-							value: new ot(b, 0, s)
+							value: new Qe(b, 0, s)
 						};
 						o.push(x), e.push({
 							colStart: f,
@@ -4786,7 +4786,7 @@ var Ai = class extends ke {
 							colEnd: v,
 							rowEnd: y,
 							value: s
-						}), le(c, _, b, mi);
+						}), oe(c, _, b, mi);
 					}
 					if (this._spillSpatial.load(o), c.size > 0) {
 						r.load(Array.from(c.values()).flat()), n.bumpCalcEpochs(!1);
@@ -4796,23 +4796,23 @@ var Ai = class extends ke {
 					}
 					e.length > 0 && (s.spillInserts = e);
 				}
-				let b = !1, x = e.volatile, S = x ? x.length : 0;
-				if (S > 0) {
+				let b = !1, x = e.volatile, C = x ? x.length : 0;
+				if (C > 0) {
 					let e = n.getVolatiles(), t = (t) => {
 						e.add(t), t.state |= $n, t.block.calcOnLoad = !0;
-					}, r = Array(S);
-					for (let e = 0; e < S; e++) {
-						let n = x[e], o = pe(n, a);
+					}, r = Array(C);
+					for (let e = 0; e < C; e++) {
+						let n = x[e], o = m(n, a);
 						r[e] = { ...o };
 						let s = i.search(o), c = s.length;
 						for (let e = 0; e < c; e++) {
 							let n = s[e];
-							nt(n, o, t);
+							qe(n, o, t);
 						}
 					}
 					this._markDirtyRegionsNow(r), b = !0;
 				}
-				let C = this._contentfulSpatial, w = !C.isEmpty(), T = null, E = {
+				let w = this._contentfulSpatial, T = !w.isEmpty(), E = null, D = {
 					rowStart: 0,
 					colStart: 0,
 					rowEnd: 0,
@@ -4820,29 +4820,29 @@ var Ai = class extends ke {
 					scope: t
 				};
 				for (let e = 0; e < f; e++) {
-					let t = m[e];
+					let t = p[e];
 					if (!t) continue;
 					let n = (t.rowEnd - t.rowStart + 1) * (t.colEnd - t.colStart + 1), r = 0;
-					if (w) {
-						E.rowStart = t.rowStart, E.colStart = t.colStart, E.rowEnd = t.rowEnd, E.colEnd = t.colEnd;
-						let e = C.search(E);
+					if (T) {
+						D.rowStart = t.rowStart, D.colStart = t.colStart, D.rowEnd = t.rowEnd, D.colEnd = t.colEnd;
+						let e = w.search(D);
 						for (let n = 0; n < e.length; n++) {
 							let i = e[n];
 							r += (Math.min(i.rowEnd, t.rowEnd) - Math.max(i.rowStart, t.rowStart) + 1) * (Math.min(i.colEnd, t.colEnd) - Math.max(i.colStart, t.colStart) + 1);
 						}
 					}
 					let i = r < n && !this._isSavedSpill(t);
-					i && (t.value.uncalculated = !0), (i || t.value?.getError()) && (T ??= []).push({
+					i && (t.value.uncalculated = !0), (i || t.value?.getError()) && (E ??= []).push({
 						rowStart: t.rowStart,
 						colStart: t.colStart,
 						rowEnd: t.rowEnd,
 						colEnd: t.colEnd
 					});
 				}
-				if (T && (this._markDirtyRegionsNow(T), b = !0), c && f > 0) {
+				if (E && (this._markDirtyRegionsNow(E), b = !0), c && f > 0) {
 					let e = Array(f);
 					for (let t = 0; t < f; t++) {
-						let n = m[t];
+						let n = p[t];
 						e[t] = {
 							rowStart: n.rowStart,
 							colStart: n.colStart,
@@ -4882,42 +4882,42 @@ var Ai = class extends ke {
 	}
 	_toJSONNow(e) {
 		let t = this._container.getFormulas().getSpatialAt(this._gridId)?.all(), n = t ? t.length : 0;
-		n > 0 && (t = ce(t, xn.Column, 2, Ki), t.sort(K.rowFirstRangeComparator)), n = t ? t.length : 0;
-		let r = this._hiddenRows, a = this._hiddenColumns, o = this._filtered;
-		if (n === 0 && !r && !a && !o) return null;
-		let s = {};
-		r && (s.hiddenRows = r), a && (s.hiddenColumns = a), o && (s.filtered = !0);
-		let c = this._spillSpatial.all().filter((e) => e.value.getKind() !== "pivot"), l = c.length;
-		if (l > 1 && c.sort(K.rowFirstRangeComparator), n > 0) {
+		n > 0 && (t = le(t, xn.Column, 2, Ki), t.sort(K.rowFirstRangeComparator)), n = t ? t.length : 0;
+		let r = this._hiddenRows, i = this._hiddenColumns, a = this._filtered;
+		if (n === 0 && !r && !i && !a) return null;
+		let o = {};
+		r && (o.hiddenRows = r), i && (o.hiddenColumns = i), a && (o.filtered = !0);
+		let s = this._spillSpatial.all().filter((e) => e.value.getKind() !== "pivot"), c = s.length;
+		if (c > 1 && s.sort(K.rowFirstRangeComparator), n > 0) {
 			let e = Array(n);
 			for (let r = 0; r < n; r++) {
 				let n = t[r];
 				e[r] = n.value.toJSON(!1, n);
 			}
-			s.formulas = e;
+			o.formulas = e;
 		}
-		if (l > 0) {
-			let e = this.getEntireCoords(), t = Array(l);
-			for (let n = 0; n < l; n++) {
-				let r = c[n], a = i(r, e);
-				t[n] = [a, r.value.getKind()];
+		if (c > 0) {
+			let e = this.getEntireCoords(), t = Array(c);
+			for (let n = 0; n < c; n++) {
+				let r = s[n], i = De(r, e);
+				t[n] = [i, r.value.getKind()];
 			}
-			s.formulaArray = t;
+			o.formulaArray = t;
 		}
-		let u = this._container.getVolatiles(), d = this._gridId, f = null;
-		if (u.size > 0) {
-			let e = u.values(), t = e.next(), n = this._values.getAxis() === W.Axis.Column, r = E(!0);
+		let l = this._container.getVolatiles(), u = this._gridId, d = null;
+		if (l.size > 0) {
+			let e = l.values(), t = e.next(), n = this._values.getAxis() === W.Axis.Column, r = ne(!0);
 			for (; !t.done;) {
 				let i = t.value;
-				if (t = e.next(), i.gridId !== d || i.ext !== null && i.ext.shownGroup !== 0) continue;
+				if (t = e.next(), i.gridId !== u || i.ext !== null && i.ext.shownGroup !== 0) continue;
 				let a = i.colIndex, o = i.rowIndex, s = n ? a : o, c = n ? o : a;
 				r.append(s, c);
 			}
-			f = r.done(!0);
+			d = r.done(!0);
 		}
-		let p = this._circularSpatial, m = this._calcStatusSpatial, h = c.filter((e) => e.value.getError());
-		if (!p.isEmpty() || !m.isEmpty() || h.length > 0) {
-			let e = f ? f.slice() : [], t = (t) => {
+		let f = this._circularSpatial, p = this._calcStatusSpatial, m = s.filter((e) => e.value.getError());
+		if (!f.isEmpty() || !p.isEmpty() || m.length > 0) {
+			let e = d ? d.slice() : [], t = (t) => {
 				for (let n = 0; n < t.length; n++) {
 					let r = t[n];
 					e.push({
@@ -4928,20 +4928,20 @@ var Ai = class extends ke {
 					});
 				}
 			};
-			p.isEmpty() || t(p.all());
-			let n = m.isEmpty() ? [] : m.all().filter((e) => e.value === j.CalcStatus.Working);
-			n.length > 0 && t(n), h.length > 0 && t(h), f = ce(e, xn.Column, 2);
-		}
-		let g = f ? f.length : 0;
-		if (g > 0) {
-			let e = Array(g);
-			for (let t = 0; t < g; t++) {
-				let n = f[t], r = i(n, this.getEntireCoords());
+			f.isEmpty() || t(f.all());
+			let n = p.isEmpty() ? [] : p.all().filter((e) => e.value === D.CalcStatus.Working);
+			n.length > 0 && t(n), m.length > 0 && t(m), d = le(e, xn.Column, 2);
+		}
+		let h = d ? d.length : 0;
+		if (h > 0) {
+			let e = Array(h);
+			for (let t = 0; t < h; t++) {
+				let n = d[t], r = De(n, this.getEntireCoords());
 				e[t] = r;
 			}
-			s.volatile = e;
+			o.volatile = e;
 		}
-		return s;
+		return o;
 	}
 }, ji = /* @__PURE__ */ new WeakMap(), Mi = (e, t) => {
 	let n = e?.length ?? 0;
@@ -5049,25 +5049,25 @@ function Zi(e, t, n) {
 	let a = [];
 	for (let e = 0; e < i; e++) {
 		let n = t[e], r = [], i = a.length;
-		m(n, a, r), a.length > i && (n.value.registeredPrecedents = a.slice(i));
+		h(n, a, r), a.length > i && (n.value.registeredPrecedents = a.slice(i));
 	}
 	e.load(a);
 }
 Wi.fill(null, 0, 10);
 var Qi = (e) => {
 	let t = !1;
-	if (ye.forEachLeaf(e, (e, n, r, i) => {
-		if (t || e instanceof M) return;
+	if (te.forEachLeaf(e, (e, n, r, i) => {
+		if (t || e instanceof u) return;
 		let a = n + i - r;
 		!0 === e.isIRepeatingList && (a = Math.min(a, n + e.getPeriod() - 1));
-		for (let r = n; !t && r <= a; r++) t = St(e.at(r));
+		for (let r = n; !t && r <= a; r++) t = Dt(e.at(r));
 	}), !t) return e;
-	let n = e.length, r = Array(n);
-	for (let t = 0; t < n; t++) r[t] = Te(e.at(t));
-	return new P.ArrayList(r);
+	let n = e.length, i = Array(n);
+	for (let t = 0; t < n; t++) i[t] = Tt(e.at(t));
+	return new r.ArrayList(i);
 }, $i = (e, t, n) => {
 	let r = n?.fetchedFrom;
-	if (!e) return new c({
+	if (!e) return new O({
 		source: { buffer: t },
 		fetchedFrom: r
 	});
@@ -5108,13 +5108,13 @@ var Qi = (e) => {
 		}
 	}
 	_moved() {
-		Et(), this._onMoved?.(this);
+		ye(), this._onMoved?.(this);
 	}
 	_final() {
 		let e = this._onFinal;
 		this._onFinal = null, e?.(this);
 	}
-}, aa = (e) => e, oa = (e, t) => st.fromJSON({
+}, aa = (e) => e, oa = (e, t) => He.fromJSON({
 	type: e,
 	data: t
 }), sa = (e, t) => globalThis.fetch(e, t), ca = () => {
@@ -5229,7 +5229,7 @@ var Qi = (e) => {
 		}, e);
 	}
 	newHolder(e, t) {
-		return this._holders = !0, new be(e, t.calls, t.direct);
+		return this._holders = !0, new St(e, t.calls, t.direct);
 	}
 	defer(e, t, n = null, r = !1) {
 		let i = this._scope, a = i.deferOrdinal++;
@@ -5305,7 +5305,7 @@ var Qi = (e) => {
 		let t = this._scope, n = t.node;
 		if (!n || !this._holders || !t.gridId) return;
 		let r = this._heldAt(t.gridId, t.rowIndex, t.colIndex);
-		return r === null && St(n.cachedValue) && (r = n.cachedValue), r === null ? void 0 : r.calls[e];
+		return r === null && Dt(n.cachedValue) && (r = n.cachedValue), r === null ? void 0 : r.calls[e];
 	}
 }, fa = (e, t) => {
 	for (let n of e) n.isOpen() && n.reject(t);
@@ -5394,7 +5394,7 @@ var Qi = (e) => {
 	}
 	_grow() {
 		let e = this._keys, t = this._values, n = this._order, r = this.size, i = Math.max(64, 2 * (this._mask + 1));
-		this._keys = new Float64Array(i).fill(-1), this._values = Ge(i), this._order = new Int32Array(i), this._mask = i - 1;
+		this._keys = new Float64Array(i).fill(-1), this._values = Ie(i), this._order = new Int32Array(i), this._mask = i - 1;
 		for (let i = 0; i < r; i++) {
 			let r = e[n[i]], a = Math.floor(r / ga), o = this._slotOf(a, r - a * ga, r);
 			this._keys[o] = r, this._values[o] = t[n[i]], this._order[i] = o;
@@ -5781,7 +5781,7 @@ var xa = {
 	getValues(e) {
 		let t = this.getRuns(e ? { bounds: e } : void 0), n = t.next();
 		if (n.done) return null;
-		let r = new _e.Builder();
+		let r = new de.Builder();
 		for (; !n.done;) r.pushMultipleAt(n.value[0], n.value[1], n.value[2]), n = t.next();
 		return r.build();
 	}
@@ -6113,16 +6113,16 @@ var Pa = class {
 			dynamicByBlock: _,
 			lastUpdates: new Map(v)
 		};
-		let D = /* @__PURE__ */ new Map();
+		let E = /* @__PURE__ */ new Map();
 		this._addDynamicPrecedent = (e, t, n) => {
-			e?.block && (f.getScope().perCellRead = !0, n === pi && (e.state |= $n), le(D, e, t, n));
+			e?.block && (f.getScope().perCellRead = !0, n === pi && (e.state |= $n), oe(E, e, t, n));
 		};
-		let O = /* @__PURE__ */ new Map(), k = (e, t) => {
+		let D = /* @__PURE__ */ new Map(), O = (e, t) => {
 			(function(e, t, n, r) {
 				if (t === 0) return;
 				let i, a, o, s = Va, c = [], l = /* @__PURE__ */ new Set(), u = () => {
 					let e = i.build();
-					e && e.tuples && (o.values.setValues(e.tuples), lt(o.errorSpatial, e.tuples, r));
+					e && e.tuples && (o.values.setValues(e.tuples), nt(o.errorSpatial, e.tuples, r));
 					let t = a.done(!0);
 					for (let e = 0; e < t.length; e++) {
 						let n = t[e];
@@ -6148,7 +6148,7 @@ var Pa = class {
 				e.length = t, e.sort(r ? Wa : Ka);
 				for (let d = 0; d < t; d++) {
 					let t = e[d], f = t.colIndex, p = t.rowIndex, m = t.gridId;
-					m || console.log("nodeGridId is null", t), m !== s && (s !== Va && u(), i = new _e.Builder(Fa), a = E(r), s = m, o = n(m));
+					m || console.log("nodeGridId is null", t), m !== s && (s !== Va && u(), i = new de.Builder(Fa), a = ne(r), s = m, o = n(m));
 					let h = r ? f : p, g = r ? p : f, _ = t.cachedValue;
 					_?.isIRange || (i.pushAt(h, g, _), a.append(h, g));
 					let v = t.block, y = t.numFmt;
@@ -6169,7 +6169,7 @@ var Pa = class {
 								}
 							});
 						}
-					} else y !== null && (o.formatsConflating || (o.formatsConflating = E(r)), o.formatsConflating.append(h, g, y));
+					} else y !== null && (o.formatsConflating || (o.formatsConflating = ne(r)), o.formatsConflating.append(h, g, y));
 				}
 				u();
 			})(e, t, p, !0);
@@ -6177,22 +6177,22 @@ var Pa = class {
 				let t = e[n];
 				t.state = t.state & ~q | pr;
 			}
-			for (let [e, t] of v) O.set(e, t);
+			for (let [e, t] of v) D.set(e, t);
 			v.clear();
-		}, A = r, j = ss;
-		j.length = 0;
-		let ee = 0, M = !1;
+		}, k = r, A = ss;
+		A.length = 0;
+		let ee = 0, te = !1;
 		do {
-			++S, x(), this.doMarkAndPlan(e, S, C, j);
-			let t = this.doEvaluate(e, p, k, A, j);
-			M = t !== void 0, M && (A = !1, ++S, C.length = 0, this.doCollectDirtyCalcs(e, S, t.all(), C, l, h, y), ee > 200 && (++S, x(), this.doMarkAndPlan(e, S, C, j, !0), this.doEvaluate(e, p, k, !1, j), this._hasCycle() || console.error("Too many iterations, possible cycle or leak"), M = !1)), ee++;
-		} while (M);
+			++S, x(), this.doMarkAndPlan(e, S, C, A);
+			let t = this.doEvaluate(e, p, O, k, A);
+			te = t !== void 0, te && (k = !1, ++S, C.length = 0, this.doCollectDirtyCalcs(e, S, t.all(), C, l, h, y), ee > 200 && (++S, x(), this.doMarkAndPlan(e, S, C, A, !0), this.doEvaluate(e, p, O, !1, A), this._hasCycle() || console.error("Too many iterations, possible cycle or leak"), te = !1)), ee++;
+		} while (te);
 		for (let e of b) {
-			if (D.has(e)) continue;
+			if (E.has(e)) continue;
 			let t = _.get(e);
 			t && (h.removeAll(t, Gi), _ === g && (_ = new Map(_)), _.delete(e));
 		}
-		if (D.size > 0) {
+		if (E.size > 0) {
 			if (function(e, t, n) {
 				for (let t of n) if (!e.has(t)) return !1;
 				for (let [n, r] of e) {
@@ -6211,22 +6211,22 @@ var Pa = class {
 					}
 				}
 				return !0;
-			}(D, g, b)) h = m, _ = g, D.clear();
+			}(E, g, b)) h = m, _ = g, E.clear();
 			else {
 				h === m && (h = h.clone()), _ === g && (_ = new Map(_));
-				for (let e of D.keys()) {
+				for (let e of E.keys()) {
 					let t = _.get(e);
 					t && h.removeAll(t, Gi);
 				}
-				h.load(Array.from(D.values()).flat());
-				for (let [e, t] of D) _.set(e, t);
-				D.clear();
+				h.load(Array.from(E.values()).flat());
+				for (let [e, t] of E) _.set(e, t);
+				E.clear();
 			}
 		}
 		return this._gridUpdates = null, this._addDynamicPrecedent = null, this._context._setDynamicReadHook(null), this._passActive = !1, f.getDeferred?.()?.flush(), {
 			precedentSpatial: h,
 			dynamicByBlock: _,
-			lastUpdates: O,
+			lastUpdates: D,
 			skippedTables: this._takeSkippedTables()
 		};
 	}
@@ -6239,7 +6239,7 @@ var Pa = class {
 		if (r?.isIRange && r.size > 1) {
 			if (t.uncalculated) return;
 			let i = e.rowIndex, a = e.colIndex;
-			return new $e(this._container.getRuntime(), n.getValues().clone(), {
+			return new We(this._container.getRuntime(), n.getValues().clone(), {
 				rowStart: i,
 				colStart: a,
 				rowEnd: i + r.getRowCount() - 1,
@@ -6432,7 +6432,7 @@ var Pa = class {
 			let t = r.deferCount;
 			i = n.finalizeValueForCell(n.evaluateAt(e.rowIndex, e.colIndex)), r.deferCount !== t && (i = this._takeDeferred(e, i));
 		} catch (t) {
-			if (!(t instanceof je)) throw t;
+			if (!(t instanceof Oe)) throw t;
 			i = e.cachedValue ?? null;
 		}
 		return this._fitCell(t, i);
@@ -6464,15 +6464,15 @@ var Pa = class {
 		if (i.blankCycleId === a && i.blankMarkId === o) return;
 		let s = this._container.getScope(), c = s.perCellRead, l = !(r || c || t && t.isIRange), u = !1;
 		if (l && s.positionRead && (u = !this._isPositionFree(e, t), l = !u), !l) return u && !c && this._container.getGrid(e.gridId)?.isPaged() ? void this._pageBlank(i, n) : void this._fallbackBlank(i, c || u);
-		let f = i.blankShared, p = i.blankValue;
+		let d = i.blankShared, p = i.blankValue;
 		i.blankValue = t, i.blankCycleId = a, i.blankMarkId = o;
 		let m = i.getTouchedCached().blank, h = e.gridId, g = n.values, _ = n.errorSpatial, v = this._container.getGrid(h);
 		if (v !== null && v.getShadowOf() !== null) return void La(m, n, h);
 		let y = g.getAxis() === W.Axis.Column, b = y ? W.Axis.Column : W.Axis.Row, x = oo, S = so;
 		for (let e = 0; e < m.length; e++) {
-			let n = m[e], r = y ? n.colStart : n.rowStart, i = y ? n.colEnd : n.rowEnd, a = y ? n.rowStart : n.colStart, o = y ? n.rowEnd - n.rowStart + 1 : n.colEnd - n.colStart + 1, s = new F([t], o), c = Array(i - r + 1);
+			let n = m[e], r = y ? n.colStart : n.rowStart, i = y ? n.colEnd : n.rowEnd, a = y ? n.rowStart : n.colStart, o = y ? n.rowEnd - n.rowStart + 1 : n.colEnd - n.colStart + 1, s = new P([t], o), c = Array(i - r + 1);
 			for (let e = r; e <= i; e++) c[e - r] = [e, [[a, s]]];
-			g.setValues(c), d(_, n), lt(_, c, y);
+			g.setValues(c), f(_, n), nt(_, c, y);
 			let l = {
 				colStart: n.colStart,
 				rowStart: n.rowStart,
@@ -6482,10 +6482,10 @@ var Pa = class {
 			};
 			x.push({
 				...l,
-				value: new We(l, b)
+				value: new Fe(l, b)
 			}), S.push(l);
 		}
-		n.contentfulSpatial.insertAllNonOverlapping(x), n.notifyValues.insertAllNonOverlapping(S), x.length = 0, S.length = 0, i.setBlankShared(m), this._dirtyBlankReaders(h, m, p === t ? f : null);
+		n.contentfulSpatial.insertAllNonOverlapping(x), n.notifyValues.insertAllNonOverlapping(S), x.length = 0, S.length = 0, i.setBlankShared(m), this._dirtyBlankReaders(h, m, p === t ? d : null);
 	}
 	_dirtyBlankReaders(e, t, n) {
 		if (n !== null && Qr(t, n)) return;
@@ -6494,7 +6494,7 @@ var Pa = class {
 		for (let e = 0; e < t.length; e++) n === null ? i.push(t[e]) : $r(t[e], n, i);
 		for (let t = 0; t < i.length; t++) {
 			let n = i[t];
-			a.colStart = n.colStart, a.rowStart = n.rowStart, a.colEnd = n.colEnd, a.rowEnd = n.rowEnd, r.search(a).length !== 0 && (this._fallbackDirty ??= new v()).insertNonOverlapping({
+			a.colStart = n.colStart, a.rowStart = n.rowStart, a.colEnd = n.colEnd, a.rowEnd = n.rowEnd, r.search(a).length !== 0 && (this._fallbackDirty ??= new N()).insertNonOverlapping({
 				colStart: n.colStart,
 				rowStart: n.rowStart,
 				colEnd: n.colEnd,
@@ -6511,7 +6511,7 @@ var Pa = class {
 		Ra(e, n.blank, t);
 		let r = e.getDemandedBlank();
 		if (r.length === 0) return;
-		let i = this._fallbackDirty ??= new v(), a = e.gridId, o = co;
+		let i = this._fallbackDirty ??= new N(), a = e.gridId, o = co;
 		for (let e = 0; e < r.length; e++) {
 			let t = r[e];
 			o.push({
@@ -6530,7 +6530,7 @@ var Pa = class {
 		if (n === null) return;
 		let r = n.blank;
 		if (r.length === 0) return;
-		let i = this._fallbackDirty ??= new v(), a = e.gridId, o = co;
+		let i = this._fallbackDirty ??= new N(), a = e.gridId, o = co;
 		for (let e = 0; e < r.length; e++) {
 			let t = r[e];
 			o.push({
@@ -6821,7 +6821,7 @@ var Pa = class {
 			let t = this._cycleOf(s), n = o === X;
 			(n ? t.members : t.downstream).add(e), c = t.getEntry(n);
 		}
-		a.shownGroup = s, e.state = e.state & ~tr | o << 2, t.circularConflating ||= E(i), t.circularConflating.append(n, r, c);
+		a.shownGroup = s, e.state = e.state & ~tr | o << 2, t.circularConflating ||= ne(i), t.circularConflating.append(n, r, c);
 	}
 	_cycleOf(e) {
 		let t = this._cycles.get(e);
@@ -6907,8 +6907,8 @@ var Pa = class {
 				sn(r, n, t, O, k, A);
 			}
 		}
-		let j = qa();
-		if (g.discoveryMs += j - _, v && g.fastEligible++, y !== null) {
+		let ee = qa();
+		if (g.discoveryMs += ee - _, v && g.fastEligible++, y !== null) {
 			let n = y.plan, r = y.planLength === b;
 			for (let i = 0; r && i < b; i++) {
 				let a = n[i];
@@ -6943,7 +6943,7 @@ var Pa = class {
 			})(go, b, s, this._lastStampedLength), r.length = b;
 			let e = b, t = this._lastStampedOrderedLength;
 			for (; e > 0 && s[e - 1].orderIndex >= t;) e--;
-			return e < b && this._flagDemandAppendix(s, e, b), this._rememberPlan(a, o, s, b, m, e), g.fastHits++, g.kahnMs += qa() - j, e === b;
+			return e < b && this._flagDemandAppendix(s, e, b), this._rememberPlan(a, o, s, b, m, e), g.fastHits++, g.kahnMs += qa() - ee, e === b;
 		}
 		if (f === "on" && !i && A.size > 0 && x === 0 && b >= Uo && this._cycles.size === 0 && function(e, t, n, r) {
 			let i = /* @__PURE__ */ new Map(), a = null;
@@ -7006,27 +7006,27 @@ var Pa = class {
 				for (let e = 0; e < i.length; e++) --i[e].waitingOn === 0 && o.push(i[e]);
 			}
 			return o.length === i.size;
-		}(go, b, d, s)) return r.length = b, this._stampPlan(s, b, b, p), this._rememberPlan(a, o, s, b, m), g.blockOrdered++, g.kahnMs += qa() - j, !0;
-		let ee = (e) => {
+		}(go, b, d, s)) return r.length = b, this._stampPlan(s, b, b, p), this._rememberPlan(a, o, s, b, m), g.blockOrdered++, g.kahnMs += qa() - ee, !0;
+		let te = (e) => {
 			g.planAssertFailures++, console.error("CalcExecutor: order-stamp fast path would invert a static edge at", e.gridId, e.rowIndex, e.colIndex), v = !1;
-		}, M = (n) => {
-			n.cycleId === e && n.markId === t ? (Bo++, v && n.orderIndex >= zo.orderIndex && ee(zo)) : this._iterate || (n.state & tr) === 0 || (this._taintGroup = n.ext.shownGroup, this._taintDownstream(zo));
-		}, N = null, te = (n) => {
+		}, ne = (n) => {
+			n.cycleId === e && n.markId === t ? (Bo++, v && n.orderIndex >= zo.orderIndex && te(zo)) : this._iterate || (n.state & tr) === 0 || (this._taintGroup = n.ext.shownGroup, this._taintDownstream(zo));
+		}, j = null, M = (n) => {
 			n.cycleId === e && n.markId === t ? (Yo++, n.orderIndex > Xo && (Xo = n.orderIndex)) : Zo !== null || this._iterate || (n.state & tr) === 0 || (Zo = n.ext.shownGroup);
-		}, P = (e, t, n, r, i) => {
-			N === null && (N = /* @__PURE__ */ new Map());
-			let a = N.get(e);
+		}, re = (e, t, n, r, i) => {
+			j === null && (j = /* @__PURE__ */ new Map());
+			let a = j.get(e);
 			a === void 0 && (a = {
 				rects: [],
 				next: 0
-			}, N.set(e, a));
+			}, j.set(e, a));
 			let o = a.rects;
 			for (let e = 0; e < o.length; e++) {
 				let a = o[e];
 				if (a.rowFrom === t && a.rowTo === n && a.colFrom === r && a.colTo === i) return a;
 			}
 			let s;
-			return Yo = 0, Xo = -1, Zo = null, e.forEachNodeIn(t, n, r, i, te), o.length < Ho ? (s = {
+			return Yo = 0, Xo = -1, Zo = null, e.forEachNodeIn(t, n, r, i, M), o.length < Ho ? (s = {
 				rowFrom: t,
 				rowTo: n,
 				colFrom: r,
@@ -7060,9 +7060,9 @@ var Pa = class {
 				for (let e = 0; e < m; e++) {
 					let n = u[e], r = n.colStart, l = n.rowStart, d = n.colEnd, f = n.rowEnd, p = Math.max(r, a), m = Math.max(l, o), h = Math.min(d, s), g = Math.min(f, c);
 					if ((g - m + 1) * (h - p + 1) >= Vo) {
-						let e = P(n.value, m, g, p, h);
-						i += e.count, v && e.maxOrder >= t.orderIndex && ee(t), e.shownGroup !== null && (this._taintGroup = e.shownGroup, this._taintDownstream(t));
-					} else zo = t, Bo = i, n.value.forEachNodeIn(m, g, p, h, M), i = Bo;
+						let e = re(n.value, m, g, p, h);
+						i += e.count, v && e.maxOrder >= t.orderIndex && te(t), e.shownGroup !== null && (this._taintGroup = e.shownGroup, this._taintDownstream(t));
+					} else zo = t, Bo = i, n.value.forEachNodeIn(m, g, p, h, ne), i = Bo;
 				}
 			}
 			t.inDegree = i, x === 0 && t.inDegree === 0 && (yo[C++] = t);
@@ -7083,9 +7083,9 @@ var Pa = class {
 			}
 		}
 		g.formulaCacheHits += w, g.formulaCacheMisses += T;
-		let ne = qa();
-		g.inDegreeMs += ne - j;
-		let re = (n) => {
+		let ie = qa();
+		g.inDegreeMs += ie - ee;
+		let ae = (n) => {
 			n.cycleId === e && n.markId === t && (n.inDegree--, n.inDegree === 0 && (yo[C++] = n));
 		};
 		for (; S < C;) {
@@ -7094,17 +7094,17 @@ var Pa = class {
 			let t = e.colIndex, n = e.rowIndex, r = e.ext;
 			if (r !== null) {
 				let e = r.spillDependents, i = e.length;
-				for (let a = 0; a < i; a++) on(e[a], n, t, r.spillRowStart, r.spillColStart, r.spillRowEnd, r.spillColEnd, re);
+				for (let a = 0; a < i; a++) on(e[a], n, t, r.spillRowStart, r.spillColStart, r.spillRowEnd, r.spillColEnd, ae);
 			}
 			let i;
 			i = e.dependents;
 			let a = i.length;
 			if (a !== 0) for (let e = 0; e < a; e++) {
 				let r = i[e];
-				Qt(r, n, t, re);
+				Qt(r, n, t, ae);
 			}
 		}
-		if (g.kahnMs += qa() - ne, i || c < b) {
+		if (g.kahnMs += qa() - ie, i || c < b) {
 			if (v) {
 				let e = this._lastStampedOrderedLength;
 				for (let t = 0; t < b; t++) {
@@ -7175,150 +7175,150 @@ var Pa = class {
 		d.length = r, l.planLength = r, l.epoch = i, l.cycleFree = f, l.cycleEpoch = this._cycleEpoch, l.demandStart = a;
 	}
 	doEvaluate(e, t, n, r, i) {
-		let a = qa(), o = this._container, s = this._context, c = o.getScope(), l = s.getRuntime(), u = o.getDeferred?.() ?? null, f = i.values, p = i.length;
+		let a = qa(), o = this._container, s = this._context, c = o.getScope(), l = s.getRuntime(), u = o.getDeferred?.() ?? null, d = i.values, p = i.length;
 		es = this._passCycleId, ts = this._passMarkId;
-		let m = ho, h, g, _, y, b, x, S, C, w, T, D, O, k, A = 0, ee = /* @__PURE__ */ new Map();
-		this._overlays = ee;
-		let M = (e) => this._overlayFor(e), N = (e) => {
-			D = o.getGrid(e), T = D.getEntireCoords.bind(D), g = t(e), _ = g.gridId, k = M(e), y = g.values, O = g.errorSpatial, b = g.contentfulSpatial, x = g.spillSpatial, S = g.notifyValues, C = g.notifySpillsInsert, w = g.notifySpillsRemove, g.notifyFormats, g.notifyCalcStatus, c.gridId = _;
-		}, te = W.Axis.Column, P = te === W.Axis.Column, ne = () => {
-			if (A > 0) {
-				n(m, A), A = 0;
-				for (let e of ee.values()) e.reset();
+		let m = ho, h, g, _, v, y, b, x, S, C, w, T, E, O, k = 0, A = /* @__PURE__ */ new Map();
+		this._overlays = A;
+		let ee = (e) => this._overlayFor(e), te = (e) => {
+			T = o.getGrid(e), w = T.getEntireCoords.bind(T), g = t(e), _ = g.gridId, O = ee(e), v = g.values, E = g.errorSpatial, y = g.contentfulSpatial, b = g.spillSpatial, x = g.notifyValues, S = g.notifySpillsInsert, C = g.notifySpillsRemove, g.notifyFormats, g.notifyCalcStatus, c.gridId = _;
+		}, j = W.Axis.Column, M = j === W.Axis.Column, re = () => {
+			if (k > 0) {
+				n(m, k), k = 0;
+				for (let e of A.values()) e.reset();
 				_ !== void 0 && (g = t(_));
 			}
 		};
-		this._flush = ne;
-		let re = this._exceptTables;
-		if (re) for (let e = 0; e < p; e++) {
-			let t = f[e];
+		this._flush = re;
+		let ie = this._exceptTables;
+		if (ie) for (let e = 0; e < p; e++) {
+			let t = d[e];
 			t.block.hasDataTable() && (t.state = t.state & ~q | pr, this._skippedTables.add(t));
 		}
-		let ie = 0;
-		for (; ie < p;) try {
-			for (; ie < p; ie++) {
-				let n = f[ie], i = n.colIndex, a = n.rowIndex;
+		let ae = 0;
+		for (; ae < p;) try {
+			for (; ae < p; ae++) {
+				let n = d[ae], i = n.colIndex, a = n.rowIndex;
 				if ((n.state & Xn) !== 0 && e === n.cycleId) {
 					n.state &= ~Xn;
 					continue;
 				}
-				if (re && n.block.hasDataTable()) continue;
+				if (ie && n.block.hasDataTable()) continue;
 				let s = n.gridId;
-				s !== _ && N(s);
-				let p = n.block, ee = p.representative === n && p.isBlankAware(e), ae = n.cachedValue, oe, se, ce = !1;
-				typeof ae == "object" && ae && (ae.isIRange ? oe = ae : U.isError(ae, U.Code.Spill) && (se = ae, ce = !0));
-				let le = (n.state & Qn) !== 0;
-				le && (n.state & q) !== pr && (ne(), this.doDemandEvaluate(e, t, this._demandBatch, ne), c.gridId = s);
-				let ue = le ? null : Jt(n), de = n.inputsAt;
-				if (ue && de >= 0) {
-					let e = Gn(), t = ue.length;
+				s !== _ && te(s);
+				let p = n.block, A = p.representative === n && p.isBlankAware(e), oe = n.cachedValue, se, ce, le = !1;
+				typeof oe == "object" && oe && (oe.isIRange ? se = oe : U.isError(oe, U.Code.Spill) && (ce = oe, le = !0));
+				let ue = (n.state & Qn) !== 0;
+				ue && (n.state & q) !== pr && (re(), this.doDemandEvaluate(e, t, this._demandBatch, re), c.gridId = s);
+				let de = ue ? null : Jt(n), fe = n.inputsAt;
+				if (de && fe >= 0) {
+					let e = Gn(), t = de.length;
 					for (let n = 0; n < t; n++) {
-						let t = ue[n];
+						let t = de[n];
 						if (U.isError(t)) {
-							e[de + n] = t;
+							e[fe + n] = t;
 							continue;
 						}
 						let r = t.colStart, i = t.rowStart, a = t.colEnd, s = t.rowEnd;
 						if (s !== i || r !== a) {
-							let c = t.scope, u = y, d = T, f = k, p = D;
-							c && c !== _ && (p = o.getGrid(c), p && (u = p.getValues(), f = M(c), d = p.getEntireCoords.bind(p)));
+							let c = t.scope, u = v, d = w, f = O, p = T;
+							c && c !== _ && (p = o.getGrid(c), p && (u = p.getValues(), f = ee(c), d = p.getEntireCoords.bind(p)));
 							let m = p;
 							f.intersects(i, r, s, a) && (u = f, m = f);
-							let h = new ht(l, u, { ...t }, null, d, o.resolveScope);
-							h._setErrorIndex(m), e[de + n] = h;
+							let h = new pt(l, u, { ...t }, null, d, o.resolveScope);
+							h._setErrorIndex(m), e[fe + n] = h;
 						}
 					}
 				}
-				ue && u !== null && u.getOpenCount() !== 0 && (n.state & ar) === 0 && is(ue, _, o) && (n.state |= ar);
-				let fe = P ? i : a, pe = P ? a : i;
+				de && u !== null && u.getOpenCount() !== 0 && (n.state & ar) === 0 && is(de, _, o) && (n.state |= ar);
+				let pe = M ? i : a, me = M ? a : i;
 				c.node = n, c.colIndex = i, c.rowIndex = a, c.drawIndex = 0;
-				let me = p.formula, F, he = null, ge = !1, _e = (n.state & Zn) === 0 ? 0 : (n.state & lr) === 0 ? j.CalcStatus.Waiting : j.CalcStatus.Working, ve = _e, ye = r ? 0 : _e, be = n.ext;
-				if (le && !this._iterate && (n.state & J) !== hr) be !== null && (be.demandValue = void 0), F = po(n), ve = 0;
+				let he = p.formula, P, ge = null, _e = !1, ve = (n.state & Zn) === 0 ? 0 : (n.state & lr) === 0 ? D.CalcStatus.Waiting : D.CalcStatus.Working, ye = ve, be = r ? 0 : ve, xe = n.ext;
+				if (ue && !this._iterate && (n.state & J) !== hr) xe !== null && (xe.demandValue = void 0), P = po(n), ye = 0;
 				else {
-					if (le) {
-						let e = be === null ? void 0 : be.demandValue;
-						be !== null && (be.demandValue = void 0), F = e === void 0 ? 0 : e;
+					if (ue) {
+						let e = xe === null ? void 0 : xe.demandValue;
+						xe !== null && (xe.demandValue = void 0), P = e === void 0 ? 0 : e;
 					} else {
 						if (n.state = n.state & ~q | fr, c.perCellRead = !1, c.positionRead = !1, (n.state & sr) !== 0) {
 							n.state &= ~sr;
-							let e = this._settlePass ? Ba(y, x, a, i) : null;
+							let e = this._settlePass ? Ba(v, b, a, i) : null;
 							if (e !== null && e.direct) {
-								ge = !0, n.state &= ~(or | cr);
-								let t = Te(e);
-								t?.isIRange ? (F = me.finalizeValueForCell(t), he = e) : F = e;
+								_e = !0, n.state &= ~(or | cr);
+								let t = Tt(e);
+								t?.isIRange ? (P = he.finalizeValueForCell(t), ge = e) : P = e;
 							}
 						}
-						if (!ge) {
+						if (!_e) {
 							this._planStats.evaluated++, n.state &= ~($n | or | cr);
 							let e = c.deferCount;
-							F = me.evaluateAt(a, i), F = me.finalizeValueForCell(F), (c.perCellRead || c.positionRead) && (n.block.positionRead = !0), c.deferCount !== e && (F = this._takeDeferred(n, F), he = this._spillHolder, this._spillHolder = null);
+							P = he.evaluateAt(a, i), P = he.finalizeValueForCell(P), (c.perCellRead || c.positionRead) && (n.block.positionRead = !0), c.deferCount !== e && (P = this._takeDeferred(n, P), ge = this._spillHolder, this._spillHolder = null);
 						}
 					}
-					ve = (n.state & cr) === 0 ? (n.state & (ar | or)) === 0 ? 0 : j.CalcStatus.Waiting : j.CalcStatus.Working, ve !== 0 && (n.state |= or);
+					ye = (n.state & cr) === 0 ? (n.state & (ar | or)) === 0 ? 0 : D.CalcStatus.Waiting : D.CalcStatus.Working, ye !== 0 && (n.state |= or);
 				}
-				let I;
-				(n.state & q) !== pr && (n.state = n.state & ~q | mr), ve !== ye && (ve === 0 ? n.state &= ~(Zn | lr) : ve === j.CalcStatus.Working ? n.state |= Zn | lr : n.state = (n.state | Zn) & ~lr, g.calcStatusConflating || (g.calcStatusConflating = E(P)), g.calcStatusConflating.append(fe, pe, ve !== 0 && ve)), le && k.takeDemand(a, i);
-				let xe = n.ext, Se = xe === null ? null : xe.fixedRef;
-				if (oe || se || Se) {
+				let F;
+				(n.state & q) !== pr && (n.state = n.state & ~q | mr), ye !== be && (ye === 0 ? n.state &= ~(Zn | lr) : ye === D.CalcStatus.Working ? n.state |= Zn | lr : n.state = (n.state | Zn) & ~lr, g.calcStatusConflating || (g.calcStatusConflating = ne(M)), g.calcStatusConflating.append(pe, me, ye !== 0 && ye)), ue && O.takeDemand(a, i);
+				let Se = n.ext, I = Se === null ? null : Se.fixedRef;
+				if (se || ce || I) {
 					mo.colStart = i, mo.rowStart = a, mo.colEnd = i, mo.rowEnd = a;
-					let e = x.search(mo);
-					for (let t = 0; !I && t < e.length; t++) {
+					let e = b.search(mo);
+					for (let t = 0; !F && t < e.length; t++) {
 						let n = e[t];
-						n.value.isAnchor(a, i) && n.value.getKind() !== "pivot" && (I = n);
+						n.value.isAnchor(a, i) && n.value.getKind() !== "pivot" && (F = n);
 					}
-					if (I && (x.remove(I, Gi), !I || !I.value.getError())) {
+					if (F && (b.remove(F, Gi), !F || !F.value.getError())) {
 						let e = {
-							...K.sanitizeRange(I),
-							scope: I.scope,
+							...K.sanitizeRange(F),
+							scope: F.scope,
 							value: null
 						};
-						b.insertNonOverlapping(e), y.delete(e), d(O, e);
+						y.insertNonOverlapping(e), v.delete(e), f(E, e);
 					}
 				}
-				F = this._fitCell(p, F);
-				let Ce = 1, we = 1, Ee = F, De = typeof F == "object" && !!F, Oe = De && Ee.isIRange, L, R = De && U.isError(F, U.Code.Spill);
-				if (Se) {
-					Ce = Se.colEnd - Se.colStart + 1, we = Se.rowEnd - Se.rowStart + 1;
+				P = this._fitCell(p, P);
+				let Ce = 1, we = 1, Te = P, Ee = typeof P == "object" && !!P, De = Ee && Te.isIRange, L, R = Ee && U.isError(P, U.Code.Spill);
+				if (I) {
+					Ce = I.colEnd - I.colStart + 1, we = I.rowEnd - I.rowStart + 1;
 					let t = {
-						colStart: Se.colStart,
-						rowStart: Se.rowStart,
-						colEnd: Se.colEnd,
-						rowEnd: Se.rowEnd,
+						colStart: I.colStart,
+						rowStart: I.rowStart,
+						colEnd: I.colEnd,
+						rowEnd: I.rowEnd,
 						scope: s
-					}, r = Xt(F, t, P)?.tuples;
-					y.delete(t), r && y.setValues(r), d(O, t), lt(O, r, P), L = {
+					}, r = Xt(P, t, M)?.tuples;
+					v.delete(t), r && v.setValues(r), f(E, t), nt(E, r, M), L = {
 						...t,
-						value: new ot(t, e, "fixed", null, he)
-					}, x.insert(L), o.addDynamicPrecedent(n, t, mi), b.insertNonOverlapping({
+						value: new Qe(t, e, "fixed", null, ge)
+					}, b.insert(L), o.addDynamicPrecedent(n, t, mi), y.insertNonOverlapping({
 						...t,
-						value: new We(t, te)
+						value: new Fe(t, j)
 					});
-				} else if (Oe && Ee.size > 1) {
-					Ce = Ee.getColumnCount(), we = Ee.getRowCount();
+				} else if (De && Te.size > 1) {
+					Ce = Te.getColumnCount(), we = Te.getRowCount();
 					let t = Lo(n), r = t === null ? a : a - t.rows, c = t === null ? i : i - t.columns, l = {
 						colStart: c,
 						rowStart: r,
 						colEnd: c + Ce - 1,
 						rowEnd: r + we - 1,
 						scope: s
-					}, u = T(), f = !K.isRangeWithinRange(l, u);
-					if (f && (l.colEnd = Math.min(l.colEnd, u.colEnd), l.rowEnd = Math.min(l.rowEnd, u.rowEnd)), R = f, !R) {
-						let e = b.search(l);
+					}, u = w(), d = !K.isRangeWithinRange(l, u);
+					if (d && (l.colEnd = Math.min(l.colEnd, u.colEnd), l.rowEnd = Math.min(l.rowEnd, u.rowEnd)), R = d, !R) {
+						let e = y.search(l);
 						if (R = e.length > 1, !R && e.length === 1) {
 							let t = e[0], n = K.intersectRanges(l, t, $a);
 							!n || n.rowEnd === n.rowStart && n.colStart === n.colEnd && n.colStart === i && n.rowStart === a || (R = !0);
 						}
 					}
 					let p, m;
-					if (R) F = U.BuiltIn.Spill, Ce = 1, we = 1, p = [[fe, [[pe, [F]]]]], y.setValues(p), lt(O, p, P), m = {
+					if (R) P = U.BuiltIn.Spill, Ce = 1, we = 1, p = [[pe, [[me, [P]]]]], v.setValues(p), nt(E, p, M), m = {
 						colStart: i,
 						rowStart: a,
 						colEnd: i,
 						rowEnd: a
 					};
 					else {
-						let e = ln(Ee, P ? c : r, P ? r : c);
-						e && (p = e.tuples), y.delete(l), p && y.setValues(p), d(O, l), lt(O, p, P), m = l;
+						let e = ln(Te, M ? c : r, M ? r : c);
+						e && (p = e.tuples), v.delete(l), p && v.setValues(p), f(E, l), nt(E, p, M), m = l;
 					}
 					let h = R ? {
 						colStart: i,
@@ -7329,45 +7329,45 @@ var Pa = class {
 					} : l;
 					L = {
 						...h,
-						value: new ot(h, e, R ? "error" : "dynamic", R || t === null ? null : t, he, R ? l : null)
-					}, x.insert(L), o.addDynamicPrecedent(n, l, mi), b.insertNonOverlapping({
+						value: new Qe(h, e, R ? "error" : "dynamic", R || t === null ? null : t, ge, R ? l : null)
+					}, b.insert(L), o.addDynamicPrecedent(n, l, mi), y.insertNonOverlapping({
 						...m,
-						value: new We(m, te)
+						value: new Fe(m, j)
 					});
 				}
-				!ee || p.blankCycleId === e && p.blankMarkId === this._passMarkId || this._finalizeRepresentative(n, F, g, ve !== 0 || le || !0 === Oe || R || Se !== null || ge);
-				let ke = !1;
-				if ((I || L || R || se) && (ke = K.isEqualRanges(I, L), I && w.push(I), L && C.push(L)), L || I) {
-					let e = I ?? L, t = L ?? I, r = {
+				!A || p.blankCycleId === e && p.blankMarkId === this._passMarkId || this._finalizeRepresentative(n, P, g, ye !== 0 || ue || !0 === De || R || I !== null || _e);
+				let Oe = !1;
+				if ((F || L || R || ce) && (Oe = K.isEqualRanges(F, L), F && C.push(F), L && S.push(L)), L || F) {
+					let e = F ?? L, t = L ?? F, r = {
 						colStart: Math.min(i, e.colStart, t.colStart),
 						rowStart: Math.min(a, e.rowStart, t.rowStart),
 						colEnd: Math.max(i, e.colEnd, t.colEnd),
 						rowEnd: Math.max(a, e.rowEnd, t.rowEnd),
 						scope: s
 					};
-					S.insertNonOverlapping(r), ke && R === ce || (this._invalidatePlans(), o.getPrecedents().search(r).length > 0 && (n.state |= Xn, h ||= new v(), h.insertNonOverlapping(r)));
+					x.insertNonOverlapping(r), Oe && R === le || (this._invalidatePlans(), o.getPrecedents().search(r).length > 0 && (n.state |= Xn, h ||= new N(), h.insertNonOverlapping(r)));
 				}
-				n.cachedValue = F, m[A++] = n;
-				let Ae = u !== null && u.hasHolders() ? Te(F) : F;
-				Oe || Se || k.push(a, i, Ae), A >= (k.observed ? Ha : Ua) && ne(), ((n.state & J) !== hr || n.ext !== null && n.ext.shownGroup !== 0) && this._trackCircular(n, g, fe, pe, P);
-				let je = n.dependents, Me = je.length;
-				if (Me > 0) {
+				n.cachedValue = P, m[k++] = n;
+				let ke = u !== null && u.hasHolders() ? Tt(P) : P;
+				De || I || O.push(a, i, ke), k >= (O.observed ? Ha : Ua) && re(), ((n.state & J) !== hr || n.ext !== null && n.ext.shownGroup !== 0) && this._trackCircular(n, g, pe, me, M);
+				let Ae = n.dependents, je = Ae.length;
+				if (je > 0) {
 					let e = (n.state & Zn) !== 0, t = !this._iterate && (n.state & J) !== hr;
 					t && (this._taintGroup = n.ext.cycleGroup);
-					for (let n = 0; n < Me; n++) {
-						let r = je[n];
+					for (let n = 0; n < je; n++) {
+						let r = Ae[n];
 						t && Qt(r, a, i, this._taintDownstream);
 						let o = r.value.index;
-						o < 0 || (Zt(r) && (Qo = o, $o = Ae, Qt(r, a, i, ns)), e && Qt(r, a, i, rs));
+						o < 0 || (Zt(r) && (Qo = o, $o = ke, Qt(r, a, i, ns)), e && Qt(r, a, i, rs));
 					}
 				}
 			}
 		} catch (n) {
-			let r = f[ie];
+			let r = d[ae];
 			if (n instanceof an || n instanceof en && this._iterate) {
 				let i = ao;
 				if (i.length = 0, n instanceof an) for (let e = 0; e < n.count; e++) i.push(n.nodes[e]);
-				i.push(r), ne(), r.state &= ~q, this.doDemandEvaluate(e, t, i, ne);
+				i.push(r), re(), r.state &= ~q, this.doDemandEvaluate(e, t, i, re);
 			} else {
 				if (!(n instanceof en || n instanceof Yt)) throw n;
 				{
@@ -7379,17 +7379,17 @@ var Pa = class {
 			}
 			c.gridId = r.gridId;
 		}
-		c.node = null, c.colIndex = 2 ** 53 - 1, c.rowIndex = 2 ** 53 - 1, ne();
-		for (let e of ee.values()) e.commitDemand();
+		c.node = null, c.colIndex = 2 ** 53 - 1, c.rowIndex = 2 ** 53 - 1, re();
+		for (let e of A.values()) e.commitDemand();
 		this._flush = null, this._overlays = null;
-		let ae = this._fallbackDirty;
-		return ae !== null && (this._fallbackDirty = null, h ? h.insertAllNonOverlapping(ae.all()) : h = ae), (() => {
+		let oe = this._fallbackDirty;
+		return oe !== null && (this._fallbackDirty = null, h ? h.insertAllNonOverlapping(oe.all()) : h = oe), (() => {
 			let e = Un, t = Wn;
 			for (let n = 0; n < t; n++) e[n] = void 0;
 			Wn = 0;
 		})(), this._planStats.evaluateMs += qa() - a, h;
 	}
-}, Fa = (e, t) => new P.ArrayList(e.slice(0, t));
+}, Fa = (e, t) => new r.ArrayList(e.slice(0, t));
 function Ia(e, t, n, r, i, a) {
 	let o = t.rowStart + n, s = t.rowStart + r, c = t.colStart + i, l = t.colStart + a;
 	for (let t = 0; t < e.length; t++) {
@@ -7402,7 +7402,7 @@ function La(e, t, n) {
 	let r = t.values, i = t.errorSpatial, a = oo, o = so;
 	for (let s = 0; s < e.length; s++) {
 		let c = e[s];
-		r.delete(c), d(i, c);
+		r.delete(c), f(i, c);
 		let l = {
 			colStart: c.colStart,
 			rowStart: c.rowStart,
@@ -7431,7 +7431,7 @@ function za(e, t, n) {
 }
 var Ba = (e, t, n, r) => {
 	let i = e.getValueAt(n, r);
-	return St(i) ? i : mt(t, n, r);
+	return Dt(i) ? i : ft(t, n, r);
 }, Va = Symbol("unsetGridId"), Ha = 1024, Ua = 65536;
 function Wa(e, t) {
 	return e.scope === t.scope ? e.colIndex === t.colIndex ? e.rowIndex - t.rowIndex : e.colIndex - t.colIndex : e.scope === null ? -1 : t.scope === null ? 1 : e.scope.localeCompare(t.scope);
@@ -7507,7 +7507,7 @@ var $a = {
 }, fo = (e) => {
 	let t = e.ext;
 	return t === null ? 0 : (e.state & J) === hr ? t.shownGroup : t.cycleGroup;
-}, po = (e) => Te(e.cachedValue) ?? 0, mo = {
+}, po = (e) => Tt(e.cachedValue) ?? 0, mo = {
 	rowStart: 0,
 	colStart: 0,
 	rowEnd: 0,
@@ -7567,37 +7567,37 @@ var os = {
 		this._namesByKey = /* @__PURE__ */ new Map(), this._namesById = /* @__PURE__ */ new Map(), this._hostsById = /* @__PURE__ */ new Map(), this._loadedData = /* @__PURE__ */ new Map(), this._options = e;
 	}
 	sync(e = !1) {
-		let { books: t, getGrid: n, unregisterGrid: r } = this._options, i = this._options.holdsGrids?.() ?? !0, a = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), c = /* @__PURE__ */ new Set(), l = t.getItems();
+		let { books: t, getGrid: n, unregisterGrid: r } = this._options, i = this._options.holdsGrids?.() ?? !0, a = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set(), l = t.getItems();
 		for (let t = 0; t < l.length; t++) {
-			let s = l[t], u = s.getId(), d = s.getSheetNames();
+			let c = l[t], u = c.getId(), d = c.getSheetNames();
 			for (let e = 0; e < d.length; e++) {
-				let t = Tt(u, e);
-				a.add(t), i && (n(t) ? this._loadedData.get(t) !== (s.getSheetData(e)?.data ?? null) && (r(t), this._registerSheet(s, e, t), c.add(u)) : (this._registerSheet(s, e, t), c.add(u)));
+				let t = Et(u, e);
+				a.add(t), i && (n(t) ? this._loadedData.get(t) !== (c.getSheetData(e)?.data ?? null) && (r(t), this._registerSheet(c, e, t), s.add(u)) : (this._registerSheet(c, e, t), s.add(u)));
 			}
-			let f = s.getDefinedNames();
+			let f = c.getDefinedNames();
 			for (let t = 0; t < f.length; t++) {
 				let n = f[t];
 				if (!n.name) continue;
-				let r = n.sheetIndex, i = Tt(u, r !== void 0 && r >= 0 && r < d.length ? r : -1), a = ls(i, n.name);
+				let r = n.sheetIndex, i = Et(u, r !== void 0 && r >= 0 && r < d.length ? r : -1), a = ls(i, n.name);
 				o.add(a);
 				let l = this._namesByKey.get(a);
 				if (l) {
 					if (l.refersTo !== (n.refersTo ?? "")) {
 						l.refersTo = n.refersTo ?? "";
 						let e = this._hostsById.get(l.getId());
-						e && this._queueBody(l.getId(), e, s, i, l.refersTo, !1), c.add(u);
+						e && this._queueBody(l.getId(), e, c, i, l.refersTo, !1), s.add(u);
 					}
-				} else this._registerName(s, i, n, e), c.add(u);
+				} else this._registerName(c, i, n, e), s.add(u);
 			}
 		}
-		for (let e of this._registeredSheetGrids()) a.has(e) || (r(e), this._loadedData.delete(e), c.add(s(e).bookId));
+		for (let e of this._registeredSheetGrids()) a.has(e) || (r(e), this._loadedData.delete(e), s.add(c(e).bookId));
 		for (let [e, t] of this._namesByKey) {
 			if (o.has(e)) continue;
 			this._namesByKey.delete(e), this._namesById.delete(t.getId());
 			let n = this._hostsById.get(t.getId());
-			this._hostsById.delete(t.getId()), n?.setPlaceholder(U.BuiltIn.Name.toString()), c.add(s(t.getScope()).bookId);
+			this._hostsById.delete(t.getId()), n?.setPlaceholder(U.BuiltIn.Name.toString()), s.add(c(t.getScope()).bookId);
 		}
-		return c;
+		return s;
 	}
 	getNameByScope(e, t) {
 		return this._namesByKey.get(ls(t, e)) ?? null;
@@ -7608,7 +7608,7 @@ var os = {
 	_registeredSheetGrids() {
 		let e = [];
 		for (let t of this._options.gridIds()) {
-			let n = s(t);
+			let n = c(t);
 			n && n.sheetIndex >= 0 && e.push(t);
 		}
 		return e;
@@ -7624,7 +7624,7 @@ var os = {
 				for (let e = 0; e < i.length; e++) {
 					let [n, a] = i[e], o = a.length;
 					for (let e = 0; e < o; e++) {
-						let i = ae.fromJSONValue(a.at(e));
+						let i = j.fromJSONValue(a.at(e));
 						i != null && t.push({
 							col: n + e,
 							row: r,
@@ -7635,7 +7635,7 @@ var os = {
 			}
 			if (t.length === 0) return null;
 			t.sort((e, t) => e.col - t.col || e.row - t.row);
-			let n = new _e.Builder();
+			let n = new de.Builder();
 			for (let e = 0; e < t.length; e++) n.pushAt(t[e].col, t[e].row, t[e].value);
 			return n.build()?.tuples ?? null;
 		}(i);
@@ -7653,16 +7653,16 @@ var os = {
 		this._hostsById.set(o, c), this._queueBody(o, c, e, t, s.refersTo, r);
 	}
 	_queueBody(e, t, n, r, i, a) {
-		let { queue: o, recompileNamed: c } = this._options, l = i.trim();
+		let { queue: o, recompileNamed: s } = this._options, l = i.trim();
 		l.startsWith("=") && (l = l.substring(1)), l ||= U.BuiltIn.Ref.toString();
-		let u = s(r), d = u.sheetIndex >= 0 ? u.sheetIndex : n.getSheetNames().length > 0 ? 0 : -1, f = Tt(u.bookId, d);
+		let u = c(r), d = u.sheetIndex >= 0 ? u.sheetIndex : n.getSheetNames().length > 0 ? 0 : -1, f = Et(u.bookId, d);
 		o(async () => {
 			this._hostsById.get(e) === t && t.setBody({
 				coords: us,
 				expression: l,
 				authoredAt: ds,
 				scopeGridId: f
-			}) && (a || c(e));
+			}) && (a || s(e));
 		});
 	}
 }, ls = (e, t) => e + "::" + t.toLowerCase(), us = Object.freeze({
@@ -7691,7 +7691,7 @@ var os = {
 			deferOrdinal: 0,
 			deferRoot: !1,
 			deferServed: null
-		}, this._cycleId = 0, this._staticEpoch = 1, this._precedentEpoch = 1, this._epochSeenFormulas = null, this._epochSeenPrecedents = null, this._epochSeenDynamics = null, this._volatiles = /* @__PURE__ */ new Set(), this._calculatedCommitId = null, this._calculatedEngineId = null, this._holdsGrids = !1, this._engineIds = /* @__PURE__ */ new Map(), this._landingOf = /* @__PURE__ */ new Map(), this._mirroredId = null, this._lastRevert = null, this._symbolIndex = null, this._symbolIndexOf = null, this._sheetsDerived = null, this._tablesDerived = null, this._namesDerived = null, this._collecting = null, this._recompileNamedPending = null, this._recompileLoadedPending = null, this._invalidateNamedPending = null, this.resolveScope = (e) => this._symbols.resolve(z.Sheet, e)?.toString(), this._heldCloneKey = null, this._callbacks = e.callbacks, this._runtime = e.runtime, this._richData = e.richData ?? o.DetachedContext, this._symbols = e.symbols, this._resolvers = e.resolvers, this._getSheetIndex = e.getSheetIndex ?? null, this._legacyIntersect = !0 === e.legacyIntersect, this._gridOptions = e.gridOptions ?? {}, this._calculation = e.calculation;
+		}, this._cycleId = 0, this._staticEpoch = 1, this._precedentEpoch = 1, this._epochSeenFormulas = null, this._epochSeenPrecedents = null, this._epochSeenDynamics = null, this._volatiles = /* @__PURE__ */ new Set(), this._calculatedCommitId = null, this._calculatedEngineId = null, this._holdsGrids = !1, this._engineIds = /* @__PURE__ */ new Map(), this._landingOf = /* @__PURE__ */ new Map(), this._mirroredId = null, this._lastRevert = null, this._symbolIndex = null, this._symbolIndexOf = null, this._sheetsDerived = null, this._tablesDerived = null, this._namesDerived = null, this._collecting = null, this._recompileNamedPending = null, this._recompileLoadedPending = null, this._invalidateNamedPending = null, this.resolveScope = (e) => this._symbols.resolve(z.Sheet, e)?.toString(), this._heldCloneKey = null, this._callbacks = e.callbacks, this._runtime = e.runtime, this._richData = e.richData ?? wt.DetachedContext, this._symbols = e.symbols, this._resolvers = e.resolvers, this._getSheetIndex = e.getSheetIndex ?? null, this._legacyIntersect = !0 === e.legacyIntersect, this._gridOptions = e.gridOptions ?? {}, this._calculation = e.calculation;
 		let n = e.replica;
 		this._updateState({
 			gridsAll: /* @__PURE__ */ new Map(),
@@ -7711,7 +7711,7 @@ var os = {
 			dynamicByBlock: /* @__PURE__ */ new Map(),
 			dirtySpatial: new En()
 		}), e.modelCommitId && this.mirror(e.modelCommitId), this._context = new yi(this, W.Axis.Column, e.functions), this._deferred = new da(this._calcScope, (e, t, n) => this._holderAt(e, t, n), () => this._runtime.getRandom(), () => this._settle(), void 0, (e, t) => this._normalizeResult(e, t), {
-			createRichData: (e, t) => st.fromJSON({
+			createRichData: (e, t) => He.fromJSON({
 				type: e,
 				data: t
 			}, this._richData),
@@ -7799,7 +7799,7 @@ var os = {
 		let r = this.getGrid(e);
 		if (!r) return null;
 		let i = r.getValues().getValueAt(t, n);
-		return St(i) ? i : mt(r.getSpills(), t, n);
+		return Dt(i) ? i : ft(r.getSpills(), t, n);
 	}
 	_settleNow() {
 		let e = this._deferred, t = e.takeMoved();
@@ -7811,21 +7811,21 @@ var os = {
 				r = new ms(!i || i.getValues().getAxis() === W.Axis.Column), e.set(t, r);
 			}
 			return r;
-		}, c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Set(), u = [], f = (e) => {
+		}, c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Set(), u = [], d = (e) => {
 			l.add(e), s(a, e.gridId).add(e.rowIndex, e.colIndex);
 		};
 		for (let e = 0; e < t.length; e++) {
-			let d = t[e], p = d.owner;
+			let f = t[e], p = f.owner;
 			if (p === null || !i.isLiveNode(p)) continue;
 			let m = p.gridId, h = n.gridsAll.get(m);
 			if (!h) continue;
-			let g = p.rowIndex, _ = p.colIndex, v = h.getValues().getValueAt(g, _), y = St(v), b = y ? v : mt(h.getSpills(), g, _);
-			if (b === null || b.calls.indexOf(d) < 0) continue;
+			let g = p.rowIndex, _ = p.colIndex, v = h.getValues().getValueAt(g, _), y = Dt(v), b = y ? v : ft(h.getSpills(), g, _);
+			if (b === null || b.calls.indexOf(f) < 0) continue;
 			if (!b.direct) {
 				l.add(p), s(a, m).add(g, _);
 				continue;
 			}
-			if (!y || d.latest?.isIRange) {
+			if (!y || f.latest?.isIRange) {
 				u.push(p);
 				continue;
 			}
@@ -7835,7 +7835,7 @@ var os = {
 				runs: s(/* @__PURE__ */ new Map(), m),
 				errors: /* @__PURE__ */ new Map()
 			}), x.runs.add(g, _);
-			let S = d.latest;
+			let S = f.latest;
 			if (U.isError(S)) {
 				let e = S.getLabel(), t = {
 					colStart: _,
@@ -7855,7 +7855,7 @@ var os = {
 						...e.ref,
 						scope: e.gridId
 					});
-				} else Qt(t, g, _, f);
+				} else Qt(t, g, _, d);
 			}
 		}
 		for (let [t, n] of c) {
@@ -7870,7 +7870,7 @@ var os = {
 				}), a[e] = {
 					...t,
 					value: !1
-				}, d(r.errorSpatial, t);
+				}, f(r.errorSpatial, t);
 			}
 			r.notifyCalcStatus.load(a);
 			for (let [e, t] of n.errors) r.errorSpatial.load(gs(t).map((t) => ({
@@ -7894,10 +7894,10 @@ var os = {
 		p.length > 0 && e.addSettleDirty(p), this._callbacks.calculate(void 0, void 0, !0);
 	}
 	createFormulaBlock(e, t, n, r, i, a, o) {
-		let c = this._callbacks.getCompiler(a);
-		if (!c) throw Error("The calculation engine has not started; nothing can compile yet.");
-		let l = s(e)?.bookId ?? null, u = l ? null : s(this._externalBindings.getNameById(e)?.getScope() ?? "")?.bookId ?? null;
-		return new Nn(c.compile(t.getRuntime(), r, i, n, this._symbols, (e) => t.getFunction(e), l ?? u ? Tt(l ?? u, -1) : this.getSheetName(e), o, l ? { book: l } : void 0), t, this._calcScope, e, () => this.getGrid(e)?.getEntireCoords() ?? null, this._resolvers);
+		let s = this._callbacks.getCompiler(a);
+		if (!s) throw Error("The calculation engine has not started; nothing can compile yet.");
+		let l = c(e)?.bookId ?? null, u = l ? null : c(this._externalBindings.getNameById(e)?.getScope() ?? "")?.bookId ?? null;
+		return new Nn(s.compile(t.getRuntime(), r, i, n, this._symbols, (e) => t.getFunction(e), l ?? u ? Et(l ?? u, -1) : this.getSheetName(e), o, l ? { book: l } : void 0), t, this._calcScope, e, () => this.getGrid(e)?.getEntireCoords() ?? null, this._resolvers);
 	}
 	getSymbols() {
 		return this._symbols;
@@ -7914,15 +7914,15 @@ var os = {
 		return this._sheetsCache().ids;
 	}
 	getSheetSpanIds(e) {
-		let t = Ee(e);
+		let t = be(e);
 		if (t) {
 			let e = this.getSheetIds(), n = e.indexOf(t[0]), r = e.indexOf(t[1]);
 			return n === -1 || r === -1 ? null : e.slice(Math.min(n, r), Math.max(n, r) + 1);
 		}
-		let n = s(e);
+		let n = c(e);
 		if (!n || n.sheetEnd === n.sheetIndex) return null;
 		let r = [];
-		for (let e = n.sheetIndex; e <= n.sheetEnd; e++) r.push(Tt(n.bookId, e));
+		for (let e = n.sheetIndex; e <= n.sheetEnd; e++) r.push(Et(n.bookId, e));
 		return r;
 	}
 	getFormulas() {
@@ -8030,7 +8030,7 @@ var os = {
 		return this.isClosed() ? null : this._gridsAll().get(e) ?? null;
 	}
 	markDirty(e) {
-		let t = this._getState(), n = t.dirtySpatial.clone(this._heldCloneKey), r = t.precedentSpatial, i = t.formulaSpatial, a = !1, o = ce(e, W.Axis.Column, 2);
+		let t = this._getState(), n = t.dirtySpatial.clone(this._heldCloneKey), r = t.precedentSpatial, i = t.formulaSpatial, a = !1, o = le(e, W.Axis.Column, 2);
 		for (let e = 0; e < o.length; e++) {
 			let t = o[e];
 			(r?.has(t) || i?.has(t)) && (a = !0, n.insertNonOverlapping(t));
@@ -8229,7 +8229,7 @@ var os = {
 		}), t;
 	}
 	createEngineGrid(e) {
-		let t = e.id, n = e.sizeOf, r = e.entireCoords, i = n === void 0 ? r ? () => r : void 0 : () => this.getGrid(n)?.getEntireCoords() ?? Ae, a = this._callbacks;
+		let t = e.id, n = e.sizeOf, r = e.entireCoords, i = n === void 0 ? r ? () => r : void 0 : () => this.getGrid(n)?.getEntireCoords() ?? Ce, a = this._callbacks;
 		return this.createBackendGrid({
 			uuid: t,
 			shadowOf: e.shadowOf,
@@ -8362,7 +8362,7 @@ var os = {
 		return o;
 	}
 	followRestore(e, t) {
-		return t === Ze.Status.Off || t === Ze.Status.Error ? (this.retarget(e), !1) : t === Ze.Status.Running ? this.holdsModelCommit(e) ? (this.restoreTo(e), !1) : (this.retarget(e), !0) : (this.restoreTo(e) !== null || this.holdsModelCommit(e) || this.retarget(e), !1);
+		return t === Ne.Status.Off || t === Ne.Status.Error ? (this.retarget(e), !1) : t === Ne.Status.Running ? this.holdsModelCommit(e) ? (this.restoreTo(e), !1) : (this.retarget(e), !0) : (this.restoreTo(e) !== null || this.holdsModelCommit(e) || this.retarget(e), !1);
 	}
 	rebuild(e) {
 		this.drop(), this.setReplica(e), this.open();
@@ -8392,13 +8392,13 @@ var os = {
 				if (u.deferCount !== s) {
 					let e = this._deferred, t = e.endEvaluation();
 					o.cachedValue = t.calls.length > 0 ? e.newHolder(c, t) : void 0, e.flush();
-				} else St(o.cachedValue) && (o.cachedValue = void 0);
+				} else Dt(o.cachedValue) && (o.cachedValue = void 0);
 				let d = tn(e.finalizeValue(c));
 				return d === null && (d = 0), !i || d?.isIRange || Array.isArray(d) ? d : a.createRange(1, 1, d);
 			},
 			getCalls: () => {
 				let e = f.getAnchorNode().cachedValue;
-				return St(e) ? e.calls : G.EmptyArray;
+				return Dt(e) ? e.calls : G.EmptyArray;
 			}
 		};
 	}
@@ -8414,7 +8414,7 @@ var os = {
 			let t = /* @__PURE__ */ new Map(), n = e.all3D();
 			for (let e = 0; e < n.length; e++) {
 				let r = n[e].value;
-				if (r.gridId == null || oe(r.gridId) || this._externalBindings.getNameById(r.gridId)) continue;
+				if (r.gridId == null || M(r.gridId) || this._externalBindings.getNameById(r.gridId)) continue;
 				let i = r.getReferencedSymbolIds();
 				if (i.length === 0) continue;
 				let a = r.ref, o = {
@@ -8473,10 +8473,10 @@ var os = {
 				t ? t.push(o[e]) : a.set(f, [o[e]]);
 				continue;
 			}
-			let p = f != null && !n.isDefinedName(f) && !oe(f) && !this._externalBindings.getNameById(f);
+			let p = f != null && !n.isDefinedName(f) && !M(f) && !this._externalBindings.getNameById(f);
 			if (d && p) for (let e = 0; e < i.length; e++) {
 				let [t, n] = i[e];
-				c.includes(t) && (d = d.replaceTableReferences(t, (e) => k(e, n) ? b() : null));
+				c.includes(t) && (d = d.replaceTableReferences(t, (e) => T(e, n) ? me() : null));
 			}
 			let m = d && d !== s.formula ? d.getTextAt(u.rowStart, u.colStart) : s.getTextAt(u.rowStart, u.colStart);
 			this._writeBlockText(s, m);
@@ -8497,7 +8497,7 @@ var os = {
 			let t = o[e].value;
 			if (t.index < 0) continue;
 			let n = t.formulaEntry.value, r = n.gridId;
-			if (r == null || oe(r) || this._externalBindings.getNameById(r)) continue;
+			if (r == null || M(r) || this._externalBindings.getNameById(r)) continue;
 			let i = (s ??= /* @__PURE__ */ new Map()).get(n);
 			i ? i.includes(t.index) || i.push(t.index) : s.set(n, [t.index]);
 		}
@@ -8561,10 +8561,10 @@ var os = {
 		}
 	}
 	rewriteTableReferences(e, t) {
-		let n = (e) => t ? ee(e, t) : b(), r = this._callbacks, i = this._getState().formulaSpatial.all3D();
+		let n = (e) => t ? k(e, t) : me(), r = this._callbacks, i = this._getState().formulaSpatial.all3D();
 		for (let t = 0; t < i.length; t++) {
 			let a = i[t].value, o = a.gridId;
-			if (o == null || !a.getReferencedSymbolIds().includes(e) || r.isDefinedName(o) || oe(o) || this._externalBindings.getNameById(o)) continue;
+			if (o == null || !a.getReferencedSymbolIds().includes(e) || r.isDefinedName(o) || M(o) || this._externalBindings.getNameById(o)) continue;
 			let s = a.formula, c = s?.replaceTableReferences(e, n);
 			if (!c || c === s) continue;
 			let l = a.ref;
@@ -8938,7 +8938,7 @@ var os = {
 	scope: void 0
 }, ms = class {
 	constructor(e) {
-		this._unordered = null, this._lastMajor = -1, this._lastMinor = -1, this._isColumn = e, this._conflating = E(e);
+		this._unordered = null, this._lastMajor = -1, this._lastMinor = -1, this._isColumn = e, this._conflating = ne(e);
 	}
 	add(e, t) {
 		let n = this._unordered;
@@ -8967,7 +8967,7 @@ var os = {
 	colEnd: e.colEnd,
 	rowEnd: e.rowEnd
 }), gs = (e) => {
-	let t = ce(e, W.Axis.Column, 2), n = Array(t.length);
+	let t = le(e, W.Axis.Column, 2), n = Array(t.length);
 	for (let e = 0; e < t.length; e++) {
 		let r = t[e];
 		n[e] = {