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

package/node/esm/{CwePQwTILHHjGDkZ.mjs → CzrLqStvrcPE2-hb.mjs}

@@ -1,15 +1,15 @@
 /**
-* @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 s, Fn as r, Gn as i, Hn as n, In as o, Jn as a, Kn as h, Ln as l, Nn as u, Pn as c, Rn as p, Tn as g, Un as m, Vn as O, Wn as _, Xn as E, Yn as L, Zn as f, dr as A, ir as C, jn as T, kn as N, nr as U, or as S, qn as d, rr as x, sr as R, zn as I } from "./OVfaSb506tNSIvbv.mjs";
+import { $n as e, Bn as t, Fn as s, Gn as r, Jn as i, Kn as n, Ln as o, Qn as a, Un as h, Vn as l, Wn as u, Xn as c, Yn as p, Zn as g, _r as m, ar as O, er as _, fr as E, gr as L, ir as A, mr as f, nr as C, or as T, pr as N, qn as U, rr as S, sr as d, tr as x, xr as R, zn as I } from "./BQ2XqExomMceAjfe.mjs";
 import { FormulaError as M } from "@sheetxl/primitives";
 import { EOF as P, EmbeddedActionsParser as b, Lexer as v, createToken as k, defaultParserErrorProvider as w } from "chevrotain";
 var y = class e {
 	static shared(t) {
-		const s = t?.locale ?? R, r = t?.maxColumn ?? D, i = t?.maxRow ?? G;
+		const s = t?.locale ?? m, r = t?.maxColumn ?? D, i = t?.maxRow ?? G;
 		let n = $.get(s);
 		n || (n = /* @__PURE__ */ new Map(), $.set(s, n));
 		const o = `${r}:${i}`;
