@sheetxl/mcp 0.8.0-beta.16 → 0.8.0-beta.17

package/assets/{SaCo3me4_hw2b1L4.js → BJdWgj1hv57eGVl4.js}

@@ -1,14 +1,14 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.16
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.17
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { p as e, tt as t } from "./CrwtgrD7BbXyCkx0.js";
-import { d as n, en as s, f as r, vt as o } from "./BNrpvJZtIL0Ex_wE.js";
-import { d as a } from "./D3bxrF1Ys2GSVfQH.js";
-import { $ as i, $i as l, Aa as d, Ai as u, Bi as c, Ca as f, Gr as m, Hi as p, In as h, Ki as g, Li as w, M as v, Oi as F, Rn as b, Sn as y, U as I, Vi as x, Wa as A, Xi as C, Ya as E, Yi as S, Zi as P, _n as k, ci as M, ei as T, ga as R, jr as O, kt as N, ln as $, mr as L, n as _, nt as D, ut as V, wr as U, x as H, xr as B, xt as z, yr as j, za as G, zr as q } from "./5B_tapYOcjOv1wGO.js";
-import { a as K, i as Q, n as W, o as J, r as Y } from "./Di4ehJD7muvtcrN3.js";
+import { p as e, tt as t } from "./CfA8o-FNret9-D6Y.js";
+import { d as n, en as s, f as r, vt as o } from "./BJBoygm-gY68bLAP.js";
+import { d as a } from "./MW2nt7se27FlH9Yb.js";
+import { Bi as i, Dr as l, Dt as d, F as u, G as c, Gi as f, Hi as m, Hr as p, Ii as h, Ir as g, La as w, Oa as v, Oi as F, Pt as b, Qi as y, Qr as I, S as x, Ua as A, Vi as C, Vn as E, Xi as S, Y as P, Ya as k, Yi as M, _r as T, ai as O, at as R, dr as N, fn as L, ha as $, hr as _, ji as D, mt as V, n as U, w as H, xa as B, xn as z, yr as G, zi as j, zn as q } from "./D6ON3ZLcTAXV3fO6.js";
+import { a as Q, i as K, n as J, o as W, r as Y } from "./BjhAYfsKC8iEbtgn.js";
 var X = [
 	"Jan",
 	"Feb",
@@ -61,15 +61,15 @@ var X = [
 		default: return null;
 	}
 }, te = (e, t) => {
-	const n = e.fields ?? [], s = m(e.records, n.length);
-	if (!n.some(p)) return s;
-	const r = m(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
+	const n = e.fields ?? [], s = p(e.records, n.length);
+	if (!n.some(m)) return s;
+	const r = p(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
 	for (let e = 0; e < n.length; e++) {
 		const i = n[e];
-		if (!p(i)) continue;
+		if (!m(i)) continue;
 		const l = i.group, d = s[l.base] ?? [], u = r[l.base] ?? [], c = new Int32Array(u.length);
 		for (let e = 0; e < u.length; e++) {
-			const n = l.range ? ee(l.range, l.items.length, G(u[e]), t) : l.discrete?.[e] ?? null;
+			const n = l.range ? ee(l.range, l.items.length, w(u[e]), t) : l.discrete?.[e] ?? null;
 			c[e] = n ?? -1;
 		}
 		const f = new Array(o);
@@ -231,10 +231,10 @@ var X = [
 		if (t.includes(e)) return !1;
 		const l = [];
 		oe(n[e].formula, (e) => {
-			const t = n.findIndex((t) => w(t.name, e));
+			const t = n.findIndex((t) => h(t.name, e));
 			return t >= 0 && l.push(t), t >= 0 ? "" : null;
 		});
-		for (const r of l) if (f(n[r])) {
+		for (const r of l) if (B(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({
@@ -242,7 +242,7 @@ var X = [
 			expression: ""
 		}), !0;
 	}, l = [];
-	for (const [t, s] of (e.dataFields ?? []).entries()) if (f(n[s.field])) {
+	for (const [t, s] of (e.dataFields ?? []).entries()) if (B(n[s.field])) {
 		if (!i(s.field, [])) return null;
 		l.push({
 			data: t,
@@ -251,8 +251,8 @@ var X = [
 	}
 	const d = (e, t) => {
 		if (null !== t) return null;
-		const r = n.findIndex((t) => w(t.name, e));
-		return r >= 0 ? ae(f(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(B(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
 		var a;
 	};
 	for (const e of r) {
@@ -343,41 +343,41 @@ var X = [
 	percent: 13,
 	percentDiff: 14
 }, Ie = (e, t, n, s) => {
-	const r = y.peek(), o = e.fields, a = t.fields;
+	const r = c.peek(), o = e.fields, a = t.fields;
 	if (!r || !o || !a || o.length !== a.length) return null;
-	if (h(e)) return {
+	if (q(e)) return {
 		cells: [],
 		...V,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: c(e),
+		header: j(e),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
 		...s?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	const i = u(e, a), l = i ? s?.filters : null;
+	const i = D(e, a), l = i ? s?.filters : null;
 	if (i && !l) return null;
 	const d = o.some((e) => e.items?.some((e) => e.calculated));
 	if (d && !l?.calculatedRecords) return null;
-	const f = de(e, t);
-	if (!f || f.measures.length > 0 && !l?.fieldValues) return null;
+	const u = de(e, t);
+	if (!u || u.measures.length > 0 && !l?.fieldValues) return null;
 	if ((e.dataFields ?? []).some((e) => void 0 === ye[e.showDataAs ?? "normal"] || void 0 === pe[e.subtotal ?? "sum"])) return null;
-	const m = xe(e, t, n, l?.calculatedRecords, f.operands);
-	if (!m) return null;
-	const { items: g, records: w, values: v, n: F } = m, b = (e) => !!e && (!e.noRecords || p(e)), I = e.form ?? "compact", x = (e) => {
+	const f = xe(e, t, n, l?.calculatedRecords, u.operands);
+	if (!f) return null;
+	const { items: p, records: h, values: g, n: w } = f, v = (e) => !!e && (!e.noRecords || m(e)), F = e.form ?? "compact", b = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === ce) {
 				t.push({
 					field: n,
-					form: I
+					form: F
 				});
 				continue;
 			}
 			const e = o[n], s = e?.subtotals;
-			if (!e || !b(a[n])) return null;
+			if (!e || !v(a[n])) return null;
 			if (d && s && s.some((e) => "default" !== e)) return null;
 			t.push({
 				field: n,
@@ -385,33 +385,33 @@ var X = [
 			});
 		}
 		return t;
-	}, C = x(e.rowFields), E = x(e.columnFields), S = e.pageFields ?? [];
-	if (!C || !E || S.some((e) => !b(a[e.field]))) return null;
-	const P = A(e, s?.slicerFields);
-	return P.pageFields?.some((e) => !b(a[e.field])) ? null : Te(e, t, g, C, E, Se(r, P, g, w, v, C, E, F, l?.keep, l?.records, f.operands.length, l?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
+	}, y = b(e.rowFields), I = b(e.columnFields), x = e.pageFields ?? [];
+	if (!y || !I || x.some((e) => !v(a[e.field]))) return null;
+	const C = A(e, s?.slicerFields);
+	return C.pageFields?.some((e) => !v(a[e.field])) ? null : Te(e, t, p, y, I, Se(r, C, p, h, g, y, I, w, l?.keep, l?.records, u.operands.length, l?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
 }, xe = (e, t, n, s, r = []) => {
-	const o = t.fields?.length ?? 0, a = U(t);
+	const o = t.fields?.length ?? 0, a = G(t);
 	if (!t.records) return null;
 	const i = te(t, n.isDate1904());
 	if (!i) return null;
-	const l = !0 === t.fields?.some(p), d = l ? m(t.items, o) : a, u = l ? m(t.records, o) : i, c = t.recordCount ?? 0, f = s?.count ?? 0, h = c + f, g = (e, n) => {
+	const l = !0 === t.fields?.some(m), d = l ? p(t.items, o) : a, u = l ? p(t.records, o) : i, c = t.recordCount ?? 0, f = s?.count ?? 0, h = c + f, g = (e, n) => {
 		const s = !t.fields?.[e]?.noRecords, r = s ? u[e] : i[e] ?? [], o = s ? d[e] : a[e], l = new Array(h);
-		for (let e = 0; e < c; e++) l[e] = G(o[r[e]]);
+		for (let e = 0; e < c; e++) l[e] = w(o[r[e]]);
 		for (let e = 0; e < f; e++) l[c + e] = n?.[e] ?? null;
 		return l;
-	}, w = [...(e.dataFields ?? []).map((e, t) => g(e.field, s?.values[t])), ...r.map((e) => g(e))];
+	}, v = [...(e.dataFields ?? []).map((e, t) => g(e.field, s?.values[t])), ...r.map((e) => g(e))];
 	return {
 		items: a,
 		records: s ? i.map((e, t) => e.concat(s.ids[t] ?? [])) : i,
-		values: w,
+		values: v,
 		n: h
 	};
 }, Ae = async (e, t, n, s, r, o, a, i, l) => {
-	const d = y.peek(), u = e.dataFields?.[r];
+	const d = c.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;
-	const p = m.slice(0, m.indexOf(s)), h = e.fields.map((e) => {
+	const f = [e.rowFields, e.columnFields].map((e) => (e ?? []).filter((e) => e !== ce)), m = f.findIndex((e) => e.includes(s)), p = f[m];
+	if (!p) return null;
+	const h = p.slice(0, p.indexOf(s)), g = e.fields.map((e) => {
 		const { blankRowAfter: t, showItemsWithNoData: n, sort: s, ...r } = e;
 		return {
 			...r,
@@ -421,44 +421,44 @@ var X = [
 				return n;
 			})
 		};
-	}), { columnGrandTotals: g, ...w } = e, { showDataAs: v, ...F } = u, b = {
-		...w,
-		fields: h,
-		rowFields: [...p, s],
+	}), { columnGrandTotals: w, ...v } = e, { showDataAs: F, ...b } = u, y = {
+		...v,
+		fields: g,
+		rowFields: [...h, s],
 		columnFields: [],
-		dataFields: [F],
+		dataFields: [b],
 		rowGrandTotals: !1
 	}, I = i ? {
 		...i,
 		values: [i.values[r] ?? []]
-	} : i, x = de(b, t);
+	} : i, x = de(y, t);
 	if (!x || x.measures.length > 0 && !l) return null;
-	const A = xe(b, t, n, I, x.operands);
+	const A = xe(y, t, n, I, x.operands);
 	if (!A) return null;
-	const { items: C, records: E, values: S, n: P } = A, k = b.rowFields.map((e) => ({
+	const { items: C, records: E, values: S, n: P } = A, k = y.rowFields.map((e) => ({
 		field: e,
 		form: "compact"
 	}));
 	let M;
 	if (a) {
-		const e = 0 === f ? 1 : 2;
+		const e = 0 === m ? 1 : 2;
 		M = new Uint8Array(P);
 		for (let t = 0; t < P; 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, b, C, E, S, k, [], P, o, M, l) : void 0, R = Se(d, b, 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(",");
+	const T = x.measures.length > 0 ? await Ee(d, x, y, C, E, S, k, [], P, o, M, l) : void 0, O = Se(d, y, C, E, S, k, [], P, o, M, x.operands.length, T), R = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), L = O.columns.length;
+	return O.rows.forEach((e, t) => {
+		if (0 !== e.kind || e.path.length !== h.length + 1) return;
+		const n = h.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[p.length])), r.totals.push(R.values[t * $]);
+		}), r.ids.push(R(s, e.path[h.length])), r.totals.push(O.values[t * L]);
 	}), {
-		outer: p,
+		outer: h,
 		groups: N,
 		records: E
 	};
@@ -485,7 +485,7 @@ var X = [
 			t.operands.forEach((t, n) => {
 				const o = s.values(r + n);
 				try {
-					const t = Q(e.wasm_memory().buffer, o, p), n = new Array(h);
+					const t = K(e.wasm_memory().buffer, o, p), n = new Array(h);
 					for (let e = 0; e < h; e++) n[e] = t(e);
 					g.push(n);
 				} finally {
@@ -522,7 +522,7 @@ var X = [
 	try {
 		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);
+			const l = K(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;
 			return {
 				rows: n,
@@ -598,7 +598,7 @@ var X = [
 			d[t] = !n || c && 0 === c[t] ? 0 : 1;
 		}
 	}
-	const A = new W();
+	const A = new J();
 	F.forEach((e, t) => {
 		const n = {
 			doubles: new Float64Array(x, e, i),
@@ -649,57 +649,57 @@ var X = [
 		} 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, u, f) => {
-	const m = e.fields, p = t.fields, h = e.dataFields ?? [], w = (t) => t === ce ? e.valuesCaption ?? "Values" : m[t].name ?? p[t].name, v = (e, t) => {
+}, Te = (e, t, n, r, o, i, d, u, c) => {
+	const m = e.fields, p = t.fields, h = e.dataFields ?? [], F = (t) => t === ce ? e.valuesCaption ?? "Values" : m[t].name ?? p[t].name, b = (e, t) => {
 		if (e === ce) return h[t]?.name ?? "";
 		const s = m[e].items?.[t];
 		if (void 0 !== s?.name) return s.name;
-		const r = G(n[e][s?.item ?? t]);
-		return null === r ? d : r;
-	}, F = (e, t) => {
-		const n = v(e, t);
+		const r = w(n[e][s?.item ?? t]);
+		return null === r ? v : r;
+	}, y = (e, t) => {
+		const n = b(e, t);
 		if ("number" == typeof n) {
-			const r = m[e].items?.[t]?.item ?? t, o = void 0 === (m[e].numberFormat ?? p[e].numberFormat) && T(p[e], r);
-			return s(l, o ? O(q(p[e], r), l) : ((e) => O(m[e].numberFormat ?? p[e].numberFormat, l))(e), n);
+			const r = m[e].items?.[t]?.item ?? t, o = void 0 === (m[e].numberFormat ?? p[e].numberFormat) && I(p[e], r);
+			return s(d, o ? l(g(p[e], r), d) : ((e) => l(m[e].numberFormat ?? p[e].numberFormat, d))(e), n);
 		}
 		return a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-	}, y = (e) => {
-		if (void 0 !== e.item) return v(e.field, e.item);
+	}, x = (e) => {
+		if (void 0 !== e.item) return b(e.field, e.item);
 		const t = m[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		const n = t.flatMap((e, t) => E(e) && !e.hidden ? [t] : []);
-		return 1 === n.length ? v(e.field, n[0]) : "(Multiple Items)";
-	}, I = e.grandTotalCaption ?? "Grand Total", x = u ? /* @__PURE__ */ new Map() : null, A = (e, t) => e === ce ? {
+		const n = t.flatMap((e, t) => k(e) && !e.hidden ? [t] : []);
+		return 1 === n.length ? b(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
-	}, C = (e) => e === ce ? null : {
+	}, M = (e) => e === ce ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, P = (e, t) => 2 === e.kind && t === I ? { kind: "grandTotal" } : null, k = 0 === r.length && 0 === o.length && 0 === h.length, M = k ? {
+	}, T = (e, t) => 2 === e.kind && t === A ? { kind: "grandTotal" } : null, O = 0 === r.length && 0 === o.length && 0 === h.length, R = O ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : c(e), R = k ? [] : Me(i.rows, i.functions), N = k ? [] : Me(i.columns, i.functions), $ = g({
+	} : j(e), N = O ? [] : Me(i.rows, i.functions), L = O ? [] : Me(i.columns, i.functions), $ = f({
 		...e,
-		header: M,
-		rowLines: R,
-		columnLines: N
-	}), L = i.columns.length, _ = (e) => "row" === e ? r : o, D = (t) => {
+		header: R,
+		rowLines: N,
+		columnLines: L
+	}), D = i.columns.length, V = (e) => "row" === e ? r : o, U = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [w(n), {
+				return [F(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
 			}
 			case "pageItem": {
 				const n = e.pageFields[t.page];
-				return [y(n), {
+				return [x(n), {
 					kind: "pageItem",
 					page: t.page
 				}];
@@ -711,28 +711,28 @@ var X = [
 			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), C(e)];
+				const e = V(t.axis)[t.level].field;
+				return [F(e), M(e)];
 			}
 			case "label": {
-				const e = _(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [v(e, n), A(e, n)];
+				const e = V(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [b(e, n), P(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 ? h[t.data]?.name ?? "" : "";
-					if (2 === t.kind) return n ? `Total ${s}` : I;
-					const r = t.path.length - 1, o = e[r].field, a = F(o, t.path[r]);
+					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 = we[i.functions[t.function]];
-						return (n || t.across) && null !== t.data ? `${a} ${e} of ${w(h[t.data].field)}` : `${a} ${e}`;
+						return (n || t.across) && null !== t.data ? `${a} ${e} of ${F(h[t.data].field)}` : `${a} ${e}`;
 					}
 					return m[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
-				})(_(t.axis), e);
-				return [n, P(e, n)];
+				})(V(t.axis), e);
+				return [n, T(e, n)];
 			}
 			case "value": {
-				const n = t.row.index * L + t.column.index, s = i.states[n];
+				const n = t.row.index * D + t.column.index, s = i.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) => {
 					if (void 0 === e) return null;
@@ -743,206 +743,206 @@ var X = [
 				})(e.emptyCaption)), [r, null];
 			}
 		}
-	}, V = new S.Builder(), U = $.top, H = $.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), B = (e, t) => {
-		const n = j($, e, t);
+	}, H = new C.Builder(), B = $.top, z = $.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), G = (e, t) => {
+		const n = _($, e, t);
 		if (!n) return;
-		const [s, r] = D(n);
+		const [s, r] = U(n);
 		((e, t, n) => {
-			x && n && x.set(e + "," + t, n);
-		})(e - U, t, r), null !== s && (f ? V.pushAt(t, e - U, s) : V.pushAt(e - U, t, s));
+			S && n && S.set(e + "," + t, n);
+		})(e - B, t, r), null !== s && (c ? H.pushAt(t, e - B, s) : H.pushAt(e - B, t, s));
 	};
-	if (f) {
-		const e = Math.max(H, $.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < $.rows.length; e++) t < (e < U ? H : $.columns.length) && B(e, t);
+	if (c) {
+		const e = Math.max(z, $.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < $.rows.length; e++) t < (e < B ? z : $.columns.length) && G(e, t);
 	} else for (let e = 0; e < $.rows.length; e++) {
-		const t = e < U ? H : $.columns.length;
-		for (let n = 0; n < t; n++) B(e, n);
+		const t = e < B ? z : $.columns.length;
+		for (let n = 0; n < t; n++) G(e, n);
 	}
-	if (k) {
-		const t = b(e);
+	if (O) {
+		const t = E(e);
 		return {
-			cells: V.build()?.tuples ?? [],
+			cells: H.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
 			columnPageCount: t.columns,
-			header: M,
+			header: R,
 			rowLines: [],
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...x ? { roles: x } : {}
+			...S ? { roles: S } : {}
 		};
 	}
-	const z = (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, [...z(r, e), ...z(o, t)]), [W] = i.rows, [J] = i.columns, Y = W && J && 3 !== W.kind && 3 !== J.kind ? Q(W, J) : null, X = [], Z = (e) => 1 === e.kind && null !== e.function;
+	}, K = (e, t) => Q(e.data ?? t.data ?? 0, [...q(r, e), ...q(o, t)]), [J] = i.rows, [W] = i.columns, Y = J && W && 3 !== J.kind && 3 !== W.kind ? K(J, W) : null, X = [], Z = (e) => 1 === e.kind && null !== e.function;
 	i.rows.forEach((t, n) => {
-		3 === t.kind || Z(t) || (z(r, t), i.columns.forEach((s, r) => {
-			const o = i.states[n * L + r];
+		3 === t.kind || Z(t) || (q(r, t), i.columns.forEach((s, r) => {
+			const o = i.states[n * D + r];
 			if (3 === s.kind || Z(s) || 0 !== o && 1 !== o) return;
-			let l = 0 === o ? i.values[n * L + r] : 0;
-			e.showError && a.isError(l) && (l = e.errorCaption || 0), X.push([Q(t, s), l]);
+			let l = 0 === o ? i.values[n * D + r] : 0;
+			e.showError && a.isError(l) && (l = e.errorCaption || 0), X.push([K(t, s), l]);
 		}));
 	});
-	const ee = b(e);
+	const ee = E(e);
 	return {
-		cells: V.build()?.tuples ?? [],
-		rows: $.rows.length - U,
+		cells: H.build()?.tuples ?? [],
+		rows: $.rows.length - B,
 		columns: $.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
-		header: M,
-		rowLines: R,
-		columnLines: N,
+		header: R,
+		rowLines: N,
+		columnLines: L,
 		viewValues: X,
 		firstKey: Y,
-		...x ? { roles: x } : {}
+		...S ? { roles: S } : {}
 	};
-}, Re = (e, t, n, r, o = !1, i, l) => {
-	const d = Ie(e, t, r, {
+}, Oe = (e, t, n, r, o = !1, i, d) => {
+	const u = Ie(e, t, r, {
 		filters: i,
-		slicerFields: l
+		slicerFields: d
 	});
-	if (!d) return null;
-	const u = d.rowPageCount > 0 ? d.rowPageCount + 1 : 0, c = d.rowPageCount > 0 ? 3 * d.columnPageCount - 1 : 0, { rowStart: f, colStart: m } = n;
-	if (f - u < 0) return null;
-	const h = {
-		rowStart: f - u,
-		colStart: m,
-		rowEnd: f + d.rows - 1,
-		colEnd: m + Math.max(d.columns, c) - 1
-	}, g = e.fields, w = t.fields, v = U(t), F = (e, t) => {
-		const n = g[e], o = n.numberFormat ?? w[e].numberFormat, i = O(o, r), l = p(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 })), f = c.map((t) => {
-			const n = G(d[t.item]), u = T(w[e], t.item), c = null === n ? "(blank)" : "number" == typeof n ? s(r, u ? (f = t.item, void 0 === o ? O(q(w[e], f), r) : i) : i, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-			var f;
-			const m = l && u ? c : n;
+	if (!u) return null;
+	const c = u.rowPageCount > 0 ? u.rowPageCount + 1 : 0, f = u.rowPageCount > 0 ? 3 * u.columnPageCount - 1 : 0, { rowStart: p, colStart: h } = n;
+	if (p - c < 0) return null;
+	const v = {
+		rowStart: p - c,
+		colStart: h,
+		rowEnd: p + u.rows - 1,
+		colEnd: h + Math.max(u.columns, f) - 1
+	}, F = e.fields, b = t.fields, y = G(t), x = (e, t) => {
+		const n = F[e], o = n.numberFormat ?? b[e].numberFormat, i = l(o, r), d = m(b[e]), u = y[e], c = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), f = c.length > 0 ? c : u.map((e, t) => ({ item: t })), p = f.map((t) => {
+			const n = w(u[t.item]), c = I(b[e], t.item), f = null === n ? "(blank)" : "number" == typeof n ? s(r, c ? (m = t.item, void 0 === o ? l(g(b[e], m), r) : i) : i, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+			var m;
+			const p = d && c ? f : n;
 			return void 0 !== t.name ? {
-				value: m,
-				text: c,
+				value: p,
+				text: f,
 				name: t.name
 			} : {
-				value: m,
-				text: c
+				value: p,
+				text: f
 			};
-		}), m = {
-			name: n.name ?? w[e].name,
-			items: f
+		}), h = {
+			name: n.name ?? b[e].name,
+			items: p
 		};
 		if (t) {
 			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			m.page = void 0 !== e ? c.findIndex((t) => t.item === e) : -1;
+			h.page = void 0 !== e ? f.findIndex((t) => t.item === e) : -1;
 		}
-		return m;
-	}, b = (e) => (e ?? []).filter((e) => -2 !== e);
+		return h;
+	}, A = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
-			range: h,
+			range: v,
 			dataFields: (e.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: w[e.field].name
+				sourceName: b[e.field].name
 			})),
 			fields: [
-				...b(e.rowFields).map((e) => F(e)),
-				...b(e.columnFields).map((e) => F(e)),
-				...(e.pageFields ?? []).map((e) => F(e.field, e))
+				...A(e.rowFields).map((e) => x(e)),
+				...A(e.columnFields).map((e) => x(e)),
+				...(e.pageFields ?? []).map((e) => x(e.field, e))
 			],
-			values: d.viewValues,
+			values: u.viewValues,
 			block: {
 				anchor: {
-					row: f,
-					column: m
+					row: p,
+					column: h
 				},
 				...o ? { blocked: !0 } : {},
-				...null !== d.firstKey ? { first: d.firstKey } : {}
+				...null !== u.firstKey ? { first: u.firstKey } : {}
 			}
 		},
 		size: {
-			rows: d.rows,
-			columns: d.columns
+			rows: u.rows,
+			columns: u.columns
 		}
 	};
-}, Oe = async (e, t, n, r) => {
-	const o = /* @__PURE__ */ new Map(), i = (e.filters ?? []).filter((t) => D(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), l = e.fields?.some((e) => e.items?.some((e) => e.calculated)), u = e.dataFields?.some((e) => f(t.fields?.[e.field]));
-	if (0 === i.length && !l && !u) return { keep: o };
-	const c = U(t);
-	for (const s of i.filter(D)) {
-		const a = s.field, i = c[a];
-		if (!i) continue;
-		const l = x(s.condition) ? Le(e, t, i, a, n) : null, d = new Array(i.length);
-		for (let e = 0; e < i.length; e++) d[e] = l ? l[e] : G(i[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);
+}, Re = async (e, t, n, r) => {
+	const o = /* @__PURE__ */ new Map(), d = (e.filters ?? []).filter((t) => R(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), u = e.fields?.some((e) => e.items?.some((e) => e.calculated)), f = e.dataFields?.some((e) => B(t.fields?.[e.field]));
+	if (0 === d.length && !u && !f) return { keep: o };
+	const m = G(t);
+	for (const s of d.filter(R)) {
+		const a = s.field, l = m[a];
+		if (!l) continue;
+		const d = i(s.condition) ? $e(e, t, l, a, n) : null, u = new Array(l.length);
+		for (let e = 0; e < l.length; e++) u[e] = d ? d[e] : w(l[e]);
+		const c = await Le(s.condition, u, 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 m = l && r ? await (async (e, t, n, r, o) => {
-		const i = t.fields ?? [], l = e.fields ?? [], u = i.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
-		if (1 !== u.length || c.some((e) => f(i[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
-		const m = u[0], p = i[m].calculatedItems, h = te(t, n.isDate1904());
-		if (!h) return null;
-		const g = U(t), v = U({
+	const p = u && r ? await (async (e, t, n, r, o) => {
+		const i = t.fields ?? [], d = e.fields ?? [], u = i.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
+		if (1 !== u.length || c.some((e) => B(i[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
+		const f = u[0], m = i[f].calculatedItems, p = te(t, n.isDate1904());
+		if (!p) return null;
+		const g = G(t), F = G({
 			...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(m) ? F : b.includes(m) ? b : null;
-		if (!y) return null;
-		const I = y.slice(0, y.indexOf(m)), x = [...y.slice(y.indexOf(m) + 1), ...y === F ? b : F], A = [...I, ...x], C = t.recordCount ?? 0, E = (e, t) => {
-			const n = l[e]?.items, s = n?.find((e) => e.item === t && void 0 === e.type);
+		}), b = (e.rowFields ?? []).filter((e) => e >= 0), y = (e.columnFields ?? []).filter((e) => e >= 0), x = b.includes(f) ? b : y.includes(f) ? y : null;
+		if (!x) return null;
+		const A = x.slice(0, x.indexOf(f)), C = [...x.slice(x.indexOf(f) + 1), ...x === b ? y : b], E = [...A, ...C], S = t.recordCount ?? 0, P = (e, t) => {
+			const n = d[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]);
-		}, S = (e, t) => {
-			const n = l[e.field]?.items;
+		}, k = (e, t) => {
+			const n = d[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;
-		}, P = e.pageFields ?? [], k = O(i[m].numberFormat ?? 14, n), M = (e) => g[m].findIndex((t, r) => {
-			const o = G(t);
-			return "number" == typeof o && (i[m].dates || T(i[m], r)) ? w(s(n, k, o), e) : w(null === o ? d : H(o), e);
-		}), R = /* @__PURE__ */ new Map(), N = new Map(p.map((e) => [e.item, e.formula])), $ = (e) => {
+		}, M = e.pageFields ?? [], T = l(i[f].numberFormat ?? 14, n), O = (e) => g[f].findIndex((t, r) => {
+			const o = w(t);
+			return "number" == typeof o && (i[f].dates || I(i[f], r)) ? h(s(n, T, o), e) : h(null === o ? v : H(o), e);
+		}), R = /* @__PURE__ */ new Map(), N = new Map(m.map((e) => [e.item, e.formula])), L = (e) => {
 			let t = R.get(e);
 			return void 0 === t && R.set(e, t = R.size), t;
 		};
-		for (const e of p) if (null === oe(e.formula, (e, t) => {
-			if (null === t || !w(i[m].name, e)) return null;
-			const n = M(t);
-			return n < 0 ? null : (N.has(n) || $(n), "");
+		for (const e of m) if (null === oe(e.formula, (e, t) => {
+			if (null === t || !h(i[f].name, e)) return null;
+			const n = O(t);
+			return n < 0 ? null : (N.has(n) || L(n), "");
 		})) return null;
-		const L = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), D = c.map((e) => ({
-			column: h[e.field],
-			values: v[e.field],
+		const $ = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), D = c.map((e) => ({
+			column: p[e.field],
+			values: F[e.field],
 			fold: e.subtotal ?? "sum"
 		})), V = R.size;
-		for (let e = 0; e < C; e++) {
-			if (!P.every((t) => S(t, h[t.field][e]))) continue;
-			if (!A.every((t) => E(t, h[t][e]))) continue;
+		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;
 			let t = "";
-			for (const n of I) t += h[n][e] + ",";
+			for (const n of A) t += p[n][e] + ",";
 			_.has(t) || _.set(t, e);
-			const n = R.get(h[m][e]);
+			const n = R.get(p[f][e]);
 			if (void 0 === n) continue;
 			let s = t;
-			for (const t of x) s += h[t][e] + ",";
-			let r = L.get(s);
+			for (const t of C) s += p[t][e] + ",";
+			let r = $.get(s);
 			r || (r = {
 				sums: c.map(() => new Array(V).fill(0)),
 				errors: c.map(() => new Array(V).fill(void 0))
-			}, L.set(s, r));
+			}, $.set(s, r));
 			const { sums: o, errors: i } = r;
 			D.forEach(({ column: t, values: s, fold: r }, l) => {
-				const d = G(s[t[e]]);
+				const d = w(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);
 			});
 		}
-		const B = x.map((e) => {
-			const t = l[e]?.items;
-			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && E(e, t.item) ? [t.item] : []) : g[e].map((e, t) => t);
+		const U = 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] : []) : g[e].map((e, t) => t);
 		});
-		if (B.reduce((e, t) => e * t.length, _.size) > 5e5) return null;
+		if (U.reduce((e, t) => e * t.length, _.size) > 5e5) return null;
 		const z = [];
 		for (const [e, t] of _) {
 			const n = (e, s, r) => {
-				if (e !== B.length) for (const t of B[e]) n(e + 1, [...s, t], r + t + ",");
+				if (e !== U.length) for (const t of U[e]) n(e + 1, [...s, t], r + t + ",");
 				else z.push({
 					exemplar: t,
 					path: s,
@@ -957,39 +957,39 @@ var X = [
 			ids: i.map(() => []),
 			values: c.map(() => [])
 		};
-		const q = c.length * V, K = (e, t) => e * V + t, Q = (e, t) => q + e * p.length + t, W = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < V; t++) W.push(z.map(({ key: n }) => {
-			const s = L.get(n);
+		const q = c.length * V, Q = (e, t) => e * V + t, K = (e, t) => q + e * m.length + t, J = [];
+		for (let e = 0; e < c.length; e++) for (let t = 0; t < V; t++) J.push(z.map(({ key: n }) => {
+			const s = $.get(n);
 			return s ? s.errors[e][t] ?? s.sums[e][t] : 0;
 		}));
-		const J = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < p.length; t++) {
-			const n = oe(p[t].formula, (t, n) => {
+		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) => {
 				if (null === n) return null;
-				const s = M(n), r = p.findIndex((e) => e.item === s);
-				return ae(r >= 0 ? Q(e, r) : K(e, R.get(s)));
+				const s = O(n), r = m.findIndex((e) => e.item === s);
+				return ae(r >= 0 ? K(e, r) : Q(e, R.get(s)));
 			});
 			if (null === n) return null;
-			J.push({
+			W.push({
 				expression: n,
-				coords: ie(Q(e, t), j)
+				coords: ie(K(e, t), j)
 			});
 		}
 		const Y = await r.evaluateBatch({
-			values: le(W, j),
-			formulas: J
+			values: le(J, j),
+			formulas: W
 		}), X = i.map(() => []), Z = c.map(() => []), ee = (e, t, n, s) => {
-			h.forEach((n, s) => {
-				const r = x.indexOf(s);
-				X[s].push(s === m ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
+			p.forEach((n, s) => {
+				const r = C.indexOf(s);
+				X[s].push(s === f ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
 			}), Z.forEach((e, t) => {
 				e.push(t === n ? s : null);
 			});
 		};
 		return z.forEach((e, t) => {
-			p.forEach(({ item: n }, s) => {
+			m.forEach(({ item: n }, s) => {
 				c.forEach((r, o) => {
-					const a = Y[o * p.length + s].getValueAt(t, 0) ?? 0;
+					const a = Y[o * m.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);
 				});
@@ -999,34 +999,34 @@ var X = [
 			ids: X,
 			values: Z
 		};
-	})(e, t, n, r, o) : void 0, p = i.filter((e) => !D(e)).map((e, t) => ({
+	})(e, t, n, r, o) : void 0, g = d.filter((e) => !R(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) + (m?.count ?? 0);
-	let g;
-	const v = e.rowFields ?? [];
-	for (const { filter: s } of p) {
-		const a = await Ae(e, t, n, s.field, s.dataField, o, g, m, r);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), F = (t.recordCount ?? 0) + (p?.count ?? 0);
+	let b;
+	const y = e.rowFields ?? [];
+	for (const { filter: s } of g) {
+		const a = await Ae(e, t, n, s.field, s.dataField, o, b, p, r);
 		if (!a) continue;
 		const i = /* @__PURE__ */ new Set();
 		for (const [e, t] of a.groups) {
-			const o = await $e(s.condition, t.totals, n, r);
+			const o = await Le(s.condition, t.totals, n, r);
 			t.ids.forEach((t, n) => {
 				o[n] || i.add(`${e}|${t}`);
 			});
 		}
 		if (0 === i.size) continue;
-		g ??= new Uint8Array(h).fill(3);
-		const l = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = v.includes(s.field) ? 1 : 2;
-		for (let e = 0; e < h; e++) {
-			if (!(g[e] & u)) continue;
+		b ??= new Uint8Array(F).fill(3);
+		const l = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = y.includes(s.field) ? 1 : 2;
+		for (let e = 0; e < F; e++) {
+			if (!(b[e] & u)) continue;
 			let t = "";
 			for (let n = 0; n < l.length; n++) t += (n > 0 ? "," : "") + l[n][e];
-			i.has(`${t}|${d[e]}`) && (g[e] &= ~u);
+			i.has(`${t}|${d[e]}`) && (b[e] &= ~u);
 		}
 	}
-	const F = u && r ? await (async (e, t, n, s, r, o, a) => {
-		const i = y.peek(), l = de(e, t);
+	const x = f && r ? await (async (e, t, n, s, r, o, a) => {
+		const i = c.peek(), l = de(e, t);
 		if (!i || !l) return null;
 		const d = xe(e, t, n, a, l.operands);
 		if (!d) return null;
@@ -1035,12 +1035,12 @@ var X = [
 			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, g, m) : void 0;
+	})(e, t, n, r, o, b, p) : void 0;
 	return {
 		keep: o,
-		...g ? { records: g } : {},
-		...m ? { calculatedRecords: m } : {},
-		...F ? { fieldValues: F } : {}
+		...b ? { records: b } : {},
+		...p ? { calculatedRecords: p } : {},
+		...x ? { fieldValues: x } : {}
 	};
 }, Ne = (e, t) => {
 	const n = e.filters;
@@ -1057,13 +1057,13 @@ var X = [
 		...e,
 		filters: r
 	} : e;
-}, $e = async (e, t, n, s) => {
+}, Le = async (e, t, n, s) => {
 	const r = t.length, o = new Uint8Array(r);
 	if (0 === r) return o;
-	const a = new i();
+	const a = new x();
 	for (let e = 0; e < r; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
-	let l = !1;
-	return await B({
+	let i = !1;
+	return await T({
 		conditions: [e],
 		runtime: n,
 		calculation: s ?? null,
@@ -1075,28 +1075,28 @@ var X = [
 			colEnd: 0
 		},
 		onTrue: (e) => {
-			l = !0, o[e.rowIndex] = 1;
+			i = !0, o[e.rowIndex] = 1;
 		},
 		onFalse: () => {
-			l = !0;
+			i = !0;
 		},
 		onBlank: (e) => {
-			l = !0;
+			i = !0;
 			for (let n = 0; n < r; n++) null === t[n] && e(n, 0) && (o[n] = 1);
 		}
-	}), l || o.fill(1), o;
-}, Le = (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 u = i?.numberFormat ?? t.fields?.[r]?.numberFormat, c = O(u, o), f = (e) => void 0 === u ? O(q(t.fields?.[r], e), o) : c, m = new Array(n.length);
+	}), i || o.fill(1), o;
+}, $e = (e, t, n, r, o) => {
+	const i = e.fields?.[r], d = /* @__PURE__ */ new Map();
+	for (const e of i?.items ?? []) void 0 !== e.item && void 0 === e.type && void 0 !== e.name && d.set(e.item, e.name);
+	const u = i?.numberFormat ?? t.fields?.[r]?.numberFormat, c = l(u, o), f = (e) => void 0 === u ? l(g(t.fields?.[r], e), o) : c, m = new Array(n.length);
 	for (let e = 0; e < n.length; e++) {
-		const i = l.get(e);
+		const i = d.get(e);
 		if (void 0 !== i) {
 			m[e] = i;
 			continue;
 		}
-		const u = G(n[e]);
-		null === u ? m[e] = d : "number" == typeof u ? m[e] = s(o, T(t.fields?.[r], e) ? f(e) : c, u) : "boolean" == typeof u ? m[e] = u ? "TRUE" : "FALSE" : a.isError(u) ? m[e] = u.getLabel() : m[e] = String(u);
+		const l = w(n[e]);
+		null === l ? m[e] = v : "number" == typeof l ? m[e] = s(o, I(t.fields?.[r], e) ? f(e) : c, l) : "boolean" == typeof l ? m[e] = l ? "TRUE" : "FALSE" : a.isError(l) ? m[e] = l.getLabel() : m[e] = String(l);
 	}
 	return m;
 }, _e = (e) => {
@@ -1107,7 +1107,7 @@ var X = [
 		colEnd: t.colEnd
 	}).getValues()[0] ?? [], a = [];
 	for (let e = 0; e < n; e++) {
-		const n = o[e] ?? null, i = new J(), l = new Uint32Array(s);
+		const n = o[e] ?? null, i = new W(), l = new Uint32Array(s);
 		let d, u, c = !1, f = i.values;
 		if (s > 0) {
 			const n = r.getRange({
@@ -1184,8 +1184,8 @@ var X = [
 } : a.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, ze = (e, t) => (t && "number" == typeof e ? "date:" : "") + P(G(e)), je = (e, t, n, s = !1) => {
-	const r = e.fields ?? [], o = m(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), i = ((e) => {
+} : e, ze = (e, t) => (t && "number" == typeof e ? "date:" : "") + S(w(e)), Ge = (e, t, n, s = !1) => {
+	const r = e.fields ?? [], o = p(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), i = ((e) => {
 		const t = /* @__PURE__ */ new Set();
 		return e.map((e, n) => {
 			const s = "" === e ? `Field${n + 1}` : e;
@@ -1198,7 +1198,7 @@ var X = [
 		const n = e.name.toLocaleLowerCase();
 		e.noRecords || l.has(n) || l.set(n, t);
 	});
-	const d = t.recordCount, u = r.map(() => -1), c = r.map((e, t) => o[t].map(() => -1)), h = [], g = [], w = [], v = [], F = [], b = [], y = [], I = (e, t, n) => {
+	const d = t.recordCount, u = r.map(() => -1), c = r.map((e, t) => o[t].map(() => -1)), f = [], h = [], g = [], v = [], F = [], b = [], y = [], x = (e, t, n) => {
 		v[t] = n.items, b[t] = n.items.length, y[t] = !0, c[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
@@ -1209,98 +1209,98 @@ var X = [
 	t.columns.forEach((e, t) => {
 		const n = l.get(i[t].toLocaleLowerCase());
 		void 0 !== n && (l.delete(i[t].toLocaleLowerCase()), u[n] = t);
-		const f = new Int32Array(e.values.length).fill(-1), m = [], x = [], A = new Array(d);
+		const p = new Int32Array(e.values.length).fill(-1), A = [], C = [], E = new Array(d);
 		for (let t = 0; t < d; t++) {
 			const n = e.ids[t];
-			let s = f[n];
-			s < 0 && (s = f[n] = m.length, m.push(Be(e.values[n])), x.push(e.dates || !!e.dateIds?.has(n))), A[t] = s;
+			let s = p[n];
+			s < 0 && (s = p[n] = A.length, A.push(Be(e.values[n])), C.push(e.dates || !!e.dateIds?.has(n))), E[t] = s;
 		}
-		const C = (e) => void 0 !== n && (!!r[n].dates || T(r[n], e)), E = m.length, S = void 0 !== n ? !0 === r[n].inline : m.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), P = [];
-		if (void 0 !== n && S) {
+		const S = (e) => void 0 !== n && (!!r[n].dates || I(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 = /* @__PURE__ */ new Map();
-			for (let t = 0; t < E; t++) e.set(ze(m[t], x[t]), t);
+			for (let t = 0; t < P; t++) e.set(ze(A[t], C[t]), t);
 			o[n].forEach((t, s) => {
-				c[n][s] = e.get(ze(t, C(s))) ?? -1;
+				c[n][s] = e.get(ze(t, S(s))) ?? -1;
 			});
 		} else if (void 0 !== n) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < E; t++) e.set(ze(m[t], x[t]), t);
+			for (let t = 0; t < P; t++) e.set(ze(A[t], C[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 = ze(s, C(r));
+				const o = ze(s, S(r));
 				let i = e.get(o);
-				void 0 !== i || a || C(r) || (i = m.length, m.push(s), x.push(C(r)), P.push(i), e.set(o, i)), c[n][r] = i ?? -1;
+				void 0 !== i || a || S(r) || (i = A.length, A.push(s), C.push(S(r)), M.push(i), e.set(o, i)), c[n][r] = i ?? -1;
 			});
 		}
-		const k = { name: i[t] };
-		S && (k.inline = !0), void 0 !== e.numberFormat && (k.numberFormat = e.numberFormat);
-		const M = [];
+		const T = { name: i[t] };
+		k && (T.inline = !0), void 0 !== e.numberFormat && (T.numberFormat = e.numberFormat);
+		const O = [];
 		let R = !1;
-		m.forEach((e, t) => {
-			"number" == typeof e && (x[t] ? M.push(t) : R = !0);
-		}), M.length > 0 && !R ? k.dates = !0 : M.length > 0 && (k.dateItems = M), F[t] = k.dateItems ? new Set(k.dateItems) : void 0, P.length > 0 && (k.unused = P);
-		const O = void 0 !== n ? r[n].rest : void 0;
-		O && (k.rest = O);
-		const N = void 0 !== n ? r[n].calculatedItems : void 0;
-		N?.length && (k.calculatedItems = N.map(({ item: e, formula: t }) => {
-			const s = m.length;
-			return m.push(o[n][e]), c[n][e] = s, {
+		A.forEach((e, t) => {
+			"number" == typeof e && (C[t] ? O.push(t) : R = !0);
+		}), O.length > 0 && !R ? T.dates = !0 : O.length > 0 && (T.dateItems = O), F[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]), c[n][e] = s, {
 				item: s,
 				formula: t
 			};
-		})), h.push(k), g.push([t, [[0, m]]]), w.push([t, [[0, A]]]), v.push(m), b.push(E), y.push(!1);
+		})), f.push(T), h.push([t, [[0, A]]]), g.push([t, [[0, E]]]), v.push(A), b.push(P), y.push(!1);
 		const $ = void 0 !== n ? r[n].group : void 0;
 		if ($?.range && $.base === n) {
-			const e = re($, m.slice(0, E).map(G), s);
-			e ? (k.group = {
+			const e = re($, A.slice(0, P).map(w), s);
+			e ? (T.group = {
 				...e,
 				base: t
-			}, I(n, t, e)) : c[n] = o[n].map(() => -1);
-		} else $ && !p(r[n]) && (k.group = $);
+			}, x(n, t, e)) : c[n] = o[n].map(() => -1);
+		} else $ && !m(r[n]) && (T.group = $);
 	}), r.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (f(e)) return u[t] = h.length, h.push(e), v.push([]), b.push(0), void y.push(!1);
+		if (B(e)) return u[t] = f.length, f.push(e), v.push([]), b.push(0), void y.push(!1);
 		const n = e.group;
 		if (!n) return;
 		const r = u[n.base];
 		if (void 0 === r || r < 0) return;
 		const o = v[r];
 		let a, i = [];
-		if (n.range) a = re(n, o.slice(0, b[r]).map(G), s);
+		if (n.range) a = re(n, o.slice(0, b[r]).map(w), s);
 		else {
-			const e = Ge(n, c[n.base], o, h[r]);
+			const e = je(n, c[n.base], o, f[r]);
 			a = e.group, i = e.itemMap;
 		}
 		if (!a) return;
-		const l = h.length;
-		u[t] = l, h.push({
+		const l = f.length;
+		u[t] = l, f.push({
 			...e,
 			group: {
 				...a,
 				base: r
 			}
-		}), v.push(a.items), F[l] = a.dateItems ? new Set(a.dateItems) : void 0, b.push(a.items.length), y.push(!1), n.range ? I(t, l, a) : c[t] = i;
-	}), h.forEach((e, t) => {
+		}), v.push(a.items), F[l] = a.dateItems ? new Set(a.dateItems) : void 0, b.push(a.items.length), y.push(!1), n.range ? x(t, l, a) : c[t] = i;
+	}), f.forEach((e, t) => {
 		const n = e.group;
 		if (void 0 === n?.parent) return;
 		const s = u[n.parent], { parent: r, ...o } = n;
 		void 0 !== s && s >= 0 ? e.group = {
 			...n,
 			parent: s
-		} : p(e) ? e.group = o : delete e.group, e.group && !p(e) && (e.group = {
+		} : m(e) ? e.group = o : delete e.group, e.group && !m(e) && (e.group = {
 			...e.group,
 			base: t
 		});
 	});
-	const { cacheId: x, part: A, partFormats: C, fields: E, items: S, records: P, ...k } = e;
+	const { cacheId: A, part: C, partFormats: E, fields: S, items: P, records: k, ...M } = e;
 	return {
 		model: {
-			...k,
+			...M,
 			source: n ?? e.source,
-			fields: h,
-			items: g,
-			records: w,
+			fields: f,
+			items: h,
+			records: g,
 			recordCount: d
 		},
 		remap: {
@@ -1312,13 +1312,13 @@ var X = [
 			dateItems: F
 		}
 	};
-}, Ge = (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), u = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || T(s, t)) && i.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = 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), u = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || I(s, t)) && i.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
 			...f,
@@ -1331,7 +1331,7 @@ var X = [
 }, 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) => {
+}, Qe = (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 = [];
 	a.forEach((e) => {
 		if (!o(e.field)) return void i.push(-1);
@@ -1356,7 +1356,7 @@ var X = [
 			} : { order: e.sort.order };
 		}
 		if (e.items) {
-			const { items: r, positions: a } = We(e, t.items[n], t.newItems[s], t.usedCounts[s], t.inItemOrder[s], t.dateItems[s]);
+			const { items: r, positions: a } = Je(e, t.items[n], t.newItems[s], t.usedCounts[s], t.inItemOrder[s], t.dateItems[s]);
 			o.items = r, d[n] = a;
 		}
 		u[s] = o;
@@ -1383,7 +1383,7 @@ var X = [
 		...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) => {
+	Ke(f, "rowFields", c(e.rowFields)), Ke(f, "columnFields", c(e.columnFields)), Ke(f, "dataFields", l.length > 0 ? l : void 0), a.forEach((e, t) => {
 		const n = i[t];
 		if (n < 0 || void 0 === e.baseField || "number" != typeof e.baseItem) return;
 		const s = d[e.baseField]?.[e.baseItem];
@@ -1398,7 +1398,7 @@ var X = [
 		}
 		return [t];
 	});
-	Qe(f, "pageFields", m.length > 0 ? m : void 0);
+	Ke(f, "pageFields", m.length > 0 ? m : void 0);
 	const p = (e.filters ?? []).flatMap((e) => {
 		if (!o(e.field)) return [];
 		const t = {
@@ -1412,7 +1412,7 @@ var X = [
 		}
 		return [t];
 	});
-	Qe(f, "filters", p.length > 0 ? p : void 0);
+	Ke(f, "filters", p.length > 0 ? p : void 0);
 	const h = (e) => Xe(e, r, o, d, i), g = (e.formats ?? []).flatMap((e) => {
 		const t = h(e.area);
 		return t ? [{
@@ -1420,7 +1420,7 @@ var X = [
 			area: t
 		}] : [];
 	});
-	Qe(f, "formats", g.length > 0 ? g : void 0);
+	Ke(f, "formats", g.length > 0 ? g : void 0);
 	const w = (e.conditionalFormats ?? []).flatMap((e) => {
 		const t = e.areas.flatMap((e) => {
 			const t = h(e);
@@ -1431,13 +1431,13 @@ var X = [
 			areas: t
 		}] : [];
 	});
-	return Qe(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
-}, Qe = (e, t, n) => {
+	return Ke(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
+}, Ke = (e, t, n) => {
 	void 0 === n ? delete e[t] : e[t] = n;
-}, We = (e, t, n, s, r = !1, o) => {
+}, Je = (e, t, n, s, r = !1, o) => {
 	const a = e.items ?? [], i = [], l = [], d = /* @__PURE__ */ new Set();
 	for (const e of a) {
-		if (!E(e)) {
+		if (!k(e)) {
 			l.push(i.length), i.push(e);
 			continue;
 		}
@@ -1459,7 +1459,7 @@ var X = [
 		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && a.some((e) => e.hidden), s = i.map((e, t) => ({
 			item: e,
 			at: t
-		})), r = s.filter((e) => !E(e.item)), o = [...[...s.filter((e) => E(e.item)), ...u.map((e) => ({
+		})), r = s.filter((e) => !k(e.item)), o = [...[...s.filter((e) => k(e.item)), ...u.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
@@ -1480,15 +1480,15 @@ var X = [
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, s = (e, t) => qe(L(e, n), G(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		const t = "descending" === e.sort.order, s = (e, t) => qe(N(e, n), w(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
 		for (const e of u) {
 			const n = f(e);
-			let r = i.findIndex((n) => E(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
-			r < 0 && (r = Je(i)), i.splice(r, 0, n);
+			let r = i.findIndex((n) => k(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]++;
 		}
 	} else {
-		const e = Je(i);
+		const e = We(i);
 		i.splice(e, 0, ...u.map(f));
 		for (let t = 0; t < l.length; t++) l[t] >= e && (l[t] += u.length);
 	}
@@ -1496,13 +1496,13 @@ var X = [
 		items: i,
 		positions: l
 	};
-}, Je = (e) => {
-	const t = e.findIndex((e) => !E(e));
+}, We = (e) => {
+	const t = e.findIndex((e) => !k(e));
 	return t < 0 ? e.length : t;
 }, Ye = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		const s = (t + n) % e.length, r = e[s];
-		if (E(r) && !r.missing) return s;
+		if (k(r) && !r.missing) return s;
 	}
 }, Xe = (e, t, n, s, r) => {
 	const o = { ...e };
@@ -1577,13 +1577,13 @@ var X = [
 		areas: e.areas.map(d)
 	}))), a;
 }, et = (e, t, n, s) => {
-	const r = (e.fields ?? [])[n]?.items ?? [], o = U(t)[n] ?? [], a = t.fields?.[n], i = void 0 !== a?.group?.range, l = (e) => void 0 === e.name && T(a, e.item), d = r.map((e, t) => ({
+	const r = (e.fields ?? [])[n]?.items ?? [], o = G(t)[n] ?? [], a = t.fields?.[n], i = void 0 !== a?.group?.range, l = (e) => void 0 === e.name && I(a, e.item), d = r.map((e, t) => ({
 		item: e,
 		at: t
-	})), u = d.filter((e) => E(e.item));
-	u.sort((e, t) => i ? e.item.item - t.item.item : qe(L(e.item, o), L(t.item, o), l(e.item), l(t.item))), "descending" === s && u.reverse();
+	})), u = d.filter((e) => k(e.item));
+	u.sort((e, t) => i ? e.item.item - t.item.item : qe(N(e.item, o), N(t.item, o), l(e.item), l(t.item))), "descending" === s && u.reverse();
 	let c = 0;
-	const f = Ze(e, n, d.map((e) => E(e.item) ? u[c++] : e).map((e) => e.at));
+	const f = Ze(e, n, d.map((e) => k(e.item) ? u[c++] : e).map((e) => e.at));
 	return {
 		...f,
 		fields: f.fields.map((e, t) => t === n ? {
@@ -1593,27 +1593,27 @@ var X = [
 	};
 }, tt = (n, s, r) => {
 	const o = n.fields?.[s]?.items?.[r];
-	if (!o || !E(o)) throw new t(e("error.pivotTable.changePart"));
+	if (!o || !k(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, u = U(s)[r] ?? [], c = (e) => {
-		const t = G(u[e.item]);
-		return null === t ? d : H(t);
+	const i = tt(n, r, o), l = n.fields[r].items, d = G(s)[r] ?? [], u = (e) => {
+		const t = w(d[e.item]);
+		return null === t ? v : H(t);
 	};
-	if (l.some((e, t) => t !== o && E(e) && w(e.name ?? c(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
-	const { name: f, ...m } = i, p = a === c(i) ? m : {
+	if (l.some((e, t) => t !== o && k(e) && h(e.name ?? u(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
+	const { name: c, ...f } = i, m = a === u(i) ? f : {
 		...i,
 		name: a
 	};
-	if (p.name === i.name) return n;
-	const h = {
+	if (m.name === i.name) return n;
+	const p = {
 		...n,
 		fields: n.fields.map((e, t) => t === r ? {
 			...e,
-			items: l.map((e, t) => t === o ? p : e)
+			items: l.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);
@@ -1630,10 +1630,10 @@ var X = [
 		})
 	} : a;
 }, rt = (n, s, r, o) => {
-	const a = H(o), i = n.fields, l = s.fields, u = n.dataFields ?? [], c = U(s), f = (e, t) => {
+	const a = H(o), i = n.fields, l = s.fields, u = n.dataFields ?? [], c = G(s), f = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		const n = G(c[e][t.item]);
-		return null === n ? d : H(n);
+		const n = w(c[e][t.item]);
+		return null === n ? v : H(n);
 	}, m = (r) => {
 		if (void 0 !== r.field && a === (i[r.field].name ?? l[r.field].name)) return;
 		const o = void 0 === r.field ? n : {
@@ -1643,13 +1643,13 @@ var X = [
 				name: "\0"
 			} : e)
 		};
-		if (z(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
+		if (d(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 && E(n) && w(f(e, n), a));
+			const o = i[e].items.findIndex((n, s) => s !== t && k(n) && h(f(e, n), a));
 			return o >= 0 ? st(n, e, o, t) : nt(n, s, e, t, a);
 		}
 		case "fieldCaption": {
@@ -1690,7 +1690,7 @@ var X = [
 		case "pageItem": {
 			const s = n.pageFields, o = s[r.page];
 			let l;
-			if (!w(a, "(All)") && (l = (i[o.field].items ?? []).findIndex((e) => E(e) && w(f(o.field, e), a)), l < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
+			if (!h(a, "(All)") && (l = (i[o.field].items ?? []).findIndex((e) => k(e) && h(f(o.field, e), a)), l < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
 			const { item: d, ...u } = o, c = void 0 === l ? u : {
 				...o,
 				item: l
@@ -1701,7 +1701,7 @@ var X = [
 			};
 		}
 	}
-}, ot = (e, t, n) => je({
+}, ot = (e, t, n) => Ge({
 	cacheId: 0,
 	fields: []
 }, e, t, n).model, at = (e, t) => t.some((t) => e.fields?.[t]?.inline) ? {
@@ -1716,8 +1716,8 @@ var X = [
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
 ].filter((e) => e >= 0), lt = (e, t) => {
-	const n = e.fields[t], s = U(e)[t], r = s.map((e, t) => t);
-	p(n) || r.sort((e, t) => qe(G(s[e]), G(s[t]), T(n, e), T(n, t)));
+	const n = e.fields[t], s = G(e)[t], r = s.map((e, t) => t);
+	m(n) || r.sort((e, t) => qe(w(s[e]), w(s[t]), I(n, e), I(n, t)));
 	const o = new Set(n.calculatedItems?.map((e) => e.item)), a = new Set(n.unused);
 	return [...r.map((e) => ({
 		item: e,
@@ -1727,21 +1727,21 @@ var X = [
 }, 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" === M(e, t) ? "sum" : "count")(s.fields[r], U(s)[r]), i = k[a];
+	const a = o?.function ?? ((e, t) => "number" === O(e, t) ? "sum" : "count")(s.fields[r], G(s)[r]), i = z[a];
 	if (!i) throw new t(e("error.pivotTable.notAFunction", { name: a }));
 	let l = o?.name;
-	if (void 0 === l) l = z(n, s, `${i} of ${v(n, s, r)}`);
-	else if (z(n, s, l) !== l) throw new t(e("error.pivotTable.fieldNameExists"));
-	const d = {
+	if (void 0 === l) l = d(n, s, `${i} of ${u(n, s, r)}`);
+	else if (d(n, s, l) !== l) throw new t(e("error.pivotTable.fieldNameExists"));
+	const c = {
 		name: l,
 		field: r,
 		baseField: 0,
 		baseItem: 0
 	};
-	return "sum" !== a && (d.subtotal = a), void 0 !== o?.numberFormat && (dt(o.numberFormat), d.numberFormat = o.numberFormat), d;
+	return "sum" !== a && (c.subtotal = a), void 0 !== o?.numberFormat && (dt(o.numberFormat), c.numberFormat = o.numberFormat), c;
 }, ct = (n, s) => {
 	const r = n.fields ?? [], o = (n) => {
-		const s = r.findIndex((e) => w(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(), i = (e, t) => {
@@ -1771,14 +1771,14 @@ var X = [
 			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 = l("row");
+	g.length > 0 && (p.rowFields = g), m.length > 0 && (p.columnFields = m);
+	const w = l("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 === _.Axis.Row ? e.columnFields : t.axis === _.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const s = ((t.axis === U.Axis.Row ? e.columnFields : t.axis === U.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;
@@ -1795,25 +1795,25 @@ var X = [
 		}
 	};
 }), mt = (n, s, r, o, a) => {
-	const i = _.Axis, d = s.fields?.[r], u = n.fields?.[r]?.axis ?? null;
+	const i = U.Axis, l = s.fields?.[r], d = n.fields?.[r]?.axis ?? null;
 	if (o === i.Values) throw new t(e("error.pivotTable.valuesNotAnAxis"));
 	if (null === o) {
-		if (null === u) return n;
-	} else if (void 0 !== d?.formula || o === i.Page && (d?.calculatedItems?.length ?? 0) > 0) throw new t(e("error.pivotTable.fieldNotPlaceable"));
-	const c = o ? R(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 || R(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 === i.Row ? c : v(n.rowFields), b = o === i.Column ? c : v(n.columnFields), y = o === i.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);
+		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 ? $(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 || $(n, o)[c] === r)) return n;
+	u.splice(c, 0, r);
+	const { rowFields: f, columnFields: m, pageFields: p, ...h } = n, g = {}, w = (e) => (e ?? []).filter((e) => e !== r), v = o === i.Row ? u : w(n.rowFields), F = o === i.Column ? u : w(n.columnFields), b = o === i.Page ? u.map((e) => n.pageFields?.find((t) => t.field === e) ?? { field: e }) : (n.pageFields ?? []).filter((e) => e.field !== r);
+	v.length > 0 && (g.rowFields = v), F.length > 0 && (g.columnFields = F), b.length > 0 && (g.pageFields = b);
 	let I = {
-		...g,
-		...w
+		...h,
+		...g
 	};
-	o === i.Page && u !== i.Page && (I = l(I, r, () => !0));
+	o === i.Page && d !== i.Page && (I = y(I, r, () => !0));
 	const x = { ...n.fields?.[r] };
-	o ? x.axis = o : delete x.axis, o && !x.items && d && (x.items = C(lt(s, r), x.subtotals)), o && void 0 === x.numberFormat && d?.dates && void 0 !== d.numberFormat && (x.numberFormat = d.numberFormat), o === i.Page && x.items?.some((e) => e.hidden) && (x.multipleItemSelection = !0);
+	o ? x.axis = o : delete x.axis, o && !x.items && l && (x.items = M(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);
 	if (I = {
 		...I,
@@ -1954,7 +1954,7 @@ var X = [
 		i[e] = t;
 	}), It(n, a.map((e) => o[e]), i);
 }, Et = (e, t, n, s) => {
-	const r = I(e, t, n, s);
+	const r = P(e, t, n, s);
 	return (e.dataFields[n].subtotal ?? "sum") === s ? e : bt(e, n, (e) => {
 		const { subtotal: t, ...n } = e, o = {
 			...n,
@@ -1965,38 +1965,38 @@ var X = [
 }, St = (n, s, r, o) => {
 	const a = n.dataFields[r], i = a.showDataAs ?? "normal", l = 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, ...f } = a, m = { ...f };
-	"normal" !== l && (m.showDataAs = l);
-	let p = a.baseField, h = a.baseItem;
+	const { showDataAs: d, baseField: c, baseItem: f, ...m } = a, p = { ...m };
+	"normal" !== l && (p.showDataAs = l);
+	let g = a.baseField, w = a.baseItem;
 	if (void 0 !== o?.baseField) {
-		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => w(v(n, s, t), r));
+		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => h(u(n, s, t), r));
 		if (a < 0) throw new t(e("error.pivotTable.notAField", { name: r }));
-		a !== p && (p = a, h = 0);
+		a !== g && (g = a, w = 0);
 	}
 	if (void 0 !== o?.baseItem) {
-		const r = p ?? 0;
-		if (w(o.baseItem, "(previous)")) h = "previous";
-		else if (w(o.baseItem, "(next)")) h = "next";
+		const r = g ?? 0;
+		if (h(o.baseItem, "(previous)")) w = "previous";
+		else if (h(o.baseItem, "(next)")) w = "next";
 		else {
 			const a = n.fields?.[r]?.items ? n : { fields: (n.fields ?? []).map((e, t) => t === r ? {
 				...e,
 				items: lt(s, r)
-			} : e) }, i = $(a, s, r).findIndex((e) => null !== e && w(e, o.baseItem));
+			} : e) }, i = L(a, s, r).findIndex((e) => null !== e && h(e, o.baseItem));
 			if (i < 0) throw new t(e("error.pivotTable.notAnItem", { name: o.baseItem }));
-			h = i;
+			w = 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 !== g && (p.baseField = g), void 0 !== w && (p.baseItem = w), l === i) return p.baseField === a.baseField && p.baseItem === a.baseItem ? n : bt(n, r, () => p);
+	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);
+		const s = ((e) => b(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));
+	return v === a.numberFormat ? bt(n, r, () => p) : bt(Ft(n, r), r, () => yt(p, v));
 }, Pt = (e, t, n) => {
 	dt(n);
-	const s = N(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
-	if (N(r.numberFormat) === s && o && vt(o.area, t) && o.style.numberFormat === s) return e;
+	const s = b(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
+	if (b(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,
@@ -2013,16 +2013,16 @@ var X = [
 	};
 }, kt = (n, s, r) => {
 	if (null === s) return At(n);
-	const o = _.Axis;
+	const o = U.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 = R(n, s).filter((e) => e !== pt);
+	const i = $(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 || R(n, s)[l] === pt)) return n;
+	if (s === a && (void 0 === r || $(n, s)[l] === pt)) return n;
 	i.splice(l, 0, pt);
-	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = R(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 { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = $(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;
 	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;
@@ -2030,10 +2030,10 @@ var X = [
 		...a,
 		valuesCaption: "\0"
 	};
-	if (z(i, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (d(i, 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, D 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, je 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, it as axisFieldsOf, Oe as buildPivotView, Re as evaluatePivotFilters, R 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, Ge as refreshPivotCache, Qe 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 };