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

package/node/esm/{BoLecFnIxhYKGor-.mjs → Cf-cK3yPe9bjK6o2.mjs}

@@ -1,14 +1,14 @@
 /**
-* @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 s, Ea as o, En as l, Fa as i, Fn as a, In as d, Ln as u, Mn as c, Nn as f, On as m, Pn as p, Rn as h, Sn as g, Sr as w, Tn as v, Un as F, Vn as b, Ya as y, _n as I, bn as x, cn as A, dn as C, fn as E, gi as S, gn as k, jn as T, kn as P, ln as R, pn as O, un as _, vn as $, wn as L, wr as D, xn as V, yn as U, zn as H } from "./Cb1-r2RCxcJZB6fM.mjs";
-import { Mt as B, Vt as z, _t as G, vt as j } from "./D51xu0rubo34Ppeg.mjs";
-import { c as q, i as K, r as Q, s as J, t as W } from "./DfbVTAhNutxM74E8.mjs";
-import { FormulaError as Y } from "@sheetxl/primitives";
-import { ExpectedError as X, t as Z } from "@sheetxl/utils";
+import { An as e, Bn as t, Cn as n, Cr as r, Da as s, Dn as o, En as l, Fn as i, Hn as a, Ia as d, In as u, Ln as c, Mn as f, Nn as m, On as p, Pn as h, Rn as g, Sn as w, Tn as v, Tr as F, Vn as b, Wn as y, Xa as I, _i as x, _n as A, bn as C, dn as E, fn as S, jn as T, kn as P, ln as R, mn as _, pn as N, un as O, vn as $, wn as L, wr as D, xn as V, yn as U, zn as H } from "./CpvUwhAeDmdEpdR-.mjs";
+import { Mt as B, Vt as z, _t as G, vt as j } from "./yVJ2lEYZob1gwiRZ.mjs";
+import { c as q, i as K, r as Q, s as W, t as J } from "./CTWihjVB5uFX7U4j.mjs";
+import { FormulaError as X } from "@sheetxl/primitives";
+import { ExpectedError as Y, t as Z } from "@sheetxl/utils";
 var ee = [
 	"Jan",
 	"Feb",
@@ -60,27 +60,27 @@ var ee = [
 		case "seconds": return o.second + 1;
 		default: return null;
 	}
-}, re = (e, t) => {
-	const n = e.fields ?? [], r = $(e.records, n.length);
-	if (!n.some(P)) return r;
-	const s = $(e.items, n.length), o = e.recordCount ?? 0, l = r.slice();
-	for (let e = 0; e < n.length; e++) {
-		const i = n[e];
-		if (!P(i)) continue;
-		const d = i.group, u = r[d.base] ?? [], c = s[d.base] ?? [], f = new Int32Array(c.length);
-		for (let e = 0; e < c.length; e++) {
-			const n = d.range ? ne(d.range, d.items.length, a(c[e]), t) : d.discrete?.[e] ?? null;
-			f[e] = n ?? -1;
+}, re = (t, n) => {
+	const r = t.fields ?? [], s = U(t.records, r.length);
+	if (!r.some(e)) return s;
+	const o = U(t.items, r.length), l = t.recordCount ?? 0, i = s.slice();
+	for (let t = 0; t < r.length; t++) {
+		const a = r[t];
+		if (!e(a)) continue;
+		const d = a.group, c = s[d.base] ?? [], f = o[d.base] ?? [], m = new Int32Array(f.length);
+		for (let e = 0; e < f.length; e++) {
+			const t = d.range ? ne(d.range, d.items.length, u(f[e]), n) : d.discrete?.[e] ?? null;
+			m[e] = t ?? -1;
 		}
-		const m = new Array(o);
-		for (let e = 0; e < o; e++) {
-			const t = f[u[e]];
+		const p = new Array(l);
+		for (let e = 0; e < l; e++) {
+			const t = m[c[e]];
 			if (void 0 === t || t < 0) return null;
-			m[e] = t;
+			p[e] = t;
 		}
-		l[e] = m;
+		i[t] = p;
 	}
-	return l;
+	return i;
 }, se = (e) => String(Number(e.toPrecision(12))), oe = (e, t) => {
 	const n = B(e, t, !0);
 	return n ? `${n.month}/${n.day}/${n.year}` : String(e);
@@ -226,44 +226,44 @@ var ee = [
 	for (let r = 0; r < t; r++) n.push([r, [[0, e.map((e) => e[r] ?? null)]]]);
 	return n;
 }, ce = (e, t) => {
-	const n = t.fields ?? [], r = [], o = [], l = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = (e, t) => {
-		if (l.has(e)) return !0;
+	const n = t.fields ?? [], r = [], s = [], o = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map(), i = (e, t) => {
+		if (o.has(e)) return !0;
 		if (t.includes(e)) return !1;
-		const d = [];
+		const a = [];
 		ie(n[e].formula, (e) => {
-			const t = n.findIndex((t) => T(t.name, e));
-			return t >= 0 && d.push(t), t >= 0 ? "" : null;
+			const t = n.findIndex((t) => f(t.name, e));
+			return t >= 0 && a.push(t), t >= 0 ? "" : null;
 		});
-		for (const o of d) if (s(n[o])) {
-			if (!a(o, [...t, e])) return !1;
-		} else r.includes(o) || r.push(o);
-		return l.set(e, o.length), i.set(e, n[e].formula), o.push({
+		for (const s of a) if (p(n[s])) {
+			if (!i(s, [...t, e])) return !1;
+		} else r.includes(s) || r.push(s);
+		return o.set(e, s.length), l.set(e, n[e].formula), s.push({
 			field: e,
 			expression: ""
 		}), !0;
-	}, d = [];
-	for (const [t, r] of (e.dataFields ?? []).entries()) if (s(n[r.field])) {
-		if (!a(r.field, [])) return null;
-		d.push({
+	}, a = [];
+	for (const [t, r] of (e.dataFields ?? []).entries()) if (p(n[r.field])) {
+		if (!i(r.field, [])) return null;
+		a.push({
 			data: t,
-			formula: l.get(r.field)
+			formula: o.get(r.field)
 		});
 	}
-	const u = (e, t) => {
+	const d = (e, t) => {
 		if (null !== t) return null;
-		const o = n.findIndex((t) => T(t.name, e));
-		return o >= 0 ? ae(s(n[i = o]) ? r.length + l.get(i) : r.indexOf(i)) : null;
-		var i;
+		const s = n.findIndex((t) => f(t.name, e));
+		return s >= 0 ? ae(p(n[l = s]) ? r.length + o.get(l) : r.indexOf(l)) : null;
+		var l;
 	};
-	for (const e of o) {
-		const t = ie(i.get(e.field), u);
+	for (const e of s) {
+		const t = ie(l.get(e.field), d);
 		if (null === t) return null;
 		e.expression = t;
 	}
 	return {
 		operands: r,
-		formulas: o,
-		measures: d
+		formulas: s,
+		measures: a
 	};
 }, fe = /* @__PURE__ */ new Set([
 	"sum",
@@ -323,10 +323,10 @@ var ee = [
 }, Re = (e, t) => {
 	const n = new Set(t.flatMap((t) => t.field === me ? [] : Pe(e.fields?.[t.field])));
 	return ke.filter((e) => n.has(e));
-}, Ne = (e, t) => {
+}, _e = (e, t) => {
 	const n = t.filter((e) => e.field !== me).map((e) => e.field);
 	return !(n.length < 2 || t[t.length - 1].field === me) && !n.slice(0, -1).some((t) => e.fields?.[t]?.items?.some((e) => e.collapsed)) && !e.filters?.some((e) => void 0 !== e.dataField && n.includes(e.field));
-}, Oe = {
+}, Ne = {
 	normal: 0,
 	percentOfTotal: 1,
 	percentOfRow: 2,
@@ -342,73 +342,73 @@ var ee = [
 	difference: 12,
 	percent: 13,
 	percentDiff: 14
-}, _e = (e, t, n, r) => {
-	const s = o.peek(), l = e.fields, i = t.fields;
-	if (!s || !l || !i || l.length !== i.length) return null;
-	if (C(e)) return {
+}, Oe = (n, r, o, l) => {
+	const a = s.peek(), d = n.fields, u = r.fields;
+	if (!a || !d || !u || d.length !== u.length) return null;
+	if (S(n)) return {
 		cells: [],
-		...A,
+		...R,
 		rowPageCount: 0,
 		columnPageCount: 0,
-		header: _(e),
+		header: E(n),
 		rowLines: [],
 		columnLines: [],
 		viewValues: [],
 		firstKey: null,
-		...r?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
+		...l?.roles ? { roles: /* @__PURE__ */ new Map() } : {}
 	};
-	const a = p(e, i), d = a ? r?.filters : null;
-	if (a && !d) return null;
-	const u = l.some((e) => e.items?.some((e) => e.calculated));
-	if (u && !d?.calculatedRecords) return null;
-	const c = ce(e, t);
-	if (!c || c.measures.length > 0 && !d?.fieldValues) return null;
-	if ((e.dataFields ?? []).some((e) => void 0 === Oe[e.showDataAs ?? "normal"] || void 0 === Se[e.subtotal ?? "sum"])) return null;
-	const f = $e(e, t, n, d?.calculatedRecords, c.operands);
-	if (!f) return null;
-	const { items: m, records: h, values: g, n: w } = f, v = (e) => !!e && (!e.noRecords || P(e)), F = e.form ?? "compact", b = (e) => {
+	const c = i(n, u), f = c ? l?.filters : null;
+	if (c && !f) return null;
+	const m = d.some((e) => e.items?.some((e) => e.calculated));
+	if (m && !f?.calculatedRecords) return null;
+	const p = ce(n, r);
+	if (!p || p.measures.length > 0 && !f?.fieldValues) return null;
+	if ((n.dataFields ?? []).some((e) => void 0 === Ne[e.showDataAs ?? "normal"] || void 0 === Se[e.subtotal ?? "sum"])) return null;
+	const h = $e(n, r, o, f?.calculatedRecords, p.operands);
+	if (!h) return null;
+	const { items: g, records: w, values: v, n: F } = h, b = (t) => !!t && (!t.noRecords || e(t)), y = n.form ?? "compact", I = (e) => {
 		const t = [];
 		for (const n of e ?? []) {
 			if (n === me) {
 				t.push({
 					field: n,
-					form: F
+					form: y
 				});
 				continue;
 			}
-			const e = l[n], r = e?.subtotals;
-			if (!e || !v(i[n])) return null;
-			if (u && r && r.some((e) => "default" !== e)) return null;
+			const e = d[n], r = e?.subtotals;
+			if (!e || !b(u[n])) return null;
+			if (m && r && r.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(i[e.field]))) return null;
-	const E = H(e, r?.slicerFields);
-	if (E.pageFields?.some((e) => !v(i[e.field]))) return null;
-	return Ge(e, t, m, y, I, Ue(s, E, m, h, g, y, I, w, d?.keep, d?.records, c.operands.length, d?.fieldValues, !0), n, !0 === r?.roles, "columns" === r?.cellOrder);
-}, $e = (e, t, n, r, s = []) => {
-	const o = t.fields?.length ?? 0, l = f(t);
-	if (!t.records) return null;
-	const i = re(t, n.isDate1904());
-	if (!i) return null;
-	const d = !0 === t.fields?.some(P), u = d ? $(t.items, o) : l, c = d ? $(t.records, o) : i, m = t.recordCount ?? 0, p = r?.count ?? 0, h = m + p, g = (e, n) => {
-		const r = !t.fields?.[e]?.noRecords, s = r ? c[e] : i[e] ?? [], o = r ? u[e] : l[e], d = new Array(h);
-		for (let e = 0; e < m; e++) d[e] = a(o[s[e]]);
-		for (let e = 0; e < p; e++) d[m + e] = n?.[e] ?? null;
-		return d;
-	}, w = [...(e.dataFields ?? []).map((e, t) => g(e.field, r?.values[t])), ...s.map((e) => g(e))];
+	}, x = I(n.rowFields), A = I(n.columnFields), C = n.pageFields ?? [];
+	if (!x || !A || C.some((e) => !b(u[e.field]))) return null;
+	const k = t(n, l?.slicerFields);
+	if (k.pageFields?.some((e) => !b(u[e.field]))) return null;
+	return Ge(n, r, g, x, A, Ue(a, k, g, w, v, x, A, F, f?.keep, f?.records, p.operands.length, f?.fieldValues, !0), o, !0 === l?.roles, "columns" === l?.cellOrder);
+}, $e = (t, n, r, s, o = []) => {
+	const l = n.fields?.length ?? 0, i = h(n);
+	if (!n.records) return null;
+	const a = re(n, r.isDate1904());
+	if (!a) return null;
+	const d = !0 === n.fields?.some(e), c = d ? U(n.items, l) : i, f = d ? U(n.records, l) : a, m = n.recordCount ?? 0, p = s?.count ?? 0, g = m + p, w = (e, t) => {
+		const r = !n.fields?.[e]?.noRecords, s = r ? f[e] : a[e] ?? [], o = r ? c[e] : i[e], l = new Array(g);
+		for (let e = 0; e < m; e++) l[e] = u(o[s[e]]);
+		for (let e = 0; e < p; e++) l[m + e] = t?.[e] ?? null;
+		return l;
+	}, v = [...(t.dataFields ?? []).map((e, t) => w(e.field, s?.values[t])), ...o.map((e) => w(e))];
 	return {
-		items: l,
-		records: r ? i.map((e, t) => e.concat(r.ids[t] ?? [])) : i,
-		values: w,
-		n: h
+		items: i,
+		records: s ? a.map((e, t) => e.concat(s.ids[t] ?? [])) : a,
+		values: v,
+		n: g
 	};
-}, Le = async (e, t, n, r, s, l, i, a, d) => {
-	const u = o.peek(), c = e.dataFields?.[s];
+}, Le = async (e, t, n, r, o, l, i, a, d) => {
+	const u = s.peek(), c = e.dataFields?.[o];
 	if (!u || !e.fields || !c || void 0 === Se[c.subtotal ?? "sum"]) return null;
 	const f = [e.rowFields, e.columnFields].map((e) => (e ?? []).filter((e) => e !== me)), m = f.findIndex((e) => e.includes(r)), p = f[m];
 	if (!p) return null;
@@ -431,7 +431,7 @@ var ee = [
 		rowGrandTotals: !1
 	}, I = a ? {
 		...a,
-		values: [a.values[s] ?? []]
+		values: [a.values[o] ?? []]
 	} : a, x = ce(y, t);
 	if (!x || x.measures.length > 0 && !d) return null;
 	const A = $e(y, t, n, I, x.operands);
@@ -449,18 +449,18 @@ var ee = [
 			T[t] = (n & e ? 1 : 0) | (3 === n ? 2 : 0);
 		}
 	}
-	const P = x.measures.length > 0 ? await Ve(u, x, y, C, E, S, M, [], k, l, T, d) : void 0, R = Ue(u, y, C, E, S, M, [], k, l, T, x.operands.length, P), N = (t, n) => e.fields[t].items?.[n]?.item ?? n, O = /* @__PURE__ */ new Map(), _ = R.columns.length;
+	const P = x.measures.length > 0 ? await Ve(u, x, y, C, E, S, M, [], k, l, T, d) : void 0, R = Ue(u, y, C, E, S, M, [], k, l, T, x.operands.length, P), _ = (t, n) => e.fields[t].items?.[n]?.item ?? n, N = /* @__PURE__ */ new Map(), O = R.columns.length;
 	return R.rows.forEach((e, t) => {
 		if (e.kind !== ye || e.path.length !== h.length + 1) return;
-		const n = h.map((t, n) => N(t, e.path[n])).join(",");
-		let s = O.get(n);
-		s || O.set(n, s = {
+		const n = h.map((t, n) => _(t, e.path[n])).join(",");
+		let s = N.get(n);
+		s || N.set(n, s = {
 			ids: [],
 			totals: []
-		}), s.ids.push(N(r, e.path[h.length])), s.totals.push(R.values[t * _]);
+		}), s.ids.push(_(r, e.path[h.length])), s.totals.push(R.values[t * O]);
 	}), {
 		outer: h,
-		groups: O,
+		groups: N,
 		records: E
 	};
 }, De = (e, t, n) => {
@@ -479,14 +479,14 @@ var ee = [
 	let p = 0;
 	const h = [];
 	try {
-		const r = f.operands(0, m.codeOf(Y.BuiltIn.NA), m.codeOf(Y.BuiltIn.Null));
+		const r = f.operands(0, m.codeOf(X.BuiltIn.NA), m.codeOf(X.BuiltIn.Null));
 		try {
 			p = r.cell_count();
 			const s = n.dataFields?.length ?? 0;
 			t.operands.forEach((t, n) => {
 				const o = r.values(s + n);
 				try {
-					const t = J(e.wasm_memory().buffer, o, m), n = new Array(p);
+					const t = W(e.wasm_memory().buffer, o, m), n = new Array(p);
 					for (let e = 0; e < p; e++) n[e] = t(e);
 					h.push(n);
 				} finally {
@@ -519,11 +519,11 @@ var ee = [
 		return i;
 	})(t, h, p, c);
 }, Ue = (e, t, n, r, s, o, l, i, a, d, u = 0, c, f = !1) => {
-	const { request: m, errors: p } = He(e, t, n, r, s, o, l, i, a, d, u, c, f), h = p.codeOf(Y.BuiltIn.NA), g = p.codeOf(Y.BuiltIn.Null), w = m.lay_out(0, h, g);
+	const { request: m, errors: p } = He(e, t, n, r, s, o, l, i, a, d, u, c, f), h = p.codeOf(X.BuiltIn.NA), g = p.codeOf(X.BuiltIn.Null), w = m.lay_out(0, h, g);
 	try {
 		const n = Be(w.row_lines(), w.row_stride()), r = Be(w.column_lines(), w.column_stride()), s = w.states(), i = w.values();
 		try {
-			const a = J(e.wasm_memory().buffer, i, p), d = new Array(s.length);
+			const a = W(e.wasm_memory().buffer, i, p), d = new Array(s.length);
 			for (let e = 0; e < s.length; e++) d[e] = s[e] === Ce ? a(e) : null;
 			return {
 				rows: n,
@@ -549,7 +549,7 @@ var ee = [
 			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 ? Pe(l) : [];
 			if (c.length > 0) {
-				const n = r[r.length - 1].field === s && Ne(t, r);
+				const n = r[r.length - 1].field === s && _e(t, r);
 				p.set_field_functions(e, d, new Uint32Array(c.map((e) => h.indexOf(e))), n);
 			}
 			g.push({
@@ -566,7 +566,7 @@ var ee = [
 	})), F = s.map(() => p.add_values(127)), b = t.dataFields ?? [];
 	b.forEach((e, t) => {
 		p.add_measure(t, Se[e.subtotal ?? "sum"]);
-		const n = Oe[e.showDataAs ?? "normal"];
+		const n = Ne[e.showDataAs ?? "normal"];
 		if (!n) return;
 		let r = 2, s = o.findIndex((t) => t.field === e.baseField);
 		s >= 0 ? r = 0 : (s = l.findIndex((t) => t.field === e.baseField), s >= 0 && (r = 1));
@@ -650,50 +650,50 @@ var ee = [
 		} else r.type = e.kind === Ie ? null !== e.function ? t[e.function] : "default" : e.kind === xe ? "grand" : "blank", r.items = e.kind === xe ? [0] : e.path.slice();
 		return null !== e.data && e.data > 0 && (r.dataField = e.data), r;
 	});
-}, Ge = (e, t, n, r, s, o, i, d, u) => {
-	const c = e.fields, f = t.fields, p = e.dataFields ?? [], h = (t) => t === me ? e.valuesCaption ?? "Values" : c[t].name ?? f[t].name, g = (e, t) => {
-		if (e === me) return p[t]?.name ?? "";
+}, Ge = (e, t, n, r, s, l, i, a, d) => {
+	const c = e.fields, f = t.fields, m = e.dataFields ?? [], p = (t) => t === me ? e.valuesCaption ?? "Values" : c[t].name ?? f[t].name, h = (e, t) => {
+		if (e === me) return m[t]?.name ?? "";
 		const r = c[e].items?.[t];
 		if (void 0 !== r?.name) return r.name;
-		const s = a(n[e][r?.item ?? t]);
-		return null === s ? k : s;
-	}, w = (e, t) => {
-		const n = g(e, t);
+		const s = u(n[e][r?.item ?? t]);
+		return null === s ? A : s;
+	}, g = (e, t) => {
+		const n = h(e, t);
 		if ("number" == typeof n) {
-			const r = c[e].items?.[t]?.item ?? t, s = void 0 === (c[e].numberFormat ?? f[e].numberFormat) && m(f[e], r);
-			return j(i, s ? R(V(f[e], r), i) : ((e) => R(c[e].numberFormat ?? f[e].numberFormat, i))(e), n);
+			const r = c[e].items?.[t]?.item ?? t, s = void 0 === (c[e].numberFormat ?? f[e].numberFormat) && P(f[e], r);
+			return j(i, s ? O(w(f[e], r), i) : ((e) => O(c[e].numberFormat ?? f[e].numberFormat, i))(e), n);
 		}
-		return Y.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+		return X.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
 	}, v = (e) => {
-		if (void 0 !== e.item) return g(e.field, e.item);
+		if (void 0 !== e.item) return h(e.field, e.item);
 		const t = c[e.field].items ?? [];
 		if (!t.some((e) => e.hidden)) return "(All)";
-		const n = t.flatMap((e, t) => l(e) && !e.hidden ? [t] : []);
-		return 1 === n.length ? g(e.field, n[0]) : "(Multiple Items)";
-	}, b = e.grandTotalCaption ?? "Grand Total", I = d ? /* @__PURE__ */ new Map() : null, x = (e, t) => e === me ? {
+		const n = t.flatMap((e, t) => o(e) && !e.hidden ? [t] : []);
+		return 1 === n.length ? h(e.field, n[0]) : "(Multiple Items)";
+	}, F = e.grandTotalCaption ?? "Grand Total", b = a ? /* @__PURE__ */ new Map() : null, x = (e, t) => e === me ? {
 		kind: "dataCaption",
 		data: t
 	} : {
 		kind: "item",
 		field: e,
 		rank: t
-	}, A = (e) => e === me ? null : {
+	}, C = (e) => e === me ? null : {
 		kind: "fieldCaption",
 		field: e
-	}, C = (e, t) => e.kind === xe && t === b ? { kind: "grandTotal" } : null, S = 0 === r.length && 0 === s.length && 0 === p.length, M = S ? {
+	}, S = (e, t) => e.kind === xe && t === F ? { kind: "grandTotal" } : null, k = 0 === r.length && 0 === s.length && 0 === m.length, M = k ? {
 		firstHeaderRow: 0,
 		firstDataRow: 0,
 		firstDataCol: 0
-	} : _(e), T = S ? [] : ze(o.rows, o.functions), P = S ? [] : ze(o.columns, o.functions), N = O({
+	} : E(e), T = k ? [] : ze(l.rows, l.functions), R = k ? [] : ze(l.columns, l.functions), $ = _({
 		...e,
 		header: M,
 		rowLines: T,
-		columnLines: P
-	}), $ = o.columns.length, L = (e) => "row" === e ? r : s, D = (t) => {
+		columnLines: R
+	}), L = l.columns.length, D = (e) => "row" === e ? r : s, V = (t) => {
 		switch (t.kind) {
 			case "pageCaption": {
 				const n = e.pageFields[t.page].field;
-				return [h(n), {
+				return [p(n), {
 					kind: "fieldCaption",
 					field: n
 				}];
@@ -705,37 +705,37 @@ var ee = [
 					page: t.page
 				}];
 			}
-			case "dataCaption": return [p[t.data]?.name ?? null, {
+			case "dataCaption": return [m[t.data]?.name ?? null, {
 				kind: "dataCaption",
 				data: t.data
 			}];
 			case "rowHeader": return [r.every((e) => e.field === me) ? e.valuesCaption ?? "Values" : e.rowHeaderCaption ?? "Row Labels", { kind: "rowHeader" }];
 			case "columnHeader": return [e.columnHeaderCaption ?? "Column Labels", { kind: "columnHeader" }];
 			case "fieldCaption": {
-				const e = L(t.axis)[t.level].field;
-				return [h(e), A(e)];
+				const e = D(t.axis)[t.level].field;
+				return [p(e), C(e)];
 			}
 			case "label": {
-				const e = L(t.axis)[t.level].field, n = t.line.path[t.level];
-				return [g(e, n), x(e, n)];
+				const e = D(t.axis)[t.level].field, n = t.line.path[t.level];
+				return [h(e, n), x(e, n)];
 			}
 			case "total": {
-				const e = ("row" === t.axis ? o.rows : o.columns)[t.line.index], n = ((e, t) => {
-					const n = e.findIndex((e) => e.field === me) >= t.path.length && null !== t.data, r = n ? p[t.data]?.name ?? "" : "";
-					if (t.kind === xe) return n ? `Total ${r}` : b;
-					const s = t.path.length - 1, l = e[s].field, i = w(l, t.path[s]);
+				const e = ("row" === t.axis ? l.rows : l.columns)[t.line.index], n = ((e, t) => {
+					const n = e.findIndex((e) => e.field === me) >= t.path.length && null !== t.data, r = n ? m[t.data]?.name ?? "" : "";
+					if (t.kind === xe) return n ? `Total ${r}` : F;
+					const s = t.path.length - 1, o = e[s].field, i = g(o, t.path[s]);
 					if (null !== t.function) {
-						const e = Te[o.functions[t.function]];
-						return (n || t.across) && null !== t.data ? `${i} ${e} of ${h(p[t.data].field)}` : `${i} ${e}`;
+						const e = Te[l.functions[t.function]];
+						return (n || t.across) && null !== t.data ? `${i} ${e} of ${p(m[t.data].field)}` : `${i} ${e}`;
 					}
-					return c[l]?.subtotalCaption ?? (n ? `${i} ${r}` : `${i} Total`);
-				})(L(t.axis), e);
-				return [n, C(e, n)];
+					return c[o]?.subtotalCaption ?? (n ? `${i} ${r}` : `${i} Total`);
+				})(D(t.axis), e);
+				return [n, S(e, n)];
 			}
 			case "value": {
-				const n = t.row.index * $ + t.column.index, r = o.states[n];
+				const n = t.row.index * L + t.column.index, r = l.states[n];
 				let s = null;
-				return r === Ce ? (s = o.values[n], e.showError && Y.isError(s) && (s = e.errorCaption ?? "")) : r === Ee && (s = !1 === e.showEmpty ? 0 : ((e) => {
+				return r === Ce ? (s = l.values[n], e.showError && X.isError(s) && (s = e.errorCaption ?? "")) : r === Ee && (s = !1 === e.showEmpty ? 0 : ((e) => {
 					if (void 0 === e) return null;
 					const t = e.trim();
 					if (!/^[+-]?\d*(?:\.\d*)?$/.test(t)) return e;
@@ -744,23 +744,23 @@ var ee = [
 				})(e.emptyCaption)), [s, null];
 			}
 		}
-	}, U = new y.Builder(), H = N.top, B = N.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), z = (e, t) => {
-		const n = E(N, e, t);
+	}, U = new I.Builder(), H = $.top, B = $.pages.reduce((e, t) => Math.max(e, t.column + 2), 0), z = (e, t) => {
+		const n = N($, e, t);
 		if (!n) return;
-		const [r, s] = D(n);
+		const [r, s] = V(n);
 		((e, t, n) => {
-			I && n && I.set(e + "," + t, n);
-		})(e - H, t, s), null !== r && (u ? U.pushAt(t, e - H, r) : U.pushAt(e - H, t, r));
+			b && n && b.set(e + "," + t, n);
+		})(e - H, t, s), null !== r && (d ? U.pushAt(t, e - H, r) : U.pushAt(e - H, t, r));
 	};
-	if (u) {
-		const e = Math.max(B, N.columns.length);
-		for (let t = 0; t < e; t++) for (let e = 0; e < N.rows.length; e++) t < (e < H ? B : N.columns.length) && z(e, t);
-	} else for (let e = 0; e < N.rows.length; e++) {
-		const t = e < H ? B : N.columns.length;
+	if (d) {
+		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) && z(e, t);
+	} else for (let e = 0; e < $.rows.length; e++) {
+		const t = e < H ? B : $.columns.length;
 		for (let n = 0; n < t; n++) z(e, n);
 	}
-	if (S) {
-		const t = F(e);
+	if (k) {
+		const t = y(e);
 		return {
 			cells: U.build()?.tuples ?? [],
 			rows: 1,
@@ -772,7 +772,7 @@ var ee = [
 			columnLines: [],
 			viewValues: [],
 			firstKey: null,
-			...I ? { roles: I } : {}
+			...b ? { roles: b } : {}
 		};
 	}
 	const G = (e, t) => {
@@ -780,164 +780,164 @@ var ee = [
 		return e.forEach((e, r) => {
 			e.field !== me && n.push(r < t.path.length ? t.path[r] : -1);
 		}), n;
-	}, q = (e, t) => W(e.data ?? t.data ?? 0, [...G(r, e), ...G(s, t)]), [K] = o.rows, [Q] = o.columns, J = K && Q && K.kind !== Ae && Q.kind !== Ae ? q(K, Q) : null, X = [], Z = (e) => e.kind === Ie && null !== e.function;
-	o.rows.forEach((t, n) => {
-		t.kind === Ae || Z(t) || (G(r, t), o.columns.forEach((r, s) => {
-			const l = o.states[n * $ + s];
-			if (r.kind === Ae || Z(r) || l !== Ce && l !== Ee) return;
-			let i = l === Ce ? o.values[n * $ + s] : 0;
-			e.showError && Y.isError(i) && (i = e.errorCaption || 0), X.push([q(t, r), i]);
+	}, q = (e, t) => J(e.data ?? t.data ?? 0, [...G(r, e), ...G(s, t)]), [K] = l.rows, [Q] = l.columns, W = K && Q && K.kind !== Ae && Q.kind !== Ae ? q(K, Q) : null, Y = [], Z = (e) => e.kind === Ie && null !== e.function;
+	l.rows.forEach((t, n) => {
+		t.kind === Ae || Z(t) || (G(r, t), l.columns.forEach((r, s) => {
+			const o = l.states[n * L + s];
+			if (r.kind === Ae || Z(r) || o !== Ce && o !== Ee) return;
+			let i = o === Ce ? l.values[n * L + s] : 0;
+			e.showError && X.isError(i) && (i = e.errorCaption || 0), Y.push([q(t, r), i]);
 		}));
 	});
-	const ee = F(e);
+	const ee = y(e);
 	return {
 		cells: U.build()?.tuples ?? [],
-		rows: N.rows.length - H,
-		columns: N.columns.length,
+		rows: $.rows.length - H,
+		columns: $.columns.length,
 		rowPageCount: ee.rows,
 		columnPageCount: ee.columns,
 		header: M,
 		rowLines: T,
-		columnLines: P,
-		viewValues: X,
-		firstKey: J,
-		...I ? { roles: I } : {}
+		columnLines: R,
+		viewValues: Y,
+		firstKey: W,
+		...b ? { roles: b } : {}
 	};
-}, je = (e, t, n, r, s = !1, o, l) => {
-	const i = _e(e, t, r, {
-		filters: o,
-		slicerFields: l
+}, je = (t, n, r, s, o = !1, l, i) => {
+	const a = Oe(t, n, s, {
+		filters: l,
+		slicerFields: i
 	});
-	if (!i) return null;
-	const d = i.rowPageCount > 0 ? i.rowPageCount + 1 : 0, u = i.rowPageCount > 0 ? 3 * i.columnPageCount - 1 : 0, { rowStart: c, colStart: p } = n;
-	if (c - d < 0) return null;
-	const h = {
-		rowStart: c - d,
-		colStart: p,
-		rowEnd: c + i.rows - 1,
-		colEnd: p + Math.max(i.columns, u) - 1
-	}, g = e.fields, w = t.fields, v = f(t), F = (e, t) => {
-		const n = g[e], s = n.numberFormat ?? w[e].numberFormat, o = R(s, r), l = P(w[e]), i = v[e], d = (n.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), u = d.length > 0 ? d : i.map((e, t) => ({ item: t })), c = u.map((t) => {
-			const n = a(i[t.item]), d = m(w[e], t.item), u = null === n ? "(blank)" : "number" == typeof n ? j(r, d ? (c = t.item, void 0 === s ? R(V(w[e], c), r) : o) : o, n) : Y.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
+	if (!a) return null;
+	const d = a.rowPageCount > 0 ? a.rowPageCount + 1 : 0, c = a.rowPageCount > 0 ? 3 * a.columnPageCount - 1 : 0, { rowStart: f, colStart: m } = r;
+	if (f - d < 0) return null;
+	const p = {
+		rowStart: f - d,
+		colStart: m,
+		rowEnd: f + a.rows - 1,
+		colEnd: m + Math.max(a.columns, c) - 1
+	}, g = t.fields, v = n.fields, F = h(n), b = (t, n) => {
+		const r = g[t], o = r.numberFormat ?? v[t].numberFormat, l = O(o, s), i = e(v[t]), a = F[t], d = (r.items ?? []).filter((e) => void 0 !== e.item && void 0 === e.type), c = d.length > 0 ? d : a.map((e, t) => ({ item: t })), f = c.map((e) => {
+			const n = u(a[e.item]), r = P(v[t], e.item), d = null === n ? "(blank)" : "number" == typeof n ? j(s, r ? (c = e.item, void 0 === o ? O(w(v[t], c), s) : l) : l, n) : X.isError(n) ? n.getLabel() : "boolean" == typeof n ? n ? "TRUE" : "FALSE" : String(n);
 			var c;
-			const f = l && d ? u : n;
-			return void 0 !== t.name ? {
+			const f = i && r ? d : n;
+			return void 0 !== e.name ? {
 				value: f,
-				text: u,
-				name: t.name
+				text: d,
+				name: e.name
 			} : {
 				value: f,
-				text: u
+				text: d
 			};
-		}), f = {
-			name: n.name ?? w[e].name,
-			items: c
+		}), m = {
+			name: r.name ?? v[t].name,
+			items: f
 		};
-		if (t) {
-			const e = void 0 !== t.item ? (n.items ?? [])[t.item]?.item : void 0;
-			f.page = void 0 !== e ? u.findIndex((t) => t.item === e) : -1;
+		if (n) {
+			const e = void 0 !== n.item ? (r.items ?? [])[n.item]?.item : void 0;
+			m.page = void 0 !== e ? c.findIndex((t) => t.item === e) : -1;
 		}
-		return f;
-	}, b = (e) => (e ?? []).filter((e) => -2 !== e);
+		return m;
+	}, y = (e) => (e ?? []).filter((e) => -2 !== e);
 	return {
 		view: {
-			range: h,
-			dataFields: (e.dataFields ?? []).map((e) => ({
+			range: p,
+			dataFields: (t.dataFields ?? []).map((e) => ({
 				name: e.name,
-				sourceName: w[e.field].name
+				sourceName: v[e.field].name
 			})),
 			fields: [
-				...b(e.rowFields).map((e) => F(e)),
-				...b(e.columnFields).map((e) => F(e)),
-				...(e.pageFields ?? []).map((e) => F(e.field, e))
+				...y(t.rowFields).map((e) => b(e)),
+				...y(t.columnFields).map((e) => b(e)),
+				...(t.pageFields ?? []).map((e) => b(e.field, e))
 			],
-			values: i.viewValues,
+			values: a.viewValues,
 			block: {
 				anchor: {
-					row: c,
-					column: p
+					row: f,
+					column: m
 				},
-				...s ? { blocked: !0 } : {},
-				...null !== i.firstKey ? { first: i.firstKey } : {}
+				...o ? { blocked: !0 } : {},
+				...null !== a.firstKey ? { first: a.firstKey } : {}
 			}
 		},
 		size: {
-			rows: i.rows,
-			columns: i.columns
+			rows: a.rows,
+			columns: a.columns
 		}
 	};
-}, qe = async (t, n, r, l) => {
-	const i = /* @__PURE__ */ new Map(), d = (t.filters ?? []).filter((n) => e(n) || t.rowFields?.includes(n.field) || t.columnFields?.includes(n.field)), c = t.fields?.some((e) => e.items?.some((e) => e.calculated)), p = t.dataFields?.some((e) => s(n.fields?.[e.field]));
-	if (0 === d.length && !c && !p) return { keep: i };
-	const h = f(n);
-	for (const s of d.filter(e)) {
-		const e = s.field, o = h[e];
-		if (!o) continue;
-		const d = D(s.condition) ? Je(t, n, o, e, r) : null, u = new Array(o.length);
-		for (let e = 0; e < o.length; e++) u[e] = d ? d[e] : a(o[e]);
-		const c = await Qe(s.condition, u, r, l), f = i.get(e);
-		if (f) for (let e = 0; e < c.length; e++) f[e] &= c[e];
-		else i.set(e, c);
+}, qe = async (e, t, n, r) => {
+	const o = /* @__PURE__ */ new Map(), l = (e.filters ?? []).filter((t) => T(t) || e.rowFields?.includes(t.field) || e.columnFields?.includes(t.field)), i = e.fields?.some((e) => e.items?.some((e) => e.calculated)), a = e.dataFields?.some((e) => p(t.fields?.[e.field]));
+	if (0 === l.length && !i && !a) return { keep: o };
+	const d = h(t);
+	for (const s of l.filter(T)) {
+		const l = s.field, i = d[l];
+		if (!i) continue;
+		const a = F(s.condition) ? We(e, t, i, l, n) : null, c = new Array(i.length);
+		for (let e = 0; e < i.length; e++) c[e] = a ? a[e] : u(i[e]);
+		const f = await Qe(s.condition, c, n, r), m = o.get(l);
+		if (m) for (let e = 0; e < f.length; e++) m[e] &= f[e];
+		else o.set(l, f);
 	}
-	const g = c && l ? await (async (e, t, n, r, o) => {
-		const l = t.fields ?? [], i = e.fields ?? [], d = l.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), c = e.dataFields ?? [];
-		if (1 !== d.length || c.some((e) => s(l[e.field]) || !fe.has(e.subtotal ?? "sum"))) return null;
-		const p = d[0], h = l[p].calculatedItems, g = re(t, n.isDate1904());
-		if (!g) return null;
-		const w = f(t), v = f({
+	const c = i && r ? await (async (e, t, n, r, s) => {
+		const o = t.fields ?? [], l = e.fields ?? [], i = o.flatMap((e, t) => e.calculatedItems?.length ? [t] : []), a = e.dataFields ?? [];
+		if (1 !== i.length || a.some((e) => p(o[e.field]) || !fe.has(e.subtotal ?? "sum"))) return null;
+		const d = i[0], c = o[d].calculatedItems, m = re(t, n.isDate1904());
+		if (!m) return null;
+		const w = h(t), v = h({
 			...t,
-			fields: l.map(({ group: e, ...t }) => t)
-		}), F = (e.rowFields ?? []).filter((e) => e >= 0), b = (e.columnFields ?? []).filter((e) => e >= 0), y = F.includes(p) ? F : b.includes(p) ? b : null;
+			fields: o.map(({ group: e, ...t }) => t)
+		}), F = (e.rowFields ?? []).filter((e) => e >= 0), b = (e.columnFields ?? []).filter((e) => e >= 0), y = F.includes(d) ? F : b.includes(d) ? b : null;
 		if (!y) return null;
-		const I = y.slice(0, y.indexOf(p)), x = [...y.slice(y.indexOf(p) + 1), ...y === F ? b : F], A = [...I, ...x], C = t.recordCount ?? 0, E = (e, t) => {
-			const n = i[e]?.items, r = n?.find((e) => e.item === t && void 0 === e.type);
-			return !(n && (!r || r.hidden) || o?.get(e) && 0 === o.get(e)[t]);
-		}, S = (e, t) => {
-			const n = i[e.field]?.items;
+		const I = y.slice(0, y.indexOf(d)), x = [...y.slice(y.indexOf(d) + 1), ...y === F ? b : F], C = [...I, ...x], E = t.recordCount ?? 0, S = (e, t) => {
+			const n = l[e]?.items, r = n?.find((e) => e.item === t && void 0 === e.type);
+			return !(n && (!r || r.hidden) || s?.get(e) && 0 === s.get(e)[t]);
+		}, k = (e, t) => {
+			const n = l[e.field]?.items;
 			if (void 0 !== e.item) return n?.[e.item]?.item === t;
 			const r = n?.find((e) => e.item === t && void 0 === e.type);
 			return !n || !!r && !r.hidden;
-		}, M = e.pageFields ?? [], P = R(l[p].numberFormat ?? 14, n), N = (e) => w[p].findIndex((t, r) => {
-			const s = a(t);
-			return "number" == typeof s && (l[p].dates || m(l[p], r)) ? T(j(n, P, s), e) : T(null === s ? k : u(s), e);
-		}), O = /* @__PURE__ */ new Map(), _ = new Map(h.map((e) => [e.item, e.formula])), $ = (e) => {
-			let t = O.get(e);
-			return void 0 === t && O.set(e, t = O.size), t;
+		}, M = e.pageFields ?? [], T = O(o[d].numberFormat ?? 14, n), R = (e) => w[d].findIndex((t, r) => {
+			const s = u(t);
+			return "number" == typeof s && (o[d].dates || P(o[d], r)) ? f(j(n, T, s), e) : f(null === s ? A : g(s), e);
+		}), _ = /* @__PURE__ */ new Map(), N = new Map(c.map((e) => [e.item, e.formula])), $ = (e) => {
+			let t = _.get(e);
+			return void 0 === t && _.set(e, t = _.size), t;
 		};
-		for (const e of h) if (null === ie(e.formula, (e, t) => {
-			if (null === t || !T(l[p].name, e)) return null;
-			const n = N(t);
-			return n < 0 ? null : (_.has(n) || $(n), "");
+		for (const e of c) if (null === ie(e.formula, (e, t) => {
+			if (null === t || !f(o[d].name, e)) return null;
+			const n = R(t);
+			return n < 0 ? null : (N.has(n) || $(n), "");
 		})) return null;
-		const L = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), V = c.map((e) => ({
-			column: g[e.field],
+		const L = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), V = a.map((e) => ({
+			column: m[e.field],
 			values: v[e.field],
 			fold: e.subtotal ?? "sum"
-		})), U = O.size;
-		for (let e = 0; e < C; e++) {
-			if (!M.every((t) => S(t, g[t.field][e]))) continue;
-			if (!A.every((t) => E(t, g[t][e]))) continue;
+		})), U = _.size;
+		for (let e = 0; e < E; e++) {
+			if (!M.every((t) => k(t, m[t.field][e]))) continue;
+			if (!C.every((t) => S(t, m[t][e]))) continue;
 			let t = "";
-			for (const n of I) t += g[n][e] + ",";
+			for (const n of I) t += m[n][e] + ",";
 			D.has(t) || D.set(t, e);
-			const n = O.get(g[p][e]);
+			const n = _.get(m[d][e]);
 			if (void 0 === n) continue;
 			let r = t;
-			for (const t of x) r += g[t][e] + ",";
+			for (const t of x) r += m[t][e] + ",";
 			let s = L.get(r);
 			s || (s = {
-				sums: c.map(() => new Array(U).fill(0)),
-				errors: c.map(() => new Array(U).fill(void 0))
+				sums: a.map(() => new Array(U).fill(0)),
+				errors: a.map(() => new Array(U).fill(void 0))
 			}, L.set(r, s));
 			const { sums: o, errors: l } = s;
 			V.forEach(({ column: t, values: r, fold: s }, i) => {
-				const d = a(r[t[e]]);
-				"sum" === s ? "number" == typeof d ? o[i][n] += d : Y.isError(d) && (l[i][n] ??= d) : ("countNums" === s ? "number" == typeof d : null !== d) && (o[i][n] += 1);
+				const a = u(r[t[e]]);
+				"sum" === s ? "number" == typeof a ? o[i][n] += a : X.isError(a) && (l[i][n] ??= a) : ("countNums" === s ? "number" == typeof a : null !== a) && (o[i][n] += 1);
 			});
 		}
 		const H = x.map((e) => {
-			const t = i[e]?.items;
-			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && E(e, t.item) ? [t.item] : []) : w[e].map((e, t) => t);
+			const t = l[e]?.items;
+			return t ? t.flatMap((t) => void 0 !== t.item && void 0 === t.type && !t.missing && S(e, t.item) ? [t.item] : []) : w[e].map((e, t) => t);
 		});
 		if (H.reduce((e, t) => e * t.length, D.size) > 5e5) return null;
 		const B = [];
@@ -955,79 +955,79 @@ var ee = [
 		const z = B.length;
 		if (0 === z) return {
 			count: 0,
-			ids: l.map(() => []),
-			values: c.map(() => [])
+			ids: o.map(() => []),
+			values: a.map(() => [])
 		};
-		const G = c.length * U, q = (e, t) => e * U + t, K = (e, t) => G + e * h.length + t, Q = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < U; t++) Q.push(B.map(({ key: n }) => {
+		const G = a.length * U, q = (e, t) => e * U + t, K = (e, t) => G + e * c.length + t, Q = [];
+		for (let e = 0; e < a.length; e++) for (let t = 0; t < U; t++) Q.push(B.map(({ key: n }) => {
 			const r = L.get(n);
 			return r ? r.errors[e][t] ?? r.sums[e][t] : 0;
 		}));
-		const J = [];
-		for (let e = 0; e < c.length; e++) for (let t = 0; t < h.length; t++) {
-			const n = ie(h[t].formula, (t, n) => {
+		const W = [];
+		for (let e = 0; e < a.length; e++) for (let t = 0; t < c.length; t++) {
+			const n = ie(c[t].formula, (t, n) => {
 				if (null === n) return null;
-				const r = N(n), s = h.findIndex((e) => e.item === r);
-				return ae(s >= 0 ? K(e, s) : q(e, O.get(r)));
+				const r = R(n), s = c.findIndex((e) => e.item === r);
+				return ae(s >= 0 ? K(e, s) : q(e, _.get(r)));
 			});
 			if (null === n) return null;
-			J.push({
+			W.push({
 				expression: n,
 				coords: de(K(e, t), z)
 			});
 		}
-		const W = await r.evaluateBatch({
+		const J = await r.evaluateBatch({
 			values: ue(Q, z),
-			formulas: J
-		}), X = l.map(() => []), Z = c.map(() => []), ee = (e, t, n, r) => {
-			g.forEach((n, r) => {
+			formulas: W
+		}), Y = o.map(() => []), Z = a.map(() => []), ee = (e, t, n, r) => {
+			m.forEach((n, r) => {
 				const s = x.indexOf(r);
-				X[r].push(r === p ? t : s >= 0 ? e.path[s] : n[e.exemplar] ?? 0);
+				Y[r].push(r === d ? t : s >= 0 ? e.path[s] : n[e.exemplar] ?? 0);
 			}), Z.forEach((e, t) => {
 				e.push(t === n ? r : null);
 			});
 		};
 		return B.forEach((e, t) => {
-			h.forEach(({ item: n }, r) => {
-				c.forEach((s, o) => {
-					const l = W[o * h.length + r].getValueAt(t, 0) ?? 0;
+			c.forEach(({ item: n }, r) => {
+				a.forEach((s, o) => {
+					const l = J[o * c.length + r].getValueAt(t, 0) ?? 0;
 					if ("sum" !== (s.subtotal ?? "sum") && "number" == typeof l) for (let t = 0; t < Math.round(l); t++) ee(e, n, o, 1);
 					else ee(e, n, o, l);
 				});
 			});
 		}), {
-			count: X[0]?.length ?? 0,
-			ids: X,
+			count: Y[0]?.length ?? 0,
+			ids: Y,
 			values: Z
 		};
-	})(t, n, r, l, i) : void 0, w = d.filter((t) => !e(t)).map((e, t) => ({
+	})(e, t, n, r, o) : void 0, m = l.filter((e) => !T(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);
-	let F;
-	const b = t.rowFields ?? [];
-	for (const { filter: e } of w) {
-		const s = await Le(t, n, r, e.field, e.dataField, i, F, g, l);
-		if (!s) continue;
-		const o = /* @__PURE__ */ new Set();
-		for (const [t, n] of s.groups) {
-			const s = await Qe(e.condition, n.totals, r, l);
-			n.ids.forEach((e, n) => {
-				s[n] || o.add(`${t}|${e}`);
+	})).sort((e, t) => (e.filter.evalOrder ?? -1) - (t.filter.evalOrder ?? -1) || e.index - t.index), w = (t.recordCount ?? 0) + (c?.count ?? 0);
+	let v;
+	const b = e.rowFields ?? [];
+	for (const { filter: s } of m) {
+		const l = await Le(e, t, n, s.field, s.dataField, o, v, c, r);
+		if (!l) continue;
+		const i = /* @__PURE__ */ new Set();
+		for (const [e, t] of l.groups) {
+			const o = await Qe(s.condition, t.totals, n, r);
+			t.ids.forEach((t, n) => {
+				o[n] || i.add(`${e}|${t}`);
 			});
 		}
-		if (0 === o.size) continue;
-		F ??= new Uint8Array(v).fill(3);
-		const a = s.outer.map((e) => s.records[e]), d = s.records[e.field], u = b.includes(e.field) ? 1 : 2;
-		for (let e = 0; e < v; e++) {
-			if (!(F[e] & u)) continue;
+		if (0 === i.size) continue;
+		v ??= new Uint8Array(w).fill(3);
+		const a = l.outer.map((e) => l.records[e]), d = l.records[s.field], u = b.includes(s.field) ? 1 : 2;
+		for (let e = 0; e < w; e++) {
+			if (!(v[e] & u)) continue;
 			let t = "";
 			for (let n = 0; n < a.length; n++) t += (n > 0 ? "," : "") + a[n][e];
-			o.has(`${t}|${d[e]}`) && (F[e] &= ~u);
+			i.has(`${t}|${d[e]}`) && (v[e] &= ~u);
 		}
 	}
-	const y = p && l ? await (async (e, t, n, r, s, l, i) => {
-		const a = o.peek(), d = ce(e, t);
+	const y = a && r ? await (async (e, t, n, r, o, l, i) => {
+		const a = s.peek(), d = ce(e, t);
 		if (!a || !d) return null;
 		const u = $e(e, t, n, i, d.operands);
 		if (!u) return null;
@@ -1035,72 +1035,72 @@ var ee = [
 			field: t,
 			form: t === me ? e.form ?? "compact" : e.fields?.[t]?.form ?? "compact"
 		}));
-		return Ve(a, d, e, u.items, u.records, u.values, c(e.rowFields), c(e.columnFields), u.n, s, l, r);
-	})(t, n, r, l, i, F, g) : void 0;
+		return Ve(a, d, e, u.items, u.records, u.values, c(e.rowFields), c(e.columnFields), u.n, o, l, r);
+	})(e, t, n, r, o, v, c) : void 0;
 	return {
-		keep: i,
-		...F ? { records: F } : {},
-		...g ? { calculatedRecords: g } : {},
+		keep: o,
+		...v ? { records: v } : {},
+		...c ? { calculatedRecords: c } : {},
 		...y ? { fieldValues: y } : {}
 	};
 }, Ke = (e, t) => {
 	const n = e.filters;
 	if (!n) return e;
-	let r = !1;
-	const s = n.map((e) => {
-		const n = e.condition && w(e.condition, t);
-		return n === e.condition ? e : (r = !0, {
+	let s = !1;
+	const o = n.map((e) => {
+		const n = e.condition && r(e.condition, t);
+		return n === e.condition ? e : (s = !0, {
 			...e,
 			condition: n
 		});
 	});
-	return r ? {
+	return s ? {
 		...e,
-		filters: s
+		filters: o
 	} : e;
-}, Qe = async (e, t, n, s) => {
-	const o = t.length, l = new Uint8Array(o);
-	if (0 === o) return l;
-	const a = new i();
-	for (let e = 0; e < o; e++) null !== t[e] && a.setValueAt(e, 0, t[e]);
-	let d = !1;
-	return await r({
+}, Qe = async (e, t, n, r) => {
+	const s = t.length, o = new Uint8Array(s);
+	if (0 === s) return o;
+	const l = new d();
+	for (let e = 0; e < s; e++) null !== t[e] && l.setValueAt(e, 0, t[e]);
+	let i = !1;
+	return await D({
 		conditions: [e],
 		runtime: n,
-		calculation: s ?? null,
-		values: a,
+		calculation: r ?? null,
+		values: l,
 		coords: {
 			rowStart: 0,
-			rowEnd: o - 1,
+			rowEnd: s - 1,
 			colStart: 0,
 			colEnd: 0
 		},
 		onTrue: (e) => {
-			d = !0, l[e.rowIndex] = 1;
+			i = !0, o[e.rowIndex] = 1;
 		},
 		onFalse: () => {
-			d = !0;
+			i = !0;
 		},
 		onBlank: (e) => {
-			d = !0;
-			for (let n = 0; n < o; n++) null === t[n] && e(n, 0) && (l[n] = 1);
+			i = !0;
+			for (let n = 0; n < s; n++) null === t[n] && e(n, 0) && (o[n] = 1);
 		}
-	}), d || l.fill(1), l;
-}, Je = (e, t, n, r, s) => {
+	}), i || o.fill(1), o;
+}, We = (e, t, n, r, s) => {
 	const o = e.fields?.[r], l = /* @__PURE__ */ new Map();
 	for (const e of o?.items ?? []) void 0 !== e.item && void 0 === e.type && void 0 !== e.name && l.set(e.item, e.name);
-	const i = o?.numberFormat ?? t.fields?.[r]?.numberFormat, d = R(i, s), u = (e) => void 0 === i ? R(V(t.fields?.[r], e), s) : d, c = new Array(n.length);
+	const i = o?.numberFormat ?? t.fields?.[r]?.numberFormat, a = O(i, s), d = (e) => void 0 === i ? O(w(t.fields?.[r], e), s) : a, c = new Array(n.length);
 	for (let e = 0; e < n.length; e++) {
 		const o = l.get(e);
 		if (void 0 !== o) {
 			c[e] = o;
 			continue;
 		}
-		const i = a(n[e]);
-		null === i ? c[e] = k : "number" == typeof i ? c[e] = j(s, m(t.fields?.[r], e) ? u(e) : d, i) : "boolean" == typeof i ? c[e] = i ? "TRUE" : "FALSE" : Y.isError(i) ? c[e] = i.getLabel() : c[e] = String(i);
+		const i = u(n[e]);
+		null === i ? c[e] = A : "number" == typeof i ? c[e] = j(s, P(t.fields?.[r], e) ? d(e) : a, i) : "boolean" == typeof i ? c[e] = i ? "TRUE" : "FALSE" : X.isError(i) ? c[e] = i.getLabel() : c[e] = String(i);
 	}
 	return c;
-}, We = (e) => {
+}, Je = (e) => {
 	const t = e.getCoords(), n = t.colEnd - t.colStart + 1, r = t.rowEnd - t.rowStart, s = e.getWorksheet(), o = s.getRange({
 		rowStart: t.rowStart,
 		rowEnd: t.rowStart,
@@ -1117,12 +1117,12 @@ var ee = [
 				colStart: t.colStart + e,
 				colEnd: t.colStart + e
 			});
-			i.fill(n.getValuesRange(), a), d = Xe(n, r);
+			i.fill(n.getValuesRange(), a), d = Ye(n, r);
 			const o = Ze(n, t.rowStart + 1, a, i.values);
 			c = o.dates, u = o.dateIds, f = o.values;
 		}
 		l.push({
-			header: Ye(n),
+			header: Xe(n),
 			ids: a,
 			values: f,
 			numberFormat: d,
@@ -1134,7 +1134,7 @@ var ee = [
 		columns: l,
 		recordCount: r
 	};
-}, Ye = (e) => null == e ? "" : "boolean" == typeof e ? e ? "TRUE" : "FALSE" : Y.isError(e) ? e.getLabel() : String(e), Xe = (e, t) => {
+}, Xe = (e) => null == e ? "" : "boolean" == typeof e ? e ? "TRUE" : "FALSE" : X.isError(e) ? e.getLabel() : String(e), Ye = (e, t) => {
 	const n = [...e.getRegions("numberFormat")];
 	if (1 !== n.length || n[0].getRowCount() !== t) return;
 	const r = n[0].getCell().getStyle().getNumberFormat();
@@ -1182,11 +1182,11 @@ var ee = [
 }, tt = (e) => null == e ? {
 	t: "z",
 	v: 0
-} : Y.isError(e) ? {
+} : X.isError(e) ? {
 	t: "e",
 	v: e.getCode()
-} : e, nt = (e, t) => (t && "number" == typeof e ? "date:" : "") + S(a(e)), rt = (e, t, n, r = !1) => {
-	const o = e.fields ?? [], l = $(e.items, o.length), i = /\smissingItemsLimit="0"/.test(e.rest ?? ""), d = ((e) => {
+} : e, nt = (e, t) => (t && "number" == typeof e ? "date:" : "") + x(u(e)), rt = (t, n, r, s = !1) => {
+	const o = t.fields ?? [], l = U(t.items, o.length), i = /\smissingItemsLimit="0"/.test(t.rest ?? ""), a = ((e) => {
 		const t = /* @__PURE__ */ new Set();
 		return e.map((e, n) => {
 			const r = "" === e ? `Field${n + 1}` : e;
@@ -1194,111 +1194,111 @@ var ee = [
 			for (let e = 2; t.has(s.toLocaleLowerCase()); e++) s = `${r}${e}`;
 			return t.add(s.toLocaleLowerCase()), s;
 		});
-	})(t.columns.map((e) => e.header)), u = /* @__PURE__ */ new Map();
+	})(n.columns.map((e) => e.header)), d = /* @__PURE__ */ new Map();
 	o.forEach((e, t) => {
 		const n = e.name.toLocaleLowerCase();
-		e.noRecords || u.has(n) || u.set(n, t);
+		e.noRecords || d.has(n) || d.set(n, t);
 	});
-	const c = t.recordCount, f = o.map(() => -1), p = o.map((e, t) => l[t].map(() => -1)), h = [], g = [], w = [], v = [], F = [], b = [], y = [], I = (e, t, n) => {
-		v[t] = n.items, b[t] = n.items.length, y[t] = !0, p[e] = ((e, t) => {
+	const c = n.recordCount, f = o.map(() => -1), m = o.map((e, t) => l[t].map(() => -1)), h = [], g = [], w = [], v = [], F = [], b = [], y = [], I = (e, t, n) => {
+		v[t] = n.items, b[t] = n.items.length, y[t] = !0, m[e] = ((e, t) => {
 			const n = /* @__PURE__ */ new Map();
 			return t.forEach((e, t) => {
 				n.set(e, t);
 			}), e.map((r, s) => 0 === s ? 0 : s === e.length - 1 ? t.length - 1 : n.get(r) ?? -1);
 		})(o[e].group.items, n.items);
 	};
-	t.columns.forEach((e, t) => {
-		const n = u.get(d[t].toLocaleLowerCase());
-		void 0 !== n && (u.delete(d[t].toLocaleLowerCase()), f[n] = t);
-		const s = new Int32Array(e.values.length).fill(-1), x = [], A = [], C = new Array(c);
-		for (let t = 0; t < c; t++) {
-			const n = e.ids[t];
-			let r = s[n];
-			r < 0 && (r = s[n] = x.length, x.push(tt(e.values[n])), A.push(e.dates || !!e.dateIds?.has(n))), C[t] = r;
+	n.columns.forEach((t, n) => {
+		const r = d.get(a[n].toLocaleLowerCase());
+		void 0 !== r && (d.delete(a[n].toLocaleLowerCase()), f[r] = n);
+		const p = new Int32Array(t.values.length).fill(-1), x = [], A = [], C = new Array(c);
+		for (let e = 0; e < c; e++) {
+			const n = t.ids[e];
+			let r = p[n];
+			r < 0 && (r = p[n] = x.length, x.push(tt(t.values[n])), A.push(t.dates || !!t.dateIds?.has(n))), C[e] = r;
 		}
-		const E = (e) => void 0 !== n && (!!o[n].dates || m(o[n], e)), S = x.length, k = void 0 !== n ? !0 === o[n].inline : x.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), M = [];
-		if (void 0 !== n && k) {
+		const E = (e) => void 0 !== r && (!!o[r].dates || P(o[r], e)), S = x.length, k = void 0 !== r ? !0 === o[r].inline : x.every((e) => "number" == typeof e || "object" == typeof e && "z" === e?.t), M = [];
+		if (void 0 !== r && k) {
 			const e = /* @__PURE__ */ new Map();
 			for (let t = 0; t < S; t++) e.set(nt(x[t], A[t]), t);
-			l[n].forEach((t, r) => {
-				p[n][r] = e.get(nt(t, E(r))) ?? -1;
+			l[r].forEach((t, n) => {
+				m[r][n] = e.get(nt(t, E(n))) ?? -1;
 			});
-		} else if (void 0 !== n) {
+		} else if (void 0 !== r) {
 			const e = /* @__PURE__ */ new Map();
 			for (let t = 0; t < S; t++) e.set(nt(x[t], A[t]), t);
-			const t = new Set(o[n].calculatedItems?.map((e) => e.item));
-			l[n].forEach((r, s) => {
+			const t = new Set(o[r].calculatedItems?.map((e) => e.item));
+			l[r].forEach((n, s) => {
 				if (t.has(s)) return;
-				const o = nt(r, E(s));
+				const o = nt(n, E(s));
 				let l = e.get(o);
-				void 0 !== l || i || E(s) || (l = x.length, x.push(r), A.push(E(s)), M.push(l), e.set(o, l)), p[n][s] = l ?? -1;
+				void 0 !== l || i || E(s) || (l = x.length, x.push(n), A.push(E(s)), M.push(l), e.set(o, l)), m[r][s] = l ?? -1;
 			});
 		}
-		const T = { name: d[t] };
-		k && (T.inline = !0), void 0 !== e.numberFormat && (T.numberFormat = e.numberFormat);
+		const T = { name: a[n] };
+		k && (T.inline = !0), void 0 !== t.numberFormat && (T.numberFormat = t.numberFormat);
 		const R = [];
-		let N = !1;
+		let _ = !1;
 		x.forEach((e, t) => {
-			"number" == typeof e && (A[t] ? R.push(t) : N = !0);
-		}), R.length > 0 && !N ? T.dates = !0 : R.length > 0 && (T.dateItems = R), F[t] = T.dateItems ? new Set(T.dateItems) : void 0, M.length > 0 && (T.unused = M);
-		const O = void 0 !== n ? o[n].rest : void 0;
-		O && (T.rest = O);
-		const _ = void 0 !== n ? o[n].calculatedItems : void 0;
-		_?.length && (T.calculatedItems = _.map(({ item: e, formula: t }) => {
-			const r = x.length;
-			return x.push(l[n][e]), p[n][e] = r, {
-				item: r,
+			"number" == typeof e && (A[t] ? R.push(t) : _ = !0);
+		}), R.length > 0 && !_ ? T.dates = !0 : R.length > 0 && (T.dateItems = R), F[n] = T.dateItems ? new Set(T.dateItems) : void 0, M.length > 0 && (T.unused = M);
+		const N = void 0 !== r ? o[r].rest : void 0;
+		N && (T.rest = N);
+		const O = void 0 !== r ? o[r].calculatedItems : void 0;
+		O?.length && (T.calculatedItems = O.map(({ item: e, formula: t }) => {
+			const n = x.length;
+			return x.push(l[r][e]), m[r][e] = n, {
+				item: n,
 				formula: t
 			};
-		})), h.push(T), g.push([t, [[0, x]]]), w.push([t, [[0, C]]]), v.push(x), b.push(S), y.push(!1);
-		const $ = void 0 !== n ? o[n].group : void 0;
-		if ($?.range && $.base === n) {
-			const e = le($, x.slice(0, S).map(a), r);
+		})), h.push(T), g.push([n, [[0, x]]]), w.push([n, [[0, C]]]), v.push(x), b.push(S), y.push(!1);
+		const $ = void 0 !== r ? o[r].group : void 0;
+		if ($?.range && $.base === r) {
+			const e = le($, x.slice(0, S).map(u), s);
 			e ? (T.group = {
 				...e,
-				base: t
-			}, I(n, t, e)) : p[n] = l[n].map(() => -1);
-		} else $ && !P(o[n]) && (T.group = $);
+				base: n
+			}, I(r, n, e)) : m[r] = l[r].map(() => -1);
+		} else $ && !e(o[r]) && (T.group = $);
 	}), o.forEach((e, t) => {
 		if (!e.noRecords) return;
-		if (s(e)) return f[t] = h.length, h.push(e), v.push([]), b.push(0), void y.push(!1);
+		if (p(e)) return f[t] = h.length, h.push(e), v.push([]), b.push(0), void y.push(!1);
 		const n = e.group;
 		if (!n) return;
-		const o = f[n.base];
-		if (void 0 === o || o < 0) return;
-		const l = v[o];
-		let i, d = [];
-		if (n.range) i = le(n, l.slice(0, b[o]).map(a), r);
+		const r = f[n.base];
+		if (void 0 === r || r < 0) return;
+		const o = v[r];
+		let l, i = [];
+		if (n.range) l = le(n, o.slice(0, b[r]).map(u), s);
 		else {
-			const e = st(n, p[n.base], l, h[o]);
-			i = e.group, d = e.itemMap;
+			const e = st(n, m[n.base], o, h[r]);
+			l = e.group, i = e.itemMap;
 		}
-		if (!i) return;
-		const u = h.length;
-		f[t] = u, h.push({
+		if (!l) return;
+		const a = h.length;
+		f[t] = a, h.push({
 			...e,
 			group: {
-				...i,
-				base: o
+				...l,
+				base: r
 			}
-		}), v.push(i.items), F[u] = i.dateItems ? new Set(i.dateItems) : void 0, b.push(i.items.length), y.push(!1), n.range ? I(t, u, i) : p[t] = d;
-	}), h.forEach((e, t) => {
-		const n = e.group;
-		if (void 0 === n?.parent) return;
-		const r = f[n.parent], { parent: s, ...o } = n;
-		void 0 !== r && r >= 0 ? e.group = {
-			...n,
-			parent: r
-		} : P(e) ? e.group = o : delete e.group, e.group && !P(e) && (e.group = {
-			...e.group,
-			base: t
+		}), v.push(l.items), F[a] = l.dateItems ? new Set(l.dateItems) : void 0, b.push(l.items.length), y.push(!1), n.range ? I(t, a, l) : m[t] = i;
+	}), h.forEach((t, n) => {
+		const r = t.group;
+		if (void 0 === r?.parent) return;
+		const s = f[r.parent], { parent: o, ...l } = r;
+		void 0 !== s && s >= 0 ? t.group = {
+			...r,
+			parent: s
+		} : e(t) ? t.group = l : delete t.group, t.group && !e(t) && (t.group = {
+			...t.group,
+			base: n
 		});
 	});
-	const { cacheId: x, part: A, partFormats: C, fields: E, items: S, records: k, ...M } = e;
+	const { cacheId: x, part: A, partFormats: C, fields: E, items: S, records: k, ...M } = t;
 	return {
 		model: {
 			...M,
-			source: n ?? e.source,
+			source: r ?? t.source,
 			fields: h,
 			items: g,
 			records: w,
@@ -1306,7 +1306,7 @@ var ee = [
 		},
 		remap: {
 			fields: f,
-			items: p,
+			items: m,
 			newItems: v,
 			usedCounts: b,
 			inItemOrder: y,
@@ -1319,7 +1319,7 @@ var ee = [
 		const r = t?.[n] ?? -1;
 		r < 0 || (o[r] = e, s.add(e));
 	});
-	const l = [], i = [], a = new Set(e.dateItems), d = e.items.map((e, t) => s.has(t) ? (a.has(t) && i.push(l.length), l.push(e), l.length - 1) : -1), u = o.map((e, t) => e >= 0 ? d[e] : ((r.dates || m(r, t)) && i.push(l.length), l.push(n[t]), l.length - 1)), { dateItems: c, ...f } = e;
+	const l = [], i = [], a = new Set(e.dateItems), d = e.items.map((e, t) => s.has(t) ? (a.has(t) && i.push(l.length), l.push(e), l.length - 1) : -1), u = o.map((e, t) => e >= 0 ? d[e] : ((r.dates || P(r, t)) && i.push(l.length), l.push(n[t]), l.length - 1)), { dateItems: c, ...f } = e;
 	return {
 		group: {
 			...f,
@@ -1435,16 +1435,16 @@ var ee = [
 	return it(f, "conditionalFormats", w.length > 0 ? w : void 0), f;
 }, it = (e, t, n) => {
 	void 0 === n ? delete e[t] : e[t] = n;
-}, at = (e, t, n, r, s = !1, o) => {
-	const i = e.items ?? [], u = [], c = [], f = /* @__PURE__ */ new Set();
+}, at = (e, t, n, r, s = !1, l) => {
+	const i = e.items ?? [], a = [], d = [], f = /* @__PURE__ */ new Set();
 	for (const e of i) {
-		if (!l(e)) {
-			c.push(u.length), u.push(e);
+		if (!o(e)) {
+			d.push(a.length), a.push(e);
 			continue;
 		}
 		const n = t[e.item] ?? -1;
 		if (n < 0) {
-			c.push(-1);
+			d.push(-1);
 			continue;
 		}
 		f.add(n);
@@ -1452,58 +1452,58 @@ var ee = [
 			...e,
 			item: n
 		};
-		n >= r && !e.calculated ? s.missing = !0 : delete s.missing, c.push(u.length), u.push(s);
+		n >= r && !e.calculated ? s.missing = !0 : delete s.missing, d.push(a.length), a.push(s);
 	}
 	const m = [];
 	for (let e = 0; e < n.length; e++) f.has(e) || m.push(e);
 	if (s) {
-		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && i.some((e) => e.hidden), r = u.map((e, t) => ({
+		const t = void 0 === e.sort?.dataField && "descending" === e.sort?.order, n = !e.includeNewItemsInFilter && i.some((e) => e.hidden), r = a.map((e, t) => ({
 			item: e,
 			at: t
-		})), s = r.filter((e) => !l(e.item)), o = [...[...r.filter((e) => l(e.item)), ...m.map((e) => ({
+		})), s = r.filter((e) => !o(e.item)), l = [...[...r.filter((e) => o(e.item)), ...m.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), ...s], a = new Map(o.map((e, t) => [e.at, t]));
+		}))].sort((e, n) => t ? n.item.item - e.item.item : e.item.item - n.item.item), ...s], u = new Map(l.map((e, t) => [e.at, t]));
 		return {
-			items: o.map((e) => e.item),
-			positions: c.map((e) => e < 0 ? e : a.get(e) ?? -1)
+			items: l.map((e) => e.item),
+			positions: d.map((e) => e < 0 ? e : u.get(e) ?? -1)
 		};
 	}
 	if (0 === m.length) return {
-		items: u,
-		positions: c
+		items: a,
+		positions: d
 	};
 	const p = !e.includeNewItemsInFilter && i.some((e) => e.hidden), h = (e) => p ? {
 		item: e,
 		hidden: !0
 	} : { item: e };
 	if (e.sort && void 0 === e.sort.dataField) {
-		const t = "descending" === e.sort.order, r = (e, t) => ot(d(e, n), a(n[t]), void 0 === e.name && o?.has(e.item), o?.has(t));
+		const t = "descending" === e.sort.order, r = (e, t) => ot(c(e, n), u(n[t]), void 0 === e.name && l?.has(e.item), l?.has(t));
 		for (const e of m) {
 			const n = h(e);
-			let s = u.findIndex((n) => l(n) && (t ? r(n, e) < 0 : r(n, e) > 0));
-			s < 0 && (s = dt(u)), u.splice(s, 0, n);
-			for (let e = 0; e < c.length; e++) c[e] >= s && c[e]++;
+			let s = a.findIndex((n) => o(n) && (t ? r(n, e) < 0 : r(n, e) > 0));
+			s < 0 && (s = dt(a)), a.splice(s, 0, n);
+			for (let e = 0; e < d.length; e++) d[e] >= s && d[e]++;
 		}
 	} else {
-		const e = dt(u);
-		u.splice(e, 0, ...m.map(h));
-		for (let t = 0; t < c.length; t++) c[t] >= e && (c[t] += m.length);
+		const e = dt(a);
+		a.splice(e, 0, ...m.map(h));
+		for (let t = 0; t < d.length; t++) d[t] >= e && (d[t] += m.length);
 	}
 	return {
-		items: u,
-		positions: c
+		items: a,
+		positions: d
 	};
 }, dt = (e) => {
-	const t = e.findIndex((e) => !l(e));
+	const t = e.findIndex((e) => !o(e));
 	return t < 0 ? e.length : t;
 }, ut = (e, t) => {
 	if (!(t < 0)) for (let n = 0; n < e.length; n++) {
 		const r = (t + n) % e.length, s = e[r];
-		if (l(s) && !s.missing) return r;
+		if (o(s) && !s.missing) return r;
 	}
 }, ct = (e, t, n, r, s) => {
 	const o = { ...e };
@@ -1578,43 +1578,43 @@ var ee = [
 		areas: e.areas.map(d)
 	}))), l;
 }, mt = (e, t, n, r) => {
-	const s = (e.fields ?? [])[n]?.items ?? [], o = f(t)[n] ?? [], i = t.fields?.[n], a = void 0 !== i?.group?.range, u = (e) => void 0 === e.name && m(i, e.item), c = s.map((e, t) => ({
+	const s = (e.fields ?? [])[n]?.items ?? [], l = h(t)[n] ?? [], i = t.fields?.[n], a = void 0 !== i?.group?.range, d = (e) => void 0 === e.name && P(i, e.item), u = s.map((e, t) => ({
 		item: e,
 		at: t
-	})), p = c.filter((e) => l(e.item));
-	p.sort((e, t) => a ? e.item.item - t.item.item : ot(d(e.item, o), d(t.item, o), u(e.item), u(t.item))), "descending" === r && p.reverse();
-	let h = 0;
-	const w = ft(e, n, c.map((e) => l(e.item) ? p[h++] : e).map((e) => e.at));
+	})), f = u.filter((e) => o(e.item));
+	f.sort((e, t) => a ? e.item.item - t.item.item : ot(c(e.item, l), c(t.item, l), d(e.item), d(t.item))), "descending" === r && f.reverse();
+	let m = 0;
+	const g = ft(e, n, u.map((e) => o(e.item) ? f[m++] : e).map((e) => e.at));
 	return {
-		...w,
-		fields: w.fields.map((e, t) => t === n ? {
+		...g,
+		fields: g.fields.map((e, t) => t === n ? {
 			...e,
 			sort: { order: r }
 		} : e)
 	};
 }, pt = (e, t, n) => {
 	const r = e.fields?.[t]?.items?.[n];
-	if (!r || !l(r)) throw new X(Z("error.pivotTable.changePart"));
+	if (!r || !o(r)) throw new Y(Z("error.pivotTable.changePart"));
 	return r;
 }, ht = (e, t, n, r, s) => {
-	const o = pt(e, n, r), i = e.fields[n].items, d = f(t)[n] ?? [], c = (e) => {
-		const t = a(d[e.item]);
-		return null === t ? k : u(t);
+	const l = pt(e, n, r), i = e.fields[n].items, a = h(t)[n] ?? [], d = (e) => {
+		const t = u(a[e.item]);
+		return null === t ? A : g(t);
 	};
-	if (i.some((e, t) => t !== r && l(e) && T(e.name ?? c(e), s))) throw new X(Z("error.pivotTable.itemNameExists", { name: s }));
-	const { name: m, ...p } = o, h = s === c(o) ? p : {
-		...o,
+	if (i.some((e, t) => t !== r && o(e) && f(e.name ?? d(e), s))) throw new Y(Z("error.pivotTable.itemNameExists", { name: s }));
+	const { name: c, ...m } = l, p = s === d(l) ? m : {
+		...l,
 		name: s
 	};
-	if (h.name === o.name) return e;
-	const g = {
+	if (p.name === l.name) return e;
+	const w = {
 		...e,
 		fields: e.fields.map((e, t) => t === n ? {
 			...e,
-			items: i.map((e, t) => t === r ? h : e)
+			items: i.map((e, t) => t === r ? p : e)
 		} : e)
-	}, w = e.fields[n].sort;
-	return w && void 0 === w.dataField ? mt(g, t, n, w.order) : g;
+	}, v = e.fields[n].sort;
+	return v && void 0 === v.dataField ? mt(w, t, n, v.order) : w;
 }, gt = (e, t, n, r) => {
 	pt(e, t, n);
 	const s = e.fields[t].items.map((e, t) => t).filter((e) => e !== n);
@@ -1631,36 +1631,36 @@ var ee = [
 		})
 	} : l;
 }, wt = (e, t, n, r) => {
-	const s = u(r), o = e.fields, i = t.fields, d = e.dataFields ?? [], c = f(t), m = (e, t) => {
+	const s = g(r), i = e.fields, a = t.fields, d = e.dataFields ?? [], c = h(t), m = (e, t) => {
 		if (void 0 !== t.name) return t.name;
-		const n = a(c[e][t.item]);
-		return null === n ? k : u(n);
+		const n = u(c[e][t.item]);
+		return null === n ? A : g(n);
 	}, p = (n) => {
-		if (void 0 !== n.field && s === (o[n.field].name ?? i[n.field].name)) return;
+		if (void 0 !== n.field && s === (i[n.field].name ?? a[n.field].name)) return;
 		const r = void 0 === n.field ? e : {
 			...e,
-			fields: o.map((e, t) => t === n.field ? {
+			fields: i.map((e, t) => t === n.field ? {
 				...e,
 				name: "\0"
 			} : e)
 		};
-		if (v(r, t, s, n.data) !== s) throw new X(Z("error.pivotTable.fieldNameExists"));
+		if (l(r, t, s, n.data) !== s) throw new Y(Z("error.pivotTable.fieldNameExists"));
 	};
 	switch (n.kind) {
 		case "item": {
-			const { field: r, rank: i } = n;
-			pt(e, r, i);
-			const a = o[r].items.findIndex((e, t) => t !== i && l(e) && T(m(r, e), s));
-			return a >= 0 ? gt(e, r, a, i) : ht(e, t, r, i, s);
+			const { field: r, rank: l } = n;
+			pt(e, r, l);
+			const a = i[r].items.findIndex((e, t) => t !== l && o(e) && f(m(r, e), s));
+			return a >= 0 ? gt(e, r, a, l) : ht(e, t, r, l, s);
 		}
 		case "fieldCaption": {
 			const { field: t } = n;
 			return p({ field: t }), ((t, n) => ({
 				...e,
-				fields: o.map((e, r) => r === t ? n(e) : e)
+				fields: i.map((e, r) => r === t ? n(e) : e)
 			}))(t, (e) => {
 				const { name: n, ...r } = e;
-				return s === i[t].name ? r : {
+				return s === a[t].name ? r : {
 					...e,
 					name: s
 				};
@@ -1690,11 +1690,11 @@ var ee = [
 		};
 		case "pageItem": {
 			const t = e.pageFields, r = t[n.page];
-			let i;
-			if (!T(s, "(All)") && (i = (o[r.field].items ?? []).findIndex((e) => l(e) && T(m(r.field, e), s)), i < 0)) throw new X(Z("error.pivotTable.notAnItem", { name: s }));
-			const { item: a, ...d } = r, u = void 0 === i ? d : {
+			let l;
+			if (!f(s, "(All)") && (l = (i[r.field].items ?? []).findIndex((e) => o(e) && f(m(r.field, e), s)), l < 0)) throw new Y(Z("error.pivotTable.notAnItem", { name: s }));
+			const { item: a, ...d } = r, u = void 0 === l ? d : {
 				...r,
-				item: i
+				item: l
 			};
 			return {
 				...e,
@@ -1716,34 +1716,34 @@ var ee = [
 	...e.rowFields ?? [],
 	...e.columnFields ?? [],
 	...(e.pageFields ?? []).map((e) => e.field)
-].filter((e) => e >= 0), yt = (e, t) => {
-	const n = e.fields[t], r = f(e)[t], s = r.map((e, t) => t);
-	P(n) || s.sort((e, t) => ot(a(r[e]), a(r[t]), m(n, e), m(n, t)));
-	const o = new Set(n.calculatedItems?.map((e) => e.item)), l = new Set(n.unused);
-	return [...s.map((e) => ({
+].filter((e) => e >= 0), yt = (t, n) => {
+	const r = t.fields[n], s = h(t)[n], o = s.map((e, t) => t);
+	e(r) || o.sort((e, t) => ot(u(s[e]), u(s[t]), P(r, e), P(r, t)));
+	const l = new Set(r.calculatedItems?.map((e) => e.item)), i = new Set(r.unused);
+	return [...o.map((e) => ({
 		item: e,
-		...o.has(e) ? { calculated: !0 } : {},
-		...l.has(e) ? { missing: !0 } : {}
+		...l.has(e) ? { calculated: !0 } : {},
+		...i.has(e) ? { missing: !0 } : {}
 	})), { type: "default" }];
 }, It = (e) => {
-	if (!("number" == typeof e ? void 0 !== z(e) : "" !== e && G.isValidFormat(e))) throw new X(Z("error.pivotTable.notANumberFormat", { name: String(e) }));
-}, xt = (e, t, n, r) => {
-	const s = r?.function ?? ((e, t) => "number" === x(e, t) ? "sum" : "count")(t.fields[n], f(t)[n]), o = I[s];
-	if (!o) throw new X(Z("error.pivotTable.notAFunction", { name: s }));
-	let l = r?.name;
-	if (void 0 === l) l = v(e, t, `${o} of ${g(e, t, n)}`);
-	else if (v(e, t, l) !== l) throw new X(Z("error.pivotTable.fieldNameExists"));
-	const i = {
-		name: l,
-		field: n,
+	if (!("number" == typeof e ? void 0 !== z(e) : "" !== e && G.isValidFormat(e))) throw new Y(Z("error.pivotTable.notANumberFormat", { name: String(e) }));
+}, xt = (e, t, r, s) => {
+	const o = s?.function ?? ((e, t) => "number" === V(e, t) ? "sum" : "count")(t.fields[r], h(t)[r]), i = $[o];
+	if (!i) throw new Y(Z("error.pivotTable.notAFunction", { name: o }));
+	let a = s?.name;
+	if (void 0 === a) a = l(e, t, `${i} of ${n(e, t, r)}`);
+	else if (l(e, t, a) !== a) throw new Y(Z("error.pivotTable.fieldNameExists"));
+	const d = {
+		name: a,
+		field: r,
 		baseField: 0,
 		baseItem: 0
 	};
-	return "sum" !== s && (i.subtotal = s), void 0 !== r?.numberFormat && (It(r.numberFormat), i.numberFormat = r.numberFormat), i;
+	return "sum" !== o && (d.subtotal = o), void 0 !== s?.numberFormat && (It(s.numberFormat), d.numberFormat = s.numberFormat), d;
 }, At = (e, t) => {
 	const n = e.fields ?? [], r = (e) => {
-		const t = n.findIndex((t) => T(t.name, e));
-		if (t < 0) throw new X(Z("error.pivotTable.notAField", { name: e }));
+		const t = n.findIndex((t) => f(t.name, e));
+		if (t < 0) throw new Y(Z("error.pivotTable.notAField", { name: e }));
 		return t;
 	}, s = /* @__PURE__ */ new Map(), o = (e, t) => {
 		for (const n of e ?? []) {
@@ -1762,7 +1762,7 @@ var ee = [
 		return o && (r.axis = o, r.items = yt(e, n)), a.has(n) && (r.dataField = !0), d && (r.form = d), t.dates && void 0 !== t.numberFormat && (r.numberFormat = t.numberFormat), r;
 	}), c = l("column");
 	i.length > 1 && c.push(-2);
-	const f = {
+	const m = {
 		fields: u,
 		style: {
 			name: t?.style ?? "PivotStyleLight16",
@@ -1772,14 +1772,14 @@ var ee = [
 			showColumnStripes: !1,
 			showLastColumn: !0
 		}
-	}, m = l("row");
-	m.length > 0 && (f.rowFields = m), c.length > 0 && (f.columnFields = c);
-	const p = l("page");
-	return p.length > 0 && (f.pageFields = p.map((e) => ({ field: e }))), i.length > 0 && (f.dataFields = i), d && (f.form = d), f;
+	}, p = l("row");
+	p.length > 0 && (m.rowFields = p), c.length > 0 && (m.columnFields = c);
+	const h = l("page");
+	return h.length > 0 && (m.pageFields = h.map((e) => ({ field: e }))), i.length > 0 && (m.dataFields = i), d && (m.form = d), m;
 }, Ct = (e, t) => t.map((t) => {
 	const n = t.sort?.scope;
 	if (!n) return t;
-	const r = ((t.axis === b.Axis.Row ? e.columnFields : t.axis === b.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
+	const r = ((t.axis === a.Axis.Row ? e.columnFields : t.axis === a.Axis.Column ? e.rowFields : void 0) ?? []).filter((e) => -2 !== e);
 	if (!n.items.every((e, t) => r[t] === e.field)) {
 		const { sort: e, ...n } = t;
 		return n;
@@ -1795,38 +1795,38 @@ var ee = [
 			} : o
 		}
 	};
-}), Et = (e, r, s, o, l) => {
-	const i = b.Axis, a = r.fields?.[s], d = e.fields?.[s]?.axis ?? null;
-	if (o === i.Values) throw new X(Z("error.pivotTable.valuesNotAnAxis"));
-	if (null === o) {
-		if (null === d) return e;
-	} else if (void 0 !== a?.formula || o === i.Page && (a?.calculatedItems?.length ?? 0) > 0) throw new X(Z("error.pivotTable.fieldNotPlaceable"));
-	const u = o ? n(e, o).filter((e) => e !== s) : [];
-	if (void 0 !== l && (!Number.isInteger(l) || l < 1 || l > u.length + 1)) throw new X(Z("error.pivotTable.fieldPosition"));
-	const c = (l ?? u.length + 1) - 1;
-	if (o === d && (void 0 === l || n(e, o)[c] === s)) return e;
-	u.splice(c, 0, s);
-	const { rowFields: f, columnFields: m, pageFields: p, ...g } = e, w = {}, v = (e) => (e ?? []).filter((e) => e !== s), F = o === i.Row ? u : v(e.rowFields), y = o === i.Column ? u : v(e.columnFields), I = o === i.Page ? u.map((t) => e.pageFields?.find((e) => e.field === t) ?? { field: t }) : (e.pageFields ?? []).filter((e) => e.field !== s);
-	F.length > 0 && (w.rowFields = F), y.length > 0 && (w.columnFields = y), I.length > 0 && (w.pageFields = I);
-	let x = {
-		...g,
-		...w
+}), Et = (e, t, n, r, s) => {
+	const o = a.Axis, l = t.fields?.[n], i = e.fields?.[n]?.axis ?? null;
+	if (r === o.Values) throw new Y(Z("error.pivotTable.valuesNotAnAxis"));
+	if (null === r) {
+		if (null === i) return e;
+	} else if (void 0 !== l?.formula || r === o.Page && (l?.calculatedItems?.length ?? 0) > 0) throw new Y(Z("error.pivotTable.fieldNotPlaceable"));
+	const d = r ? L(e, r).filter((e) => e !== n) : [];
+	if (void 0 !== s && (!Number.isInteger(s) || s < 1 || s > d.length + 1)) throw new Y(Z("error.pivotTable.fieldPosition"));
+	const u = (s ?? d.length + 1) - 1;
+	if (r === i && (void 0 === s || L(e, r)[u] === n)) return e;
+	d.splice(u, 0, n);
+	const { rowFields: c, columnFields: f, pageFields: m, ...p } = e, h = {}, g = (e) => (e ?? []).filter((e) => e !== n), w = r === o.Row ? d : g(e.rowFields), v = r === o.Column ? d : g(e.columnFields), F = r === o.Page ? d.map((t) => e.pageFields?.find((e) => e.field === t) ?? { field: t }) : (e.pageFields ?? []).filter((e) => e.field !== n);
+	w.length > 0 && (h.rowFields = w), v.length > 0 && (h.columnFields = v), F.length > 0 && (h.pageFields = F);
+	let y = {
+		...p,
+		...h
 	};
-	o === i.Page && d !== i.Page && (x = h(x, s, () => !0));
-	const A = { ...e.fields?.[s] };
-	o ? A.axis = o : delete A.axis, o && !A.items && a && (A.items = t(yt(r, s), A.subtotals)), o && void 0 === A.numberFormat && a?.dates && void 0 !== a.numberFormat && (A.numberFormat = a.numberFormat), o === i.Page && A.items?.some((e) => e.hidden) && (A.multipleItemSelection = !0);
-	const C = (e.fields ?? []).map((e, t) => t === s ? A : e);
-	if (x = {
-		...x,
-		fields: Ct(x, C)
-	}, null === o && e.formats?.some((e) => e.area.references?.some((e) => e.field === s))) {
-		const t = e.formats.filter((e) => !e.area.references?.some((e) => e.field === s)), { formats: n, ...r } = x;
-		x = t.length > 0 ? {
-			...r,
+	r === o.Page && i !== o.Page && (y = H(y, n, () => !0));
+	const I = { ...e.fields?.[n] };
+	r ? I.axis = r : delete I.axis, r && !I.items && l && (I.items = b(yt(t, n), I.subtotals)), r && void 0 === I.numberFormat && l?.dates && void 0 !== l.numberFormat && (I.numberFormat = l.numberFormat), r === o.Page && I.items?.some((e) => e.hidden) && (I.multipleItemSelection = !0);
+	const x = (e.fields ?? []).map((e, t) => t === n ? I : e);
+	if (y = {
+		...y,
+		fields: Ct(y, x)
+	}, null === r && e.formats?.some((e) => e.area.references?.some((e) => e.field === n))) {
+		const t = e.formats.filter((e) => !e.area.references?.some((e) => e.field === n)), { formats: r, ...s } = y;
+		y = t.length > 0 ? {
+			...s,
 			formats: t
-		} : r;
+		} : s;
 	}
-	return x;
+	return y;
 }, St = -2, kt = /* @__PURE__ */ new Set([
 	"percentOfTotal",
 	"percentOfRow",
@@ -1848,22 +1848,22 @@ var ee = [
 	"difference"
 ]), Pt = (e, t, n) => {
 	if (Mt.has(n)) return Mt.has(t) ? e : void 0;
-	const r = ((e) => L(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
+	const r = ((e) => v(e).replace(/"[^"]*"|\\./g, "").includes("%"))(e);
 	return kt.has(n) ? kt.has(t) || r ? e : 10 : kt.has(t) && r ? void 0 : e;
 }, Rt = (e, t) => {
 	const n = 1 === e.references?.length ? e.references[0] : null;
 	return !1 === e.outline && n?.field === St && 1 === n.items?.length && n.items[0] === t && void 0 === n.selected && !e.type && !e.labelOnly && void 0 === e.dataOnly;
-}, Nt = (e, t) => {
+}, _t = (e, t) => {
 	if (!e.formats?.some((e) => Rt(e.area, t))) return e;
 	const n = e.formats.filter((e) => !Rt(e.area, t)), { formats: r, ...s } = e;
 	return n.length > 0 ? {
 		...s,
 		formats: n
 	} : s;
-}, Ot = (e, t, n) => ({
+}, Nt = (e, t, n) => ({
 	...e,
 	dataFields: e.dataFields.map((e, r) => r === t ? n(e) : e)
-}), _t = (e, t) => {
+}), Ot = (e, t) => {
 	const { numberFormat: n, ...r } = e;
 	return void 0 === t ? r : {
 		...r,
@@ -1950,7 +1950,7 @@ var ee = [
 	}), $t(e, s, r);
 }, Vt = (e, t, n) => {
 	const r = e.dataFields ?? [];
-	if (!Number.isInteger(n) || n < 1 || n > r.length) throw new X(Z("error.pivotTable.valuePosition"));
+	if (!Number.isInteger(n) || n < 1 || n > r.length) throw new Y(Z("error.pivotTable.valuePosition"));
 	if (n - 1 === t) return e;
 	const s = r.map((e, t) => t).filter((e) => e !== t);
 	s.splice(n - 1, 0, t);
@@ -1959,46 +1959,46 @@ var ee = [
 		o[e] = t;
 	}), $t(e, s.map((e) => r[e]), o);
 }, Ut = (e, t, n, r) => {
-	const s = U(e, t, n, r);
-	return (e.dataFields[n].subtotal ?? "sum") === r ? e : Ot(e, n, (e) => {
+	const s = C(e, t, n, r);
+	return (e.dataFields[n].subtotal ?? "sum") === r ? e : Nt(e, n, (e) => {
 		const { subtotal: t, ...n } = e, o = {
 			...n,
 			name: s
 		};
 		return "sum" !== r && (o.subtotal = r), o;
 	});
-}, Ht = (e, t, n, r) => {
-	const s = e.dataFields[n], o = s.showDataAs ?? "normal", l = r?.kind ?? "normal";
-	if (r && !Tt.has(r.kind)) throw new X(Z("error.pivotTable.notAShowAs", { name: r.kind }));
-	const { showDataAs: i, baseField: a, baseItem: d, ...u } = s, f = { ...u };
-	"normal" !== l && (f.showDataAs = l);
-	let m = s.baseField, p = s.baseItem;
-	if (void 0 !== r?.baseField) {
-		const n = r.baseField, s = (t.fields ?? []).findIndex((r, s) => T(g(e, t, s), n));
-		if (s < 0) throw new X(Z("error.pivotTable.notAField", { name: n }));
-		s !== m && (m = s, p = 0);
+}, Ht = (e, t, r, s) => {
+	const o = e.dataFields[r], l = o.showDataAs ?? "normal", i = s?.kind ?? "normal";
+	if (s && !Tt.has(s.kind)) throw new Y(Z("error.pivotTable.notAShowAs", { name: s.kind }));
+	const { showDataAs: a, baseField: d, baseItem: u, ...c } = o, p = { ...c };
+	"normal" !== i && (p.showDataAs = i);
+	let h = o.baseField, g = o.baseItem;
+	if (void 0 !== s?.baseField) {
+		const r = s.baseField, o = (t.fields ?? []).findIndex((s, o) => f(n(e, t, o), r));
+		if (o < 0) throw new Y(Z("error.pivotTable.notAField", { name: r }));
+		o !== h && (h = o, g = 0);
 	}
-	if (void 0 !== r?.baseItem) {
-		const n = m ?? 0;
-		if (T(r.baseItem, "(previous)")) p = "previous";
-		else if (T(r.baseItem, "(next)")) p = "next";
+	if (void 0 !== s?.baseItem) {
+		const n = h ?? 0;
+		if (f(s.baseItem, "(previous)")) g = "previous";
+		else if (f(s.baseItem, "(next)")) g = "next";
 		else {
-			const s = e.fields?.[n]?.items ? e : { fields: (e.fields ?? []).map((e, r) => r === n ? {
+			const r = e.fields?.[n]?.items ? e : { fields: (e.fields ?? []).map((e, r) => r === n ? {
 				...e,
 				items: yt(t, n)
-			} : e) }, o = c(s, t, n).findIndex((e) => null !== e && T(e, r.baseItem));
-			if (o < 0) throw new X(Z("error.pivotTable.notAnItem", { name: r.baseItem }));
-			p = o;
+			} : e) }, o = m(r, t, n).findIndex((e) => null !== e && f(e, s.baseItem));
+			if (o < 0) throw new Y(Z("error.pivotTable.notAnItem", { name: s.baseItem }));
+			g = o;
 		}
 	}
-	if (void 0 !== m && (f.baseField = m), void 0 !== p && (f.baseItem = p), l === o) return f.baseField === s.baseField && f.baseItem === s.baseItem ? e : Ot(e, n, () => f);
-	const h = Pt(s.numberFormat, o, l);
-	return h === s.numberFormat ? Ot(e, n, () => f) : Ot(Nt(e, n), n, () => _t(f, h));
+	if (void 0 !== h && (p.baseField = h), void 0 !== g && (p.baseItem = g), i === l) return p.baseField === o.baseField && p.baseItem === o.baseItem ? e : Nt(e, r, () => p);
+	const w = Pt(o.numberFormat, l, i);
+	return w === o.numberFormat ? Nt(e, r, () => p) : Nt(_t(e, r), r, () => Ot(p, w));
 }, Bt = (e, t, n) => {
 	It(n);
-	const r = L(n), s = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
-	if (L(s.numberFormat) === r && o && Rt(o.area, t) && o.style.numberFormat === r) return e;
-	const i = Ot(Nt(e, t), t, (e) => _t(e, "General" === r ? void 0 : n));
+	const r = v(n), s = e.dataFields[t], o = e.formats?.[e.formats.length - 1];
+	if (v(s.numberFormat) === r && o && Rt(o.area, t) && o.style.numberFormat === r) return e;
+	const i = Nt(_t(e, t), t, (e) => Ot(e, "General" === r ? void 0 : n));
 	return {
 		...i,
 		formats: [...i.formats ?? [], {
@@ -2012,29 +2012,29 @@ var ee = [
 			}
 		}]
 	};
-}, zt = (e, t, r) => {
+}, zt = (e, t, n) => {
 	if (null === t) return Dt(e);
-	const s = b.Axis;
-	if (t !== s.Row && t !== s.Column) throw new X(Z("error.pivotTable.fieldNotPlaceable"));
-	const o = e.rowFields?.includes(St) ? s.Row : e.columnFields?.includes(St) ? s.Column : null;
-	if (!o) throw new X(Z("error.pivotTable.fieldPosition"));
-	const l = n(e, t).filter((e) => e !== St);
-	if (void 0 !== r && (!Number.isInteger(r) || r < 1 || r > l.length + 1)) throw new X(Z("error.pivotTable.fieldPosition"));
-	const i = (r ?? l.length + 1) - 1;
-	if (t === o && (void 0 === r || n(e, t)[i] === St)) return e;
-	l.splice(i, 0, St);
-	const { rowFields: a, columnFields: d, valuesOnRows: u, ...c } = e, f = n(e, t === s.Row ? s.Column : s.Row).filter((e) => e !== St), m = { ...c }, p = t === s.Row ? l : f, h = t === s.Column ? l : f;
-	return p.length > 0 && (m.rowFields = [...p]), h.length > 0 && (m.columnFields = [...h]), t === s.Row && (m.valuesOnRows = !0), m;
+	const r = a.Axis;
+	if (t !== r.Row && t !== r.Column) throw new Y(Z("error.pivotTable.fieldNotPlaceable"));
+	const s = e.rowFields?.includes(St) ? r.Row : e.columnFields?.includes(St) ? r.Column : null;
+	if (!s) throw new Y(Z("error.pivotTable.fieldPosition"));
+	const o = L(e, t).filter((e) => e !== St);
+	if (void 0 !== n && (!Number.isInteger(n) || n < 1 || n > o.length + 1)) throw new Y(Z("error.pivotTable.fieldPosition"));
+	const l = (n ?? o.length + 1) - 1;
+	if (t === s && (void 0 === n || L(e, t)[l] === St)) return e;
+	o.splice(l, 0, St);
+	const { rowFields: i, columnFields: d, valuesOnRows: u, ...c } = e, f = L(e, t === r.Row ? r.Column : r.Row).filter((e) => e !== St), m = { ...c }, p = t === r.Row ? o : f, h = t === r.Column ? o : f;
+	return p.length > 0 && (m.rowFields = [...p]), h.length > 0 && (m.columnFields = [...h]), t === r.Row && (m.valuesOnRows = !0), m;
 }, Gt = (e, t, n) => {
 	if (n === (e.valuesCaption ?? "Values")) return e;
 	const { valuesCaption: r, ...s } = e, o = {
 		...s,
 		valuesCaption: "\0"
 	};
-	if (v(o, t, n) !== n) throw new X(Z("error.pivotTable.fieldNameExists"));
+	if (l(o, t, n) !== n) throw new Y(Z("error.pivotTable.fieldNameExists"));
 	return "Values" === n ? s : {
 		...s,
 		valuesCaption: n
 	};
 };
-export { Lt as addPivotDataField, Ke as anchorPivotPeriods, It as assertNumberFormat, bt as axisFieldsOf, je as buildPivotView, qe as evaluatePivotFilters, e as isItemFilter, _e as layOutPivot, yt as listedItemsOf, Vt as movePivotDataField, Et as movePivotField, gt as movePivotItem, zt as movePivotValues, vt as newPivotCache, At as newPivotTable, We as readPivotSource, rt as refreshPivotCache, lt as remapPivotTable, Dt as removePivotDataField, ht as renamePivotItem, Gt as renamePivotValues, ft as reorderPivotItems, Ut as setPivotDataFunction, Bt as setPivotDataNumberFormat, Ht as setPivotDataShowAs, mt as sortPivotItemsByLabel, wt as typeOverPivot, Ft as withListedFields };
+export { Lt as addPivotDataField, Ke as anchorPivotPeriods, It as assertNumberFormat, bt as axisFieldsOf, je as buildPivotView, qe as evaluatePivotFilters, T as isItemFilter, Oe as layOutPivot, yt as listedItemsOf, Vt as movePivotDataField, Et as movePivotField, gt as movePivotItem, zt as movePivotValues, vt as newPivotCache, At as newPivotTable, Je as readPivotSource, rt as refreshPivotCache, lt as remapPivotTable, Dt as removePivotDataField, ht as renamePivotItem, Gt as renamePivotValues, ft as reorderPivotItems, Ut as setPivotDataFunction, Bt as setPivotDataNumberFormat, Ht as setPivotDataShowAs, mt as sortPivotItemsByLabel, wt as typeOverPivot, Ft as withListedFields };