ooxml-core 1.9.0 → 1.10.0

package/dist/xlsx/load/index.mjs

@@ -6451,25 +6451,198 @@ function validatePivotFields(pivot) {
     ...pivot.columnField ? [pivot.columnField] : [],
     pivot.valueField
   ];
+  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))
+    throw new Error("Choose a valid Values position.");
+  if ((pivot.valuesPosition === "between" || pivot.valuesPosition === "first") && (pivot.valuesAxis !== "rows" || !pivot.secondRowField))
+    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")
+    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())
+  ) || new Set(
+    [pivot.valueCaption, ...extras.map((measure) => measure.caption)].map(
+      (caption) => caption?.toLowerCase()
+    )
+  ).size !== extras.length + 1)
+    throw new Error("Choose PivotTable value fields with valid aggregates and unique captions.");
   if (pivot.layout !== void 0 && !["tabular", "compact", "outline"].includes(pivot.layout) || pivot.subtotalPosition !== void 0 && !["top", "bottom"].includes(pivot.subtotalPosition) || !PIVOT_AGGREGATES.includes(pivot.aggregate) || used.some((field) => !pivot.fields.includes(field)) || new Set([pivot.rowField, pivot.secondRowField, pivot.columnField].filter(Boolean)).size !== [pivot.rowField, pivot.secondRowField, pivot.columnField].filter(Boolean).length || pivot.subtotals !== void 0 && typeof pivot.subtotals !== "boolean" || pivot.repeatLabels !== void 0 && typeof pivot.repeatLabels !== "boolean")
     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 ?? []
