@sheetxl/mcp 0.8.0-beta.20 → 0.8.0-beta.21

package/assets/{CDmri0gcZxpVZfWn.js → Q2j8yQZX1kL_MbbB.js}

@@ -1,14 +1,14 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.20
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.21
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { p as e, tt as t } from "./CyOyY32LLW-Pj_L7.js";
-import { d as n, en as s, f as r, vt as o } from "./C9aV1SF8uCWIB4zU.js";
-import { u as a } from "./CrRJqUPbvvhnp4p4.js";
-import { $ as l, Ba as i, Ca as d, Cn as u, Da as c, Dr as f, Fn as m, G as p, Jr as h, Kn as g, La as w, M as v, Mi as F, Qa as b, Rn as y, Ua as I, Xi as x, Yr as A, ba as C, ct as E, g as S, hi as P, hn as k, ht as M, it as T, ja as R, k as O, kt as N, l as $, na as L, qr as _, s as D, si as V, ta as U, ua as H, vr as B, w as j, xi as z, ya as G, zi as q } from "./DTXRsv2Ww7WbIwCb.js";
-import { a as K, i as Q, n as J, o as W, r as X } from "./C9eaFlFi_4GmymzP.js";
+import { p as e, tt as t } from "./DjbBTiei0H-BIJaN.js";
+import { d as n, en as s, f as r, vt as o } from "./CB9TsE5n0FEyFnAz.js";
+import { u as a } from "./D5mfuGSeGXSDHj9-.js";
+import { $a as l, Ba as i, Ga as d, Ja as u, Lr as c, Ma as f, Oa as m, Qr as p, Sr as h, Ta as g, Tn as w, Vn as v, aa as F, ao as b, b as y, bi as I, ci as x, dr as A, ft as C, gi as E, gn as S, gt as P, ka as k, kr as M, li as T, nn as O, pi as R, q as N, qi as $, qr as L, ti as _, ua as D, ui as V, un as U, w as H, wa as B, wi as q, yt as z, zi as G, zr as j } from "./Vo34QvIefEN595xl.js";
+import { a as K, i as Q, n as J, o as W, r as X } from "./B1l0k4ErELObdQKE.js";
 var Y = [
 	"Jan",
 	"Feb",
@@ -61,20 +61,20 @@ var Y = [
 		default: return null;
 	}
 }, te = (e, t) => {
-	const n = e.fields ?? [], s = L(e.records, n.length);
-	if (!n.some(d)) return s;
-	const r = L(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
+	const n = e.fields ?? [], s = g(e.records, n.length);
+	if (!n.some(f)) return s;
+	const r = g(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
 	for (let e = 0; e < n.length; e++) {
 		const l = n[e];
-		if (!d(l)) continue;
-		const i = l.group, u = s[i.base] ?? [], c = r[i.base] ?? [], f = new Int32Array(c.length);
-		for (let e = 0; e < c.length; e++) {
-			const n = i.range ? ee(i.range, i.items.length, j(c[e]), t) : i.discrete?.[e] ?? null;
-			f[e] = n ?? -1;
+		if (!f(l)) continue;
+		const i = l.group, d = s[i.base] ?? [], u = r[i.base] ?? [], c = 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;
+			c[e] = n ?? -1;
 		}
 		const m = new Array(o);
 		for (let e = 0; e < o; e++) {
-			const t = f[u[e]];
+			const t = c[d[e]];
 			if (void 0 === t || t < 0) return null;
 			m[e] = t;
 		}
@@ -231,10 +231,10 @@ var Y = [
 		if (t.includes(e)) return !1;
 		const i = [];
 		oe(n[e].formula, (e) => {
-			const t = n.findIndex((t) => b(t.name, e));
+			const t = n.findIndex((t) => h(t.name, e));
 			return t >= 0 && i.push(t), t >= 0 ? "" : null;
 		});
-		for (const r of i) if (q(n[r])) {
+		for (const r of i) if (M(n[r])) {
 			if (!l(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({
@@ -242,7 +242,7 @@ var Y = [
 			expression: ""
 		}), !0;
 	}, i = [];
-	for (const [t, s] of (e.dataFields ?? []).entries()) if (q(n[s.field])) {
+	for (const [t, s] of (e.dataFields ?? []).entries()) if (M(n[s.field])) {
 		if (!l(s.field, [])) return null;
 		i.push({
 			data: t,
@@ -251,8 +251,8 @@ var Y = [
 	}
 	const d = (e, t) => {
 		if (null !== t) return null;
-		const r = n.findIndex((t) => b(t.name, e));
-		return r >= 0 ? ae(q(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
+		const r = n.findIndex((t) => h(t.name, e));
+		return r >= 0 ? ae(M(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
 		var a;
 	};
 	for (const e of r) {
@@ -343,75 +343,75 @@ var Y = [
 	percent: 13,
 	percentDiff: 14
 }, Ie = (e, t, n, s) => {
-	const r = m.peek(), o = e.fields, a = t.fields;
+	const r = P.peek(), o = e.fields, a = t.fields;
 	if (!r || !o || !a || o.length !== a.length) return null;
-	if (g(e)) return {
+	if (A(e)) return {
 		cells: [],
-		...l,
+		...U,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: G(e),
+		header: m(e),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
 		...s?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	const i = $(e, a), u = i ? s?.filters : null;
-	if (i && !u) return null;
-	const c = o.some((e) => e.items?.some((e) => e.calculated));
-	if (c && !u?.calculatedRecords) return null;
-	const f = de(e, t);
-	if (!f || f.measures.length > 0 && !u?.fieldValues) return null;
+	const i = j(e, a), d = i ? s?.filters : null;
+	if (i && !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;
 	if ((e.dataFields ?? []).some((e) => void 0 === ye[e.showDataAs ?? "normal"] || void 0 === pe[e.subtotal ?? "sum"])) return null;
-	const p = xe(e, t, n, u?.calculatedRecords, f.operands);
+	const p = xe(e, t, n, d?.calculatedRecords, c.operands);
 	if (!p) return null;
-	const { items: h, records: w, values: v, n: b } = p, y = (e) => !!e && (!e.noRecords || d(e)), I = e.form ?? "compact", x = (e) => {
+	const { items: h, records: g, values: w, n: v } = p, F = (e) => !!e && (!e.noRecords || f(e)), b = e.form ?? "compact", y = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === ce) {
 				t.push({
 					field: n,
-					form: I
+					form: b
 				});
 				continue;
 			}
 			const e = o[n], s = e?.subtotals;
-			if (!e || !y(a[n])) return null;
-			if (c && s && s.some((e) => "default" !== e)) return null;
+			if (!e || !F(a[n])) return null;
+			if (u && s && s.some((e) => "default" !== e)) return null;
 			t.push({
 				field: n,
 				form: e.form ?? "compact"
 			});
 		}
 		return t;
-	}, A = x(e.rowFields), C = x(e.columnFields), E = e.pageFields ?? [];
-	if (!A || !C || E.some((e) => !y(a[e.field]))) return null;
-	const S = F(e, s?.slicerFields);
-	return S.pageFields?.some((e) => !y(a[e.field])) ? null : Te(e, t, h, A, C, Se(r, S, h, w, v, A, C, b, u?.keep, u?.records, f.operands.length, u?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
+	}, I = y(e.rowFields), x = y(e.columnFields), C = e.pageFields ?? [];
+	if (!I || !x || C.some((e) => !F(a[e.field]))) return null;
+	const E = l(e, s?.slicerFields);
+	return E.pageFields?.some((e) => !F(a[e.field])) ? null : Te(e, t, h, I, x, Se(r, E, h, g, w, I, x, v, d?.keep, d?.records, c.operands.length, d?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
 }, xe = (e, t, n, s, r = []) => {
-	const o = t.fields?.length ?? 0, a = A(t);
+	const o = t.fields?.length ?? 0, a = V(t);
 	if (!t.records) return null;
 	const l = te(t, n.isDate1904());
 	if (!l) return null;
-	const i = !0 === t.fields?.some(d), u = i ? L(t.items, o) : a, c = i ? L(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 ? c[e] : l[e] ?? [], o = s ? u[e] : a[e], i = new Array(p);
-		for (let e = 0; e < f; e++) i[e] = j(o[r[e]]);
-		for (let e = 0; e < m; e++) i[f + e] = n?.[e] ?? null;
+	const i = !0 === t.fields?.some(f), d = i ? g(t.items, o) : a, u = i ? g(t.records, o) : l, c = t.recordCount ?? 0, m = s?.count ?? 0, p = c + 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 < c; e++) i[e] = C(o[r[e]]);
+		for (let e = 0; e < m; e++) i[c + e] = n?.[e] ?? null;
 		return i;
-	}, g = [...(e.dataFields ?? []).map((e, t) => h(e.field, s?.values[t])), ...r.map((e) => h(e))];
+	}, w = [...(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: g,
+		values: w,
 		n: p
 	};
 }, Ae = async (e, t, n, s, r, o, a, l, i) => {
-	const d = m.peek(), u = e.dataFields?.[r];
+	const d = P.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)), p = c[f];
-	if (!p) return null;
-	const h = p.slice(0, p.indexOf(s)), g = e.fields.map((e) => {
+	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;
+	const p = m.slice(0, m.indexOf(s)), h = e.fields.map((e) => {
 		const { blankRowAfter: t, showItemsWithNoData: n, sort: s, ...r } = e;
 		return {
 			...r,
@@ -421,46 +421,46 @@ var Y = [
 				return n;
 			})
 		};
-	}), { columnGrandTotals: w, ...v } = e, { showDataAs: F, ...b } = u, y = {
-		...v,
-		fields: g,
-		rowFields: [...h, s],
+	}), { columnGrandTotals: g, ...w } = e, { showDataAs: v, ...F } = u, b = {
+		...w,
+		fields: h,
+		rowFields: [...p, s],
 		columnFields: [],
-		dataFields: [b],
+		dataFields: [F],
 		rowGrandTotals: !1
-	}, I = l ? {
+	}, y = 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) => ({
+	} : l, I = de(b, t);
+	if (!I || I.measures.length > 0 && !i) 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, k = b.rowFields.map((e) => ({
 		field: e,
 		form: "compact"
 	}));
 	let M;
 	if (a) {
 		const e = 0 === f ? 1 : 2;
-		M = new Uint8Array(P);
-		for (let t = 0; t < P; t++) {
+		M = new Uint8Array(S);
+		for (let t = 0; t < S; t++) {
 			const n = a[t];
 			M[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
 		}
 	}
-	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 !== h.length + 1) return;
-		const n = h.map((t, n) => O(t, e.path[n])).join(",");
+	const T = I.measures.length > 0 ? await Ee(d, I, b, A, C, E, k, [], S, o, M, i) : void 0, O = Se(d, b, A, C, E, k, [], S, o, M, I.operands.length, T), R = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), $ = O.columns.length;
+	return O.rows.forEach((e, t) => {
+		if (0 !== e.kind || e.path.length !== p.length + 1) return;
+		const n = p.map((t, n) => R(t, e.path[n])).join(",");
 		let r = N.get(n);
 		r || N.set(n, r = {
 			ids: [],
 			totals: []
-		}), r.ids.push(O(s, e.path[h.length])), r.totals.push(R.values[t * $]);
+		}), r.ids.push(R(s, e.path[p.length])), r.totals.push(O.values[t * $]);
 	}), {
-		outer: h,
+		outer: p,
 		groups: N,
-		records: E
+		records: C
 	};
 }, Ce = (e, t, n) => {
 	const s = new Uint32Array(t).fill(fe), r = new Uint8Array(t), o = e.items;
@@ -649,51 +649,51 @@ var Y = [
 		} 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, l, d, f, m) => {
-	const p = e.fields, h = t.fields, g = e.dataFields ?? [], w = (t) => t === ce ? e.valuesCaption ?? "Values" : p[t].name ?? h[t].name, v = (e, t) => {
-		if (e === ce) return g[t]?.name ?? "";
-		const s = p[e].items?.[t];
+}, Te = (e, t, n, r, o, l, d, u, c) => {
+	const f = e.fields, p = t.fields, h = e.dataFields ?? [], g = (t) => t === ce ? e.valuesCaption ?? "Values" : f[t].name ?? p[t].name, w = (e, t) => {
+		if (e === ce) return h[t]?.name ?? "";
+		const s = f[e].items?.[t];
 		if (void 0 !== s?.name) return s.name;
-		const r = j(n[e][s?.item ?? t]);
-		return null === r ? x : r;
-	}, F = (e, t) => {
-		const n = v(e, t);
+		const r = C(n[e][s?.item ?? t]);
+		return null === r ? F : r;
+	}, v = (e, t) => {
+		const n = w(e, t);
 		if ("number" == typeof n) {
-			const o = p[e].items?.[t]?.item ?? t, a = void 0 === (p[e].numberFormat ?? h[e].numberFormat) && I(h[e], o);
-			return s(d, a ? i(P(h[e], o), d) : i(p[r = e].numberFormat ?? h[r].numberFormat, d), n);
+			const o = f[e].items?.[t]?.item ?? t, a = void 0 === (f[e].numberFormat ?? p[e].numberFormat) && E(p[e], o);
+			return s(d, a ? R(H(p[e], o), d) : R(f[r = e].numberFormat ?? p[r].numberFormat, d), n);
 		}
 		var r;
 		return a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
 	}, b = (e) => {
-		if (void 0 !== e.item) return v(e.field, e.item);
-		const t = p[e.field].items ?? [];
+		if (void 0 !== e.item) return w(e.field, e.item);
+		const t = f[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		const n = t.flatMap((e, t) => u(e) && !e.hidden ? [t] : []);
-		return 1 === n.length ? v(e.field, n[0]) : "(Multiple Items)";
-	}, y = e.grandTotalCaption ?? "Grand Total", A = f ? /* @__PURE__ */ new Map() : null, C = (e, t) => e === ce ? {
+		const n = t.flatMap((e, t) => y(e) && !e.hidden ? [t] : []);
+		return 1 === n.length ? w(e.field, n[0]) : "(Multiple Items)";
+	}, A = e.grandTotalCaption ?? "Grand Total", S = u ? /* @__PURE__ */ new Map() : null, P = (e, t) => e === ce ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, E = (e) => e === ce ? null : {
+	}, k = (e) => e === ce ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, S = (e, t) => 2 === e.kind && t === y ? { kind: "grandTotal" } : null, k = 0 === r.length && 0 === o.length && 0 === g.length, M = k ? {
+	}, M = (e, t) => 2 === e.kind && t === A ? { kind: "grandTotal" } : null, T = 0 === r.length && 0 === o.length && 0 === h.length, O = T ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : G(e), T = k ? [] : Me(l.rows, l.functions), R = k ? [] : Me(l.columns, l.functions), O = c({
+	} : m(e), N = T ? [] : Me(l.rows, l.functions), $ = T ? [] : Me(l.columns, l.functions), L = I({
 		...e,
-		header: M,
-		rowLines: T,
-		columnLines: R
-	}), N = l.columns.length, $ = (e) => "row" === e ? r : o, L = (t) => {
+		header: O,
+		rowLines: N,
+		columnLines: $
+	}), _ = l.columns.length, D = (e) => "row" === e ? r : o, V = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [w(n), {
+				return [g(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
@@ -705,35 +705,35 @@ var Y = [
 					page: t.page
 				}];
 			}
-			case "dataCaption": return [g[t.data]?.name ?? null, {
+			case "dataCaption": return [h[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 "columnHeader": return [e.columnHeaderCaption ?? "Column Labels", { kind: "columnHeader" }];
 			case "fieldCaption": {
-				const e = $(t.axis)[t.level].field;
-				return [w(e), E(e)];
+				const e = D(t.axis)[t.level].field;
+				return [g(e), k(e)];
 			}
 			case "label": {
-				const e = $(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [v(e, n), C(e, n)];
+				const e = D(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [w(e, n), P(e, n)];
 			}
 			case "total": {
 				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 ? g[t.data]?.name ?? "" : "";
-					if (2 === t.kind) return n ? `Total ${s}` : y;
-					const r = t.path.length - 1, o = e[r].field, a = F(o, t.path[r]);
+					const n = e.findIndex((e) => e.field === ce) >= t.path.length && null !== t.data, s = n ? h[t.data]?.name ?? "" : "";
+					if (2 === t.kind) return n ? `Total ${s}` : A;
+					const r = t.path.length - 1, o = e[r].field, a = v(o, t.path[r]);
 					if (null !== t.function) {
 						const e = we[l.functions[t.function]];
-						return (n || t.across) && null !== t.data ? `${a} ${e} of ${w(g[t.data].field)}` : `${a} ${e}`;
+						return (n || t.across) && null !== t.data ? `${a} ${e} of ${g(h[t.data].field)}` : `${a} ${e}`;
 					}
-					return p[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
-				})($(t.axis), e);
-				return [n, S(e, n)];
+					return f[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
+				})(D(t.axis), e);
+				return [n, M(e, n)];
 			}
 			case "value": {
-				const n = t.row.index * N + t.column.index, s = l.states[n];
+				const n = t.row.index * _ + t.column.index, s = l.states[n];
 				let r = null;
 				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;
@@ -744,207 +744,207 @@ var Y = [
 				})(e.emptyCaption)), [r, null];
 			}
 		}
-	}, D = new U.Builder(), V = O.top, H = O.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), z = (e, t) => {
-		const n = _(O, e, t);
+	}, U = new B.Builder(), q = L.top, z = L.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), G = (e, t) => {
+		const n = x(L, e, t);
 		if (!n) return;
-		const [s, r] = L(n);
+		const [s, r] = V(n);
 		((e, t, n) => {
-			A && n && A.set(e + "," + t, n);
-		})(e - V, t, r), null !== s && (m ? D.pushAt(t, e - V, s) : D.pushAt(e - V, t, s));
+			S && n && S.set(e + "," + t, n);
+		})(e - q, t, r), null !== s && (c ? U.pushAt(t, e - q, s) : U.pushAt(e - q, t, s));
 	};
-	if (m) {
-		const e = Math.max(H, O.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < O.rows.length; e++) t < (e < V ? H : O.columns.length) && z(e, t);
-	} else for (let e = 0; e < O.rows.length; e++) {
-		const t = e < V ? H : O.columns.length;
-		for (let n = 0; n < t; n++) z(e, n);
+	if (c) {
+		const e = Math.max(z, L.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < L.rows.length; e++) t < (e < q ? z : L.columns.length) && G(e, t);
+	} else for (let e = 0; e < L.rows.length; e++) {
+		const t = e < q ? z : L.columns.length;
+		for (let n = 0; n < t; n++) G(e, n);
 	}
-	if (k) {
-		const t = B(e);
+	if (T) {
+		const t = i(e);
 		return {
-			cells: D.build()?.tuples ?? [],
+			cells: U.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
 			columnPageCount: t.columns,
-			header: M,
+			header: O,
 			rowLines: [],
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...A ? { roles: A } : {}
+			...S ? { roles: S } : {}
 		};
 	}
-	const q = (e, t) => {
+	const j = (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, [...q(r, e), ...q(o, 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;
+	}, Q = (e, t) => K(e.data ?? t.data ?? 0, [...j(r, e), ...j(o, 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(r, t), l.columns.forEach((s, r) => {
-			const o = l.states[n * N + r];
+		3 === t.kind || Z(t) || (j(r, 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 * N + r] : 0;
+			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 = i(e);
 	return {
-		cells: D.build()?.tuples ?? [],
-		rows: O.rows.length - V,
-		columns: O.columns.length,
+		cells: U.build()?.tuples ?? [],
+		rows: L.rows.length - q,
+		columns: L.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
-		header: M,
-		rowLines: T,
-		columnLines: R,
+		header: O,
+		rowLines: N,
+		columnLines: $,
 		viewValues: Y,
 		firstKey: X,
-		...A ? { roles: A } : {}
+		...S ? { roles: S } : {}
 	};
-}, Re = (e, t, n, r, o = !1, l, u) => {
-	const c = Ie(e, t, r, {
+}, Oe = (e, t, n, r, o = !1, l, i) => {
+	const d = Ie(e, t, r, {
 		filters: l,
-		slicerFields: u
+		slicerFields: i
 	});
-	if (!c) return null;
-	const f = c.rowPageCount > 0 ? c.rowPageCount + 1 : 0, m = c.rowPageCount > 0 ? 3 * c.columnPageCount - 1 : 0, { rowStart: p, colStart: h } = n;
-	if (p - f < 0) return null;
-	const g = {
-		rowStart: p - f,
-		colStart: h,
-		rowEnd: p + c.rows - 1,
-		colEnd: h + Math.max(c.columns, m) - 1
-	}, w = e.fields, v = t.fields, F = A(t), b = (e, t) => {
-		const n = w[e], o = n.numberFormat ?? v[e].numberFormat, l = i(o, r), u = d(v[e]), c = F[e], f = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), m = f.length > 0 ? f : c.map((e, t) => ({ item: t })), p = m.map((t) => {
-			const n = j(c[t.item]), d = I(v[e], t.item), f = null === n ? "(blank)" : "number" == typeof n ? s(r, d ? (m = t.item, void 0 === o ? i(P(v[e], m), r) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-			var m;
-			const p = u && d ? f : n;
+	if (!d) return null;
+	const u = d.rowPageCount > 0 ? d.rowPageCount + 1 : 0, c = d.rowPageCount > 0 ? 3 * d.columnPageCount - 1 : 0, { rowStart: m, colStart: p } = n;
+	if (m - u < 0) return null;
+	const h = {
+		rowStart: m - u,
+		colStart: p,
+		rowEnd: m + d.rows - 1,
+		colEnd: p + Math.max(d.columns, c) - 1
+	}, g = e.fields, w = t.fields, v = V(t), F = (e, t) => {
+		const n = g[e], o = n.numberFormat ?? w[e].numberFormat, l = R(o, r), i = f(w[e]), d = v[e], u = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), c = u.length > 0 ? u : d.map((e, t) => ({ item: t })), m = c.map((t) => {
+			const n = C(d[t.item]), u = E(w[e], t.item), c = null === n ? "(blank)" : "number" == typeof n ? s(r, u ? (f = t.item, void 0 === o ? R(H(w[e], f), r) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+			var f;
+			const m = i && u ? c : n;
 			return void 0 !== t.name ? {
-				value: p,
-				text: f,
+				value: m,
+				text: c,
 				name: t.name
 			} : {
-				value: p,
-				text: f
+				value: m,
+				text: c
 			};
-		}), h = {
-			name: n.name ?? v[e].name,
-			items: p
+		}), p = {
+			name: n.name ?? w[e].name,
+			items: m
 		};
 		if (t) {
 			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			h.page = void 0 !== e ? m.findIndex((t) => t.item === e) : -1;
+			p.page = void 0 !== e ? c.findIndex((t) => t.item === e) : -1;
 		}
-		return h;
-	}, y = (e) => (e ?? []).filter((e) => -2 !== e);
+		return p;
+	}, b = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
-			range: g,
+			range: h,
 			dataFields: (e.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: v[e.field].name
+				sourceName: w[e.field].name
 			})),
 			fields: [
-				...y(e.rowFields).map((e) => b(e)),
-				...y(e.columnFields).map((e) => b(e)),
-				...(e.pageFields ?? []).map((e) => b(e.field, e))
+				...b(e.rowFields).map((e) => F(e)),
+				...b(e.columnFields).map((e) => F(e)),
+				...(e.pageFields ?? []).map((e) => F(e.field, e))
 			],
-			values: c.viewValues,
+			values: d.viewValues,
 			block: {
 				anchor: {
-					row: p,
-					column: h
+					row: m,
+					column: p
 				},
 				...o ? { blocked: !0 } : {},
-				...null !== c.firstKey ? { first: c.firstKey } : {}
+				...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(), l = (e.filters ?? []).filter((t) => H(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), d = e.fields?.some((e) => e.items?.some((e) => e.calculated)), u = e.dataFields?.some((e) => q(t.fields?.[e.field]));
-	if (0 === l.length && !d && !u) return { keep: o };
-	const c = A(t);
-	for (const s of l.filter(H)) {
-		const a = s.field, l = c[a];
+}, Re = async (e, t, n, r) => {
+	const o = /* @__PURE__ */ new Map(), l = (e.filters ?? []).filter((t) => $(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), i = e.fields?.some((e) => e.items?.some((e) => e.calculated)), d = e.dataFields?.some((e) => M(t.fields?.[e.field]));
+	if (0 === l.length && !i && !d) return { keep: o };
+	const u = V(t);
+	for (const s of l.filter($)) {
+		const a = s.field, l = u[a];
 		if (!l) continue;
-		const i = C(s.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] : j(l[e]);
-		const u = await $e(s.condition, d, n, r), f = o.get(a);
-		if (f) for (let e = 0; e < u.length; e++) f[e] &= u[e];
-		else o.set(a, u);
+		const i = k(s.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 c = await $e(s.condition, d, n, r), f = o.get(a);
+		if (f) for (let e = 0; e < c.length; e++) f[e] &= c[e];
+		else o.set(a, c);
 	}
-	const f = d && r ? await (async (e, t, n, r, o) => {
-		const l = t.fields ?? [], d = e.fields ?? [], u = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
-		if (1 !== u.length || c.some((e) => q(l[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
-		const f = u[0], m = l[f].calculatedItems, p = te(t, n.isDate1904());
-		if (!p) return null;
-		const h = A(t), g = A({
+	const c = i && r ? await (async (e, t, n, r, o) => {
+		const l = t.fields ?? [], i = e.fields ?? [], d = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), u = e.dataFields ?? [];
+		if (1 !== d.length || u.some((e) => M(l[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
+		const c = d[0], f = l[c].calculatedItems, m = te(t, n.isDate1904());
+		if (!m) return null;
+		const p = V(t), g = V({
 			...t,
 			fields: l.map(({ group: e, ...t }) => t)
-		}), w = (e.rowFields ?? []).filter((e) => e >= 0), v = (e.columnFields ?? []).filter((e) => e >= 0), F = w.includes(f) ? w : v.includes(f) ? v : null;
-		if (!F) return null;
-		const y = F.slice(0, F.indexOf(f)), C = [...F.slice(F.indexOf(f) + 1), ...F === w ? v : w], E = [...y, ...C], S = t.recordCount ?? 0, P = (e, t) => {
-			const n = d[e]?.items, s = n?.find((e) => e.item === t && void 0 === e.type);
+		}), w = (e.rowFields ?? []).filter((e) => e >= 0), v = (e.columnFields ?? []).filter((e) => e >= 0), b = w.includes(c) ? w : v.includes(c) ? v : null;
+		if (!b) return null;
+		const y = b.slice(0, b.indexOf(c)), I = [...b.slice(b.indexOf(c) + 1), ...b === w ? v : w], x = [...y, ...I], A = t.recordCount ?? 0, S = (e, t) => {
+			const n = i[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]);
-		}, k = (e, t) => {
-			const n = d[e.field]?.items;
+		}, P = (e, t) => {
+			const n = i[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;
-		}, M = e.pageFields ?? [], T = i(l[f].numberFormat ?? 14, n), R = (e) => h[f].findIndex((t, r) => {
-			const o = j(t);
-			return "number" == typeof o && (l[f].dates || I(l[f], r)) ? b(s(n, T, o), e) : b(null === o ? x : V(o), e);
-		}), O = /* @__PURE__ */ new Map(), N = new Map(m.map((e) => [e.item, e.formula])), $ = (e) => {
-			let t = O.get(e);
-			return void 0 === t && O.set(e, t = O.size), t;
+		}, k = e.pageFields ?? [], T = R(l[c].numberFormat ?? 14, n), O = (e) => p[c].findIndex((t, r) => {
+			const o = C(t);
+			return "number" == typeof o && (l[c].dates || E(l[c], r)) ? h(s(n, T, o), e) : h(null === o ? F : D(o), e);
+		}), N = /* @__PURE__ */ new Map(), $ = new Map(f.map((e) => [e.item, e.formula])), L = (e) => {
+			let t = N.get(e);
+			return void 0 === t && N.set(e, t = N.size), t;
 		};
-		for (const e of m) if (null === oe(e.formula, (e, t) => {
-			if (null === t || !b(l[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 || !h(l[c].name, e)) return null;
+			const n = O(t);
+			return n < 0 ? null : ($.has(n) || L(n), "");
 		})) return null;
-		const L = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), D = c.map((e) => ({
-			column: p[e.field],
+		const _ = /* @__PURE__ */ new Map(), U = /* @__PURE__ */ new Map(), H = u.map((e) => ({
+			column: m[e.field],
 			values: g[e.field],
 			fold: e.subtotal ?? "sum"
-		})), U = O.size;
-		for (let e = 0; e < S; e++) {
-			if (!M.every((t) => k(t, p[t.field][e]))) continue;
-			if (!E.every((t) => P(t, p[t][e]))) continue;
+		})), B = N.size;
+		for (let e = 0; e < A; e++) {
+			if (!k.every((t) => P(t, m[t.field][e]))) continue;
+			if (!x.every((t) => S(t, m[t][e]))) continue;
 			let t = "";
-			for (const n of y) t += p[n][e] + ",";
-			_.has(t) || _.set(t, e);
-			const n = O.get(p[f][e]);
+			for (const n of y) t += m[n][e] + ",";
+			U.has(t) || U.set(t, e);
+			const n = N.get(m[c][e]);
 			if (void 0 === n) continue;
 			let s = t;
-			for (const t of C) s += p[t][e] + ",";
-			let r = L.get(s);
+			for (const t of I) s += m[t][e] + ",";
+			let r = _.get(s);
 			r || (r = {
-				sums: c.map(() => new Array(U).fill(0)),
-				errors: c.map(() => new Array(U).fill(void 0))
-			}, L.set(s, r));
+				sums: u.map(() => new Array(B).fill(0)),
+				errors: u.map(() => new Array(B).fill(void 0))
+			}, _.set(s, r));
 			const { sums: o, errors: l } = r;
-			D.forEach(({ column: t, values: s, fold: r }, i) => {
-				const d = j(s[t[e]]);
+			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 H = C.map((e) => {
-			const t = d[e]?.items;
-			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && P(e, t.item) ? [t.item] : []) : h[e].map((e, t) => t);
+		const q = I.map((e) => {
+			const t = i[e]?.items;
+			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && S(e, t.item) ? [t.item] : []) : p[e].map((e, t) => t);
 		});
-		if (H.reduce((e, t) => e * t.length, _.size) > 5e5) return null;
-		const B = [];
-		for (const [e, t] of _) {
+		if (q.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 !== H.length) for (const t of H[e]) n(e + 1, [...s, t], r + t + ",");
-				else B.push({
+				if (e !== q.length) for (const t of q[e]) n(e + 1, [...s, t], r + t + ",");
+				else z.push({
 					exemplar: t,
 					path: s,
 					key: r
@@ -952,45 +952,45 @@ var Y = [
 			};
 			n(0, [], e);
 		}
-		const z = B.length;
-		if (0 === z) return {
+		const G = z.length;
+		if (0 === G) return {
 			count: 0,
 			ids: l.map(() => []),
-			values: c.map(() => [])
+			values: u.map(() => [])
 		};
-		const G = c.length * U, K = (e, t) => e * U + t, Q = (e, t) => G + e * m.length + t, J = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < U; t++) J.push(B.map(({ key: n }) => {
-			const s = L.get(n);
+		const j = u.length * B, K = (e, t) => e * B + t, Q = (e, t) => j + e * f.length + t, J = [];
+		for (let e = 0; e < u.length; e++) for (let t = 0; t < B; t++) J.push(z.map(({ key: n }) => {
+			const s = _.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 < m.length; t++) {
-			const n = oe(m[t].formula, (t, n) => {
+		for (let e = 0; e < u.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 = m.findIndex((e) => e.item === s);
-				return ae(r >= 0 ? Q(e, r) : K(e, O.get(s)));
+				const s = O(n), r = f.findIndex((e) => e.item === s);
+				return ae(r >= 0 ? Q(e, r) : K(e, N.get(s)));
 			});
 			if (null === n) return null;
 			W.push({
 				expression: n,
-				coords: le(Q(e, t), z)
+				coords: le(Q(e, t), G)
 			});
 		}
 		const X = await r.evaluateBatch({
-			values: ie(J, z),
+			values: ie(J, G),
 			formulas: W
-		}), Y = l.map(() => []), Z = c.map(() => []), ee = (e, t, n, s) => {
-			p.forEach((n, s) => {
-				const r = C.indexOf(s);
-				Y[s].push(s === f ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
+		}), Y = l.map(() => []), Z = u.map(() => []), ee = (e, t, n, s) => {
+			m.forEach((n, s) => {
+				const r = I.indexOf(s);
+				Y[s].push(s === c ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
 			}), Z.forEach((e, t) => {
 				e.push(t === n ? s : null);
 			});
 		};
-		return B.forEach((e, t) => {
-			m.forEach(({ item: n }, s) => {
-				c.forEach((r, o) => {
-					const a = X[o * m.length + s].getValueAt(t, 0) ?? 0;
+		return z.forEach((e, t) => {
+			f.forEach(({ item: n }, s) => {
+				u.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);
 				});
@@ -1000,14 +1000,14 @@ var Y = [
 			ids: Y,
 			values: Z
 		};
-	})(e, t, n, r, o) : void 0, p = l.filter((e) => !H(e)).map((e, t) => ({
+	})(e, t, n, r, o) : void 0, f = l.filter((e) => !$(e)).map((e, t) => ({
 		filter: e,
 		index: t
-	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), h = (t.recordCount ?? 0) + (f?.count ?? 0);
-	let g;
-	const w = e.rowFields ?? [];
-	for (const { filter: s } of p) {
-		const a = await Ae(e, t, n, s.field, s.dataField, o, g, f, r);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), m = (t.recordCount ?? 0) + (c?.count ?? 0);
+	let p;
+	const g = e.rowFields ?? [];
+	for (const { filter: s } of f) {
+		const a = await Ae(e, t, n, s.field, s.dataField, o, p, c, r);
 		if (!a) continue;
 		const l = /* @__PURE__ */ new Set();
 		for (const [e, t] of a.groups) {
@@ -1017,17 +1017,17 @@ var Y = [
 			});
 		}
 		if (0 === l.size) continue;
-		g ??= new Uint8Array(h).fill(3);
-		const i = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = w.includes(s.field) ? 1 : 2;
-		for (let e = 0; e < h; e++) {
-			if (!(g[e] & u)) continue;
+		p ??= new Uint8Array(m).fill(3);
+		const i = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = g.includes(s.field) ? 1 : 2;
+		for (let e = 0; e < m; e++) {
+			if (!(p[e] & u)) continue;
 			let t = "";
 			for (let n = 0; n < i.length; n++) t += (n > 0 ? "," : "") + i[n][e];
-			l.has(`${t}|${d[e]}`) && (g[e] &= ~u);
+			l.has(`${t}|${d[e]}`) && (p[e] &= ~u);
 		}
 	}
-	const v = u && r ? await (async (e, t, n, s, r, o, a) => {
-		const l = m.peek(), i = de(e, t);
+	const w = d && r ? await (async (e, t, n, s, r, o, a) => {
+		const l = P.peek(), i = de(e, t);
 		if (!l || !i) return null;
 		const d = xe(e, t, n, a, i.operands);
 		if (!d) return null;
@@ -1036,19 +1036,19 @@ var Y = [
 			form: t === ce ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
 		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, r, o, g, f) : void 0;
+	})(e, t, n, r, o, p, c) : void 0;
 	return {
 		keep: o,
-		...g ? { records: g } : {},
-		...f ? { calculatedRecords: f } : {},
-		...v ? { fieldValues: v } : {}
+		...p ? { records: p } : {},
+		...c ? { calculatedRecords: c } : {},
+		...w ? { fieldValues: w } : {}
 	};
 }, Ne = (e, t) => {
 	const n = e.filters;
 	if (!n) return e;
 	let s = !1;
 	const r = n.map((e) => {
-		const n = e.condition && D(e.condition, t);
+		const n = e.condition && c(e.condition, t);
 		return n === e.condition ? e : (s = !0, {
 			...e,
 			condition: n
@@ -1061,10 +1061,10 @@ var Y = [
 }, $e = async (e, t, n, s) => {
 	const r = t.length, o = new Uint8Array(r);
 	if (0 === r) return o;
-	const a = new T();
+	const a = new p();
 	for (let e = 0; e < r; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
 	let l = !1;
-	return await h({
+	return await T({
 		conditions: [e],
 		runtime: n,
 		calculation: s ?? null,
@@ -1087,19 +1087,19 @@ var Y = [
 		}
 	}), l || o.fill(1), o;
 }, Le = (e, t, n, r, o) => {
-	const l = e.fields?.[r], 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?.[r]?.numberFormat, c = i(u, o), f = (e) => void 0 === u ? i(P(t.fields?.[r], e), o) : c, m = new Array(n.length);
+	const l = e.fields?.[r], i = /* @__PURE__ */ new Map();
+	for (const e of l?.items ?? []) void 0 !== e.item && void 0 === e.type && void 0 !== e.name && i.set(e.item, e.name);
+	const d = l?.numberFormat ?? t.fields?.[r]?.numberFormat, u = R(d, o), c = (e) => void 0 === d ? R(H(t.fields?.[r], e), o) : u, f = new Array(n.length);
 	for (let e = 0; e < n.length; e++) {
-		const l = d.get(e);
+		const l = i.get(e);
 		if (void 0 !== l) {
-			m[e] = l;
+			f[e] = l;
 			continue;
 		}
-		const i = j(n[e]);
-		null === i ? m[e] = x : "number" == typeof i ? m[e] = s(o, I(t.fields?.[r], e) ? f(e) : c, i) : "boolean" == typeof i ? m[e] = i ? "TRUE" : "FALSE" : a.isError(i) ? m[e] = i.getLabel() : m[e] = String(i);
+		const d = C(n[e]);
+		null === d ? f[e] = F : "number" == typeof d ? f[e] = s(o, E(t.fields?.[r], e) ? c(e) : u, d) : "boolean" == typeof d ? f[e] = d ? "TRUE" : "FALSE" : a.isError(d) ? f[e] = d.getLabel() : f[e] = String(d);
 	}
-	return m;
+	return f;
 }, _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,
@@ -1185,8 +1185,8 @@ var Y = [
 } : a.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, je = (e, t) => (t && "number" == typeof e ? "date:" : "") + O(j(e)), ze = (e, t, n, s = !1) => {
-	const r = e.fields ?? [], o = L(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), l = ((e) => {
+} : e, qe = (e, t) => (t && "number" == typeof e ? "date:" : "") + d(C(e)), ze = (e, t, n, s = !1) => {
+	const r = e.fields ?? [], o = g(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;
@@ -1199,8 +1199,8 @@ var Y = [
 		const n = e.name.toLocaleLowerCase();
 		e.noRecords || i.has(n) || i.set(n, t);
 	});
-	const u = t.recordCount, c = r.map(() => -1), f = r.map((e, t) => o[t].map(() => -1)), m = [], p = [], h = [], g = [], w = [], v = [], F = [], b = (e, t, n) => {
-		g[t] = n.items, v[t] = n.items.length, F[t] = !0, f[e] = ((e, t) => {
+	const d = t.recordCount, u = r.map(() => -1), c = r.map((e, t) => o[t].map(() => -1)), m = [], p = [], h = [], w = [], v = [], F = [], b = [], y = (e, t, n) => {
+		w[t] = n.items, F[t] = n.items.length, b[t] = !0, c[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
@@ -1209,108 +1209,108 @@ var Y = [
 	};
 	t.columns.forEach((e, t) => {
 		const n = i.get(l[t].toLocaleLowerCase());
-		void 0 !== n && (i.delete(l[t].toLocaleLowerCase()), c[n] = t);
-		const y = new Int32Array(e.values.length).fill(-1), x = [], A = [], C = new Array(u);
-		for (let t = 0; t < u; t++) {
+		void 0 !== n && (i.delete(l[t].toLocaleLowerCase()), u[n] = t);
+		const g = new Int32Array(e.values.length).fill(-1), I = [], x = [], A = new Array(d);
+		for (let t = 0; t < d; t++) {
 			const n = e.ids[t];
-			let s = y[n];
-			s < 0 && (s = y[n] = x.length, x.push(Be(e.values[n])), A.push(e.dates || !!e.dateIds?.has(n))), C[t] = s;
+			let s = g[n];
+			s < 0 && (s = g[n] = I.length, I.push(Be(e.values[n])), x.push(e.dates || !!e.dateIds?.has(n))), A[t] = s;
 		}
-		const E = (e) => void 0 !== n && (!!r[n].dates || I(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 S = (e) => void 0 !== n && (!!r[n].dates || E(r[n], e)), P = I.length, k = void 0 !== n ? !0 === r[n].inline : I.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), M = [];
+		if (void 0 !== n && k) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < S; t++) e.set(je(x[t], A[t]), t);
+			for (let t = 0; t < P; t++) e.set(qe(I[t], x[t]), t);
 			o[n].forEach((t, s) => {
-				f[n][s] = e.get(je(t, E(s))) ?? -1;
+				c[n][s] = e.get(qe(t, S(s))) ?? -1;
 			});
 		} else if (void 0 !== n) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < S; t++) e.set(je(x[t], A[t]), t);
+			for (let t = 0; t < P; t++) e.set(qe(I[t], x[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, E(r));
+				const o = qe(s, S(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)), f[n][r] = l ?? -1;
+				void 0 !== l || a || S(r) || (l = I.length, I.push(s), x.push(S(r)), M.push(l), e.set(o, l)), c[n][r] = l ?? -1;
 			});
 		}
-		const M = { name: l[t] };
-		P && (M.inline = !0), void 0 !== e.numberFormat && (M.numberFormat = e.numberFormat);
-		const T = [];
+		const T = { name: l[t] };
+		k && (T.inline = !0), void 0 !== e.numberFormat && (T.numberFormat = e.numberFormat);
+		const O = [];
 		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), w[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]), f[n][e] = s, {
+		I.forEach((e, t) => {
+			"number" == typeof e && (x[t] ? O.push(t) : R = !0);
+		}), O.length > 0 && !R ? T.dates = !0 : O.length > 0 && (T.dateItems = O), v[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 $ = void 0 !== n ? r[n].calculatedItems : void 0;
+		$?.length && (T.calculatedItems = $.map(({ item: e, formula: t }) => {
+			const s = I.length;
+			return I.push(o[n][e]), c[n][e] = s, {
 				item: s,
 				formula: t
 			};
-		})), m.push(M), p.push([t, [[0, x]]]), h.push([t, [[0, C]]]), g.push(x), v.push(S), F.push(!1);
-		const $ = void 0 !== n ? r[n].group : void 0;
-		if ($?.range && $.base === n) {
-			const e = re($, x.slice(0, S).map(j), s);
-			e ? (M.group = {
+		})), m.push(T), p.push([t, [[0, I]]]), h.push([t, [[0, A]]]), w.push(I), F.push(P), b.push(!1);
+		const L = void 0 !== n ? r[n].group : void 0;
+		if (L?.range && L.base === n) {
+			const e = re(L, I.slice(0, P).map(C), s);
+			e ? (T.group = {
 				...e,
 				base: t
-			}, b(n, t, e)) : f[n] = o[n].map(() => -1);
-		} else $ && !d(r[n]) && (M.group = $);
+			}, y(n, t, e)) : c[n] = o[n].map(() => -1);
+		} else L && !f(r[n]) && (T.group = L);
 	}), r.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (q(e)) return c[t] = m.length, m.push(e), g.push([]), v.push(0), void F.push(!1);
+		if (M(e)) return u[t] = m.length, m.push(e), w.push([]), F.push(0), void b.push(!1);
 		const n = e.group;
 		if (!n) return;
-		const r = c[n.base];
+		const r = u[n.base];
 		if (void 0 === r || r < 0) return;
-		const o = g[r];
+		const o = w[r];
 		let a, l = [];
-		if (n.range) a = re(n, o.slice(0, v[r]).map(j), s);
+		if (n.range) a = re(n, o.slice(0, F[r]).map(C), s);
 		else {
-			const e = Ge(n, f[n.base], o, m[r]);
+			const e = Ge(n, c[n.base], o, m[r]);
 			a = e.group, l = e.itemMap;
 		}
 		if (!a) return;
 		const i = m.length;
-		c[t] = i, m.push({
+		u[t] = i, m.push({
 			...e,
 			group: {
 				...a,
 				base: r
 			}
-		}), g.push(a.items), w[i] = a.dateItems ? new Set(a.dateItems) : void 0, v.push(a.items.length), F.push(!1), n.range ? b(t, i, a) : f[t] = l;
+		}), w.push(a.items), v[i] = a.dateItems ? new Set(a.dateItems) : void 0, F.push(a.items.length), b.push(!1), n.range ? y(t, i, a) : c[t] = l;
 	}), m.forEach((e, t) => {
 		const n = e.group;
 		if (void 0 === n?.parent) return;
-		const s = c[n.parent], { parent: r, ...o } = n;
+		const s = u[n.parent], { parent: r, ...o } = n;
 		void 0 !== s && s >= 0 ? e.group = {
 			...n,
 			parent: s
-		} : d(e) ? e.group = o : delete e.group, e.group && !d(e) && (e.group = {
+		} : f(e) ? e.group = o : delete e.group, e.group && !f(e) && (e.group = {
 			...e.group,
 			base: t
 		});
 	});
-	const { cacheId: y, part: x, partFormats: A, fields: C, items: E, records: S, ...P } = e;
+	const { cacheId: I, part: x, partFormats: A, fields: S, items: P, records: k, ...T } = e;
 	return {
 		model: {
-			...P,
+			...T,
 			source: n ?? e.source,
 			fields: m,
 			items: p,
 			records: h,
-			recordCount: u
+			recordCount: d
 		},
 		remap: {
-			fields: c,
-			items: f,
-			newItems: g,
-			usedCounts: v,
-			inItemOrder: F,
-			dateItems: w
+			fields: u,
+			items: c,
+			newItems: w,
+			usedCounts: F,
+			inItemOrder: b,
+			dateItems: v
 		}
 	};
 }, Ge = (e, t, n, s) => {
@@ -1319,7 +1319,7 @@ var Y = [
 		const s = t?.[n] ?? -1;
 		s < 0 || (o[s] = e, r.add(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 || I(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = 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 || E(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
 			...f,
@@ -1329,7 +1329,7 @@ var Y = [
 		},
 		itemMap: d
 	};
-}, qe = (e, t, n = !1, s = !1) => {
+}, je = (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) => {
@@ -1438,7 +1438,7 @@ var Y = [
 }, Je = (e, t, n, s, r = !1, o) => {
 	const a = e.items ?? [], l = [], i = [], d = /* @__PURE__ */ new Set();
 	for (const e of a) {
-		if (!u(e)) {
+		if (!y(e)) {
 			i.push(l.length), l.push(e);
 			continue;
 		}
@@ -1454,13 +1454,13 @@ var Y = [
 		};
 		n >= s && !e.calculated ? r.missing = !0 : delete r.missing, i.push(l.length), l.push(r);
 	}
-	const c = [];
-	for (let e = 0; e < n.length; e++) d.has(e) || c.push(e);
+	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 = l.map((e, t) => ({
 			item: e,
 			at: t
-		})), r = s.filter((e) => !u(e.item)), o = [...[...s.filter((e) => u(e.item)), ...c.map((e) => ({
+		})), r = s.filter((e) => !y(e.item)), o = [...[...s.filter((e) => y(e.item)), ...u.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
@@ -1472,38 +1472,38 @@ var Y = [
 			positions: i.map((e) => e < 0 ? e : d.get(e) ?? -1)
 		};
 	}
-	if (0 === c.length) return {
+	if (0 === u.length) return {
 		items: l,
 		positions: i
 	};
-	const f = !e.includeNewItemsInFilter && a.some((e) => e.hidden), m = (e) => f ? {
+	const c = !e.includeNewItemsInFilter && a.some((e) => e.hidden), f = (e) => c ? {
 		item: e,
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, s = (e, t) => qe(S(e, n), j(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
-		for (const e of c) {
-			const n = m(e);
-			let r = l.findIndex((n) => u(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
+		const t = "descending" === e.sort.order, s = (e, t) => je(S(e, n), C(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		for (const e of u) {
+			const n = f(e);
+			let r = l.findIndex((n) => y(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(l);
-		l.splice(e, 0, ...c.map(m));
-		for (let t = 0; t < i.length; t++) i[t] >= e && (i[t] += c.length);
+		l.splice(e, 0, ...u.map(f));
+		for (let t = 0; t < i.length; t++) i[t] >= e && (i[t] += u.length);
 	}
 	return {
 		items: l,
 		positions: i
 	};
 }, We = (e) => {
-	const t = e.findIndex((e) => !u(e));
+	const t = e.findIndex((e) => !y(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 (u(r) && !r.missing) return s;
+		if (y(r) && !r.missing) return s;
 	}
 }, Ye = (e, t, n, s, r) => {
 	const o = { ...e };
@@ -1578,43 +1578,43 @@ var Y = [
 		areas: e.areas.map(d)
 	}))), a;
 }, et = (e, t, n, s) => {
-	const r = (e.fields ?? [])[n]?.items ?? [], o = A(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, i = (e) => void 0 === e.name && I(a, e.item), d = r.map((e, t) => ({
+	const r = (e.fields ?? [])[n]?.items ?? [], o = V(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, i = (e) => void 0 === e.name && E(a, e.item), d = r.map((e, t) => ({
 		item: e,
 		at: t
-	})), c = d.filter((e) => u(e.item));
-	c.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 && c.reverse();
-	let f = 0;
-	const m = Ze(e, n, d.map((e) => u(e.item) ? c[f++] : e).map((e) => e.at));
+	})), u = d.filter((e) => y(e.item));
+	u.sort((e, t) => l ? e.item.item - t.item.item : je(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) => y(e.item) ? u[c++] : e).map((e) => e.at));
 	return {
-		...m,
-		fields: m.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 || !u(o)) throw new t(e("error.pivotTable.changePart"));
+	if (!o || !y(o)) throw new t(e("error.pivotTable.changePart"));
 	return o;
 }, nt = (n, s, r, o, a) => {
-	const l = tt(n, r, o), i = n.fields[r].items, d = A(s)[r] ?? [], c = (e) => {
-		const t = j(d[e.item]);
-		return null === t ? x : V(t);
+	const l = tt(n, r, o), i = n.fields[r].items, d = V(s)[r] ?? [], u = (e) => {
+		const t = C(d[e.item]);
+		return null === t ? F : D(t);
 	};
-	if (i.some((e, t) => t !== o && u(e) && b(e.name ?? c(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
-	const { name: f, ...m } = l, p = a === c(l) ? m : {
+	if (i.some((e, t) => t !== o && y(e) && h(e.name ?? u(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
+	const { name: c, ...f } = l, m = a === u(l) ? f : {
 		...l,
 		name: a
 	};
-	if (p.name === l.name) return n;
-	const h = {
+	if (m.name === l.name) return n;
+	const p = {
 		...n,
 		fields: n.fields.map((e, t) => t === r ? {
 			...e,
-			items: i.map((e, t) => t === o ? p : e)
+			items: i.map((e, t) => t === o ? m : e)
 		} : e)
 	}, g = n.fields[r].sort;
-	return g && void 0 === g.dataField ? et(h, s, r, g.order) : h;
+	return g && void 0 === g.dataField ? et(p, s, r, g.order) : p;
 }, st = (e, t, n, s) => {
 	tt(e, t, n);
 	const r = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
@@ -1631,11 +1631,11 @@ var Y = [
 		})
 	} : a;
 }, rt = (n, s, r, o) => {
-	const a = V(o), l = n.fields, i = s.fields, d = n.dataFields ?? [], c = A(s), f = (e, t) => {
+	const a = D(o), l = n.fields, i = s.fields, d = n.dataFields ?? [], u = V(s), c = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		const n = j(c[e][t.item]);
-		return null === n ? x : V(n);
-	}, m = (r) => {
+		const n = C(u[e][t.item]);
+		return null === n ? F : D(n);
+	}, f = (r) => {
 		if (void 0 !== r.field && a === (l[r.field].name ?? i[r.field].name)) return;
 		const o = void 0 === r.field ? n : {
 			...n,
@@ -1644,18 +1644,18 @@ var Y = [
 				name: "\0"
 			} : e)
 		};
-		if (y(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
+		if (z(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 = l[e].items.findIndex((n, s) => s !== t && u(n) && b(f(e, n), a));
+			const o = l[e].items.findIndex((n, s) => s !== t && y(n) && h(c(e, n), a));
 			return o >= 0 ? st(n, e, o, t) : nt(n, s, e, t, a);
 		}
 		case "fieldCaption": {
 			const { field: e } = r;
-			return m({ field: e }), ((e, t) => ({
+			return f({ field: e }), ((e, t) => ({
 				...n,
 				fields: l.map((n, s) => s === e ? t(n) : n)
 			}))(e, (t) => {
@@ -1668,7 +1668,7 @@ var Y = [
 		}
 		case "dataCaption": {
 			const { data: e } = r;
-			return m({ data: e }), {
+			return f({ data: e }), {
 				...n,
 				dataFields: d.map((t, n) => n === e ? {
 					...t,
@@ -1691,14 +1691,14 @@ var Y = [
 		case "pageItem": {
 			const s = n.pageFields, o = s[r.page];
 			let i;
-			if (!b(a, "(All)") && (i = (l[o.field].items ?? []).findIndex((e) => u(e) && b(f(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
-			const { item: d, ...c } = o, m = void 0 === i ? c : {
+			if (!h(a, "(All)") && (i = (l[o.field].items ?? []).findIndex((e) => y(e) && h(c(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
+			const { item: d, ...u } = o, f = void 0 === i ? u : {
 				...o,
 				item: i
 			};
 			return {
 				...n,
-				pageFields: s.map((e, t) => t === r.page ? m : e)
+				pageFields: s.map((e, t) => t === r.page ? f : e)
 			};
 		}
 	}
@@ -1717,8 +1717,8 @@ var Y = [
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
 ].filter((e) => e >= 0), it = (e, t) => {
-	const n = e.fields[t], s = A(e)[t], r = s.map((e, t) => t);
-	d(n) || r.sort((e, t) => qe(j(s[e]), j(s[t]), I(n, e), I(n, t)));
+	const n = e.fields[t], s = V(e)[t], r = s.map((e, t) => t);
+	f(n) || r.sort((e, t) => je(C(s[e]), C(s[t]), E(n, e), E(n, t)));
 	const o = new Set(n.calculatedItems?.map((e) => e.item)), a = new Set(n.unused);
 	return [...r.map((e) => ({
 		item: e,
@@ -1728,11 +1728,11 @@ var Y = [
 }, dt = (s) => {
 	if (!("number" == typeof s ? void 0 !== o(s) : "" !== s && n.isValidFormat(s))) throw new t(e("error.pivotTable.notANumberFormat", { name: String(s) }));
 }, ut = (n, s, r, o) => {
-	const a = o?.function ?? ((e, t) => "number" === E(e, t) ? "sum" : "count")(s.fields[r], A(s)[r]), l = p[a];
+	const a = o?.function ?? ((e, t) => "number" === _(e, t) ? "sum" : "count")(s.fields[r], V(s)[r]), l = v[a];
 	if (!l) throw new t(e("error.pivotTable.notAFunction", { name: a }));
 	let i = o?.name;
-	if (void 0 === i) i = y(n, s, `${l} of ${f(n, s, r)}`);
-	else if (y(n, s, i) !== i) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (void 0 === i) i = z(n, s, `${l} of ${w(n, s, r)}`);
+	else if (z(n, s, i) !== i) throw new t(e("error.pivotTable.fieldNameExists"));
 	const d = {
 		name: i,
 		field: r,
@@ -1742,7 +1742,7 @@ var Y = [
 	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) => b(e.name, n));
+		const s = r.findIndex((e) => h(e.name, n));
 		if (s < 0) throw new t(e("error.pivotTable.notAField", { name: n }));
 		return s;
 	}, a = /* @__PURE__ */ new Map(), l = (e, t) => {
@@ -1772,14 +1772,14 @@ var Y = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, h = i("row");
-	h.length > 0 && (p.rowFields = h), m.length > 0 && (p.columnFields = m);
-	const g = i("page");
-	return g.length > 0 && (p.pageFields = g.map((e) => ({ field: e }))), d.length > 0 && (p.dataFields = d), c && (p.form = c), p;
+	}, g = i("row");
+	g.length > 0 && (p.rowFields = g), m.length > 0 && (p.columnFields = m);
+	const w = i("page");
+	return w.length > 0 && (p.pageFields = w.map((e) => ({ field: e }))), d.length > 0 && (p.dataFields = d), c && (p.form = c), p;
 }, ft = (e, t) => t.map((t) => {
 	const n = t.sort?.scope;
 	if (!n) return t;
-	const s = ((t.axis === w.Axis.Row ? e.columnFields : t.axis === w.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const s = ((t.axis === L.Axis.Row ? e.columnFields : t.axis === L.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,37 +1796,37 @@ var Y = [
 		}
 	};
 }), mt = (n, s, r, o, a) => {
-	const l = w.Axis, i = s.fields?.[r], d = n.fields?.[r]?.axis ?? null;
+	const l = L.Axis, i = s.fields?.[r], d = 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 !== i?.formula || o === l.Page && (i?.calculatedItems?.length ?? 0) > 0) throw new t(e("error.pivotTable.fieldNotPlaceable"));
-	const u = o ? z(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 || z(n, o)[c] === r)) return n;
-	u.splice(c, 0, r);
-	const { rowFields: f, columnFields: m, pageFields: p, ...h } = n, g = {}, F = (e) => (e ?? []).filter((e) => e !== r), b = o === l.Row ? u : F(n.rowFields), y = o === l.Column ? u : F(n.columnFields), I = o === l.Page ? u.map((e) => n.pageFields?.find((t) => t.field === e) ?? { field: e }) : (n.pageFields ?? []).filter((e) => e.field !== r);
-	b.length > 0 && (g.rowFields = b), y.length > 0 && (g.columnFields = y), I.length > 0 && (g.pageFields = I);
-	let x = {
-		...h,
-		...g
+	const c = o ? G(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 === d && (void 0 === a || G(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 = {
+		...g,
+		...w
 	};
-	o === l.Page && d !== l.Page && (x = v(x, r, () => !0));
-	const A = { ...n.fields?.[r] };
-	o ? A.axis = o : delete A.axis, o && !A.items && i && (A.items = R(it(s, r), A.subtotals)), o && void 0 === A.numberFormat && i?.dates && void 0 !== i.numberFormat && (A.numberFormat = i.numberFormat), o === l.Page && A.items?.some((e) => e.hidden) && (A.multipleItemSelection = !0);
-	const C = (n.fields ?? []).map((e, t) => t === r ? A : e);
-	if (x = {
-		...x,
-		fields: ft(x, C)
+	o === l.Page && d !== l.Page && (I = u(I, r, () => !0));
+	const x = { ...n.fields?.[r] };
+	o ? x.axis = o : delete x.axis, o && !x.items && i && (x.items = q(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 A = (n.fields ?? []).map((e, t) => t === r ? x : e);
+	if (I = {
+		...I,
+		fields: ft(I, A)
 	}, 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 } = x;
-		x = e.length > 0 ? {
+		const e = n.formats.filter((e) => !e.area.references?.some((e) => e.field === r)), { formats: t, ...s } = I;
+		I = e.length > 0 ? {
 			...s,
 			formats: e
 		} : s;
 	}
-	return x;
+	return I;
 }, pt = -2, ht = /* @__PURE__ */ new Set([
 	"percentOfTotal",
 	"percentOfRow",
@@ -1955,7 +1955,7 @@ var Y = [
 		l[e] = t;
 	}), It(n, a.map((e) => o[e]), l);
 }, Et = (e, t, n, s) => {
-	const r = M(e, t, n, s);
+	const r = O(e, t, n, s);
 	return (e.dataFields[n].subtotal ?? "sum") === s ? e : bt(e, n, (e) => {
 		const { subtotal: t, ...n } = e, o = {
 			...n,
@@ -1966,34 +1966,34 @@ var Y = [
 }, St = (n, s, r, o) => {
 	const a = n.dataFields[r], l = a.showDataAs ?? "normal", i = o?.kind ?? "normal";
 	if (o && !wt.has(o.kind)) throw new t(e("error.pivotTable.notAShowAs", { name: o.kind }));
-	const { showDataAs: d, baseField: u, baseItem: c, ...m } = a, p = { ...m };
-	"normal" !== i && (p.showDataAs = i);
-	let h = a.baseField, g = a.baseItem;
+	const { showDataAs: d, baseField: u, baseItem: c, ...f } = a, m = { ...f };
+	"normal" !== i && (m.showDataAs = i);
+	let p = a.baseField, g = a.baseItem;
 	if (void 0 !== o?.baseField) {
-		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => b(f(n, s, t), r));
+		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => h(w(n, s, t), r));
 		if (a < 0) throw new t(e("error.pivotTable.notAField", { name: r }));
-		a !== h && (h = a, g = 0);
+		a !== p && (p = a, g = 0);
 	}
 	if (void 0 !== o?.baseItem) {
-		const r = h ?? 0;
-		if (b(o.baseItem, "(previous)")) g = "previous";
-		else if (b(o.baseItem, "(next)")) g = "next";
+		const r = p ?? 0;
+		if (h(o.baseItem, "(previous)")) g = "previous";
+		else if (h(o.baseItem, "(next)")) g = "next";
 		else {
 			const a = n.fields?.[r]?.items ? n : { fields: (n.fields ?? []).map((e, t) => t === r ? {
 				...e,
 				items: it(s, r)
-			} : e) }, l = k(a, s, r).findIndex((e) => null !== e && b(e, o.baseItem));
+			} : e) }, l = b(a, s, r).findIndex((e) => null !== e && h(e, o.baseItem));
 			if (l < 0) throw new t(e("error.pivotTable.notAnItem", { name: o.baseItem }));
 			g = l;
 		}
 	}
-	if (void 0 !== h && (p.baseField = h), void 0 !== g && (p.baseItem = g), i === l) return p.baseField === a.baseField && p.baseItem === a.baseItem ? n : bt(n, r, () => p);
-	const w = ((e, t, n) => {
+	if (void 0 !== p && (m.baseField = p), void 0 !== g && (m.baseItem = g), i === l) return m.baseField === a.baseField && m.baseItem === a.baseItem ? n : bt(n, r, () => m);
+	const v = ((e, t, n) => {
 		if (gt.has(n)) return gt.has(t) ? e : void 0;
 		const s = ((e) => N(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
 		return ht.has(n) ? ht.has(t) || s ? e : 10 : ht.has(t) && s ? void 0 : e;
 	})(a.numberFormat, l, i);
-	return w === a.numberFormat ? bt(n, r, () => p) : bt(Ft(n, r), r, () => yt(p, w));
+	return v === a.numberFormat ? bt(n, r, () => m) : bt(Ft(n, r), r, () => yt(m, v));
 }, Pt = (e, t, n) => {
 	dt(n);
 	const s = N(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
@@ -2014,16 +2014,16 @@ var Y = [
 	};
 }, kt = (n, s, r) => {
 	if (null === s) return At(n);
-	const o = w.Axis;
+	const o = L.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 l = z(n, s).filter((e) => e !== pt);
+	const l = G(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 || z(n, s)[i] === pt)) return n;
+	if (s === a && (void 0 === r || G(n, s)[i] === pt)) return n;
 	l.splice(i, 0, pt);
-	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = z(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;
+	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = G(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;
@@ -2031,10 +2031,10 @@ var Y = [
 		...a,
 		valuesCaption: "\0"
 	};
-	if (y(l, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (z(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, lt as axisFieldsOf, Re as buildPivotView, Oe as evaluatePivotFilters, H 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 };
+export { xt as addPivotDataField, Ne as anchorPivotPeriods, dt as assertNumberFormat, lt as axisFieldsOf, Oe as buildPivotView, Re as evaluatePivotFilters, $ 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 };