ooxml-core 1.14.0 → 1.16.0

package/dist/xlsx/load/index.mjs

@@ -309,7 +309,7 @@ function parseOle2(buffer, options = {}) {
       fatEntries.push(fatView.getUint32(i2 * 4, true));
     }
   }
-  function followChain(table2, start, label5, needed) {
+  function followChain(table2, start, label2, needed) {
     const ids = [];
     const visited = /* @__PURE__ */ new Set();
     let current = start;
@@ -317,26 +317,26 @@ function parseOle2(buffer, options = {}) {
       if (!strict && needed !== void 0 && ids.length >= needed)
         return ids;
       if (visited.has(current)) {
-        throw new Ole2ParseError(`Circular reference in ${label5} chain at sector ${current}`);
+        throw new Ole2ParseError(`Circular reference in ${label2} chain at sector ${current}`);
       }
       visited.add(current);
       ids.push(current);
       if (table2[current] === void 0)
-        throw new Ole2ParseError(`Missing ${label5} chain entry`);
+        throw new Ole2ParseError(`Missing ${label2} chain entry`);
       current = table2[current];
     }
     if (current !== ENDOFCHAIN) {
       if (strict || needed === void 0 || ids.length < needed) {
-        throw new Ole2ParseError(`Invalid ${label5} chain terminator`);
+        throw new Ole2ParseError(`Invalid ${label2} chain terminator`);
       }
-      warnings.push({ code: "chain-terminator", message: `Accepted ${label5} chain ending in 0x${current.toString(16)}` });
+      warnings.push({ code: "chain-terminator", message: `Accepted ${label2} chain ending in 0x${current.toString(16)}` });
     }
     return ids;
   }
-  function readMetadataChain(startSector, label5) {
+  function readMetadataChain(startSector, label2) {
     if (startSector > MAXREGSECT)
       return new Uint8Array(0);
-    const ids = followChain(fatEntries, startSector, label5 === "directory" ? "FAT" : label5);
+    const ids = followChain(fatEntries, startSector, label2 === "directory" ? "FAT" : label2);
     const result2 = new Uint8Array(ids.length * sectorSize);
     ids.forEach((id, i2) => result2.set(readSector(id), i2 * sectorSize));
     return result2;
@@ -3249,7 +3249,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, label2, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
@@ -3262,16 +3262,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(`${label2} 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(`${label2} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
 function parseXml(xml, options = {}) {
-  const label5 = options.label ?? "OOXML";
+  const label2 = 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(`${label2} XML with DTD or entity declarations is not supported`);
+  checkXmlLimits(xml, label2, options.limits);
   let parseError = "";
   let parsed;
   try {
@@ -3282,12 +3282,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 ${label2} 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 ${label2} XML: ${parseError || "missing root element"}`);
   return parsed;
 }
 var buildXml = (node2) => new XMLSerializer().serializeToString(node2);
@@ -4397,19 +4397,19 @@ var DIGITAL_SIGNATURE_ORIGIN_REL_TYPE = "http://schemas.openxmlformats.org/packa
 var MAX_ROW = 1048575;
 var MAX_COL = 16383;
 function columnLabel(col) {
-  let label5 = "";
+  let label2 = "";
   let n = col + 1;
   while (n > 0) {
     const rem = (n - 1) % 26;
-    label5 = String.fromCharCode(65 + rem) + label5;
+    label2 = String.fromCharCode(65 + rem) + label2;
     n = Math.floor((n - 1) / 26);
   }
-  return label5;
+  return label2;
 }
-function columnIndex(label5) {
-  if (!/^[A-Za-z]{1,3}$/.test(label5)) return -1;
+function columnIndex(label2) {
+  if (!/^[A-Za-z]{1,3}$/.test(label2)) return -1;
   let n = 0;
-  for (const ch of label5.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
+  for (const ch of label2.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
   return n - 1;
 }
 var formatAddress = (address2) => `${columnLabel(address2.col)}${address2.row + 1}`;
@@ -6719,11 +6719,83 @@ 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 at = pivot.valuesPosition;
+  if (typeof at === "number") return Math.min(Math.max(Math.trunc(at), 0), count2);
+  return at === "first" ? 0 : at === "between" ? Math.min(1, count2) : count2;
+}
 var pivotColumnFields = (pivot) => [
   ...pivot.columnField ? [pivot.columnField] : [],
   ...pivot.columnField ? pivot.moreColumnFields ?? [] : []
 ];
 
+// xlsx/pivot/captions.ts
+var FUNCTIONS = {
+  sum: "Sum",
+  count: "Count",
+  average: "Average",
+  max: "Max",
+  min: "Min",
+  product: "Product",
+  countNums: "Count",
+  stdDev: "StdDev",
+  stdDevp: "StdDevp",
+  var: "Var",
+  varp: "Varp"
+};
+var aggregateNames = () => Object.fromEntries(
+  Object.keys(FUNCTIONS).map((fn) => [
+    fn,
+    `${fn[0].toUpperCase()}${fn.slice(1)} of {0}`
+  ])
+);
+var ENGLISH_PIVOT_CAPTIONS = {
+  rowLabels: "Row Labels",
+  columnLabels: "Column Labels",
+  grandTotal: "Grand Total",
+  values: "Values",
+  all: "(All)",
+  blank: "(blank)",
+  subtotal: "{0} Total",
+  measureTotal: "Total {0}",
+  functions: FUNCTIONS,
+  aggregates: aggregateNames()
+};
+var fillCaption = (template, ...args) => template.replace(/\{(\d)\}/g, (_match, at) => args[Number(at)] ?? "");
+function pivotCaptions(pivot) {
+  const own = pivot.captions;
+  if (!own) return ENGLISH_PIVOT_CAPTIONS;
+  return {
+    ...ENGLISH_PIVOT_CAPTIONS,
+    ...Object.fromEntries(Object.entries(own).filter(([, value2]) => typeof value2 === "string")),
+    functions: { ...ENGLISH_PIVOT_CAPTIONS.functions, ...own.functions },
+    aggregates: { ...ENGLISH_PIVOT_CAPTIONS.aggregates, ...own.aggregates }
+  };
+}
+function trimmedCaptions(caps) {
+  const out = {};
+  for (const key of [
+    "rowLabels",
+    "columnLabels",
+    "grandTotal",
+    "values",
+    "all",
+    "blank",
+    "subtotal",
+    "measureTotal"
+  ])
+    if (caps[key] !== ENGLISH_PIVOT_CAPTIONS[key]) out[key] = caps[key];
+  for (const key of ["functions", "aggregates"]) {
+    const changed = Object.keys(caps[key]).filter(
+      (fn) => caps[key][fn] !== ENGLISH_PIVOT_CAPTIONS[key][fn]
+    );
+    if (changed.length) out[key] = Object.fromEntries(changed.map((fn) => [fn, caps[key][fn]]));
+  }
+  return Object.keys(out).length ? out : void 0;
+}
+
 // xlsx/formula/date-serial.ts
 var DAY_MS = 864e5;
 var EPOCH_19002 = Date.UTC(1899, 11, 30);
@@ -6811,7 +6883,7 @@ var LEAP_MONTHS = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 var MAX_ITEMS = 1e4;
 var pad4 = (value2, width = 2) => String(value2).padStart(width, "0");
 var dateGroupUnits = (group) => PIVOT_DATE_UNITS.filter((unit) => group.by.includes(unit));
-var dateGroupFieldName = (unit, field) => `${UNIT_TITLES[unit]} (${field})`;
+var dateGroupFieldName = (unit, field, group) => group?.localized?.[unit]?.name ?? `${UNIT_TITLES[unit]} (${field})`;
 var dateGroupDays = (group) => group.by.length === 1 && group.by[0] === "days" ? group.days ?? 1 : 1;
 function dateGroupRange(group, serials) {
   let min = Infinity;
@@ -6834,7 +6906,7 @@ var secondsOfDay = (serial) => Math.round((serial - Math.floor(serial)) * 86400)
 function dayBuckets(range, days) {
   return Math.max(1, Math.ceil((Math.floor(range.end) - Math.floor(range.start) + 1) / days));
 }
-function dateUnitLabels(unit, range, days, date1904) {
+function englishDateUnitLabels(unit, range, days, date1904) {
   const labels = [`<${isoDay(range.start, date1904)}`];
   if (unit === "seconds" || unit === "minutes")
     for (let i2 = 0; i2 < 60; i2++) labels.push(`:${pad4(i2)}`);
@@ -6863,6 +6935,11 @@ function dateUnitLabels(unit, range, days, date1904) {
   labels.push(`>${isoDay(range.end, date1904)}`);
   return labels;
 }
+function dateUnitLabels(unit, range, days, date1904, group) {
+  const english = englishDateUnitLabels(unit, range, days, date1904);
+  const localized = group?.localized?.[unit]?.labels;
+  return localized?.length === english.length ? localized : english;
+}
 function dateUnitIndex(unit, range, days, date1904, serial, count2) {
   if (serial < range.start) return 0;
   if (serial > range.end) return count2 - 1;
@@ -6886,7 +6963,7 @@ function derivedDateFields(pivot) {
   for (const group of pivot.dateGroups ?? [])
     for (const unit of dateGroupUnits(group))
       derived.push({
-        name: dateGroupFieldName(unit, group.field),
+        name: dateGroupFieldName(unit, group.field, group),
         unit,
         group,
         index: databaseFields + derived.length
@@ -6897,7 +6974,7 @@ function countDerived(pivot) {
   let count2 = 0;
   for (const group of pivot.dateGroups ?? [])
     for (const unit of dateGroupUnits(group))
-      if (pivot.fields.includes(dateGroupFieldName(unit, group.field))) count2++;
+      if (pivot.fields.includes(dateGroupFieldName(unit, group.field, group))) count2++;
   return count2;
 }
 var pivotAxisFieldNames = (pivot) => [
@@ -6917,7 +6994,7 @@ function derivedDateLabels(pivot, name) {
   if (!entry3) return void 0;
   const [group] = resolveDateGroups({ ...pivot, dateGroups: [entry3.group] });
   const range = { start: group.start, end: group.end };
-  return dateUnitLabels(entry3.unit, range, dateGroupDays(group), pivot.date1904 ?? false);
+  return dateUnitLabels(entry3.unit, range, dateGroupDays(group), pivot.date1904 ?? false, group);
 }
 function validateDateGroups(pivot) {
   const groups = pivot.dateGroups;
@@ -6933,18 +7010,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((record) => record[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 range = dateGroupRange(group, serials);
     if (range.start >= range.end) throw new Error("The date group must end after it starts.");
     for (const unit of dateGroupUnits(group)) {
-      const name = dateGroupFieldName(unit, group.field);
+      const name = dateGroupFieldName(unit, group.field, group);
       if (pivot.fields.includes(name))
         throw new Error("A source field already has the name of a date group field.");
-      if (dateUnitLabels(unit, range, dateGroupDays(group), pivot.date1904 ?? false).length > MAX_ITEMS)
+      if (dateUnitLabels(unit, range, dateGroupDays(group), pivot.date1904 ?? false, group).length > MAX_ITEMS)
         throw new Error("The date group has too many items.");
     }
   }
@@ -6958,7 +7033,7 @@ function expandDateGroups(pivot) {
   const tables = derived.map((entry3) => {
     const range = { start: entry3.group.start, end: entry3.group.end };
     const days = dateGroupDays(entry3.group);
-    const labels = dateUnitLabels(entry3.unit, range, days, date1904);
+    const labels = dateUnitLabels(entry3.unit, range, days, date1904, entry3.group);
     return {
       base: pivot.fields.indexOf(entry3.group.field),
       labels,
@@ -7081,15 +7156,13 @@ function fieldSubtotalFunctions(pivot, field) {
   if (entry3) return PIVOT_SUBTOTAL_ORDER.filter((fn) => entry3.functions.includes(fn));
   return field === pivot.rowField && pivot.subtotals === false ? [] : "auto";
 }
-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);
   }
@@ -7157,6 +7230,17 @@ function validatePivotItemFilters(pivot) {
   }
 }
 
+// xlsx/pivot/item-labels.ts
+var keyOf = (field, item) => `${field}\0${pivotValueKey(item)}`;
+function pivotItemLabeler(pivot) {
+  const blank = pivotCaptions(pivot).blank;
+  const names = pivot.itemNames?.length ? new Map(pivot.itemNames.map((entry3) => [keyOf(entry3.field, entry3.item), entry3.name])) : void 0;
+  return (field, value2) => names?.get(keyOf(field, value2)) ?? (value2 === null || value2 === "" ? blank : pivotItemLabel(value2));
+}
+var pivotItemName = (pivot, field, item) => pivot.itemNames?.find(
+  (entry3) => entry3.field === field && pivotValueKey(entry3.item) === pivotValueKey(item)
+)?.name;
+
 // xlsx/pivot/page-filter.ts
 function validatePivotPageFilter(pivot) {
   const filter2 = pivot.pageFilter;
@@ -7168,23 +7252,24 @@ function validatePivotPageFilter(pivot) {
     pivot.columnField,
     pivot.valueField,
     ...extras.map((v) => v?.field)
-  ].includes(filter2.field) || pivot.valuesAxis === "rows")
-    throw new Error("Report filters require Values on columns and a separate source field.");
+  ].includes(filter2.field))
+    throw new Error("Report filters require a separate source field.");
   if (filter2.item !== void 0 && !(filter2.item === null || typeof filter2.item === "string" || typeof filter2.item === "boolean" || typeof filter2.item === "number" && Number.isFinite(filter2.item) || isCellError(filter2.item) && isErrorCode(filter2.item.error) && Object.keys(filter2.item).length === 1))
     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(), key2 = pivotValueKey(item);
-    if (label5 === "(all)" || labels.has(label5) && labels.get(label5) !== key2)
+    const label2 = String(pivotItemLabel(item)).toLowerCase(), key2 = pivotValueKey(item);
+    if (label2 === "(all)" || labels.has(label2) && labels.get(label2) !== key2)
       throw new Error("Ambiguous report filter item captions are preserved.");
-    labels.set(label5, key2);
+    labels.set(label2, key2);
   }
   if (filter2.item === void 0) return pivot;
   const index3 = pivot.fields.indexOf(filter2.field), key = pivotValueKey(filter2.item);
@@ -7202,7 +7287,7 @@ function prependPivotPage(grid, pivot) {
     values: [
       [
         pivot.pageFilter.field,
-        pivot.pageFilter.item === void 0 ? "(All)" : pivotItemLabel(pivot.pageFilter.item),
+        pivot.pageFilter.item === void 0 ? pivotCaptions(pivot).all : pivotItemLabeler(pivot)(pivot.pageFilter.field, pivot.pageFilter.item),
         ...Array(width - 2).fill(null)
       ],
       Array(width).fill(null),
@@ -7299,13 +7384,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((name) => typeof name !== "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((name) => name === group.field)
@@ -7314,13 +7395,14 @@ 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 position = pivot.valuesPosition;
+  if (position !== void 0 && !["last", "between", "first"].includes(position) && !(typeof position === "number" && Number.isInteger(position) && position >= 0))
     throw new Error("Choose a valid Values position.");
-  if ((pivot.valuesPosition === "between" || pivot.valuesPosition === "first") && (pivot.valuesAxis !== "rows" || !pivot.secondRowField))
+  if (position !== void 0 && position !== "last" && (pivot.valuesAxis !== "rows" || position === "between" && !pivot.secondRowField || typeof position === "number" && position > 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.");
-  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== "Values")
+  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== pivotCaptions(pivot).values)
     throw new Error("This PivotTable uses unsupported Values header captions.");
   if (!Array.isArray(extras) || extras.length > 15 || extras.some(
     (measure) => !measure || !pivot.fields.includes(measure.field) || !PIVOT_AGGREGATES.includes(measure.aggregate) || typeof measure.caption !== "string" || !measure.caption.trim() || measure.caption.length > 255 || pivot.fields.some((field) => field.toLowerCase() === measure.caption.toLowerCase())
@@ -7334,314 +7416,6 @@ function validatePivotFields(pivot) {
     throw new Error("Choose valid PivotTable fields; row and column fields must differ.");
 }
 
-// xlsx/pivot/measures.ts
-var pivotMeasures = (pivot) => [
-  { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
-  ...pivot.additionalValues ?? []
-];
-var DIV0 = { error: "#DIV/0!" };
-function variance(numbers3, sample) {
-  const n = numbers3.length;
-  if (n < (sample ? 2 : 1)) return DIV0;
-  const mean2 = numbers3.reduce((total2, value2) => total2 + value2, 0) / n;
-  const squares = numbers3.reduce((total2, value2) => total2 + (value2 - mean2) ** 2, 0);
-  return squares / (sample ? n - 1 : n);
-}
-function aggregateValues(records, field, type) {
-  if (!records.length) return null;
-  const values2 = records.map((record) => record[field] ?? null);
-  if (type === "count") return values2.filter((value2) => value2 !== null && value2 !== "").length;
-  if (type === "countNums") return values2.filter((value2) => typeof value2 === "number").length;
-  const error = values2.find(isCellError);
-  if (error) return error;
-  const numbers3 = values2.filter((value2) => typeof value2 === "number");
-  if (type === "var" || type === "varp" || type === "stdDev" || type === "stdDevp") {
-    const result2 = variance(numbers3, type === "var" || type === "stdDev");
-    return typeof result2 === "number" && (type === "stdDev" || type === "stdDevp") ? Math.sqrt(result2) : result2;
-  }
-  if (!numbers3.length) return type === "average" ? DIV0 : 0;
-  if (type === "min") return numbers3.reduce((a2, b) => Math.min(a2, b));
-  if (type === "max") return numbers3.reduce((a2, b) => Math.max(a2, b));
-  if (type === "product") return numbers3.reduce((total2, value2) => total2 * value2, 1);
-  const sum3 = numbers3.reduce((total2, value2) => total2 + value2, 0);
-  return type === "average" ? sum3 / numbers3.length : sum3;
-}
-var pivotMeasureNumber = (pivot, records, measure) => aggregateValues(records, pivot.fields.indexOf(measure.field), measure.aggregate);
-var pivotNumbers = (pivot, records) => pivotMeasures(pivot).map((measure) => pivotMeasureNumber(pivot, records, measure));
-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: children2,
-    innerIndices,
-    groups,
-    details,
-    buckets,
-    width,
-    rowLabels,
-    top,
-    bottom,
-    append
-  } = context;
-  const compact = pivot.layout === "compact";
-  const tabular = !pivot.layout || pivot.layout === "tabular";
-  const blank = () => Array(width - rowLabels).fill(null);
-  pivotMeasures(pivot).forEach((measure, m) => {
-    const numbers3 = (keys, records) => [
-      ...columnItems.map(
-        (column2) => pivotMeasureNumber(
-          pivot,
-          buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-          measure
-        )
-      ),
-      pivotMeasureNumber(pivot, records, measure)
-    ];
-    if (!tabular)
-      append([measure.caption, ...Array(rowLabels - 1).fill(null)], blank(), {
-        indices: [m],
-        measure: m
-      });
-    let first2 = true;
-    rowItems.forEach((outer, outerIndex) => {
-      const key = pivotValueKey(outer);
-      const group = groups.get(key) ?? [];
-      if (!tabular)
-        append(
-          compact ? [pivotItemLabel(outer)] : [null, pivotItemLabel(outer), null],
-          top ? numbers3([key], group) : blank(),
-          { indices: [m, outerIndex], measure: m },
-          compact ? 1 : 0
-        );
-      const innerKeys = [...children2.get(key)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      innerKeys.forEach((innerKey, child4) => {
-        const innerIndex = innerIndices.get(innerKey);
-        append(
-          compact ? [pivotItemLabel(secondRowItems[innerIndex])] : [
-            tabular && first2 ? measure.caption : null,
-            pivot.repeatLabels || tabular && child4 === 0 ? pivotItemLabel(outer) : null,
-            pivotItemLabel(secondRowItems[innerIndex])
-          ],
-          numbers3([key, innerKey], details.get(JSON.stringify([key, innerKey]))),
-          { indices: [m, outerIndex, innerIndex], measure: m },
-          compact ? 2 : 0
-        );
-        first2 = false;
-      });
-      if (bottom)
-        append(
-          compact ? [`${String(pivotItemLabel(outer))} Total`] : [null, `${String(pivotItemLabel(outer))} Total`, null],
-          numbers3([key], group),
-          { indices: [m, outerIndex], measure: m, type: "default" },
-          compact ? 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 compact = layout3 === "compact";
-  const firstValues = pivot.valuesPosition === "first";
-  const between = pivot.valuesPosition === "between";
-  const measures = pivotMeasures(pivot);
-  const top = firstValues && layout3 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
-  const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact ? 1 : 3;
-  const groups = /* @__PURE__ */ new Map();
-  const details = /* @__PURE__ */ new Map();
-  const children2 = /* @__PURE__ */ new Map();
-  const innerIndices = new Map(secondRowItems.map((item, index3) => [pivotValueKey(item), index3]));
-  const buckets = /* @__PURE__ */ new Map();
-  const collect = (map, key, record) => {
-    const list = map.get(key);
-    if (list) list.push(record);
-    else map.set(key, [record]);
-  };
-  for (const record of pivot.records) {
-    const outer = pivotValueKey(record[outerField] ?? null);
-    const inner = pivotValueKey(record[innerField] ?? null);
-    collect(groups, outer, record);
-    collect(details, JSON.stringify([outer, inner]), record);
-    if (!children2.has(outer)) children2.set(outer, /* @__PURE__ */ new Set());
-    children2.get(outer).add(inner);
-    if (pivot.columnField) {
-      const column2 = pivotValueKey(record[columnField] ?? null);
-      for (const key of [[], [outer], [outer, inner]])
-        collect(buckets, JSON.stringify([...key, column2]), record);
-    }
-  }
-  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
-  const rows = (details.size + rowItems.length * Number(bottom) + 1) * measures.length + rowItems.length * Number(layout3 !== "tabular") * (firstValues ? measures.length : 1) + (firstValues ? measures.length : between ? rowItems.length * measures.length : details.size) * Number(layout3 !== "tabular") + dimensions.rows;
-  if (rows * dimensions.width > 1e6) throw new Error("The PivotTable result is too large.");
-  const labels = compact ? ["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);
-    measures.forEach(
-      (measure, m) => append(
-        type ? [
-          `${type === "grand" ? "Total" : String(labels2[0])} ${measure.caption}`,
-          ...Array(rowLabelColumns - 1).fill(null)
-        ] : compact ? [measure.caption] : [
-          ...labels2.map(
-            (label5) => layout3 === "tabular" && m === 0 || pivot.repeatLabels ? label5 : null
-          ),
-          measure.caption
-        ],
-        values3.map((band) => band[m] ?? null),
-        { indices: type ? indices : [...indices, m], measure: m, ...type ? { type } : {} },
-        compact && !type ? 2 : 0
-      )
-    );
-  };
-  if (firstValues)
-    appendFirstPivotValues(pivot, {
-      rowItems,
-      secondRowItems,
-      columnItems,
-      children: children2,
-      innerIndices,
-      groups,
-      details,
-      buckets,
-      width: dimensions.width,
-      rowLabels: rowLabelColumns,
-      top,
-      bottom,
-      append
-    });
-  else
-    rowItems.forEach((outer, outerIndex) => {
-      const key = pivotValueKey(outer);
-      if (layout3 !== "tabular")
-        append(
-          [label(outer), ...Array(rowLabelColumns - 1).fill(null)],
-          top ? numbers3([key], groups.get(key) ?? []) : Array(dimensions.width - rowLabelColumns).fill(null),
-          { indices: [outerIndex] }
-        );
-      let first2 = true;
-      const innerKeys = [...children2.get(key)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      if (between)
-        measures.forEach((measure, m) => {
-          if (layout3 !== "tabular")
-            append(
-              compact ? [measure.caption] : [pivot.repeatLabels ? label(outer) : null, measure.caption, null],
-              Array(dimensions.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, m], measure: m },
-              compact ? 1 : 0
-            );
-          innerKeys.forEach((innerKey, child4) => {
-            const innerIndex = innerIndices.get(innerKey);
-            const keys = [key, innerKey];
-            const records = details.get(JSON.stringify(keys));
-            append(
-              compact ? [label(secondRowItems[innerIndex])] : [
-                pivot.repeatLabels || layout3 === "tabular" && m === 0 && child4 === 0 ? label(outer) : null,
-                layout3 === "tabular" && child4 === 0 ? measure.caption : null,
-                label(secondRowItems[innerIndex])
-              ],
-              [
-                ...columnItems.map(
-                  (column2) => pivotMeasureNumber(
-                    pivot,
-                    buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-                    measure
-                  )
-                ),
-                pivotMeasureNumber(pivot, records, measure)
-              ],
-              { indices: [outerIndex, m, innerIndex], measure: m },
-              compact ? 2 : 0
-            );
-          });
-        });
-      else
-        innerKeys.forEach((innerKey) => {
-          const innerIndex = innerIndices.get(innerKey);
-          const inner = secondRowItems[innerIndex];
-          const keys = [key, innerKey];
-          const records = details.get(JSON.stringify(keys));
-          if (!records) return;
-          if (layout3 !== "tabular")
-            append(
-              compact ? [label(inner)] : [pivot.repeatLabels ? label(outer) : null, label(inner), null],
-              Array(dimensions.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, innerIndex] },
-              compact ? 1 : 0
-            );
-          appendMeasures(
-            [pivot.repeatLabels || first2 ? label(outer) : null, label(inner)],
-            keys,
-            records,
-            [outerIndex, innerIndex]
-          );
-          first2 = false;
-        });
-      if (bottom)
-        appendMeasures([label(outer)], [key], groups.get(key) ?? [], [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 CONTROL = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
@@ -7681,15 +7455,49 @@ function inlineFragment(xml) {
   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 },
+  ...pivot.additionalValues ?? []
+];
+var DIV0 = { error: "#DIV/0!" };
+function variance(numbers3, sample) {
+  const n = numbers3.length;
+  if (n < (sample ? 2 : 1)) return DIV0;
+  const mean2 = numbers3.reduce((total2, value2) => total2 + value2, 0) / n;
+  const squares = numbers3.reduce((total2, value2) => total2 + (value2 - mean2) ** 2, 0);
+  return squares / (sample ? n - 1 : n);
+}
+function aggregateValues(records, field, type) {
+  if (!records.length) return null;
+  const values2 = records.map((record) => record[field] ?? null);
+  if (type === "count") return values2.filter((value2) => value2 !== null && value2 !== "").length;
+  if (type === "countNums") return values2.filter((value2) => typeof value2 === "number").length;
+  const error = values2.find(isCellError);
+  if (error) return error;
+  const numbers3 = values2.filter((value2) => typeof value2 === "number");
+  if (type === "var" || type === "varp" || type === "stdDev" || type === "stdDevp") {
+    const result2 = variance(numbers3, type === "var" || type === "stdDev");
+    return typeof result2 === "number" && (type === "stdDev" || type === "stdDevp") ? Math.sqrt(result2) : result2;
+  }
+  if (!numbers3.length) return type === "average" ? DIV0 : 0;
+  if (type === "min") return numbers3.reduce((a2, b) => Math.min(a2, b));
+  if (type === "max") return numbers3.reduce((a2, b) => Math.max(a2, b));
+  if (type === "product") return numbers3.reduce((total2, value2) => total2 * value2, 1);
+  const sum3 = numbers3.reduce((total2, value2) => total2 + value2, 0);
+  return type === "average" ? sum3 / numbers3.length : sum3;
+}
+var pivotMeasureNumber = (pivot, records, measure) => aggregateValues(records, pivot.fields.indexOf(measure.field), measure.aggregate);
+
 // xlsx/pivot/columns.ts
 var SEPARATOR = "
";
-var label2 = pivotItemLabel;
 var columnKey = (keys, depth) => keys.slice(0, depth).join(SEPARATOR);
 var recordColumnKeys = (record, indices) => indices.map((index3) => pivotValueKey(record[index3] ?? null));
 function pivotColumnEntries(pivot) {
   const names = pivotColumnFields(pivot);
   const items = names.map((name) => pivotItems(pivot, name));
   const entries = [];
+  const functions = names.map((name) => fieldSubtotalFunctions(pivot, name));
   if (names.length) {
     const order = items.map(
       (list) => new Map(list.map((item, index3) => [pivotValueKey(item), index3]))
@@ -7724,7 +7532,9 @@ function pivotColumnEntries(pivot) {
         if (level === names.length - 1) entries.push({ kind: "leaf", ...entry3 });
         else {
           visit(child4[1], level + 1, here.path, here.values, here.keys);
-          entries.push({ kind: "subtotal", ...entry3 });
+          const own = functions[level];
+          if (own === "auto") entries.push({ kind: "subtotal", ...entry3 });
+          else for (const fn of own) entries.push({ kind: "subtotal", ...entry3, fn });
         }
       }
     };
@@ -7733,26 +7543,31 @@ function pivotColumnEntries(pivot) {
   entries.push({ kind: "grand", path: [], key: "", values: [] });
   return { names, items, entries };
 }
-function pivotColumnDimensions(pivot, columns, labelColumns) {
-  const measures = 1 + (pivot.additionalValues?.length ?? 0);
+function pivotColumnDimensions(pivot, columns, labelColumns, valuesOnRows = false) {
+  const measures = valuesOnRows ? 1 : 1 + (pivot.additionalValues?.length ?? 0);
   const levels = columns.names.length;
   return {
     rows: (levels ? levels + 1 + Number(measures > 1) : 1) + (pivot.pageFilter ? 2 : 0),
     width: labelColumns + (levels ? columns.entries.length : 1) * measures
   };
 }
-function pivotColumnHeaders(pivot, columns, rowLabels) {
-  const measures = pivotMeasures(pivot);
+function pivotColumnHeaders(pivot, columns, rowLabels, valuesOnRows = false) {
+  const measures = valuesOnRows ? pivotMeasures(pivot).slice(0, 1) : pivotMeasures(pivot);
   const count2 = measures.length;
   const levels = columns.names.length;
-  if (!levels) return [[...rowLabels, ...measures.map((measure) => measure.caption)]];
+  if (!levels)
+    return [
+      [...rowLabels, ...valuesOnRows ? [null] : measures.map((measure) => measure.caption)]
+    ];
   const compact = 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;
-  const titles = compact ? ["Column Labels"] : [...columns.names, ...count2 > 1 ? ["Values"] : []];
+  if (count2 === 1 && !valuesOnRows) grid[0][0] = pivot.valueCaption;
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
+  const titles = compact ? [caps.columnLabels] : [...columns.names, ...count2 > 1 ? [caps.values] : []];
   titles.forEach((title, i2) => {
     grid[0][labelColumns + i2] = title;
   });
@@ -7765,16 +7580,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][at] = label2(entry3.values[level]);
+        if (!continued) grid[1 + level][at] = labelOf(columns.names[level], entry3.values[level]);
       });
       previous = entry3.path;
       if (count2 > 1) measures.forEach((measure, m) => grid[rows - 1][at + m] = measure.caption);
       return;
     }
     const row2 = entry3.kind === "grand" ? 1 : entry3.path.length;
-    const name = entry3.kind === "grand" ? "" : String(label2(entry3.values.at(-1)));
+    const name = entry3.kind === "grand" ? "" : String(labelOf(columns.names[entry3.path.length - 1], entry3.values.at(-1)));
     measures.forEach((measure, m) => {
-      grid[row2][at + m] = count2 === 1 ? entry3.kind === "grand" ? "Grand Total" : `${name} Total` : entry3.kind === "grand" ? `Total ${measure.caption}` : `${name} ${measure.caption}`;
+      const custom = entry3.fn ? caps.functions[entry3.fn] : void 0;
+      grid[row2][at + m] = custom ? count2 === 1 ? `${name} ${custom}` : `${name} ${custom} of ${measure.field}` : count2 === 1 ? entry3.kind === "grand" ? caps.grandTotal : fillCaption(caps.subtotal, name) : entry3.kind === "grand" ? fillCaption(caps.measureTotal, measure.caption) : `${name} ${measure.caption}`;
     });
   });
   return grid;
@@ -7799,7 +7615,7 @@ function pivotColumnItemsXml(entries, measures, remap) {
       const prefix = sharedPrefix(path2, previous);
       const xs = path2.slice(prefix).map((index3) => `<x${attrs({ v: index3 || void 0 })}/>`);
       out.push(
-        `<i${attrs({ t: entry3.kind === "subtotal" ? "default" : void 0, r: prefix || void 0, i: m || void 0 })}>${xs.join("")}</i>`
+        `<i${attrs({ t: entry3.kind === "subtotal" ? entry3.fn ? PIVOT_SUBTOTALS[entry3.fn].item : "default" : void 0, r: prefix || void 0, i: m || void 0 })}>${xs.join("")}</i>`
       );
       previous = path2;
     }
@@ -7807,7 +7623,6 @@ function pivotColumnItemsXml(entries, measures, remap) {
 }
 
 // xlsx/pivot/nested.ts
-var label3 = pivotItemLabel;
 var MAX_CELLS = 1e6;
 var node = (index3, value2) => ({
   index: index3,
@@ -7819,6 +7634,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((name) => pivotItems(pivot, name));
   const itemIndices = axisItems.map(
     (items) => new Map(items.map((item, index3) => [pivotValueKey(item), index3]))
@@ -7830,125 +7649,170 @@ function nestedPivotGrid(pivot) {
   const compact = layout3 === "compact";
   const tabular = layout3 === "tabular";
   const above = !tabular && (pivot.subtotalPosition ?? "top") === "top";
-  const labelColumns = compact ? 1 : depth;
+  const labelColumns = compact ? 1 : levels;
   const measures = pivotMeasures(pivot);
+  const functions = names.map((name) => fieldSubtotalFunctions(pivot, name));
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
   const root = node(0, null);
   for (const record of pivot.records) {
     const keys = recordColumnKeys(record, columnFields);
     let current = root;
-    for (let level = -1; level < depth; level++) {
-      if (level >= 0) {
-        const value2 = record[fieldIndices[level]] ?? null;
+    for (let field = -1; field < depth; field++) {
+      if (field >= 0) {
+        const value2 = record[fieldIndices[field]] ?? null;
         const key = pivotValueKey(value2);
         let child4 = current.children.get(key);
         if (!child4) {
-          child4 = node(itemIndices[level].get(key), value2);
+          child4 = node(itemIndices[field].get(key), value2);
           current.children.set(key, child4);
         }
         current = child4;
       }
       current.records.push(record);
-      for (let width = 1; width <= keys.length; width++) {
-        const key = columnKey(keys, width);
+      for (let width2 = 1; width2 <= keys.length; width2++) {
+        const key = columnKey(keys, width2);
         const list = current.columns.get(key);
         if (list) list.push(record);
         else current.columns.set(key, [record]);
       }
     }
   }
-  const dimensions = pivotColumnDimensions(pivot, columns, labelColumns);
-  const functions = names.map((name) => fieldSubtotalFunctions(pivot, name));
-  let rows = 1;
-  const count2 = (parent, level) => {
-    for (const child4 of parent.children.values()) {
-      rows++;
-      if (level < depth - 1) {
-        const f6 = functions[level];
-        rows += f6 === "auto" ? 1 : f6.length;
-        count2(child4, level + 1);
-      }
-    }
-  };
-  count2(root, 0);
-  if ((rows + dimensions.rows) * dimensions.width > MAX_CELLS)
-    throw new Error("The PivotTable result is too large.");
-  const values2 = pivotColumnHeaders(pivot, columns, compact ? ["Row Labels"] : names);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
+  const dimensions = pivotColumnDimensions(pivot, columns, labelColumns, onRows);
+  const rowTitles = names.map((name) => name);
+  if (onRows) rowTitles.splice(valuesAt, 0, caps.values);
+  let values2 = [];
+  let indents = [];
   const rowEntries = [];
-  const blanks = () => Array(dimensions.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) => measures.map((measure) => aggregateValues(records, pivot.fields.indexOf(measure.field), fn))
-  );
-  const labelCells = (path2, shown, text2) => {
+  let counting = true;
+  let rowCount = 0;
+  const width = dimensions.width - labelColumns;
+  const blanks = () => Array(width).fill(null);
+  const cells = (group, rowFn, measure) => columns.entries.flatMap((entry3) => {
+    const records = entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [];
+    const picked = measure === void 0 ? measures : [measures[measure]];
+    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, text2) => {
     if (compact) return [text2];
-    const cells = Array(depth).fill(null);
-    path2.forEach((value2, level) => {
-      if (shown[level]) cells[level] = label3(value2);
+    const row2 = Array(levels).fill(null);
+    path2.labels.forEach((value2, at) => {
+      if (shown[at]) row2[at] = value2;
     });
-    cells[path2.length] = text2;
-    return cells;
+    row2[level] = text2;
+    return row2;
   };
-  const push = (cells, numbersOnRow, entry3, indent) => {
-    values2.push([...cells, ...numbersOnRow]);
+  const push = (indent, build2) => {
+    if (counting) {
+      if ((++rowCount + dimensions.rows) * dimensions.width > MAX_CELLS)
+        throw new Error("The PivotTable result is too large.");
+      return;
+    }
+    const [cells2, numbers3, entry3] = build2();
+    values2.push([...cells2, ...numbers3]);
     rowEntries.push(entry3);
     indents.push(compact ? indent : 0);
   };
-  const emit = (parent, level, path2, indices, firsts) => {
-    const last = level === depth - 1;
-    const own = functions[level];
-    const children2 = [...parent.children.values()].sort((a2, b) => a2.index - b.index);
+  const entryOf = (indices, measure, type) => ({
+    indices,
+    ...measure !== void 0 ? { measure } : {},
+    ...type ? { type } : {}
+  });
+  const walk = (level, group, measure, path2) => {
+    const field = 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 (field < 0) {
+      measures.forEach((one2, m) => {
+        const here = {
+          labels: [...path2.labels, one2.caption],
+          indices: [...path2.indices, m],
+          firsts: [...path2.firsts, m === 0]
+        };
+        if (last)
+          return push(level, () => [
+            labelCells(path2, leafShown(here.firsts), level, one2.caption),
+            cells(group, void 0, m),
+            entryOf(here.indices, m)
+          ]);
+        if (!tabular)
+          push(level, () => [
+            labelCells(path2, repeated, level, one2.caption),
+            blanks(),
+            entryOf(here.indices, m)
+          ]);
+        walk(level + 1, group, m, here);
+      });
+      return;
+    }
+    const own = functions[field];
+    const valuesAbove = !onRows || valuesAt < level;
+    const showsValue = above && own === "auto" && valuesAbove;
+    const children2 = [...group.children.values()].sort((a2, b) => a2.index - b.index);
     children2.forEach((child4, position) => {
-      const here = [...path2, child4.value];
-      const at = [...indices, child4.index];
-      const firstHere = [...firsts, position === 0];
-      const repeated = Array(level).fill(!!pivot.repeatLabels);
-      if (last) {
-        const shown = repeated.map(
-          (repeat, k) => repeat || tabular && firstHere.slice(k + 1).every(Boolean)
-        );
-        push(labelCells(path2, shown, label3(child4.value)), numbers3(child4), { indices: at }, level);
-        return;
-      }
+      const here = {
+        labels: [...path2.labels, labelOf(names[field], child4.value)],
+        indices: [...path2.indices, child4.index],
+        firsts: [...path2.firsts, position === 0]
+      };
+      const text2 = labelOf(names[field], child4.value);
+      if (last)
+        return push(level, () => [
+          labelCells(path2, leafShown(here.firsts), level, text2),
+          cells(child4, void 0, measure),
+          entryOf(here.indices, measure)
+        ]);
       if (!tabular)
-        push(
-          labelCells(path2, repeated, label3(child4.value)),
-          own === "auto" && above ? numbers3(child4) : blanks(),
-          { indices: at },
-          level
-        );
-      emit(child4, level + 1, here, at, firstHere);
-      const caption = String(label3(child4.value));
+        push(level, () => [
+          labelCells(path2, repeated, level, text2),
+          showsValue ? cells(child4, void 0, measure) : blanks(),
+          entryOf(here.indices, measure)
+        ]);
+      walk(level + 1, child4, measure, here);
+      if (field === depth - 1) return;
+      const caption = String(text2);
+      const subtotal = (title, fn, one2) => push(level, () => [
+        labelCells(path2, repeated, level, title),
+        cells(child4, fn, one2),
+        entryOf(here.indices, one2, fn ?? "default")
+      ]);
       if (own === "auto") {
-        if (!above)
-          push(
-            labelCells(path2, repeated, `${caption} Total`),
-            numbers3(child4),
-            { indices: at, type: "default" },
-            level
-          );
+        if (showsValue) return;
+        if (valuesAbove) subtotal(fillCaption(caps.subtotal, caption), void 0, measure);
+        else measures.forEach((one2, m) => subtotal(`${caption} ${one2.caption}`, void 0, m));
       } else
         for (const fn of own)
-          push(
-            labelCells(path2, repeated, `${caption} ${PIVOT_SUBTOTALS[fn].label}`),
-            subtotalNumbers(child4, fn),
-            { indices: at, type: fn },
-            level
-          );
+          if (valuesAbove) subtotal(`${caption} ${caps.functions[fn]}`, fn, measure);
+          else
+            measures.forEach(
+              (one2, m) => subtotal(`${caption} ${caps.functions[fn]} of ${one2.field}`, fn, m)
+            );
     });
   };
-  emit(root, 0, [], [], []);
-  push(
-    compact ? ["Grand Total"] : ["Grand Total", ...Array(depth - 1).fill(null)],
-    numbers3(root),
-    { indices: [0], type: "grand" },
-    0
-  );
+  const grand = (text2, measure) => push(0, () => [
+    compact ? [text2] : [text2, ...Array(levels - 1).fill(null)],
+    cells(root, void 0, measure),
+    entryOf([0], measure, "grand")
+  ]);
+  const build = () => {
+    walk(0, root, void 0, { labels: [], indices: [], firsts: [] });
+    if (onRows) measures.forEach((one2, m) => grand(fillCaption(caps.measureTotal, one2.caption), m));
+    else grand(caps.grandTotal);
+  };
+  build();
+  counting = false;
+  values2 = pivotColumnHeaders(pivot, columns, compact ? [caps.rowLabels] : rowTitles, onRows);
+  const firstDataRow = values2.length;
+  indents = values2.map(() => 0);
+  build();
   return {
     values: values2,
     rowItems: axisItems[0],
@@ -7960,105 +7824,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 compact = pivot.layout === "compact";
-  const headings = pivot.layout !== void 0 && pivot.layout !== "tabular";
-  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, compact ? 1 : 2);
-  const dataRows = (rowItems.length + 1) * (1 + (pivot.additionalValues?.length ?? 0)) + (headings ? rowItems.length : 0);
-  if ((dataRows + dimensions.rows) * dimensions.width > 1e6)
-    throw new Error("The PivotTable result is too large.");
-  const label5 = pivotItemLabel;
-  const values2 = pivotHeaders(pivot, columnItems, [compact ? "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 cells = /* @__PURE__ */ new Map();
-  const columns = /* @__PURE__ */ new Map();
-  const collect = (map, key, record) => {
-    const found = map.get(key);
-    if (found) found.push(record);
-    else map.set(key, [record]);
-  };
-  for (const record of pivot.records) {
-    const key = pivotValueKey(record[rowField] ?? null);
-    collect(groups, key, record);
-    if (pivot.columnField) {
-      const col = pivotValueKey(record[colField] ?? null);
-      collect(columns, col, record);
-      collect(cells, JSON.stringify([key, col]), record);
-    }
-  }
-  const firstDataRow = values2.length;
-  const measures = pivotMeasures(pivot);
-  const rowEntries = [];
-  const indents = values2.map(() => 0);
-  const append = (caption, bands, index3, grand = false) => {
-    measures.forEach((measure, m) => {
-      values2.push([
-        ...compact ? [grand ? `Total ${measure.caption}` : measure.caption] : [
-          grand ? `Total ${measure.caption}` : pivot.repeatLabels || !headings && m === 0 ? caption : null,
-          grand ? null : measure.caption
-        ],
-        ...bands.map((band) => band[m] ?? null)
-      ]);
-      indents.push(compact && !grand ? 1 : 0);
-      rowEntries.push({
-        indices: grand ? [0] : [index3, m],
-        measure: m,
-        ...grand ? { type: "grand" } : {}
-      });
-    });
-  };
-  rowItems.forEach((item, index3) => {
-    const key = pivotValueKey(item);
-    if (headings) {
-      values2.push([label5(item), ...Array(dimensions.width - 1).fill(null)]);
-      rowEntries.push({ indices: [index3] });
-      indents.push(0);
-    }
-    append(
-      label5(item),
-      [
-        ...columnItems.map(
-          (col) => pivotNumbers(pivot, cells.get(JSON.stringify([key, pivotValueKey(col)])) ?? [])
-        ),
-        pivotNumbers(pivot, groups.get(key) ?? [])
-      ],
-      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: compact ? 1 : 2,
-    indents,
-    firstHeaderRow: 1,
-    rowEntries
-  };
+  return prependPivotPage(nestedPivotGrid(pivotPageProjection(pivot)), pivot);
 }
 function pivotTableAt(sheet, at) {
   return sheet.pivotTables?.find((pivot) => rangeContains(pivot.location, at));
@@ -8068,14 +7842,14 @@ function pivotTableAt(sheet, at) {
 var X14 = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
 var LAYOUT = "http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout";
 var TABLE = {
-  pivotTableDefinition: "name cacheId dataCaption dataOnRows dataPosition updatedVersion minRefreshableVersion createdVersion applyNumberFormats applyBorderFormats applyFontFormats applyPatternFormats applyAlignmentFormats applyWidthHeightFormats useAutoFormatting itemPrintTitles indent compact compactData outline outlineData multipleFieldFilters rowGrandTotals colGrandTotals",
+  pivotTableDefinition: "name cacheId dataCaption grandTotalCaption rowHeaderCaption colHeaderCaption dataOnRows dataPosition updatedVersion minRefreshableVersion createdVersion applyNumberFormats applyBorderFormats applyFontFormats applyPatternFormats applyAlignmentFormats applyWidthHeightFormats useAutoFormatting itemPrintTitles indent compact compactData outline outlineData multipleFieldFilters rowGrandTotals colGrandTotals",
   location: "ref firstHeaderRow firstDataRow firstDataCol rowPageCount colPageCount",
   pageFields: "count",
   pageField: "fld item hier",
   pivotFields: "count",
   pivotField: "axis dataField compact outline showAll subtotalTop defaultSubtotal numFmtId sumSubtotal countASubtotal avgSubtotal maxSubtotal minSubtotal productSubtotal countSubtotal stdDevSubtotal stdDevPSubtotal varSubtotal varPSubtotal",
   items: "count",
-  item: "x t h",
+  item: "x t h n",
   rowFields: "count",
   colFields: "count",
   field: "x",
@@ -8188,6 +7962,121 @@ function assertPivotRecords(records) {
   );
 }
 
+// xlsx/pivot/captions-read.ts
+var ATTRIBUTES = {
+  rowHeaderCaption: "rowLabels",
+  colHeaderCaption: "columnLabels",
+  grandTotalCaption: "grandTotal",
+  dataCaption: "values"
+};
+function readPivotCaptionAttributes(root) {
+  const out = {};
+  for (const [attribute2, key] of Object.entries(ATTRIBUTES)) {
+    const text2 = att(root, attribute2);
+    if (text2 !== void 0)
+      out[key] = decodeEscapes(text2);
+  }
+  return out;
+}
+function aggregateCaptionsOf(pivot) {
+  const out = {};
+  for (const measure of [
+    { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
+    ...pivot.additionalValues ?? []
+  ]) {
+    const at = measure.caption.indexOf(measure.field);
+    if (at < 0 || measure.caption === measure.field) continue;
+    const template = `${measure.caption.slice(0, at)}{0}${measure.caption.slice(at + measure.field.length)}`;
+    if (template !== ENGLISH_PIVOT_CAPTIONS.aggregates[measure.aggregate])
+      out[measure.aggregate] = template;
+  }
+  return Object.keys(out).length ? out : void 0;
+}
+var MARK = "
";
+var SENTINELS = {
+  rowLabels: `${MARK}R`,
+  columnLabels: `${MARK}C`,
+  grandTotal: `${MARK}G`,
+  values: `${MARK}V`,
+  all: `${MARK}A`,
+  blank: `${MARK}B`,
+  subtotal: `{0}${MARK}S`,
+  measureTotal: `${MARK}M{0}`,
+  functions: Object.fromEntries(
+    Object.keys(ENGLISH_PIVOT_CAPTIONS.functions).map((fn) => [fn, `${MARK}F${fn}`])
+  ),
+  aggregates: ENGLISH_PIVOT_CAPTIONS.aggregates
+};
+function templateOf(cached, arg) {
+  if (!arg || !cached.includes(arg)) return void 0;
+  if (cached.startsWith(arg)) return `{0}${cached.slice(arg.length)}`;
+  if (cached.endsWith(arg)) return `${cached.slice(0, -arg.length)}{0}`;
+  const at = cached.indexOf(arg);
+  return `${cached.slice(0, at)}{0}${cached.slice(at + arg.length)}`;
+}
+function inferPivotCaptions(pivot, sheet, named2) {
+  const known = pivotCaptions({ captions: named2 });
+  const probe = { ...SENTINELS };
+  for (const key of Object.keys(named2))
+    if (typeof named2[key] === "string")
+      probe[key] = known[key];
+  const grid = pivotGrid({ ...pivot, captions: probe });
+  const found = /* @__PURE__ */ new Map();
+  const set = (key, value2) => {
+    if (value2 === void 0) return;
+    const before = found.get(key);
+    found.set(key, before === void 0 || before === value2 ? value2 : null);
+  };
+  grid.values.forEach(
+    (line2, r) => line2.forEach((expected, c2) => {
+      if (typeof expected !== "string" || !expected.includes(MARK)) return;
+      const cached = getCell(
+        sheet,
+        pivot.location.start.row + r,
+        pivot.location.start.col + c2
+      )?.value;
+      if (typeof cached !== "string") return;
+      const kind = /\u0001([RCGVASMFB])(\w*)/.exec(expected);
+      if (!kind) return;
+      const at = kind.index;
+      switch (kind[1]) {
+        case "R":
+          return set("rowLabels", cached);
+        case "C":
+          return set("columnLabels", cached);
+        case "G":
+          return set("grandTotal", cached);
+        case "V":
+          return set("values", cached);
+        case "A":
+          return set("all", cached);
+        case "B":
+          return set("blank", cached);
+        case "S":
+          return set("subtotal", templateOf(cached, expected.slice(0, at)));
+        case "M":
+          return set("measureTotal", templateOf(cached, expected.slice(at + 2)));
+        case "F": {
+          const item = expected.slice(0, at - 1);
+          const of = / of (.*)$/.exec(expected.slice(at));
+          const word = cached.slice(item.length + 1, of ? cached.length - of[0].length : void 0);
+          if (cached.startsWith(`${item} `) && (!of || cached.endsWith(of[0])))
+            set(`function:${kind[2]}`, word);
+        }
+      }
+    })
+  );
+  const out = pivotCaptions({ captions: named2 });
+  const functions = { ...out.functions };
+  for (const [key, value2] of found) {
+    if (value2 === null) continue;
+    if (key.startsWith("function:")) functions[key.slice(9)] = value2;
+    else out[key] = value2;
+  }
+  out.functions = functions;
+  return trimmedCaptions(out);
+}
+
 // xlsx/slicer/read-slicers.ts
 var TABLE_SLICER_URI = "{2F2917AC-EB37-4324-AD4E-5DD8C200BD13}";
 var X152 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
@@ -8627,7 +8516,7 @@ function readFieldGroups(fields, names) {
       throw new Error("Unsupported pivot field group");
     const labels = children(list, "s", NS.x).map((node2) => decodeEscapes(att(node2, "v") ?? ""));
     const expected = numberGroupLabels({ start, end, by });
-    if (elements(list).length !== labels.length || labels.length !== expected.length || labels.some((label5, i2) => label5 !== expected[i2]))
+    if (elements(list).length !== labels.length || labels.length !== expected.length || labels.some((label2, i2) => label2 !== expected[i2]))
       throw new Error("Unsupported pivot group items");
     groups.push({ field: names[index3] ?? "", start, end, by });
   });
@@ -8705,14 +8594,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 list) {
-      const labels = dateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
+      const labels = englishDateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
       const node2 = first(first(entry3.node, "fieldGroup", NS.x), "groupItems", NS.x);
       const actual = children(node2, "s", NS.x).map((item) => decodeEscapes(att(item, "v") ?? ""));
-      if (att(entry3.node, "name") === void 0 || decodeEscapes(att(entry3.node, "name")) !== dateGroupFieldName(entry3.unit, field) || elements(node2).length !== actual.length || actual.length !== labels.length || actual.some((label5, i2) => label5 !== labels[i2]))
+      const name = decodeEscapes(att(entry3.node, "name") ?? "");
+      if (!name || elements(node2).length !== actual.length || actual.length !== labels.length || actual.some((label2) => !label2) || new Set(actual).size !== actual.length)
         throw unsupported("group items");
+      if (name !== dateGroupFieldName(entry3.unit, field) || actual.some((l, i2) => l !== labels[i2]))
+        localized[entry3.unit] = { name, labels: actual };
     }
-    groups.push(group);
+    groups.push(Object.keys(localized).length ? { ...group, localized } : group);
   }
   return groups;
 }
@@ -8765,12 +8658,32 @@ function readItemFilters(fields, names, shared) {
   return filters.length ? filters : void 0;
 }
 
+// xlsx/pivot/item-names-read.ts
+function readItemNames(tableFields, names, shared) {
+  const out = [];
+  tableFields.forEach((field, index3) => {
+    const list = first(field, "items", NS.x);
+    if (!list || index3 >= names.length) return;
+    for (const item of children(list, "item", NS.x)) {
+      const name = att(item, "n");
+      if (name === void 0) continue;
+      const at = Number(att(item, "x"));
+      const value2 = shared[index3]?.[at];
+      if (att(item, "t") !== void 0 || !Number.isInteger(at) || value2 === void 0)
+        throw new Error("Unsupported pivot item name");
+      out.push({ field: names[index3], item: value2, name: decodeEscapes(name) });
+    }
+  });
+  return out;
+}
+
 // xlsx/pivot/values-axis.ts
 function remapPivotRowEntries(entries, axes2) {
   return entries.map(
     (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;
@@ -8789,7 +8702,7 @@ function pivotValueIndex(root, axis) {
   const position = root.getAttribute("dataPosition");
   if (position !== null && (!/^\d+$/.test(position.trim()) || Number(position) !== index3))
     throw new Error("Inconsistent Values axis position");
-  if (axis.length === 3 && index3 >= 0 && index3 < 2 && position === null)
+  if (index3 >= 0 && index3 < axis.length - 1 && position === null)
     throw new Error("Missing leading or between-field Values position");
   return index3;
 }
@@ -8804,7 +8717,7 @@ function pivotValueAxisItems(measures) {
 function supportedPivotAxes(rows, columns, measures, valuesOnRows) {
   const index3 = pivotFieldIndex;
   if (valuesOnRows)
-    return measures > 1 && (rows.length === 2 || rows.length === 3) && (index3(rows[0]) >= 0 || rows.length === 3) && rows.filter((field) => index3(field) === -2).length === 1 && rows.filter((field) => index3(field) !== -2).every((field) => index3(field) >= 0) && columns.length <= 1 && (!columns.length || index3(columns[0]) >= 0);
+    return measures > 1 && rows.length > 1 && rows.filter((field) => index3(field) === -2).length === 1 && rows.filter((field) => index3(field) !== -2).every((field) => index3(field) >= 0) && columns.every((field) => index3(field) >= 0);
   if (rows.some((field) => !Number.isInteger(index3(field)) || index3(field) < 0)) return false;
   if (measures > 1 && (!columns.length || index3(columns.at(-1)) !== -2)) return false;
   return (measures > 1 ? columns.slice(0, -1) : columns).every(
@@ -8866,6 +8779,9 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
   literals(cache2);
   literals(recordRoot);
   const cacheFields = children(first(cache2, "cacheFields", NS.x), "cacheField", NS.x);
+  const all2 = expandDateGroups(pivot).fields;
+  const derived = all2.slice(pivot.fields.length).map((name) => groupLabelsOf(pivot, name) ?? []);
+  const sharedAll = [...shared, ...derived];
   if (pivot.columnField) {
     const column2 = children(first(root, "pivotFields", NS.x), "pivotField", NS.x)[pivot.fields.indexOf(pivot.columnField)];
     const list = first(column2, "extLst", NS.x);
@@ -8884,13 +8800,13 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
     ))
       throw new Error("Repeated report column labels are preserved");
   }
-  if (integer(first(cache2, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== pivot.fields.length || integer(cache2.getAttribute("recordCount")) !== pivot.records.length || integer(recordRoot.getAttribute("count")) !== pivot.records.length)
+  if (integer(first(cache2, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== all2.length || integer(cache2.getAttribute("recordCount")) !== pivot.records.length || integer(recordRoot.getAttribute("count")) !== pivot.records.length)
     throw new Error("Inconsistent report cache counts");
   for (const name of [...pivotRowFields(pivot), pivot.columnField, pivot.pageFilter.field].filter(
     Boolean
   )) {
-    const field = pivot.fields.indexOf(name);
-    if (integer(first(cacheFields[field], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field].length)
+    const field = all2.indexOf(name);
+    if (field < pivot.fields.length && integer(first(cacheFields[field], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field].length)
       throw new Error("Inconsistent report shared-item counts");
   }
   for (const name of ["rowFields", "colFields"]) {
@@ -8900,7 +8816,7 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
   }
   const projected = pivotPageProjection(pivot), fields = children(first(root, "pivotFields", NS.x), "pivotField", NS.x);
   const axisValues = (name, axis) => {
-    const f6 = pivot.fields.indexOf(name), node2 = fields[f6], list = first(node2, "items", NS.x), items = children(list, "item", NS.x), count2 = shared[f6].length;
+    const f6 = all2.indexOf(name), node2 = fields[f6], list = first(node2, "items", NS.x), items = children(list, "item", NS.x), count2 = sharedAll[f6].length;
     if (node2.getAttribute("axis") !== axis) throw new Error("Inconsistent report axis field");
     const defaults = node2.getAttribute("defaultSubtotal") !== "0";
     if (!list || integer(list.getAttribute("count")) !== items.length || items.length !== count2 + Number(defaults))
@@ -8909,7 +8825,7 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
       const i2 = integer(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");
@@ -8924,7 +8840,10 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
   };
   const rowAxes = pivotRowFields(pivot).map((name) => axisValues(name, "axisRow")), rowItems = read("rowItems");
   const grid = pivotGrid(pivot);
-  const entries = grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, rowAxes) : [
+  const valuesAt = pivotValuesIndex(pivot);
+  const levelAxes = [...rowAxes];
+  if (valuesAt >= 0) levelAxes.splice(valuesAt, 0, null);
+  const entries = grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, levelAxes) : [
     ...rowAxes[0].map((index3) => ({ indices: [index3] })),
     { indices: [0], type: "grand" }
   ];
@@ -8934,11 +8853,11 @@ function assertPageAxisItems(root, pivot, shared, cache2, recordRoot) {
     const expected2 = entries[i2];
     const xs = children(item, "x", NS.x).map((x) => integer(x.getAttribute("v"), 0)), prefix = integer(item.getAttribute("r"), 0);
     const type = expected2.type === void 0 || expected2.type === "default" || expected2.type === "grand" ? expected2.type : PIVOT_SUBTOTALS[expected2.type].item;
-    if (item.getAttribute("t") !== (type ?? null) || !Number.isInteger(prefix) || prefix < 0 || prefix > previousRow.length || prefix >= expected2.indices.length || expected2.type === "grand" && prefix !== 0 || integer(item.getAttribute("i"), 0) !== 0 || JSON.stringify([...previousRow.slice(0, prefix), ...xs]) !== JSON.stringify(expected2.indices))
+    if (item.getAttribute("t") !== (type ?? null) || !Number.isInteger(prefix) || prefix < 0 || prefix > previousRow.length || prefix >= expected2.indices.length || expected2.type === "grand" && prefix !== 0 || integer(item.getAttribute("i"), 0) !== (expected2.measure ?? 0) || JSON.stringify([...previousRow.slice(0, prefix), ...xs]) !== JSON.stringify(expected2.indices))
       throw new Error("Unmodeled page row item");
     previousRow = expected2.type === "grand" ? [] : expected2.indices;
   });
-  const measures = 1 + (pivot.additionalValues?.length ?? 0), columns = pivot.columnField ? axisValues(pivot.columnField, "axisCol") : void 0, expected = [];
+  const measures = valuesAt >= 0 ? 1 : 1 + (pivot.additionalValues?.length ?? 0), columns = pivot.columnField ? axisValues(pivot.columnField, "axisCol") : void 0, expected = [];
   if (columns)
     for (const col of columns)
       for (let m = 0; m < measures; m++) expected.push(measures > 1 ? [col, m] : [col]);
@@ -8980,6 +8899,10 @@ function value(node2, date1904 = false) {
   if (node2.localName === "e" && isErrorCode(v)) return { error: v };
   throw new Error("Unsupported pivot cache item");
 }
+var namedAggregates = (pivot) => {
+  const aggregates = aggregateCaptionsOf(pivot);
+  return aggregates ? { aggregates } : {};
+};
 function readOne(workbook, source2, part) {
   const xml = source2.text(part);
   const root = parseXml(xml).documentElement;
@@ -9045,7 +8968,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 measure = dataFields[0];
@@ -9115,8 +9038,8 @@ function readOne(workbook, source2, part) {
   const col = columnNames[0];
   const moreColumns = columnNames.slice(1);
   const columnDefinitions = columnDefs.map((field) => tableFields[Number(att(field, "x"))]);
-  if (fieldSubtotalsOf(columnDefinitions.slice(0, -1), columnNames.slice(0, -1)).length || columnNames.some((name) => !name))
-    throw new Error("Column subtotal settings are preserved");
+  if (columnNames.some((name) => !name)) throw new Error("Invalid pivot column fields");
+  const columnSubtotals = fieldSubtotalsOf(columnDefinitions, columnNames);
   const data = names[Number(att(measure, "fld"))];
   const location = parseRange(att(first(root, "location", NS.x), "ref") ?? "");
   if (!row2 || !data || !location || hasColumn && !col || realRows.length === 2 && !second)
@@ -9126,6 +9049,7 @@ function readOne(workbook, source2, part) {
     location.start.row -= 2;
   }
   const itemFilters = readItemFilters(tableFields, names, shared);
+  const itemNames = readItemNames(tableFields, names, shared);
   const slicerCacheId = readSlicerCacheId(cache2);
   const fieldGroups = readFieldGroups(fields, names);
   const dateFields = readDateFields(fields, names);
@@ -9157,11 +9081,14 @@ function readOne(workbook, source2, part) {
   ]);
   if (dateFields.some((field) => onAxis.has(field)))
     throw new Error("Date fields used as rows, columns or values are preserved");
-  if ([...realRows, ...columnDefs].some((field) => pivotFieldIndex(field) >= databaseCount) && (pageFilter || dateFilter || itemFilters || slicerCacheId !== void 0))
-    throw new Error("Date groups with filters are preserved");
+  const fieldSubtotals = [
+    ...subtotalSettings.filter((entry4) => entry4.field !== row2 || entry4.functions.length),
+    ...columnSubtotals
+  ];
   const pivot = {
     ...pageFilter ? { pageFilter } : {},
     ...itemFilters ? { itemFilters } : {},
+    ...itemNames.length ? { itemNames } : {},
     ...fieldGroups.length ? { fieldGroups } : {},
     ...dateFields.length ? { dateFields } : {},
     ...dateGroups.length ? { dateGroups } : {},
@@ -9173,13 +9100,11 @@ function readOne(workbook, source2, part) {
     rowField: row2,
     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 !== row2 || entry4.functions.length) ? {
-      fieldSubtotals: subtotalSettings.filter(
-        (entry4) => entry4.field !== row2 || 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 },
@@ -9206,6 +9131,12 @@ function readOne(workbook, source2, part) {
     ...col ? { columnField: col } : {},
     ...moreColumns.length ? { moreColumnFields: moreColumns } : {}
   };
+  const captions = trimmedCaptions(
+    pivotCaptions({
+      captions: { ...readPivotCaptionAttributes(root), ...namedAggregates(pivot) }
+    })
+  );
+  if (captions) pivot.captions = captions;
   if (pageFilter && moreColumns.length) throw new Error("Report filters support one column field");
   assertPageAxisItems(root, pivot, shared, cache2, recordRoot);
   return pivot;
@@ -9233,6 +9164,12 @@ function readPivotTables(workbook, source2, warn, slicers) {
           if (slicers.blocked.has(pivotKey(sheet.sheetId, name)) || cache2 && (caches2.get(cache2) ?? 0) > 1)
             throw new Error("Shared pivot cache or unsupported slicer connection");
           const pivot = readOne(workbook, source2, part);
+          const inferred = inferPivotCaptions(pivot, sheet, {
+            ...readPivotCaptionAttributes(parseXml(pivot.sourceXml).documentElement),
+            ...namedAggregates(pivot)
+          });
+          if (inferred) pivot.captions = inferred;
+          else delete pivot.captions;
           const grid = pivotGrid(pivot);
           if (grid.values.length !== pivot.location.end.row - pivot.location.start.row + 1 || grid.values[0].length !== pivot.location.end.col - pivot.location.start.col + 1 || grid.values.some(
             (line2, r) => line2.some(
@@ -9993,7 +9930,7 @@ function mergeSpacedAreas(tokens2) {
   }
   return out;
 }
-function templateOf(formula) {
+function templateOf2(formula) {
   const cached = templates.get(formula);
   if (cached !== void 0) return cached;
   const raw2 = safeTokens(formula);
@@ -10023,7 +9960,7 @@ function templateOf(formula) {
   return template;
 }
 function rewriteTemplate(formula, rewrite2) {
-  const template = templateOf(formula);
+  const template = templateOf2(formula);
   if (!template) return formula;
   let next;
   for (let i2 = 0; i2 < template.length; i2++) {
@@ -10605,8 +10542,8 @@ function parseDiagramDataModel(source2, part) {
           "CONNECTION_ENDPOINT_MISSING",
           `dgm:cxn ${attribute2} references missing point: ${id}.`
         );
-    const label5 = connectionLabel(connection, transitionText);
-    connections.push(label5 ? { ...connection, label: label5 } : connection);
+    const label2 = connectionLabel(connection, transitionText);
+    connections.push(label2 ? { ...connection, label: label2 } : connection);
     if ((!connection.type || connection.type === "parOf") && !parentById.has(connection.destId))
       parentById.set(connection.destId, connection.sourceId);
   }
@@ -10645,14 +10582,14 @@ function colorList(container2) {
 }
 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((label2) => ({
+    name: stringAttribute(label2, "name") ?? "",
+    fill: colorList(first(label2, "fillClrLst", NS.dgm)),
+    line: colorList(first(label2, "linClrLst", NS.dgm)),
+    effect: colorList(first(label2, "effectClrLst", NS.dgm)),
+    textLine: colorList(first(label2, "txLinClrLst", NS.dgm)),
+    textFill: colorList(first(label2, "txFillClrLst", NS.dgm)),
+    textEffect: colorList(first(label2, "txEffectClrLst", NS.dgm))
   }));
   return { ...parseDefinitionHeader(root), labels };
 }
@@ -10685,16 +10622,16 @@ function parseStyleReferences(style2) {
 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((label2) => ({
+    name: stringAttribute(label2, "name") ?? "",
+    ...parseStyleReferences(first(label2, "style", NS.dgm)),
+    hasScene3d: Boolean(first(label2, "scene3d", NS.dgm)),
+    hasShape3d: hasContent(first(label2, "sp3d", NS.dgm))
   }));
   return {
     ...parseDefinitionHeader(root),
     labels,
-    has3d: labels.some((label5) => label5.hasShape3d)
+    has3d: labels.some((label2) => label2.hasShape3d)
   };
 }
 function parseDiagramLayoutSummary(source2) {
@@ -12371,10 +12308,10 @@ function parseDisplayUnits(context, element2) {
   if (!element2) return void 0;
   reportUnmodelled(context, element2, DISPLAY_UNITS);
   const labelElement = cChild(element2, "dispUnitsLbl");
-  let label5;
+  let label2;
   if (labelElement) {
     reportUnmodelled(context, labelElement, DISPLAY_UNITS_LABEL);
-    label5 = assignDefined(
+    label2 = assignDefined(
       {},
       {
         layout: manualLayout(labelElement),
@@ -12389,7 +12326,7 @@ function parseDisplayUnits(context, element2) {
     {
       builtInUnit: cVal(element2, "builtInUnit"),
       customUnit: cNumber(context, element2, "custUnit"),
-      label: label5,
+      label: label2,
       extLst: extensionList(element2)
     }
   );
@@ -13985,8 +13922,8 @@ function parseTable(xml, partName) {
       if (id !== void 0 && Number.isInteger(id) && id >= 0) column2.sourceId = id;
       const fn = att(node2, "totalsRowFunction");
       if (fn && fn !== "none") column2.totalsRowFunction = fn;
-      const label5 = att(node2, "totalsRowLabel");
-      if (label5 !== void 0) column2.totalsRowLabel = label5;
+      const label2 = att(node2, "totalsRowLabel");
+      if (label2 !== void 0) column2.totalsRowLabel = label2;
       const calculated = xFirst(node2, "calculatedColumnFormula");
       if (calculated) column2.calculatedColumnFormula = stripFuturePrefixes(xText(calculated));
       return column2;
@@ -14870,10 +14807,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, label2) {
   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", label2.index) + valXml("delete", label2.deleted) + layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + labelOptionsXml(context, label2) + raw(context, label2.extLst)
   );
 }
 function dataLabelsXml(context, labels) {
@@ -14881,7 +14818,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((label2) => labelXml(context, label2)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
   );
 }
 
@@ -14902,12 +14839,12 @@ function dataTableXml(context, table2) {
 }
 function displayUnitsXml(context, units) {
   if (!units) return "";
-  const label5 = units.label;
+  const label2 = units.label;
   return elementXml(
     "dispUnits",
-    valXml("custUnit", units.customUnit) + (units.customUnit === void 0 ? valXml("builtInUnit", units.builtInUnit) : "") + (label5 ? elementXml(
+    valXml("custUnit", units.customUnit) + (units.customUnit === void 0 ? valXml("builtInUnit", units.builtInUnit) : "") + (label2 ? elementXml(
       "dispUnitsLbl",
-      layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr)
+      layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr)
     ) : "") + raw(context, units.extLst)
   );
 }
@@ -14932,11 +14869,11 @@ function axisXml(context, axis) {
 }
 
 // chart/write-analysis.ts
-function trendlineLabelXml(context, label5) {
-  if (!label5) return "";
+function trendlineLabelXml(context, label2) {
+  if (!label2) 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, label2.layout) + chartTextXml(context, label2.tx, false) + numberFormatXml(label2.numberFormat) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr) + raw(context, label2.extLst)
   );
 }
 function trendlineXml(context, trendline) {
@@ -16953,14 +16890,14 @@ function unique(args, ctx) {
   const byCol = args.length > 1 && args[1] !== null && toBool(ctx.toScalar(args[1] ?? null));
   const once = args.length > 2 && args[2] !== null && toBool(ctx.toScalar(args[2] ?? null));
   if (byCol) m = transpose(m);
-  const keyOf2 = (row2) => JSON.stringify(
+  const keyOf3 = (row2) => JSON.stringify(
     row2.map(
       (v) => isError(v) ? `#${v.error}` : typeof v === "string" ? `s${v.toLowerCase()}` : v
     )
   );
   const counts = /* @__PURE__ */ new Map();
   for (const row2 of m.data) {
-    const key = keyOf2(row2);
+    const key = keyOf3(row2);
     const entry3 = counts.get(key);
     if (entry3) entry3.count++;
     else counts.set(key, { row: row2, count: 1 });
@@ -17245,11 +17182,11 @@ function gammaLn(z) {
 
 // xlsx/formula/functions/database.ts
 var C3 = "Database";
-var label4 = (value2) => value2 === null ? "" : typeof value2 === "string" ? value2 : String(value2);
+var label = (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) => label(v).toLowerCase()), records };
 }
 function fieldIndex(table2, field) {
   const value2 = scalar2(field);
@@ -17259,7 +17196,7 @@ function fieldIndex(table2, field) {
     if (index4 < 0 || index4 >= table2.headers.length) fail(ERR.VALUE);
     return index4;
   }
-  const index3 = table2.headers.indexOf(label4(value2).toLowerCase());
+  const index3 = table2.headers.indexOf(label(value2).toLowerCase());
   if (index3 < 0) fail(ERR.VALUE);
   return index3;
 }
@@ -17268,7 +17205,7 @@ function recordFilter(table2, criteria) {
   if (!head || rows.length === 0) fail(ERR.VALUE);
   const columns = head.map((name) => {
     if (name === null || name === "") return -1;
-    return table2.headers.indexOf(label4(name).toLowerCase());
+    return table2.headers.indexOf(label(name).toLowerCase());
   });
   const alternatives = rows.map(
     (row2) => row2.flatMap((cell, c2) => {
@@ -24483,7 +24420,7 @@ function headerMode(args, i2, ctx, firstRow) {
   if (mode === 1 || mode === 3) return true;
   return fail(ERR.VALUE);
 }
-var keyOf = (values2) => JSON.stringify(values2);
+var keyOf2 = (values2) => JSON.stringify(values2);
 var plain2 = (v) => v === void 0 || isError(v) ? null : v;
 function compareBy(keys, rows) {
   return (a2, b) => {
@@ -24523,7 +24460,7 @@ function groupby(args, ctx) {
   if (rows.length === 0) fail(ERR.CALC);
   const groups = /* @__PURE__ */ new Map();
   for (const r of rows) {
-    const key = keyOf(keysM.data[r]);
+    const key = keyOf2(keysM.data[r]);
     const found = groups.get(key);
     if (found) found.push(r);
     else groups.set(key, [r]);
@@ -24590,8 +24527,8 @@ function pivotby(args, ctx) {
   const colKeys = /* @__PURE__ */ new Map();
   for (const r of used) {
     for (const [map, key] of [
-      [rowKeys, keyOf(rowsM.data[r])],
-      [colKeys, keyOf(colsM.data[r])]
+      [rowKeys, keyOf2(rowsM.data[r])],
+      [colKeys, keyOf2(colsM.data[r])]
     ]) {
       const found = map.get(key);
       if (found) found.push(r);
@@ -27389,15 +27326,15 @@ function derivedFields(pivot, date1904) {
 function derivedFieldXml(pivot, entry3, date1904) {
   const range = { start: entry3.group.start, end: entry3.group.end };
   const days = dateGroupDays(entry3.group);
-  const labels = dateUnitLabels(entry3.unit, range, days, date1904);
+  const labels = dateUnitLabels(entry3.unit, range, days, date1904, entry3.group);
   const base = pivot.fields.indexOf(entry3.group.field);
-  return `<cacheField${attrs({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base}"><rangePr${attrs({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range.start, date1904), endDate: serialToIso(range.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${attrs({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base}"><rangePr${attrs({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range.start, date1904), endDate: serialToIso(range.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
 }
 function groupXml2(pivot, name, index3) {
   const group = groupOf(pivot, name);
   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((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup>`;
 }
 function slicerExt(pivot) {
   if (pivot.slicerCacheId === void 0) return "";
@@ -27418,8 +27355,6 @@ function pivotTableXml(source2, cacheId, cache2) {
   const pivot = expandDateGroups(source2);
   const rowNames = pivotRowFields(pivot);
   const rowIdx = rowNames.map((name) => pivot.fields.indexOf(name));
-  const row2 = 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);
@@ -27447,7 +27382,10 @@ function pivotTableXml(source2, cacheId, cache2) {
   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 measures = pivotMeasures(pivot);
@@ -27456,13 +27394,17 @@ function pivotTableXml(source2, cacheId, cache2) {
   const compact = pivot.layout === "compact";
   const outline = pivot.layout === "compact" || pivot.layout === "outline";
   const top = (pivot.subtotalPosition ?? (outline ? "top" : "bottom")) === "top";
+  const named2 = (field, item) => {
+    const text2 = pivotItemName(pivot, field, item);
+    return text2 === void 0 ? "" : attrs({ n: encodeEscapes(text2) });
+  };
   const fields = pivot.fields.map((name, index3) => {
     const isDate = pivot.dateFields?.includes(name) ?? false;
     const at = rowIdx.indexOf(index3);
     const colAt = columnIdx.indexOf(index3);
     const items2 = index3 === page ? pageItems : at >= 0 ? rowItemsFull[at] : colAt >= 0 ? columnItemsFull[colAt] : groupLabelsOf(pivot, name) ?? (filtered2.has(name) || isDate ? pivotItems(pivot, name) : void 0);
     const hidden = hiddenItemKeys(pivot, name);
-    const functions = at >= 0 ? fieldSubtotalFunctions(pivot, name) : "auto";
+    const functions = at >= 0 || colAt >= 0 ? fieldSubtotalFunctions(pivot, name) : "auto";
     const automatic = functions === "auto";
     const custom = automatic ? [] : functions;
     const repeated = pivot.repeatLabels && at >= 0 ? `<extLst><ext uri="{2946ED86-A175-432a-8AC1-64E0C546D7DE}"><x14:pivotField xmlns:x14="${X143}" fillDownLabels="1"/></ext></extLst>` : "";
@@ -27470,37 +27412,27 @@ function pivotTableXml(source2, cacheId, cache2) {
       custom.map((fn) => [PIVOT_SUBTOTALS[fn].attr, true])
     );
     const entries = automatic ? '<item t="default"/>' : custom.map((fn) => `<item t="${PIVOT_SUBTOTALS[fn].item}"/>`).join("");
-    return `<pivotField${attrs({ axis: index3 === page ? "axisPage" : at >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures.some((measure) => pivot.fields.indexOf(measure.field) === index3) ? true : void 0, compact, outline, showAll: false, subtotalTop: at >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""} x="${itemX(index3, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
+    return `<pivotField${attrs({ axis: index3 === page ? "axisPage" : at >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures.some((measure) => pivot.fields.indexOf(measure.field) === index3) ? true : void 0, compact, outline, showAll: false, subtotalTop: at >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""}${named2(name, item)} x="${itemX(index3, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
   }).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, row2, second] : rowsAxis && pivot.valuesPosition === "between" ? [row2, -2, second] : [...rowIdx, ...rowsAxis ? [-2] : []];
+  const rowIndices = [...rowIdx];
+  if (valuesAt >= 0) rowIndices.splice(valuesAt, 0, -2);
   let previous = [];
   const rowItems = rowEntries?.map((entry3) => {
     let prefix = 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") prefix = 1;
-      else if (!entry3.type)
-        while (prefix < entry3.indices.length - 1 && entry3.indices[prefix] === previous[prefix])
-          prefix++;
-      previous = entry3.type && !(entry3.type === "default" && pivot.valuesPosition === "first") ? [] : entry3.indices;
-    } else {
-      if (entry3.type !== "grand") prefix = sharedPrefix(entry3.indices, previous);
-      previous = entry3.type === "grand" ? [] : entry3.indices;
-    }
+    if (entry3.type !== "grand") prefix = sharedPrefix(entry3.indices, previous);
+    previous = entry3.type === "grand" ? [] : entry3.indices;
     return `<i${attrs({ t: type, r: prefix || void 0, i: entry3.measure || void 0 })}>${entry3.indices.slice(prefix).map((index3) => `<x${attrs({ v: index3 || void 0 })}/>`).join("")}</i>`;
   }).join("") ?? items(grid.rowItems.length, rowIndicesFull[0]);
   let body = `<location${attrs({ 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, measures.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 : measures.length, (level, index3) => columnIndicesFull[level][index3])}`;
   } else if (multiple && !rowsAxis)
     body += `<colFields count="1"><field x="-2"/></colFields>${pivotValueAxisItems(measures.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${attrs({ 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="${measures.length}">${measures.map((measure) => `<dataField${attrs({ name: encodeEscapes(measure.caption), fld: pivot.fields.indexOf(measure.field), subtotal: measure.aggregate, baseField: 0, baseItem: 0 })}/>`).join("")}</dataFields>`;
@@ -27510,9 +27442,17 @@ function pivotTableXml(source2, cacheId, cache2) {
   const root = doc.documentElement;
   root.setAttribute("name", pivot.name);
   root.setAttribute("cacheId", String(cacheId));
+  const caps = pivotCaptions(pivot);
+  root.setAttribute("dataCaption", caps.values);
+  for (const [attribute2, key] of [
+    ["rowHeaderCaption", "rowLabels"],
+    ["colHeaderCaption", "columnLabels"],
+    ["grandTotalCaption", "grandTotal"]
+  ])
+    if (caps[key] !== ENGLISH_PIVOT_CAPTIONS[key] || root.hasAttribute(attribute2))
+      root.setAttribute(attribute2, caps[key]);
   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", compact ? "1" : "0");
   root.setAttribute("compactData", compact ? "1" : "0");
@@ -27578,7 +27518,8 @@ function pivotTableXml(source2, cacheId, cache2) {
 }
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  return `<filters count="1"><filter${attrs({ 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 id = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id, 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
@@ -30316,9 +30257,9 @@ function parseSheet(bound, records, start, globals) {
       default: {
         if (opcode === 157)
           hasAutoFilter = true;
-        const label5 = UNSUPPORTED[opcode];
-        if (label5)
-          addUnique(sheet.unsupported, label5);
+        const label2 = UNSUPPORTED[opcode];
+        if (label2)
+          addUnique(sheet.unsupported, label2);
       }
     }
   }