@sheetxl/mcp 0.8.0-beta.21 → 0.8.0-beta.23

package/assets/{DRiAktGToP73uwgm.js → Dol52NFQzLCbObuC.js}

@@ -1,11 +1,11 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.21
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.23
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { u as e } from "./D5mfuGSeGXSDHj9-.js";
-import { At as t, Da as n, Dn as i, Fr as r, Hi as s, Pa as o, Pi as a, Sn as c, T as h, Ur as l, Xt as u, Y as d, Yi as p, Yr as f, _i as m, dn as E, er as T, fr as g, in as O, j as A, ot as R, so as I, t as _, ta as N, u as L, wr as S, x as C, xa as y, z as k, zt as v } from "./Vo34QvIefEN595xl.js";
+import { u as e } from "./BI8kb-rd9dW85XJs.js";
+import { $i as t, D as n, Dn as i, Fn as r, Gn as s, Ia as o, Ji as a, Jr as c, Mt as h, N as l, Ur as u, Va as d, Wi as p, Ya as f, ai as m, ar as E, bn as T, er as g, ft as O, ha as A, hi as R, io as I, ka as _, ki as N, m as L, so as S, t as C, uo as y, xa as k, xi as v } from "./Cl04_aSpBHTwfsQR.js";
 function x(e) {
 	console && console.error && console.error(`Error: ${e}`);
 }
@@ -92,7 +92,7 @@ var U = class {
 	constructor(e) {
 		super(e.definition), this.idx = 1, this.ignoreAmbiguities = !1, this.hasPredicates = !1, Object.assign(this, Y(e));
 	}
-}, H = class {
+}, V = class {
 	constructor(e) {
 		this.idx = 1, Object.assign(this, Y(e));
 	}
@@ -100,9 +100,9 @@ var U = class {
 		e.visit(this);
 	}
 };
