ooxml-core 1.14.0 → 1.15.0

package/dist/automation/index.cjs

@@ -81,7 +81,7 @@ var DEFAULT_XML_LIMITS = {
   maxNodes: 5e6
 };
 var MARKUP_RE = /<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?\]\]>|<\?[\s\S]*?\?>|<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/g;
-function checkXmlLimits(xml, label5, limits = {}) {
+function checkXmlLimits(xml, label4, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
@@ -94,16 +94,16 @@ function checkXmlLimits(xml, label5, limits = {}) {
       continue;
     }
     nodes++;
-    if (nodes > maxNodes) throw new Error(`${label5} XML exceeds the limit of ${maxNodes} elements`);
+    if (nodes > maxNodes) throw new Error(`${label4} XML exceeds the limit of ${maxNodes} elements`);
     if (!selfClosing && ++depth > maxDepth)
-      throw new Error(`${label5} XML exceeds the nesting depth limit of ${maxDepth}`);
+      throw new Error(`${label4} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
 function parseXml(xml, options = {}) {
-  const label5 = options.label ?? "OOXML";
+  const label4 = options.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
-    throw new Error(`${label5} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label5, options.limits);
+    throw new Error(`${label4} XML with DTD or entity declarations is not supported`);
+  checkXmlLimits(xml, label4, options.limits);
   let parseError = "";
   let parsed;
   try {
@@ -114,12 +114,12 @@ function parseXml(xml, options = {}) {
     }).parseFromString(xml, "application/xml");
   } catch (error) {
     throw new Error(
-      `Invalid ${label5} XML: ${error instanceof Error ? error.message : String(error)}`,
+      `Invalid ${label4} XML: ${error instanceof Error ? error.message : String(error)}`,
       { cause: error }
     );
   }
   if (parseError || !parsed.documentElement)
-    throw new Error(`Invalid ${label5} XML: ${parseError || "missing root element"}`);
+    throw new Error(`Invalid ${label4} XML: ${parseError || "missing root element"}`);
   return parsed;
 }
 var buildXml = (node3) => new xmldom.XMLSerializer().serializeToString(node3);
