ooxml-core 1.9.0 → 1.10.0

package/dist/xlsx/ui/index.cjs

@@ -13837,6 +13837,25 @@ 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(
+    (measure2) => !measure2 || !pivot.fields.includes(measure2.field) || !PIVOT_AGGREGATES.includes(measure2.aggregate) || typeof measure2.caption !== "string" || !measure2.caption.trim() || measure2.caption.length > 255 || pivot.fields.some((field) => field.toLowerCase() === measure2.caption.toLowerCase())
+  ) || new Set(
+    [pivot.valueCaption, ...extras.map((measure2) => measure2.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.");
 }
@@ -13844,21 +13863,191 @@ function pivotCaption(aggregate3, field) {
   return `${aggregate3[0].toUpperCase()}${aggregate3.slice(1)} of ${field}`;
 }
 
+// xlsx/pivot/measures.ts
+var pivotMeasures = (pivot) => [
+  { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
+  ...pivot.additionalValues ?? []
+];
+function normalizedPivotMeasures(values2) {
+  if (!Array.isArray(values2) || values2.length > 15)
+    throw new Error("Choose between one and sixteen PivotTable value fields.");
+  return values2.map((value2) => {
+    if (!value2 || typeof value2.field !== "string")
+      throw new Error("Choose valid PivotTable value fields.");
+    const aggregate3 = value2.aggregate ?? "sum";
+    if (!PIVOT_AGGREGATES.includes(aggregate3))
+      throw new Error("Choose a valid PivotTable aggregate.");
+    return {
+      field: value2.field,
+      aggregate: aggregate3,
+      caption: value2.caption ?? `${aggregate3[0].toUpperCase()}${aggregate3.slice(1)} of ${value2.field}`
+    };
+  });
+}
+function aggregate2(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((a, b) => Math.min(a, b));
+  if (type === "max") return numbers3.reduce((a, b) => Math.max(a, b));
+  const sum2 = numbers3.reduce((total2, value2) => total2 + value2, 0);
+  return type === "average" ? sum2 / numbers3.length : sum2;
+}
+var pivotMeasureNumber = (pivot, records, measure2) => aggregate2(records, pivot.fields.indexOf(measure2.field), measure2.aggregate);
+var pivotNumbers = (pivot, records) => pivotMeasures(pivot).map((measure2) => pivotMeasureNumber(pivot, records, measure2));
+function pivotHeaderDimensions(pivot, columnItems, rowLabels) {
+  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((measure2) => measure2.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((measure2) => `Total ${measure2.caption}`)
+    ],
+    [
+      ...labels,
+      ...columns.flatMap(() => measures.map((measure2) => measure2.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 compact3 = pivot.layout === "compact";
+  const tabular = !pivot.layout || pivot.layout === "tabular";
+  const blank = () => Array(width - rowLabels).fill(null);
+  pivotMeasures(pivot).forEach((measure2, m) => {
+    const numbers3 = (keys, records) => [
+      ...columnItems.map(
+        (column) => pivotMeasureNumber(
+          pivot,
+          buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [],
+          measure2
+        )
+      ),
+      pivotMeasureNumber(pivot, records, measure2)
+    ];
+    if (!tabular)
+      append([measure2.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(
+          compact3 ? [pivotItemLabel(outer)] : [null, pivotItemLabel(outer), null],
+          top ? numbers3([key], group) : blank(),
+          { indices: [m, outerIndex], measure: m },
+          compact3 ? 1 : 0
+        );
+      const innerKeys = [...children2.get(key)].sort(
+        (a, b) => innerIndices.get(a) - innerIndices.get(b)
+      );
+      innerKeys.forEach((innerKey, child) => {
+        const innerIndex = innerIndices.get(innerKey);
+        append(
+          compact3 ? [pivotItemLabel(secondRowItems[innerIndex])] : [
+            tabular && first2 ? measure2.caption : null,
+            pivot.repeatLabels || tabular && child === 0 ? pivotItemLabel(outer) : null,
+            pivotItemLabel(secondRowItems[innerIndex])
+          ],
+          numbers3([key, innerKey], details.get(JSON.stringify([key, innerKey]))),
+          { indices: [m, outerIndex, innerIndex], measure: m },
+          compact3 ? 2 : 0
+        );
+        first2 = false;
+      });
+      if (bottom)
+        append(
+          compact3 ? [`${String(pivotItemLabel(outer))} Total`] : [null, `${String(pivotItemLabel(outer))} Total`, null],
+          numbers3([key], group),
+          { indices: [m, outerIndex], measure: m, type: "default" },
+          compact3 ? 1 : 0
+        );
+    });
+  });
+}
+
 // xlsx/pivot/hierarchy.ts
 var label2 = 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 layout2 = pivot.layout ?? "tabular";
   const compact3 = layout2 === "compact";
-  const top = layout2 !== "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) && layout2 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
   const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact3 ? 1 : 2;
+  const rowLabelColumns = compact3 ? 1 : rowsAxis ? 3 : 2;
   const groups = /* @__PURE__ */ new Map();
   const details = /* @__PURE__ */ new Map();
   const children2 = /* @__PURE__ */ new Map();
@@ -13882,20 +14071,12 @@ function hierarchicalPivotGrid(pivot, aggregate3) {
         collect(buckets, JSON.stringify([...key, column]), record);
     }
   }
-  const rows2 = details.size + rowItems.length * (Number(layout2 !== "tabular") + Number(bottom)) + 3;
-  if (rows2 * (columnItems.length + 3) > 1e6)
-    throw new Error("The PivotTable result is too large.");
+  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
+  const rows2 = (details.size + rowItems.length * Number(bottom) + 1) * (rowsAxis ? measures.length : 1) + rowItems.length * Number(layout2 !== "tabular") * (firstValues ? measures.length : 1) + (firstValues ? measures.length : between ? rowItems.length * measures.length : details.size) * Number(rowsAxis && layout2 !== "tabular") + dimensions.rows;
+  if (rows2 * dimensions.width > 1e6) throw new Error("The PivotTable result is too large.");
   const labels = compact3 ? ["Row Labels"] : [pivot.rowField, pivot.secondRowField];
-  const values2 = pivot.columnField ? [
-    [
-      pivot.valueCaption,
-      ...compact3 ? [] : [null],
-      compact3 ? "Column Labels" : pivot.columnField,
-      ...columnItems.slice(1).map(() => null),
-      null
-    ],
-    [...labels, ...columnItems.map(label2), "Grand Total"]
-  ] : [[...labels, pivot.valueCaption]];
+  const values2 = pivotHeaders(pivot, columnItems, labels, label2);
+  const firstDataRow = values2.length;
   const indents = values2.map(() => 0);
   const rowEntries = [];
   const append = (labels2, numbers4, entry, indent = 0) => {
@@ -13903,91 +14084,184 @@ function hierarchicalPivotGrid(pivot, aggregate3) {
     rowEntries.push(entry);
     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 (layout2 !== "tabular")
-      append(
-        [label2(outer), ...compact3 ? [] : [null]],
-        top ? numbers3([key], groups.get(key) ?? []) : Array(columnItems.length + 1).fill(null),
-        { indices: [outerIndex] }
-      );
-    let first2 = true;
-    [...children2.get(key)].sort((a, b) => innerIndices.get(a) - innerIndices.get(b)).forEach((innerKey) => {
-      const innerIndex = innerIndices.get(innerKey);
-      const inner2 = secondRowItems[innerIndex];
-      const keys = [key, innerKey];
-      const records = details.get(JSON.stringify(keys));
-      if (!records) return;
-      append(
-        compact3 ? [label2(inner2)] : [
-          pivot.repeatLabels || layout2 === "tabular" && first2 ? label2(outer) : null,
-          label2(inner2)
+  const numbers3 = (keys, records) => bands(keys, records).flat();
+  const appendMeasures = (labels2, keys, records, indices, type) => {
+    const values3 = bands(keys, records);
+    measures.forEach(
+      (measure2, m) => append(
+        type ? [
+          `${type === "grand" ? "Total" : String(labels2[0])} ${measure2.caption}`,
+          ...Array(rowLabelColumns - 1).fill(null)
+        ] : compact3 ? [measure2.caption] : [
+          ...labels2.map(
+            (label3) => layout2 === "tabular" && m === 0 || pivot.repeatLabels ? label3 : null
+          ),
+          measure2.caption
         ],
-        numbers3(keys, records),
-        { indices: [outerIndex, innerIndex] },
-        compact3 ? 1 : 0
-      );
-      first2 = false;
+        values3.map((band) => band[m] ?? null),
+        { indices: type ? indices : [...indices, m], measure: m, ...type ? { type } : {} },
+        compact3 && !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(label2(outer));
-      append(
-        [`${caption} Total`, ...compact3 ? [] : [null]],
-        numbers3([key], groups.get(key) ?? []),
-        { indices: [outerIndex], type: "default" }
+  else
+    rowItems.forEach((outer, outerIndex) => {
+      const key = pivotValueKey(outer);
+      if (layout2 !== "tabular")
+        append(
+          [label2(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(
+        (a, b) => innerIndices.get(a) - innerIndices.get(b)
       );
-    }
-  });
-  append(["Grand Total", ...compact3 ? [] : [null]], numbers3([], pivot.records), {
-    indices: [0],
-    type: "grand"
-  });
+      if (between)
+        measures.forEach((measure2, m) => {
+          if (layout2 !== "tabular")
+            append(
+              compact3 ? [measure2.caption] : [pivot.repeatLabels ? label2(outer) : null, measure2.caption, null],
+              Array(dimensions.width - rowLabelColumns).fill(null),
+              { indices: [outerIndex, m], measure: m },
+              compact3 ? 1 : 0
+            );
+          innerKeys.forEach((innerKey, child) => {
+            const innerIndex = innerIndices.get(innerKey);
+            const keys = [key, innerKey];
+            const records = details.get(JSON.stringify(keys));
+            append(
+              compact3 ? [label2(secondRowItems[innerIndex])] : [
+                pivot.repeatLabels || layout2 === "tabular" && m === 0 && child === 0 ? label2(outer) : null,
+                layout2 === "tabular" && child === 0 ? measure2.caption : null,
+                label2(secondRowItems[innerIndex])
+              ],
+              [
+                ...columnItems.map(
+                  (column) => pivotMeasureNumber(
+                    pivot,
+                    buckets.get(JSON.stringify([...keys, pivotValueKey(column)])) ?? [],
+                    measure2
+                  )
+                ),
+                pivotMeasureNumber(pivot, records, measure2)
+              ],
+              { indices: [outerIndex, m, innerIndex], measure: m },
+              compact3 ? 2 : 0
+            );
+          });
+        });
+      else
+        innerKeys.forEach((innerKey) => {
+          const innerIndex = innerIndices.get(innerKey);
+          const inner2 = secondRowItems[innerIndex];
+          const keys = [key, innerKey];
+          const records = details.get(JSON.stringify(keys));
+          if (!records) return;
+          if (rowsAxis) {
+            if (layout2 !== "tabular")
+              append(
+                compact3 ? [label2(inner2)] : [pivot.repeatLabels ? label2(outer) : null, label2(inner2), null],
+                Array(dimensions.width - rowLabelColumns).fill(null),
+                { indices: [outerIndex, innerIndex] },
+                compact3 ? 1 : 0
+              );
+            appendMeasures(
+              [pivot.repeatLabels || first2 ? label2(outer) : null, label2(inner2)],
+              keys,
+              records,
+              [outerIndex, innerIndex]
+            );
+            first2 = false;
+            return;
+          }
+          append(
+            compact3 ? [label2(inner2)] : [
+              pivot.repeatLabels || layout2 === "tabular" && first2 ? label2(outer) : null,
+              label2(inner2)
+            ],
+            numbers3(keys, records),
+            { indices: [outerIndex, innerIndex] },
+            compact3 ? 1 : 0
+          );
+          first2 = false;
+        });
+      if (bottom) {
+        if (rowsAxis) {
+          appendMeasures([label2(outer)], [key], groups.get(key) ?? [], [outerIndex], "default");
+          return;
+        }
+        const caption = String(label2(outer));
+        append(
+          [`${caption} Total`, ...compact3 ? [] : [null]],
+          numbers3([key], groups.get(key) ?? []),
+          { indices: [outerIndex], type: "default" }
+        );
+      }
+    });
+  if (rowsAxis) appendMeasures([], [], pivot.records, [0], "grand");
+  else
+    append(["Grand Total", ...compact3 ? [] : [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 aggregate2(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((a, b) => Math.min(a, b));
-  if (type === "max") return numbers3.reduce((a, b) => Math.max(a, 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, aggregate2);
+  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 compact3 = pivot.layout === "compact";
+  const headings = rowsAxis && pivot.layout !== void 0 && pivot.layout !== "tabular";
+  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowsAxis && !compact3 ? 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();
@@ -14005,44 +14279,104 @@ 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((measure2, m) => {
+        values2.push([
+          ...compact3 ? [grand ? `Total ${measure2.caption}` : measure2.caption] : [
+            grand ? `Total ${measure2.caption}` : pivot.repeatLabels || !headings && m === 0 ? caption : null,
+            grand ? null : measure2.caption
+          ],
+          ...bands.map((band) => band[m] ?? null)
+        ]);
+        indents.push(compact3 && !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: compact3 ? 1 : 2,
+      indents,
+      firstHeaderRow: 1,
+      rowEntries
+    };
+  }
   for (const row2 of rowItems) {
     const records = groups.get(pivotValueKey(row2)) ?? [];
     values2.push([
       label3(row2),
-      ...columnItems.map(
-        (col) => aggregate2(
-          cells.get(JSON.stringify([pivotValueKey(row2), pivotValueKey(col)])) ?? [],
-          valueField,
-          pivot.aggregate
+      ...columnItems.flatMap(
+        (col) => pivotNumbers(
+          pivot,
+          cells.get(JSON.stringify([pivotValueKey(row2), pivotValueKey(col)])) ?? []
         )
       ),
-      aggregate2(records, valueField, pivot.aggregate)
+      ...pivotNumbers(pivot, records)
     ]);
   }
   values2.push([
     "Grand Total",
-    ...columnItems.map(
-      (col) => aggregate2(columns.get(pivotValueKey(col)) ?? [], valueField, pivot.aggregate)
-    ),
-    aggregate2(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/write/xml-out.ts
+var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
+var INVALID_XML = new RegExp(`[${CONTROL2}]`, "g");
+var escapeText = (text2) => text2.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var escapeAttr = (text2) => text2.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 text2 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num2(value2) : value2;
+    out += ` ${name}="${escapeAttr(text2)}"`;
+  }
+  return out;
+}
+var el = (name, values2 = {}, content = "") => content ? `<${name}${attrs(values2)}>${content}</${name}>` : `<${name}${attrs(values2)}/>`;
+var num2 = (value2) => Object.is(value2, -0) ? "0" : String(value2);
+
 // xlsx/read/style-parts.ts
 function parseColor(element2, palette) {
   if (!element2) return void 0;
@@ -14076,23 +14410,6 @@ function parseSqref(sqref) {
   return sqref.split(/\s+/).filter(Boolean).map((part) => parseRange(part)).filter((range2) => range2 !== void 0);
 }
 
-// xlsx/write/xml-out.ts
-var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
-var INVALID_XML = new RegExp(`[${CONTROL2}]`, "g");
-var escapeText = (text2) => text2.replace(INVALID_XML, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-var escapeAttr = (text2) => text2.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 text2 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num2(value2) : value2;
-    out += ` ${name}="${escapeAttr(text2)}"`;
-  }
-  return out;
-}
-var el = (name, values2 = {}, content = "") => content ? `<${name}${attrs(values2)}>${content}</${name}>` : `<${name}${attrs(values2)}/>`;
-var num2 = (value2) => Object.is(value2, -0) ? "0" : String(value2);
-
 // xlsx/conditional-extensions.ts
 var XM = "http://schemas.microsoft.com/office/excel/2006/main";
 function dataBarLengths(rule, node) {
@@ -18865,12 +19182,16 @@ function write(ctx, s, pivot, old) {
     ],
     () => {
       const compact3 = pivot.layout === "compact";
-      const indents = [
-        stylePatcher(ctx.workbook, {
-          alignment: { indent: 0, ...compact3 ? { horizontal: "left" } : {} }
-        }),
-        stylePatcher(ctx.workbook, { alignment: { indent: 1, horizontal: "left" } })
-      ];
+      const indents = new Map(
+        [.../* @__PURE__ */ new Set([0, ...grid6.indents ?? []])].map(
+          (indent) => [
+            indent,
+            stylePatcher(ctx.workbook, {
+              alignment: { indent, ...compact3 || indent > 0 ? { horizontal: "left" } : {} }
+            })
+          ]
+        )
+      );
       const styles = /* @__PURE__ */ new Map();
       forEachCellInRange(sheet, location, (cell, row2, col) => {
         if (cell.styleId !== void 0) styles.set(`${row2}:${col}`, cell.styleId);
@@ -18893,7 +19214,7 @@ function write(ctx, s, pivot, old) {
             const indent = col === 0 ? grid6.indents?.[row2] ?? 0 : 0;
             const alignment = styleAt(ctx.workbook, styleId).alignment;
             if ((alignment?.indent ?? 0) !== indent || compact3 && alignment?.horizontal !== "left")
-              styleId = indents[indent](styleId);
+              styleId = indents.get(indent)(styleId);
           }
           putCell(sheet, r, c, { value: value2, ...styleId !== void 0 ? { styleId } : {} });
         })
@@ -18920,6 +19241,9 @@ function createPivotTable(ctx, s, destination, options) {
     valueField: options.valueField,
     aggregate: aggregate3,
     valueCaption: pivotCaption(aggregate3, options.valueField),
+    ...options.valuesAxis !== void 0 ? { valuesAxis: options.valuesAxis } : {},
+    ...options.valuesPosition !== void 0 ? { valuesPosition: options.valuesPosition } : {},
+    ...options.additionalValues ? { additionalValues: normalizedPivotMeasures(options.additionalValues) } : {},
     location: { start: { ...destination }, end: { ...destination } },
     ...options.columnField ? { columnField: options.columnField } : {}
   };
@@ -18951,6 +19275,15 @@ function refreshPivotTable(ctx, s, name, patch2 = {}) {
   if (patch2.repeatLabels !== void 0) next.repeatLabels = patch2.repeatLabels;
   if (patch2.layout !== void 0) next.layout = patch2.layout;
   if (patch2.subtotalPosition !== void 0) next.subtotalPosition = patch2.subtotalPosition;
+  if (patch2.valuesAxis !== void 0) next.valuesAxis = patch2.valuesAxis;
+  if (patch2.valuesPosition !== void 0) next.valuesPosition = patch2.valuesPosition;
+  else if (patch2.valuesAxis === "columns" || patch2.secondRowField === "")
+    delete next.valuesPosition;
+  if (patch2.additionalValues !== void 0) {
+    const measures = normalizedPivotMeasures(patch2.additionalValues);
+    if (measures.length) next.additionalValues = measures;
+    else delete next.additionalValues;
+  }
   validatePivotFields(next);
   write(ctx, s, next, old);
 }
@@ -28446,6 +28779,93 @@ var SPARKLINE_STRINGS = {
 
 // xlsx/ui/commands/i18n/pivots.ts
 var PIVOT_STRINGS = {
+  "Before row fields": [
+    "Avant les champs de ligne",
+    "Vor den Zeilenfeldern",
+    "Antes de los campos de fila",
+    "\u884C\u5B57\u6BB5\u4E4B\u524D"
+  ],
+  "Values are listed before the row fields.": [
+    "Les valeurs sont affich\xE9es avant les champs de ligne.",
+    "Werte werden vor den Zeilenfeldern aufgef\xFChrt.",
+    "Los valores aparecen antes de los campos de fila.",
+    "\u503C\u5217\u5728\u884C\u5B57\u6BB5\u4E4B\u524D\u3002"
+  ],
+  "Values Placement:": [
+    "Position des valeurs :",
+    "Anordnung der Werte:",
+    "Posici\xF3n de los valores:",
+    "\u503C\u4F4D\u7F6E\uFF1A"
+  ],
+  "After row fields": [
+    "Apr\xE8s les champs de ligne",
+    "Nach den Zeilenfeldern",
+    "Despu\xE9s de los campos de fila",
+    "\u884C\u5B57\u6BB5\u4E4B\u540E"
+  ],
+  "Between row fields": [
+    "Entre les champs de ligne",
+    "Zwischen den Zeilenfeldern",
+    "Entre los campos de fila",
+    "\u884C\u5B57\u6BB5\u4E4B\u95F4"
+  ],
+  "Values are listed between the row fields.": [
+    "Les valeurs sont affich\xE9es entre les champs de ligne.",
+    "Werte werden zwischen den Zeilenfeldern aufgef\xFChrt.",
+    "Los valores aparecen entre los campos de fila.",
+    "\u503C\u5217\u5728\u884C\u5B57\u6BB5\u4E4B\u95F4\u3002"
+  ],
+  "Values Axis:": ["Axe des valeurs :", "Werteachse:", "Eje de valores:", "\u503C\u8F74\uFF1A"],
+  "Values on Columns": [
+    "Valeurs en colonnes",
+    "Werte in Spalten",
+    "Valores en columnas",
+    "\u503C\u663E\u793A\u5728\u5217\u4E0A"
+  ],
+  "Values on Rows": ["Valeurs en lignes", "Werte in Zeilen", "Valores en filas", "\u503C\u663E\u793A\u5728\u884C\u4E0A"],
+  "Values are listed after the row fields.": [
+    "Les valeurs sont affich\xE9es apr\xE8s les champs de ligne.",
+    "Werte werden nach den Zeilenfeldern aufgef\xFChrt.",
+    "Los valores aparecen despu\xE9s de los campos de fila.",
+    "\u503C\u5217\u5728\u884C\u5B57\u6BB5\u4E4B\u540E\u3002"
+  ],
+  "Values on rows display subtotals below groups.": [
+    "Les valeurs en lignes affichent les sous-totaux sous les groupes.",
+    "Werte in Zeilen zeigen Teilergebnisse unter den Gruppen an.",
+    "Los valores en filas muestran los subtotales debajo de los grupos.",
+    "\u884C\u4E0A\u7684\u503C\u5C06\u5206\u7C7B\u6C47\u603B\u663E\u793A\u5728\u7EC4\u4E0B\u65B9\u3002"
+  ],
+  "Multiple value fields use Values on columns.": [
+    "Plusieurs champs de valeur utilisent les valeurs en colonnes.",
+    "Mehrere Wertfelder verwenden Werte in Spalten.",
+    "Varios campos de valor usan Valores en columnas.",
+    "\u591A\u4E2A\u503C\u5B57\u6BB5\u7684\u503C\u4F4D\u4E8E\u5217\u8F74\u4E0A\u3002"
+  ],
+  "Add Value Field": [
+    "Ajouter un champ de valeur",
+    "Wertfeld hinzuf\xFCgen",
+    "A\xF1adir campo de valor",
+    "\u6DFB\u52A0\u503C\u5B57\u6BB5"
+  ],
+  "Remove Value Field": [
+    "Supprimer le champ de valeur",
+    "Wertfeld entfernen",
+    "Quitar campo de valor",
+    "\u5220\u9664\u503C\u5B57\u6BB5"
+  ],
+  "Additional Value Field": [
+    "Champ de valeur suppl\xE9mentaire",
+    "Zus\xE4tzliches Wertfeld",
+    "Campo de valor adicional",
+    "\u9644\u52A0\u503C\u5B57\u6BB5"
+  ],
+  "Value Caption:": ["Libell\xE9 de valeur :", "Wertbeschriftung:", "T\xEDtulo del valor:", "\u503C\u6807\u9898\uFF1A"],
+  "Multiple value fields use tabular layout with Values on columns.": [
+    "Plusieurs champs de valeur utilisent la forme tabulaire avec les valeurs en colonnes.",
+    "Mehrere Wertfelder verwenden das Tabellenformat mit Werten in Spalten.",
+    "Varios campos de valor usan el formato tabular con Valores en columnas.",
+    "\u591A\u4E2A\u503C\u5B57\u6BB5\u4F7F\u7528\u8868\u683C\u5E03\u5C40\uFF0C\u503C\u4F4D\u4E8E\u5217\u8F74\u4E0A\u3002"
+  ],
   "Compact Form": ["Forme compacte", "Kompaktformat", "Formato compacto", "\u538B\u7F29\u5F62\u5F0F"],
   "Outline Form": ["Forme de plan", "Gliederungsformat", "Formato de esquema", "\u5927\u7EB2\u5F62\u5F0F"],
   "Tabular Form": ["Forme tabulaire", "Tabellenformat", "Formato tabular", "\u8868\u683C\u5F62\u5F0F"],