@@ -21,7 +21,7 @@ var y = class e {
 		}), n.set(o, a)), a;
 	}
 	constructor(e) {
-		const t = e?.maxColumn ?? D, s = e?.maxRow ?? G, r = e?.locale ?? R;
+		const t = e?.maxColumn ?? D, s = e?.maxRow ?? G, r = e?.locale ?? m;
 		this._locale = r, this._maxColumn = t, this._maxRow = s;
 		const { separatorFunction: i, separatorColumn: n, separatorRow: o, separatorDecimal: a } = r.separators;
 		if (n === o) throw new Error(`FormulaLexer: separatorColumn and separatorRow must differ (both '${n}')`);
@@ -37,16 +37,16 @@ var y = class e {
 			pattern: /[a-zA-Z_\u007F-\uFFFF]+[a-zA-Z0-9_.\u007F-\uFFFF]*(?=\()/
 		}), c = k({
 			name: "TableReference",
-			pattern: { exec: x },
+			pattern: { exec: N },
 			line_breaks: !1,
 			start_chars_hint: B
 		}), p = k({
 			name: "BracketedString",
-			pattern: { exec: U },
+			pattern: { exec: E },
 			line_breaks: !1,
 			start_chars_hint: [91],
 			longer_alt: [c, l]
-		}), g = (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()}]`), O = k({
+		}), g = (e) => (e ?? []).map((e) => e?.trim()).filter(Boolean).map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).map((e) => e + "|").join(""), O = (e) => e.replace(/[A-Za-z]/g, (e) => `[${e.toUpperCase()}${e.toLowerCase()}]`), _ = k({
 			name: "LiteralError",
 			pattern: new RegExp(g(r.errorLiterals) + [
 				"#PARSE!",
@@ -65,24 +65,24 @@ var y = class e {
 				"#BUSY!",
 				"#PYTHON!",
 				"#TIMEOUT!"
-			].map(m).join("|"))
-		}), _ = k({
+			].map(O).join("|"))
+		}), L = k({
 			name: "RefError",
-			pattern: new RegExp(g(r.errorRefs) + ["#REF!", "#NAME\\?"].map(m).join("|"))
-		}), E = k({
+			pattern: new RegExp(g(r.errorRefs) + ["#REF!", "#NAME\\?"].map(O).join("|"))
+		}), A = k({
 			name: "SingleQuotedString",
 			pattern: /'(''|[^'])*'/
-		}), L = k({
+		}), f = k({
 			name: "SheetQuoted",
 			pattern: /'(?:''|[^'])*?'!/
-		}), f = k({
+		}), C = k({
 			name: "Sheet",
 			pattern: /[A-Za-z_.\d\u007F-\uFFFF]*!/
-		}), A = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, C = k({
+		}), T = /[a-zA-Z_\\\u007F-\uFFFF][a-zA-Z0-9_.?\\\u007F-\uFFFF]*:?/y, U = k({
 			name: "NamedToken",
 			pattern: { exec: (e, t) => {
-				A.lastIndex = t;
-				const s = A.exec(e);
+				T.lastIndex = t;
+				const s = T.exec(e);
 				if (!s) return null;
 				let r = s[0];
 				const i = r.indexOf(".:");
@@ -90,24 +90,24 @@ var y = class e {
 			} },
 			line_breaks: !1,
 			start_chars_hint: B
-		}), T = k({
+		}), S = k({
 			name: "Cell",
 			pattern: { exec: W(t, s) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...F],
-			longer_alt: C
-		}), N = k({
+			longer_alt: U
+		}), d = k({
 			name: "Column",
 			pattern: { exec: z(t) },
 			line_breaks: !1,
 			start_chars_hint: [36, ...F],
-			longer_alt: C
-		}), S = k({
+			longer_alt: U
+		}), x = k({
 			name: "AbsRow",
 			pattern: /[$][0-9]+/
-		}), d = "." === a ? "\\." : a, I = k({
+		}), R = "." === a ? "\\." : a, I = k({
 			name: "NumberToken",
-			pattern: new RegExp(`[0-9]+${d}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${d}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
+			pattern: new RegExp(`[0-9]+${R}(?!:)[0-9]*([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|${R}[0-9]+([eE][+-]?[0-9]+|\\*\\*[+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+`)
 		}), M = k({
 			name: "ScientificDigit",
 			pattern: /[0-9]+\*\*[+-]?[0-9]+/
@@ -134,10 +134,10 @@ var y = class e {
 		}), j = k({
 			name: "RangeOp",
 			pattern: /:/
-		}), Z = k({
+		}), Q = k({
 			name: "RangeTrimFullOp",
 			pattern: /\.:\./
-		}), Q = k({
+		}), Z = k({
 			name: "RangeTrimLeadingOp",
 			pattern: /\.:/
 		}), q = k({
@@ -185,7 +185,7 @@ var y = class e {
 		}), le = k({
 			name: "ArrayAnchorOp",
 			pattern: /#/,
-			longer_alt: [O, _]
+			longer_alt: [_, L]
 		}), ue = k({
 			name: "GtOp",
 			pattern: />/
@@ -198,31 +198,31 @@ var y = class e {
 		}), ge = [
 			h,
 			l,
-			L,
-			E,
 			f,
+			A,
+			C,
 			u,
 			c,
 			p,
-			O,
 			_,
+			L,
 			y,
 			...n !== i ? [$] : [],
 			Y,
-			Z,
 			Q,
+			Z,
 			q,
 			j,
-			T,
-			w,
-			N,
 			S,
+			w,
+			d,
+			x,
 			I,
 			M,
 			P,
 			le,
 			ne,
-			C,
+			U,
 			K,
 			H,
 			J,
@@ -355,28 +355,28 @@ function V(e) {
 	return new RegExp(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 }
 var j = class {
-	constructor(e = R) {
+	constructor(e = m) {
 		const t = function(e) {
-			const t = [...g];
+			const t = [...s];
 			if (e) for (const s of Object.values(e)) {
 				const e = s?.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), s = k({
+		}(e.specifiers), r = k({
 			name: "WhiteSpace",
 			pattern: /\s+/,
 			group: v.SKIPPED
-		}), r = k({
+		}), i = k({
 			name: "TableSpecifier",
 			pattern: new RegExp(`\\[#(?:${t})\\]`, "i")
-		}), i = [
-			s,
+		}), n = [
 			r,
+			i,
 			k({
 				name: "BracketedColumn",
 				pattern: /\[(?:'['#[\]]|'(?!['#[\]])|[^'[\]])*\]/,
-				longer_alt: [r]
+				longer_alt: [i]
 			}),
 			k({
 				name: "BareSpecifier",
@@ -391,11 +391,11 @@ var j = class {
 				pattern: new RegExp(e.separators.separatorFunction.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
 			})
 		];
-		this._lexer = new v(i, { ensureOptimizations: !0 });
-		const n = {};
-		i.forEach((e) => {
-			n[e.name] = e;
-		}), this._vocabulary = n;
+		this._lexer = new v(n, { ensureOptimizations: !0 });
+		const o = {};
+		n.forEach((e) => {
+			o[e.name] = e;
+		}), this._vocabulary = o;
 	}
 	getVocabulary() {
 		return this._vocabulary;
@@ -403,8 +403,8 @@ var j = class {
 	tokenize(e) {
 		return this._lexer.tokenize(e);
 	}
-}, Z = class extends b {
-	constructor(e = R) {
+}, Q = class extends b {
+	constructor(e = m) {
 		const t = new j(e), s = t.getVocabulary();
 		super(s, {
 			nodeLocationTracking: "none",
@@ -428,13 +428,13 @@ var j = class {
 		}), h.RULE("ruleItem", () => h.OR([{ ALT: () => h.SUBRULE(h.ruleSpecifier) }, { ALT: () => h.SUBRULE(h.ruleColumnOrRange) }])), h.RULE("ruleSpecifier", () => h.OR([{ ALT: () => {
 			const t = h.CONSUME(r);
 			return h.ACTION(() => {
-				const s = f(t.image, e);
+				const s = d(t.image, e);
 				return s.image = t.image, s;
 			});
 		} }, { ALT: () => {
 			const t = h.CONSUME(n);
 			return h.ACTION(() => {
-				const s = f(t.image, e);
+				const s = d(t.image, e);
 				return s.image = t.image, s;
 			});
 		} }])), h.RULE("ruleColumnOrRange", () => {
@@ -443,11 +443,11 @@ var j = class {
 			return h.OPTION(() => {
 				t = h.CONSUME(o), s = h.CONSUME2(i);
 			}), h.ACTION(() => {
-				const r = L(e.image);
+				const r = O(e.image);
 				if (r.image = e.image, !s) return r;
-				const i = L(s.image);
+				const i = O(s.image);
 				i.image = s.image;
-				const n = l(":", r, i, !0);
+				const n = U(":", r, i, !0);
 				return n.image = t?.image ?? ":", n;
 			});
 		}), h.performSelfAnalysis();
@@ -474,13 +474,13 @@ var j = class {
 					return e.image = "@", [e];
 				}
 			}
-			const s = L(e);
+			const s = O(e);
 			s.image = e;
 			const r = _("@", s, !0);
 			return r.image = "@", [r];
 		}
 		if ("[" !== s && "#" !== s) {
-			const t = L(e);
+			const t = O(e);
 			return t.image = e, [t];
 		}
 		return this._parseInner(t);
@@ -488,7 +488,7 @@ var j = class {
 	parse(e, t, s) {
 		this.reset();
 		const r = () => ({
-			root: E("", []),
+			root: T("", []),
 			errors: []
 		});
 		if (!s) return r();
@@ -501,11 +501,11 @@ var j = class {
 		if (-1 === n) return r();
 		const o = s.slice(0, n), a = s.slice(n + 1, -1), h = this._parseContent(a);
 		return {
-			root: E(o, h),
+			root: T(o, h),
 			errors: this.errors.length > 0 ? [...this.errors] : []
 		};
 	}
-}, Q = /* @__PURE__ */ new Set([
+}, Z = /* @__PURE__ */ new Set([
 	":",
 	".:.",
 	".:",
@@ -516,7 +516,7 @@ var j = class {
 	":."
 ]), K = (e) => {
 	if (!e) return null;
-	if (e.type === A.Cell) {
+	if (e.type === R.Cell) {
 		const t = e.value;
 		return t.rowIndex === Number.MIN_SAFE_INTEGER ? "col" : t.colIndex === Number.MIN_SAFE_INTEGER ? "row" : null;
 	}
@@ -546,75 +546,75 @@ var te = {
 		return e.expected === P && t ? `Unexpected '${t}'` : w.buildMismatchTokenMessage(e);
 	}
 }, se = class extends b {
-	constructor(g) {
-		const E = g?.lexer ?? y.shared(g?.lexerOptions), L = E.getVocabulary();
-		super(L, {
+	constructor(s) {
+		const m = s?.lexer ?? y.shared(s?.lexerOptions), O = m.getVocabulary();
+		super(O, {
 			skipValidations: !0,
 			recoveryEnabled: !0,
-			...g,
+			...s,
 			nodeLocationTracking: "full",
 			errorMessageProvider: te,
 			maxLookahead: 1
 		}), this._ruleInfixOp = this.RULE("ruleInfixOp", () => {
-			const { PlusOp: e, MinOp: t, MulOp: r, DivOp: i, ExOp: n, ConcatOp: o, GtOp: a, EqOp: h, LtOp: u, NeqOp: c, GteOp: p, LteOp: g } = this._vocab, m = [];
-			return m.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
-				const s = this.OR(this._c1 || (this._c1 = [
+			const { PlusOp: e, MinOp: t, MulOp: s, DivOp: r, ExOp: i, ConcatOp: n, GtOp: a, EqOp: h, LtOp: l, NeqOp: u, GteOp: c, LteOp: p } = this._vocab, g = [];
+			return g.push({ node: this.SUBRULE(this._rulePostfixOp) }), this.MANY(() => {
+				const o = this.OR(this._c1 || (this._c1 = [
 					{ ALT: () => this.CONSUME(e).image },
 					{ ALT: () => this.CONSUME(t).image },
+					{ ALT: () => this.CONSUME(s).image },
 					{ ALT: () => this.CONSUME(r).image },
 					{ ALT: () => this.CONSUME(i).image },
 					{ ALT: () => this.CONSUME(n).image },
-					{ ALT: () => this.CONSUME(o).image },
 					{ ALT: () => this.CONSUME(a).image },
 					{ ALT: () => this.CONSUME(h).image },
+					{ ALT: () => this.CONSUME(l).image },
 					{ ALT: () => this.CONSUME(u).image },
 					{ ALT: () => this.CONSUME(c).image },
-					{ ALT: () => this.CONSUME(p).image },
-					{ ALT: () => this.CONSUME(g).image }
-				])), l = {
-					value: s,
+					{ ALT: () => this.CONSUME(p).image }
+				])), m = {
+					value: o,
 					index: this.getLexerPosition(),
-					isRange: C.includes(s)
+					isRange: f.includes(o)
 				}, O = this.SUBRULE2(this._rulePostfixOp);
-				m.push({
-					op: l,
+				g.push({
+					op: m,
 					node: O
 				});
 			}), this.ACTION(() => {
-				let e = m.length - 1;
-				const t = s.length;
-				for (let r = 0; e > 0 && r < t; r++) {
-					const t = s[r];
-					let i = 1;
-					for (; i < m.length;) {
-						const s = m[i].op;
+				let e = g.length - 1;
+				const t = o.length;
+				for (let s = 0; e > 0 && s < t; s++) {
+					const t = o[s];
+					let r = 1;
+					for (; r < g.length;) {
+						const s = g[r].op;
 						if (t.includes(s.value)) {
-							const t = m[i - 1].node, r = m[i].node;
-							let n = l(s.value, t, r, s.isRange);
-							n = this._tag(n, s.index), m[i - 1].node = n, m.splice(i, 1), e--;
-						} else i++;
+							const t = g[r - 1].node, i = g[r].node;
+							let n = U(s.value, t, i, s.isRange);
+							n = this._tag(n, s.index), g[r - 1].node = n, g.splice(r, 1), e--;
+						} else r++;
 					}
 				}
-			}), m[0].node;
+			}), g[0].node;
 		}), this._rulePlusMinusOp = this.RULE("rulePlusMinusOp", () => {
 			const { PlusOp: e, MinOp: t } = this._vocab;
 			return this.OR([{ ALT: () => this.CONSUME(e) }, { ALT: () => this.CONSUME(t) }]);
 		}), this._rulePostfixOp = this.RULE("rulePostfixOp", () => {
-			const { PercentOp: e } = this._vocab;
-			let t = this.SUBRULE(this._rulePrefixOp);
-			const s = [];
+			const { PercentOp: t } = this._vocab;
+			let s = this.SUBRULE(this._rulePrefixOp);
+			const r = [];
 			return this.MANY(() => {
-				const t = this.CONSUME(e).image;
+				const e = this.CONSUME(t).image;
 				this.ACTION(() => {
-					s.push([t, this.getLexerPosition()]);
+					r.push([e, this.getLexerPosition()]);
 				});
 			}), this.ACTION(() => {
-				const e = s.length;
-				if (0 !== e) for (let r = 0; r < e; r++) {
-					const e = s[r], i = e[0], n = e[1], o = C.includes(i);
-					t = m(i, t, o), t = this._tag(t, n);
+				const t = r.length;
+				if (0 !== t) for (let i = 0; i < t; i++) {
+					const t = r[i], n = t[0], o = t[1], a = f.includes(n);
+					s = e(n, s, a), s = this._tag(s, o);
 				}
-			}), t;
+			}), s;
 		}), this._rulePrefixOp = this.RULE("rulePrefixOp", () => {
 			const { PlusOp: e, MinOp: t, ImplicitIntersectOp: s } = this._vocab, r = [];
 			this.MANY(() => {
@@ -631,42 +631,48 @@ var te = {
 			return this.ACTION(() => {
 				const e = r.length;
 				if (0 !== e) for (let t = e - 1; t >= 0; t--) {
-					const e = r[t], s = e[0], n = e[1], o = C.includes(s);
+					const e = r[t], s = e[0], n = e[1], o = f.includes(s);
 					i = _(s, i, o), i = this._tag(i, n);
 				}
 			}), i;
 		}), this._ruleRangeOp = this.RULE("ruleRangeOp", () => {
-			const { RangeOp: e, RangeTrimFullOp: t, RangeTrimLeadingOp: s, RangeTrimTrailingOp: r, ArrayAnchorOp: i } = this._vocab, n = [];
-			return n.push({ node: this.SUBRULE(this._ruleCallOp) }), this.MANY2(() => {
-				this.CONSUME(i), n.push({ anchor: this.getLexerPosition() });
+			const { RangeOp: t, RangeTrimFullOp: s, RangeTrimLeadingOp: r, RangeTrimTrailingOp: i, ArrayAnchorOp: n } = this._vocab, o = [];
+			return o.push({ node: this.SUBRULE(this._ruleCallOp) }), this.MANY2(() => {
+				this.CONSUME(n), o.push({ anchor: this.getLexerPosition() });
 			}), this.MANY(() => {
-				const o = {
+				const e = {
 					value: this.OR(this._c2 || (this._c2 = [
-						{ ALT: () => this.CONSUME(e).image },
 						{ ALT: () => this.CONSUME(t).image },
 						{ ALT: () => this.CONSUME(s).image },
-						{ ALT: () => this.CONSUME(r).image }
+						{ ALT: () => this.CONSUME(r).image },
+						{ ALT: () => this.CONSUME(i).image }
 					])),
 					index: this.getLexerPosition()
 				}, a = this.SUBRULE2(this._ruleCallOp);
-				n.push({
-					op: o,
+				o.push({
+					op: e,
 					node: a
 				}), this.MANY3(() => {
-					this.CONSUME2(i), n.push({ anchor: this.getLexerPosition() });
+					this.CONSUME2(n), o.push({ anchor: this.getLexerPosition() });
 				});
 			}), this.ACTION(() => {
-				for (let e = 1; e < n.length; e++) {
-					const t = n[e];
-					if (void 0 !== t.anchor) {
-						n[0].node = this._tag(m("#", n[0].node, !0), t.anchor);
+				for (let e = 1; e + 1 < o.length; e++) {
+					const t = o[e], s = o[e + 1];
+					if (":" !== t.op?.value || ":" !== s.op?.value) continue;
+					const r = K(t.node);
+					r && K(s.node) === r && K(o[e - 1].node) !== r && (t.node = this._tag(U(":", t.node, s.node, !0), s.op.index), o.splice(e + 1, 1));
+				}
+				for (let t = 1; t < o.length; t++) {
+					const s = o[t];
+					if (void 0 !== s.anchor) {
+						o[0].node = this._tag(e("#", o[0].node, !0), s.anchor);
 						continue;
 					}
-					const s = t.op;
-					let r = l(s.value, n[0].node, t.node, !0);
-					r = this._tag(r, s.index), n[0].node = r;
+					const r = s.op;
+					let i = U(r.value, o[0].node, s.node, !0);
+					i = this._tag(i, r.index), o[0].node = i;
 				}
-			}), n[0].node;
+			}), o[0].node;
 		}), this._ruleCallOp = this.RULE("ruleCallOp", () => {
 			const { OpenParen: e, CloseParen: t } = this._vocab;
 			let s = this.SUBRULE(this._ruleFormula);
@@ -677,7 +683,7 @@ var te = {
 				},
 				DEF: () => {
 					this.CONSUME(e);
-					const r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), n = s, o = this.ACTION(() => this._tag(T(n, i), r)), a = this.OPTION(() => this.CONSUME(t));
+					const r = this.getLexerPosition(), i = this.SUBRULE(this._ruleFunctionArguments), n = s, o = this.ACTION(() => this._tag(l(n, i), r)), a = this.OPTION(() => this.CONSUME(t));
 					this.ACTION(() => {
 						a || this._reportError(o, "Missing closing parenthesis ')'", r), this._tagClose(o, this.getLexerPosition()), s = o;
 					});
@@ -699,7 +705,7 @@ var te = {
 				for (; e.length > 1;) {
 					let t = e.length - 1;
 					for (let s = 0; s < t; s++) {
-						const r = e[s], i = e[s + 1], n = l(" ", r, i, !0), o = this._tokenMap.get(r);
+						const r = e[s], i = e[s + 1], n = U(" ", r, i, !0), o = this._tokenMap.get(r);
 						o && delete o.tokenIndexClose;
 						const a = this._tokenMap.get(i), h = a?.tokenIndex;
 						if (void 0 !== h) {
@@ -729,81 +735,81 @@ var te = {
 			}), t;
 		}), this._ruleParen = this.RULE("ruleParen", () => {
 			const { OpenParen: e, CloseParen: t } = this._vocab;
-			return this._processParen(A.Paren, e, t);
+			return this._processParen(R.Paren, e, t);
 		}), this._ruleLiteralArray = this.RULE("ruleLiteralArray", () => {
-			const { OpenCurlyParen: e, CloseCurlyParen: s, ColSeparator: r, RowSeparator: i } = this._vocab;
-			let n = t();
+			const { OpenCurlyParen: e, CloseCurlyParen: t, ColSeparator: s, RowSeparator: r } = this._vocab;
+			let n = c();
 			this.CONSUME(e);
 			const o = this.getLexerPosition();
-			let a = this.ACTION(() => this._tag(p(n), o));
+			let a = this.ACTION(() => this._tag(i(n), o));
 			const h = this.SUBRULE(this._ruleLiteralForArray);
 			this.ACTION(() => {
 				n.value.push(h);
 			}), this.MANY(() => {
 				let e = !1;
 				this.OR([{ ALT: () => {
-					this.CONSUME(r), e = !0;
-				} }, { ALT: () => this.CONSUME(i) }]);
-				const s = this.SUBRULE2(this._ruleLiteralForArray);
+					this.CONSUME(s), e = !0;
+				} }, { ALT: () => this.CONSUME(r) }]);
+				const t = this.SUBRULE2(this._ruleLiteralForArray);
 				this.ACTION(() => {
-					e || (n = t(), a.value.push(n)), n.value.push(s);
+					e || (n = c(), a.value.push(n)), n.value.push(t);
 				});
 			});
-			const l = this.OPTION(() => this.CONSUME(s));
+			const l = this.OPTION(() => this.CONSUME(t));
 			return a = this.ACTION(() => (l || this._reportError(a, "Missing closing parenthesis '}'", o), this._tagClose(a, this.getLexerPosition()))), a;
 		}), this._ruleLiteralForArray = this.RULE("ruleLiteralForArray", () => {
-			const { StringToken: t, BooleanToken: s, LiteralError: r, RefError: o } = this._vocab;
+			const { StringToken: e, BooleanToken: s, LiteralError: r, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
-					const e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), s = this.ACTION(() => this._tag(n(t.image, this._locale), this.getLexerPosition()));
-					return this.ACTION(() => e ? i(e.image, s) : s);
+					const e = this.OPTION(() => this.SUBRULE(this._rulePlusMinusOp)), t = this.SUBRULE(this._ruleNumber), s = this.ACTION(() => this._tag(a(t.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => e ? x(e.image, s) : s);
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(a(e.image), this.getLexerPosition()));
+					const t = this.CONSUME(e);
+					return this.ACTION(() => this._tag(A(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const t = this.CONSUME(s);
-					return this.ACTION(() => this._tag(e(t.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(s);
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(I(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(p(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(o);
-					return this.ACTION(() => this._tag(h(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(i);
+					return this.ACTION(() => this._tag(C(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleLiteral = this.RULE("ruleLiteral", () => {
-			const { StringToken: t, BooleanToken: s, LiteralError: r, RefError: i } = this._vocab;
+			const { StringToken: e, BooleanToken: s, LiteralError: r, RefError: i } = this._vocab;
 			return this.OR([
 				{ ALT: () => {
 					const e = this.SUBRULE(this._ruleNumber);
-					return this.ACTION(() => this._tag(n(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(a(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(t);
-					return this.ACTION(() => this._tag(a(e.image), this.getLexerPosition()));
+					const t = this.CONSUME(e);
+					return this.ACTION(() => this._tag(A(t.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const t = this.CONSUME(s);
-					return this.ACTION(() => this._tag(e(t.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(s);
+					return this.ACTION(() => this._tag(t(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(r);
-					return this.ACTION(() => this._tag(I(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(p(e.image, this._locale), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(i);
-					return this.ACTION(() => this._tag(h(e.image, this._locale), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(C(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 		}), this._ruleFunction = this.RULE("ruleFunction", () => {
 			const { FunctionToken: e, OpenParen: t, CloseParen: s } = this._vocab, r = this.CONSUME(e).image, i = this.getLexerPosition();
 			this.CONSUME(t);
-			const n = this.SUBRULE(this._ruleFunctionArguments);
-			let a = this.ACTION(() => this._tag(o(r, n), i));
+			const o = this.SUBRULE(this._ruleFunctionArguments);
+			let a = this.ACTION(() => this._tag(n(r, o), i));
 			const h = this.OPTION(() => this.CONSUME(s));
 			return a = this.ACTION(() => (h || this._reportError(a, "Missing closing parenthesis ')'", i), this._tagClose(a, this.getLexerPosition()))), a;
 		}), this._ruleFunctionArguments = this.RULE("ruleFunctionArguments", () => {
@@ -837,8 +843,8 @@ var te = {
 				return this._tag(e.root, s);
 			});
 		}), this._ruleReference = this.RULE("ruleReference", () => {
-			const { Sheet: e, SheetQuoted: t, DivOp: s, MulOp: r, PlusOp: i, MinOp: n, ArgSeparator: o, Cell: a, NamedToken: l, SingleQuotedString: p, Column: g, AbsRow: m, DigitToken: _, RefError: E } = this._vocab;
-			let L, f;
+			const { Sheet: e, SheetQuoted: t, DivOp: s, MulOp: r, PlusOp: i, MinOp: n, ArgSeparator: o, Cell: a, NamedToken: l, SingleQuotedString: c, Column: p, AbsRow: m, DigitToken: O, RefError: _ } = this._vocab;
+			let E, L;
 			this.OPTION2({
 				GATE: () => {
 					for (let a = 1; a < 6; a++) {
@@ -849,50 +855,50 @@ var te = {
 					return !1;
 				},
 				DEF: () => {
-					f = this.getLexerPosition() + 1, L = this.SUBRULE(this._rulePrefixSheetName);
+					L = this.getLexerPosition() + 1, E = this.SUBRULE(this._rulePrefixSheetName);
 				}
 			});
-			let C = this.OR([
+			let A = this.OR([
 				{ ALT: () => {
 					const e = this.CONSUME(a), t = this.getLexerPosition();
-					return this.ACTION(() => this._tag(u(e.image, this.rowIndex, this.colIndex), t));
+					return this.ACTION(() => this._tag(h(e.image, this.rowIndex, this.colIndex), t));
 				} },
 				{ ALT: () => {
-					const e = this.OR2([{ ALT: () => this.CONSUME(l) }, { ALT: () => this.CONSUME(p) }]);
-					return this.ACTION(() => this._tag(O(e.image), this.getLexerPosition()));
+					const e = this.OR2([{ ALT: () => this.CONSUME(l) }, { ALT: () => this.CONSUME(c) }]);
+					return this.ACTION(() => this._tag(g(e.image), this.getLexerPosition()));
 				} },
 				{ ALT: () => this.SUBRULE(this._ruleBracketedString) },
 				{ ALT: () => this.SUBRULE(this._ruleFunction) },
 				{ ALT: () => {
-					const e = this.CONSUME(g);
-					return this.ACTION(() => this._tag(c(e.image, this.colIndex), this.getLexerPosition()));
+					const e = this.CONSUME(p);
+					return this.ACTION(() => this._tag(u(e.image, this.colIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
 					const e = this.CONSUME(m);
-					return this.ACTION(() => this._tag(d(e.image, this.rowIndex), this.getLexerPosition()));
+					return this.ACTION(() => this._tag(S(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(_);
-					return this.ACTION(() => this._tag(d(e.image, this.rowIndex), this.getLexerPosition()));
+					const e = this.CONSUME(O);
+					return this.ACTION(() => this._tag(S(e.image, this.rowIndex), this.getLexerPosition()));
 				} },
 				{ ALT: () => {
-					const e = this.CONSUME(E);
-					return this.ACTION(() => this._tag(h(e.image, this._locale), this.getLexerPosition()));
+					const e = this.CONSUME(_);
+					return this.ACTION(() => this._tag(C(e.image, this._locale), this.getLexerPosition()));
 				} }
 			]);
 			return this.ACTION(() => {
-				if (L && C) {
-					if ("" === L.name) return void this._reportError(C, `'${L.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
-					let e = C;
-					if (C.type === A.Postfix && C.inputs?.[0] && (e = C.inputs[0]), e.type === A.Cell || e.type === A.Named || e.type === A.Row || e.type === A.TableColumn || e.type === A.Error) {
-						e.value.scope = L.name, e.value.scopeImage = L.image;
+				if (E && A) {
+					if ("" === E.name) return void this._reportError(A, `'${E.image}' is not a valid sheet reference — a '!' needs a sheet name before it`);
+					let e = A;
+					if (A.type === R.Postfix && A.inputs?.[0] && (e = A.inputs[0]), e.type === R.Cell || e.type === R.Named || e.type === R.Row || e.type === R.TableColumn || e.type === R.Error) {
+						e.value.scope = E.name, e.value.scopeImage = E.image;
 						const t = this._tokenMap.get(e);
-						t && void 0 !== f && (t.tokenIndex = f);
+						t && void 0 !== L && (t.tokenIndex = L);
 					}
 				}
-			}), C;
+			}), A;
 		}), this._rulePrefixSheetName = this.RULE("rulePrefixSheetName", () => {
-			const { SheetQuoted: e, BracketedString: t, NamedToken: s, RangeOp: r, Sheet: i } = this._vocab;
+			const { SheetQuoted: e, BracketedString: t, NamedToken: s, Column: r, RangeOp: i, Sheet: n } = this._vocab;
 			return this.OR([{ ALT: () => {
 				const t = this.CONSUME(e).image;
 				return {
@@ -904,15 +910,18 @@ var te = {
 				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(s).image, this.CONSUME(r), e += ":";
+						e += this.OR2([{ ALT: () => this.CONSUME(s).image }, {
+							GATE: () => 36 !== this.LA(1).image.charCodeAt(0),
+							ALT: () => this.CONSUME(r).image
+						}]), this.CONSUME(i), e += ":";
 					}
 				});
-				const n = this.CONSUME(i).image;
+				const o = this.CONSUME(n).image;
 				return {
-					name: e + n.slice(0, -1),
-					image: e + n
+					name: e + o.slice(0, -1),
+					image: e + o
 				};
 			} }]);
 		}), this._ruleNumber = this.RULE("ruleNumber", () => {
@@ -927,12 +936,12 @@ var te = {
 			return this.MANY(() => {
 				this.CONSUME(e), s.push(this.SUBRULE2(this._ruleIntersectOp));
 			}), this.ACTION(() => 0 === s.length ? t : {
-				type: A.List,
+				type: R.List,
 				value: ",",
 				inputs: [t, ...s],
 				isReference: !0
 			});
-		}), this._lexer = E, this._locale = E.getLocale(), this._vocab = L, this._srParser = g?.srParser ?? new Z(this._locale), this.performSelfAnalysis();
+		}), this._lexer = m, this._locale = m.getLocale(), this._vocab = O, this._srParser = s?.srParser ?? new Q(this._locale), this.performSelfAnalysis();
 	}
 	getLexer() {
 		return this._lexer;
@@ -942,26 +951,26 @@ var te = {
 		let i;
 		if (!r) return {
 			root: {
-				type: A.Unparsed,
+				type: R.Unparsed,
 				value: s
 			},
 			errors: []
 		};
 		const n = r.tokens;
 		if (0 === n.length) throw new M.Parse(J);
-		return this.input = n, this._inputText = s, this._inputTextLength = s.length, this.rowIndex = e, this.colIndex = t, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), i = this._ruleRoot(), i && this._bindAllWhitespace(i), i = S(i, (t, s) => {
-			const r = t.type, i = s?.isReference ? s.value : void 0, n = "string" == typeof i && Q.has(i), o = "string" == typeof i && q.has(i), a = n ? s.inputs : void 0, h = a ? a[0] === t ? a[1] : a[0] : void 0, l = this._lexer.getMaxRow();
-			if (n && r !== A.Cell && Number.isInteger(t.value)) {
-				const s = d(t.image, e);
-				return N(s, t), "row" !== K(h) ? this._reportError(s, `'${t.image}' is not a valid reference — a whole row can only pair with another row (as in ${t.image}:${t.image})`) : H(t.image, l) || this._reportError(s, `'${t.image}' is not a valid row — rows run from 1 to ${l}`), s;
+		return this.input = n, this._inputText = s, this._inputTextLength = s.length, this.rowIndex = e, this.colIndex = t, this._astErrors = [], this._tokenMap = /* @__PURE__ */ new Map(), this.reset(), i = this._ruleRoot(), i && this._bindAllWhitespace(i), i = L(i, (t, s) => {
+			const r = t.type, i = s?.isReference ? s.value : void 0, n = "string" == typeof i && Z.has(i), o = "string" == typeof i && q.has(i), a = n ? s.inputs : void 0, h = a ? a[0] === t ? a[1] : a[0] : void 0, l = this._lexer.getMaxRow();
+			if (n && r !== R.Cell && Number.isInteger(t.value)) {
+				const s = S(t.image, e);
+				return I(s, t), "row" !== K(h) ? this._reportError(s, `'${t.image}' is not a valid reference — a whole row can only pair with another row (as in ${t.image}:${t.image})`) : H(t.image, l) || this._reportError(s, `'${t.image}' is not a valid row — rows run from 1 to ${l}`), s;
 			}
-			if (o && r === A.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 === A.Cell) {
+			if (o && r === R.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 === R.Cell) {
 				const e = t.value, s = e.colIndex === Number.MIN_SAFE_INTEGER, r = e.rowIndex === Number.MIN_SAFE_INTEGER;
 				if ((s || r) && K(h) === (s ? "row" : "col")) return s && !H(t.image, l) && this._reportError(t, `'${t.image}' is not a valid row — rows run from 1 to ${l}`), t;
 				if (s || r || e.colIndex >= 16384) {
-					const n = O(t.image);
-					N(n, t);
+					const n = g(t.image);
+					I(n, t);
 					const a = e.scope;
 					return a && (n.value.scope = a, n.value.scopeImage = e.scopeImage), s ? this._reportError(n, `'${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(n, `'${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(n, `'${t.image}' is a name — '${i}' needs a cell or range on both sides`), n;
 				}
@@ -1024,7 +1033,7 @@ var te = {
 	_bindAllWhitespace(e) {
 		if (e) {
 			if (this._bindNodeWhitespace(e), e.inputs) for (const t of e.inputs) t && this._bindAllWhitespace(t);
-			if (e.type === A.Array && Array.isArray(e.value)) {
+			if (e.type === R.Array && Array.isArray(e.value)) {
 				for (const t of e.value) if (t && Array.isArray(t.value)) for (const e of t.value) e && this._bindAllWhitespace(e);
 			}
 		}