-function V(e) {
+function H(e) {
 	function t(e) {
-		return e.map(V);
+		return e.map(H);
 	}
 	if (e instanceof w) {
 		const t = {
@@ -129,13 +129,13 @@ function V(e) {
 	if (e instanceof j) return {
 		type: "RepetitionMandatoryWithSeparator",
 		idx: e.idx,
-		separator: V(new H({ terminalType: e.separator })),
+		separator: H(new V({ terminalType: e.separator })),
 		definition: t(e.definition)
 	};
 	if (e instanceof K) return {
 		type: "RepetitionWithSeparator",
 		idx: e.idx,
-		separator: V(new H({ terminalType: e.separator })),
+		separator: H(new V({ terminalType: e.separator })),
 		definition: t(e.definition)
 	};
 	if (e instanceof G) return {
@@ -148,7 +148,7 @@ function V(e) {
 		idx: e.idx,
 		definition: t(e.definition)
 	};
-	if (e instanceof H) {
+	if (e instanceof V) {
 		const t = {
 			type: "Terminal",
 			name: e.terminalType.name,
@@ -183,7 +183,7 @@ var z = class {
 			case K: return this.visitRepetitionWithSeparator(t);
 			case G: return this.visitRepetition(t);
 			case W: return this.visitAlternation(t);
-			case H: return this.visitTerminal(t);
+			case V: return this.visitTerminal(t);
 			case F: return this.visitRule(t);
 			default: throw Error("non exhaustive match");
 		}
@@ -210,7 +210,7 @@ function q(e) {
 	if (e instanceof j) return "AT_LEAST_ONE_SEP";
 	if (e instanceof K) return "MANY_SEP";
 	if (e instanceof G) return "MANY";
-	if (e instanceof H) return "CONSUME";
+	if (e instanceof V) return "CONSUME";
 	throw Error("non exhaustive match");
 }
 var Q = class {
@@ -218,7 +218,7 @@ var Q = class {
 		e.definition.forEach((n, i) => {
 			const r = e.definition.slice(i + 1);
 			if (n instanceof w) this.walkProdRef(n, r, t);
-			else if (n instanceof H) this.walkTerminal(n, r, t);
+			else if (n instanceof V) this.walkTerminal(n, r, t);
 			else if (n instanceof D) this.walkFlat(n, r, t);
 			else if (n instanceof B) this.walkOption(n, r, t);
 			else if (n instanceof $) this.walkAtLeastOne(n, r, t);
@@ -266,13 +266,13 @@ var Q = class {
 	}
 };
 function Z(e, t, n) {
-	return [new B({ definition: [new H({ terminalType: e.separator })].concat(e.definition) })].concat(t, n);
+	return [new B({ definition: [new V({ terminalType: e.separator })].concat(e.definition) })].concat(t, n);
 }
 function J(e) {
 	if (e instanceof w) return J(e.referencedRule);
-	if (e instanceof H) return [e.terminalType];
+	if (e instanceof V) return [e.terminalType];
 	if (function(e) {
-		return e instanceof D || e instanceof B || e instanceof G || e instanceof $ || e instanceof j || e instanceof K || e instanceof H || e instanceof F;
+		return e instanceof D || e instanceof B || e instanceof G || e instanceof $ || e instanceof j || e instanceof K || e instanceof V || e instanceof F;
 	}(e)) return function(e) {
 		let t = [];
 		const n = e.definition;
@@ -1508,7 +1508,7 @@ function Ke(e, t) {
 function We(e, t) {
 	return e.tokenTypeIdx === t.tokenTypeIdx;
 }
-var He = 1, Ve = {};
+var Ve = 1, He = {};
 function Ye(e) {
 	const t = function(e) {
 		let t = [...e], n = e, i = !0;
@@ -1522,7 +1522,7 @@ function Ye(e) {
 	(function(e) {
 		e.forEach((e) => {
 			var t;
-			Xe(e) || (Ve[He] = e, e.tokenTypeIdx = He++), qe(e) && !Array.isArray(e.CATEGORIES) && (e.CATEGORIES = [e.CATEGORIES]), qe(e) || (e.CATEGORIES = []), t = e, Object.hasOwn(null != t ? t : {}, "categoryMatches") || (e.categoryMatches = []), function(e) {
+			Xe(e) || (He[Ve] = e, e.tokenTypeIdx = Ve++), qe(e) && !Array.isArray(e.CATEGORIES) && (e.CATEGORIES = [e.CATEGORIES]), qe(e) || (e.CATEGORIES = []), t = e, Object.hasOwn(null != t ? t : {}, "categoryMatches") || (e.categoryMatches = []), function(e) {
 				return Object.hasOwn(null != e ? e : {}, "categoryMatchesMap");
 			}(e) || (e.categoryMatchesMap = {});
 		});
@@ -1533,7 +1533,7 @@ function Ye(e) {
 	}(t), function(e) {
 		e.forEach((e) => {
 			e.categoryMatches = [], Object.keys(e.categoryMatchesMap).forEach((t) => {
-				e.categoryMatches.push(Ve[t].tokenTypeIdx);
+				e.categoryMatches.push(He[t].tokenTypeIdx);
 			});
 		});
 	}(t), t.forEach((e) => {
@@ -1946,7 +1946,7 @@ var Et = {
 Object.freeze(Et);
 var Tt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a rule which is not defined: ->" + t.nonTerminalName + "<-\ninside top level rule: ->" + e.name + "<-" }, gt = {
 	buildDuplicateFoundError(e, t) {
-		const n = e.name, i = t[0], r = i.idx, s = q(i), o = (a = i) instanceof H ? a.terminalType.name : a instanceof w ? a.nonTerminalName : "";
+		const n = e.name, i = t[0], r = i.idx, s = q(i), o = (a = i) instanceof V ? a.terminalType.name : a instanceof w ? a.nonTerminalName : "";
 		var a;
 		let c = `->${s}${r > 0 ? r : ""}<- ${o ? `with argument: ->${o}<-` : ""}\n                  appears more than once (${t.length} times) in the top level rule: ->${n}<-.                  \n                  For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES \n                  `;
 		return c = c.replace(/[ \t]+/g, " "), c = c.replace(/\s\s+/g, "\n"), c;
@@ -2047,28 +2047,28 @@ var Ot, At = class extends z {
 	walkMany(e, t, n) {
 		if (e.idx === this.occurrence) {
 			const e = t.concat(n)[0];
-			this.result.isEndOfRule = void 0 === e, e instanceof H && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = void 0 === e, e instanceof V && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkMany(e, t, n);
 	}
 }, Lt = class extends _t {
 	walkManySep(e, t, n) {
 		if (e.idx === this.occurrence) {
 			const e = t.concat(n)[0];
-			this.result.isEndOfRule = void 0 === e, e instanceof H && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = void 0 === e, e instanceof V && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkManySep(e, t, n);
 	}
 }, St = class extends _t {
 	walkAtLeastOne(e, t, n) {
 		if (e.idx === this.occurrence) {
 			const e = t.concat(n)[0];
-			this.result.isEndOfRule = void 0 === e, e instanceof H && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = void 0 === e, e instanceof V && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkAtLeastOne(e, t, n);
 	}
 }, Ct = class extends _t {
 	walkAtLeastOneSep(e, t, n) {
 		if (e.idx === this.occurrence) {
 			const e = t.concat(n)[0];
-			this.result.isEndOfRule = void 0 === e, e instanceof H && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = void 0 === e, e instanceof V && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkAtLeastOneSep(e, t, n);
 	}
 };
@@ -2086,14 +2086,14 @@ function yt(e, t, n = []) {
 		if (t instanceof B) i = s(t.definition);
 		else {
 			if (t instanceof $) return s(t.definition.concat([new G({ definition: t.definition })]));
-			if (t instanceof j) return s([new D({ definition: t.definition }), new G({ definition: [new H({ terminalType: t.separator })].concat(t.definition) })]);
-			if (t instanceof K) i = s(t.definition.concat([new G({ definition: [new H({ terminalType: t.separator })].concat(t.definition) })]));
+			if (t instanceof j) return s([new D({ definition: t.definition }), new G({ definition: [new V({ terminalType: t.separator })].concat(t.definition) })]);
+			if (t instanceof K) i = s(t.definition.concat([new G({ definition: [new V({ terminalType: t.separator })].concat(t.definition) })]));
 			else if (t instanceof G) i = s(t.definition.concat([new G({ definition: t.definition })]));
 			else {
 				if (t instanceof W) return t.definition.forEach((e) => {
 					0 !== e.definition.length && (i = s(e.definition));
 				}), i;
-				if (!(t instanceof H)) throw Error("non exhaustive match");
+				if (!(t instanceof V)) throw Error("non exhaustive match");
 				n.push(t.terminalType);
 			}
 		}
@@ -2338,7 +2338,7 @@ function Gt(e) {
 }
 function Kt(e, t, n, i) {
 	const r = e.flatMap((e) => function(e, t) {
-		const n = new Vt();
+		const n = new Ht();
 		e.accept(n);
 		const i = n.allProductions, r = Object.groupBy(i, Wt), s = Object.fromEntries(Object.entries(r).filter(([e, t]) => t.length > 1));
 		return Object.values(s).map((n) => {
@@ -2348,7 +2348,7 @@ function Kt(e, t, n, i) {
 				ruleName: e.name,
 				dslName: s,
 				occurrence: i.idx
-			}, a = Ht(i);
+			}, a = Vt(i);
 			return a && (o.parameter = a), o;
 		});
 	}(e, n)), s = function(e, t, n) {
@@ -2393,12 +2393,12 @@ function Kt(e, t, n, i) {
 	return r.concat(s, o, a);
 }
 function Wt(e) {
-	return `${q(e)}_#_${e.idx}_#_${Ht(e)}`;
+	return `${q(e)}_#_${e.idx}_#_${Vt(e)}`;
 }
-function Ht(e) {
-	return e instanceof H ? e.terminalType.name : e instanceof w ? e.nonTerminalName : "";
+function Vt(e) {
+	return e instanceof V ? e.terminalType.name : e instanceof w ? e.nonTerminalName : "";
 }
-var Vt = class extends z {
+var Ht = class extends z {
 	constructor() {
 		super(...arguments), this.allProductions = [];
 	}
@@ -2454,7 +2454,7 @@ function zt(e) {
 	if (n instanceof w) t.push(n.referencedRule);
 	else if (n instanceof D || n instanceof B || n instanceof $ || n instanceof j || n instanceof K || n instanceof G) t = t.concat(zt(n.definition));
 	else if (n instanceof W) t = n.definition.map((e) => zt(e.definition)).flat();
-	else if (!(n instanceof H)) throw Error("non exhaustive match");
+	else if (!(n instanceof V)) throw Error("non exhaustive match");
 	const i = X(n), r = e.length > 1;
 	if (i && r) {
 		const n = e.slice(1);
@@ -2498,7 +2498,7 @@ function qt(e, t) {
 					occurrenceStack: f.slice(0, -1)
 				};
 				u.push(e);
-			} else if (m instanceof H) if (d < c - 1) {
+			} else if (m instanceof V) if (d < c - 1) {
 				const e = d + 1;
 				if (n(t[e], m.terminalType)) {
 					const t = {
@@ -2558,7 +2558,7 @@ function qt(e, t) {
 				u.push(t);
 			} else if (m instanceof j) {
 				const t = new G({
-					definition: [new H({ terminalType: m.separator })].concat(m.definition),
+					definition: [new V({ terminalType: m.separator })].concat(m.definition),
 					idx: m.idx
 				}), n = {
 					idx: d,
@@ -2576,7 +2576,7 @@ function qt(e, t) {
 				};
 				u.push(e), u.push(o);
 				const n = new G({
-					definition: [new H({ terminalType: m.separator })].concat(m.definition),
+					definition: [new V({ terminalType: m.separator })].concat(m.definition),
 					idx: m.idx
 				}), r = {
 					idx: d,
@@ -3990,7 +3990,7 @@ $n.DEFER_DEFINITION_ERRORS_HANDLING = !1, Bn = $n, [
 			return this.gastProductionsCache;
 		}
 		getSerializedGastProductions() {
-			return Object.values(this.gastProductionsCache).map(V);
+			return Object.values(this.gastProductionsCache).map(H);
 		}
 	},
 	class {
@@ -4145,7 +4145,7 @@ $n.DEFER_DEFINITION_ERRORS_HANDLING = !1, Bn = $n, [
 				const n = /* @__PURE__ */ new Error(`<CONSUME${Mn(t)}> argument is invalid expecting a TokenType reference but got: <${JSON.stringify(e)}>\n inside top level rule: <${this.recordingProdStack[0].name}>`);
 				throw n.KNOWN_RECORDER_ERROR = !0, n;
 			}
-			const i = this.recordingProdStack.at(-1), r = new H({
+			const i = this.recordingProdStack.at(-1), r = new V({
 				idx: t,
 				terminalType: e,
 				label: null == n ? void 0 : n.LABEL
@@ -4187,9 +4187,9 @@ var jn = class extends $n {
 	}
 }, Gn = class t {
 	static shared(e) {
-		const n = e?.locale ?? h, i = e?.maxColumn ?? Vn, r = e?.maxRow ?? Yn;
-		let s = Hn.get(n);
-		s || (s = /* @__PURE__ */ new Map(), Hn.set(n, s));
+		const n = e?.locale ?? S, i = e?.maxColumn ?? Hn, r = e?.maxRow ?? Yn;
+		let s = Vn.get(n);
+		s || (s = /* @__PURE__ */ new Map(), Vn.set(n, s));
 		const o = `${i}:${r}`;
 		let a = s.get(o);
 		return a || (a = new t({
@@ -4199,34 +4199,34 @@ var jn = class extends $n {
 		}), s.set(o, a)), a;
 	}
 	constructor(e) {
-		const t = e?.maxColumn ?? Vn, n = e?.maxRow ?? Yn, i = e?.locale ?? h;
-		this._locale = i, this._maxColumn = t, this._maxRow = n;
-		const { separatorFunction: r, separatorColumn: s, separatorRow: o, separatorDecimal: a } = i.separators;
-		if (s === o) throw new Error(`FormulaLexer: separatorColumn and separatorRow must differ (both '${s}')`);
-		const c = pt({
+		const t = e?.maxColumn ?? Hn, n = e?.maxRow ?? Yn, s = e?.locale ?? S;
+		this._locale = s, this._maxColumn = t, this._maxRow = n;
+		const { separatorFunction: o, separatorColumn: a, separatorRow: c, separatorDecimal: h } = s.separators;
+		if (a === c) throw new Error(`FormulaLexer: separatorColumn and separatorRow must differ (both '${a}')`);
+		const l = pt({
 			name: "WhiteSpace",
 			pattern: /[ \n\v\f\r\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/,
 			group: tt.SKIPPED
-		}), l = pt({
+		}), u = pt({
 			name: "StringToken",
 			pattern: /"(""|[^"])*"/
-		}), u = pt({
+		}), d = pt({
 			name: "FunctionToken",
 			pattern: /[a-zA-Z_\u007F-\uFFFF]+[a-zA-Z0-9_.\u007F-\uFFFF]*(?=\()/
-		}), d = pt({
+		}), p = pt({
 			name: "TableReference",
-			pattern: { exec: I },
+			pattern: { exec: r },
 			line_breaks: !1,
 			start_chars_hint: Wn
-		}), p = pt({
+		}), f = pt({
 			name: "BracketedString",
-			pattern: { exec: T },
+			pattern: { exec: i },
 			line_breaks: !1,
 			start_chars_hint: [91],
-			longer_alt: [d, l]
-		}), f = (e) => (e ?? []).map((e) => e?.trim()).filter(Boolean).map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).map((e) => e + "|").join(""), m = (e) => e.replace(/[A-Za-z]/g, (e) => `[${e.toUpperCase()}${e.toLowerCase()}]`), E = pt({
+			longer_alt: [p, u]
+		}), m = (e) => (e ?? []).map((e) => e?.trim()).filter(Boolean).map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).map((e) => e + "|").join(""), E = (e) => e.replace(/[A-Za-z]/g, (e) => `[${e.toUpperCase()}${e.toLowerCase()}]`), T = pt({
 			name: "LiteralError",
-			pattern: new RegExp(f(i.errorLiterals) + [
+			pattern: new RegExp(m(s.errorLiterals) + [
 				"#PARSE!",
 				"#NULL!",
 				"#DIV\\/0!",
@@ -4243,10 +4243,10 @@ var jn = class extends $n {
 				"#BUSY!",
 				"#PYTHON!",
 				"#TIMEOUT!"
-			].map(m).join("|"))
+			].map(E).join("|"))
 		}), g = pt({
 			name: "RefError",
-			pattern: new RegExp(f(i.errorRefs) + ["#REF!", "#NAME\\?"].map(m).join("|"))
+			pattern: new RegExp(m(s.errorRefs) + ["#REF!", "#NAME\\?"].map(E).join("|"))
 		}), O = pt({
 			name: "SingleQuotedString",
 			pattern: /'(''|[^'])*'/
@@ -4256,11 +4256,11 @@ var jn = class extends $n {
 		}), R = pt({
 			name: "Sheet",
 			pattern: /[A-Za-z_.\d\u007F-\uFFFF]*!/
-		}), _ = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, N = pt({
+		}), I = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, _ = pt({
 			name: "NamedToken",
 			pattern: { exec: (e, t) => {
-				_.lastIndex = t;
-				const n = _.exec(e);
+				I.lastIndex = t;
+				const n = I.exec(e);
 				if (!n) return null;
 				let i = n[0];
 				const r = i.indexOf(".:");
@@ -4268,22 +4268,22 @@ var jn = class extends $n {
 			} },
 			line_breaks: !1,
 			start_chars_hint: Wn
-		}), L = pt({
+		}), N = pt({
 			name: "Cell",
 			pattern: { exec: qn(t, n) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Kn],
-			longer_alt: N
-		}), S = pt({
+			longer_alt: _
+		}), L = pt({
 			name: "Column",
 			pattern: { exec: Xn(t) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Kn],
-			longer_alt: N
+			longer_alt: _
 		}), C = pt({
 			name: "AbsRow",
 			pattern: /[$][0-9]+/
-		}), y = "." === a ? "\\." : a, k = pt({
+		}), y = "." === h ? "\\." : h, k = pt({
 			name: "NumberToken",
 			pattern: new RegExp(`[0-9]+${y}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${y}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
 		}), v = pt({
@@ -4293,7 +4293,7 @@ var jn = class extends $n {
 			name: "DigitToken",
 			pattern: /[0-9]+/
 		}), P = ["TRUE", "FALSE"];
-		for (const e of [i.booleanTrue, i.booleanFalse]) {
+		for (const e of [s.booleanTrue, s.booleanFalse]) {
 			const t = e?.trim();
 			t && !P.some((e) => e.toLowerCase() === t.toLowerCase()) && P.push(t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 		}
@@ -4302,13 +4302,13 @@ var jn = class extends $n {
 			pattern: new RegExp(P.join("|"), "i")
 		}), b = pt({
 			name: "ArgSeparator",
-			pattern: Qn(r)
+			pattern: Qn(o)
 		}), U = pt({
 			name: "ColSeparator",
-			pattern: Qn(s)
+			pattern: Qn(a)
 		}), w = pt({
 			name: "RowSeparator",
-			pattern: Qn(o)
+			pattern: Qn(c)
 		}), F = pt({
 			name: "RangeOp",
 			pattern: /:/
@@ -4333,10 +4333,10 @@ var jn = class extends $n {
 		}), W = pt({
 			name: "CloseCurlyParen",
 			pattern: /}/
-		}), H = pt({
+		}), V = pt({
 			name: "QuoteS",
 			pattern: /'/
-		}), V = pt({
+		}), H = pt({
 			name: "MulOp",
 			pattern: /\*(?!\*)/
 		}), Y = pt({
@@ -4363,7 +4363,7 @@ var jn = class extends $n {
 		}), ee = pt({
 			name: "ArrayAnchorOp",
 			pattern: /#/,
-			longer_alt: [E, g]
+			longer_alt: [T, g]
 		}), te = pt({
 			name: "GtOp",
 			pattern: />/
@@ -4374,39 +4374,39 @@ var jn = class extends $n {
 			name: "LtOp",
 			pattern: /</
 		}), re = [
-			c,
 			l,
+			u,
 			A,
 			O,
 			R,
-			u,
 			d,
 			p,
-			E,
+			f,
+			T,
 			g,
 			b,
-			...s !== r ? [U] : [],
+			...a !== o ? [U] : [],
 			w,
 			D,
 			B,
 			$,
 			F,
-			L,
+			N,
 			M,
-			S,
+			L,
 			C,
 			k,
 			v,
 			x,
 			ee,
 			q,
-			N,
+			_,
 			j,
 			G,
 			K,
 			W,
-			H,
 			V,
+			H,
 			Y,
 			z,
 			X,
@@ -4433,7 +4433,7 @@ var jn = class extends $n {
 		const se = {};
 		re.forEach((e) => {
 			se[e.name] = e;
-		}), s === r && (se.ColSeparator = b), this._vocabulary = se;
+		}), a === o && (se.ColSeparator = b), this._vocabulary = se;
 	}
 	tokenize(t, n = !0) {
 		const i = this._lexer.tokenize(t);
@@ -4477,7 +4477,7 @@ var jn = class extends $n {
 	];
 	for (let t = 127; t <= 65535; t++) e.push(t);
 	return e;
-})(), Hn = /* @__PURE__ */ new WeakMap(), Vn = 16384, Yn = 1048576;
+})(), Vn = /* @__PURE__ */ new WeakMap(), Hn = 16384, Yn = 1048576;
 function zn(e, t, n) {
 	let i = 0;
 	for (let r = t; r < n; r++) {
@@ -4533,9 +4533,9 @@ function Qn(e) {
 	return new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 }
 var Zn = class {
-	constructor(e = h) {
+	constructor(e = S) {
 		const t = function(e) {
-			const t = [...O];
+			const t = [...T];
 			if (e) for (const n of Object.values(e)) {
 				const e = n?.trim();
 				e && !t.some((t) => t.toLowerCase() === e.toLowerCase()) && t.push(e);
@@ -4582,7 +4582,7 @@ var Zn = class {
 		return this._lexer.tokenize(e);
 	}
 }, Jn = class extends jn {
-	constructor(e = h) {
+	constructor(e = S) {
 		const t = new Zn(e), n = t.getVocabulary();
 		super(n, {
 			nodeLocationTracking: "none",
@@ -4606,13 +4606,13 @@ var Zn = class {
 		}), c.RULE("ruleItem", () => c.OR([{ ALT: () => c.SUBRULE(c.ruleSpecifier) }, { ALT: () => c.SUBRULE(c.ruleColumnOrRange) }])), c.RULE("ruleSpecifier", () => c.OR([{ ALT: () => {
 			const t = c.CONSUME(i);
 			return c.ACTION(() => {
-				const n = d(t.image, e);
+				const n = l(t.image, e);
 				return n.image = t.image, n;
 			});
 		} }, { ALT: () => {
 			const t = c.CONSUME(s);
 			return c.ACTION(() => {
-				const n = d(t.image, e);
+				const n = l(t.image, e);
 				return n.image = t.image, n;
 			});
 		} }])), c.RULE("ruleColumnOrRange", () => {
@@ -4621,11 +4621,11 @@ var Zn = class {
 			return c.OPTION(() => {
 				t = c.CONSUME(o), n = c.CONSUME2(r);
 			}), c.ACTION(() => {
-				const i = _(e.image);
+				const i = g(e.image);
 				if (i.image = e.image, !n) return i;
-				const r = _(n.image);
+				const r = g(n.image);
 				r.image = n.image;
-				const s = g(":", i, r, !0);
+				const s = y(":", i, r, !0);
 				return s.image = t?.image ?? ":", s;
 			});
 		}), c.performSelfAnalysis();
@@ -4642,23 +4642,23 @@ var Zn = class {
 		if ("@" === n) {
 			const e = t.slice(1).trim();
 			if (!e) {
-				const e = l("@", null, !0);
+				const e = s("@", null, !0);
 				return e.image = "@", [e];
 			}
 			if ("[" === e.charAt(0)) {
 				const t = this._parseInner(e);
 				if (1 === t.length && "infix" === t[0].type) {
-					const e = l("@", t[0], !0);
+					const e = s("@", t[0], !0);
 					return e.image = "@", [e];
 				}
 			}
-			const n = _(e);
+			const n = g(e);
 			n.image = e;
-			const i = l("@", n, !0);
+			const i = s("@", n, !0);
 			return i.image = "@", [i];
 		}
 		if ("[" !== n && "#" !== n) {
-			const t = _(e);
+			const t = g(e);
 			return t.image = e, [t];
 		}
 		return this._parseInner(t);
@@ -4666,7 +4666,7 @@ var Zn = class {
 	parse(e, t, n) {
 		this.reset();
 		const i = () => ({
-			root: u("", []),
+			root: O("", []),
 			errors: []
 		});
 		if (!n) return i();
@@ -4679,7 +4679,7 @@ var Zn = class {
 		if (-1 === s) return i();
 		const o = n.slice(0, s), a = n.slice(s + 1, -1), c = this._parseContent(a);
 		return {
-			root: u(o, c),
+			root: O(o, c),
 			errors: this.errors.length > 0 ? [...this.errors] : []
 		};
 	}
@@ -4694,7 +4694,7 @@ var Zn = class {
 	":."
 ]), ni = (e) => {
 	if (!e) return null;
-	if (e.type === E.Cell) {
+	if (e.type === f.Cell) {
 		const t = e.value;
 		return t.rowIndex === Number.MIN_SAFE_INTEGER ? "col" : t.colIndex === Number.MIN_SAFE_INTEGER ? "row" : null;
 	}
@@ -4725,8 +4725,8 @@ var ai = {
 	}
 }, ci = class extends jn {
 	constructor(e) {
-		const h = e?.lexer ?? Gn.shared(e?.lexerOptions), u = h.getVocabulary();
-		super(u, {
+		const i = e?.lexer ?? Gn.shared(e?.lexerOptions), r = i.getVocabulary();
+		super(r, {
 			skipValidations: !0,
 			recoveryEnabled: !0,
 			...e,
@@ -4734,46 +4734,46 @@ var ai = {
 			errorMessageProvider: ai,
 			maxLookahead: 1
 		}), this._ruleInfixOp = this.RULE("ruleInfixOp", () => {
-			const { PlusOp: e, MinOp: t, MulOp: n, DivOp: i, ExOp: r, ConcatOp: o, GtOp: a, EqOp: h, LtOp: l, NeqOp: u, GteOp: d, LteOp: p } = this._vocab, f = [];
-			return f.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
-				const s = this.OR(this._c1 || (this._c1 = [
+			const { PlusOp: e, MinOp: t, MulOp: n, DivOp: i, ExOp: r, ConcatOp: s, GtOp: o, EqOp: a, LtOp: c, NeqOp: h, GteOp: l, LteOp: u } = this._vocab, d = [];
+			return d.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
+				const f = this.OR(this._c1 || (this._c1 = [
 					{ ALT: () => this.CONSUME(e).image },
 					{ ALT: () => this.CONSUME(t).image },
 					{ ALT: () => this.CONSUME(n).image },
 					{ ALT: () => this.CONSUME(i).image },
 					{ ALT: () => this.CONSUME(r).image },
+					{ ALT: () => this.CONSUME(s).image },
 					{ ALT: () => this.CONSUME(o).image },
 					{ ALT: () => this.CONSUME(a).image },
+					{ ALT: () => this.CONSUME(c).image },
 					{ ALT: () => this.CONSUME(h).image },
 					{ ALT: () => this.CONSUME(l).image },
-					{ ALT: () => this.CONSUME(u).image },
-					{ ALT: () => this.CONSUME(d).image },
-					{ ALT: () => this.CONSUME(p).image }
+					{ ALT: () => this.CONSUME(u).image }
 				])), m = {
-					value: s,
+					value: f,
 					index: this.getLexerPosition(),
-					isRange: c.includes(s)
+					isRange: p.includes(f)
 				}, E = this.SUBRULE2(this._rulePostfixOp);
-				f.push({
+				d.push({
 					op: m,
 					node: E
 				});
 			}), this.ACTION(() => {
-				let e = f.length - 1;
-				const t = s.length;
+				let e = d.length - 1;
+				const t = L.length;
 				for (let n = 0; e > 0 && n < t; n++) {
-					const t = s[n];
+					const t = L[n];
 					let i = 1;
-					for (; i < f.length;) {
-						const n = f[i].op;
+					for (; i < d.length;) {
+						const n = d[i].op;
 						if (t.includes(n.value)) {
-							const t = f[i - 1].node, r = f[i].node;
-							let s = g(n.value, t, r, n.isRange);
-							s = this._tag(s, n.index), f[i - 1].node = s, f.splice(i, 1), e--;
+							const t = d[i - 1].node, r = d[i].node;
+							let s = y(n.value, t, r, n.isRange);
+							s = this._tag(s, n.index), d[i - 1].node = s, d.splice(i, 1), e--;
 						} else i++;
 					}
 				}
-			}), f[0].node;
+			}), d[0].node;
 		}), this._rulePlusMinusOp = this.RULE("rulePlusMinusOp", () => {
 			const { PlusOp: e, MinOp: t } = this._vocab;
 			return this.OR([{ ALT: () => this.CONSUME(e) }, { ALT: () => this.CONSUME(t) }]);
@@ -4789,8 +4789,8 @@ var ai = {
 			}), this.ACTION(() => {
 				const e = n.length;
 				if (0 !== e) for (let i = 0; i < e; i++) {
-					const e = n[i], r = e[0], s = e[1], a = c.includes(r);
-					t = o(r, t, a), t = this._tag(t, s);
+					const e = n[i], r = e[0], s = e[1], o = p.includes(r);
+					t = v(r, t, o), t = this._tag(t, s);
 				}
 			}), t;
 		}), this._rulePrefixOp = this.RULE("rulePrefixOp", () => {
@@ -4809,8 +4809,8 @@ var ai = {
 			return this.ACTION(() => {
 				const e = i.length;
 				if (0 !== e) for (let t = e - 1; t >= 0; t--) {
-					const e = i[t], n = e[0], s = e[1], o = c.includes(n);
-					r = l(n, r, o), r = this._tag(r, s);
+					const e = i[t], n = e[0], o = e[1], a = p.includes(n);
+					r = s(n, r, a), r = this._tag(r, o);
 				}
 			}), r;
 		}), this._ruleRangeOp = this.RULE("ruleRangeOp", () => {
@@ -4838,16 +4838,16 @@ var ai = {
 					const t = s[e], n = s[e + 1];
 					if (":" !== t.op?.value || ":" !== n.op?.value) continue;
 					const i = ni(t.node);
-					i && ni(n.node) === i && ni(s[e - 1].node) !== i && (t.node = this._tag(g(":", t.node, n.node, !0), n.op.index), s.splice(e + 1, 1));
+					i && ni(n.node) === i && ni(s[e - 1].node) !== i && (t.node = this._tag(y(":", t.node, n.node, !0), n.op.index), s.splice(e + 1, 1));
 				}
 				for (let e = 1; e < s.length; e++) {
 					const t = s[e];
 					if (void 0 !== t.anchor) {
-						s[0].node = this._tag(o("#", s[0].node, !0), t.anchor);
+						s[0].node = this._tag(v("#", s[0].node, !0), t.anchor);
 						continue;
 					}
 					const n = t.op;
-					let i = g(n.value, s[0].node, t.node, !0);
+					let i = y(n.value, s[0].node, t.node, !0);
 					i = this._tag(i, n.index), s[0].node = i;
 				}
 			}), s[0].node;
@@ -4861,7 +4861,7 @@ var ai = {
 				},
 				DEF: () => {
 					this.CONSUME(e);
-					const i = this.getLexerPosition(), r = this.SUBRULE(this._ruleFunctionArguments), s = n, o = this.ACTION(() => this._tag(k(s, r), i)), a = this.OPTION(() => this.CONSUME(t));
+					const i = this.getLexerPosition(), r = this.SUBRULE(this._ruleFunctionArguments), s = n, o = this.ACTION(() => this._tag(h(s, r), i)), a = this.OPTION(() => this.CONSUME(t));
 					this.ACTION(() => {
 						a || this._reportError(o, "Missing closing parenthesis ')'", i), this._tagClose(o, this.getLexerPosition()), n = o;
 					});
@@ -4883,7 +4883,7 @@ var ai = {
 				for (; e.length > 1;) {
 					let t = e.length - 1;
 					for (let n = 0; n < t; n++) {
-						const i = e[n], r = e[n + 1], s = g(" ", i, r, !0), o = this._tokenMap.get(i);
+						const i = e[n], r = e[n + 1], s = y(" ", i, r, !0), o = this._tokenMap.get(i);
 						o && delete o.tokenIndexClose;
 						const a = this._tokenMap.get(r), c = a?.tokenIndex;
 						if (void 0 !== c) {
@@ -4913,81 +4913,81 @@ var ai = {
 			}), t;
 		}), this._ruleParen = this.RULE("ruleParen", () => {
 			const { OpenParen: e, CloseParen: t } = this._vocab;
-			return this._processParen(E.Paren, e, t);
+			return this._processParen(f.Paren, e, t);
 		}), this._ruleLiteralArray = this.RULE("ruleLiteralArray", () => {
-			const { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: n, RowSeparator: i } = this._vocab;
-			let r = a();
+			const { OpenCurlyParen: e, CloseCurlyParen: n, ColSeparator: i, RowSeparator: r } = this._vocab;
+			let s = t();
 			this.CONSUME(e);
-			const s = this.getLexerPosition();
-			let o = this.ACTION(() => this._tag(m(r), s));
-			const c = this.SUBRULE(this._ruleLiteralForArray);
+			const o = this.getLexerPosition();
+			let c = this.ACTION(() => this._tag(a(s), o));
+			const h = this.SUBRULE(this._ruleLiteralForArray);
 			this.ACTION(() => {
-				r.value.push(c);
+				s.value.push(h);
 			}), this.MANY(() => {
 				let e = !1;
 				this.OR([{ ALT: () => {
-					this.CONSUME(n), e = !0;
-				} }, { ALT: () => this.CONSUME(i) }]);
-				const t = this.SUBRULE2(this._ruleLiteralForArray);
+					this.CONSUME(i), e = !0;
+				} }, { ALT: () => this.CONSUME(r) }]);
+				const n = this.SUBRULE2(this._ruleLiteralForArray);
 				this.ACTION(() => {
-					e || (r = a(), o.value.push(r)), r.value.push(t);
+					e || (s = t(), c.value.push(s)), s.value.push(n);
 				});
 			});
-			const h = this.OPTION(() => this.CONSUME(t));
-			return o = this.ACTION(() => (h || this._reportError(o, "Missing closing parenthesis '}'", s), this._tagClose(o, this.getLexerPosition()))), o;
+			const l = this.OPTION(() => this.CONSUME(n));
+			return c = this.ACTION(() => (l || this._reportError(c, "Missing closing parenthesis '}'", o), this._tagClose(c, this.getLexerPosition()))), c;
 		}), this._ruleLiteralForArray = this.RULE("ruleLiteralForArray", () => {
-			const { StringToken: e, BooleanToken: t, LiteralError: i, RefError: s } = this._vocab;
+			const { StringToken: e, BooleanToken: t, LiteralError: n, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
-					const e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(y(t.image, this._locale), this.getLexerPosition()));
-					return this.ACTION(() => e ? p(e.image, n) : n);
+					const e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(_(t.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => e ? C(e.image, n) : n);
 				} },
 				{ ALT: () => {
 					const t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(n(t.image), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(c(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(S(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(A(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(i);
-					return this.ACTION(() => this._tag(L(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(n);
+					return this.ACTION(() => this._tag(k(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(s);
-					return this.ACTION(() => this._tag(r(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(R(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleLiteral = this.RULE("ruleLiteral", () => {
-			const { StringToken: e, BooleanToken: t, LiteralError: i, RefError: s } = this._vocab;
+			const { StringToken: e, BooleanToken: t, LiteralError: n, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
 					const e = this.SUBRULE(this._ruleNumber);
-					return this.ACTION(() => this._tag(y(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(_(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(n(t.image), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(c(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(S(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(A(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(i);
-					return this.ACTION(() => this._tag(L(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(n);
+					return this.ACTION(() => this._tag(k(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(s);
-					return this.ACTION(() => this._tag(r(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(R(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleFunction = this.RULE("ruleFunction", () => {
-			const { FunctionToken: e, OpenParen: n, CloseParen: i } = this._vocab, r = this.CONSUME(e).image, s = this.getLexerPosition();
-			this.CONSUME(n);
+			const { FunctionToken: e, OpenParen: t, CloseParen: i } = this._vocab, r = this.CONSUME(e).image, s = this.getLexerPosition();
+			this.CONSUME(t);
 			const o = this.SUBRULE(this._ruleFunctionArguments);
-			let a = this.ACTION(() => this._tag(t(r, o), s));
+			let a = this.ACTION(() => this._tag(n(r, o), s));
 			const c = this.OPTION(() => this.CONSUME(i));
 			return a = this.ACTION(() => (c || this._reportError(a, "Missing closing parenthesis ')'", s), this._tagClose(a, this.getLexerPosition()))), a;
 		}), this._ruleFunctionArguments = this.RULE("ruleFunctionArguments", () => {
@@ -4998,11 +4998,11 @@ var ai = {
 					let t;
 					this.OPTION2(() => {
 						t = this.SUBRULE(this._ruleIntersectOp);
-					}), t = this.ACTION(() => t ?? this._tagClose(C(), this.getLexerPosition())), n.push(t), this.MANY(() => {
+					}), t = this.ACTION(() => t ?? this._tagClose(m(), this.getLexerPosition())), n.push(t), this.MANY(() => {
 						let t;
 						this.CONSUME(e), this.OPTION3(() => {
 							t = this.SUBRULE2(this._ruleIntersectOp);
-						}), t = this.ACTION(() => t ?? this._tagClose(C(), this.getLexerPosition())), n.push(t);
+						}), t = this.ACTION(() => t ?? this._tagClose(m(), this.getLexerPosition())), n.push(t);
 					});
 				}
 			}), n;
@@ -5021,14 +5021,14 @@ var ai = {
 				return this._tag(e.root, n);
 			});
 		}), this._ruleReference = this.RULE("ruleReference", () => {
-			const { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: s, PlusOp: o, MinOp: a, ArgSeparator: c, Cell: h, NamedToken: l, SingleQuotedString: u, Column: d, AbsRow: p, DigitToken: f, RefError: m } = this._vocab;
+			const { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: i, PlusOp: r, MinOp: s, ArgSeparator: o, Cell: a, NamedToken: c, SingleQuotedString: h, Column: l, AbsRow: u, DigitToken: p, RefError: m } = this._vocab;
 			let T, g;
 			this.OPTION2({
 				GATE: () => {
-					for (let i = 1; i < 6; i++) {
-						const r = this.LA(i);
-						if (r.tokenType === e || r.tokenType === t) return !0;
-						if ("" === r.image || ")" === r.image || r.tokenType === n || r.tokenType === s || r.tokenType === o || r.tokenType === a || r.tokenType === c) break;
+					for (let a = 1; a < 6; a++) {
+						const c = this.LA(a);
+						if (c.tokenType === e || c.tokenType === t) return !0;
+						if ("" === c.image || ")" === c.image || c.tokenType === n || c.tokenType === i || c.tokenType === r || c.tokenType === s || c.tokenType === o) break;
 					}
 					return !1;
 				},
@@ -5038,37 +5038,37 @@ var ai = {
 			});
 			let O = this.OR([
 				{ ALT: () => {
-					const e = this.CONSUME(h), t = this.getLexerPosition();
-					return this.ACTION(() => this._tag(A(e.image, this.rowIndex, this.colIndex), t));
+					const e = this.CONSUME(a), t = this.getLexerPosition();
+					return this.ACTION(() => this._tag(d(e.image, this.rowIndex, this.colIndex), t));
 				} },
 				{ ALT: () => {
-					const e = this.OR2([{ ALT: () => this.CONSUME(l) }, { ALT: () => this.CONSUME(u) }]);
-					return this.ACTION(() => this._tag(N(e.image), this.getLexerPosition()));
+					const e = this.OR2([{ ALT: () => this.CONSUME(c) }, { ALT: () => this.CONSUME(h) }]);
+					return this.ACTION(() => this._tag(E(e.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => this.SUBRULE(this._ruleBracketedString) },
 				{ ALT: () => this.SUBRULE(this._ruleFunction) },
 				{ ALT: () => {
-					const e = this.CONSUME(d);
-					return this.ACTION(() => this._tag(v(e.image, this.colIndex), this.getLexerPosition()));
+					const e = this.CONSUME(l);
+					return this.ACTION(() => this._tag(N(e.image, this.colIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(p);
-					return this.ACTION(() => this._tag(i(e.image, this.rowIndex), this.getLexerPosition()));
+					const e = this.CONSUME(u);
+					return this.ACTION(() => this._tag(I(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(f);
-					return this.ACTION(() => this._tag(i(e.image, this.rowIndex), this.getLexerPosition()));
+					const e = this.CONSUME(p);
+					return this.ACTION(() => this._tag(I(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(m);
-					return this.ACTION(() => this._tag(r(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(R(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 			return this.ACTION(() => {
 				if (T && O) {
 					if ("" === T.name) return void this._reportError(O, `'${T.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
 					let e = O;
-					if (O.type === E.Postfix && O.inputs?.[0] && (e = O.inputs[0]), e.type === E.Cell || e.type === E.Named || e.type === E.Row || e.type === E.TableColumn || e.type === E.Error) {
+					if (O.type === f.Postfix && O.inputs?.[0] && (e = O.inputs[0]), e.type === f.Cell || e.type === f.Named || e.type === f.Row || e.type === f.TableColumn || e.type === f.Error) {
 						e.value.scope = T.name, e.value.scopeImage = T.image;
 						const t = this._tokenMap.get(e);
 						t && void 0 !== g && (t.tokenIndex = g);
@@ -5114,48 +5114,48 @@ var ai = {
 			return this.MANY(() => {
 				this.CONSUME(e), n.push(this.SUBRULE2(this._ruleIntersectOp));
 			}), this.ACTION(() => 0 === n.length ? t : {
-				type: E.List,
+				type: f.List,
 				value: ",",
 				inputs: [t, ...n],
 				isReference: !0
 			});
-		}), this._lexer = h, this._locale = h.getLocale(), this._vocab = u, this._srParser = e?.srParser ?? new Jn(this._locale), this.performSelfAnalysis();
+		}), this._lexer = i, this._locale = i.getLocale(), this._vocab = r, this._srParser = e?.srParser ?? new Jn(this._locale), this.performSelfAnalysis();
 	}
 	getLexer() {
 		return this._lexer;
 	}
-	parse(t, n, r) {
-		const s = this._lexer.tokenize(r);
-		let o;
-		if (!s) return {
+	parse(t, n, i) {
+		const r = this._lexer.tokenize(i);
+		let s;
+		if (!r) return {
 			root: {
-				type: E.Unparsed,
-				value: r
+				type: f.Unparsed,
+				value: i
 			},
 			errors: []
 		};
-		const a = s.tokens;
+		const a = r.tokens;
 		if (0 === a.length) throw new e.Parse(ri);
-		return this.input = a, this._inputText = r, this._inputTextLength = r.length, this.rowIndex = t, this.colIndex = n, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), o = this._ruleRoot(), o && this._bindAllWhitespace(o), o = R(o, (e, n) => {
-			const r = e.type, s = n?.isReference ? n.value : void 0, o = "string" == typeof s && ei.has(s), a = "string" == typeof s && ti.has(s), c = o ? n.inputs : void 0, h = c ? c[0] === e ? c[1] : c[0] : void 0, l = this._lexer.getMaxRow();
-			if (o && r !== E.Cell && Number.isInteger(e.value)) {
-				const n = i(e.image, t);
-				return f(n, e), "row" !== ni(h) ? this._reportError(n, `'${e.image}' is not a valid reference — a whole row can only pair with another row (as in ${e.image}:${e.image})`) : ii(e.image, l) || this._reportError(n, `'${e.image}' is not a valid row — rows run from 1 to ${l}`), n;
+		return this.input = a, this._inputText = i, this._inputTextLength = i.length, this.rowIndex = t, this.colIndex = n, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), s = this._ruleRoot(), s && this._bindAllWhitespace(s), s = u(s, (e, n) => {
+			const i = e.type, r = n?.isReference ? n.value : void 0, s = "string" == typeof r && ei.has(r), a = "string" == typeof r && ti.has(r), c = s ? n.inputs : void 0, h = c ? c[0] === e ? c[1] : c[0] : void 0, l = this._lexer.getMaxRow();
+			if (s && i !== f.Cell && Number.isInteger(e.value)) {
+				const n = I(e.image, t);
+				return o(n, e), "row" !== ni(h) ? this._reportError(n, `'${e.image}' is not a valid reference — a whole row can only pair with another row (as in ${e.image}:${e.image})`) : ii(e.image, l) || this._reportError(n, `'${e.image}' is not a valid row — rows run from 1 to ${l}`), n;
 			}
-			if (a && r === E.Named) return this._reportError(e, `'${e.image ?? e.value?.nameId}' is a name — '${s}' needs a cell or range on both sides`), e;
-			if (r === E.Cell) {
+			if (a && i === f.Named) return this._reportError(e, `'${e.image ?? e.value?.nameId}' is a name — '${r}' needs a cell or range on both sides`), e;
+			if (i === f.Cell) {
 				const t = e.value, n = t.colIndex === Number.MIN_SAFE_INTEGER, i = t.rowIndex === Number.MIN_SAFE_INTEGER;
 				if ((n || i) && ni(h) === (n ? "row" : "col")) return n && !ii(e.image, l) && this._reportError(e, `'${e.image}' is not a valid row — rows run from 1 to ${l}`), e;
 				if (n || i || t.colIndex >= 16384) {
-					const r = N(e.image);
-					f(r, e);
-					const o = t.scope;
-					return o && (r.value.scope = o, r.value.scopeImage = t.scopeImage), n ? this._reportError(r, `'${e.image}' is not a valid reference — a row needs a column (use ${e.image}:${e.image} for the whole row)`) : i && e.image.includes("$") ? this._reportError(r, `'${e.image}' is not a valid reference — a whole column can only pair with another column (as in ${e.image}:${e.image})`) : a && this._reportError(r, `'${e.image}' is a name — '${s}' needs a cell or range on both sides`), r;
+					const s = E(e.image);
+					o(s, e);
+					const c = t.scope;
+					return c && (s.value.scope = c, s.value.scopeImage = t.scopeImage), n ? this._reportError(s, `'${e.image}' is not a valid reference — a row needs a column (use ${e.image}:${e.image} for the whole row)`) : i && e.image.includes("$") ? this._reportError(s, `'${e.image}' is not a valid reference — a whole column can only pair with another column (as in ${e.image}:${e.image})`) : a && this._reportError(s, `'${e.image}' is a name — '${r}' needs a cell or range on both sides`), s;
 				}
 			}
 			return e;
 		}), {
-			root: o,
+			root: s,
 			errors: [...this.errors, ...this._astErrors]
 		};
 	}
@@ -5211,7 +5211,7 @@ var ai = {
 	_bindAllWhitespace(e) {
 		if (e) {
 			if (this._bindNodeWhitespace(e), e.inputs) for (const t of e.inputs) t && this._bindAllWhitespace(t);
-			if (e.type === E.Array && Array.isArray(e.value)) {
+			if (e.type === f.Array && Array.isArray(e.value)) {
 				for (const t of e.value) if (t && Array.isArray(t.value)) for (const e of t.value) e && this._bindAllWhitespace(e);
 			}
 		}