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

package/assets/{DZt1ONN8CTTfmHGn.js → BtNEVWQWEp_Ie1nT.js}

@@ -1,15 +1,15 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.23
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.25
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { p as e, tt as t } from "./DIAQ_WlBCWhgHt-z.js";
-import { d as n, en as s, f as r, vt as o } from "./BomatnedZsGMF7MW.js";
-import { u as a } from "./BI8kb-rd9dW85XJs.js";
-import { $r as i, Ba as l, Bi as d, Br as u, E as c, Hi as f, Kr as m, La as p, Lr as h, Na as g, Pa as v, Qi as w, Rt as F, Si as b, Ta as y, Tn as I, Ui as x, Xi as A, Xr as C, Zr as E, bi as S, ci as P, ei as k, jt as M, la as T, mn as R, na as O, no as N, or as L, pi as $, qi as _, qn as D, ri as V, rn as U, ut as H, v as B, va as j, vn as q, vr as z, xt as G } from "./Cl04_aSpBHTwfsQR.js";
-import { a as K, i as Q, n as J, o as W, r as X } from "./t4qTfgdlstczTs2z.js";
-var Z = [
+import { p as e, tt as t } from "./ixHQtoul8ubEJfWS.js";
+import { Dt as n, Et as s, _t as r, d as o } from "./BbfSzxx5EzAvn-_F.js";
+import { u as a } from "./CCOaNx5_BfWCc9yz.js";
+import { $a as l, $i as i, Aa as d, Bi as u, D as c, Gn as f, Gr as m, Ha as p, I as h, Ii as g, Jr as w, Ka as v, Ln as F, Nn as b, Nt as y, Oa as I, Q as x, Ra as A, Sa as C, aa as E, b as S, bi as P, f as k, fa as M, fn as T, hr as R, l as O, li as N, oa as $, pt as L, qr as _, st as D, ut as V, wa as U, wi as H, wr as B, xa as G, xn as z, xt as j, z as q } from "./ckvxz2tZRlY1UPpg.js";
+import { a as K, i as Q, n as J, o as W, r as X } from "./BSJ_L1gNOejEih6N.js";
+var Y = [
 	"Jan",
 	"Feb",
 	"Mar",
@@ -22,7 +22,7 @@ var Z = [
 	"Oct",
 	"Nov",
 	"Dec"
-], Y = [
+], Z = [
 	31,
 	29,
 	31,
@@ -35,24 +35,24 @@ var Z = [
 	31,
 	30,
 	31
-], ee = (e, t, n, s) => {
-	if ("number" != typeof n) return null;
-	if (n < e.start) return 0;
+], ee = (e, t, s, r) => {
+	if ("number" != typeof s) return null;
+	if (s < e.start) return 0;
 	const o = t - 1;
 	if (((e) => "numbers" === e.by || "days" === e.by && 1 !== (e.interval ?? 1))(e)) {
-		const s = Math.floor((n - e.start) / (e.interval ?? 1));
-		return s >= t - 2 ? n <= e.end ? t - 2 : o : s + 1;
+		const n = Math.floor((s - e.start) / (e.interval ?? 1));
+		return n >= t - 2 ? s <= e.end ? t - 2 : o : n + 1;
 	}
-	if (n > e.end) return o;
-	const a = r(n, s, !0);
+	if (s > e.end) return o;
+	const a = n(s, r, !0);
 	if (!a) return null;
 	switch (e.by) {
-		case "years": return Math.min(a.year - (r(e.start, s, !0)?.year ?? a.year) + 1, o);
+		case "years": return Math.min(a.year - (n(e.start, r, !0)?.year ?? a.year) + 1, o);
 		case "quarters": return Math.floor((a.month - 1) / 3) + 1;
 		case "months": return a.month;
 		case "days": {
 			let e = a.day;
-			for (let t = 0; t < a.month - 1; t++) e += Y[t];
+			for (let t = 0; t < a.month - 1; t++) e += Z[t];
 			return e;
 		}
 		case "hours": return a.hour + 1;
@@ -61,71 +61,71 @@ var Z = [
 		default: return null;
 	}
 }, te = (e, t) => {
-	const n = e.fields ?? [], s = v(e.records, n.length);
-	if (!n.some(i)) return s;
-	const r = v(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
+	const n = e.fields ?? [], s = $(e.records, n.length);
+	if (!n.some(U)) return s;
+	const r = $(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
 	for (let e = 0; e < n.length; e++) {
 		const l = n[e];
-		if (!i(l)) continue;
-		const d = l.group, u = s[d.base] ?? [], c = r[d.base] ?? [], f = new Int32Array(c.length);
-		for (let e = 0; e < c.length; e++) {
-			const n = d.range ? ee(d.range, d.items.length, m(c[e]), t) : d.discrete?.[e] ?? null;
+		if (!U(l)) continue;
+		const i = l.group, d = s[i.base] ?? [], u = r[i.base] ?? [], f = new Int32Array(u.length);
+		for (let e = 0; e < u.length; e++) {
+			const n = i.range ? ee(i.range, i.items.length, c(u[e]), t) : i.discrete?.[e] ?? null;
 			f[e] = n ?? -1;
 		}
-		const p = new Array(o);
+		const m = new Array(o);
 		for (let e = 0; e < o; e++) {
-			const t = f[u[e]];
+			const t = f[d[e]];
 			if (void 0 === t || t < 0) return null;
-			p[e] = t;
+			m[e] = t;
 		}
-		a[e] = p;
+		a[e] = m;
 	}
 	return a;
 }, ne = (e) => String(Number(e.toPrecision(12))), se = (e, t) => {
-	const n = r(e, t, !0);
-	return n ? `${n.month}/${n.day}/${n.year}` : String(e);
-}, re = (e, t, n) => {
-	const s = e.range;
+	const s = n(e, t, !0);
+	return s ? `${s.month}/${s.day}/${s.year}` : String(e);
+}, re = (e, t, s) => {
+	const r = e.range;
 	let o = 1 / 0, a = -1 / 0;
 	for (const e of t) {
 		if ("number" != typeof e) return null;
 		e < o && (o = e), e > a && (a = e);
 	}
 	if (0 === t.length) return e;
-	const i = { ...s };
-	s.fixedStart || (i.start = o), s.fixedEnd || (i.end = "numbers" !== s.by && Number.isInteger(a) ? a + 1 : a);
-	const { inner: l, endText: d } = ((e, t) => {
-		const { start: n, end: s } = e, o = e.interval ?? 1, a = se(s, t), i = (e, t) => Array.from({ length: e }, (e, n) => t(n));
+	const l = { ...r };
+	r.fixedStart || (l.start = o), r.fixedEnd || (l.end = "numbers" !== r.by && Number.isInteger(a) ? a + 1 : a);
+	const { inner: i, endText: d } = ((e, t) => {
+		const { start: s, end: r } = e, o = e.interval ?? 1, a = se(r, t), l = (e, t) => Array.from({ length: e }, (e, n) => t(n));
 		switch (e.by) {
 			case "numbers": {
-				const e = Math.max(1, Math.ceil(Number(((s - n) / o).toPrecision(12)))), t = Number.isInteger(Number(((s - n) / o).toPrecision(12))), r = Number.isInteger(n) && Number.isInteger(o);
+				const e = Math.max(1, Math.ceil(Number(((r - s) / o).toPrecision(12)))), t = Number.isInteger(Number(((r - s) / o).toPrecision(12))), n = Number.isInteger(s) && Number.isInteger(o);
 				return {
-					inner: i(e, (a) => {
-						const i = n + a * o, l = a === e - 1 && t ? s : r ? i + o - 1 : i + o;
-						return `${ne(i)}-${ne(l)}`;
+					inner: l(e, (a) => {
+						const l = s + a * o, i = a === e - 1 && t ? r : n ? l + o - 1 : l + o;
+						return `${ne(l)}-${ne(i)}`;
 					}),
-					endText: ne(t ? s : n + e * o)
+					endText: ne(t ? r : s + e * o)
 				};
 			}
 			case "days":
 				if (1 === o) {
 					const e = [];
-					return Y.forEach((t, n) => {
-						for (let s = 1; s <= t; s++) e.push(`${s}-${Z[n]}`);
+					return Z.forEach((t, n) => {
+						for (let s = 1; s <= t; s++) e.push(`${s}-${Y[n]}`);
 					}), {
 						inner: e,
 						endText: a
 					};
 				}
 				return {
-					inner: i(Math.max(1, Math.ceil((s - n) / o)), (e) => {
-						const r = n + e * o;
-						return `${se(r, t)} - ${se(Math.min(r + o - 1, s), t)}`;
+					inner: l(Math.max(1, Math.ceil((r - s) / o)), (e) => {
+						const n = s + e * o;
+						return `${se(n, t)} - ${se(Math.min(n + o - 1, r), t)}`;
 					}),
 					endText: a
 				};
 			case "months": return {
-				inner: Z.slice(),
+				inner: Y.slice(),
 				endText: a
 			};
 			case "quarters": return {
@@ -138,28 +138,28 @@ var Z = [
 				endText: a
 			};
 			case "years": {
-				const e = r(n, t)?.year ?? 0;
+				const e = n(s, t)?.year ?? 0;
 				return {
-					inner: i((r(s, t)?.year ?? e) - e + 1, (t) => String(e + t)),
+					inner: l((n(r, t)?.year ?? e) - e + 1, (t) => String(e + t)),
 					endText: a
 				};
 			}
 			case "hours": return {
-				inner: i(24, (e) => `${e % 12 == 0 ? 12 : e % 12} ${e < 12 ? "AM" : "PM"}`),
+				inner: l(24, (e) => `${e % 12 == 0 ? 12 : e % 12} ${e < 12 ? "AM" : "PM"}`),
 				endText: a
 			};
 			default: return {
-				inner: i(60, (e) => `:${String(e).padStart(2, "0")}`),
+				inner: l(60, (e) => `:${String(e).padStart(2, "0")}`),
 				endText: a
 			};
 		}
-	})(i, n), u = "numbers" === i.by ? ne(i.start) : se(i.start, n);
+	})(l, s), u = "numbers" === l.by ? ne(l.start) : se(l.start, s);
 	return {
 		...e,
-		range: i,
+		range: l,
 		items: [
 			`<${u}`,
-			...l,
+			...i,
 			`>${d}`
 		]
 	};
@@ -191,37 +191,37 @@ var Z = [
 			n += t, s += t.length;
 			continue;
 		}
-		const a = "'" === o, i = a ? null : /^[\p{L}_][\p{L}\p{N}_.]*/u.exec(e.slice(s))?.[0];
-		if (!a && !i) {
+		const a = "'" === o, l = a ? null : /^[\p{L}_][\p{L}\p{N}_.]*/u.exec(e.slice(s))?.[0];
+		if (!a && !l) {
 			n += o, s++;
 			continue;
 		}
-		const l = a ? r() : i;
-		if (a || (s += l.length), "(" !== e[s]) {
+		const i = a ? r() : l;
+		if (a || (s += i.length), "(" !== e[s]) {
 			if ("[" === e[s]) {
 				s++;
 				let o = "";
 				for ("'" === e[s] && (o = r()); s < e.length && "]" !== e[s];) o += e[s++];
 				s++;
-				const a = t(l, o);
+				const a = t(i, o);
 				if (null === a) return null;
 				n += a;
 				continue;
 			}
-			n += t(l, null) ?? (a ? `'${l.replace(/'/g, "''")}'` : l);
-		} else n += l;
+			n += t(i, null) ?? (a ? `'${i.replace(/'/g, "''")}'` : i);
+		} else n += i;
 	}
 	return n;
 }, ae = (e) => {
 	let t = "";
 	for (let n = e + 1; n > 0; n = Math.floor((n - 1) / 26)) t = String.fromCharCode(65 + (n - 1) % 26) + t;
 	return `${t}1`;
-}, ie = (e, t) => ({
+}, le = (e, t) => ({
 	rowStart: 0,
 	colStart: e,
 	rowEnd: t - 1,
 	colEnd: e
-}), le = (e, t) => {
+}), ie = (e, t) => {
 	const n = [];
 	for (let s = 0; s < t; s++) n.push([s, [[0, e.map((e) => e[s] ?? null)]]]);
 	return n;
@@ -229,41 +229,41 @@ var Z = [
 	const n = t.fields ?? [], s = [], r = [], o = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), i = (e, t) => {
 		if (o.has(e)) return !0;
 		if (t.includes(e)) return !1;
-		const l = [];
+		const d = [];
 		oe(n[e].formula, (e) => {
-			const t = n.findIndex((t) => T(t.name, e));
-			return t >= 0 && l.push(t), t >= 0 ? "" : null;
+			const t = n.findIndex((t) => l(t.name, e));
+			return t >= 0 && d.push(t), t >= 0 ? "" : null;
 		});
-		for (const r of l) if (j(n[r])) {
+		for (const r of d) if (u(n[r])) {
 			if (!i(r, [...t, e])) return !1;
 		} else s.includes(r) || s.push(r);
 		return o.set(e, r.length), a.set(e, n[e].formula), r.push({
 			field: e,
 			expression: ""
 		}), !0;
-	}, l = [];
-	for (const [t, s] of (e.dataFields ?? []).entries()) if (j(n[s.field])) {
+	}, d = [];
+	for (const [t, s] of (e.dataFields ?? []).entries()) if (u(n[s.field])) {
 		if (!i(s.field, [])) return null;
-		l.push({
+		d.push({
 			data: t,
 			formula: o.get(s.field)
 		});
 	}
-	const d = (e, t) => {
+	const c = (e, t) => {
 		if (null !== t) return null;
-		const r = n.findIndex((t) => T(t.name, e));
-		return r >= 0 ? ae(j(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
+		const r = n.findIndex((t) => l(t.name, e));
+		return r >= 0 ? ae(u(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
 		var a;
 	};
 	for (const e of r) {
-		const t = oe(a.get(e.field), d);
+		const t = oe(a.get(e.field), c);
 		if (null === t) return null;
 		e.expression = t;
 	}
 	return {
 		operands: s,
 		formulas: r,
-		measures: l
+		measures: d
 	};
 }, ue = /* @__PURE__ */ new Set([
 	"sum",
@@ -305,7 +305,7 @@ var Z = [
 	stdDevP: 10,
 	var: 7,
 	varP: 8
-}, ve = {
+}, we = {
 	sum: "Sum",
 	countA: "Count",
 	avg: "Average",
@@ -317,11 +317,11 @@ var Z = [
 	stdDevP: "StdDevp",
 	var: "Var",
 	varP: "Varp"
-}, we = (e) => {
+}, ve = (e) => {
 	const t = e?.subtotals;
 	return t && !t.includes("default") ? he.filter((e) => t.includes(e)) : [];
 }, Fe = (e, t) => {
-	const n = new Set(t.flatMap((t) => t.field === ce ? [] : we(e.fields?.[t.field])));
+	const n = new Set(t.flatMap((t) => t.field === ce ? [] : ve(e.fields?.[t.field])));
 	return he.filter((e) => n.has(e));
 }, be = (e, t) => {
 	const n = t.filter((e) => e.field !== ce).map((e) => e.field);
@@ -343,71 +343,71 @@ var Z = [
 	percent: 13,
 	percentDiff: 14
 }, Ie = (e, t, n, s) => {
-	const r = R.peek(), o = e.fields, a = t.fields;
+	const r = b.peek(), o = e.fields, a = t.fields;
 	if (!r || !o || !a || o.length !== a.length) return null;
-	if (H(e)) return {
+	if (f(e)) return {
 		cells: [],
-		...I,
+		...D,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: C(e),
+		header: G(e),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
 		...s?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	const l = S(e, a), d = l ? s?.filters : null;
-	if (l && !d) return null;
-	const u = o.some((e) => e.items?.some((e) => e.calculated));
-	if (u && !d?.calculatedRecords) return null;
-	const c = de(e, t);
-	if (!c || c.measures.length > 0 && !d?.fieldValues) return null;
+	const l = k(e, a), i = l ? s?.filters : null;
+	if (l && !i) return null;
+	const d = o.some((e) => e.items?.some((e) => e.calculated));
+	if (d && !i?.calculatedRecords) return null;
+	const u = de(e, t);
+	if (!u || u.measures.length > 0 && !i?.fieldValues) return null;
 	if ((e.dataFields ?? []).some((e) => void 0 === ye[e.showDataAs ?? "normal"] || void 0 === pe[e.subtotal ?? "sum"])) return null;
-	const f = xe(e, t, n, d?.calculatedRecords, c.operands);
-	if (!f) return null;
-	const { items: m, records: p, values: h, n: g } = f, v = (e) => !!e && (!e.noRecords || i(e)), w = e.form ?? "compact", F = (e) => {
+	const c = xe(e, t, n, i?.calculatedRecords, u.operands);
+	if (!c) return null;
+	const { items: m, records: p, values: h, n: w } = c, v = (e) => !!e && (!e.noRecords || U(e)), F = e.form ?? "compact", y = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === ce) {
 				t.push({
 					field: n,
-					form: w
+					form: F
 				});
 				continue;
 			}
 			const e = o[n], s = e?.subtotals;
 			if (!e || !v(a[n])) return null;
-			if (u && s && s.some((e) => "default" !== e)) return null;
+			if (d && s && s.some((e) => "default" !== e)) return null;
 			t.push({
 				field: n,
 				form: e.form ?? "compact"
 			});
 		}
 		return t;
-	}, b = F(e.rowFields), y = F(e.columnFields), x = e.pageFields ?? [];
-	if (!b || !y || x.some((e) => !v(a[e.field]))) return null;
-	const A = U(e, s?.slicerFields);
-	return A.pageFields?.some((e) => !v(a[e.field])) ? null : Te(e, t, m, b, y, Se(r, A, m, p, h, b, y, g, d?.keep, d?.records, c.operands.length, d?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
+	}, I = y(e.rowFields), x = y(e.columnFields), A = e.pageFields ?? [];
+	if (!I || !x || A.some((e) => !v(a[e.field]))) return null;
+	const C = g(e, s?.slicerFields);
+	return C.pageFields?.some((e) => !v(a[e.field])) ? null : Te(e, t, m, I, x, Se(r, C, m, p, h, I, x, w, i?.keep, i?.records, u.operands.length, i?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
 }, xe = (e, t, n, s, r = []) => {
-	const o = t.fields?.length ?? 0, a = x(t);
+	const o = t.fields?.length ?? 0, a = w(t);
 	if (!t.records) return null;
 	const l = te(t, n.isDate1904());
 	if (!l) return null;
-	const d = !0 === t.fields?.some(i), u = d ? v(t.items, o) : a, c = d ? v(t.records, o) : l, f = t.recordCount ?? 0, p = s?.count ?? 0, h = f + p, g = (e, n) => {
-		const s = !t.fields?.[e]?.noRecords, r = s ? c[e] : l[e] ?? [], o = s ? u[e] : a[e], i = new Array(h);
-		for (let e = 0; e < f; e++) i[e] = m(o[r[e]]);
-		for (let e = 0; e < p; e++) i[f + e] = n?.[e] ?? null;
+	const i = !0 === t.fields?.some(U), d = i ? $(t.items, o) : a, u = i ? $(t.records, o) : l, f = t.recordCount ?? 0, m = s?.count ?? 0, p = f + m, h = (e, n) => {
+		const s = !t.fields?.[e]?.noRecords, r = s ? u[e] : l[e] ?? [], o = s ? d[e] : a[e], i = new Array(p);
+		for (let e = 0; e < f; e++) i[e] = c(o[r[e]]);
+		for (let e = 0; e < m; e++) i[f + e] = n?.[e] ?? null;
 		return i;
-	}, w = [...(e.dataFields ?? []).map((e, t) => g(e.field, s?.values[t])), ...r.map((e) => g(e))];
+	}, g = [...(e.dataFields ?? []).map((e, t) => h(e.field, s?.values[t])), ...r.map((e) => h(e))];
 	return {
 		items: a,
 		records: s ? l.map((e, t) => e.concat(s.ids[t] ?? [])) : l,
-		values: w,
-		n: h
+		values: g,
+		n: p
 	};
-}, Ae = async (e, t, n, s, r, o, a, i, l) => {
-	const d = R.peek(), u = e.dataFields?.[r];
+}, Ae = async (e, t, n, s, r, o, a, l, i) => {
+	const d = b.peek(), u = e.dataFields?.[r];
 	if (!d || !e.fields || !u || void 0 === pe[u.subtotal ?? "sum"]) return null;
 	const c = [e.rowFields, e.columnFields].map((e) => (e ?? []).filter((e) => e !== ce)), f = c.findIndex((e) => e.includes(s)), m = c[f];
 	if (!m) return null;
@@ -421,46 +421,46 @@ var Z = [
 				return n;
 			})
 		};
-	}), { columnGrandTotals: g, ...v } = e, { showDataAs: w, ...F } = u, b = {
-		...v,
+	}), { columnGrandTotals: g, ...w } = e, { showDataAs: v, ...F } = u, y = {
+		...w,
 		fields: h,
 		rowFields: [...p, s],
 		columnFields: [],
 		dataFields: [F],
 		rowGrandTotals: !1
-	}, y = i ? {
-		...i,
-		values: [i.values[r] ?? []]
-	} : i, I = de(b, t);
-	if (!I || I.measures.length > 0 && !l) return null;
-	const x = xe(b, t, n, y, I.operands);
-	if (!x) return null;
-	const { items: A, records: C, values: E, n: S } = x, P = b.rowFields.map((e) => ({
+	}, I = l ? {
+		...l,
+		values: [l.values[r] ?? []]
+	} : l, x = de(y, t);
+	if (!x || x.measures.length > 0 && !i) return null;
+	const A = xe(y, t, n, I, x.operands);
+	if (!A) return null;
+	const { items: C, records: E, values: S, n: P } = A, k = y.rowFields.map((e) => ({
 		field: e,
 		form: "compact"
 	}));
-	let k;
+	let M;
 	if (a) {
 		const e = 0 === f ? 1 : 2;
-		k = new Uint8Array(S);
-		for (let t = 0; t < S; t++) {
+		M = new Uint8Array(P);
+		for (let t = 0; t < P; t++) {
 			const n = a[t];
-			k[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
+			M[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
 		}
 	}
-	const M = I.measures.length > 0 ? await Ee(d, I, b, A, C, E, P, [], S, o, k, l) : void 0, T = Se(d, b, A, C, E, P, [], S, o, k, I.operands.length, M), O = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), L = T.columns.length;
-	return T.rows.forEach((e, t) => {
+	const T = x.measures.length > 0 ? await Ee(d, x, y, C, E, S, k, [], P, o, M, i) : void 0, R = Se(d, y, C, E, S, k, [], P, o, M, x.operands.length, T), O = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), $ = R.columns.length;
+	return R.rows.forEach((e, t) => {
 		if (0 !== e.kind || e.path.length !== p.length + 1) return;
 		const n = p.map((t, n) => O(t, e.path[n])).join(",");
 		let r = N.get(n);
 		r || N.set(n, r = {
 			ids: [],
 			totals: []
-		}), r.ids.push(O(s, e.path[p.length])), r.totals.push(T.values[t * L]);
+		}), r.ids.push(O(s, e.path[p.length])), r.totals.push(R.values[t * $]);
 	}), {
 		outer: p,
 		groups: N,
-		records: C
+		records: E
 	};
 }, Ce = (e, t, n) => {
 	const s = new Uint32Array(t).fill(fe), r = new Uint8Array(t), o = e.items;
@@ -473,8 +473,8 @@ var Z = [
 		ranks: s,
 		flags: r
 	};
-}, Ee = async (e, t, n, s, r, o, i, l, d, u, c, f) => {
-	const { request: m, errors: p } = Pe(e, n, s, r, o, i, l, d, u, c, t.operands.length);
+}, Ee = async (e, t, n, s, r, o, l, i, d, u, c, f) => {
+	const { request: m, errors: p } = Pe(e, n, s, r, o, l, i, d, u, c, t.operands.length);
 	let h = 0;
 	const g = [];
 	try {
@@ -504,49 +504,49 @@ var Z = [
 			for (let s = 0; s < n; s++) t[s] = e[s] ?? 0;
 			return t[n] = 0, t;
 		}), a = await s.evaluateBatch({
-			values: le(o, r),
+			values: ie(o, r),
 			formulas: e.formulas.map(({ expression: e }, n) => ({
 				expression: e,
-				coords: ie(t.length + n, r)
+				coords: le(t.length + n, r)
 			}))
-		}), i = /* @__PURE__ */ new Map();
+		}), l = /* @__PURE__ */ new Map();
 		for (const { data: t, formula: n } of e.measures) {
 			const e = new Array(r);
 			for (let t = 0; t < r; t++) e[t] = a[n].getValueAt(t, 0) ?? 0;
-			i.set(t, e);
+			l.set(t, e);
 		}
-		return i;
+		return l;
 	})(t, g, h, f);
-}, Se = (e, t, n, s, r, o, i, l, d, u, c = 0, f, m = !1) => {
-	const { request: p, errors: h } = Pe(e, t, n, s, r, o, i, l, d, u, c, f, m), g = h.codeOf(a.BuiltIn.NA), v = h.codeOf(a.BuiltIn.Null), w = p.lay_out(0, g, v);
+}, Se = (e, t, n, s, r, o, l, i, d, u, c = 0, f, m = !1) => {
+	const { request: p, errors: h } = Pe(e, t, n, s, r, o, l, i, d, u, c, f, m), g = h.codeOf(a.BuiltIn.NA), w = h.codeOf(a.BuiltIn.Null), v = p.lay_out(0, g, w);
 	try {
-		const n = ke(w.row_lines(), w.row_stride()), s = ke(w.column_lines(), w.column_stride()), r = w.states(), a = w.values();
+		const n = ke(v.row_lines(), v.row_stride()), s = ke(v.column_lines(), v.column_stride()), r = v.states(), a = v.values();
 		try {
-			const l = Q(e.wasm_memory().buffer, a, h), d = new Array(r.length);
-			for (let e = 0; e < r.length; e++) d[e] = 0 === r[e] ? l(e) : null;
+			const i = Q(e.wasm_memory().buffer, a, h), d = new Array(r.length);
+			for (let e = 0; e < r.length; e++) d[e] = 0 === r[e] ? i(e) : null;
 			return {
 				rows: n,
 				columns: s,
 				states: r,
 				values: d,
-				functions: m ? Fe(t, [...o, ...i]) : []
+				functions: m ? Fe(t, [...o, ...l]) : []
 			};
 		} finally {
 			a.free();
 		}
 	} finally {
-		w.free(), p.free();
+		v.free(), p.free();
 	}
-}, Pe = (e, t, n, s, r, o, a, i, l, d, u = 0, c, f = !1) => {
-	const m = t.fields, p = new e.LayoutRequest(i), h = f ? Fe(t, [...o, ...a]) : [], g = [], v = (e, s) => {
+}, Pe = (e, t, n, s, r, o, a, l, i, d, u = 0, c, f = !1) => {
+	const m = t.fields, p = new e.LayoutRequest(l), h = f ? Fe(t, [...o, ...a]) : [], g = [], w = (e, s) => {
 		for (const { field: r, form: o } of s) {
 			if (r === ce) {
 				p.add_values_slot(e, "tabular" === o);
 				continue;
 			}
-			const a = m[r], i = a.subtotals, l = (!i || i.includes("default") ? 1 : 0) | (!1 !== a.subtotalsOnTop ? 2 : 0) | (a.blankRowAfter ? 4 : 0) | (a.showItemsWithNoData ? 8 : 0) | ("tabular" === o ? 16 : 0), d = p.add_field(e, n[r].length, l), u = a.sort;
+			const a = m[r], l = a.subtotals, i = (!l || l.includes("default") ? 1 : 0) | (!1 !== a.subtotalsOnTop ? 2 : 0) | (a.blankRowAfter ? 4 : 0) | (a.showItemsWithNoData ? 8 : 0) | ("tabular" === o ? 16 : 0), d = p.add_field(e, n[r].length, i), u = a.sort;
 			void 0 !== u?.dataField && p.set_field_sort(e, d, u.dataField, "descending" === u.order, new Uint32Array((u.scope?.items ?? []).map((e) => e.item)));
-			const c = f ? we(a) : [];
+			const c = f ? ve(a) : [];
 			if (c.length > 0) {
 				const n = s[s.length - 1].field === r && be(t, s);
 				p.set_field_functions(e, d, new Uint32Array(c.map((e) => h.indexOf(e))), n);
@@ -558,8 +558,8 @@ var Z = [
 			});
 		}
 	};
-	v(0, o), v(1, a);
-	const w = (t.pageFields ?? []).map((e) => ({
+	w(0, o), w(1, a);
+	const v = (t.pageFields ?? []).map((e) => ({
 		page: e,
 		index: p.add_page(n[e.field].length)
 	})), F = r.map(() => p.add_values(127)), b = t.dataFields ?? [];
@@ -569,8 +569,8 @@ var Z = [
 		if (!n) return;
 		let s = 2, r = o.findIndex((t) => t.field === e.baseField);
 		r >= 0 ? s = 0 : (r = a.findIndex((t) => t.field === e.baseField), r >= 0 && (s = 1));
-		const i = "previous" === e.baseItem ? 4294967294 : "next" === e.baseItem ? 4294967295 : e.baseItem ?? 0;
-		p.set_show_as(t, n, s, Math.max(r, 0), i);
+		const l = "previous" === e.baseItem ? 4294967294 : "next" === e.baseItem ? 4294967295 : e.baseItem ?? 0;
+		p.set_show_as(t, n, s, Math.max(r, 0), l);
 	});
 	for (let e = 0; e < u; e++) p.add_measure(b.length + e, pe.sum);
 	u > 0 && p.set_operand_measures(u);
@@ -582,17 +582,17 @@ var Z = [
 	}));
 	p.set_grand(!1 !== t.rowGrandTotals, !1 !== t.columnGrandTotals);
 	const I = d ? p.record_keep() : null, x = e.wasm_memory().buffer;
-	d && null !== I && new Uint8Array(x, I, i).set(d.subarray(0, i));
+	d && null !== I && new Uint8Array(x, I, l).set(d.subarray(0, l));
 	for (const { axis: e, slot: t, field: r } of g) {
 		const o = n[r].length;
-		new Uint32Array(x, p.field_ids(e, t), i).set(s[r].slice(0, i));
-		const { ranks: a, flags: d } = Ce(m[r], o, l?.get(r));
+		new Uint32Array(x, p.field_ids(e, t), l).set(s[r].slice(0, l));
+		const { ranks: a, flags: d } = Ce(m[r], o, i?.get(r));
 		new Uint32Array(x, p.field_ranks(e, t), o).set(a), new Uint8Array(x, p.field_flags(e, t), o).set(d);
 	}
-	for (const { page: e, index: t } of w) {
+	for (const { page: e, index: t } of v) {
 		const r = n[e.field].length;
-		new Uint32Array(x, p.page_ids(t), i).set(s[e.field].slice(0, i));
-		const { ranks: o, flags: a } = Ce(m[e.field], r), d = new Uint8Array(x, p.page_keep(t), r), u = void 0 !== e.item ? m[e.field].items?.[e.item]?.item : void 0, c = e.slicer ? l?.get(e.field) : void 0;
+		new Uint32Array(x, p.page_ids(t), l).set(s[e.field].slice(0, l));
+		const { ranks: o, flags: a } = Ce(m[e.field], r), d = new Uint8Array(x, p.page_keep(t), r), u = void 0 !== e.item ? m[e.field].items?.[e.item]?.item : void 0, c = e.slicer ? i?.get(e.field) : void 0;
 		for (let t = 0; t < r; t++) {
 			const n = void 0 !== u ? t === u : !(o[t] === fe && m[e.field].items || 1 & a[t]);
 			d[t] = !n || c && 0 === c[t] ? 0 : 1;
@@ -601,14 +601,14 @@ var Z = [
 	const A = new J();
 	F.forEach((e, t) => {
 		const n = {
-			doubles: new Float64Array(x, e, i),
-			ints: new Int32Array(x, e, 2 * i),
-			types: new Uint8Array(x, e + 8 * i, i)
+			doubles: new Float64Array(x, e, l),
+			ints: new Int32Array(x, e, 2 * l),
+			types: new Uint8Array(x, e + 8 * l, l)
 		}, s = {
 			ok: !0,
 			numeric: !0
 		}, o = r[t];
-		for (let e = 0; e < i; e++) X(n, e, o[e], A, s);
+		for (let e = 0; e < l; e++) X(n, e, o[e], A, s);
 	});
 	for (const { column: e, ptr: t } of y) {
 		const n = e.length, s = {
@@ -649,93 +649,93 @@ var Z = [
 		} else s.type = 1 === e.kind ? null !== e.function ? t[e.function] : "default" : 2 === e.kind ? "grand" : "blank", s.items = 2 === e.kind ? [0] : e.path.slice();
 		return null !== e.data && e.data > 0 && (s.dataField = e.data), s;
 	});
-}, Te = (e, t, n, r, o, i, l, f, p) => {
-	const v = e.fields, w = t.fields, F = e.dataFields ?? [], y = (t) => t === ce ? e.valuesCaption ?? "Values" : v[t].name ?? w[t].name, I = (e, t) => {
-		if (e === ce) return F[t]?.name ?? "";
-		const s = v[e].items?.[t];
+}, Te = (e, t, n, s, r, l, d, u, f) => {
+	const h = e.fields, g = t.fields, w = e.dataFields ?? [], F = (t) => t === ce ? e.valuesCaption ?? "Values" : h[t].name ?? g[t].name, b = (e, t) => {
+		if (e === ce) return w[t]?.name ?? "";
+		const s = h[e].items?.[t];
 		if (void 0 !== s?.name) return s.name;
-		const r = m(n[e][s?.item ?? t]);
-		return null === r ? L : r;
-	}, x = (e, t) => {
-		const n = I(e, t);
+		const r = c(n[e][s?.item ?? t]);
+		return null === r ? i : r;
+	}, y = (e, t) => {
+		const n = b(e, t);
 		if ("number" == typeof n) {
-			const o = v[e].items?.[t]?.item ?? t, a = void 0 === (v[e].numberFormat ?? w[e].numberFormat) && u(w[e], o);
-			return s(l, a ? h(P(w[e], o), l) : h(v[r = e].numberFormat ?? w[r].numberFormat, l), n);
+			const r = h[e].items?.[t]?.item ?? t, a = void 0 === (h[e].numberFormat ?? g[e].numberFormat) && v(g[e], r);
+			return o(d, a ? p(P(g[e], r), d) : p(h[s = e].numberFormat ?? g[s].numberFormat, d), n);
 		}
-		var r;
+		var s;
 		return a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-	}, E = (e) => {
-		if (void 0 !== e.item) return I(e.field, e.item);
-		const t = v[e.field].items ?? [];
+	}, x = (e) => {
+		if (void 0 !== e.item) return b(e.field, e.item);
+		const t = h[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		const n = t.flatMap((e, t) => c(e) && !e.hidden ? [t] : []);
-		return 1 === n.length ? I(e.field, n[0]) : "(Multiple Items)";
-	}, S = e.grandTotalCaption ?? "Grand Total", k = f ? /* @__PURE__ */ new Map() : null, M = (e, t) => e === ce ? {
+		const n = t.flatMap((e, t) => z(e) && !e.hidden ? [t] : []);
+		return 1 === n.length ? b(e.field, n[0]) : "(Multiple Items)";
+	}, A = e.grandTotalCaption ?? "Grand Total", C = u ? /* @__PURE__ */ new Map() : null, S = (e, t) => e === ce ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, T = (e) => e === ce ? null : {
+	}, k = (e) => e === ce ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, R = (e, t) => 2 === e.kind && t === S ? { kind: "grandTotal" } : null, O = 0 === r.length && 0 === o.length && 0 === F.length, N = O ? {
+	}, M = (e, t) => 2 === e.kind && t === A ? { kind: "grandTotal" } : null, T = 0 === s.length && 0 === r.length && 0 === w.length, O = T ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : C(e), $ = O ? [] : Me(i.rows, i.functions), _ = O ? [] : Me(i.columns, i.functions), D = A({
+	} : G(e), N = T ? [] : Me(l.rows, l.functions), $ = T ? [] : Me(l.columns, l.functions), L = I({
 		...e,
-		header: N,
-		rowLines: $,
-		columnLines: _
-	}), V = i.columns.length, U = (e) => "row" === e ? r : o, H = (t) => {
+		header: O,
+		rowLines: N,
+		columnLines: $
+	}), _ = l.columns.length, D = (e) => "row" === e ? s : r, V = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [y(n), {
+				return [F(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
 			}
 			case "pageItem": {
 				const n = e.pageFields[t.page];
-				return [E(n), {
+				return [x(n), {
 					kind: "pageItem",
 					page: t.page
 				}];
 			}
-			case "dataCaption": return [F[t.data]?.name ?? null, {
+			case "dataCaption": return [w[t.data]?.name ?? null, {
 				kind: "dataCaption",
 				data: t.data
 			}];
-			case "rowHeader": return [r.every((e) => e.field === ce) ? e.valuesCaption ?? "Values" : e.rowHeaderCaption ?? "Row Labels", { kind: "rowHeader" }];
+			case "rowHeader": return [s.every((e) => e.field === ce) ? e.valuesCaption ?? "Values" : e.rowHeaderCaption ?? "Row Labels", { kind: "rowHeader" }];
 			case "columnHeader": return [e.columnHeaderCaption ?? "Column Labels", { kind: "columnHeader" }];
 			case "fieldCaption": {
-				const e = U(t.axis)[t.level].field;
-				return [y(e), T(e)];
+				const e = D(t.axis)[t.level].field;
+				return [F(e), k(e)];
 			}
 			case "label": {
-				const e = U(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [I(e, n), M(e, n)];
+				const e = D(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [b(e, n), S(e, n)];
 			}
 			case "total": {
-				const e = ("row" === t.axis ? i.rows : i.columns)[t.line.index], n = ((e, t) => {
-					const n = e.findIndex((e) => e.field === ce) >= t.path.length && null !== t.data, s = n ? F[t.data]?.name ?? "" : "";
-					if (2 === t.kind) return n ? `Total ${s}` : S;
-					const r = t.path.length - 1, o = e[r].field, a = x(o, t.path[r]);
+				const e = ("row" === t.axis ? l.rows : l.columns)[t.line.index], n = ((e, t) => {
+					const n = e.findIndex((e) => e.field === ce) >= t.path.length && null !== t.data, s = n ? w[t.data]?.name ?? "" : "";
+					if (2 === t.kind) return n ? `Total ${s}` : A;
+					const r = t.path.length - 1, o = e[r].field, a = y(o, t.path[r]);
 					if (null !== t.function) {
-						const e = ve[i.functions[t.function]];
-						return (n || t.across) && null !== t.data ? `${a} ${e} of ${y(F[t.data].field)}` : `${a} ${e}`;
+						const e = we[l.functions[t.function]];
+						return (n || t.across) && null !== t.data ? `${a} ${e} of ${F(w[t.data].field)}` : `${a} ${e}`;
 					}
-					return v[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
-				})(U(t.axis), e);
-				return [n, R(e, n)];
+					return h[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
+				})(D(t.axis), e);
+				return [n, M(e, n)];
 			}
 			case "value": {
-				const n = t.row.index * V + t.column.index, s = i.states[n];
+				const n = t.row.index * _ + t.column.index, s = l.states[n];
 				let r = null;
-				return 0 === s ? (r = i.values[n], e.showError && a.isError(r) && (r = e.errorCaption ?? "")) : 1 === s && (r = !1 === e.showEmpty ? 0 : ((e) => {
+				return 0 === s ? (r = l.values[n], e.showError && a.isError(r) && (r = e.errorCaption ?? "")) : 1 === s && (r = !1 === e.showEmpty ? 0 : ((e) => {
 					if (void 0 === e) return null;
 					const t = e.trim();
 					if (!/^[+-]?\d*(?:\.\d*)?$/.test(t)) return e;
@@ -744,207 +744,207 @@ var Z = [
 				})(e.emptyCaption)), [r, null];
 			}
 		}
-	}, B = new g.Builder(), j = D.top, q = D.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), z = (e, t) => {
-		const n = d(D, e, t);
+	}, U = new E.Builder(), H = L.top, B = L.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), j = (e, t) => {
+		const n = m(L, e, t);
 		if (!n) return;
-		const [s, r] = H(n);
+		const [s, r] = V(n);
 		((e, t, n) => {
-			k && n && k.set(e + "," + t, n);
-		})(e - j, t, r), null !== s && (p ? B.pushAt(t, e - j, s) : B.pushAt(e - j, t, s));
+			C && n && C.set(e + "," + t, n);
+		})(e - H, t, r), null !== s && (f ? U.pushAt(t, e - H, s) : U.pushAt(e - H, t, s));
 	};
-	if (p) {
-		const e = Math.max(q, D.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < D.rows.length; e++) t < (e < j ? q : D.columns.length) && z(e, t);
-	} else for (let e = 0; e < D.rows.length; e++) {
-		const t = e < j ? q : D.columns.length;
-		for (let n = 0; n < t; n++) z(e, n);
+	if (f) {
+		const e = Math.max(B, L.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < L.rows.length; e++) t < (e < H ? B : L.columns.length) && j(e, t);
+	} else for (let e = 0; e < L.rows.length; e++) {
+		const t = e < H ? B : L.columns.length;
+		for (let n = 0; n < t; n++) j(e, n);
 	}
-	if (O) {
-		const t = b(e);
+	if (T) {
+		const t = R(e);
 		return {
-			cells: B.build()?.tuples ?? [],
+			cells: U.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
 			columnPageCount: t.columns,
-			header: N,
+			header: O,
 			rowLines: [],
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...k ? { roles: k } : {}
+			...C ? { roles: C } : {}
 		};
 	}
-	const G = (e, t) => {
+	const q = (e, t) => {
 		const n = [];
 		return e.forEach((e, s) => {
 			e.field !== ce && n.push(s < t.path.length ? t.path[s] : -1);
 		}), n;
-	}, Q = (e, t) => K(e.data ?? t.data ?? 0, [...G(r, e), ...G(o, t)]), [J] = i.rows, [W] = i.columns, X = J && W && 3 !== J.kind && 3 !== W.kind ? Q(J, W) : null, Z = [], Y = (e) => 1 === e.kind && null !== e.function;
-	i.rows.forEach((t, n) => {
-		3 === t.kind || Y(t) || (G(r, t), i.columns.forEach((s, r) => {
-			const o = i.states[n * V + r];
-			if (3 === s.kind || Y(s) || 0 !== o && 1 !== o) return;
-			let l = 0 === o ? i.values[n * V + r] : 0;
-			e.showError && a.isError(l) && (l = e.errorCaption || 0), Z.push([Q(t, s), l]);
+	}, Q = (e, t) => K(e.data ?? t.data ?? 0, [...q(s, e), ...q(r, t)]), [J] = l.rows, [W] = l.columns, X = J && W && 3 !== J.kind && 3 !== W.kind ? Q(J, W) : null, Y = [], Z = (e) => 1 === e.kind && null !== e.function;
+	l.rows.forEach((t, n) => {
+		3 === t.kind || Z(t) || (q(s, t), l.columns.forEach((s, r) => {
+			const o = l.states[n * _ + r];
+			if (3 === s.kind || Z(s) || 0 !== o && 1 !== o) return;
+			let i = 0 === o ? l.values[n * _ + r] : 0;
+			e.showError && a.isError(i) && (i = e.errorCaption || 0), Y.push([Q(t, s), i]);
 		}));
 	});
-	const ee = b(e);
+	const ee = R(e);
 	return {
-		cells: B.build()?.tuples ?? [],
-		rows: D.rows.length - j,
-		columns: D.columns.length,
+		cells: U.build()?.tuples ?? [],
+		rows: L.rows.length - H,
+		columns: L.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
-		header: N,
-		rowLines: $,
-		columnLines: _,
-		viewValues: Z,
+		header: O,
+		rowLines: N,
+		columnLines: $,
+		viewValues: Y,
 		firstKey: X,
-		...k ? { roles: k } : {}
+		...C ? { roles: C } : {}
 	};
-}, Re = (e, t, n, r, o = !1, l, d) => {
-	const c = Ie(e, t, r, {
+}, Re = (e, t, n, s, r = !1, l, i) => {
+	const d = Ie(e, t, s, {
 		filters: l,
-		slicerFields: d
+		slicerFields: i
 	});
-	if (!c) return null;
-	const f = c.rowPageCount > 0 ? c.rowPageCount + 1 : 0, p = c.rowPageCount > 0 ? 3 * c.columnPageCount - 1 : 0, { rowStart: g, colStart: v } = n;
-	if (g - f < 0) return null;
-	const w = {
-		rowStart: g - f,
-		colStart: v,
-		rowEnd: g + c.rows - 1,
-		colEnd: v + Math.max(c.columns, p) - 1
-	}, F = e.fields, b = t.fields, y = x(t), I = (e, t) => {
-		const n = F[e], o = n.numberFormat ?? b[e].numberFormat, l = h(o, r), d = i(b[e]), c = y[e], f = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), p = f.length > 0 ? f : c.map((e, t) => ({ item: t })), g = p.map((t) => {
-			const n = m(c[t.item]), i = u(b[e], t.item), f = null === n ? "(blank)" : "number" == typeof n ? s(r, i ? (p = t.item, void 0 === o ? h(P(b[e], p), r) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-			var p;
-			const g = d && i ? f : n;
+	if (!d) return null;
+	const u = d.rowPageCount > 0 ? d.rowPageCount + 1 : 0, f = d.rowPageCount > 0 ? 3 * d.columnPageCount - 1 : 0, { rowStart: m, colStart: h } = n;
+	if (m - u < 0) return null;
+	const g = {
+		rowStart: m - u,
+		colStart: h,
+		rowEnd: m + d.rows - 1,
+		colEnd: h + Math.max(d.columns, f) - 1
+	}, F = e.fields, b = t.fields, y = w(t), I = (e, t) => {
+		const n = F[e], r = n.numberFormat ?? b[e].numberFormat, l = p(r, s), i = U(b[e]), d = y[e], u = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), f = u.length > 0 ? u : d.map((e, t) => ({ item: t })), m = f.map((t) => {
+			const n = c(d[t.item]), u = v(b[e], t.item), f = null === n ? "(blank)" : "number" == typeof n ? o(s, u ? (m = t.item, void 0 === r ? p(P(b[e], m), s) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+			var m;
+			const h = i && u ? f : n;
 			return void 0 !== t.name ? {
-				value: g,
+				value: h,
 				text: f,
 				name: t.name
 			} : {
-				value: g,
+				value: h,
 				text: f
 			};
-		}), v = {
+		}), h = {
 			name: n.name ?? b[e].name,
-			items: g
+			items: m
 		};
 		if (t) {
 			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			v.page = void 0 !== e ? p.findIndex((t) => t.item === e) : -1;
+			h.page = void 0 !== e ? f.findIndex((t) => t.item === e) : -1;
 		}
-		return v;
-	}, A = (e) => (e ?? []).filter((e) => -2 !== e);
+		return h;
+	}, x = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
-			range: w,
+			range: g,
 			dataFields: (e.dataFields ?? []).map((e) => ({
 				name: e.name,
 				sourceName: b[e.field].name
 			})),
 			fields: [
-				...A(e.rowFields).map((e) => I(e)),
-				...A(e.columnFields).map((e) => I(e)),
+				...x(e.rowFields).map((e) => I(e)),
+				...x(e.columnFields).map((e) => I(e)),
 				...(e.pageFields ?? []).map((e) => I(e.field, e))
 			],
-			values: c.viewValues,
+			values: d.viewValues,
 			block: {
 				anchor: {
-					row: g,
-					column: v
+					row: m,
+					column: h
 				},
-				...o ? { blocked: !0 } : {},
-				...null !== c.firstKey ? { first: c.firstKey } : {}
+				...r ? { blocked: !0 } : {},
+				...null !== d.firstKey ? { first: d.firstKey } : {}
 			}
 		},
 		size: {
-			rows: c.rows,
-			columns: c.columns
+			rows: d.rows,
+			columns: d.columns
 		}
 	};
-}, Oe = async (e, t, n, r) => {
-	const o = /* @__PURE__ */ new Map(), i = (e.filters ?? []).filter((t) => B(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), l = e.fields?.some((e) => e.items?.some((e) => e.calculated)), d = e.dataFields?.some((e) => j(t.fields?.[e.field]));
-	if (0 === i.length && !l && !d) return { keep: o };
-	const c = x(t);
-	for (const s of i.filter(B)) {
-		const a = s.field, i = c[a];
-		if (!i) continue;
-		const l = E(s.condition) ? $e(e, t, i, a, n) : null, d = new Array(i.length);
-		for (let e = 0; e < i.length; e++) d[e] = l ? l[e] : m(i[e]);
-		const u = await Le(s.condition, d, n, r), f = o.get(a);
+}, Oe = async (e, t, n, s) => {
+	const r = /* @__PURE__ */ new Map(), d = (e.filters ?? []).filter((t) => M(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), f = e.fields?.some((e) => e.items?.some((e) => e.calculated)), m = e.dataFields?.some((e) => u(t.fields?.[e.field]));
+	if (0 === d.length && !f && !m) return { keep: r };
+	const h = w(t);
+	for (const o of d.filter(M)) {
+		const a = o.field, l = h[a];
+		if (!l) continue;
+		const i = C(o.condition) ? Le(e, t, l, a, n) : null, d = new Array(l.length);
+		for (let e = 0; e < l.length; e++) d[e] = i ? i[e] : c(l[e]);
+		const u = await $e(o.condition, d, n, s), f = r.get(a);
 		if (f) for (let e = 0; e < u.length; e++) f[e] &= u[e];
-		else o.set(a, u);
+		else r.set(a, u);
 	}
-	const f = l && r ? await (async (e, t, n, r, o) => {
-		const i = t.fields ?? [], l = e.fields ?? [], d = i.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
-		if (1 !== d.length || c.some((e) => j(i[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
-		const f = d[0], p = i[f].calculatedItems, g = te(t, n.isDate1904());
-		if (!g) return null;
-		const v = x(t), w = x({
+	const g = f && s ? await (async (e, t, n, s, r) => {
+		const d = t.fields ?? [], f = e.fields ?? [], m = d.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), h = e.dataFields ?? [];
+		if (1 !== m.length || h.some((e) => u(d[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
+		const g = m[0], F = d[g].calculatedItems, b = te(t, n.isDate1904());
+		if (!b) return null;
+		const y = w(t), I = w({
 			...t,
-			fields: i.map(({ group: e, ...t }) => t)
-		}), F = (e.rowFields ?? []).filter((e) => e >= 0), b = (e.columnFields ?? []).filter((e) => e >= 0), y = F.includes(f) ? F : b.includes(f) ? b : null;
-		if (!y) return null;
-		const I = y.slice(0, y.indexOf(f)), A = [...y.slice(y.indexOf(f) + 1), ...y === F ? b : F], C = [...I, ...A], E = t.recordCount ?? 0, S = (e, t) => {
-			const n = l[e]?.items, s = n?.find((e) => e.item === t && void 0 === e.type);
-			return !(n && (!s || s.hidden) || o?.get(e) && 0 === o.get(e)[t]);
-		}, P = (e, t) => {
-			const n = l[e.field]?.items;
+			fields: d.map(({ group: e, ...t }) => t)
+		}), x = (e.rowFields ?? []).filter((e) => e >= 0), A = (e.columnFields ?? []).filter((e) => e >= 0), C = x.includes(g) ? x : A.includes(g) ? A : null;
+		if (!C) return null;
+		const E = C.slice(0, C.indexOf(g)), S = [...C.slice(C.indexOf(g) + 1), ...C === x ? A : x], P = [...E, ...S], k = t.recordCount ?? 0, M = (e, t) => {
+			const n = f[e]?.items, s = n?.find((e) => e.item === t && void 0 === e.type);
+			return !(n && (!s || s.hidden) || r?.get(e) && 0 === r.get(e)[t]);
+		}, T = (e, t) => {
+			const n = f[e.field]?.items;
 			if (void 0 !== e.item) return n?.[e.item]?.item === t;
 			const s = n?.find((e) => e.item === t && void 0 === e.type);
 			return !n || !!s && !s.hidden;
-		}, k = e.pageFields ?? [], M = h(i[f].numberFormat ?? 14, n), R = (e) => v[f].findIndex((t, r) => {
-			const o = m(t);
-			return "number" == typeof o && (i[f].dates || u(i[f], r)) ? T(s(n, M, o), e) : T(null === o ? L : $(o), e);
-		}), O = /* @__PURE__ */ new Map(), N = new Map(p.map((e) => [e.item, e.formula])), _ = (e) => {
-			let t = O.get(e);
-			return void 0 === t && O.set(e, t = O.size), t;
+		}, R = e.pageFields ?? [], O = p(d[g].numberFormat ?? 14, n), $ = (e) => y[g].findIndex((t, s) => {
+			const r = c(t);
+			return "number" == typeof r && (d[g].dates || v(d[g], s)) ? l(o(n, O, r), e) : l(null === r ? i : N(r), e);
+		}), L = /* @__PURE__ */ new Map(), _ = new Map(F.map((e) => [e.item, e.formula])), D = (e) => {
+			let t = L.get(e);
+			return void 0 === t && L.set(e, t = L.size), t;
 		};
-		for (const e of p) if (null === oe(e.formula, (e, t) => {
-			if (null === t || !T(i[f].name, e)) return null;
-			const n = R(t);
-			return n < 0 ? null : (N.has(n) || _(n), "");
+		for (const e of F) if (null === oe(e.formula, (e, t) => {
+			if (null === t || !l(d[g].name, e)) return null;
+			const n = $(t);
+			return n < 0 ? null : (_.has(n) || D(n), "");
 		})) return null;
-		const D = /* @__PURE__ */ new Map(), V = /* @__PURE__ */ new Map(), U = c.map((e) => ({
-			column: g[e.field],
-			values: w[e.field],
+		const V = /* @__PURE__ */ new Map(), U = /* @__PURE__ */ new Map(), H = h.map((e) => ({
+			column: b[e.field],
+			values: I[e.field],
 			fold: e.subtotal ?? "sum"
-		})), H = O.size;
-		for (let e = 0; e < E; e++) {
-			if (!k.every((t) => P(t, g[t.field][e]))) continue;
-			if (!C.every((t) => S(t, g[t][e]))) continue;
+		})), B = L.size;
+		for (let e = 0; e < k; e++) {
+			if (!R.every((t) => T(t, b[t.field][e]))) continue;
+			if (!P.every((t) => M(t, b[t][e]))) continue;
 			let t = "";
-			for (const n of I) t += g[n][e] + ",";
-			V.has(t) || V.set(t, e);
-			const n = O.get(g[f][e]);
+			for (const n of E) t += b[n][e] + ",";
+			U.has(t) || U.set(t, e);
+			const n = L.get(b[g][e]);
 			if (void 0 === n) continue;
 			let s = t;
-			for (const t of A) s += g[t][e] + ",";
-			let r = D.get(s);
+			for (const t of S) s += b[t][e] + ",";
+			let r = V.get(s);
 			r || (r = {
-				sums: c.map(() => new Array(H).fill(0)),
-				errors: c.map(() => new Array(H).fill(void 0))
-			}, D.set(s, r));
-			const { sums: o, errors: i } = r;
-			U.forEach(({ column: t, values: s, fold: r }, l) => {
-				const d = m(s[t[e]]);
-				"sum" === r ? "number" == typeof d ? o[l][n] += d : a.isError(d) && (i[l][n] ??= d) : ("countNums" === r ? "number" == typeof d : null !== d) && (o[l][n] += 1);
+				sums: h.map(() => new Array(B).fill(0)),
+				errors: h.map(() => new Array(B).fill(void 0))
+			}, V.set(s, r));
+			const { sums: o, errors: l } = r;
+			H.forEach(({ column: t, values: s, fold: r }, i) => {
+				const d = c(s[t[e]]);
+				"sum" === r ? "number" == typeof d ? o[i][n] += d : a.isError(d) && (l[i][n] ??= d) : ("countNums" === r ? "number" == typeof d : null !== d) && (o[i][n] += 1);
 			});
 		}
-		const B = A.map((e) => {
-			const t = l[e]?.items;
-			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && S(e, t.item) ? [t.item] : []) : v[e].map((e, t) => t);
+		const G = S.map((e) => {
+			const t = f[e]?.items;
+			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && M(e, t.item) ? [t.item] : []) : y[e].map((e, t) => t);
 		});
-		if (B.reduce((e, t) => e * t.length, V.size) > 5e5) return null;
-		const q = [];
-		for (const [e, t] of V) {
+		if (G.reduce((e, t) => e * t.length, U.size) > 5e5) return null;
+		const z = [];
+		for (const [e, t] of U) {
 			const n = (e, s, r) => {
-				if (e !== B.length) for (const t of B[e]) n(e + 1, [...s, t], r + t + ",");
-				else q.push({
+				if (e !== G.length) for (const t of G[e]) n(e + 1, [...s, t], r + t + ",");
+				else z.push({
 					exemplar: t,
 					path: s,
 					key: r
@@ -952,103 +952,103 @@ var Z = [
 			};
 			n(0, [], e);
 		}
-		const z = q.length;
-		if (0 === z) return {
+		const j = z.length;
+		if (0 === j) return {
 			count: 0,
-			ids: i.map(() => []),
-			values: c.map(() => [])
+			ids: d.map(() => []),
+			values: h.map(() => [])
 		};
-		const G = c.length * H, K = (e, t) => e * H + t, Q = (e, t) => G + e * p.length + t, J = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < H; t++) J.push(q.map(({ key: n }) => {
-			const s = D.get(n);
+		const q = h.length * B, K = (e, t) => e * B + t, Q = (e, t) => q + e * F.length + t, J = [];
+		for (let e = 0; e < h.length; e++) for (let t = 0; t < B; t++) J.push(z.map(({ key: n }) => {
+			const s = V.get(n);
 			return s ? s.errors[e][t] ?? s.sums[e][t] : 0;
 		}));
 		const W = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < p.length; t++) {
-			const n = oe(p[t].formula, (t, n) => {
+		for (let e = 0; e < h.length; e++) for (let t = 0; t < F.length; t++) {
+			const n = oe(F[t].formula, (t, n) => {
 				if (null === n) return null;
-				const s = R(n), r = p.findIndex((e) => e.item === s);
-				return ae(r >= 0 ? Q(e, r) : K(e, O.get(s)));
+				const s = $(n), r = F.findIndex((e) => e.item === s);
+				return ae(r >= 0 ? Q(e, r) : K(e, L.get(s)));
 			});
 			if (null === n) return null;
 			W.push({
 				expression: n,
-				coords: ie(Q(e, t), z)
+				coords: le(Q(e, t), j)
 			});
 		}
-		const X = await r.evaluateBatch({
-			values: le(J, z),
+		const X = await s.evaluateBatch({
+			values: ie(J, j),
 			formulas: W
-		}), Z = i.map(() => []), Y = c.map(() => []), ee = (e, t, n, s) => {
-			g.forEach((n, s) => {
-				const r = A.indexOf(s);
-				Z[s].push(s === f ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
-			}), Y.forEach((e, t) => {
+		}), Y = d.map(() => []), Z = h.map(() => []), ee = (e, t, n, s) => {
+			b.forEach((n, s) => {
+				const r = S.indexOf(s);
+				Y[s].push(s === g ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
+			}), Z.forEach((e, t) => {
 				e.push(t === n ? s : null);
 			});
 		};
-		return q.forEach((e, t) => {
-			p.forEach(({ item: n }, s) => {
-				c.forEach((r, o) => {
-					const a = X[o * p.length + s].getValueAt(t, 0) ?? 0;
+		return z.forEach((e, t) => {
+			F.forEach(({ item: n }, s) => {
+				h.forEach((r, o) => {
+					const a = X[o * F.length + s].getValueAt(t, 0) ?? 0;
 					if ("sum" !== (r.subtotal ?? "sum") && "number" == typeof a) for (let t = 0; t < Math.round(a); t++) ee(e, n, o, 1);
 					else ee(e, n, o, a);
 				});
 			});
 		}), {
-			count: Z[0]?.length ?? 0,
-			ids: Z,
-			values: Y
+			count: Y[0]?.length ?? 0,
+			ids: Y,
+			values: Z
 		};
-	})(e, t, n, r, o) : void 0, p = i.filter((e) => !B(e)).map((e, t) => ({
+	})(e, t, n, s, r) : void 0, F = d.filter((e) => !M(e)).map((e, t) => ({
 		filter: e,
 		index: t
-	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), g = (t.recordCount ?? 0) + (f?.count ?? 0);
-	let v;
-	const w = e.rowFields ?? [];
-	for (const { filter: s } of p) {
-		const a = await Ae(e, t, n, s.field, s.dataField, o, v, f, r);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), y = (t.recordCount ?? 0) + (g?.count ?? 0);
+	let I;
+	const x = e.rowFields ?? [];
+	for (const { filter: o } of F) {
+		const a = await Ae(e, t, n, o.field, o.dataField, r, I, g, s);
 		if (!a) continue;
-		const i = /* @__PURE__ */ new Set();
+		const l = /* @__PURE__ */ new Set();
 		for (const [e, t] of a.groups) {
-			const o = await Le(s.condition, t.totals, n, r);
+			const r = await $e(o.condition, t.totals, n, s);
 			t.ids.forEach((t, n) => {
-				o[n] || i.add(`${e}|${t}`);
+				r[n] || l.add(`${e}|${t}`);
 			});
 		}
-		if (0 === i.size) continue;
-		v ??= new Uint8Array(g).fill(3);
-		const l = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = w.includes(s.field) ? 1 : 2;
-		for (let e = 0; e < g; e++) {
-			if (!(v[e] & u)) continue;
+		if (0 === l.size) continue;
+		I ??= new Uint8Array(y).fill(3);
+		const i = a.outer.map((e) => a.records[e]), d = a.records[o.field], u = x.includes(o.field) ? 1 : 2;
+		for (let e = 0; e < y; e++) {
+			if (!(I[e] & u)) continue;
 			let t = "";
-			for (let n = 0; n < l.length; n++) t += (n > 0 ? "," : "") + l[n][e];
-			i.has(`${t}|${d[e]}`) && (v[e] &= ~u);
+			for (let n = 0; n < i.length; n++) t += (n > 0 ? "," : "") + i[n][e];
+			l.has(`${t}|${d[e]}`) && (I[e] &= ~u);
 		}
 	}
-	const F = d && r ? await (async (e, t, n, s, r, o, a) => {
-		const i = R.peek(), l = de(e, t);
-		if (!i || !l) return null;
-		const d = xe(e, t, n, a, l.operands);
+	const A = m && s ? await (async (e, t, n, s, r, o, a) => {
+		const l = b.peek(), i = de(e, t);
+		if (!l || !i) return null;
+		const d = xe(e, t, n, a, i.operands);
 		if (!d) return null;
 		const u = (t) => (t ?? []).map((t) => ({
 			field: t,
 			form: t === ce ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
-		return Ee(i, l, e, d.items, d.records, d.values, u(e.rowFields), u(e.columnFields), d.n, r, o, s);
-	})(e, t, n, r, o, v, f) : void 0;
+		return Ee(l, i, e, d.items, d.records, d.values, u(e.rowFields), u(e.columnFields), d.n, r, o, s);
+	})(e, t, n, s, r, I, g) : void 0;
 	return {
-		keep: o,
-		...v ? { records: v } : {},
-		...f ? { calculatedRecords: f } : {},
-		...F ? { fieldValues: F } : {}
+		keep: r,
+		...I ? { records: I } : {},
+		...g ? { calculatedRecords: g } : {},
+		...A ? { fieldValues: A } : {}
 	};
 }, Ne = (e, t) => {
 	const n = e.filters;
 	if (!n) return e;
 	let s = !1;
 	const r = n.map((e) => {
-		const n = e.condition && y(e.condition, t);
+		const n = e.condition && O(e.condition, t);
 		return n === e.condition ? e : (s = !0, {
 			...e,
 			condition: n
@@ -1058,13 +1058,13 @@ var Z = [
 		...e,
 		filters: r
 	} : e;
-}, Le = async (e, t, n, s) => {
+}, $e = async (e, t, n, s) => {
 	const r = t.length, o = new Uint8Array(r);
 	if (0 === r) return o;
-	const a = new p();
+	const a = new V();
 	for (let e = 0; e < r; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
-	let i = !1;
-	return await f({
+	let l = !1;
+	return await _({
 		conditions: [e],
 		runtime: n,
 		calculation: s ?? null,
@@ -1076,30 +1076,30 @@ var Z = [
 			colEnd: 0
 		},
 		onTrue: (e) => {
-			i = !0, o[e.rowIndex] = 1;
+			l = !0, o[e.rowIndex] = 1;
 		},
 		onFalse: () => {
-			i = !0;
+			l = !0;
 		},
 		onBlank: (e) => {
-			i = !0;
+			l = !0;
 			for (let n = 0; n < r; n++) null === t[n] && e(n, 0) && (o[n] = 1);
 		}
-	}), i || o.fill(1), o;
-}, $e = (e, t, n, r, o) => {
-	const i = e.fields?.[r], l = /* @__PURE__ */ new Map();
-	for (const e of i?.items ?? []) void 0 !== e.item && void 0 === e.type && void 0 !== e.name && l.set(e.item, e.name);
-	const d = i?.numberFormat ?? t.fields?.[r]?.numberFormat, c = h(d, o), f = (e) => void 0 === d ? h(P(t.fields?.[r], e), o) : c, p = new Array(n.length);
+	}), l || o.fill(1), o;
+}, Le = (e, t, n, s, r) => {
+	const l = e.fields?.[s], d = /* @__PURE__ */ new Map();
+	for (const e of l?.items ?? []) void 0 !== e.item && void 0 === e.type && void 0 !== e.name && d.set(e.item, e.name);
+	const u = l?.numberFormat ?? t.fields?.[s]?.numberFormat, f = p(u, r), m = (e) => void 0 === u ? p(P(t.fields?.[s], e), r) : f, h = new Array(n.length);
 	for (let e = 0; e < n.length; e++) {
-		const i = l.get(e);
-		if (void 0 !== i) {
-			p[e] = i;
+		const l = d.get(e);
+		if (void 0 !== l) {
+			h[e] = l;
 			continue;
 		}
-		const d = m(n[e]);
-		null === d ? p[e] = L : "number" == typeof d ? p[e] = s(o, u(t.fields?.[r], e) ? f(e) : c, d) : "boolean" == typeof d ? p[e] = d ? "TRUE" : "FALSE" : a.isError(d) ? p[e] = d.getLabel() : p[e] = String(d);
+		const u = c(n[e]);
+		null === u ? h[e] = i : "number" == typeof u ? h[e] = o(r, v(t.fields?.[s], e) ? m(e) : f, u) : "boolean" == typeof u ? h[e] = u ? "TRUE" : "FALSE" : a.isError(u) ? h[e] = u.getLabel() : h[e] = String(u);
 	}
-	return p;
+	return h;
 }, _e = (e) => {
 	const t = e.getCoords(), n = t.colEnd - t.colStart + 1, s = t.rowEnd - t.rowStart, r = e.getWorksheet(), o = r.getRange({
 		rowStart: t.rowStart,
@@ -1108,8 +1108,8 @@ var Z = [
 		colEnd: t.colEnd
 	}).getValues()[0] ?? [], a = [];
 	for (let e = 0; e < n; e++) {
-		const n = o[e] ?? null, i = new W(), l = new Uint32Array(s);
-		let d, u, c = !1, f = i.values;
+		const n = o[e] ?? null, l = new W(), i = new Uint32Array(s);
+		let d, u, c = !1, f = l.values;
 		if (s > 0) {
 			const n = r.getRange({
 				rowStart: t.rowStart + 1,
@@ -1117,13 +1117,13 @@ var Z = [
 				colStart: t.colStart + e,
 				colEnd: t.colStart + e
 			});
-			i.fill(n.getValuesRange(), l), d = Ve(n, s);
-			const o = Ue(n, t.rowStart + 1, l, i.values);
+			l.fill(n.getValuesRange(), i), d = Ve(n, s);
+			const o = Ue(n, t.rowStart + 1, i, l.values);
 			c = o.dates, u = o.dateIds, f = o.values;
 		}
 		a.push({
 			header: De(n),
-			ids: l,
+			ids: i,
 			values: f,
 			numberFormat: d,
 			dates: c,
@@ -1156,17 +1156,17 @@ var Z = [
 		dates: o,
 		values: s
 	};
-	const i = s.slice(), l = /* @__PURE__ */ new Map();
+	const l = s.slice(), i = /* @__PURE__ */ new Map();
 	for (let e = 0; e < n.length; e++) {
 		const t = n[e];
 		if ("number" != typeof s[t] || !He(r, e)) continue;
-		let o = l.get(t);
-		void 0 === o && (o = i.length, i.push(s[t]), l.set(t, o)), n[e] = o;
+		let o = i.get(t);
+		void 0 === o && (o = l.length, l.push(s[t]), i.set(t, o)), n[e] = o;
 	}
 	return {
 		dates: !1,
-		dateIds: new Set(l.values()),
-		values: i
+		dateIds: new Set(i.values()),
+		values: l
 	};
 }, He = (e, t) => {
 	let n = 0, s = e.length - 1;
@@ -1185,8 +1185,8 @@ var Z = [
 } : a.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, je = (e, t) => (t && "number" == typeof e ? "date:" : "") + k(m(e)), qe = (e, t, n, s = !1) => {
-	const r = e.fields ?? [], o = v(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), l = ((e) => {
+} : e, Ge = (e, t) => (t && "number" == typeof e ? "date:" : "") + h(c(e)), ze = (e, t, n, s = !1) => {
+	const r = e.fields ?? [], o = $(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), l = ((e) => {
 		const t = /* @__PURE__ */ new Set();
 		return e.map((e, n) => {
 			const s = "" === e ? `Field${n + 1}` : e;
@@ -1194,13 +1194,13 @@ var Z = [
 			for (let e = 2; t.has(r.toLocaleLowerCase()); e++) r = `${s}${e}`;
 			return t.add(r.toLocaleLowerCase()), r;
 		});
-	})(t.columns.map((e) => e.header)), d = /* @__PURE__ */ new Map();
+	})(t.columns.map((e) => e.header)), i = /* @__PURE__ */ new Map();
 	r.forEach((e, t) => {
 		const n = e.name.toLocaleLowerCase();
-		e.noRecords || d.has(n) || d.set(n, t);
+		e.noRecords || i.has(n) || i.set(n, t);
 	});
-	const c = t.recordCount, f = r.map(() => -1), p = r.map((e, t) => o[t].map(() => -1)), h = [], g = [], w = [], F = [], b = [], y = [], I = [], x = (e, t, n) => {
-		F[t] = n.items, y[t] = n.items.length, I[t] = !0, p[e] = ((e, t) => {
+	const d = t.recordCount, f = r.map(() => -1), m = r.map((e, t) => o[t].map(() => -1)), p = [], h = [], g = [], w = [], F = [], b = [], y = [], I = (e, t, n) => {
+		w[t] = n.items, b[t] = n.items.length, y[t] = !0, m[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
@@ -1208,140 +1208,140 @@ var Z = [
 		})(r[e].group.items, n.items);
 	};
 	t.columns.forEach((e, t) => {
-		const n = d.get(l[t].toLocaleLowerCase());
-		void 0 !== n && (d.delete(l[t].toLocaleLowerCase()), f[n] = t);
-		const v = new Int32Array(e.values.length).fill(-1), A = [], C = [], E = new Array(c);
-		for (let t = 0; t < c; t++) {
+		const n = i.get(l[t].toLocaleLowerCase());
+		void 0 !== n && (i.delete(l[t].toLocaleLowerCase()), f[n] = t);
+		const u = new Int32Array(e.values.length).fill(-1), x = [], A = [], C = new Array(d);
+		for (let t = 0; t < d; t++) {
 			const n = e.ids[t];
-			let s = v[n];
-			s < 0 && (s = v[n] = A.length, A.push(Be(e.values[n])), C.push(e.dates || !!e.dateIds?.has(n))), E[t] = s;
+			let s = u[n];
+			s < 0 && (s = u[n] = x.length, x.push(Be(e.values[n])), A.push(e.dates || !!e.dateIds?.has(n))), C[t] = s;
 		}
-		const S = (e) => void 0 !== n && (!!r[n].dates || u(r[n], e)), P = A.length, k = void 0 !== n ? !0 === r[n].inline : A.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), M = [];
-		if (void 0 !== n && k) {
+		const E = (e) => void 0 !== n && (!!r[n].dates || v(r[n], e)), S = x.length, P = void 0 !== n ? !0 === r[n].inline : x.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), k = [];
+		if (void 0 !== n && P) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < P; t++) e.set(je(A[t], C[t]), t);
+			for (let t = 0; t < S; t++) e.set(Ge(x[t], A[t]), t);
 			o[n].forEach((t, s) => {
-				p[n][s] = e.get(je(t, S(s))) ?? -1;
+				m[n][s] = e.get(Ge(t, E(s))) ?? -1;
 			});
 		} else if (void 0 !== n) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < P; t++) e.set(je(A[t], C[t]), t);
+			for (let t = 0; t < S; t++) e.set(Ge(x[t], A[t]), t);
 			const t = new Set(r[n].calculatedItems?.map((e) => e.item));
 			o[n].forEach((s, r) => {
 				if (t.has(r)) return;
-				const o = je(s, S(r));
-				let i = e.get(o);
-				void 0 !== i || a || S(r) || (i = A.length, A.push(s), C.push(S(r)), M.push(i), e.set(o, i)), p[n][r] = i ?? -1;
+				const o = Ge(s, E(r));
+				let l = e.get(o);
+				void 0 !== l || a || E(r) || (l = x.length, x.push(s), A.push(E(r)), k.push(l), e.set(o, l)), m[n][r] = l ?? -1;
 			});
 		}
-		const T = { name: l[t] };
-		k && (T.inline = !0), void 0 !== e.numberFormat && (T.numberFormat = e.numberFormat);
-		const R = [];
-		let O = !1;
-		A.forEach((e, t) => {
-			"number" == typeof e && (C[t] ? R.push(t) : O = !0);
-		}), R.length > 0 && !O ? T.dates = !0 : R.length > 0 && (T.dateItems = R), b[t] = T.dateItems ? new Set(T.dateItems) : void 0, M.length > 0 && (T.unused = M);
-		const N = void 0 !== n ? r[n].rest : void 0;
-		N && (T.rest = N);
-		const L = void 0 !== n ? r[n].calculatedItems : void 0;
-		L?.length && (T.calculatedItems = L.map(({ item: e, formula: t }) => {
-			const s = A.length;
-			return A.push(o[n][e]), p[n][e] = s, {
+		const M = { name: l[t] };
+		P && (M.inline = !0), void 0 !== e.numberFormat && (M.numberFormat = e.numberFormat);
+		const T = [];
+		let R = !1;
+		x.forEach((e, t) => {
+			"number" == typeof e && (A[t] ? T.push(t) : R = !0);
+		}), T.length > 0 && !R ? M.dates = !0 : T.length > 0 && (M.dateItems = T), F[t] = M.dateItems ? new Set(M.dateItems) : void 0, k.length > 0 && (M.unused = k);
+		const O = void 0 !== n ? r[n].rest : void 0;
+		O && (M.rest = O);
+		const N = void 0 !== n ? r[n].calculatedItems : void 0;
+		N?.length && (M.calculatedItems = N.map(({ item: e, formula: t }) => {
+			const s = x.length;
+			return x.push(o[n][e]), m[n][e] = s, {
 				item: s,
 				formula: t
 			};
-		})), h.push(T), g.push([t, [[0, A]]]), w.push([t, [[0, E]]]), F.push(A), y.push(P), I.push(!1);
+		})), p.push(M), h.push([t, [[0, x]]]), g.push([t, [[0, C]]]), w.push(x), b.push(S), y.push(!1);
 		const $ = void 0 !== n ? r[n].group : void 0;
 		if ($?.range && $.base === n) {
-			const e = re($, A.slice(0, P).map(m), s);
-			e ? (T.group = {
+			const e = re($, x.slice(0, S).map(c), s);
+			e ? (M.group = {
 				...e,
 				base: t
-			}, x(n, t, e)) : p[n] = o[n].map(() => -1);
-		} else $ && !i(r[n]) && (T.group = $);
+			}, I(n, t, e)) : m[n] = o[n].map(() => -1);
+		} else $ && !U(r[n]) && (M.group = $);
 	}), r.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (j(e)) return f[t] = h.length, h.push(e), F.push([]), y.push(0), void I.push(!1);
+		if (u(e)) return f[t] = p.length, p.push(e), w.push([]), b.push(0), void y.push(!1);
 		const n = e.group;
 		if (!n) return;
 		const r = f[n.base];
 		if (void 0 === r || r < 0) return;
-		const o = F[r];
-		let a, i = [];
-		if (n.range) a = re(n, o.slice(0, y[r]).map(m), s);
+		const o = w[r];
+		let a, l = [];
+		if (n.range) a = re(n, o.slice(0, b[r]).map(c), s);
 		else {
-			const e = ze(n, p[n.base], o, h[r]);
-			a = e.group, i = e.itemMap;
+			const e = je(n, m[n.base], o, p[r]);
+			a = e.group, l = e.itemMap;
 		}
 		if (!a) return;
-		const l = h.length;
-		f[t] = l, h.push({
+		const i = p.length;
+		f[t] = i, p.push({
 			...e,
 			group: {
 				...a,
 				base: r
 			}
-		}), F.push(a.items), b[l] = a.dateItems ? new Set(a.dateItems) : void 0, y.push(a.items.length), I.push(!1), n.range ? x(t, l, a) : p[t] = i;
-	}), h.forEach((e, t) => {
+		}), w.push(a.items), F[i] = a.dateItems ? new Set(a.dateItems) : void 0, b.push(a.items.length), y.push(!1), n.range ? I(t, i, a) : m[t] = l;
+	}), p.forEach((e, t) => {
 		const n = e.group;
 		if (void 0 === n?.parent) return;
 		const s = f[n.parent], { parent: r, ...o } = n;
 		void 0 !== s && s >= 0 ? e.group = {
 			...n,
 			parent: s
-		} : i(e) ? e.group = o : delete e.group, e.group && !i(e) && (e.group = {
+		} : U(e) ? e.group = o : delete e.group, e.group && !U(e) && (e.group = {
 			...e.group,
 			base: t
 		});
 	});
-	const { cacheId: A, part: C, partFormats: E, fields: S, items: P, records: k, ...M } = e;
+	const { cacheId: x, part: A, partFormats: C, fields: E, items: S, records: P, ...k } = e;
 	return {
 		model: {
-			...M,
+			...k,
 			source: n ?? e.source,
-			fields: h,
-			items: g,
-			records: w,
-			recordCount: c
+			fields: p,
+			items: h,
+			records: g,
+			recordCount: d
 		},
 		remap: {
 			fields: f,
-			items: p,
-			newItems: F,
-			usedCounts: y,
-			inItemOrder: I,
-			dateItems: b
+			items: m,
+			newItems: w,
+			usedCounts: b,
+			inItemOrder: y,
+			dateItems: F
 		}
 	};
-}, ze = (e, t, n, s) => {
+}, je = (e, t, n, s) => {
 	const r = /* @__PURE__ */ new Set(), o = new Array(n.length).fill(-1);
 	(e.discrete ?? []).forEach((e, n) => {
 		const s = t?.[n] ?? -1;
 		s < 0 || (o[s] = e, r.add(e));
 	});
-	const a = [], i = [], l = new Set(e.dateItems), d = e.items.map((e, t) => r.has(t) ? (l.has(t) && i.push(a.length), a.push(e), a.length - 1) : -1), c = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || u(s, t)) && i.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: f, ...m } = e;
+	const a = [], l = [], i = new Set(e.dateItems), d = e.items.map((e, t) => r.has(t) ? (i.has(t) && l.push(a.length), a.push(e), a.length - 1) : -1), u = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || v(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
-			...m,
+			...f,
 			items: a,
-			discrete: c,
-			...i.length > 0 ? { dateItems: i } : {}
+			discrete: u,
+			...l.length > 0 ? { dateItems: l } : {}
 		},
 		itemMap: d
 	};
-}, Ge = (e, t, n = !1, s = !1) => {
+}, qe = (e, t, n = !1, s = !1) => {
 	const r = (e, t) => null === e ? 5 : "number" == typeof e ? t ? 3 : 0 : "string" == typeof e ? 1 : "boolean" == typeof e ? 2 : 4, o = r(e, n), a = r(t, s);
 	return o !== a ? o - a : 0 === o || 3 === o ? e - t : 1 === o ? e.localeCompare(t, void 0, { sensitivity: "base" }) : 2 === o ? Number(e) - Number(t) : 4 === o ? e.getCode() - t.getCode() : 0;
 }, Ke = (e, t) => {
-	const n = e.fields ?? [], s = t.newItems.length, r = (e) => e < 0 ? e : t.fields[e] ?? -1, o = (e) => e < 0 || r(e) >= 0, a = e.dataFields ?? [], i = [], l = [];
+	const n = e.fields ?? [], s = t.newItems.length, r = (e) => e < 0 ? e : t.fields[e] ?? -1, o = (e) => e < 0 || r(e) >= 0, a = e.dataFields ?? [], l = [], i = [];
 	a.forEach((e) => {
-		if (!o(e.field)) return void i.push(-1);
-		i.push(l.length);
+		if (!o(e.field)) return void l.push(-1);
+		l.push(i.length);
 		const t = {
 			...e,
 			field: r(e.field)
 		};
-		void 0 !== e.baseField && (o(e.baseField) ? t.baseField = r(e.baseField) : delete t.baseField), l.push(t);
+		void 0 !== e.baseField && (o(e.baseField) ? t.baseField = r(e.baseField) : delete t.baseField), i.push(t);
 	});
 	const d = n.map(() => null), u = [];
 	for (let e = 0; e < s; e++) u.push({});
@@ -1350,7 +1350,7 @@ var Z = [
 		if (s < 0) return;
 		const o = { ...e };
 		if (void 0 !== e.sort?.dataField) {
-			const t = i[e.sort.dataField];
+			const t = l[e.sort.dataField];
 			o.sort = t >= 0 ? {
 				...e.sort,
 				dataField: t
@@ -1379,16 +1379,16 @@ var Z = [
 	const c = (e) => {
 		if (!e) return;
 		let t = e.filter(o).map(r);
-		return l.length < 2 && (t = t.filter((e) => -2 !== e)), t.length > 0 ? t : void 0;
+		return i.length < 2 && (t = t.filter((e) => -2 !== e)), t.length > 0 ? t : void 0;
 	}, f = {
 		...e,
 		fields: u
 	};
-	Qe(f, "rowFields", c(e.rowFields)), Qe(f, "columnFields", c(e.columnFields)), Qe(f, "dataFields", l.length > 0 ? l : void 0), a.forEach((e, t) => {
-		const n = i[t];
+	Qe(f, "rowFields", c(e.rowFields)), Qe(f, "columnFields", c(e.columnFields)), Qe(f, "dataFields", i.length > 0 ? i : void 0), a.forEach((e, t) => {
+		const n = l[t];
 		if (n < 0 || void 0 === e.baseField || "number" != typeof e.baseItem) return;
 		const s = d[e.baseField]?.[e.baseItem];
-		void 0 !== s && s >= 0 && (l[n].baseItem = s);
+		void 0 !== s && s >= 0 && (i[n].baseItem = s);
 	});
 	const m = (e.pageFields ?? []).flatMap((e) => {
 		if (!o(e.field)) return [];
@@ -1407,14 +1407,14 @@ var Z = [
 			field: r(e.field)
 		};
 		if (void 0 !== e.dataField) {
-			const n = i[e.dataField];
+			const n = l[e.dataField];
 			if (void 0 === n || n < 0) return [];
 			t.dataField = n;
 		}
 		return [t];
 	});
 	Qe(f, "filters", p.length > 0 ? p : void 0);
-	const h = (e) => Ze(e, r, o, d, i), g = (e.formats ?? []).flatMap((e) => {
+	const h = (e) => Ye(e, r, o, d, l), g = (e.formats ?? []).flatMap((e) => {
 		const t = h(e.area);
 		return t ? [{
 			...e,
@@ -1422,7 +1422,7 @@ var Z = [
 		}] : [];
 	});
 	Qe(f, "formats", g.length > 0 ? g : void 0);
-	const v = (e.conditionalFormats ?? []).flatMap((e) => {
+	const w = (e.conditionalFormats ?? []).flatMap((e) => {
 		const t = e.areas.flatMap((e) => {
 			const t = h(e);
 			return t ? [t] : [];
@@ -1432,19 +1432,19 @@ var Z = [
 			areas: t
 		}] : [];
 	});
-	return Qe(f, "conditionalFormats", v.length > 0 ? v : void 0), f;
+	return Qe(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
 }, Qe = (e, t, n) => {
 	void 0 === n ? delete e[t] : e[t] = n;
 }, Je = (e, t, n, s, r = !1, o) => {
-	const a = e.items ?? [], i = [], l = [], d = /* @__PURE__ */ new Set();
+	const a = e.items ?? [], l = [], i = [], d = /* @__PURE__ */ new Set();
 	for (const e of a) {
-		if (!c(e)) {
-			l.push(i.length), i.push(e);
+		if (!z(e)) {
+			i.push(l.length), l.push(e);
 			continue;
 		}
 		const n = t[e.item] ?? -1;
 		if (n < 0) {
-			l.push(-1);
+			i.push(-1);
 			continue;
 		}
 		d.add(n);
@@ -1452,15 +1452,15 @@ var Z = [
 			...e,
 			item: n
 		};
-		n >= s && !e.calculated ? r.missing = !0 : delete r.missing, l.push(i.length), i.push(r);
+		n >= s && !e.calculated ? r.missing = !0 : delete r.missing, i.push(l.length), l.push(r);
 	}
 	const u = [];
 	for (let e = 0; e < n.length; e++) d.has(e) || u.push(e);
 	if (r) {
-		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && a.some((e) => e.hidden), s = i.map((e, t) => ({
+		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && a.some((e) => e.hidden), s = l.map((e, t) => ({
 			item: e,
 			at: t
-		})), r = s.filter((e) => !c(e.item)), o = [...[...s.filter((e) => c(e.item)), ...u.map((e) => ({
+		})), r = s.filter((e) => !z(e.item)), o = [...[...s.filter((e) => z(e.item)), ...u.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
@@ -1469,43 +1469,43 @@ var Z = [
 		}))].sort((e, n) => t ? n.item.item - e.item.item : e.item.item - n.item.item), ...r], d = new Map(o.map((e, t) => [e.at, t]));
 		return {
 			items: o.map((e) => e.item),
-			positions: l.map((e) => e < 0 ? e : d.get(e) ?? -1)
+			positions: i.map((e) => e < 0 ? e : d.get(e) ?? -1)
 		};
 	}
 	if (0 === u.length) return {
-		items: i,
-		positions: l
+		items: l,
+		positions: i
 	};
-	const f = !e.includeNewItemsInFilter && a.some((e) => e.hidden), p = (e) => f ? {
+	const f = !e.includeNewItemsInFilter && a.some((e) => e.hidden), m = (e) => f ? {
 		item: e,
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, s = (e, t) => Ge(N(e, n), m(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		const t = "descending" === e.sort.order, s = (e, t) => qe(S(e, n), c(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
 		for (const e of u) {
-			const n = p(e);
-			let r = i.findIndex((n) => c(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
-			r < 0 && (r = We(i)), i.splice(r, 0, n);
-			for (let e = 0; e < l.length; e++) l[e] >= r && l[e]++;
+			const n = m(e);
+			let r = l.findIndex((n) => z(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
+			r < 0 && (r = We(l)), l.splice(r, 0, n);
+			for (let e = 0; e < i.length; e++) i[e] >= r && i[e]++;
 		}
 	} else {
-		const e = We(i);
-		i.splice(e, 0, ...u.map(p));
-		for (let t = 0; t < l.length; t++) l[t] >= e && (l[t] += u.length);
+		const e = We(l);
+		l.splice(e, 0, ...u.map(m));
+		for (let t = 0; t < i.length; t++) i[t] >= e && (i[t] += u.length);
 	}
 	return {
-		items: i,
-		positions: l
+		items: l,
+		positions: i
 	};
 }, We = (e) => {
-	const t = e.findIndex((e) => !c(e));
+	const t = e.findIndex((e) => !z(e));
 	return t < 0 ? e.length : t;
 }, Xe = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		const s = (t + n) % e.length, r = e[s];
-		if (c(r) && !r.missing) return s;
+		if (z(r) && !r.missing) return s;
 	}
-}, Ze = (e, t, n, s, r) => {
+}, Ye = (e, t, n, s, r) => {
 	const o = { ...e };
 	if (void 0 !== e.field) {
 		if (!n(e.field)) return null;
@@ -1532,7 +1532,7 @@ var Z = [
 		o.references = a;
 	}
 	return o;
-}, Ye = (e, t, n) => {
+}, Ze = (e, t, n) => {
 	const s = e.fields ?? [], r = s[t]?.items ?? [], o = new Array(r.length);
 	n.forEach((e, t) => {
 		o[e] = t;
@@ -1546,7 +1546,7 @@ var Z = [
 			};
 			const a = e.sort?.scope;
 			if (!a?.items.some((e) => e.field === t)) return e;
-			const i = a.items.map((e) => e.field === t ? {
+			const l = a.items.map((e) => e.field === t ? {
 				...e,
 				item: o[e.item] ?? e.item
 			} : e);
@@ -1556,7 +1556,7 @@ var Z = [
 					...e.sort,
 					scope: {
 						...a,
-						items: i
+						items: l
 					}
 				}
 			};
@@ -1569,7 +1569,7 @@ var Z = [
 		...e,
 		baseItem: o[e.baseItem] ?? e.baseItem
 	} : e));
-	const i = s.map((e, n) => n === t ? o : null), l = (e.dataFields ?? []).map((e, t) => t), d = (e) => Ze(e, (e) => e, () => !0, i, l) ?? e;
+	const l = s.map((e, n) => n === t ? o : null), i = (e.dataFields ?? []).map((e, t) => t), d = (e) => Ye(e, (e) => e, () => !0, l, i) ?? e;
 	return e.formats && (a.formats = e.formats.map((e) => ({
 		...e,
 		area: d(e.area)
@@ -1578,50 +1578,50 @@ var Z = [
 		areas: e.areas.map(d)
 	}))), a;
 }, et = (e, t, n, s) => {
-	const r = (e.fields ?? [])[n]?.items ?? [], o = x(t)[n] ?? [], a = t.fields?.[n], i = void 0 !== a?.group?.range, l = (e) => void 0 === e.name && u(a, e.item), d = r.map((e, t) => ({
+	const r = (e.fields ?? [])[n]?.items ?? [], o = w(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, i = (e) => void 0 === e.name && v(a, e.item), d = r.map((e, t) => ({
 		item: e,
 		at: t
-	})), f = d.filter((e) => c(e.item));
-	f.sort((e, t) => i ? e.item.item - t.item.item : Ge(N(e.item, o), N(t.item, o), l(e.item), l(t.item))), "descending" === s && f.reverse();
-	let m = 0;
-	const p = Ye(e, n, d.map((e) => c(e.item) ? f[m++] : e).map((e) => e.at));
+	})), u = d.filter((e) => z(e.item));
+	u.sort((e, t) => l ? e.item.item - t.item.item : qe(S(e.item, o), S(t.item, o), i(e.item), i(t.item))), "descending" === s && u.reverse();
+	let c = 0;
+	const f = Ze(e, n, d.map((e) => z(e.item) ? u[c++] : e).map((e) => e.at));
 	return {
-		...p,
-		fields: p.fields.map((e, t) => t === n ? {
+		...f,
+		fields: f.fields.map((e, t) => t === n ? {
 			...e,
 			sort: { order: s }
 		} : e)
 	};
 }, tt = (n, s, r) => {
 	const o = n.fields?.[s]?.items?.[r];
-	if (!o || !c(o)) throw new t(e("error.pivotTable.changePart"));
+	if (!o || !z(o)) throw new t(e("error.pivotTable.changePart"));
 	return o;
 }, nt = (n, s, r, o, a) => {
-	const i = tt(n, r, o), l = n.fields[r].items, d = x(s)[r] ?? [], u = (e) => {
-		const t = m(d[e.item]);
-		return null === t ? L : $(t);
+	const d = tt(n, r, o), u = n.fields[r].items, f = w(s)[r] ?? [], m = (e) => {
+		const t = c(f[e.item]);
+		return null === t ? i : N(t);
 	};
-	if (l.some((e, t) => t !== o && c(e) && T(e.name ?? u(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
-	const { name: f, ...p } = i, h = a === u(i) ? p : {
-		...i,
+	if (u.some((e, t) => t !== o && z(e) && l(e.name ?? m(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
+	const { name: p, ...h } = d, g = a === m(d) ? h : {
+		...d,
 		name: a
 	};
-	if (h.name === i.name) return n;
-	const g = {
+	if (g.name === d.name) return n;
+	const v = {
 		...n,
 		fields: n.fields.map((e, t) => t === r ? {
 			...e,
-			items: l.map((e, t) => t === o ? h : e)
+			items: u.map((e, t) => t === o ? g : e)
 		} : e)
-	}, v = n.fields[r].sort;
-	return v && void 0 === v.dataField ? et(g, s, r, v.order) : g;
+	}, F = n.fields[r].sort;
+	return F && void 0 === F.dataField ? et(v, s, r, F.order) : v;
 }, st = (e, t, n, s) => {
 	tt(e, t, n);
 	const r = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
 	r.splice(s, 0, n);
 	const o = e.fields[t].sort;
 	if (!o && r.every((e, t) => e === t)) return e;
-	const a = Ye(e, t, r);
+	const a = Ze(e, t, r);
 	return o ? {
 		...a,
 		fields: a.fields.map((e, n) => {
@@ -1631,36 +1631,36 @@ var Z = [
 		})
 	} : a;
 }, rt = (n, s, r, o) => {
-	const a = $(o), i = n.fields, l = s.fields, d = n.dataFields ?? [], u = x(s), f = (e, t) => {
+	const a = N(o), d = n.fields, u = s.fields, f = n.dataFields ?? [], m = w(s), p = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		const n = m(u[e][t.item]);
-		return null === n ? L : $(n);
-	}, p = (r) => {
-		if (void 0 !== r.field && a === (i[r.field].name ?? l[r.field].name)) return;
+		const n = c(m[e][t.item]);
+		return null === n ? i : N(n);
+	}, h = (r) => {
+		if (void 0 !== r.field && a === (d[r.field].name ?? u[r.field].name)) return;
 		const o = void 0 === r.field ? n : {
 			...n,
-			fields: i.map((e, t) => t === r.field ? {
+			fields: d.map((e, t) => t === r.field ? {
 				...e,
 				name: "\0"
 			} : e)
 		};
-		if (q(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
+		if (F(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
 	};
 	switch (r.kind) {
 		case "item": {
 			const { field: e, rank: t } = r;
 			tt(n, e, t);
-			const o = i[e].items.findIndex((n, s) => s !== t && c(n) && T(f(e, n), a));
+			const o = d[e].items.findIndex((n, s) => s !== t && z(n) && l(p(e, n), a));
 			return o >= 0 ? st(n, e, o, t) : nt(n, s, e, t, a);
 		}
 		case "fieldCaption": {
 			const { field: e } = r;
-			return p({ field: e }), ((e, t) => ({
+			return h({ field: e }), ((e, t) => ({
 				...n,
-				fields: i.map((n, s) => s === e ? t(n) : n)
+				fields: d.map((n, s) => s === e ? t(n) : n)
 			}))(e, (t) => {
 				const { name: n, ...s } = t;
-				return a === l[e].name ? s : {
+				return a === u[e].name ? s : {
 					...t,
 					name: a
 				};
@@ -1668,9 +1668,9 @@ var Z = [
 		}
 		case "dataCaption": {
 			const { data: e } = r;
-			return p({ data: e }), {
+			return h({ data: e }), {
 				...n,
-				dataFields: d.map((t, n) => n === e ? {
+				dataFields: f.map((t, n) => n === e ? {
 					...t,
 					name: a
 				} : t)
@@ -1690,19 +1690,19 @@ var Z = [
 		};
 		case "pageItem": {
 			const s = n.pageFields, o = s[r.page];
-			let l;
-			if (!T(a, "(All)") && (l = (i[o.field].items ?? []).findIndex((e) => c(e) && T(f(o.field, e), a)), l < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
-			const { item: d, ...u } = o, m = void 0 === l ? u : {
+			let i;
+			if (!l(a, "(All)") && (i = (d[o.field].items ?? []).findIndex((e) => z(e) && l(p(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
+			const { item: u, ...c } = o, f = void 0 === i ? c : {
 				...o,
-				item: l
+				item: i
 			};
 			return {
 				...n,
-				pageFields: s.map((e, t) => t === r.page ? m : e)
+				pageFields: s.map((e, t) => t === r.page ? f : e)
 			};
 		}
 	}
-}, ot = (e, t, n) => qe({
+}, ot = (e, t, n) => ze({
 	cacheId: 0,
 	fields: []
 }, e, t, n).model, at = (e, t) => t.some((t) => e.fields?.[t]?.inline) ? {
@@ -1712,37 +1712,37 @@ var Z = [
 		const { inline: s, ...r } = e;
 		return r;
 	})
-} : e, it = (e) => [
+} : e, lt = (e) => [
 	...e.rowFields ?? [],
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
-].filter((e) => e >= 0), lt = (e, t) => {
-	const n = e.fields[t], s = x(e)[t], r = s.map((e, t) => t);
-	i(n) || r.sort((e, t) => Ge(m(s[e]), m(s[t]), u(n, e), u(n, t)));
+].filter((e) => e >= 0), it = (e, t) => {
+	const n = e.fields[t], s = w(e)[t], r = s.map((e, t) => t);
+	U(n) || r.sort((e, t) => qe(c(s[e]), c(s[t]), v(n, e), v(n, t)));
 	const o = new Set(n.calculatedItems?.map((e) => e.item)), a = new Set(n.unused);
 	return [...r.map((e) => ({
 		item: e,
 		...o.has(e) ? { calculated: !0 } : {},
 		...a.has(e) ? { missing: !0 } : {}
 	})), { type: "default" }];
-}, dt = (s) => {
-	if (!("number" == typeof s ? void 0 !== o(s) : "" !== s && n.isValidFormat(s))) throw new t(e("error.pivotTable.notANumberFormat", { name: String(s) }));
+}, dt = (n) => {
+	if (!("number" == typeof n ? void 0 !== r(n) : "" !== n && s.isValidFormat(n))) throw new t(e("error.pivotTable.notANumberFormat", { name: String(n) }));
 }, ut = (n, s, r, o) => {
-	const a = o?.function ?? ((e, t) => "number" === l(e, t) ? "sum" : "count")(s.fields[r], x(s)[r]), i = M[a];
-	if (!i) throw new t(e("error.pivotTable.notAFunction", { name: a }));
-	let d = o?.name;
-	if (void 0 === d) d = q(n, s, `${i} of ${_(n, s, r)}`);
-	else if (q(n, s, d) !== d) throw new t(e("error.pivotTable.fieldNameExists"));
-	const u = {
-		name: d,
+	const a = o?.function ?? ((e, t) => "number" === L(e, t) ? "sum" : "count")(s.fields[r], w(s)[r]), l = x[a];
+	if (!l) throw new t(e("error.pivotTable.notAFunction", { name: a }));
+	let i = o?.name;
+	if (void 0 === i) i = F(n, s, `${l} of ${B(n, s, r)}`);
+	else if (F(n, s, i) !== i) throw new t(e("error.pivotTable.fieldNameExists"));
+	const d = {
+		name: i,
 		field: r,
 		baseField: 0,
 		baseItem: 0
 	};
-	return "sum" !== a && (u.subtotal = a), void 0 !== o?.numberFormat && (dt(o.numberFormat), u.numberFormat = o.numberFormat), u;
+	return "sum" !== a && (d.subtotal = a), void 0 !== o?.numberFormat && (dt(o.numberFormat), d.numberFormat = o.numberFormat), d;
 }, ct = (n, s) => {
 	const r = n.fields ?? [], o = (n) => {
-		const s = r.findIndex((e) => T(e.name, n));
+		const s = r.findIndex((e) => l(e.name, n));
 		if (s < 0) throw new t(e("error.pivotTable.notAField", { name: n }));
 		return s;
 	}, a = /* @__PURE__ */ new Map(), i = (e, t) => {
@@ -1752,18 +1752,18 @@ var Z = [
 		}
 	};
 	i(s?.rows, "row"), i(s?.columns, "column"), i(s?.pages, "page");
-	const l = (e) => [...a].filter(([, t]) => t === e).map(([e]) => e), d = [];
+	const d = (e) => [...a].filter(([, t]) => t === e).map(([e]) => e), u = [];
 	for (const e of s?.values ?? []) {
 		const { field: t, ...s } = "string" == typeof e ? { field: e } : e;
-		d.push(ut({ dataFields: d }, n, o(t), s));
+		u.push(ut({ dataFields: u }, n, o(t), s));
 	}
-	const u = new Set(d.map((e) => e.field)), c = s?.form && "compact" !== s.form ? s.form : void 0, f = r.map((e, t) => {
+	const c = new Set(u.map((e) => e.field)), f = s?.form && "compact" !== s.form ? s.form : void 0, m = r.map((e, t) => {
 		const s = {}, r = a.get(t);
-		return r && (s.axis = r, s.items = lt(n, t)), u.has(t) && (s.dataField = !0), c && (s.form = c), e.dates && void 0 !== e.numberFormat && (s.numberFormat = e.numberFormat), s;
-	}), m = l("column");
-	d.length > 1 && m.push(-2);
-	const p = {
-		fields: f,
+		return r && (s.axis = r, s.items = it(n, t)), c.has(t) && (s.dataField = !0), f && (s.form = f), e.dates && void 0 !== e.numberFormat && (s.numberFormat = e.numberFormat), s;
+	}), p = d("column");
+	u.length > 1 && p.push(-2);
+	const h = {
+		fields: m,
 		style: {
 			name: s?.style ?? "PivotStyleLight16",
 			showRowHeaders: !0,
@@ -1772,14 +1772,14 @@ var Z = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, h = l("row");
-	h.length > 0 && (p.rowFields = h), m.length > 0 && (p.columnFields = m);
-	const g = l("page");
-	return g.length > 0 && (p.pageFields = g.map((e) => ({ field: e }))), d.length > 0 && (p.dataFields = d), c && (p.form = c), p;
+	}, g = d("row");
+	g.length > 0 && (h.rowFields = g), p.length > 0 && (h.columnFields = p);
+	const w = d("page");
+	return w.length > 0 && (h.pageFields = w.map((e) => ({ field: e }))), u.length > 0 && (h.dataFields = u), f && (h.form = f), h;
 }, ft = (e, t) => t.map((t) => {
 	const n = t.sort?.scope;
 	if (!n) return t;
-	const s = ((t.axis === D.Axis.Row ? e.columnFields : t.axis === D.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const s = ((t.axis === A.Axis.Row ? e.columnFields : t.axis === A.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
 	if (!n.items.every((e, t) => s[t] === e.field)) {
 		const { sort: e, ...n } = t;
 		return n;
@@ -1796,29 +1796,29 @@ var Z = [
 		}
 	};
 }), mt = (n, s, r, o, a) => {
-	const i = D.Axis, l = s.fields?.[r], d = n.fields?.[r]?.axis ?? null;
-	if (o === i.Values) throw new t(e("error.pivotTable.valuesNotAnAxis"));
+	const l = A.Axis, i = s.fields?.[r], u = n.fields?.[r]?.axis ?? null;
+	if (o === l.Values) throw new t(e("error.pivotTable.valuesNotAnAxis"));
 	if (null === o) {
-		if (null === d) return n;
-	} else if (void 0 !== l?.formula || o === i.Page && (l?.calculatedItems?.length ?? 0) > 0) throw new t(e("error.pivotTable.fieldNotPlaceable"));
-	const u = o ? O(n, o).filter((e) => e !== r) : [];
-	if (void 0 !== a && (!Number.isInteger(a) || a < 1 || a > u.length + 1)) throw new t(e("error.pivotTable.fieldPosition"));
-	const c = (a ?? u.length + 1) - 1;
-	if (o === d && (void 0 === a || O(n, o)[c] === r)) return n;
-	u.splice(c, 0, r);
-	const { rowFields: f, columnFields: m, pageFields: p, ...h } = n, g = {}, v = (e) => (e ?? []).filter((e) => e !== r), F = o === i.Row ? u : v(n.rowFields), b = o === i.Column ? u : v(n.columnFields), y = o === i.Page ? u.map((e) => n.pageFields?.find((t) => t.field === e) ?? { field: e }) : (n.pageFields ?? []).filter((e) => e.field !== r);
-	F.length > 0 && (g.rowFields = F), b.length > 0 && (g.columnFields = b), y.length > 0 && (g.pageFields = y);
+		if (null === u) return n;
+	} else if (void 0 !== i?.formula || o === l.Page && (i?.calculatedItems?.length ?? 0) > 0) throw new t(e("error.pivotTable.fieldNotPlaceable"));
+	const c = o ? H(n, o).filter((e) => e !== r) : [];
+	if (void 0 !== a && (!Number.isInteger(a) || a < 1 || a > c.length + 1)) throw new t(e("error.pivotTable.fieldPosition"));
+	const f = (a ?? c.length + 1) - 1;
+	if (o === u && (void 0 === a || H(n, o)[f] === r)) return n;
+	c.splice(f, 0, r);
+	const { rowFields: m, columnFields: p, pageFields: h, ...g } = n, w = {}, v = (e) => (e ?? []).filter((e) => e !== r), F = o === l.Row ? c : v(n.rowFields), b = o === l.Column ? c : v(n.columnFields), y = o === l.Page ? c.map((e) => n.pageFields?.find((t) => t.field === e) ?? { field: e }) : (n.pageFields ?? []).filter((e) => e.field !== r);
+	F.length > 0 && (w.rowFields = F), b.length > 0 && (w.columnFields = b), y.length > 0 && (w.pageFields = y);
 	let I = {
-		...h,
-		...g
+		...g,
+		...w
 	};
-	o === i.Page && d !== i.Page && (I = V(I, r, () => !0));
+	o === l.Page && u !== l.Page && (I = q(I, r, () => !0));
 	const x = { ...n.fields?.[r] };
-	o ? x.axis = o : delete x.axis, o && !x.items && l && (x.items = w(lt(s, r), x.subtotals)), o && void 0 === x.numberFormat && l?.dates && void 0 !== l.numberFormat && (x.numberFormat = l.numberFormat), o === i.Page && x.items?.some((e) => e.hidden) && (x.multipleItemSelection = !0);
-	const A = (n.fields ?? []).map((e, t) => t === r ? x : e);
+	o ? x.axis = o : delete x.axis, o && !x.items && i && (x.items = d(it(s, r), x.subtotals)), o && void 0 === x.numberFormat && i?.dates && void 0 !== i.numberFormat && (x.numberFormat = i.numberFormat), o === l.Page && x.items?.some((e) => e.hidden) && (x.multipleItemSelection = !0);
+	const C = (n.fields ?? []).map((e, t) => t === r ? x : e);
 	if (I = {
 		...I,
-		fields: ft(I, A)
+		fields: ft(I, C)
 	}, null === o && n.formats?.some((e) => e.area.references?.some((e) => e.field === r))) {
 		const e = n.formats.filter((e) => !e.area.references?.some((e) => e.field === r)), { formats: t, ...s } = I;
 		I = e.length > 0 ? {
@@ -1841,17 +1841,17 @@ var Z = [
 	"index",
 	"rankAscending",
 	"rankDescending"
-]), vt = /* @__PURE__ */ new Set([
+]), wt = /* @__PURE__ */ new Set([
 	...ht,
 	...gt,
 	"runTotal",
 	"difference"
-]), wt = (e, t) => {
+]), vt = (e, t) => {
 	const n = 1 === e.references?.length ? e.references[0] : null;
 	return !1 === e.outline && n?.field === pt && 1 === n.items?.length && n.items[0] === t && void 0 === n.selected && !e.type && !e.labelOnly && void 0 === e.dataOnly;
 }, Ft = (e, t) => {
-	if (!e.formats?.some((e) => wt(e.area, t))) return e;
-	const n = e.formats.filter((e) => !wt(e.area, t)), { formats: s, ...r } = e;
+	if (!e.formats?.some((e) => vt(e.area, t))) return e;
+	const n = e.formats.filter((e) => !vt(e.area, t)), { formats: s, ...r } = e;
 	return n.length > 0 ? {
 		...r,
 		formats: n
@@ -1889,7 +1889,7 @@ var Z = [
 			} : n;
 		}
 		return r;
-	}), { dataFields: o, filters: a, formats: i, conditionalFormats: l, ...d } = e, u = {
+	}), { dataFields: o, filters: a, formats: l, conditionalFormats: i, ...d } = e, u = {
 		...d,
 		fields: r
 	};
@@ -1903,7 +1903,7 @@ var Z = [
 		}];
 	});
 	c.length > 0 && (u.filters = c);
-	const f = (e) => Ze(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
+	const f = (e) => Ye(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
 		const t = f(e.area);
 		return t ? [{
 			...e,
@@ -1921,11 +1921,11 @@ var Z = [
 	return p.length > 0 && (u.conditionalFormats = p), ((e) => {
 		const t = e.dataFields?.length ?? 0, n = e.rowFields?.includes(pt), s = e.columnFields?.includes(pt), { valuesPosition: r, ...o } = e;
 		if (t < 2 && (n || s)) {
-			const t = n ? "rowFields" : "columnFields", s = e[t], r = s.indexOf(pt), a = s.filter((e) => e !== pt), i = {
+			const t = n ? "rowFields" : "columnFields", s = e[t], r = s.indexOf(pt), a = s.filter((e) => e !== pt), l = {
 				...o,
 				...r < a.length ? { valuesPosition: r } : {}
 			};
-			return a.length > 0 ? i[t] = a : delete i[t], i;
+			return a.length > 0 ? l[t] = a : delete l[t], l;
 		}
 		if (t >= 2 && !n && !s) {
 			const t = e.valuesOnRows ? "rowFields" : "columnFields", n = [...e[t] ?? []];
@@ -1950,12 +1950,12 @@ var Z = [
 	if (r - 1 === s) return n;
 	const a = o.map((e, t) => t).filter((e) => e !== s);
 	a.splice(r - 1, 0, s);
-	const i = [];
+	const l = [];
 	return a.forEach((e, t) => {
-		i[e] = t;
-	}), It(n, a.map((e) => o[e]), i);
+		l[e] = t;
+	}), It(n, a.map((e) => o[e]), l);
 }, Et = (e, t, n, s) => {
-	const r = G(e, t, n, s);
+	const r = j(e, t, n, s);
 	return (e.dataFields[n].subtotal ?? "sum") === s ? e : bt(e, n, (e) => {
 		const { subtotal: t, ...n } = e, o = {
 			...n,
@@ -1964,40 +1964,40 @@ var Z = [
 		return "sum" !== s && (o.subtotal = s), o;
 	});
 }, St = (n, s, r, o) => {
-	const a = n.dataFields[r], i = a.showDataAs ?? "normal", l = o?.kind ?? "normal";
-	if (o && !vt.has(o.kind)) throw new t(e("error.pivotTable.notAShowAs", { name: o.kind }));
-	const { showDataAs: d, baseField: u, baseItem: c, ...f } = a, m = { ...f };
-	"normal" !== l && (m.showDataAs = l);
-	let p = a.baseField, h = a.baseItem;
+	const a = n.dataFields[r], i = a.showDataAs ?? "normal", d = o?.kind ?? "normal";
+	if (o && !wt.has(o.kind)) throw new t(e("error.pivotTable.notAShowAs", { name: o.kind }));
+	const { showDataAs: u, baseField: c, baseItem: f, ...m } = a, p = { ...m };
+	"normal" !== d && (p.showDataAs = d);
+	let h = a.baseField, g = a.baseItem;
 	if (void 0 !== o?.baseField) {
-		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => T(_(n, s, t), r));
+		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => l(B(n, s, t), r));
 		if (a < 0) throw new t(e("error.pivotTable.notAField", { name: r }));
-		a !== p && (p = a, h = 0);
+		a !== h && (h = a, g = 0);
 	}
 	if (void 0 !== o?.baseItem) {
-		const r = p ?? 0;
-		if (T(o.baseItem, "(previous)")) h = "previous";
-		else if (T(o.baseItem, "(next)")) h = "next";
+		const r = h ?? 0;
+		if (l(o.baseItem, "(previous)")) g = "previous";
+		else if (l(o.baseItem, "(next)")) g = "next";
 		else {
 			const a = n.fields?.[r]?.items ? n : { fields: (n.fields ?? []).map((e, t) => t === r ? {
 				...e,
-				items: lt(s, r)
-			} : e) }, i = z(a, s, r).findIndex((e) => null !== e && T(e, o.baseItem));
+				items: it(s, r)
+			} : e) }, i = T(a, s, r).findIndex((e) => null !== e && l(e, o.baseItem));
 			if (i < 0) throw new t(e("error.pivotTable.notAnItem", { name: o.baseItem }));
-			h = i;
+			g = i;
 		}
 	}
-	if (void 0 !== p && (m.baseField = p), void 0 !== h && (m.baseItem = h), l === i) return m.baseField === a.baseField && m.baseItem === a.baseItem ? n : bt(n, r, () => m);
-	const g = ((e, t, n) => {
+	if (void 0 !== h && (p.baseField = h), void 0 !== g && (p.baseItem = g), d === i) return p.baseField === a.baseField && p.baseItem === a.baseItem ? n : bt(n, r, () => p);
+	const w = ((e, t, n) => {
 		if (gt.has(n)) return gt.has(t) ? e : void 0;
-		const s = ((e) => F(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
+		const s = ((e) => y(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
 		return ht.has(n) ? ht.has(t) || s ? e : 10 : ht.has(t) && s ? void 0 : e;
-	})(a.numberFormat, i, l);
-	return g === a.numberFormat ? bt(n, r, () => m) : bt(Ft(n, r), r, () => yt(m, g));
+	})(a.numberFormat, i, d);
+	return w === a.numberFormat ? bt(n, r, () => p) : bt(Ft(n, r), r, () => yt(p, w));
 }, Pt = (e, t, n) => {
 	dt(n);
-	const s = F(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
-	if (F(r.numberFormat) === s && o && wt(o.area, t) && o.style.numberFormat === s) return e;
+	const s = y(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
+	if (y(r.numberFormat) === s && o && vt(o.area, t) && o.style.numberFormat === s) return e;
 	const a = bt(Ft(e, t), t, (e) => yt(e, "General" === s ? void 0 : n));
 	return {
 		...a,
@@ -2014,27 +2014,27 @@ var Z = [
 	};
 }, kt = (n, s, r) => {
 	if (null === s) return At(n);
-	const o = D.Axis;
+	const o = A.Axis;
 	if (s !== o.Row && s !== o.Column) throw new t(e("error.pivotTable.fieldNotPlaceable"));
 	const a = n.rowFields?.includes(pt) ? o.Row : n.columnFields?.includes(pt) ? o.Column : null;
 	if (!a) throw new t(e("error.pivotTable.fieldPosition"));
-	const i = O(n, s).filter((e) => e !== pt);
-	if (void 0 !== r && (!Number.isInteger(r) || r < 1 || r > i.length + 1)) throw new t(e("error.pivotTable.fieldPosition"));
-	const l = (r ?? i.length + 1) - 1;
-	if (s === a && (void 0 === r || O(n, s)[l] === pt)) return n;
-	i.splice(l, 0, pt);
-	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = O(n, s === o.Row ? o.Column : o.Row).filter((e) => e !== pt), p = { ...f }, h = s === o.Row ? i : m, g = s === o.Column ? i : m;
+	const l = H(n, s).filter((e) => e !== pt);
+	if (void 0 !== r && (!Number.isInteger(r) || r < 1 || r > l.length + 1)) throw new t(e("error.pivotTable.fieldPosition"));
+	const i = (r ?? l.length + 1) - 1;
+	if (s === a && (void 0 === r || H(n, s)[i] === pt)) return n;
+	l.splice(i, 0, pt);
+	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = H(n, s === o.Row ? o.Column : o.Row).filter((e) => e !== pt), p = { ...f }, h = s === o.Row ? l : m, g = s === o.Column ? l : m;
 	return h.length > 0 && (p.rowFields = [...h]), g.length > 0 && (p.columnFields = [...g]), s === o.Row && (p.valuesOnRows = !0), p;
 }, Mt = (n, s, r) => {
 	if (r === (n.valuesCaption ?? "Values")) return n;
-	const { valuesCaption: o, ...a } = n, i = {
+	const { valuesCaption: o, ...a } = n, l = {
 		...a,
 		valuesCaption: "\0"
 	};
-	if (q(i, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (F(l, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
 	return "Values" === r ? a : {
 		...a,
 		valuesCaption: r
 	};
 };
-export { xt as addPivotDataField, Ne as anchorPivotPeriods, dt as assertNumberFormat, it as axisFieldsOf, Re as buildPivotView, Oe as evaluatePivotFilters, B as isItemFilter, Ie as layOutPivot, lt as listedItemsOf, Ct as movePivotDataField, mt as movePivotField, st as movePivotItem, kt as movePivotValues, ot as newPivotCache, ct as newPivotTable, _e as readPivotSource, qe as refreshPivotCache, Ke as remapPivotTable, At as removePivotDataField, nt as renamePivotItem, Mt as renamePivotValues, Ye as reorderPivotItems, Et as setPivotDataFunction, Pt as setPivotDataNumberFormat, St as setPivotDataShowAs, et as sortPivotItemsByLabel, rt as typeOverPivot, at as withListedFields };
+export { xt as addPivotDataField, Ne as anchorPivotPeriods, dt as assertNumberFormat, lt as axisFieldsOf, Re as buildPivotView, Oe as evaluatePivotFilters, M as isItemFilter, Ie as layOutPivot, it as listedItemsOf, Ct as movePivotDataField, mt as movePivotField, st as movePivotItem, kt as movePivotValues, ot as newPivotCache, ct as newPivotTable, _e as readPivotSource, ze as refreshPivotCache, Ke as remapPivotTable, At as removePivotDataField, nt as renamePivotItem, Mt as renamePivotValues, Ze as reorderPivotItems, Et as setPivotDataFunction, Pt as setPivotDataNumberFormat, St as setPivotDataShowAs, et as sortPivotItemsByLabel, rt as typeOverPivot, at as withListedFields };