@sheetxl/mcp 0.8.0-beta.22 → 0.8.0-beta.24

package/assets/{BkqENH8xJ3_NQnD5.js → CmwNIrRssYuLN2fn.js}

@@ -1,15 +1,15 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.22
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.24
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { p as e, tt as t } from "./DHHYGjNwlLvja3dS.js";
-import { d as n, en as s, f as r, vt as o } from "./BSdRn3B8QeJFflY6.js";
-import { u as a } from "./BUGEQS5WdiLcI_0X.js";
-import { $ as l, $r as i, B as d, Da as u, E as c, Ir as f, Ji as m, Nr as p, P as h, Qi as g, Rt as w, Sa as v, Ta as F, Ti as b, Ua as y, Vn as I, Xr as x, aa as A, br as C, ca as E, ci as S, da as P, eo as k, f as M, h as T, ht as R, ia as O, ja as N, jn as $, k as L, kr as _, la as D, m as V, mi as U, n as H, rn as B, rt as j, wn as z, x as G, xi as q } from "./C1PTfp7kVu3DqqZh.js";
-import { a as K, i as Q, n as J, o as W, r as X } from "./sYakw2x8dcnpUlsX.js";
-var Y = [
+import { p as e, tt as t } from "./DMDTS0LH9Ke9t-3z.js";
+import { Qt as n, _ as s, v as r, vt as o } from "./B16G2473LTkZP6Mq.js";
+import { u as a } from "./DRzZ4bEyLRGVOLzV.js";
+import { $ as l, $i as i, Ai as d, Hr as u, I as c, In as f, It as m, Mn as p, Na as h, O as g, Pi as w, Qi as v, Ra as F, S as b, Sa as y, Sn as I, Tt as x, Un as A, Va as C, Vr as E, Za as S, _a as P, aa as k, br as M, fi as T, fr as R, ga as O, gi as N, mn as $, mt as _, p as L, qi as D, st as V, ti as U, u as H, ut as z, wa as B, ya as j, z as q, zr as G } from "./C9iFJ52KwQTePQ81.js";
+import { a as Q, i as K, n as J, o as W, r as Z } from "./CnI4Nli8vtWdFKvf.js";
+var X = [
 	"Jan",
 	"Feb",
 	"Mar",
@@ -22,7 +22,7 @@ var Y = [
 	"Oct",
 	"Nov",
 	"Dec"
-], Z = [
+], Y = [
 	31,
 	29,
 	31,
@@ -52,7 +52,7 @@ var Y = [
 		case "months": return a.month;
 		case "days": {
 			let e = a.day;
-			for (let t = 0; t < a.month - 1; t++) e += Z[t];
+			for (let t = 0; t < a.month - 1; t++) e += Y[t];
 			return e;
 		}
 		case "hours": return a.hour + 1;
@@ -61,15 +61,15 @@ var Y = [
 		default: return null;
 	}
 }, te = (e, t) => {
-	const n = e.fields ?? [], s = A(e.records, n.length);
-	if (!n.some(P)) return s;
-	const r = A(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
+	const n = e.fields ?? [], s = i(e.records, n.length);
+	if (!n.some(j)) return s;
+	const r = i(e.items, n.length), o = e.recordCount ?? 0, a = s.slice();
 	for (let e = 0; e < n.length; e++) {
 		const l = n[e];
-		if (!P(l)) continue;
+		if (!j(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, q(u[e]), t) : i.discrete?.[e] ?? null;
+			const n = i.range ? ee(i.range, i.items.length, g(u[e]), t) : i.discrete?.[e] ?? null;
 			c[e] = n ?? -1;
 		}
 		const f = new Array(o);
@@ -110,8 +110,8 @@ var Y = [
 			case "days":
 				if (1 === o) {
 					const e = [];
-					return Z.forEach((t, n) => {
-						for (let s = 1; s <= t; s++) e.push(`${s}-${Y[n]}`);
+					return Y.forEach((t, n) => {
+						for (let s = 1; s <= t; s++) e.push(`${s}-${X[n]}`);
 					}), {
 						inner: e,
 						endText: a
@@ -125,7 +125,7 @@ var Y = [
 					endText: a
 				};
 			case "months": return {
-				inner: Y.slice(),
+				inner: X.slice(),
 				endText: a
 			};
 			case "quarters": return {
@@ -231,10 +231,10 @@ var Y = [
 		if (t.includes(e)) return !1;
 		const i = [];
 		oe(n[e].formula, (e) => {
-			const t = n.findIndex((t) => d(t.name, e));
+			const t = n.findIndex((t) => S(t.name, e));
 			return t >= 0 && i.push(t), t >= 0 ? "" : null;
 		});
-		for (const r of i) if (b(n[r])) {
+		for (const r of i) if (w(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,21 +242,21 @@ var Y = [
 			expression: ""
 		}), !0;
 	}, i = [];
-	for (const [t, s] of (e.dataFields ?? []).entries()) if (b(n[s.field])) {
+	for (const [t, s] of (e.dataFields ?? []).entries()) if (w(n[s.field])) {
 		if (!l(s.field, [])) return null;
 		i.push({
 			data: t,
 			formula: o.get(s.field)
 		});
 	}
-	const u = (e, t) => {
+	const d = (e, t) => {
 		if (null !== t) return null;
-		const r = n.findIndex((t) => d(t.name, e));
-		return r >= 0 ? ae(b(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
+		const r = n.findIndex((t) => S(t.name, e));
+		return r >= 0 ? ae(w(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
 		var a;
 	};
 	for (const e of r) {
-		const t = oe(a.get(e.field), u);
+		const t = oe(a.get(e.field), d);
 		if (null === t) return null;
 		e.expression = t;
 	}
@@ -343,41 +343,41 @@ var Y = [
 	percent: 13,
 	percentDiff: 14
 }, Ie = (e, t, n, s) => {
-	const r = l.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 (v(e)) return {
+	if (A(e)) return {
 		cells: [],
-		...B,
+		...V,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: E(e),
+		header: O(e),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
 		...s?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	const i = f(e, a), d = i ? s?.filters : null;
-	if (i && !d) return null;
+	const l = L(e, a), i = l ? s?.filters : null;
+	if (l && !i) return null;
 	const u = o.some((e) => e.items?.some((e) => e.calculated));
-	if (u && !d?.calculatedRecords) return null;
+	if (u && !i?.calculatedRecords) return null;
 	const c = de(e, t);
-	if (!c || c.measures.length > 0 && !d?.fieldValues) return null;
+	if (!c || c.measures.length > 0 && !i?.fieldValues) return null;
 	if ((e.dataFields ?? []).some((e) => void 0 === ye[e.showDataAs ?? "normal"] || void 0 === pe[e.subtotal ?? "sum"])) return null;
-	const m = xe(e, t, n, d?.calculatedRecords, c.operands);
-	if (!m) return null;
-	const { items: p, records: g, values: w, n: F } = m, b = (e) => !!e && (!e.noRecords || P(e)), y = e.form ?? "compact", I = (e) => {
+	const f = xe(e, t, n, i?.calculatedRecords, c.operands);
+	if (!f) return null;
+	const { items: m, records: h, values: g, n: w } = f, v = (e) => !!e && (!e.noRecords || j(e)), F = e.form ?? "compact", b = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === ce) {
 				t.push({
 					field: n,
-					form: y
+					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 (u && s && s.some((e) => "default" !== e)) return null;
 			t.push({
 				field: n,
@@ -385,33 +385,33 @@ var Y = [
 			});
 		}
 		return t;
-	}, x = I(e.rowFields), A = I(e.columnFields), C = e.pageFields ?? [];
-	if (!x || !A || C.some((e) => !b(a[e.field]))) return null;
-	const S = h(e, s?.slicerFields);
-	return S.pageFields?.some((e) => !b(a[e.field])) ? null : Te(e, t, p, x, A, Se(r, S, p, g, w, x, A, F, d?.keep, d?.records, c.operands.length, d?.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 = d(e, s?.slicerFields);
+	return C.pageFields?.some((e) => !v(a[e.field])) ? null : Te(e, t, m, y, I, Se(r, C, m, h, g, y, I, w, i?.keep, i?.records, c.operands.length, i?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
 }, xe = (e, t, n, s, r = []) => {
-	const o = t.fields?.length ?? 0, a = T(t);
+	const o = t.fields?.length ?? 0, a = u(t);
 	if (!t.records) return null;
 	const l = te(t, n.isDate1904());
 	if (!l) return null;
-	const i = !0 === t.fields?.some(P), d = i ? A(t.items, o) : a, u = i ? A(t.records, o) : l, c = t.recordCount ?? 0, f = s?.count ?? 0, m = c + f, p = (e, n) => {
-		const s = !t.fields?.[e]?.noRecords, r = s ? u[e] : l[e] ?? [], o = s ? d[e] : a[e], i = new Array(m);
-		for (let e = 0; e < c; e++) i[e] = q(o[r[e]]);
-		for (let e = 0; e < f; e++) i[c + e] = n?.[e] ?? null;
+	const d = !0 === t.fields?.some(j), c = d ? i(t.items, o) : a, f = d ? i(t.records, o) : l, m = t.recordCount ?? 0, p = s?.count ?? 0, h = m + p, w = (e, n) => {
+		const s = !t.fields?.[e]?.noRecords, r = s ? f[e] : l[e] ?? [], o = s ? c[e] : a[e], i = new Array(h);
+		for (let e = 0; e < m; e++) i[e] = g(o[r[e]]);
+		for (let e = 0; e < p; e++) i[m + e] = n?.[e] ?? null;
 		return i;
-	}, h = [...(e.dataFields ?? []).map((e, t) => p(e.field, s?.values[t])), ...r.map((e) => p(e))];
+	}, v = [...(e.dataFields ?? []).map((e, t) => w(e.field, s?.values[t])), ...r.map((e) => w(e))];
 	return {
 		items: a,
 		records: s ? l.map((e, t) => e.concat(s.ids[t] ?? [])) : l,
-		values: h,
-		n: m
+		values: v,
+		n: h
 	};
-}, Ae = async (e, t, n, s, r, o, a, i, d) => {
-	const u = l.peek(), c = e.dataFields?.[r];
-	if (!u || !e.fields || !c || void 0 === pe[c.subtotal ?? "sum"]) return null;
-	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) => {
+}, Ae = async (e, t, n, s, r, o, a, l, i) => {
+	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)), m = c[f];
+	if (!m) return null;
+	const h = m.slice(0, m.indexOf(s)), g = e.fields.map((e) => {
 		const { blankRowAfter: t, showItemsWithNoData: n, sort: s, ...r } = e;
 		return {
 			...r,
@@ -421,18 +421,18 @@ var Y = [
 				return n;
 			})
 		};
-	}), { columnGrandTotals: w, ...v } = e, { showDataAs: F, ...b } = c, y = {
+	}), { columnGrandTotals: w, ...v } = e, { showDataAs: F, ...b } = u, y = {
 		...v,
 		fields: g,
 		rowFields: [...h, s],
 		columnFields: [],
 		dataFields: [b],
 		rowGrandTotals: !1
-	}, I = i ? {
-		...i,
-		values: [i.values[r] ?? []]
-	} : i, x = de(y, t);
-	if (!x || x.measures.length > 0 && !d) return null;
+	}, I = l ? {
+		...l,
+		values: [l.values[r] ?? []]
+	} : l, x = de(y, t);
+	if (!x || x.measures.length > 0 && !i) return null;
 	const A = xe(y, t, n, I, x.operands);
 	if (!A) return null;
 	const { items: C, records: E, values: S, n: P } = A, k = y.rowFields.map((e) => ({
@@ -441,14 +441,14 @@ var Y = [
 	}));
 	let M;
 	if (a) {
-		const e = 0 === m ? 1 : 2;
+		const e = 0 === f ? 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(u, x, y, C, E, S, k, [], P, o, M, d) : void 0, R = Se(u, 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;
+	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(",");
@@ -485,7 +485,7 @@ var Y = [
 			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 Y = [
 	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 i = Q(e.wasm_memory().buffer, a, h), d = new Array(r.length);
+			const i = 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] ? i(e) : null;
 			return {
 				rows: n,
@@ -608,7 +608,7 @@ var Y = [
 			ok: !0,
 			numeric: !0
 		}, o = r[t];
-		for (let e = 0; e < l; e++) X(n, e, o[e], A, s);
+		for (let e = 0; e < l; e++) Z(n, e, o[e], A, s);
 	});
 	for (const { column: e, ptr: t } of y) {
 		const n = e.length, s = {
@@ -619,7 +619,7 @@ var Y = [
 			ok: !0,
 			numeric: !0
 		};
-		for (let t = 0; t < n; t++) X(s, t, e[t], A, r);
+		for (let t = 0; t < n; t++) Z(s, t, e[t], A, r);
 	}
 	return {
 		request: p,
@@ -649,87 +649,87 @@ 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, u, c) => {
-	const f = e.fields, m = t.fields, p = e.dataFields ?? [], h = (t) => t === ce ? e.valuesCaption ?? "Values" : f[t].name ?? m[t].name, g = (e, t) => {
-		if (e === ce) return p[t]?.name ?? "";
-		const s = f[e].items?.[t];
-		if (void 0 !== s?.name) return s.name;
-		const r = q(n[e][s?.item ?? t]);
-		return null === r ? S : r;
+}, Te = (e, t, s, r, o, l, i, d, u) => {
+	const c = e.fields, f = t.fields, m = e.dataFields ?? [], p = (t) => t === ce ? e.valuesCaption ?? "Values" : c[t].name ?? f[t].name, h = (e, t) => {
+		if (e === ce) return m[t]?.name ?? "";
+		const n = c[e].items?.[t];
+		if (void 0 !== n?.name) return n.name;
+		const r = g(s[e][n?.item ?? t]);
+		return null === r ? D : r;
 	}, w = (e, t) => {
-		const n = g(e, t);
-		if ("number" == typeof n) {
-			const o = f[e].items?.[t]?.item ?? t, a = void 0 === (f[e].numberFormat ?? m[e].numberFormat) && i(m[e], o);
-			return s(d, a ? x(y(m[e], o), d) : x(f[r = e].numberFormat ?? m[r].numberFormat, d), n);
+		const s = h(e, t);
+		if ("number" == typeof s) {
+			const o = c[e].items?.[t]?.item ?? t, a = void 0 === (c[e].numberFormat ?? f[e].numberFormat) && C(f[e], o);
+			return n(i, a ? F(T(f[e], o), i) : F(c[r = e].numberFormat ?? f[r].numberFormat, i), s);
 		}
 		var r;
-		return a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-	}, v = (e) => {
-		if (void 0 !== e.item) return g(e.field, e.item);
-		const t = f[e.field].items ?? [];
+		return a.isError(s) ? s.getLabel() : "boolean" == typeof s ? s ? "TRUE" : "FALSE" : String(s);
+	}, b = (e) => {
+		if (void 0 !== e.item) return h(e.field, e.item);
+		const t = c[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		const n = t.flatMap((e, t) => _(e) && !e.hidden ? [t] : []);
-		return 1 === n.length ? g(e.field, n[0]) : "(Multiple Items)";
-	}, b = e.grandTotalCaption ?? "Grand Total", I = u ? /* @__PURE__ */ new Map() : null, A = (e, t) => e === ce ? {
+		const n = t.flatMap((e, t) => I(e) && !e.hidden ? [t] : []);
+		return 1 === n.length ? h(e.field, n[0]) : "(Multiple Items)";
+	}, x = e.grandTotalCaption ?? "Grand Total", A = d ? /* @__PURE__ */ new Map() : null, E = (e, t) => e === ce ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, C = (e) => e === ce ? null : {
+	}, S = (e) => e === ce ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, P = (e, t) => 2 === e.kind && t === b ? { kind: "grandTotal" } : null, k = 0 === r.length && 0 === o.length && 0 === p.length, T = k ? {
+	}, P = (e, t) => 2 === e.kind && t === x ? { kind: "grandTotal" } : null, k = 0 === r.length && 0 === o.length && 0 === m.length, M = k ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : E(e), R = k ? [] : Me(l.rows, l.functions), N = k ? [] : Me(l.columns, l.functions), $ = F({
+	} : O(e), N = k ? [] : Me(l.rows, l.functions), $ = k ? [] : Me(l.columns, l.functions), _ = y({
 		...e,
-		header: T,
-		rowLines: R,
-		columnLines: N
-	}), L = l.columns.length, D = (e) => "row" === e ? r : o, V = (t) => {
+		header: M,
+		rowLines: N,
+		columnLines: $
+	}), L = l.columns.length, V = (e) => "row" === e ? r : o, U = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [h(n), {
+				return [p(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
 			}
 			case "pageItem": {
 				const n = e.pageFields[t.page];
-				return [v(n), {
+				return [b(n), {
 					kind: "pageItem",
 					page: t.page
 				}];
 			}
-			case "dataCaption": return [p[t.data]?.name ?? null, {
+			case "dataCaption": return [m[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 = D(t.axis)[t.level].field;
-				return [h(e), C(e)];
+				const e = V(t.axis)[t.level].field;
+				return [p(e), S(e)];
 			}
 			case "label": {
-				const e = D(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [g(e, n), A(e, n)];
+				const e = V(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [h(e, n), E(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 ? p[t.data]?.name ?? "" : "";
-					if (2 === t.kind) return n ? `Total ${s}` : b;
+					const n = e.findIndex((e) => e.field === ce) >= t.path.length && null !== t.data, s = n ? m[t.data]?.name ?? "" : "";
+					if (2 === t.kind) return n ? `Total ${s}` : x;
 					const r = t.path.length - 1, o = e[r].field, a = w(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 ${h(p[t.data].field)}` : `${a} ${e}`;
+						return (n || t.across) && null !== t.data ? `${a} ${e} of ${p(m[t.data].field)}` : `${a} ${e}`;
 					}
-					return f[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
-				})(D(t.axis), e);
+					return c[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
+				})(V(t.axis), e);
 				return [n, P(e, n)];
 			}
 			case "value": {
@@ -744,200 +744,200 @@ var Y = [
 				})(e.emptyCaption)), [r, null];
 			}
 		}
-	}, U = new O.Builder(), B = $.top, j = $.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), z = (e, t) => {
-		const n = M($, e, t);
+	}, H = new v.Builder(), z = _.top, B = _.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), j = (e, t) => {
+		const n = G(_, e, t);
 		if (!n) return;
-		const [s, r] = V(n);
+		const [s, r] = U(n);
 		((e, t, n) => {
-			I && n && I.set(e + "," + t, n);
-		})(e - B, t, r), null !== s && (c ? U.pushAt(t, e - B, s) : U.pushAt(e - B, t, s));
+			A && n && A.set(e + "," + t, n);
+		})(e - z, t, r), null !== s && (u ? H.pushAt(t, e - z, s) : H.pushAt(e - z, t, s));
 	};
-	if (c) {
-		const e = Math.max(j, $.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < $.rows.length; e++) t < (e < B ? j : $.columns.length) && z(e, t);
-	} else for (let e = 0; e < $.rows.length; e++) {
-		const t = e < B ? j : $.columns.length;
-		for (let n = 0; n < t; n++) z(e, n);
+	if (u) {
+		const e = Math.max(B, _.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < _.rows.length; e++) t < (e < z ? B : _.columns.length) && j(e, t);
+	} else for (let e = 0; e < _.rows.length; e++) {
+		const t = e < z ? B : _.columns.length;
+		for (let n = 0; n < t; n++) j(e, n);
 	}
 	if (k) {
-		const t = H(e);
+		const t = R(e);
 		return {
-			cells: U.build()?.tuples ?? [],
+			cells: H.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
 			columnPageCount: t.columns,
-			header: T,
+			header: M,
 			rowLines: [],
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...I ? { roles: I } : {}
+			...A ? { roles: A } : {}
 		};
 	}
-	const G = (e, t) => {
+	const q = (e, t) => {
 		const n = [];
 		return e.forEach((e, s) => {
 			e.field !== ce && n.push(s < t.path.length ? t.path[s] : -1);
 		}), n;
-	}, Q = (e, t) => K(e.data ?? t.data ?? 0, [...G(r, e), ...G(o, t)]), [J] = 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;
+	}, K = (e, t) => Q(e.data ?? t.data ?? 0, [...q(r, e), ...q(o, t)]), [J] = l.rows, [W] = l.columns, Z = J && W && 3 !== J.kind && 3 !== W.kind ? K(J, W) : null, X = [], Y = (e) => 1 === e.kind && null !== e.function;
 	l.rows.forEach((t, n) => {
-		3 === t.kind || Z(t) || (G(r, t), l.columns.forEach((s, r) => {
+		3 === t.kind || Y(t) || (q(r, t), l.columns.forEach((s, r) => {
 			const o = l.states[n * L + r];
-			if (3 === s.kind || Z(s) || 0 !== o && 1 !== o) return;
+			if (3 === s.kind || Y(s) || 0 !== o && 1 !== o) return;
 			let i = 0 === o ? l.values[n * L + r] : 0;
-			e.showError && a.isError(i) && (i = e.errorCaption || 0), Y.push([Q(t, s), i]);
+			e.showError && a.isError(i) && (i = e.errorCaption || 0), X.push([K(t, s), i]);
 		}));
 	});
-	const ee = H(e);
+	const ee = R(e);
 	return {
-		cells: U.build()?.tuples ?? [],
-		rows: $.rows.length - B,
-		columns: $.columns.length,
+		cells: H.build()?.tuples ?? [],
+		rows: _.rows.length - z,
+		columns: _.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
-		header: T,
-		rowLines: R,
-		columnLines: N,
-		viewValues: Y,
-		firstKey: X,
-		...I ? { roles: I } : {}
+		header: M,
+		rowLines: N,
+		columnLines: $,
+		viewValues: X,
+		firstKey: Z,
+		...A ? { roles: A } : {}
 	};
-}, Re = (e, t, n, r, o = !1, l, d) => {
-	const u = Ie(e, t, r, {
+}, Re = (e, t, s, r, o = !1, l, i) => {
+	const d = Ie(e, t, r, {
 		filters: l,
-		slicerFields: d
+		slicerFields: i
 	});
-	if (!u) return null;
-	const c = u.rowPageCount > 0 ? u.rowPageCount + 1 : 0, f = u.rowPageCount > 0 ? 3 * u.columnPageCount - 1 : 0, { rowStart: m, colStart: p } = n;
+	if (!d) return null;
+	const c = d.rowPageCount > 0 ? d.rowPageCount + 1 : 0, f = d.rowPageCount > 0 ? 3 * d.columnPageCount - 1 : 0, { rowStart: m, colStart: p } = s;
 	if (m - c < 0) return null;
 	const h = {
 		rowStart: m - c,
 		colStart: p,
-		rowEnd: m + u.rows - 1,
-		colEnd: p + Math.max(u.columns, f) - 1
-	}, g = e.fields, w = t.fields, v = T(t), F = (e, t) => {
-		const n = g[e], o = n.numberFormat ?? w[e].numberFormat, l = x(o, r), d = P(w[e]), u = v[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 })), m = f.map((t) => {
-			const n = q(u[t.item]), c = i(w[e], t.item), f = null === n ? "(blank)" : "number" == typeof n ? s(r, c ? (m = t.item, void 0 === o ? x(y(w[e], m), r) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-			var m;
-			const p = d && c ? f : n;
+		rowEnd: m + d.rows - 1,
+		colEnd: p + Math.max(d.columns, f) - 1
+	}, w = e.fields, v = t.fields, b = u(t), y = (e, t) => {
+		const s = w[e], o = s.numberFormat ?? v[e].numberFormat, l = F(o, r), i = j(v[e]), d = b[e], u = (s.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 s = g(d[t.item]), u = C(v[e], t.item), c = null === s ? "(blank)" : "number" == typeof s ? n(r, u ? (f = t.item, void 0 === o ? F(T(v[e], f), r) : l) : l, s) : a.isError(s) ? s.getLabel() : "boolean" == typeof s ? s ? "TRUE" : "FALSE" : String(s);
+			var f;
+			const m = i && u ? c : s;
 			return void 0 !== t.name ? {
-				value: p,
-				text: f,
+				value: m,
+				text: c,
 				name: t.name
 			} : {
-				value: p,
-				text: f
+				value: m,
+				text: c
 			};
-		}), p = {
-			name: n.name ?? w[e].name,
-			items: m
+		}), m = {
+			name: s.name ?? v[e].name,
+			items: f
 		};
 		if (t) {
-			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			p.page = void 0 !== e ? f.findIndex((t) => t.item === e) : -1;
+			const e = void 0 !== t.item ? (s.items ?? [])[t.item]?.item : void 0;
+			m.page = void 0 !== e ? c.findIndex((t) => t.item === e) : -1;
 		}
-		return p;
-	}, b = (e) => (e ?? []).filter((e) => -2 !== e);
+		return m;
+	}, I = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
 			range: h,
 			dataFields: (e.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: w[e.field].name
+				sourceName: v[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))
+				...I(e.rowFields).map((e) => y(e)),
+				...I(e.columnFields).map((e) => y(e)),
+				...(e.pageFields ?? []).map((e) => y(e.field, e))
 			],
-			values: u.viewValues,
+			values: d.viewValues,
 			block: {
 				anchor: {
 					row: m,
 					column: p
 				},
 				...o ? { blocked: !0 } : {},
-				...null !== u.firstKey ? { first: u.firstKey } : {}
+				...null !== d.firstKey ? { first: d.firstKey } : {}
 			}
 		},
 		size: {
-			rows: u.rows,
-			columns: u.columns
+			rows: d.rows,
+			columns: d.columns
 		}
 	};
-}, Oe = async (e, t, n, r) => {
-	const o = /* @__PURE__ */ new Map(), u = (e.filters ?? []).filter((t) => U(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), c = e.fields?.some((e) => e.items?.some((e) => e.calculated)), f = e.dataFields?.some((e) => b(t.fields?.[e.field]));
-	if (0 === u.length && !c && !f) return { keep: o };
-	const m = T(t);
-	for (const s of u.filter(U)) {
-		const a = s.field, l = m[a];
+}, Oe = async (e, t, s, r) => {
+	const o = /* @__PURE__ */ new Map(), l = (e.filters ?? []).filter((t) => k(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) => w(t.fields?.[e.field]));
+	if (0 === l.length && !i && !d) return { keep: o };
+	const c = u(t);
+	for (const n of l.filter(k)) {
+		const a = n.field, l = c[a];
 		if (!l) continue;
-		const i = D(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] : q(l[e]);
-		const u = await $e(s.condition, d, n, r), c = o.get(a);
-		if (c) for (let e = 0; e < u.length; e++) c[e] &= u[e];
+		const i = P(n.condition) ? _e(e, t, l, a, s) : null, d = new Array(l.length);
+		for (let e = 0; e < l.length; e++) d[e] = i ? i[e] : g(l[e]);
+		const u = await $e(n.condition, d, s, 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 p = c && r ? await (async (e, t, n, r, o) => {
-		const l = t.fields ?? [], u = e.fields ?? [], c = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), f = e.dataFields ?? [];
-		if (1 !== c.length || f.some((e) => b(l[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
-		const m = c[0], p = l[m].calculatedItems, h = te(t, n.isDate1904());
-		if (!h) return null;
-		const g = T(t), w = T({
+	const f = i && r ? await (async (e, t, s, r, o) => {
+		const l = t.fields ?? [], i = e.fields ?? [], d = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
+		if (1 !== d.length || c.some((e) => w(l[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
+		const f = d[0], m = l[f].calculatedItems, p = te(t, s.isDate1904());
+		if (!p) return null;
+		const h = u(t), v = u({
 			...t,
 			fields: l.map(({ group: e, ...t }) => t)
-		}), v = (e.rowFields ?? []).filter((e) => e >= 0), F = (e.columnFields ?? []).filter((e) => e >= 0), y = v.includes(m) ? v : F.includes(m) ? F : null;
-		if (!y) return null;
-		const I = y.slice(0, y.indexOf(m)), A = [...y.slice(y.indexOf(m) + 1), ...y === v ? F : v], C = [...I, ...A], E = t.recordCount ?? 0, P = (e, t) => {
-			const n = u[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), I = b.includes(f) ? b : y.includes(f) ? y : null;
+		if (!I) return null;
+		const x = I.slice(0, I.indexOf(f)), A = [...I.slice(I.indexOf(f) + 1), ...I === b ? y : b], E = [...x, ...A], P = t.recordCount ?? 0, k = (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 = u[e.field]?.items;
+		}, M = (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 ?? [], O = x(l[m].numberFormat ?? 14, n), N = (e) => g[m].findIndex((t, r) => {
-			const o = q(t);
-			return "number" == typeof o && (l[m].dates || i(l[m], r)) ? d(s(n, O, o), e) : d(null === o ? S : R(o), e);
-		}), $ = /* @__PURE__ */ new Map(), L = new Map(p.map((e) => [e.item, e.formula])), _ = (e) => {
-			let t = $.get(e);
-			return void 0 === t && $.set(e, t = $.size), t;
+		}, T = e.pageFields ?? [], R = F(l[f].numberFormat ?? 14, s), O = (e) => h[f].findIndex((t, r) => {
+			const o = g(t);
+			return "number" == typeof o && (l[f].dates || C(l[f], r)) ? S(n(s, R, o), e) : S(null === o ? D : U(o), e);
+		}), N = /* @__PURE__ */ new Map(), $ = new Map(m.map((e) => [e.item, e.formula])), _ = (e) => {
+			let t = N.get(e);
+			return void 0 === t && N.set(e, t = N.size), t;
 		};
-		for (const e of p) if (null === oe(e.formula, (e, t) => {
-			if (null === t || !d(l[m].name, e)) return null;
-			const n = N(t);
-			return n < 0 ? null : (L.has(n) || _(n), "");
+		for (const e of m) if (null === oe(e.formula, (e, t) => {
+			if (null === t || !S(l[f].name, e)) return null;
+			const n = O(t);
+			return n < 0 ? null : ($.has(n) || _(n), "");
 		})) return null;
-		const D = /* @__PURE__ */ new Map(), V = /* @__PURE__ */ new Map(), U = f.map((e) => ({
-			column: h[e.field],
-			values: w[e.field],
+		const L = /* @__PURE__ */ new Map(), V = /* @__PURE__ */ new Map(), H = c.map((e) => ({
+			column: p[e.field],
+			values: v[e.field],
 			fold: e.subtotal ?? "sum"
-		})), H = $.size;
-		for (let e = 0; e < E; e++) {
-			if (!M.every((t) => k(t, h[t.field][e]))) continue;
-			if (!C.every((t) => P(t, h[t][e]))) continue;
+		})), z = N.size;
+		for (let e = 0; e < P; e++) {
+			if (!T.every((t) => M(t, p[t.field][e]))) continue;
+			if (!E.every((t) => k(t, p[t][e]))) continue;
 			let t = "";
-			for (const n of I) t += h[n][e] + ",";
+			for (const n of x) t += p[n][e] + ",";
 			V.has(t) || V.set(t, e);
-			const n = $.get(h[m][e]);
+			const n = N.get(p[f][e]);
 			if (void 0 === n) continue;
 			let s = t;
-			for (const t of A) s += h[t][e] + ",";
-			let r = D.get(s);
+			for (const t of A) s += p[t][e] + ",";
+			let r = L.get(s);
 			r || (r = {
-				sums: f.map(() => new Array(H).fill(0)),
-				errors: f.map(() => new Array(H).fill(void 0))
-			}, D.set(s, r));
+				sums: c.map(() => new Array(z).fill(0)),
+				errors: c.map(() => new Array(z).fill(void 0))
+			}, L.set(s, r));
 			const { sums: o, errors: l } = r;
-			U.forEach(({ column: t, values: s, fold: r }, i) => {
-				const d = q(s[t[e]]);
+			H.forEach(({ column: t, values: s, fold: r }, i) => {
+				const d = g(s[t[e]]);
 				"sum" === r ? "number" == typeof d ? o[i][n] += d : a.isError(d) && (l[i][n] ??= d) : ("countNums" === r ? "number" == typeof d : null !== d) && (o[i][n] += 1);
 			});
 		}
 		const B = A.map((e) => {
-			const t = u[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);
+			const t = i[e]?.items;
+			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && k(e, t.item) ? [t.item] : []) : h[e].map((e, t) => t);
 		});
 		if (B.reduce((e, t) => e * t.length, V.size) > 5e5) return null;
 		const j = [];
@@ -952,103 +952,103 @@ var Y = [
 			};
 			n(0, [], e);
 		}
-		const z = j.length;
-		if (0 === z) return {
+		const q = j.length;
+		if (0 === q) return {
 			count: 0,
 			ids: l.map(() => []),
-			values: f.map(() => [])
+			values: c.map(() => [])
 		};
-		const G = f.length * H, K = (e, t) => e * H + t, Q = (e, t) => G + e * p.length + t, J = [];
-		for (let e = 0; e < f.length; e++) for (let t = 0; t < H; t++) J.push(j.map(({ key: n }) => {
-			const s = D.get(n);
+		const G = c.length * z, Q = (e, t) => e * z + t, K = (e, t) => G + e * m.length + t, J = [];
+		for (let e = 0; e < c.length; e++) for (let t = 0; t < z; t++) J.push(j.map(({ key: n }) => {
+			const s = L.get(n);
 			return s ? s.errors[e][t] ?? s.sums[e][t] : 0;
 		}));
 		const W = [];
-		for (let e = 0; e < f.length; e++) for (let t = 0; t < p.length; t++) {
-			const n = oe(p[t].formula, (t, n) => {
+		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 = N(n), r = p.findIndex((e) => e.item === s);
-				return ae(r >= 0 ? Q(e, r) : K(e, $.get(s)));
+				const s = O(n), r = m.findIndex((e) => e.item === s);
+				return ae(r >= 0 ? K(e, r) : Q(e, N.get(s)));
 			});
 			if (null === n) return null;
 			W.push({
 				expression: n,
-				coords: le(Q(e, t), z)
+				coords: le(K(e, t), q)
 			});
 		}
-		const X = await r.evaluateBatch({
-			values: ie(J, z),
+		const Z = await r.evaluateBatch({
+			values: ie(J, q),
 			formulas: W
-		}), Y = l.map(() => []), Z = f.map(() => []), ee = (e, t, n, s) => {
-			h.forEach((n, s) => {
+		}), X = l.map(() => []), Y = c.map(() => []), ee = (e, t, n, s) => {
+			p.forEach((n, s) => {
 				const r = A.indexOf(s);
-				Y[s].push(s === m ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
-			}), Z.forEach((e, t) => {
+				X[s].push(s === f ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
+			}), Y.forEach((e, t) => {
 				e.push(t === n ? s : null);
 			});
 		};
 		return j.forEach((e, t) => {
-			p.forEach(({ item: n }, s) => {
-				f.forEach((r, o) => {
-					const a = X[o * p.length + s].getValueAt(t, 0) ?? 0;
+			m.forEach(({ item: n }, s) => {
+				c.forEach((r, o) => {
+					const a = Z[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);
 				});
 			});
 		}), {
-			count: Y[0]?.length ?? 0,
-			ids: Y,
-			values: Z
+			count: X[0]?.length ?? 0,
+			ids: X,
+			values: Y
 		};
-	})(e, t, n, r, o) : void 0, h = u.filter((e) => !U(e)).map((e, t) => ({
+	})(e, t, s, r, o) : void 0, m = l.filter((e) => !k(e)).map((e, t) => ({
 		filter: e,
 		index: t
-	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), g = (t.recordCount ?? 0) + (p?.count ?? 0);
-	let w;
-	const v = e.rowFields ?? [];
-	for (const { filter: s } of h) {
-		const a = await Ae(e, t, n, s.field, s.dataField, o, w, p, r);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), h = (t.recordCount ?? 0) + (f?.count ?? 0);
+	let v;
+	const b = e.rowFields ?? [];
+	for (const { filter: n } of m) {
+		const a = await Ae(e, t, s, n.field, n.dataField, o, v, f, r);
 		if (!a) continue;
 		const l = /* @__PURE__ */ new Set();
 		for (const [e, t] of a.groups) {
-			const o = await $e(s.condition, t.totals, n, r);
+			const o = await $e(n.condition, t.totals, s, r);
 			t.ids.forEach((t, n) => {
 				o[n] || l.add(`${e}|${t}`);
 			});
 		}
 		if (0 === l.size) continue;
-		w ??= new Uint8Array(g).fill(3);
-		const i = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = v.includes(s.field) ? 1 : 2;
-		for (let e = 0; e < g; e++) {
-			if (!(w[e] & u)) continue;
+		v ??= new Uint8Array(h).fill(3);
+		const i = a.outer.map((e) => a.records[e]), d = a.records[n.field], u = b.includes(n.field) ? 1 : 2;
+		for (let e = 0; e < h; e++) {
+			if (!(v[e] & u)) continue;
 			let t = "";
 			for (let n = 0; n < i.length; n++) t += (n > 0 ? "," : "") + i[n][e];
-			l.has(`${t}|${d[e]}`) && (w[e] &= ~u);
+			l.has(`${t}|${d[e]}`) && (v[e] &= ~u);
 		}
 	}
-	const F = f && r ? await (async (e, t, n, s, r, o, a) => {
-		const i = l.peek(), d = de(e, t);
-		if (!i || !d) return null;
-		const u = xe(e, t, n, a, d.operands);
-		if (!u) return null;
-		const c = (t) => (t ?? []).map((t) => ({
+	const y = 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;
+		const u = (t) => (t ?? []).map((t) => ({
 			field: t,
 			form: t === ce ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
-		return Ee(i, d, e, u.items, u.records, u.values, c(e.rowFields), c(e.columnFields), u.n, r, o, s);
-	})(e, t, n, r, o, w, p) : void 0;
+		return Ee(l, i, e, d.items, d.records, d.values, u(e.rowFields), u(e.columnFields), d.n, r, o, s);
+	})(e, t, s, r, o, v, f) : void 0;
 	return {
 		keep: o,
-		...w ? { records: w } : {},
-		...p ? { calculatedRecords: p } : {},
-		...F ? { fieldValues: F } : {}
+		...v ? { records: v } : {},
+		...f ? { calculatedRecords: f } : {},
+		...y ? { fieldValues: y } : {}
 	};
 }, Ne = (e, t) => {
 	const n = e.filters;
 	if (!n) return e;
 	let s = !1;
 	const r = n.map((e) => {
-		const n = e.condition && p(e.condition, t);
+		const n = e.condition && H(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 c();
+	const a = new z();
 	for (let e = 0; e < r; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
 	let l = !1;
-	return await V({
+	return await E({
 		conditions: [e],
 		runtime: n,
 		calculation: s ?? null,
@@ -1086,21 +1086,21 @@ var Y = [
 			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 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 = x(u, o), f = (e) => void 0 === u ? x(y(t.fields?.[r], e), o) : c, m = new Array(n.length);
-	for (let e = 0; e < n.length; e++) {
-		const l = d.get(e);
+}, _e = (e, t, s, r, o) => {
+	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 = F(d, o), c = (e) => void 0 === d ? F(T(t.fields?.[r], e), o) : u, f = new Array(s.length);
+	for (let e = 0; e < s.length; e++) {
+		const l = i.get(e);
 		if (void 0 !== l) {
-			m[e] = l;
+			f[e] = l;
 			continue;
 		}
-		const u = q(n[e]);
-		null === u ? m[e] = S : "number" == typeof u ? m[e] = s(o, i(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 d = g(s[e]);
+		null === d ? f[e] = D : "number" == typeof d ? f[e] = n(o, C(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;
-}, _e = (e) => {
+	return f;
+}, Le = (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,
 		rowEnd: t.rowStart,
@@ -1179,14 +1179,14 @@ var Y = [
 		}
 	}
 	return !1;
-}, Be = (e) => null == e ? {
+}, ze = (e) => null == e ? {
 	t: "z",
 	v: 0
 } : a.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, je = (e, t) => (t && "number" == typeof e ? "date:" : "") + m(q(e)), ze = (e, t, n, s = !1) => {
-	const r = e.fields ?? [], o = A(e.items, r.length), a = /\smissingItemsLimit="0"/.test(e.rest ?? ""), l = ((e) => {
+} : e, Be = (e, t) => (t && "number" == typeof e ? "date:" : "") + c(g(e)), je = (e, t, n, s = !1) => {
+	const r = e.fields ?? [], o = i(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 || d.has(n) || d.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 = [], y = (e, t, n) => {
-		g[t] = n.items, v[t] = n.items.length, F[t] = !0, f[e] = ((e, t) => {
+	const u = t.recordCount, c = r.map(() => -1), f = r.map((e, t) => o[t].map(() => -1)), m = [], p = [], h = [], v = [], F = [], b = [], y = [], I = (e, t, n) => {
+		v[t] = n.items, b[t] = n.items.length, y[t] = !0, f[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
@@ -1210,67 +1210,67 @@ var Y = [
 	t.columns.forEach((e, t) => {
 		const n = d.get(l[t].toLocaleLowerCase());
 		void 0 !== n && (d.delete(l[t].toLocaleLowerCase()), c[n] = t);
-		const b = new Int32Array(e.values.length).fill(-1), I = [], x = [], A = new Array(u);
+		const i = new Int32Array(e.values.length).fill(-1), w = [], x = [], A = new Array(u);
 		for (let t = 0; t < u; t++) {
 			const n = e.ids[t];
-			let s = b[n];
-			s < 0 && (s = b[n] = I.length, I.push(Be(e.values[n])), x.push(e.dates || !!e.dateIds?.has(n))), A[t] = s;
+			let s = i[n];
+			s < 0 && (s = i[n] = w.length, w.push(ze(e.values[n])), x.push(e.dates || !!e.dateIds?.has(n))), A[t] = s;
 		}
-		const C = (e) => void 0 !== n && (!!r[n].dates || i(r[n], e)), E = I.length, S = void 0 !== n ? !0 === r[n].inline : I.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), k = [];
-		if (void 0 !== n && S) {
+		const E = (e) => void 0 !== n && (!!r[n].dates || C(r[n], e)), S = w.length, P = void 0 !== n ? !0 === r[n].inline : w.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), k = [];
+		if (void 0 !== n && P) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < E; t++) e.set(je(I[t], x[t]), t);
+			for (let t = 0; t < S; t++) e.set(Be(w[t], x[t]), t);
 			o[n].forEach((t, s) => {
-				f[n][s] = e.get(je(t, C(s))) ?? -1;
+				f[n][s] = e.get(Be(t, E(s))) ?? -1;
 			});
 		} else if (void 0 !== n) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < E; t++) e.set(je(I[t], x[t]), t);
+			for (let t = 0; t < S; t++) e.set(Be(w[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, C(r));
+				const o = Be(s, E(r));
 				let l = e.get(o);
-				void 0 !== l || a || C(r) || (l = I.length, I.push(s), x.push(C(r)), k.push(l), e.set(o, l)), f[n][r] = l ?? -1;
+				void 0 !== l || a || E(r) || (l = w.length, w.push(s), x.push(E(r)), k.push(l), e.set(o, l)), f[n][r] = l ?? -1;
 			});
 		}
 		const M = { name: l[t] };
-		S && (M.inline = !0), void 0 !== e.numberFormat && (M.numberFormat = e.numberFormat);
+		P && (M.inline = !0), void 0 !== e.numberFormat && (M.numberFormat = e.numberFormat);
 		const T = [];
 		let R = !1;
-		I.forEach((e, t) => {
+		w.forEach((e, t) => {
 			"number" == typeof e && (x[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);
+		}), T.length > 0 && !R ? M.dates = !0 : T.length > 0 && (M.dateItems = T), F[t] = M.dateItems ? new Set(M.dateItems) : void 0, k.length > 0 && (M.unused = k);
 		const O = void 0 !== n ? r[n].rest : void 0;
 		O && (M.rest = O);
 		const N = void 0 !== n ? r[n].calculatedItems : void 0;
 		N?.length && (M.calculatedItems = N.map(({ item: e, formula: t }) => {
-			const s = I.length;
-			return I.push(o[n][e]), f[n][e] = s, {
+			const s = w.length;
+			return w.push(o[n][e]), f[n][e] = s, {
 				item: s,
 				formula: t
 			};
-		})), m.push(M), p.push([t, [[0, I]]]), h.push([t, [[0, A]]]), g.push(I), v.push(E), F.push(!1);
+		})), m.push(M), p.push([t, [[0, w]]]), h.push([t, [[0, A]]]), v.push(w), b.push(S), y.push(!1);
 		const $ = void 0 !== n ? r[n].group : void 0;
 		if ($?.range && $.base === n) {
-			const e = re($, I.slice(0, E).map(q), s);
+			const e = re($, w.slice(0, S).map(g), s);
 			e ? (M.group = {
 				...e,
 				base: t
-			}, y(n, t, e)) : f[n] = o[n].map(() => -1);
-		} else $ && !P(r[n]) && (M.group = $);
+			}, I(n, t, e)) : f[n] = o[n].map(() => -1);
+		} else $ && !j(r[n]) && (M.group = $);
 	}), r.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (b(e)) return c[t] = m.length, m.push(e), g.push([]), v.push(0), void F.push(!1);
+		if (w(e)) return c[t] = m.length, m.push(e), v.push([]), b.push(0), void y.push(!1);
 		const n = e.group;
 		if (!n) return;
 		const r = c[n.base];
 		if (void 0 === r || r < 0) return;
-		const o = g[r];
+		const o = v[r];
 		let a, l = [];
-		if (n.range) a = re(n, o.slice(0, v[r]).map(q), s);
+		if (n.range) a = re(n, o.slice(0, b[r]).map(g), s);
 		else {
-			const e = Ge(n, f[n.base], o, m[r]);
+			const e = qe(n, f[n.base], o, m[r]);
 			a = e.group, l = e.itemMap;
 		}
 		if (!a) return;
@@ -1281,7 +1281,7 @@ var Y = [
 				...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 ? y(t, i, a) : f[t] = l;
+		}), v.push(a.items), F[i] = a.dateItems ? new Set(a.dateItems) : void 0, b.push(a.items.length), y.push(!1), n.range ? I(t, i, a) : f[t] = l;
 	}), m.forEach((e, t) => {
 		const n = e.group;
 		if (void 0 === n?.parent) return;
@@ -1289,12 +1289,12 @@ var Y = [
 		void 0 !== s && s >= 0 ? e.group = {
 			...n,
 			parent: s
-		} : P(e) ? e.group = o : delete e.group, e.group && !P(e) && (e.group = {
+		} : j(e) ? e.group = o : delete e.group, e.group && !j(e) && (e.group = {
 			...e.group,
 			base: t
 		});
 	});
-	const { cacheId: I, part: x, partFormats: C, fields: E, items: S, records: k, ...M } = e;
+	const { cacheId: x, part: A, partFormats: E, fields: S, items: P, records: k, ...M } = e;
 	return {
 		model: {
 			...M,
@@ -1307,32 +1307,32 @@ var Y = [
 		remap: {
 			fields: c,
 			items: f,
-			newItems: g,
-			usedCounts: v,
-			inItemOrder: F,
-			dateItems: w
+			newItems: v,
+			usedCounts: b,
+			inItemOrder: y,
+			dateItems: F
 		}
 	};
-}, Ge = (e, t, n, s) => {
+}, qe = (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 = [], l = [], d = new Set(e.dateItems), u = e.items.map((e, t) => r.has(t) ? (d.has(t) && l.push(a.length), a.push(e), a.length - 1) : -1), c = o.map((e, t) => e >= 0 ? u[e] : ((s.dates || i(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: f, ...m } = e;
+	const a = [], l = [], i = new Set(e.dateItems), d = e.items.map((e, t) => r.has(t) ? (i.has(t) && l.push(a.length), a.push(e), a.length - 1) : -1), u = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || C(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
-			...m,
+			...f,
 			items: a,
-			discrete: c,
+			discrete: u,
 			...l.length > 0 ? { dateItems: l } : {}
 		},
-		itemMap: u
+		itemMap: d
 	};
-}, qe = (e, t, n = !1, s = !1) => {
+}, Ge = (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 ?? [], l = [], i = [];
 	a.forEach((e) => {
 		if (!o(e.field)) return void l.push(-1);
@@ -1384,7 +1384,7 @@ var Y = [
 		...e,
 		fields: u
 	};
-	Qe(f, "rowFields", c(e.rowFields)), Qe(f, "columnFields", c(e.columnFields)), Qe(f, "dataFields", i.length > 0 ? i : void 0), a.forEach((e, t) => {
+	Ke(f, "rowFields", c(e.rowFields)), Ke(f, "columnFields", c(e.columnFields)), Ke(f, "dataFields", i.length > 0 ? i : void 0), a.forEach((e, t) => {
 		const n = l[t];
 		if (n < 0 || void 0 === e.baseField || "number" != typeof e.baseItem) return;
 		const s = d[e.baseField]?.[e.baseItem];
@@ -1394,12 +1394,12 @@ var Y = [
 		if (!o(e.field)) return [];
 		const t = { field: r(e.field) };
 		if (void 0 !== e.item) {
-			const n = Xe(u[t.field].items ?? [], d[e.field]?.[e.item] ?? -1);
+			const n = Ze(u[t.field].items ?? [], d[e.field]?.[e.item] ?? -1);
 			void 0 !== n && (t.item = n);
 		}
 		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 = {
@@ -1413,15 +1413,15 @@ var Y = [
 		}
 		return [t];
 	});
-	Qe(f, "filters", p.length > 0 ? p : void 0);
-	const h = (e) => Ye(e, r, o, d, l), g = (e.formats ?? []).flatMap((e) => {
+	Ke(f, "filters", p.length > 0 ? p : void 0);
+	const h = (e) => Xe(e, r, o, d, l), g = (e.formats ?? []).flatMap((e) => {
 		const t = h(e.area);
 		return t ? [{
 			...e,
 			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);
@@ -1432,13 +1432,13 @@ var Y = [
 			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;
 }, Je = (e, t, n, s, r = !1, o) => {
 	const a = e.items ?? [], l = [], i = [], d = /* @__PURE__ */ new Set();
 	for (const e of a) {
-		if (!_(e)) {
+		if (!I(e)) {
 			i.push(l.length), l.push(e);
 			continue;
 		}
@@ -1460,7 +1460,7 @@ var Y = [
 		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) => !_(e.item)), o = [...[...s.filter((e) => _(e.item)), ...u.map((e) => ({
+		})), r = s.filter((e) => !I(e.item)), o = [...[...s.filter((e) => I(e.item)), ...u.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
@@ -1481,10 +1481,10 @@ var Y = [
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, s = (e, t) => qe(z(e, n), q(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		const t = "descending" === e.sort.order, s = (e, t) => Ge(b(e, n), g(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) => _(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
+			let r = l.findIndex((n) => I(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]++;
 		}
@@ -1498,14 +1498,14 @@ var Y = [
 		positions: i
 	};
 }, We = (e) => {
-	const t = e.findIndex((e) => !_(e));
+	const t = e.findIndex((e) => !I(e));
 	return t < 0 ? e.length : t;
-}, Xe = (e, t) => {
+}, Ze = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		const s = (t + n) % e.length, r = e[s];
-		if (_(r) && !r.missing) return s;
+		if (I(r) && !r.missing) return s;
 	}
-}, Ye = (e, t, n, s, r) => {
+}, Xe = (e, t, n, s, r) => {
 	const o = { ...e };
 	if (void 0 !== e.field) {
 		if (!n(e.field)) return null;
@@ -1532,7 +1532,7 @@ var Y = [
 		o.references = a;
 	}
 	return o;
-}, Ze = (e, t, n) => {
+}, Ye = (e, t, n) => {
 	const s = e.fields ?? [], r = s[t]?.items ?? [], o = new Array(r.length);
 	n.forEach((e, t) => {
 		o[e] = t;
@@ -1569,7 +1569,7 @@ var Y = [
 		...e,
 		baseItem: o[e.baseItem] ?? e.baseItem
 	} : e));
-	const l = s.map((e, n) => n === t ? o : null), i = (e.dataFields ?? []).map((e, t) => t), d = (e) => Ye(e, (e) => e, () => !0, l, i) ?? e;
+	const l = s.map((e, n) => n === t ? o : null), i = (e.dataFields ?? []).map((e, t) => t), d = (e) => Xe(e, (e) => e, () => !0, l, i) ?? e;
 	return e.formats && (a.formats = e.formats.map((e) => ({
 		...e,
 		area: d(e.area)
@@ -1578,13 +1578,13 @@ var Y = [
 		areas: e.areas.map(d)
 	}))), a;
 }, et = (e, t, n, s) => {
-	const r = (e.fields ?? [])[n]?.items ?? [], o = T(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, d = (e) => void 0 === e.name && i(a, e.item), u = r.map((e, t) => ({
+	const r = (e.fields ?? [])[n]?.items ?? [], o = u(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, i = (e) => void 0 === e.name && C(a, e.item), d = r.map((e, t) => ({
 		item: e,
 		at: t
-	})), c = u.filter((e) => _(e.item));
-	c.sort((e, t) => l ? e.item.item - t.item.item : qe(z(e.item, o), z(t.item, o), d(e.item), d(t.item))), "descending" === s && c.reverse();
+	})), c = d.filter((e) => I(e.item));
+	c.sort((e, t) => l ? e.item.item - t.item.item : Ge(b(e.item, o), b(t.item, o), i(e.item), i(t.item))), "descending" === s && c.reverse();
 	let f = 0;
-	const m = Ze(e, n, u.map((e) => _(e.item) ? c[f++] : e).map((e) => e.at));
+	const m = Ye(e, n, d.map((e) => I(e.item) ? c[f++] : e).map((e) => e.at));
 	return {
 		...m,
 		fields: m.fields.map((e, t) => t === n ? {
@@ -1594,14 +1594,14 @@ var Y = [
 	};
 }, tt = (n, s, r) => {
 	const o = n.fields?.[s]?.items?.[r];
-	if (!o || !_(o)) throw new t(e("error.pivotTable.changePart"));
+	if (!o || !I(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, u = T(s)[r] ?? [], c = (e) => {
-		const t = q(u[e.item]);
-		return null === t ? S : R(t);
+	const l = tt(n, r, o), i = n.fields[r].items, d = u(s)[r] ?? [], c = (e) => {
+		const t = g(d[e.item]);
+		return null === t ? D : U(t);
 	};
-	if (i.some((e, t) => t !== o && _(e) && d(e.name ?? c(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
+	if (i.some((e, t) => t !== o && I(e) && S(e.name ?? c(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
 	const { name: f, ...m } = l, p = a === c(l) ? m : {
 		...l,
 		name: a
@@ -1613,15 +1613,15 @@ var Y = [
 			...e,
 			items: i.map((e, t) => t === o ? p : e)
 		} : e)
-	}, g = n.fields[r].sort;
-	return g && void 0 === g.dataField ? et(h, s, r, g.order) : h;
+	}, w = n.fields[r].sort;
+	return w && void 0 === w.dataField ? et(h, s, r, w.order) : h;
 }, st = (e, t, n, s) => {
 	tt(e, t, n);
 	const r = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
 	r.splice(s, 0, n);
 	const o = e.fields[t].sort;
 	if (!o && r.every((e, t) => e === t)) return e;
-	const a = Ze(e, t, r);
+	const a = Ye(e, t, r);
 	return o ? {
 		...a,
 		fields: a.fields.map((e, n) => {
@@ -1631,11 +1631,11 @@ var Y = [
 		})
 	} : a;
 }, rt = (n, s, r, o) => {
-	const a = R(o), l = n.fields, i = s.fields, u = n.dataFields ?? [], c = T(s), f = (e, t) => {
+	const a = U(o), l = n.fields, i = s.fields, d = n.dataFields ?? [], c = u(s), m = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		const n = q(c[e][t.item]);
-		return null === n ? S : R(n);
-	}, m = (r) => {
+		const n = g(c[e][t.item]);
+		return null === n ? D : U(n);
+	}, p = (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 (j(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
+		if (f(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
 	};
 	switch (r.kind) {
 		case "item": {
 			const { field: e, rank: t } = r;
 			tt(n, e, t);
-			const o = l[e].items.findIndex((n, s) => s !== t && _(n) && d(f(e, n), a));
+			const o = l[e].items.findIndex((n, s) => s !== t && I(n) && S(m(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 p({ field: e }), ((e, t) => ({
 				...n,
 				fields: l.map((n, s) => s === e ? t(n) : n)
 			}))(e, (t) => {
@@ -1668,9 +1668,9 @@ var Y = [
 		}
 		case "dataCaption": {
 			const { data: e } = r;
-			return m({ data: e }), {
+			return p({ data: e }), {
 				...n,
-				dataFields: u.map((t, n) => n === e ? {
+				dataFields: d.map((t, n) => n === e ? {
 					...t,
 					name: a
 				} : t)
@@ -1691,18 +1691,18 @@ var Y = [
 		case "pageItem": {
 			const s = n.pageFields, o = s[r.page];
 			let i;
-			if (!d(a, "(All)") && (i = (l[o.field].items ?? []).findIndex((e) => _(e) && d(f(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
-			const { item: u, ...c } = o, m = void 0 === i ? c : {
+			if (!S(a, "(All)") && (i = (l[o.field].items ?? []).findIndex((e) => I(e) && S(m(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
+			const { item: d, ...u } = o, c = 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 ? c : e)
 			};
 		}
 	}
-}, ot = (e, t, n) => ze({
+}, ot = (e, t, n) => je({
 	cacheId: 0,
 	fields: []
 }, e, t, n).model, at = (e, t) => t.some((t) => e.fields?.[t]?.inline) ? {
@@ -1717,32 +1717,32 @@ var Y = [
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
 ].filter((e) => e >= 0), it = (e, t) => {
-	const n = e.fields[t], s = T(e)[t], r = s.map((e, t) => t);
-	P(n) || r.sort((e, t) => qe(q(s[e]), q(s[t]), i(n, e), i(n, t)));
+	const n = e.fields[t], s = u(e)[t], r = s.map((e, t) => t);
+	j(n) || r.sort((e, t) => Ge(g(s[e]), g(s[t]), C(n, e), C(n, t)));
 	const o = new Set(n.calculatedItems?.map((e) => e.item)), a = new Set(n.unused);
 	return [...r.map((e) => ({
 		item: e,
 		...o.has(e) ? { calculated: !0 } : {},
 		...a.has(e) ? { missing: !0 } : {}
 	})), { type: "default" }];
-}, dt = (s) => {
-	if (!("number" == typeof s ? void 0 !== o(s) : "" !== s && n.isValidFormat(s))) throw new t(e("error.pivotTable.notANumberFormat", { name: String(s) }));
+}, dt = (n) => {
+	if (!("number" == typeof n ? void 0 !== o(n) : "" !== n && s.isValidFormat(n))) throw new t(e("error.pivotTable.notANumberFormat", { name: String(n) }));
 }, ut = (n, s, r, o) => {
-	const a = o?.function ?? ((e, t) => "number" === L(e, t) ? "sum" : "count")(s.fields[r], T(s)[r]), l = w[a];
-	if (!l) throw new t(e("error.pivotTable.notAFunction", { name: a }));
-	let i = o?.name;
-	if (void 0 === i) i = j(n, s, `${l} of ${k(n, s, r)}`);
-	else if (j(n, s, i) !== i) throw new t(e("error.pivotTable.fieldNameExists"));
-	const d = {
-		name: i,
+	const a = o?.function ?? ((e, t) => "number" === _(e, t) ? "sum" : "count")(s.fields[r], u(s)[r]), i = l[a];
+	if (!i) throw new t(e("error.pivotTable.notAFunction", { name: a }));
+	let d = o?.name;
+	if (void 0 === d) d = f(n, s, `${i} of ${M(n, s, r)}`);
+	else if (f(n, s, d) !== d) throw new t(e("error.pivotTable.fieldNameExists"));
+	const c = {
+		name: d,
 		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) => d(e.name, n));
+		const s = r.findIndex((e) => S(e.name, n));
 		if (s < 0) throw new t(e("error.pivotTable.notAField", { name: n }));
 		return s;
 	}, a = /* @__PURE__ */ new Map(), l = (e, t) => {
@@ -1752,18 +1752,18 @@ var Y = [
 		}
 	};
 	l(s?.rows, "row"), l(s?.columns, "column"), l(s?.pages, "page");
-	const i = (e) => [...a].filter(([, t]) => t === e).map(([e]) => e), u = [];
+	const i = (e) => [...a].filter(([, t]) => t === e).map(([e]) => e), d = [];
 	for (const e of s?.values ?? []) {
 		const { field: t, ...s } = "string" == typeof e ? { field: e } : e;
-		u.push(ut({ dataFields: u }, n, o(t), s));
+		d.push(ut({ dataFields: d }, n, o(t), s));
 	}
-	const c = new Set(u.map((e) => e.field)), f = s?.form && "compact" !== s.form ? s.form : void 0, m = r.map((e, t) => {
+	const u = new Set(d.map((e) => e.field)), c = s?.form && "compact" !== s.form ? s.form : void 0, f = r.map((e, t) => {
 		const s = {}, r = a.get(t);
-		return r && (s.axis = r, s.items = it(n, t)), c.has(t) && (s.dataField = !0), f && (s.form = f), e.dates && void 0 !== e.numberFormat && (s.numberFormat = e.numberFormat), s;
-	}), p = i("column");
-	u.length > 1 && p.push(-2);
-	const h = {
-		fields: m,
+		return r && (s.axis = r, s.items = it(n, t)), u.has(t) && (s.dataField = !0), c && (s.form = c), e.dates && void 0 !== e.numberFormat && (s.numberFormat = e.numberFormat), s;
+	}), m = i("column");
+	d.length > 1 && m.push(-2);
+	const p = {
+		fields: f,
 		style: {
 			name: s?.style ?? "PivotStyleLight16",
 			showRowHeaders: !0,
@@ -1772,14 +1772,14 @@ var Y = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, g = i("row");
-	g.length > 0 && (h.rowFields = g), p.length > 0 && (h.columnFields = p);
-	const w = i("page");
-	return w.length > 0 && (h.pageFields = w.map((e) => ({ field: e }))), u.length > 0 && (h.dataFields = u), f && (h.form = f), h;
+	}, 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;
 }, ft = (e, t) => t.map((t) => {
 	const n = t.sort?.scope;
 	if (!n) return t;
-	const s = ((t.axis === C.Axis.Row ? e.columnFields : t.axis === C.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const s = ((t.axis === h.Axis.Row ? e.columnFields : t.axis === h.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 = C.Axis, i = s.fields?.[r], d = n.fields?.[r]?.axis ?? null;
+	const l = h.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 c = o ? N(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 || N(n, o)[f] === r)) return n;
-	c.splice(f, 0, r);
-	const { rowFields: m, columnFields: p, pageFields: h, ...w } = n, v = {}, F = (e) => (e ?? []).filter((e) => e !== r), b = o === l.Row ? c : F(n.rowFields), y = o === l.Column ? c : F(n.columnFields), I = o === l.Page ? c.map((e) => n.pageFields?.find((t) => t.field === e) ?? { field: e }) : (n.pageFields ?? []).filter((e) => e.field !== r);
-	b.length > 0 && (v.rowFields = b), y.length > 0 && (v.columnFields = y), I.length > 0 && (v.pageFields = I);
-	let x = {
-		...w,
-		...v
+	const u = o ? N(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(n, o)[c] === r)) return n;
+	u.splice(c, 0, r);
+	const { rowFields: f, columnFields: m, pageFields: p, ...g } = n, w = {}, v = (e) => (e ?? []).filter((e) => e !== r), F = o === l.Row ? u : v(n.rowFields), b = o === l.Column ? u : v(n.columnFields), y = o === l.Page ? u.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 = g(x, r, () => !0));
-	const A = { ...n.fields?.[r] };
-	o ? A.axis = o : delete A.axis, o && !A.items && i && (A.items = u(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 E = (n.fields ?? []).map((e, t) => t === r ? A : e);
-	if (x = {
-		...x,
-		fields: ft(x, E)
+	o === l.Page && d !== l.Page && (I = q(I, r, () => !0));
+	const x = { ...n.fields?.[r] };
+	o ? x.axis = o : delete x.axis, o && !x.items && i && (x.items = B(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",
@@ -1903,7 +1903,7 @@ var Y = [
 		}];
 	});
 	c.length > 0 && (u.filters = c);
-	const f = (e) => Ye(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
+	const f = (e) => Xe(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
 		const t = f(e.area);
 		return t ? [{
 			...e,
@@ -1955,7 +1955,7 @@ var Y = [
 		l[e] = t;
 	}), It(n, a.map((e) => o[e]), l);
 }, Et = (e, t, n, s) => {
-	const r = I(e, t, n, s);
+	const r = x(e, t, n, s);
 	return (e.dataFields[n].subtotal ?? "sum") === s ? e : bt(e, n, (e) => {
 		const { subtotal: t, ...n } = e, o = {
 			...n,
@@ -1966,23 +1966,23 @@ 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: u, baseField: c, baseItem: f, ...m } = a, p = { ...m };
+	const { showDataAs: d, baseField: u, baseItem: c, ...f } = a, p = { ...f };
 	"normal" !== i && (p.showDataAs = i);
 	let h = a.baseField, g = a.baseItem;
 	if (void 0 !== o?.baseField) {
-		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => d(k(n, s, t), r));
+		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => S(M(n, s, t), r));
 		if (a < 0) throw new t(e("error.pivotTable.notAField", { name: r }));
 		a !== h && (h = a, g = 0);
 	}
 	if (void 0 !== o?.baseItem) {
 		const r = h ?? 0;
-		if (d(o.baseItem, "(previous)")) g = "previous";
-		else if (d(o.baseItem, "(next)")) g = "next";
+		if (S(o.baseItem, "(previous)")) g = "previous";
+		else if (S(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 = G(a, s, r).findIndex((e) => null !== e && d(e, o.baseItem));
+			} : e) }, l = $(a, s, r).findIndex((e) => null !== e && S(e, o.baseItem));
 			if (l < 0) throw new t(e("error.pivotTable.notAnItem", { name: o.baseItem }));
 			g = l;
 		}
@@ -1990,14 +1990,14 @@ var Y = [
 	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 (gt.has(n)) return gt.has(t) ? e : void 0;
-		const s = ((e) => $(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
+		const s = ((e) => m(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));
 }, Pt = (e, t, n) => {
 	dt(n);
-	const s = $(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
-	if ($(r.numberFormat) === s && o && vt(o.area, t) && o.style.numberFormat === s) return e;
+	const s = m(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
+	if (m(r.numberFormat) === s && o && vt(o.area, t) && o.style.numberFormat === s) return e;
 	const a = bt(Ft(e, t), t, (e) => yt(e, "General" === s ? void 0 : n));
 	return {
 		...a,
@@ -2014,7 +2014,7 @@ var Y = [
 	};
 }, kt = (n, s, r) => {
 	if (null === s) return At(n);
-	const o = C.Axis;
+	const o = h.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"));
@@ -2023,18 +2023,18 @@ var Y = [
 	const i = (r ?? l.length + 1) - 1;
 	if (s === a && (void 0 === r || N(n, s)[i] === pt)) return n;
 	l.splice(i, 0, pt);
-	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = N(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;
+	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = N(n, s === o.Row ? o.Column : o.Row).filter((e) => e !== pt), p = { ...f }, g = s === o.Row ? l : m, w = s === o.Column ? l : m;
+	return g.length > 0 && (p.rowFields = [...g]), w.length > 0 && (p.columnFields = [...w]), s === o.Row && (p.valuesOnRows = !0), p;
 }, Mt = (n, s, r) => {
 	if (r === (n.valuesCaption ?? "Values")) return n;
 	const { valuesCaption: o, ...a } = n, l = {
 		...a,
 		valuesCaption: "\0"
 	};
-	if (j(l, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (f(l, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
 	return "Values" === r ? a : {
 		...a,
 		valuesCaption: r
 	};
 };
-export { xt as addPivotDataField, Ne as anchorPivotPeriods, dt as assertNumberFormat, lt as axisFieldsOf, Re as buildPivotView, Oe as evaluatePivotFilters, U 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, Re as buildPivotView, Oe as evaluatePivotFilters, k 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, Le as readPivotSource, je as refreshPivotCache, Qe as remapPivotTable, At as removePivotDataField, nt as renamePivotItem, Mt as renamePivotValues, Ye as reorderPivotItems, Et as setPivotDataFunction, Pt as setPivotDataNumberFormat, St as setPivotDataShowAs, et as sortPivotItemsByLabel, rt as typeOverPivot, at as withListedFields };