@sheetxl/mcp 0.8.0-beta.23 → 0.8.0-beta.25

package/assets/{B3YRTBFhX61z6rJv.js → D6qQAWN_5p3FAshK.js}

@@ -1,18 +1,18 @@
 /**
-* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.23
+* @license @sheetxl/mcp - MCP server exposing SheetXL spreadsheet operations as tools and resources. - v0.8.0-beta.25
 *
 * (C) 2026-present SheetXL Inc. & Michael T. Ford
 * License: SheetXL EULA — https://www.sheetxl.com/eula
 */
-import { Q as t, h as e, ht as n, ot as o, xt as s } from "./DIAQ_WlBCWhgHt-z.js";
-import { Dt as r, F as a, G as i, Kt as l, Tt as c, U as d, Vt as m, ht as p, k as f, lt as h, p as u, v as g } from "./BomatnedZsGMF7MW.js";
-import { f as x, o as y, p as v, u as w } from "./BI8kb-rd9dW85XJs.js";
-import { Bt as S, En as b, Er as C, Ln as T, Ot as k, S as I, _i as R, i as F, ln as E, qr as M, si as P, ui as A, y as D, yn as L } from "./Cl04_aSpBHTwfsQR.js";
-import { u as _, y as N } from "./ChbkkN_JqbAGrUwB.js";
-import { n as $ } from "./CCBQDcCHI47PZ0YQ.js";
-import { F as B, _t as O, gt as V, pt as W, vt as z, yt as j } from "./BGxwDpW8DkO8W0Ig.js";
-import { $t as X, A as H, An as U, At as G, Ct as q, D as J, Dn as K, Dr as Y, Dt as Z, En as Q, Et as et, F as nt, Ft as ot, G as st, Gn as rt, Gt as at, It as it, J as lt, Jn as ct, Jt as dt, Kn as mt, Kt as pt, L as ft, Lt as ht, M as ut, Mn as gt, Mt as xt, O as yt, Or as vt, Ot as wt, P as St, Pn as bt, Pt as Ct, Qn as Tt, R as kt, Rt as It, Sn as Rt, Sr as Ft, St as Et, Tn as Mt, Tr as Pt, Tt as At, U as Dt, Un as Lt, Ut as _t, Vt as Nt, W as $t, Wn as Bt, Xt as Vt, Yn as Wt, Yt as zt, Z as jt, Zt as Xt, _ as Ht, _r as Ut, ar as Gt, at as qt, b as Jt, bn as Kt, bt as Yt, c as Zt, cn as Qt, cr as te, ct as ee, d as ne, dn as oe, dr as se, dt as re, er as ae, et as ie, fr as ce, ft as de, gn as me, gr as pe, h as fe, hn as he, ht as ue, i as ge, ir as xe, it as ye, j as ve, jn as we, jr as Se, k as be, kn as Ce, kt as Te, l as ke, lr as Ie, lt as Re, n as Fe, nn as Ee, nt as Me, on as Pe, or as Ae, p as De, pn as Le, pr as _e, pt as Ne, qn as $e, r as Be, rn as Oe, rr as Ve, sn as We, st as ze, t as je, tn as Xe, tr as He, u as Ue, un as Ge, ur as qe, vn as Ke, vt as Ye, w as Ze, wn as Qe, wt as tn, y as en, yn as nn, yr as on, z as sn, zn as rn, zt as an } from "./CpyybSV2kR6b-SIB.js";
-import { i as ln, l as cn, n as dn, o as mn, s as pn, t as fn } from "./CwrOCbcS4IHLsERQ.js";
+import { Q as t, h as e, ht as n, ot as o, xt as s } from "./ixHQtoul8ubEJfWS.js";
+import { D as r, J as a, Jt as i, L as l, Lt as c, Ot as d, Xt as m, b as p, ct as f, s as h, w as u, x as g } from "./BbfSzxx5EzAvn-_F.js";
+import { f as x, o as y, p as v, u as w } from "./CCOaNx5_BfWCc9yz.js";
+import { $ as S, $r as b, B as C, Ct as T, Ga as k, O as I, Ti as R, U as F, Y as E, c as M, fo as P, oi as A, or as D, ya as L } from "./ckvxz2tZRlY1UPpg.js";
+import { l as _, y as N } from "./DBgHcEP-FcgSHLvx.js";
+import { n as $ } from "./BBccc8pDH-6AJdoT.js";
+import { F as B, _t as O, gt as V, pt as W, vt as z, yt as j } from "./xMi-tFxI2s6e18L1.js";
+import { $t as X, A as H, An as U, At as G, Ct as q, D as J, Dn as K, Dr as Y, Dt as Z, En as Q, Et as et, F as nt, Ft as ot, G as st, Gn as rt, Gt as at, It as it, J as lt, Jn as ct, Jt as dt, Kn as mt, Kt as pt, L as ft, Lt as ht, M as ut, Mn as gt, Mt as xt, O as yt, Or as vt, Ot as wt, P as St, Pn as bt, Pt as Ct, Qn as Tt, R as kt, Rt as It, Sn as Rt, Sr as Ft, St as Et, Tn as Mt, Tr as Pt, Tt as At, U as Dt, Un as Lt, Ut as _t, Vt as Nt, W as $t, Wn as Bt, Xt as Vt, Yn as Wt, Yt as zt, Z as jt, Zt as Xt, _ as Ht, _r as Ut, ar as Gt, at as qt, b as Jt, bn as Kt, bt as Yt, c as Zt, cn as Qt, cr as te, ct as ee, d as ne, dn as oe, dr as se, dt as re, er as ae, et as ie, fr as ce, ft as de, gn as me, gr as pe, h as fe, hn as he, ht as ue, i as ge, ir as xe, it as ye, j as ve, jn as we, jr as Se, k as be, kn as Ce, kt as Te, l as ke, lr as Ie, lt as Re, n as Fe, nn as Ee, nt as Me, on as Pe, or as Ae, p as De, pn as Le, pr as _e, pt as Ne, qn as $e, r as Be, rn as Oe, rr as Ve, sn as We, st as ze, t as je, tn as Xe, tr as He, u as Ue, un as Ge, ur as qe, vn as Ke, vt as Ye, w as Ze, wn as Qe, wt as tn, y as en, yn as nn, yr as on, z as sn, zn as rn, zt as an } from "./DXVfJfT6ftWk5kYi.js";
+import { i as ln, l as cn, n as dn, o as mn, s as pn, t as fn } from "./eCD6fmcTsgv76IZm.js";
 var hn = [
 	["%EntityServiceId", "i"],
 	["_DisplayString", "s"],
@@ -27,7 +27,7 @@ var hn = [
 ], xn = (t) => {
 	const e = t.getName(), n = e.lastIndexOf(":");
 	return n > 0 ? e.substring(0, n) : e;
-}, yn = (t) => t instanceof b && "#spb" === xn(t.getKind()), vn = (t) => "" + t, wn = (t, e) => {
+}, yn = (t) => t instanceof R && "#spb" === xn(t.getKind()), vn = (t) => "" + t, wn = (t, e) => {
 	const n = [];
 	return t?.cardView && n.push(["ShowInCardView", "0"]), t?.dotNotation && n.push(["ShowInDotNotation", "0"]), t?.autoComplete && n.push(["ShowInAutoComplete", "0"]), e && t?.calcCompare && n.push(["ExcludeFromCalcComparison", "1"]), n;
 }, Sn = "resourcesById", bn = class {
@@ -685,7 +685,7 @@ var Zn = "xfVariants", Qn = class {
 		if (void 0 !== e) return e;
 		const n = this._json?.direct?.[t];
 		if (e = n?.protection?.showFormulas, void 0 === e) {
-			const o = (0 !== t ? n?.named : void 0) ?? g.BuiltInName.Normal;
+			const o = (0 !== t ? n?.named : void 0) ?? l.BuiltInName.Normal;
 			e = this._styles.getNamedStyles().getByName(o)?.toJSON().style?.protection?.showFormulas ?? !1;
 		}
 		return this._shown.set(t, e), e;
@@ -902,10 +902,10 @@ function so(n, s, r, a, i) {
 		};
 	}({
 		cells: m,
-		cols: l.cols ? E.refsToRuns(l.cols, !0) : [],
-		rows: l.rows ? E.refsToRuns(l.rows, !1) : []
+		cols: l.cols ? P.refsToRuns(l.cols, !0) : [],
+		rows: l.rows ? P.refsToRuns(l.rows, !1) : []
 	}, d, a), g = { ...n };
-	u.cols.length > 0 ? g.cols = E.runsToRefs(u.cols, !0) : delete g.cols;
+	u.cols.length > 0 ? g.cols = P.runsToRefs(u.cols, !0) : delete g.cols;
 	const x = function(t, e, n) {
 		if (0 === e.length && 0 === n.length) return t;
 		const o = [], s = (t) => {
@@ -936,9 +936,9 @@ function so(n, s, r, a, i) {
 		}
 		return r;
 	}(u.rows, h.top, h.bottom);
-	x.length > 0 ? g.rows = E.runsToRefs(x, !1) : delete g.rows;
+	x.length > 0 ? g.rows = P.runsToRefs(x, !1) : delete g.rows;
 	const y = u.cells;
-	return y.length > 0 ? g.directStyles = y.map(([t, e]) => [E.rangeToString(t, d), e]) : delete g.directStyles, g;
+	return y.length > 0 ? g.directStyles = y.map(([t, e]) => [P.rangeToString(t, d), e]) : delete g.directStyles, g;
 }
 function ro(t, e) {
 	if (!t || !e) return t === e;
@@ -951,19 +951,19 @@ function ro(t, e) {
 	return e.color?.isIColor && (o = e.color.toString()), n === o;
 }
 function ao(t, e, n, o) {
-	const s = o ? l.Edge.Left : l.Edge.Top, r = o ? l.Edge.Right : l.Edge.Bottom, a = o ? l.Edge.Vertical : l.Edge.Horizontal, i = o ? e.colStart : e.rowStart, c = o ? e.colEnd : e.rowEnd, d = o ? n.colStart : n.rowStart, m = o ? n.colEnd : n.rowEnd, p = i === d, f = c === m, h = { ...t };
+	const s = o ? i.Edge.Left : i.Edge.Top, r = o ? i.Edge.Right : i.Edge.Bottom, a = o ? i.Edge.Vertical : i.Edge.Horizontal, l = o ? e.colStart : e.rowStart, c = o ? e.colEnd : e.rowEnd, d = o ? n.colStart : n.rowStart, m = o ? n.colEnd : n.rowEnd, p = l === d, f = c === m, h = { ...t };
 	return p && f ? t : (delete h[s], delete h[r], delete h[a], p ? void 0 !== t[s] && (h[s] = t[s]) : void 0 !== t[a] && (h[s] = t[a]), f ? void 0 !== t[r] && (h[r] = t[r]) : void 0 !== t[a] && (h[r] = t[a]), m - d > 0 && void 0 !== t[a] && (h[a] = t[a]), 0 === Object.keys(h).length ? null : h);
 }
 function io(t, e, n) {
 	const o = t.colEnd - t.colStart + 1, s = t.rowEnd - t.rowStart + 1;
 	let r = e.borders;
 	if (1 === o && 1 === s || !r) return [[t, e]];
-	const a = void 0 !== n && t.colEnd >= n.colEnd, i = void 0 !== n && t.rowEnd >= n.rowEnd;
-	if ((a || i) && (r = { ...r }, a && (void 0 !== r[l.Edge.Vertical] ? r[l.Edge.Right] = r[l.Edge.Vertical] : delete r[l.Edge.Right]), i && (void 0 !== r[l.Edge.Horizontal] ? r[l.Edge.Bottom] = r[l.Edge.Horizontal] : delete r[l.Edge.Bottom]), 0 === Object.keys(r).length)) {
+	const a = void 0 !== n && t.colEnd >= n.colEnd, l = void 0 !== n && t.rowEnd >= n.rowEnd;
+	if ((a || l) && (r = { ...r }, a && (void 0 !== r[i.Edge.Vertical] ? r[i.Edge.Right] = r[i.Edge.Vertical] : delete r[i.Edge.Right]), l && (void 0 !== r[i.Edge.Horizontal] ? r[i.Edge.Bottom] = r[i.Edge.Horizontal] : delete r[i.Edge.Bottom]), 0 === Object.keys(r).length)) {
 		const n = { ...e };
 		return delete n.borders, Object.keys(n).length > 0 ? [[t, n]] : [];
 	}
-	const c = 1 === o || ro(r[l.Edge.Left], r[l.Edge.Vertical]) && ro(r[l.Edge.Right], r[l.Edge.Vertical]), d = 1 === s || ro(r[l.Edge.Top], r[l.Edge.Horizontal]) && ro(r[l.Edge.Bottom], r[l.Edge.Horizontal]);
+	const c = 1 === o || ro(r[i.Edge.Left], r[i.Edge.Vertical]) && ro(r[i.Edge.Right], r[i.Edge.Vertical]), d = 1 === s || ro(r[i.Edge.Top], r[i.Edge.Horizontal]) && ro(r[i.Edge.Bottom], r[i.Edge.Horizontal]);
 	if (c && d) return [[t, r === e.borders ? e : {
 		...e,
 		borders: r
@@ -975,12 +975,12 @@ function io(t, e, n) {
 			rowStart: e.rowStart,
 			colEnd: e.colEnd,
 			rowEnd: e.rowStart
-		}, a, o, !1), (s > 2 || i) && p(e, {
+		}, a, o, !1), (s > 2 || l) && p(e, {
 			colStart: e.colStart,
 			rowStart: e.rowStart + 1,
 			colEnd: e.colEnd,
-			rowEnd: i ? e.rowEnd : e.rowEnd - 1
-		}, a, o, !1), i || p(e, {
+			rowEnd: l ? e.rowEnd : e.rowEnd - 1
+		}, a, o, !1), l || p(e, {
 			colStart: e.colStart,
 			rowStart: e.rowEnd,
 			colEnd: e.colEnd,
@@ -1009,7 +1009,7 @@ function io(t, e, n) {
 }
 var lo = 2, co = 3, mo = (t) => {
 	const e = t?.style;
-	return e ? l.BuiltInDefinitions.get(e)?.width ?? 0 : 0;
+	return e ? i.BuiltInDefinitions.get(e)?.width ?? 0 : 0;
 };
 function po(t) {
 	t.sort((t, e) => t.min - e.min);
@@ -1307,7 +1307,7 @@ var xo = [
 							o.push([a.name, "spb"]), r.push(yn(i) ? "" + e(i) : "");
 							break;
 						case "array":
-							o.push([a.name, "spba"]), r.push(i instanceof L ? "" + t.addBagArray(s(i)) : "");
+							o.push([a.name, "spba"]), r.push(i instanceof S ? "" + t.addBagArray(s(i)) : "");
 							break;
 						case "integer":
 							o.push([a.name, "i"]), r.push(null == i ? "0" : "" + i);
@@ -1323,9 +1323,9 @@ var xo = [
 				const n = e.getElements(), o = Math.max(1, ...n.map((t) => t.length));
 				return t.addArray(n.length, o, s(e));
 			}, a = (e, o) => {
-				if (e instanceof b) return l(e);
-				if (e instanceof L) return t.addValue(t.structureFor("_array", [["array", "a"]]), ["" + r(e)]);
-				if (e instanceof D) return t.addValue(t.structureFor("_hyperlink", [["Address", "s"], ["Text", "s"]]), [e.getAddress() ?? "", "" + (e.getFriendlyName() ?? e.getAddress() ?? "")]);
+				if (e instanceof R) return l(e);
+				if (e instanceof S) return t.addValue(t.structureFor("_array", [["array", "a"]]), ["" + r(e)]);
+				if (e instanceof C) return t.addValue(t.structureFor("_hyperlink", [["Address", "s"], ["Text", "s"]]), [e.getAddress() ?? "", "" + (e.getFriendlyName() ?? e.getAddress() ?? "")]);
 				if ("number" == typeof e) {
 					const s = o ? [["_Self", "" + t.addRichStyle({ numberFormat: o })]] : [];
 					return t.addValue(t.structureFor("_formattednumber", [["_Format", "spb"]]), ["" + n(s, "i")], vn(e));
@@ -1386,7 +1386,7 @@ var xo = [
 							yn(u) ? (p.push([h, "spb"]), f.push("" + e(u))) : (p.push([h, "r"]), f.push(null == u ? "" : "" + a(u, d[h]?.numberFormat)));
 							break;
 						case "array":
-							p.push([h, "a"]), f.push(u instanceof L ? "" + r(u) : "");
+							p.push([h, "a"]), f.push(u instanceof S ? "" + r(u) : "");
 							break;
 						case "string":
 							p.push([h, "s"]), f.push(null == u ? "" : "" + u);
@@ -1423,7 +1423,7 @@ var xo = [
 				}
 				return i(e);
 			};
-			return { writeCell: (t) => t instanceof b && !yn(t) ? l(t) : t instanceof L ? a(t, void 0) : null };
+			return { writeCell: (t) => t instanceof R && !yn(t) ? l(t) : t instanceof S ? a(t, void 0) : null };
 		})(this), this._metaCollector = t, this._workbook = e, this._onWarn = n;
 	}
 	add(t, e = null) {
@@ -1573,64 +1573,64 @@ function Mo(t, e, n, o) {
 	if (!n) return;
 	const s = "string" == typeof n ? e.parseColor(n) : n;
 	o && t.start(o);
-	const r = s.getType(), a = s.getVal(), i = s.getAdjustments(), l = i && i.length > 0;
-	switch (r) {
+	const a = s.getType(), i = s.getVal(), l = s.getAdjustments(), c = l && l.length > 0;
+	switch (a) {
 		case "scheme":
-			l ? (t.start("schemeClr", { val: a }), Po(t, i), t.end("schemeClr")) : t.empty("schemeClr", { val: a });
+			c ? (t.start("schemeClr", { val: i }), Po(t, l), t.end("schemeClr")) : t.empty("schemeClr", { val: i });
 			break;
 		case "named":
-			if (d.isSystem(a)) {
+			if (r.isSystem(i)) {
 				const e = s.getLastColor() ?? s.getBaseColor().toHex().toString(!1).replace("#", "");
-				l ? (t.start("sysClr", {
-					val: a,
+				c ? (t.start("sysClr", {
+					val: i,
 					lastClr: e
-				}), Po(t, i), t.end("sysClr")) : t.empty("sysClr", {
-					val: a,
+				}), Po(t, l), t.end("sysClr")) : t.empty("sysClr", {
+					val: i,
 					lastClr: e
 				});
-			} else l ? (t.start("prstClr", { val: a }), Po(t, i), t.end("prstClr")) : t.empty("prstClr", { val: a });
+			} else c ? (t.start("prstClr", { val: i }), Po(t, l), t.end("prstClr")) : t.empty("prstClr", { val: i });
 			break;
 		case "auto": {
 			const e = s.getLastColor() ?? s.getBaseColor().toHex().toString(!1).replace("#", "");
-			l ? (t.start("sysClr", {
+			c ? (t.start("sysClr", {
 				val: "windowText",
 				lastClr: e
-			}), Po(t, i), t.end("sysClr")) : t.empty("sysClr", {
+			}), Po(t, l), t.end("sysClr")) : t.empty("sysClr", {
 				val: "windowText",
 				lastClr: e
 			});
 			break;
 		}
 		case "index":
-			l ? (t.start("srgbClr", { val: a }), Po(t, i), t.end("srgbClr")) : t.empty("srgbClr", { val: a });
+			c ? (t.start("srgbClr", { val: i }), Po(t, l), t.end("srgbClr")) : t.empty("srgbClr", { val: i });
 			break;
 		case "hsl":
 			const e = s.toHex().toString();
-			l ? (t.start("srgbClr", { val: e }), Po(t, i), t.end("srgbClr")) : t.empty("srgbClr", { val: e });
+			c ? (t.start("srgbClr", { val: e }), Po(t, l), t.end("srgbClr")) : t.empty("srgbClr", { val: e });
 			break;
 		case "lrgb": {
-			const e = /^lrgba?\(\s*([-\d.]+)\s*,\s*([-\d.]+)\s*,\s*([-\d.]+)/i.exec(String(a));
+			const e = /^lrgba?\(\s*([-\d.]+)\s*,\s*([-\d.]+)\s*,\s*([-\d.]+)/i.exec(String(i));
 			if (e) {
 				const n = {
 					r: String(Math.round(1e3 * parseFloat(e[1]))),
 					g: String(Math.round(1e3 * parseFloat(e[2]))),
 					b: String(Math.round(1e3 * parseFloat(e[3])))
 				};
-				l ? (t.start("scrgbClr", n), Po(t, i), t.end("scrgbClr")) : t.empty("scrgbClr", n);
+				c ? (t.start("scrgbClr", n), Po(t, l), t.end("scrgbClr")) : t.empty("scrgbClr", n);
 				break;
 			}
 		}
 		case "rgb":
 			const n = s.toHex().toString();
-			l ? (t.start("srgbClr", { val: n }), Po(t, i), t.end("srgbClr")) : t.empty("srgbClr", { val: n });
+			c ? (t.start("srgbClr", { val: n }), Po(t, l), t.end("srgbClr")) : t.empty("srgbClr", { val: n });
 			break;
 		case "hex":
-			const o = a.replace("#", "").toUpperCase();
-			l ? (t.start("srgbClr", { val: o }), Po(t, i), t.end("srgbClr")) : t.empty("srgbClr", { val: o });
+			const o = i.replace("#", "").toUpperCase();
+			c ? (t.start("srgbClr", { val: o }), Po(t, l), t.end("srgbClr")) : t.empty("srgbClr", { val: o });
 			break;
 		default:
-			const r = a.replace("#", "").toUpperCase();
-			t.empty("srgbClr", { val: r });
+			const a = i.replace("#", "").toUpperCase();
+			t.empty("srgbClr", { val: a });
 	}
 	o && t.end(o);
 }
@@ -1661,29 +1661,29 @@ function Ao(t, e, n, o, s = !1, r = !1) {
 	if (!n) return;
 	const a = "string" == typeof n ? e.parseColor(n) : n, i = () => {
 		t.empty(o, { rgb: Vo(a.toHex().toString(!0)) });
-	}, l = a.getAdjustments(), c = l && l.length > 0, d = a.getType();
-	if (d !== m.Type.Auto) {
-		if (d === m.Type.Scheme) {
+	}, l = a.getAdjustments(), d = l && l.length > 0, m = a.getType();
+	if (m !== c.Type.Auto) {
+		if (m === c.Type.Scheme) {
 			const e = a.getVal(), n = Do[e] ?? e, s = No.get(n);
 			if (void 0 === s && "phClr" !== n) return console.warn(`Color scheme not in theme. schemeVal=${e} themeKey=${n}`), i();
 			const r = {};
-			if (r.theme = s, c) {
+			if (r.theme = s, d) {
 				if (!function(t) {
 					for (const e of t) switch (Object.keys(e)[0]) {
-						case m.AdjustmentType.Tint:
-						case m.AdjustmentType.ETint:
-						case m.AdjustmentType.Shade:
-						case m.AdjustmentType.Lum:
-						case m.AdjustmentType.LumOff:
-						case m.AdjustmentType.LumMod:
-						case m.AdjustmentType.Alpha:
-						case m.AdjustmentType.AlphaOff:
-						case m.AdjustmentType.AlphaMod: continue;
+						case c.AdjustmentType.Tint:
+						case c.AdjustmentType.ETint:
+						case c.AdjustmentType.Shade:
+						case c.AdjustmentType.Lum:
+						case c.AdjustmentType.LumOff:
+						case c.AdjustmentType.LumMod:
+						case c.AdjustmentType.Alpha:
+						case c.AdjustmentType.AlphaOff:
+						case c.AdjustmentType.AlphaMod: continue;
 						default: return !1;
 					}
 					return !0;
 				}(l)) return i();
-				const t = 1 === l.length ? l[0][m.AdjustmentType.ETint] : void 0;
+				const t = 1 === l.length ? l[0][c.AdjustmentType.ETint] : void 0;
 				let e;
 				if (void 0 !== t) e = Bo(t);
 				else {
@@ -1698,7 +1698,7 @@ function Ao(t, e, n, o, s = !1, r = !1) {
 			t.empty(o, r);
 			return;
 		}
-		if (d === m.Type.Index) {
+		if (m === c.Type.Index) {
 			const e = a.getVal(), n = e.substring(5, e.length);
 			t.empty(o, { indexed: Number(n) });
 			return;
@@ -1778,40 +1778,40 @@ var zo = "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
 	const s = "string" == typeof o ? { address: o } : o, r = { "xmlns:r": zo };
 	s.address && (r["r:id"] = t.addExternal("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", s.address).relId ?? void 0), r.action = s.action, r.tgtFrame = s.target, r.tooltip = s.screenTip, void 0 !== s.history && (r.history = s.history ? "1" : "0"), e.empty(n, r);
 };
-function Xo(t, e, o, s, r = !1, i = !1) {
-	const l = s.getTheme();
+function Xo(t, e, o, s, r = !1, a = !1) {
+	const i = s.getTheme();
 	if (r && e.start("fill"), "string" == typeof o && (o = {
-		type: a.Type.Solid,
+		type: u.Type.Solid,
 		color: o
-	}), o.type !== a.Type.Image || r) if (o.type !== a.Type.Group || r) if (o.type === a.Type.None || o.type === a.Type.Image || o.type === a.Type.Group) r ? e.empty("patternFill", { patternType: "none" }) : e.empty("noFill");
-	else if (o.type === a.Type.Solid) {
+	}), o.type !== u.Type.Image || r) if (o.type !== u.Type.Group || r) if (o.type === u.Type.None || o.type === u.Type.Image || o.type === u.Type.Group) r ? e.empty("patternFill", { patternType: "none" }) : e.empty("noFill");
+	else if (o.type === u.Type.Solid) {
 		const t = o;
-		r ? e.start("patternFill", { patternType: "solid" }) : e.start("solidFill"), t.color && (r ? Ao(e, l, t.color, i ? "bgColor" : "fgColor") : Mo(e, l, t.color)), r ? e.end("patternFill") : e.end("solidFill");
-	} else if (o.type === a.Type.Pattern) {
+		r ? e.start("patternFill", { patternType: "solid" }) : e.start("solidFill"), t.color && (r ? Ao(e, i, t.color, a ? "bgColor" : "fgColor") : Mo(e, i, t.color)), r ? e.end("patternFill") : e.end("solidFill");
+	} else if (o.type === u.Type.Pattern) {
 		const t = o, n = t.patternType || "solid";
 		e.start("patternFill", { patternType: n });
-		const s = i ? t.background : t.foreground, a = i ? t.foreground : t.background;
-		s && (r ? Ao(e, l, s, "fgColor") : Mo(e, l, s)), a && (r ? Ao(e, l, a, "bgColor") : Mo(e, l, a)), e.end("patternFill");
-	} else if (o.type === a.Type.Gradient && r) {
+		const s = a ? t.background : t.foreground, l = a ? t.foreground : t.background;
+		s && (r ? Ao(e, i, s, "fgColor") : Mo(e, i, s)), l && (r ? Ao(e, i, l, "bgColor") : Mo(e, i, l)), e.end("patternFill");
+	} else if (o.type === u.Type.Gradient && r) {
 		const t = o, n = {}, s = t.gradientType;
-		if (s !== a.GradientType.Path && s !== a.GradientType.Linear || (n.type = s), void 0 !== t.angle) {
+		if (s !== u.GradientType.Path && s !== u.GradientType.Linear || (n.type = s), void 0 !== t.angle) {
 			const e = (t.angle - 90) % 360;
 			0 !== e && (n.degree = String(e));
 		}
 		const r = t.focus;
 		r && (r.left && (n.left = String(r.left)), r.right && (n.right = String(r.right)), r.top && (n.top = String(r.top)), r.bottom && (n.bottom = String(r.bottom))), e.start("gradientFill", n);
-		const i = t.stops;
-		if (i && i.length > 0) for (const t of i) {
+		const a = t.stops;
+		if (a && a.length > 0) for (const t of a) {
 			let n, o = 0;
 			if ("string" == typeof t || "object" == typeof t && !("offset" in t)) n = t, o = 0;
 			else {
 				const e = t;
 				o = e.offset || 0, n = e.color;
 			}
-			e.start("stop", { position: String(o) }), n && Ao(e, l, n, "color"), e.end("stop");
+			e.start("stop", { position: String(o) }), n && Ao(e, i, n, "color"), e.end("stop");
 		}
 		e.end("gradientFill");
-	} else if (o.type === a.Type.Gradient) {
+	} else if (o.type === u.Type.Gradient) {
 		const t = o, s = {};
 		void 0 !== t.flip && (s.flip = t.flip), void 0 !== t.isRotatedWithShape && (s.rotWithShape = t.isRotatedWithShape ? "1" : "0"), e.start("gradFill", s), e.start("gsLst");
 		const r = t.stops;
@@ -1819,19 +1819,19 @@ function Xo(t, e, o, s, r = !1, i = !1) {
 			const t = r.length - 1;
 			for (let o = 0; o < r.length; o++) {
 				const s = r[o];
-				let a, i = t > 0 ? o / t : 0;
+				let a, l = t > 0 ? o / t : 0;
 				if ("string" == typeof s || "object" == typeof s && !("offset" in s)) a = s;
 				else {
 					const t = s;
-					i = t.offset ?? i, a = t.color;
+					l = t.offset ?? l, a = t.color;
 				}
-				e.start("gs", { pos: String(n.roundAccurately(1e5 * i, 0)) }), a && Mo(e, l, a), e.end("gs");
+				e.start("gs", { pos: String(n.roundAccurately(1e5 * l, 0)) }), a && Mo(e, i, a), e.end("gs");
 			}
 		}
 		e.end("gsLst");
-		const i = t.gradientType;
-		if (i && i !== a.GradientType.Linear) {
-			const o = i === a.GradientType.Path || "radial" === i ? "circle" : i;
+		const a = t.gradientType;
+		if (a && a !== u.GradientType.Linear) {
+			const o = a === u.GradientType.Path || "radial" === a ? "circle" : a;
 			e.start("path", { path: o });
 			const s = t.focus;
 			if (s) {
@@ -1871,9 +1871,9 @@ var Ho = (t, e, o, s) => {
 		});
 		e.end("custDash");
 	} else "string" == typeof r.dash && e.empty("prstDash", { val: r.dash });
-	if (r.lineJoin === u.LineJoin.Round) e.empty("round");
-	else if (r.lineJoin === u.LineJoin.Bevel) e.empty("bevel");
-	else if (r.lineJoin === u.LineJoin.Miter) {
+	if (r.lineJoin === d.LineJoin.Round) e.empty("round");
+	else if (r.lineJoin === d.LineJoin.Bevel) e.empty("bevel");
+	else if (r.lineJoin === d.LineJoin.Miter) {
 		const t = {};
 		void 0 !== r.miterLimit && (t.lim = String(n.roundAccurately(1e5 * r.miterLimit, 0))), e.empty("miter", t);
 	}
@@ -1904,32 +1904,32 @@ var Ho = (t, e, o, s) => {
 	e.end("effectLst");
 }, Jo = (t, e, o) => {
 	switch (o.type) {
-		case c.Type.OuterShadow: {
+		case g.Type.OuterShadow: {
 			const s = {};
 			void 0 !== o.blur && (s.blurRad = String(ls(o.blur))), void 0 !== o.distance && (s.dist = String(ls(o.distance))), void 0 !== o.angle && (s.dir = String(ds(o.angle))), void 0 !== o.alignment && (s.algn = o.alignment), void 0 !== o.isRotatedWithShape && (s.rotWithShape = o.isRotatedWithShape ? "1" : "0"), void 0 !== o.scaleX && (s.sx = String(n.roundAccurately(1e3 * o.scaleX, 0))), void 0 !== o.scaleY && (s.sy = String(n.roundAccurately(1e3 * o.scaleY, 0))), void 0 !== o.skewX && (s.kx = String(ds(o.skewX))), void 0 !== o.skewY && (s.ky = String(ds(o.skewY))), t.start("outerShdw", s), Mo(t, e, o.color), t.end("outerShdw");
 			break;
 		}
-		case c.Type.InnerShadow: {
+		case g.Type.InnerShadow: {
 			const n = {};
 			void 0 !== o.blur && (n.blurRad = String(ls(o.blur))), void 0 !== o.distance && (n.dist = String(ls(o.distance))), void 0 !== o.angle && (n.dir = String(ds(o.angle))), t.start("innerShdw", n), Mo(t, e, o.color), t.end("innerShdw");
 			break;
 		}
-		case c.Type.PresetShadow: {
+		case g.Type.PresetShadow: {
 			const n = { prst: o.preset };
 			void 0 !== o.distance && (n.dist = String(ls(o.distance))), void 0 !== o.angle && (n.dir = String(ds(o.angle))), t.start("prstShdw", n), Mo(t, e, o.color), t.end("prstShdw");
 			break;
 		}
-		case c.Type.Glow: {
+		case g.Type.Glow: {
 			const n = {};
 			void 0 !== o.radius && (n.rad = String(ls(o.radius))), t.start("glow", n), Mo(t, e, o.color), t.end("glow");
 			break;
 		}
-		case c.Type.SoftEdge: {
+		case g.Type.SoftEdge: {
 			const e = {};
 			void 0 !== o.radius && (e.rad = String(ls(o.radius))), t.empty("softEdge", e);
 			break;
 		}
-		case c.Type.Reflection: {
+		case g.Type.Reflection: {
 			const e = {};
 			void 0 !== o.blur && (e.blurRad = String(ls(o.blur))), void 0 !== o.distance && (e.dist = String(ls(o.distance))), void 0 !== o.angle && (e.dir = String(ds(o.angle))), void 0 !== o.fadeAngle && (e.fadeDir = String(ds(o.fadeAngle))), void 0 !== o.startAlpha && (e.stA = String(n.roundAccurately(1e3 * o.startAlpha, 0))), void 0 !== o.startPosition && (e.stPos = String(n.roundAccurately(1e3 * o.startPosition, 0))), void 0 !== o.endAlpha && (e.endA = String(n.roundAccurately(1e3 * o.endAlpha, 0))), void 0 !== o.endPosition && (e.endPos = String(n.roundAccurately(1e3 * o.endPosition, 0))), void 0 !== o.scaleX && (e.sx = String(n.roundAccurately(1e3 * o.scaleX, 0))), void 0 !== o.scaleY && (e.sy = String(n.roundAccurately(1e3 * o.scaleY, 0))), void 0 !== o.skewX && (e.kx = String(ds(o.skewX))), void 0 !== o.skewY && (e.ky = String(ds(o.skewY))), void 0 !== o.alignment && (e.algn = o.alignment), void 0 !== o.isRotatedWithShape && (e.rotWithShape = o.isRotatedWithShape ? "1" : "0"), t.empty("reflection", e);
 			break;
@@ -1968,7 +1968,7 @@ var Ho = (t, e, o, s) => {
 }, es = (t, e) => void 0 === e ? void 0 : t.getSharedStates().get(Sn)?.get(e), ns = async (t, e) => {
 	if (!e) return;
 	const n = e.fill;
-	if (n?.type === a.Type.Image) {
+	if (n?.type === u.Type.Image) {
 		const e = es(t, n.resId);
 		e && await ts(t, e);
 	}
@@ -2015,7 +2015,7 @@ var Ho = (t, e, o, s) => {
 		for (let e = 0; e < o; e++) {
 			const o = 0 === e ? {
 				...n[e],
-				named: g.BuiltInName.Normal
+				named: l.BuiltInName.Normal
 			} : n[e], r = t.resolve(o), a = {};
 			void 0 !== o.named && (a.named = o.named), void 0 !== o.quotePrefix && (a.quotePrefix = o.quotePrefix), void 0 !== o.protection && (a.protection = o.protection);
 			for (let t = 0; t < xs.length; t++) {
@@ -2054,7 +2054,7 @@ function ys(t, e, o) {
 		namedStyles: []
 	};
 	(function(t, e) {
-		const n = (t.getNamedStyles().getByName(g.BuiltInName.Normal).toJSON().style ?? {}).font ?? {};
+		const n = (t.getNamedStyles().getByName(l.BuiltInName.Normal).toJSON().style ?? {}).font ?? {};
 		e.fontMap.set(s.JSONStableStringify(n), "0"), e.fonts.push(n);
 	})(t, r), function(t) {
 		const e = { type: "none" };
@@ -2073,7 +2073,7 @@ function ys(t, e, o) {
 		};
 		t.borderMap.set(s.JSONStableStringify(e), "0"), t.borders.push(e);
 	}(r), function(t, e) {
-		Ss(t, t.getNamedStyles().getByName(g.BuiltInName.Normal).toJSON(), e);
+		Ss(t, t.getNamedStyles().getByName(l.BuiltInName.Normal).toJSON(), e);
 	}(t, r);
 	const a = e?.named ?? n.EmptyArray;
 	for (const e of a) Ss(t, e, r);
@@ -2082,7 +2082,7 @@ function ys(t, e, o) {
 }
 function vs(t, e, n) {
 	if (!e) return;
-	const o = p.toBuiltInID(e), s = n.numFmtMap;
+	const o = m.toBuiltInID(e), s = n.numFmtMap;
 	if (!s.has(e)) {
 		let t = 0;
 		"number" == typeof o ? t = o : (t = n.numFmtsCustom.length + Ps, n.numFmtsCustom.push(o)), s.set(e, "" + t);
@@ -2156,42 +2156,42 @@ function Ts(t, e, n, o, s = !1) {
 var ks = (t) => null == t ? null : "string" == typeof t ? t : JSON.stringify(t);
 function Is(t, e, n, o = !1) {
 	const s = {};
-	n.horizontal && n.horizontal !== h.HorizontalAlignment.General && (s.horizontal = n.horizontal), n.vertical && n.vertical !== h.VerticalAlignment.Bottom && (s.vertical = n.vertical);
+	n.horizontal && n.horizontal !== f.HorizontalAlignment.General && (s.horizontal = n.horizontal), n.vertical && n.vertical !== f.VerticalAlignment.Bottom && (s.vertical = n.vertical);
 	let r = n.rotation;
 	n.stacked && (s.textRotation = "255", r = 0), r && (r >= 270 && r < 360 ? r = 360 - r : r > 0 && r <= 90 && (r += 90), s.textRotation = String(r));
 	const a = n.overflow;
-	switch (a === h.Overflow.Wrap && (s.wrapText = "1"), n.indent && (s.indent = "" + n.indent), n.relativeIndent && (s.relativeIndent = "" + n.relativeIndent), n.justifyLastLine && (s.justifyLastLine = "1"), a === h.Overflow.Shrink && (s.shrinkToFit = "1"), n.readingDirection) {
-		case h.ReadingDirection.Auto: break;
-		case h.ReadingDirection.LeftToRight:
+	switch (a === f.Overflow.Wrap && (s.wrapText = "1"), n.indent && (s.indent = "" + n.indent), n.relativeIndent && (s.relativeIndent = "" + n.relativeIndent), n.justifyLastLine && (s.justifyLastLine = "1"), a === f.Overflow.Shrink && (s.shrinkToFit = "1"), n.readingDirection) {
+		case f.ReadingDirection.Auto: break;
+		case f.ReadingDirection.LeftToRight:
 			s.readingOrder = "1";
 			break;
-		case h.ReadingDirection.RightToLeft: s.readingOrder = "2";
+		case f.ReadingDirection.RightToLeft: s.readingOrder = "2";
 	}
 	return Object.keys(s).length > 0 ? s : null;
 }
-function Rs(t, e, n, o, r, a, i = !1, l = !1, c = null) {
-	const d = {};
-	let m = null, p = o.named;
-	p && (m = n.getNamedStyles().getByName(p).toJSON().style);
-	const f = o.font ?? m?.font, h = f ? r.fontMap.get(s.JSONStableStringify(f)) ?? 0 : 0, u = o.fill ?? m?.fill, x = u ? r.fillMap.get(s.JSONStableStringify(u)) ?? 0 : 0, y = o.borders ?? m?.borders, v = y ? r.borderMap.get(s.JSONStableStringify(y)) ?? 0 : 0, w = o.numberFormat ?? m?.numberFormat;
-	if (d.numFmtId = (void 0 !== w ? r.numFmtMap.get(w) : void 0) ?? "0", d.fontId = String(h), d.fillId = String(x), d.borderId = String(v), a) {
-		const t = o.named ?? g.BuiltInName.Normal;
-		d.xfId = r.namedStyleMap.get(t.toLowerCase());
+function Rs(t, e, n, o, r, a, i = !1, c = !1, d = null) {
+	const m = {};
+	let p = null, f = o.named;
+	f && (p = n.getNamedStyles().getByName(f).toJSON().style);
+	const h = o.font ?? p?.font, u = h ? r.fontMap.get(s.JSONStableStringify(h)) ?? 0 : 0, g = o.fill ?? p?.fill, x = g ? r.fillMap.get(s.JSONStableStringify(g)) ?? 0 : 0, y = o.borders ?? p?.borders, v = y ? r.borderMap.get(s.JSONStableStringify(y)) ?? 0 : 0, w = o.numberFormat ?? p?.numberFormat;
+	if (m.numFmtId = (void 0 !== w ? r.numFmtMap.get(w) : void 0) ?? "0", m.fontId = String(u), m.fillId = String(x), m.borderId = String(v), a) {
+		const t = o.named ?? l.BuiltInName.Normal;
+		m.xfId = r.namedStyleMap.get(t.toLowerCase());
 	}
 	let S = null;
-	const b = o.alignment ?? m?.alignment;
-	b && (S = Is(0, 0, b)), o.font && (d.applyFont = "1"), o.fill && (d.applyFill = "1"), o.numberFormat && (d.applyNumberFormat = "1"), o.borders && (d.applyBorder = "1"), S && (d.applyAlignment = "1");
+	const b = o.alignment ?? p?.alignment;
+	b && (S = Is(0, 0, b)), o.font && (m.applyFont = "1"), o.fill && (m.applyFill = "1"), o.numberFormat && (m.applyNumberFormat = "1"), o.borders && (m.applyBorder = "1"), S && (m.applyAlignment = "1");
 	let C = null;
-	const T = o.protection?.alwaysUnlocked ?? m?.protection?.alwaysUnlocked ?? !1;
-	(T || i) && (C = {}, T && (C.locked = "0"), i && (C.hidden = "1"), d.applyProtection = "1"), o.quotePrefix && (d.quotePrefix = "1"), l && (d.pivotButton = "1"), S || C || null !== c ? (e.start("xf", d), S && e.empty("alignment", S), C && e.empty("protection", C), null !== c && (e.start("extLst"), e.start("ext", {
+	const T = o.protection?.alwaysUnlocked ?? p?.protection?.alwaysUnlocked ?? !1;
+	(T || i) && (C = {}, T && (C.locked = "0"), i && (C.hidden = "1"), m.applyProtection = "1"), o.quotePrefix && (m.quotePrefix = "1"), c && (m.pivotButton = "1"), S || C || null !== d ? (e.start("xf", m), S && e.empty("alignment", S), C && e.empty("protection", C), null !== d && (e.start("extLst"), e.start("ext", {
 		uri: Fs,
 		"xmlns:xfpb": Es
-	}), e.empty("xfpb:xfComplement", { i: String(c) }), e.end("ext"), e.end("extLst")), e.end("xf")) : e.empty("xf", d);
+	}), e.empty("xfpb:xfComplement", { i: String(d) }), e.end("ext"), e.end("extLst")), e.end("xf")) : e.empty("xf", m);
 }
 var Fs = "{C7286773-470A-42A8-94C5-96B5CB345126}", Es = "http://schemas.microsoft.com/office/spreadsheetml/2022/featurepropertybag";
 function Ms(t, e, n, o, s, r = "dxf", a = Ps) {
 	if (e.start(r), n.font && bs(0, e, n.font, o, !0), void 0 !== n.numberFormat && null !== n.numberFormat) {
-		const t = p.toBuiltInID(n.numberFormat), o = "number" == typeof t, s = o ? p.builtInFormat(t) : String(t);
+		const t = m.toBuiltInID(n.numberFormat), o = "number" == typeof t, s = o ? m.builtInFormat(t) : String(t);
 		s && e.empty("numFmt", {
 			numFmtId: String(o ? t : a++),
 			formatCode: s
@@ -2463,7 +2463,7 @@ var Ps = 164, As = Object.freeze([
 		numFmtId: (t) => ((t, e) => (vs(t.styles, e, t.denormalized), parseInt(t.denormalized.numFmtMap.get(e) ?? "0", 10)))(n, t),
 		dxfId: (t) => o.add(t)
 	};
-}, tr = (t, e) => t.getSharedStates().get("pivotCachePaths")?.get(e) ?? null, er = "date1904", nr = (t) => !0 === t.getSharedStates().get(er), or = 0, sr = M.BuiltInOperatorNames, rr = (t, e, n, o, s, r, a) => {
+}, tr = (t, e) => t.getSharedStates().get("pivotCachePaths")?.get(e) ?? null, er = "date1904", nr = (t) => !0 === t.getSharedStates().get(er), or = 0, sr = L.BuiltInOperatorNames, rr = (t, e, n, o, s, r, a) => {
 	const i = o.sorts, l = i ? i.length : 0;
 	if (0 === l) return;
 	const c = {};
@@ -2472,7 +2472,7 @@ var Ps = 164, As = Object.freeze([
 		t && (c.caseSensitive = "object" != typeof t || Array.isArray(t) || "case" !== t.sensitivity && "variant" !== t.sensitivity ? "0" : "1");
 	}
 	const d = o.extent, m = n.getRange().getCoords(), p = (d ? an(m, d.range) : null) ?? r;
-	c.ref = E.rangeToString(p), c["xmlns:xlrd2"] = "http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2", e.start("sortState", c);
+	c.ref = P.rangeToString(p), c["xmlns:xlrd2"] = "http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2", e.start("sortState", c);
 	for (let n = 0; n < l; n++) {
 		const o = i[n], s = o.criteria ?? {}, l = o.index + r.colStart, c = {};
 		s.reverse && (c.descending = "1");
@@ -2486,7 +2486,7 @@ var Ps = 164, As = Object.freeze([
 			colStart: l,
 			colEnd: l
 		});
-		c.ref = E.rangeToString(h);
+		c.ref = P.rangeToString(h);
 		const u = ue(s.sortOn);
 		u && (c.sortBy = u), void 0 !== s.style && (c.dxfId = hs(t.getSharedStates()).add(s.style)), void 0 !== s.iconSet && (c.iconSet = s.iconSet), void 0 !== s.customList && (c.customList = s.customList), e.empty("sortCondition", c);
 	}
@@ -2522,16 +2522,16 @@ var Ps = 164, As = Object.freeze([
 	const s = { operator: o.operator };
 	void 0 !== o.val && (s.val = o.val), e.empty("customFilter", s);
 }, lr = /* @__PURE__ */ new Set([
-	M.BuiltInSelectorNames.Display,
-	M.BuiltInSelectorNames.Date,
-	M.BuiltInSelectorNames.Time
+	L.BuiltInSelectorNames.Display,
+	L.BuiltInSelectorNames.Date,
+	L.BuiltInSelectorNames.Time
 ]), cr = (t, e, n, o, s, r = null) => {
 	const a = {};
 	a.colId = "" + n, s && (a.hiddenButton = "1"), o ? (e.start("filterColumn", a), ((t, e, n, o = null) => {
 		const s = n.operator, r = "string" == typeof n.selector ? n.selector : n.selector?.getName?.();
-		if (r && !lr.has(r) && t.warn(`A '${r}' selector has no OOXML form in a Table AutoFilter; the rule is written without it`, n), !0 === n.includeBlanks && s !== M.BuiltInOperatorNames.InSet && s !== sr.Blank && t.warn("Ignore Blank has no OOXML form in a Table AutoFilter outside a values list; Excel will hide the blank rows", n), s === M.BuiltInOperatorNames.Expression) return void t.warn("Expression conditions not supported in Table AutoFilters", n);
-		if (s === M.BuiltInOperatorNames.Unique) return void t.warn("Unique conditions not supported in Table AutoFilters", n);
-		if (s === M.BuiltInOperatorNames.Color) {
+		if (r && !lr.has(r) && t.warn(`A '${r}' selector has no OOXML form in a Table AutoFilter; the rule is written without it`, n), !0 === n.includeBlanks && s !== L.BuiltInOperatorNames.InSet && s !== sr.Blank && t.warn("Ignore Blank has no OOXML form in a Table AutoFilter outside a values list; Excel will hide the blank rows", n), s === L.BuiltInOperatorNames.Expression) return void t.warn("Expression conditions not supported in Table AutoFilters", n);
+		if (s === L.BuiltInOperatorNames.Unique) return void t.warn("Unique conditions not supported in Table AutoFilters", n);
+		if (s === L.BuiltInOperatorNames.Color) {
 			const o = n.param, s = {};
 			void 0 !== o.cellColor && (s.cellColor = o.cellColor ? "1" : "0"), void 0 !== o.style && (s.dxfId = hs(t.getSharedStates()).add(o.style)), e.empty("colorFilter", s);
 		}
@@ -2546,10 +2546,10 @@ var Ps = 164, As = Object.freeze([
 			});
 			e.end("customFilters");
 		} else if (s !== sr.Blank) {
-			if (s === M.BuiltInOperatorNames.InSet) {
+			if (s === L.BuiltInOperatorNames.InSet) {
 				const s = n.param ?? {};
 				let r = Array.isArray(s.items) ? s.items : [];
-				n.selector !== M.BuiltInSelectorNames.Display && r.some((t) => "string" != typeof t) && (r = ((t, e, n, o) => {
+				n.selector !== L.BuiltInSelectorNames.Display && r.some((t) => "string" != typeof t) && (r = ((t, e, n, o) => {
 					const s = [], r = [];
 					for (let t = 0; t < n.length; t++) {
 						const e = n[t];
@@ -2577,7 +2577,7 @@ var Ps = 164, As = Object.freeze([
 					e.end("customFilters");
 				}
 			} else U(n) ? (e.start("customFilters"), ir(t, e, n), e.end("customFilters")) : s === sr.Not && t.warn("Not rule with non-comparison criteria not supported in OOXML", n.param);
-			if (s === M.BuiltInOperatorNames.TimePeriod) {
+			if (s === L.BuiltInOperatorNames.TimePeriod) {
 				const o = n.param, s = o?.type;
 				if (s && Qe.has(s)) {
 					const n = o.anchorDate, r = "number" == typeof n && Number.isFinite(n) ? tn(s, Math.floor(n), nr(t)) : null;
@@ -2588,15 +2588,15 @@ var Ps = 164, As = Object.freeze([
 					} : { type: s });
 				} else t.warn(`TimePeriod '${s}' has no OOXML dynamicFilter type; not written`, n.param);
 			}
-			if (s === M.BuiltInOperatorNames.Average) {
-				const o = n.param, s = o?.type === M.AverageType.Below ? "belowAverage" : "aboveAverage";
+			if (s === L.BuiltInOperatorNames.Average) {
+				const o = n.param, s = o?.type === L.AverageType.Below ? "belowAverage" : "aboveAverage";
 				o?.stdDevs && t.warn(`Average with stdDevs has no OOXML spelling; written as ${s}`, n.param), e.empty("dynamicFilter", { type: s });
 			}
-			if (s === M.BuiltInOperatorNames.Icon) {
+			if (s === L.BuiltInOperatorNames.Icon) {
 				const t = n.param, o = {};
 				void 0 !== t.iconSet && (o.iconSet = t.iconSet), void 0 !== t.iconId && (o.iconId = "" + t.iconId), e.empty("iconFilter", o);
 			}
-			if (s === M.BuiltInOperatorNames.TopN) {
+			if (s === L.BuiltInOperatorNames.TopN) {
 				const o = n.param;
 				if (o.sum) return void t.warn("Top N by sum has no OOXML form in a Table AutoFilter; it is not written", n);
 				const s = {};
@@ -2939,13 +2939,13 @@ function Yr(t, e, n) {
 	const o = (e, n) => {
 		void 0 !== n && t.empty(e, n ? void 0 : { val: 0 });
 	};
-	o("b", void 0 === e.weight ? void 0 : e.weight >= 700), o("i", void 0 === e.style ? void 0 : e.style !== i.Style.Normal), o("strike", on(e.strike));
+	o("b", void 0 === e.weight ? void 0 : e.weight >= 700), o("i", void 0 === e.style ? void 0 : e.style !== a.Style.Normal), o("strike", on(e.strike));
 	const s = Dt(e.letterSpacing);
 	s && o(s, !0), o("outline", e.outline), o("shadow", e.shadow);
 	const r = Mt(e.underline);
-	r && t.empty("u", r === i.UnderlineStyle.Single ? void 0 : { val: r });
-	const a = sn(e.baseline, !0);
-	a && t.empty("vertAlign", { val: a }), void 0 !== e.size && t.empty("sz", { val: e.size }), e.color && function(t, e, n) {
+	r && t.empty("u", r === a.UnderlineStyle.Single ? void 0 : { val: r });
+	const i = sn(e.baseline, !0);
+	i && t.empty("vertAlign", { val: i }), void 0 !== e.size && t.empty("sz", { val: e.size }), e.color && function(t, e, n) {
 		const o = /^index(\d+)$/.exec(e);
 		o ? t.empty("color", { indexed: Number(o[1]) }) : Ao(t, n, e, "color");
 	}(t, e.color, n);
@@ -2969,7 +2969,7 @@ function Qr(t) {
 	if (e.isInvalid()) return null;
 	const n = e.getCoords()[0];
 	return n ? {
-		ref: E.cellToString({
+		ref: P.cellToString({
 			rowIndex: n.rowStart,
 			colIndex: n.colStart
 		}),
@@ -3001,13 +3001,13 @@ function la(t, e, n, o) {
 	const r = [];
 	for (let o = e.rowStart; o <= e.rowEnd; o++) for (let a = e.colStart; a <= e.colEnd; a++) {
 		let i = n;
-		o === e.rowStart && a === e.colStart || (s || (s = [], E.normalizeA1ToR1C1(n, e.rowStart, e.colStart, s)), i = E.resolveRelativeToA1(s, o, a));
+		o === e.rowStart && a === e.colStart || (s || (s = [], P.normalizeA1ToR1C1(n, e.rowStart, e.colStart, s)), i = P.resolveRelativeToA1(s, o, a));
 		const l = ge(i, {
 			rowIndex: o,
 			colIndex: a
 		});
 		if (!l) return !1;
-		const c = t.getRange(E.cellToString({
+		const c = t.getRange(P.cellToString({
 			rowIndex: o,
 			colIndex: a
 		})).getCell().getValue();
@@ -3023,7 +3023,7 @@ function la(t, e, n, o) {
 }
 function ca(t, e) {
 	let n = e.type;
-	n === I.ColorStopType.AutoMin ? n = I.ColorStopType.Min : n === I.ColorStopType.AutoMax && (n = I.ColorStopType.Max), t.empty("cfvo", {
+	n === F.ColorStopType.AutoMin ? n = F.ColorStopType.Min : n === F.ColorStopType.AutoMax && (n = F.ColorStopType.Max), t.empty("cfvo", {
 		type: n,
 		val: e.value,
 		gte: e.exclusive ? "0" : void 0
@@ -3037,29 +3037,29 @@ function da(t, e) {
 	void 0 !== e.value ? (t.start("x14:cfvo", n), t.start("xm:f"), t.text(e.value), t.end("xm:f"), t.end("x14:cfvo")) : t.empty("x14:cfvo", n);
 }
 var ma = /* @__PURE__ */ new Set([
-	g.IconSet.Arrows3,
-	g.IconSet.ArrowsGray3,
-	g.IconSet.Flags3,
-	g.IconSet.Signs3,
-	g.IconSet.Symbols3,
-	g.IconSet.Symbols3_2,
-	g.IconSet.TrafficLights3,
-	g.IconSet.TrafficLights3_2,
-	g.IconSet.Arrows4,
-	g.IconSet.ArrowsGray4,
-	g.IconSet.Rating4,
-	g.IconSet.RedToBlack4,
-	g.IconSet.TrafficLights4,
-	g.IconSet.Arrows5,
-	g.IconSet.ArrowsGray5,
-	g.IconSet.Quarters5,
-	g.IconSet.Rating5
+	l.IconSet.Arrows3,
+	l.IconSet.ArrowsGray3,
+	l.IconSet.Flags3,
+	l.IconSet.Signs3,
+	l.IconSet.Symbols3,
+	l.IconSet.Symbols3_2,
+	l.IconSet.TrafficLights3,
+	l.IconSet.TrafficLights3_2,
+	l.IconSet.Arrows4,
+	l.IconSet.ArrowsGray4,
+	l.IconSet.Rating4,
+	l.IconSet.RedToBlack4,
+	l.IconSet.TrafficLights4,
+	l.IconSet.Arrows5,
+	l.IconSet.ArrowsGray5,
+	l.IconSet.Quarters5,
+	l.IconSet.Rating5
 ]);
 function pa(t) {
 	return (t.icon?.length ?? 0) > 0 || void 0 !== t.iconSet && !ma.has(t.iconSet);
 }
 function fa(t) {
-	return [t.minPoint ?? { type: I.ColorStopType.Min }, t.maxPoint ?? { type: I.ColorStopType.Max }];
+	return [t.minPoint ?? { type: F.ColorStopType.Min }, t.maxPoint ?? { type: F.ColorStopType.Max }];
 }
 function ha(t, e, o, s, r, a, i, l, c) {
 	const d = s.scale;
@@ -3080,8 +3080,8 @@ function ha(t, e, o, s, r, a, i, l, c) {
 		timePeriod: r.timePeriod
 	};
 	let p;
-	d?.type === I.ScaleType.DataBar && function(t) {
-		return !!(t.solidFill || t.borderColor || t.negativeFillColor || t.negativeBorderColor || t.axisColor || t.axisPosition || t.direction) || t.minPoint?.type === I.ColorStopType.AutoMin || t.maxPoint?.type === I.ColorStopType.AutoMax;
+	d?.type === F.ScaleType.DataBar && function(t) {
+		return !!(t.solidFill || t.borderColor || t.negativeFillColor || t.negativeBorderColor || t.axisColor || t.axisPosition || t.direction) || t.minPoint?.type === F.ColorStopType.AutoMin || t.maxPoint?.type === F.ColorStopType.AutoMax;
 	}(d) && (p = Pt(n.uuidV4), c.push({
 		guid: p,
 		sqref: a,
@@ -3092,13 +3092,13 @@ function ha(t, e, o, s, r, a, i, l, c) {
 	if (0 !== h || d) {
 		e.start("cfRule", m);
 		for (let t = 0; t < h; t++) e.start("formula"), e.text(f[t]), e.end("formula");
-		if (d?.type === I.ScaleType.ColorScale) {
+		if (d?.type === F.ScaleType.ColorScale) {
 			const t = d.stops ?? [];
 			e.start("colorScale");
 			for (let n = 0; n < t.length; n++) ca(e, t[n]);
 			for (let n = 0; n < t.length; n++) Ao(e, o, t[n].color, "color");
 			e.end("colorScale");
-		} else if (d?.type === I.ScaleType.DataBar) {
+		} else if (d?.type === F.ScaleType.DataBar) {
 			e.start("dataBar", {
 				minLength: d.minLength ?? 0,
 				maxLength: d.maxLength ?? 100,
@@ -3106,7 +3106,7 @@ function ha(t, e, o, s, r, a, i, l, c) {
 			});
 			const [t, n] = fa(d);
 			ca(e, t), ca(e, n), Ao(e, o, d.color ?? "#638EC6", "color"), e.end("dataBar");
-		} else if (d?.type === I.ScaleType.IconSet) {
+		} else if (d?.type === F.ScaleType.IconSet) {
 			const t = d.stops ?? [];
 			e.start("iconSet", {
 				iconSet: d.iconSet,
@@ -3127,10 +3127,10 @@ function ua(t) {
 	const o = t.split(" ");
 	for (let t = 0; t < o.length; t++) {
 		if (!o[t]) continue;
-		const s = E.fastStringToRange(o[t]);
+		const s = P.fastStringToRange(o[t]);
 		s.rowStart < e && (e = s.rowStart), s.colStart < n && (n = s.colStart);
 	}
-	return E.cellToString({
+	return P.cellToString({
 		rowIndex: e,
 		colIndex: n
 	});
@@ -3140,12 +3140,12 @@ function ga(t) {
 	if (Array.isArray(t)) {
 		const e = [];
 		for (let n = 0; n < t.length; n++) {
-			const o = E.rangeToString(t[n]);
+			const o = P.rangeToString(t[n]);
 			o && e.push(o);
 		}
 		return e.length > 0 ? e.join(" ") : null;
 	}
-	return E.rangeToString(t);
+	return P.rangeToString(t);
 }
 function xa(t) {
 	if (void 0 !== t) return t ? "1" : "0";
@@ -3170,7 +3170,7 @@ function wa(t) {
 	const o = t.split(" ");
 	for (let t = 0; t < o.length; t++) {
 		if (!o[t]) continue;
-		const s = E.fastStringToRange(o[t]);
+		const s = P.fastStringToRange(o[t]);
 		s.rowStart < e && (e = s.rowStart), s.colStart < n && (n = s.colStart);
 	}
 	return e === Number.MAX_SAFE_INTEGER ? null : {
@@ -3198,7 +3198,7 @@ function ba(t, e, n) {
 			value: s
 		};
 	};
-	if (t.type === I.ScaleType.DataBar) {
+	if (t.type === F.ScaleType.DataBar) {
 		const e = o(t.minPoint), n = o(t.maxPoint);
 		if (e === t.minPoint && n === t.maxPoint) return t;
 		const s = { ...t };
@@ -3370,7 +3370,7 @@ var _a = (t) => String(Math.round(1e3 * t)), Na = (t) => void 0 === t ? void 0 :
 	buFont: "lt"
 }, Oa = (t, e, n) => {
 	if (!n) return;
-	const o = void 0 !== n.scheme && n.scheme !== i.Scheme.None ? `+${n.scheme === i.Scheme.Major ? "mj" : "mn"}-${Ba[e]}` : n.family;
+	const o = void 0 !== n.scheme && n.scheme !== a.Scheme.None ? `+${n.scheme === a.Scheme.Major ? "mj" : "mn"}-${Ba[e]}` : n.family;
 	void 0 !== o && t.empty(e, {
 		typeface: o,
 		panose: n.panose,
@@ -3425,12 +3425,12 @@ var _a = (t) => String(Math.round(1e3 * t)), Na = (t) => void 0 === t ? void 0 :
 		}
 		o.defaultRun && Va(t, e, "defRPr", o.defaultRun), s.end(n);
 	} else s.empty(n, r);
-}, ja = (t) => t === h.Overflow.Visible ? void 0 : rt.write(t), Xa = (t, e) => {
+}, ja = (t) => t === f.Overflow.Visible ? void 0 : rt.write(t), Xa = (t, e) => {
 	const n = e.body ?? {}, o = n.insets, s = {
 		rot: void 0 === e.rotation ? void 0 : String(Math.round(6e4 * e.rotation)),
 		spcFirstLastPara: Na(n.spaceFirstLastParagraph),
-		vertOverflow: ja(n.verticalOverflow ?? f.TEXT_DEFAULTS.verticalOverflow),
-		horzOverflow: ja(n.horizontalOverflow ?? f.TEXT_DEFAULTS.horizontalOverflow),
+		vertOverflow: ja(n.verticalOverflow ?? p.TEXT_DEFAULTS.verticalOverflow),
+		horzOverflow: ja(n.horizontalOverflow ?? p.TEXT_DEFAULTS.horizontalOverflow),
 		vert: _e.write(n.vertical),
 		wrap: n.wrap,
 		lIns: void 0 === o?.left ? void 0 : String(cs(o.left)),
@@ -3462,13 +3462,13 @@ var _a = (t) => String(Math.round(1e3 * t)), Na = (t) => void 0 === t ? void 0 :
 			t.end("prstTxWarp");
 		}
 		switch (n.autoFit) {
-			case h.Autofit.None:
+			case f.Autofit.None:
 				t.empty("noAutofit");
 				break;
-			case h.Autofit.Shape:
+			case f.Autofit.Shape:
 				t.empty("spAutoFit");
 				break;
-			case h.Autofit.Normal: t.empty("normAutofit", {
+			case f.Autofit.Normal: t.empty("normAutofit", {
 				fontScale: void 0 === n.fontScale ? void 0 : _a(n.fontScale),
 				lnSpcReduction: void 0 === n.lineSpacingReduction ? void 0 : _a(n.lineSpacingReduction)
 			});
@@ -3483,9 +3483,9 @@ var _a = (t) => String(Math.round(1e3 * t)), Na = (t) => void 0 === t ? void 0 :
 }, Ua = (t, e, n, o) => {
 	const s = t.getXMLWriter();
 	s.pushDefaultNamespace("a"), s.start("p");
-	const { runs: r, endRun: a, ...i } = o, l = void 0 !== f.inheritedTextSize(n, o) ? (t) => t : (t) => void 0 === t.size ? {
+	const { runs: r, endRun: a, ...i } = o, l = void 0 !== p.inheritedTextSize(n, o) ? (t) => t : (t) => void 0 === t.size ? {
 		...t,
-		size: f.TEXT_DEFAULTS.size
+		size: p.TEXT_DEFAULTS.size
 	} : t;
 	((t) => !!t && Object.keys(t).some((e) => "runs" !== e && "endRun" !== e && void 0 !== t[e]))(i) && za(t, e, "pPr", i);
 	for (const n of r ?? []) {
@@ -3658,17 +3658,17 @@ var Ka = [
 		for (const n of hi(e)) await gi(t, n);
 	}
 }, xi = async (t, e, n, o, s, r) => {
-	const i = await ts(t, r), l = o.content?.json, c = l?.image ?? {}, d = c.extLst ?? (i.external ? void 0 : yi), m = {
-		...c,
-		type: a.Type.Image,
-		extLst: d,
-		stretch: c.tile ? void 0 : c.stretch ?? {}
-	}, p = {};
-	void 0 !== l?.macro && (p.macro = l.macro), void 0 !== l?.published && (p.fPublished = l.published ? "1" : "0");
-	const f = {};
-	void 0 !== c.dpi && (f.dpi = String(c.dpi)), void 0 !== c.isRotatedWithShape && (f.rotWithShape = c.isRotatedWithShape ? "1" : "0");
-	const h = t.getXMLWriter();
-	h.start("pic", p), h.start("nvPicPr"), Li(t, h, n, o, e), h.start("cNvPicPr", l?.noRelativeResize ? { preferRelativeResize: "0" } : {}), h.empty("a:picLocks", Bi(o)), h.end("cNvPicPr"), h.end("nvPicPr"), h.start("blipFill", f), h.pushDefaultNamespace("a"), as(h, m, i), h.popDefaultNamespace(), h.end("blipFill"), Ai(t, e, n, o, s), h.end("pic");
+	const a = await ts(t, r), i = o.content?.json, l = i?.image ?? {}, c = l.extLst ?? (a.external ? void 0 : yi), d = {
+		...l,
+		type: u.Type.Image,
+		extLst: c,
+		stretch: l.tile ? void 0 : l.stretch ?? {}
+	}, m = {};
+	void 0 !== i?.macro && (m.macro = i.macro), void 0 !== i?.published && (m.fPublished = i.published ? "1" : "0");
+	const p = {};
+	void 0 !== l.dpi && (p.dpi = String(l.dpi)), void 0 !== l.isRotatedWithShape && (p.rotWithShape = l.isRotatedWithShape ? "1" : "0");
+	const f = t.getXMLWriter();
+	f.start("pic", m), f.start("nvPicPr"), Li(t, f, n, o, e), f.start("cNvPicPr", i?.noRelativeResize ? { preferRelativeResize: "0" } : {}), f.empty("a:picLocks", Bi(o)), f.end("cNvPicPr"), f.end("nvPicPr"), f.start("blipFill", p), f.pushDefaultNamespace("a"), as(f, d, a), f.popDefaultNamespace(), f.end("blipFill"), await Ai(t, e, n, o, s), f.end("pic");
 }, yi = "<a:extLst><a:ext uri=\"{28A0092B-C50C-407E-A947-70E740481C1C}\"><a14:useLocalDpi xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" val=\"0\"/></a:ext></a:extLst>", vi = async (t, e, n, o, s) => {
 	const r = o.content?.json, a = r?.model, i = r?.part, l = () => s ?? n?.getBounds() ?? {
 		x: 0,
@@ -3748,22 +3748,23 @@ var Ka = [
 	r.start("grpSp"), r.start("nvGrpSpPr"), Li(t, r, n, o, e);
 	const l = Ni(o);
 	l ? (r.start("cNvGrpSpPr"), r.empty("a:grpSpLocks", l), r.end("cNvGrpSpPr")) : r.empty("cNvGrpSpPr"), r.end("nvGrpSpPr"), r.start("grpSpPr"), r.pushDefaultNamespace("a"), Oi(r, s, o, a?.childBounds ?? s), Go(t, i, a), a?.scene3d && r.raw(a.scene3d), a?.extLst?.properties && r.raw(a.extLst.properties), r.popDefaultNamespace(), r.end("grpSpPr");
-	for (const n of hi(o)) await bi(t, e, n, ui(n));
+	const c = hi(o), d = n?.getMovables()?.getItems() ?? [];
+	for (let n = 0; n < c.length; n++) await bi(t, e, d.length === c.length ? d[n] : null, c[n], ui(c[n]));
 	r.end("grpSp");
-}, bi = async (t, e, n, o) => {
-	switch (n.content?.type) {
+}, bi = async (t, e, n, o, s) => {
+	switch (o.content?.type) {
 		case "picture": {
-			const s = es(t, n.content.json?.resId);
-			return s ? xi(t, e, null, n, o, s) : void t.warn(`The picture '${n.content.name ?? ""}' in a group names no image in the workbook; the group is saved without it.`, void 0, "xlsx.drawing.group.picture");
+			const r = es(t, o.content.json?.resId);
+			return r ? xi(t, e, n, o, s, r) : void t.warn(`The picture '${o.content.name ?? ""}' in a group names no image in the workbook; the group is saved without it.`, void 0, "xlsx.drawing.group.picture");
 		}
-		case "chart": return vi(t, e, null, n, o);
-		case "shape": return Ci(t, e, null, n, o);
-		case "group": return Si(t, e, null, n, o);
-		default: return We(n.content?.type) ? void Wi(t.getXMLWriter(), n, o) : Pi(t, e, n, o);
+		case "chart": return vi(t, e, n, o, s);
+		case "shape": return Ci(t, e, n, o, s);
+		case "group": return Si(t, e, n, o, s);
+		default: return We(o.content?.type) ? void Wi(t.getXMLWriter(), o, s) : Pi(t, e, o, s);
 	}
 }, Ci = async (t, e, n, o, s) => {
-	const a = t.getXMLWriter(), i = {}, l = o.content?.json, c = l?.type ?? r.Type.Shape, d = e.getStyles();
-	c === r.Type.Connector ? (void 0 !== l?.macro && (i.macro = l.macro), void 0 !== l?.published && (i.fPublished = l.published ? "1" : "0"), a.start("cxnSp", i), a.start("nvCxnSpPr"), Li(t, a, n, o, e), $i(t, a, n, o, e), a.end("nvCxnSpPr"), Ai(t, e, n, o, s), Di(t, e, n, o), Ga(t, d, l?.text), a.end("cxnSp")) : (void 0 !== l?.macro && (i.macro = l.macro), void 0 !== l?.textLink && (i.textlink = l.textLink), void 0 !== l?.locksText && (i.fLocksText = l.locksText ? "1" : "0"), void 0 !== l?.published && (i.fPublished = l.published ? "1" : "0"), a.start("sp", i), a.start("nvSpPr"), Li(t, a, n, o, e), $i(t, a, n, o, e), a.end("nvSpPr"), Ai(t, e, n, o, s), Di(t, e, n, o), Ga(t, d, l?.text), a.end("sp"));
+	const r = t.getXMLWriter(), a = {}, i = o.content?.json, l = i?.type ?? h.Type.Shape, c = e.getStyles();
+	l === h.Type.Connector ? (void 0 !== i?.macro && (a.macro = i.macro), void 0 !== i?.published && (a.fPublished = i.published ? "1" : "0"), r.start("cxnSp", a), r.start("nvCxnSpPr"), Li(t, r, n, o, e), $i(t, r, n, o, e), r.end("nvCxnSpPr"), await Ai(t, e, n, o, s), Di(t, e, n, o), Ga(t, c, i?.text), r.end("cxnSp")) : (void 0 !== i?.macro && (a.macro = i.macro), void 0 !== i?.textLink && (a.textlink = i.textLink), void 0 !== i?.locksText && (a.fLocksText = i.locksText ? "1" : "0"), void 0 !== i?.published && (a.fPublished = i.published ? "1" : "0"), r.start("sp", a), r.start("nvSpPr"), Li(t, r, n, o, e), $i(t, r, n, o, e), r.end("nvSpPr"), await Ai(t, e, n, o, s), Di(t, e, n, o), Ga(t, c, i?.text), r.end("sp"));
 }, Ti = async (t, e, n, o) => Pi(t, e, o, n.getBounds()), ki = "http://schemas.openxmlformats.org/markup-compatibility/2006", Ii = "http://schemas.microsoft.com/office/drawing/2010/slicer", Ri = "http://schemas.microsoft.com/office/drawing/2012/timeslicer", Fi = async (t, e, n, o) => {
 	const s = t.getXMLWriter(), r = o.content?.name ?? "", a = Cr(n.getContent()), i = void 0 !== a?.timeline, l = i ? {
 		"xmlns:tsle": Ri,
@@ -3808,29 +3809,35 @@ var Ka = [
 		lang: "en-US",
 		sz: "1100"
 	}), t.start("a:t"), t.text(n), t.end("a:t"), t.end("a:r"), t.end("a:p"), t.end("txBody"), t.end("sp");
-}, Mi = async (t, e, n, o) => Pi(t, e, o, n.getBounds()), Pi = async (t, e, n, o) => {
-	Ci(t, e, null, {
-		...n,
-		content: {
-			type: "shape",
-			name: n.content?.name,
-			description: n.content?.description,
-			json: {
-				fill: "bg1",
-				stroke: {
-					width: 2,
-					fill: "red"
-				},
-				text: { runs: [{
-					text: "Unsupported Type: " + (n.content?.type ?? "unknown"),
-					color: "tx1"
-				}] }
-			}
-		}
-	}, o);
-}, Ai = (t, e, n, o, s) => {
-	const r = t.getXMLWriter(), a = o.content?.json, i = a?.geometry, l = e.getStyles();
-	if (r.start("spPr"), r.pushDefaultNamespace("a"), Oi(r, s, o), "object" == typeof i && i) ((t, e) => {
+}, Mi = async (t, e, n, o) => Pi(t, e, o, n.getBounds()), Pi = async (t, e, n, o) => Ci(t, e, null, {
+	...n,
+	content: {
+		type: "shape",
+		name: n.content?.name,
+		description: n.content?.description,
+		json: {
+			fill: "bg1",
+			stroke: {
+				width: 2,
+				fill: "red"
+			},
+			text: { runs: [{
+				text: "Unsupported Type: " + (n.content?.type ?? "unknown"),
+				color: "tx1"
+			}] }
+		}
+	}
+}, o), Ai = async (t, e, n, o, s) => {
+	const r = o.content?.json, a = r?.geometry, i = e.getStyles(), l = "string" == typeof a ? a : "rect";
+	let c = [];
+	"object" != typeof a && r?.adjustments && Object.keys(r.adjustments).length > 0 && (c = ((t, e) => {
+		const n = [];
+		if (t) return t.isAdjusted() && t.forEachAdjustment((t, e) => n.push([t, `val ${Math.round(e)}`])), n;
+		for (const t of Object.keys(e ?? {})) Number.isFinite(e[t]) && n.push([t, `val ${Math.round(e[t])}`]);
+		return n;
+	})(await (n?.getContent())?.getGeometry?.(Math.max(1, s.width), Math.max(1, s.height)) ?? null, r.adjustments));
+	const d = t.getXMLWriter();
+	if (d.start("spPr"), d.pushDefaultNamespace("a"), Oi(d, s, o), "object" == typeof a && a) ((t, e) => {
 		t.start("custGeom"), t.start("avLst");
 		for (const n of e.av ?? []) ai(t, n);
 		t.end("avLst"), t.start("gdLst");
@@ -3854,26 +3861,24 @@ var Ka = [
 		t.start("pathLst");
 		for (const n of e.paths) di(t, n);
 		t.end("pathLst"), t.end("custGeom");
-	})(r, i);
+	})(d, a);
 	else {
-		r.start("prstGeom", { prst: "string" == typeof i ? i : "rect" });
-		const t = ((t) => t ? Object.keys(t).filter((e) => Number.isFinite(t[e])).map((e) => [e, `val ${Math.round(t[e])}`]) : [])(a?.adjustments);
-		if (0 === t.length) r.empty("avLst");
+		if (d.start("prstGeom", { prst: l }), 0 === c.length) d.empty("avLst");
 		else {
-			r.start("avLst");
-			for (const [e, n] of t) r.empty("gd", {
-				name: e,
-				fmla: n
+			d.start("avLst");
+			for (const [t, e] of c) d.empty("gd", {
+				name: t,
+				fmla: e
 			});
-			r.end("avLst");
+			d.end("avLst");
 		}
-		r.end("prstGeom");
+		d.end("prstGeom");
 	}
-	Go(t, l, a), a?.scene3d && r.raw(a.scene3d), a?.shape3d && r.raw(a.shape3d), a?.extLst?.properties && r.raw(a.extLst.properties), r.popDefaultNamespace(), r.end("spPr");
+	Go(t, i, r), r?.scene3d && d.raw(r.scene3d), r?.shape3d && d.raw(r.shape3d), r?.extLst?.properties && d.raw(r.extLst.properties), d.popDefaultNamespace(), d.end("spPr");
 }, Di = (t, e, n, o) => {
 	const s = t.getXMLWriter(), r = o.content?.json?.style;
 	if (null === r) return;
-	const a = e.getStyles().getTheme(), i = f.defaultStyleRefs(o.content?.json), l = (t, e) => {
+	const a = e.getStyles().getTheme(), i = p.defaultStyleRefs(o.content?.json), l = (t, e) => {
 		e && (s.start(t, { idx: String(e.index) }), e.color && Mo(s, a, e.color), s.end(t));
 	};
 	s.start("style"), s.pushDefaultNamespace("a"), l("lnRef", r?.stroke ?? i.stroke), l("fillRef", r?.fill ?? i.fill), l("effectRef", r?.effect ?? i.effect), l("fontRef", r?.font ?? i.font), s.popDefaultNamespace(), s.end("style");
@@ -3905,12 +3910,12 @@ var Ka = [
 	for (const t of Object.keys(e)) e[t] && (n[t] = "1");
 	return Object.keys(n).length > 0 ? n : null;
 }, $i = (t, e, n, o, s) => {
-	const a = o.content?.json, i = Ni(o);
-	if (a?.type === r.Type.Connector) {
-		const n = a.connectorEnds;
-		if (!i && !n) return void e.empty("cNvCxnSpPr");
+	const r = o.content?.json, a = Ni(o);
+	if (r?.type === h.Type.Connector) {
+		const n = r.connectorEnds;
+		if (!a && !n) return void e.empty("cNvCxnSpPr");
 		const o = _i(t, s);
-		e.start("cNvCxnSpPr"), i && e.empty("a:cxnSpLocks", i), n?.start && e.empty("a:stCxn", {
+		e.start("cNvCxnSpPr"), a && e.empty("a:cxnSpLocks", a), n?.start && e.empty("a:stCxn", {
 			id: String(o.bySource.get(n.start.id) ?? n.start.id),
 			idx: String(n.start.index)
 		}), n?.end && e.empty("a:endCxn", {
@@ -3919,8 +3924,8 @@ var Ka = [
 		}), e.end("cNvCxnSpPr");
 		return;
 	}
-	const l = { txBox: a?.textBox ? "1" : void 0 };
-	i ? (e.start("cNvSpPr", l), e.empty("a:spLocks", i), e.end("cNvSpPr")) : e.empty("cNvSpPr", l);
+	const i = { txBox: r?.textBox ? "1" : void 0 };
+	a ? (e.start("cNvSpPr", i), e.empty("a:spLocks", a), e.end("cNvSpPr")) : e.empty("cNvSpPr", i);
 }, Bi = (t) => {
 	const e = { ...(t.content?.json)?.locks };
 	void 0 !== t.lockAspect ? e.noChangeAspect = t.lockAspect : e.noChangeAspect ??= !0;
@@ -4003,7 +4008,7 @@ var Ui = {
 function Gi(t, e, n, o) {
 	if (null == o) return;
 	Ui.rowIndex = e, Ui.colIndex = n;
-	const s = E.cellToString(Ui);
+	const s = P.cellToString(Ui);
 	let r, a;
 	switch (typeof o) {
 		case "number":
@@ -4067,7 +4072,7 @@ var qi = [
 					...t.styles,
 					direct: a.list
 				}), n.setXfComplements(a.complements), s;
-			}(s, t.getSheets({ visibility: R.Visibility.VeryHidden }), r, (t, n) => {
+			}(s, t.getSheets({ visibility: M.Visibility.VeryHidden }), r, (t, n) => {
 				e.warn(t, void 0, n);
 			});
 			e.getSharedStates().set(pt, mt(s.names, function(t) {
@@ -4112,7 +4117,7 @@ var qi = [
 				a && (s.xWindow = "" + Math.round(a.left), s.yWindow = "" + Math.round(a.top), s.windowWidth = "" + Math.round(a.width), s.windowHeight = "" + Math.round(a.height));
 				const i = o.getTabRatio();
 				600 !== i && (s.tabRatio = i);
-				const l = Math.min(o.getFirstTab(), n.getSheets({ visibility: R.Visibility.VeryHidden }).length - 1);
+				const l = Math.min(o.getFirstTab(), n.getSheets({ visibility: M.Visibility.VeryHidden }).length - 1);
 				l > 0 && (s.firstSheet = "" + l);
 				const c = n.getSelectedSheet().getIndex();
 				0 !== c && (s.activeTab = "" + c), o.isAutoFilterDateGrouping() || (s.autoFilterDateGrouping = "0"), e.empty("workbookView", s), e.end("bookViews");
@@ -4168,7 +4173,7 @@ var qi = [
 				}
 				return s;
 			})(e, s.pivotCaches, !0 === s.date1904, ((t) => {
-				const e = /* @__PURE__ */ new Set(), n = t.getWorksheets().getItems({ visibility: R.Visibility.VeryHidden });
+				const e = /* @__PURE__ */ new Set(), n = t.getWorksheets().getItems({ visibility: M.Visibility.VeryHidden });
 				for (let t = 0; t < n.length; t++) {
 					const o = kr(n[t]);
 					for (let t = 0; t < o.length; t++) {
@@ -4194,7 +4199,7 @@ var qi = [
 				cacheNames: []
 			};
 			try {
-				const o = t.getSheets({ visibility: R.Visibility.VeryHidden }), i = s.sheets, d = t.getSelectedSheet(), m = o.length, f = ((t, e) => {
+				const o = t.getSheets({ visibility: M.Visibility.VeryHidden }), i = s.sheets, d = t.getSelectedSheet(), m = o.length, f = ((t, e) => {
 					const n = new Array(e), o = /* @__PURE__ */ new Set();
 					let s = 1;
 					for (let r = 0; r < e; r++) {
@@ -4262,7 +4267,7 @@ var qi = [
 						pivot: [],
 						timeline: [],
 						cacheNames: []
-					}, o = pr(t), s = e.getWorksheets().getItems({ visibility: R.Visibility.VeryHidden });
+					}, o = pr(t), s = e.getWorksheets().getItems({ visibility: M.Visibility.VeryHidden });
 					for (let e = 0; e < s.length; e++) {
 						const r = kr(s[e]);
 						for (let e = 0; e < r.length; e++) {
@@ -4334,7 +4339,7 @@ var qi = [
 			}(e, n, s), function(t, e, n, o, s) {
 				const r = t.getSharedStates().get(pt), a = o.names, i = a ? a.length : 0, l = new Set((a ?? []).filter((t) => !t.scope).map((t) => t.name.toLowerCase())), c = s.filter((t) => !l.has(t.toLowerCase()));
 				if (0 === i && 0 === c.length) return;
-				const d = /* @__PURE__ */ new Map(), m = n.getSheets({ visibility: R.Visibility.VeryHidden });
+				const d = /* @__PURE__ */ new Map(), m = n.getSheets({ visibility: M.Visibility.VeryHidden });
 				for (let t = 0; t < m.length; t++) d.set(m[t].getName().toLowerCase(), t);
 				e.start("definedNames");
 				for (let n = 0; n < i; n++) {
@@ -4432,7 +4437,7 @@ var qi = [
 			});
 		}
 		async emit(t, e) {
-			const s = e.getXMLWriter(), r = t.model, a = t.json, l = Ze(r, a);
+			const s = e.getXMLWriter(), r = t.model, i = t.json, l = Ze(r, i);
 			((t, e) => {
 				if (0 === e.length) return;
 				let n = Ve(t.legacyDrawing?.xml ?? "");
@@ -4446,7 +4451,7 @@ var qi = [
 					const o = e[t].jsonMovable.content, r = o.json ?? (o.json = {});
 					("number" != typeof r.shapeId || s.has(r.shapeId)) && (r.shapeId = ++n), s.add(r.shapeId);
 				}
-			})(a, l), s.decl(), s.start("worksheet", {
+			})(i, l), s.decl(), s.start("worksheet", {
 				xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
 				"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
 				"xmlns:mc": "http://schemas.openxmlformats.org/markup-compatibility/2006",
@@ -4463,7 +4468,7 @@ var qi = [
 				p?.hideAutoPageBreaks && (f.autoPageBreaks = "0"), p?.fitToPage && (f.fitToPage = "1");
 				const h = Object.keys(f).length > 0, u = !!s || m || h;
 				(u || 0 !== Object.keys(a).length) && (u ? (e.start("sheetPr", a), s && Ao(e, n.getStyles().getTheme(), s, "tabColor", !1), m && e.empty("outlinePr", d), h && e.empty("pageSetUpPr", f), e.end("sheetPr")) : e.empty("sheetPr", a));
-			}(0, s, r, a), function(t, e, n, s) {
+			}(0, s, r, i), function(t, e, n, s) {
 				let r = n.getUsedRange({ features: [] }), a = r ? r.getCoords() : null;
 				const i = Wt, l = et, c = s.directStyles, d = c ? c.length : 0;
 				for (let t = 0; t < d; t++) {
@@ -4503,8 +4508,8 @@ var qi = [
 					colEnd: a.colEnd,
 					rowEnd: a.rowEnd
 				}).getAddress()}`), e.empty("dimension", { ref: f });
-			}(0, s, r, a), function(t, e, n, o, s) {
-				const r = n.getView(), a = r.getTopLeft(), i = n.getRowHeaders().getMetrics().getIndex(a.top), l = n.getColumnHeaders().getMetrics().getIndex(a.left), c = E.cellToString({
+			}(0, s, r, i), function(t, e, n, o, s) {
+				const r = n.getView(), a = r.getTopLeft(), i = n.getRowHeaders().getMetrics().getIndex(a.top), l = n.getColumnHeaders().getMetrics().getIndex(a.left), c = P.cellToString({
 					colIndex: l,
 					rowIndex: i
 				});
@@ -4512,7 +4517,7 @@ var qi = [
 				const d = {};
 				r.isShowFormulas() && (d.showFormulas = "1"), r.isShowColumnGridlines() || r.isShowRowGridlines() || (d.showGridLines = "0"), r.isShowColumnHeaders() || r.isShowRowHeaders() || (d.showRowColHeaders = "0"), r.isShowZeros() || (d.showZeros = "0"), r.isRightToLeft() && (d.rightToLeft = "1"), r.isShowOutlineSymbols() || (d.showOutlineSymbols = "0"), s && (d.tabSelected = "1"), "A1" !== c && (d.topLeftCell = c), r.isShowRuler() || (d.showRuler = "0"), r.isShowWhitespace() || (d.showWhiteSpace = "0");
 				const m = r.getViewMode();
-				m !== S.ViewMode.Normal && (d.view = m);
+				m !== T.ViewMode.Normal && (d.view = m);
 				const p = r.getZoomScale();
 				100 !== p && (d.zoomScale = p);
 				const f = r.toJSON(), h = f?.zoomScales ?? {};
@@ -4533,17 +4538,17 @@ var qi = [
 					d.colorId = "" + i;
 				}
 				d.workbookViewId = "0";
-				const g = n.getSelection().getCoords(), x = E.cellToString(g.cell);
+				const g = n.getSelection().getCoords(), x = P.cellToString(g.cell);
 				let y = {};
-				const v = r.getFreezePanes(), w = v.coords ?? {}, b = w.colIndex ?? 0, C = w.rowIndex ?? 0;
-				if (b > 0 || C > 0) {
-					const t = v.topLeft ?? {}, o = t.top ?? 0, s = t.left ?? 0, r = n.getRowHeaders().getMetrics().getIndex(o), i = n.getColumnHeaders().getMetrics().getIndex(s), l = b - i, c = C - r, m = Math.max(b, n.getColumnHeaders().getMetrics().getIndex(a.left + n.getColumnHeaders().getMetrics().getOffset(b) - s)), p = Math.max(C, n.getRowHeaders().getMetrics().getIndex(a.top + n.getRowHeaders().getMetrics().getOffset(C) - o)), f = E.cellToString({
+				const v = r.getFreezePanes(), w = v.coords ?? {}, S = w.colIndex ?? 0, b = w.rowIndex ?? 0;
+				if (S > 0 || b > 0) {
+					const t = v.topLeft ?? {}, o = t.top ?? 0, s = t.left ?? 0, r = n.getRowHeaders().getMetrics().getIndex(o), i = n.getColumnHeaders().getMetrics().getIndex(s), l = S - i, c = b - r, m = Math.max(S, n.getColumnHeaders().getMetrics().getIndex(a.left + n.getColumnHeaders().getMetrics().getOffset(S) - s)), p = Math.max(b, n.getRowHeaders().getMetrics().getIndex(a.top + n.getRowHeaders().getMetrics().getOffset(b) - o)), f = P.cellToString({
 						colIndex: i,
 						rowIndex: r
 					});
 					"A1" !== f ? d.topLeftCell = f : delete d.topLeftCell, e.start("sheetView", d);
 					const h = {};
-					l > 0 && (h.xSplit = l), c > 0 && (h.ySplit = c), h.topLeftCell = E.cellToString({
+					l > 0 && (h.xSplit = l), c > 0 && (h.ySplit = c), h.topLeftCell = P.cellToString({
 						colIndex: m,
 						rowIndex: p
 					}), h.state = "frozen";
@@ -4557,27 +4562,27 @@ var qi = [
 							sqref: s?.sqref ?? r
 						});
 					};
-					0 === b ? (h.activePane = "bottomLeft", e.empty("pane", h), g("topLeft", E.cellToString({
+					0 === S ? (h.activePane = "bottomLeft", e.empty("pane", h), g("topLeft", P.cellToString({
 						colIndex: m,
 						rowIndex: r
-					}), !1), y.pane = "bottomLeft") : 0 === C ? (h.activePane = "topRight", e.empty("pane", h), g("topLeft", E.cellToString({
+					}), !1), y.pane = "bottomLeft") : 0 === b ? (h.activePane = "topRight", e.empty("pane", h), g("topLeft", P.cellToString({
 						colIndex: i,
 						rowIndex: p
-					}), !1), y.pane = "topRight") : (h.activePane = "bottomRight", e.empty("pane", h), g("topLeft", f, !1), g("topRight", E.cellToString({
+					}), !1), y.pane = "topRight") : (h.activePane = "bottomRight", e.empty("pane", h), g("topLeft", f, !1), g("topRight", P.cellToString({
 						colIndex: m,
 						rowIndex: r
-					}), !0), g("bottomLeft", E.cellToString({
+					}), !0), g("bottomLeft", P.cellToString({
 						colIndex: i,
 						rowIndex: p
 					}), !0), y.pane = "bottomRight");
 				} else e.start("sheetView", d);
 				y.activeCell = x;
-				const T = g.ranges, k = T ? T.length : 0;
+				const C = g.ranges, k = C ? C.length : 0;
 				if (k > 0) {
 					let t = "";
 					for (let e = 0; e < k; e++) {
-						const n = T[e];
-						e > 0 && (t += " "), t += E.rangeToString(n);
+						const n = C[e];
+						e > 0 && (t += " "), t += P.rangeToString(n);
 					}
 					y.sqref = t, (g.rangeIndex ?? 0) > 0 && (y.activeCellId = "" + g.rangeIndex);
 				} else "A1" === x ? y = null : y.sqref = x;
@@ -4593,7 +4598,7 @@ var qi = [
 						thickBottom: s,
 						run: n
 					};
-				}, s = t.defaultRowSize ?? e, r = t.rows ? E.refsToRuns(t.rows, !1) : null;
+				}, s = t.defaultRowSize ?? e, r = t.rows ? P.refsToRuns(t.rows, !1) : null;
 				let a = null, i = 0;
 				const l = r ? r.length : 0;
 				for (let t = 0; t < l; t++) {
@@ -4601,18 +4606,18 @@ var qi = [
 					i += e.max - e.min + 1, ta(e.value) && (!a || e.max - e.min > a.max - a.min) && (a = e);
 				}
 				return a && a.max - a.min + 1 > n - i ? o(a.value.sz ?? s, a) : void 0 !== t.defaultRowSize ? o(t.defaultRowSize, null) : null;
-			})(a, .75 * r.getStyles().getNormal().getBestFit().height, r.getEntireRange().getRowEnd() + 1);
+			})(i, .75 * r.getStyles().getNormal().getBestFit().height, r.getEntireRange().getRowEnd() + 1);
 			(function(t, e, n, o, s) {
 				const r = o.defaultColSize, a = o.defaultRowSize, i = {};
-				void 0 !== o.baseColSize && (i.baseColWidth = o.baseColSize), void 0 !== r && (i.defaultColWidth = r), s ? (i.defaultRowHeight = s.height, s.custom && (i.customHeight = "1")) : (i.defaultRowHeight = a ?? .75 * n.getRowHeaders().getMetrics().getDefaultSize(), void 0 !== a && (i.customHeight = "1")), o.rows && null !== ra(E.refsToRuns(o.rows, !1)) && (i.zeroHeight = "1"), s?.thickTop && (i.thickTop = "1"), s?.thickBottom && (i.thickBottom = "1");
+				void 0 !== o.baseColSize && (i.baseColWidth = o.baseColSize), void 0 !== r && (i.defaultColWidth = r), s ? (i.defaultRowHeight = s.height, s.custom && (i.customHeight = "1")) : (i.defaultRowHeight = a ?? .75 * n.getRowHeaders().getMetrics().getDefaultSize(), void 0 !== a && (i.customHeight = "1")), o.rows && null !== ra(P.refsToRuns(o.rows, !1)) && (i.zeroHeight = "1"), s?.thickTop && (i.thickTop = "1"), s?.thickBottom && (i.thickBottom = "1");
 				const l = n.getOutline(), c = l.getLevelCount(v.Axis.Row);
 				c > 0 && (i.outlineLevelRow = c);
 				const d = l.getLevelCount(v.Axis.Column);
 				d > 0 && (i.outlineLevelCol = d), i["x14ac:dyDescent"] = "0.25", e.empty("sheetFormatPr", i);
-			})(0, s, r, a, c);
-			const d = !1 === a.protection?.showFormulas ? e.getSharedStates().get("xfVariants") ?? null : null;
+			})(0, s, r, i, c);
+			const d = !1 === i.protection?.showFormulas ? e.getSharedStates().get("xfVariants") ?? null : null;
 			(function(t, e, n, o, s) {
-				const r = o.cols ? E.refsToRuns(o.cols, !0) : null, a = r ? r.length : 0;
+				const r = o.cols ? P.refsToRuns(o.cols, !0) : null, a = r ? r.length : 0;
 				n.getEntireRange().getColumnEnd();
 				const i = n.getColumnHeaders().getDefaultSizeNative(), l = s ? s.getXf(0, !0, !1) : 0;
 				let c = 1;
@@ -4642,13 +4647,13 @@ var qi = [
 					}
 					d(et + 1), e.end("cols");
 				}
-			})(0, s, r, a, d), function(t, e, n, s, r, a, l) {
+			})(0, s, r, i, d), function(t, e, n, s, r, i, l) {
 				const c = t.getSharedStates(), d = c.get("persistStrings"), m = c.get("metaCollector"), p = c.get("persistRichTypes"), f = c.get(Zn), h = function(t) {
 					let e = null;
 					for (const n of t.pivotTables ?? []) {
 						const t = n.buttons?.length ? te(n) : null;
 						if (t) for (const o of n.buttons) {
-							const n = E.fastStringToRange(o);
+							const n = P.fastStringToRange(o);
 							for (let o = n.rowStart; o <= n.rowEnd; o++) for (let s = n.colStart; s <= n.colEnd; s++) (e ??= /* @__PURE__ */ new Set()).add((t.rowStart + o) * Ra + t.colStart + s);
 						}
 					}
@@ -4660,15 +4665,15 @@ var qi = [
 						o && (e ??= []).push({
 							table: n,
 							coords: o,
-							formats: t?.header ? F(t) : null
+							formats: t?.header ? b(t) : null
 						});
 					}
 					return e;
 				}(n);
 				let g = 0, y = 0;
 				const S = n.getUsedRange();
-				let b = 0;
-				const T = l?.run, k = s.rows ? E.refsToRuns(s.rows, !1) : null, I = s.defaultRowSize ?? .75 * n.getStyles().getNormal().getBestFit().height, R = k && T ? ((t, e, n, o) => {
+				let T = 0;
+				const k = l?.run, R = s.rows ? P.refsToRuns(s.rows, !1) : null, F = s.defaultRowSize ?? .75 * n.getStyles().getNormal().getBestFit().height, E = R && k ? ((t, e, n, o) => {
 					const s = [];
 					let r = 0;
 					const a = (t, e) => {
@@ -4683,26 +4688,26 @@ var qi = [
 						a(r, o.min - 1), r = o.max + 1, o.min === e.min && o.max === e.max || s.push(o);
 					}
 					return a(r, o - 1), s;
-				})(k, T, I, n.getEntireRange().getRowEnd() + 1) : k, M = R ? R.length : 0, P = ra(R), L = null !== P ? P - 1 : R?.[M - 1]?.max ?? -1, _ = s.cols ? E.refsToRuns(s.cols, !0) : null, N = _ ? _.length : 0, $ = _?.[N - 1]?.max ?? -1;
+				})(R, k, F, n.getEntireRange().getRowEnd() + 1) : R, M = E ? E.length : 0, D = ra(E), L = null !== D ? D - 1 : E?.[M - 1]?.max ?? -1, _ = s.cols ? P.refsToRuns(s.cols, !0) : null, N = _ ? _.length : 0, $ = _?.[N - 1]?.max ?? -1;
 				if (S || M > 0) {
-					const c = .75, S = s.defaultRowSize ?? n.getRowHeaders().getMetrics().getDefaultSize() * c, T = n.getStyles().getNormal().getBestFit().height * c, k = sa(n.getOutline(), v.Axis.Row), I = (t, e) => {
+					const c = .75, S = s.defaultRowSize ?? n.getRowHeaders().getMetrics().getDefaultSize() * c, b = n.getStyles().getNormal().getBestFit().height * c, k = sa(n.getOutline(), v.Axis.Row), R = (t, e) => {
 						const n = Ma;
 						if (n.r = "" + (t + 1), n.s = void 0, n.customFormat = void 0, n.hidden = void 0, n.ht = void 0, n.customHeight = void 0, n.outlineLevel = void 0, n.collapsed = void 0, n.thickTop = void 0, n.thickBot = void 0, !e) return n;
 						const o = e.value;
-						void 0 !== o.s && (n.s = "" + (a ? a.getXf(o.s, !0, !1) : o.s), n.customFormat = "1"), o.h && (n.hidden = "1");
+						void 0 !== o.s && (n.s = "" + (i ? i.getXf(o.s, !0, !1) : o.s), n.customFormat = "1"), o.h && (n.hidden = "1");
 						const s = o.csz ?? !1, r = o.sz ?? S;
-						return (r !== (l?.height ?? T) || s) && (n.ht = "" + r), s && (n.customHeight = "1"), o.l && (n.outlineLevel = "" + o.l), k.has(t) && (n.collapsed = "1"), o.tt && (n.thickTop = "1"), o.tb && (n.thickBot = "1"), n;
+						return (r !== (l?.height ?? b) || s) && (n.ht = "" + r), s && (n.customHeight = "1"), o.l && (n.outlineLevel = "" + o.l), k.has(t) && (n.collapsed = "1"), o.tt && (n.thickTop = "1"), o.tb && (n.thickBot = "1"), n;
 					};
-					let F = 0, M = R?.[F] ?? null, N = M?.min ?? Number.MAX_SAFE_INTEGER, B = M?.max ?? Number.MAX_SAFE_INTEGER, O = M?.value?.s, V = -1, W = 0, z = _?.[W] ?? null, j = z?.min ?? Number.MAX_SAFE_INTEGER, X = z?.max ?? Number.MAX_SAFE_INTEGER, H = z?.value?.s;
+					let F = 0, M = E?.[F] ?? null, N = M?.min ?? Number.MAX_SAFE_INTEGER, B = M?.max ?? Number.MAX_SAFE_INTEGER, O = M?.value?.s, V = -1, W = 0, z = _?.[W] ?? null, j = z?.min ?? Number.MAX_SAFE_INTEGER, X = z?.max ?? Number.MAX_SAFE_INTEGER, H = z?.value?.s;
 					const U = (t, n = !1) => {
 						if (V !== t) {
 							for (-1 !== V && (e.end("row"), 0 !== W && (W = 0, z = _?.[W] ?? null, j = z?.min ?? Number.MAX_SAFE_INTEGER, X = z?.max ?? Number.MAX_SAFE_INTEGER, H = z?.value?.s)); V + 1 <= t;) {
-								V++, M && V > B && (M = R[++F] ?? null, M ? (N = M.min, B = M.max, O = M.value?.s) : (N = Number.MAX_SAFE_INTEGER, B = Number.MAX_SAFE_INTEGER, O = void 0)), V < N && V < t && null === P && (V = M ? Math.min(N, t) : t), null !== P && V >= P && V < t && (V = t);
-								const o = V < t || n && V === t, s = I(V, M && V >= N && V <= B ? M : null);
+								V++, M && V > B && (M = E[++F] ?? null, M ? (N = M.min, B = M.max, O = M.value?.s) : (N = Number.MAX_SAFE_INTEGER, B = Number.MAX_SAFE_INTEGER, O = void 0)), V < N && V < t && null === D && (V = M ? Math.min(N, t) : t), null !== D && V >= D && V < t && (V = t);
+								const o = V < t || n && V === t, s = R(V, M && V >= N && V <= B ? M : null);
 								o ? e.empty("row", s) : e.start("row", s);
 							}
 							if (t < V) {
-								const n = I(t, null);
+								const n = R(t, null);
 								e.start("row", n);
 							}
 						}
@@ -4757,23 +4762,23 @@ var qi = [
 									rowIndex: u.rowStart,
 									colIndex: u.colStart
 								}, v = c.parse(g, y), w = v ? c.annotate(v) : void 0, S = v ? c.spell(v, f.has(`${u.rowStart},${u.colStart}`), p(u.rowStart, u.colStart)) : null;
-								let C = S ? A.imager(S, { entireCoords: d }) : null;
-								if (C) g = C(y);
+								let b = S ? A.imager(S, { entireCoords: d }) : null;
+								if (b) g = b(y);
 								else if (!o.isSingleCell(u)) {
 									const t = [];
-									E.normalizeA1ToR1C1(g, y.rowIndex, y.colIndex, t), C = (e) => {
+									P.normalizeA1ToR1C1(g, y.rowIndex, y.colIndex, t), b = (e) => {
 										const n = e ?? y;
-										return E.resolveRelativeToA1(t, n.rowIndex, n.colIndex);
+										return P.resolveRelativeToA1(t, n.rowIndex, n.colIndex);
 									};
 								}
 								if (g.length > 8192) {
-									t.warn(`The formula at '${n.getName()}'!${E.rangeToString(u)} is ${g.length.toLocaleString()} characters as xlsx stores it; Excel allows at most ${8192 .toLocaleString()}. Its cells are saved as values.`, void 0, "xlsx.formula.lengthLimit");
+									t.warn(`The formula at '${n.getName()}'!${P.rangeToString(u)} is ${g.length.toLocaleString()} characters as xlsx stores it; Excel allows at most ${8192 .toLocaleString()}. Its cells are saved as values.`, void 0, "xlsx.formula.lengthLimit");
 									continue;
 								}
-								let T = !0 === w?.cm;
+								let C = !0 === w?.cm;
 								const k = !0 === w?.ca;
 								if (r.affects(s)) {
-									x = null, T = !1;
+									x = null, C = !1;
 									const t = (t, e, n) => {
 										const o = {
 											rowStart: t,
@@ -4785,7 +4790,7 @@ var qi = [
 											coords: o,
 											formula: n,
 											sharedId: null,
-											ref: E.rangeToString(o),
+											ref: P.rangeToString(o),
 											isDynamicRange: !1,
 											isWrapped: !0
 										}]);
@@ -4798,7 +4803,7 @@ var qi = [
 												t(r, a, o), s = !0;
 												continue;
 											}
-											const i = n.getRange(E.rangeToString({
+											const i = n.getRange(P.rangeToString({
 												rowStart: r,
 												colStart: a,
 												rowEnd: r,
@@ -4807,19 +4812,19 @@ var qi = [
 											null !== l && t(r, a, l);
 										}
 									} else m.forEach((e, n) => {
-										const o = n.getCoords(), r = C?.(o) ?? g, a = se(r, n.getCell().getValue());
+										const o = n.getCoords(), r = b?.(o) ?? g, a = se(r, n.getCell().getValue());
 										null !== a && (t(o.rowIndex, o.colIndex, a), s = !0);
 									}, { includeEmpty: !0 });
 									if (s) continue;
 								}
 								const I = -1 !== g.indexOf("!") || -1 !== g.indexOf("[");
-								T || m.isSingleCell() || I || l(u) || (x = "" + b++);
-								const R = null !== x || m.isSingleCell() ? null : C, F = [u, {
+								C || m.isSingleCell() || I || l(u) || (x = "" + T++);
+								const R = null !== x || m.isSingleCell() ? null : b, F = [u, {
 									coords: u,
 									formula: g,
 									sharedId: x,
 									ref: e,
-									isDynamicRange: T,
+									isDynamicRange: C,
 									isExcelVolatile: k,
 									memberImage: R
 								}];
@@ -4882,9 +4887,9 @@ var qi = [
 						Z > 0 && (b = o.getInjectedReference(2) ?? !1);
 						let T = null;
 						tt > 0 && (T = o.getInjectedReference(3) ?? null);
-						const k = "error" === T?.kind, I = "fixed" === T?.kind, R = Ea;
-						R.r = o.getAddress(), R.s = void 0, R.t = void 0, R.cm = void 0, R.vm = void 0;
-						const F = null !== h && h.has(r * Ra + l), E = null !== u ? function(t, e, n) {
+						const k = "error" === T?.kind, R = "fixed" === T?.kind, F = Ea;
+						F.r = o.getAddress(), F.s = void 0, F.t = void 0, F.cm = void 0, F.vm = void 0;
+						const E = null !== h && h.has(r * Ra + l), M = null !== u ? function(t, e, n) {
 							for (const { table: o, coords: s, formats: r } of t) {
 								if (e < s.rowStart || e > s.rowEnd || n < s.colStart || n > s.colEnd) continue;
 								const t = o.getStyleAt(e, n), a = t.getAlignment(), i = "left" === a.getHorizontal() ? a.getIndent() : null, l = t.getNumberFormat(), c = l && "General" !== l ? l : null, d = r?.formatAt(e - s.rowStart, n - s.colStart).user ?? null;
@@ -4896,30 +4901,30 @@ var qi = [
 							}
 							return null;
 						}(u, r, l) : null;
-						(a || F || null !== E) && (c = f.getXf(c ?? 0, null !== a, F, E?.labelIndent ?? null, E?.numberFormat ?? null, E?.user ?? null)), void 0 !== c && 0 !== c && (R.s = "" + c);
-						const M = K.length > 0 ? o.getInjectedReference(4) ?? null : null;
-						let P = null, A = null;
+						(i || E || null !== M) && (c = f.getXf(c ?? 0, null !== i, E, M?.labelIndent ?? null, M?.numberFormat ?? null, M?.user ?? null)), void 0 !== c && 0 !== c && (F.s = "" + c);
+						const P = K.length > 0 ? o.getInjectedReference(4) ?? null : null;
+						let A = null, D = null;
 						switch (v) {
 							case x.Boolean:
-								P = n ? "1" : "0", A = "b";
+								A = n ? "1" : "0", D = "b";
 								break;
 							case x.Error:
 								const t = n.getCode();
-								if (A = "e", t > 7) P = w.BuiltIn.Value.getLabel(), R.vm = "" + p.add(n);
+								if (D = "e", t > 7) A = w.BuiltIn.Value.getLabel(), F.vm = "" + p.add(n);
 								else if (t < 1) {
 									let t;
-									A = "s", S ? (t = "=" + S.formula, S = null) : t = "" + n.getLabel(), P = "" + d.add(t), g++;
-								} else P = "" + n.getLabel();
+									D = "s", S ? (t = "=" + S.formula, S = null) : t = "" + n.getLabel(), A = "" + d.add(t), g++;
+								} else A = "" + n.getLabel();
 								break;
 							case x.Number:
-								P = ot(n), A = null;
+								A = ot(n), D = null;
 								break;
 							case x.String:
-								P = n, S || M ? (A = "str", P = n) : (A = "s", P = "" + d.add(P), g++);
+								A = n, S || P ? (D = "str", A = n) : (D = "s", A = "" + d.add(A), g++);
 								break;
 							case x.RichData:
-								if (n instanceof C) {
-									S || M ? (A = "str", P = n.getText()) : (A = "s", P = "" + d.add(function(t, e, n) {
+								if (n instanceof I) {
+									S || P ? (D = "str", A = n.getText()) : (D = "s", A = "" + d.add(function(t, e, n) {
 										const o = t.getRuns(), s = e.getCell().getRichText();
 										if (!s) return t.getText();
 										const r = new Array(o.length);
@@ -4929,28 +4934,28 @@ var qi = [
 												continue;
 											}
 											const e = { ...s.runs[t].font };
-											void 0 !== e.weight && e.weight < 700 && delete e.weight, e.style === i.Style.Normal && delete e.style, e.underline === i.UnderlineStyle.None && delete e.underline, e.strike === i.StrikeStyle.None && delete e.strike, 0 === e.baseline && delete e.baseline, r[t] = {
+											void 0 !== e.weight && e.weight < 700 && delete e.weight, e.style === a.Style.Normal && delete e.style, e.underline === a.UnderlineStyle.None && delete e.underline, e.strike === a.StrikeStyle.None && delete e.strike, 0 === e.baseline && delete e.baseline, r[t] = {
 												text: o[t].text,
 												font: e
 											};
 										}
-										const a = JSON.stringify(r);
-										let l = n.get(a);
-										return void 0 === l && (l = new C(r), n.set(a, l)), l;
+										const i = JSON.stringify(r);
+										let l = n.get(i);
+										return void 0 === l && (l = new I(r), n.set(i, l)), l;
 									}(n, o, et)), g++);
 									break;
 								}
-								if (n instanceof D) {
+								if (n instanceof C) {
 									const t = n.toPrimitive();
-									"number" == typeof t ? P = ot(t) : "boolean" == typeof t ? (A = "b", P = t ? "1" : "0") : S || M ? (A = "str", P = t) : (A = "s", P = "" + d.add(t), g++);
+									"number" == typeof t ? A = ot(t) : "boolean" == typeof t ? (D = "b", A = t ? "1" : "0") : S || P ? (D = "str", A = t) : (D = "s", A = "" + d.add(t), g++);
 									break;
 								}
-								A = "e", P = w.BuiltIn.Value.getLabel(), R.vm = "" + p.add(n, S?.formula ?? (M ? "" : null));
+								D = "e", A = w.BuiltIn.Value.getLabel(), F.vm = "" + p.add(n, S?.formula ?? (P ? "" : null));
 						}
-						A && (R.t = A);
+						D && (F.t = D);
 						const L = !S?.isWrapped && (null !== T || (S?.isDynamicRange ?? !1));
-						if (null !== S || null !== P || null !== M) {
-							if (L && null !== S && !I && (R.cm = "" + m.registerArrayCell(k)), e.start("c", R), S) {
+						if (null !== S || null !== A || null !== P) {
+							if (L && null !== S && !R && (F.cm = "" + m.registerArrayCell(k)), e.start("c", F), S) {
 								const t = r === S.coords.rowStart && l === S.coords.colStart;
 								let n = S.formula;
 								S.memberImage && !t && (n = S.memberImage({
@@ -4963,14 +4968,14 @@ var qi = [
 									o = Aa;
 									const t = S.coords;
 									t.colStart === l && t.rowStart === r ? (o.ref = S.ref, o.si = a, s = S.formula) : (o.ref = void 0, o.si = a);
-								} else L ? (o = Da, o.aca = k ? "1" : void 0, o.ref = k ? R.r : T?.ref ?? R.r, s = n) : (o = Pa, s = n);
+								} else L ? (o = Da, o.aca = k ? "1" : void 0, o.ref = k ? F.r : T?.ref ?? F.r, s = n) : (o = Pa, s = n);
 								o.ca = b || k || S.isExcelVolatile ? "1" : void 0, s ? (e.start("f", o), e.text(s), e.end("f")) : e.empty("f", o);
-							} else M && e.empty("f", b ? {
-								...M,
+							} else P && e.empty("f", b ? {
+								...P,
 								ca: "1"
-							} : M);
-							null !== P && ("str" === A && P ? (e.start("v", ke.test(P) ? Fe : void 0), e.text(ie(P))) : (e.start("v"), P && e.text(P)), e.end("v")), e.end("c");
-						} else y++ < aa ? e.empty("c", R) : 1048577 === y && t.warn(`Reached ${aa} style-only cells at '${R.r}'; not writing the rest.`);
+							} : P);
+							null !== A && ("str" === D && A ? (e.start("v", ke.test(A) ? Fe : void 0), e.text(ie(A))) : (e.start("v"), A && e.text(A)), e.end("v")), e.end("c");
+						} else y++ < aa ? e.empty("c", F) : 1048577 === y && t.warn(`Reached ${aa} style-only cells at '${F.r}'; not writing the rest.`);
 					}, {
 						injectReferences: G,
 						features: []
@@ -4980,7 +4985,7 @@ var qi = [
 					const t = c.get("stringsCount") ?? 0;
 					c.set("stringsCount", t + g);
 				}
-			}(e, s, r, a, await (async (t, e) => {
+			}(e, s, r, i, await (async (t, e) => {
 				const n = e ? e.length : 0;
 				if (0 === n) return ea;
 				const o = /* @__PURE__ */ new Set(), s = new Array(n);
@@ -5012,7 +5017,7 @@ var qi = [
 						return !1;
 					}
 				};
-			})(r, a.formulas), d, c), function(t, e, n, o) {
+			})(r, i.formulas), d, c), function(t, e, n, o) {
 				const s = o.protection;
 				if (!s) return;
 				const r = {};
@@ -5022,7 +5027,7 @@ var qi = [
 					null !== e && (r[t.attribute] = e);
 				}
 				e.empty("sheetProtection", r);
-			}(0, s, 0, a), function(t, e, n, o) {
+			}(0, s, 0, i), function(t, e, n, o) {
 				const s = o.protectedRanges, r = s ? s.length : 0;
 				if (0 === r) return;
 				const a = [];
@@ -5047,8 +5052,8 @@ var qi = [
 					for (let t = 0; t < a.length; t++) e.empty("protectedRange", a[t]);
 					e.end("protectedRanges");
 				}
-			}(e, s, 0, a);
-			const m = a.autoTable;
+			}(e, s, 0, i);
+			const m = i.autoTable;
 			if (m) {
 				let t;
 				const n = m;
@@ -5059,12 +5064,12 @@ var qi = [
 				if (s > 0) {
 					e.start("mergeCells", { count: s });
 					for (let t = 0; t < s; t++) {
-						const n = o.merges[t], s = "string" == typeof n ? n : E.rangeToString(n);
+						const n = o.merges[t], s = "string" == typeof n ? n : P.rangeToString(n);
 						e.empty("mergeCell", { ref: s });
 					}
 					e.end("mergeCells");
 				}
-			})(0, s, 0, a);
+			})(0, s, 0, i);
 			const p = /* @__PURE__ */ new Map(), f = function(t, e, o, s, r) {
 				const a = [], i = s.conditionals, l = i ? i.length : 0;
 				if (0 === l) return a;
@@ -5088,7 +5093,7 @@ var qi = [
 						scale: x
 					});
 					const y = x ? { type: x.type } : vt(l.condition, ua(c), (e, n) => t.warn(e, void 0, n));
-					y ? (y.formulas && (y.formulas = y.formulas.map((t) => Sa(t, g, p))), x?.type === I.ScaleType.IconSet && pa(x) ? (h++, u(l), a.push({
+					y ? (y.formulas && (y.formulas = y.formulas.map((t) => Sa(t, g, p))), x?.type === F.ScaleType.IconSet && pa(x) ? (h++, u(l), a.push({
 						guid: Pt(n.uuidV4),
 						sqref: c,
 						priority: h,
@@ -5106,7 +5111,7 @@ var qi = [
 					}))) : l.condition || t.log("Skipping conditional format with neither a condition nor a scale.");
 				}
 				return null !== f && e.end("conditionalFormatting"), a;
-			}(e, s, r, a, p), h = function(t, e, n, o) {
+			}(e, s, r, i, p), h = function(t, e, n, o) {
 				const s = [], r = t.getSharedStates().get(pt), a = o.validations, i = a ? a.length : 0;
 				if (0 === i) return s;
 				const l = [];
@@ -5155,7 +5160,7 @@ var qi = [
 					void 0 !== o || void 0 !== s ? (e.start("dataValidation", n), void 0 !== o && (e.start("formula1"), e.text(o), e.end("formula1")), void 0 !== s && (e.start("formula2"), e.text(s), e.end("formula2")), e.end("dataValidation")) : e.empty("dataValidation", n);
 				}
 				return e.end("dataValidations"), s;
-			}(e, s, r, a);
+			}(e, s, r, i);
 			(function(t, e, n, o) {
 				const s = o.hyperlinks, r = s ? s.length : 0;
 				if (0 !== r) {
@@ -5169,7 +5174,7 @@ var qi = [
 					}
 					e.end("hyperlinks");
 				}
-			})(e, s, 0, a), await async function(t, e, n) {
+			})(e, s, 0, i), await async function(t, e, n) {
 				const o = {};
 				n?.centerHorizontally && (o.horizontalCentered = "1"), n?.centerVertically && (o.verticalCentered = "1"), n?.printHeadings && (o.headings = "1"), n?.printGridlines && (o.gridLines = "1"), Object.keys(o).length > 0 && e.empty("printOptions", o);
 				const s = n?.margins;
@@ -5214,7 +5219,7 @@ var qi = [
 					}
 				}
 				Ta(e, "rowBreaks", n.rowBreaks), Ta(e, "colBreaks", n.columnBreaks);
-			}(e, s, a.pageLayout), function(t, e) {
+			}(e, s, i.pageLayout), function(t, e) {
 				if (!e?.length) return;
 				const n = /* @__PURE__ */ new Map();
 				for (const t of e) {
@@ -5238,7 +5243,7 @@ var qi = [
 					}
 					t.end("ignoredErrors");
 				}
-			}(s, a.ignoredErrors), function(t, e, n, o) {
+			}(s, i.ignoredErrors), function(t, e, n, o) {
 				const s = o.movables;
 				if (0 === (s ? s.length : 0)) return;
 				if (!s.some((t) => {
@@ -5261,7 +5266,7 @@ var qi = [
 					resources: n.getResources()
 				});
 				e.empty("drawing", { "r:id": c.relId });
-			}(e, s, r, a);
+			}(e, s, r, i);
 			const u = function(t) {
 				const e = t.getComments().toArray();
 				if (0 === e.length) return null;
@@ -5344,7 +5349,7 @@ var qi = [
 					...e,
 					xml: i
 				} : { xml: i } : e;
-			})(r, a.legacyDrawing ?? null, l), u)), ka(e, s, "legacyDrawingHF", a.legacyDrawingHF ?? null), await async function(t, e, n) {
+			})(r, i.legacyDrawing ?? null, l), u)), ka(e, s, "legacyDrawingHF", i.legacyDrawingHF ?? null), await async function(t, e, n) {
 				const o = n.getPicture();
 				if (!o) return;
 				const s = o.getResource(), r = await s.getExternalURI();
@@ -5427,7 +5432,7 @@ var qi = [
 					c["r:id"] = l.relId, e.empty("tablePart", c);
 				}
 				e.end("tableParts");
-			}(e, s, r, a), function(t, e, n, o, s) {
+			}(e, s, r, i), function(t, e, n, o, s) {
 				const r = kr(n), a = n.getSparklineGroups().getItems(), i = a.length > 0;
 				if (0 === o.length && 0 === s.length && 0 === r.length && !i) return;
 				const l = n.getStyles(), c = l.getTheme();
@@ -5438,7 +5443,7 @@ var qi = [
 					}), e.start("x14:conditionalFormattings");
 					for (let n = 0; n < o.length; n++) {
 						const { guid: s, sqref: r, priority: a, scale: i, rule: d, style: m, stopIfTrue: p } = o[n];
-						if (e.start("x14:conditionalFormatting", { "xmlns:xm": "http://schemas.microsoft.com/office/excel/2006/main" }), i) if (i.type === I.ScaleType.DataBar) {
+						if (e.start("x14:conditionalFormatting", { "xmlns:xm": "http://schemas.microsoft.com/office/excel/2006/main" }), i) if (i.type === F.ScaleType.DataBar) {
 							e.start("x14:cfRule", {
 								type: "dataBar",
 								id: s
@@ -5614,7 +5619,7 @@ var qi = [
 						}
 					});
 				}
-			}(e, a, p), function(t, e) {
+			}(e, i, p), function(t, e) {
 				e && (t.addPart("comments", e), e.comments.some((t) => !t.comment.isNote()) && t.addPart("threadedComments", e));
 			}(e, u), s.end("worksheet"), s.close();
 		}
@@ -5638,7 +5643,7 @@ var qi = [
 			const a = t.theme;
 			for (let t = 0; t < s; t++) {
 				const e = o[t];
-				if (n.start("si"), e instanceof C) {
+				if (n.start("si"), e instanceof I) {
 					const t = e.getRuns();
 					for (let e = 0; e < t.length; e++) {
 						const o = t[e];
@@ -5744,7 +5749,7 @@ var qi = [
 				"xmlns:x16r2": "http://schemas.microsoft.com/office/spreadsheetml/2015/02/main",
 				"xmlns:xr": "http://schemas.microsoft.com/office/spreadsheetml/2014/revision"
 			});
-			const { directXfs: a, denormalized: i } = e.getSharedStates().get("stylesLayout") ?? gs(r, s), l = e.getSharedStates().get(fs), c = function(t) {
+			const { directXfs: a, denormalized: i } = e.getSharedStates().get("stylesLayout") ?? gs(r, s), c = e.getSharedStates().get(fs), d = function(t) {
 				const e = t?.slicers?.styles;
 				if (!e) return t;
 				const n = { ...t.tables?.styles };
@@ -5763,7 +5768,7 @@ var qi = [
 						styles: n
 					}
 				};
-			}(s), d = function(t, e = 0) {
+			}(s), m = function(t, e = 0) {
 				const n = t?.tables;
 				if (!n) return null;
 				const o = n.styles;
@@ -5786,7 +5791,7 @@ var qi = [
 					dxfs: s,
 					dxfIndexMap: r
 				};
-			}(c, l?.getCount() ?? 0), m = e.getSharedStates().get(Zn), p = (m?.getSources() ?? []).map((t) => function(t, e, o) {
+			}(d, c?.getCount() ?? 0), p = e.getSharedStates().get(Zn), h = (p?.getSources() ?? []).map((t) => function(t, e, o) {
 				let s = e[t.xf];
 				if (t.user) {
 					const { numberFormat: e, ...r } = t.user;
@@ -5803,7 +5808,7 @@ var qi = [
 						...s,
 						alignment: {
 							...n,
-							horizontal: h.HorizontalAlignment.Left,
+							horizontal: f.HorizontalAlignment.Left,
 							...t.labelIndent > 0 ? { indent: t.labelIndent } : {}
 						}
 					};
@@ -5813,7 +5818,7 @@ var qi = [
 					numberFormat: t.numberFormat
 				}), s;
 			}(t, a, s));
-			for (const t of p) ws(r, t, i);
+			for (const t of h) ws(r, t, i);
 			(function(t, e, n) {
 				const o = n.numFmtsCustom, s = o.length;
 				if (0 !== s) {
@@ -5828,7 +5833,7 @@ var qi = [
 					e.end("numFmts");
 				}
 			})(0, o, i), function(t, e, n, o) {
-				const s = o.fonts, r = s.length, a = n.getTheme(), i = T.getShared(), l = $e(s.map((t) => ({
+				const s = o.fonts, r = s.length, a = n.getTheme(), i = D.getShared(), l = $e(s.map((t) => ({
 					...t,
 					family: ne(t.family, t.fallbacks, a, !0).name
 				}))).every((t) => gt(i, t));
@@ -5863,18 +5868,18 @@ var qi = [
 					Rs(0, e, n, a[t], s, !0, o.hidden, o.pivotButton, i?.getXfComplement(o.xf) ?? null);
 				}
 				e.end("cellXfs");
-			}(e, o, r, a, i, m, p, e.getSharedStates().get(to)), function(t, e, n, o, s) {
+			}(e, o, r, a, i, p, h, e.getSharedStates().get(to)), function(t, e, n, o, s) {
 				const r = s.namedStyles, a = r.length;
 				e.start("cellStyles", { count: String(a) });
 				const i = s.namedStyleMap;
 				for (let t = 0; t < a; t++) {
-					const o = r[t], s = o.name, a = s.toLowerCase(), l = {
+					const o = r[t], s = o.name, a = s.toLowerCase(), c = {
 						name: s,
 						xfId: i.get(a)
 					};
-					o.hidden && (l.hidden = "1"), o.iLevel && (l.iLevel = String(o.iLevel));
-					let c = null;
-					c = a === g.BuiltInName.Normal.toLowerCase() ? 0 : n.getNamedStyles().getByName(s).getBuiltInID(), null !== c && (l.builtinId = String(c), o.customized && (l.customBuiltin = "1")), e.empty("cellStyle", l);
+					o.hidden && (c.hidden = "1"), o.iLevel && (c.iLevel = String(o.iLevel));
+					let d = null;
+					d = a === l.BuiltInName.Normal.toLowerCase() ? 0 : n.getNamedStyles().getByName(s).getBuiltInID(), null !== d && (c.builtinId = String(d), o.customized && (c.customBuiltin = "1")), e.empty("cellStyle", c);
 				}
 				e.end("cellStyles");
 			}(0, o, r, 0, i), function(t, e, n, o, s) {
@@ -5885,7 +5890,7 @@ var qi = [
 				let i = Ps;
 				for (const o of r) i = Ms(t, e, o, n, a, "dxf", i);
 				e.end("dxfs");
-			}(e, o, r, d, l), function(t, e, n, o, s, r) {
+			}(e, o, r, m, c), function(t, e, n, o, s, r) {
 				const a = o?.tables, i = a?.styles ?? null, l = i ? Object.keys(i) : null, c = l ? l.length : 0, d = {
 					count: String(c),
 					defaultTableStyle: a?.defaultTableStyle ?? "TableStyleMedium2",
@@ -5914,7 +5919,7 @@ var qi = [
 					}
 					e.end("tableStyles");
 				} else e.empty("tableStyles", d);
-			}(0, o, 0, c, d, s?.slicers), function(t, e, n, o) {
+			}(0, o, 0, d, m, s?.slicers), function(t, e, n, o) {
 				const s = o?.indexedColors && o.indexedColors.length > 0, r = o?.mruColors && o.mruColors.length > 0;
 				if (s || r) {
 					if (e.start("colors"), s) {
@@ -6056,7 +6061,7 @@ var qi = [
 			});
 		}
 		async emit(t, e) {
-			const n = e.getXMLWriter(), o = t.model, s = (await P.getDetails()).getBuildVersion(), r = Et(s), a = o.getProperties();
+			const n = e.getXMLWriter(), o = t.model, s = (await k.getDetails()).getBuildVersion(), r = Et(s), a = o.getProperties();
 			n.setValidationDisabled(!0), n.decl(), n.start("Properties", {
 				xmlns: "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties",
 				"xmlns:vt": "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
@@ -6084,13 +6089,13 @@ var qi = [
 					chart: 2,
 					dialog: 3
 				};
-				for (const t of n.getSheets({ visibility: R.Visibility.Hidden })) o[s[t.getKind()] ?? 0].names.push(t.getName());
+				for (const t of n.getSheets({ visibility: M.Visibility.Hidden })) o[s[t.getKind()] ?? 0].names.push(t.getName());
 				const r = n.getNames().getItems({ type: "formula" }).filter((t) => !!t.getRanges?.());
 				o.push({
 					heading: "Named Ranges",
 					names: r.map((t) => {
 						const e = t.getScope();
-						return e ? `${E.sheetNameToString(e)}!${t.getName()}` : t.getName();
+						return e ? `${P.sheetNameToString(e)}!${t.getName()}` : t.getName();
 					})
 				});
 				const a = o.filter((t, e) => 0 === e || t.names.length > 0);
@@ -6328,7 +6333,7 @@ var qi = [
 					let n = s && !s.isClosed() ? s : null;
 					if (!n) {
 						const e = await t.workbook.fetch(o);
-						e.ok && e.headers.get("content-type")?.startsWith("image/") && (n = new k({ source: { buffer: await e.arrayBuffer() } }));
+						e.ok && e.headers.get("content-type")?.startsWith("image/") && (n = new E({ source: { buffer: await e.arrayBuffer() } }));
 					}
 					n && (a = (await ts(e, n)).relId);
 				} catch {}
@@ -7169,7 +7174,7 @@ var qi = [
 	});
 	f.addPart("workbook", t, "/xl/workbook.xml"), await f.waitEmit(), f.addPart("propsCore", { model: t }), f.addPart("propsApp", { model: t }), t.getProperties().getCustom().length > 0 && f.addPart("propsCustom", { model: t });
 	let h = await f.build();
-	await P.isWatermarked() && (h = await (async (t) => {
+	await k.isWatermarked() && (h = await (async (t) => {
 		const e = new B(new z(t)), n = new j(), o = new je(n, { lastModDate: new Date(1899, 11, 29, 19, 0, 0) });
 		try {
 			for (const t of await e.getEntries()) {