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

package/browser/esm/{d_t-7d5BD1AdHg3u.mjs → Bql31KGUYo0SCMwZ.mjs}

@@ -1,10 +1,10 @@
 /**
-* @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 { $r as e, Br as t, Dr as n, Fr as r, Gr as i, Hr as a, Ir as o, Jr as s, Kr as c, Lr as l, Mr as u, Nr as d, Qr as f, Rr as p, Ur as m, Vr as h, Wr as g, Xr as _, Yr as ee, Zr as v, ai as te, ci as y, ii as ne, jr as b, kr as x, li as S, oi as C, pi as w, qr as re, zr as T } from "./CkZoDPUCK5jMUaeJ.mjs";
+import { $r as e, Ar as t, Br as n, Gr as r, Hr as i, Ir as a, Jr as o, Kr as s, Lr as c, Mr as l, Nr as u, Or as d, Pr as f, Qr as p, Rr as m, Ur as h, Vr as g, Wr as _, Xr as ee, Yr as v, Zr as y, ai as b, ei as x, li as te, mi as S, oi as C, qr as w, si as ne, ui as T, zr as re } from "./_lh_Rr5SwLthmbmu.mjs";
 import { FormulaError as E } from "@sheetxl/primitives";
 function D(e) {
 	console && console.error && console.error(`Error: ${e}`);
@@ -171,7 +171,7 @@ function oe(e) {
 function B(e) {
 	return Object.fromEntries(Object.entries(e).filter(([, e]) => e !== void 0));
 }
-var V = class {
+var se = class {
 	visit(e) {
 		let t = e;
 		switch (t.constructor) {
@@ -199,10 +199,10 @@ var V = class {
 	visitTerminal(e) {}
 	visitRule(e) {}
 };
-function se(e, t = []) {
-	return e instanceof N || e instanceof I || e instanceof L || (e instanceof R ? e.definition.some((e) => se(e, t)) : !(e instanceof A && t.includes(e)) && e instanceof k && (e instanceof A && t.push(e), e.definition.every((e) => se(e, t))));
+function ce(e, t = []) {
+	return e instanceof N || e instanceof I || e instanceof L || (e instanceof R ? e.definition.some((e) => ce(e, t)) : !(e instanceof A && t.includes(e)) && e instanceof k && (e instanceof A && t.push(e), e.definition.every((e) => ce(e, t))));
 }
-function H(e) {
+function V(e) {
 	if (e instanceof A) return "SUBRULE";
 	if (e instanceof N) return "OPTION";
 	if (e instanceof R) return "OR";
@@ -213,7 +213,7 @@ function H(e) {
 	if (e instanceof z) return "CONSUME";
 	throw Error("non exhaustive match");
 }
-var ce = class {
+var le = class {
 	walk(e, t = []) {
 		e.definition.forEach((n, r) => {
 			let i = e.definition.slice(r + 1);
@@ -246,7 +246,7 @@ var ce = class {
 		this.walk(e, r);
 	}
 	walkAtLeastOneSep(e, t, n) {
-		let r = le(e, t, n);
+		let r = ue(e, t, n);
 		this.walk(e, r);
 	}
 	walkMany(e, t, n) {
@@ -254,7 +254,7 @@ var ce = class {
 		this.walk(e, r);
 	}
 	walkManySep(e, t, n) {
-		let r = le(e, t, n);
+		let r = ue(e, t, n);
 		this.walk(e, r);
 	}
 	walkOr(e, t, n) {
@@ -265,28 +265,28 @@ var ce = class {
 		});
 	}
 };
-function le(e, t, n) {
+function ue(e, t, n) {
 	return [new N({ definition: [new z({ terminalType: e.separator })].concat(e.definition) })].concat(t, n);
 }
-function ue(e) {
-	if (e instanceof A) return ue(e.referencedRule);
+function de(e) {
+	if (e instanceof A) return de(e.referencedRule);
 	if (e instanceof z) return [e.terminalType];
 	if (function(e) {
 		return e instanceof M || e instanceof N || e instanceof I || e instanceof P || e instanceof F || e instanceof L || e instanceof z || e instanceof j;
 	}(e)) return function(e) {
 		let t = [], n = e.definition, r, i = 0, a = n.length > i, o = !0;
-		for (; a && o;) r = n[i], o = se(r), t = t.concat(ue(r)), i += 1, a = n.length > i;
+		for (; a && o;) r = n[i], o = ce(r), t = t.concat(de(r)), i += 1, a = n.length > i;
 		return [...new Set(t)];
 	}(e);
 	if (function(e) {
 		return e instanceof R;
 	}(e)) return function(e) {
-		let t = e.definition.map((e) => ue(e));
+		let t = e.definition.map((e) => de(e));
 		return [...new Set(t.flat())];
 	}(e);
 	throw Error("non exhaustive match");
 }
-var de = "_~IN~_", fe = class extends ce {
+var fe = "_~IN~_", pe = class extends le {
 	constructor(e) {
 		super(), this.topProd = e, this.follows = {};
 	}
@@ -295,67 +295,67 @@ var de = "_~IN~_", fe = class extends ce {
 	}
 	walkTerminal(e, t, n) {}
 	walkProdRef(e, t, n) {
-		let r = (i = e.referencedRule, a = e.idx, i.name + a + de + this.topProd.name);
+		let r = (i = e.referencedRule, a = e.idx, i.name + a + fe + this.topProd.name);
 		var i, a;
-		let o = ue(new M({ definition: t.concat(n) }));
+		let o = de(new M({ definition: t.concat(n) }));
 		this.follows[r] = o;
 	}
 };
-function U(e) {
+function H(e) {
 	return e.charCodeAt(0);
 }
-function pe(e, t) {
+function me(e, t) {
 	Array.isArray(e) ? e.forEach(function(e) {
 		t.push(e);
 	}) : t.push(e);
 }
-function W(e, t) {
+function U(e, t) {
 	if (!0 === e[t]) throw "duplicate flag " + t;
 	e[t], e[t] = !0;
 }
-function G(e) {
+function W(e) {
 	if (e === void 0) throw Error("Internal Error - Should never get here!");
 	return !0;
 }
-function me() {
+function he() {
 	throw Error("Internal Error - Should never get here!");
 }
-function he(e) {
+function ge(e) {
 	return e.type === "Character";
 }
-var ge = [];
-for (let e = U("0"); e <= U("9"); e++) ge.push(e);
-var _e = [U("_")].concat(ge);
-for (let e = U("a"); e <= U("z"); e++) _e.push(e);
-for (let e = U("A"); e <= U("Z"); e++) _e.push(e);
-var ve = [
-	U(" "),
-	U("\f"),
-	U("\n"),
-	U("\r"),
-	U("	"),
-	U("\v"),
-	U("	"),
-	U("\xA0"),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U(" "),
-	U("\u2028"),
-	U("\u2029"),
-	U(" "),
-	U(" "),
-	U("　"),
-	U("")
-], ye = /[0-9a-fA-F]/, be = /[0-9]/, xe = /[1-9]/, Se = class {
+var _e = [];
+for (let e = H("0"); e <= H("9"); e++) _e.push(e);
+var ve = [H("_")].concat(_e);
+for (let e = H("a"); e <= H("z"); e++) ve.push(e);
+for (let e = H("A"); e <= H("Z"); e++) ve.push(e);
+var ye = [
+	H(" "),
+	H("\f"),
+	H("\n"),
+	H("\r"),
+	H("	"),
+	H("\v"),
+	H("	"),
+	H("\xA0"),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H(" "),
+	H("\u2028"),
+	H("\u2029"),
+	H(" "),
+	H(" "),
+	H("　"),
+	H("")
+], be = /[0-9a-fA-F]/, xe = /[0-9]/, Se = /[1-9]/, Ce = class {
 	visitChildren(e) {
 		for (let t in e) {
 			let n = e[t];
@@ -435,7 +435,7 @@ var ve = [
 	visitGroup(e) {}
 	visitGroupBackReference(e) {}
 	visitQuantifier(e) {}
-}, Ce = {}, we = new class {
+}, we = {}, Te = new class {
 	constructor() {
 		this.idx = 0, this.input = "", this.groupIdx = 0;
 	}
@@ -467,18 +467,18 @@ var ve = [
 		};
 		for (; this.isRegExpFlag();) switch (this.popChar()) {
 			case "g":
-				W(n, "global");
+				U(n, "global");
 				break;
 			case "i":
-				W(n, "ignoreCase");
+				U(n, "ignoreCase");
 				break;
 			case "m":
-				W(n, "multiLine");
+				U(n, "multiLine");
 				break;
 			case "u":
-				W(n, "unicode");
+				U(n, "unicode");
 				break;
-			case "y": W(n, "sticky");
+			case "y": U(n, "sticky");
 		}
 		if (this.idx !== this.input.length) throw Error("Redundant input: " + this.input.substring(this.idx));
 		return {
@@ -548,7 +548,7 @@ var ve = [
 						case "!": t = "NegativeLookbehind";
 					}
 				}
-				G(t);
+				W(t);
 				let n = this.disjunction();
 				return this.consumeChar(")"), {
 					type: t,
@@ -556,7 +556,7 @@ var ve = [
 					loc: this.loc(e)
 				};
 		}
-		return me();
+		return he();
 	}
 	quantifier(e = !1) {
 		let t, n = this.idx;
@@ -599,9 +599,9 @@ var ve = [
 						}, this.consumeChar("}");
 				}
 				if (!0 === e && t === void 0) return;
-				G(t);
+				W(t);
 		}
-		if (!0 !== e || t !== void 0) return G(t) ? (this.peekChar(0) === "?" ? (this.consumeChar("?"), t.greedy = !1) : t.greedy = !0, t.type = "Quantifier", t.loc = this.loc(n), t) : void 0;
+		if (!0 !== e || t !== void 0) return W(t) ? (this.peekChar(0) === "?" ? (this.consumeChar("?"), t.greedy = !1) : t.greedy = !0, t.type = "Quantifier", t.loc = this.loc(n), t) : void 0;
 	}
 	atom() {
 		let e, t = this.idx;
@@ -617,17 +617,17 @@ var ve = [
 				break;
 			case "(": e = this.group();
 		}
-		return e === void 0 && this.isPatternCharacter() && (e = this.patternCharacter()), G(e) ? (e.loc = this.loc(t), this.isQuantifier() && (e.quantifier = this.quantifier()), e) : me();
+		return e === void 0 && this.isPatternCharacter() && (e = this.patternCharacter()), W(e) ? (e.loc = this.loc(t), this.isQuantifier() && (e.quantifier = this.quantifier()), e) : he();
 	}
 	dotAll() {
 		return this.consumeChar("."), {
 			type: "Set",
 			complement: !0,
 			value: [
-				U("\n"),
-				U("\r"),
-				U("\u2028"),
-				U("\u2029")
+				H("\n"),
+				H("\r"),
+				H("\u2028"),
+				H("\u2029")
 			]
 		};
 	}
@@ -670,49 +670,49 @@ var ve = [
 		let e, t = !1;
 		switch (this.popChar()) {
 			case "d":
-				e = ge;
+				e = _e;
 				break;
 			case "D":
-				e = ge, t = !0;
+				e = _e, t = !0;
 				break;
 			case "s":
-				e = ve;
+				e = ye;
 				break;
 			case "S":
-				e = ve, t = !0;
+				e = ye, t = !0;
 				break;
 			case "w":
-				e = _e;
+				e = ve;
 				break;
-			case "W": e = _e, t = !0;
+			case "W": e = ve, t = !0;
 		}
-		return G(e) ? {
+		return W(e) ? {
 			type: "Set",
 			value: e,
 			complement: t
-		} : me();
+		} : he();
 	}
 	controlEscapeAtom() {
 		let e;
 		switch (this.popChar()) {
 			case "f":
-				e = U("\f");
+				e = H("\f");
 				break;
 			case "n":
-				e = U("\n");
+				e = H("\n");
 				break;
 			case "r":
-				e = U("\r");
+				e = H("\r");
 				break;
 			case "t":
-				e = U("	");
+				e = H("	");
 				break;
-			case "v": e = U("\v");
+			case "v": e = H("\v");
 		}
-		return G(e) ? {
+		return W(e) ? {
 			type: "Character",
 			value: e
-		} : me();
+		} : he();
 	}
 	controlLetterEscapeAtom() {
 		this.consumeChar("c");
@@ -726,7 +726,7 @@ var ve = [
 	nulCharacterAtom() {
 		return this.consumeChar("0"), {
 			type: "Character",
-			value: U("\0")
+			value: H("\0")
 		};
 	}
 	hexEscapeSequenceAtom() {
@@ -738,7 +738,7 @@ var ve = [
 	identityEscapeAtom() {
 		return {
 			type: "Character",
-			value: U(this.popChar())
+			value: H(this.popChar())
 		};
 	}
 	classPatternCharacterAtom() {
@@ -751,7 +751,7 @@ var ve = [
 			case "]": throw Error("TBD");
 			default: return {
 				type: "Character",
-				value: U(this.popChar())
+				value: H(this.popChar())
 			};
 		}
 	}
@@ -759,17 +759,17 @@ var ve = [
 		let e = [], t = !1;
 		for (this.consumeChar("["), this.peekChar(0) === "^" && (this.consumeChar("^"), t = !0); this.isClassAtom();) {
 			let t = this.classAtom();
-			if (t.type, he(t) && this.isRangeDash()) {
+			if (t.type, ge(t) && this.isRangeDash()) {
 				this.consumeChar("-");
 				let n = this.classAtom();
-				if (n.type, he(n)) {
+				if (n.type, ge(n)) {
 					if (n.value < t.value) throw Error("Range out of order in character class");
 					e.push({
 						from: t.value,
 						to: n.value
 					});
-				} else pe(t.value, e), e.push(U("-")), pe(n.value, e);
-			} else pe(t.value, e);
+				} else me(t.value, e), e.push(H("-")), me(n.value, e);
+			} else me(t.value, e);
 		}
 		return this.consumeChar("]"), {
 			type: "Set",
@@ -792,7 +792,7 @@ var ve = [
 		switch (this.consumeChar("\\"), this.peekChar()) {
 			case "b": return this.consumeChar("b"), {
 				type: "Character",
-				value: U("\b")
+				value: H("\b")
 			};
 			case "d":
 			case "D":
@@ -826,14 +826,14 @@ var ve = [
 	}
 	positiveInteger() {
 		let e = this.popChar();
-		if (!1 === xe.test(e)) throw Error("Expecting a positive integer");
-		for (; be.test(this.peekChar(0));) e += this.popChar();
+		if (!1 === Se.test(e)) throw Error("Expecting a positive integer");
+		for (; xe.test(this.peekChar(0));) e += this.popChar();
 		return parseInt(e, 10);
 	}
 	integerIncludingZero() {
 		let e = this.popChar();
-		if (!1 === be.test(e)) throw Error("Expecting an integer");
-		for (; be.test(this.peekChar(0));) e += this.popChar();
+		if (!1 === xe.test(e)) throw Error("Expecting an integer");
+		for (; xe.test(this.peekChar(0));) e += this.popChar();
 		return parseInt(e, 10);
 	}
 	patternCharacter() {
@@ -856,7 +856,7 @@ var ve = [
 			case "|": throw Error("TBD");
 			default: return {
 				type: "Character",
-				value: U(e)
+				value: H(e)
 			};
 		}
 	}
@@ -874,7 +874,7 @@ var ve = [
 		return this.peekChar() === "-" && this.isClassAtom(1);
 	}
 	isDigit() {
-		return be.test(this.peekChar(0));
+		return xe.test(this.peekChar(0));
 	}
 	isClassAtom(e = 0) {
 		switch (this.peekChar(e)) {
@@ -947,7 +947,7 @@ var ve = [
 		let t = "";
 		for (let n = 0; n < e; n++) {
 			let e = this.popChar();
-			if (!1 === ye.test(e)) throw Error("Expecting a HexDecimal digits");
+			if (!1 === be.test(e)) throw Error("Expecting a HexDecimal digits");
 			t += e;
 		}
 		return {
@@ -974,32 +974,32 @@ var ve = [
 		};
 	}
 }();
-function Te(e) {
+function Ee(e) {
 	let t = e.toString();
-	if (Ce.hasOwnProperty(t)) return Ce[t];
+	if (we.hasOwnProperty(t)) return we[t];
 	{
-		let e = we.pattern(t);
-		return Ce[t] = e, e;
+		let e = Te.pattern(t);
+		return we[t] = e, e;
 	}
 }
-var Ee = "Complement Sets are not supported for first char optimization", De = "Unable to use \"first char\" lexer optimizations:\n";
-function Oe(e, t = !1) {
+var De = "Complement Sets are not supported for first char optimization", Oe = "Unable to use \"first char\" lexer optimizations:\n";
+function ke(e, t = !1) {
 	try {
-		let t = Te(e);
-		return ke(t.value, {}, t.flags.ignoreCase);
+		let t = Ee(e);
+		return Ae(t.value, {}, t.flags.ignoreCase);
 	} catch (n) {
-		if (n.message === Ee) t && O(`${De}\tUnable to optimize: < ${e.toString()} >\n\tComplement Sets cannot be automatically optimized.\n\tThis will disable the lexer's first char optimizations.\n\tSee: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);
+		if (n.message === De) t && O(`${Oe}\tUnable to optimize: < ${e.toString()} >\n\tComplement Sets cannot be automatically optimized.\n\tThis will disable the lexer's first char optimizations.\n\tSee: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);
 		else {
 			let n = "";
-			t && (n = "\n	This will disable the lexer's first char optimizations.\n	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details."), D(`${De}\n\tFailed parsing: < ${e.toString()} >\n\tUsing the @chevrotain/regexp-to-ast library\n\tPlease open an issue at: https://github.com/chevrotain/chevrotain/issues` + n);
+			t && (n = "\n	This will disable the lexer's first char optimizations.\n	See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details."), D(`${Oe}\n\tFailed parsing: < ${e.toString()} >\n\tUsing the @chevrotain/regexp-to-ast library\n\tPlease open an issue at: https://github.com/chevrotain/chevrotain/issues` + n);
 		}
 	}
 	return [];
 }
-function ke(e, t, n) {
+function Ae(e, t, n) {
 	switch (e.type) {
 		case "Disjunction":
-			for (let r = 0; r < e.value.length; r++) ke(e.value[r], t, n);
+			for (let r = 0; r < e.value.length; r++) Ae(e.value[r], t, n);
 			break;
 		case "Alternative":
 			let r = e.value;
@@ -1019,17 +1019,17 @@ function ke(e, t, n) {
 				let a = i;
 				switch (a.type) {
 					case "Character":
-						Ae(a.value, t, n);
+						je(a.value, t, n);
 						break;
 					case "Set":
-						if (!0 === a.complement) throw Error(Ee);
+						if (!0 === a.complement) throw Error(De);
 						a.value.forEach((e) => {
-							if (typeof e == "number") Ae(e, t, n);
+							if (typeof e == "number") je(e, t, n);
 							else {
 								let r = e;
-								if (!0 === n) for (let e = r.from; e <= r.to; e++) Ae(e, t, n);
+								if (!0 === n) for (let e = r.from; e <= r.to; e++) je(e, t, n);
 								else {
-									for (let e = r.from; e <= r.to && e < 256; e++) Ae(e, t, n);
+									for (let e = r.from; e <= r.to && e < 256; e++) je(e, t, n);
 									if (r.to >= 256) {
 										let e = r.from >= 256 ? r.from : 256, n = r.to, i = K(e), a = K(n);
 										for (let e = i; e <= a; e++) t[e] = e;
@@ -1039,19 +1039,19 @@ function ke(e, t, n) {
 						});
 						break;
 					case "Group":
-						ke(a.value, t, n);
+						Ae(a.value, t, n);
 						break;
 					default: throw Error("Non Exhaustive Match");
 				}
 				let o = a.quantifier !== void 0 && a.quantifier.atLeast === 0;
-				if (a.type === "Group" && !1 === Me(a) || a.type !== "Group" && !1 === o) break;
+				if (a.type === "Group" && !1 === Ne(a) || a.type !== "Group" && !1 === o) break;
 			}
 			break;
 		default: throw Error("non exhaustive match!");
 	}
 	return Object.values(t);
 }
-function Ae(e, t, n) {
+function je(e, t, n) {
 	let r = K(e);
 	t[r] = r, !0 === n && function(e, t) {
 		let n = String.fromCharCode(e), r = n.toUpperCase();
@@ -1067,7 +1067,7 @@ function Ae(e, t, n) {
 		}
 	}(e, t);
 }
-function je(e, t) {
+function Me(e, t) {
 	return e.value.find((e) => {
 		if (typeof e == "number") return t.includes(e);
 		{
@@ -1076,11 +1076,11 @@ function je(e, t) {
 		}
 	});
 }
-function Me(e) {
+function Ne(e) {
 	let t = e.quantifier;
-	return !(!t || t.atLeast !== 0) || !!e.value && (Array.isArray(e.value) ? e.value.every(Me) : Me(e.value));
+	return !(!t || t.atLeast !== 0) || !!e.value && (Array.isArray(e.value) ? e.value.every(Ne) : Ne(e.value));
 }
-var Ne = class extends Se {
+var Pe = class extends Ce {
 	constructor(e) {
 		super(), this.targetCharCodes = e, this.found = !1;
 	}
@@ -1107,12 +1107,12 @@ var Ne = class extends Se {
 		this.targetCharCodes.includes(e.value) && (this.found = !0);
 	}
 	visitSet(e) {
-		e.complement ? je(e, this.targetCharCodes) === void 0 && (this.found = !0) : je(e, this.targetCharCodes) !== void 0 && (this.found = !0);
+		e.complement ? Me(e, this.targetCharCodes) === void 0 && (this.found = !0) : Me(e, this.targetCharCodes) !== void 0 && (this.found = !0);
 	}
 };
-function Pe(e, t) {
+function Fe(e, t) {
 	if (t instanceof RegExp) {
-		let n = Te(t), r = new Ne(e);
+		let n = Ee(t), r = new Pe(e);
 		return r.visit(n), r.found;
 	}
 	for (let n of t) {
@@ -1121,7 +1121,7 @@ function Pe(e, t) {
 	}
 	return !1;
 }
-var Fe = "PATTERN", Ie = "defaultMode";
+var G = "PATTERN", Ie = "defaultMode";
 function Le(e, t) {
 	let n = (t = Object.assign({
 		safeMode: !1,
@@ -1137,12 +1137,12 @@ function Le(e, t) {
 			}
 		})();
 	}), n("Reject Lexer.NA", () => {
-		r = e.filter((e) => e[Fe] !== J.NA);
+		r = e.filter((e) => e[G] !== J.NA);
 	});
 	let i, a, o, s, c, l, u, d, f, p, m, h = !1;
 	n("Transform Patterns", () => {
 		h = !1, i = r.map((e) => {
-			let t = e[Fe];
+			let t = e[G];
 			if (t instanceof RegExp) {
 				let e = t.source;
 				return e.length !== 1 || e === "^" || e === "$" || e === "." || t.ignoreCase ? e.length !== 2 || e[0] !== "\\" || [
@@ -1189,7 +1189,7 @@ function Le(e, t) {
 		}), c = r.map((e) => e.PUSH_MODE), l = r.map((e) => Object.hasOwn(e, "POP_MODE"));
 	}), n("Line Terminator Handling", () => {
 		let e = qe(t.lineTerminatorCharacters);
-		u = r.map((e) => !1), t.positionTracking !== "onlyOffset" && (u = r.map((t) => Object.hasOwn(t, "LINE_BREAKS") ? !!t.LINE_BREAKS : !1 === Ge(t, e) && Pe(e, t.PATTERN)));
+		u = r.map((e) => !1), t.positionTracking !== "onlyOffset" && (u = r.map((t) => Object.hasOwn(t, "LINE_BREAKS") ? !!t.LINE_BREAKS : !1 === Ge(t, e) && Fe(e, t.PATTERN)));
 	}), n("Misc Mapping #2", () => {
 		d = r.map(He), f = i.map(Ue), p = r.reduce((e, t) => {
 			let n = t.GROUP;
@@ -1199,7 +1199,7 @@ function Le(e, t) {
 				if (!(e instanceof RegExp) || e.flags !== "") return;
 				let t;
 				try {
-					t = Te(e);
+					t = Ee(e);
 				} catch {
 					return;
 				}
@@ -1244,14 +1244,14 @@ function Le(e, t) {
 					t !== i && (t = i, Je(e, i, m[r]));
 				});
 			} else if (n.PATTERN instanceof RegExp) {
-				if (n.PATTERN.unicode) g = !1, t.ensureOptimizations && D(`${De}\tUnable to analyze < ${n.PATTERN.toString()} > pattern.\n\tThe regexp unicode flag is not currently supported by the regexp-to-ast library.\n\tThis will disable the lexer's first char optimizations.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);
+				if (n.PATTERN.unicode) g = !1, t.ensureOptimizations && D(`${Oe}\tUnable to analyze < ${n.PATTERN.toString()} > pattern.\n\tThe regexp unicode flag is not currently supported by the regexp-to-ast library.\n\tThis will disable the lexer's first char optimizations.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);
 				else {
-					let i = Oe(n.PATTERN, t.ensureOptimizations);
+					let i = ke(n.PATTERN, t.ensureOptimizations);
 					i.length === 0 && (g = !1), i.forEach((t) => {
 						Je(e, t, m[r]);
 					});
 				}
-			} else t.ensureOptimizations && D(`${De}\tTokenType: <${n.name}> is using a custom token pattern without providing <start_chars_hint> parameter.\n\tThis will disable the lexer's first char optimizations.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`), g = !1;
+			} else t.ensureOptimizations && D(`${Oe}\tTokenType: <${n.name}> is using a custom token pattern without providing <start_chars_hint> parameter.\n\tThis will disable the lexer's first char optimizations.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`), g = !1;
 			return e;
 		}, []);
 	}), {
@@ -1264,7 +1264,7 @@ function Le(e, t) {
 }
 function Re(e, t) {
 	let n = [], r = function(e) {
-		let t = e.filter((e) => !Object.hasOwn(e, Fe));
+		let t = e.filter((e) => !Object.hasOwn(e, G));
 		return {
 			errors: t.map((e) => ({
 				message: "Token Type: ->" + e.name + "<- missing static 'PATTERN' property",
@@ -1277,7 +1277,7 @@ function Re(e, t) {
 	n = n.concat(r.errors);
 	let i = function(e) {
 		let t = e.filter((e) => {
-			let t = e[Fe];
+			let t = e[G];
 			return !(t instanceof RegExp || typeof t == "function" || Object.hasOwn(t, "exec") || typeof t == "string");
 		});
 		return {
@@ -1290,9 +1290,9 @@ function Re(e, t) {
 		};
 	}(r.valid), a = i.valid;
 	return n = n.concat(i.errors), n = n.concat(function(e) {
-		let t = [], n = e.filter((e) => e[Fe] instanceof RegExp);
+		let t = [], n = e.filter((e) => e[G] instanceof RegExp);
 		return t = t.concat(function(e) {
-			class t extends Se {
+			class t extends Ce {
 				constructor() {
 					super(...arguments), this.found = !1;
 				}
@@ -1303,7 +1303,7 @@ function Re(e, t) {
 			return e.filter((e) => {
 				let n = e.PATTERN;
 				try {
-					let e = Te(n), r = new t();
+					let e = Ee(n), r = new t();
 					return r.visit(e), r.found;
 				} catch {
 					return ze.test(n.source);
@@ -1314,7 +1314,7 @@ function Re(e, t) {
 				tokenTypes: [e]
 			}));
 		}(n)), t = t.concat(function(e) {
-			class t extends Se {
+			class t extends Ce {
 				constructor() {
 					super(...arguments), this.found = !1;
 				}
@@ -1325,7 +1325,7 @@ function Re(e, t) {
 			return e.filter((e) => {
 				let n = e.PATTERN;
 				try {
-					let e = Te(n), r = new t();
+					let e = Ee(n), r = new t();
 					return r.visit(e), r.found;
 				} catch {
 					return Be.test(n.source);
@@ -1337,7 +1337,7 @@ function Re(e, t) {
 			}));
 		}(n)), t = t.concat(function(e) {
 			return e.filter((e) => {
-				let t = e[Fe];
+				let t = e[G];
 				return t instanceof RegExp && (t.multiline || t.global);
 			}).map((e) => ({
 				message: "Token Type: ->" + e.name + "<- static 'PATTERN' may NOT contain global('g') or multiline('m')",
@@ -1460,7 +1460,7 @@ function Ge(e, t) {
 	if (Object.hasOwn(e, "LINE_BREAKS")) return !1;
 	if (e.PATTERN instanceof RegExp) {
 		try {
-			Pe(t, e.PATTERN);
+			Fe(t, e.PATTERN);
 		} catch (e) {
 			return {
 				issue: q.IDENTIFY_TERMINATOR,
@@ -1617,7 +1617,7 @@ var J = class {
 				}(n, this.trackStartLines, this.config.lineTerminatorCharacters));
 			}), this.TRACE_INIT("performWarningRuntimeChecks", () => {
 				this.lexerDefinitionWarning = this.lexerDefinitionWarning.concat(function(e, t, n) {
-					let r = [], i = !1, a = Object.values(e.modes || {}).flat().filter(Boolean).filter((e) => e[Fe] !== J.NA), o = qe(n);
+					let r = [], i = !1, a = Object.values(e.modes || {}).flat().filter(Boolean).filter((e) => e[G] !== J.NA), o = qe(n);
 					return t && a.forEach((e) => {
 						let t = Ge(e, o);
 						if (!1 !== t) {
@@ -1627,7 +1627,7 @@ var J = class {
 								tokenType: e
 							};
 							r.push(n);
-						} else Object.hasOwn(e, "LINE_BREAKS") ? !0 === e.LINE_BREAKS && (i = !0) : Pe(o, e.PATTERN) && (i = !0);
+						} else Object.hasOwn(e, "LINE_BREAKS") ? !0 === e.LINE_BREAKS && (i = !0) : Fe(o, e.PATTERN) && (i = !0);
 					}), t && !i && r.push({
 						message: "Warning: No LINE_BREAKS Found.\n	This Lexer has been defined to track line and column information,\n	But none of the Token Types can be identified as matching a line terminator.\n	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS \n	for details.",
 						type: q.NO_LINE_BREAKS_FLAGS
@@ -1672,7 +1672,7 @@ var J = class {
 				let e = Object.entries(this.canModeBeOptimized).reduce((e, [t, n]) => (!1 === n && e.push(t), e), []);
 				if (t.ensureOptimizations && e.length > 0) throw Error(`Lexer Modes: < ${e.join(", ")} > cannot be optimized.\n\t Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode.\n\t Or inspect the console log for details on how to resolve these issues.`);
 			}), this.TRACE_INIT("clearRegExpParserCache", () => {
-				Ce = {};
+				we = {};
 			}), this.TRACE_INIT("toFastProperties", () => {
 				ae(this);
 			});
@@ -1686,14 +1686,14 @@ var J = class {
 		return this.tokenizeInternal(e, t);
 	}
 	tokenizeInternal(e, t) {
-		let n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _ = e, ee = _.length, v = 0, te = 0, y = this.hasCustom ? 0 : Math.floor(e.length / 10), ne = Array(y), b = [], x = this.trackStartLines ? 1 : void 0, S = this.trackStartLines ? 1 : void 0, C = {};
-		for (let e = 0; e < this.cachedGroupKeys.length; e++) C[this.cachedGroupKeys[e]] = [];
-		let w = this.trackStartLines, re = this.config.lineTerminatorsPattern, T = 0, E = [], D = [], O = [], ie = [];
+		let n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _ = e, ee = _.length, v = 0, y = 0, b = this.hasCustom ? 0 : Math.floor(e.length / 10), x = Array(b), te = [], S = this.trackStartLines ? 1 : void 0, C = this.trackStartLines ? 1 : void 0, w = {};
+		for (let e = 0; e < this.cachedGroupKeys.length; e++) w[this.cachedGroupKeys[e]] = [];
+		let ne = this.trackStartLines, T = this.config.lineTerminatorsPattern, re = 0, E = [], D = [], O = [], ie = [];
 		Object.freeze(ie);
 		let ae = !1, k = (e) => {
 			if (O.length === 1 && e.tokenType.PUSH_MODE === void 0) {
 				let t = this.config.errorMessageProvider.buildUnableToPopLexerModeMessage(e);
-				b.push({
+				te.push({
 					offset: e.startOffset,
 					line: e.startLine,
 					column: e.startColumn,
@@ -1703,13 +1703,13 @@ var J = class {
 			} else {
 				O.pop();
 				let e = O.at(-1);
-				E = this.patternIdxToConfig[e], D = this.charCodeToPatternIdxToConfig[e], T = E.length;
+				E = this.patternIdxToConfig[e], D = this.charCodeToPatternIdxToConfig[e], re = E.length;
 				let t = this.canModeBeOptimized[e] && !1 === this.config.safeMode;
 				ae = !(!D || !t);
 			}
 		};
 		function A(e) {
-			O.push(e), D = this.charCodeToPatternIdxToConfig[e], E = this.patternIdxToConfig[e], T = E.length;
+			O.push(e), D = this.charCodeToPatternIdxToConfig[e], E = this.patternIdxToConfig[e], re = E.length;
 			let t = this.canModeBeOptimized[e] && !1 === this.config.safeMode;
 			ae = !(!D || !t);
 		}
@@ -1718,21 +1718,21 @@ var J = class {
 		let M = this.config.recoveryEnabled;
 		for (; v < ee;) {
 			s = null, u = -1;
-			let t = _.charCodeAt(v), y;
+			let t = _.charCodeAt(v), b;
 			if (ae) {
 				let e = K(t), n = D[e];
-				y = n === void 0 ? ie : n;
-			} else y = E;
-			let N = y.length;
+				b = n === void 0 ? ie : n;
+			} else b = E;
+			let N = b.length;
 			for (n = 0; n < N; n++) {
-				j = y[n];
+				j = b[n];
 				let r = j.pattern;
 				switch (c = null, j.matchType) {
 					case 0:
 						t === j.short && (u = 1, s = r);
 						break;
 					case 1:
-						g = r.exec(_, v, ne, C), g === null ? s = null : (s = g[0], u = s.length, g.payload !== void 0 && (c = g.payload));
+						g = r.exec(_, v, x, w), g === null ? s = null : (s = g[0], u = s.length, g.payload !== void 0 && (c = g.payload));
 						break;
 					case 3: {
 						let e = j.asciiClass;
@@ -1753,7 +1753,7 @@ var J = class {
 						let t = o.length;
 						for (i = 0; i < t; i++) {
 							let t = E[o[i]], n = t.pattern;
-							if (l = null, t.matchType === 1 ? (g = n.exec(_, v, ne, C), g === null ? a = null : (a = g[0], g.payload !== void 0 && (l = g.payload))) : (n.lastIndex = v, a = this.match(n, e, v)), a && a.length > s.length) {
+							if (l = null, t.matchType === 1 ? (g = n.exec(_, v, x, w), g === null ? a = null : (a = g[0], g.payload !== void 0 && (l = g.payload))) : (n.lastIndex = v, a = this.match(n, e, v)), a && a.length > s.length) {
 								s = a, u = a.length, c = l, j = t;
 								break;
 							}
@@ -1763,32 +1763,32 @@ var J = class {
 				}
 			}
 			if (u !== -1) {
-				if (d = j.group, d !== void 0 && (s = s === null ? e.substring(v, v + u) : s, f = j.tokenTypeIdx, p = this.createTokenInstance(s, v, f, j.tokenType, x, S, u), this.handlePayload(p, c), !1 === d ? te = this.addToken(ne, te, p) : C[d].push(p)), !0 === w && !0 === j.canLineTerminator) {
+				if (d = j.group, d !== void 0 && (s = s === null ? e.substring(v, v + u) : s, f = j.tokenTypeIdx, p = this.createTokenInstance(s, v, f, j.tokenType, S, C, u), this.handlePayload(p, c), !1 === d ? y = this.addToken(x, y, p) : w[d].push(p)), !0 === ne && !0 === j.canLineTerminator) {
 					let t, n, r = 0;
-					re.lastIndex = 0;
+					T.lastIndex = 0;
 					do
-						s = s === null ? e.substring(v, v + u) : s, t = re.test(s), !0 === t && (n = re.lastIndex - 1, r++);
+						s = s === null ? e.substring(v, v + u) : s, t = T.test(s), !0 === t && (n = T.lastIndex - 1, r++);
 					while (!0 === t);
-					r === 0 ? S = this.computeNewColumn(S, u) : (x += r, S = u - n, this.updateTokenEndLineColumnLocation(p, d, n, r, x, S, u));
-				} else S = this.computeNewColumn(S, u);
+					r === 0 ? C = this.computeNewColumn(C, u) : (S += r, C = u - n, this.updateTokenEndLineColumnLocation(p, d, n, r, S, C, u));
+				} else C = this.computeNewColumn(C, u);
 				v += u, this.handleModes(j, k, A, p);
 			} else {
-				let t = v, n = x, i = S, a = !1 === M;
-				for (; !1 === a && v < ee;) for (v++, r = 0; r < T; r++) {
+				let t = v, n = S, i = C, a = !1 === M;
+				for (; !1 === a && v < ee;) for (v++, r = 0; r < re; r++) {
 					let t = E[r], n = t.pattern;
 					switch (t.matchType) {
 						case 0:
 							_.charCodeAt(v) === t.short && (a = !0);
 							break;
 						case 1:
-							a = n.exec(_, v, ne, C) !== null;
+							a = n.exec(_, v, x, w) !== null;
 							break;
 						case 3:
 						case 2: n.lastIndex = v, a = n.exec(e) !== null;
 					}
 					if (!0 === a) break;
 				}
-				if (m = v - t, S = this.computeNewColumn(S, m), h = this.config.errorMessageProvider.buildUnexpectedCharactersMessage(_, t, m, n, i, O.at(-1)), b.push({
+				if (m = v - t, C = this.computeNewColumn(C, m), h = this.config.errorMessageProvider.buildUnexpectedCharactersMessage(_, t, m, n, i, O.at(-1)), te.push({
 					offset: t,
 					line: n,
 					column: i,
@@ -1797,10 +1797,10 @@ var J = class {
 				}), !1 === M) break;
 			}
 		}
-		return this.hasCustom || (ne.length = te), {
-			tokens: ne,
-			groups: C,
-			errors: b
+		return this.hasCustom || (x.length = y), {
+			tokens: x,
+			groups: w,
+			errors: te
 		};
 	}
 	handleModes(e, t, n, r) {
@@ -1912,7 +1912,7 @@ var yt = {
 Object.freeze(yt);
 var bt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a rule which is not defined: ->" + t.nonTerminalName + "<-\ninside top level rule: ->" + e.name + "<-" }, xt = {
 	buildDuplicateFoundError(e, t) {
-		let n = e.name, r = t[0], i = r.idx, a = H(r), o = (s = r) instanceof z ? s.terminalType.name : s instanceof A ? s.nonTerminalName : "";
+		let n = e.name, r = t[0], i = r.idx, a = V(r), o = (s = r) instanceof z ? s.terminalType.name : s instanceof A ? s.nonTerminalName : "";
 		var s;
 		let c = `->${a}${i > 0 ? i : ""}<- ${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;
@@ -1927,7 +1927,7 @@ var bt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 		return r += n ? "These alternatives are all empty (match no tokens), making them indistinguishable.\nOnly the last alternative may be empty.\n" : `<${e.prefixPath.map((e) => st(e)).join(", ")}> may appears as a prefix path in all these alternatives.\n`, r += "See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES\nFor Further details.", r;
 	},
 	buildEmptyRepetitionError(e) {
-		let t = H(e.repetition);
+		let t = V(e.repetition);
 		return e.repetition.idx !== 0 && (t += e.repetition.idx), `The repetition <${t}> within Rule <${e.topLevelRule.name}> can never consume any tokens.\nThis could lead to an infinite loop.`;
 	},
 	buildTokenNameError: (e) => "deprecated",
@@ -1942,7 +1942,7 @@ var bt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 		let t;
 		return t = e.topLevelRule instanceof j ? e.topLevelRule.name : e.topLevelRule, `Duplicate definition, rule: ->${t}<- is already defined in the grammar: ->${e.grammarName}<-`;
 	}
-}, Z, St = class extends V {
+}, Z, St = class extends se {
 	constructor(e, t) {
 		super(), this.nameToTopRule = e, this.errMsgProvider = t, this.errors = [];
 	}
@@ -1964,7 +1964,7 @@ var bt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 			});
 		}
 	}
-}, Ct = class extends ce {
+}, Ct = class extends le {
 	constructor(e, t) {
 		super(), this.topProd = e, this.path = t, this.possibleTokTypes = [], this.nextProductionName = "", this.nextProductionOccurrence = 0, this.found = !1, this.isAtEndOfPath = !1;
 	}
@@ -1991,10 +1991,10 @@ var bt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 	walkTerminal(e, t, n) {
 		if (this.isAtEndOfPath && e.terminalType.name === this.nextTerminalName && e.idx === this.nextTerminalOccurrence && !this.found) {
 			let e = new M({ definition: t.concat(n) });
-			this.possibleTokTypes = ue(e), this.found = !0;
+			this.possibleTokTypes = de(e), this.found = !0;
 		}
 	}
-}, Tt = class extends ce {
+}, Tt = class extends le {
 	constructor(e, t) {
 		super(), this.topRule = e, this.occurrence = t, this.result = {
 			token: void 0,
@@ -2152,7 +2152,7 @@ function Pt(e, t, n) {
 (function(e) {
 	e[e.OPTION = 0] = "OPTION", e[e.REPETITION = 1] = "REPETITION", e[e.REPETITION_MANDATORY = 2] = "REPETITION_MANDATORY", e[e.REPETITION_MANDATORY_WITH_SEPARATOR = 3] = "REPETITION_MANDATORY_WITH_SEPARATOR", e[e.REPETITION_WITH_SEPARATOR = 4] = "REPETITION_WITH_SEPARATOR", e[e.ALTERNATION = 5] = "ALTERNATION";
 })(Z ||= {});
-var Ft = class extends ce {
+var Ft = class extends le {
 	constructor(e, t, n) {
 		super(), this.topProd = e, this.targetOccurrence = t, this.targetProdType = n;
 	}
@@ -2177,7 +2177,7 @@ var Ft = class extends ce {
 	walkManySep(e, t, n) {
 		this.checkIsTarget(e, Z.REPETITION_WITH_SEPARATOR, t, n) || super.walkOption(e, t, n);
 	}
-}, It = class extends V {
+}, It = class extends se {
 	constructor(e, t, n) {
 		super(), this.targetOccurrence = e, this.targetProdType = t, this.targetRef = n, this.result = [];
 	}
@@ -2302,7 +2302,7 @@ function Gt(e, t, n, r) {
 		e.accept(n);
 		let r = n.allProductions, i = Object.groupBy(r, Kt), a = Object.fromEntries(Object.entries(i).filter(([e, t]) => t.length > 1));
 		return Object.values(a).map((n) => {
-			let r = n[0], i = t.buildDuplicateFoundError(e, n), a = H(r), o = {
+			let r = n[0], i = t.buildDuplicateFoundError(e, n), a = V(r), o = {
 				message: i,
 				type: Q.DUPLICATE_PRODUCTIONS,
 				ruleName: e.name,
@@ -2353,12 +2353,12 @@ function Gt(e, t, n, r) {
 	return i.concat(a, o, s);
 }
 function Kt(e) {
-	return `${H(e)}_#_${e.idx}_#_${qt(e)}`;
+	return `${V(e)}_#_${e.idx}_#_${qt(e)}`;
 }
 function qt(e) {
 	return e instanceof z ? e.terminalType.name : e instanceof A ? e.nonTerminalName : "";
 }
-var Jt = class extends V {
+var Jt = class extends se {
 	constructor() {
 		super(...arguments), this.allProductions = [];
 	}
@@ -2415,14 +2415,14 @@ function Xt(e) {
 	else if (n instanceof M || n instanceof N || n instanceof P || n instanceof F || n instanceof L || n instanceof I) t = t.concat(Xt(n.definition));
 	else if (n instanceof R) t = n.definition.map((e) => Xt(e.definition)).flat();
 	else if (!(n instanceof z)) throw Error("non exhaustive match");
-	let r = se(n), i = e.length > 1;
+	let r = ce(n), i = e.length > 1;
 	if (r && i) {
 		let n = e.slice(1);
 		return t.concat(Xt(n));
 	}
 	return t;
 }
-var Zt = class extends V {
+var Zt = class extends se {
 	constructor() {
 		super(...arguments), this.alternations = [];
 	}
@@ -2662,7 +2662,7 @@ function $t(e, t, n) {
 		return o.concat(s);
 	});
 }
-var en = class extends V {
+var en = class extends se {
 	constructor() {
 		super(...arguments), this.allProductions = [];
 	}
@@ -2793,7 +2793,7 @@ var _n = 1024, vn = 1280, yn = 1536, bn = class {
 			return a(o[0], s, r);
 		}(e.prodOccurrence, e.rule, e.maxLookahead, e.dynamicTokensEnabled, Mt(e.prodType), Pt);
 	}
-}, xn = new class extends V {
+}, xn = new class extends se {
 	constructor() {
 		super(...arguments), this.dslMethods = {
 			option: [],
@@ -2997,7 +2997,7 @@ var zn, Bn = class e {
 				let e = function(e) {
 					let t = {};
 					return e.forEach((e) => {
-						let n = new fe(e).startWalking();
+						let n = new pe(e).startWalking();
 						Object.assign(t, n);
 					}), t;
 				}(Object.values(this.gastProductionsCache));
@@ -3112,7 +3112,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 		}
 		getFollowSetFromFollowKey(e) {
 			if (e === mn) return [X];
-			let t = e.ruleName + e.idxInCallingRule + de + e.inRule;
+			let t = e.ruleName + e.idxInCallingRule + fe + e.inRule;
 			return this.resyncFollows[t];
 		}
 		addToResyncTokens(e, t) {
@@ -3152,7 +3152,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 					}(e);
 					t.forEach((t) => {
 						let n = t.idx === 0 ? "" : t.idx;
-						this.TRACE_INIT(`${H(t)}${n}`, () => {
+						this.TRACE_INIT(`${V(t)}${n}`, () => {
 							let n = this.lookaheadStrategy.buildLookaheadForAlternation({
 								prodOccurrence: t.idx,
 								rule: e,
@@ -3163,15 +3163,15 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 							this.setLaFuncCache(this.fullRuleNameToShort[e.name], 256 | t.idx, n);
 						});
 					}), n.forEach((t) => {
-						this.computeLookaheadFunc(e, t.idx, 768, "Repetition", t.maxLookahead, H(t));
+						this.computeLookaheadFunc(e, t.idx, 768, "Repetition", t.maxLookahead, V(t));
 					}), r.forEach((t) => {
-						this.computeLookaheadFunc(e, t.idx, 512, "Option", t.maxLookahead, H(t));
+						this.computeLookaheadFunc(e, t.idx, 512, "Option", t.maxLookahead, V(t));
 					}), i.forEach((t) => {
-						this.computeLookaheadFunc(e, t.idx, _n, "RepetitionMandatory", t.maxLookahead, H(t));
+						this.computeLookaheadFunc(e, t.idx, _n, "RepetitionMandatory", t.maxLookahead, V(t));
 					}), a.forEach((t) => {
-						this.computeLookaheadFunc(e, t.idx, yn, "RepetitionMandatoryWithSeparator", t.maxLookahead, H(t));
+						this.computeLookaheadFunc(e, t.idx, yn, "RepetitionMandatoryWithSeparator", t.maxLookahead, V(t));
 					}), o.forEach((t) => {
-						this.computeLookaheadFunc(e, t.idx, vn, "RepetitionWithSeparator", t.maxLookahead, H(t));
+						this.computeLookaheadFunc(e, t.idx, vn, "RepetitionWithSeparator", t.maxLookahead, V(t));
 					});
 				});
 			});
@@ -4128,7 +4128,7 @@ var Vn = class extends Bn {
 	}
 }, Hn = class e {
 	static shared(t) {
-		let n = t?.locale ?? S, r = t?.maxColumn ?? Kn, i = t?.maxRow ?? qn, a = Gn.get(n);
+		let n = t?.locale ?? T, r = t?.maxColumn ?? Kn, i = t?.maxRow ?? qn, a = Gn.get(n);
 		a || (a = /* @__PURE__ */ new Map(), Gn.set(n, a));
 		let o = `${r}:${i}`, s = a.get(o);
 		return s || (s = new e({
@@ -4138,7 +4138,7 @@ var Vn = class extends Bn {
 		}), a.set(o, s)), s;
 	}
 	constructor(e) {
-		let t = e?.maxColumn ?? Kn, n = e?.maxRow ?? qn, r = e?.locale ?? S;
+		let t = e?.maxColumn ?? Kn, n = e?.maxRow ?? qn, r = e?.locale ?? T;
 		this._locale = r, this._maxColumn = t, this._maxRow = n;
 		let { separatorFunction: i, separatorColumn: a, separatorRow: o, separatorDecimal: s } = r.separators;
 		if (a === o) throw Error(`FormulaLexer: separatorColumn and separatorRow must differ (both '${a}')`);
@@ -4154,12 +4154,12 @@ var Vn = class extends Bn {
 			pattern: /[a-zA-Z_\u007F-\uFFFF]+[a-zA-Z0-9_.\u007F-\uFFFF]*(?=\()/
 		}), d = Y({
 			name: "TableReference",
-			pattern: { exec: te },
+			pattern: { exec: C },
 			line_breaks: !1,
 			start_chars_hint: Wn
 		}), f = Y({
 			name: "BracketedString",
-			pattern: { exec: ne },
+			pattern: { exec: b },
 			line_breaks: !1,
 			start_chars_hint: [91],
 			longer_alt: [d, l]
@@ -4195,7 +4195,7 @@ var Vn = class extends Bn {
 		}), v = Y({
 			name: "Sheet",
 			pattern: /[A-Za-z_.\d\u007F-\uFFFF]*!/
-		}), y = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, b = Y({
+		}), y = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, x = Y({
 			name: "NamedToken",
 			pattern: { exec: (e, t) => {
 				y.lastIndex = t;
@@ -4206,24 +4206,24 @@ var Vn = class extends Bn {
 			} },
 			line_breaks: !1,
 			start_chars_hint: Wn
-		}), x = Y({
+		}), te = Y({
 			name: "Cell",
 			pattern: { exec: Xn(t, n) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: b
-		}), C = Y({
+			longer_alt: x
+		}), S = Y({
 			name: "Column",
 			pattern: { exec: Yn(t) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: b
+			longer_alt: x
 		}), w = Y({
 			name: "AbsRow",
 			pattern: /[$][0-9]+/
-		}), re = s === "." ? "\\." : s, T = Y({
+		}), ne = s === "." ? "\\." : s, re = Y({
 			name: "NumberToken",
-			pattern: RegExp(`[0-9]+${re}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${re}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
+			pattern: RegExp(`[0-9]+${ne}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${ne}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
 		}), E = Y({
 			name: "ScientificDigit",
 			pattern: /[0-9]+\*\*[+-]?[0-9]+/
@@ -4280,38 +4280,38 @@ var Vn = class extends Bn {
 		}), B = Y({
 			name: "PlusOp",
 			pattern: /\+/
-		}), V = Y({
+		}), se = Y({
 			name: "DivOp",
 			pattern: /\//
-		}), se = Y({
+		}), ce = Y({
 			name: "MinOp",
 			pattern: /-/
-		}), H = Y({
+		}), V = Y({
 			name: "ImplicitIntersectOp",
 			pattern: /@/
-		}), ce = Y({
+		}), le = Y({
 			name: "ConcatOp",
 			pattern: /&/
-		}), le = Y({
+		}), ue = Y({
 			name: "ExOp",
 			pattern: /\^/
-		}), ue = Y({
+		}), de = Y({
 			name: "PercentOp",
 			pattern: /%/
-		}), de = Y({
+		}), fe = Y({
 			name: "ArrayAnchorOp",
 			pattern: /#/,
 			longer_alt: [h, g]
-		}), fe = Y({
+		}), pe = Y({
 			name: "GtOp",
 			pattern: />/
-		}), U = Y({
+		}), H = Y({
 			name: "EqOp",
 			pattern: /=/
-		}), pe = Y({
+		}), me = Y({
 			name: "LtOp",
 			pattern: /</
-		}), W = [
+		}), U = [
 			c,
 			l,
 			ee,
@@ -4329,16 +4329,16 @@ var Vn = class extends Bn {
 			N,
 			P,
 			j,
-			x,
+			te,
 			ie,
-			C,
+			S,
 			w,
-			T,
+			re,
 			E,
 			D,
-			de,
-			H,
-			b,
+			fe,
+			V,
+			x,
 			F,
 			I,
 			L,
@@ -4346,11 +4346,11 @@ var Vn = class extends Bn {
 			z,
 			oe,
 			B,
-			V,
 			se,
 			ce,
 			le,
 			ue,
+			de,
 			Y({
 				name: "NeqOp",
 				pattern: /<>/
@@ -4363,15 +4363,15 @@ var Vn = class extends Bn {
 				name: "LteOp",
 				pattern: /<=/
 			}),
-			fe,
-			U,
-			pe
+			pe,
+			H,
+			me
 		];
-		this._lexer = new J(W, { ensureOptimizations: !0 });
-		let G = {};
-		W.forEach((e) => {
-			G[e.name] = e;
-		}), a === i && (G.ColSeparator = ae), this._vocabulary = G;
+		this._lexer = new J(U, { ensureOptimizations: !0 });
+		let W = {};
+		U.forEach((e) => {
+			W[e.name] = e;
+		}), a === i && (W.ColSeparator = ae), this._vocabulary = W;
 	}
 	tokenize(e, t = !0) {
 		let n = this._lexer.tokenize(e);
@@ -4469,28 +4469,28 @@ function Zn(e) {
 	return new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 }
 var Qn = class {
-	constructor(e = S) {
+	constructor(e = T) {
 		let t = function(e) {
-			let t = [...n];
+			let t = [...d];
 			if (e) for (let n of Object.values(e)) {
 				let e = n?.trim();
 				e && !t.some((t) => t.toLowerCase() === e.toLowerCase()) && t.push(e);
 			}
 			return t.sort((e, t) => t.length - e.length), t.map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-		}(e.specifiers), r = Y({
+		}(e.specifiers), n = Y({
 			name: "WhiteSpace",
 			pattern: /\s+/,
 			group: J.SKIPPED
-		}), i = Y({
+		}), r = Y({
 			name: "TableSpecifier",
 			pattern: RegExp(`\\[#(?:${t})\\]`, "i")
-		}), a = [
+		}), i = [
+			n,
 			r,
-			i,
 			Y({
 				name: "BracketedColumn",
 				pattern: /\[(?:'['#[\]]|'(?!['#[\]])|[^'[\]])*\]/,
-				longer_alt: [i]
+				longer_alt: [r]
 			}),
 			Y({
 				name: "BareSpecifier",
@@ -4505,11 +4505,11 @@ var Qn = class {
 				pattern: new RegExp(e.separators.separatorFunction.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
 			})
 		];
-		this._lexer = new J(a, { ensureOptimizations: !0 });
-		let o = {};
-		a.forEach((e) => {
-			o[e.name] = e;
-		}), this._vocabulary = o;
+		this._lexer = new J(i, { ensureOptimizations: !0 });
+		let a = {};
+		i.forEach((e) => {
+			a[e.name] = e;
+		}), this._vocabulary = a;
 	}
 	getVocabulary() {
 		return this._vocabulary;
@@ -4518,14 +4518,14 @@ var Qn = class {
 		return this._lexer.tokenize(e);
 	}
 }, $n = class extends Vn {
-	constructor(t = S) {
-		let n = new Qn(t), r = n.getVocabulary();
+	constructor(e = T) {
+		let t = new Qn(e), r = t.getVocabulary();
 		super(r, {
 			nodeLocationTracking: "none",
 			maxLookahead: 2,
 			skipValidations: !0,
 			recoveryEnabled: !1
-		}), this._lexer = n;
+		}), this._lexer = t;
 		let { TableSpecifier: i, BracketedColumn: a, BareSpecifier: o, ColumnSep: s, ListSep: c } = r, l = this;
 		l.RULE("ruleContent", () => {
 			let e = [], t = l.SUBRULE(l.ruleItem);
@@ -4540,28 +4540,28 @@ var Qn = class {
 				});
 			}), e;
 		}), l.RULE("ruleItem", () => l.OR([{ ALT: () => l.SUBRULE(l.ruleSpecifier) }, { ALT: () => l.SUBRULE(l.ruleColumnOrRange) }])), l.RULE("ruleSpecifier", () => l.OR([{ ALT: () => {
-			let n = l.CONSUME(i);
+			let t = l.CONSUME(i);
 			return l.ACTION(() => {
-				let r = e(n.image, t);
-				return r.image = n.image, r;
+				let n = x(t.image, e);
+				return n.image = t.image, n;
 			});
 		} }, { ALT: () => {
-			let n = l.CONSUME(o);
+			let t = l.CONSUME(o);
 			return l.ACTION(() => {
-				let r = e(n.image, t);
-				return r.image = n.image, r;
+				let n = x(t.image, e);
+				return n.image = t.image, n;
 			});
 		} }])), l.RULE("ruleColumnOrRange", () => {
-			let e = l.CONSUME(a), t, n;
+			let e = l.CONSUME(a), t, r;
 			return l.OPTION(() => {
-				t = l.CONSUME(s), n = l.CONSUME2(a);
+				t = l.CONSUME(s), r = l.CONSUME2(a);
 			}), l.ACTION(() => {
-				let r = v(e.image);
-				if (r.image = e.image, !n) return r;
-				let i = v(n.image);
-				i.image = n.image;
-				let a = T(":", r, i, !0);
-				return a.image = t?.image ?? ":", a;
+				let i = p(e.image);
+				if (i.image = e.image, !r) return i;
+				let a = p(r.image);
+				a.image = r.image;
+				let o = n(":", i, a, !0);
+				return o.image = t?.image ?? ":", o;
 			});
 		}), l.performSelfAnalysis();
 	}
@@ -4577,44 +4577,44 @@ var Qn = class {
 		if (n === "@") {
 			let e = t.slice(1).trim();
 			if (!e) {
-				let e = c("@", null, !0);
+				let e = w("@", null, !0);
 				return e.image = "@", [e];
 			}
 			if (e.charAt(0) === "[") {
 				let t = this._parseInner(e);
 				if (t.length === 1 && t[0].type === "infix") {
-					let e = c("@", t[0], !0);
+					let e = w("@", t[0], !0);
 					return e.image = "@", [e];
 				}
 			}
-			let n = v(e);
+			let n = p(e);
 			n.image = e;
-			let r = c("@", n, !0);
+			let r = w("@", n, !0);
 			return r.image = "@", [r];
 		}
 		if (n !== "[" && n !== "#") {
-			let t = v(e);
+			let t = p(e);
 			return t.image = e, [t];
 		}
 		return this._parseInner(t);
 	}
-	parse(e, t, n) {
+	parse(t, n, r) {
 		this.reset();
-		let r = () => ({
-			root: f("", []),
+		let i = () => ({
+			root: e("", []),
 			errors: []
 		});
-		if (!n) return r();
-		let i = 0;
-		if (n.charAt(0) === "[") {
-			let e = n.indexOf("]");
-			e !== -1 && n.charAt(e + 1) === "!" && (i = e + 2);
-		}
-		let a = n.indexOf("[", i);
-		if (a === -1) return r();
-		let o = n.slice(0, a), s = n.slice(a + 1, -1), c = this._parseContent(s);
+		if (!r) return i();
+		let a = 0;
+		if (r.charAt(0) === "[") {
+			let e = r.indexOf("]");
+			e !== -1 && r.charAt(e + 1) === "!" && (a = e + 2);
+		}
+		let o = r.indexOf("[", a);
+		if (o === -1) return i();
+		let s = r.slice(0, o), c = r.slice(o + 1, -1), l = this._parseContent(c);
 		return {
-			root: f(o, c),
+			root: e(s, l),
 			errors: this.errors.length > 0 ? [...this.errors] : []
 		};
 	}
@@ -4629,7 +4629,7 @@ var Qn = class {
 	":."
 ]), nr = (e) => {
 	if (!e) return null;
-	if (e.type === w.Cell) {
+	if (e.type === S.Cell) {
 		let t = e.value;
 		return t.rowIndex === -(2 ** 53 - 1) ? "col" : t.colIndex === -(2 ** 53 - 1) ? "row" : null;
 	}
@@ -4660,8 +4660,8 @@ var sr = {
 	}
 }, cr = class extends Vn {
 	constructor(e) {
-		let n = e?.lexer ?? Hn.shared(e?.lexerOptions), f = n.getVocabulary();
-		super(f, {
+		let l = e?.lexer ?? Hn.shared(e?.lexerOptions), d = l.getVocabulary();
+		super(d, {
 			skipValidations: !0,
 			recoveryEnabled: !0,
 			...e,
@@ -4669,12 +4669,10 @@ var sr = {
 			errorMessageProvider: sr,
 			maxLookahead: 1
 		}), this._ruleInfixOp = this.RULE("ruleInfixOp", () => {
-			let { PlusOp: e, MinOp: t, MulOp: n, DivOp: r, ExOp: i, ConcatOp: a, GtOp: o, EqOp: s, LtOp: c, NeqOp: l, GteOp: u, LteOp: d } = this._vocab, f = [];
-			return f.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
-				let p = this.OR(this._c1 ||= [
+			let { PlusOp: e, MinOp: r, MulOp: i, DivOp: a, ExOp: o, ConcatOp: s, GtOp: c, EqOp: l, LtOp: u, NeqOp: d, GteOp: f, LteOp: p } = this._vocab, m = [];
+			return m.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
+				let t = this.OR(this._c1 ||= [
 					{ ALT: () => this.CONSUME(e).image },
-					{ ALT: () => this.CONSUME(t).image },
-					{ ALT: () => this.CONSUME(n).image },
 					{ ALT: () => this.CONSUME(r).image },
 					{ ALT: () => this.CONSUME(i).image },
 					{ ALT: () => this.CONSUME(a).image },
@@ -4683,29 +4681,31 @@ var sr = {
 					{ ALT: () => this.CONSUME(c).image },
 					{ ALT: () => this.CONSUME(l).image },
 					{ ALT: () => this.CONSUME(u).image },
-					{ ALT: () => this.CONSUME(d).image }
-				]), m = {
-					value: p,
+					{ ALT: () => this.CONSUME(d).image },
+					{ ALT: () => this.CONSUME(f).image },
+					{ ALT: () => this.CONSUME(p).image }
+				]), n = {
+					value: t,
 					index: this.getLexerPosition(),
-					isRange: C.includes(p)
+					isRange: ne.includes(t)
 				}, h = this.SUBRULE2(this._rulePostfixOp);
-				f.push({
-					op: m,
+				m.push({
+					op: n,
 					node: h
 				});
 			}), this.ACTION(() => {
-				let e = f.length - 1, t = x.length;
-				for (let n = 0; e > 0 && n < t; n++) {
-					let t = x[n], r = 1;
-					for (; r < f.length;) {
-						let n = f[r].op;
-						if (t.includes(n.value)) {
-							let t = f[r - 1].node, i = f[r].node, a = T(n.value, t, i, n.isRange);
-							a = this._tag(a, n.index), f[r - 1].node = a, f.splice(r, 1), e--;
-						} else r++;
+				let e = m.length - 1, r = t.length;
+				for (let i = 0; e > 0 && i < r; i++) {
+					let r = t[i], a = 1;
+					for (; a < m.length;) {
+						let t = m[a].op;
+						if (r.includes(t.value)) {
+							let r = m[a - 1].node, i = m[a].node, o = n(t.value, r, i, t.isRange);
+							o = this._tag(o, t.index), m[a - 1].node = o, m.splice(a, 1), e--;
+						} else a++;
 					}
 				}
-			}), f[0].node;
+			}), m[0].node;
 		}), this._rulePlusMinusOp = this.RULE("rulePlusMinusOp", () => {
 			let { PlusOp: e, MinOp: t } = this._vocab;
 			return this.OR([{ ALT: () => this.CONSUME(e) }, { ALT: () => this.CONSUME(t) }]);
@@ -4719,8 +4719,8 @@ var sr = {
 			}), this.ACTION(() => {
 				let e = n.length;
 				if (e !== 0) for (let r = 0; r < e; r++) {
-					let e = n[r], a = e[0], o = e[1], s = C.includes(a);
-					t = i(a, t, s), t = this._tag(t, o);
+					let e = n[r], i = e[0], a = e[1], o = ne.includes(i);
+					t = s(i, t, o), t = this._tag(t, a);
 				}
 			}), t;
 		}), this._rulePrefixOp = this.RULE("rulePrefixOp", () => {
@@ -4739,45 +4739,45 @@ var sr = {
 			return this.ACTION(() => {
 				let e = r.length;
 				if (e !== 0) for (let t = e - 1; t >= 0; t--) {
-					let e = r[t], n = e[0], a = e[1], o = C.includes(n);
-					i = c(n, i, o), i = this._tag(i, a);
+					let e = r[t], n = e[0], a = e[1], o = ne.includes(n);
+					i = w(n, i, o), i = this._tag(i, a);
 				}
 			}), i;
 		}), this._ruleRangeOp = this.RULE("ruleRangeOp", () => {
-			let { RangeOp: e, RangeTrimFullOp: t, RangeTrimLeadingOp: n, RangeTrimTrailingOp: r, ArrayAnchorOp: a } = this._vocab, o = [];
+			let { RangeOp: e, RangeTrimFullOp: t, RangeTrimLeadingOp: r, RangeTrimTrailingOp: i, ArrayAnchorOp: a } = this._vocab, o = [];
 			return o.push({ node: this.SUBRULE(this._ruleCallOp) }), this.MANY2(() => {
 				this.CONSUME(a), o.push({ anchor: this.getLexerPosition() });
 			}), this.MANY(() => {
-				let i = {
+				let n = {
 					value: this.OR(this._c2 ||= [
 						{ ALT: () => this.CONSUME(e).image },
 						{ ALT: () => this.CONSUME(t).image },
-						{ ALT: () => this.CONSUME(n).image },
-						{ ALT: () => this.CONSUME(r).image }
+						{ ALT: () => this.CONSUME(r).image },
+						{ ALT: () => this.CONSUME(i).image }
 					]),
 					index: this.getLexerPosition()
 				}, s = this.SUBRULE2(this._ruleCallOp);
 				o.push({
-					op: i,
+					op: n,
 					node: s
 				}), this.MANY3(() => {
 					this.CONSUME2(a), o.push({ anchor: this.getLexerPosition() });
 				});
 			}), this.ACTION(() => {
 				for (let e = 1; e + 1 < o.length; e++) {
-					let t = o[e], n = o[e + 1];
-					if (t.op?.value !== ":" || n.op?.value !== ":") continue;
-					let r = nr(t.node);
-					r && nr(n.node) === r && nr(o[e - 1].node) !== r && (t.node = this._tag(T(":", t.node, n.node, !0), n.op.index), o.splice(e + 1, 1));
+					let t = o[e], r = o[e + 1];
+					if (t.op?.value !== ":" || r.op?.value !== ":") continue;
+					let i = nr(t.node);
+					i && nr(r.node) === i && nr(o[e - 1].node) !== i && (t.node = this._tag(n(":", t.node, r.node, !0), r.op.index), o.splice(e + 1, 1));
 				}
 				for (let e = 1; e < o.length; e++) {
 					let t = o[e];
 					if (t.anchor !== void 0) {
-						o[0].node = this._tag(i("#", o[0].node, !0), t.anchor);
+						o[0].node = this._tag(s("#", o[0].node, !0), t.anchor);
 						continue;
 					}
-					let n = t.op, r = T(n.value, o[0].node, t.node, !0);
-					r = this._tag(r, n.index), o[0].node = r;
+					let r = t.op, i = n(r.value, o[0].node, t.node, !0);
+					i = this._tag(i, r.index), o[0].node = i;
 				}
 			}), o[0].node;
 		}), this._ruleCallOp = this.RULE("ruleCallOp", () => {
@@ -4789,7 +4789,7 @@ var sr = {
 				},
 				DEF: () => {
 					this.CONSUME(e);
-					let r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), a = n, o = this.ACTION(() => this._tag(d(a, i), r)), s = this.OPTION(() => this.CONSUME(t));
+					let r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), a = n, o = this.ACTION(() => this._tag(f(a, i), r)), s = this.OPTION(() => this.CONSUME(t));
 					this.ACTION(() => {
 						s || this._reportError(o, "Missing closing parenthesis ')'", r), this._tagClose(o, this.getLexerPosition()), n = o;
 					});
@@ -4810,15 +4810,15 @@ var sr = {
 			}), this.ACTION(() => {
 				for (; e.length > 1;) {
 					let t = e.length - 1;
-					for (let n = 0; n < t; n++) {
-						let r = e[n], i = e[n + 1], a = T(" ", r, i, !0), o = this._tokenMap.get(r);
-						o && delete o.tokenIndexClose;
-						let s = this._tokenMap.get(i), c = s?.tokenIndex;
-						if (c !== void 0) {
-							let e = this.input[c], t = this.input[c - 1]?.endOffset ?? -1, n = this._inputText.slice(t + 1, e.startOffset).slice(0, -1);
-							n.length > 0 && (a.wsBefore = n);
+					for (let r = 0; r < t; r++) {
+						let i = e[r], a = e[r + 1], o = n(" ", i, a, !0), s = this._tokenMap.get(i);
+						s && delete s.tokenIndexClose;
+						let c = this._tokenMap.get(a), l = c?.tokenIndex;
+						if (l !== void 0) {
+							let e = this.input[l], t = this.input[l - 1]?.endOffset ?? -1, n = this._inputText.slice(t + 1, e.startOffset).slice(0, -1);
+							n.length > 0 && (o.wsBefore = n);
 						}
-						s && delete s.tokenIndex, n + 1 < t && s && delete s.tokenIndexClose, e.splice(n, 2, a), n--, t--;
+						c && delete c.tokenIndex, r + 1 < t && c && delete c.tokenIndexClose, e.splice(r, 2, o), r--, t--;
 					}
 				}
 			}), e[0];
@@ -4841,35 +4841,35 @@ var sr = {
 			}), t;
 		}), this._ruleParen = this.RULE("ruleParen", () => {
 			let { OpenParen: e, CloseParen: t } = this._vocab;
-			return this._processParen(w.Paren, e, t);
+			return this._processParen(S.Paren, e, t);
 		}), this._ruleLiteralArray = this.RULE("ruleLiteralArray", () => {
-			let { OpenCurlyParen: e, CloseCurlyParen: n, ColSeparator: r, RowSeparator: i } = this._vocab, o = a();
+			let { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: n, RowSeparator: r } = this._vocab, i = h();
 			this.CONSUME(e);
-			let s = this.getLexerPosition(), c = this.ACTION(() => this._tag(t(o), s)), l = this.SUBRULE(this._ruleLiteralForArray);
+			let a = this.getLexerPosition(), o = this.ACTION(() => this._tag(g(i), a)), s = this.SUBRULE(this._ruleLiteralForArray);
 			this.ACTION(() => {
-				o.value.push(l);
+				i.value.push(s);
 			}), this.MANY(() => {
 				let e = !1;
 				this.OR([{ ALT: () => {
-					this.CONSUME(r), e = !0;
-				} }, { ALT: () => this.CONSUME(i) }]);
+					this.CONSUME(n), e = !0;
+				} }, { ALT: () => this.CONSUME(r) }]);
 				let t = this.SUBRULE2(this._ruleLiteralForArray);
 				this.ACTION(() => {
-					e || (o = a(), c.value.push(o)), o.value.push(t);
+					e || (i = h(), o.value.push(i)), i.value.push(t);
 				});
 			});
-			let u = this.OPTION(() => this.CONSUME(n));
-			return c = this.ACTION(() => (u || this._reportError(c, "Missing closing parenthesis '}'", s), this._tagClose(c, this.getLexerPosition()))), c;
+			let c = this.OPTION(() => this.CONSUME(t));
+			return o = this.ACTION(() => (c || this._reportError(o, "Missing closing parenthesis '}'", a), this._tagClose(o, this.getLexerPosition()))), o;
 		}), this._ruleLiteralForArray = this.RULE("ruleLiteralForArray", () => {
-			let { StringToken: e, BooleanToken: t, LiteralError: n, RefError: r } = this._vocab;
+			let { StringToken: e, BooleanToken: t, LiteralError: n, RefError: a } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
-					let e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(g(t.image, this._locale), this.getLexerPosition()));
-					return this.ACTION(() => e ? re(e.image, n) : n);
+					let e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(r(t.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => e ? o(e.image, n) : n);
 				} },
 				{ ALT: () => {
 					let t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(_(t.image), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(t);
@@ -4877,23 +4877,23 @@ var sr = {
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(n);
-					return this.ACTION(() => this._tag(h(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(i(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(s(e.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(a);
+					return this.ACTION(() => this._tag(v(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleLiteral = this.RULE("ruleLiteral", () => {
-			let { StringToken: e, BooleanToken: t, LiteralError: n, RefError: r } = this._vocab;
+			let { StringToken: e, BooleanToken: t, LiteralError: n, RefError: a } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
 					let e = this.SUBRULE(this._ruleNumber);
-					return this.ACTION(() => this._tag(g(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(r(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(_(t.image), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(t);
@@ -4901,17 +4901,17 @@ var sr = {
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(n);
-					return this.ACTION(() => this._tag(h(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(i(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(s(e.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(a);
+					return this.ACTION(() => this._tag(v(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleFunction = this.RULE("ruleFunction", () => {
 			let { FunctionToken: e, OpenParen: t, CloseParen: n } = this._vocab, r = this.CONSUME(e).image, i = this.getLexerPosition();
 			this.CONSUME(t);
-			let a = this.SUBRULE(this._ruleFunctionArguments), o = this.ACTION(() => this._tag(p(r, a), i)), s = this.OPTION(() => this.CONSUME(n));
+			let a = this.SUBRULE(this._ruleFunctionArguments), o = this.ACTION(() => this._tag(re(r, a), i)), s = this.OPTION(() => this.CONSUME(n));
 			return o = this.ACTION(() => (s || this._reportError(o, "Missing closing parenthesis ')'", i), this._tagClose(o, this.getLexerPosition()))), o;
 		}), this._ruleFunctionArguments = this.RULE("ruleFunctionArguments", () => {
 			let { ArgSeparator: e, CloseParen: t } = this._vocab, n = [];
@@ -4921,11 +4921,11 @@ var sr = {
 					let t;
 					this.OPTION2(() => {
 						t = this.SUBRULE(this._ruleIntersectOp);
-					}), t = this.ACTION(() => t ?? this._tagClose(l(), 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(l(), this.getLexerPosition())), n.push(t);
+						}), t = this.ACTION(() => t ?? this._tagClose(m(), this.getLexerPosition())), n.push(t);
 					});
 				}
 			}), n;
@@ -4944,59 +4944,59 @@ var sr = {
 				return this._tag(e.root, n);
 			});
 		}), this._ruleReference = this.RULE("ruleReference", () => {
-			let { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: i, PlusOp: a, MinOp: c, ArgSeparator: l, Cell: u, NamedToken: d, SingleQuotedString: f, Column: p, AbsRow: h, DigitToken: g, RefError: _ } = this._vocab, v, te;
+			let { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: r, PlusOp: i, MinOp: o, ArgSeparator: s, Cell: l, NamedToken: u, SingleQuotedString: d, Column: f, AbsRow: p, DigitToken: m, RefError: h } = this._vocab, g, y;
 			this.OPTION2({
 				GATE: () => {
-					for (let r = 1; r < 6; r++) {
-						let o = this.LA(r);
-						if (o.tokenType === e || o.tokenType === t) return !0;
-						if (o.image === "" || o.image === ")" || o.tokenType === n || o.tokenType === i || o.tokenType === a || o.tokenType === c || o.tokenType === l) break;
+					for (let a = 1; a < 6; a++) {
+						let c = this.LA(a);
+						if (c.tokenType === e || c.tokenType === t) return !0;
+						if (c.image === "" || c.image === ")" || c.tokenType === n || c.tokenType === r || c.tokenType === i || c.tokenType === o || c.tokenType === s) break;
 					}
 					return !1;
 				},
 				DEF: () => {
-					te = this.getLexerPosition() + 1, v = this.SUBRULE(this._rulePrefixSheetName);
+					y = this.getLexerPosition() + 1, g = this.SUBRULE(this._rulePrefixSheetName);
 				}
 			});
-			let y = this.OR([
+			let b = this.OR([
 				{ ALT: () => {
-					let e = this.CONSUME(u), t = this.getLexerPosition();
-					return this.ACTION(() => this._tag(r(e.image, this.rowIndex, this.colIndex), t));
+					let e = this.CONSUME(l), t = this.getLexerPosition();
+					return this.ACTION(() => this._tag(a(e.image, this.rowIndex, this.colIndex), t));
 				} },
 				{ ALT: () => {
-					let e = this.OR2([{ ALT: () => this.CONSUME(d) }, { ALT: () => this.CONSUME(f) }]);
-					return this.ACTION(() => this._tag(m(e.image), this.getLexerPosition()));
+					let e = this.OR2([{ ALT: () => this.CONSUME(u) }, { ALT: () => this.CONSUME(d) }]);
+					return this.ACTION(() => this._tag(_(e.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => this.SUBRULE(this._ruleBracketedString) },
 				{ ALT: () => this.SUBRULE(this._ruleFunction) },
 				{ ALT: () => {
-					let e = this.CONSUME(p);
-					return this.ACTION(() => this._tag(o(e.image, this.colIndex), this.getLexerPosition()));
+					let e = this.CONSUME(f);
+					return this.ACTION(() => this._tag(c(e.image, this.colIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(h);
+					let e = this.CONSUME(p);
 					return this.ACTION(() => this._tag(ee(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(g);
+					let e = this.CONSUME(m);
 					return this.ACTION(() => this._tag(ee(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(_);
-					return this.ACTION(() => this._tag(s(e.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(h);
+					return this.ACTION(() => this._tag(v(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 			return this.ACTION(() => {
-				if (v && y) {
-					if (v.name === "") return void this._reportError(y, `'${v.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
-					let e = y;
-					if (y.type === w.Postfix && y.inputs?.[0] && (e = y.inputs[0]), e.type === w.Cell || e.type === w.Named || e.type === w.Row || e.type === w.TableColumn || e.type === w.Error) {
-						e.value.scope = v.name, e.value.scopeImage = v.image;
+				if (g && b) {
+					if (g.name === "") return void this._reportError(b, `'${g.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
+					let e = b;
+					if (b.type === S.Postfix && b.inputs?.[0] && (e = b.inputs[0]), e.type === S.Cell || e.type === S.Named || e.type === S.Row || e.type === S.TableColumn || e.type === S.Error) {
+						e.value.scope = g.name, e.value.scopeImage = g.image;
 						let t = this._tokenMap.get(e);
-						t && te !== void 0 && (t.tokenIndex = te);
+						t && y !== void 0 && (t.tokenIndex = y);
 					}
 				}
-			}), y;
+			}), b;
 		}), this._rulePrefixSheetName = this.RULE("rulePrefixSheetName", () => {
 			let { SheetQuoted: e, BracketedString: t, NamedToken: n, Column: r, RangeOp: i, Sheet: a } = this._vocab;
 			return this.OR([{ ALT: () => {
@@ -5036,12 +5036,12 @@ var sr = {
 			return this.MANY(() => {
 				this.CONSUME(e), n.push(this.SUBRULE2(this._ruleIntersectOp));
 			}), this.ACTION(() => n.length === 0 ? t : {
-				type: w.List,
+				type: S.List,
 				value: ",",
 				inputs: [t, ...n],
 				isReference: !0
 			});
-		}), this._lexer = n, this._locale = n.getLocale(), this._vocab = f, this._srParser = e?.srParser ?? new $n(this._locale), this.performSelfAnalysis();
+		}), this._lexer = l, this._locale = l.getLocale(), this._vocab = d, this._srParser = e?.srParser ?? new $n(this._locale), this.performSelfAnalysis();
 	}
 	getLexer() {
 		return this._lexer;
@@ -5050,26 +5050,26 @@ var sr = {
 		let r = this._lexer.tokenize(n), i;
 		if (!r) return {
 			root: {
-				type: w.Unparsed,
+				type: S.Unparsed,
 				value: n
 			},
 			errors: []
 		};
 		let a = r.tokens;
 		if (a.length === 0) throw new E.Parse(ir);
-		return this.input = a, this._inputText = n, this._inputTextLength = n.length, this.rowIndex = e, this.colIndex = t, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), i = this._ruleRoot(), i && this._bindAllWhitespace(i), i = y(i, (t, n) => {
-			let r = t.type, i = n?.isReference ? n.value : void 0, a = typeof i == "string" && er.has(i), o = typeof i == "string" && tr.has(i), s = a ? n.inputs : void 0, c = s ? s[0] === t ? s[1] : s[0] : void 0, l = this._lexer.getMaxRow();
-			if (a && r !== w.Cell && Number.isInteger(t.value)) {
+		return this.input = a, this._inputText = n, this._inputTextLength = n.length, this.rowIndex = e, this.colIndex = t, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), i = this._ruleRoot(), i && this._bindAllWhitespace(i), i = te(i, (t, n) => {
+			let r = t.type, i = n?.isReference ? n.value : void 0, a = typeof i == "string" && er.has(i), o = typeof i == "string" && tr.has(i), s = a ? n.inputs : void 0, c = s ? s[0] === t ? s[1] : s[0] : void 0, u = this._lexer.getMaxRow();
+			if (a && r !== S.Cell && Number.isInteger(t.value)) {
 				let n = ee(t.image, e);
-				return b(n, t), nr(c) === "row" ? rr(t.image, l) || this._reportError(n, `'${t.image}' is not a valid row — rows run from 1 to ${l}`) : this._reportError(n, `'${t.image}' is not a valid reference — a whole row can only pair with another row (as in ${t.image}:${t.image})`), n;
+				return l(n, t), nr(c) === "row" ? rr(t.image, u) || this._reportError(n, `'${t.image}' is not a valid row — rows run from 1 to ${u}`) : this._reportError(n, `'${t.image}' is not a valid reference — a whole row can only pair with another row (as in ${t.image}:${t.image})`), n;
 			}
-			if (o && r === w.Named) return this._reportError(t, `'${t.image ?? t.value?.nameId}' is a name — '${i}' needs a cell or range on both sides`), t;
-			if (r === w.Cell) {
+			if (o && r === S.Named) return this._reportError(t, `'${t.image ?? t.value?.nameId}' is a name — '${i}' needs a cell or range on both sides`), t;
+			if (r === S.Cell) {
 				let e = t.value, n = e.colIndex === -(2 ** 53 - 1), r = e.rowIndex === -(2 ** 53 - 1);
-				if ((n || r) && nr(c) === (n ? "row" : "col")) return n && !rr(t.image, l) && this._reportError(t, `'${t.image}' is not a valid row — rows run from 1 to ${l}`), t;
+				if ((n || r) && nr(c) === (n ? "row" : "col")) return n && !rr(t.image, u) && this._reportError(t, `'${t.image}' is not a valid row — rows run from 1 to ${u}`), t;
 				if (n || r || e.colIndex >= 16384) {
-					let a = m(t.image);
-					b(a, t);
+					let a = _(t.image);
+					l(a, t);
 					let s = e.scope;
 					return s && (a.value.scope = s, a.value.scopeImage = e.scopeImage), n ? this._reportError(a, `'${t.image}' is not a valid reference — a row needs a column (use ${t.image}:${t.image} for the whole row)`) : r && t.image.includes("$") ? this._reportError(a, `'${t.image}' is not a valid reference — a whole column can only pair with another column (as in ${t.image}:${t.image})`) : o && this._reportError(a, `'${t.image}' is a name — '${i}' needs a cell or range on both sides`), a;
 				}
@@ -5132,7 +5132,7 @@ var sr = {
 	_bindAllWhitespace(e) {
 		if (e) {
 			if (this._bindNodeWhitespace(e), e.inputs) for (let t of e.inputs) t && this._bindAllWhitespace(t);
-			if (e.type === w.Array && Array.isArray(e.value)) {
+			if (e.type === S.Array && Array.isArray(e.value)) {
 				for (let t of e.value) if (t && Array.isArray(t.value)) for (let e of t.value) e && this._bindAllWhitespace(e);
 			}
 		}