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

package/browser/esm/{CLT3qGy_brDIwbYd.mjs → CVXOtvee4oFImGyR.mjs}

@@ -1,12 +1,12 @@
 /**
-* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.17
+* @license @sheetxl/sdk - SDK - A high-performance, embeddable spreadsheet engine. - v0.8.0-beta.18
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { An as e, Bn as t, Cn as n, Cr as r, Dn as i, Ea as a, En as o, Fa as s, Fn as c, In as l, Ln as u, Mn as d, Nn as f, On as p, Pn as m, Rn as h, Sn as g, Sr as _, Tn as v, Un as y, Vn as b, Ya as x, _n as S, bn as C, cn as w, dn as T, fn as E, gi as D, gn as O, jn as k, kn as A, ln as j, pn as M, un as N, vn as P, wn as F, wr as I, xn as L, yn as R, zn as ee } from "./gQzj95vSMXdKhpWf.mjs";
-import { Mt as z, Vt as B, _t as V, vt as te } from "./Byp_bvP9G-tN6hcz.mjs";
-import { c as H, i as U, r as ne, s as W, t as re } from "./XHhDDWrJiZJgWxPM.mjs";
+import { An as e, Bn as t, Cn as n, Cr as r, Da as i, Dn as a, En as o, Fn as s, Hn as c, Ia as l, In as u, Ln as d, Mn as f, Nn as p, On as m, Pn as h, Rn as g, Sn as _, Tn as v, Tr as y, Vn as b, Wn as x, Xa as S, _i as C, _n as w, bn as T, dn as E, fn as D, jn as O, kn as k, ln as A, mn as j, pn as M, un as N, vn as P, wn as F, wr as I, xn as L, yn as R, zn as ee } from "./_lh_Rr5SwLthmbmu.mjs";
+import { Mt as z, Vt as B, _t as V, vt as te } from "./0Mw5Ew_7tAiWgc5J.mjs";
+import { c as H, i as U, r as ne, s as W, t as re } from "./D2P43UD6TGSXErhr.mjs";
 import { FormulaError as G } from "@sheetxl/primitives";
 import { ExpectedError as K, t as q } from "@sheetxl/utils";
 var J = [
@@ -60,27 +60,27 @@ var J = [
 		case "seconds": return a.second + 1;
 		default: return null;
 	}
-}, ie = (e, t) => {
-	let n = e.fields ?? [], r = P(e.records, n.length);
-	if (!n.some(A)) return r;
-	let i = P(e.items, n.length), a = e.recordCount ?? 0, o = r.slice();
-	for (let e = 0; e < n.length; e++) {
-		let s = n[e];
-		if (!A(s)) continue;
-		let l = s.group, u = r[l.base] ?? [], d = i[l.base] ?? [], f = new Int32Array(d.length);
-		for (let e = 0; e < d.length; e++) {
-			let n = l.range ? X(l.range, l.items.length, c(d[e]), t) : l.discrete?.[e] ?? null;
-			f[e] = n ?? -1;
+}, ie = (t, n) => {
+	let r = t.fields ?? [], i = R(t.records, r.length);
+	if (!r.some(e)) return i;
+	let a = R(t.items, r.length), o = t.recordCount ?? 0, s = i.slice();
+	for (let t = 0; t < r.length; t++) {
+		let c = r[t];
+		if (!e(c)) continue;
+		let l = c.group, d = i[l.base] ?? [], f = a[l.base] ?? [], p = new Int32Array(f.length);
+		for (let e = 0; e < f.length; e++) {
+			let t = l.range ? X(l.range, l.items.length, u(f[e]), n) : l.discrete?.[e] ?? null;
+			p[e] = t ?? -1;
 		}
-		let p = Array(a);
-		for (let e = 0; e < a; e++) {
-			let t = f[u[e]];
+		let m = Array(o);
+		for (let e = 0; e < o; e++) {
+			let t = p[d[e]];
 			if (t === void 0 || t < 0) return null;
-			p[e] = t;
+			m[e] = t;
 		}
-		o[e] = p;
+		s[t] = m;
 	}
-	return o;
+	return s;
 }, ae = (e) => String(Number(e.toPrecision(12))), oe = (e, t) => {
 	let n = z(e, t, !0);
 	return n ? `${n.month}/${n.day}/${n.year}` : String(e);
@@ -224,44 +224,44 @@ var J = [
 	for (let r = 0; r < t; r++) n.push([r, [[0, e.map((e) => e[r] ?? null)]]]);
 	return n;
 }, fe = (e, t) => {
-	let n = t.fields ?? [], r = [], a = [], o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = (e, t) => {
-		if (o.has(e)) return !0;
+	let n = t.fields ?? [], r = [], i = [], a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = (e, t) => {
+		if (a.has(e)) return !0;
 		if (t.includes(e)) return !1;
-		let l = [];
+		let c = [];
 		ce(n[e].formula, (e) => {
-			let t = n.findIndex((t) => k(t.name, e));
-			return t >= 0 && l.push(t), t >= 0 ? "" : null;
+			let t = n.findIndex((t) => f(t.name, e));
+			return t >= 0 && c.push(t), t >= 0 ? "" : null;
 		});
-		for (let a of l) if (i(n[a])) {
-			if (!c(a, [...t, e])) return !1;
-		} else r.includes(a) || r.push(a);
-		return o.set(e, a.length), s.set(e, n[e].formula), a.push({
+		for (let i of c) if (m(n[i])) {
+			if (!s(i, [...t, e])) return !1;
+		} else r.includes(i) || r.push(i);
+		return a.set(e, i.length), o.set(e, n[e].formula), i.push({
 			field: e,
 			expression: ""
 		}), !0;
-	}, l = [];
-	for (let [t, r] of (e.dataFields ?? []).entries()) if (i(n[r.field])) {
-		if (!c(r.field, [])) return null;
-		l.push({
+	}, c = [];
+	for (let [t, r] of (e.dataFields ?? []).entries()) if (m(n[r.field])) {
+		if (!s(r.field, [])) return null;
+		c.push({
 			data: t,
-			formula: o.get(r.field)
+			formula: a.get(r.field)
 		});
 	}
-	let u = (e, t) => {
+	let l = (e, t) => {
 		if (t !== null) return null;
-		let a = n.findIndex((t) => k(t.name, e));
-		return a >= 0 ? le(i(n[s = a]) ? r.length + o.get(s) : r.indexOf(s)) : null;
-		var s;
+		let i = n.findIndex((t) => f(t.name, e));
+		return i >= 0 ? le(m(n[o = i]) ? r.length + a.get(o) : r.indexOf(o)) : null;
+		var o;
 	};
-	for (let e of a) {
-		let t = ce(s.get(e.field), u);
+	for (let e of i) {
+		let t = ce(o.get(e.field), l);
 		if (t === null) return null;
 		e.expression = t;
 	}
 	return {
 		operands: r,
-		formulas: a,
-		measures: l
+		formulas: i,
+		measures: c
 	};
 }, pe = /* @__PURE__ */ new Set([
 	"sum",
@@ -340,70 +340,70 @@ var J = [
 	difference: 12,
 	percent: 13,
 	percentDiff: 14
-}, Fe = (e, t, n, r) => {
-	let i = a.peek(), o = e.fields, s = t.fields;
-	if (!i || !o || !s || o.length !== s.length) return null;
-	if (T(e)) return {
+}, Fe = (n, r, a, o) => {
+	let c = i.peek(), l = n.fields, u = r.fields;
+	if (!c || !l || !u || l.length !== u.length) return null;
+	if (D(n)) return {
 		cells: [],
-		...w,
+		...A,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: N(e),
+		header: E(n),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
-		...r?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
+		...o?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	let c = m(e, s), l = c ? r?.filters : null;
-	if (c && !l) return null;
-	let u = o.some((e) => e.items?.some((e) => e.calculated));
-	if (u && !l?.calculatedRecords) return null;
-	let d = fe(e, t);
-	if (!d || d.measures.length > 0 && !l?.fieldValues || (e.dataFields ?? []).some((e) => Pe[e.showDataAs ?? "normal"] === void 0 || De[e.subtotal ?? "sum"] === void 0)) return null;
-	let f = Ie(e, t, n, l?.calculatedRecords, d.operands);
-	if (!f) return null;
-	let { items: p, records: h, values: g, n: _ } = f, v = (e) => !!e && (!e.noRecords || A(e)), y = e.form ?? "compact", b = (e) => {
+	let d = s(n, u), f = d ? o?.filters : null;
+	if (d && !f) return null;
+	let p = l.some((e) => e.items?.some((e) => e.calculated));
+	if (p && !f?.calculatedRecords) return null;
+	let m = fe(n, r);
+	if (!m || m.measures.length > 0 && !f?.fieldValues || (n.dataFields ?? []).some((e) => Pe[e.showDataAs ?? "normal"] === void 0 || De[e.subtotal ?? "sum"] === void 0)) return null;
+	let h = Ie(n, r, a, f?.calculatedRecords, m.operands);
+	if (!h) return null;
+	let { items: g, records: _, values: v, n: y } = h, b = (t) => !!t && (!t.noRecords || e(t)), x = n.form ?? "compact", S = (e) => {
 		let t = [];
 		for (let n of e ?? []) {
 			if (n === Z) {
 				t.push({
 					field: n,
-					form: y
+					form: x
 				});
 				continue;
 			}
-			let e = o[n], r = e?.subtotals;
-			if (!e || !v(s[n]) || u && r && r.some((e) => e !== "default")) return null;
+			let e = l[n], r = e?.subtotals;
+			if (!e || !b(u[n]) || p && r && r.some((e) => e !== "default")) return null;
 			t.push({
 				field: n,
 				form: e.form ?? "compact"
 			});
 		}
 		return t;
-	}, x = b(e.rowFields), S = b(e.columnFields), C = e.pageFields ?? [];
-	if (!x || !S || C.some((e) => !v(s[e.field]))) return null;
-	let E = ee(e, r?.slicerFields);
-	return E.pageFields?.some((e) => !v(s[e.field])) ? null : We(e, t, p, x, S, Be(i, E, p, h, g, x, S, _, l?.keep, l?.records, d.operands.length, l?.fieldValues, !0), n, !0 === r?.roles, r?.cellOrder === "columns");
-}, Ie = (e, t, n, r, i = []) => {
-	let a = t.fields?.length ?? 0, o = f(t);
-	if (!t.records) return null;
-	let s = ie(t, n.isDate1904());
-	if (!s) return null;
-	let l = !0 === t.fields?.some(A), u = l ? P(t.items, a) : o, d = l ? P(t.records, a) : s, p = t.recordCount ?? 0, m = r?.count ?? 0, h = p + m, g = (e, n) => {
-		let r = !t.fields?.[e]?.noRecords, i = r ? d[e] : s[e] ?? [], a = r ? u[e] : o[e], l = Array(h);
-		for (let e = 0; e < p; e++) l[e] = c(a[i[e]]);
-		for (let e = 0; e < m; e++) l[p + e] = n?.[e] ?? null;
-		return l;
-	}, _ = [...(e.dataFields ?? []).map((e, t) => g(e.field, r?.values[t])), ...i.map((e) => g(e))];
+	}, C = S(n.rowFields), w = S(n.columnFields), T = n.pageFields ?? [];
+	if (!C || !w || T.some((e) => !b(u[e.field]))) return null;
+	let O = t(n, o?.slicerFields);
+	return O.pageFields?.some((e) => !b(u[e.field])) ? null : We(n, r, g, C, w, Be(c, O, g, _, v, C, w, y, f?.keep, f?.records, m.operands.length, f?.fieldValues, !0), a, !0 === o?.roles, o?.cellOrder === "columns");
+}, Ie = (t, n, r, i, a = []) => {
+	let o = n.fields?.length ?? 0, s = h(n);
+	if (!n.records) return null;
+	let c = ie(n, r.isDate1904());
+	if (!c) return null;
+	let l = !0 === n.fields?.some(e), d = l ? R(n.items, o) : s, f = l ? R(n.records, o) : c, p = n.recordCount ?? 0, m = i?.count ?? 0, g = p + m, _ = (e, t) => {
+		let r = !n.fields?.[e]?.noRecords, i = r ? f[e] : c[e] ?? [], a = r ? d[e] : s[e], o = Array(g);
+		for (let e = 0; e < p; e++) o[e] = u(a[i[e]]);
+		for (let e = 0; e < m; e++) o[p + e] = t?.[e] ?? null;
+		return o;
+	}, v = [...(t.dataFields ?? []).map((e, t) => _(e.field, i?.values[t])), ...a.map((e) => _(e))];
 	return {
-		items: o,
-		records: r ? s.map((e, t) => e.concat(r.ids[t] ?? [])) : s,
-		values: _,
-		n: h
+		items: s,
+		records: i ? c.map((e, t) => e.concat(i.ids[t] ?? [])) : c,
+		values: v,
+		n: g
 	};
-}, Le = async (e, t, n, r, i, o, s, c, l) => {
-	let u = a.peek(), d = e.dataFields?.[i];
+}, Le = async (e, t, n, r, a, o, s, c, l) => {
+	let u = i.peek(), d = e.dataFields?.[a];
 	if (!u || !e.fields || !d || De[d.subtotal ?? "sum"] === void 0) return null;
 	let f = [e.rowFields, e.columnFields].map((e) => (e ?? []).filter((e) => e !== Z)), p = f.findIndex((e) => e.includes(r)), m = f[p];
 	if (!m) return null;
@@ -426,7 +426,7 @@ var J = [
 		rowGrandTotals: !1
 	}, S = c && {
 		...c,
-		values: [c.values[i] ?? []]
+		values: [c.values[a] ?? []]
 	}, C = fe(x, t);
 	if (!C || C.measures.length > 0 && !l) return null;
 	let w = Ie(x, t, n, S, C.operands);
@@ -641,50 +641,50 @@ var J = [
 		} else r.type = e.kind === Se ? e.function === null ? "default" : t[e.function] : e.kind === Ce ? "grand" : "blank", r.items = e.kind === Ce ? [0] : e.path.slice();
 		return e.data !== null && e.data > 0 && (r.dataField = e.data), r;
 	});
-}, We = (e, t, n, r, i, a, s, l, u) => {
-	let d = e.fields, f = t.fields, m = e.dataFields ?? [], h = (t) => t === Z ? e.valuesCaption ?? "Values" : d[t].name ?? f[t].name, g = (e, t) => {
-		if (e === Z) return m[t]?.name ?? "";
+}, We = (e, t, n, r, i, o, s, c, l) => {
+	let d = e.fields, f = t.fields, p = e.dataFields ?? [], m = (t) => t === Z ? e.valuesCaption ?? "Values" : d[t].name ?? f[t].name, h = (e, t) => {
+		if (e === Z) return p[t]?.name ?? "";
 		let r = d[e].items?.[t];
 		if (r?.name !== void 0) return r.name;
-		let i = c(n[e][r?.item ?? t]);
-		return i === null ? O : i;
-	}, _ = (e, t) => {
-		let n = g(e, t);
+		let i = u(n[e][r?.item ?? t]);
+		return i === null ? w : i;
+	}, g = (e, t) => {
+		let n = h(e, t);
 		if (typeof n == "number") {
-			let r = d[e].items?.[t]?.item ?? t, i = (d[e].numberFormat ?? f[e].numberFormat) === void 0 && p(f[e], r);
-			return te(s, i ? j(L(f[e], r), s) : ((e) => j(d[e].numberFormat ?? f[e].numberFormat, s))(e), n);
+			let r = d[e].items?.[t]?.item ?? t, i = (d[e].numberFormat ?? f[e].numberFormat) === void 0 && k(f[e], r);
+			return te(s, i ? N(_(f[e], r), s) : ((e) => N(d[e].numberFormat ?? f[e].numberFormat, s))(e), n);
 		}
 		return G.isError(n) ? n.getLabel() : typeof n == "boolean" ? n ? "TRUE" : "FALSE" : String(n);
 	}, v = (e) => {
-		if (e.item !== void 0) return g(e.field, e.item);
+		if (e.item !== void 0) return h(e.field, e.item);
 		let t = d[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		let n = t.flatMap((e, t) => o(e) && !e.hidden ? [t] : []);
-		return n.length === 1 ? g(e.field, n[0]) : "(Multiple Items)";
-	}, b = e.grandTotalCaption ?? "Grand Total", S = l ? /* @__PURE__ */ new Map() : null, C = (e, t) => e === Z ? {
+		let n = t.flatMap((e, t) => a(e) && !e.hidden ? [t] : []);
+		return n.length === 1 ? h(e.field, n[0]) : "(Multiple Items)";
+	}, y = e.grandTotalCaption ?? "Grand Total", b = c ? /* @__PURE__ */ new Map() : null, C = (e, t) => e === Z ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, w = (e) => e === Z ? null : {
+	}, T = (e) => e === Z ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, T = (e, t) => e.kind === Ce && t === b ? { kind: "grandTotal" } : null, D = r.length === 0 && i.length === 0 && m.length === 0, k = D ? {
+	}, D = (e, t) => e.kind === Ce && t === y ? { kind: "grandTotal" } : null, O = r.length === 0 && i.length === 0 && p.length === 0, A = O ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : N(e), A = D ? [] : Ue(a.rows, a.functions), P = D ? [] : Ue(a.columns, a.functions), F = M({
+	} : E(e), P = O ? [] : Ue(o.rows, o.functions), F = O ? [] : Ue(o.columns, o.functions), I = j({
 		...e,
-		header: k,
-		rowLines: A,
-		columnLines: P
-	}), I = a.columns.length, R = (e) => e === "row" ? r : i, ee = (t) => {
+		header: A,
+		rowLines: P,
+		columnLines: F
+	}), L = o.columns.length, R = (e) => e === "row" ? r : i, ee = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				let n = e.pageFields[t.page].field;
-				return [h(n), {
+				return [m(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
@@ -696,7 +696,7 @@ var J = [
 					page: t.page
 				}];
 			}
-			case "dataCaption": return [m[t.data]?.name ?? null, {
+			case "dataCaption": return [p[t.data]?.name ?? null, {
 				kind: "dataCaption",
 				data: t.data
 			}];
@@ -704,28 +704,28 @@ var J = [
 			case "columnHeader": return [e.columnHeaderCaption ?? "Column Labels", { kind: "columnHeader" }];
 			case "fieldCaption": {
 				let e = R(t.axis)[t.level].field;
-				return [h(e), w(e)];
+				return [m(e), T(e)];
 			}
 			case "label": {
 				let e = R(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [g(e, n), C(e, n)];
+				return [h(e, n), C(e, n)];
 			}
 			case "total": {
-				let e = (t.axis === "row" ? a.rows : a.columns)[t.line.index], n = ((e, t) => {
-					let n = e.findIndex((e) => e.field === Z) >= t.path.length && t.data !== null, r = n ? m[t.data]?.name ?? "" : "";
-					if (t.kind === Ce) return n ? `Total ${r}` : b;
-					let i = t.path.length - 1, o = e[i].field, s = _(o, t.path[i]);
+				let e = (t.axis === "row" ? o.rows : o.columns)[t.line.index], n = ((e, t) => {
+					let n = e.findIndex((e) => e.field === Z) >= t.path.length && t.data !== null, r = n ? p[t.data]?.name ?? "" : "";
+					if (t.kind === Ce) return n ? `Total ${r}` : y;
+					let i = t.path.length - 1, a = e[i].field, s = g(a, t.path[i]);
 					if (t.function !== null) {
-						let e = Ae[a.functions[t.function]];
-						return (n || t.across) && t.data !== null ? `${s} ${e} of ${h(m[t.data].field)}` : `${s} ${e}`;
+						let e = Ae[o.functions[t.function]];
+						return (n || t.across) && t.data !== null ? `${s} ${e} of ${m(p[t.data].field)}` : `${s} ${e}`;
 					}
-					return d[o]?.subtotalCaption ?? (n ? `${s} ${r}` : `${s} Total`);
+					return d[a]?.subtotalCaption ?? (n ? `${s} ${r}` : `${s} Total`);
 				})(R(t.axis), e);
-				return [n, T(e, n)];
+				return [n, D(e, n)];
 			}
 			case "value": {
-				let n = t.row.index * I + t.column.index, r = a.states[n], i = null;
-				return r === Te ? (i = a.values[n], e.showError && G.isError(i) && (i = e.errorCaption ?? "")) : r === Ee && (i = !1 === e.showEmpty ? 0 : ((e) => {
+				let n = t.row.index * L + t.column.index, r = o.states[n], i = null;
+				return r === Te ? (i = o.values[n], e.showError && G.isError(i) && (i = e.errorCaption ?? "")) : r === Ee && (i = !1 === e.showEmpty ? 0 : ((e) => {
 					if (e === void 0) return null;
 					let t = e.trim();
 					if (!/^[+-]?\d*(?:\.\d*)?$/.test(t)) return e;
@@ -734,35 +734,35 @@ var J = [
 				})(e.emptyCaption)), [i, null];
 			}
 		}
-	}, z = new x.Builder(), B = F.top, V = F.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), H = (e, t) => {
-		let n = E(F, e, t);
+	}, z = new S.Builder(), B = I.top, V = I.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), H = (e, t) => {
+		let n = M(I, e, t);
 		if (!n) return;
 		let [r, i] = ee(n);
 		((e, t, n) => {
-			S && n && S.set(e + "," + t, n);
-		})(e - B, t, i), r !== null && (u ? z.pushAt(t, e - B, r) : z.pushAt(e - B, t, r));
+			b && n && b.set(e + "," + t, n);
+		})(e - B, t, i), r !== null && (l ? z.pushAt(t, e - B, r) : z.pushAt(e - B, t, r));
 	};
-	if (u) {
-		let e = Math.max(V, F.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < F.rows.length; e++) t < (e < B ? V : F.columns.length) && H(e, t);
-	} else for (let e = 0; e < F.rows.length; e++) {
-		let t = e < B ? V : F.columns.length;
+	if (l) {
+		let e = Math.max(V, I.columns.length);
+		for (let t = 0; t < e; t++) for (let e = 0; e < I.rows.length; e++) t < (e < B ? V : I.columns.length) && H(e, t);
+	} else for (let e = 0; e < I.rows.length; e++) {
+		let t = e < B ? V : I.columns.length;
 		for (let n = 0; n < t; n++) H(e, n);
 	}
-	if (D) {
-		let t = y(e);
+	if (O) {
+		let t = x(e);
 		return {
 			cells: z.build()?.tuples ?? [],
 			rows: 1,
 			columns: 1,
 			rowPageCount: t.rows,
 			columnPageCount: t.columns,
-			header: k,
+			header: A,
 			rowLines: [],
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...S ? { roles: S } : {}
+			...b ? { roles: b } : {}
 		};
 	}
 	let U = (e, t) => {
@@ -770,163 +770,163 @@ var J = [
 		return e.forEach((e, r) => {
 			e.field !== Z && n.push(r < t.path.length ? t.path[r] : -1);
 		}), n;
-	}, ne = (e, t) => re(e.data ?? t.data ?? 0, [...U(r, e), ...U(i, t)]), [W] = a.rows, [K] = a.columns, q = W && K && W.kind !== we && K.kind !== we ? ne(W, K) : null, J = [], Y = (e) => e.kind === Se && e.function !== null;
-	a.rows.forEach((t, n) => {
-		t.kind === we || Y(t) || (U(r, t), a.columns.forEach((r, i) => {
-			let o = a.states[n * I + i];
-			if (r.kind === we || Y(r) || o !== Te && o !== Ee) return;
-			let s = o === Te ? a.values[n * I + i] : 0;
+	}, ne = (e, t) => re(e.data ?? t.data ?? 0, [...U(r, e), ...U(i, t)]), [W] = o.rows, [K] = o.columns, q = W && K && W.kind !== we && K.kind !== we ? ne(W, K) : null, J = [], Y = (e) => e.kind === Se && e.function !== null;
+	o.rows.forEach((t, n) => {
+		t.kind === we || Y(t) || (U(r, t), o.columns.forEach((r, i) => {
+			let a = o.states[n * L + i];
+			if (r.kind === we || Y(r) || a !== Te && a !== Ee) return;
+			let s = a === Te ? o.values[n * L + i] : 0;
 			e.showError && G.isError(s) && (s = e.errorCaption || 0), J.push([ne(t, r), s]);
 		}));
 	});
-	let X = y(e);
+	let X = x(e);
 	return {
 		cells: z.build()?.tuples ?? [],
-		rows: F.rows.length - B,
-		columns: F.columns.length,
+		rows: I.rows.length - B,
+		columns: I.columns.length,
 		rowPageCount: X.rows,
 		columnPageCount: X.columns,
-		header: k,
-		rowLines: A,
-		columnLines: P,
+		header: A,
+		rowLines: P,
+		columnLines: F,
 		viewValues: J,
 		firstKey: q,
-		...S ? { roles: S } : {}
+		...b ? { roles: b } : {}
 	};
-}, Ge = (e, t, n, r, i = !1, a, o) => {
-	let s = Fe(e, t, r, {
-		filters: a,
-		slicerFields: o
+}, Ge = (t, n, r, i, a = !1, o, s) => {
+	let c = Fe(t, n, i, {
+		filters: o,
+		slicerFields: s
 	});
-	if (!s) return null;
-	let l = s.rowPageCount > 0 ? s.rowPageCount + 1 : 0, u = s.rowPageCount > 0 ? 3 * s.columnPageCount - 1 : 0, { rowStart: d, colStart: m } = n;
-	if (d - l < 0) return null;
-	let h = {
-		rowStart: d - l,
-		colStart: m,
-		rowEnd: d + s.rows - 1,
-		colEnd: m + Math.max(s.columns, u) - 1
-	}, g = e.fields, _ = t.fields, v = f(t), y = (e, t) => {
-		let n = g[e], i = n.numberFormat ?? _[e].numberFormat, a = j(i, r), o = A(_[e]), s = v[e], l = (n.items ?? []).filter((e) => e.item !== void 0 && e.type === void 0), u = l.length > 0 ? l : s.map((e, t) => ({ item: t })), d = u.map((t) => {
-			let n = c(s[t.item]), l = p(_[e], t.item), u = n === null ? "(blank)" : typeof n == "number" ? te(r, l ? (d = t.item, i === void 0 ? j(L(_[e], d), r) : a) : a, n) : G.isError(n) ? n.getLabel() : typeof n == "boolean" ? n ? "TRUE" : "FALSE" : String(n);
+	if (!c) return null;
+	let l = c.rowPageCount > 0 ? c.rowPageCount + 1 : 0, d = c.rowPageCount > 0 ? 3 * c.columnPageCount - 1 : 0, { rowStart: f, colStart: p } = r;
+	if (f - l < 0) return null;
+	let m = {
+		rowStart: f - l,
+		colStart: p,
+		rowEnd: f + c.rows - 1,
+		colEnd: p + Math.max(c.columns, d) - 1
+	}, g = t.fields, v = n.fields, y = h(n), b = (t, n) => {
+		let r = g[t], a = r.numberFormat ?? v[t].numberFormat, o = N(a, i), s = e(v[t]), c = y[t], l = (r.items ?? []).filter((e) => e.item !== void 0 && e.type === void 0), d = l.length > 0 ? l : c.map((e, t) => ({ item: t })), f = d.map((e) => {
+			let n = u(c[e.item]), r = k(v[t], e.item), l = n === null ? "(blank)" : typeof n == "number" ? te(i, r ? (d = e.item, a === void 0 ? N(_(v[t], d), i) : o) : o, n) : G.isError(n) ? n.getLabel() : typeof n == "boolean" ? n ? "TRUE" : "FALSE" : String(n);
 			var d;
-			let f = o && l ? u : n;
-			return t.name === void 0 ? {
+			let f = s && r ? l : n;
+			return e.name === void 0 ? {
 				value: f,
-				text: u
+				text: l
 			} : {
 				value: f,
-				text: u,
-				name: t.name
+				text: l,
+				name: e.name
 			};
-		}), f = {
-			name: n.name ?? _[e].name,
-			items: d
+		}), p = {
+			name: r.name ?? v[t].name,
+			items: f
 		};
-		if (t) {
-			let e = t.item === void 0 ? void 0 : (n.items ?? [])[t.item]?.item;
-			f.page = e === void 0 ? -1 : u.findIndex((t) => t.item === e);
+		if (n) {
+			let e = n.item === void 0 ? void 0 : (r.items ?? [])[n.item]?.item;
+			p.page = e === void 0 ? -1 : d.findIndex((t) => t.item === e);
 		}
-		return f;
-	}, b = (e) => (e ?? []).filter((e) => e !== -2);
+		return p;
+	}, x = (e) => (e ?? []).filter((e) => e !== -2);
 	return {
 		view: {
-			range: h,
-			dataFields: (e.dataFields ?? []).map((e) => ({
+			range: m,
+			dataFields: (t.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: _[e.field].name
+				sourceName: v[e.field].name
 			})),
 			fields: [
-				...b(e.rowFields).map((e) => y(e)),
-				...b(e.columnFields).map((e) => y(e)),
-				...(e.pageFields ?? []).map((e) => y(e.field, e))
+				...x(t.rowFields).map((e) => b(e)),
+				...x(t.columnFields).map((e) => b(e)),
+				...(t.pageFields ?? []).map((e) => b(e.field, e))
 			],
-			values: s.viewValues,
+			values: c.viewValues,
 			block: {
 				anchor: {
-					row: d,
-					column: m
+					row: f,
+					column: p
 				},
-				...i ? { blocked: !0 } : {},
-				...s.firstKey === null ? {} : { first: s.firstKey }
+				...a ? { blocked: !0 } : {},
+				...c.firstKey === null ? {} : { first: c.firstKey }
 			}
 		},
 		size: {
-			rows: s.rows,
-			columns: s.columns
+			rows: c.rows,
+			columns: c.columns
 		}
 	};
-}, Ke = async (t, n, r, o) => {
-	let s = /* @__PURE__ */ new Map(), l = (t.filters ?? []).filter((n) => e(n) || t.rowFields?.includes(n.field) || t.columnFields?.includes(n.field)), d = t.fields?.some((e) => e.items?.some((e) => e.calculated)), m = t.dataFields?.some((e) => i(n.fields?.[e.field]));
-	if (l.length === 0 && !d && !m) return { keep: s };
-	let h = f(n);
-	for (let i of l.filter(e)) {
-		let e = i.field, a = h[e];
-		if (!a) continue;
-		let l = I(i.condition) ? Ye(t, n, a, e, r) : null, u = Array(a.length);
-		for (let e = 0; e < a.length; e++) u[e] = l ? l[e] : c(a[e]);
-		let d = await Je(i.condition, u, r, o), f = s.get(e);
-		if (f) for (let e = 0; e < d.length; e++) f[e] &= d[e];
-		else s.set(e, d);
+}, Ke = async (e, t, n, r) => {
+	let a = /* @__PURE__ */ new Map(), o = (e.filters ?? []).filter((t) => O(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), s = e.fields?.some((e) => e.items?.some((e) => e.calculated)), c = e.dataFields?.some((e) => m(t.fields?.[e.field]));
+	if (o.length === 0 && !s && !c) return { keep: a };
+	let l = h(t);
+	for (let i of o.filter(O)) {
+		let o = i.field, s = l[o];
+		if (!s) continue;
+		let c = y(i.condition) ? Ye(e, t, s, o, n) : null, d = Array(s.length);
+		for (let e = 0; e < s.length; e++) d[e] = c ? c[e] : u(s[e]);
+		let f = await Je(i.condition, d, n, r), p = a.get(o);
+		if (p) for (let e = 0; e < f.length; e++) p[e] &= f[e];
+		else a.set(o, f);
 	}
-	let g = d && o ? await (async (e, t, n, r, a) => {
-		let o = t.fields ?? [], s = e.fields ?? [], l = o.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), d = e.dataFields ?? [];
-		if (l.length !== 1 || d.some((e) => i(o[e.field]) || !pe.has(e.subtotal ?? "sum"))) return null;
-		let m = l[0], h = o[m].calculatedItems, g = ie(t, n.isDate1904());
-		if (!g) return null;
-		let _ = f(t), v = f({
+	let d = s && r ? await (async (e, t, n, r, i) => {
+		let a = t.fields ?? [], o = e.fields ?? [], s = a.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
+		if (s.length !== 1 || c.some((e) => m(a[e.field]) || !pe.has(e.subtotal ?? "sum"))) return null;
+		let l = s[0], d = a[l].calculatedItems, p = ie(t, n.isDate1904());
+		if (!p) return null;
+		let _ = h(t), v = h({
 			...t,
-			fields: o.map(({ group: e, ...t }) => t)
-		}), y = (e.rowFields ?? []).filter((e) => e >= 0), b = (e.columnFields ?? []).filter((e) => e >= 0), x = y.includes(m) ? y : b.includes(m) ? b : null;
+			fields: a.map(({ group: e, ...t }) => t)
+		}), y = (e.rowFields ?? []).filter((e) => e >= 0), b = (e.columnFields ?? []).filter((e) => e >= 0), x = y.includes(l) ? y : b.includes(l) ? b : null;
 		if (!x) return null;
-		let S = x.slice(0, x.indexOf(m)), C = [...x.slice(x.indexOf(m) + 1), ...x === y ? b : y], w = [...S, ...C], T = t.recordCount ?? 0, E = (e, t) => {
-			let n = s[e]?.items, r = n?.find((e) => e.item === t && e.type === void 0);
-			return !(n && (!r || r.hidden) || a?.get(e) && a.get(e)[t] === 0);
-		}, D = (e, t) => {
-			let n = s[e.field]?.items;
+		let S = x.slice(0, x.indexOf(l)), C = [...x.slice(x.indexOf(l) + 1), ...x === y ? b : y], T = [...S, ...C], E = t.recordCount ?? 0, D = (e, t) => {
+			let n = o[e]?.items, r = n?.find((e) => e.item === t && e.type === void 0);
+			return !(n && (!r || r.hidden) || i?.get(e) && i.get(e)[t] === 0);
+		}, O = (e, t) => {
+			let n = o[e.field]?.items;
 			if (e.item !== void 0) return n?.[e.item]?.item === t;
 			let r = n?.find((e) => e.item === t && e.type === void 0);
 			return !n || !!r && !r.hidden;
-		}, A = e.pageFields ?? [], M = j(o[m].numberFormat ?? 14, n), N = (e) => _[m].findIndex((t, r) => {
-			let i = c(t);
-			return typeof i == "number" && (o[m].dates || p(o[m], r)) ? k(te(n, M, i), e) : k(i === null ? O : u(i), e);
-		}), P = /* @__PURE__ */ new Map(), F = new Map(h.map((e) => [e.item, e.formula])), I = (e) => {
+		}, A = e.pageFields ?? [], j = N(a[l].numberFormat ?? 14, n), M = (e) => _[l].findIndex((t, r) => {
+			let i = u(t);
+			return typeof i == "number" && (a[l].dates || k(a[l], r)) ? f(te(n, j, i), e) : f(i === null ? w : g(i), e);
+		}), P = /* @__PURE__ */ new Map(), F = new Map(d.map((e) => [e.item, e.formula])), I = (e) => {
 			let t = P.get(e);
 			return t === void 0 && P.set(e, t = P.size), t;
 		};
-		for (let e of h) if (ce(e.formula, (e, t) => {
-			if (t === null || !k(o[m].name, e)) return null;
-			let n = N(t);
+		for (let e of d) if (ce(e.formula, (e, t) => {
+			if (t === null || !f(a[l].name, e)) return null;
+			let n = M(t);
 			return n < 0 ? null : (F.has(n) || I(n), "");
 		}) === null) return null;
-		let L = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Map(), ee = d.map((e) => ({
-			column: g[e.field],
+		let L = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Map(), ee = c.map((e) => ({
+			column: p[e.field],
 			values: v[e.field],
 			fold: e.subtotal ?? "sum"
 		})), z = P.size;
-		for (let e = 0; e < T; e++) {
-			if (!A.every((t) => D(t, g[t.field][e])) || !w.every((t) => E(t, g[t][e]))) continue;
+		for (let e = 0; e < E; e++) {
+			if (!A.every((t) => O(t, p[t.field][e])) || !T.every((t) => D(t, p[t][e]))) continue;
 			let t = "";
-			for (let n of S) t += g[n][e] + ",";
+			for (let n of S) t += p[n][e] + ",";
 			R.has(t) || R.set(t, e);
-			let n = P.get(g[m][e]);
+			let n = P.get(p[l][e]);
 			if (n === void 0) continue;
 			let r = t;
-			for (let t of C) r += g[t][e] + ",";
+			for (let t of C) r += p[t][e] + ",";
 			let i = L.get(r);
 			i || (i = {
-				sums: d.map(() => Array(z).fill(0)),
-				errors: d.map(() => Array(z).fill(void 0))
+				sums: c.map(() => Array(z).fill(0)),
+				errors: c.map(() => Array(z).fill(void 0))
 			}, L.set(r, i));
 			let { sums: a, errors: o } = i;
 			ee.forEach(({ column: t, values: r, fold: i }, s) => {
-				let l = c(r[t[e]]);
-				i === "sum" ? typeof l == "number" ? a[s][n] += l : G.isError(l) && (o[s][n] ??= l) : (i === "countNums" ? typeof l == "number" : l !== null) && (a[s][n] += 1);
+				let c = u(r[t[e]]);
+				i === "sum" ? typeof c == "number" ? a[s][n] += c : G.isError(c) && (o[s][n] ??= c) : (i === "countNums" ? typeof c == "number" : c !== null) && (a[s][n] += 1);
 			});
 		}
 		let B = C.map((e) => {
-			let t = s[e]?.items;
-			return t ? t.flatMap((t) => t.item !== void 0 && t.type === void 0 && !t.missing && E(e, t.item) ? [t.item] : []) : _[e].map((e, t) => t);
+			let t = o[e]?.items;
+			return t ? t.flatMap((t) => t.item !== void 0 && t.type === void 0 && !t.missing && D(e, t.item) ? [t.item] : []) : _[e].map((e, t) => t);
 		});
 		if (B.reduce((e, t) => e * t.length, R.size) > 5e5) return null;
 		let V = [];
@@ -944,19 +944,19 @@ var J = [
 		let H = V.length;
 		if (H === 0) return {
 			count: 0,
-			ids: o.map(() => []),
-			values: d.map(() => [])
+			ids: a.map(() => []),
+			values: c.map(() => [])
 		};
-		let U = d.length * z, ne = (e, t) => e * z + t, W = (e, t) => U + e * h.length + t, re = [];
-		for (let e = 0; e < d.length; e++) for (let t = 0; t < z; t++) re.push(V.map(({ key: n }) => {
+		let U = c.length * z, ne = (e, t) => e * z + t, W = (e, t) => U + e * d.length + t, re = [];
+		for (let e = 0; e < c.length; e++) for (let t = 0; t < z; t++) re.push(V.map(({ key: n }) => {
 			let r = L.get(n);
 			return r ? r.errors[e][t] ?? r.sums[e][t] : 0;
 		}));
 		let K = [];
-		for (let e = 0; e < d.length; e++) for (let t = 0; t < h.length; t++) {
-			let n = ce(h[t].formula, (t, n) => {
+		for (let e = 0; e < c.length; e++) for (let t = 0; t < d.length; t++) {
+			let n = ce(d[t].formula, (t, n) => {
 				if (n === null) return null;
-				let r = N(n), i = h.findIndex((e) => e.item === r);
+				let r = M(n), i = d.findIndex((e) => e.item === r);
 				return le(i >= 0 ? W(e, i) : ne(e, P.get(r)));
 			});
 			if (n === null) return null;
@@ -968,18 +968,18 @@ var J = [
 		let q = await r.evaluateBatch({
 			values: de(re, H),
 			formulas: K
-		}), J = o.map(() => []), Y = d.map(() => []), X = (e, t, n, r) => {
-			g.forEach((n, r) => {
+		}), J = a.map(() => []), Y = c.map(() => []), X = (e, t, n, r) => {
+			p.forEach((n, r) => {
 				let i = C.indexOf(r);
-				J[r].push(r === m ? t : i >= 0 ? e.path[i] : n[e.exemplar] ?? 0);
+				J[r].push(r === l ? t : i >= 0 ? e.path[i] : n[e.exemplar] ?? 0);
 			}), Y.forEach((e, t) => {
 				e.push(t === n ? r : null);
 			});
 		};
 		return V.forEach((e, t) => {
-			h.forEach(({ item: n }, r) => {
-				d.forEach((i, a) => {
-					let o = q[a * h.length + r].getValueAt(t, 0) ?? 0;
+			d.forEach(({ item: n }, r) => {
+				c.forEach((i, a) => {
+					let o = q[a * d.length + r].getValueAt(t, 0) ?? 0;
 					if ((i.subtotal ?? "sum") !== "sum" && typeof o == "number") for (let t = 0; t < Math.round(o); t++) X(e, n, a, 1);
 					else X(e, n, a, o);
 				});
@@ -989,32 +989,32 @@ var J = [
 			ids: J,
 			values: Y
 		};
-	})(t, n, r, o, s) : void 0, _ = l.filter((t) => !e(t)).map((e, t) => ({
+	})(e, t, n, r, a) : void 0, p = o.filter((e) => !O(e)).map((e, t) => ({
 		filter: e,
 		index: t
-	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), v = (n.recordCount ?? 0) + (g?.count ?? 0), y, b = t.rowFields ?? [];
-	for (let { filter: e } of _) {
-		let i = await Le(t, n, r, e.field, e.dataField, s, y, g, o);
-		if (!i) continue;
-		let a = /* @__PURE__ */ new Set();
-		for (let [t, n] of i.groups) {
-			let i = await Je(e.condition, n.totals, r, o);
-			n.ids.forEach((e, n) => {
-				i[n] || a.add(`${t}|${e}`);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), _ = (t.recordCount ?? 0) + (d?.count ?? 0), v, b = e.rowFields ?? [];
+	for (let { filter: i } of p) {
+		let o = await Le(e, t, n, i.field, i.dataField, a, v, d, r);
+		if (!o) continue;
+		let s = /* @__PURE__ */ new Set();
+		for (let [e, t] of o.groups) {
+			let a = await Je(i.condition, t.totals, n, r);
+			t.ids.forEach((t, n) => {
+				a[n] || s.add(`${e}|${t}`);
 			});
 		}
-		if (a.size === 0) continue;
-		y ??= new Uint8Array(v).fill(3);
-		let c = i.outer.map((e) => i.records[e]), l = i.records[e.field], u = b.includes(e.field) ? 1 : 2;
-		for (let e = 0; e < v; e++) {
-			if (!(y[e] & u)) continue;
+		if (s.size === 0) continue;
+		v ??= new Uint8Array(_).fill(3);
+		let c = o.outer.map((e) => o.records[e]), l = o.records[i.field], u = b.includes(i.field) ? 1 : 2;
+		for (let e = 0; e < _; e++) {
+			if (!(v[e] & u)) continue;
 			let t = "";
 			for (let n = 0; n < c.length; n++) t += (n > 0 ? "," : "") + c[n][e];
-			a.has(`${t}|${l[e]}`) && (y[e] &= ~u);
+			s.has(`${t}|${l[e]}`) && (v[e] &= ~u);
 		}
 	}
-	let x = m && o ? await (async (e, t, n, r, i, o, s) => {
-		let c = a.peek(), l = fe(e, t);
+	let x = c && r ? await (async (e, t, n, r, a, o, s) => {
+		let c = i.peek(), l = fe(e, t);
 		if (!c || !l) return null;
 		let u = Ie(e, t, n, s, l.operands);
 		if (!u) return null;
@@ -1022,68 +1022,68 @@ var J = [
 			field: t,
 			form: t === Z ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
-		return ze(c, l, e, u.items, u.records, u.values, d(e.rowFields), d(e.columnFields), u.n, i, o, r);
-	})(t, n, r, o, s, y, g) : void 0;
+		return ze(c, l, e, u.items, u.records, u.values, d(e.rowFields), d(e.columnFields), u.n, a, o, r);
+	})(e, t, n, r, a, v, d) : void 0;
 	return {
-		keep: s,
-		...y ? { records: y } : {},
-		...g ? { calculatedRecords: g } : {},
+		keep: a,
+		...v ? { records: v } : {},
+		...d ? { calculatedRecords: d } : {},
 		...x ? { fieldValues: x } : {}
 	};
 }, qe = (e, t) => {
 	let n = e.filters;
 	if (!n) return e;
-	let r = !1, i = n.map((e) => {
-		let n = e.condition && _(e.condition, t);
-		return n === e.condition ? e : (r = !0, {
+	let i = !1, a = n.map((e) => {
+		let n = e.condition && r(e.condition, t);
+		return n === e.condition ? e : (i = !0, {
 			...e,
 			condition: n
 		});
 	});
-	return r ? {
+	return i ? {
 		...e,
-		filters: i
+		filters: a
 	} : e;
-}, Je = async (e, t, n, i) => {
-	let a = t.length, o = new Uint8Array(a);
-	if (a === 0) return o;
-	let c = new s();
-	for (let e = 0; e < a; e++) t[e] !== null && c.setValueAt(e, 0, t[e]);
-	let l = !1;
-	return await r({
+}, Je = async (e, t, n, r) => {
+	let i = t.length, a = new Uint8Array(i);
+	if (i === 0) return a;
+	let o = new l();
+	for (let e = 0; e < i; e++) t[e] !== null && o.setValueAt(e, 0, t[e]);
+	let s = !1;
+	return await I({
 		conditions: [e],
 		runtime: n,
-		calculation: i ?? null,
-		values: c,
+		calculation: r ?? null,
+		values: o,
 		coords: {
 			rowStart: 0,
-			rowEnd: a - 1,
+			rowEnd: i - 1,
 			colStart: 0,
 			colEnd: 0
 		},
 		onTrue: (e) => {
-			l = !0, o[e.rowIndex] = 1;
+			s = !0, a[e.rowIndex] = 1;
 		},
 		onFalse: () => {
-			l = !0;
+			s = !0;
 		},
 		onBlank: (e) => {
-			l = !0;
-			for (let n = 0; n < a; n++) t[n] === null && e(n, 0) && (o[n] = 1);
+			s = !0;
+			for (let n = 0; n < i; n++) t[n] === null && e(n, 0) && (a[n] = 1);
 		}
-	}), l || o.fill(1), o;
+	}), s || a.fill(1), a;
 }, Ye = (e, t, n, r, i) => {
 	let a = e.fields?.[r], o = /* @__PURE__ */ new Map();
 	for (let e of a?.items ?? []) e.item !== void 0 && e.type === void 0 && e.name !== void 0 && o.set(e.item, e.name);
-	let s = a?.numberFormat ?? t.fields?.[r]?.numberFormat, l = j(s, i), u = (e) => s === void 0 ? j(L(t.fields?.[r], e), i) : l, d = Array(n.length);
+	let s = a?.numberFormat ?? t.fields?.[r]?.numberFormat, c = N(s, i), l = (e) => s === void 0 ? N(_(t.fields?.[r], e), i) : c, d = Array(n.length);
 	for (let e = 0; e < n.length; e++) {
 		let a = o.get(e);
 		if (a !== void 0) {
 			d[e] = a;
 			continue;
 		}
-		let s = c(n[e]);
-		s === null ? d[e] = O : typeof s == "number" ? d[e] = te(i, p(t.fields?.[r], e) ? u(e) : l, s) : typeof s == "boolean" ? d[e] = s ? "TRUE" : "FALSE" : G.isError(s) ? d[e] = s.getLabel() : d[e] = String(s);
+		let s = u(n[e]);
+		s === null ? d[e] = w : typeof s == "number" ? d[e] = te(i, k(t.fields?.[r], e) ? l(e) : c, s) : typeof s == "boolean" ? d[e] = s ? "TRUE" : "FALSE" : G.isError(s) ? d[e] = s.getLabel() : d[e] = String(s);
 	}
 	return d;
 }, Xe = (e) => {
@@ -1170,115 +1170,115 @@ var J = [
 } : G.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, nt = (e, t) => (t && typeof e == "number" ? "date:" : "") + D(c(e)), rt = (e, t, n, r = !1) => {
-	let a = e.fields ?? [], o = P(e.items, a.length), s = /\smissingItemsLimit="0"/.test(e.rest ?? ""), l = ((e) => {
+} : e, nt = (e, t) => (t && typeof e == "number" ? "date:" : "") + C(u(e)), rt = (t, n, r, i = !1) => {
+	let a = t.fields ?? [], o = R(t.items, a.length), s = /\smissingItemsLimit="0"/.test(t.rest ?? ""), c = ((e) => {
 		let t = /* @__PURE__ */ new Set();
 		return e.map((e, n) => {
 			let r = e === "" ? `Field${n + 1}` : e, i = r;
 			for (let e = 2; t.has(i.toLocaleLowerCase()); e++) i = `${r}${e}`;
 			return t.add(i.toLocaleLowerCase()), i;
 		});
-	})(t.columns.map((e) => e.header)), u = /* @__PURE__ */ new Map();
+	})(n.columns.map((e) => e.header)), l = /* @__PURE__ */ new Map();
 	a.forEach((e, t) => {
 		let n = e.name.toLocaleLowerCase();
-		e.noRecords || u.has(n) || u.set(n, t);
+		e.noRecords || l.has(n) || l.set(n, t);
 	});
-	let d = t.recordCount, f = a.map(() => -1), m = a.map((e, t) => o[t].map(() => -1)), h = [], g = [], _ = [], v = [], y = [], b = [], x = [], S = (e, t, n) => {
-		v[t] = n.items, b[t] = n.items.length, x[t] = !0, m[e] = ((e, t) => {
+	let d = n.recordCount, f = a.map(() => -1), p = a.map((e, t) => o[t].map(() => -1)), h = [], g = [], _ = [], v = [], y = [], b = [], x = [], S = (e, t, n) => {
+		v[t] = n.items, b[t] = n.items.length, x[t] = !0, p[e] = ((e, t) => {
 			let n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
 			}), e.map((r, i) => i === 0 ? 0 : i === e.length - 1 ? t.length - 1 : n.get(r) ?? -1);
 		})(a[e].group.items, n.items);
 	};
-	t.columns.forEach((e, t) => {
-		let n = u.get(l[t].toLocaleLowerCase());
-		n !== void 0 && (u.delete(l[t].toLocaleLowerCase()), f[n] = t);
-		let i = new Int32Array(e.values.length).fill(-1), C = [], w = [], T = Array(d);
-		for (let t = 0; t < d; t++) {
-			let n = e.ids[t], r = i[n];
-			r < 0 && (r = i[n] = C.length, C.push(tt(e.values[n])), w.push(e.dates || !!e.dateIds?.has(n))), T[t] = r;
+	n.columns.forEach((t, n) => {
+		let r = l.get(c[n].toLocaleLowerCase());
+		r !== void 0 && (l.delete(c[n].toLocaleLowerCase()), f[r] = n);
+		let m = new Int32Array(t.values.length).fill(-1), C = [], w = [], T = Array(d);
+		for (let e = 0; e < d; e++) {
+			let n = t.ids[e], r = m[n];
+			r < 0 && (r = m[n] = C.length, C.push(tt(t.values[n])), w.push(t.dates || !!t.dateIds?.has(n))), T[e] = r;
 		}
-		let E = (e) => n !== void 0 && (!!a[n].dates || p(a[n], e)), D = C.length, O = n === void 0 ? C.every((e) => typeof e == "number" || typeof e == "object" && e?.t === "z") : !0 === a[n].inline, k = [];
-		if (n !== void 0 && O) {
+		let E = (e) => r !== void 0 && (!!a[r].dates || k(a[r], e)), D = C.length, O = r === void 0 ? C.every((e) => typeof e == "number" || typeof e == "object" && e?.t === "z") : !0 === a[r].inline, A = [];
+		if (r !== void 0 && O) {
 			let e = /* @__PURE__ */ new Map();
 			for (let t = 0; t < D; t++) e.set(nt(C[t], w[t]), t);
-			o[n].forEach((t, r) => {
-				m[n][r] = e.get(nt(t, E(r))) ?? -1;
+			o[r].forEach((t, n) => {
+				p[r][n] = e.get(nt(t, E(n))) ?? -1;
 			});
-		} else if (n !== void 0) {
+		} else if (r !== void 0) {
 			let e = /* @__PURE__ */ new Map();
 			for (let t = 0; t < D; t++) e.set(nt(C[t], w[t]), t);
-			let t = new Set(a[n].calculatedItems?.map((e) => e.item));
-			o[n].forEach((r, i) => {
+			let t = new Set(a[r].calculatedItems?.map((e) => e.item));
+			o[r].forEach((n, i) => {
 				if (t.has(i)) return;
-				let a = nt(r, E(i)), o = e.get(a);
-				o !== void 0 || s || E(i) || (o = C.length, C.push(r), w.push(E(i)), k.push(o), e.set(a, o)), m[n][i] = o ?? -1;
+				let a = nt(n, E(i)), o = e.get(a);
+				o !== void 0 || s || E(i) || (o = C.length, C.push(n), w.push(E(i)), A.push(o), e.set(a, o)), p[r][i] = o ?? -1;
 			});
 		}
-		let j = { name: l[t] };
-		O && (j.inline = !0), e.numberFormat !== void 0 && (j.numberFormat = e.numberFormat);
+		let j = { name: c[n] };
+		O && (j.inline = !0), t.numberFormat !== void 0 && (j.numberFormat = t.numberFormat);
 		let M = [], N = !1;
 		C.forEach((e, t) => {
 			typeof e == "number" && (w[t] ? M.push(t) : N = !0);
-		}), M.length > 0 && !N ? j.dates = !0 : M.length > 0 && (j.dateItems = M), y[t] = j.dateItems ? new Set(j.dateItems) : void 0, k.length > 0 && (j.unused = k);
-		let P = n === void 0 ? void 0 : a[n].rest;
+		}), M.length > 0 && !N ? j.dates = !0 : M.length > 0 && (j.dateItems = M), y[n] = j.dateItems ? new Set(j.dateItems) : void 0, A.length > 0 && (j.unused = A);
+		let P = r === void 0 ? void 0 : a[r].rest;
 		P && (j.rest = P);
-		let F = n === void 0 ? void 0 : a[n].calculatedItems;
+		let F = r === void 0 ? void 0 : a[r].calculatedItems;
 		F?.length && (j.calculatedItems = F.map(({ item: e, formula: t }) => {
-			let r = C.length;
-			return C.push(o[n][e]), m[n][e] = r, {
-				item: r,
+			let n = C.length;
+			return C.push(o[r][e]), p[r][e] = n, {
+				item: n,
 				formula: t
 			};
-		})), h.push(j), g.push([t, [[0, C]]]), _.push([t, [[0, T]]]), v.push(C), b.push(D), x.push(!1);
-		let I = n === void 0 ? void 0 : a[n].group;
-		if (I?.range && I.base === n) {
-			let e = se(I, C.slice(0, D).map(c), r);
+		})), h.push(j), g.push([n, [[0, C]]]), _.push([n, [[0, T]]]), v.push(C), b.push(D), x.push(!1);
+		let I = r === void 0 ? void 0 : a[r].group;
+		if (I?.range && I.base === r) {
+			let e = se(I, C.slice(0, D).map(u), i);
 			e ? (j.group = {
 				...e,
-				base: t
-			}, S(n, t, e)) : m[n] = o[n].map(() => -1);
-		} else I && !A(a[n]) && (j.group = I);
+				base: n
+			}, S(r, n, e)) : p[r] = o[r].map(() => -1);
+		} else I && !e(a[r]) && (j.group = I);
 	}), a.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (i(e)) return f[t] = h.length, h.push(e), v.push([]), b.push(0), void x.push(!1);
+		if (m(e)) return f[t] = h.length, h.push(e), v.push([]), b.push(0), void x.push(!1);
 		let n = e.group;
 		if (!n) return;
-		let a = f[n.base];
-		if (a === void 0 || a < 0) return;
-		let o = v[a], s, l = [];
-		if (n.range) s = se(n, o.slice(0, b[a]).map(c), r);
+		let r = f[n.base];
+		if (r === void 0 || r < 0) return;
+		let a = v[r], o, s = [];
+		if (n.range) o = se(n, a.slice(0, b[r]).map(u), i);
 		else {
-			let e = it(n, m[n.base], o, h[a]);
-			s = e.group, l = e.itemMap;
+			let e = it(n, p[n.base], a, h[r]);
+			o = e.group, s = e.itemMap;
 		}
-		if (!s) return;
-		let u = h.length;
-		f[t] = u, h.push({
+		if (!o) return;
+		let c = h.length;
+		f[t] = c, h.push({
 			...e,
 			group: {
-				...s,
-				base: a
+				...o,
+				base: r
 			}
-		}), v.push(s.items), y[u] = s.dateItems ? new Set(s.dateItems) : void 0, b.push(s.items.length), x.push(!1), n.range ? S(t, u, s) : m[t] = l;
-	}), h.forEach((e, t) => {
-		let n = e.group;
-		if (n?.parent === void 0) return;
-		let r = f[n.parent], { parent: i, ...a } = n;
-		r !== void 0 && r >= 0 ? e.group = {
-			...n,
-			parent: r
-		} : A(e) ? e.group = a : delete e.group, e.group && !A(e) && (e.group = {
-			...e.group,
-			base: t
+		}), v.push(o.items), y[c] = o.dateItems ? new Set(o.dateItems) : void 0, b.push(o.items.length), x.push(!1), n.range ? S(t, c, o) : p[t] = s;
+	}), h.forEach((t, n) => {
+		let r = t.group;
+		if (r?.parent === void 0) return;
+		let i = f[r.parent], { parent: a, ...o } = r;
+		i !== void 0 && i >= 0 ? t.group = {
+			...r,
+			parent: i
+		} : e(t) ? t.group = o : delete t.group, t.group && !e(t) && (t.group = {
+			...t.group,
+			base: n
 		});
 	});
-	let { cacheId: C, part: w, partFormats: T, fields: E, items: D, records: O, ...k } = e;
+	let { cacheId: C, part: w, partFormats: T, fields: E, items: D, records: O, ...A } = t;
 	return {
 		model: {
-			...k,
-			source: n ?? e.source,
+			...A,
+			source: r ?? t.source,
 			fields: h,
 			items: g,
 			records: _,
@@ -1286,7 +1286,7 @@ var J = [
 		},
 		remap: {
 			fields: f,
-			items: m,
+			items: p,
 			newItems: v,
 			usedCounts: b,
 			inItemOrder: x,
@@ -1299,7 +1299,7 @@ var J = [
 		let r = t?.[n] ?? -1;
 		r < 0 || (a[r] = e, i.add(e));
 	});
-	let o = [], s = [], c = new Set(e.dateItems), l = e.items.map((e, t) => i.has(t) ? (c.has(t) && s.push(o.length), o.push(e), o.length - 1) : -1), u = a.map((e, t) => e >= 0 ? l[e] : ((r.dates || p(r, t)) && s.push(o.length), o.push(n[t]), o.length - 1)), { dateItems: d, ...f } = e;
+	let o = [], s = [], c = new Set(e.dateItems), l = e.items.map((e, t) => i.has(t) ? (c.has(t) && s.push(o.length), o.push(e), o.length - 1) : -1), u = a.map((e, t) => e >= 0 ? l[e] : ((r.dates || k(r, t)) && s.push(o.length), o.push(n[t]), o.length - 1)), { dateItems: d, ...f } = e;
 	return {
 		group: {
 			...f,
@@ -1415,16 +1415,16 @@ var J = [
 	return Q(f, "conditionalFormats", _.length > 0 ? _ : void 0), f;
 }, Q = (e, t, n) => {
 	n === void 0 ? delete e[t] : e[t] = n;
-}, st = (e, t, n, r, i = !1, a) => {
-	let s = e.items ?? [], u = [], d = [], f = /* @__PURE__ */ new Set();
+}, st = (e, t, n, r, i = !1, o) => {
+	let s = e.items ?? [], c = [], l = [], f = /* @__PURE__ */ new Set();
 	for (let e of s) {
-		if (!o(e)) {
-			d.push(u.length), u.push(e);
+		if (!a(e)) {
+			l.push(c.length), c.push(e);
 			continue;
 		}
 		let n = t[e.item] ?? -1;
 		if (n < 0) {
-			d.push(-1);
+			l.push(-1);
 			continue;
 		}
 		f.add(n);
@@ -1432,57 +1432,57 @@ var J = [
 			...e,
 			item: n
 		};
-		n >= r && !e.calculated ? i.missing = !0 : delete i.missing, d.push(u.length), u.push(i);
+		n >= r && !e.calculated ? i.missing = !0 : delete i.missing, l.push(c.length), c.push(i);
 	}
 	let p = [];
 	for (let e = 0; e < n.length; e++) f.has(e) || p.push(e);
 	if (i) {
-		let t = e.sort?.dataField === void 0 && e.sort?.order === "descending", n = !e.includeNewItemsInFilter && s.some((e) => e.hidden), r = u.map((e, t) => ({
+		let t = e.sort?.dataField === void 0 && e.sort?.order === "descending", n = !e.includeNewItemsInFilter && s.some((e) => e.hidden), r = c.map((e, t) => ({
 			item: e,
 			at: t
-		})), i = r.filter((e) => !o(e.item)), a = [...[...r.filter((e) => o(e.item)), ...p.map((e) => ({
+		})), i = r.filter((e) => !a(e.item)), o = [...[...r.filter((e) => a(e.item)), ...p.map((e) => ({
 			item: n ? {
 				item: e,
 				hidden: !0
 			} : { item: e },
 			at: -1
-		}))].sort((e, n) => t ? n.item.item - e.item.item : e.item.item - n.item.item), ...i], c = new Map(a.map((e, t) => [e.at, t]));
+		}))].sort((e, n) => t ? n.item.item - e.item.item : e.item.item - n.item.item), ...i], u = new Map(o.map((e, t) => [e.at, t]));
 		return {
-			items: a.map((e) => e.item),
-			positions: d.map((e) => e < 0 ? e : c.get(e) ?? -1)
+			items: o.map((e) => e.item),
+			positions: l.map((e) => e < 0 ? e : u.get(e) ?? -1)
 		};
 	}
 	if (p.length === 0) return {
-		items: u,
-		positions: d
+		items: c,
+		positions: l
 	};
 	let m = !e.includeNewItemsInFilter && s.some((e) => e.hidden), h = (e) => m ? {
 		item: e,
 		hidden: !0
 	} : { item: e };
 	if (e.sort && e.sort.dataField === void 0) {
-		let t = e.sort.order === "descending", r = (e, t) => at(l(e, n), c(n[t]), e.name === void 0 && a?.has(e.item), a?.has(t));
+		let t = e.sort.order === "descending", r = (e, t) => at(d(e, n), u(n[t]), e.name === void 0 && o?.has(e.item), o?.has(t));
 		for (let e of p) {
-			let n = h(e), i = u.findIndex((n) => o(n) && (t ? r(n, e) < 0 : r(n, e) > 0));
-			i < 0 && (i = ct(u)), u.splice(i, 0, n);
-			for (let e = 0; e < d.length; e++) d[e] >= i && d[e]++;
+			let n = h(e), i = c.findIndex((n) => a(n) && (t ? r(n, e) < 0 : r(n, e) > 0));
+			i < 0 && (i = ct(c)), c.splice(i, 0, n);
+			for (let e = 0; e < l.length; e++) l[e] >= i && l[e]++;
 		}
 	} else {
-		let e = ct(u);
-		u.splice(e, 0, ...p.map(h));
-		for (let t = 0; t < d.length; t++) d[t] >= e && (d[t] += p.length);
+		let e = ct(c);
+		c.splice(e, 0, ...p.map(h));
+		for (let t = 0; t < l.length; t++) l[t] >= e && (l[t] += p.length);
 	}
 	return {
-		items: u,
-		positions: d
+		items: c,
+		positions: l
 	};
 }, ct = (e) => {
-	let t = e.findIndex((e) => !o(e));
+	let t = e.findIndex((e) => !a(e));
 	return t < 0 ? e.length : t;
 }, lt = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		let r = (t + n) % e.length, i = e[r];
-		if (o(i) && !i.missing) return r;
+		if (a(i) && !i.missing) return r;
 	}
 }, ut = (e, t, n, r, i) => {
 	let a = { ...e };
@@ -1557,42 +1557,42 @@ var J = [
 		areas: e.areas.map(l)
 	}))), o;
 }, ft = (e, t, n, r) => {
-	let i = (e.fields ?? [])[n]?.items ?? [], a = f(t)[n] ?? [], s = t.fields?.[n], c = s?.group?.range !== void 0, u = (e) => e.name === void 0 && p(s, e.item), d = i.map((e, t) => ({
+	let i = (e.fields ?? [])[n]?.items ?? [], o = h(t)[n] ?? [], s = t.fields?.[n], c = s?.group?.range !== void 0, l = (e) => e.name === void 0 && k(s, e.item), u = i.map((e, t) => ({
 		item: e,
 		at: t
-	})), m = d.filter((e) => o(e.item));
-	m.sort((e, t) => c ? e.item.item - t.item.item : at(l(e.item, a), l(t.item, a), u(e.item), u(t.item))), r === "descending" && m.reverse();
-	let h = 0, g = dt(e, n, d.map((e) => o(e.item) ? m[h++] : e).map((e) => e.at));
+	})), f = u.filter((e) => a(e.item));
+	f.sort((e, t) => c ? e.item.item - t.item.item : at(d(e.item, o), d(t.item, o), l(e.item), l(t.item))), r === "descending" && f.reverse();
+	let p = 0, m = dt(e, n, u.map((e) => a(e.item) ? f[p++] : e).map((e) => e.at));
 	return {
-		...g,
-		fields: g.fields.map((e, t) => t === n ? {
+		...m,
+		fields: m.fields.map((e, t) => t === n ? {
 			...e,
 			sort: { order: r }
 		} : e)
 	};
 }, pt = (e, t, n) => {
 	let r = e.fields?.[t]?.items?.[n];
-	if (!r || !o(r)) throw new K(q("error.pivotTable.changePart"));
+	if (!r || !a(r)) throw new K(q("error.pivotTable.changePart"));
 	return r;
 }, mt = (e, t, n, r, i) => {
-	let a = pt(e, n, r), s = e.fields[n].items, l = f(t)[n] ?? [], d = (e) => {
-		let t = c(l[e.item]);
-		return t === null ? O : u(t);
+	let o = pt(e, n, r), s = e.fields[n].items, c = h(t)[n] ?? [], l = (e) => {
+		let t = u(c[e.item]);
+		return t === null ? w : g(t);
 	};
-	if (s.some((e, t) => t !== r && o(e) && k(e.name ?? d(e), i))) throw new K(q("error.pivotTable.itemNameExists", { name: i }));
-	let { name: p, ...m } = a, h = i === d(a) ? m : {
-		...a,
+	if (s.some((e, t) => t !== r && a(e) && f(e.name ?? l(e), i))) throw new K(q("error.pivotTable.itemNameExists", { name: i }));
+	let { name: d, ...p } = o, m = i === l(o) ? p : {
+		...o,
 		name: i
 	};
-	if (h.name === a.name) return e;
-	let g = {
+	if (m.name === o.name) return e;
+	let _ = {
 		...e,
 		fields: e.fields.map((e, t) => t === n ? {
 			...e,
-			items: s.map((e, t) => t === r ? h : e)
+			items: s.map((e, t) => t === r ? m : e)
 		} : e)
-	}, _ = e.fields[n].sort;
-	return _ && _.dataField === void 0 ? ft(g, t, n, _.order) : g;
+	}, v = e.fields[n].sort;
+	return v && v.dataField === void 0 ? ft(_, t, n, v.order) : _;
 }, ht = (e, t, n, r) => {
 	pt(e, t, n);
 	let i = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
@@ -1609,36 +1609,36 @@ var J = [
 		})
 	} : o;
 }, gt = (e, t, n, r) => {
-	let i = u(r), a = e.fields, s = t.fields, l = e.dataFields ?? [], d = f(t), p = (e, t) => {
+	let i = g(r), s = e.fields, c = t.fields, l = e.dataFields ?? [], d = h(t), p = (e, t) => {
 		if (t.name !== void 0) return t.name;
-		let n = c(d[e][t.item]);
-		return n === null ? O : u(n);
+		let n = u(d[e][t.item]);
+		return n === null ? w : g(n);
 	}, m = (n) => {
-		if (n.field !== void 0 && i === (a[n.field].name ?? s[n.field].name)) return;
+		if (n.field !== void 0 && i === (s[n.field].name ?? c[n.field].name)) return;
 		let r = n.field === void 0 ? e : {
 			...e,
-			fields: a.map((e, t) => t === n.field ? {
+			fields: s.map((e, t) => t === n.field ? {
 				...e,
 				name: "\0"
 			} : e)
 		};
-		if (v(r, t, i, n.data) !== i) throw new K(q("error.pivotTable.fieldNameExists"));
+		if (o(r, t, i, n.data) !== i) throw new K(q("error.pivotTable.fieldNameExists"));
 	};
 	switch (n.kind) {
 		case "item": {
-			let { field: r, rank: s } = n;
-			pt(e, r, s);
-			let c = a[r].items.findIndex((e, t) => t !== s && o(e) && k(p(r, e), i));
-			return c >= 0 ? ht(e, r, c, s) : mt(e, t, r, s, i);
+			let { field: r, rank: o } = n;
+			pt(e, r, o);
+			let c = s[r].items.findIndex((e, t) => t !== o && a(e) && f(p(r, e), i));
+			return c >= 0 ? ht(e, r, c, o) : mt(e, t, r, o, i);
 		}
 		case "fieldCaption": {
 			let { field: t } = n;
 			return m({ field: t }), ((t, n) => ({
 				...e,
-				fields: a.map((e, r) => r === t ? n(e) : e)
+				fields: s.map((e, r) => r === t ? n(e) : e)
 			}))(t, (e) => {
 				let { name: n, ...r } = e;
-				return i === s[t].name ? r : {
+				return i === c[t].name ? r : {
 					...e,
 					name: i
 				};
@@ -1667,11 +1667,11 @@ var J = [
 			grandTotalCaption: i
 		};
 		case "pageItem": {
-			let t = e.pageFields, r = t[n.page], s;
-			if (!k(i, "(All)") && (s = (a[r.field].items ?? []).findIndex((e) => o(e) && k(p(r.field, e), i)), s < 0)) throw new K(q("error.pivotTable.notAnItem", { name: i }));
-			let { item: c, ...l } = r, u = s === void 0 ? l : {
+			let t = e.pageFields, r = t[n.page], o;
+			if (!f(i, "(All)") && (o = (s[r.field].items ?? []).findIndex((e) => a(e) && f(p(r.field, e), i)), o < 0)) throw new K(q("error.pivotTable.notAnItem", { name: i }));
+			let { item: c, ...l } = r, u = o === void 0 ? l : {
 				...r,
-				item: s
+				item: o
 			};
 			return {
 				...e,
@@ -1693,33 +1693,33 @@ var J = [
 	...e.rowFields ?? [],
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
-].filter((e) => e >= 0), bt = (e, t) => {
-	let n = e.fields[t], r = f(e)[t], i = r.map((e, t) => t);
-	A(n) || i.sort((e, t) => at(c(r[e]), c(r[t]), p(n, e), p(n, t)));
-	let a = new Set(n.calculatedItems?.map((e) => e.item)), o = new Set(n.unused);
-	return [...i.map((e) => ({
+].filter((e) => e >= 0), bt = (t, n) => {
+	let r = t.fields[n], i = h(t)[n], a = i.map((e, t) => t);
+	e(r) || a.sort((e, t) => at(u(i[e]), u(i[t]), k(r, e), k(r, t)));
+	let o = new Set(r.calculatedItems?.map((e) => e.item)), s = new Set(r.unused);
+	return [...a.map((e) => ({
 		item: e,
-		...a.has(e) ? { calculated: !0 } : {},
-		...o.has(e) ? { missing: !0 } : {}
+		...o.has(e) ? { calculated: !0 } : {},
+		...s.has(e) ? { missing: !0 } : {}
 	})), { type: "default" }];
 }, xt = (e) => {
 	if (!(typeof e == "number" ? B(e) !== void 0 : e !== "" && V.isValidFormat(e))) throw new K(q("error.pivotTable.notANumberFormat", { name: String(e) }));
-}, St = (e, t, n, r) => {
-	let i = r?.function ?? ((e, t) => C(e, t) === "number" ? "sum" : "count")(t.fields[n], f(t)[n]), a = S[i];
-	if (!a) throw new K(q("error.pivotTable.notAFunction", { name: i }));
-	let o = r?.name;
-	if (o === void 0) o = v(e, t, `${a} of ${g(e, t, n)}`);
-	else if (v(e, t, o) !== o) throw new K(q("error.pivotTable.fieldNameExists"));
-	let s = {
-		name: o,
-		field: n,
+}, St = (e, t, r, i) => {
+	let a = i?.function ?? ((e, t) => L(e, t) === "number" ? "sum" : "count")(t.fields[r], h(t)[r]), s = P[a];
+	if (!s) throw new K(q("error.pivotTable.notAFunction", { name: a }));
+	let c = i?.name;
+	if (c === void 0) c = o(e, t, `${s} of ${n(e, t, r)}`);
+	else if (o(e, t, c) !== c) throw new K(q("error.pivotTable.fieldNameExists"));
+	let l = {
+		name: c,
+		field: r,
 		baseField: 0,
 		baseItem: 0
 	};
-	return i !== "sum" && (s.subtotal = i), r?.numberFormat !== void 0 && (xt(r.numberFormat), s.numberFormat = r.numberFormat), s;
+	return a !== "sum" && (l.subtotal = a), i?.numberFormat !== void 0 && (xt(i.numberFormat), l.numberFormat = i.numberFormat), l;
 }, Ct = (e, t) => {
 	let n = e.fields ?? [], r = (e) => {
-		let t = n.findIndex((t) => k(t.name, e));
+		let t = n.findIndex((t) => f(t.name, e));
 		if (t < 0) throw new K(q("error.pivotTable.notAField", { name: e }));
 		return t;
 	}, i = /* @__PURE__ */ new Map(), a = (e, t) => {
@@ -1739,7 +1739,7 @@ var J = [
 		return a && (r.axis = a, r.items = bt(e, n)), c.has(n) && (r.dataField = !0), l && (r.form = l), t.dates && t.numberFormat !== void 0 && (r.numberFormat = t.numberFormat), r;
 	}), d = o("column");
 	s.length > 1 && d.push(-2);
-	let f = {
+	let p = {
 		fields: u,
 		style: {
 			name: t?.style ?? "PivotStyleLight16",
@@ -1749,14 +1749,14 @@ var J = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, p = o("row");
-	p.length > 0 && (f.rowFields = p), d.length > 0 && (f.columnFields = d);
-	let m = o("page");
-	return m.length > 0 && (f.pageFields = m.map((e) => ({ field: e }))), s.length > 0 && (f.dataFields = s), l && (f.form = l), f;
+	}, m = o("row");
+	m.length > 0 && (p.rowFields = m), d.length > 0 && (p.columnFields = d);
+	let h = o("page");
+	return h.length > 0 && (p.pageFields = h.map((e) => ({ field: e }))), s.length > 0 && (p.dataFields = s), l && (p.form = l), p;
 }, wt = (e, t) => t.map((t) => {
 	let n = t.sort?.scope;
 	if (!n) return t;
-	let r = ((t.axis === b.Axis.Row ? e.columnFields : t.axis === b.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => e !== -2);
+	let r = ((t.axis === c.Axis.Row ? e.columnFields : t.axis === c.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => e !== -2);
 	if (!n.items.every((e, t) => r[t] === e.field)) {
 		let { sort: e, ...n } = t;
 		return n;
@@ -1772,38 +1772,38 @@ var J = [
 			} : a
 		}
 	};
-}), Tt = (e, r, i, a, o) => {
-	let s = b.Axis, c = r.fields?.[i], l = e.fields?.[i]?.axis ?? null;
-	if (a === s.Values) throw new K(q("error.pivotTable.valuesNotAnAxis"));
-	if (a === null) {
-		if (l === null) return e;
-	} else if (c?.formula !== void 0 || a === s.Page && (c?.calculatedItems?.length ?? 0) > 0) throw new K(q("error.pivotTable.fieldNotPlaceable"));
-	let u = a ? n(e, a).filter((e) => e !== i) : [];
-	if (o !== void 0 && (!Number.isInteger(o) || o < 1 || o > u.length + 1)) throw new K(q("error.pivotTable.fieldPosition"));
-	let d = (o ?? u.length + 1) - 1;
-	if (a === l && (o === void 0 || n(e, a)[d] === i)) return e;
-	u.splice(d, 0, i);
-	let { rowFields: f, columnFields: p, pageFields: m, ...g } = e, _ = {}, v = (e) => (e ?? []).filter((e) => e !== i), y = a === s.Row ? u : v(e.rowFields), x = a === s.Column ? u : v(e.columnFields), S = a === s.Page ? u.map((t) => e.pageFields?.find((e) => e.field === t) ?? { field: t }) : (e.pageFields ?? []).filter((e) => e.field !== i);
-	y.length > 0 && (_.rowFields = y), x.length > 0 && (_.columnFields = x), S.length > 0 && (_.pageFields = S);
-	let C = {
-		...g,
-		..._
+}), Tt = (e, t, n, r, i) => {
+	let a = c.Axis, o = t.fields?.[n], s = e.fields?.[n]?.axis ?? null;
+	if (r === a.Values) throw new K(q("error.pivotTable.valuesNotAnAxis"));
+	if (r === null) {
+		if (s === null) return e;
+	} else if (o?.formula !== void 0 || r === a.Page && (o?.calculatedItems?.length ?? 0) > 0) throw new K(q("error.pivotTable.fieldNotPlaceable"));
+	let l = r ? F(e, r).filter((e) => e !== n) : [];
+	if (i !== void 0 && (!Number.isInteger(i) || i < 1 || i > l.length + 1)) throw new K(q("error.pivotTable.fieldPosition"));
+	let u = (i ?? l.length + 1) - 1;
+	if (r === s && (i === void 0 || F(e, r)[u] === n)) return e;
+	l.splice(u, 0, n);
+	let { rowFields: d, columnFields: f, pageFields: p, ...m } = e, h = {}, g = (e) => (e ?? []).filter((e) => e !== n), _ = r === a.Row ? l : g(e.rowFields), v = r === a.Column ? l : g(e.columnFields), y = r === a.Page ? l.map((t) => e.pageFields?.find((e) => e.field === t) ?? { field: t }) : (e.pageFields ?? []).filter((e) => e.field !== n);
+	_.length > 0 && (h.rowFields = _), v.length > 0 && (h.columnFields = v), y.length > 0 && (h.pageFields = y);
+	let x = {
+		...m,
+		...h
 	};
-	a === s.Page && l !== s.Page && (C = h(C, i, () => !0));
-	let w = { ...e.fields?.[i] };
-	a ? w.axis = a : delete w.axis, a && !w.items && c && (w.items = t(bt(r, i), w.subtotals)), a && w.numberFormat === void 0 && c?.dates && c.numberFormat !== void 0 && (w.numberFormat = c.numberFormat), a === s.Page && w.items?.some((e) => e.hidden) && (w.multipleItemSelection = !0);
-	let T = (e.fields ?? []).map((e, t) => t === i ? w : e);
-	if (C = {
-		...C,
-		fields: wt(C, T)
-	}, a === null && e.formats?.some((e) => e.area.references?.some((e) => e.field === i))) {
-		let t = e.formats.filter((e) => !e.area.references?.some((e) => e.field === i)), { formats: n, ...r } = C;
-		C = t.length > 0 ? {
-			...r,
+	r === a.Page && s !== a.Page && (x = ee(x, n, () => !0));
+	let S = { ...e.fields?.[n] };
+	r ? S.axis = r : delete S.axis, r && !S.items && o && (S.items = b(bt(t, n), S.subtotals)), r && S.numberFormat === void 0 && o?.dates && o.numberFormat !== void 0 && (S.numberFormat = o.numberFormat), r === a.Page && S.items?.some((e) => e.hidden) && (S.multipleItemSelection = !0);
+	let C = (e.fields ?? []).map((e, t) => t === n ? S : e);
+	if (x = {
+		...x,
+		fields: wt(x, C)
+	}, r === null && e.formats?.some((e) => e.area.references?.some((e) => e.field === n))) {
+		let t = e.formats.filter((e) => !e.area.references?.some((e) => e.field === n)), { formats: r, ...i } = x;
+		x = t.length > 0 ? {
+			...i,
 			formats: t
-		} : r;
+		} : i;
 	}
-	return C;
+	return x;
 }, $ = -2, Et = /* @__PURE__ */ new Set([
 	"percentOfTotal",
 	"percentOfRow",
@@ -1825,7 +1825,7 @@ var J = [
 	"difference"
 ]), kt = (e, t, n) => {
 	if (Dt.has(n)) return Dt.has(t) ? e : void 0;
-	let r = ((e) => F(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
+	let r = ((e) => v(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
 	return Et.has(n) ? Et.has(t) || r ? e : 10 : Et.has(t) && r ? void 0 : e;
 }, At = (e, t) => {
 	let n = e.references?.length === 1 ? e.references[0] : null;
@@ -1936,7 +1936,7 @@ var J = [
 		a[e] = t;
 	}), Pt(e, i.map((e) => r[e]), a);
 }, Rt = (e, t, n, r) => {
-	let i = R(e, t, n, r);
+	let i = T(e, t, n, r);
 	return (e.dataFields[n].subtotal ?? "sum") === r ? e : Mt(e, n, (e) => {
 		let { subtotal: t, ...n } = e, a = {
 			...n,
@@ -1944,37 +1944,37 @@ var J = [
 		};
 		return r !== "sum" && (a.subtotal = r), a;
 	});
-}, zt = (e, t, n, r) => {
-	let i = e.dataFields[n], a = i.showDataAs ?? "normal", o = r?.kind ?? "normal";
-	if (r && !Ot.has(r.kind)) throw new K(q("error.pivotTable.notAShowAs", { name: r.kind }));
-	let { showDataAs: s, baseField: c, baseItem: l, ...u } = i, f = { ...u };
-	o !== "normal" && (f.showDataAs = o);
-	let p = i.baseField, m = i.baseItem;
-	if (r?.baseField !== void 0) {
-		let n = r.baseField, i = (t.fields ?? []).findIndex((r, i) => k(g(e, t, i), n));
-		if (i < 0) throw new K(q("error.pivotTable.notAField", { name: n }));
-		i !== p && (p = i, m = 0);
+}, zt = (e, t, r, i) => {
+	let a = e.dataFields[r], o = a.showDataAs ?? "normal", s = i?.kind ?? "normal";
+	if (i && !Ot.has(i.kind)) throw new K(q("error.pivotTable.notAShowAs", { name: i.kind }));
+	let { showDataAs: c, baseField: l, baseItem: u, ...d } = a, m = { ...d };
+	s !== "normal" && (m.showDataAs = s);
+	let h = a.baseField, g = a.baseItem;
+	if (i?.baseField !== void 0) {
+		let r = i.baseField, a = (t.fields ?? []).findIndex((i, a) => f(n(e, t, a), r));
+		if (a < 0) throw new K(q("error.pivotTable.notAField", { name: r }));
+		a !== h && (h = a, g = 0);
 	}
-	if (r?.baseItem !== void 0) {
-		let n = p ?? 0;
-		if (k(r.baseItem, "(previous)")) m = "previous";
-		else if (k(r.baseItem, "(next)")) m = "next";
+	if (i?.baseItem !== void 0) {
+		let n = h ?? 0;
+		if (f(i.baseItem, "(previous)")) g = "previous";
+		else if (f(i.baseItem, "(next)")) g = "next";
 		else {
-			let i = e.fields?.[n]?.items ? e : { fields: (e.fields ?? []).map((e, r) => r === n ? {
+			let r = e.fields?.[n]?.items ? e : { fields: (e.fields ?? []).map((e, r) => r === n ? {
 				...e,
 				items: bt(t, n)
-			} : e) }, a = d(i, t, n).findIndex((e) => e !== null && k(e, r.baseItem));
-			if (a < 0) throw new K(q("error.pivotTable.notAnItem", { name: r.baseItem }));
-			m = a;
+			} : e) }, a = p(r, t, n).findIndex((e) => e !== null && f(e, i.baseItem));
+			if (a < 0) throw new K(q("error.pivotTable.notAnItem", { name: i.baseItem }));
+			g = a;
 		}
 	}
-	if (p !== void 0 && (f.baseField = p), m !== void 0 && (f.baseItem = m), o === a) return f.baseField === i.baseField && f.baseItem === i.baseItem ? e : Mt(e, n, () => f);
-	let h = kt(i.numberFormat, a, o);
-	return h === i.numberFormat ? Mt(e, n, () => f) : Mt(jt(e, n), n, () => Nt(f, h));
+	if (h !== void 0 && (m.baseField = h), g !== void 0 && (m.baseItem = g), s === o) return m.baseField === a.baseField && m.baseItem === a.baseItem ? e : Mt(e, r, () => m);
+	let _ = kt(a.numberFormat, o, s);
+	return _ === a.numberFormat ? Mt(e, r, () => m) : Mt(jt(e, r), r, () => Nt(m, _));
 }, Bt = (e, t, n) => {
 	xt(n);
-	let r = F(n), i = e.dataFields[t], a = e.formats?.[e.formats.length - 1];
-	if (F(i.numberFormat) === r && a && At(a.area, t) && a.style.numberFormat === r) return e;
+	let r = v(n), i = e.dataFields[t], a = e.formats?.[e.formats.length - 1];
+	if (v(i.numberFormat) === r && a && At(a.area, t) && a.style.numberFormat === r) return e;
 	let o = Mt(jt(e, t), t, (e) => Nt(e, r === "General" ? void 0 : n));
 	return {
 		...o,
@@ -1989,29 +1989,29 @@ var J = [
 			}
 		}]
 	};
-}, Vt = (e, t, r) => {
+}, Vt = (e, t, n) => {
 	if (t === null) return It(e);
-	let i = b.Axis;
-	if (t !== i.Row && t !== i.Column) throw new K(q("error.pivotTable.fieldNotPlaceable"));
-	let a = e.rowFields?.includes($) ? i.Row : e.columnFields?.includes($) ? i.Column : null;
-	if (!a) throw new K(q("error.pivotTable.fieldPosition"));
-	let o = n(e, t).filter((e) => e !== $);
-	if (r !== void 0 && (!Number.isInteger(r) || r < 1 || r > o.length + 1)) throw new K(q("error.pivotTable.fieldPosition"));
-	let s = (r ?? o.length + 1) - 1;
-	if (t === a && (r === void 0 || n(e, t)[s] === $)) return e;
-	o.splice(s, 0, $);
-	let { rowFields: c, columnFields: l, valuesOnRows: u, ...d } = e, f = n(e, t === i.Row ? i.Column : i.Row).filter((e) => e !== $), p = { ...d }, m = t === i.Row ? o : f, h = t === i.Column ? o : f;
-	return m.length > 0 && (p.rowFields = [...m]), h.length > 0 && (p.columnFields = [...h]), t === i.Row && (p.valuesOnRows = !0), p;
+	let r = c.Axis;
+	if (t !== r.Row && t !== r.Column) throw new K(q("error.pivotTable.fieldNotPlaceable"));
+	let i = e.rowFields?.includes($) ? r.Row : e.columnFields?.includes($) ? r.Column : null;
+	if (!i) throw new K(q("error.pivotTable.fieldPosition"));
+	let a = F(e, t).filter((e) => e !== $);
+	if (n !== void 0 && (!Number.isInteger(n) || n < 1 || n > a.length + 1)) throw new K(q("error.pivotTable.fieldPosition"));
+	let o = (n ?? a.length + 1) - 1;
+	if (t === i && (n === void 0 || F(e, t)[o] === $)) return e;
+	a.splice(o, 0, $);
+	let { rowFields: s, columnFields: l, valuesOnRows: u, ...d } = e, f = F(e, t === r.Row ? r.Column : r.Row).filter((e) => e !== $), p = { ...d }, m = t === r.Row ? a : f, h = t === r.Column ? a : f;
+	return m.length > 0 && (p.rowFields = [...m]), h.length > 0 && (p.columnFields = [...h]), t === r.Row && (p.valuesOnRows = !0), p;
 }, Ht = (e, t, n) => {
 	if (n === (e.valuesCaption ?? "Values")) return e;
 	let { valuesCaption: r, ...i } = e, a = {
 		...i,
 		valuesCaption: "\0"
 	};
-	if (v(a, t, n) !== n) throw new K(q("error.pivotTable.fieldNameExists"));
+	if (o(a, t, n) !== n) throw new K(q("error.pivotTable.fieldNameExists"));
 	return n === "Values" ? i : {
 		...i,
 		valuesCaption: n
 	};
 };
-export { Ft as addPivotDataField, qe as anchorPivotPeriods, xt as assertNumberFormat, yt as axisFieldsOf, Ge as buildPivotView, Ke as evaluatePivotFilters, e as isItemFilter, Fe as layOutPivot, bt as listedItemsOf, Lt as movePivotDataField, Tt as movePivotField, ht as movePivotItem, Vt as movePivotValues, _t as newPivotCache, Ct as newPivotTable, Xe as readPivotSource, rt as refreshPivotCache, ot as remapPivotTable, It as removePivotDataField, mt as renamePivotItem, Ht as renamePivotValues, dt as reorderPivotItems, Rt as setPivotDataFunction, Bt as setPivotDataNumberFormat, zt as setPivotDataShowAs, ft as sortPivotItemsByLabel, gt as typeOverPivot, vt as withListedFields };
+export { Ft as addPivotDataField, qe as anchorPivotPeriods, xt as assertNumberFormat, yt as axisFieldsOf, Ge as buildPivotView, Ke as evaluatePivotFilters, O as isItemFilter, Fe as layOutPivot, bt as listedItemsOf, Lt as movePivotDataField, Tt as movePivotField, ht as movePivotItem, Vt as movePivotValues, _t as newPivotCache, Ct as newPivotTable, Xe as readPivotSource, rt as refreshPivotCache, ot as remapPivotTable, It as removePivotDataField, mt as renamePivotItem, Ht as renamePivotValues, dt as reorderPivotItems, Rt as setPivotDataFunction, Bt as setPivotDataNumberFormat, zt as setPivotDataShowAs, ft as sortPivotItemsByLabel, gt as typeOverPivot, vt as withListedFields };