@sheetxl/sdk 0.8.0-beta.11 → 0.8.0-beta.13

package/browser/esm/{DvAaxH6z_tGvrRzl.mjs → Bax5aOzQkbHKXW_X.mjs}

@@ -1,25 +1,25 @@
 /**
-* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.11
+* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.13
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: The license can be found at https://www.sheetxl.com/license.
 */
-import { An as e, Bn as t, Dn as n, Fn as r, Gn as i, Hn as a, In as o, Jn as s, Kn as c, Ln as l, Nn as u, Pn as d, Rn as f, Tn as p, Un as m, Vn as h, Wn as g, Xn as _, Yn as v, Zn as y, dr as b, ir as x, jn as S, kn as ee, nr as te, or as C, qn as w, rr as ne, sr as re, zn as ie } from "./C16ycKja6zG0crV_.mjs";
-import { FormulaError as T } from "@sheetxl/primitives";
-function E(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 "./Dz86-De57bv2VYIi.mjs";
+import { FormulaError as E } from "@sheetxl/primitives";
+function D(e) {
 	console && console.error && console.error(`Error: ${e}`);
 }
-function D(e) {
+function O(e) {
 	console && console.warn && console.warn(`Warning: ${e}`);
 }
-function ae(e) {
+function ie(e) {
 	let t = (/* @__PURE__ */ new Date()).getTime(), n = e();
 	return {
 		time: (/* @__PURE__ */ new Date()).getTime() - t,
 		value: n
 	};
 }
-function O(e) {
+function ae(e) {
 	function t() {}
 	t.prototype = e;
 	let n = new t();
@@ -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 && D(`${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."), E(`${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 [];
@@ -1244,14 +1244,14 @@ function Le(e, t) {
 					t !== i && (t = i, Je(e, i, m[r]));
 				});
 			} else if (n.PATTERN instanceof RegExp) {
-				if (n.PATTERN.unicode) g = !1, t.ensureOptimizations && E(`${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) => {
 						Je(e, t, m[r]);
 					});
 				}
-			} else t.ensureOptimizations && E(`${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;
 		}, []);
 	}), {
@@ -1571,7 +1571,7 @@ var J = class {
 				this.traceInitIndent++;
 				let n = Array(this.traceInitIndent + 1).join("	");
 				this.traceInitIndent < this.traceInitMaxIdent && console.log(`${n}--\x3e <${e}>`);
-				let { time: r, value: i } = ae(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();
@@ -1659,7 +1659,7 @@ var J = class {
 				throw Error("Errors detected in definition of Lexer:\n" + e);
 			}
 			this.lexerDefinitionWarning.forEach((e) => {
-				D(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 J = class {
 			}), this.TRACE_INIT("clearRegExpParserCache", () => {
 				we = {};
 			}), this.TRACE_INIT("toFastProperties", () => {
-				O(this);
+				ae(this);
 			});
 		});
 	}
@@ -1686,14 +1686,14 @@ var J = class {
 		return this.tokenizeInternal(e, t);
 	}
 	tokenizeInternal(e, t) {
-		let n, r, i, a, o, s, c, l, u, d, f, p, m, h, g, _ = e, v = _.length, y = 0, b = 0, x = this.hasCustom ? 0 : Math.floor(e.length / 10), S = Array(x), ee = [], te = this.trackStartLines ? 1 : void 0, C = this.trackStartLines ? 1 : void 0, w = {};
+		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, re = this.config.lineTerminatorsPattern, ie = 0, T = [], E = [], D = [], ae = [];
-		Object.freeze(ae);
-		let O = !1, k = (e) => {
-			if (D.length === 1 && e.tokenType.PUSH_MODE === void 0) {
+		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);
-				ee.push({
+				te.push({
 					offset: e.startOffset,
 					line: e.startLine,
 					column: e.startColumn,
@@ -1701,38 +1701,38 @@ var J = class {
 					message: t
 				});
 			} else {
-				D.pop();
-				let e = D.at(-1);
-				T = this.patternIdxToConfig[e], E = this.charCodeToPatternIdxToConfig[e], ie = T.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;
-				O = !(!E || !t);
+				ae = !(!D || !t);
 			}
 		};
 		function A(e) {
-			D.push(e), E = this.charCodeToPatternIdxToConfig[e], T = this.patternIdxToConfig[e], ie = T.length;
+			O.push(e), D = this.charCodeToPatternIdxToConfig[e], E = this.patternIdxToConfig[e], re = E.length;
 			let t = this.canModeBeOptimized[e] && !1 === this.config.safeMode;
-			O = !(!E || !t);
+			ae = !(!D || !t);
 		}
 		let j;
 		A.call(this, t);
 		let M = this.config.recoveryEnabled;
 		for (; y < v;) {
 			s = null, u = -1;
-			let t = _.charCodeAt(y), x;
-			if (O) {
-				let e = K(t), n = E[e];
-				x = n === void 0 ? ae : n;
-			} else x = T;
-			let N = x.length;
+			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 = x[n];
+				j = b[n];
 				let r = j.pattern;
 				switch (c = null, j.matchType) {
 					case 0:
 						t === j.short && (u = 1, s = r);
 						break;
 					case 1:
-						g = r.exec(_, y, S, w), 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 = j.asciiClass;
@@ -1752,8 +1752,8 @@ var J = class {
 						s = e.substring(y, y + u);
 						let t = o.length;
 						for (i = 0; i < t; i++) {
-							let t = T[o[i]], n = t.pattern;
-							if (l = null, t.matchType === 1 ? (g = n.exec(_, y, S, 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) {
+							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,32 +1763,32 @@ var J = class {
 				}
 			}
 			if (u !== -1) {
-				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, te, C, u), this.handlePayload(p, c), !1 === d ? b = this.addToken(S, b, p) : w[d].push(p)), !0 === ne && !0 === j.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;
-					re.lastIndex = 0;
+					T.lastIndex = 0;
 					do
-						s = s === null ? e.substring(y, y + u) : s, t = re.test(s), !0 === t && (n = re.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 ? C = this.computeNewColumn(C, u) : (te += r, C = u - n, this.updateTokenEndLineColumnLocation(p, d, n, r, te, C, u));
+					r === 0 ? C = this.computeNewColumn(C, u) : (S += r, C = u - n, this.updateTokenEndLineColumnLocation(p, d, n, r, S, C, u));
 				} else C = this.computeNewColumn(C, u);
 				y += u, this.handleModes(j, k, A, p);
 			} else {
-				let t = y, n = te, i = C, a = !1 === M;
-				for (; !1 === a && y < v;) for (y++, r = 0; r < ie; r++) {
-					let t = T[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, S, w) !== 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, C = this.computeNewColumn(C, m), h = this.config.errorMessageProvider.buildUnexpectedCharactersMessage(_, t, m, n, i, D.at(-1)), ee.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,
@@ -1797,10 +1797,10 @@ var J = class {
 				}), !1 === M) break;
 			}
 		}
-		return this.hasCustom || (S.length = b), {
-			tokens: S,
+		return this.hasCustom || (x.length = ee), {
+			tokens: x,
 			groups: w,
-			errors: ee
+			errors: te
 		};
 	}
 	handleModes(e, t, n, r) {
@@ -2954,7 +2954,7 @@ var zn, Bn = class e {
 			this.selfAnalysisDone = !0;
 			let n = this.className;
 			this.TRACE_INIT("toFastProps", () => {
-				O(this);
+				ae(this);
 			}), this.TRACE_INIT("Grammar Recording", () => {
 				try {
 					this.enableRecording(), this.definedRulesNames.forEach((e) => {
@@ -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 } = ae(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 ?? re, 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,7 +4138,7 @@ var Vn = class extends Bn {
 		}), a.set(o, s)), s;
 	}
 	constructor(e) {
-		let t = e?.maxColumn ?? Kn, n = e?.maxRow ?? qn, r = e?.locale ?? re;
+		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}')`);
@@ -4154,16 +4154,16 @@ var Vn = class extends Bn {
 			pattern: /[a-zA-Z_\u007F-\uFFFF]+[a-zA-Z0-9_.\u007F-\uFFFF]*(?=\()/
 		}), d = Y({
 			name: "TableReference",
-			pattern: { exec: ne },
+			pattern: { exec: te },
 			line_breaks: !1,
 			start_chars_hint: Wn
 		}), f = Y({
 			name: "BracketedString",
-			pattern: { exec: te },
+			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 = Y({
+		}), 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,63 +4182,63 @@ var Vn = class extends Bn {
 				"#BUSY!",
 				"#PYTHON!",
 				"#TIMEOUT!"
-			].map(m).join("|"))
-		}), g = Y({
+			].map(h).join("|"))
+		}), v = Y({
 			name: "RefError",
-			pattern: new RegExp(p(r.errorRefs) + ["#REF!", "#NAME\\?"].map(m).join("|"))
-		}), _ = Y({
+			pattern: new RegExp(p(r.errorRefs) + ["#REF!", "#NAME\\?"].map(h).join("|"))
+		}), y = Y({
 			name: "SingleQuotedString",
 			pattern: /'(''|[^'])*'/
-		}), v = Y({
+		}), ee = Y({
 			name: "SheetQuoted",
 			pattern: /'(?:''|[^'])*?'!/
-		}), y = Y({
+		}), b = Y({
 			name: "Sheet",
 			pattern: /[A-Za-z_.\d\u007F-\uFFFF]*!/
-		}), b = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, x = Y({
+		}), x = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, S = Y({
 			name: "NamedToken",
 			pattern: { exec: (e, t) => {
-				b.lastIndex = t;
-				let n = b.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
-		}), S = Y({
+		}), C = Y({
 			name: "Cell",
 			pattern: { exec: Xn(t, n) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: x
-		}), ee = Y({
+			longer_alt: S
+		}), w = Y({
 			name: "Column",
 			pattern: { exec: Yn(t) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...Un],
-			longer_alt: x
-		}), C = Y({
+			longer_alt: S
+		}), ne = Y({
 			name: "AbsRow",
 			pattern: /[$][0-9]+/
-		}), w = s === "." ? "\\." : s, ie = Y({
+		}), T = s === "." ? "\\." : s, re = Y({
 			name: "NumberToken",
-			pattern: RegExp(`[0-9]+${w}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${w}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
-		}), T = Y({
+			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]+/
-		}), E = Y({
+		}), D = Y({
 			name: "DigitToken",
 			pattern: /[0-9]+/
-		}), D = ["TRUE", "FALSE"];
+		}), O = ["TRUE", "FALSE"];
 		for (let e of [r.booleanTrue, r.booleanFalse]) {
 			let t = e?.trim();
-			t && !D.some((e) => e.toLowerCase() === t.toLowerCase()) && D.push(t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+			t && !O.some((e) => e.toLowerCase() === t.toLowerCase()) && O.push(t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 		}
-		let ae = Y({
+		let ie = Y({
 			name: "BooleanToken",
-			pattern: new RegExp(D.join("|"), "i")
-		}), O = Y({
+			pattern: new RegExp(O.join("|"), "i")
+		}), ae = Y({
 			name: "ArgSeparator",
 			pattern: Zn(i)
 		}), k = Y({
@@ -4301,7 +4301,7 @@ var Vn = class extends Bn {
 		}), fe = Y({
 			name: "ArrayAnchorOp",
 			pattern: /#/,
-			longer_alt: [h, g]
+			longer_alt: [g, v]
 		}), pe = Y({
 			name: "GtOp",
 			pattern: />/
@@ -4314,31 +4314,31 @@ var Vn = class extends Bn {
 		}), U = [
 			c,
 			l,
-			v,
-			_,
+			ee,
 			y,
+			b,
 			u,
 			d,
 			f,
-			h,
 			g,
-			O,
+			v,
+			ae,
 			...a === i ? [] : [k],
 			A,
 			M,
 			N,
 			P,
 			j,
-			S,
-			ae,
-			ee,
 			C,
 			ie,
-			T,
+			w,
+			ne,
+			re,
 			E,
+			D,
 			fe,
 			V,
-			x,
+			S,
 			F,
 			I,
 			L,
@@ -4371,13 +4371,13 @@ var Vn = class extends Bn {
 		let W = {};
 		U.forEach((e) => {
 			W[e.name] = e;
-		}), a === i && (W.ColSeparator = O), 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 T.Parse(o, {
+			throw new E.Parse(o, {
 				line: r,
 				column: i,
 				offset: t.offset,
@@ -4469,28 +4469,28 @@ function Zn(e) {
 	return new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 }
 var Qn = class {
-	constructor(e = re) {
+	constructor(e = m) {
 		let t = function(e) {
-			let t = [...p];
+			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 = Y({
+		}(e.specifiers), r = Y({
 			name: "WhiteSpace",
 			pattern: /\s+/,
 			group: J.SKIPPED
-		}), r = Y({
+		}), i = Y({
 			name: "TableSpecifier",
 			pattern: RegExp(`\\[#(?:${t})\\]`, "i")
-		}), i = [
-			n,
+		}), a = [
 			r,
+			i,
 			Y({
 				name: "BracketedColumn",
 				pattern: /\[(?:'['#[\]]|'(?!['#[\]])|[^'[\]])*\]/,
-				longer_alt: [r]
+				longer_alt: [i]
 			}),
 			Y({
 				name: "BareSpecifier",
@@ -4505,11 +4505,11 @@ var Qn = class {
 				pattern: new RegExp(e.separators.separatorFunction.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
 			})
 		];
-		this._lexer = new J(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 = re) {
+	constructor(e = m) {
 		let t = new Qn(e), n = t.getVocabulary();
 		super(n, {
 			nodeLocationTracking: "none",
@@ -4542,13 +4542,13 @@ var Qn = class {
 		}), 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 = y(t.image, e);
+				let n = w(t.image, e);
 				return n.image = t.image, n;
 			});
 		} }, { ALT: () => {
 			let t = c.CONSUME(a);
 			return c.ACTION(() => {
-				let n = y(t.image, e);
+				let n = w(t.image, e);
 				return n.image = t.image, n;
 			});
 		} }])), c.RULE("ruleColumnOrRange", () => {
@@ -4556,11 +4556,11 @@ var Qn = class {
 			return c.OPTION(() => {
 				t = c.CONSUME(o), n = c.CONSUME2(i);
 			}), c.ACTION(() => {
-				let r = v(e.image);
+				let r = h(e.image);
 				if (r.image = e.image, !n) return r;
-				let i = v(n.image);
+				let i = h(n.image);
 				i.image = n.image;
-				let a = l(":", r, i, !0);
+				let a = S(":", r, i, !0);
 				return a.image = t?.image ?? ":", a;
 			});
 		}), c.performSelfAnalysis();
@@ -4587,13 +4587,13 @@ var Qn = class {
 					return e.image = "@", [e];
 				}
 			}
-			let n = v(e);
+			let n = h(e);
 			n.image = e;
 			let r = g("@", n, !0);
 			return r.image = "@", [r];
 		}
 		if (n !== "[" && n !== "#") {
-			let t = v(e);
+			let t = h(e);
 			return t.image = e, [t];
 		}
 		return this._parseInner(t);
@@ -4601,7 +4601,7 @@ var Qn = class {
 	parse(e, t, n) {
 		this.reset();
 		let r = () => ({
-			root: _("", []),
+			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: _(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 === b.Cell) {
+	if (e.type === T.Cell) {
 		let t = e.value;
 		return t.rowIndex === -(2 ** 53 - 1) ? "col" : t.colIndex === -(2 ** 53 - 1) ? "row" : null;
 	}
@@ -4659,70 +4659,70 @@ var sr = {
 		return e.expected === X && t ? `Unexpected '${t}'` : yt.buildMismatchTokenMessage(e);
 	}
 }, cr = class extends Vn {
-	constructor(p) {
-		let _ = p?.lexer ?? Hn.shared(p?.lexerOptions), v = _.getVocabulary();
-		super(v, {
+	constructor(n) {
+		let m = n?.lexer ?? Hn.shared(n?.lexerOptions), h = m.getVocabulary();
+		super(h, {
 			skipValidations: !0,
 			recoveryEnabled: !0,
-			...p,
+			...n,
 			nodeLocationTracking: "full",
 			errorMessageProvider: sr,
 			maxLookahead: 1
 		}), this._ruleInfixOp = this.RULE("ruleInfixOp", () => {
-			let { PlusOp: e, MinOp: t, MulOp: r, DivOp: i, ExOp: a, ConcatOp: o, GtOp: s, EqOp: c, LtOp: u, NeqOp: d, GteOp: f, LteOp: p } = this._vocab, m = [];
-			return m.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
-				let n = 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(o).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 }
-				]), l = {
-					value: n,
+					{ ALT: () => this.CONSUME(f).image }
+				]), m = {
+					value: o,
 					index: this.getLexerPosition(),
-					isRange: x.includes(n)
+					isRange: ee.includes(o)
 				}, h = this.SUBRULE2(this._rulePostfixOp);
-				m.push({
-					op: l,
+				p.push({
+					op: m,
 					node: h
 				});
 			}), this.ACTION(() => {
-				let e = m.length - 1, t = n.length;
-				for (let r = 0; e > 0 && r < t; r++) {
-					let t = n[r], i = 1;
-					for (; i < m.length;) {
-						let n = m[i].op;
+				let e = p.length - 1, t = o.length;
+				for (let n = 0; e > 0 && n < t; n++) {
+					let t = o[n], r = 1;
+					for (; r < p.length;) {
+						let n = p[r].op;
 						if (t.includes(n.value)) {
-							let t = m[i - 1].node, r = m[i].node, a = l(n.value, t, r, n.isRange);
-							a = this._tag(a, n.index), m[i - 1].node = a, m.splice(i, 1), e--;
-						} else i++;
+							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 = x.includes(i);
-					t = m(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: e, MinOp: t, ImplicitIntersectOp: n } = this._vocab, r = [];
 			this.MANY(() => {
@@ -4739,41 +4739,47 @@ var sr = {
 			return this.ACTION(() => {
 				let e = r.length;
 				if (e !== 0) for (let t = e - 1; t >= 0; t--) {
-					let e = r[t], n = e[0], a = e[1], o = x.includes(n);
+					let e = r[t], n = e[0], a = e[1], o = ee.includes(n);
 					i = g(n, i, o), i = this._tag(i, 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(m("#", 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 = l(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: t } = this._vocab, n = this.SUBRULE(this._ruleFormula);
 			return this.MANY({
@@ -4783,7 +4789,7 @@ var sr = {
 				},
 				DEF: () => {
 					this.CONSUME(e);
-					let r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), a = n, o = this.ACTION(() => this._tag(S(a, i), r)), s = this.OPTION(() => this.CONSUME(t));
+					let r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), a = n, o = this.ACTION(() => this._tag(l(a, i), r)), s = this.OPTION(() => this.CONSUME(t));
 					this.ACTION(() => {
 						s || this._reportError(o, "Missing closing parenthesis ')'", r), this._tagClose(o, this.getLexerPosition()), n = o;
 					});
@@ -4805,7 +4811,7 @@ 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 = l(" ", r, i, !0), o = this._tokenMap.get(r);
+						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) {
@@ -4835,77 +4841,77 @@ var sr = {
 			}), t;
 		}), this._ruleParen = this.RULE("ruleParen", () => {
 			let { OpenParen: e, CloseParen: t } = this._vocab;
-			return this._processParen(b.Paren, e, t);
+			return this._processParen(T.Paren, e, t);
 		}), this._ruleLiteralArray = this.RULE("ruleLiteralArray", () => {
-			let { OpenCurlyParen: e, CloseCurlyParen: n, ColSeparator: r, RowSeparator: i } = this._vocab, a = t();
+			let { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: n, RowSeparator: r } = this._vocab, a = d();
 			this.CONSUME(e);
-			let o = this.getLexerPosition(), s = this.ACTION(() => this._tag(f(a), o)), c = this.SUBRULE(this._ruleLiteralForArray);
+			let o = this.getLexerPosition(), s = this.ACTION(() => this._tag(i(a), o)), c = this.SUBRULE(this._ruleLiteralForArray);
 			this.ACTION(() => {
 				a.value.push(c);
 			}), this.MANY(() => {
 				let e = !1;
 				this.OR([{ ALT: () => {
-					this.CONSUME(r), e = !0;
-				} }, { ALT: () => this.CONSUME(i) }]);
-				let n = this.SUBRULE2(this._ruleLiteralForArray);
+					this.CONSUME(n), e = !0;
+				} }, { ALT: () => this.CONSUME(r) }]);
+				let t = this.SUBRULE2(this._ruleLiteralForArray);
 				this.ACTION(() => {
-					e || (a = t(), s.value.push(a)), a.value.push(n);
+					e || (a = d(), s.value.push(a)), a.value.push(t);
 				});
 			});
-			let l = this.OPTION(() => this.CONSUME(n));
+			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: t, BooleanToken: n, LiteralError: r, RefError: o } = 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(a(t.image, this._locale), this.getLexerPosition()));
-					return this.ACTION(() => e ? i(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 e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(s(e.image), this.getLexerPosition()));
+					let t = this.CONSUME(e);
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let t = this.CONSUME(n);
-					return this.ACTION(() => this._tag(e(t.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(n);
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(ie(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(f(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(o);
-					return this.ACTION(() => this._tag(c(e.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(b(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleLiteral = this.RULE("ruleLiteral", () => {
-			let { StringToken: t, BooleanToken: n, LiteralError: r, RefError: i } = 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(a(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(s(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(s(e.image), this.getLexerPosition()));
+					let t = this.CONSUME(e);
+					return this.ACTION(() => this._tag(y(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let t = this.CONSUME(n);
-					return this.ACTION(() => this._tag(e(t.image, this._locale), this.getLexerPosition()));
+					let e = this.CONSUME(n);
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					let e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(ie(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(c(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(b(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleFunction = this.RULE("ruleFunction", () => {
 			let { FunctionToken: e, OpenParen: t, CloseParen: n } = this._vocab, r = this.CONSUME(e).image, i = this.getLexerPosition();
 			this.CONSUME(t);
-			let a = this.SUBRULE(this._ruleFunctionArguments), s = this.ACTION(() => this._tag(o(r, a), i)), c = this.OPTION(() => this.CONSUME(n));
+			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 = [];
@@ -4938,7 +4944,7 @@ var sr = {
 				return this._tag(e.root, n);
 			});
 		}), this._ruleReference = this.RULE("ruleReference", () => {
-			let { Sheet: e, SheetQuoted: t, DivOp: n, MulOp: r, PlusOp: i, MinOp: a, ArgSeparator: o, Cell: s, NamedToken: l, SingleQuotedString: f, Column: p, AbsRow: m, DigitToken: g, 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 s = 1; s < 6; s++) {
@@ -4949,50 +4955,50 @@ var sr = {
 					return !1;
 				},
 				DEF: () => {
-					y = this.getLexerPosition() + 1, v = this.SUBRULE(this._rulePrefixSheetName);
+					v = this.getLexerPosition() + 1, _ = this.SUBRULE(this._rulePrefixSheetName);
 				}
 			});
-			let x = this.OR([
+			let y = this.OR([
 				{ ALT: () => {
 					let e = this.CONSUME(s), t = this.getLexerPosition();
-					return this.ACTION(() => this._tag(u(e.image, this.rowIndex, this.colIndex), t));
+					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(f) }]);
-					return this.ACTION(() => this._tag(h(e.image), this.getLexerPosition()));
+					let e = this.OR2([{ ALT: () => this.CONSUME(l) }, { ALT: () => this.CONSUME(d) }]);
+					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);
-					return this.ACTION(() => this._tag(d(e.image, this.colIndex), this.getLexerPosition()));
+					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(w(e.image, this.rowIndex), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(C(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(g);
-					return this.ACTION(() => this._tag(w(e.image, this.rowIndex), this.getLexerPosition()));
+					let e = this.CONSUME(h);
+					return this.ACTION(() => this._tag(C(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					let e = this.CONSUME(_);
-					return this.ACTION(() => this._tag(c(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 && x) {
-					if (v.name === "") return void this._reportError(x, `'${v.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
-					let e = x;
-					if (x.type === b.Postfix && x.inputs?.[0] && (e = x.inputs[0]), e.type === b.Cell || e.type === b.Named || e.type === b.Row || e.type === b.TableColumn || e.type === b.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);
 					}
 				}
-			}), x;
+			}), 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: b.List,
+				type: T.List,
 				value: ",",
 				inputs: [t, ...n],
 				isReference: !0
 			});
-		}), this._lexer = _, this._locale = _.getLocale(), this._vocab = v, this._srParser = p?.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: b.Unparsed,
+				type: T.Unparsed,
 				value: n
 			},
 			errors: []
 		};
 		let a = r.tokens;
-		if (a.length === 0) throw new T.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 = C(i, (t, 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 !== b.Cell && Number.isInteger(t.value)) {
-				let n = w(t.image, e);
-				return ee(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 (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 === b.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 === b.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, 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 = h(t.image);
-					ee(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 === b.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);
 			}
 		}