@sheetxl/sdk 0.8.0-beta.12 → 0.8.0-beta.14

package/browser/esm/{C9u8FUewte5ugUjH.mjs → UMQTbO0zNmBpzW1V.mjs}

@@ -1,25 +1,25 @@
 /**
-* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.12
+* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.14
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: The license can be found at https://www.sheetxl.com/license.
 */
-import { $n as e, Bn as t, Gn as n, Hn as r, In as i, Jn as a, Kn as o, Pn as s, Qn as c, Rn as l, Un as u, Wn as d, Xn as f, Yn as p, Zn as m, ar as h, br as g, dr as _, er as v, fr as y, gr as b, hr as ee, ir as x, nr as S, or as C, pr as w, qn as T, rr as te, tr as E, zn as ne } from "./BudSIfXBAsTxvu-K.mjs";
-import { FormulaError as D } from "@sheetxl/primitives";
-function O(e) {
+import { $n as e, Bn as t, Fn as n, Gn as r, Jn as i, Kn as a, Ln as o, Qn as s, Un as c, Vn as l, Wn as u, Xn as d, Yn as f, Zn as p, _r as m, ar as h, er as g, fr as _, gr as v, ir as y, mr as ee, nr as b, or as x, pr as te, qn as S, rr as C, sr as w, tr as ne, xr as T, zn as re } from "./CtC__ALh4I8PKIln.mjs";
+import { FormulaError as E } from "@sheetxl/primitives";
+function D(e) {
 	console && console.error && console.error(`Error: ${e}`);
 }
-function k(e) {
+function O(e) {
 	console && console.warn && console.warn(`Warning: ${e}`);
 }
-function re(e) {
+function ie(e) {
 	let t = (/* @__PURE__ */ new Date()).getTime(), n = e();
 	return {
 		time: (/* @__PURE__ */ new Date()).getTime() - t,
 		value: n
 	};
 }
-function ie(e) {
+function ae(e) {
 	function t() {}
 	t.prototype = e;
 	let n = new t();
@@ -28,7 +28,7 @@ function ie(e) {
 	}
 	return r(), r(), e;
 }
-var A = class {
+var k = class {
 	get definition() {
 		return this._definition;
 	}
@@ -43,9 +43,9 @@ var A = class {
 			t.accept(e);
 		});
 	}
-}, j = class extends A {
+}, A = class extends k {
 	constructor(e) {
-		super([]), this.idx = 1, Object.assign(this, V(e));
+		super([]), this.idx = 1, Object.assign(this, B(e));
 	}
 	set definition(e) {}
 	get definition() {
@@ -54,35 +54,35 @@ var A = class {
 	accept(e) {
 		e.visit(this);
 	}
-}, M = class extends A {
+}, j = class extends k {
 	constructor(e) {
-		super(e.definition), this.orgText = "", Object.assign(this, V(e));
+		super(e.definition), this.orgText = "", Object.assign(this, B(e));
 	}
-}, N = class extends A {
+}, M = class extends k {
 	constructor(e) {
-		super(e.definition), this.ignoreAmbiguities = !1, Object.assign(this, V(e));
+		super(e.definition), this.ignoreAmbiguities = !1, Object.assign(this, B(e));
 	}
-}, P = class extends A {
+}, N = class extends k {
 	constructor(e) {
-		super(e.definition), this.idx = 1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, Object.assign(this, B(e));
 	}
-}, F = class extends A {
+}, P = class extends k {
 	constructor(e) {
-		super(e.definition), this.idx = 1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, Object.assign(this, B(e));
 	}
-}, I = class extends A {
+}, F = class extends k {
 	constructor(e) {
-		super(e.definition), this.idx = 1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, Object.assign(this, B(e));
 	}
-}, L = class extends A {
+}, I = class extends k {
 	constructor(e) {
-		super(e.definition), this.idx = 1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, Object.assign(this, B(e));
 	}
-}, R = class extends A {
+}, L = class extends k {
 	constructor(e) {
-		super(e.definition), this.idx = 1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, Object.assign(this, B(e));
 	}
-}, z = class extends A {
+}, R = class extends k {
 	get definition() {
 		return this._definition;
 	}
@@ -90,21 +90,21 @@ var A = class {
 		this._definition = e;
 	}
 	constructor(e) {
-		super(e.definition), this.idx = 1, this.ignoreAmbiguities = !1, this.hasPredicates = !1, Object.assign(this, V(e));
+		super(e.definition), this.idx = 1, this.ignoreAmbiguities = !1, this.hasPredicates = !1, Object.assign(this, B(e));
 	}
-}, B = class {
+}, z = class {
 	constructor(e) {
-		this.idx = 1, Object.assign(this, V(e));
+		this.idx = 1, Object.assign(this, B(e));
 	}
 	accept(e) {
 		e.visit(this);
 	}
 };
-function ae(e) {
+function oe(e) {
 	function t(e) {
-		return e.map(ae);
+		return e.map(oe);
 	}
-	if (e instanceof j) {
+	if (e instanceof A) {
 		let t = {
 			type: "NonTerminal",
 			name: e.nonTerminalName,
@@ -112,43 +112,43 @@ function ae(e) {
 		};
 		return typeof e.label == "string" && (t.label = e.label), t;
 	}
-	if (e instanceof N) return {
+	if (e instanceof M) return {
 		type: "Alternative",
 		definition: t(e.definition)
 	};
-	if (e instanceof P) return {
+	if (e instanceof N) return {
 		type: "Option",
 		idx: e.idx,
 		definition: t(e.definition)
 	};
-	if (e instanceof F) return {
+	if (e instanceof P) return {
 		type: "RepetitionMandatory",
 		idx: e.idx,
 		definition: t(e.definition)
 	};
-	if (e instanceof I) return {
+	if (e instanceof F) return {
 		type: "RepetitionMandatoryWithSeparator",
 		idx: e.idx,
-		separator: ae(new B({ terminalType: e.separator })),
+		separator: oe(new z({ terminalType: e.separator })),
 		definition: t(e.definition)
 	};
-	if (e instanceof R) return {
+	if (e instanceof L) return {
 		type: "RepetitionWithSeparator",
 		idx: e.idx,
-		separator: ae(new B({ terminalType: e.separator })),
+		separator: oe(new z({ terminalType: e.separator })),
 		definition: t(e.definition)
 	};
-	if (e instanceof L) return {
+	if (e instanceof I) return {
 		type: "Repetition",
 		idx: e.idx,
 		definition: t(e.definition)
 	};
-	if (e instanceof z) return {
+	if (e instanceof R) return {
 		type: "Alternation",
 		idx: e.idx,
 		definition: t(e.definition)
 	};
-	if (e instanceof B) {
+	if (e instanceof z) {
 		let t = {
 			type: "Terminal",
 			name: e.terminalType.name,
@@ -159,7 +159,7 @@ function ae(e) {
 		let i = e.terminalType.PATTERN;
 		return e.terminalType.PATTERN && (t.pattern = i instanceof RegExp ? i.source : i), t;
 	}
-	if (e instanceof M) return {
+	if (e instanceof j) return {
 		type: "Rule",
 		name: e.name,
 		orgText: e.orgText,
@@ -168,23 +168,23 @@ function ae(e) {
 	throw Error("non exhaustive match");
 	var n, r;
 }
-function V(e) {
+function B(e) {
 	return Object.fromEntries(Object.entries(e).filter(([, e]) => e !== void 0));
 }
-var oe = class {
+var se = class {
 	visit(e) {
 		let t = e;
 		switch (t.constructor) {
-			case j: return this.visitNonTerminal(t);
-			case N: return this.visitAlternative(t);
-			case P: return this.visitOption(t);
-			case F: return this.visitRepetitionMandatory(t);
-			case I: return this.visitRepetitionMandatoryWithSeparator(t);
-			case R: return this.visitRepetitionWithSeparator(t);
-			case L: return this.visitRepetition(t);
-			case z: return this.visitAlternation(t);
-			case B: return this.visitTerminal(t);
-			case M: return this.visitRule(t);
+			case A: return this.visitNonTerminal(t);
+			case M: return this.visitAlternative(t);
+			case N: return this.visitOption(t);
+			case P: return this.visitRepetitionMandatory(t);
+			case F: return this.visitRepetitionMandatoryWithSeparator(t);
+			case L: return this.visitRepetitionWithSeparator(t);
+			case I: return this.visitRepetition(t);
+			case R: return this.visitAlternation(t);
+			case z: return this.visitTerminal(t);
+			case j: return this.visitRule(t);
 			default: throw Error("non exhaustive match");
 		}
 	}
@@ -199,34 +199,34 @@ var oe = class {
 	visitTerminal(e) {}
 	visitRule(e) {}
 };
-function se(e, t = []) {
-	return e instanceof P || e instanceof L || e instanceof R || (e instanceof z ? e.definition.some((e) => se(e, t)) : !(e instanceof j && t.includes(e)) && e instanceof A && (e instanceof j && 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) {
-	if (e instanceof j) return "SUBRULE";
-	if (e instanceof P) return "OPTION";
-	if (e instanceof z) return "OR";
-	if (e instanceof F) return "AT_LEAST_ONE";
-	if (e instanceof I) return "AT_LEAST_ONE_SEP";
-	if (e instanceof R) return "MANY_SEP";
-	if (e instanceof L) return "MANY";
-	if (e instanceof B) return "CONSUME";
+function V(e) {
+	if (e instanceof A) return "SUBRULE";
+	if (e instanceof N) return "OPTION";
+	if (e instanceof R) return "OR";
+	if (e instanceof P) return "AT_LEAST_ONE";
+	if (e instanceof F) return "AT_LEAST_ONE_SEP";
+	if (e instanceof L) return "MANY_SEP";
+	if (e instanceof I) return "MANY";
+	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);
-			if (n instanceof j) this.walkProdRef(n, i, t);
-			else if (n instanceof B) this.walkTerminal(n, i, t);
-			else if (n instanceof N) this.walkFlat(n, i, t);
-			else if (n instanceof P) this.walkOption(n, i, t);
-			else if (n instanceof F) this.walkAtLeastOne(n, i, t);
-			else if (n instanceof I) this.walkAtLeastOneSep(n, i, t);
-			else if (n instanceof R) this.walkManySep(n, i, t);
-			else if (n instanceof L) this.walkMany(n, i, t);
+			if (n instanceof A) this.walkProdRef(n, i, t);
+			else if (n instanceof z) this.walkTerminal(n, i, t);
+			else if (n instanceof M) this.walkFlat(n, i, t);
+			else if (n instanceof N) this.walkOption(n, i, t);
+			else if (n instanceof P) this.walkAtLeastOne(n, i, t);
+			else if (n instanceof F) this.walkAtLeastOneSep(n, i, t);
+			else if (n instanceof L) this.walkManySep(n, i, t);
+			else if (n instanceof I) this.walkMany(n, i, t);
 			else {
-				if (!(n instanceof z)) throw Error("non exhaustive match");
+				if (!(n instanceof R)) throw Error("non exhaustive match");
 				this.walkOr(n, i, t);
 			}
 		});
@@ -242,51 +242,51 @@ var ce = class {
 		this.walk(e, r);
 	}
 	walkAtLeastOne(e, t, n) {
-		let r = [new P({ definition: e.definition })].concat(t, n);
+		let r = [new N({ definition: e.definition })].concat(t, n);
 		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) {
-		let r = [new P({ definition: e.definition })].concat(t, n);
+		let r = [new N({ definition: e.definition })].concat(t, n);
 		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) {
 		let r = t.concat(n);
 		e.definition.forEach((e) => {
-			let t = new N({ definition: [e] });
+			let t = new M({ definition: [e] });
 			this.walk(t, r);
 		});
 	}
 };
-function le(e, t, n) {
-	return [new P({ definition: [new B({ terminalType: e.separator })].concat(e.definition) })].concat(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 j) return ue(e.referencedRule);
-	if (e instanceof B) return [e.terminalType];
+function de(e) {
+	if (e instanceof A) return de(e.referencedRule);
+	if (e instanceof z) return [e.terminalType];
 	if (function(e) {
-		return e instanceof N || e instanceof P || e instanceof L || e instanceof F || e instanceof I || e instanceof R || e instanceof B || e instanceof M;
+		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 z;
+		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,21 +295,21 @@ 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 N({ 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 me(e, t) {
+function U(e, t) {
 	if (!0 === e[t]) throw "duplicate flag " + t;
 	e[t], e[t] = !0;
 }
@@ -324,37 +324,37 @@ function ge(e) {
 	return e.type === "Character";
 }
 var _e = [];
-for (let e = U("0"); e <= U("9"); e++) _e.push(e);
-var ve = [U("_")].concat(_e);
-for (let e = U("a"); e <= U("z"); e++) ve.push(e);
-for (let e = U("A"); e <= U("Z"); e++) ve.push(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 = [
-	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("")
+	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) {
@@ -467,18 +467,18 @@ var ye = [
 		};
 		for (; this.isRegExpFlag();) switch (this.popChar()) {
 			case "g":
-				me(n, "global");
+				U(n, "global");
 				break;
 			case "i":
-				me(n, "ignoreCase");
+				U(n, "ignoreCase");
 				break;
 			case "m":
-				me(n, "multiLine");
+				U(n, "multiLine");
 				break;
 			case "u":
-				me(n, "unicode");
+				U(n, "unicode");
 				break;
-			case "y": me(n, "sticky");
+			case "y": U(n, "sticky");
 		}
 		if (this.idx !== this.input.length) throw Error("Redundant input: " + this.input.substring(this.idx));
 		return {
@@ -624,10 +624,10 @@ var ye = [
 			type: "Set",
 			complement: !0,
 			value: [
-				U("\n"),
-				U("\r"),
-				U("\u2028"),
-				U("\u2029")
+				H("\n"),
+				H("\r"),
+				H("\u2028"),
+				H("\u2029")
 			]
 		};
 	}
@@ -696,18 +696,18 @@ var ye = [
 		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 W(e) ? {
 			type: "Character",
@@ -726,7 +726,7 @@ var ye = [
 	nulCharacterAtom() {
 		return this.consumeChar("0"), {
 			type: "Character",
-			value: U("\0")
+			value: H("\0")
 		};
 	}
 	hexEscapeSequenceAtom() {
@@ -738,7 +738,7 @@ var ye = [
 	identityEscapeAtom() {
 		return {
 			type: "Character",
-			value: U(this.popChar())
+			value: H(this.popChar())
 		};
 	}
 	classPatternCharacterAtom() {
@@ -751,7 +751,7 @@ var ye = [
 			case "]": throw Error("TBD");
 			default: return {
 				type: "Character",
-				value: U(this.popChar())
+				value: H(this.popChar())
 			};
 		}
 	}
@@ -768,8 +768,8 @@ var ye = [
 						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 ye = [
 		switch (this.consumeChar("\\"), this.peekChar()) {
 			case "b": return this.consumeChar("b"), {
 				type: "Character",
-				value: U("\b")
+				value: H("\b")
 			};
 			case "d":
 			case "D":
@@ -856,7 +856,7 @@ var ye = [
 			case "|": throw Error("TBD");
 			default: return {
 				type: "Character",
-				value: U(e)
+				value: H(e)
 			};
 		}
 	}
@@ -988,10 +988,10 @@ function ke(e, t = !1) {
 		let t = Ee(e);
 		return Ae(t.value, {}, t.flags.ignoreCase);
 	} catch (n) {
-		if (n.message === De) t && k(`${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.`);
+		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."), O(`${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);
+			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 [];
@@ -1031,7 +1031,7 @@ function Ae(e, t, n) {
 								else {
 									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 = G(e), a = G(n);
+										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;
 									}
 								}
@@ -1052,16 +1052,16 @@ function Ae(e, t, n) {
 	return Object.values(t);
 }
 function je(e, t, n) {
-	let r = G(e);
+	let r = K(e);
 	t[r] = r, !0 === n && function(e, t) {
 		let n = String.fromCharCode(e), r = n.toUpperCase();
 		if (r !== n) {
-			let e = G(r.charCodeAt(0));
+			let e = K(r.charCodeAt(0));
 			t[e] = e;
 		} else {
 			let e = n.toLowerCase();
 			if (e !== n) {
-				let n = G(e.charCodeAt(0));
+				let n = K(e.charCodeAt(0));
 				t[n] = n;
 			}
 		}
@@ -1121,8 +1121,8 @@ function Fe(e, t) {
 	}
 	return !1;
 }
-var Ie = "PATTERN", Le = "defaultMode";
-function Re(e, t) {
+var G = "PATTERN", Ie = "defaultMode";
+function Le(e, t) {
 	let n = (t = Object.assign({
 		safeMode: !1,
 		positionTracking: "full",
@@ -1131,18 +1131,18 @@ function Re(e, t) {
 	}, t)).tracer, r;
 	n("initCharCodeToOptimizedIndexMap", () => {
 		(function() {
-			if (Xe.length === 0) {
-				Xe = Array(65536);
-				for (let e = 0; e < 65536; e++) Xe[e] = e > 255 ? 255 + ~~(e / 255) : e;
+			if (Ye.length === 0) {
+				Ye = Array(65536);
+				for (let e = 0; e < 65536; e++) Ye[e] = e > 255 ? 255 + ~~(e / 255) : e;
 			}
 		})();
 	}), n("Reject Lexer.NA", () => {
-		r = e.filter((e) => e[Ie] !== q.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[Ie];
+			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] !== "\\" || [
@@ -1162,7 +1162,7 @@ function Re(e, t) {
 					"v",
 					"w",
 					"W"
-				].includes(e[1]) ? He(t) : e[1] : e;
+				].includes(e[1]) ? Ve(t) : e[1] : e;
 			}
 			if (typeof t == "function") return h = !0, { exec: t };
 			if (typeof t == "object") return h = !0, t;
@@ -1170,7 +1170,7 @@ function Re(e, t) {
 				if (t.length === 1) return t;
 				{
 					let e = t.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
-					return He(new RegExp(e));
+					return Ve(new RegExp(e));
 				}
 			}
 			throw Error("non exhaustive match");
@@ -1178,7 +1178,7 @@ function Re(e, t) {
 	}), n("misc mapping", () => {
 		a = r.map((e) => e.tokenTypeIdx), o = r.map((e) => {
 			let t = e.GROUP;
-			if (t !== q.SKIPPED) {
+			if (t !== J.SKIPPED) {
 				if (typeof t == "string") return t;
 				if (t === void 0) return !1;
 				throw Error("non exhaustive match");
@@ -1188,12 +1188,12 @@ function Re(e, t) {
 			if (t) return Array.isArray(t) ? t.map((e) => r.indexOf(e)) : [r.indexOf(t)];
 		}), c = r.map((e) => e.PUSH_MODE), l = r.map((e) => Object.hasOwn(e, "POP_MODE"));
 	}), n("Line Terminator Handling", () => {
-		let e = Je(t.lineTerminatorCharacters);
-		u = r.map((e) => !1), t.positionTracking !== "onlyOffset" && (u = r.map((t) => Object.hasOwn(t, "LINE_BREAKS") ? !!t.LINE_BREAKS : !1 === Ke(t, e) && Fe(e, t.PATTERN)));
+		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) && Fe(e, t.PATTERN)));
 	}), n("Misc Mapping #2", () => {
-		d = r.map(Ue), f = i.map(We), p = r.reduce((e, t) => {
+		d = r.map(He), f = i.map(Ue), p = r.reduce((e, t) => {
 			let n = t.GROUP;
-			return typeof n == "string" && n !== q.SKIPPED && (e[n] = []), e;
+			return typeof n == "string" && n !== J.SKIPPED && (e[n] = []), e;
 		}, {}), m = i.map((e, t) => {
 			let n = o[t] === void 0 && s[t] === void 0 ? function(e) {
 				if (!(e instanceof RegExp) || e.flags !== "") return;
@@ -1236,22 +1236,22 @@ function Re(e, t) {
 	let g = !0, _ = [];
 	return t.safeMode || n("First Char Optimization", () => {
 		_ = r.reduce((e, n, r) => {
-			if (typeof n.PATTERN == "string") Ye(e, G(n.PATTERN.charCodeAt(0)), m[r]);
+			if (typeof n.PATTERN == "string") Je(e, K(n.PATTERN.charCodeAt(0)), m[r]);
 			else if (Array.isArray(n.START_CHARS_HINT)) {
 				let t;
 				n.START_CHARS_HINT.forEach((n) => {
-					let i = G(typeof n == "string" ? n.charCodeAt(0) : n);
-					t !== i && (t = i, Ye(e, i, m[r]));
+					let i = K(typeof n == "string" ? n.charCodeAt(0) : n);
+					t !== i && (t = i, Je(e, i, m[r]));
 				});
 			} else if (n.PATTERN instanceof RegExp) {
-				if (n.PATTERN.unicode) g = !1, t.ensureOptimizations && O(`${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`);
+				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 = ke(n.PATTERN, t.ensureOptimizations);
 					i.length === 0 && (g = !1), i.forEach((t) => {
-						Ye(e, t, m[r]);
+						Je(e, t, m[r]);
 					});
 				}
-			} else t.ensureOptimizations && O(`${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;
+			} 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;
 		}, []);
 	}), {
@@ -1262,13 +1262,13 @@ function Re(e, t) {
 		canBeOptimized: g
 	};
 }
-function ze(e, t) {
+function Re(e, t) {
 	let n = [], r = function(e) {
-		let t = e.filter((e) => !Object.hasOwn(e, Ie));
+		let t = e.filter((e) => !Object.hasOwn(e, G));
 		return {
 			errors: t.map((e) => ({
 				message: "Token Type: ->" + e.name + "<- missing static 'PATTERN' property",
-				type: K.MISSING_PATTERN,
+				type: q.MISSING_PATTERN,
 				tokenTypes: [e]
 			})),
 			valid: e.filter((e) => !t.includes(e))
@@ -1277,20 +1277,20 @@ function ze(e, t) {
 	n = n.concat(r.errors);
 	let i = function(e) {
 		let t = e.filter((e) => {
-			let t = e[Ie];
+			let t = e[G];
 			return !(t instanceof RegExp || typeof t == "function" || Object.hasOwn(t, "exec") || typeof t == "string");
 		});
 		return {
 			errors: t.map((e) => ({
 				message: "Token Type: ->" + e.name + "<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",
-				type: K.INVALID_PATTERN,
+				type: q.INVALID_PATTERN,
 				tokenTypes: [e]
 			})),
 			valid: e.filter((e) => !t.includes(e))
 		};
 	}(r.valid), a = i.valid;
 	return n = n.concat(i.errors), n = n.concat(function(e) {
-		let t = [], n = e.filter((e) => e[Ie] instanceof RegExp);
+		let t = [], n = e.filter((e) => e[G] instanceof RegExp);
 		return t = t.concat(function(e) {
 			class t extends Ce {
 				constructor() {
@@ -1306,11 +1306,11 @@ function ze(e, t) {
 					let e = Ee(n), r = new t();
 					return r.visit(e), r.found;
 				} catch {
-					return Be.test(n.source);
+					return ze.test(n.source);
 				}
 			}).map((e) => ({
 				message: "Unexpected RegExp Anchor Error:\n	Token Type: ->" + e.name + "<- static 'PATTERN' cannot contain end of input anchor '$'\n	See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.",
-				type: K.EOI_ANCHOR_FOUND,
+				type: q.EOI_ANCHOR_FOUND,
 				tokenTypes: [e]
 			}));
 		}(n)), t = t.concat(function(e) {
@@ -1328,36 +1328,36 @@ function ze(e, t) {
 					let e = Ee(n), r = new t();
 					return r.visit(e), r.found;
 				} catch {
-					return Ve.test(n.source);
+					return Be.test(n.source);
 				}
 			}).map((e) => ({
 				message: "Unexpected RegExp Anchor Error:\n	Token Type: ->" + e.name + "<- static 'PATTERN' cannot contain start of input anchor '^'\n	See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS	for details.",
-				type: K.SOI_ANCHOR_FOUND,
+				type: q.SOI_ANCHOR_FOUND,
 				tokenTypes: [e]
 			}));
 		}(n)), t = t.concat(function(e) {
 			return e.filter((e) => {
-				let t = e[Ie];
+				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')",
-				type: K.UNSUPPORTED_FLAGS_FOUND,
+				type: q.UNSUPPORTED_FLAGS_FOUND,
 				tokenTypes: [e]
 			}));
 		}(n)), t = t.concat(function(e) {
-			let t = [], n = e.map((n) => e.reduce((e, r) => (n.PATTERN.source !== r.PATTERN.source || t.includes(r) || r.PATTERN === q.NA || (t.push(r), e.push(r)), e), []));
+			let t = [], n = e.map((n) => e.reduce((e, r) => (n.PATTERN.source !== r.PATTERN.source || t.includes(r) || r.PATTERN === J.NA || (t.push(r), e.push(r)), e), []));
 			return n = n.filter(Boolean), n.filter((e) => e.length > 1).map((e) => {
 				let t = e.map((e) => e.name);
 				return {
 					message: `The same RegExp pattern ->${e[0].PATTERN}<-has been used in all of the following Token Types: ${t.join(", ")} <-`,
-					type: K.DUPLICATE_PATTERNS_FOUND,
+					type: q.DUPLICATE_PATTERNS_FOUND,
 					tokenTypes: e
 				};
 			});
 		}(n)), t = t.concat(function(e) {
 			return e.filter((e) => e.PATTERN.test("")).map((e) => ({
 				message: "Token Type: ->" + e.name + "<- static 'PATTERN' must not match an empty string",
-				type: K.EMPTY_MATCH_PATTERN,
+				type: q.EMPTY_MATCH_PATTERN,
 				tokenTypes: [e]
 			}));
 		}(n)), t;
@@ -1365,22 +1365,22 @@ function ze(e, t) {
 		return e.filter((e) => {
 			if (!Object.hasOwn(e, "GROUP")) return !1;
 			let t = e.GROUP;
-			return t !== q.SKIPPED && t !== q.NA && typeof t != "string";
+			return t !== J.SKIPPED && t !== J.NA && typeof t != "string";
 		}).map((e) => ({
 			message: "Token Type: ->" + e.name + "<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",
-			type: K.INVALID_GROUP_TYPE_FOUND,
+			type: q.INVALID_GROUP_TYPE_FOUND,
 			tokenTypes: [e]
 		}));
 	}(a)), n = n.concat(function(e, t) {
 		return e.filter((e) => e.PUSH_MODE !== void 0 && !t.includes(e.PUSH_MODE)).map((e) => ({
 			message: `Token Type: ->${e.name}<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->${e.PUSH_MODE}<-which does not exist`,
-			type: K.PUSH_MODE_DOES_NOT_EXIST,
+			type: q.PUSH_MODE_DOES_NOT_EXIST,
 			tokenTypes: [e]
 		}));
 	}(a, t)), n = n.concat(function(e) {
 		let t = [], n = e.reduce((e, t, n) => {
 			let r = t.PATTERN;
-			return r === q.NA || (typeof r == "string" ? e.push({
+			return r === J.NA || (typeof r == "string" ? e.push({
 				str: r,
 				idx: n,
 				tokenType: t
@@ -1421,7 +1421,7 @@ function ze(e, t) {
 					let n = `Token: ->${a.name}<- can never be matched.\nBecause it appears AFTER the Token Type ->${e.name}<-in the lexer's definition.\nSee https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;
 					t.push({
 						message: n,
-						type: K.UNREACHABLE_PATTERN,
+						type: q.UNREACHABLE_PATTERN,
 						tokenTypes: [e, a]
 					});
 				}
@@ -1429,22 +1429,22 @@ function ze(e, t) {
 		}), t;
 	}(a)), n;
 }
-var Be = /[^\\][$]/, Ve = /[^\\[][\^]|^\^/;
-function He(e) {
+var ze = /[^\\][$]/, Be = /[^\\[][\^]|^\^/;
+function Ve(e) {
 	let t = e.ignoreCase ? "iy" : "y";
 	return RegExp(`${e.source}`, t);
 }
-function Ue(e) {
+function He(e) {
 	let t = e.PATTERN;
 	if (t instanceof RegExp) return !1;
 	if (typeof t == "function" || Object.hasOwn(t, "exec")) return !0;
 	if (typeof t == "string") return !1;
 	throw Error("non exhaustive match");
 }
-function We(e) {
+function Ue(e) {
 	return typeof e == "string" && e.length === 1 && e.charCodeAt(0);
 }
-var Ge = {
+var We = {
 	test: function(e) {
 		let t = e.length;
 		for (let n = this.lastIndex; n < t; n++) {
@@ -1456,47 +1456,47 @@ var Ge = {
 	},
 	lastIndex: 0
 };
-function Ke(e, t) {
+function Ge(e, t) {
 	if (Object.hasOwn(e, "LINE_BREAKS")) return !1;
 	if (e.PATTERN instanceof RegExp) {
 		try {
 			Fe(t, e.PATTERN);
 		} catch (e) {
 			return {
-				issue: K.IDENTIFY_TERMINATOR,
+				issue: q.IDENTIFY_TERMINATOR,
 				errMsg: e.message
 			};
 		}
 		return !1;
 	}
 	if (typeof e.PATTERN == "string") return !1;
-	if (Ue(e)) return { issue: K.CUSTOM_LINE_BREAK };
+	if (He(e)) return { issue: q.CUSTOM_LINE_BREAK };
 	throw Error("non exhaustive match");
 }
-function qe(e, t) {
-	if (t.issue === K.IDENTIFY_TERMINATOR) return `Warning: unable to identify line terminator usage in pattern.\n\tThe problem is in the <${e.name}> Token Type\n\t Root cause: ${t.errMsg}.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR`;
-	if (t.issue === K.CUSTOM_LINE_BREAK) return `Warning: A Custom Token Pattern should specify the <line_breaks> option.\n\tThe problem is in the <${e.name}> Token Type\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK`;
+function Ke(e, t) {
+	if (t.issue === q.IDENTIFY_TERMINATOR) return `Warning: unable to identify line terminator usage in pattern.\n\tThe problem is in the <${e.name}> Token Type\n\t Root cause: ${t.errMsg}.\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR`;
+	if (t.issue === q.CUSTOM_LINE_BREAK) return `Warning: A Custom Token Pattern should specify the <line_breaks> option.\n\tThe problem is in the <${e.name}> Token Type\n\tFor details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK`;
 	throw Error("non exhaustive match");
 }
-function Je(e) {
+function qe(e) {
 	return e.map((e) => typeof e == "string" ? e.charCodeAt(0) : e);
 }
-function Ye(e, t, n) {
+function Je(e, t, n) {
 	e[t] === void 0 ? e[t] = [n] : e[t].push(n);
 }
-var Xe = [];
-function G(e) {
-	return e < 256 ? e : Xe[e];
+var Ye = [];
+function K(e) {
+	return e < 256 ? e : Ye[e];
 }
-function Ze(e, t) {
+function Xe(e, t) {
 	let n = e.tokenTypeIdx;
 	return n === t.tokenTypeIdx || !0 === t.isParent && !0 === t.categoryMatchesMap[n];
 }
-function Qe(e, t) {
+function Ze(e, t) {
 	return e.tokenTypeIdx === t.tokenTypeIdx;
 }
-var $e = 1, et = {};
-function tt(e) {
+var Qe = 1, $e = {};
+function et(e) {
 	let t = function(e) {
 		let t = [...e], n = e, r = !0;
 		for (; r;) {
@@ -1509,107 +1509,107 @@ function tt(e) {
 	(function(e) {
 		e.forEach((e) => {
 			var t;
-			rt(e) || (et[$e] = e, e.tokenTypeIdx = $e++), it(e) && !Array.isArray(e.CATEGORIES) && (e.CATEGORIES = [e.CATEGORIES]), it(e) || (e.CATEGORIES = []), t = e, Object.hasOwn(t ?? {}, "categoryMatches") || (e.categoryMatches = []), function(e) {
+			nt(e) || ($e[Qe] = e, e.tokenTypeIdx = Qe++), rt(e) && !Array.isArray(e.CATEGORIES) && (e.CATEGORIES = [e.CATEGORIES]), rt(e) || (e.CATEGORIES = []), t = e, Object.hasOwn(t ?? {}, "categoryMatches") || (e.categoryMatches = []), function(e) {
 				return Object.hasOwn(e ?? {}, "categoryMatchesMap");
 			}(e) || (e.categoryMatchesMap = {});
 		});
 	})(t), function(e) {
 		e.forEach((e) => {
-			nt([], e);
+			tt([], e);
 		});
 	}(t), function(e) {
 		e.forEach((e) => {
 			e.categoryMatches = [], Object.keys(e.categoryMatchesMap).forEach((t) => {
-				e.categoryMatches.push(et[t].tokenTypeIdx);
+				e.categoryMatches.push($e[t].tokenTypeIdx);
 			});
 		});
 	}(t), t.forEach((e) => {
 		e.isParent = e.categoryMatches.length > 0;
 	});
 }
-function nt(e, t) {
+function tt(e, t) {
 	e.forEach((e) => {
 		t.categoryMatchesMap[e.tokenTypeIdx] = !0;
 	}), t.CATEGORIES.forEach((n) => {
 		let r = e.concat(t);
-		r.includes(n) || nt(r, n);
+		r.includes(n) || tt(r, n);
 	});
 }
-function rt(e) {
+function nt(e) {
 	return Object.hasOwn(e ?? {}, "tokenTypeIdx");
 }
-function it(e) {
+function rt(e) {
 	return Object.hasOwn(e ?? {}, "CATEGORIES");
 }
-function at(e) {
+function it(e) {
 	return Object.hasOwn(e ?? {}, "tokenTypeIdx");
 }
-var K, ot = {
+var q, at = {
 	buildUnableToPopLexerModeMessage: (e) => `Unable to pop Lexer Mode after encountering Token ->${e.image}<- The Mode Stack is empty`,
 	buildUnexpectedCharactersMessage: (e, t, n, r, i, a) => `unexpected character: ->${e.charAt(t)}<- at offset: ${t}, skipped ${n} characters.`
 };
 (function(e) {
 	e[e.MISSING_PATTERN = 0] = "MISSING_PATTERN", e[e.INVALID_PATTERN = 1] = "INVALID_PATTERN", e[e.EOI_ANCHOR_FOUND = 2] = "EOI_ANCHOR_FOUND", e[e.UNSUPPORTED_FLAGS_FOUND = 3] = "UNSUPPORTED_FLAGS_FOUND", e[e.DUPLICATE_PATTERNS_FOUND = 4] = "DUPLICATE_PATTERNS_FOUND", e[e.INVALID_GROUP_TYPE_FOUND = 5] = "INVALID_GROUP_TYPE_FOUND", e[e.PUSH_MODE_DOES_NOT_EXIST = 6] = "PUSH_MODE_DOES_NOT_EXIST", e[e.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE = 7] = "MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE", e[e.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY = 8] = "MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY", e[e.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST = 9] = "MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST", e[e.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED = 10] = "LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED", e[e.SOI_ANCHOR_FOUND = 11] = "SOI_ANCHOR_FOUND", e[e.EMPTY_MATCH_PATTERN = 12] = "EMPTY_MATCH_PATTERN", e[e.NO_LINE_BREAKS_FLAGS = 13] = "NO_LINE_BREAKS_FLAGS", e[e.UNREACHABLE_PATTERN = 14] = "UNREACHABLE_PATTERN", e[e.IDENTIFY_TERMINATOR = 15] = "IDENTIFY_TERMINATOR", e[e.CUSTOM_LINE_BREAK = 16] = "CUSTOM_LINE_BREAK", e[e.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE = 17] = "MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE";
-})(K ||= {});
-var st = {
+})(q ||= {});
+var ot = {
 	deferDefinitionErrorsHandling: !1,
 	positionTracking: "full",
 	lineTerminatorsPattern: /\n|\r\n?/g,
 	lineTerminatorCharacters: ["\n", "\r"],
 	ensureOptimizations: !1,
 	safeMode: !1,
-	errorMessageProvider: ot,
+	errorMessageProvider: at,
 	traceInitPerf: !1,
 	skipValidations: !1,
 	recoveryEnabled: !0
 };
-Object.freeze(st);
-var q = class {
-	constructor(e, t = st) {
+Object.freeze(ot);
+var J = class {
+	constructor(e, t = ot) {
 		if (this.lexerDefinition = e, this.lexerDefinitionErrors = [], this.lexerDefinitionWarning = [], this.patternIdxToConfig = {}, this.charCodeToPatternIdxToConfig = {}, this.modes = [], this.emptyGroups = {}, this.cachedGroupKeys = [], this.trackStartLines = !0, this.trackEndLines = !0, this.hasCustom = !1, this.canModeBeOptimized = {}, this.TRACE_INIT = (e, t) => {
 			if (!0 === this.traceInitPerf) {
 				this.traceInitIndent++;
 				let n = Array(this.traceInitIndent + 1).join("	");
 				this.traceInitIndent < this.traceInitMaxIdent && console.log(`${n}--\x3e <${e}>`);
-				let { time: r, value: i } = re(t), a = r > 10 ? console.warn : console.log;
+				let { time: r, value: i } = ie(t), a = r > 10 ? console.warn : console.log;
 				return this.traceInitIndent < this.traceInitMaxIdent && a(`${n}<-- <${e}> time: ${r}ms`), this.traceInitIndent--, i;
 			}
 			return t();
 		}, typeof t == "boolean") throw Error("The second argument to the Lexer constructor is now an ILexerConfig Object.\na boolean 2nd argument is no longer supported");
-		this.config = Object.assign({}, st, t);
+		this.config = Object.assign({}, ot, t);
 		let n = this.config.traceInitPerf;
 		!0 === n ? (this.traceInitMaxIdent = 1 / 0, this.traceInitPerf = !0) : typeof n == "number" && (this.traceInitMaxIdent = n, this.traceInitPerf = !0), this.traceInitIndent = -1, this.TRACE_INIT("Lexer Constructor", () => {
 			let n, r = !0;
 			this.TRACE_INIT("Lexer Config handling", () => {
-				if (this.config.lineTerminatorsPattern === st.lineTerminatorsPattern) this.config.lineTerminatorsPattern = Ge;
-				else if (this.config.lineTerminatorCharacters === st.lineTerminatorCharacters) throw Error("Error: Missing <lineTerminatorCharacters> property on the Lexer config.\n	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS");
+				if (this.config.lineTerminatorsPattern === ot.lineTerminatorsPattern) this.config.lineTerminatorsPattern = We;
+				else if (this.config.lineTerminatorCharacters === ot.lineTerminatorCharacters) throw Error("Error: Missing <lineTerminatorCharacters> property on the Lexer config.\n	For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS");
 				if (t.safeMode && t.ensureOptimizations) throw Error("\"safeMode\" and \"ensureOptimizations\" flags are mutually exclusive.");
 				this.trackStartLines = /full|onlyStart/i.test(this.config.positionTracking), this.trackEndLines = /full/i.test(this.config.positionTracking), Array.isArray(e) ? n = {
 					modes: { defaultMode: [...e] },
-					defaultMode: Le
+					defaultMode: Ie
 				} : (r = !1, n = Object.assign({}, e));
 			}), !1 === this.config.skipValidations && (this.TRACE_INIT("performRuntimeChecks", () => {
 				this.lexerDefinitionErrors = this.lexerDefinitionErrors.concat(function(e) {
 					let t = [];
 					return Object.hasOwn(e, "defaultMode") || t.push({
 						message: "A MultiMode Lexer cannot be initialized without a <defaultMode> property in its definition\n",
-						type: K.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE
+						type: q.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE
 					}), Object.hasOwn(e, "modes") || t.push({
 						message: "A MultiMode Lexer cannot be initialized without a <modes> property in its definition\n",
-						type: K.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY
+						type: q.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY
 					}), Object.hasOwn(e, "modes") && Object.hasOwn(e, "defaultMode") && !Object.hasOwn(e.modes, e.defaultMode) && t.push({
-						message: `A MultiMode Lexer cannot be initialized with a ${Le}: <${e.defaultMode}>which does not exist\n`,
-						type: K.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST
+						message: `A MultiMode Lexer cannot be initialized with a ${Ie}: <${e.defaultMode}>which does not exist\n`,
+						type: q.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST
 					}), Object.hasOwn(e, "modes") && Object.keys(e.modes).forEach((n) => {
 						let r = e.modes[n];
 						r.forEach((e, i) => {
 							e === void 0 ? t.push({
 								message: `A Lexer cannot be initialized using an undefined Token Type. Mode:<${n}> at index: <${i}>\n`,
-								type: K.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED
+								type: q.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED
 							}) : Object.hasOwn(e, "LONGER_ALT") && (Array.isArray(e.LONGER_ALT) ? e.LONGER_ALT : [e.LONGER_ALT]).forEach((i) => {
 								i === void 0 || r.includes(i) || t.push({
 									message: `A MultiMode Lexer cannot be initialized with a longer_alt <${i.name}> on token <${e.name}> outside of mode <${n}>\n`,
-									type: K.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE
+									type: q.MULTI_MODE_LEXER_LONGER_ALT_NOT_IN_CURRENT_MODE
 								});
 							});
 						});
@@ -1617,12 +1617,12 @@ var q = 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[Ie] !== q.NA), o = Je(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 = Ke(e, o);
+						let t = Ge(e, o);
 						if (!1 !== t) {
 							let n = {
-								message: qe(e, t),
+								message: Ke(e, t),
 								type: t.issue,
 								tokenType: e
 							};
@@ -1630,7 +1630,7 @@ var q = class {
 						} 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: K.NO_LINE_BREAKS_FLAGS
+						type: q.NO_LINE_BREAKS_FLAGS
 					}), r;
 				}(n, this.trackStartLines, this.config.lineTerminatorCharacters));
 			})), n.modes = n.modes ? n.modes : {}, Object.entries(n.modes).forEach(([e, t]) => {
@@ -1640,11 +1640,11 @@ var q = class {
 			if (Object.entries(n.modes).forEach(([e, n]) => {
 				this.TRACE_INIT(`Mode: <${e}> processing`, () => {
 					if (this.modes.push(e), !1 === this.config.skipValidations && this.TRACE_INIT("validatePatterns", () => {
-						this.lexerDefinitionErrors = this.lexerDefinitionErrors.concat(ze(n, i));
+						this.lexerDefinitionErrors = this.lexerDefinitionErrors.concat(Re(n, i));
 					}), this.lexerDefinitionErrors.length === 0) {
 						let r;
-						tt(n), this.TRACE_INIT("analyzeTokenTypes", () => {
-							r = Re(n, {
+						et(n), this.TRACE_INIT("analyzeTokenTypes", () => {
+							r = Le(n, {
 								lineTerminatorCharacters: this.config.lineTerminatorCharacters,
 								positionTracking: t.positionTracking,
 								ensureOptimizations: t.ensureOptimizations,
@@ -1659,7 +1659,7 @@ var q = class {
 				throw Error("Errors detected in definition of Lexer:\n" + e);
 			}
 			this.lexerDefinitionWarning.forEach((e) => {
-				k(e.message);
+				O(e.message);
 			}), this.TRACE_INIT("Choosing sub-methods implementations", () => {
 				if (r && (this.handleModes = () => {}), !1 === this.trackStartLines && (this.computeNewColumn = (e) => e), !1 === this.trackEndLines && (this.updateTokenEndLineColumnLocation = () => {}), /full/i.test(this.config.positionTracking)) this.createTokenInstance = this.createFullToken;
 				else if (/onlyStart/i.test(this.config.positionTracking)) this.createTokenInstance = this.createStartOnlyToken;
@@ -1674,7 +1674,7 @@ var q = class {
 			}), this.TRACE_INIT("clearRegExpParserCache", () => {
 				we = {};
 			}), this.TRACE_INIT("toFastProperties", () => {
-				ie(this);
+				ae(this);
 			});
 		});
 	}
@@ -1686,14 +1686,14 @@ var q = 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, v = _.length, y = 0, b = 0, ee = this.hasCustom ? 0 : Math.floor(e.length / 10), x = Array(ee), S = [], C = this.trackStartLines ? 1 : void 0, w = this.trackStartLines ? 1 : void 0, T = {};
-		for (let e = 0; e < this.cachedGroupKeys.length; e++) T[this.cachedGroupKeys[e]] = [];
-		let te = this.trackStartLines, E = this.config.lineTerminatorsPattern, ne = 0, D = [], O = [], k = [], re = [];
-		Object.freeze(re);
-		let ie = !1, A = (e) => {
-			if (k.length === 1 && e.tokenType.PUSH_MODE === void 0) {
+		let n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _ = e, v = _.length, y = 0, ee = 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);
-				S.push({
+				te.push({
 					offset: e.startOffset,
 					line: e.startLine,
 					column: e.startColumn,
@@ -1701,41 +1701,41 @@ var q = class {
 					message: t
 				});
 			} else {
-				k.pop();
-				let e = k.at(-1);
-				D = this.patternIdxToConfig[e], O = this.charCodeToPatternIdxToConfig[e], ne = D.length;
+				O.pop();
+				let e = O.at(-1);
+				E = this.patternIdxToConfig[e], D = this.charCodeToPatternIdxToConfig[e], re = E.length;
 				let t = this.canModeBeOptimized[e] && !1 === this.config.safeMode;
-				ie = !(!O || !t);
+				ae = !(!D || !t);
 			}
 		};
-		function j(e) {
-			k.push(e), O = this.charCodeToPatternIdxToConfig[e], D = this.patternIdxToConfig[e], ne = D.length;
+		function A(e) {
+			O.push(e), D = this.charCodeToPatternIdxToConfig[e], E = this.patternIdxToConfig[e], re = E.length;
 			let t = this.canModeBeOptimized[e] && !1 === this.config.safeMode;
-			ie = !(!O || !t);
+			ae = !(!D || !t);
 		}
-		let M;
-		j.call(this, t);
-		let N = this.config.recoveryEnabled;
+		let j;
+		A.call(this, t);
+		let M = this.config.recoveryEnabled;
 		for (; y < v;) {
 			s = null, u = -1;
-			let t = _.charCodeAt(y), ee;
-			if (ie) {
-				let e = G(t), n = O[e];
-				ee = n === void 0 ? re : n;
-			} else ee = D;
-			let P = ee.length;
-			for (n = 0; n < P; n++) {
-				M = ee[n];
-				let r = M.pattern;
-				switch (c = null, M.matchType) {
+			let t = _.charCodeAt(y), b;
+			if (ae) {
+				let e = K(t), n = D[e];
+				b = n === void 0 ? ie : n;
+			} else b = E;
+			let N = b.length;
+			for (n = 0; n < N; n++) {
+				j = b[n];
+				let r = j.pattern;
+				switch (c = null, j.matchType) {
 					case 0:
-						t === M.short && (u = 1, s = r);
+						t === j.short && (u = 1, s = r);
 						break;
 					case 1:
-						g = r.exec(_, y, x, T), g === null ? s = null : (s = g[0], u = s.length, g.payload !== void 0 && (c = g.payload));
+						g = r.exec(_, y, x, w), g === null ? s = null : (s = g[0], u = s.length, g.payload !== void 0 && (c = g.payload));
 						break;
 					case 3: {
-						let e = M.asciiClass;
+						let e = j.asciiClass;
 						if (e[t] !== 1) {
 							r.lastIndex = 0;
 							break;
@@ -1748,13 +1748,13 @@ var q = class {
 					case 2: r.lastIndex = y, u = this.matchLength(r, e, y);
 				}
 				if (u !== -1) {
-					if (o = M.longerAlt, o !== void 0) {
+					if (o = j.longerAlt, o !== void 0) {
 						s = e.substring(y, y + u);
 						let t = o.length;
 						for (i = 0; i < t; i++) {
-							let t = D[o[i]], n = t.pattern;
-							if (l = null, t.matchType === 1 ? (g = n.exec(_, y, x, T), g === null ? a = null : (a = g[0], g.payload !== void 0 && (l = g.payload))) : (n.lastIndex = y, a = this.match(n, e, y)), a && a.length > s.length) {
-								s = a, u = a.length, c = l, M = t;
+							let t = E[o[i]], n = t.pattern;
+							if (l = null, t.matchType === 1 ? (g = n.exec(_, y, x, w), g === null ? a = null : (a = g[0], g.payload !== void 0 && (l = g.payload))) : (n.lastIndex = y, a = this.match(n, e, y)), a && a.length > s.length) {
+								s = a, u = a.length, c = l, j = t;
 								break;
 							}
 						}
@@ -1763,44 +1763,44 @@ var q = class {
 				}
 			}
 			if (u !== -1) {
-				if (d = M.group, d !== void 0 && (s = s === null ? e.substring(y, y + u) : s, f = M.tokenTypeIdx, p = this.createTokenInstance(s, y, f, M.tokenType, C, w, u), this.handlePayload(p, c), !1 === d ? b = this.addToken(x, b, p) : T[d].push(p)), !0 === te && !0 === M.canLineTerminator) {
+				if (d = j.group, d !== void 0 && (s = s === null ? e.substring(y, y + u) : s, f = j.tokenTypeIdx, p = this.createTokenInstance(s, y, f, j.tokenType, S, C, u), this.handlePayload(p, c), !1 === d ? ee = this.addToken(x, ee, p) : w[d].push(p)), !0 === ne && !0 === j.canLineTerminator) {
 					let t, n, r = 0;
-					E.lastIndex = 0;
+					T.lastIndex = 0;
 					do
-						s = s === null ? e.substring(y, y + u) : s, t = E.test(s), !0 === t && (n = E.lastIndex - 1, r++);
+						s = s === null ? e.substring(y, y + u) : s, t = T.test(s), !0 === t && (n = T.lastIndex - 1, r++);
 					while (!0 === t);
-					r === 0 ? w = this.computeNewColumn(w, u) : (C += r, w = u - n, this.updateTokenEndLineColumnLocation(p, d, n, r, C, w, u));
-				} else w = this.computeNewColumn(w, u);
-				y += u, this.handleModes(M, A, j, p);
+					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);
+				y += u, this.handleModes(j, k, A, p);
 			} else {
-				let t = y, n = C, i = w, a = !1 === N;
-				for (; !1 === a && y < v;) for (y++, r = 0; r < ne; r++) {
-					let t = D[r], n = t.pattern;
+				let t = y, n = S, i = C, a = !1 === M;
+				for (; !1 === a && y < v;) for (y++, r = 0; r < re; r++) {
+					let t = E[r], n = t.pattern;
 					switch (t.matchType) {
 						case 0:
 							_.charCodeAt(y) === t.short && (a = !0);
 							break;
 						case 1:
-							a = n.exec(_, y, x, T) !== null;
+							a = n.exec(_, y, x, w) !== null;
 							break;
 						case 3:
 						case 2: n.lastIndex = y, a = n.exec(e) !== null;
 					}
 					if (!0 === a) break;
 				}
-				if (m = y - t, w = this.computeNewColumn(w, m), h = this.config.errorMessageProvider.buildUnexpectedCharactersMessage(_, t, m, n, i, k.at(-1)), S.push({
+				if (m = y - 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,
 					length: m,
 					message: h
-				}), !1 === N) break;
+				}), !1 === M) break;
 			}
 		}
-		return this.hasCustom || (x.length = b), {
+		return this.hasCustom || (x.length = ee), {
 			tokens: x,
-			groups: T,
-			errors: S
+			groups: w,
+			errors: te
 		};
 	}
 	handleModes(e, t, n, r) {
@@ -1864,26 +1864,26 @@ var q = class {
 		return !0 === e.test(t) ? e.lastIndex - n : -1;
 	}
 };
-function ct(e) {
-	return lt(e) ? e.LABEL : e.name;
+function st(e) {
+	return ct(e) ? e.LABEL : e.name;
 }
-function lt(e) {
+function ct(e) {
 	return typeof e.LABEL == "string" && e.LABEL !== "";
 }
-q.SKIPPED = "This marks a skipped Token pattern, this means each token identified by it will be consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.", q.NA = /NOT_APPLICABLE/;
-var ut = "parent", dt = "categories", ft = "label", pt = "group", mt = "push_mode", ht = "pop_mode", gt = "longer_alt", _t = "line_breaks", vt = "start_chars_hint";
-function J(e) {
+J.SKIPPED = "This marks a skipped Token pattern, this means each token identified by it will be consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.", J.NA = /NOT_APPLICABLE/;
+var lt = "parent", ut = "categories", dt = "label", ft = "group", pt = "push_mode", mt = "pop_mode", ht = "longer_alt", gt = "line_breaks", _t = "start_chars_hint";
+function Y(e) {
 	return function(e) {
 		let t = e.pattern, n = {};
-		if (n.name = e.name, t !== void 0 && (n.PATTERN = t), Object.hasOwn(e, ut)) throw "The parent property is no longer supported.\nSee: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.";
-		return Object.hasOwn(e, dt) && (n.CATEGORIES = e[dt]), tt([n]), Object.hasOwn(e, ft) && (n.LABEL = e[ft]), Object.hasOwn(e, pt) && (n.GROUP = e[pt]), Object.hasOwn(e, ht) && (n.POP_MODE = e[ht]), Object.hasOwn(e, mt) && (n.PUSH_MODE = e[mt]), Object.hasOwn(e, gt) && (n.LONGER_ALT = e[gt]), Object.hasOwn(e, _t) && (n.LINE_BREAKS = e[_t]), Object.hasOwn(e, vt) && (n.START_CHARS_HINT = e[vt]), n;
+		if (n.name = e.name, t !== void 0 && (n.PATTERN = t), Object.hasOwn(e, lt)) throw "The parent property is no longer supported.\nSee: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.";
+		return Object.hasOwn(e, ut) && (n.CATEGORIES = e[ut]), et([n]), Object.hasOwn(e, dt) && (n.LABEL = e[dt]), Object.hasOwn(e, ft) && (n.GROUP = e[ft]), Object.hasOwn(e, mt) && (n.POP_MODE = e[mt]), Object.hasOwn(e, pt) && (n.PUSH_MODE = e[pt]), Object.hasOwn(e, ht) && (n.LONGER_ALT = e[ht]), Object.hasOwn(e, gt) && (n.LINE_BREAKS = e[gt]), Object.hasOwn(e, _t) && (n.START_CHARS_HINT = e[_t]), n;
 	}(e);
 }
-var Y = J({
+var X = Y({
 	name: "EOF",
-	pattern: q.NA
+	pattern: J.NA
 });
-function yt(e, t, n, r, i, a, o, s) {
+function vt(e, t, n, r, i, a, o, s) {
 	return {
 		image: t,
 		startOffset: n,
@@ -1896,38 +1896,38 @@ function yt(e, t, n, r, i, a, o, s) {
 		tokenType: e
 	};
 }
-tt([Y]);
-var bt = {
-	buildMismatchTokenMessage: ({ expected: e, actual: t, previous: n, ruleName: r }) => `Expecting ${lt(e) ? `--\x3e ${ct(e)} <--` : `token of type --\x3e ${e.name} <--`} but found --\x3e '${t.image}' <--`,
+et([X]);
+var yt = {
+	buildMismatchTokenMessage: ({ expected: e, actual: t, previous: n, ruleName: r }) => `Expecting ${ct(e) ? `--\x3e ${st(e)} <--` : `token of type --\x3e ${e.name} <--`} but found --\x3e '${t.image}' <--`,
 	buildNotAllInputParsedMessage: ({ firstRedundant: e, ruleName: t }) => "Redundant input, expecting EOF but found: " + e.image,
 	buildNoViableAltMessage({ expectedPathsPerAlt: e, actual: t, previous: n, customUserDescription: r, ruleName: i }) {
 		let a = "\nbut found: '" + t[0].image + "'";
-		return r ? "Expecting: " + r + a : `Expecting: one of these possible Token sequences:\n${e.reduce((e, t) => e.concat(t), []).map((e) => `[${e.map((e) => ct(e)).join(", ")}]`).map((e, t) => `  ${t + 1}. ${e}`).join("\n")}` + a;
+		return r ? "Expecting: " + r + a : `Expecting: one of these possible Token sequences:\n${e.reduce((e, t) => e.concat(t), []).map((e) => `[${e.map((e) => st(e)).join(", ")}]`).map((e, t) => `  ${t + 1}. ${e}`).join("\n")}` + a;
 	},
 	buildEarlyExitMessage({ expectedIterationPaths: e, actual: t, customUserDescription: n, ruleName: r }) {
 		let i = "\nbut found: '" + t[0].image + "'";
-		return n ? "Expecting: " + n + i : `Expecting: expecting at least one iteration which starts with one of these possible Token sequences::\n  <${e.map((e) => `[${e.map((e) => ct(e)).join(",")}]`).join(" ,")}>` + i;
+		return n ? "Expecting: " + n + i : `Expecting: expecting at least one iteration which starts with one of these possible Token sequences::\n  <${e.map((e) => `[${e.map((e) => st(e)).join(",")}]`).join(" ,")}>` + i;
 	}
 };
-Object.freeze(bt);
-var xt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a rule which is not defined: ->" + t.nonTerminalName + "<-\ninside top level rule: ->" + e.name + "<-" }, X = {
+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 B ? s.terminalType.name : s instanceof j ? 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;
 	},
 	buildNamespaceConflictError: (e) => `Namespace conflict found in grammar.\nThe grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <${e.name}>.\nTo resolve this make sure each Terminal and Non-Terminal names are unique\nThis is easy to accomplish by using the convention that Terminal names start with an uppercase letter\nand Non-Terminal names start with a lower case letter.`,
 	buildAlternationPrefixAmbiguityError(e) {
-		let t = e.prefixPath.map((e) => ct(e)).join(", "), n = e.alternation.idx === 0 ? "" : e.alternation.idx;
+		let t = e.prefixPath.map((e) => st(e)).join(", "), n = e.alternation.idx === 0 ? "" : e.alternation.idx;
 		return `Ambiguous alternatives: <${e.ambiguityIndices.join(" ,")}> due to common lookahead prefix\nin <OR${n}> inside <${e.topLevelRule.name}> Rule,\n<${t}> may appears as a prefix path in all these alternatives.\nSee: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX\nFor Further details.`;
 	},
 	buildAlternationAmbiguityError(e) {
 		let t = e.alternation.idx === 0 ? "" : e.alternation.idx, n = e.prefixPath.length === 0, r = `Ambiguous Alternatives Detected: <${e.ambiguityIndices.join(" ,")}> in <OR${t}> inside <${e.topLevelRule.name}> Rule,\n`;
-		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) => ct(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;
+		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",
@@ -1940,9 +1940,9 @@ var xt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 	buildInvalidRuleNameError: (e) => "deprecated",
 	buildDuplicateRuleNameError(e) {
 		let t;
-		return t = e.topLevelRule instanceof M ? e.topLevelRule.name : e.topLevelRule, `Duplicate definition, rule: ->${t}<- is already defined in the grammar: ->${e.grammarName}<-`;
+		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 oe {
+}, Z, St = class extends se {
 	constructor(e, t) {
 		super(), this.nameToTopRule = e, this.errMsgProvider = t, this.errors = [];
 	}
@@ -1964,7 +1964,7 @@ var xt = { 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;
 	}
@@ -1990,11 +1990,11 @@ var xt = { 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 N({ definition: t.concat(n) });
-			this.possibleTokTypes = ue(e), this.found = !0;
+			let e = new M({ definition: t.concat(n) });
+			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,
@@ -2009,28 +2009,28 @@ var xt = { buildRuleNotFoundError: (e, t) => "Invalid grammar, reference to a ru
 	walkMany(e, t, n) {
 		if (e.idx === this.occurrence) {
 			let e = t.concat(n)[0];
-			this.result.isEndOfRule = e === void 0, e instanceof B && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = e === void 0, e instanceof z && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkMany(e, t, n);
 	}
 }, Dt = class extends Tt {
 	walkManySep(e, t, n) {
 		if (e.idx === this.occurrence) {
 			let e = t.concat(n)[0];
-			this.result.isEndOfRule = e === void 0, e instanceof B && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = e === void 0, e instanceof z && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkManySep(e, t, n);
 	}
 }, Ot = class extends Tt {
 	walkAtLeastOne(e, t, n) {
 		if (e.idx === this.occurrence) {
 			let e = t.concat(n)[0];
-			this.result.isEndOfRule = e === void 0, e instanceof B && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = e === void 0, e instanceof z && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkAtLeastOne(e, t, n);
 	}
 }, kt = class extends Tt {
 	walkAtLeastOneSep(e, t, n) {
 		if (e.idx === this.occurrence) {
 			let e = t.concat(n)[0];
-			this.result.isEndOfRule = e === void 0, e instanceof B && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
+			this.result.isEndOfRule = e === void 0, e instanceof z && (this.result.token = e.terminalType, this.result.occurrence = e.idx);
 		} else super.walkAtLeastOneSep(e, t, n);
 	}
 };
@@ -2043,18 +2043,18 @@ function At(e, t, n = []) {
 	}
 	for (; n.length < t && i < e.length;) {
 		let t = e[i];
-		if (t instanceof N || t instanceof j) return a(t.definition);
-		if (t instanceof P) r = a(t.definition);
+		if (t instanceof M || t instanceof A) return a(t.definition);
+		if (t instanceof N) r = a(t.definition);
 		else {
-			if (t instanceof F) return a(t.definition.concat([new L({ definition: t.definition })]));
-			if (t instanceof I) return a([new N({ definition: t.definition }), new L({ definition: [new B({ terminalType: t.separator })].concat(t.definition) })]);
-			if (t instanceof R) r = a(t.definition.concat([new L({ definition: [new B({ terminalType: t.separator })].concat(t.definition) })]));
-			else if (t instanceof L) r = a(t.definition.concat([new L({ definition: t.definition })]));
+			if (t instanceof P) return a(t.definition.concat([new I({ definition: t.definition })]));
+			if (t instanceof F) return a([new M({ definition: t.definition }), new I({ definition: [new z({ terminalType: t.separator })].concat(t.definition) })]);
+			if (t instanceof L) r = a(t.definition.concat([new I({ definition: [new z({ terminalType: t.separator })].concat(t.definition) })]));
+			else if (t instanceof I) r = a(t.definition.concat([new I({ definition: t.definition })]));
 			else {
-				if (t instanceof z) return t.definition.forEach((e) => {
+				if (t instanceof R) return t.definition.forEach((e) => {
 					e.definition.length !== 0 && (r = a(e.definition));
 				}), r;
-				if (!(t instanceof B)) throw Error("non exhaustive match");
+				if (!(t instanceof z)) throw Error("non exhaustive match");
 				n.push(t.terminalType);
 			}
 		}
@@ -2077,12 +2077,12 @@ function jt(e, t, n, r) {
 	};
 }
 function Mt(e) {
-	if (e instanceof P || e === "Option") return Z.OPTION;
-	if (e instanceof L || e === "Repetition") return Z.REPETITION;
-	if (e instanceof F || e === "RepetitionMandatory") return Z.REPETITION_MANDATORY;
-	if (e instanceof I || e === "RepetitionMandatoryWithSeparator") return Z.REPETITION_MANDATORY_WITH_SEPARATOR;
-	if (e instanceof R || e === "RepetitionWithSeparator") return Z.REPETITION_WITH_SEPARATOR;
-	if (e instanceof z || e === "Alternation") return Z.ALTERNATION;
+	if (e instanceof N || e === "Option") return Z.OPTION;
+	if (e instanceof I || e === "Repetition") return Z.REPETITION;
+	if (e instanceof P || e === "RepetitionMandatory") return Z.REPETITION_MANDATORY;
+	if (e instanceof F || e === "RepetitionMandatoryWithSeparator") return Z.REPETITION_MANDATORY_WITH_SEPARATOR;
+	if (e instanceof L || e === "RepetitionWithSeparator") return Z.REPETITION_WITH_SEPARATOR;
+	if (e instanceof R || e === "Alternation") return Z.ALTERNATION;
 	throw Error("non exhaustive match");
 }
 function Nt(e, t, n, r) {
@@ -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 oe {
+}, It = class extends se {
 	constructor(e, t, n) {
 		super(), this.targetOccurrence = e, this.targetProdType = t, this.targetRef = n, this.result = [];
 	}
@@ -2278,7 +2278,7 @@ function Ht(e, t, n, r) {
 	let i = new It(e, n);
 	t.accept(i);
 	let a = i.result, o = new Ft(t, e, n).startWalking();
-	return Bt([new N({ definition: a }), new N({ definition: o })], r);
+	return Bt([new M({ definition: a }), new M({ definition: o })], r);
 }
 function Ut(e, t) {
 	e: for (let n = 0; n < e.length; n++) {
@@ -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 B ? e.terminalType.name : e instanceof j ? e.nonTerminalName : "";
+	return e instanceof z ? e.terminalType.name : e instanceof A ? e.nonTerminalName : "";
 }
-var Jt = class extends oe {
+var Jt = class extends se {
 	constructor() {
 		super(...arguments), this.allProductions = [];
 	}
@@ -2411,18 +2411,18 @@ function Xt(e) {
 	let t = [];
 	if (e.length === 0) return t;
 	let n = e[0];
-	if (n instanceof j) t.push(n.referencedRule);
-	else if (n instanceof N || n instanceof P || n instanceof F || n instanceof I || n instanceof R || n instanceof L) t = t.concat(Xt(n.definition));
-	else if (n instanceof z) t = n.definition.map((e) => Xt(e.definition)).flat();
-	else if (!(n instanceof B)) throw Error("non exhaustive match");
-	let r = se(n), i = e.length > 1;
+	if (n instanceof A) t.push(n.referencedRule);
+	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 = 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 oe {
+var Zt = class extends se {
 	constructor() {
 		super(...arguments), this.alternations = [];
 	}
@@ -2456,7 +2456,7 @@ function Qt(e, t) {
 					occurrenceStack: m.slice(0, -1)
 				};
 				d.push(e);
-			} else if (h instanceof B) {
+			} else if (h instanceof z) {
 				if (f < c - 1) {
 					let e = f + 1;
 					if (n(t[e], h.terminalType)) {
@@ -2477,7 +2477,7 @@ function Qt(e, t) {
 						occurrenceStack: m
 					}), s = !0;
 				}
-			} else if (h instanceof j) {
+			} else if (h instanceof A) {
 				let e = [...p];
 				e.push(h.nonTerminalName);
 				let t = [...m];
@@ -2489,7 +2489,7 @@ function Qt(e, t) {
 					occurrenceStack: t
 				};
 				d.push(n);
-			} else if (h instanceof P) {
+			} else if (h instanceof N) {
 				let e = {
 					idx: f,
 					def: r.slice(1),
@@ -2504,8 +2504,8 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(t);
-			} else if (h instanceof F) {
-				let e = new L({
+			} else if (h instanceof P) {
+				let e = new I({
 					definition: h.definition,
 					idx: h.idx
 				}), t = {
@@ -2515,9 +2515,9 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(t);
-			} else if (h instanceof I) {
-				let e = new L({
-					definition: [new B({ terminalType: h.separator })].concat(h.definition),
+			} else if (h instanceof F) {
+				let e = new I({
+					definition: [new z({ terminalType: h.separator })].concat(h.definition),
 					idx: h.idx
 				}), t = {
 					idx: f,
@@ -2526,7 +2526,7 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(t);
-			} else if (h instanceof R) {
+			} else if (h instanceof L) {
 				let e = {
 					idx: f,
 					def: r.slice(1),
@@ -2534,8 +2534,8 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(e), d.push(o);
-				let t = new L({
-					definition: [new B({ terminalType: h.separator })].concat(h.definition),
+				let t = new I({
+					definition: [new z({ terminalType: h.separator })].concat(h.definition),
 					idx: h.idx
 				}), n = {
 					idx: f,
@@ -2544,7 +2544,7 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(n);
-			} else if (h instanceof L) {
+			} else if (h instanceof I) {
 				let e = {
 					idx: f,
 					def: r.slice(1),
@@ -2552,7 +2552,7 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(e), d.push(o);
-				let t = new L({
+				let t = new I({
 					definition: h.definition,
 					idx: h.idx
 				}), n = {
@@ -2562,7 +2562,7 @@ function Qt(e, t) {
 					occurrenceStack: m
 				};
 				d.push(n);
-			} else if (h instanceof z) for (let e = h.definition.length - 1; e >= 0; e--) {
+			} else if (h instanceof R) for (let e = h.definition.length - 1; e >= 0; e--) {
 				let t = {
 					idx: f,
 					def: h.definition[e].definition.concat(r.slice(1)),
@@ -2571,19 +2571,19 @@ function Qt(e, t) {
 				};
 				d.push(t), d.push(o);
 			}
-			else if (h instanceof N) d.push({
+			else if (h instanceof M) d.push({
 				idx: f,
 				def: h.definition.concat(r.slice(1)),
 				ruleStack: p,
 				occurrenceStack: m
 			});
 			else {
-				if (!(h instanceof M)) throw Error("non exhaustive match");
+				if (!(h instanceof j)) throw Error("non exhaustive match");
 				d.push(jt(h, f, p, m));
 			}
 		}
 		return u;
-	}([r], [], Ze, 1).length === 0 ? [{
+	}([r], [], Xe, 1).length === 0 ? [{
 		message: t.buildEmptyAlternationError({
 			topLevelRule: e,
 			alternation: n,
@@ -2662,7 +2662,7 @@ function $t(e, t, n) {
 		return o.concat(s);
 	});
 }
-var en = class extends oe {
+var en = class extends se {
 	constructor() {
 		super(...arguments), this.allProductions = [];
 	}
@@ -2680,7 +2680,7 @@ var en = class extends oe {
 	}
 };
 function tn(e) {
-	let t = Object.assign({ errMsgProvider: xt }, e), n = {};
+	let t = Object.assign({ errMsgProvider: bt }, e), n = {};
 	return e.rules.forEach((e) => {
 		n[e.name] = e;
 	}), function(e, t) {
@@ -2731,7 +2731,7 @@ function gn(e, t, n, r, i, a, o) {
 		d = new a(this.getGAstProductions()[e], i).startWalking(), u[l] = d;
 	}
 	let f = d.token, p = d.occurrence, m = d.isEndOfRule;
-	this.RULE_STACK_IDX === 0 && m && f === void 0 && (f = Y, p = 1), f !== void 0 && p !== void 0 && this.shouldInRepetitionRecoveryBeTried(f, p, o) && this.tryInRepetitionRecovery(e, t, n, f);
+	this.RULE_STACK_IDX === 0 && m && f === void 0 && (f = X, p = 1), f !== void 0 && p !== void 0 && this.shouldInRepetitionRecoveryBeTried(f, p, o) && this.tryInRepetitionRecovery(e, t, n, f);
 }
 var _n = 1024, vn = 1280, yn = 1536, bn = class {
 	constructor(e) {
@@ -2751,13 +2751,13 @@ var _n = 1024, vn = 1280, yn = 1536, bn = class {
 		return t;
 	}
 	validateNoLeftRecursion(e) {
-		return e.flatMap((e) => Yt(e, e, X));
+		return e.flatMap((e) => Yt(e, e, xt));
 	}
 	validateEmptyOrAlternatives(e) {
-		return e.flatMap((e) => Qt(e, X));
+		return e.flatMap((e) => Qt(e, xt));
 	}
 	validateAmbiguousAlternationAlternatives(e, t) {
-		return e.flatMap((e) => $t(e, t, X));
+		return e.flatMap((e) => $t(e, t, xt));
 	}
 	validateSomeNonEmptyLookaheadPath(e, t) {
 		return function(e, t, n) {
@@ -2779,21 +2779,21 @@ var _n = 1024, vn = 1280, yn = 1536, bn = class {
 					}
 				});
 			}), r;
-		}(e, t, X);
+		}(e, t, xt);
 	}
 	buildLookaheadForAlternation(e) {
 		return function(e, t, n, r, i, a) {
 			let o = Vt(e, t, n);
-			return a(o, r, Wt(o) ? Qe : Ze, i);
+			return a(o, r, Wt(o) ? Ze : Xe, i);
 		}(e.prodOccurrence, e.rule, e.maxLookahead, e.hasPredicates, e.dynamicTokensEnabled, Nt);
 	}
 	buildLookaheadForOptional(e) {
 		return function(e, t, n, r, i, a) {
-			let o = Ht(e, t, i, n), s = Wt(o) ? Qe : Ze;
+			let o = Ht(e, t, i, n), s = Wt(o) ? Ze : Xe;
 			return a(o[0], s, r);
 		}(e.prodOccurrence, e.rule, e.maxLookahead, e.dynamicTokensEnabled, Mt(e.prodType), Pt);
 	}
-}, xn = new class extends oe {
+}, xn = new class extends se {
 	constructor() {
 		super(...arguments), this.dslMethods = {
 			option: [],
@@ -2886,12 +2886,12 @@ function Dn(e, t) {
 })(wn ||= {});
 var On = { description: "This Object indicates the Parser is during Recording Phase" };
 Object.freeze(On);
-var kn = !0, An = J({
+var kn = !0, An = Y({
 	name: "RECORDING_PHASE_TOKEN",
-	pattern: q.NA
+	pattern: J.NA
 });
-tt([An]);
-var jn = yt(An, "This IToken indicates the Parser is in Recording Phase\n	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details", -1, -1, -1, -1, -1, -1);
+et([An]);
+var jn = vt(An, "This IToken indicates the Parser is in Recording Phase\n	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details", -1, -1, -1, -1, -1, -1);
 Object.freeze(jn);
 var Mn = {
 	name: "This CSTNode indicates the Parser is in Recording Phase\n	See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details",
@@ -2907,13 +2907,13 @@ function Nn(e, t, n, r = !1) {
 }
 function Pn(e, t) {
 	In(t);
-	let n = this.recordingProdStack.at(-1), r = !1 === Array.isArray(e), i = !1 === r ? e : e.DEF, a = new z({
+	let n = this.recordingProdStack.at(-1), r = !1 === Array.isArray(e), i = !1 === r ? e : e.DEF, a = new R({
 		definition: [],
 		idx: t,
 		ignoreAmbiguities: r && !0 === e.IGNORE_AMBIGUITIES
 	});
 	return Object.hasOwn(e, "MAX_LOOKAHEAD") && (a.maxLookahead = e.MAX_LOOKAHEAD), a.hasPredicates = i.some((e) => typeof e.GATE == "function"), n.definition.push(a), i.forEach((e) => {
-		let t = new N({ definition: [] });
+		let t = new M({ definition: [] });
 		a.definition.push(t), Object.hasOwn(e, "IGNORE_AMBIGUITIES") ? t.ignoreAmbiguities = e.IGNORE_AMBIGUITIES : Object.hasOwn(e, "GATE") && (t.ignoreAmbiguities = !0), this.recordingProdStack.push(t), e.ALT.call(this), this.recordingProdStack.pop();
 	}), On;
 }
@@ -2926,14 +2926,14 @@ function In(e) {
 		throw t.KNOWN_RECORDER_ERROR = !0, t;
 	}
 }
-var Ln = yt(Y, "", -1, -1, -1, -1, -1, -1);
+var Ln = vt(X, "", -1, -1, -1, -1, -1, -1);
 Object.freeze(Ln);
 var Q, $ = Object.freeze({
 	recoveryEnabled: !1,
 	maxLookahead: 3,
 	dynamicTokensEnabled: !1,
 	outputCst: !0,
-	errorMessageProvider: bt,
+	errorMessageProvider: yt,
 	nodeLocationTracking: "none",
 	traceInitPerf: !1,
 	skipValidations: !1
@@ -2954,7 +2954,7 @@ var zn, Bn = class e {
 			this.selfAnalysisDone = !0;
 			let n = this.className;
 			this.TRACE_INIT("toFastProps", () => {
-				ie(this);
+				ae(this);
 			}), this.TRACE_INIT("Grammar Recording", () => {
 				try {
 					this.enableRecording(), this.definedRulesNames.forEach((e) => {
@@ -2973,12 +2973,12 @@ var zn, Bn = class e {
 			}), this.TRACE_INIT("Grammar Validations", () => {
 				if (r.length === 0 && !1 === this.skipValidations) {
 					let t = function(e) {
-						let t = e.errMsgProvider ?? X;
+						let t = e.errMsgProvider ?? xt;
 						return Gt(e.rules, e.tokenTypes, t, e.grammarName);
 					}({
 						rules: Object.values(this.gastProductionsCache),
 						tokenTypes: Object.values(this.tokensMap),
-						errMsgProvider: X,
+						errMsgProvider: xt,
 						grammarName: n
 					}), r = (e = {
 						lookaheadStrategy: this.lookaheadStrategy,
@@ -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));
@@ -3021,7 +3021,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			this.firstAfterRepMap = [], this.resyncFollows = {}, this.recoveryEnabled = Object.hasOwn(e, "recoveryEnabled") ? e.recoveryEnabled : $.recoveryEnabled, this.recoveryEnabled && (this.attemptInRepetitionRecovery = gn);
 		}
 		getTokenToInsert(e) {
-			let t = yt(e, "", -1, -1, -1, -1, -1, -1);
+			let t = vt(e, "", -1, -1, -1, -1, -1, -1);
 			return t.isInsertedInRecovery = !0, t;
 		}
 		canTokenTypeBeInsertedInRecovery(e) {
@@ -3084,7 +3084,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 		findReSyncTokenType() {
 			let e = this.flattenFollowSet(), t = this.LA_FAST(1), n = 2;
 			for (;;) {
-				let r = e.find((e) => Ze(t, e));
+				let r = e.find((e) => Xe(t, e));
 				if (r !== void 0) return r;
 				t = this.LA(n), n++;
 			}
@@ -3111,12 +3111,12 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			return this.buildFullFollowKeyStack().map((e) => this.getFollowSetFromFollowKey(e)).flat();
 		}
 		getFollowSetFromFollowKey(e) {
-			if (e === mn) return [Y];
-			let t = e.ruleName + e.idxInCallingRule + de + e.inRule;
+			if (e === mn) return [X];
+			let t = e.ruleName + e.idxInCallingRule + fe + e.inRule;
 			return this.resyncFollows[t];
 		}
 		addToResyncTokens(e, t) {
-			return this.tokenMatcher(e, Y) || t.push(e), t;
+			return this.tokenMatcher(e, X) || t.push(e), t;
 		}
 		reSyncTo(e) {
 			let t = [], n = this.LA_FAST(1);
@@ -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));
 					});
 				});
 			});
@@ -3340,22 +3340,22 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 	},
 	class {
 		initRecognizerEngine(e, t) {
-			if (this.className = this.constructor.name, this.shortRuleNameToFull = [], this.fullRuleNameToShort = {}, this.ruleShortNameIdx = 0, this.tokenMatcher = Qe, this.subruleIdx = 0, this.currRuleShortName = -1, this.definedRulesNames = [], this.tokensMap = {}, this.isBackTrackingStack = [], this.RULE_STACK = [], this.RULE_STACK_IDX = -1, this.RULE_OCCURRENCE_STACK = [], this.RULE_OCCURRENCE_STACK_IDX = -1, this.gastProductionsCache = {}, Object.hasOwn(t, "serializedGrammar")) throw Error("The Parser's configuration can no longer contain a <serializedGrammar> property.\n	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0\n	For Further details.");
+			if (this.className = this.constructor.name, this.shortRuleNameToFull = [], this.fullRuleNameToShort = {}, this.ruleShortNameIdx = 0, this.tokenMatcher = Ze, this.subruleIdx = 0, this.currRuleShortName = -1, this.definedRulesNames = [], this.tokensMap = {}, this.isBackTrackingStack = [], this.RULE_STACK = [], this.RULE_STACK_IDX = -1, this.RULE_OCCURRENCE_STACK = [], this.RULE_OCCURRENCE_STACK_IDX = -1, this.gastProductionsCache = {}, Object.hasOwn(t, "serializedGrammar")) throw Error("The Parser's configuration can no longer contain a <serializedGrammar> property.\n	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0\n	For Further details.");
 			if (Array.isArray(e)) {
 				if (e.length === 0) throw Error("A Token Vocabulary cannot be empty.\n	Note that the first argument for the parser constructor\n	is no longer a Token vector (since v4.0).");
 				if (typeof e[0].startOffset == "number") throw Error("The Parser constructor no longer accepts a token vector as the first argument.\n	See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0\n	For Further details.");
 			}
 			if (Array.isArray(e)) this.tokensMap = e.reduce((e, t) => (e[t.name] = t, e), {});
-			else if (Object.hasOwn(e, "modes") && Object.values(e.modes).flat().every(at)) {
+			else if (Object.hasOwn(e, "modes") && Object.values(e.modes).flat().every(it)) {
 				let t = Object.values(e.modes).flat(), n = [...new Set(t)];
 				this.tokensMap = n.reduce((e, t) => (e[t.name] = t, e), {});
 			} else {
 				if (typeof e != "object" || !e) throw Error("<tokensDictionary> argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");
 				this.tokensMap = Object.assign({}, e);
 			}
-			this.tokensMap.EOF = Y;
+			this.tokensMap.EOF = X;
 			let n = (Object.hasOwn(e, "modes") ? Object.values(e.modes).flat() : Object.values(e)).every((e) => e.categoryMatches?.length == 0);
-			this.tokenMatcher = n ? Qe : Ze, tt(Object.values(this.tokensMap));
+			this.tokenMatcher = n ? Ze : Xe, et(Object.values(this.tokensMap));
 		}
 		defineRule(e, t, n) {
 			if (this.selfAnalysisDone) throw Error(`Grammar rule <${e}> may not be defined after the 'performSelfAnalysis' method has been called'\nMake sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);
@@ -3602,7 +3602,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			return this.shortRuleNameToFull[e];
 		}
 		isAtEndOfInput() {
-			return this.tokenMatcher(this.LA(1), Y);
+			return this.tokenMatcher(this.LA(1), X);
 		}
 		reset() {
 			this.resetLexerState(), this.subruleIdx = 0, this.currRuleShortName = -1, this.currRuleLookaheadFuncs = [], this.isBackTrackingStack = [], this.errors = [], this.RULE_STACK_IDX = -1, this.RULE_OCCURRENCE_STACK_IDX = -1, this.CST_STACK = [];
@@ -3886,7 +3886,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 		RULE(e, t, n = Rn) {
 			if (this.definedRulesNames.includes(e)) {
 				let t = {
-					message: X.buildDuplicateRuleNameError({
+					message: xt.buildDuplicateRuleNameError({
 						topLevelRule: e,
 						grammarName: this.className
 					}),
@@ -3931,7 +3931,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			return this.gastProductionsCache;
 		}
 		getSerializedGastProductions() {
-			return Object.values(this.gastProductionsCache).map(ae);
+			return Object.values(this.gastProductionsCache).map(oe);
 		}
 	},
 	class {
@@ -4036,7 +4036,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 		}
 		topLevelRuleRecord(e, t) {
 			try {
-				let n = new M({
+				let n = new j({
 					definition: [],
 					name: e
 				});
@@ -4051,19 +4051,19 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			}
 		}
 		optionInternalRecord(e, t) {
-			return Nn.call(this, P, e, t);
+			return Nn.call(this, N, e, t);
 		}
 		atLeastOneInternalRecord(e, t) {
-			Nn.call(this, F, t, e);
+			Nn.call(this, P, t, e);
 		}
 		atLeastOneSepFirstInternalRecord(e, t) {
-			Nn.call(this, I, t, e, kn);
+			Nn.call(this, F, t, e, kn);
 		}
 		manyInternalRecord(e, t) {
-			Nn.call(this, L, t, e);
+			Nn.call(this, I, t, e);
 		}
 		manySepFirstInternalRecord(e, t) {
-			Nn.call(this, R, t, e, kn);
+			Nn.call(this, L, t, e, kn);
 		}
 		orInternalRecord(e, t) {
 			return Pn.call(this, e, t);
@@ -4073,7 +4073,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 				let n = /* @__PURE__ */ Error(`<SUBRULE${Fn(t)}> argument is invalid expecting a Parser method reference but got: <${JSON.stringify(e)}>\n inside top level rule: <${this.recordingProdStack[0].name}>`);
 				throw n.KNOWN_RECORDER_ERROR = !0, n;
 			}
-			let r = this.recordingProdStack.at(-1), i = e.ruleName, a = new j({
+			let r = this.recordingProdStack.at(-1), i = e.ruleName, a = new A({
 				idx: t,
 				nonTerminalName: i,
 				label: n?.LABEL,
@@ -4082,11 +4082,11 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 			return r.definition.push(a), this.outputCst ? Mn : On;
 		}
 		consumeInternalRecord(e, t, n) {
-			if (In(t), !rt(e)) {
+			if (In(t), !nt(e)) {
 				let n = /* @__PURE__ */ Error(`<CONSUME${Fn(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;
 			}
-			let r = this.recordingProdStack.at(-1), i = new B({
+			let r = this.recordingProdStack.at(-1), i = new z({
 				idx: t,
 				terminalType: e,
 				label: n?.LABEL
@@ -4107,7 +4107,7 @@ Bn.DEFER_DEFINITION_ERRORS_HANDLING = !1, zn = Bn, [
 				this.traceInitIndent++;
 				let n = Array(this.traceInitIndent + 1).join("	");
 				this.traceInitIndent < this.traceInitMaxIdent && console.log(`${n}--\x3e <${e}>`);
-				let { time: r, value: i } = re(t), a = r > 10 ? console.warn : console.log;
+				let { time: r, value: i } = ie(t), a = r > 10 ? console.warn : console.log;
 				return this.traceInitIndent < this.traceInitMaxIdent && a(`${n}<-- <${e}> time: ${r}ms`), this.traceInitIndent--, i;
 			}
 			return t();
@@ -4128,7 +4128,7 @@ var Vn = class extends Bn {
 	}
 }, Hn = class e {
 	static shared(t) {
-		let n = t?.locale ?? b, r = t?.maxColumn ?? Kn, i = t?.maxRow ?? qn, a = Gn.get(n);
+		let n = t?.locale ?? m, 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,32 +4138,32 @@ var Vn = class extends Bn {
 		}), a.set(o, s)), s;
 	}
 	constructor(e) {
-		let t = e?.maxColumn ?? Kn, n = e?.maxRow ?? qn, r = e?.locale ?? b;
+		let t = e?.maxColumn ?? Kn, n = e?.maxRow ?? qn, r = e?.locale ?? m;
 		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}')`);
-		let c = J({
+		let c = Y({
 			name: "WhiteSpace",
 			pattern: /[ \n\v\f\r\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/,
-			group: q.SKIPPED
-		}), l = J({
+			group: J.SKIPPED
+		}), l = Y({
 			name: "StringToken",
 			pattern: /"(""|[^"])*"/
-		}), u = J({
+		}), u = Y({
 			name: "FunctionToken",
 			pattern: /[a-zA-Z_\u007F-\uFFFF]+[a-zA-Z0-9_.\u007F-\uFFFF]*(?=\()/
-		}), d = J({
+		}), d = Y({
 			name: "TableReference",
-			pattern: { exec: y },
+			pattern: { exec: te },
 			line_breaks: !1,
 			start_chars_hint: Wn
-		}), f = J({
+		}), f = Y({
 			name: "BracketedString",
 			pattern: { exec: _ },
 			line_breaks: !1,
 			start_chars_hint: [91],
 			longer_alt: [d, l]
-		}), p = (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()}]`), h = J({
+		}), p = (e) => (e ?? []).map((e) => e?.trim()).filter(Boolean).map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).map((e) => e + "|").join(""), h = (e) => e.replace(/[A-Za-z]/g, (e) => `[${e.toUpperCase()}${e.toLowerCase()}]`), g = Y({
 			name: "LiteralError",
 			pattern: new RegExp(p(r.errorLiterals) + [
 				"#PARSE!",
@@ -4182,202 +4182,202 @@ var Vn = class extends Bn {
 				"#BUSY!",
 				"#PYTHON!",
 				"#TIMEOUT!"
-			].map(m).join("|"))
-		}), g = J({
+			].map(h).join("|"))
+		}), v = Y({
 			name: "RefError",
-			pattern: new RegExp(p(r.errorRefs) + ["#REF!", "#NAME\\?"].map(m).join("|"))
-		}), v = J({
+			pattern: new RegExp(p(r.errorRefs) + ["#REF!", "#NAME\\?"].map(h).join("|"))
+		}), y = Y({
 			name: "SingleQuotedString",
 			pattern: /'(''|[^'])*'/
-		}), ee = J({
+		}), ee = Y({
 			name: "SheetQuoted",
 			pattern: /'(?:''|[^'])*?'!/
-		}), x = J({
+		}), b = Y({
 			name: "Sheet",
 			pattern: /[A-Za-z_.\d\u007F-\uFFFF]*!/
-		}), S = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, C = J({
+		}), x = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, S = Y({
 			name: "NamedToken",
 			pattern: { exec: (e, t) => {
-				S.lastIndex = t;
-				let n = S.exec(e);
+				x.lastIndex = t;
+				let n = x.exec(e);
 				if (!n) return null;
 				let r = n[0], i = r.indexOf(".:");
 				return i === -1 ? r.endsWith(":") && (r = r.slice(0, -1)) : r = r.substring(0, i), [r];
 			} },
 			line_breaks: !1,
 			start_chars_hint: Wn
-		}), w = J({
+		}), C = Y({
 			name: "Cell",
 			pattern: { exec: Xn(t, n) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: C
-		}), T = J({
+			longer_alt: S
+		}), w = Y({
 			name: "Column",
 			pattern: { exec: Yn(t) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: C
-		}), te = J({
+			longer_alt: S
+		}), ne = Y({
 			name: "AbsRow",
 			pattern: /[$][0-9]+/
-		}), E = s === "." ? "\\." : s, ne = J({
+		}), T = s === "." ? "\\." : s, re = Y({
 			name: "NumberToken",
-			pattern: RegExp(`[0-9]+${E}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${E}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
-		}), D = J({
+			pattern: RegExp(`[0-9]+${T}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${T}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
+		}), E = Y({
 			name: "ScientificDigit",
 			pattern: /[0-9]+\*\*[+-]?[0-9]+/
-		}), O = J({
+		}), D = Y({
 			name: "DigitToken",
 			pattern: /[0-9]+/
-		}), k = ["TRUE", "FALSE"];
+		}), O = ["TRUE", "FALSE"];
 		for (let e of [r.booleanTrue, r.booleanFalse]) {
 			let t = e?.trim();
-			t && !k.some((e) => e.toLowerCase() === t.toLowerCase()) && k.push(t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+			t && !O.some((e) => e.toLowerCase() === t.toLowerCase()) && O.push(t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 		}
-		let re = J({
+		let ie = Y({
 			name: "BooleanToken",
-			pattern: new RegExp(k.join("|"), "i")
-		}), ie = J({
+			pattern: new RegExp(O.join("|"), "i")
+		}), ae = Y({
 			name: "ArgSeparator",
 			pattern: Zn(i)
-		}), A = J({
+		}), k = Y({
 			name: "ColSeparator",
 			pattern: Zn(a)
-		}), j = J({
+		}), A = Y({
 			name: "RowSeparator",
 			pattern: Zn(o)
-		}), M = J({
+		}), j = Y({
 			name: "RangeOp",
 			pattern: /:/
-		}), N = J({
+		}), M = Y({
 			name: "RangeTrimFullOp",
 			pattern: /\.:\./
-		}), P = J({
+		}), N = Y({
 			name: "RangeTrimLeadingOp",
 			pattern: /\.:/
-		}), F = J({
+		}), P = Y({
 			name: "RangeTrimTrailingOp",
 			pattern: /:\./
-		}), I = J({
+		}), F = Y({
 			name: "OpenParen",
 			pattern: /\(/
-		}), L = J({
+		}), I = Y({
 			name: "CloseParen",
 			pattern: /\)/
-		}), R = J({
+		}), L = Y({
 			name: "OpenCurlyParen",
 			pattern: /{/
-		}), z = J({
+		}), R = Y({
 			name: "CloseCurlyParen",
 			pattern: /}/
-		}), B = J({
+		}), z = Y({
 			name: "QuoteS",
 			pattern: /'/
-		}), ae = J({
+		}), oe = Y({
 			name: "MulOp",
 			pattern: /\*(?!\*)/
-		}), V = J({
+		}), B = Y({
 			name: "PlusOp",
 			pattern: /\+/
-		}), oe = J({
+		}), se = Y({
 			name: "DivOp",
 			pattern: /\//
-		}), se = J({
+		}), ce = Y({
 			name: "MinOp",
 			pattern: /-/
-		}), H = J({
+		}), V = Y({
 			name: "ImplicitIntersectOp",
 			pattern: /@/
-		}), ce = J({
+		}), le = Y({
 			name: "ConcatOp",
 			pattern: /&/
-		}), le = J({
+		}), ue = Y({
 			name: "ExOp",
 			pattern: /\^/
-		}), ue = J({
+		}), de = Y({
 			name: "PercentOp",
 			pattern: /%/
-		}), de = J({
+		}), fe = Y({
 			name: "ArrayAnchorOp",
 			pattern: /#/,
-			longer_alt: [h, g]
-		}), fe = J({
+			longer_alt: [g, v]
+		}), pe = Y({
 			name: "GtOp",
 			pattern: />/
-		}), U = J({
+		}), H = Y({
 			name: "EqOp",
 			pattern: /=/
-		}), pe = J({
+		}), me = Y({
 			name: "LtOp",
 			pattern: /</
-		}), me = [
+		}), U = [
 			c,
 			l,
 			ee,
-			v,
-			x,
+			y,
+			b,
 			u,
 			d,
 			f,
-			h,
 			g,
-			ie,
-			...a === i ? [] : [A],
-			j,
+			v,
+			ae,
+			...a === i ? [] : [k],
+			A,
+			M,
 			N,
 			P,
-			F,
-			M,
+			j,
+			C,
+			ie,
 			w,
-			re,
-			T,
-			te,
 			ne,
+			re,
+			E,
 			D,
-			O,
-			de,
-			H,
-			C,
+			fe,
+			V,
+			S,
+			F,
 			I,
 			L,
 			R,
 			z,
-			B,
-			ae,
-			V,
 			oe,
+			B,
 			se,
 			ce,
 			le,
 			ue,
-			J({
+			de,
+			Y({
 				name: "NeqOp",
 				pattern: /<>/
 			}),
-			J({
+			Y({
 				name: "GteOp",
 				pattern: />=/
 			}),
-			J({
+			Y({
 				name: "LteOp",
 				pattern: /<=/
 			}),
-			fe,
-			U,
-			pe
+			pe,
+			H,
+			me
 		];
-		this._lexer = new q(me, { ensureOptimizations: !0 });
+		this._lexer = new J(U, { ensureOptimizations: !0 });
 		let W = {};
-		me.forEach((e) => {
+		U.forEach((e) => {
 			W[e.name] = e;
-		}), a === i && (W.ColSeparator = ie), this._vocabulary = W;
+		}), a === i && (W.ColSeparator = ae), this._vocabulary = W;
 	}
 	tokenize(e, t = !0) {
 		let n = this._lexer.tokenize(e);
 		if (t && n.errors.length > 0) {
 			let t = n.errors[0], r = t.line, i = t.column, a = e.substr(t.offset, t.length || 1), o = a ? `Unexpected character '${a}'` : t.message;
-			throw new D.Parse(o, {
+			throw new E.Parse(o, {
 				line: r,
 				column: i,
 				offset: t.offset,
@@ -4469,47 +4469,47 @@ function Zn(e) {
 	return new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 }
 var Qn = class {
-	constructor(e = b) {
+	constructor(e = m) {
 		let t = function(e) {
-			let t = [...s];
+			let t = [...n];
 			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), n = J({
+		}(e.specifiers), r = Y({
 			name: "WhiteSpace",
 			pattern: /\s+/,
-			group: q.SKIPPED
-		}), r = J({
+			group: J.SKIPPED
+		}), i = Y({
 			name: "TableSpecifier",
 			pattern: RegExp(`\\[#(?:${t})\\]`, "i")
-		}), i = [
-			n,
+		}), a = [
 			r,
-			J({
+			i,
+			Y({
 				name: "BracketedColumn",
 				pattern: /\[(?:'['#[\]]|'(?!['#[\]])|[^'[\]])*\]/,
-				longer_alt: [r]
+				longer_alt: [i]
 			}),
-			J({
+			Y({
 				name: "BareSpecifier",
 				pattern: RegExp(`#(?:${t})`, "i")
 			}),
-			J({
+			Y({
 				name: "ColumnSep",
 				pattern: /:/
 			}),
-			J({
+			Y({
 				name: "ListSep",
 				pattern: new RegExp(e.separators.separatorFunction.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
 			})
 		];
-		this._lexer = new q(i, { ensureOptimizations: !0 });
-		let a = {};
-		i.forEach((e) => {
-			a[e.name] = e;
-		}), this._vocabulary = a;
+		this._lexer = new J(a, { ensureOptimizations: !0 });
+		let o = {};
+		a.forEach((e) => {
+			o[e.name] = e;
+		}), this._vocabulary = o;
 	}
 	getVocabulary() {
 		return this._vocabulary;
@@ -4518,7 +4518,7 @@ var Qn = class {
 		return this._lexer.tokenize(e);
 	}
 }, $n = class extends Vn {
-	constructor(e = b) {
+	constructor(e = m) {
 		let t = new Qn(e), n = t.getVocabulary();
 		super(n, {
 			nodeLocationTracking: "none",
@@ -4526,82 +4526,82 @@ var Qn = class {
 			skipValidations: !0,
 			recoveryEnabled: !1
 		}), this._lexer = t;
-		let { TableSpecifier: r, BracketedColumn: i, BareSpecifier: a, ColumnSep: s, ListSep: c } = n, l = this;
-		l.RULE("ruleContent", () => {
-			let e = [], t = l.SUBRULE(l.ruleItem);
-			return l.ACTION(() => {
+		let { TableSpecifier: r, BracketedColumn: i, BareSpecifier: a, ColumnSep: o, ListSep: s } = n, c = this;
+		c.RULE("ruleContent", () => {
+			let e = [], t = c.SUBRULE(c.ruleItem);
+			return c.ACTION(() => {
 				t && e.push(t);
-			}), l.MANY(() => {
-				l.CONSUME(c), l.OPTION(() => {
-					let t = l.SUBRULE2(l.ruleItem);
-					l.ACTION(() => {
+			}), c.MANY(() => {
+				c.CONSUME(s), c.OPTION(() => {
+					let t = c.SUBRULE2(c.ruleItem);
+					c.ACTION(() => {
 						t && e.push(t);
 					});
 				});
 			}), e;
-		}), l.RULE("ruleItem", () => l.OR([{ ALT: () => l.SUBRULE(l.ruleSpecifier) }, { ALT: () => l.SUBRULE(l.ruleColumnOrRange) }])), l.RULE("ruleSpecifier", () => l.OR([{ ALT: () => {
-			let t = l.CONSUME(r);
-			return l.ACTION(() => {
-				let n = C(t.image, e);
+		}), c.RULE("ruleItem", () => c.OR([{ ALT: () => c.SUBRULE(c.ruleSpecifier) }, { ALT: () => c.SUBRULE(c.ruleColumnOrRange) }])), c.RULE("ruleSpecifier", () => c.OR([{ ALT: () => {
+			let t = c.CONSUME(r);
+			return c.ACTION(() => {
+				let n = w(t.image, e);
 				return n.image = t.image, n;
 			});
 		} }, { ALT: () => {
-			let t = l.CONSUME(a);
-			return l.ACTION(() => {
-				let n = C(t.image, e);
+			let t = c.CONSUME(a);
+			return c.ACTION(() => {
+				let n = w(t.image, e);
 				return n.image = t.image, n;
 			});
-		} }])), l.RULE("ruleColumnOrRange", () => {
-			let e = l.CONSUME(i), t, n;
-			return l.OPTION(() => {
-				t = l.CONSUME(s), n = l.CONSUME2(i);
-			}), l.ACTION(() => {
-				let r = x(e.image);
+		} }])), c.RULE("ruleColumnOrRange", () => {
+			let e = c.CONSUME(i), t, n;
+			return c.OPTION(() => {
+				t = c.CONSUME(o), n = c.CONSUME2(i);
+			}), c.ACTION(() => {
+				let r = h(e.image);
 				if (r.image = e.image, !n) return r;
-				let i = x(n.image);
+				let i = h(n.image);
 				i.image = n.image;
-				let a = o(":", r, i, !0);
+				let a = S(":", r, i, !0);
 				return a.image = t?.image ?? ":", a;
 			});
-		}), l.performSelfAnalysis();
+		}), c.performSelfAnalysis();
 	}
 	_parseInner(e) {
 		let t = this._lexer.tokenize(e);
 		return t.errors.length > 0 || t.tokens.length === 0 ? [] : (this.input = t.tokens, this.reset(), this.ruleContent() ?? []);
 	}
-	_parseContent(t) {
+	_parseContent(e) {
+		if (!e) return [];
+		let t = e.trim();
 		if (!t) return [];
-		let n = t.trim();
-		if (!n) return [];
-		let r = n[0];
-		if (r === "@") {
-			let t = n.slice(1).trim();
-			if (!t) {
-				let t = e("@", null, !0);
-				return t.image = "@", [t];
+		let n = t[0];
+		if (n === "@") {
+			let e = t.slice(1).trim();
+			if (!e) {
+				let e = g("@", null, !0);
+				return e.image = "@", [e];
 			}
-			if (t.charAt(0) === "[") {
-				let n = this._parseInner(t);
-				if (n.length === 1 && n[0].type === "infix") {
-					let t = e("@", n[0], !0);
-					return t.image = "@", [t];
+			if (e.charAt(0) === "[") {
+				let t = this._parseInner(e);
+				if (t.length === 1 && t[0].type === "infix") {
+					let e = g("@", t[0], !0);
+					return e.image = "@", [e];
 				}
 			}
-			let r = x(t);
-			r.image = t;
-			let i = e("@", r, !0);
-			return i.image = "@", [i];
+			let n = h(e);
+			n.image = e;
+			let r = g("@", n, !0);
+			return r.image = "@", [r];
 		}
-		if (r !== "[" && r !== "#") {
-			let e = x(t);
-			return e.image = t, [e];
+		if (n !== "[" && n !== "#") {
+			let t = h(e);
+			return t.image = e, [t];
 		}
-		return this._parseInner(n);
+		return this._parseInner(t);
 	}
 	parse(e, t, n) {
 		this.reset();
 		let r = () => ({
-			root: h("", []),
+			root: x("", []),
 			errors: []
 		});
 		if (!n) return r();
@@ -4614,7 +4614,7 @@ var Qn = class {
 		if (a === -1) return r();
 		let o = n.slice(0, a), s = n.slice(a + 1, -1), c = this._parseContent(s);
 		return {
-			root: h(o, c),
+			root: x(o, c),
 			errors: this.errors.length > 0 ? [...this.errors] : []
 		};
 	}
@@ -4629,7 +4629,7 @@ var Qn = class {
 	":."
 ]), nr = (e) => {
 	if (!e) return null;
-	if (e.type === g.Cell) {
+	if (e.type === T.Cell) {
 		let t = e.value;
 		return t.rowIndex === -(2 ** 53 - 1) ? "col" : t.colIndex === -(2 ** 53 - 1) ? "row" : null;
 	}
@@ -4647,135 +4647,141 @@ function or(e, t) {
 	return `Unexpected '${n}'`;
 }
 var sr = {
-	...bt,
+	...yt,
 	buildNoViableAltMessage: (e) => or(e.actual, e.previous),
 	buildEarlyExitMessage: (e) => or(e.actual, e.previous),
 	buildNotAllInputParsedMessage: (e) => {
 		let t = e.firstRedundant?.image;
-		return t ? `Unexpected '${t}'` : bt.buildNotAllInputParsedMessage(e);
+		return t ? `Unexpected '${t}'` : yt.buildNotAllInputParsedMessage(e);
 	},
 	buildMismatchTokenMessage: (e) => {
 		let t = e.actual?.image;
-		return e.expected === Y && t ? `Unexpected '${t}'` : bt.buildMismatchTokenMessage(e);
+		return e.expected === X && t ? `Unexpected '${t}'` : yt.buildMismatchTokenMessage(e);
 	}
 }, cr = class extends Vn {
-	constructor(s) {
-		let l = s?.lexer ?? Hn.shared(s?.lexerOptions), h = l.getVocabulary();
+	constructor(n) {
+		let m = n?.lexer ?? Hn.shared(n?.lexerOptions), h = m.getVocabulary();
 		super(h, {
 			skipValidations: !0,
 			recoveryEnabled: !0,
-			...s,
+			...n,
 			nodeLocationTracking: "full",
 			errorMessageProvider: sr,
 			maxLookahead: 1
 		}), this._ruleInfixOp = this.RULE("ruleInfixOp", () => {
-			let { PlusOp: e, MinOp: t, MulOp: n, DivOp: r, ExOp: a, 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 i = this.OR(this._c1 ||= [
+			let { PlusOp: e, MinOp: t, MulOp: n, DivOp: r, ExOp: i, ConcatOp: a, GtOp: s, EqOp: c, LtOp: l, NeqOp: u, GteOp: d, LteOp: f } = this._vocab, p = [];
+			return p.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
+				let o = 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 },
 					{ ALT: () => this.CONSUME(s).image },
 					{ ALT: () => this.CONSUME(c).image },
 					{ ALT: () => this.CONSUME(l).image },
 					{ ALT: () => this.CONSUME(u).image },
 					{ ALT: () => this.CONSUME(d).image },
-					{ ALT: () => this.CONSUME(f).image },
-					{ ALT: () => this.CONSUME(p).image }
-				]), o = {
-					value: i,
+					{ ALT: () => this.CONSUME(f).image }
+				]), m = {
+					value: o,
 					index: this.getLexerPosition(),
-					isRange: w.includes(i)
+					isRange: ee.includes(o)
 				}, h = this.SUBRULE2(this._rulePostfixOp);
-				m.push({
-					op: o,
+				p.push({
+					op: m,
 					node: h
 				});
 			}), this.ACTION(() => {
-				let e = m.length - 1, t = i.length;
+				let e = p.length - 1, t = o.length;
 				for (let n = 0; e > 0 && n < t; n++) {
-					let t = i[n], r = 1;
-					for (; r < m.length;) {
-						let n = m[r].op;
+					let t = o[n], r = 1;
+					for (; r < p.length;) {
+						let n = p[r].op;
 						if (t.includes(n.value)) {
-							let t = m[r - 1].node, i = m[r].node, a = o(n.value, t, i, n.isRange);
-							a = this._tag(a, n.index), m[r - 1].node = a, m.splice(r, 1), e--;
+							let t = p[r - 1].node, i = p[r].node, a = S(n.value, t, i, n.isRange);
+							a = this._tag(a, n.index), p[r - 1].node = a, p.splice(r, 1), e--;
 						} else r++;
 					}
 				}
-			}), m[0].node;
+			}), p[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) }]);
 		}), this._rulePostfixOp = this.RULE("rulePostfixOp", () => {
-			let { PercentOp: e } = this._vocab, t = this.SUBRULE(this._rulePrefixOp), n = [];
+			let { PercentOp: t } = this._vocab, n = this.SUBRULE(this._rulePrefixOp), r = [];
 			return this.MANY(() => {
-				let t = this.CONSUME(e).image;
+				let e = this.CONSUME(t).image;
 				this.ACTION(() => {
-					n.push([t, this.getLexerPosition()]);
+					r.push([e, this.getLexerPosition()]);
 				});
 			}), this.ACTION(() => {
-				let e = n.length;
-				if (e !== 0) for (let r = 0; r < e; r++) {
-					let e = n[r], i = e[0], a = e[1], o = w.includes(i);
-					t = c(i, t, o), t = this._tag(t, a);
+				let t = r.length;
+				if (t !== 0) for (let i = 0; i < t; i++) {
+					let t = r[i], a = t[0], o = t[1], s = ee.includes(a);
+					n = e(a, n, s), n = this._tag(n, o);
 				}
-			}), t;
+			}), n;
 		}), this._rulePrefixOp = this.RULE("rulePrefixOp", () => {
-			let { PlusOp: t, MinOp: n, ImplicitIntersectOp: r } = this._vocab, i = [];
+			let { PlusOp: e, MinOp: t, ImplicitIntersectOp: n } = this._vocab, r = [];
 			this.MANY(() => {
-				let e = this.OR([
+				let i = this.OR([
+					{ ALT: () => this.CONSUME(e).image },
 					{ ALT: () => this.CONSUME(t).image },
-					{ ALT: () => this.CONSUME(n).image },
-					{ ALT: () => this.CONSUME(r).image }
+					{ ALT: () => this.CONSUME(n).image }
 				]);
 				this.ACTION(() => {
-					i.push([e, this.getLexerPosition()]);
+					r.push([i, this.getLexerPosition()]);
 				});
 			});
-			let a = this.SUBRULE(this._ruleRangeOp);
+			let i = this.SUBRULE(this._ruleRangeOp);
 			return this.ACTION(() => {
-				let t = i.length;
-				if (t !== 0) for (let n = t - 1; n >= 0; n--) {
-					let t = i[n], r = t[0], o = t[1], s = w.includes(r);
-					a = e(r, a, s), a = this._tag(a, o);
+				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 = ee.includes(n);
+					i = g(n, i, o), i = this._tag(i, a);
 				}
-			}), a;
+			}), i;
 		}), this._ruleRangeOp = this.RULE("ruleRangeOp", () => {
-			let { RangeOp: e, RangeTrimFullOp: t, RangeTrimLeadingOp: n, RangeTrimTrailingOp: r, ArrayAnchorOp: i } = this._vocab, a = [];
-			return a.push({ node: this.SUBRULE(this._ruleCallOp) }), this.MANY2(() => {
-				this.CONSUME(i), a.push({ anchor: this.getLexerPosition() });
+			let { RangeOp: t, RangeTrimFullOp: n, 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 o = {
+				let e = {
 					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);
-				a.push({
-					op: o,
+				o.push({
+					op: e,
 					node: s
 				}), this.MANY3(() => {
-					this.CONSUME2(i), a.push({ anchor: this.getLexerPosition() });
+					this.CONSUME2(a), o.push({ anchor: this.getLexerPosition() });
 				});
 			}), this.ACTION(() => {
-				for (let e = 1; e < a.length; e++) {
-					let t = a[e];
-					if (t.anchor !== void 0) {
-						a[0].node = this._tag(c("#", a[0].node, !0), t.anchor);
+				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(S(":", t.node, n.node, !0), n.op.index), o.splice(e + 1, 1));
+				}
+				for (let t = 1; t < o.length; t++) {
+					let n = o[t];
+					if (n.anchor !== void 0) {
+						o[0].node = this._tag(e("#", o[0].node, !0), n.anchor);
 						continue;
 					}
-					let n = t.op, r = o(n.value, a[0].node, t.node, !0);
-					r = this._tag(r, n.index), a[0].node = r;
+					let r = n.op, i = S(r.value, o[0].node, n.node, !0);
+					i = this._tag(i, r.index), o[0].node = i;
 				}
-			}), a[0].node;
+			}), o[0].node;
 		}), this._ruleCallOp = this.RULE("ruleCallOp", () => {
-			let { OpenParen: e, CloseParen: n } = this._vocab, r = this.SUBRULE(this._ruleFormula);
+			let { OpenParen: e, CloseParen: t } = this._vocab, n = this.SUBRULE(this._ruleFormula);
 			return this.MANY({
 				GATE: () => {
 					let t = this.LA(0), n = this.LA(1);
@@ -4783,12 +4789,12 @@ var sr = {
 				},
 				DEF: () => {
 					this.CONSUME(e);
-					let i = this.getLexerPosition(), a = this.SUBRULE(this._ruleFunctionArguments), o = r, s = this.ACTION(() => this._tag(t(o, a), i)), c = this.OPTION(() => this.CONSUME(n));
+					let r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), a = n, o = this.ACTION(() => this._tag(l(a, i), r)), s = this.OPTION(() => this.CONSUME(t));
 					this.ACTION(() => {
-						c || this._reportError(s, "Missing closing parenthesis ')'", i), this._tagClose(s, this.getLexerPosition()), r = s;
+						s || this._reportError(o, "Missing closing parenthesis ')'", r), this._tagClose(o, this.getLexerPosition()), n = o;
 					});
 				}
-			}), r;
+			}), n;
 		}), this._ruleIntersectOp = this.RULE("ruleIntersectOp", () => {
 			let e = [this.SUBRULE(this._ruleInfixOp)];
 			return this.MANY(() => {
@@ -4805,14 +4811,14 @@ var sr = {
 				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 = o(" ", r, i, !0), s = this._tokenMap.get(r);
-						s && delete s.tokenIndexClose;
-						let c = this._tokenMap.get(i), 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);
+						let r = e[n], i = e[n + 1], a = S(" ", 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);
 						}
-						c && delete c.tokenIndex, n + 1 < t && c && delete c.tokenIndexClose, e.splice(n, 2, a), n--, t--;
+						s && delete s.tokenIndex, n + 1 < t && s && delete s.tokenIndexClose, e.splice(n, 2, a), n--, t--;
 					}
 				}
 			}), e[0];
@@ -4835,13 +4841,13 @@ var sr = {
 			}), t;
 		}), this._ruleParen = this.RULE("ruleParen", () => {
 			let { OpenParen: e, CloseParen: t } = this._vocab;
-			return this._processParen(g.Paren, e, t);
+			return this._processParen(T.Paren, e, t);
 		}), this._ruleLiteralArray = this.RULE("ruleLiteralArray", () => {
-			let { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: n, RowSeparator: r } = this._vocab, i = p();
+			let { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: n, RowSeparator: r } = this._vocab, a = d();
 			this.CONSUME(e);
-			let a = this.getLexerPosition(), o = this.ACTION(() => this._tag(T(i), a)), s = this.SUBRULE(this._ruleLiteralForArray);
+			let o = this.getLexerPosition(), s = this.ACTION(() => this._tag(i(a), o)), c = this.SUBRULE(this._ruleLiteralForArray);
 			this.ACTION(() => {
-				i.value.push(s);
+				a.value.push(c);
 			}), this.MANY(() => {
 				let e = !1;
 				this.OR([{ ALT: () => {
@@ -4849,64 +4855,64 @@ var sr = {
 				} }, { ALT: () => this.CONSUME(r) }]);
 				let t = this.SUBRULE2(this._ruleLiteralForArray);
 				this.ACTION(() => {
-					e || (i = p(), o.value.push(i)), i.value.push(t);
+					e || (a = d(), s.value.push(a)), a.value.push(t);
 				});
 			});
-			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;
+			let l = this.OPTION(() => this.CONSUME(t));
+			return s = this.ACTION(() => (l || this._reportError(s, "Missing closing parenthesis '}'", o), this._tagClose(s, this.getLexerPosition()))), s;
 		}), this._ruleLiteralForArray = this.RULE("ruleLiteralForArray", () => {
-			let { StringToken: e, BooleanToken: t, LiteralError: n, RefError: r } = this._vocab;
+			let { StringToken: e, BooleanToken: n, LiteralError: r, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
-					let e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(m(t.image, this._locale), this.getLexerPosition()));
-					return this.ACTION(() => e ? v(e.image, n) : n);
+					let e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), n = this.ACTION(() => this._tag(s(t.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => e ? ne(e.image, n) : n);
 				} },
 				{ ALT: () => {
 					let t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(te(t.image), this.getLexerPosition()));
-				} },
-				{ ALT: () => {
-					let e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(ne(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(n);
-					return this.ACTION(() => this._tag(a(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(E(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(f(e.image, this._locale), this.getLexerPosition()));
+				} },
+				{ ALT: () => {
+					let e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(b(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: n, LiteralError: r, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
 					let e = this.SUBRULE(this._ruleNumber);
-					return this.ACTION(() => this._tag(m(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(s(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let t = this.CONSUME(e);
-					return this.ACTION(() => this._tag(te(t.image), this.getLexerPosition()));
-				} },
-				{ ALT: () => {
-					let e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(ne(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(n);
-					return this.ACTION(() => this._tag(a(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(E(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(f(e.image, this._locale), this.getLexerPosition()));
+				} },
+				{ ALT: () => {
+					let e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(b(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleFunction = this.RULE("ruleFunction", () => {
-			let { FunctionToken: e, OpenParen: t, CloseParen: r } = this._vocab, i = this.CONSUME(e).image, a = this.getLexerPosition();
+			let { FunctionToken: e, OpenParen: t, CloseParen: n } = this._vocab, r = this.CONSUME(e).image, i = this.getLexerPosition();
 			this.CONSUME(t);
-			let o = this.SUBRULE(this._ruleFunctionArguments), s = this.ACTION(() => this._tag(n(i, o), a)), c = this.OPTION(() => this.CONSUME(r));
-			return s = this.ACTION(() => (c || this._reportError(s, "Missing closing parenthesis ')'", a), this._tagClose(s, this.getLexerPosition()))), s;
+			let o = this.SUBRULE(this._ruleFunctionArguments), s = this.ACTION(() => this._tag(a(r, o), i)), c = this.OPTION(() => this.CONSUME(n));
+			return s = this.ACTION(() => (c || this._reportError(s, "Missing closing parenthesis ')'", i), this._tagClose(s, this.getLexerPosition()))), s;
 		}), this._ruleFunctionArguments = this.RULE("ruleFunctionArguments", () => {
 			let { ArgSeparator: e, CloseParen: t } = this._vocab, n = [];
 			return this.OPTION({
@@ -4915,11 +4921,11 @@ var sr = {
 					let t;
 					this.OPTION2(() => {
 						t = this.SUBRULE(this._ruleIntersectOp);
-					}), t = this.ACTION(() => t ?? this._tagClose(d(), this.getLexerPosition())), n.push(t), this.MANY(() => {
+					}), t = this.ACTION(() => t ?? this._tagClose(r(), 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(d(), this.getLexerPosition())), n.push(t);
+						}), t = this.ACTION(() => t ?? this._tagClose(r(), this.getLexerPosition())), n.push(t);
 					});
 				}
 			}), n;
@@ -4938,61 +4944,61 @@ 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: o, ArgSeparator: s, Cell: c, NamedToken: l, SingleQuotedString: d, Column: p, AbsRow: m, DigitToken: h, RefError: _ } = this._vocab, v, y;
+			let { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: r, PlusOp: i, MinOp: a, ArgSeparator: o, Cell: s, NamedToken: l, SingleQuotedString: d, Column: f, AbsRow: m, DigitToken: h, RefError: g } = this._vocab, _, v;
 			this.OPTION2({
 				GATE: () => {
-					for (let r = 1; r < 6; r++) {
-						let c = this.LA(r);
+					for (let s = 1; s < 6; s++) {
+						let c = this.LA(s);
 						if (c.tokenType === e || c.tokenType === t) return !0;
-						if (c.image === "" || c.image === ")" || c.tokenType === n || c.tokenType === i || c.tokenType === a || c.tokenType === o || c.tokenType === s) break;
+						if (c.image === "" || c.image === ")" || c.tokenType === n || c.tokenType === r || c.tokenType === i || c.tokenType === a || c.tokenType === o) break;
 					}
 					return !1;
 				},
 				DEF: () => {
-					y = this.getLexerPosition() + 1, v = this.SUBRULE(this._rulePrefixSheetName);
+					v = this.getLexerPosition() + 1, _ = this.SUBRULE(this._rulePrefixSheetName);
 				}
 			});
-			let b = this.OR([
+			let y = this.OR([
 				{ ALT: () => {
-					let e = this.CONSUME(c), t = this.getLexerPosition();
-					return this.ACTION(() => this._tag(r(e.image, this.rowIndex, this.colIndex), t));
+					let e = this.CONSUME(s), t = this.getLexerPosition();
+					return this.ACTION(() => this._tag(c(e.image, this.rowIndex, this.colIndex), t));
 				} },
 				{ ALT: () => {
 					let e = this.OR2([{ ALT: () => this.CONSUME(l) }, { ALT: () => this.CONSUME(d) }]);
-					return this.ACTION(() => this._tag(f(e.image), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(p(e.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => this.SUBRULE(this._ruleBracketedString) },
 				{ ALT: () => this.SUBRULE(this._ruleFunction) },
 				{ ALT: () => {
-					let e = this.CONSUME(p);
+					let e = this.CONSUME(f);
 					return this.ACTION(() => this._tag(u(e.image, this.colIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(m);
-					return this.ACTION(() => this._tag(S(e.image, this.rowIndex), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(C(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(h);
-					return this.ACTION(() => this._tag(S(e.image, this.rowIndex), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(C(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(_);
-					return this.ACTION(() => this._tag(E(e.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(g);
+					return this.ACTION(() => this._tag(b(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 			return this.ACTION(() => {
-				if (v && b) {
-					if (v.name === "") return void this._reportError(b, `'${v.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
-					let e = b;
-					if (b.type === g.Postfix && b.inputs?.[0] && (e = b.inputs[0]), e.type === g.Cell || e.type === g.Named || e.type === g.Row || e.type === g.TableColumn || e.type === g.Error) {
-						e.value.scope = v.name, e.value.scopeImage = v.image;
+				if (_ && y) {
+					if (_.name === "") return void this._reportError(y, `'${_.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
+					let e = y;
+					if (y.type === T.Postfix && y.inputs?.[0] && (e = y.inputs[0]), e.type === T.Cell || e.type === T.Named || e.type === T.Row || e.type === T.TableColumn || e.type === T.Error) {
+						e.value.scope = _.name, e.value.scopeImage = _.image;
 						let t = this._tokenMap.get(e);
-						t && y !== void 0 && (t.tokenIndex = y);
+						t && v !== void 0 && (t.tokenIndex = v);
 					}
 				}
-			}), b;
+			}), y;
 		}), this._rulePrefixSheetName = this.RULE("rulePrefixSheetName", () => {
-			let { SheetQuoted: e, BracketedString: t, NamedToken: n, RangeOp: r, Sheet: i } = this._vocab;
+			let { SheetQuoted: e, BracketedString: t, NamedToken: n, Column: r, RangeOp: i, Sheet: a } = this._vocab;
 			return this.OR([{ ALT: () => {
 				let t = this.CONSUME(e).image;
 				return {
@@ -5004,15 +5010,18 @@ var sr = {
 				this.OPTION(() => {
 					e += this.CONSUME(t).image;
 				}), this.OPTION2({
-					GATE: () => this.LA(2).tokenType === r,
+					GATE: () => this.LA(2).tokenType === i,
 					DEF: () => {
-						e += this.CONSUME(n).image, this.CONSUME(r), e += ":";
+						e += this.OR2([{ ALT: () => this.CONSUME(n).image }, {
+							GATE: () => this.LA(1).image.charCodeAt(0) !== 36,
+							ALT: () => this.CONSUME(r).image
+						}]), this.CONSUME(i), e += ":";
 					}
 				});
-				let a = this.CONSUME(i).image;
+				let o = this.CONSUME(a).image;
 				return {
-					name: e + a.slice(0, -1),
-					image: e + a
+					name: e + o.slice(0, -1),
+					image: e + o
 				};
 			} }]);
 		}), this._ruleNumber = this.RULE("ruleNumber", () => {
@@ -5027,12 +5036,12 @@ var sr = {
 			return this.MANY(() => {
 				this.CONSUME(e), n.push(this.SUBRULE2(this._ruleIntersectOp));
 			}), this.ACTION(() => n.length === 0 ? t : {
-				type: g.List,
+				type: T.List,
 				value: ",",
 				inputs: [t, ...n],
 				isReference: !0
 			});
-		}), this._lexer = l, this._locale = l.getLocale(), this._vocab = h, this._srParser = s?.srParser ?? new $n(this._locale), this.performSelfAnalysis();
+		}), this._lexer = m, this._locale = m.getLocale(), this._vocab = h, this._srParser = n?.srParser ?? new $n(this._locale), this.performSelfAnalysis();
 	}
 	getLexer() {
 		return this._lexer;
@@ -5041,26 +5050,26 @@ var sr = {
 		let r = this._lexer.tokenize(n), i;
 		if (!r) return {
 			root: {
-				type: g.Unparsed,
+				type: T.Unparsed,
 				value: n
 			},
 			errors: []
 		};
 		let a = r.tokens;
-		if (a.length === 0) throw new D.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 = ee(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 !== g.Cell && Number.isInteger(t.value)) {
-				let n = S(t.image, e);
-				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 (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 = v(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 !== T.Cell && Number.isInteger(t.value)) {
+				let n = C(t.image, e);
+				return re(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;
 			}
-			if (o && r === g.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 === g.Cell) {
+			if (o && r === T.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 === T.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, u) && this._reportError(t, `'${t.image}' is not a valid row — rows run from 1 to ${u}`), t;
+				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 || e.colIndex >= 16384) {
-					let a = f(t.image);
-					l(a, t);
+					let a = p(t.image);
+					re(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;
 				}
@@ -5123,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 === g.Array && Array.isArray(e.value)) {
+			if (e.type === T.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);
 			}
 		}