@@ -406,10 +406,10 @@ function withParseWarnings(warnings, fn) {
 function reportParseWarning(message) {
   if (sink && !sink.includes(message)) sink.push(message);
 }
-function enumValue(guard2, raw2, label5) {
+function enumValue(guard2, raw2, label4) {
   if (raw2 === null || raw2 === void 0 || raw2 === "") return void 0;
   if (guard2(raw2)) return raw2;
-  reportParseWarning(`Ignored invalid ${label5} value \u201C${raw2}\u201D; it is not allowed by the schema.`);
+  reportParseWarning(`Ignored invalid ${label4} value \u201C${raw2}\u201D; it is not allowed by the schema.`);
   return void 0;
 }
 
@@ -13460,8 +13460,8 @@ function parseDiagramDataModel(source2, part) {
           "CONNECTION_ENDPOINT_MISSING",
           `dgm:cxn ${attribute4} references missing point: ${id3}.`
         );
-    const label5 = connectionLabel(connection, transitionText);
-    connections2.push(label5 ? { ...connection, label: label5 } : connection);
+    const label4 = connectionLabel(connection, transitionText);
+    connections2.push(label4 ? { ...connection, label: label4 } : connection);
     if ((!connection.type || connection.type === "parOf") && !parentById.has(connection.destId))
       parentById.set(connection.destId, connection.sourceId);
   }
@@ -13500,14 +13500,14 @@ function colorList(container) {
 }
 function parseDiagramColors(source2) {
   const root = rootOf2(source2);
-  const labels = children(root, "styleLbl", NS.dgm).map((label5) => ({
-    name: stringAttribute(label5, "name") ?? "",
-    fill: colorList(first(label5, "fillClrLst", NS.dgm)),
-    line: colorList(first(label5, "linClrLst", NS.dgm)),
-    effect: colorList(first(label5, "effectClrLst", NS.dgm)),
-    textLine: colorList(first(label5, "txLinClrLst", NS.dgm)),
-    textFill: colorList(first(label5, "txFillClrLst", NS.dgm)),
-    textEffect: colorList(first(label5, "txEffectClrLst", NS.dgm))
+  const labels = children(root, "styleLbl", NS.dgm).map((label4) => ({
+    name: stringAttribute(label4, "name") ?? "",
+    fill: colorList(first(label4, "fillClrLst", NS.dgm)),
+    line: colorList(first(label4, "linClrLst", NS.dgm)),
+    effect: colorList(first(label4, "effectClrLst", NS.dgm)),
+    textLine: colorList(first(label4, "txLinClrLst", NS.dgm)),
+    textFill: colorList(first(label4, "txFillClrLst", NS.dgm)),
+    textEffect: colorList(first(label4, "txEffectClrLst", NS.dgm))
   }));
   return { ...parseDefinitionHeader(root), labels };
 }
@@ -13540,16 +13540,16 @@ function parseStyleReferences(style3) {
 var hasContent = (element2) => Boolean(element2 && (element2.attributes.length > 0 || elements(element2).length > 0));
 function parseDiagramQuickStyle(source2) {
   const root = rootOf2(source2);
-  const labels = children(root, "styleLbl", NS.dgm).map((label5) => ({
-    name: stringAttribute(label5, "name") ?? "",
-    ...parseStyleReferences(first(label5, "style", NS.dgm)),
-    hasScene3d: Boolean(first(label5, "scene3d", NS.dgm)),
-    hasShape3d: hasContent(first(label5, "sp3d", NS.dgm))
+  const labels = children(root, "styleLbl", NS.dgm).map((label4) => ({
+    name: stringAttribute(label4, "name") ?? "",
+    ...parseStyleReferences(first(label4, "style", NS.dgm)),
+    hasScene3d: Boolean(first(label4, "scene3d", NS.dgm)),
+    hasShape3d: hasContent(first(label4, "sp3d", NS.dgm))
   }));
   return {
     ...parseDefinitionHeader(root),
     labels,
-    has3d: labels.some((label5) => label5.hasShape3d)
+    has3d: labels.some((label4) => label4.hasShape3d)
   };
 }
 function parseDiagramLayoutSummary(source2) {
@@ -14719,10 +14719,10 @@ function parseDisplayUnits(context, element2) {
   if (!element2) return void 0;
   reportUnmodelled(context, element2, DISPLAY_UNITS);
   const labelElement = cChild(element2, "dispUnitsLbl");
-  let label5;
+  let label4;
   if (labelElement) {
     reportUnmodelled(context, labelElement, DISPLAY_UNITS_LABEL);
-    label5 = assignDefined(
+    label4 = assignDefined(
       {},
       {
         layout: manualLayout(labelElement),
@@ -14737,7 +14737,7 @@ function parseDisplayUnits(context, element2) {
     {
       builtInUnit: cVal(element2, "builtInUnit"),
       customUnit: cNumber(context, element2, "custUnit"),
-      label: label5,
+      label: label4,
       extLst: extensionList2(element2)
     }
   );
@@ -15591,10 +15591,10 @@ function titleXml(context, title) {
 function labelOptionsXml(context, options) {
   return numberFormatXml(options.numberFormat) + shapePropertiesXml(context, options.spPr) + textBodyXml(context, options.txPr) + valXml("dLblPos", options.position) + valXml("showLegendKey", options.showLegendKey) + valXml("showVal", options.showValue) + valXml("showCatName", options.showCategoryName) + valXml("showSerName", options.showSeriesName) + valXml("showPercent", options.showPercent) + valXml("showBubbleSize", options.showBubbleSize) + (options.separator === void 0 ? "" : textElement("separator", options.separator));
 }
-function labelXml(context, label5) {
+function labelXml(context, label4) {
   return elementXml(
     "dLbl",
-    valXml("idx", label5.index) + valXml("delete", label5.deleted) + layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + labelOptionsXml(context, label5) + raw(context, label5.extLst)
+    valXml("idx", label4.index) + valXml("delete", label4.deleted) + layoutXml(context, label4.layout) + chartTextXml(context, label4.tx, false) + labelOptionsXml(context, label4) + raw(context, label4.extLst)
   );
 }
 function dataLabelsXml(context, labels) {
@@ -15602,7 +15602,7 @@ function dataLabelsXml(context, labels) {
   const leaderLines = labels.leaderLines ? elementXml("leaderLines", shapePropertiesXml(context, labels.leaderLines.spPr)) : "";
   return elementXml(
     "dLbls",
-    labels.labels.map((label5) => labelXml(context, label5)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
+    labels.labels.map((label4) => labelXml(context, label4)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
   );
 }
 
@@ -15623,12 +15623,12 @@ function dataTableXml(context, table3) {
 }
 function displayUnitsXml(context, units2) {
   if (!units2) return "";
-  const label5 = units2.label;
+  const label4 = units2.label;
   return elementXml(
     "dispUnits",
-    valXml("custUnit", units2.customUnit) + (units2.customUnit === void 0 ? valXml("builtInUnit", units2.builtInUnit) : "") + (label5 ? elementXml(
+    valXml("custUnit", units2.customUnit) + (units2.customUnit === void 0 ? valXml("builtInUnit", units2.builtInUnit) : "") + (label4 ? elementXml(
       "dispUnitsLbl",
-      layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr)
+      layoutXml(context, label4.layout) + chartTextXml(context, label4.tx, false) + shapePropertiesXml(context, label4.spPr) + textBodyXml(context, label4.txPr)
     ) : "") + raw(context, units2.extLst)
   );
 }
@@ -15653,11 +15653,11 @@ function axisXml(context, axis) {
 }
 
 // chart/write-analysis.ts
-function trendlineLabelXml(context, label5) {
-  if (!label5) return "";
+function trendlineLabelXml(context, label4) {
+  if (!label4) return "";
   return elementXml(
     "trendlineLbl",
-    layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + numberFormatXml(label5.numberFormat) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr) + raw(context, label5.extLst)
+    layoutXml(context, label4.layout) + chartTextXml(context, label4.tx, false) + numberFormatXml(label4.numberFormat) + shapePropertiesXml(context, label4.spPr) + textBodyXml(context, label4.txPr) + raw(context, label4.extLst)
   );
 }
 function trendlineXml(context, trendline) {
@@ -20860,19 +20860,19 @@ var nextSheetId = (workbook) => workbook.sheets.reduce((max, sheet) => Math.max(
 var MAX_ROW = 1048575;
 var MAX_COL = 16383;
 function columnLabel(col) {
-  let label5 = "";
+  let label4 = "";
   let n = col + 1;
   while (n > 0) {
     const rem = (n - 1) % 26;
-    label5 = String.fromCharCode(65 + rem) + label5;
+    label4 = String.fromCharCode(65 + rem) + label4;
     n = Math.floor((n - 1) / 26);
   }
-  return label5;
+  return label4;
 }
-function columnIndex(label5) {
-  if (!/^[A-Za-z]{1,3}$/.test(label5)) return -1;
+function columnIndex(label4) {
+  if (!/^[A-Za-z]{1,3}$/.test(label4)) return -1;
   let n = 0;
-  for (const ch of label5.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
+  for (const ch of label4.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
   return n - 1;
 }
 var formatAddress = (address2) => `${columnLabel(address2.col)}${address2.row + 1}`;
@@ -23231,6 +23231,13 @@ var pivotRowFields = (pivot) => [
   ...pivot.secondRowField ? [pivot.secondRowField] : [],
   ...pivot.secondRowField ? pivot.moreRowFields ?? [] : []
 ];
+function pivotValuesIndex(pivot) {
+  if (pivot.valuesAxis !== "rows") return -1;
+  const count2 = pivotRowFields(pivot).length;
+  const at2 = pivot.valuesPosition;
+  if (typeof at2 === "number") return Math.min(Math.max(Math.trunc(at2), 0), count2);
+  return at2 === "first" ? 0 : at2 === "between" ? Math.min(1, count2) : count2;
+}
 var pivotColumnFields = (pivot) => [
   ...pivot.columnField ? [pivot.columnField] : [],
   ...pivot.columnField ? pivot.moreColumnFields ?? [] : []
@@ -23332,7 +23339,7 @@ var LEAP_MONTHS = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 var MAX_ITEMS = 1e4;
 var pad3 = (value2, width = 2) => String(value2).padStart(width, "0");
 var dateGroupUnits = (group) => PIVOT_DATE_UNITS.filter((unit3) => group.by.includes(unit3));
-var dateGroupFieldName = (unit3, field2) => `${UNIT_TITLES[unit3]} (${field2})`;
+var dateGroupFieldName = (unit3, field2, group) => group?.localized?.[unit3]?.name ?? `${UNIT_TITLES[unit3]} (${field2})`;
 var dateGroupDays = (group) => group.by.length === 1 && group.by[0] === "days" ? group.days ?? 1 : 1;
 function dateGroupRange(group, serials) {
   let min = Infinity;
@@ -23355,7 +23362,7 @@ var secondsOfDay = (serial) => Math.round((serial - Math.floor(serial)) * 86400)
 function dayBuckets(range2, days) {
   return Math.max(1, Math.ceil((Math.floor(range2.end) - Math.floor(range2.start) + 1) / days));
 }
-function dateUnitLabels(unit3, range2, days, date1904) {
+function englishDateUnitLabels(unit3, range2, days, date1904) {
   const labels = [`<${isoDay(range2.start, date1904)}`];
   if (unit3 === "seconds" || unit3 === "minutes")
     for (let i2 = 0; i2 < 60; i2++) labels.push(`:${pad3(i2)}`);
@@ -23384,6 +23391,11 @@ function dateUnitLabels(unit3, range2, days, date1904) {
   labels.push(`>${isoDay(range2.end, date1904)}`);
   return labels;
 }
+function dateUnitLabels(unit3, range2, days, date1904, group) {
+  const english = englishDateUnitLabels(unit3, range2, days, date1904);
+  const localized = group?.localized?.[unit3]?.labels;
+  return localized?.length === english.length ? localized : english;
+}
 function dateUnitIndex(unit3, range2, days, date1904, serial, count2) {
   if (serial < range2.start) return 0;
   if (serial > range2.end) return count2 - 1;
@@ -23407,7 +23419,7 @@ function derivedDateFields(pivot) {
   for (const group of pivot.dateGroups ?? [])
     for (const unit3 of dateGroupUnits(group))
       derived.push({
-        name: dateGroupFieldName(unit3, group.field),
+        name: dateGroupFieldName(unit3, group.field, group),
         unit: unit3,
         group,
         index: databaseFields + derived.length
@@ -23418,7 +23430,7 @@ function countDerived(pivot) {
   let count2 = 0;
   for (const group of pivot.dateGroups ?? [])
     for (const unit3 of dateGroupUnits(group))
-      if (pivot.fields.includes(dateGroupFieldName(unit3, group.field))) count2++;
+      if (pivot.fields.includes(dateGroupFieldName(unit3, group.field, group))) count2++;
   return count2;
 }
 var pivotAxisFieldNames = (pivot) => [
@@ -23438,7 +23450,7 @@ function derivedDateLabels(pivot, name3) {
   if (!entry3) return void 0;
   const [group] = resolveDateGroups({ ...pivot, dateGroups: [entry3.group] });
   const range2 = { start: group.start, end: group.end };
-  return dateUnitLabels(entry3.unit, range2, dateGroupDays(group), pivot.date1904 ?? false);
+  return dateUnitLabels(entry3.unit, range2, dateGroupDays(group), pivot.date1904 ?? false, group);
 }
 function validateDateGroups(pivot) {
   const groups = pivot.dateGroups;
@@ -23454,18 +23466,16 @@ function validateDateGroups(pivot) {
     seen.add(group.field);
     if (!(pivot.dateFields ?? []).includes(group.field))
       throw new Error("Only fields that contain dates can be grouped by date.");
-    if (pivot.pageFilter || pivot.dateFilter)
-      throw new Error("Date groups cannot be combined with report filters or timelines.");
     const serials = pivot.records.map((record2) => record2[index3]);
     if (!serials.length || serials.some((v) => typeof v !== "number" || !Number.isFinite(v)))
       throw new Error("Only fields that contain dates can be grouped by date.");
     const range2 = dateGroupRange(group, serials);
     if (range2.start >= range2.end) throw new Error("The date group must end after it starts.");
     for (const unit3 of dateGroupUnits(group)) {
-      const name3 = dateGroupFieldName(unit3, group.field);
+      const name3 = dateGroupFieldName(unit3, group.field, group);
       if (pivot.fields.includes(name3))
         throw new Error("A source field already has the name of a date group field.");
-      if (dateUnitLabels(unit3, range2, dateGroupDays(group), pivot.date1904 ?? false).length > MAX_ITEMS)
+      if (dateUnitLabels(unit3, range2, dateGroupDays(group), pivot.date1904 ?? false, group).length > MAX_ITEMS)
         throw new Error("The date group has too many items.");
     }
   }
@@ -23479,7 +23489,7 @@ function expandDateGroups(pivot) {
   const tables = derived.map((entry3) => {
     const range2 = { start: entry3.group.start, end: entry3.group.end };
     const days = dateGroupDays(entry3.group);
-    const labels = dateUnitLabels(entry3.unit, range2, days, date1904);
+    const labels = dateUnitLabels(entry3.unit, range2, days, date1904, entry3.group);
     return {
       base: pivot.fields.indexOf(entry3.group.field),
       labels,
@@ -23612,15 +23622,13 @@ function normalizedFieldSubtotals(entries) {
     };
   });
 }
-function validateFieldSubtotals(pivot, rowFields) {
+function validateFieldSubtotals(pivot, axisFields) {
   const entries = pivot.fieldSubtotals;
   if (entries === void 0) return;
   if (!Array.isArray(entries)) throw new Error("Choose valid field subtotals.");
-  if (entries.length && pivot.valuesAxis === "rows")
-    throw new Error("Field subtotals require Values on columns.");
   const seen = /* @__PURE__ */ new Set();
   for (const entry3 of entries) {
-    if (!entry3 || typeof entry3 !== "object" || !rowFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
+    if (!entry3 || typeof entry3 !== "object" || !axisFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
       throw new Error("Choose valid field subtotals.");
     seen.add(entry3.field);
   }
@@ -23716,17 +23724,18 @@ function validatePivotPageFilter(pivot) {
     throw new Error("Choose a cached literal report filter item.");
 }
 function pivotPageProjection(pivot) {
-  return applyPivotGroups(applyPivotItemFilters(pagedProjection(pivot)));
+  const groups = pivot.dateGroups?.length ? { ...pivot, dateGroups: resolveDateGroups(pivot) } : pivot;
+  return applyPivotGroups(applyPivotItemFilters(pagedProjection(groups)));
 }
 function pagedProjection(pivot) {
   const filter2 = pivot.pageFilter;
   if (!filter2) return pivot;
   const labels = /* @__PURE__ */ new Map();
   for (const item of pivotItems(pivot, filter2.field)) {
-    const label5 = String(pivotItemLabel(item)).toLowerCase(), key3 = pivotValueKey(item);
-    if (label5 === "(all)" || labels.has(label5) && labels.get(label5) !== key3)
+    const label4 = String(pivotItemLabel(item)).toLowerCase(), key3 = pivotValueKey(item);
+    if (label4 === "(all)" || labels.has(label4) && labels.get(label4) !== key3)
       throw new Error("Ambiguous report filter item captions are preserved.");
-    labels.set(label5, key3);
+    labels.set(label4, key3);
   }
   if (filter2.item === void 0) return pivot;
   const index3 = pivot.fields.indexOf(filter2.field), key2 = pivotValueKey(filter2.item);
@@ -23865,13 +23874,9 @@ function validatePivotFields(pivot) {
   const columns = pivotColumnFields(pivot);
   if (pivot.moreColumnFields !== void 0 && (!Array.isArray(pivot.moreColumnFields) || pivot.moreColumnFields.length > 0 && !pivot.columnField || pivot.moreColumnFields.length > 62 || pivot.moreColumnFields.some((name3) => typeof name3 !== "string")))
     throw new Error("Choose valid PivotTable column fields.");
-  if (pivot.valuesAxis === "rows" && rows.length > 2)
-    throw new Error("Values on rows support at most two row fields.");
-  if (pivot.valuesAxis === "rows" && columns.length > 1)
-    throw new Error("Values on rows support one column field.");
   if (pivot.pageFilter && columns.length > 1)
     throw new Error("Report filters support one column field.");
-  validateFieldSubtotals(pivot, rows);
+  validateFieldSubtotals(pivot, [...rows, ...columns]);
   const axisNames = pivotAxisFieldNames(pivot);
   if ((pivot.dateGroups ?? []).some(
     (group) => [...rows, ...columns].some((name3) => name3 === group.field)
@@ -23880,9 +23885,10 @@ function validatePivotFields(pivot) {
   const extras = pivot.additionalValues ?? [];
   if (pivot.valuesAxis !== void 0 && !["columns", "rows"].includes(pivot.valuesAxis))
     throw new Error("Choose a valid Values axis.");
-  if (pivot.valuesPosition !== void 0 && !["last", "between", "first"].includes(pivot.valuesPosition))
+  const position2 = pivot.valuesPosition;
+  if (position2 !== void 0 && !["last", "between", "first"].includes(position2) && !(typeof position2 === "number" && Number.isInteger(position2) && position2 >= 0))
     throw new Error("Choose a valid Values position.");
-  if ((pivot.valuesPosition === "between" || pivot.valuesPosition === "first") && (pivot.valuesAxis !== "rows" || !pivot.secondRowField))
+  if (position2 !== void 0 && position2 !== "last" && (pivot.valuesAxis !== "rows" || position2 === "between" && !pivot.secondRowField || typeof position2 === "number" && position2 > rows.length))
     throw new Error("Values before or between fields require two row fields and Values on rows.");
   if (pivot.valuesAxis === "rows" && (!Array.isArray(extras) || !extras.length))
     throw new Error("Values on rows require multiple measures.");
@@ -23903,6 +23909,45 @@ function pivotCaption(aggregate2, field2) {
   return `${aggregate2[0].toUpperCase()}${aggregate2.slice(1)} of ${field2}`;
 }
 
+// xlsx/write/xml-out.ts
+var XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
+var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
+var NEEDS_ESCAPE = new RegExp(`[${CONTROL2}\r]|_x[0-9A-Fa-f]{4}_`);
+var ESCAPABLE = new RegExp(`[${CONTROL2}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
+function encodeEscapes(text8) {
+  if (!NEEDS_ESCAPE.test(text8)) return text8;
+  return text8.replace(
+    ESCAPABLE,
+    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
+  );
+}
+var INVALID_XML2 = new RegExp(`[${CONTROL2}]`, "g");
+var escapeText3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var escapeAttr3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
+function attrs2(values2) {
+  let out = "";
+  for (const [name3, value2] of Object.entries(values2)) {
+    if (value2 === void 0) continue;
+    const text8 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
+    out += ` ${name3}="${escapeAttr3(text8)}"`;
+  }
+  return out;
+}
+var el4 = (name3, values2 = {}, content2 = "") => content2 ? `<${name3}${attrs2(values2)}>${content2}</${name3}>` : `<${name3}${attrs2(values2)}/>`;
+var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
+function tElement(text8, name3 = "t") {
+  const encoded = escapeText3(encodeEscapes(text8));
+  const preserve = /^\s|\s$|\n|\t/.test(text8) ? ' xml:space="preserve"' : "";
+  return `<${name3}${preserve}>${encoded}</${name3}>`;
+}
+var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
+function inlineFragment(xml) {
+  const end = xml.indexOf(">");
+  if (end < 0) return xml;
+  const head = xml.slice(0, end);
+  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
+}
+
 // xlsx/pivot/measures.ts
 var pivotMeasures = (pivot) => [
   { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
@@ -23952,329 +23997,17 @@ function aggregateValues(records, field2, type) {
   return type === "average" ? sum3 / numbers3.length : sum3;
 }
 var pivotMeasureNumber = (pivot, records, measure2) => aggregateValues(records, pivot.fields.indexOf(measure2.field), measure2.aggregate);
-var pivotNumbers = (pivot, records) => pivotMeasures(pivot).map((measure2) => pivotMeasureNumber(pivot, records, measure2));
-function pivotHeaderDimensions(pivot, columnItems, rowLabels) {
-  return {
-    rows: (pivot.columnField ? 2 : 1) + (pivot.pageFilter ? 2 : 0),
-    width: rowLabels + (pivot.columnField ? columnItems + 1 : 1)
-  };
-}
-function pivotHeaders(pivot, columns, labels, label5) {
-  const rowLabels = pivot.layout === "compact" ? ["Row Labels"] : pivot.valuesPosition === "first" ? ["Values", ...labels] : pivot.valuesPosition === "between" ? [labels[0], "Values", labels[1]] : [...labels, "Values"];
-  return pivot.columnField ? [
-    [
-      ...rowLabels.map(() => null),
-      pivot.layout === "compact" ? "Column Labels" : pivot.columnField,
-      ...columns.map(() => null)
-    ],
-    [...rowLabels, ...columns.map(label5), "Grand Total"]
-  ] : [[...rowLabels, null]];
-}
-
-// xlsx/pivot/hierarchy-first.ts
-function appendFirstPivotValues(pivot, context) {
-  const {
-    rowItems,
-    secondRowItems,
-    columnItems,
-    children: children4,
-    innerIndices,
-    groups,
-    details,
-    buckets,
-    width,
-    rowLabels,
-    top,
-    bottom,
-    append
-  } = context;
-  const compact3 = pivot.layout === "compact";
-  const tabular = !pivot.layout || pivot.layout === "tabular";
-  const blank = () => Array(width - rowLabels).fill(null);
-  pivotMeasures(pivot).forEach((measure2, m) => {
-    const numbers3 = (keys, records) => [
-      ...columnItems.map(
-        (column2) => pivotMeasureNumber(
-          pivot,
-          buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-          measure2
-        )
-      ),
-      pivotMeasureNumber(pivot, records, measure2)
-    ];
-    if (!tabular)
-      append([measure2.caption, ...Array(rowLabels - 1).fill(null)], blank(), {
-        indices: [m],
-        measure: m
-      });
-    let first3 = true;
-    rowItems.forEach((outer, outerIndex) => {
-      const key2 = pivotValueKey(outer);
-      const group = groups.get(key2) ?? [];
-      if (!tabular)
-        append(
-          compact3 ? [pivotItemLabel(outer)] : [null, pivotItemLabel(outer), null],
-          top ? numbers3([key2], group) : blank(),
-          { indices: [m, outerIndex], measure: m },
-          compact3 ? 1 : 0
-        );
-      const innerKeys = [...children4.get(key2)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      innerKeys.forEach((innerKey, child7) => {
-        const innerIndex = innerIndices.get(innerKey);
-        append(
-          compact3 ? [pivotItemLabel(secondRowItems[innerIndex])] : [
-            tabular && first3 ? measure2.caption : null,
-            pivot.repeatLabels || tabular && child7 === 0 ? pivotItemLabel(outer) : null,
-            pivotItemLabel(secondRowItems[innerIndex])
-          ],
-          numbers3([key2, innerKey], details.get(JSON.stringify([key2, innerKey]))),
-          { indices: [m, outerIndex, innerIndex], measure: m },
-          compact3 ? 2 : 0
-        );
-        first3 = false;
-      });
-      if (bottom)
-        append(
-          compact3 ? [`${String(pivotItemLabel(outer))} Total`] : [null, `${String(pivotItemLabel(outer))} Total`, null],
-          numbers3([key2], group),
-          { indices: [m, outerIndex], measure: m, type: "default" },
-          compact3 ? 1 : 0
-        );
-    });
-  });
-}
-
-// xlsx/pivot/hierarchy.ts
-var label = pivotItemLabel;
-function hierarchicalPivotGrid(pivot) {
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const secondRowItems = pivotItems(pivot, pivot.secondRowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const outerField = pivot.fields.indexOf(pivot.rowField);
-  const innerField = pivot.fields.indexOf(pivot.secondRowField);
-  const columnField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const layout3 = pivot.layout ?? "tabular";
-  const compact3 = layout3 === "compact";
-  const firstValues = pivot.valuesPosition === "first";
-  const between = pivot.valuesPosition === "between";
-  const measures2 = pivotMeasures(pivot);
-  const top = firstValues && layout3 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
-  const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact3 ? 1 : 3;
-  const groups = /* @__PURE__ */ new Map();
-  const details = /* @__PURE__ */ new Map();
-  const children4 = /* @__PURE__ */ new Map();
-  const innerIndices = new Map(secondRowItems.map((item, index3) => [pivotValueKey(item), index3]));
-  const buckets = /* @__PURE__ */ new Map();
-  const collect = (map, key2, record2) => {
-    const list2 = map.get(key2);
-    if (list2) list2.push(record2);
-    else map.set(key2, [record2]);
-  };
-  for (const record2 of pivot.records) {
-    const outer = pivotValueKey(record2[outerField] ?? null);
-    const inner2 = pivotValueKey(record2[innerField] ?? null);
-    collect(groups, outer, record2);
-    collect(details, JSON.stringify([outer, inner2]), record2);
-    if (!children4.has(outer)) children4.set(outer, /* @__PURE__ */ new Set());
-    children4.get(outer).add(inner2);
-    if (pivot.columnField) {
-      const column2 = pivotValueKey(record2[columnField] ?? null);
-      for (const key2 of [[], [outer], [outer, inner2]])
-        collect(buckets, JSON.stringify([...key2, column2]), record2);
-    }
-  }
-  const dimensions3 = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
-  const rows = (details.size + rowItems.length * Number(bottom) + 1) * measures2.length + rowItems.length * Number(layout3 !== "tabular") * (firstValues ? measures2.length : 1) + (firstValues ? measures2.length : between ? rowItems.length * measures2.length : details.size) * Number(layout3 !== "tabular") + dimensions3.rows;
-  if (rows * dimensions3.width > 1e6) throw new Error("The PivotTable result is too large.");
-  const labels = compact3 ? ["Row Labels"] : [pivot.rowField, pivot.secondRowField];
-  const values2 = pivotHeaders(pivot, columnItems, labels, label);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
-  const rowEntries = [];
-  const append = (labels2, numbers4, entry3, indent = 0) => {
-    values2.push([...labels2, ...numbers4]);
-    rowEntries.push(entry3);
-    indents.push(indent);
-  };
-  const bands = (keys, records) => [
-    ...columnItems.map(
-      (column2) => pivotNumbers(pivot, buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [])
-    ),
-    pivotNumbers(pivot, records)
-  ];
-  const numbers3 = (keys, records) => bands(keys, records).flat();
-  const appendMeasures = (labels2, keys, records, indices, type) => {
-    const values3 = bands(keys, records);
-    measures2.forEach(
-      (measure2, m) => append(
-        type ? [
-          `${type === "grand" ? "Total" : String(labels2[0])} ${measure2.caption}`,
-          ...Array(rowLabelColumns - 1).fill(null)
-        ] : compact3 ? [measure2.caption] : [
-          ...labels2.map(
-            (label5) => layout3 === "tabular" && m === 0 || pivot.repeatLabels ? label5 : null
-          ),
-          measure2.caption
-        ],
-        values3.map((band2) => band2[m] ?? null),
-        { indices: type ? indices : [...indices, m], measure: m, ...type ? { type } : {} },
-        compact3 && !type ? 2 : 0
-      )
-    );
-  };
-  if (firstValues)
-    appendFirstPivotValues(pivot, {
-      rowItems,
-      secondRowItems,
-      columnItems,
-      children: children4,
-      innerIndices,
-      groups,
-      details,
-      buckets,
-      width: dimensions3.width,
-      rowLabels: rowLabelColumns,
-      top,
-      bottom,
-      append
-    });
-  else
-    rowItems.forEach((outer, outerIndex) => {
-      const key2 = pivotValueKey(outer);
-      if (layout3 !== "tabular")
-        append(
-          [label(outer), ...Array(rowLabelColumns - 1).fill(null)],
-          top ? numbers3([key2], groups.get(key2) ?? []) : Array(dimensions3.width - rowLabelColumns).fill(null),
-          { indices: [outerIndex] }
-        );
-      let first3 = true;
-      const innerKeys = [...children4.get(key2)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      if (between)
-        measures2.forEach((measure2, m) => {
-          if (layout3 !== "tabular")
-            append(
-              compact3 ? [measure2.caption] : [pivot.repeatLabels ? label(outer) : null, measure2.caption, null],
-              Array(dimensions3.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, m], measure: m },
-              compact3 ? 1 : 0
-            );
-          innerKeys.forEach((innerKey, child7) => {
-            const innerIndex = innerIndices.get(innerKey);
-            const keys = [key2, innerKey];
-            const records = details.get(JSON.stringify(keys));
-            append(
-              compact3 ? [label(secondRowItems[innerIndex])] : [
-                pivot.repeatLabels || layout3 === "tabular" && m === 0 && child7 === 0 ? label(outer) : null,
-                layout3 === "tabular" && child7 === 0 ? measure2.caption : null,
-                label(secondRowItems[innerIndex])
-              ],
-              [
-                ...columnItems.map(
-                  (column2) => pivotMeasureNumber(
-                    pivot,
-                    buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-                    measure2
-                  )
-                ),
-                pivotMeasureNumber(pivot, records, measure2)
-              ],
-              { indices: [outerIndex, m, innerIndex], measure: m },
-              compact3 ? 2 : 0
-            );
-          });
-        });
-      else
-        innerKeys.forEach((innerKey) => {
-          const innerIndex = innerIndices.get(innerKey);
-          const inner2 = secondRowItems[innerIndex];
-          const keys = [key2, innerKey];
-          const records = details.get(JSON.stringify(keys));
-          if (!records) return;
-          if (layout3 !== "tabular")
-            append(
-              compact3 ? [label(inner2)] : [pivot.repeatLabels ? label(outer) : null, label(inner2), null],
-              Array(dimensions3.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, innerIndex] },
-              compact3 ? 1 : 0
-            );
-          appendMeasures(
-            [pivot.repeatLabels || first3 ? label(outer) : null, label(inner2)],
-            keys,
-            records,
-            [outerIndex, innerIndex]
-          );
-          first3 = false;
-        });
-      if (bottom)
-        appendMeasures([label(outer)], [key2], groups.get(key2) ?? [], [outerIndex], "default");
-    });
-  appendMeasures([], [], pivot.records, [0], "grand");
-  return {
-    values: values2,
-    rowItems,
-    secondRowItems,
-    columnItems,
-    rowEntries,
-    firstDataRow,
-    rowLabelColumns,
-    indents,
-    firstHeaderRow: 1
-  };
-}
-
-// xlsx/write/xml-out.ts
-var XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
-var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
-var NEEDS_ESCAPE = new RegExp(`[${CONTROL2}\r]|_x[0-9A-Fa-f]{4}_`);
-var ESCAPABLE = new RegExp(`[${CONTROL2}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
-function encodeEscapes(text8) {
-  if (!NEEDS_ESCAPE.test(text8)) return text8;
-  return text8.replace(
-    ESCAPABLE,
-    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
-  );
-}
-var INVALID_XML2 = new RegExp(`[${CONTROL2}]`, "g");
-var escapeText3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-var escapeAttr3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
-function attrs2(values2) {
-  let out = "";
-  for (const [name3, value2] of Object.entries(values2)) {
-    if (value2 === void 0) continue;
-    const text8 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
-    out += ` ${name3}="${escapeAttr3(text8)}"`;
-  }
-  return out;
-}
-var el4 = (name3, values2 = {}, content2 = "") => content2 ? `<${name3}${attrs2(values2)}>${content2}</${name3}>` : `<${name3}${attrs2(values2)}/>`;
-var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
-function tElement(text8, name3 = "t") {
-  const encoded = escapeText3(encodeEscapes(text8));
-  const preserve = /^\s|\s$|\n|\t/.test(text8) ? ' xml:space="preserve"' : "";
-  return `<${name3}${preserve}>${encoded}</${name3}>`;
-}
-var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
-function inlineFragment(xml) {
-  const end = xml.indexOf(">");
-  if (end < 0) return xml;
-  const head = xml.slice(0, end);
-  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
-}
 
 // xlsx/pivot/columns.ts
 var SEPARATOR = "
";
-var label2 = pivotItemLabel;
+var label = pivotItemLabel;
 var columnKey = (keys, depth) => keys.slice(0, depth).join(SEPARATOR);
 var recordColumnKeys = (record2, indices) => indices.map((index3) => pivotValueKey(record2[index3] ?? null));
 function pivotColumnEntries(pivot) {
   const names = pivotColumnFields(pivot);
   const items = names.map((name3) => pivotItems(pivot, name3));
   const entries = [];
+  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
   if (names.length) {
     const order = items.map(
       (list2) => new Map(list2.map((item, index3) => [pivotValueKey(item), index3]))
@@ -24309,7 +24042,9 @@ function pivotColumnEntries(pivot) {
         if (level === names.length - 1) entries.push({ kind: "leaf", ...entry3 });
         else {
           visit2(child7[1], level + 1, here.path, here.values, here.keys);
-          entries.push({ kind: "subtotal", ...entry3 });
+          const own2 = functions[level];
+          if (own2 === "auto") entries.push({ kind: "subtotal", ...entry3 });
+          else for (const fn of own2) entries.push({ kind: "subtotal", ...entry3, fn });
         }
       }
     };
@@ -24318,25 +24053,28 @@ function pivotColumnEntries(pivot) {
   entries.push({ kind: "grand", path: [], key: "", values: [] });
   return { names, items, entries };
 }
-function pivotColumnDimensions(pivot, columns, labelColumns) {
-  const measures2 = 1 + (pivot.additionalValues?.length ?? 0);
+function pivotColumnDimensions(pivot, columns, labelColumns, valuesOnRows = false) {
+  const measures2 = valuesOnRows ? 1 : 1 + (pivot.additionalValues?.length ?? 0);
   const levels = columns.names.length;
   return {
     rows: (levels ? levels + 1 + Number(measures2 > 1) : 1) + (pivot.pageFilter ? 2 : 0),
     width: labelColumns + (levels ? columns.entries.length : 1) * measures2
   };
 }
-function pivotColumnHeaders(pivot, columns, rowLabels) {
-  const measures2 = pivotMeasures(pivot);
+function pivotColumnHeaders(pivot, columns, rowLabels, valuesOnRows = false) {
+  const measures2 = valuesOnRows ? pivotMeasures(pivot).slice(0, 1) : pivotMeasures(pivot);
   const count2 = measures2.length;
   const levels = columns.names.length;
-  if (!levels) return [[...rowLabels, ...measures2.map((measure2) => measure2.caption)]];
+  if (!levels)
+    return [
+      [...rowLabels, ...valuesOnRows ? [null] : measures2.map((measure2) => measure2.caption)]
+    ];
   const compact3 = pivot.layout === "compact";
   const labelColumns = rowLabels.length;
   const width = labelColumns + columns.entries.length * count2;
   const rows = levels + 1 + Number(count2 > 1);
   const grid = Array.from({ length: rows }, () => Array(width).fill(null));
-  if (count2 === 1) grid[0][0] = pivot.valueCaption;
+  if (count2 === 1 && !valuesOnRows) grid[0][0] = pivot.valueCaption;
   const titles = compact3 ? ["Column Labels"] : [...columns.names, ...count2 > 1 ? ["Values"] : []];
   titles.forEach((title, i2) => {
     grid[0][labelColumns + i2] = title;
@@ -24350,16 +24088,17 @@ function pivotColumnHeaders(pivot, columns, rowLabels) {
     if (entry3.kind === "leaf") {
       entry3.path.forEach((_index, level) => {
         const continued = entry3.path.slice(0, level + 1).every((p, i2) => p === previous[i2]);
-        if (!continued) grid[1 + level][at2] = label2(entry3.values[level]);
+        if (!continued) grid[1 + level][at2] = label(entry3.values[level]);
       });
       previous = entry3.path;
       if (count2 > 1) measures2.forEach((measure2, m) => grid[rows - 1][at2 + m] = measure2.caption);
       return;
     }
     const row3 = entry3.kind === "grand" ? 1 : entry3.path.length;
-    const name3 = entry3.kind === "grand" ? "" : String(label2(entry3.values.at(-1)));
+    const name3 = entry3.kind === "grand" ? "" : String(label(entry3.values.at(-1)));
     measures2.forEach((measure2, m) => {
-      grid[row3][at2 + m] = count2 === 1 ? entry3.kind === "grand" ? "Grand Total" : `${name3} Total` : entry3.kind === "grand" ? `Total ${measure2.caption}` : `${name3} ${measure2.caption}`;
+      const custom = entry3.fn ? PIVOT_SUBTOTALS[entry3.fn].label : void 0;
+      grid[row3][at2 + m] = custom ? count2 === 1 ? `${name3} ${custom}` : `${name3} ${custom} of ${measure2.field}` : count2 === 1 ? entry3.kind === "grand" ? "Grand Total" : `${name3} Total` : entry3.kind === "grand" ? `Total ${measure2.caption}` : `${name3} ${measure2.caption}`;
     });
   });
   return grid;
@@ -24384,7 +24123,7 @@ function pivotColumnItemsXml(entries, measures2, remap) {
       const prefix3 = sharedPrefix(path2, previous);
       const xs = path2.slice(prefix3).map((index3) => `<x${attrs2({ v: index3 || void 0 })}/>`);
       out.push(
-        `<i${attrs2({ t: entry3.kind === "subtotal" ? "default" : void 0, r: prefix3 || void 0, i: m || void 0 })}>${xs.join("")}</i>`
+        `<i${attrs2({ t: entry3.kind === "subtotal" ? entry3.fn ? PIVOT_SUBTOTALS[entry3.fn].item : "default" : void 0, r: prefix3 || void 0, i: m || void 0 })}>${xs.join("")}</i>`
       );
       previous = path2;
     }
@@ -24392,7 +24131,7 @@ function pivotColumnItemsXml(entries, measures2, remap) {
 }
 
 // xlsx/pivot/nested.ts
-var label3 = pivotItemLabel;
+var label2 = pivotItemLabel;
 var MAX_CELLS = 1e6;
 var node = (index3, value2) => ({
   index: index3,
@@ -24404,6 +24143,10 @@ var node = (index3, value2) => ({
 function nestedPivotGrid(pivot) {
   const names = pivotRowFields(pivot);
   const depth = names.length;
+  const valuesAt = pivotValuesIndex(pivot);
+  const onRows = valuesAt >= 0;
+  const levels = depth + (onRows ? 1 : 0);
+  const fieldOf = (level) => !onRows || level < valuesAt ? level : level === valuesAt ? -1 : level - 1;
   const axisItems = names.map((name3) => pivotItems(pivot, name3));
   const itemIndices = axisItems.map(
     (items) => new Map(items.map((item, index3) => [pivotValueKey(item), index3]))
@@ -24415,125 +24158,168 @@ function nestedPivotGrid(pivot) {
   const compact3 = layout3 === "compact";
   const tabular = layout3 === "tabular";
   const above = !tabular && (pivot.subtotalPosition ?? "top") === "top";
-  const labelColumns = compact3 ? 1 : depth;
+  const labelColumns = compact3 ? 1 : levels;
   const measures2 = pivotMeasures(pivot);
+  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
   const root = node(0, null);
   for (const record2 of pivot.records) {
     const keys = recordColumnKeys(record2, columnFields);
     let current = root;
-    for (let level = -1; level < depth; level++) {
-      if (level >= 0) {
-        const value2 = record2[fieldIndices[level]] ?? null;
+    for (let field2 = -1; field2 < depth; field2++) {
+      if (field2 >= 0) {
+        const value2 = record2[fieldIndices[field2]] ?? null;
         const key2 = pivotValueKey(value2);
         let child7 = current.children.get(key2);
         if (!child7) {
-          child7 = node(itemIndices[level].get(key2), value2);
+          child7 = node(itemIndices[field2].get(key2), value2);
           current.children.set(key2, child7);
         }
         current = child7;
       }
       current.records.push(record2);
-      for (let width = 1; width <= keys.length; width++) {
-        const key2 = columnKey(keys, width);
+      for (let width2 = 1; width2 <= keys.length; width2++) {
+        const key2 = columnKey(keys, width2);
         const list2 = current.columns.get(key2);
         if (list2) list2.push(record2);
         else current.columns.set(key2, [record2]);
       }
     }
   }
-  const dimensions3 = pivotColumnDimensions(pivot, columns, labelColumns);
-  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
-  let rows = 1;
-  const count2 = (parent, level) => {
-    for (const child7 of parent.children.values()) {
-      rows++;
-      if (level < depth - 1) {
-        const f6 = functions[level];
-        rows += f6 === "auto" ? 1 : f6.length;
-        count2(child7, level + 1);
-      }
-    }
-  };
-  count2(root, 0);
-  if ((rows + dimensions3.rows) * dimensions3.width > MAX_CELLS)
-    throw new Error("The PivotTable result is too large.");
-  const values2 = pivotColumnHeaders(pivot, columns, compact3 ? ["Row Labels"] : names);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
+  const dimensions3 = pivotColumnDimensions(pivot, columns, labelColumns, onRows);
+  const rowTitles = names.map((name3) => name3);
+  if (onRows) rowTitles.splice(valuesAt, 0, "Values");
+  let values2 = [];
+  let indents = [];
   const rowEntries = [];
-  const blanks = () => Array(dimensions3.width - labelColumns).fill(null);
-  const bands = (group, run2) => columns.entries.flatMap(
-    (entry3) => run2(entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [])
-  );
-  const numbers3 = (group) => bands(group, (records) => pivotNumbers(pivot, records));
-  const subtotalNumbers = (group, fn) => bands(
-    group,
-    (records) => measures2.map((measure2) => aggregateValues(records, pivot.fields.indexOf(measure2.field), fn))
-  );
-  const labelCells = (path2, shown, text8) => {
+  let counting = true;
+  let rowCount = 0;
+  const width = dimensions3.width - labelColumns;
+  const blanks = () => Array(width).fill(null);
+  const cells3 = (group, rowFn, measure2) => columns.entries.flatMap((entry3) => {
+    const records = entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [];
+    const picked = measure2 === void 0 ? measures2 : [measures2[measure2]];
+    if (rowFn && entry3.fn && rowFn !== entry3.fn) return picked.map(() => null);
+    const fn = rowFn ?? entry3.fn;
+    return picked.map(
+      (one2) => fn ? aggregateValues(records, pivot.fields.indexOf(one2.field), fn) : pivotMeasureNumber(pivot, records, one2)
+    );
+  });
+  const labelCells = (path2, shown, level, text8) => {
     if (compact3) return [text8];
-    const cells3 = Array(depth).fill(null);
-    path2.forEach((value2, level) => {
-      if (shown[level]) cells3[level] = label3(value2);
+    const row3 = Array(levels).fill(null);
+    path2.labels.forEach((value2, at2) => {
+      if (shown[at2]) row3[at2] = value2;
     });
-    cells3[path2.length] = text8;
-    return cells3;
+    row3[level] = text8;
+    return row3;
   };
-  const push3 = (cells3, numbersOnRow, entry3, indent) => {
-    values2.push([...cells3, ...numbersOnRow]);
+  const push3 = (indent, build3) => {
+    if (counting) {
+      if ((++rowCount + dimensions3.rows) * dimensions3.width > MAX_CELLS)
+        throw new Error("The PivotTable result is too large.");
+      return;
+    }
+    const [cells4, numbers3, entry3] = build3();
+    values2.push([...cells4, ...numbers3]);
     rowEntries.push(entry3);
     indents.push(compact3 ? indent : 0);
   };
-  const emit = (parent, level, path2, indices, firsts) => {
-    const last = level === depth - 1;
-    const own2 = functions[level];
-    const children4 = [...parent.children.values()].sort((a2, b) => a2.index - b.index);
+  const entryOf = (indices, measure2, type) => ({
+    indices,
+    ...measure2 !== void 0 ? { measure: measure2 } : {},
+    ...type ? { type } : {}
+  });
+  const walk2 = (level, group, measure2, path2) => {
+    const field2 = fieldOf(level);
+    const last = level === levels - 1;
+    const repeated = Array.from(
+      { length: level },
+      (_v, k) => !!pivot.repeatLabels && fieldOf(k) >= 0
+    );
+    const leafShown = (firsts) => repeated.map((repeat, k) => repeat || tabular && firsts.slice(k + 1).every(Boolean));
+    if (field2 < 0) {
+      measures2.forEach((one2, m) => {
+        const here = {
+          labels: [...path2.labels, one2.caption],
+          indices: [...path2.indices, m],
+          firsts: [...path2.firsts, m === 0]
+        };
+        if (last)
+          return push3(level, () => [
+            labelCells(path2, leafShown(here.firsts), level, one2.caption),
+            cells3(group, void 0, m),
+            entryOf(here.indices, m)
+          ]);
+        if (!tabular)
+          push3(level, () => [
+            labelCells(path2, repeated, level, one2.caption),
+            blanks(),
+            entryOf(here.indices, m)
+          ]);
+        walk2(level + 1, group, m, here);
+      });
+      return;
+    }
+    const own2 = functions[field2];
+    const valuesAbove = !onRows || valuesAt < level;
+    const showsValue = above && own2 === "auto" && valuesAbove;
+    const children4 = [...group.children.values()].sort((a2, b) => a2.index - b.index);
     children4.forEach((child7, position2) => {
-      const here = [...path2, child7.value];
-      const at2 = [...indices, child7.index];
-      const firstHere = [...firsts, position2 === 0];
-      const repeated = Array(level).fill(!!pivot.repeatLabels);
-      if (last) {
-        const shown = repeated.map(
-          (repeat, k) => repeat || tabular && firstHere.slice(k + 1).every(Boolean)
-        );
-        push3(labelCells(path2, shown, label3(child7.value)), numbers3(child7), { indices: at2 }, level);
-        return;
-      }
+      const here = {
+        labels: [...path2.labels, label2(child7.value)],
+        indices: [...path2.indices, child7.index],
+        firsts: [...path2.firsts, position2 === 0]
+      };
+      const text8 = label2(child7.value);
+      if (last)
+        return push3(level, () => [
+          labelCells(path2, leafShown(here.firsts), level, text8),
+          cells3(child7, void 0, measure2),
+          entryOf(here.indices, measure2)
+        ]);
       if (!tabular)
-        push3(
-          labelCells(path2, repeated, label3(child7.value)),
-          own2 === "auto" && above ? numbers3(child7) : blanks(),
-          { indices: at2 },
-          level
-        );
-      emit(child7, level + 1, here, at2, firstHere);
-      const caption = String(label3(child7.value));
+        push3(level, () => [
+          labelCells(path2, repeated, level, text8),
+          showsValue ? cells3(child7, void 0, measure2) : blanks(),
+          entryOf(here.indices, measure2)
+        ]);
+      walk2(level + 1, child7, measure2, here);
+      if (field2 === depth - 1) return;
+      const caption = String(text8);
+      const subtotal = (title, fn, one2) => push3(level, () => [
+        labelCells(path2, repeated, level, title),
+        cells3(child7, fn, one2),
+        entryOf(here.indices, one2, fn ?? "default")
+      ]);
       if (own2 === "auto") {
-        if (!above)
-          push3(
-            labelCells(path2, repeated, `${caption} Total`),
-            numbers3(child7),
-            { indices: at2, type: "default" },
-            level
-          );
+        if (showsValue) return;
+        if (valuesAbove) subtotal(`${caption} Total`, void 0, measure2);
+        else measures2.forEach((one2, m) => subtotal(`${caption} ${one2.caption}`, void 0, m));
       } else
         for (const fn of own2)
-          push3(
-            labelCells(path2, repeated, `${caption} ${PIVOT_SUBTOTALS[fn].label}`),
-            subtotalNumbers(child7, fn),
-            { indices: at2, type: fn },
-            level
-          );
+          if (valuesAbove) subtotal(`${caption} ${PIVOT_SUBTOTALS[fn].label}`, fn, measure2);
+          else
+            measures2.forEach(
+              (one2, m) => subtotal(`${caption} ${PIVOT_SUBTOTALS[fn].label} of ${one2.field}`, fn, m)
+            );
     });
   };
-  emit(root, 0, [], [], []);
-  push3(
-    compact3 ? ["Grand Total"] : ["Grand Total", ...Array(depth - 1).fill(null)],
-    numbers3(root),
-    { indices: [0], type: "grand" },
-    0
-  );
+  const grand = (text8, measure2) => push3(0, () => [
+    compact3 ? [text8] : [text8, ...Array(levels - 1).fill(null)],
+    cells3(root, void 0, measure2),
+    entryOf([0], measure2, "grand")
+  ]);
+  const build2 = () => {
+    walk2(0, root, void 0, { labels: [], indices: [], firsts: [] });
+    if (onRows) measures2.forEach((one2, m) => grand(`Total ${one2.caption}`, m));
+    else grand("Grand Total");
+  };
+  build2();
+  counting = false;
+  values2 = pivotColumnHeaders(pivot, columns, compact3 ? ["Row Labels"] : rowTitles, onRows);
+  const firstDataRow = values2.length;
+  indents = values2.map(() => 0);
+  build2();
   return {
     values: values2,
     rowItems: axisItems[0],
@@ -24545,105 +24331,15 @@ function nestedPivotGrid(pivot) {
     rowEntries,
     firstDataRow,
     rowLabelColumns: labelColumns,
-    indents
+    indents,
+    ...onRows ? { firstHeaderRow: 1 } : {}
   };
 }
 
 // xlsx/pivot/aggregate.ts
 function pivotGrid(pivot) {
   validatePivotFields(pivot);
-  return prependPivotPage(pivotDataGrid(pivotPageProjection(pivot)), pivot);
-}
-function pivotDataGrid(pivot) {
-  if (pivot.valuesAxis !== "rows") return nestedPivotGrid(pivot);
-  if (pivot.secondRowField) return hierarchicalPivotGrid(pivot);
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const compact3 = pivot.layout === "compact";
-  const headings = pivot.layout !== void 0 && pivot.layout !== "tabular";
-  const dimensions3 = pivotHeaderDimensions(pivot, columnItems.length, compact3 ? 1 : 2);
-  const dataRows = (rowItems.length + 1) * (1 + (pivot.additionalValues?.length ?? 0)) + (headings ? rowItems.length : 0);
-  if ((dataRows + dimensions3.rows) * dimensions3.width > 1e6)
-    throw new Error("The PivotTable result is too large.");
-  const label5 = pivotItemLabel;
-  const values2 = pivotHeaders(pivot, columnItems, [compact3 ? "Row Labels" : pivot.rowField], label5);
-  const rowField = pivot.fields.indexOf(pivot.rowField);
-  const colField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const groups = /* @__PURE__ */ new Map();
-  const cells3 = /* @__PURE__ */ new Map();
-  const columns = /* @__PURE__ */ new Map();
-  const collect = (map, key2, record2) => {
-    const found = map.get(key2);
-    if (found) found.push(record2);
-    else map.set(key2, [record2]);
-  };
-  for (const record2 of pivot.records) {
-    const key2 = pivotValueKey(record2[rowField] ?? null);
-    collect(groups, key2, record2);
-    if (pivot.columnField) {
-      const col = pivotValueKey(record2[colField] ?? null);
-      collect(columns, col, record2);
-      collect(cells3, JSON.stringify([key2, col]), record2);
-    }
-  }
-  const firstDataRow = values2.length;
-  const measures2 = pivotMeasures(pivot);
-  const rowEntries = [];
-  const indents = values2.map(() => 0);
-  const append = (caption, bands, index3, grand = false) => {
-    measures2.forEach((measure2, m) => {
-      values2.push([
-        ...compact3 ? [grand ? `Total ${measure2.caption}` : measure2.caption] : [
-          grand ? `Total ${measure2.caption}` : pivot.repeatLabels || !headings && m === 0 ? caption : null,
-          grand ? null : measure2.caption
-        ],
-        ...bands.map((band2) => band2[m] ?? null)
-      ]);
-      indents.push(compact3 && !grand ? 1 : 0);
-      rowEntries.push({
-        indices: grand ? [0] : [index3, m],
-        measure: m,
-        ...grand ? { type: "grand" } : {}
-      });
-    });
-  };
-  rowItems.forEach((item, index3) => {
-    const key2 = pivotValueKey(item);
-    if (headings) {
-      values2.push([label5(item), ...Array(dimensions3.width - 1).fill(null)]);
-      rowEntries.push({ indices: [index3] });
-      indents.push(0);
-    }
-    append(
-      label5(item),
-      [
-        ...columnItems.map(
-          (col) => pivotNumbers(pivot, cells3.get(JSON.stringify([key2, pivotValueKey(col)])) ?? [])
-        ),
-        pivotNumbers(pivot, groups.get(key2) ?? [])
-      ],
-      index3
-    );
-  });
-  append(
-    "Grand Total",
-    [
-      ...columnItems.map((col) => pivotNumbers(pivot, columns.get(pivotValueKey(col)) ?? [])),
-      pivotNumbers(pivot, pivot.records)
-    ],
-    0,
-    true
-  );
-  return {
-    values: values2,
-    rowItems,
-    columnItems,
-    firstDataRow,
-    rowLabelColumns: compact3 ? 1 : 2,
-    indents,
-    firstHeaderRow: 1,
-    rowEntries
-  };
+  return prependPivotPage(nestedPivotGrid(pivotPageProjection(pivot)), pivot);
 }
 function pivotTableAt(sheet, at2) {
   return sheet.pivotTables?.find((pivot) => rangeContains(pivot.location, at2));
@@ -25268,7 +24964,7 @@ function readFieldGroups(fields, names) {
       throw new Error("Unsupported pivot field group");
     const labels = children(list2, "s", NS.x).map((node3) => decodeEscapes(att(node3, "v") ?? ""));
     const expected = numberGroupLabels({ start, end, by });
-    if (elements(list2).length !== labels.length || labels.length !== expected.length || labels.some((label5, i2) => label5 !== expected[i2]))
+    if (elements(list2).length !== labels.length || labels.length !== expected.length || labels.some((label4, i2) => label4 !== expected[i2]))
       throw new Error("Unsupported pivot group items");
     groups.push({ field: names[index3] ?? "", start, end, by });
   });
@@ -25346,14 +25042,18 @@ function readDateGroups(fields, count2, names, dateFields, records, date1904) {
     const expected = dateGroupRange(group, serials);
     if (!close(expected.start, start) || !close(expected.end, end))
       throw unsupported("stale range");
+    const localized = {};
     for (const entry3 of list2) {
-      const labels = dateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
+      const labels = englishDateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
       const node3 = first(first(entry3.node, "fieldGroup", NS.x), "groupItems", NS.x);
       const actual = children(node3, "s", NS.x).map((item) => decodeEscapes(att(item, "v") ?? ""));
-      if (att(entry3.node, "name") === void 0 || decodeEscapes(att(entry3.node, "name")) !== dateGroupFieldName(entry3.unit, field2) || elements(node3).length !== actual.length || actual.length !== labels.length || actual.some((label5, i2) => label5 !== labels[i2]))
+      const name3 = decodeEscapes(att(entry3.node, "name") ?? "");
+      if (!name3 || elements(node3).length !== actual.length || actual.length !== labels.length || actual.some((label4) => !label4) || new Set(actual).size !== actual.length)
         throw unsupported("group items");
+      if (name3 !== dateGroupFieldName(entry3.unit, field2) || actual.some((l, i2) => l !== labels[i2]))
+        localized[entry3.unit] = { name: name3, labels: actual };
     }
-    groups.push(group);
+    groups.push(Object.keys(localized).length ? { ...group, localized } : group);
   }
   return groups;
 }
@@ -25412,6 +25112,7 @@ function remapPivotRowEntries(entries, axes2) {
     (entry3) => entry3.type === "grand" ? entry3 : {
       ...entry3,
       indices: entry3.indices.map((item, axis) => {
+        if (axes2[axis] === null) return item;
         const index3 = axes2[axis]?.[item];
         if (index3 === void 0) throw new Error("Invalid report row axis item");
         return index3;
@@ -25430,7 +25131,7 @@ function pivotValueIndex(root, axis) {
   const position2 = root.getAttribute("dataPosition");
   if (position2 !== null && (!/^\d+$/.test(position2.trim()) || Number(position2) !== index3))
     throw new Error("Inconsistent Values axis position");
-  if (axis.length === 3 && index3 >= 0 && index3 < 2 && position2 === null)
+  if (index3 >= 0 && index3 < axis.length - 1 && position2 === null)
     throw new Error("Missing leading or between-field Values position");
   return index3;
 }
@@ -25445,7 +25146,7 @@ function pivotValueAxisItems(measures2) {
 function supportedPivotAxes(rows, columns, measures2, valuesOnRows) {
   const index3 = pivotFieldIndex;
   if (valuesOnRows)
-    return measures2 > 1 && (rows.length === 2 || rows.length === 3) && (index3(rows[0]) >= 0 || rows.length === 3) && rows.filter((field2) => index3(field2) === -2).length === 1 && rows.filter((field2) => index3(field2) !== -2).every((field2) => index3(field2) >= 0) && columns.length <= 1 && (!columns.length || index3(columns[0]) >= 0);
+    return measures2 > 1 && rows.length > 1 && rows.filter((field2) => index3(field2) === -2).length === 1 && rows.filter((field2) => index3(field2) !== -2).every((field2) => index3(field2) >= 0) && columns.every((field2) => index3(field2) >= 0);
   if (rows.some((field2) => !Number.isInteger(index3(field2)) || index3(field2) < 0)) return false;
   if (measures2 > 1 && (!columns.length || index3(columns.at(-1)) !== -2)) return false;
   return (measures2 > 1 ? columns.slice(0, -1) : columns).every(
@@ -25466,6 +25167,9 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
   literals(cache3);
   literals(recordRoot);
   const cacheFields = children(first(cache3, "cacheFields", NS.x), "cacheField", NS.x);
+  const all2 = expandDateGroups(pivot).fields;
+  const derived = all2.slice(pivot.fields.length).map((name3) => groupLabelsOf(pivot, name3) ?? []);
+  const sharedAll = [...shared, ...derived];
   if (pivot.columnField) {
     const column2 = children(first(root, "pivotFields", NS.x), "pivotField", NS.x)[pivot.fields.indexOf(pivot.columnField)];
     const list2 = first(column2, "extLst", NS.x);
@@ -25484,13 +25188,13 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
     ))
       throw new Error("Repeated report column labels are preserved");
   }
-  if (integer3(first(cache3, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== pivot.fields.length || integer3(cache3.getAttribute("recordCount")) !== pivot.records.length || integer3(recordRoot.getAttribute("count")) !== pivot.records.length)
+  if (integer3(first(cache3, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== all2.length || integer3(cache3.getAttribute("recordCount")) !== pivot.records.length || integer3(recordRoot.getAttribute("count")) !== pivot.records.length)
     throw new Error("Inconsistent report cache counts");
   for (const name3 of [...pivotRowFields(pivot), pivot.columnField, pivot.pageFilter.field].filter(
     Boolean
   )) {
-    const field2 = pivot.fields.indexOf(name3);
-    if (integer3(first(cacheFields[field2], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field2].length)
+    const field2 = all2.indexOf(name3);
+    if (field2 < pivot.fields.length && integer3(first(cacheFields[field2], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field2].length)
       throw new Error("Inconsistent report shared-item counts");
   }
   for (const name3 of ["rowFields", "colFields"]) {
@@ -25500,7 +25204,7 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
   }
   const projected = pivotPageProjection(pivot), fields = children(first(root, "pivotFields", NS.x), "pivotField", NS.x);
   const axisValues = (name3, axis) => {
-    const f6 = pivot.fields.indexOf(name3), node3 = fields[f6], list2 = first(node3, "items", NS.x), items = children(list2, "item", NS.x), count2 = shared[f6].length;
+    const f6 = all2.indexOf(name3), node3 = fields[f6], list2 = first(node3, "items", NS.x), items = children(list2, "item", NS.x), count2 = sharedAll[f6].length;
     if (node3.getAttribute("axis") !== axis) throw new Error("Inconsistent report axis field");
     const defaults = node3.getAttribute("defaultSubtotal") !== "0";
     if (!list2 || integer3(list2.getAttribute("count")) !== items.length || items.length !== count2 + Number(defaults))
@@ -25509,7 +25213,7 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
       const i2 = integer3(item.getAttribute("x"));
       if (item.hasAttribute("t") || !Number.isInteger(i2) || i2 >= count2)
         throw new Error("Invalid page-axis cache item");
-      return shared[f6][i2];
+      return sharedAll[f6][i2];
     });
     if (new Set(data.map(pivotValueKey)).size !== count2 || defaults && (items.at(-1)?.getAttribute("t") !== "default" || items.at(-1)?.hasAttribute("x")))
       throw new Error("Invalid page-axis default item");
@@ -25645,7 +25349,7 @@ function readOne(workbook, source2, part) {
     "dataField",
     NS.x
   );
-  if (rowFields.length < 1 || rowsAxis && rowFields.length > 3 || dataFields.length < 1 || dataFields.length > 16 || !supportedPivotAxes(rowFields, colFields, dataFields.length, rowsAxis) || root.getAttribute("rowGrandTotals") === "0" || root.getAttribute("colGrandTotals") === "0")
+  if (rowFields.length < 1 || dataFields.length < 1 || dataFields.length > 16 || !supportedPivotAxes(rowFields, colFields, dataFields.length, rowsAxis) || root.getAttribute("rowGrandTotals") === "0" || root.getAttribute("colGrandTotals") === "0")
     throw new Error("Unsupported pivot layout");
   const valueIndex = pivotValueIndex(root, rowsAxis ? rowFields : colFields);
   const measure2 = dataFields[0];
@@ -25715,8 +25419,8 @@ function readOne(workbook, source2, part) {
   const col = columnNames[0];
   const moreColumns = columnNames.slice(1);
   const columnDefinitions = columnDefs.map((field2) => tableFields[Number(att(field2, "x"))]);
-  if (fieldSubtotalsOf(columnDefinitions.slice(0, -1), columnNames.slice(0, -1)).length || columnNames.some((name3) => !name3))
-    throw new Error("Column subtotal settings are preserved");
+  if (columnNames.some((name3) => !name3)) throw new Error("Invalid pivot column fields");
+  const columnSubtotals = fieldSubtotalsOf(columnDefinitions, columnNames);
   const data = names[Number(att(measure2, "fld"))];
   const location = parseRange(att(first(root, "location", NS.x), "ref") ?? "");
   if (!row3 || !data || !location || hasColumn && !col || realRows.length === 2 && !second)
@@ -25757,8 +25461,10 @@ function readOne(workbook, source2, part) {
   ]);
   if (dateFields.some((field2) => onAxis.has(field2)))
     throw new Error("Date fields used as rows, columns or values are preserved");
-  if ([...realRows, ...columnDefs].some((field2) => pivotFieldIndex(field2) >= databaseCount) && (pageFilter || dateFilter || itemFilters || slicerCacheId !== void 0))
-    throw new Error("Date groups with filters are preserved");
+  const fieldSubtotals = [
+    ...subtotalSettings.filter((entry4) => entry4.field !== row3 || entry4.functions.length),
+    ...columnSubtotals
+  ];
   const pivot = {
     ...pageFilter ? { pageFilter } : {},
     ...itemFilters ? { itemFilters } : {},
@@ -25773,13 +25479,11 @@ function readOne(workbook, source2, part) {
     rowField: row3,
     layout: layout3,
     ...rowsAxis ? { valuesAxis: "rows" } : {},
-    ...rowsAxis && realRows.length === 2 && valueIndex < 2 ? { valuesPosition: valueIndex === 0 ? "first" : "between" } : {},
-    subtotalPosition: att(outer, "subtotalTop") === "0" ? "bottom" : "top",
-    ...subtotalSettings.some((entry4) => entry4.field !== row3 || entry4.functions.length) ? {
-      fieldSubtotals: subtotalSettings.filter(
-        (entry4) => entry4.field !== row3 || entry4.functions.length
-      )
+    ...rowsAxis && valueIndex < realRows.length ? {
+      valuesPosition: valueIndex === 0 ? "first" : valueIndex === 1 && realRows.length === 2 ? "between" : valueIndex
     } : {},
+    subtotalPosition: att(outer, "subtotalTop") === "0" ? "bottom" : "top",
+    ...fieldSubtotals.length ? { fieldSubtotals } : {},
     ...more.length ? { moreRowFields: more } : {},
     ...second ? { secondRowField: second, subtotals: subtotal, repeatLabels: repeat[0] ?? false } : {
       ...subtotal ? {} : { subtotals: false },
@@ -28027,8 +27731,8 @@ function parseTable3(xml, partName) {
       if (id3 !== void 0 && Number.isInteger(id3) && id3 >= 0) column2.sourceId = id3;
       const fn = att(node3, "totalsRowFunction");
       if (fn && fn !== "none") column2.totalsRowFunction = fn;
-      const label5 = att(node3, "totalsRowLabel");
-      if (label5 !== void 0) column2.totalsRowLabel = label5;
+      const label4 = att(node3, "totalsRowLabel");
+      if (label4 !== void 0) column2.totalsRowLabel = label4;
       const calculated = xFirst(node3, "calculatedColumnFormula");
       if (calculated) column2.calculatedColumnFormula = stripFuturePrefixes(xText(calculated));
       return column2;
@@ -30905,11 +30609,11 @@ function gammaLn(z) {
 
 // xlsx/formula/functions/database.ts
 var C3 = "Database";
-var label4 = (value2) => value2 === null ? "" : typeof value2 === "string" ? value2 : String(value2);
+var label3 = (value2) => value2 === null ? "" : typeof value2 === "string" ? value2 : String(value2);
 function tableOf(ctx, value2) {
   const [head, ...records] = ctx.toMatrix(value2 ?? null).data;
   if (!head || records.length === 0) fail(ERR.VALUE);
-  return { headers: head.map((v) => label4(v).toLowerCase()), records };
+  return { headers: head.map((v) => label3(v).toLowerCase()), records };
 }
 function fieldIndex(table3, field2) {
   const value2 = scalar2(field2);
@@ -30919,7 +30623,7 @@ function fieldIndex(table3, field2) {
     if (index4 < 0 || index4 >= table3.headers.length) fail(ERR.VALUE);
     return index4;
   }
-  const index3 = table3.headers.indexOf(label4(value2).toLowerCase());
+  const index3 = table3.headers.indexOf(label3(value2).toLowerCase());
   if (index3 < 0) fail(ERR.VALUE);
   return index3;
 }
@@ -30928,7 +30632,7 @@ function recordFilter(table3, criteria) {
   if (!head || rows.length === 0) fail(ERR.VALUE);
   const columns = head.map((name3) => {
     if (name3 === null || name3 === "") return -1;
-    return table3.headers.indexOf(label4(name3).toLowerCase());
+    return table3.headers.indexOf(label3(name3).toLowerCase());
   });
   const alternatives = rows.map(
     (row3) => row3.flatMap((cell, c2) => {
@@ -43721,15 +43425,15 @@ function derivedFields(pivot, date1904) {
 function derivedFieldXml(pivot, entry3, date1904) {
   const range2 = { start: entry3.group.start, end: entry3.group.end };
   const days = dateGroupDays(entry3.group);
-  const labels = dateUnitLabels(entry3.unit, range2, days, date1904);
+  const labels = dateUnitLabels(entry3.unit, range2, days, date1904, entry3.group);
   const base2 = pivot.fields.indexOf(entry3.group.field);
-  return `<cacheField${attrs2({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base2}"><rangePr${attrs2({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range2.start, date1904), endDate: serialToIso(range2.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
+  return `<cacheField${attrs2({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base2}"><rangePr${attrs2({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range2.start, date1904), endDate: serialToIso(range2.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label4) => `<s v="${escapeAttr3(label4)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
 }
 function groupXml2(pivot, name3, index3) {
   const group = groupOf(pivot, name3);
   if (!group) return "";
   const labels = numberGroupLabels(group);
-  return `<fieldGroup base="${index3}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup>`;
+  return `<fieldGroup base="${index3}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label4) => `<s v="${escapeAttr3(label4)}"/>`).join("")}</groupItems></fieldGroup>`;
 }
 function slicerExt(pivot) {
   if (pivot.slicerCacheId === void 0) return "";
@@ -43750,8 +43454,6 @@ function pivotTableXml(source2, cacheId, cache3) {
   const pivot = expandDateGroups(source2);
   const rowNames = pivotRowFields(pivot);
   const rowIdx = rowNames.map((name3) => pivot.fields.indexOf(name3));
-  const row3 = rowIdx[0];
-  const second = rowIdx[1] ?? -1;
   const page = pivot.pageFilter ? pivot.fields.indexOf(pivot.pageFilter.field) : -1;
   const pageItems = page >= 0 ? pivotItems(pivot, pivot.pageFilter.field) : [];
   const filtered2 = filteredFields(pivot);
@@ -43779,7 +43481,10 @@ function pivotTableXml(source2, cacheId, cache3) {
   const columnIndicesFull = columnNames.map(
     (_name, k) => itemIndices(visibleColumns[k], columnItemsFull[k])
   );
-  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, rowIndicesFull) : grid.rowEntries;
+  const valuesAt = pivotValuesIndex(pivot);
+  const levelAxes = [...rowIndicesFull];
+  if (valuesAt >= 0) levelAxes.splice(valuesAt, 0, null);
+  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, levelAxes) : grid.rowEntries;
   const pageOffset = page >= 0 ? 2 : 0;
   const col = columnIdx[0] ?? -1;
   const measures2 = pivotMeasures(pivot);
@@ -43794,7 +43499,7 @@ function pivotTableXml(source2, cacheId, cache3) {
     const colAt = columnIdx.indexOf(index3);
     const items2 = index3 === page ? pageItems : at2 >= 0 ? rowItemsFull[at2] : colAt >= 0 ? columnItemsFull[colAt] : groupLabelsOf(pivot, name3) ?? (filtered2.has(name3) || isDate ? pivotItems(pivot, name3) : void 0);
     const hidden = hiddenItemKeys(pivot, name3);
-    const functions = at2 >= 0 ? fieldSubtotalFunctions(pivot, name3) : "auto";
+    const functions = at2 >= 0 || colAt >= 0 ? fieldSubtotalFunctions(pivot, name3) : "auto";
     const automatic = functions === "auto";
     const custom = automatic ? [] : functions;
     const repeated = pivot.repeatLabels && at2 >= 0 ? `<extLst><ext uri="{2946ED86-A175-432a-8AC1-64E0C546D7DE}"><x14:pivotField xmlns:x14="${X143}" fillDownLabels="1"/></ext></extLst>` : "";
@@ -43806,33 +43511,23 @@ function pivotTableXml(source2, cacheId, cache3) {
   }).join("");
   const items = (count2, indices) => Array.from({ length: count2 }, (_v, i2) => `<i><x v="${indices?.[i2] ?? i2}"/></i>`).join("") + '<i t="grand"><x/></i>';
   const header = grid.firstHeaderRow !== void 0 ? grid.firstHeaderRow - pageOffset : col >= 0 ? 1 : grid.firstDataRow - pageOffset - 1;
-  const rowIndices = rowsAxis && pivot.valuesPosition === "first" ? [-2, row3, second] : rowsAxis && pivot.valuesPosition === "between" ? [row3, -2, second] : [...rowIdx, ...rowsAxis ? [-2] : []];
+  const rowIndices = [...rowIdx];
+  if (valuesAt >= 0) rowIndices.splice(valuesAt, 0, -2);
   let previous = [];
   const rowItems = rowEntries?.map((entry3) => {
     let prefix3 = 0;
     const type = entry3.type === void 0 || entry3.type === "default" || entry3.type === "grand" ? entry3.type : PIVOT_SUBTOTALS[entry3.type].item;
-    if (rowsAxis) {
-      if (entry3.type === "default" && pivot.valuesPosition === "first") prefix3 = 1;
-      else if (!entry3.type)
-        while (prefix3 < entry3.indices.length - 1 && entry3.indices[prefix3] === previous[prefix3])
-          prefix3++;
-      previous = entry3.type && !(entry3.type === "default" && pivot.valuesPosition === "first") ? [] : entry3.indices;
-    } else {
-      if (entry3.type !== "grand") prefix3 = sharedPrefix(entry3.indices, previous);
-      previous = entry3.type === "grand" ? [] : entry3.indices;
-    }
+    if (entry3.type !== "grand") prefix3 = sharedPrefix(entry3.indices, previous);
+    previous = entry3.type === "grand" ? [] : entry3.indices;
     return `<i${attrs2({ t: type, r: prefix3 || void 0, i: entry3.measure || void 0 })}>${entry3.indices.slice(prefix3).map((index3) => `<x${attrs2({ v: index3 || void 0 })}/>`).join("")}</i>`;
   }).join("") ?? items(grid.rowItems.length, rowIndicesFull[0]);
   let body = `<location${attrs2({ ref: formatRange({ ...pivot.location, start: { ...pivot.location.start, row: pivot.location.start.row + pageOffset } }), firstHeaderRow: header, firstDataRow: grid.firstDataRow - pageOffset, rowPageCount: page >= 0 ? 1 : void 0, colPageCount: page >= 0 ? 1 : void 0, firstDataCol: grid.rowLabelColumns ?? 1 })}/><pivotFields count="${pivot.fields.length}">${fields}</pivotFields><rowFields count="${rowIndices.length}">${rowIndices.map((index3) => `<field x="${index3}"/>`).join("")}</rowFields><rowItems count="${grid.rowEntries?.length ?? grid.rowItems.length + 1}">${rowItems}</rowItems>`;
-  if (!rowsAxis && col >= 0 && grid.columnEntries) {
-    const fieldsOnColumns = [...columnIdx, ...multiple ? [-2] : []];
-    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index3) => `<field x="${index3}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, measures2.length, (level, index3) => columnIndicesFull[level][index3])}`;
+  if (col >= 0 && grid.columnEntries) {
+    const fieldsOnColumns = [...columnIdx, ...multiple && !rowsAxis ? [-2] : []];
+    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index3) => `<field x="${index3}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, rowsAxis ? 1 : measures2.length, (level, index3) => columnIndicesFull[level][index3])}`;
   } else if (multiple && !rowsAxis)
     body += `<colFields count="1"><field x="-2"/></colFields>${pivotValueAxisItems(measures2.length)}`;
-  else if (col >= 0)
-    body += `<colFields count="1"><field x="${col}"/></colFields><colItems count="${grid.columnItems.length + 1}">${items(grid.columnItems.length, columnIndicesFull[0])}</colItems>`;
-  else
-    body += rowsAxis ? '<colItems count="1"><i/></colItems>' : page >= 0 ? '<colItems count="1"><i/></colItems>' : '<colItems count="1"><i><x/></i></colItems>';
+  else body += '<colItems count="1"><i/></colItems>';
   if (page >= 0)
     body += `<pageFields count="1"><pageField${attrs2({ fld: page, hier: -1, item: pivot.pageFilter.item !== void 0 ? pageItems.findIndex((item) => pivotValueKey(item) === pivotValueKey(pivot.pageFilter.item)) : void 0 })}/></pageFields>`;
   body += `<dataFields count="${measures2.length}">${measures2.map((measure2) => `<dataField${attrs2({ name: encodeEscapes(measure2.caption), fld: pivot.fields.indexOf(measure2.field), subtotal: measure2.aggregate, baseField: 0, baseItem: 0 })}/>`).join("")}</dataFields>`;
@@ -43843,8 +43538,7 @@ function pivotTableXml(source2, cacheId, cache3) {
   root.setAttribute("name", pivot.name);
   root.setAttribute("cacheId", String(cacheId));
   root.setAttribute("dataOnRows", rowsAxis ? "1" : "0");
-  if (rowsAxis && (pivot.valuesPosition === "between" || pivot.valuesPosition === "first"))
-    root.setAttribute("dataPosition", pivot.valuesPosition === "first" ? "0" : "1");
+  if (rowsAxis && valuesAt < rowIdx.length) root.setAttribute("dataPosition", String(valuesAt));
   else root.removeAttribute("dataPosition");
   root.setAttribute("compact", compact3 ? "1" : "0");
   root.setAttribute("compactData", compact3 ? "1" : "0");
@@ -43910,7 +43604,8 @@ function pivotTableXml(source2, cacheId, cache3) {
 }
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  return `<filters count="1"><filter${attrs2({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id: 1, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
+  const id3 = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  return `<filters count="1"><filter${attrs2({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id: id3, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 
 // xlsx/pivot/write.ts
@@ -48895,7 +48590,7 @@ function pixelSizeToExtent(width, height) {
 }
 
 // xlsx/pivot/date-axes.ts
-var dateGroupAxisNames = (group) => dateGroupUnits(group).reverse().map((unit3) => dateGroupFieldName(unit3, group.field));
+var dateGroupAxisNames = (group) => dateGroupUnits(group).reverse().map((unit3) => dateGroupFieldName(unit3, group.field, group));
 function replace(list2, names, replacement) {
   const at2 = list2.findIndex((name3) => names.includes(name3));
   if (at2 < 0) return list2;
@@ -48931,7 +48626,9 @@ function reconcileDateAxes(next, previous) {
   if (columns.length > 1) next.moreColumnFields = columns.slice(1);
   else delete next.moreColumnFields;
   if (next.fieldSubtotals) {
-    const kept = next.fieldSubtotals.filter((entry3) => rows.includes(entry3.field));
+    const kept = next.fieldSubtotals.filter(
+      (entry3) => rows.includes(entry3.field) || columns.includes(entry3.field)
+    );
     if (kept.length) next.fieldSubtotals = kept;
     else delete next.fieldSubtotals;
   }
@@ -48983,12 +48680,12 @@ function plan(ctx, s, pivot, old) {
   if (occupied) throw new Error("The PivotTable would overwrite existing cell content.");
   return { grid, location };
 }
-function writePivot(ctx, s, pivot, old, label5, inside2) {
+function writePivot(ctx, s, pivot, old, label4, inside2) {
   const sheet = sheetAt(ctx.workbook, s);
   const { grid, location } = plan(ctx, s, pivot, old);
   const ranges = [...old ? [old.location] : [], location];
   ctx.run(
-    label5 ?? (old ? "Refresh PivotTable" : "Create PivotTable"),
+    label4 ?? (old ? "Refresh PivotTable" : "Create PivotTable"),
     "annotations",
     [
       { kind: "parts", sheet: s, parts: ["pivotTables"] },
@@ -49147,6 +48844,12 @@ function refreshPivotTable(ctx, s, name3, patch2 = {}) {
   else delete next.dateFields;
   roundDateRecords(next, dates, ctx.workbook.date1904);
   if (next.dateFilter && !dates.includes(next.dateFilter.field)) delete next.dateFilter;
+  if (patch2.fieldSubtotals === void 0 && next.fieldSubtotals) {
+    const onAxes = [...pivotRowFields(next), ...pivotColumnFields(next)];
+    const left2 = next.fieldSubtotals.filter((entry3) => onAxes.includes(entry3.field));
+    if (left2.length) next.fieldSubtotals = left2;
+    else delete next.fieldSubtotals;
+  }
   const kept = pruneItemFilters(next);
   if (kept) next.itemFilters = kept;
   else delete next.itemFilters;
@@ -49602,10 +49305,10 @@ function validatePatch(group, patch2) {
     delete next.manualMax;
   validateSettings(next);
 }
-function save2(ctx, s, next, label5, ranges) {
+function save2(ctx, s, next, label4, ranges) {
   const sheet = sheetAt(ctx.workbook, s);
   ctx.run(
-    label5,
+    label4,
     "annotations",
     [{ kind: "parts", sheet: s, parts: ["preserved"] }],
     () => sheet.preserved.set("extLst", next),
@@ -53718,8 +53421,8 @@ function createEditSession(workbook, options = {}) {
       if (!workbook.warnings.includes(message)) workbook.warnings.push(message);
     }
   };
-  const begin = (label5, kind, info) => {
-    const step2 = { label: label5, entries: [], structural: info.structural ?? false };
+  const begin = (label4, kind, info) => {
+    const step2 = { label: label4, entries: [], structural: info.structural ?? false };
     if (info.calc) step2.calc = info.calc;
     return { step: step2, kind, sheet: info.sheet, ranges: [...info.ranges ?? []] };
   };
@@ -53743,7 +53446,7 @@ function createEditSession(workbook, options = {}) {
     }
     current.step.entries.length = from;
   };
-  const run2 = (label5, kind, scopes, fn, info = {}) => {
+  const run2 = (label4, kind, scopes, fn, info = {}) => {
     if (kind === "cells") {
       for (const scope of scopes)
         if (scope.kind === "cells" && workbook.sheets[scope.sheet]?.pivotTables?.some(
@@ -53760,7 +53463,7 @@ function createEditSession(workbook, options = {}) {
       }))
         throw new Error(DATA_TABLE_PART_ERROR);
     const outer = !open;
-    const current = open ?? begin(label5, kind, info);
+    const current = open ?? begin(label4, kind, info);
     if (!outer) {
       delete current.step.calc;
       if (info.structural) current.step.structural = true;
@@ -53930,12 +53633,12 @@ function createEditSession(workbook, options = {}) {
     validate: (s, r, c2, value2) => validateCellInput(workbook, s, r, c2, value2, {
       evaluate: (formula, at2) => calc.evaluate(formula, at2)
     }),
-    batch(label5, fn) {
+    batch(label4, fn) {
       if (open) {
         fn();
         return;
       }
-      const current = begin(label5, "batch", {});
+      const current = begin(label4, "batch", {});
       open = current;
       try {
         fn();
@@ -54615,9 +54318,9 @@ var VisioPackage = class _VisioPackage {
 };
 
 // visio/metadata.ts
-function metadata(value2, max, label5) {
+function metadata(value2, max, label4) {
   if (value2.length > max)
-    throw new VisioPackageError("METADATA_LIMIT", `${label5} exceeds its metadata length limit.`);
+    throw new VisioPackageError("METADATA_LIMIT", `${label4} exceeds its metadata length limit.`);
   return value2;
 }
 function metadataAttributes(node3) {
@@ -61251,7 +60954,7 @@ function property(row3, budget, report) {
       "Shape data has no supported current cached typed value; original cached text is retained."
     );
   }
-  const label5 = get("Label"), format5 = get("Format"), prompt = get("Prompt"), sortKey = get("SortKey");
+  const label4 = get("Label"), format5 = get("Format"), prompt = get("Prompt"), sortKey = get("SortKey");
   const invisible = boolean(row3.cells, "Invisible", budget, report);
   const dataLinked = row3.cells.has("DataLinked") ? boolean(row3.cells, "DataLinked", budget, report) : void 0;
   const unit3 = row3.cells.get("Value")?.unit, error = row3.cells.get("Value")?.error;
@@ -61263,7 +60966,7 @@ function property(row3, budget, report) {
     ...rawType === void 0 ? {} : { rawType },
     ...rawValue === void 0 ? {} : { rawValue },
     ...value2 === void 0 ? {} : { value: value2 },
-    ...label5 === void 0 ? {} : { label: label5 },
+    ...label4 === void 0 ? {} : { label: label4 },
     ...format5 === void 0 ? {} : { format: format5 },
     ...prompt === void 0 ? {} : { prompt },
     ...sortKey === void 0 ? {} : { sortKey },
@@ -61496,9 +61199,9 @@ async function readDataRecordsets(pkg, documentPart, check3) {
     const declared = children3(children3(set, "DataColumns")[0], "DataColumn");
     const columns = (declared.length ? declared : []).map((node3) => {
       const name4 = attribute3(node3, "ColumnNameID") ?? attribute3(node3, "Name") ?? "";
-      const label5 = attribute3(node3, "Label") ?? attribute3(node3, "Name") ?? name4;
-      if (!name4 || name4.length > 255 || label5.length > 255) invalid2("Invalid data column.");
-      return { name: name4, label: label5, type: typeFromCode(attribute3(node3, "DataType")) };
+      const label4 = attribute3(node3, "Label") ?? attribute3(node3, "Name") ?? name4;
+      if (!name4 || name4.length > 255 || label4.length > 255) invalid2("Invalid data column.");
+      return { name: name4, label: label4, type: typeFromCode(attribute3(node3, "DataType")) };
     });
     if (!columns.length)
       for (const column2 of ado.columns)
@@ -71383,9 +71086,9 @@ function visioBorderShapes(style3, width, height, title = VISIO_DEFAULT_TITLE) {
 // visio/edit-page-setup-commands.ts
 var VISIO_SCALE_UNITS = Object.freeze(["IN", "FT", "MM", "CM", "M"]);
 var isVisioPageSetupEdit = (edit) => edit.type === "set-page-alt-text" || edit.type === "set-page-setup" || edit.type === "set-page-properties" || edit.type === "set-page-decoration" || edit.type === "set-page-layout" || edit.type === "set-snap-glue";
-var pageId = (value2, label5) => {
+var pageId = (value2, label4) => {
   if (typeof value2 !== "string" || !value2 || value2.length > 256)
-    fail2("INVALID_EDIT", `Invalid ${label5}.`);
+    fail2("INVALID_EDIT", `Invalid ${label4}.`);
   return value2;
 };
 var newPageId = (value2) => {
@@ -71492,11 +71195,11 @@ var VISIO_SHAPE_DATA_TYPES = [
   "date"
 ];
 var invalidText2 = /[\u0000-\u0008\u000b\u000c\u000e-\u001f￾￿]|[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/u;
-function shapeDataText(value2, label5) {
+function shapeDataText(value2, label4) {
   if (typeof value2 !== "string" || value2.length > VISIO_METADATA_TEXT_LIMIT)
-    fail2("INVALID_EDIT", `${label5} must be a string within the length limit.`);
+    fail2("INVALID_EDIT", `${label4} must be a string within the length limit.`);
   if (invalidText2.test(value2) || /[\r\n\t]/.test(value2))
-    fail2("INVALID_EDIT_TEXT", `${label5} contains invalid characters.`);
+    fail2("INVALID_EDIT_TEXT", `${label4} contains invalid characters.`);
   return value2;
 }
 function shapeDataRowName(value2) {
@@ -71504,9 +71207,9 @@ function shapeDataRowName(value2) {
     fail2("INVALID_EDIT", "Shape Data row names use letters, digits and underscores.");
   return value2;
 }
-function visioShapeDataRowName(label5, taken = []) {
+function visioShapeDataRowName(label4, taken = []) {
   const used = new Set([...taken].map((name4) => name4.toLowerCase()));
-  let base2 = label5.normalize("NFKD").replace(/[^\w]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 48);
+  let base2 = label4.normalize("NFKD").replace(/[^\w]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 48);
   if (!base2) base2 = "Property";
   if (/^\d/.test(base2)) base2 = `_${base2}`;
   let name3 = base2;
@@ -71578,15 +71281,15 @@ var TYPES3 = [
   "unlink-data-rows"
 ];
 var isVisioDataEdit = (edit) => TYPES3.includes(edit.type);
-var id = (value2, label5) => {
+var id = (value2, label4) => {
   if (typeof value2 !== "string" || !/^(0|[1-9]\d{0,9})$/.test(value2) || Number(value2) > 4294967295)
-    fail2("INVALID_EDIT", `Invalid ${label5}.`);
+    fail2("INVALID_EDIT", `Invalid ${label4}.`);
   return value2;
 };
-var name = (value2, label5) => {
-  const text8 = shapeDataText(value2, label5);
+var name = (value2, label4) => {
+  const text8 = shapeDataText(value2, label4);
   if (!text8.trim() || text8.length > 255)
-    fail2("INVALID_EDIT", `${label5} must be 1 to 255 characters.`);
+    fail2("INVALID_EDIT", `${label4} must be 1 to 255 characters.`);
   return text8;
 };
 function table2(columns, rows) {
@@ -71701,16 +71404,16 @@ function snapshotPageTheme(edit) {
 var isVisioCommentEdit = (edit) => edit.type === "add-comment" || edit.type === "edit-comment" || edit.type === "delete-comment";
 var invalidText3 = /[\u0000-\u0008\u000b\u000c\u000e-\u001f￾￿]|[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/u;
 var dateTime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,7})?(?:Z|[+-]\d{2}:\d{2})?$/;
-function string(value2, limit3, label5, required = true) {
+function string(value2, limit3, label4, required = true) {
   if (typeof value2 !== "string" || value2.length > limit3 || required && !value2.trim())
-    fail2("INVALID_EDIT", `${label5} must be a non-empty string within its length limit.`);
+    fail2("INVALID_EDIT", `${label4} must be a non-empty string within its length limit.`);
   if (invalidText3.test(value2))
-    fail2("INVALID_EDIT_TEXT", `${label5} contains invalid XML characters.`);
+    fail2("INVALID_EDIT_TEXT", `${label4} contains invalid XML characters.`);
   return value2;
 }
-var id2 = (value2, label5) => {
+var id2 = (value2, label4) => {
   if (typeof value2 !== "string" || !/^(0|[1-9]\d{0,9})$/.test(value2) || Number(value2) > 4294967295)
-    fail2("INVALID_EDIT", `${label5} must be a canonical unsigned integer.`);
+    fail2("INVALID_EDIT", `${label4} must be a canonical unsigned integer.`);
   return value2;
 };
 var date = (value2) => {
@@ -72233,7 +71936,7 @@ async function editVsdxMasterInstance(pkg, parts, pages, edit, limits, maxOutput
 
 // visio/paper-sizes.ts
 var mm = (value2) => value2 / 25.4;
-var size = (id3, label5, width, height, paperKind) => Object.freeze({ id: id3, label: label5, width, height, ...paperKind === void 0 ? {} : { paperKind } });
+var size = (id3, label4, width, height, paperKind) => Object.freeze({ id: id3, label: label4, width, height, ...paperKind === void 0 ? {} : { paperKind } });
 var VISIO_PAPER_SIZES = Object.freeze([
   size("letter", "Letter", 8.5, 11, 1),
   size("tabloid", "Tabloid", 11, 17, 3),
@@ -73603,7 +73306,7 @@ function snapshotFormatting(edit) {
       if (!Number.isInteger(value2)) fail2("INVALID_EDIT", "Paint patterns require integers.");
       result2[name3] = value2;
     }
-    for (const [name3, maximum, label5] of [
+    for (const [name3, maximum, label4] of [
       ["beginArrow", 45, "Arrowheads are numbered 0 to 45."],
       ["endArrow", 45, "Arrowheads are numbered 0 to 45."],
       ["beginArrowSize", 6, "Arrowhead sizes are numbered 0 to 6."],
@@ -73617,7 +73320,7 @@ function snapshotFormatting(edit) {
       const value2 = edit[name3];
       if (value2 === void 0) continue;
       if (typeof value2 !== "number" || !Number.isInteger(value2) || value2 < 0 || value2 > maximum)
-        fail2("INVALID_EDIT", label5);
+        fail2("INVALID_EDIT", label4);
       result2[name3] = value2;
     }
     if (edit.rounding !== void 0) result2.rounding = points(edit.rounding, 0, 720);