+];
+function aggregate(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;
+  const error = values2.find(isCellError);
+  if (error) return error;
+  const numbers3 = values2.filter((value2) => typeof value2 === "number");
+  if (!numbers3.length) return type === "average" ? { error: "#DIV/0!" } : 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));
+  const sum2 = numbers3.reduce((total2, value2) => total2 + value2, 0);
+  return type === "average" ? sum2 / numbers3.length : sum2;
+}
+var pivotMeasureNumber = (pivot, records, measure) => aggregate(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) {
+  const measures = 1 + (pivot.additionalValues?.length ?? 0);
+  if (pivot.valuesAxis === "rows")
+    return {
+      rows: pivot.columnField ? 2 : 1,
+      width: rowLabels + (pivot.columnField ? columnItems + 1 : 1)
+    };
+  return {
+    rows: pivot.columnField ? measures > 1 ? 3 : 2 : 1,
+    width: rowLabels + (pivot.columnField ? measures === 1 ? Math.max(1, columnItems) + 1 : (columnItems + 1) * measures : measures)
+  };
+}
+function pivotHeaders(pivot, columns, labels, label3) {
+  const measures = pivotMeasures(pivot);
+  if (pivot.valuesAxis === "rows") {
+    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(label3), "Grand Total"]
+    ] : [[...rowLabels, null]];
+  }
+  if (!pivot.columnField) return [[...labels, ...measures.map((measure) => measure.caption)]];
+  if (measures.length === 1)
+    return [
+      [
+        pivot.valueCaption,
+        ...labels.slice(1).map(() => null),
+        pivot.layout === "compact" ? "Column Labels" : pivot.columnField,
+        ...columns.slice(1).map(() => null),
+        null
+      ],
+      [...labels, ...columns.map(label3), "Grand Total"]
+    ];
+  const { width } = pivotHeaderDimensions(pivot, columns.length, labels.length);
+  const first2 = Array(width).fill(null);
+  first2[labels.length] = pivot.layout === "compact" ? "Column Labels" : pivot.columnField;
+  if (pivot.layout !== "compact") first2[labels.length + 1] = "Values";
+  return [
+    first2,
+    [
+      ...labels.map(() => null),
+      ...columns.flatMap((column) => [label3(column), ...measures.slice(1).map(() => null)]),
+      ...measures.map((measure) => `Total ${measure.caption}`)
+    ],
+    [
+      ...labels,
+      ...columns.flatMap(() => measures.map((measure) => measure.caption)),
+      ...measures.map(() => 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(
+        (column) => pivotMeasureNumber(
+          pivot,
+          buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [],
+          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, aggregate3) {
+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 valueField = pivot.fields.indexOf(pivot.valueField);
   const layout3 = pivot.layout ?? "tabular";
   const compact = layout3 === "compact";
-  const top = layout3 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
+  const rowsAxis = pivot.valuesAxis === "rows";
+  const firstValues = rowsAxis && pivot.valuesPosition === "first";
+  const between = rowsAxis && pivot.valuesPosition === "between";
+  const measures = pivotMeasures(pivot);
+  const top = (!rowsAxis || firstValues) && layout3 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
   const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact ? 1 : 2;
+  const rowLabelColumns = compact ? 1 : rowsAxis ? 3 : 2;
   const groups = /* @__PURE__ */ new Map();
   const details = /* @__PURE__ */ new Map();
   const children2 = /* @__PURE__ */ new Map();
@@ -6493,20 +6666,12 @@ function hierarchicalPivotGrid(pivot, aggregate3) {
         collect(buckets, JSON.stringify([...key, column]), record);
     }
   }
-  const rows = details.size + rowItems.length * (Number(layout3 !== "tabular") + Number(bottom)) + 3;
-  if (rows * (columnItems.length + 3) > 1e6)
-    throw new Error("The PivotTable result is too large.");
+  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
+  const rows = (details.size + rowItems.length * Number(bottom) + 1) * (rowsAxis ? measures.length : 1) + rowItems.length * Number(layout3 !== "tabular") * (firstValues ? measures.length : 1) + (firstValues ? measures.length : between ? rowItems.length * measures.length : details.size) * Number(rowsAxis && 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 = pivot.columnField ? [
-    [
-      pivot.valueCaption,
-      ...compact ? [] : [null],
-      compact ? "Column Labels" : pivot.columnField,
-      ...columnItems.slice(1).map(() => null),
-      null
-    ],
-    [...labels, ...columnItems.map(label), "Grand Total"]
-  ] : [[...labels, pivot.valueCaption]];
+  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) => {
@@ -6514,91 +6679,184 @@ function hierarchicalPivotGrid(pivot, aggregate3) {
     rowEntries.push(entry3);
     indents.push(indent);
   };
-  const numbers3 = (keys, records) => [
+  const bands = (keys, records) => [
     ...columnItems.map(
-      (column) => aggregate3(
-        buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [],
-        valueField,
-        pivot.aggregate
-      )
+      (column) => pivotNumbers(pivot, buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [])
     ),
-    aggregate3(records, valueField, pivot.aggregate)
+    pivotNumbers(pivot, records)
   ];
-  rowItems.forEach((outer, outerIndex) => {
-    const key = pivotValueKey(outer);
-    if (layout3 !== "tabular")
-      append(
-        [label(outer), ...compact ? [] : [null]],
-        top ? numbers3([key], groups.get(key) ?? []) : Array(columnItems.length + 1).fill(null),
-        { indices: [outerIndex] }
-      );
-    let first2 = true;
-    [...children2.get(key)].sort((a2, b) => innerIndices.get(a2) - innerIndices.get(b)).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;
-      append(
-        compact ? [label(inner)] : [
-          pivot.repeatLabels || layout3 === "tabular" && first2 ? label(outer) : null,
-          label(inner)
+  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(
+            (label3) => layout3 === "tabular" && m === 0 || pivot.repeatLabels ? label3 : null
+          ),
+          measure.caption
         ],
-        numbers3(keys, records),
-        { indices: [outerIndex, innerIndex] },
-        compact ? 1 : 0
-      );
-      first2 = false;
+        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
     });
-    if (bottom) {
-      const caption = String(label(outer));
-      append(
-        [`${caption} Total`, ...compact ? [] : [null]],
-        numbers3([key], groups.get(key) ?? []),
-        { indices: [outerIndex], type: "default" }
+  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)
       );
-    }
-  });
-  append(["Grand Total", ...compact ? [] : [null]], numbers3([], pivot.records), {
-    indices: [0],
-    type: "grand"
-  });
+      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(
+                  (column) => pivotMeasureNumber(
+                    pivot,
+                    buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [],
+                    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 (rowsAxis) {
+            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;
+            return;
+          }
+          append(
+            compact ? [label(inner)] : [
+              pivot.repeatLabels || layout3 === "tabular" && first2 ? label(outer) : null,
+              label(inner)
+            ],
+            numbers3(keys, records),
+            { indices: [outerIndex, innerIndex] },
+            compact ? 1 : 0
+          );
+          first2 = false;
+        });
+      if (bottom) {
+        if (rowsAxis) {
+          appendMeasures([label(outer)], [key], groups.get(key) ?? [], [outerIndex], "default");
+          return;
+        }
+        const caption = String(label(outer));
+        append(
+          [`${caption} Total`, ...compact ? [] : [null]],
+          numbers3([key], groups.get(key) ?? []),
+          { indices: [outerIndex], type: "default" }
+        );
+      }
+    });
+  if (rowsAxis) appendMeasures([], [], pivot.records, [0], "grand");
+  else
+    append(["Grand Total", ...compact ? [] : [null]], numbers3([], pivot.records), {
+      indices: [0],
+      type: "grand"
+    });
   return {
     values: values2,
     rowItems,
     secondRowItems,
     columnItems,
     rowEntries,
-    firstDataRow: pivot.columnField ? 2 : 1,
+    firstDataRow,
     rowLabelColumns,
-    indents
+    indents,
+    ...rowsAxis ? { firstHeaderRow: 1 } : {}
   };
 }
 
 // xlsx/pivot/aggregate.ts
