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

package/assets/{BJdWgj1hv57eGVl4.js → nnqtgWxMIc_Nc-IP.js}

@@ -1,15 +1,15 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.17
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.18
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-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 = [
+import { p as e, tt as t } from "./CDqOifqA400y7KQY.js";
+import { d as n, en as s, f as r, vt as o } from "./CGGpkGg85FZsnYHc.js";
+import { d as a } from "./r9WSFw3a-_a5hlPm.js";
+import { $a as l, $i as i, A as d, Bi as u, Dn as c, E as f, Er as m, Fn as p, H as h, I as g, Ji as w, Li as v, Na as F, Nr as b, Sa as y, Ta as I, Un as x, Ur as A, Wa as C, Wt as E, Xr as S, Yi as P, _a as k, d as M, di as T, ea as R, f as N, fn as O, gr as $, hi as L, jr as _, n as D, ni as V, nt as U, ot as H, ra as B, ri as j, u as z, xt as G, y as q } from "./DN4zv4AjDxTsLFsA.js";
+import { a as K, i as W, n as J, o as Q, r as X } from "./B2C5njsdPylyQOCM.js";
+var Y = [
 	"Jan",
 	"Feb",
 	"Mar",
@@ -61,15 +61,15 @@ var X = [
 		default: return null;
 	}
 }, te = (e, t) => {
-	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();
+	const n = e.fields ?? [], s = P(e.records, n.length);
+	if (!n.some(B)) 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 (!m(i)) continue;
-		const l = i.group, d = s[l.base] ?? [], u = r[l.base] ?? [], c = new Int32Array(u.length);
+		const l = n[e];
+		if (!B(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 = l.range ? ee(l.range, l.items.length, w(u[e]), t) : l.discrete?.[e] ?? null;
+			const n = i.range ? ee(i.range, i.items.length, T(u[e]), t) : i.discrete?.[e] ?? null;
 			c[e] = n ?? -1;
 		}
 		const f = new Array(o);
@@ -92,17 +92,17 @@ var X = [
 		e < o && (o = e), e > a && (a = e);
 	}
 	if (0 === t.length) return e;
-	const i = { ...s };
-	s.fixedStart || (i.start = o), s.fixedEnd || (i.end = "numbers" !== s.by && Number.isInteger(a) ? a + 1 : a);
-	const { inner: l, endText: d } = ((e, t) => {
-		const { start: n, end: s } = e, o = e.interval ?? 1, a = se(s, t), i = (e, t) => Array.from({ length: e }, (e, n) => t(n));
+	const l = { ...s };
+	s.fixedStart || (l.start = o), s.fixedEnd || (l.end = "numbers" !== s.by && Number.isInteger(a) ? a + 1 : a);
+	const { inner: i, endText: d } = ((e, t) => {
+		const { start: n, end: s } = e, o = e.interval ?? 1, a = se(s, t), l = (e, t) => Array.from({ length: e }, (e, n) => t(n));
 		switch (e.by) {
 			case "numbers": {
 				const e = Math.max(1, Math.ceil(Number(((s - n) / o).toPrecision(12)))), t = Number.isInteger(Number(((s - n) / o).toPrecision(12))), r = Number.isInteger(n) && Number.isInteger(o);
 				return {
-					inner: i(e, (a) => {
-						const i = n + a * o, l = a === e - 1 && t ? s : r ? i + o - 1 : i + o;
-						return `${ne(i)}-${ne(l)}`;
+					inner: l(e, (a) => {
+						const l = n + a * o, i = a === e - 1 && t ? s : r ? l + o - 1 : l + o;
+						return `${ne(l)}-${ne(i)}`;
 					}),
 					endText: ne(t ? s : n + e * o)
 				};
@@ -111,21 +111,21 @@ var X = [
 				if (1 === o) {
 					const e = [];
 					return Z.forEach((t, n) => {
-						for (let s = 1; s <= t; s++) e.push(`${s}-${X[n]}`);
+						for (let s = 1; s <= t; s++) e.push(`${s}-${Y[n]}`);
 					}), {
 						inner: e,
 						endText: a
 					};
 				}
 				return {
-					inner: i(Math.max(1, Math.ceil((s - n) / o)), (e) => {
+					inner: l(Math.max(1, Math.ceil((s - n) / o)), (e) => {
 						const r = n + e * o;
 						return `${se(r, t)} - ${se(Math.min(r + o - 1, s), t)}`;
 					}),
 					endText: a
 				};
 			case "months": return {
-				inner: X.slice(),
+				inner: Y.slice(),
 				endText: a
 			};
 			case "quarters": return {
@@ -140,26 +140,26 @@ var X = [
 			case "years": {
 				const e = r(n, t)?.year ?? 0;
 				return {
-					inner: i((r(s, t)?.year ?? e) - e + 1, (t) => String(e + t)),
+					inner: l((r(s, t)?.year ?? e) - e + 1, (t) => String(e + t)),
 					endText: a
 				};
 			}
 			case "hours": return {
-				inner: i(24, (e) => `${e % 12 == 0 ? 12 : e % 12} ${e < 12 ? "AM" : "PM"}`),
+				inner: l(24, (e) => `${e % 12 == 0 ? 12 : e % 12} ${e < 12 ? "AM" : "PM"}`),
 				endText: a
 			};
 			default: return {
-				inner: i(60, (e) => `:${String(e).padStart(2, "0")}`),
+				inner: l(60, (e) => `:${String(e).padStart(2, "0")}`),
 				endText: a
 			};
 		}
-	})(i, n), u = "numbers" === i.by ? ne(i.start) : se(i.start, n);
+	})(l, n), u = "numbers" === l.by ? ne(l.start) : se(l.start, n);
 	return {
 		...e,
-		range: i,
+		range: l,
 		items: [
 			`<${u}`,
-			...l,
+			...i,
 			`>${d}`
 		]
 	};
@@ -191,60 +191,60 @@ var X = [
 			n += t, s += t.length;
 			continue;
 		}
-		const a = "'" === o, i = a ? null : /^[\p{L}_][\p{L}\p{N}_.]*/u.exec(e.slice(s))?.[0];
-		if (!a && !i) {
+		const a = "'" === o, l = a ? null : /^[\p{L}_][\p{L}\p{N}_.]*/u.exec(e.slice(s))?.[0];
+		if (!a && !l) {
 			n += o, s++;
 			continue;
 		}
-		const l = a ? r() : i;
-		if (a || (s += l.length), "(" !== e[s]) {
+		const i = a ? r() : l;
+		if (a || (s += i.length), "(" !== e[s]) {
 			if ("[" === e[s]) {
 				s++;
 				let o = "";
 				for ("'" === e[s] && (o = r()); s < e.length && "]" !== e[s];) o += e[s++];
 				s++;
-				const a = t(l, o);
+				const a = t(i, o);
 				if (null === a) return null;
 				n += a;
 				continue;
 			}
-			n += t(l, null) ?? (a ? `'${l.replace(/'/g, "''")}'` : l);
-		} else n += l;
+			n += t(i, null) ?? (a ? `'${i.replace(/'/g, "''")}'` : i);
+		} else n += i;
 	}
 	return n;
 }, ae = (e) => {
 	let t = "";
 	for (let n = e + 1; n > 0; n = Math.floor((n - 1) / 26)) t = String.fromCharCode(65 + (n - 1) % 26) + t;
 	return `${t}1`;
-}, ie = (e, t) => ({
+}, le = (e, t) => ({
 	rowStart: 0,
 	colStart: e,
 	rowEnd: t - 1,
 	colEnd: e
-}), le = (e, t) => {
+}), ie = (e, t) => {
 	const n = [];
 	for (let s = 0; s < t; s++) n.push([s, [[0, e.map((e) => e[s] ?? null)]]]);
 	return n;
 }, de = (e, t) => {
-	const n = t.fields ?? [], s = [], r = [], o = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), i = (e, t) => {
+	const n = t.fields ?? [], s = [], r = [], o = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), l = (e, t) => {
 		if (o.has(e)) return !0;
 		if (t.includes(e)) return !1;
-		const l = [];
+		const i = [];
 		oe(n[e].formula, (e) => {
 			const t = n.findIndex((t) => h(t.name, e));
-			return t >= 0 && l.push(t), t >= 0 ? "" : null;
+			return t >= 0 && i.push(t), t >= 0 ? "" : null;
 		});
-		for (const r of l) if (B(n[r])) {
-			if (!i(r, [...t, e])) return !1;
+		for (const r of i) if (L(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({
 			field: e,
 			expression: ""
 		}), !0;
-	}, l = [];
-	for (const [t, s] of (e.dataFields ?? []).entries()) if (B(n[s.field])) {
-		if (!i(s.field, [])) return null;
-		l.push({
+	}, i = [];
+	for (const [t, s] of (e.dataFields ?? []).entries()) if (L(n[s.field])) {
+		if (!l(s.field, [])) return null;
+		i.push({
 			data: t,
 			formula: o.get(s.field)
 		});
@@ -252,7 +252,7 @@ var X = [
 	const d = (e, t) => {
 		if (null !== t) return 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;
+		return r >= 0 ? ae(L(n[a = r]) ? s.length + o.get(a) : s.indexOf(a)) : null;
 		var a;
 	};
 	for (const e of r) {
@@ -263,7 +263,7 @@ var X = [
 	return {
 		operands: s,
 		formulas: r,
-		measures: l
+		measures: i
 	};
 }, ue = /* @__PURE__ */ new Set([
 	"sum",
@@ -343,30 +343,30 @@ var X = [
 	percent: 13,
 	percentDiff: 14
 }, Ie = (e, t, n, s) => {
-	const r = c.peek(), o = e.fields, a = t.fields;
+	const r = U.peek(), o = e.fields, a = t.fields;
 	if (!r || !o || !a || o.length !== a.length) return null;
-	if (q(e)) return {
+	if (k(e)) return {
 		cells: [],
-		...V,
+		...O,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: j(e),
+		header: i(e),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
 		...s?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	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 u = de(e, t);
-	if (!u || u.measures.length > 0 && !l?.fieldValues) return null;
+	const l = b(e, a), d = l ? s?.filters : null;
+	if (l && !d) return null;
+	const u = o.some((e) => e.items?.some((e) => e.calculated));
+	if (u && !d?.calculatedRecords) return null;
+	const c = de(e, t);
+	if (!c || c.measures.length > 0 && !d?.fieldValues) return null;
 	if ((e.dataFields ?? []).some((e) => void 0 === ye[e.showDataAs ?? "normal"] || void 0 === pe[e.subtotal ?? "sum"])) return null;
-	const f = xe(e, t, n, l?.calculatedRecords, u.operands);
+	const f = xe(e, t, n, d?.calculatedRecords, c.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 { items: m, records: p, values: h, n: w } = f, v = (e) => !!e && (!e.noRecords || B(e)), F = e.form ?? "compact", y = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === ce) {
@@ -378,40 +378,40 @@ var X = [
 			}
 			const e = o[n], s = e?.subtotals;
 			if (!e || !v(a[n])) return null;
-			if (d && s && s.some((e) => "default" !== e)) return null;
+			if (u && s && s.some((e) => "default" !== e)) return null;
 			t.push({
 				field: n,
 				form: e.form ?? "compact"
 			});
 		}
 		return t;
-	}, 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);
+	}, I = y(e.rowFields), x = y(e.columnFields), A = e.pageFields ?? [];
+	if (!I || !x || A.some((e) => !v(a[e.field]))) return null;
+	const C = g(e, s?.slicerFields);
+	return C.pageFields?.some((e) => !v(a[e.field])) ? null : Te(e, t, m, I, x, Se(r, C, m, p, h, I, x, w, d?.keep, d?.records, c.operands.length, d?.fieldValues, !0), n, !0 === s?.roles, "columns" === s?.cellOrder);
 }, xe = (e, t, n, s, r = []) => {
-	const o = t.fields?.length ?? 0, a = G(t);
+	const o = t.fields?.length ?? 0, a = N(t);
 	if (!t.records) return null;
-	const i = te(t, n.isDate1904());
-	if (!i) return null;
-	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] = w(o[r[e]]);
-		for (let e = 0; e < f; e++) l[c + e] = n?.[e] ?? null;
-		return l;
-	}, v = [...(e.dataFields ?? []).map((e, t) => g(e.field, s?.values[t])), ...r.map((e) => g(e))];
+	const l = te(t, n.isDate1904());
+	if (!l) return null;
+	const i = !0 === t.fields?.some(B), d = i ? P(t.items, o) : a, u = i ? P(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] = T(o[r[e]]);
+		for (let e = 0; e < f; e++) i[c + e] = n?.[e] ?? null;
+		return i;
+	}, h = [...(e.dataFields ?? []).map((e, t) => p(e.field, s?.values[t])), ...r.map((e) => p(e))];
 	return {
 		items: a,
-		records: s ? i.map((e, t) => e.concat(s.ids[t] ?? [])) : i,
-		values: v,
-		n: h
+		records: s ? l.map((e, t) => e.concat(s.ids[t] ?? [])) : l,
+		values: h,
+		n: m
 	};
-}, Ae = async (e, t, n, s, r, o, a, i, l) => {
-	const d = c.peek(), u = e.dataFields?.[r];
+}, Ae = async (e, t, n, s, r, o, a, l, i) => {
+	const d = U.peek(), u = e.dataFields?.[r];
 	if (!d || !e.fields || !u || void 0 === pe[u.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) => {
+	const c = [e.rowFields, e.columnFields].map((e) => (e ?? []).filter((e) => e !== ce)), f = c.findIndex((e) => e.includes(s)), m = c[f];
+	if (!m) return null;
+	const p = m.slice(0, m.indexOf(s)), h = e.fields.map((e) => {
 		const { blankRowAfter: t, showItemsWithNoData: n, sort: s, ...r } = e;
 		return {
 			...r,
@@ -421,46 +421,46 @@ var X = [
 				return n;
 			})
 		};
-	}), { columnGrandTotals: w, ...v } = e, { showDataAs: F, ...b } = u, y = {
-		...v,
-		fields: g,
-		rowFields: [...h, s],
+	}), { columnGrandTotals: g, ...w } = e, { showDataAs: v, ...F } = u, b = {
+		...w,
+		fields: h,
+		rowFields: [...p, s],
 		columnFields: [],
-		dataFields: [b],
+		dataFields: [F],
 		rowGrandTotals: !1
-	}, I = i ? {
-		...i,
-		values: [i.values[r] ?? []]
-	} : i, x = de(y, t);
-	if (!x || x.measures.length > 0 && !l) 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) => ({
+	}, y = l ? {
+		...l,
+		values: [l.values[r] ?? []]
+	} : l, I = de(b, t);
+	if (!I || I.measures.length > 0 && !i) return null;
+	const x = xe(b, t, n, y, I.operands);
+	if (!x) return null;
+	const { items: A, records: C, values: E, n: S } = x, P = b.rowFields.map((e) => ({
 		field: e,
 		form: "compact"
 	}));
-	let M;
+	let k;
 	if (a) {
-		const e = 0 === m ? 1 : 2;
-		M = new Uint8Array(P);
-		for (let t = 0; t < P; t++) {
+		const e = 0 === f ? 1 : 2;
+		k = new Uint8Array(S);
+		for (let t = 0; t < S; t++) {
 			const n = a[t];
-			M[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
+			k[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
 		}
 	}
-	const T = x.measures.length > 0 ? await Ee(d, x, y, C, E, S, k, [], P, o, M, 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(",");
+	const M = I.measures.length > 0 ? await Ee(d, I, b, A, C, E, P, [], S, o, k, i) : void 0, T = Se(d, b, A, C, E, P, [], S, o, k, I.operands.length, M), R = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), O = T.columns.length;
+	return T.rows.forEach((e, t) => {
+		if (0 !== e.kind || e.path.length !== p.length + 1) return;
+		const n = p.map((t, n) => R(t, e.path[n])).join(",");
 		let r = N.get(n);
 		r || N.set(n, r = {
 			ids: [],
 			totals: []
-		}), r.ids.push(R(s, e.path[h.length])), r.totals.push(O.values[t * L]);
+		}), r.ids.push(R(s, e.path[p.length])), r.totals.push(T.values[t * O]);
 	}), {
-		outer: h,
+		outer: p,
 		groups: N,
-		records: E
+		records: C
 	};
 }, Ce = (e, t, n) => {
 	const s = new Uint32Array(t).fill(fe), r = new Uint8Array(t), o = e.items;
@@ -473,8 +473,8 @@ var X = [
 		ranks: s,
 		flags: r
 	};
-}, Ee = async (e, t, n, s, r, o, i, l, d, u, c, f) => {
-	const { request: m, errors: p } = Pe(e, n, s, r, o, i, l, d, u, c, t.operands.length);
+}, Ee = async (e, t, n, s, r, o, l, i, d, u, c, f) => {
+	const { request: m, errors: p } = Pe(e, n, s, r, o, l, i, d, u, c, t.operands.length);
 	let h = 0;
 	const g = [];
 	try {
@@ -485,7 +485,7 @@ var X = [
 			t.operands.forEach((t, n) => {
 				const o = s.values(r + n);
 				try {
-					const t = K(e.wasm_memory().buffer, o, p), n = new Array(h);
+					const t = W(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 {
@@ -504,32 +504,32 @@ var X = [
 			for (let s = 0; s < n; s++) t[s] = e[s] ?? 0;
 			return t[n] = 0, t;
 		}), a = await s.evaluateBatch({
-			values: le(o, r),
+			values: ie(o, r),
 			formulas: e.formulas.map(({ expression: e }, n) => ({
 				expression: e,
-				coords: ie(t.length + n, r)
+				coords: le(t.length + n, r)
 			}))
-		}), i = /* @__PURE__ */ new Map();
+		}), l = /* @__PURE__ */ new Map();
 		for (const { data: t, formula: n } of e.measures) {
 			const e = new Array(r);
 			for (let t = 0; t < r; t++) e[t] = a[n].getValueAt(t, 0) ?? 0;
-			i.set(t, e);
+			l.set(t, e);
 		}
-		return i;
+		return l;
 	})(t, g, h, f);
-}, Se = (e, t, n, s, r, o, i, l, d, u, c = 0, f, m = !1) => {
-	const { request: p, errors: h } = Pe(e, t, n, s, r, o, i, l, d, u, c, f, m), g = h.codeOf(a.BuiltIn.NA), w = h.codeOf(a.BuiltIn.Null), v = p.lay_out(0, g, w);
+}, Se = (e, t, n, s, r, o, l, i, d, u, c = 0, f, m = !1) => {
+	const { request: p, errors: h } = Pe(e, t, n, s, r, o, l, i, d, u, c, f, m), g = h.codeOf(a.BuiltIn.NA), w = h.codeOf(a.BuiltIn.Null), v = p.lay_out(0, g, w);
 	try {
 		const n = ke(v.row_lines(), v.row_stride()), s = ke(v.column_lines(), v.column_stride()), r = v.states(), a = v.values();
 		try {
-			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;
+			const i = W(e.wasm_memory().buffer, a, h), d = new Array(r.length);
+			for (let e = 0; e < r.length; e++) d[e] = 0 === r[e] ? i(e) : null;
 			return {
 				rows: n,
 				columns: s,
 				states: r,
 				values: d,
-				functions: m ? Fe(t, [...o, ...i]) : []
+				functions: m ? Fe(t, [...o, ...l]) : []
 			};
 		} finally {
 			a.free();
@@ -537,14 +537,14 @@ var X = [
 	} finally {
 		v.free(), p.free();
 	}
-}, Pe = (e, t, n, s, r, o, a, i, l, d, u = 0, c, f = !1) => {
-	const m = t.fields, p = new e.LayoutRequest(i), h = f ? Fe(t, [...o, ...a]) : [], g = [], w = (e, s) => {
+}, Pe = (e, t, n, s, r, o, a, l, i, d, u = 0, c, f = !1) => {
+	const m = t.fields, p = new e.LayoutRequest(l), h = f ? Fe(t, [...o, ...a]) : [], g = [], w = (e, s) => {
 		for (const { field: r, form: o } of s) {
 			if (r === ce) {
 				p.add_values_slot(e, "tabular" === o);
 				continue;
 			}
-			const a = m[r], i = a.subtotals, l = (!i || i.includes("default") ? 1 : 0) | (!1 !== a.subtotalsOnTop ? 2 : 0) | (a.blankRowAfter ? 4 : 0) | (a.showItemsWithNoData ? 8 : 0) | ("tabular" === o ? 16 : 0), d = p.add_field(e, n[r].length, l), u = a.sort;
+			const a = m[r], l = a.subtotals, i = (!l || l.includes("default") ? 1 : 0) | (!1 !== a.subtotalsOnTop ? 2 : 0) | (a.blankRowAfter ? 4 : 0) | (a.showItemsWithNoData ? 8 : 0) | ("tabular" === o ? 16 : 0), d = p.add_field(e, n[r].length, i), u = a.sort;
 			void 0 !== u?.dataField && p.set_field_sort(e, d, u.dataField, "descending" === u.order, new Uint32Array((u.scope?.items ?? []).map((e) => e.item)));
 			const c = f ? ve(a) : [];
 			if (c.length > 0) {
@@ -569,8 +569,8 @@ var X = [
 		if (!n) return;
 		let s = 2, r = o.findIndex((t) => t.field === e.baseField);
 		r >= 0 ? s = 0 : (r = a.findIndex((t) => t.field === e.baseField), r >= 0 && (s = 1));
-		const i = "previous" === e.baseItem ? 4294967294 : "next" === e.baseItem ? 4294967295 : e.baseItem ?? 0;
-		p.set_show_as(t, n, s, Math.max(r, 0), i);
+		const l = "previous" === e.baseItem ? 4294967294 : "next" === e.baseItem ? 4294967295 : e.baseItem ?? 0;
+		p.set_show_as(t, n, s, Math.max(r, 0), l);
 	});
 	for (let e = 0; e < u; e++) p.add_measure(b.length + e, pe.sum);
 	u > 0 && p.set_operand_measures(u);
@@ -582,17 +582,17 @@ var X = [
 	}));
 	p.set_grand(!1 !== t.rowGrandTotals, !1 !== t.columnGrandTotals);
 	const I = d ? p.record_keep() : null, x = e.wasm_memory().buffer;
-	d && null !== I && new Uint8Array(x, I, i).set(d.subarray(0, i));
+	d && null !== I && new Uint8Array(x, I, l).set(d.subarray(0, l));
 	for (const { axis: e, slot: t, field: r } of g) {
 		const o = n[r].length;
-		new Uint32Array(x, p.field_ids(e, t), i).set(s[r].slice(0, i));
-		const { ranks: a, flags: d } = Ce(m[r], o, l?.get(r));
+		new Uint32Array(x, p.field_ids(e, t), l).set(s[r].slice(0, l));
+		const { ranks: a, flags: d } = Ce(m[r], o, i?.get(r));
 		new Uint32Array(x, p.field_ranks(e, t), o).set(a), new Uint8Array(x, p.field_flags(e, t), o).set(d);
 	}
 	for (const { page: e, index: t } of v) {
 		const r = n[e.field].length;
-		new Uint32Array(x, p.page_ids(t), i).set(s[e.field].slice(0, i));
-		const { ranks: o, flags: a } = Ce(m[e.field], r), d = new Uint8Array(x, p.page_keep(t), r), u = void 0 !== e.item ? m[e.field].items?.[e.item]?.item : void 0, c = e.slicer ? l?.get(e.field) : void 0;
+		new Uint32Array(x, p.page_ids(t), l).set(s[e.field].slice(0, l));
+		const { ranks: o, flags: a } = Ce(m[e.field], r), d = new Uint8Array(x, p.page_keep(t), r), u = void 0 !== e.item ? m[e.field].items?.[e.item]?.item : void 0, c = e.slicer ? i?.get(e.field) : void 0;
 		for (let t = 0; t < r; t++) {
 			const n = void 0 !== u ? t === u : !(o[t] === fe && m[e.field].items || 1 & a[t]);
 			d[t] = !n || c && 0 === c[t] ? 0 : 1;
@@ -601,14 +601,14 @@ var X = [
 	const A = new J();
 	F.forEach((e, t) => {
 		const n = {
-			doubles: new Float64Array(x, e, i),
-			ints: new Int32Array(x, e, 2 * i),
-			types: new Uint8Array(x, e + 8 * i, i)
+			doubles: new Float64Array(x, e, l),
+			ints: new Int32Array(x, e, 2 * l),
+			types: new Uint8Array(x, e + 8 * l, l)
 		}, s = {
 			ok: !0,
 			numeric: !0
 		}, o = r[t];
-		for (let e = 0; e < i; e++) Y(n, e, o[e], A, s);
+		for (let e = 0; e < l; e++) X(n, e, o[e], A, s);
 	});
 	for (const { column: e, ptr: t } of y) {
 		const n = e.length, s = {
@@ -619,7 +619,7 @@ var X = [
 			ok: !0,
 			numeric: !0
 		};
-		for (let t = 0; t < n; t++) Y(s, t, e[t], A, r);
+		for (let t = 0; t < n; t++) X(s, t, e[t], A, r);
 	}
 	return {
 		request: p,
@@ -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, 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) => {
+}, Te = (e, t, n, r, o, l, d, u, c) => {
+	const f = e.fields, p = t.fields, h = e.dataFields ?? [], g = (t) => t === ce ? e.valuesCaption ?? "Values" : f[t].name ?? p[t].name, v = (e, t) => {
 		if (e === ce) return h[t]?.name ?? "";
-		const s = m[e].items?.[t];
+		const s = f[e].items?.[t];
 		if (void 0 !== s?.name) return s.name;
-		const r = w(n[e][s?.item ?? t]);
-		return null === r ? v : r;
-	}, y = (e, t) => {
-		const n = b(e, t);
+		const r = T(n[e][s?.item ?? t]);
+		return null === r ? S : r;
+	}, F = (e, t) => {
+		const n = v(e, t);
 		if ("number" == typeof 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);
+			const r = f[e].items?.[t]?.item ?? t, o = void 0 === (f[e].numberFormat ?? p[e].numberFormat) && A(p[e], r);
+			return s(d, o ? j(C(p[e], r), d) : ((e) => j(f[e].numberFormat ?? p[e].numberFormat, d))(e), n);
 		}
 		return a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
-	}, x = (e) => {
-		if (void 0 !== e.item) return b(e.field, e.item);
-		const t = m[e.field].items ?? [];
+	}, b = (e) => {
+		if (void 0 !== e.item) return v(e.field, e.item);
+		const t = f[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		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 ? {
+		const n = t.flatMap((e, t) => m(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, E = (e, t) => e === ce ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, M = (e) => e === ce ? null : {
+	}, P = (e) => e === ce ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, T = (e, t) => 2 === e.kind && t === A ? { kind: "grandTotal" } : null, O = 0 === r.length && 0 === o.length && 0 === h.length, R = O ? {
+	}, k = (e, t) => 2 === e.kind && t === I ? { kind: "grandTotal" } : null, M = 0 === r.length && 0 === o.length && 0 === h.length, R = M ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : j(e), N = O ? [] : Me(i.rows, i.functions), L = O ? [] : Me(i.columns, i.functions), $ = f({
+	} : i(e), N = M ? [] : Me(l.rows, l.functions), O = M ? [] : Me(l.columns, l.functions), $ = y({
 		...e,
 		header: R,
 		rowLines: N,
-		columnLines: L
-	}), D = i.columns.length, V = (e) => "row" === e ? r : o, U = (t) => {
+		columnLines: O
+	}), L = l.columns.length, _ = (e) => "row" === e ? r : o, V = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [F(n), {
+				return [g(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
 			}
 			case "pageItem": {
 				const n = e.pageFields[t.page];
-				return [x(n), {
+				return [b(n), {
 					kind: "pageItem",
 					page: t.page
 				}];
@@ -711,30 +711,30 @@ 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 = V(t.axis)[t.level].field;
-				return [F(e), M(e)];
+				const e = _(t.axis)[t.level].field;
+				return [g(e), P(e)];
 			}
 			case "label": {
-				const e = V(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [b(e, n), P(e, n)];
+				const e = _(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [v(e, n), E(e, n)];
 			}
 			case "total": {
-				const e = ("row" === t.axis ? i.rows : i.columns)[t.line.index], n = ((e, t) => {
+				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 ? h[t.data]?.name ?? "" : "";
-					if (2 === t.kind) return n ? `Total ${s}` : A;
-					const r = t.path.length - 1, o = e[r].field, a = y(o, t.path[r]);
+					if (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 (null !== t.function) {
-						const e = we[i.functions[t.function]];
-						return (n || t.across) && null !== t.data ? `${a} ${e} of ${F(h[t.data].field)}` : `${a} ${e}`;
+						const e = we[l.functions[t.function]];
+						return (n || t.across) && null !== t.data ? `${a} ${e} of ${g(h[t.data].field)}` : `${a} ${e}`;
 					}
-					return m[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
-				})(V(t.axis), e);
-				return [n, T(e, n)];
+					return f[o]?.subtotalCaption ?? (n ? `${a} ${s}` : `${a} Total`);
+				})(_(t.axis), e);
+				return [n, k(e, n)];
 			}
 			case "value": {
-				const n = t.row.index * D + t.column.index, s = i.states[n];
+				const n = t.row.index * L + t.column.index, s = l.states[n];
 				let r = null;
-				return 0 === s ? (r = i.values[n], e.showError && a.isError(r) && (r = e.errorCaption ?? "")) : 1 === s && (r = !1 === e.showEmpty ? 0 : ((e) => {
+				return 0 === s ? (r = l.values[n], e.showError && a.isError(r) && (r = e.errorCaption ?? "")) : 1 === s && (r = !1 === e.showEmpty ? 0 : ((e) => {
 					if (void 0 === e) return null;
 					const t = e.trim();
 					if (!/^[+-]?\d*(?:\.\d*)?$/.test(t)) return e;
@@ -743,25 +743,25 @@ var X = [
 				})(e.emptyCaption)), [r, null];
 			}
 		}
-	}, 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);
+	}, U = new w.Builder(), H = $.top, B = $.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), G = (e, t) => {
+		const n = z($, e, t);
 		if (!n) return;
-		const [s, r] = U(n);
+		const [s, r] = V(n);
 		((e, t, n) => {
-			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));
+			x && n && x.set(e + "," + t, n);
+		})(e - H, t, r), null !== s && (c ? U.pushAt(t, e - H, s) : U.pushAt(e - H, t, s));
 	};
 	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);
+		const e = Math.max(B, $.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < $.rows.length; e++) t < (e < H ? B : $.columns.length) && G(e, t);
 	} else for (let e = 0; e < $.rows.length; e++) {
-		const t = e < B ? z : $.columns.length;
+		const t = e < H ? B : $.columns.length;
 		for (let n = 0; n < t; n++) G(e, n);
 	}
-	if (O) {
-		const t = E(e);
+	if (M) {
+		const t = D(e);
 		return {
-			cells: H.build()?.tuples ?? [],
+			cells: U.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
@@ -771,7 +771,7 @@ var X = [
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...S ? { roles: S } : {}
+			...x ? { roles: x } : {}
 		};
 	}
 	const q = (e, t) => {
@@ -779,171 +779,171 @@ var X = [
 		return e.forEach((e, s) => {
 			e.field !== ce && n.push(s < t.path.length ? t.path[s] : -1);
 		}), n;
-	}, 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) || (q(r, t), i.columns.forEach((s, r) => {
-			const o = i.states[n * D + r];
+	}, W = (e, t) => K(e.data ?? t.data ?? 0, [...q(r, e), ...q(o, t)]), [J] = l.rows, [Q] = l.columns, X = J && Q && 3 !== J.kind && 3 !== Q.kind ? W(J, Q) : null, Y = [], Z = (e) => 1 === e.kind && null !== e.function;
+	l.rows.forEach((t, n) => {
+		3 === t.kind || Z(t) || (q(r, t), l.columns.forEach((s, r) => {
+			const o = l.states[n * L + r];
 			if (3 === s.kind || Z(s) || 0 !== o && 1 !== o) return;
-			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]);
+			let i = 0 === o ? l.values[n * L + r] : 0;
+			e.showError && a.isError(i) && (i = e.errorCaption || 0), Y.push([W(t, s), i]);
 		}));
 	});
-	const ee = E(e);
+	const ee = D(e);
 	return {
-		cells: H.build()?.tuples ?? [],
-		rows: $.rows.length - B,
+		cells: U.build()?.tuples ?? [],
+		rows: $.rows.length - H,
 		columns: $.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
 		header: R,
 		rowLines: N,
-		columnLines: L,
-		viewValues: X,
-		firstKey: Y,
-		...S ? { roles: S } : {}
+		columnLines: O,
+		viewValues: Y,
+		firstKey: X,
+		...x ? { roles: x } : {}
 	};
-}, Oe = (e, t, n, r, o = !1, i, d) => {
-	const u = Ie(e, t, r, {
-		filters: i,
-		slicerFields: d
+}, Re = (e, t, n, r, o = !1, l, i) => {
+	const d = Ie(e, t, r, {
+		filters: l,
+		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: 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;
+	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 p = {
+		rowStart: f - u,
+		colStart: m,
+		rowEnd: f + d.rows - 1,
+		colEnd: m + Math.max(d.columns, c) - 1
+	}, h = e.fields, g = t.fields, w = N(t), v = (e, t) => {
+		const n = h[e], o = n.numberFormat ?? g[e].numberFormat, l = j(o, r), i = B(g[e]), d = w[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 = T(d[t.item]), u = A(g[e], t.item), c = null === n ? "(blank)" : "number" == typeof n ? s(r, u ? (f = t.item, void 0 === o ? j(C(g[e], f), r) : l) : l, n) : a.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+			var f;
+			const m = i && u ? c : n;
 			return void 0 !== t.name ? {
-				value: p,
-				text: f,
+				value: m,
+				text: c,
 				name: t.name
 			} : {
-				value: p,
-				text: f
+				value: m,
+				text: c
 			};
-		}), h = {
-			name: n.name ?? b[e].name,
-			items: p
+		}), m = {
+			name: n.name ?? g[e].name,
+			items: f
 		};
 		if (t) {
 			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			h.page = void 0 !== e ? f.findIndex((t) => t.item === e) : -1;
+			m.page = void 0 !== e ? c.findIndex((t) => t.item === e) : -1;
 		}
-		return h;
-	}, A = (e) => (e ?? []).filter((e) => -2 !== e);
+		return m;
+	}, F = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
-			range: v,
+			range: p,
 			dataFields: (e.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: b[e.field].name
+				sourceName: g[e.field].name
 			})),
 			fields: [
-				...A(e.rowFields).map((e) => x(e)),
-				...A(e.columnFields).map((e) => x(e)),
-				...(e.pageFields ?? []).map((e) => x(e.field, e))
+				...F(e.rowFields).map((e) => v(e)),
+				...F(e.columnFields).map((e) => v(e)),
+				...(e.pageFields ?? []).map((e) => v(e.field, e))
 			],
-			values: u.viewValues,
+			values: d.viewValues,
 			block: {
 				anchor: {
-					row: p,
-					column: h
+					row: f,
+					column: m
 				},
 				...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
 		}
 	};
-}, 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];
+}, Ne = async (e, t, n, r) => {
+	const o = /* @__PURE__ */ new Map(), l = (e.filters ?? []).filter((t) => V(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) => L(t.fields?.[e.field]));
+	if (0 === l.length && !i && !d) return { keep: o };
+	const u = N(t);
+	for (const s of l.filter(V)) {
+		const a = s.field, l = u[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);
+		const i = R(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] : T(l[e]);
+		const c = await $e(s.condition, d, n, r), f = o.get(a);
 		if (f) for (let e = 0; e < c.length; e++) f[e] &= c[e];
 		else o.set(a, c);
 	}
-	const 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({
+	const c = i && r ? await (async (e, t, n, r, o) => {
+		const l = t.fields ?? [], i = e.fields ?? [], d = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), u = e.dataFields ?? [];
+		if (1 !== d.length || u.some((e) => L(l[e.field]) || !ue.has(e.subtotal ?? "sum"))) return null;
+		const c = d[0], f = l[c].calculatedItems, m = te(t, n.isDate1904());
+		if (!m) return null;
+		const p = N(t), g = N({
 			...t,
-			fields: i.map(({ group: e, ...t }) => t)
-		}), 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);
+			fields: l.map(({ group: e, ...t }) => t)
+		}), w = (e.rowFields ?? []).filter((e) => e >= 0), v = (e.columnFields ?? []).filter((e) => e >= 0), F = w.includes(c) ? w : v.includes(c) ? v : null;
+		if (!F) return null;
+		const b = F.slice(0, F.indexOf(c)), y = [...F.slice(F.indexOf(c) + 1), ...F === w ? v : w], I = [...b, ...y], x = t.recordCount ?? 0, C = (e, t) => {
+			const n = i[e]?.items, s = n?.find((e) => e.item === t && void 0 === e.type);
 			return !(n && (!s || s.hidden) || o?.get(e) && 0 === o.get(e)[t]);
-		}, k = (e, t) => {
-			const n = d[e.field]?.items;
+		}, E = (e, t) => {
+			const n = i[e.field]?.items;
 			if (void 0 !== e.item) return n?.[e.item]?.item === t;
 			const s = n?.find((e) => e.item === t && void 0 === e.type);
 			return !n || !!s && !s.hidden;
-		}, M = e.pageFields ?? [], T = 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) => {
+		}, P = e.pageFields ?? [], k = j(l[c].numberFormat ?? 14, n), M = (e) => p[c].findIndex((t, r) => {
+			const o = T(t);
+			return "number" == typeof o && (l[c].dates || A(l[c], r)) ? h(s(n, k, o), e) : h(null === o ? S : G(o), e);
+		}), R = /* @__PURE__ */ new Map(), O = new Map(f.map((e) => [e.item, e.formula])), $ = (e) => {
 			let t = R.get(e);
 			return void 0 === t && R.set(e, t = R.size), t;
 		};
-		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), "");
+		for (const e of f) if (null === oe(e.formula, (e, t) => {
+			if (null === t || !h(l[c].name, e)) return null;
+			const n = M(t);
+			return n < 0 ? null : (O.has(n) || $(n), "");
 		})) return null;
-		const $ = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), D = c.map((e) => ({
-			column: p[e.field],
-			values: F[e.field],
+		const _ = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), V = u.map((e) => ({
+			column: m[e.field],
+			values: g[e.field],
 			fold: e.subtotal ?? "sum"
-		})), V = R.size;
-		for (let e = 0; e < S; e++) {
-			if (!M.every((t) => k(t, p[t.field][e]))) continue;
-			if (!E.every((t) => P(t, p[t][e]))) continue;
+		})), U = R.size;
+		for (let e = 0; e < x; e++) {
+			if (!P.every((t) => E(t, m[t.field][e]))) continue;
+			if (!I.every((t) => C(t, m[t][e]))) continue;
 			let t = "";
-			for (const n of A) t += p[n][e] + ",";
-			_.has(t) || _.set(t, e);
-			const n = R.get(p[f][e]);
+			for (const n of b) t += m[n][e] + ",";
+			D.has(t) || D.set(t, e);
+			const n = R.get(m[c][e]);
 			if (void 0 === n) continue;
 			let s = t;
-			for (const t of C) s += p[t][e] + ",";
-			let r = $.get(s);
+			for (const t of y) s += m[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))
-			}, $.set(s, r));
-			const { sums: o, errors: i } = r;
-			D.forEach(({ column: t, values: s, fold: r }, l) => {
-				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);
+				sums: u.map(() => new Array(U).fill(0)),
+				errors: u.map(() => new Array(U).fill(void 0))
+			}, _.set(s, r));
+			const { sums: o, errors: l } = r;
+			V.forEach(({ column: t, values: s, fold: r }, i) => {
+				const d = T(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 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);
+		const H = y.map((e) => {
+			const t = i[e]?.items;
+			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && C(e, t.item) ? [t.item] : []) : p[e].map((e, t) => t);
 		});
-		if (U.reduce((e, t) => e * t.length, _.size) > 5e5) return null;
-		const z = [];
-		for (const [e, t] of _) {
+		if (H.reduce((e, t) => e * t.length, D.size) > 5e5) return null;
+		const B = [];
+		for (const [e, t] of D) {
 			const n = (e, s, r) => {
-				if (e !== U.length) for (const t of U[e]) n(e + 1, [...s, t], r + t + ",");
-				else z.push({
+				if (e !== H.length) for (const t of H[e]) n(e + 1, [...s, t], r + t + ",");
+				else B.push({
 					exemplar: t,
 					path: s,
 					key: r
@@ -951,103 +951,103 @@ var X = [
 			};
 			n(0, [], e);
 		}
-		const j = z.length;
-		if (0 === j) return {
+		const z = B.length;
+		if (0 === z) return {
 			count: 0,
-			ids: i.map(() => []),
-			values: c.map(() => [])
+			ids: l.map(() => []),
+			values: u.map(() => [])
 		};
-		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);
+		const q = u.length * U, K = (e, t) => e * U + t, W = (e, t) => q + e * f.length + t, J = [];
+		for (let e = 0; e < u.length; e++) for (let t = 0; t < U; t++) J.push(B.map(({ key: n }) => {
+			const s = _.get(n);
 			return s ? s.errors[e][t] ?? s.sums[e][t] : 0;
 		}));
-		const W = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < m.length; t++) {
-			const n = oe(m[t].formula, (t, n) => {
+		const Q = [];
+		for (let e = 0; e < u.length; e++) for (let t = 0; t < f.length; t++) {
+			const n = oe(f[t].formula, (t, n) => {
 				if (null === n) return null;
-				const s = O(n), r = m.findIndex((e) => e.item === s);
-				return ae(r >= 0 ? K(e, r) : Q(e, R.get(s)));
+				const s = M(n), r = f.findIndex((e) => e.item === s);
+				return ae(r >= 0 ? W(e, r) : K(e, R.get(s)));
 			});
 			if (null === n) return null;
-			W.push({
+			Q.push({
 				expression: n,
-				coords: ie(K(e, t), j)
+				coords: le(W(e, t), z)
 			});
 		}
-		const Y = await r.evaluateBatch({
-			values: le(J, j),
-			formulas: W
-		}), X = i.map(() => []), Z = c.map(() => []), ee = (e, t, n, s) => {
-			p.forEach((n, s) => {
-				const r = C.indexOf(s);
-				X[s].push(s === f ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
+		const X = await r.evaluateBatch({
+			values: ie(J, z),
+			formulas: Q
+		}), Y = l.map(() => []), Z = u.map(() => []), ee = (e, t, n, s) => {
+			m.forEach((n, s) => {
+				const r = y.indexOf(s);
+				Y[s].push(s === c ? t : r >= 0 ? e.path[r] : n[e.exemplar] ?? 0);
 			}), Z.forEach((e, t) => {
 				e.push(t === n ? s : null);
 			});
 		};
-		return z.forEach((e, t) => {
-			m.forEach(({ item: n }, s) => {
-				c.forEach((r, o) => {
-					const a = Y[o * m.length + s].getValueAt(t, 0) ?? 0;
+		return B.forEach((e, t) => {
+			f.forEach(({ item: n }, s) => {
+				u.forEach((r, o) => {
+					const a = X[o * f.length + s].getValueAt(t, 0) ?? 0;
 					if ("sum" !== (r.subtotal ?? "sum") && "number" == typeof a) for (let t = 0; t < Math.round(a); t++) ee(e, n, o, 1);
 					else ee(e, n, o, a);
 				});
 			});
 		}), {
-			count: X[0]?.length ?? 0,
-			ids: X,
+			count: Y[0]?.length ?? 0,
+			ids: Y,
 			values: Z
 		};
-	})(e, t, n, r, o) : void 0, g = d.filter((e) => !R(e)).map((e, t) => ({
+	})(e, t, n, r, o) : void 0, f = l.filter((e) => !V(e)).map((e, t) => ({
 		filter: e,
 		index: t
-	})).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);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), m = (t.recordCount ?? 0) + (c?.count ?? 0);
+	let p;
+	const g = e.rowFields ?? [];
+	for (const { filter: s } of f) {
+		const a = await Ae(e, t, n, s.field, s.dataField, o, p, c, r);
 		if (!a) continue;
-		const i = /* @__PURE__ */ new Set();
+		const l = /* @__PURE__ */ new Set();
 		for (const [e, t] of a.groups) {
-			const o = await Le(s.condition, t.totals, n, r);
+			const o = await $e(s.condition, t.totals, n, r);
 			t.ids.forEach((t, n) => {
-				o[n] || i.add(`${e}|${t}`);
+				o[n] || l.add(`${e}|${t}`);
 			});
 		}
-		if (0 === i.size) 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;
+		if (0 === l.size) continue;
+		p ??= new Uint8Array(m).fill(3);
+		const i = a.outer.map((e) => a.records[e]), d = a.records[s.field], u = g.includes(s.field) ? 1 : 2;
+		for (let e = 0; e < m; e++) {
+			if (!(p[e] & u)) continue;
 			let t = "";
-			for (let n = 0; n < l.length; n++) t += (n > 0 ? "," : "") + l[n][e];
-			i.has(`${t}|${d[e]}`) && (b[e] &= ~u);
+			for (let n = 0; n < i.length; n++) t += (n > 0 ? "," : "") + i[n][e];
+			l.has(`${t}|${d[e]}`) && (p[e] &= ~u);
 		}
 	}
-	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);
+	const w = d && r ? await (async (e, t, n, s, r, o, a) => {
+		const l = U.peek(), i = de(e, t);
+		if (!l || !i) return null;
+		const d = xe(e, t, n, a, i.operands);
 		if (!d) return null;
 		const u = (t) => (t ?? []).map((t) => ({
 			field: t,
 			form: t === ce ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
-		return Ee(i, l, e, d.items, d.records, d.values, u(e.rowFields), u(e.columnFields), d.n, r, o, s);
-	})(e, t, n, r, o, b, 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, n, r, o, p, c) : void 0;
 	return {
 		keep: o,
-		...b ? { records: b } : {},
-		...p ? { calculatedRecords: p } : {},
-		...x ? { fieldValues: x } : {}
+		...p ? { records: p } : {},
+		...c ? { calculatedRecords: c } : {},
+		...w ? { fieldValues: w } : {}
 	};
-}, Ne = (e, t) => {
+}, Oe = (e, t) => {
 	const n = e.filters;
 	if (!n) return e;
 	let s = !1;
 	const r = n.map((e) => {
-		const n = e.condition && F(e.condition, t);
+		const n = e.condition && _(e.condition, t);
 		return n === e.condition ? e : (s = !0, {
 			...e,
 			condition: n
@@ -1057,13 +1057,13 @@ var X = [
 		...e,
 		filters: r
 	} : e;
-}, Le = async (e, t, n, s) => {
+}, $e = async (e, t, n, s) => {
 	const r = t.length, o = new Uint8Array(r);
 	if (0 === r) return o;
-	const a = new x();
+	const a = new f();
 	for (let e = 0; e < r; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
-	let i = !1;
-	return await T({
+	let l = !1;
+	return await M({
 		conditions: [e],
 		runtime: n,
 		calculation: s ?? null,
@@ -1075,30 +1075,30 @@ var X = [
 			colEnd: 0
 		},
 		onTrue: (e) => {
-			i = !0, o[e.rowIndex] = 1;
+			l = !0, o[e.rowIndex] = 1;
 		},
 		onFalse: () => {
-			i = !0;
+			l = !0;
 		},
 		onBlank: (e) => {
-			i = !0;
+			l = !0;
 			for (let n = 0; n < r; n++) null === t[n] && e(n, 0) && (o[n] = 1);
 		}
-	}), i || o.fill(1), o;
-}, $e = (e, t, n, r, o) => {
-	const i = e.fields?.[r], 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);
+	}), l || o.fill(1), o;
+}, Le = (e, t, n, 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 = j(d, o), c = (e) => void 0 === d ? j(C(t.fields?.[r], e), o) : u, f = new Array(n.length);
 	for (let e = 0; e < n.length; e++) {
-		const i = d.get(e);
-		if (void 0 !== i) {
-			m[e] = i;
+		const l = i.get(e);
+		if (void 0 !== l) {
+			f[e] = l;
 			continue;
 		}
-		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);
+		const d = T(n[e]);
+		null === d ? f[e] = S : "number" == typeof d ? f[e] = s(o, A(t.fields?.[r], e) ? c(e) : u, d) : "boolean" == typeof d ? f[e] = d ? "TRUE" : "FALSE" : a.isError(d) ? f[e] = d.getLabel() : f[e] = String(d);
 	}
-	return m;
+	return f;
 }, _e = (e) => {
 	const t = e.getCoords(), n = t.colEnd - t.colStart + 1, s = t.rowEnd - t.rowStart, r = e.getWorksheet(), o = r.getRange({
 		rowStart: t.rowStart,
@@ -1107,8 +1107,8 @@ var X = [
 		colEnd: t.colEnd
 	}).getValues()[0] ?? [], a = [];
 	for (let e = 0; e < n; e++) {
-		const n = o[e] ?? null, i = new W(), l = new Uint32Array(s);
-		let d, u, c = !1, f = i.values;
+		const n = o[e] ?? null, l = new Q(), i = new Uint32Array(s);
+		let d, u, c = !1, f = l.values;
 		if (s > 0) {
 			const n = r.getRange({
 				rowStart: t.rowStart + 1,
@@ -1116,13 +1116,13 @@ var X = [
 				colStart: t.colStart + e,
 				colEnd: t.colStart + e
 			});
-			i.fill(n.getValuesRange(), l), d = Ve(n, s);
-			const o = Ue(n, t.rowStart + 1, l, i.values);
+			l.fill(n.getValuesRange(), i), d = Ve(n, s);
+			const o = Ue(n, t.rowStart + 1, i, l.values);
 			c = o.dates, u = o.dateIds, f = o.values;
 		}
 		a.push({
 			header: De(n),
-			ids: l,
+			ids: i,
 			values: f,
 			numberFormat: d,
 			dates: c,
@@ -1155,17 +1155,17 @@ var X = [
 		dates: o,
 		values: s
 	};
-	const i = s.slice(), l = /* @__PURE__ */ new Map();
+	const l = s.slice(), i = /* @__PURE__ */ new Map();
 	for (let e = 0; e < n.length; e++) {
 		const t = n[e];
 		if ("number" != typeof s[t] || !He(r, e)) continue;
-		let o = l.get(t);
-		void 0 === o && (o = i.length, i.push(s[t]), l.set(t, o)), n[e] = o;
+		let o = i.get(t);
+		void 0 === o && (o = l.length, l.push(s[t]), i.set(t, o)), n[e] = o;
 	}
 	return {
 		dates: !1,
-		dateIds: new Set(l.values()),
-		values: i
+		dateIds: new Set(i.values()),
+		values: l
 	};
 }, He = (e, t) => {
 	let n = 0, s = e.length - 1;
@@ -1184,8 +1184,8 @@ var X = [
 } : a.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : 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) => {
+} : e, je = (e, t) => (t && "number" == typeof e ? "date:" : "") + v(T(e)), ze = (e, t, n, s = !1) => {
+	const r = e.fields ?? [], o = P(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;
@@ -1193,13 +1193,13 @@ var X = [
 			for (let e = 2; t.has(r.toLocaleLowerCase()); e++) r = `${s}${e}`;
 			return t.add(r.toLocaleLowerCase()), r;
 		});
-	})(t.columns.map((e) => e.header)), l = /* @__PURE__ */ new Map();
+	})(t.columns.map((e) => e.header)), i = /* @__PURE__ */ new Map();
 	r.forEach((e, t) => {
 		const n = e.name.toLocaleLowerCase();
-		e.noRecords || l.has(n) || l.set(n, t);
+		e.noRecords || i.has(n) || i.set(n, t);
 	});
-	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 d = t.recordCount, u = r.map(() => -1), c = r.map((e, t) => o[t].map(() => -1)), f = [], m = [], p = [], h = [], g = [], w = [], v = [], F = (e, t, n) => {
+		h[t] = n.items, w[t] = n.items.length, v[t] = !0, c[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
@@ -1207,80 +1207,80 @@ var X = [
 		})(r[e].group.items, n.items);
 	};
 	t.columns.forEach((e, t) => {
-		const n = l.get(i[t].toLocaleLowerCase());
-		void 0 !== n && (l.delete(i[t].toLocaleLowerCase()), u[n] = t);
-		const p = new Int32Array(e.values.length).fill(-1), A = [], C = [], E = new Array(d);
+		const n = i.get(l[t].toLocaleLowerCase());
+		void 0 !== n && (i.delete(l[t].toLocaleLowerCase()), u[n] = t);
+		const b = new Int32Array(e.values.length).fill(-1), y = [], I = [], x = new Array(d);
 		for (let t = 0; t < d; t++) {
 			const n = e.ids[t];
-			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;
+			let s = b[n];
+			s < 0 && (s = b[n] = y.length, y.push(Be(e.values[n])), I.push(e.dates || !!e.dateIds?.has(n))), x[t] = 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 C = (e) => void 0 !== n && (!!r[n].dates || A(r[n], e)), E = y.length, S = void 0 !== n ? !0 === r[n].inline : y.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), P = [];
+		if (void 0 !== n && S) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < P; t++) e.set(ze(A[t], C[t]), t);
+			for (let t = 0; t < E; t++) e.set(je(y[t], I[t]), t);
 			o[n].forEach((t, s) => {
-				c[n][s] = e.get(ze(t, S(s))) ?? -1;
+				c[n][s] = e.get(je(t, C(s))) ?? -1;
 			});
 		} else if (void 0 !== n) {
 			const e = /* @__PURE__ */ new Map();
-			for (let t = 0; t < P; t++) e.set(ze(A[t], C[t]), t);
+			for (let t = 0; t < E; t++) e.set(je(y[t], I[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, S(r));
-				let i = e.get(o);
-				void 0 !== i || a || S(r) || (i = A.length, A.push(s), C.push(S(r)), M.push(i), e.set(o, i)), c[n][r] = i ?? -1;
+				const o = je(s, C(r));
+				let l = e.get(o);
+				void 0 !== l || a || C(r) || (l = y.length, y.push(s), I.push(C(r)), P.push(l), e.set(o, l)), c[n][r] = l ?? -1;
 			});
 		}
-		const T = { name: i[t] };
-		k && (T.inline = !0), void 0 !== e.numberFormat && (T.numberFormat = e.numberFormat);
-		const O = [];
+		const k = { name: l[t] };
+		S && (k.inline = !0), void 0 !== e.numberFormat && (k.numberFormat = e.numberFormat);
+		const M = [];
 		let R = !1;
-		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);
+		y.forEach((e, t) => {
+			"number" == typeof e && (I[t] ? M.push(t) : R = !0);
+		}), M.length > 0 && !R ? k.dates = !0 : M.length > 0 && (k.dateItems = M), g[t] = k.dateItems ? new Set(k.dateItems) : void 0, P.length > 0 && (k.unused = P);
 		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, {
+		N && (k.rest = N);
+		const O = void 0 !== n ? r[n].calculatedItems : void 0;
+		O?.length && (k.calculatedItems = O.map(({ item: e, formula: t }) => {
+			const s = y.length;
+			return y.push(o[n][e]), c[n][e] = s, {
 				item: s,
 				formula: t
 			};
-		})), f.push(T), h.push([t, [[0, A]]]), g.push([t, [[0, E]]]), v.push(A), b.push(P), y.push(!1);
+		})), f.push(k), m.push([t, [[0, y]]]), p.push([t, [[0, x]]]), h.push(y), w.push(E), v.push(!1);
 		const $ = void 0 !== n ? r[n].group : void 0;
 		if ($?.range && $.base === n) {
-			const e = re($, A.slice(0, P).map(w), s);
-			e ? (T.group = {
+			const e = re($, y.slice(0, E).map(T), s);
+			e ? (k.group = {
 				...e,
 				base: t
-			}, x(n, t, e)) : c[n] = o[n].map(() => -1);
-		} else $ && !m(r[n]) && (T.group = $);
+			}, F(n, t, e)) : c[n] = o[n].map(() => -1);
+		} else $ && !B(r[n]) && (k.group = $);
 	}), r.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (B(e)) return u[t] = f.length, f.push(e), v.push([]), b.push(0), void y.push(!1);
+		if (L(e)) return u[t] = f.length, f.push(e), h.push([]), w.push(0), void v.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(w), s);
+		const o = h[r];
+		let a, l = [];
+		if (n.range) a = re(n, o.slice(0, w[r]).map(T), s);
 		else {
-			const e = je(n, c[n.base], o, f[r]);
-			a = e.group, i = e.itemMap;
+			const e = Ge(n, c[n.base], o, f[r]);
+			a = e.group, l = e.itemMap;
 		}
 		if (!a) return;
-		const l = f.length;
-		u[t] = l, f.push({
+		const i = f.length;
+		u[t] = i, 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 ? x(t, l, a) : c[t] = i;
+		}), h.push(a.items), g[i] = a.dateItems ? new Set(a.dateItems) : void 0, w.push(a.items.length), v.push(!1), n.range ? F(t, i, a) : c[t] = l;
 	}), f.forEach((e, t) => {
 		const n = e.group;
 		if (void 0 === n?.parent) return;
@@ -1288,59 +1288,59 @@ var X = [
 		void 0 !== s && s >= 0 ? e.group = {
 			...n,
 			parent: s
-		} : m(e) ? e.group = o : delete e.group, e.group && !m(e) && (e.group = {
+		} : B(e) ? e.group = o : delete e.group, e.group && !B(e) && (e.group = {
 			...e.group,
 			base: t
 		});
 	});
-	const { cacheId: A, part: C, partFormats: E, fields: S, items: P, records: k, ...M } = e;
+	const { cacheId: b, part: y, partFormats: I, fields: x, items: C, records: E, ...S } = e;
 	return {
 		model: {
-			...M,
+			...S,
 			source: n ?? e.source,
 			fields: f,
-			items: h,
-			records: g,
+			items: m,
+			records: p,
 			recordCount: d
 		},
 		remap: {
 			fields: u,
 			items: c,
-			newItems: v,
-			usedCounts: b,
-			inItemOrder: y,
-			dateItems: F
+			newItems: h,
+			usedCounts: w,
+			inItemOrder: v,
+			dateItems: g
 		}
 	};
-}, je = (e, t, n, s) => {
+}, Ge = (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 || I(s, t)) && i.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
+	const a = [], l = [], i = new Set(e.dateItems), d = e.items.map((e, t) => r.has(t) ? (i.has(t) && l.push(a.length), a.push(e), a.length - 1) : -1), u = o.map((e, t) => e >= 0 ? d[e] : ((s.dates || A(s, t)) && l.push(a.length), a.push(n[t]), a.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
 			...f,
 			items: a,
 			discrete: u,
-			...i.length > 0 ? { dateItems: i } : {}
+			...l.length > 0 ? { dateItems: l } : {}
 		},
 		itemMap: d
 	};
 }, 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;
-}, 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 = [];
+}, Ke = (e, t) => {
+	const n = e.fields ?? [], s = t.newItems.length, r = (e) => e < 0 ? e : t.fields[e] ?? -1, o = (e) => e < 0 || r(e) >= 0, a = e.dataFields ?? [], l = [], i = [];
 	a.forEach((e) => {
-		if (!o(e.field)) return void i.push(-1);
-		i.push(l.length);
+		if (!o(e.field)) return void l.push(-1);
+		l.push(i.length);
 		const t = {
 			...e,
 			field: r(e.field)
 		};
-		void 0 !== e.baseField && (o(e.baseField) ? t.baseField = r(e.baseField) : delete t.baseField), l.push(t);
+		void 0 !== e.baseField && (o(e.baseField) ? t.baseField = r(e.baseField) : delete t.baseField), i.push(t);
 	});
 	const d = n.map(() => null), u = [];
 	for (let e = 0; e < s; e++) u.push({});
@@ -1349,7 +1349,7 @@ var X = [
 		if (s < 0) return;
 		const o = { ...e };
 		if (void 0 !== e.sort?.dataField) {
-			const t = i[e.sort.dataField];
+			const t = l[e.sort.dataField];
 			o.sort = t >= 0 ? {
 				...e.sort,
 				dataField: t
@@ -1378,27 +1378,27 @@ var X = [
 	const c = (e) => {
 		if (!e) return;
 		let t = e.filter(o).map(r);
-		return l.length < 2 && (t = t.filter((e) => -2 !== e)), t.length > 0 ? t : void 0;
+		return i.length < 2 && (t = t.filter((e) => -2 !== e)), t.length > 0 ? t : void 0;
 	}, f = {
 		...e,
 		fields: u
 	};
-	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];
+	We(f, "rowFields", c(e.rowFields)), We(f, "columnFields", c(e.columnFields)), We(f, "dataFields", i.length > 0 ? i : void 0), a.forEach((e, t) => {
+		const n = l[t];
 		if (n < 0 || void 0 === e.baseField || "number" != typeof e.baseItem) return;
 		const s = d[e.baseField]?.[e.baseItem];
-		void 0 !== s && s >= 0 && (l[n].baseItem = s);
+		void 0 !== s && s >= 0 && (i[n].baseItem = s);
 	});
 	const m = (e.pageFields ?? []).flatMap((e) => {
 		if (!o(e.field)) return [];
 		const t = { field: r(e.field) };
 		if (void 0 !== e.item) {
-			const n = Ye(u[t.field].items ?? [], d[e.field]?.[e.item] ?? -1);
+			const n = Xe(u[t.field].items ?? [], d[e.field]?.[e.item] ?? -1);
 			void 0 !== n && (t.item = n);
 		}
 		return [t];
 	});
-	Ke(f, "pageFields", m.length > 0 ? m : void 0);
+	We(f, "pageFields", m.length > 0 ? m : void 0);
 	const p = (e.filters ?? []).flatMap((e) => {
 		if (!o(e.field)) return [];
 		const t = {
@@ -1406,21 +1406,21 @@ var X = [
 			field: r(e.field)
 		};
 		if (void 0 !== e.dataField) {
-			const n = i[e.dataField];
+			const n = l[e.dataField];
 			if (void 0 === n || n < 0) return [];
 			t.dataField = n;
 		}
 		return [t];
 	});
-	Ke(f, "filters", p.length > 0 ? p : void 0);
-	const h = (e) => Xe(e, r, o, d, i), g = (e.formats ?? []).flatMap((e) => {
+	We(f, "filters", p.length > 0 ? p : void 0);
+	const h = (e) => Ye(e, r, o, d, l), g = (e.formats ?? []).flatMap((e) => {
 		const t = h(e.area);
 		return t ? [{
 			...e,
 			area: t
 		}] : [];
 	});
-	Ke(f, "formats", g.length > 0 ? g : void 0);
+	We(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,19 +1431,19 @@ var X = [
 			areas: t
 		}] : [];
 	});
-	return Ke(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
-}, Ke = (e, t, n) => {
+	return We(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
+}, We = (e, t, n) => {
 	void 0 === n ? delete e[t] : e[t] = n;
 }, Je = (e, t, n, s, r = !1, o) => {
-	const a = e.items ?? [], i = [], l = [], d = /* @__PURE__ */ new Set();
+	const a = e.items ?? [], l = [], i = [], d = /* @__PURE__ */ new Set();
 	for (const e of a) {
-		if (!k(e)) {
-			l.push(i.length), i.push(e);
+		if (!m(e)) {
+			i.push(l.length), l.push(e);
 			continue;
 		}
 		const n = t[e.item] ?? -1;
 		if (n < 0) {
-			l.push(-1);
+			i.push(-1);
 			continue;
 		}
 		d.add(n);
@@ -1451,15 +1451,15 @@ var X = [
 			...e,
 			item: n
 		};
-		n >= s && !e.calculated ? r.missing = !0 : delete r.missing, l.push(i.length), i.push(r);
+		n >= s && !e.calculated ? r.missing = !0 : delete r.missing, i.push(l.length), l.push(r);
 	}
 	const u = [];
 	for (let e = 0; e < n.length; e++) d.has(e) || u.push(e);
 	if (r) {
-		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && a.some((e) => e.hidden), s = i.map((e, t) => ({
+		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && a.some((e) => e.hidden), s = l.map((e, t) => ({
 			item: e,
 			at: t
-		})), r = s.filter((e) => !k(e.item)), o = [...[...s.filter((e) => k(e.item)), ...u.map((e) => ({
+		})), r = s.filter((e) => !m(e.item)), o = [...[...s.filter((e) => m(e.item)), ...u.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
@@ -1468,43 +1468,43 @@ var X = [
 		}))].sort((e, n) => t ? n.item.item - e.item.item : e.item.item - n.item.item), ...r], d = new Map(o.map((e, t) => [e.at, t]));
 		return {
 			items: o.map((e) => e.item),
-			positions: l.map((e) => e < 0 ? e : d.get(e) ?? -1)
+			positions: i.map((e) => e < 0 ? e : d.get(e) ?? -1)
 		};
 	}
 	if (0 === u.length) return {
-		items: i,
-		positions: l
+		items: l,
+		positions: i
 	};
-	const c = !e.includeNewItemsInFilter && a.some((e) => e.hidden), f = (e) => c ? {
+	const f = !e.includeNewItemsInFilter && a.some((e) => e.hidden), p = (e) => f ? {
 		item: e,
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, s = (e, t) => qe(N(e, n), w(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		const t = "descending" === e.sort.order, s = (e, t) => qe(c(e, n), T(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) => 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]++;
+			const n = p(e);
+			let r = l.findIndex((n) => m(n) && (t ? s(n, e) < 0 : s(n, e) > 0));
+			r < 0 && (r = Qe(l)), l.splice(r, 0, n);
+			for (let e = 0; e < i.length; e++) i[e] >= r && i[e]++;
 		}
 	} else {
-		const e = We(i);
-		i.splice(e, 0, ...u.map(f));
-		for (let t = 0; t < l.length; t++) l[t] >= e && (l[t] += u.length);
+		const e = Qe(l);
+		l.splice(e, 0, ...u.map(p));
+		for (let t = 0; t < i.length; t++) i[t] >= e && (i[t] += u.length);
 	}
 	return {
-		items: i,
-		positions: l
+		items: l,
+		positions: i
 	};
-}, We = (e) => {
-	const t = e.findIndex((e) => !k(e));
+}, Qe = (e) => {
+	const t = e.findIndex((e) => !m(e));
 	return t < 0 ? e.length : t;
-}, Ye = (e, t) => {
+}, Xe = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		const s = (t + n) % e.length, r = e[s];
-		if (k(r) && !r.missing) return s;
+		if (m(r) && !r.missing) return s;
 	}
-}, Xe = (e, t, n, s, r) => {
+}, Ye = (e, t, n, s, r) => {
 	const o = { ...e };
 	if (void 0 !== e.field) {
 		if (!n(e.field)) return null;
@@ -1545,7 +1545,7 @@ var X = [
 			};
 			const a = e.sort?.scope;
 			if (!a?.items.some((e) => e.field === t)) return e;
-			const i = a.items.map((e) => e.field === t ? {
+			const l = a.items.map((e) => e.field === t ? {
 				...e,
 				item: o[e.item] ?? e.item
 			} : e);
@@ -1555,7 +1555,7 @@ var X = [
 					...e.sort,
 					scope: {
 						...a,
-						items: i
+						items: l
 					}
 				}
 			};
@@ -1568,7 +1568,7 @@ var X = [
 		...e,
 		baseItem: o[e.baseItem] ?? e.baseItem
 	} : e));
-	const i = s.map((e, n) => n === t ? o : null), l = (e.dataFields ?? []).map((e, t) => t), d = (e) => Xe(e, (e) => e, () => !0, i, l) ?? e;
+	const l = s.map((e, n) => n === t ? o : null), i = (e.dataFields ?? []).map((e, t) => t), d = (e) => Ye(e, (e) => e, () => !0, l, i) ?? e;
 	return e.formats && (a.formats = e.formats.map((e) => ({
 		...e,
 		area: d(e.area)
@@ -1577,43 +1577,43 @@ var X = [
 		areas: e.areas.map(d)
 	}))), a;
 }, et = (e, t, n, s) => {
-	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) => ({
+	const r = (e.fields ?? [])[n]?.items ?? [], o = N(t)[n] ?? [], a = t.fields?.[n], l = void 0 !== a?.group?.range, i = (e) => void 0 === e.name && A(a, e.item), d = r.map((e, t) => ({
 		item: e,
 		at: t
-	})), 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) => k(e.item) ? u[c++] : e).map((e) => e.at));
+	})), u = d.filter((e) => m(e.item));
+	u.sort((e, t) => l ? e.item.item - t.item.item : qe(c(e.item, o), c(t.item, o), i(e.item), i(t.item))), "descending" === s && u.reverse();
+	let f = 0;
+	const p = Ze(e, n, d.map((e) => m(e.item) ? u[f++] : e).map((e) => e.at));
 	return {
-		...f,
-		fields: f.fields.map((e, t) => t === n ? {
+		...p,
+		fields: p.fields.map((e, t) => t === n ? {
 			...e,
 			sort: { order: s }
 		} : e)
 	};
 }, tt = (n, s, r) => {
 	const o = n.fields?.[s]?.items?.[r];
-	if (!o || !k(o)) throw new t(e("error.pivotTable.changePart"));
+	if (!o || !m(o)) throw new t(e("error.pivotTable.changePart"));
 	return o;
 }, nt = (n, s, r, o, a) => {
-	const i = tt(n, r, o), l = n.fields[r].items, d = G(s)[r] ?? [], u = (e) => {
-		const t = w(d[e.item]);
-		return null === t ? v : H(t);
+	const l = tt(n, r, o), i = n.fields[r].items, d = N(s)[r] ?? [], u = (e) => {
+		const t = T(d[e.item]);
+		return null === t ? S : G(t);
 	};
-	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,
+	if (i.some((e, t) => t !== o && m(e) && h(e.name ?? u(e), a))) throw new t(e("error.pivotTable.itemNameExists", { name: a }));
+	const { name: c, ...f } = l, p = a === u(l) ? f : {
+		...l,
 		name: a
 	};
-	if (m.name === i.name) return n;
-	const p = {
+	if (p.name === l.name) return n;
+	const g = {
 		...n,
 		fields: n.fields.map((e, t) => t === r ? {
 			...e,
-			items: l.map((e, t) => t === o ? m : e)
+			items: i.map((e, t) => t === o ? p : e)
 		} : e)
-	}, g = n.fields[r].sort;
-	return g && void 0 === g.dataField ? et(p, s, r, g.order) : p;
+	}, w = n.fields[r].sort;
+	return w && void 0 === w.dataField ? et(g, s, r, w.order) : g;
 }, st = (e, t, n, s) => {
 	tt(e, t, n);
 	const r = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
@@ -1630,36 +1630,36 @@ var X = [
 		})
 	} : a;
 }, rt = (n, s, r, o) => {
-	const a = H(o), i = n.fields, l = s.fields, u = n.dataFields ?? [], c = G(s), f = (e, t) => {
+	const a = G(o), l = n.fields, i = s.fields, d = n.dataFields ?? [], u = N(s), c = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		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 n = T(u[e][t.item]);
+		return null === n ? S : G(n);
+	}, f = (r) => {
+		if (void 0 !== r.field && a === (l[r.field].name ?? i[r.field].name)) return;
 		const o = void 0 === r.field ? n : {
 			...n,
-			fields: i.map((e, t) => t === r.field ? {
+			fields: l.map((e, t) => t === r.field ? {
 				...e,
 				name: "\0"
 			} : e)
 		};
-		if (d(o, s, a, r.data) !== a) throw new t(e("error.pivotTable.fieldNameExists"));
+		if (H(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 && k(n) && h(f(e, n), a));
+			const o = l[e].items.findIndex((n, s) => s !== t && m(n) && h(c(e, n), a));
 			return o >= 0 ? st(n, e, o, t) : nt(n, s, e, t, a);
 		}
 		case "fieldCaption": {
 			const { field: e } = r;
-			return m({ field: e }), ((e, t) => ({
+			return f({ field: e }), ((e, t) => ({
 				...n,
-				fields: i.map((n, s) => s === e ? t(n) : n)
+				fields: l.map((n, s) => s === e ? t(n) : n)
 			}))(e, (t) => {
 				const { name: n, ...s } = t;
-				return a === l[e].name ? s : {
+				return a === i[e].name ? s : {
 					...t,
 					name: a
 				};
@@ -1667,9 +1667,9 @@ var X = [
 		}
 		case "dataCaption": {
 			const { data: e } = r;
-			return m({ data: e }), {
+			return f({ data: e }), {
 				...n,
-				dataFields: u.map((t, n) => n === e ? {
+				dataFields: d.map((t, n) => n === e ? {
 					...t,
 					name: a
 				} : t)
@@ -1689,19 +1689,19 @@ var X = [
 		};
 		case "pageItem": {
 			const s = n.pageFields, o = s[r.page];
-			let l;
-			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 : {
+			let i;
+			if (!h(a, "(All)") && (i = (l[o.field].items ?? []).findIndex((e) => m(e) && h(c(o.field, e), a)), i < 0)) throw new t(e("error.pivotTable.notAnItem", { name: a }));
+			const { item: d, ...u } = o, f = void 0 === i ? u : {
 				...o,
-				item: l
+				item: i
 			};
 			return {
 				...n,
-				pageFields: s.map((e, t) => t === r.page ? c : e)
+				pageFields: s.map((e, t) => t === r.page ? f : e)
 			};
 		}
 	}
-}, ot = (e, t, n) => Ge({
+}, ot = (e, t, n) => ze({
 	cacheId: 0,
 	fields: []
 }, e, t, n).model, at = (e, t) => t.some((t) => e.fields?.[t]?.inline) ? {
@@ -1711,13 +1711,13 @@ var X = [
 		const { inline: s, ...r } = e;
 		return r;
 	})
-} : e, it = (e) => [
+} : e, lt = (e) => [
 	...e.rowFields ?? [],
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
-].filter((e) => e >= 0), lt = (e, t) => {
-	const n = e.fields[t], s = 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)));
+].filter((e) => e >= 0), it = (e, t) => {
+	const n = e.fields[t], s = N(e)[t], r = s.map((e, t) => t);
+	B(n) || r.sort((e, t) => qe(T(s[e]), T(s[t]), A(n, e), A(n, t)));
 	const o = new Set(n.calculatedItems?.map((e) => e.item)), a = new Set(n.unused);
 	return [...r.map((e) => ({
 		item: e,
@@ -1727,13 +1727,13 @@ 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" === O(e, t) ? "sum" : "count")(s.fields[r], G(s)[r]), i = z[a];
+	const a = o?.function ?? ((e, t) => "number" === d(e, t) ? "sum" : "count")(s.fields[r], N(s)[r]), i = E[a];
 	if (!i) throw new t(e("error.pivotTable.notAFunction", { name: a }));
-	let l = o?.name;
-	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"));
+	let u = o?.name;
+	if (void 0 === u) u = H(n, s, `${i} of ${l(n, s, r)}`);
+	else if (H(n, s, u) !== u) throw new t(e("error.pivotTable.fieldNameExists"));
 	const c = {
-		name: l,
+		name: u,
 		field: r,
 		baseField: 0,
 		baseItem: 0
@@ -1744,22 +1744,22 @@ var X = [
 		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) => {
+	}, a = /* @__PURE__ */ new Map(), l = (e, t) => {
 		for (const n of e ?? []) {
 			const e = o(n);
 			a.delete(e), a.set(e, t);
 		}
 	};
-	i(s?.rows, "row"), i(s?.columns, "column"), i(s?.pages, "page");
-	const l = (e) => [...a].filter(([, t]) => t === e).map(([e]) => e), d = [];
+	l(s?.rows, "row"), l(s?.columns, "column"), l(s?.pages, "page");
+	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;
 		d.push(ut({ dataFields: d }, n, o(t), s));
 	}
 	const u = new Set(d.map((e) => e.field)), c = s?.form && "compact" !== s.form ? s.form : void 0, f = r.map((e, t) => {
 		const s = {}, r = a.get(t);
-		return r && (s.axis = r, s.items = lt(n, t)), u.has(t) && (s.dataField = !0), c && (s.form = c), e.dates && void 0 !== e.numberFormat && (s.numberFormat = e.numberFormat), s;
-	}), m = l("column");
+		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,
@@ -1771,14 +1771,14 @@ var X = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, g = l("row");
+	}, g = i("row");
 	g.length > 0 && (p.rowFields = g), m.length > 0 && (p.columnFields = m);
-	const w = l("page");
+	const w = i("page");
 	return w.length > 0 && (p.pageFields = w.map((e) => ({ field: e }))), d.length > 0 && (p.dataFields = d), c && (p.form = c), p;
 }, ft = (e, t) => t.map((t) => {
 	const n = t.sort?.scope;
 	if (!n) return t;
-	const s = ((t.axis === U.Axis.Row ? e.columnFields : t.axis === U.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const s = ((t.axis === $.Axis.Row ? e.columnFields : t.axis === $.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,37 +1795,37 @@ var X = [
 		}
 	};
 }), mt = (n, s, r, o, a) => {
-	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"));
+	const l = $.Axis, i = s.fields?.[r], d = n.fields?.[r]?.axis ?? null;
+	if (o === l.Values) throw new t(e("error.pivotTable.valuesNotAnAxis"));
 	if (null === o) {
 		if (null === d) return n;
-	} else if (void 0 !== 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 = {
-		...h,
-		...g
+	} else if (void 0 !== i?.formula || o === l.Page && (i?.calculatedItems?.length ?? 0) > 0) throw new t(e("error.pivotTable.fieldNotPlaceable"));
+	const c = o ? F(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 || F(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), b = o === l.Row ? c : v(n.rowFields), y = o === l.Column ? c : v(n.columnFields), x = 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 && (w.rowFields = b), y.length > 0 && (w.columnFields = y), x.length > 0 && (w.pageFields = x);
+	let A = {
+		...g,
+		...w
 	};
-	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 && 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,
-		fields: ft(I, A)
+	o === l.Page && d !== l.Page && (A = u(A, r, () => !0));
+	const C = { ...n.fields?.[r] };
+	o ? C.axis = o : delete C.axis, o && !C.items && i && (C.items = I(it(s, r), C.subtotals)), o && void 0 === C.numberFormat && i?.dates && void 0 !== i.numberFormat && (C.numberFormat = i.numberFormat), o === l.Page && C.items?.some((e) => e.hidden) && (C.multipleItemSelection = !0);
+	const E = (n.fields ?? []).map((e, t) => t === r ? C : e);
+	if (A = {
+		...A,
+		fields: ft(A, E)
 	}, null === o && n.formats?.some((e) => e.area.references?.some((e) => e.field === r))) {
-		const e = n.formats.filter((e) => !e.area.references?.some((e) => e.field === r)), { formats: t, ...s } = I;
-		I = e.length > 0 ? {
+		const e = n.formats.filter((e) => !e.area.references?.some((e) => e.field === r)), { formats: t, ...s } = A;
+		A = e.length > 0 ? {
 			...s,
 			formats: e
 		} : s;
 	}
-	return I;
+	return A;
 }, pt = -2, ht = /* @__PURE__ */ new Set([
 	"percentOfTotal",
 	"percentOfRow",
@@ -1888,7 +1888,7 @@ var X = [
 			} : n;
 		}
 		return r;
-	}), { dataFields: o, filters: a, formats: i, conditionalFormats: l, ...d } = e, u = {
+	}), { dataFields: o, filters: a, formats: l, conditionalFormats: i, ...d } = e, u = {
 		...d,
 		fields: r
 	};
@@ -1902,7 +1902,7 @@ var X = [
 		}];
 	});
 	c.length > 0 && (u.filters = c);
-	const f = (e) => Xe(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
+	const f = (e) => Ye(e, (e) => e, () => !0, [], n), m = (e.formats ?? []).flatMap((e) => {
 		const t = f(e.area);
 		return t ? [{
 			...e,
@@ -1920,11 +1920,11 @@ var X = [
 	return p.length > 0 && (u.conditionalFormats = p), ((e) => {
 		const t = e.dataFields?.length ?? 0, n = e.rowFields?.includes(pt), s = e.columnFields?.includes(pt), { valuesPosition: r, ...o } = e;
 		if (t < 2 && (n || s)) {
-			const t = n ? "rowFields" : "columnFields", s = e[t], r = s.indexOf(pt), a = s.filter((e) => e !== pt), i = {
+			const t = n ? "rowFields" : "columnFields", s = e[t], r = s.indexOf(pt), a = s.filter((e) => e !== pt), l = {
 				...o,
 				...r < a.length ? { valuesPosition: r } : {}
 			};
-			return a.length > 0 ? i[t] = a : delete i[t], i;
+			return a.length > 0 ? l[t] = a : delete l[t], l;
 		}
 		if (t >= 2 && !n && !s) {
 			const t = e.valuesOnRows ? "rowFields" : "columnFields", n = [...e[t] ?? []];
@@ -1949,12 +1949,12 @@ var X = [
 	if (r - 1 === s) return n;
 	const a = o.map((e, t) => t).filter((e) => e !== s);
 	a.splice(r - 1, 0, s);
-	const i = [];
+	const l = [];
 	return a.forEach((e, t) => {
-		i[e] = t;
-	}), It(n, a.map((e) => o[e]), i);
+		l[e] = t;
+	}), It(n, a.map((e) => o[e]), l);
 }, Et = (e, t, n, s) => {
-	const r = P(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,
@@ -1963,40 +1963,40 @@ var X = [
 		return "sum" !== s && (o.subtotal = s), o;
 	});
 }, St = (n, s, r, o) => {
-	const a = n.dataFields[r], i = a.showDataAs ?? "normal", l = o?.kind ?? "normal";
+	const a = n.dataFields[r], i = a.showDataAs ?? "normal", d = o?.kind ?? "normal";
 	if (o && !wt.has(o.kind)) throw new t(e("error.pivotTable.notAShowAs", { name: o.kind }));
-	const { showDataAs: d, baseField: c, baseItem: f, ...m } = a, p = { ...m };
-	"normal" !== l && (p.showDataAs = l);
-	let g = a.baseField, w = a.baseItem;
+	const { showDataAs: u, baseField: c, baseItem: f, ...m } = a, g = { ...m };
+	"normal" !== d && (g.showDataAs = d);
+	let w = a.baseField, v = a.baseItem;
 	if (void 0 !== o?.baseField) {
-		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => h(u(n, s, t), r));
+		const r = o.baseField, a = (s.fields ?? []).findIndex((e, t) => h(l(n, s, t), r));
 		if (a < 0) throw new t(e("error.pivotTable.notAField", { name: r }));
-		a !== g && (g = a, w = 0);
+		a !== w && (w = a, v = 0);
 	}
 	if (void 0 !== o?.baseItem) {
-		const r = g ?? 0;
-		if (h(o.baseItem, "(previous)")) w = "previous";
-		else if (h(o.baseItem, "(next)")) w = "next";
+		const r = w ?? 0;
+		if (h(o.baseItem, "(previous)")) v = "previous";
+		else if (h(o.baseItem, "(next)")) v = "next";
 		else {
 			const a = n.fields?.[r]?.items ? n : { fields: (n.fields ?? []).map((e, t) => t === r ? {
 				...e,
-				items: lt(s, r)
-			} : 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 }));
-			w = i;
+				items: it(s, r)
+			} : e) }, l = q(a, s, r).findIndex((e) => null !== e && h(e, o.baseItem));
+			if (l < 0) throw new t(e("error.pivotTable.notAnItem", { name: o.baseItem }));
+			v = l;
 		}
 	}
-	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 (void 0 !== w && (g.baseField = w), void 0 !== v && (g.baseItem = v), d === i) return g.baseField === a.baseField && g.baseItem === a.baseItem ? n : bt(n, r, () => g);
+	const F = ((e, t, n) => {
 		if (gt.has(n)) return gt.has(t) ? e : void 0;
-		const s = ((e) => b(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
+		const s = ((e) => p(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 v === a.numberFormat ? bt(n, r, () => p) : bt(Ft(n, r), r, () => yt(p, v));
+	})(a.numberFormat, i, d);
+	return F === a.numberFormat ? bt(n, r, () => g) : bt(Ft(n, r), r, () => yt(g, F));
 }, Pt = (e, t, n) => {
 	dt(n);
-	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 s = p(n), r = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
+	if (p(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,27 +2013,27 @@ var X = [
 	};
 }, kt = (n, s, r) => {
 	if (null === s) return At(n);
-	const o = U.Axis;
+	const o = $.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 = $(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 || $(n, s)[l] === pt)) return n;
-	i.splice(l, 0, pt);
-	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;
+	const l = F(n, s).filter((e) => e !== pt);
+	if (void 0 !== r && (!Number.isInteger(r) || r < 1 || r > l.length + 1)) throw new t(e("error.pivotTable.fieldPosition"));
+	const i = (r ?? l.length + 1) - 1;
+	if (s === a && (void 0 === r || F(n, s)[i] === pt)) return n;
+	l.splice(i, 0, pt);
+	const { rowFields: d, columnFields: u, valuesOnRows: c, ...f } = n, m = F(n, s === o.Row ? o.Column : o.Row).filter((e) => e !== pt), p = { ...f }, h = s === o.Row ? l : m, g = s === o.Column ? l : m;
 	return h.length > 0 && (p.rowFields = [...h]), g.length > 0 && (p.columnFields = [...g]), s === o.Row && (p.valuesOnRows = !0), p;
 }, Mt = (n, s, r) => {
 	if (r === (n.valuesCaption ?? "Values")) return n;
-	const { valuesCaption: o, ...a } = n, i = {
+	const { valuesCaption: o, ...a } = n, l = {
 		...a,
 		valuesCaption: "\0"
 	};
-	if (d(i, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
+	if (H(l, s, r) !== r) throw new t(e("error.pivotTable.fieldNameExists"));
 	return "Values" === r ? a : {
 		...a,
 		valuesCaption: r
 	};
 };
-export { xt as addPivotDataField, Ne as anchorPivotPeriods, dt as assertNumberFormat, it as axisFieldsOf, 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 };
+export { xt as addPivotDataField, Oe as anchorPivotPeriods, dt as assertNumberFormat, lt as axisFieldsOf, Re as buildPivotView, Ne as evaluatePivotFilters, V 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 };