-function aggregate(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;
-  const error = values2.find(isCellError);
-  if (error) return error;
-  const numbers3 = values2.filter((value2) => typeof value2 === "number");
-  if (!numbers3.length) return type === "average" ? { error: "#DIV/0!" } : 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));
-  const sum2 = numbers3.reduce((total2, value2) => total2 + value2, 0);
-  return type === "average" ? sum2 / numbers3.length : sum2;
-}
 function pivotGrid(pivot) {
   validatePivotFields(pivot);
-  if (pivot.secondRowField) return hierarchicalPivotGrid(pivot, aggregate);
+  if (pivot.secondRowField) return hierarchicalPivotGrid(pivot);
   const rowItems = pivotItems(pivot, pivot.rowField);
   const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  if ((rowItems.length + 3) * (columnItems.length + 2) > 1e6)
+  const rowsAxis = pivot.valuesAxis === "rows";
+  const compact = pivot.layout === "compact";
+  const headings = rowsAxis && pivot.layout !== void 0 && pivot.layout !== "tabular";
+  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowsAxis && !compact ? 2 : 1);
+  const dataRows = (rowItems.length + 1) * (rowsAxis ? 1 + (pivot.additionalValues?.length ?? 0) : 1) + (headings ? rowItems.length : 0);
+  if ((dataRows + dimensions.rows) * dimensions.width > 1e6)
     throw new Error("The PivotTable result is too large.");
+  const label3 = pivotItemLabel;
+  const values2 = pivotHeaders(
+    pivot,
+    columnItems,
+    [pivot.layout === "compact" ? "Row Labels" : pivot.rowField],
+    label3
+  );
   const rowField = pivot.fields.indexOf(pivot.rowField);
   const colField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const valueField = pivot.fields.indexOf(pivot.valueField);
   const groups = /* @__PURE__ */ new Map();
   const cells = /* @__PURE__ */ new Map();
   const columns = /* @__PURE__ */ new Map();
@@ -6616,49 +6874,92 @@ function pivotGrid(pivot) {
       collect(cells, JSON.stringify([key, col]), record);
     }
   }
-  const label3 = pivotItemLabel;
-  const values2 = pivot.columnField ? [
-    [
-      pivot.valueCaption,
-      pivot.layout === "compact" ? "Column Labels" : pivot.columnField,
-      ...columnItems.slice(1).map(() => null),
-      null
-    ],
-    [
-      pivot.layout === "compact" ? "Row Labels" : pivot.rowField,
-      ...columnItems.map(label3),
-      "Grand Total"
-    ]
-  ] : [[pivot.layout === "compact" ? "Row Labels" : pivot.rowField, pivot.valueCaption]];
+  const firstDataRow = values2.length;
+  if (rowsAxis) {
+    const measures = pivotMeasures(pivot);
+    const rowEntries = [];
+    const indents = values2.map(() => 0);
+    const append = (caption, bands, index2, 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] : [index2, m],
+          measure: m,
+          ...grand ? { type: "grand" } : {}
+        });
+      });
+    };
+    rowItems.forEach((item, index2) => {
+      const key = pivotValueKey(item);
+      if (headings) {
+        values2.push([label3(item), ...Array(dimensions.width - 1).fill(null)]);
+        rowEntries.push({ indices: [index2] });
+        indents.push(0);
+      }
+      append(
+        label3(item),
+        [
+          ...columnItems.map(
+            (col) => pivotNumbers(pivot, cells.get(JSON.stringify([key, pivotValueKey(col)])) ?? [])
+          ),
+          pivotNumbers(pivot, groups.get(key) ?? [])
+        ],
+        index2
+      );
+    });
+    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
+    };
+  }
   for (const row2 of rowItems) {
     const records = groups.get(pivotValueKey(row2)) ?? [];
     values2.push([
       label3(row2),
-      ...columnItems.map(
-        (col) => aggregate(
-          cells.get(JSON.stringify([pivotValueKey(row2), pivotValueKey(col)])) ?? [],
-          valueField,
-          pivot.aggregate
+      ...columnItems.flatMap(
+        (col) => pivotNumbers(
+          pivot,
+          cells.get(JSON.stringify([pivotValueKey(row2), pivotValueKey(col)])) ?? []
         )
       ),
-      aggregate(records, valueField, pivot.aggregate)
+      ...pivotNumbers(pivot, records)
     ]);
   }
   values2.push([
     "Grand Total",
-    ...columnItems.map(
-      (col) => aggregate(columns.get(pivotValueKey(col)) ?? [], valueField, pivot.aggregate)
-    ),
-    aggregate(pivot.records, valueField, pivot.aggregate)
+    ...columnItems.flatMap((col) => pivotNumbers(pivot, columns.get(pivotValueKey(col)) ?? [])),
+    ...pivotNumbers(pivot, pivot.records)
   ]);
-  return { values: values2, rowItems, columnItems, firstDataRow: pivot.columnField ? 2 : 1 };
+  return { values: values2, rowItems, columnItems, firstDataRow };
 }
 
 // xlsx/pivot/admission.ts
 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 updatedVersion minRefreshableVersion createdVersion applyNumberFormats applyBorderFormats applyFontFormats applyPatternFormats applyAlignmentFormats applyWidthHeightFormats useAutoFormatting itemPrintTitles indent compact compactData outline outlineData multipleFieldFilters rowGrandTotals colGrandTotals",
+  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",
   location: "ref firstHeaderRow firstDataRow firstDataCol",
   pivotFields: "count",
   pivotField: "axis dataField compact outline showAll subtotalTop defaultSubtotal",
@@ -6669,7 +6970,7 @@ var TABLE = {
   field: "x",
   rowItems: "count",
   colItems: "count",
-  i: "t r",
+  i: "t r i",
   x: "v",
   dataFields: "count",
   dataField: "name fld subtotal baseField baseItem showDataAs",
@@ -6700,7 +7001,7 @@ function inspect(node, profile, cache2) {
     for (let i2 = 0; i2 < node.attributes.length; i2++) {
       const attr2 = node.attributes.item(i2);
       if (attr2.name.startsWith("xmlns")) continue;
-      if (!cache2 && node.namespaceURI === X14 && node.localName === "pivotTableDefinition" && attr2.name === "hideValuesRow" && attr2.value === "1")
+      if (!cache2 && node.namespaceURI === X14 && node.localName === "pivotTableDefinition" && attr2.name === "hideValuesRow" && ["0", "1"].includes(attr2.value))
         continue;
       if (!cache2 && node.namespaceURI === X14 && (node.localName === "pivotField" && attr2.name === "fillDownLabels" || node.localName === "pivotTableDefinition" && attr2.name === "fillDownLabelsDefault") && ["0", "1"].includes(attr2.value))
         continue;
@@ -6729,7 +7030,9 @@ function inspect(node, profile, cache2) {
       throw new Error("Unsupported PivotTable option");
     if (attr2.localName === "numFmtId" && attr2.value !== "0")
       throw new Error("Unsupported PivotTable field number format");
-    if (node.localName === "pivotTableDefinition" && ["compact", "compactData", "outline", "outlineData"].includes(attr2.localName) && !["0", "1"].includes(attr2.value))
+    if (node.localName === "pivotTableDefinition" && ["compact", "compactData", "outline", "outlineData", "dataOnRows"].includes(
+      attr2.localName
+    ) && !["0", "1"].includes(attr2.value))
       throw new Error("Unsupported PivotTable global layout");
     if (node.localName === "item" && attr2.localName === "t" && !["default", "data"].includes(attr2.value))
       throw new Error("Unsupported PivotTable subtotal");
@@ -6752,6 +7055,88 @@ function assertPivotRecords(records) {
   );
 }
 
+// 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);
+var NEEDS_ESCAPE = new RegExp(`[${CONTROL}\r]|_x[0-9A-Fa-f]{4}_`);
+var ESCAPABLE = new RegExp(`[${CONTROL}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
+function encodeEscapes(text) {
+  if (!NEEDS_ESCAPE.test(text)) return text;
+  return text.replace(
+    ESCAPABLE,
+    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
+  );
+}
+var INVALID_XML = new RegExp(`[${CONTROL}]`, "g");
+var escapeText2 = (text) => text.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var escapeAttr3 = (text) => text.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
+function attrs(values2) {
+  let out = "";
+  for (const [name, value2] of Object.entries(values2)) {
+    if (value2 === void 0) continue;
+    const text = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
+    out += ` ${name}="${escapeAttr3(text)}"`;
+  }
+  return out;
+}
+var el = (name, values2 = {}, content2 = "") => content2 ? `<${name}${attrs(values2)}>${content2}</${name}>` : `<${name}${attrs(values2)}/>`;
+var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
+function tElement(text, name = "t") {
+  const encoded = escapeText2(encodeEscapes(text));
+  const preserve = /^\s|\s$|\n|\t/.test(text) ? ' xml:space="preserve"' : "";
+  return `<${name}${preserve}>${encoded}</${name}>`;
+}
+var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
+function inlineFragment(xml) {
+  const end = xml.indexOf(">");
+  if (end < 0) return xml;
+  const head = xml.slice(0, end);
+  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
+}
+
+// xlsx/pivot/values-axis.ts
+function pivotFieldIndex(field) {
+  const raw2 = field?.getAttribute("x");
+  if (raw2 === null || raw2 === void 0 || !/^-?\d+$/.test(raw2.trim())) return NaN;
+  const value2 = Number(raw2);
+  return Number.isSafeInteger(value2) ? value2 : NaN;
+}
+function pivotValueIndex(root, axis) {
+  const index2 = axis.findIndex((field) => pivotFieldIndex(field) === -2);
+  const position = root.getAttribute("dataPosition");
+  if (position !== null && (!/^\d+$/.test(position.trim()) || Number(position) !== index2))
+    throw new Error("Inconsistent Values axis position");
+  if (axis.length === 3 && index2 < 2 && position === null)
+    throw new Error("Missing leading or between-field Values position");
+  return index2;
+}
+function pivotValueAxisItems(measures, columns) {
+  const entries = [];
+  if (columns === void 0) {
+    for (let measure = 0; measure < measures; measure++)
+      entries.push(
+        `<i${attrs({ i: measure || void 0 })}><x${attrs({ v: measure || void 0 })}/></i>`
+      );
+  } else {
+    for (let column = 0; column < columns; column++)
+      for (let measure = 0; measure < measures; measure++) {
+        entries.push(
+          `<i${attrs({ r: measure ? 1 : void 0, i: measure || void 0 })}>${measure ? "" : `<x${attrs({ v: column || void 0 })}/>`}<x${attrs({ v: measure || void 0 })}/></i>`
+        );
+      }
+    for (let measure = 0; measure < measures; measure++)
+      entries.push(`<i${attrs({ t: "grand", i: measure || void 0 })}><x/></i>`);
+  }
+  return `<colItems count="${entries.length}">${entries.join("")}</colItems>`;
+}
+function supportedPivotAxes(rows, columns, measures, valuesOnRows) {
+  const index2 = pivotFieldIndex;
+  if (valuesOnRows)
+    return measures > 1 && (rows.length === 2 || rows.length === 3) && (index2(rows[0]) >= 0 || rows.length === 3) && rows.filter((field) => index2(field) === -2).length === 1 && rows.filter((field) => index2(field) !== -2).every((field) => index2(field) >= 0) && columns.length <= 1 && (!columns.length || index2(columns[0]) >= 0);
+  if (rows.some((field) => !Number.isInteger(index2(field)) || index2(field) < 0)) return false;
+  return measures === 1 ? columns.length <= 1 : columns.length >= 1 && columns.length <= 2 && index2(columns.at(-1)) === -2 && (columns.length !== 2 || index2(columns[0]) >= 0);
+}
+
 // xlsx/pivot/read.ts
 function value(node) {
   const v = att(node, "v") ?? "";
@@ -6786,6 +7171,7 @@ function readOne(workbook, source2, part) {
   const dataSheet = sourceNode && att(sourceNode, "sheet");
   const dataRange = sourceNode && parseRange(att(sourceNode, "ref") ?? "");
   const recordPart = source2.targetOfType(cachePart, `${NS.r}/pivotCacheRecords`);
+  const rowsAxis = att(root, "dataOnRows") === "1";
   if (!dataSheet || !dataRange || !recordPart || !workbook.sheets.some((sheet) => sheet.name === dataSheet))
     throw new Error("Unsupported pivot source");
   assertPivotRecords(parseXml(source2.text(recordPart)).documentElement);
@@ -6821,17 +7207,42 @@ function readOne(workbook, source2, part) {
     "dataField",
     NS.x
   );
-  if (rowFields.length < 1 || rowFields.length > 2 || colFields.length > 1 || dataFields.length !== 1 || first(root, "pageFields", NS.x) || first(root, "filters", NS.x) || root.getAttribute("rowGrandTotals") === "0" || root.getAttribute("colGrandTotals") === "0")
+  if (rowFields.length < 1 || rowFields.length > (rowsAxis ? 3 : 2) || dataFields.length < 1 || dataFields.length > 16 || !supportedPivotAxes(rowFields, colFields, dataFields.length, rowsAxis) || first(root, "pageFields", NS.x) || first(root, "filters", NS.x) || 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];
+  const definition = elements(first(root, "extLst", NS.x) ?? parseXml("<root/>").documentElement).map(
+    (extension) => first(
+      extension,
+      "pivotTableDefinition",
+      "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"
+    )
+  ).find(Boolean);
+  if (dataFields.length > 1 && att(definition, "hideValuesRow") !== "1")
+    throw new Error("Visible Values header rows are preserved");
+  for (const [axis, count2] of [
+    ["rowItems", rowsAxis ? dataFields.length : 1],
+    ["colItems", rowsAxis ? 1 : dataFields.length]
+  ]) {
+    for (const item of children(
+      first(root, axis, NS.x) ?? parseXml("<root/>").documentElement,
+      "i",
+      NS.x
+    )) {
+      const index2 = Number(att(item, "i") ?? "0");
+      if (!Number.isInteger(index2) || index2 < 0 || index2 >= count2)
+        throw new Error("Unsupported Values axis item");
+    }
+  }
   const aggregate3 = att(measure, "subtotal") ?? "sum";
   if (!PIVOT_AGGREGATES.includes(aggregate3) || att(measure, "showDataAs") && att(measure, "showDataAs") !== "normal")
     throw new Error("Unsupported pivot aggregate");
   const names = fields.map((field) => decodeEscapes(att(field, "name") ?? ""));
-  const row2 = names[Number(att(rowFields[0], "x"))];
-  const second = rowFields[1] && names[Number(att(rowFields[1], "x"))];
+  const realRows = rowsAxis ? rowFields.filter((field) => pivotFieldIndex(field) !== -2) : rowFields;
+  const row2 = names[pivotFieldIndex(realRows[0])];
+  const second = realRows[1] ? names[Number(att(realRows[1], "x"))] : void 0;
   const tableFields = children(first(root, "pivotFields", NS.x), "pivotField", NS.x);
-  const outer = tableFields[Number(att(rowFields[0], "x"))];
+  const outer = tableFields[pivotFieldIndex(realRows[0])];
   const compact = att(outer, "compact") !== "0";
   const outline = att(outer, "outline") !== "0";
   const layout3 = compact ? "compact" : outline ? "outline" : "tabular";
@@ -6840,7 +7251,7 @@ function readOne(workbook, source2, part) {
   ) || att(root, "compact") !== "0" !== compact || att(root, "compactData") !== "0" !== compact || att(root, "outline") === "1" !== outline || att(root, "outlineData") === "1" !== outline || layout3 === "compact" && att(root, "indent") !== "0")
     throw new Error("Mixed field layouts or custom compact indentation are preserved");
   const subtotal = att(outer, "defaultSubtotal") !== "0";
-  const repeat = rowFields.map((field) => {
+  const repeat = realRows.map((field) => {
     const node = tableFields[Number(att(field, "x"))];
     const extension = first(first(node, "extLst", NS.x), "ext", NS.x);
     return att(
@@ -6853,16 +7264,19 @@ function readOne(workbook, source2, part) {
     ) === "1";
   });
   if (repeat.some((entry4) => entry4 !== repeat[0])) throw new Error("Mixed field label repetition");
-  const col = colFields[0] && names[Number(att(colFields[0], "x"))];
+  const hasColumn = colFields.length > (dataFields.length > 1 && !rowsAxis ? 1 : 0);
+  const col = hasColumn ? names[Number(att(colFields[0], "x"))] : void 0;
   const data = names[Number(att(measure, "fld"))];
   const location = parseRange(att(first(root, "location", NS.x), "ref") ?? "");
-  if (!row2 || !data || !location || colFields.length && !col || rowFields.length === 2 && !second)
+  if (!row2 || !data || !location || hasColumn && !col || realRows.length === 2 && !second)
     throw new Error("Invalid pivot fields");
   const pivot = {
     name: att(root, "name") ?? "PivotTable",
     source: `${quoteSheetName(dataSheet)}!${formatRange(dataRange)}`,
     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",
     ...second ? { secondRowField: second, subtotals: subtotal, repeatLabels: repeat[0] ?? false } : {
       ...subtotal ? {} : { subtotals: false },
@@ -6871,6 +7285,15 @@ function readOne(workbook, source2, part) {
     valueField: data,
     aggregate: aggregate3,
     valueCaption: decodeEscapes(att(measure, "name") ?? data),
+    ...dataFields.length > 1 ? {
+      additionalValues: dataFields.slice(1).map((measure2) => {
+        const field = names[Number(att(measure2, "fld"))];
+        const aggregate4 = att(measure2, "subtotal") ?? "sum";
+        if (!field || !PIVOT_AGGREGATES.includes(aggregate4) || att(measure2, "showDataAs") && att(measure2, "showDataAs") !== "normal")
+          throw new Error("Unsupported pivot measure");
+        return { field, aggregate: aggregate4, caption: decodeEscapes(att(measure2, "name") ?? field) };
+      })
+    } : {},
     fields: names,
     records,
     location,
@@ -9545,45 +9968,6 @@ function readDataValidations(node) {
   return out;
 }
 
-// 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);
-var NEEDS_ESCAPE = new RegExp(`[${CONTROL}\r]|_x[0-9A-Fa-f]{4}_`);
-var ESCAPABLE = new RegExp(`[${CONTROL}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
-function encodeEscapes(text) {
-  if (!NEEDS_ESCAPE.test(text)) return text;
-  return text.replace(
-    ESCAPABLE,
-    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
-  );
-}
-var INVALID_XML = new RegExp(`[${CONTROL}]`, "g");
-var escapeText2 = (text) => text.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-var escapeAttr3 = (text) => text.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
-function attrs(values2) {
-  let out = "";
-  for (const [name, value2] of Object.entries(values2)) {
-    if (value2 === void 0) continue;
-    const text = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
-    out += ` ${name}="${escapeAttr3(text)}"`;
-  }
-  return out;
-}
-var el = (name, values2 = {}, content2 = "") => content2 ? `<${name}${attrs(values2)}>${content2}</${name}>` : `<${name}${attrs(values2)}/>`;
-var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
-function tElement(text, name = "t") {
-  const encoded = escapeText2(encodeEscapes(text));
-  const preserve = /^\s|\s$|\n|\t/.test(text) ? ' xml:space="preserve"' : "";
-  return `<${name}${preserve}>${encoded}</${name}>`;
-}
-var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
-function inlineFragment(xml) {
-  const end = xml.indexOf(">");
-  if (end < 0) return xml;
-  const head = xml.slice(0, end);
-  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
-}
-
 // xlsx/conditional-extensions.ts
 var XM = "http://schemas.microsoft.com/office/excel/2006/main";
 var URI = "{78C0D931-6437-407d-A8EE-F0AAD7539E65}";
@@ -23718,7 +24102,9 @@ function pivotTableXml(pivot, cacheId, cache2) {
   const row2 = pivot.fields.indexOf(pivot.rowField);
   const second = pivot.secondRowField ? pivot.fields.indexOf(pivot.secondRowField) : -1;
   const col = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const value2 = pivot.fields.indexOf(pivot.valueField);
+  const measures = pivotMeasures(pivot);
+  const multiple = measures.length > 1;
+  const rowsAxis = pivot.valuesAxis === "rows";
   const compact = pivot.layout === "compact";
   const outline = pivot.layout === "compact" || pivot.layout === "outline";
   const top = (pivot.subtotalPosition ?? (outline ? "top" : "bottom")) === "top";
@@ -23726,36 +24112,61 @@ function pivotTableXml(pivot, cacheId, cache2) {
     const items2 = index2 === row2 ? grid.rowItems : index2 === second ? grid.secondRowItems : index2 === col ? grid.columnItems : void 0;
     const subtotal = !(index2 === row2 && pivot.subtotals === false);
     const repeated = pivot.repeatLabels && (index2 === row2 || index2 === second) ? '<extLst><ext uri="{2946ED86-A175-432a-8AC1-64E0C546D7DE}"><x14:pivotField xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" fillDownLabels="1"/></ext></extLst>' : "";
-    return `<pivotField${attrs({ axis: index2 === row2 || index2 === second ? "axisRow" : index2 === col ? "axisCol" : void 0, dataField: index2 === value2 ? true : void 0, compact, outline, showAll: false, subtotalTop: index2 === row2 ? top : void 0, defaultSubtotal: subtotal ? void 0 : false })}>${items2 ? `<items count="${items2.length + Number(subtotal)}">${items2.map((item) => `<item x="${cache2.indices[index2].get(pivotValueKey(item))}"/>`).join("")}${subtotal ? '<item t="default"/>' : ""}</items>` : ""}${repeated}</pivotField>`;
+    return `<pivotField${attrs({ axis: index2 === row2 || index2 === second ? "axisRow" : index2 === col ? "axisCol" : void 0, dataField: measures.some((measure) => pivot.fields.indexOf(measure.field) === index2) ? true : void 0, compact, outline, showAll: false, subtotalTop: index2 === row2 ? top : void 0, defaultSubtotal: subtotal ? void 0 : false })}>${items2 ? `<items count="${items2.length + Number(subtotal)}">${items2.map((item) => `<item x="${cache2.indices[index2].get(pivotValueKey(item))}"/>`).join("")}${subtotal ? '<item t="default"/>' : ""}</items>` : ""}${repeated}</pivotField>`;
   }).join("");
   const items = (count2) => Array.from({ length: count2 }, (_v, i2) => `<i><x v="${i2}"/></i>`).join("") + '<i t="grand"><x/></i>';
-  const header = grid.firstDataRow - 1;
-  const rowIndices = [row2, ...second >= 0 ? [second] : []];
+  const header = grid.firstHeaderRow ?? (multiple && col >= 0 ? 1 : grid.firstDataRow - 1);
+  const rowIndices = rowsAxis && pivot.valuesPosition === "first" ? [-2, row2, second] : rowsAxis && pivot.valuesPosition === "between" ? [row2, -2, second] : [row2, ...second >= 0 ? [second] : [], ...rowsAxis ? [-2] : []];
   let previous = [];
   const rowItems = grid.rowEntries?.map((entry3) => {
     let prefix = 0;
-    if (!entry3.type)
+    if (entry3.type === "default" && rowsAxis && 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.indices;
-    return `<i${attrs({ t: entry3.type, r: prefix || void 0 })}>${entry3.indices.slice(prefix).map((index2) => `<x${attrs({ v: index2 || void 0 })}/>`).join("")}</i>`;
+    previous = entry3.type && !(entry3.type === "default" && pivot.valuesPosition === "first") ? [] : entry3.indices;
+    return `<i${attrs({ t: entry3.type, r: prefix || void 0, i: entry3.measure || void 0 })}>${entry3.indices.slice(prefix).map((index2) => `<x${attrs({ v: index2 || void 0 })}/>`).join("")}</i>`;
   }).join("") ?? items(grid.rowItems.length);
   let body = `<location${attrs({ ref: formatRange(pivot.location), firstHeaderRow: header, firstDataRow: grid.firstDataRow, firstDataCol: grid.rowLabelColumns ?? 1 })}/><pivotFields count="${pivot.fields.length}">${fields}</pivotFields><rowFields count="${rowIndices.length}">${rowIndices.map((index2) => `<field x="${index2}"/>`).join("")}</rowFields><rowItems count="${grid.rowEntries?.length ?? grid.rowItems.length + 1}">${rowItems}</rowItems>`;
-  if (col >= 0)
+  if (multiple && !rowsAxis)
+    body += `<colFields count="${col >= 0 ? 2 : 1}">${col >= 0 ? `<field x="${col}"/>` : ""}<field x="-2"/></colFields>${pivotValueAxisItems(measures.length, col >= 0 ? grid.columnItems.length : void 0)}`;
+  else if (col >= 0)
     body += `<colFields count="1"><field x="${col}"/></colFields><colItems count="${grid.columnItems.length + 1}">${items(grid.columnItems.length)}</colItems>`;
-  else body += '<colItems count="1"><i><x/></i></colItems>';
-  body += `<dataFields count="1"><dataField${attrs({ name: encodeEscapes(pivot.valueCaption), fld: value2, subtotal: pivot.aggregate, baseField: 0, baseItem: 0 })}/></dataFields>`;
+  else
+    body += rowsAxis ? '<colItems count="1"><i/></colItems>' : '<colItems count="1"><i><x/></i></colItems>';
+  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>`;
   const doc = parseXml(
     pivot.sourceXml ?? `<pivotTableDefinition xmlns="${NS.x}" dataCaption="Values" updatedVersion="6" minRefreshableVersion="3" createdVersion="6"><pivotTableStyleInfo name="PivotStyleLight16" showRowHeaders="1" showColHeaders="1" showRowStripes="0" showColStripes="0" showLastColumn="1"/></pivotTableDefinition>`
   );
   const root = doc.documentElement;
   root.setAttribute("name", pivot.name);
   root.setAttribute("cacheId", String(cacheId));
+  root.setAttribute("dataOnRows", rowsAxis ? "1" : "0");
+  if (rowsAxis && (pivot.valuesPosition === "between" || pivot.valuesPosition === "first"))
+    root.setAttribute("dataPosition", pivot.valuesPosition === "first" ? "0" : "1");
+  else root.removeAttribute("dataPosition");
   root.setAttribute("compact", compact ? "1" : "0");
   root.setAttribute("compactData", compact ? "1" : "0");
   root.setAttribute("outline", outline ? "1" : "0");
   root.setAttribute("outlineData", outline ? "1" : "0");
   if (compact) root.setAttribute("indent", "0");
+  if (multiple && !elements(first(root, "extLst", NS.x) ?? parseXml("<root/>").documentElement).some(
+    (extension) => first(
+      extension,
+      "pivotTableDefinition",
+      "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"
+    )
+  )) {
+    let list = first(root, "extLst", NS.x);
+    if (!list) {
+      list = doc.createElementNS(NS.x, "extLst");
+      root.appendChild(list);
+    }
+    const extension = parseXml(
+      `<ext xmlns="${NS.x}" uri="{962EF5D1-5CA2-4c93-8EF4-DBF5C05439D2}"><x14:pivotTableDefinition xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" hideValuesRow="1"/></ext>`
+    ).documentElement;
+    list.appendChild(doc.importNode(extension, true));
+  }
   root.setAttribute("rowGrandTotals", "1");
   root.setAttribute("colGrandTotals", "1");
   for (const extension of elements(
@@ -23766,6 +24177,7 @@ function pivotTableXml(pivot, cacheId, cache2) {
       "pivotTableDefinition",
       "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"
     );
+    if (multiple && definition) definition.setAttribute("hideValuesRow", "1");
     if (definition?.hasAttribute("fillDownLabelsDefault"))
       definition.setAttribute("fillDownLabelsDefault", pivot.repeatLabels ? "1" : "0");
   }