ooxml-core 1.18.0 → 1.19.0

package/dist/automation/index.cjs

@@ -118,11 +118,11 @@ function checkXmlLimits(xml, label2, limits = {}) {
       throw new Error(`${label2} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
-function parseXml(xml, options = {}) {
-  const label2 = options.label ?? "OOXML";
+function parseXml(xml, options2 = {}) {
+  const label2 = options2.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
     throw new Error(`${label2} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label2, options.limits);
+  checkXmlLimits(xml, label2, options2.limits);
   let parseError = "";
   let parsed;
   try {
@@ -2891,8 +2891,8 @@ function rgbToHsl(r, g2, b) {
   }
   return { h: h2, s: clampUnitInterval(s), l: clampUnitInterval(l) };
 }
-function hslToRgb(h2, s, l, roundChannel = Math.round, options) {
-  const sC = options?.clampSaturation === false ? s : clampUnitInterval(s);
+function hslToRgb(h2, s, l, roundChannel = Math.round, options2) {
+  const sC = options2?.clampSaturation === false ? s : clampUnitInterval(s);
   const lC = clampUnitInterval(l);
   const hN = (h2 % 360 + 360) % 360;
   const c2 = (1 - Math.abs(2 * lC - 1)) * sC;
@@ -5071,13 +5071,13 @@ var APPLIED = /* @__PURE__ */ new Set([
   "lumMod",
   "lumOff"
 ]);
-function resolveDrawingColor(color2, theme3, options) {
+function resolveDrawingColor(color2, theme3, options2) {
   const base2 = baseHex(color2, theme3);
   const rgb7 = base2 ? hexToRgbChannels(base2) : null;
   if (!rgb7) return void 0;
-  if (options?.transformOrder === "document") {
+  if (options2?.transformOrder === "document") {
     const value3 = orderedColorTransforms(rgb7, color2.transforms);
-    const round6 = options.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
+    const round6 = options2.hslRounding === "halfDown" ? (channel) => Math.ceil(channel - 0.5) : Math.round;
     return {
       hex: `#${toHex(round6(value3.r))}${toHex(round6(value3.g))}${toHex(round6(value3.b))}`,
       alpha: value3.alpha,
@@ -5128,7 +5128,7 @@ function resolveDrawingColor(color2, theme3, options) {
     if (lumMod !== void 0) hsl.l = clampUnitInterval(hsl.l * lumMod);
     const lumOff = parseDrawingFraction(find3("lumOff"));
     if (lumOff !== void 0) hsl.l = clampUnitInterval(hsl.l + lumOff);
-    const round6 = options?.hslRounding === "halfDown" ? (value3) => Math.ceil(value3 - 0.5) : Math.round;
+    const round6 = options2?.hslRounding === "halfDown" ? (value3) => Math.ceil(value3 - 0.5) : Math.round;
     ({ r, g: g2, b } = hslToRgb(hsl.h, hsl.s, hsl.l, round6));
   }
   let alpha = parseDrawingPercent(find3("alpha")) ?? 1;
@@ -14353,14 +14353,14 @@ function scottBinCount(values2, min, max) {
   const width = 3.49 * sd * values2.length ** (-1 / 3);
   return Math.max(1, Math.ceil((max - min) / width));
 }
-function computeHistogramBins(values2, options, format5 = String) {
-  const closed = options.intervalClosed ?? "l";
+function computeHistogramBins(values2, options2, format5 = String) {
+  const closed = options2.intervalClosed ?? "l";
   const finite4 = values2.map((value3, sourceIndex) => ({ value: value3, sourceIndex })).filter((item) => Number.isFinite(item.value));
   if (finite4.length === 0) {
     return [];
   }
-  const underflow = typeof options.underflow === "number" ? options.underflow : void 0;
-  const overflow = typeof options.overflow === "number" ? options.overflow : void 0;
+  const underflow = typeof options2.underflow === "number" ? options2.underflow : void 0;
+  const overflow = typeof options2.overflow === "number" ? options2.overflow : void 0;
   const under = underflow === void 0 ? [] : finite4.filter(
     (item) => closed === "r" ? item.value <= underflow : item.value < underflow
   );
@@ -14377,8 +14377,8 @@ function computeHistogramBins(values2, options, format5 = String) {
   if (regular.length > 0) {
     const min = Math.min(...regular.map((item) => item.value));
     const max = Math.max(...regular.map((item) => item.value));
-    const requestedSize = options.binSize && options.binSize > 0 ? options.binSize : void 0;
-    const requestedCount = options.binCount && options.binCount > 0 ? options.binCount : void 0;
+    const requestedSize = options2.binSize && options2.binSize > 0 ? options2.binSize : void 0;
+    const requestedCount = options2.binCount && options2.binCount > 0 ? options2.binCount : void 0;
     const start = requestedSize ? Math.floor(min / requestedSize) * requestedSize : min;
     const count2 = requestedSize ? Math.max(
       closed === "l" ? Math.floor((max - start) / requestedSize) + 1 : Math.ceil((max - start) / requestedSize),
@@ -14429,9 +14429,9 @@ function aggregateByCategory(values2, rawCategories) {
 }
 
 // chart/waterfall.ts
-function buildWaterfallSteps(values2, options) {
+function buildWaterfallSteps(values2, options2) {
   const subtotalIndices = new Set(
-    options?.subtotalIndices ?? (values2.length > 0 ? [values2.length - 1] : [])
+    options2?.subtotalIndices ?? (values2.length > 0 ? [values2.length - 1] : [])
   );
   const steps = [];
   let runningTotal = 0;
@@ -14976,12 +14976,12 @@ function resolveChartGradient(fill, resolve3) {
 }
 
 // chart/bar-cluster-geometry.ts
-function assertBarClusterOptions(options) {
+function assertBarClusterOptions(options2) {
   for (const [field2, min, max] of [
     ["barGapWidth", 0, 500],
     ["barOverlap", -100, 100]
   ]) {
-    const value3 = options[field2];
+    const value3 = options2[field2];
     if (value3 !== void 0 && (!Number.isInteger(value3) || value3 < min || value3 > max))
       throw new RangeError(`${field2} must be an integer from ${min} to ${max}`);
   }
@@ -16239,8 +16239,8 @@ function titleXml(context, title) {
     chartTextXml(context, tx, false) + layoutXml(context, title.layout) + valXml("overlay", title.overlay) + shapePropertiesXml(context, title.spPr) + textBodyXml(context, title.txPr) + raw(context, title.extLst)
   );
 }
-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 labelOptionsXml(context, options2) {
+  return numberFormatXml(options2.numberFormat) + shapePropertiesXml(context, options2.spPr) + textBodyXml(context, options2.txPr) + valXml("dLblPos", options2.position) + valXml("showLegendKey", options2.showLegendKey) + valXml("showVal", options2.showValue) + valXml("showCatName", options2.showCategoryName) + valXml("showSerName", options2.showSeriesName) + valXml("showPercent", options2.showPercent) + valXml("showBubbleSize", options2.showBubbleSize) + (options2.separator === void 0 ? "" : textElement("separator", options2.separator));
 }
 function labelXml(context, label2) {
   return elementXml(
@@ -16410,7 +16410,7 @@ function styleXml(context, space) {
   );
 }
 var relationship = (local, id3, content2 = "") => id3 === void 0 ? "" : elementXml(local, content2, ` r:id="${escapeAttribute(id3)}"`);
-function writeChartSpace(space, options = {}) {
+function writeChartSpace(space, options2 = {}) {
   const bindings = new Map(CHART_ROOT_BINDINGS);
   for (const { prefix: prefix3, uri } of space.namespaceDeclarations ?? [])
     if (!bindings.has(prefix3) && /^[A-Za-z_][\w.-]*$/.test(prefix3)) bindings.set(prefix3, uri);
@@ -16425,9 +16425,77 @@ function writeChartSpace(space, options = {}) {
     space.externalDataRelId,
     valXml("autoUpdate", space.externalDataAutoUpdate)
   ) + raw(context, space.printSettings) + relationship("userShapes", space.userShapesRelId) + raw(context, space.extLst);
-  const breakAfter = options.declarationBreak ?? "\r\n";
+  const breakAfter = options2.declarationBreak ?? "\r\n";
   return `${DECLARATION2}${breakAfter}<c:chartSpace${declarations}>${body}</c:chartSpace>`;
 }
+var AUTOMATIC_MARKER_CYCLE = [
+  "diamond",
+  "square",
+  "triangle",
+  "x",
+  "star",
+  "circle",
+  "plus",
+  "dot",
+  "dash"
+];
+function automaticMarkerSymbol(seriesIdx) {
+  const length = AUTOMATIC_MARKER_CYCLE.length;
+  const normalized = (Math.trunc(seriesIdx) % length + length) % length;
+  return AUTOMATIC_MARKER_CYCLE[Number.isFinite(normalized) ? normalized : 0];
+}
+
+// chart/render/chart-view-markers.ts
+function summaryMarkers(source2, group2, seriesPosition) {
+  if (!["line", "scatter", "radar"].includes(group2.kind)) return {};
+  const enabled2 = group2.kind === "line" ? group2.marker === true : group2.kind === "radar" ? group2.radarStyle === "marker" : !["line", "smooth", "none"].includes(group2.scatterStyle ?? "marker");
+  const symbol = source2.marker?.symbol;
+  const marker4 = {
+    ...source2.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source2.marker || enabled2 ? automaticMarkerSymbol(source2.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point2 of source2.dataPoints) {
+    if (point2.index === void 0 || !point2.marker) continue;
+    const override = point2.marker;
+    pointMarkers[point2.index] = {
+      ...marker4,
+      ...override,
+      ...override.symbol === "auto" || !source2.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source2.index ?? seriesPosition) } : {},
+      ...marker4.spPr || override.spPr ? {
+        spPr: {
+          ...marker4.spPr,
+          ...override.spPr,
+          ...marker4.spPr?.line || override.spPr?.line ? { line: { ...marker4.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker: marker4, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
+function seriesMarkerViews(source2, drawingColor2) {
+  const fillColor = (fill) => fill?.kind === "none" ? "none" : fill?.kind === "solid" ? drawingColor2(fill.color) : void 0;
+  const resolve3 = (marker4) => {
+    const fill = fillColor(marker4.spPr?.fill);
+    const stroke = fillColor(marker4.spPr?.line?.fill);
+    const width = marker4.spPr?.line?.widthEmu;
+    return {
+      ...marker4.symbol !== void 0 ? { symbol: marker4.symbol } : {},
+      ...marker4.size !== void 0 ? { size: marker4.size } : {},
+      ...fill !== void 0 ? { fill } : {},
+      ...stroke !== void 0 ? { stroke } : {},
+      ...width !== void 0 ? { strokeWidth: width / 9525 } : {}
+    };
+  };
+  return {
+    ...source2.marker ? { marker: resolve3(source2.marker) } : {},
+    ...source2.pointMarkers ? {
+      pointMarkers: Object.fromEntries(
+        Object.entries(source2.pointMarkers).map(([i2, marker4]) => [i2, resolve3(marker4)])
+      )
+    } : {}
+  };
+}
 
 // chart/render/summary-analysis.ts
 function summaryTrendline(source2) {
@@ -16470,17 +16538,17 @@ function summaryAnalysis(series) {
 }
 
 // chart/render/summary-labels.ts
-function level(options, custom) {
+function level(options2, custom) {
   const out = {};
-  if (options.deleted !== void 0) out.deleted = options.deleted;
-  if (options.showValue !== void 0) out.showValue = options.showValue;
-  if (options.showCategoryName !== void 0) out.showCategory = options.showCategoryName;
-  if (options.showSeriesName !== void 0) out.showSeriesName = options.showSeriesName;
-  if (options.showPercent !== void 0) out.showPercent = options.showPercent;
-  if (options.showBubbleSize !== void 0) out.showBubbleSize = options.showBubbleSize;
-  if (options.separator !== void 0) out.separator = options.separator;
-  if (options.position) out.position = options.position;
-  if (options.numberFormat?.formatCode) out.numberFormat = options.numberFormat.formatCode;
+  if (options2.deleted !== void 0) out.deleted = options2.deleted;
+  if (options2.showValue !== void 0) out.showValue = options2.showValue;
+  if (options2.showCategoryName !== void 0) out.showCategory = options2.showCategoryName;
+  if (options2.showSeriesName !== void 0) out.showSeriesName = options2.showSeriesName;
+  if (options2.showPercent !== void 0) out.showPercent = options2.showPercent;
+  if (options2.showBubbleSize !== void 0) out.showBubbleSize = options2.showBubbleSize;
+  if (options2.separator !== void 0) out.separator = options2.separator;
+  if (options2.position) out.position = options2.position;
+  if (options2.numberFormat?.formatCode) out.numberFormat = options2.numberFormat.formatCode;
   if (custom?.text !== void 0) out.text = custom.text;
   return out;
 }
@@ -16587,7 +16655,10 @@ function extraGroups(chartSpace, firstType) {
     const type = group2.kind === "bar" ? "column" : group2.kind;
     const entry3 = {
       chartType: type,
-      series: group2.series.map((source2) => chartSummarySeries(source2, type, group2.dataLabels)),
+      series: group2.series.map((source2, index3) => ({
+        ...chartSummarySeries(source2, type, group2.dataLabels),
+        ...summaryMarkers(source2, group2, index3)
+      })),
       secondary: valueAxisId(chartSpace, group2.axisIds) !== primary
     };
     if (group2.grouping && GROUPINGS.has(group2.grouping))
@@ -16605,13 +16676,16 @@ function chartSummaryFromSpace(chartSpace, extras = {}) {
   const group2 = chartSpace.plotArea.groups[0];
   let chartType = group2 ? GROUP_TYPES[group2.kind] : "column";
   if (chartType === "bar" && group2?.barDirection !== "bar") chartType = "column";
-  const series = (group2?.series ?? []).map(
-    (source2) => chartSummarySeries(source2, chartType, group2?.dataLabels)
-  );
+  const series = (group2?.series ?? []).map((source2, index3) => ({
+    ...chartSummarySeries(source2, chartType, group2?.dataLabels),
+    ...group2 ? summaryMarkers(source2, group2, index3) : {}
+  }));
   const summary = {
     chartType,
     series,
-    showLegend: chartSpace.legend !== void 0
+    showLegend: chartSpace.legend !== void 0,
+    axes: chartSpace.plotArea.axes,
+    axisIds: group2?.axisIds ?? []
   };
   const combined = extraGroups(chartSpace, chartType);
   if (combined.length) summary.extraGroups = combined;
@@ -16963,14 +17037,14 @@ function* units(raw2) {
     exp2++;
   }
 }
-function niceScale(dataMin, dataMax, options = {}) {
-  const maxIntervals = Math.max(1, options.maxIntervals ?? 10);
+function niceScale(dataMin, dataMax, options2 = {}) {
+  const maxIntervals = Math.max(1, options2.maxIntervals ?? 10);
   let lo = Number.isFinite(dataMin) ? dataMin : 0;
   let hi = Number.isFinite(dataMax) ? dataMax : 0;
   if (lo > hi) [lo, hi] = [hi, lo];
   if (lo === hi) {
     if (lo === 0) hi = 1;
-    else if (options.noZero) {
+    else if (options2.noZero) {
       const pad8 = Math.abs(lo) * 0.1 || 1;
       lo -= pad8;
       hi += pad8;
@@ -16979,7 +17053,7 @@ function niceScale(dataMin, dataMax, options = {}) {
   }
   let fixedLo = false;
   let fixedHi = false;
-  if (!options.noZero) {
+  if (!options2.noZero) {
     if (lo >= 0 && hi - lo >= hi / 6) {
       lo = 0;
       fixedLo = true;
@@ -17019,6 +17093,194 @@ function formatAxisValue(value3, percent = false) {
   return `${v < 0 ? "-" : ""}${grouped}${frac ? `.${frac}` : ""}`;
 }
 
+// chart/axis-range.ts
+function computeLogValueRange(series, logBase) {
+  const allValues = series.flatMap((item) => item.values).filter((value3) => value3 !== null && Number.isFinite(value3) && value3 > 0);
+  if (allValues.length === 0) {
+    return { min: 1, max: logBase, span: 1, logScale: true, logBase };
+  }
+  const dataMin = Math.min(...allValues);
+  const dataMax = Math.max(...allValues);
+  const logMin = Math.floor(Math.log(dataMin) / Math.log(logBase));
+  const logMax = Math.ceil(Math.log(dataMax) / Math.log(logBase));
+  const min = logBase ** logMin;
+  const max = logBase ** Math.max(logMax, logMin + 1);
+  return {
+    min,
+    max,
+    span: Math.max(Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase), 1),
+    logScale: true,
+    logBase
+  };
+}
+function withAxisBounds(automatic, axis, logBase) {
+  const validMin = typeof axis?.min === "number" && Number.isFinite(axis.min) && (!logBase || axis.min > 0) ? axis.min : void 0;
+  const validMax = typeof axis?.max === "number" && Number.isFinite(axis.max) && (!logBase || axis.max > 0) ? axis.max : void 0;
+  const min = validMin ?? automatic.min;
+  let max = validMax ?? automatic.max;
+  const majorUnit = validMin === void 0 && validMax === void 0 ? automatic.majorUnit : void 0;
+  if (max <= min) {
+    max = logBase ? min * logBase : min + 1;
+  }
+  const span3 = logBase ? Math.log(max) / Math.log(logBase) - Math.log(min) / Math.log(logBase) : max - min;
+  return {
+    min,
+    max,
+    span: Math.max(span3, Number.EPSILON),
+    ...majorUnit !== void 0 ? { majorUnit } : {},
+    ...logBase ? { logScale: true, logBase } : {},
+    ...axis?.orientation === "maxMin" ? { reverseOrder: true } : {}
+  };
+}
+
+// chart/axis-ticks.ts
+var LOG_EXPONENT_TOLERANCE = 1e-12;
+function generateLogTicks(range2) {
+  if (!range2.logScale || !range2.logBase) {
+    return [];
+  }
+  const base2 = range2.logBase;
+  const logMin = Math.log(range2.min) / Math.log(base2);
+  const logMax = Math.log(range2.max) / Math.log(base2);
+  const firstExponent = Math.ceil(logMin - LOG_EXPONENT_TOLERANCE);
+  const lastExponent = Math.floor(logMax + LOG_EXPONENT_TOLERANCE);
+  if (lastExponent < firstExponent) {
+    return range2.min === range2.max ? [range2.min] : [range2.min, range2.max];
+  }
+  return Array.from(
+    { length: lastExponent - firstExponent + 1 },
+    (_unused, index3) => base2 ** (firstExponent + index3)
+  );
+}
+function generateIntervalTicks(range2, unit3) {
+  if (!Number.isFinite(unit3) || unit3 <= 0 || range2.logScale) {
+    return [];
+  }
+  const tolerance = Math.max(1, Math.abs(range2.min), Math.abs(range2.max)) * 1e-12;
+  const first3 = Math.ceil((range2.min - tolerance) / unit3);
+  const last = Math.floor((range2.max + tolerance) / unit3);
+  const count2 = Math.min(Math.max(last - first3 + 1, 0), 2e3);
+  return Array.from({ length: count2 }, (_, index3) => (first3 + index3) * unit3);
+}
+function generateAxisTicks(range2, axis, defaultIntervals) {
+  if (range2.logScale && range2.logBase) {
+    return generateLogTicks(range2);
+  }
+  const explicit = generateIntervalTicks(range2, axis?.majorUnit ?? 0);
+  if (explicit.length > 0) {
+    return explicit;
+  }
+  const automatic = generateIntervalTicks(range2, range2.majorUnit ?? 0);
+  if (automatic.length > 0) {
+    return automatic;
+  }
+  return Array.from(
+    { length: defaultIntervals + 1 },
+    (_, index3) => range2.min + range2.span / defaultIntervals * index3
+  );
+}
+function generateMinorAxisTicks(range2, axis) {
+  const minor = generateIntervalTicks(range2, axis?.minorUnit ?? 0);
+  if (minor.length === 0) {
+    return [];
+  }
+  const majorUnit = axis?.majorUnit;
+  if (!majorUnit || !Number.isFinite(majorUnit) || majorUnit <= 0) {
+    return minor;
+  }
+  const tolerance = Math.max(1, Math.abs(range2.min), Math.abs(range2.max)) * 1e-10;
+  return minor.filter(
+    (value3) => Math.abs(value3 / majorUnit - Math.round(value3 / majorUnit)) > tolerance
+  );
+}
+
+// chart/render/chart-view-axes.ts
+function options(axis) {
+  return {
+    ...axis.scaling,
+    ...axis.scaling.logBase === void 0 ? {} : { logScale: true },
+    ...axis.majorUnit === void 0 ? {} : { majorUnit: axis.majorUnit },
+    ...axis.minorUnit === void 0 ? {} : { minorUnit: axis.minorUnit }
+  };
+}
+function applyChartAxes(model, chart, color2) {
+  if (!chart.axes?.length) return;
+  const axes2 = chart.axes;
+  const linked = axes2.filter((axis) => axis.id !== void 0 && chart.axisIds?.includes(axis.id));
+  const candidates = linked.length ? linked : axes2;
+  const xy = model.type === "scatter" || model.type === "bubble";
+  const value3 = candidates.find((axis) => axis.kind === "val" && !["b", "t"].includes(axis.position ?? "")) ?? candidates.find((axis) => axis.kind === "val");
+  const category = candidates.find(
+    (axis) => xy ? axis.kind === "val" && axis !== value3 : axis.kind === "cat" || axis.kind === "date"
+  );
+  const secondary = axes2.find((axis) => axis.kind === "val" && axis !== value3 && axis !== category);
+  const paint2 = (shape2) => {
+    const ln2 = shape2?.line;
+    const fill = ln2?.fill;
+    const resolved = fill?.kind === "none" ? "none" : color2(fill?.kind === "solid" ? fill.color : void 0);
+    return {
+      ...resolved === void 0 ? {} : { color: resolved },
+      ...ln2?.widthEmu === void 0 ? {} : { width: ln2.widthEmu / EMU_PER_PIXEL },
+      ...ln2?.dash === void 0 ? {} : { dash: ln2.dash }
+    };
+  };
+  const bind = (axis, scale2, values2) => {
+    const opts = options(axis);
+    const automatic = opts.logScale ? computeLogValueRange(
+      [{ values: values2 ?? [] }],
+      opts.logBase && Number.isFinite(opts.logBase) && opts.logBase > 1 ? opts.logBase : 10
+    ) : {
+      min: scale2?.min ?? 0,
+      max: scale2?.max ?? 1,
+      span: (scale2?.max ?? 1) - (scale2?.min ?? 0),
+      ...scale2 ? { majorUnit: scale2.majorUnit } : {}
+    };
+    const logBase = automatic.logBase;
+    const range2 = withAxisBounds(automatic, opts, logBase);
+    if (scale2) {
+      scale2.min = range2.min;
+      scale2.max = range2.max;
+      scale2.ticks = generateAxisTicks(range2, opts, 5);
+    }
+    return {
+      source: axis,
+      range: range2,
+      minorTicks: generateMinorAxisTicks(range2, opts),
+      line: paint2(axis.spPr),
+      majorGrid: paint2(axis.majorGridlinesSpPr),
+      minorGrid: paint2(axis.minorGridlinesSpPr)
+    };
+  };
+  const out = {};
+  if (value3)
+    out.value = bind(
+      value3,
+      model.valueAxis,
+      [
+        ...model.series,
+        ...model.extraGroups?.filter((g2) => !g2.secondary).flatMap((g2) => g2.series) ?? []
+      ].flatMap((s) => s.values)
+    );
+  if (category)
+    out.category = bind(
+      category,
+      model.xAxis ?? {
+        min: 0,
+        max: Math.max(1, model.categories.length - 1),
+        majorUnit: 1,
+        ticks: []
+      },
+      model.series.flatMap((s) => s.xValues ?? [])
+    );
+  if (secondary)
+    out.secondary = bind(
+      secondary,
+      model.secondaryAxis,
+      model.extraGroups?.filter((g2) => g2.secondary).flatMap((g2) => g2.series.flatMap((s) => s.values))
+    );
+  model.axes = out;
+}
+
 // chart/render/chart-view-analysis.ts
 function strokeOf(line3, fallback, resolve3) {
   if (line3?.fill?.kind === "none") return void 0;
@@ -17068,15 +17330,15 @@ function seriesName(series, index3, evaluateRef2) {
   const fromRef = resolveRef(series.nameRef, evaluateRef2)?.map(toText).filter((t) => t !== "").join(" ");
   return fromRef || series.name || `Series${index3 + 1}`;
 }
-function seriesContext(chart, theme3, options) {
+function seriesContext(chart, theme3, options2) {
   const scheme = chartColorScheme(theme3);
   const resolver = { scheme: (name3) => scheme[name3] };
   return {
     theme: theme3,
     scheme,
     palette: chart.colorPalette === void 0 ? void 0 : findChartColorPalette(chart.colorPalette),
-    evaluateRef: options.evaluateRef ?? (() => []),
-    seriesColor: options.seriesColor,
+    evaluateRef: options2.evaluateRef ?? (() => []),
+    seriesColor: options2.seriesColor,
     drawingColor: (color2) => color2 && drawingColorCss(resolveDrawingColor(color2, resolver, { transformOrder: "document" })),
     gradient: (fill) => fill?.kind === "gradient" ? resolveChartGradient(
       fill,
@@ -17102,7 +17364,11 @@ function seriesView(ctx, s, index3, total2, categoriesOf) {
     })
   );
   if (Object.keys(points).length) view.pointGradients = points;
-  Object.assign(view, analysisView(s, color2, ctx.drawingColor));
+  Object.assign(
+    view,
+    analysisView(s, color2, ctx.drawingColor),
+    seriesMarkerViews(s, ctx.drawingColor)
+  );
   return view;
 }
 
@@ -17397,11 +17663,11 @@ function histogramView(chart, model) {
   const first3 = model.series[0];
   if (!first3) return;
   const raw2 = first3.values.map((v) => v ?? Number.NaN);
-  const options = chart.histogram ?? {};
-  const bins = options.aggregateByCategory ? aggregateByCategory(
+  const options2 = chart.histogram ?? {};
+  const bins = options2.aggregateByCategory ? aggregateByCategory(
     first3.values.map((v) => v ?? 0),
     model.categories
-  ) : computeHistogramBins(raw2, options, formatAxisValue);
+  ) : computeHistogramBins(raw2, options2, formatAxisValue);
   model.categories = bins.map((bin) => bin.label);
   first3.values = bins.map((bin) => bin.value);
   model.barGapWidth = 0;
@@ -17425,11 +17691,11 @@ var SUPPORTED = /* @__PURE__ */ new Set([
   "treemap",
   "sunburst"
 ]);
-function chartSummaryView(chart, theme3, options = {}) {
+function chartSummaryView(chart, theme3, options2 = {}) {
   const type = chart.chartType;
   const radial = type === "pie" || type === "doughnut";
   const byPoint = radial || type === "treemap" || type === "sunburst";
-  const ctx = seriesContext(chart, theme3, options);
+  const ctx = seriesContext(chart, theme3, options2);
   const { palette, scheme, drawingColor: drawingColor2 } = ctx;
   const grouping = chart.grouping ?? (type === "bar" || type === "column" ? "clustered" : "standard");
   const rawCategories = [];
@@ -17515,6 +17781,7 @@ function chartSummaryView(chart, theme3, options = {}) {
   else if (!byPoint) model.valueAxis = valueAxis(model);
   applyDataLabels(model, chart.series, extra);
   chartExtraAxes(model);
+  applyChartAxes(model, chart, ctx.drawingColor);
   return model;
 }
 
@@ -22184,8 +22451,8 @@ function createWorksheet(name3, sheetId5) {
     preserved: /* @__PURE__ */ new Map()
   };
 }
-function createWorkbook(options = {}) {
-  const names = options.sheets?.length ? options.sheets : ["Sheet1"];
+function createWorkbook(options2 = {}) {
+  const names = options2.sheets?.length ? options2.sheets : ["Sheet1"];
   return {
     sheets: names.map((name3, index3) => createWorksheet(name3, index3 + 1)),
     styles: [defaultCellStyle()],
@@ -23400,15 +23667,15 @@ function renderAbs(v, section3, generalWidth) {
   }
   return { text: text8, zero: general === "0" };
 }
-function hashFill(options) {
-  const width = options.width ?? 0;
-  const one2 = options.measure ? options.measure("#") : 1;
+function hashFill(options2) {
+  const width = options2.width ?? 0;
+  const one2 = options2.measure ? options2.measure("#") : 1;
   return "#".repeat(Math.max(1, Math.floor(one2 > 0 ? width / one2 : width)));
 }
-function fitNumber(value3, format5, options) {
-  const date1904 = options.date1904 ?? false;
-  const width = options.width ?? 0;
-  const fits = (text8) => (options.measure ? options.measure(text8) : text8.length) <= width;
+function fitNumber(value3, format5, options2) {
+  const date1904 = options2.date1904 ?? false;
+  const width = options2.width ?? 0;
+  const fits = (text8) => (options2.measure ? options2.measure(text8) : text8.length) <= width;
   const first3 = formatNumber(value3, format5, date1904);
   if (fits(first3.text) || first3.text === OVERFLOW_TEXT) return first3;
   const choice2 = chooseSection(compileFormat(format5), value3);
@@ -23419,7 +23686,7 @@ function fitNumber(value3, format5, options) {
       if (fits(next.text)) return next;
     }
   }
-  const fill = hashFill(options);
+  const fill = hashFill(options2);
   return first3.color ? { text: fill, color: first3.color } : { text: fill };
 }
 function formatNumber(value3, format5, date1904, generalWidth) {
@@ -23441,13 +23708,13 @@ function formatNumber(value3, format5, date1904, generalWidth) {
   const minus = value3 < 0 && !abs2 && !zero;
   return result(minus ? `-${text8}` : text8, section3);
 }
-function formatValue(value3, format5, options = {}) {
+function formatValue(value3, format5, options2 = {}) {
   if (value3 === null) return { text: "" };
   if (typeof value3 === "boolean") return { text: value3 ? "TRUE" : "FALSE" };
   if (typeof value3 === "string") return formatText(value3, compileFormat(format5).text);
   if (isCellError(value3)) return { text: value3.error };
-  if (options.width !== void 0) return fitNumber(value3, format5, options);
-  return formatNumber(value3, format5, options.date1904 ?? false);
+  if (options2.width !== void 0) return fitNumber(value3, format5, options2);
+  return formatNumber(value3, format5, options2.date1904 ?? false);
 }
 function isDateFormat(format5) {
   return compileFormat(format5).isDate;
@@ -23658,7 +23925,7 @@ function parseFractionInput(text8) {
     numFmt: den < 10 ? "# ?/?" : "# ??/??"
   };
 }
-function parseCellInput(text8, options = {}) {
+function parseCellInput(text8, options2 = {}) {
   if (text8 === "") return { value: null };
   if (text8.startsWith("=") && text8.length > 1) return { value: null, formula: text8.slice(1) };
   if (text8.startsWith("'")) return { value: text8.slice(1) };
@@ -23669,7 +23936,7 @@ function parseCellInput(text8, options = {}) {
     if (upper2 === "TRUE" || upper2 === "FALSE") return { value: upper2 === "TRUE" };
     if (isErrorCode(upper2)) return { value: cellError(upper2) };
   }
-  const parsed = parseNumberInput(trimmed2) ?? parseFractionInput(trimmed2) ?? parseDateTimeInput(trimmed2, options.date1904 ?? false);
+  const parsed = parseNumberInput(trimmed2) ?? parseFractionInput(trimmed2) ?? parseDateTimeInput(trimmed2, options2.date1904 ?? false);
   if (!parsed) return { value: text8 };
   return parsed.numFmt ? { value: parsed.value, numFmt: parsed.numFmt } : { value: parsed.value };
 }
@@ -24611,7 +24878,7 @@ var pivotColumnFields = (pivot) => [
 // i18n/locale.ts
 var SUPPORTED_OFFICE_LOCALES = ["en", "fr", "de", "es", "zh-CN"];
 var DEFAULT_REJECTED_SUBTAGS = ["hant", "tw", "hk", "mo"];
-function normalizeLocale(input, supported2, fallback, options = {}) {
+function normalizeLocale(input, supported2, fallback, options2 = {}) {
   const parts = (input ?? "").trim().toLowerCase().split(/[-_]/).filter(Boolean);
   const language = parts[0];
   if (!language) return fallback;
@@ -24620,7 +24887,7 @@ function normalizeLocale(input, supported2, fallback, options = {}) {
   if (exact) return exact;
   const base2 = find3(language);
   if (base2) return base2;
-  const rejected = options.rejectedSubtags ?? DEFAULT_REJECTED_SUBTAGS;
+  const rejected = options2.rejectedSubtags ?? DEFAULT_REJECTED_SUBTAGS;
   if (parts.slice(1).some((part) => rejected.includes(part))) return fallback;
   return supported2.find((item) => item.toLowerCase().split("-")[0] === language && item.includes("-")) ?? fallback;
 }
@@ -24820,8 +25087,8 @@ function trimmedCaptions(caps) {
   }
   return Object.keys(out).length ? out : void 0;
 }
-function authoredCaptions(options) {
-  const own2 = options.captions ?? localizedPivotCaptions(options.locale);
+function authoredCaptions(options2) {
+  const own2 = options2.captions ?? localizedPivotCaptions(options2.locale);
   return own2 && Object.keys(own2).length ? structuredClone(own2) : void 0;
 }
 
@@ -28920,6 +29187,8 @@ function parseChart(xml, anchor, partName, name3) {
     showLegend: summary.showLegend,
     partName
   };
+  if (summary.axes) object.axes = summary.axes;
+  if (summary.axisIds) object.axisIds = summary.axisIds;
   if (summary.grouping) object.grouping = summary.grouping;
   if (summary.barGapWidth !== void 0) object.barGapWidth = summary.barGapWidth;
   if (summary.barOverlap !== void 0) object.barOverlap = summary.barOverlap;
@@ -29464,9 +29733,9 @@ function readPrintOptions(node3) {
   for (const key2 of KEYS) if (boolAttr(node3, key2)) out[key2] = true;
   return Object.keys(out).length ? out : void 0;
 }
-function printOptionsXml(options) {
-  if (!options) return "";
-  const attrs3 = KEYS.filter((key2) => options[key2]).map((key2) => ` ${key2}="1"`);
+function printOptionsXml(options2) {
+  if (!options2) return "";
+  const attrs3 = KEYS.filter((key2) => options2[key2]).map((key2) => ` ${key2}="1"`);
   return attrs3.length ? `<printOptions${attrs3.join("")}/>` : "";
 }
 
@@ -30253,10 +30522,10 @@ var PackageWriter = class {
   async build() {
     const zip = new JSZip__default.default();
     const date2 = new Date(Date.UTC(1980, 0, 1));
-    const options = { date: date2, createFolders: false };
-    zip.file("[Content_Types].xml", this.contentTypesXml(), options);
+    const options2 = { date: date2, createFolders: false };
+    zip.file("[Content_Types].xml", this.contentTypesXml(), options2);
     const names = [...this.parts.keys()].sort((a2, b) => rank2(a2) - rank2(b) || a2.localeCompare(b));
-    for (const name3 of names) zip.file(name3, this.parts.get(name3) ?? "", options);
+    for (const name3 of names) zip.file(name3, this.parts.get(name3) ?? "", options2);
     return zip.generateAsync({
       type: "uint8array",
       compression: "DEFLATE",
@@ -31668,7 +31937,7 @@ var int3 = (value3) => Math.trunc(num2(value3));
 var optNum = (args, i2, fallback) => i2 < args.length ? num2(args[i2]) : fallback;
 var optBool = (args, i2, fallback) => i2 < args.length ? bool(args[i2]) : fallback;
 var omitted = (args, i2) => i2 >= args.length || args[i2] === null;
-function collectNumbers(ctx, args, options = {}) {
+function collectNumbers(ctx, args, options2 = {}) {
   const out = [];
   for (const arg of args) {
     ctx.forEach(arg, (value3, kind) => {
@@ -31677,7 +31946,7 @@ function collectNumbers(ctx, args, options = {}) {
         return;
       }
       if (isError(value3)) {
-        if (options.ignoreErrors) return;
+        if (options2.ignoreErrors) return;
         throw new ErrorSignal(value3);
       }
       if (kind === "direct") {
@@ -31685,7 +31954,7 @@ function collectNumbers(ctx, args, options = {}) {
         else out.push(toNumber2(value3));
         return;
       }
-      if (options.includeAll) {
+      if (options2.includeAll) {
         if (typeof value3 === "boolean") out.push(value3 ? 1 : 0);
         else if (typeof value3 === "string") out.push(0);
       }
@@ -36637,11 +36906,11 @@ var SUM_FUNCTIONS = [
     255,
     (args, ctx) => {
       const code = int3(args[0]);
-      const options = int3(args[1]);
-      if (code < 1 || code > 19 || options < 0 || options > 7) fail(ERR.VALUE);
-      const skipNested = options <= 3;
-      const skipHidden = options === 1 || options === 3 || options === 5 || options === 7;
-      const skipErrors = options === 2 || options === 3 || options === 6 || options === 7;
+      const options2 = int3(args[1]);
+      if (code < 1 || code > 19 || options2 < 0 || options2 > 7) fail(ERR.VALUE);
+      const skipNested = options2 <= 3;
+      const skipHidden = options2 === 1 || options2 === 3 || options2 === 5 || options2 === 7;
+      const skipErrors = options2 === 2 || options2 === 3 || options2 === 6 || options2 === 7;
       if (code >= 14) {
         if (args.length !== 4) fail(ERR.VALUE);
         const values2 = subtotalValues(ctx, [args[2] ?? null], skipHidden, skipErrors, skipNested);
@@ -41203,9 +41472,9 @@ var Deferred = class {
 };
 var MAX_NESTED_COMPUTE = 40;
 var EngineHost = class {
-  constructor(workbook, options) {
+  constructor(workbook, options2) {
     this.workbook = workbook;
-    this.options = options;
+    this.options = options2;
   }
   workbook;
   options;
@@ -42302,8 +42571,8 @@ var Engine = class extends EngineStructure {
     return [...this.cycles].map(({ sheet, row: row3, col }) => ({ sheet, row: row3, col }));
   }
 };
-function createCalcEngine(workbook, options = {}) {
-  return new Engine(workbook, options);
+function createCalcEngine(workbook, options2 = {}) {
+  return new Engine(workbook, options2);
 }
 
 // xlsx/formula/move.ts
@@ -48661,15 +48930,15 @@ function pasteAt(ctx, s, at2, payload, request) {
 function pasteSelection(ctx, sheet, selection, payload, request) {
   const dest = normalizeRange(selection);
   const clip = typeof payload === "string" ? { tsv: payload, html: "", cells: cellsFromText(ctx.workbook, payload) } : payload;
-  const options = resolvePasteOptions(request);
-  if (options.mode === "widths")
-    return pasteWidths(ctx, sheet, dest, clip.cells, options.transpose, !!clip.cut);
-  const height = options.transpose ? clip.cells.cols : clip.cells.rows;
-  const width = options.transpose ? clip.cells.rows : clip.cells.cols;
+  const options2 = resolvePasteOptions(request);
+  if (options2.mode === "widths")
+    return pasteWidths(ctx, sheet, dest, clip.cells, options2.transpose, !!clip.cut);
+  const height = options2.transpose ? clip.cells.cols : clip.cells.rows;
+  const width = options2.transpose ? clip.cells.rows : clip.cells.cols;
   const rows = dest.end.row - dest.start.row + 1;
   const cols = dest.end.col - dest.start.col + 1;
   if (clip.cut || !height || !width || rows === 1 && cols === 1 || dest.start.row === 0 && dest.end.row === MAX_ROW || dest.start.col === 0 && dest.end.col === MAX_COL)
-    return pasteAt(ctx, sheet, dest.start, clip, options);
+    return pasteAt(ctx, sheet, dest.start, clip, options2);
   if (rows % height || cols % width)
     throw new RangeError("The copy and paste areas are not compatible sizes.");
   if (rows * cols > 25e4) throw new RangeError("The selected paste area is too large.");
@@ -48689,16 +48958,16 @@ function pasteSelection(ctx, sheet, selection, payload, request) {
     () => {
       for (let row3 = dest.start.row; row3 <= dest.end.row; row3 += height)
         for (let col = dest.start.col; col <= dest.end.col; col += width)
-          pasteAt(tileContext, sheet, { row: row3, col }, tileClip, options);
-      if (["all", "formats", "noBorders", "mergeFormats"].includes(options.mode))
+          pasteAt(tileContext, sheet, { row: row3, col }, tileClip, options2);
+      if (["all", "formats", "noBorders", "mergeFormats"].includes(options2.mode))
         pasteConditionalFormats(
           sheetAt(ctx.workbook, sheet),
           dest,
           clip.cells,
-          options.transpose,
-          options.skipBlanks,
+          options2.transpose,
+          options2.skipBlanks,
           void 0,
-          options.mode === "mergeFormats"
+          options2.mode === "mergeFormats"
         );
       return dest;
     },
@@ -49149,7 +49418,7 @@ function numberInputText(value3, numFmt, date1904 = false) {
   if (/%/.test(numFmt.replace(/"[^"]*"|\\./g, ""))) return `${plainNumber(value3 * 100)}%`;
   return plainNumber(value3);
 }
-function formulaBarText(workbook, cell, options = {}) {
+function formulaBarText(workbook, cell, options2 = {}) {
   if (!cell) return "";
   if (cell.formula !== void 0) return `=${cell.formula}`;
   const value3 = cell.value;
@@ -49163,7 +49432,7 @@ function formulaBarText(workbook, cell, options = {}) {
       workbook.date1904
     );
   const text8 = cell.richText?.length ? cell.richText.map((run2) => run2.text).join("") : value3;
-  if (text8 === "" || options.quote === false) return text8;
+  if (text8 === "" || options2.quote === false) return text8;
   const parsed = parseCellInput(text8, { date1904: workbook.date1904 });
   const literal2 = parsed.formula === void 0 && parsed.value === text8;
   return literal2 ? text8 : `'${text8}`;
@@ -49789,9 +50058,9 @@ var SessionCalculator = class {
 // xlsx/edit/goal-solver.ts
 var DEFAULT_GOAL_ITERATIONS = 100;
 var DEFAULT_GOAL_MAX_CHANGE = 1e-3;
-function solveGoal(f6, goal, start, options = {}) {
-  const maxIterations = options.maxIterations ?? DEFAULT_GOAL_ITERATIONS;
-  const tolerance = options.maxChange ?? DEFAULT_GOAL_MAX_CHANGE;
+function solveGoal(f6, goal, start, options2 = {}) {
+  const maxIterations = options2.maxIterations ?? DEFAULT_GOAL_ITERATIONS;
+  const tolerance = options2.maxChange ?? DEFAULT_GOAL_MAX_CHANGE;
   let iterations = 0;
   let best;
   let negative;
@@ -50268,10 +50537,10 @@ function columnOverrides(sheet, mdw, defaultPx) {
   }
   return out;
 }
-function createGridMetrics(sheet, options = {}) {
-  const zoom = zoomPercent(options.zoom ?? sheet.view.zoom);
+function createGridMetrics(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
   const factor = zoom / 100;
-  const mdw = options.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
+  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
   const scale2 = (px2) => px2 > 0 ? Math.max(1, Math.round(px2 * factor)) : 0;
   const defaultColPx = defaultColumnPixels(sheet.defaultColWidth, mdw);
   const colOverrides = [...columnOverrides(sheet, mdw, defaultColPx)].map(
@@ -50293,8 +50562,8 @@ function createGridMetrics(sheet, options = {}) {
   for (const merge2 of sheet.merges) lastColUsed = Math.max(lastColUsed, merge2.end.col);
   for (const info of sheet.columns)
     if (info.max < MAX_COL) lastColUsed = Math.max(lastColUsed, info.max);
-  const lastRow = Math.min(MAX_ROW, lastRowUsed + (options.extraRows ?? 50));
-  const lastCol = Math.min(MAX_COL, lastColUsed + (options.extraCols ?? 20));
+  const lastRow = Math.min(MAX_ROW, lastRowUsed + (options2.extraRows ?? 50));
+  const lastCol = Math.min(MAX_COL, lastColUsed + (options2.extraCols ?? 20));
   return {
     zoom,
     lastRow,
@@ -50514,37 +50783,37 @@ function writePivot(ctx, s, pivot, old, label2, inside2) {
   );
 }
 var startRow = (range2, offset2) => range2.start.row + offset2;
-function createPivotTable(ctx, s, destination, options) {
-  const data = pivotSourceData(ctx.workbook, s, options.source);
-  const name3 = options.name ?? uniqueName(ctx);
+function createPivotTable(ctx, s, destination, options2) {
+  const data = pivotSourceData(ctx.workbook, s, options2.source);
+  const name3 = options2.name ?? uniqueName(ctx);
   checkName2(ctx, name3);
-  const aggregate2 = options.aggregate ?? "sum";
-  const captions = authoredCaptions(options);
+  const aggregate2 = options2.aggregate ?? "sum";
+  const captions = authoredCaptions(options2);
   const pivot = {
     ...data,
     ...captions ? { captions } : {},
     name: name3,
-    rowField: options.rowField,
-    layout: options.layout ?? "tabular",
-    subtotalPosition: options.subtotalPosition ?? (options.layout && options.layout !== "tabular" ? "top" : "bottom"),
-    ...options.secondRowField ? { secondRowField: options.secondRowField } : {},
-    ...options.secondRowField && options.moreRowFields?.length ? { moreRowFields: [...options.moreRowFields] } : {},
-    ...options.fieldSubtotals?.length ? { fieldSubtotals: normalizedFieldSubtotals(options.fieldSubtotals) } : {},
-    ...options.dateGroups?.length ? { dateGroups: structuredClone(options.dateGroups) } : {},
+    rowField: options2.rowField,
+    layout: options2.layout ?? "tabular",
+    subtotalPosition: options2.subtotalPosition ?? (options2.layout && options2.layout !== "tabular" ? "top" : "bottom"),
+    ...options2.secondRowField ? { secondRowField: options2.secondRowField } : {},
+    ...options2.secondRowField && options2.moreRowFields?.length ? { moreRowFields: [...options2.moreRowFields] } : {},
+    ...options2.fieldSubtotals?.length ? { fieldSubtotals: normalizedFieldSubtotals(options2.fieldSubtotals) } : {},
+    ...options2.dateGroups?.length ? { dateGroups: structuredClone(options2.dateGroups) } : {},
     ...ctx.workbook.date1904 ? { date1904: true } : {},
-    ...options.subtotals !== void 0 ? { subtotals: options.subtotals } : {},
-    ...options.repeatLabels !== void 0 ? { repeatLabels: options.repeatLabels } : {},
-    valueField: options.valueField,
+    ...options2.subtotals !== void 0 ? { subtotals: options2.subtotals } : {},
+    ...options2.repeatLabels !== void 0 ? { repeatLabels: options2.repeatLabels } : {},
+    valueField: options2.valueField,
     aggregate: aggregate2,
-    valueCaption: pivotCaption(aggregate2, options.valueField, { captions }),
-    ...options.pageFilter !== void 0 ? { pageFilter: structuredClone(options.pageFilter) } : {},
-    ...options.fieldGroups?.length ? { fieldGroups: structuredClone(options.fieldGroups) } : {},
-    ...options.valuesAxis !== void 0 ? { valuesAxis: options.valuesAxis } : {},
-    ...options.valuesPosition !== void 0 ? { valuesPosition: options.valuesPosition } : {},
-    ...options.additionalValues ? { additionalValues: normalizedPivotMeasures(options.additionalValues, { captions }) } : {},
+    valueCaption: pivotCaption(aggregate2, options2.valueField, { captions }),
+    ...options2.pageFilter !== void 0 ? { pageFilter: structuredClone(options2.pageFilter) } : {},
+    ...options2.fieldGroups?.length ? { fieldGroups: structuredClone(options2.fieldGroups) } : {},
+    ...options2.valuesAxis !== void 0 ? { valuesAxis: options2.valuesAxis } : {},
+    ...options2.valuesPosition !== void 0 ? { valuesPosition: options2.valuesPosition } : {},
+    ...options2.additionalValues ? { additionalValues: normalizedPivotMeasures(options2.additionalValues, { captions }) } : {},
     location: { start: { ...destination }, end: { ...destination } },
-    ...options.columnField ? { columnField: options.columnField } : {},
-    ...options.columnField && options.moreColumnFields?.length ? { moreColumnFields: [...options.moreColumnFields] } : {}
+    ...options2.columnField ? { columnField: options2.columnField } : {},
+    ...options2.columnField && options2.moreColumnFields?.length ? { moreColumnFields: [...options2.moreColumnFields] } : {}
   };
   if (pivot.dateGroups) reconcileDateAxes(pivot);
   const dates = pivotDateFieldsOf(ctx.workbook, s, pivot);
@@ -54509,7 +54778,7 @@ function displayText2(value3, style3, numFmt, workbook, sheet) {
   });
   return formatted.color ? { text: formatted.text, color: formatted.color } : { text: formatted.text };
 }
-function cellView(workbook, sheetIndex2, row3, col, cf, options = {}) {
+function cellView(workbook, sheetIndex2, row3, col, cf, options2 = {}) {
   const sheet = workbook.sheets[sheetIndex2];
   if (!sheet) throw new RangeError(`No sheet at index ${sheetIndex2}`);
   const cell = getCell(sheet, row3, col);
@@ -54547,10 +54816,10 @@ function cellView(workbook, sheetIndex2, row3, col, cf, options = {}) {
     vAlign: alignment.vertical ?? "bottom",
     wrap: wrap3,
     shrink,
-    indentPx: indentable ? (alignment.indent ?? 0) * (options.indentPx ?? INDENT_PX_PER_LEVEL) : 0,
+    indentPx: indentable ? (alignment.indent ?? 0) * (options2.indentPx ?? INDENT_PX_PER_LEVEL) : 0,
     rotation,
     isNumber,
-    overflow: (formulaText !== void 0 || typeof value3 === "string" && value3 !== "") && !wrap3 && !shrink && rotation === 0 && !vertical2 && hAlign !== "fill" && !(options.merged ?? sheet.merges.some((m) => rangeContains(m, { row: row3, col }))),
+    overflow: (formulaText !== void 0 || typeof value3 === "string" && value3 !== "") && !wrap3 && !shrink && rotation === 0 && !vertical2 && hAlign !== "fill" && !(options2.merged ?? sheet.merges.some((m) => rangeContains(m, { row: row3, col }))),
     hasComment: sheet.comments.some((c2) => c2.address.row === row3 && c2.address.col === col),
     hasHyperlink: false,
     validationList: sheet.dataValidations.some(
@@ -55164,11 +55433,11 @@ function check2(workbook, dv, value3, at2, evaluate) {
   if (dv.type === "whole" && !Number.isInteger(n)) return false;
   return compare(operator, n, a2, b);
 }
-function validateCellInput(workbook, sheet, row3, col, value3, options = {}) {
+function validateCellInput(workbook, sheet, row3, col, value3, options2 = {}) {
   const dv = validationAt(workbook, sheet, row3, col);
   if (!dv || dv.type === "none" || dv.showErrorMessage !== true) return { ok: true };
   if (value3 === null || value3 === "") return dv.allowBlank === false ? failure(dv) : { ok: true };
-  const evaluate = options.evaluate ?? defaultEvaluate(workbook);
+  const evaluate = options2.evaluate ?? defaultEvaluate(workbook);
   return check2(workbook, dv, value3, { sheet, row: row3, col }, evaluate) ? { ok: true } : failure(dv);
 }
 function failure(dv) {
@@ -55182,10 +55451,10 @@ function failure(dv) {
 }
 
 // xlsx/edit/session.ts
-function createEditSession(workbook, options = {}) {
+function createEditSession(workbook, options2 = {}) {
   const calc = createCalcEngine(workbook);
-  const autoRecalc = options.recalc ?? true;
-  const history = new History(options.historyLimit ?? 100);
+  const autoRecalc = options2.recalc ?? true;
+  const history = new History(options2.historyLimit ?? 100);
   const listeners = /* @__PURE__ */ new Set();
   let open;
   const emit = (change) => {
@@ -55284,8 +55553,8 @@ function createEditSession(workbook, options = {}) {
     return result2;
   };
   const ctx = { workbook, calc, run: run2 };
-  if (options.defaultSheetBase) ctx.defaultSheetBase = options.defaultSheetBase;
-  const autoRows = options.autoRowHeight ?? true;
+  if (options2.defaultSheetBase) ctx.defaultSheetBase = options2.defaultSheetBase;
+  const autoRows = options2.autoRowHeight ?? true;
   const refitRows = (current) => {
     const { sheet: s, kind, ranges } = current;
     if (!autoRows || s === void 0 || !ranges.length || !current.step.entries.length) return;
@@ -55293,7 +55562,7 @@ function createEditSession(workbook, options = {}) {
     const sheet = workbook.sheets[s];
     if (!sheet) return;
     try {
-      autoGrowRows(ctx, s, rowsToRefit(sheet, ranges), options.measureText);
+      autoGrowRows(ctx, s, rowsToRefit(sheet, ranges), options2.measureText);
     } catch (error) {
       const message = `Row height update failed: ${error instanceof Error ? error.message : String(error)}`;
       if (!workbook.warnings.includes(message)) workbook.warnings.push(message);
@@ -55356,7 +55625,7 @@ function createEditSession(workbook, options = {}) {
     setDefinedName: (name3) => setDefinedName(ctx, name3),
     deleteDefinedName: (name3, localSheet) => deleteDefinedName(ctx, name3, localSheet),
     setDrawingAnchor: (s, index3, anchor) => setDrawingAnchor(ctx, s, index3, anchor),
-    createPivotTable: (s, destination, options2) => createPivotTable(ctx, s, destination, options2),
+    createPivotTable: (s, destination, options3) => createPivotTable(ctx, s, destination, options3),
     refreshPivotTable: (s, name3, patch2) => refreshPivotTable(ctx, s, name3, patch2),
     deletePivotTable: (s, name3) => deletePivotTable(ctx, s, name3),
     setSlicerSelection: (cache3, keys) => setSlicerSelection(ctx, cache3, keys),
@@ -55406,8 +55675,8 @@ function createEditSession(workbook, options = {}) {
     setDocumentProperties: (patch2) => setDocumentProperties(ctx, patch2),
     setAutoRecalc: (enabled2) => setCalcMode(ctx, enabled2 ? "auto" : "manual"),
     autoRecalc: () => autoRecalc && calcModeOf(workbook) === "auto",
-    calculateNow(options2) {
-      calculator.now(options2?.full ?? false);
+    calculateNow(options3) {
+      calculator.now(options3?.full ?? false);
       emit({ kind: "cells", label: "Calculate now", structural: false });
     },
     prepareCalculation: (opts) => calculator.prepare(opts?.timeRemaining),
@@ -55911,8 +56180,8 @@ var VisioPackage = class _VisioPackage {
     if (Date.now() >= this.deadline)
       fail2("LIMIT_RUNTIME", "Visio package processing deadline exceeded");
   };
-  static async open(input, options = {}) {
-    const limits = { ...DEFAULTS2, ...options };
+  static async open(input, options2 = {}) {
+    const limits = { ...DEFAULTS2, ...options2 };
     for (const value3 of Object.values(limits))
       if (!Number.isFinite(value3) || value3 <= 0)
         fail2("INVALID_LIMITS", "Package limits must be finite positive numbers");
@@ -56393,16 +56662,16 @@ function emfInputView(input) {
     return null;
   }
 }
-function emfInputOptions(options) {
-  if (!options || typeof options !== "object") return null;
+function emfInputOptions(options2) {
+  if (!options2 || typeof options2 !== "object") return null;
   try {
-    const prototype = Object.getPrototypeOf(options);
+    const prototype = Object.getPrototypeOf(options2);
     if (prototype !== null && prototype !== Object.prototype) return null;
     const snapshot = {};
     for (const key2 of Object.keys(
       VISIO_EMF_ADMISSION_LIMITS
     )) {
-      const descriptor = Object.getOwnPropertyDescriptor(options, key2);
+      const descriptor = Object.getOwnPropertyDescriptor(options2, key2);
       if (!descriptor) continue;
       if (!("value" in descriptor)) return null;
       const value3 = descriptor.value;
@@ -56418,18 +56687,18 @@ function emfInputOptions(options) {
 
 // visio/emf-admission-context.ts
 var EmfAdmissionContext = class {
-  constructor(view, options) {
+  constructor(view, options2) {
     this.view = view;
     this.limits = { ...VISIO_EMF_ADMISSION_LIMITS };
-    if (!options || typeof options !== "object") {
+    if (!options2 || typeof options2 !== "object") {
       this.emit("invalid", "limits", "Expected an options object.");
       return;
     }
-    const cap = options.maxDiagnostics;
+    const cap = options2.maxDiagnostics;
     if (cap !== void 0 && Number.isInteger(cap) && cap > 0 && cap <= this.limits.maxDiagnostics)
       this.limits.maxDiagnostics = cap;
     for (const key2 of Object.keys(VISIO_EMF_ADMISSION_LIMITS)) {
-      const value3 = options[key2];
+      const value3 = options2[key2];
       if (value3 === void 0) continue;
       if (!Number.isSafeInteger(value3) || value3 < 1 || value3 > this.limits[key2])
         this.emit("invalid", "limits", "Limits must be positive integers below the hard ceiling.");
@@ -56982,8 +57251,8 @@ function inspectEmfObjectRecord(c2) {
 }
 
 // visio/emf-admission.ts
-function inspectVisioEmfAdmission(input, options = {}) {
-  const snapshot = emfInputOptions(options);
+function inspectVisioEmfAdmission(input, options2 = {}) {
+  const snapshot = emfInputOptions(options2);
   const view = snapshot === null ? null : emfInputView(input);
   const c2 = new EmfAdmissionContext(view ?? new DataView(new ArrayBuffer(0)), snapshot ?? {});
   if (snapshot === null) {
@@ -57207,9 +57476,9 @@ function record(value3, allowed) {
   }
   return result2;
 }
-function limitsFor(options) {
+function limitsFor(options2) {
   const result2 = { ...VISIO_FOREIGN_VECTOR_LIMITS };
-  const values2 = record(options, Object.keys(result2));
+  const values2 = record(options2, Object.keys(result2));
   for (const key2 of Object.keys(values2)) {
     const value3 = values2[key2];
     if (typeof value3 !== "number" || !Number.isSafeInteger(value3) || value3 < 1 || value3 > result2[key2])
@@ -57563,9 +57832,9 @@ var ATTRS = {
   clipPath: ["id", "clipPathUnits", "clip-rule", ...BASE2]
 };
 var ID = /^[A-Za-z_][A-Za-z0-9_.-]{0,127}$/;
-function sanitizeVisioForeignVectorTree(root, options = {}) {
+function sanitizeVisioForeignVectorTree(root, options2 = {}) {
   try {
-    return sanitize(root, limitsFor(options));
+    return sanitize(root, limitsFor(options2));
   } catch (error) {
     if (error instanceof VisioForeignVectorError) throw error;
     unsafe("Unable to inspect converter output safely.");
@@ -58081,10 +58350,10 @@ function jpeg(bytes, limits) {
   }
   return invalid("JPEG has no image terminator.");
 }
-function inspectVisioRasterImage(bytes, options = {}) {
-  if (!options || typeof options !== "object" || Array.isArray(options))
+function inspectVisioRasterImage(bytes, options2 = {}) {
+  if (!options2 || typeof options2 !== "object" || Array.isArray(options2))
     throw new VisioImageError("invalid-limit", "Image limits must be an options object.");
-  const limits = { ...VISIO_RASTER_IMAGE_LIMITS, ...options };
+  const limits = { ...VISIO_RASTER_IMAGE_LIMITS, ...options2 };
   for (const key2 of Object.keys(VISIO_RASTER_IMAGE_LIMITS)) {
     const value3 = limits[key2];
     if (!Number.isSafeInteger(value3) || value3 <= 0 || value3 > VISIO_RASTER_IMAGE_LIMITS[key2])
@@ -58095,10 +58364,10 @@ function inspectVisioRasterImage(bytes, options = {}) {
     throw new VisioImageError("image-limit", "Raster image bytes exceed the configured limit.");
   return inspect2(bytes, limits);
 }
-async function readVisioImage(pkg, sourcePart, foreignData, report, options = {}) {
+async function readVisioImage(pkg, sourcePart, foreignData, report, options2 = {}) {
   const limits = {
     ...VISIO_RASTER_IMAGE_LIMITS,
-    ...options
+    ...options2
   };
   if (Object.values(limits).some((value3) => !Number.isSafeInteger(value3) || value3 <= 0))
     throw new VisioPackageError("INVALID_LIMIT", "Image limits must be positive safe integers.");
@@ -58358,7 +58627,7 @@ async function readEmbeddedChartObject(pkg, sourcePart, foreignData, report) {
 }
 
 // visio/prepare-images.ts
-async function prepareImages(shapes, pkg, sourcePart, report, options, converter) {
+async function prepareImages(shapes, pkg, sourcePart, report, options2, converter) {
   for (const shape2 of shapes) {
     if (shape2.deleted) continue;
     const localReport = (code, message, extra) => report(code, message, { part: sourcePart, shapeId: shape2.id, ...extra });
@@ -58386,12 +58655,12 @@ async function prepareImages(shapes, pkg, sourcePart, report, options, converter
           sourcePart,
           shape2.foreignData,
           localReport,
-          options
+          options2
         );
         if (image) shape2.image = image;
       }
     }
-    await prepareImages(shape2.children, pkg, sourcePart, report, options, converter);
+    await prepareImages(shape2.children, pkg, sourcePart, report, options2, converter);
   }
 }
 
@@ -62859,8 +63128,8 @@ function readVisioAnnotations(sheet, pageId2) {
 }
 
 // visio/shape-metadata.ts
-function createMetadataBudget(options = {}) {
-  const maxRows = options.maxRows ?? 1e5, maxCharacters = options.maxCharacters ?? 5e6;
+function createMetadataBudget(options2 = {}) {
+  const maxRows = options2.maxRows ?? 1e5, maxCharacters = options2.maxCharacters ?? 5e6;
   if (![maxRows, maxCharacters].every((v) => Number.isSafeInteger(v) && v > 0))
     throw new VisioPackageError("INVALID_LIMIT", "Metadata limits must be positive safe integers.");
   let rows = 0, characters = 0;
@@ -64427,21 +64696,21 @@ function option(value3, fallback) {
     throw new VisioPackageError("INVALID_LIMIT", "Parser limits must be positive safe integers.");
   return value3;
 }
-async function parseVsdx(input, options = {}) {
-  const deadline = Date.now() + (options.limits?.maxRuntimeMs ?? 1e4);
+async function parseVsdx(input, options2 = {}) {
+  const deadline = Date.now() + (options2.limits?.maxRuntimeMs ?? 1e4);
   const checkTime = () => {
     if (Date.now() >= deadline)
       throw new VisioPackageError("LIMIT_RUNTIME", "Visio parsing deadline exceeded.");
   };
-  const maxShapes = option(options.maxShapes, 25e3), maxShapeDepth = option(options.maxShapeDepth, 64);
-  const maxCurveWork = option(options.maxCurveWork, 2e7);
+  const maxShapes = option(options2.maxShapes, 25e3), maxShapeDepth = option(options2.maxShapeDepth, 64);
+  const maxCurveWork = option(options2.maxCurveWork, 2e7);
   let curveWork = 0;
-  const maxGeometry = option(options.maxGeometryCommands, 5e5), maxText = option(options.maxTextCharacters, 5e6);
-  const maxDiagnostics = option(options.maxDiagnostics, 2e3);
-  const maxRuns = option(options.maxTextRuns, 1e5), maxParagraphs = option(options.maxParagraphs, 5e4);
+  const maxGeometry = option(options2.maxGeometryCommands, 5e5), maxText = option(options2.maxTextCharacters, 5e6);
+  const maxDiagnostics = option(options2.maxDiagnostics, 2e3);
+  const maxRuns = option(options2.maxTextRuns, 1e5), maxParagraphs = option(options2.maxParagraphs, 5e4);
   const diagnosticState = diagnosticCollector(maxDiagnostics);
   const report = diagnosticState.report;
-  const pkg = await VisioPackage.open(input, options.limits);
+  const pkg = await VisioPackage.open(input, options2.limits);
   const types = await pkg.readXml("[Content_Types].xml", "Types");
   if (types.namespaceURI !== "http://schemas.openxmlformats.org/package/2006/content-types")
     throw new VisioPackageError("INVALID_CONTENT_TYPES", "Invalid content type namespace.");
@@ -64451,7 +64720,7 @@ async function parseVsdx(input, options = {}) {
   const documentType = elements(types).find(
     (node3) => node3.localName === "Override" && attribute3(node3, "PartName") === `/${documentPart}`
   )?.getAttribute("ContentType");
-  if (documentType !== "application/vnd.ms-visio.drawing.main+xml" && !(options.stencil && documentType && STENCIL_MAIN_TYPES.has(documentType)))
+  if (documentType !== "application/vnd.ms-visio.drawing.main+xml" && !(options2.stencil && documentType && STENCIL_MAIN_TYPES.has(documentType)))
     throw new VisioPackageError(
       "UNSUPPORTED_FORMAT",
       "Only VSDX drawing packages are supported; VSD, VDX, VSDM and templates are not supported."
@@ -64524,8 +64793,8 @@ async function parseVsdx(input, options = {}) {
         pkg,
         part,
         report,
-        options.images,
-        options.metafileConverter
+        options2.images,
+        options2.metafileConverter
       );
       masters.set(id3, masterShapes2);
       masterRecords.push({ id: id3, node: master2, shapes: masterShapes2 });
@@ -64533,7 +64802,7 @@ async function parseVsdx(input, options = {}) {
   }
   let geometryCount = 0, textCount = 0, expansionCount = 0, textRuns = 0, paragraphCount = 0;
   const context = {
-    metadataBudget: createMetadataBudget(options.metadata),
+    metadataBudget: createMetadataBudget(options2.metadata),
     layerBudget: createLayerBudget(),
     masters,
     layers: /* @__PURE__ */ new Map(),
@@ -64585,11 +64854,11 @@ async function parseVsdx(input, options = {}) {
     }
   };
   const documentMasters = listVisioMasters(masterRecords, context, {
-    metadataBudget: createMetadataBudget(options.metadata),
+    metadataBudget: createMetadataBudget(options2.metadata),
     layerBudget: createLayerBudget()
   });
-  const pagesPart = await related(pkg, documentPart, "pages", !options.stencil);
-  if (!pagesPart && !options.stencil)
+  const pagesPart = await related(pkg, documentPart, "pages", !options2.stencil);
+  if (!pagesPart && !options2.stencil)
     throw new VisioPackageError("INVALID_DOCUMENT", "Missing Visio pages part.");
   const pages = [], pageIds2 = /* @__PURE__ */ new Set();
   const comments = [];
@@ -64643,8 +64912,8 @@ async function parseVsdx(input, options = {}) {
       pkg,
       part,
       localReport,
-      options.images,
-      options.metafileConverter
+      options2.images,
+      options2.metafileConverter
     );
     const shapes = normalizeShapes(rawShapes, context);
     normalizeVisioPageGeometry(shapes, drawingToPageScale, checkTime);
@@ -65974,9 +66243,9 @@ function cellUnit(name3, relative) {
   return !relative && /\.[XY]\d+$/i.test(name3) ? "length" : "scalar";
 }
 var isBooleanLiteral = (ref) => ref.shapeId === void 0 && /^(true|false)$/i.test(ref.cell);
-function indexCells2(roots, options) {
+function indexCells2(roots, options2) {
   const cells3 = /* @__PURE__ */ new Map();
-  const maxCells = bound(options.maxCells, 1e5);
+  const maxCells = bound(options2.maxCells, 1e5);
   const add4 = (item) => {
     const id3 = key(item);
     if (cells3.has(id3)) fail2("EDIT_AMBIGUOUS_CELL", "Duplicate local ShapeSheet cell.");
@@ -66002,11 +66271,11 @@ function indexCells2(roots, options) {
     const visit2 = (parent, inherited, nested) => {
       for (const container of children3(parent, "Shapes"))
         for (const node3 of children3(container, "Shape")) {
-          options.check?.();
+          options2.check?.();
           const shapeId2 = attribute3(node3, "ID");
           if (!shapeId2 || ids.has(shapeId2)) fail2("INVALID_SHAPE_ID", "Shape IDs must be unique.");
           ids.add(shapeId2);
-          const unsafe2 = inherited || nested || node3.hasAttribute("Master") || node3.hasAttribute("MasterShape") || attribute3(node3, "Type") === "Group" || !isLocalForeignFrameShape(node3) && (attribute3(node3, "Type") !== void 0 && attribute3(node3, "Type") !== "Shape" || children3(node3, "ForeignData").length > 0 || children3(node3, "Rel").length > 0) || connected.has(shapeId2) && !options.glueShapes?.has(node3) || !options.lineEditShapes?.has(node3) && children3(node3, "Cell").some(
+          const unsafe2 = inherited || nested || node3.hasAttribute("Master") || node3.hasAttribute("MasterShape") || attribute3(node3, "Type") === "Group" || !isLocalForeignFrameShape(node3) && (attribute3(node3, "Type") !== void 0 && attribute3(node3, "Type") !== "Shape" || children3(node3, "ForeignData").length > 0 || children3(node3, "Rel").length > 0) || connected.has(shapeId2) && !options2.glueShapes?.has(node3) || !options2.lineEditShapes?.has(node3) && children3(node3, "Cell").some(
             (cell) => /^(BeginX|BeginY|EndX|EndY)$/i.test(attribute3(cell, "N") ?? "") || attribute3(cell, "N")?.toLowerCase() === "oned" && (attribute3(cell, "V") !== "0" || !!executableCellFormula(attribute3(cell, "F")) || attribute3(cell, "F") === "Inh")
           ) || children3(node3, "Shapes").length > 0 || ["1", "true"].includes(attribute3(node3, "Del") ?? "");
           sheets.push({ node: node3, shapeId: shapeId2, unsafe: unsafe2 });
@@ -66099,7 +66368,7 @@ function indexCells2(roots, options) {
         }
     }
     for (const node3 of Array.from(root.getElementsByTagName("*"))) {
-      options.check?.();
+      options2.check?.();
       if (node3.hasAttribute("F") && !indexedNodes.has(node3))
         fail2(
           "EDIT_UNKNOWN_DEPENDENCY",
@@ -66111,12 +66380,12 @@ function indexCells2(roots, options) {
 }
 
 // visio/edit-recalculate-values.ts
-function createVisioCellEvaluator(cells3, options = {}, verifyCaches = false) {
+function createVisioCellEvaluator(cells3, options2 = {}, verifyCaches = false) {
   const active = /* @__PURE__ */ new Set(), values2 = /* @__PURE__ */ new Map();
-  let steps = bound(options.maxSteps, 1e5);
-  const maxDepth = bound(options.maxDepth, 64);
+  let steps = bound(options2.maxSteps, 1e5);
+  const maxDepth = bound(options2.maxDepth, 64);
   const evaluate = (id3) => {
-    options.check?.();
+    options2.check?.();
     if (--steps < 0)
       fail2("LIMIT_FORMULA_STEPS", "ShapeSheet dependency evaluation limit exceeded.");
     const cached6 = values2.get(id3);
@@ -66125,7 +66394,7 @@ function createVisioCellEvaluator(cells3, options = {}, verifyCaches = false) {
     if (active.size >= maxDepth)
       fail2("LIMIT_FORMULA_DEPTH", "ShapeSheet dependency depth limit exceeded.");
     const item = cells3.get(id3);
-    if (!item || item.unsafe && (!item.node || !options.masterMovePins?.has(item.node) && !options.groupRotationCells?.has(item.node)))
+    if (!item || item.unsafe && (!item.node || !options2.masterMovePins?.has(item.node) && !options2.groupRotationCells?.has(item.node)))
       fail2(
         "EDIT_UNSUPPORTED_DEPENDENCY",
         "Affected formula references missing, inherited or grouped cells."
@@ -66149,7 +66418,7 @@ function createVisioCellEvaluator(cells3, options = {}, verifyCaches = false) {
           key({ pageId: item.pageId, shapeId: ref.shapeId ?? item.shapeId, cell: ref.cell })
         ),
         {
-          ...options.pageContext?.get(item.pageId),
+          ...options2.pageContext?.get(item.pageId),
           onStep: () => {
             if (--steps < 0)
               fail2("LIMIT_FORMULA_STEPS", "ShapeSheet dependency evaluation limit exceeded.");
@@ -66181,8 +66450,8 @@ function createVisioCellEvaluator(cells3, options = {}, verifyCaches = false) {
 }
 
 // visio/edit-recalculate.ts
-function recalculateVisioCells(roots, changed, options = {}) {
-  const cells3 = indexCells2(roots, options);
+function recalculateVisioCells(roots, changed, options2 = {}) {
+  const cells3 = indexCells2(roots, options2);
   const reverse2 = /* @__PURE__ */ new Map();
   for (const [id3, item] of cells3)
     for (const dependency of item.dependencies) {
@@ -66192,9 +66461,9 @@ function recalculateVisioCells(roots, changed, options = {}) {
     }
   const affected = new Set(changed.map(key));
   const pending2 = [...affected];
-  const maxAffected = bound(options.maxAffectedCells, 1e4);
+  const maxAffected = bound(options2.maxAffectedCells, 1e4);
   for (let i2 = 0; i2 < pending2.length; i2++) {
-    options.check?.();
+    options2.check?.();
     for (const id3 of reverse2.get(pending2[i2]) ?? [])
       if (!affected.has(id3)) {
         affected.add(id3);
@@ -66203,7 +66472,7 @@ function recalculateVisioCells(roots, changed, options = {}) {
     if (affected.size > maxAffected)
       fail2("LIMIT_FORMULA_AFFECTED", "Affected ShapeSheet cell limit exceeded.");
   }
-  const evaluate = createVisioCellEvaluator(cells3, options);
+  const evaluate = createVisioCellEvaluator(cells3, options2);
   const values2 = /* @__PURE__ */ new Map();
   for (const id3 of affected) values2.set(id3, evaluate(id3));
   const pages = /* @__PURE__ */ new Set();
@@ -66219,10 +66488,10 @@ function recalculateVisioCells(roots, changed, options = {}) {
   }
   return [...pages];
 }
-function assertVisioShapesUnreferenced(roots, removed, options = {}) {
-  const cells3 = indexCells2(roots, options);
+function assertVisioShapesUnreferenced(roots, removed, options2 = {}) {
+  const cells3 = indexCells2(roots, options2);
   for (const cell of cells3.values()) {
-    options.check?.();
+    options2.check?.();
     if (removed.get(cell.pageId)?.has(cell.shapeId)) continue;
     if (cell.dependencies.some((id3) => {
       const parts = JSON.parse(id3);
@@ -66233,24 +66502,24 @@ function assertVisioShapesUnreferenced(roots, removed, options = {}) {
   for (const [pageId2, ids] of removed)
     for (const connections2 of children3(roots.get(pageId2), "Connects"))
       for (const connection of children3(connections2, "Connect")) {
-        options.check?.();
+        options2.check?.();
         if (["FromSheet", "ToSheet"].some((name3) => ids.has(attribute3(connection, name3) ?? "")))
           fail2("EDIT_REFERENCED_DELETE", "Shape participates in a Connect record.");
       }
 }
-function assertVisioShapeUnreferenced(roots, pageId2, shapeId2, options = {}) {
-  assertVisioShapesUnreferenced(roots, /* @__PURE__ */ new Map([[pageId2, /* @__PURE__ */ new Set([shapeId2])]]), options);
+function assertVisioShapeUnreferenced(roots, pageId2, shapeId2, options2 = {}) {
+  assertVisioShapesUnreferenced(roots, /* @__PURE__ */ new Map([[pageId2, /* @__PURE__ */ new Set([shapeId2])]]), options2);
 }
-function createVisioDependencyQuery(roots, options = {}) {
-  const cells3 = indexCells2(roots, options);
+function createVisioDependencyQuery(roots, options2 = {}) {
+  const cells3 = indexCells2(roots, options2);
   return (source2, targets) => {
     const wanted = new Set(targets.map(key));
     const seen = /* @__PURE__ */ new Set();
     const pending2 = [key(source2)];
-    const maxSteps = bound(options.maxSteps, 1e5);
+    const maxSteps = bound(options2.maxSteps, 1e5);
     let found = false;
     while (pending2.length) {
-      options.check?.();
+      options2.check?.();
       const id3 = pending2.pop();
       if (seen.has(id3)) continue;
       seen.add(id3);
@@ -67382,13 +67651,13 @@ function unique3(items, key2, what) {
   return result2;
 }
 var cellMap2 = (parent) => unique3(children3(parent, "Cell"), (cell) => attribute3(cell, "N") ?? "", "cell");
-function instanceSheet(instance, template, options = {}) {
+function instanceSheet(instance, template, options2 = {}) {
   for (const node3 of [instance, template]) {
     const type = attribute3(node3, "Type");
-    if (!(options.group ? ["Shape", "Group", void 0] : ["Shape", void 0]).includes(type) || !options.group && children3(node3, "Shapes").length > 0 || children3(node3, "ForeignData").length || deleted2(node3))
+    if (!(options2.group ? ["Shape", "Group", void 0] : ["Shape", void 0]).includes(type) || !options2.group && children3(node3, "Shapes").length > 0 || children3(node3, "ForeignData").length || deleted2(node3))
       fail2(
         "UNSUPPORTED_INSTANCE_EDIT",
-        options.group ? "A stencil shape that holds a picture or a deleted part cannot be changed." : "Only stencil shapes made of one plain shape can be changed; grouped, picture and deleted ones cannot."
+        options2.group ? "A stencil shape that holds a picture or a deleted part cannot be changed." : "Only stencil shapes made of one plain shape can be changed; grouped, picture and deleted ones cannot."
       );
   }
   if (template.hasAttribute("Master") || template.hasAttribute("MasterShape"))
@@ -67467,7 +67736,7 @@ function effectiveFormula(cell) {
   return own2 === "Inh" ? executableCellFormula(attribute3(cell.inherited, "F")) : executableCellFormula(own2);
 }
 var AFTER_SECTIONS = ["Text", "Data1", "Data2", "Data3", "ForeignData", "Shapes"];
-function writeInstanceCell(sheet, cell, value3, options = {}) {
+function writeInstanceCell(sheet, cell, value3, options2 = {}) {
   const { instance } = sheet;
   const create2 = (name3) => instance.ownerDocument.createElementNS(instance.namespaceURI, name3);
   let node3 = cell.local;
@@ -67513,9 +67782,9 @@ function writeInstanceCell(sheet, cell, value3, options = {}) {
   }
   node3.setAttribute("V", value3);
   node3.removeAttribute("E");
-  const unit3 = options.unit ?? attribute3(cell.inherited, "U");
-  if (unit3 !== void 0 && (created || options.unit !== void 0)) node3.setAttribute("U", unit3);
-  if (options.formula) node3.setAttribute("F", options.formula);
+  const unit3 = options2.unit ?? attribute3(cell.inherited, "U");
+  if (unit3 !== void 0 && (created || options2.unit !== void 0)) node3.setAttribute("U", unit3);
+  if (options2.formula) node3.setAttribute("F", options2.formula);
   else node3.removeAttribute("F");
   return node3;
 }
@@ -69675,7 +69944,7 @@ function proveConnectorShape(shape2, route = routeOf(shape2)) {
       "Only right-angle and curved connectors drawn here can be rerouted."
     );
 }
-function rerouteConnector(roots, pageId2, glue, check3, options = {}) {
+function rerouteConnector(roots, pageId2, glue, check3, options2 = {}) {
   const root = roots.get(pageId2);
   const shape2 = glue.shape;
   const stencil = isStencilConnector(shape2);
@@ -69687,7 +69956,7 @@ function rerouteConnector(roots, pageId2, glue, check3, options = {}) {
     if (target2) return glueSites(root, target2);
     return [
       {
-        point: options.free?.[end] ?? {
+        point: options2.free?.[end] ?? {
           x: numeric4(local.get(`${prefix2(end)}X`)),
           y: numeric4(local.get(`${prefix2(end)}Y`))
         }
@@ -69696,7 +69965,7 @@ function rerouteConnector(roots, pageId2, glue, check3, options = {}) {
   };
   const chosen = chooseSites(sites("begin"), sites("end"));
   if (isStencilLine(shape2)) {
-    if (options.route && options.route !== "straight")
+    if (options2.route && options2.route !== "straight")
       fail2(
         "UNSUPPORTED_GEOMETRY_EDIT",
         "This connector is a straight line from a stencil; only Visio's Dynamic connector can be restyled."
@@ -69715,12 +69984,12 @@ function rerouteConnector(roots, pageId2, glue, check3, options = {}) {
     const target2 = glue.ends[end];
     return target2 && target2.point === void 0 ? walkShape(glueBox(root, target2.target)) : { point: sites(end)[0].point };
   };
-  const route = options.route ?? current;
+  const route = options2.route ?? current;
   if (route === "straight" && current === "straight" && ENDS.every(
     (end) => sameLineCoordinate(numeric4(local.get(`${prefix2(end)}X`)), chosen[end].point.x) && sameLineCoordinate(numeric4(local.get(`${prefix2(end)}Y`)), chosen[end].point.y)
   ))
     return [];
-  if (options.route) setRouteCells(shape2, options.route);
+  if (options2.route) setRouteCells(shape2, options2.route);
   const obstacles = route === "right-angle" ? connectorObstacles(
     root,
     /* @__PURE__ */ new Set([
@@ -70072,14 +70341,14 @@ async function measuresOwnText(root, shapeId2, template, check3) {
     return false;
   }
 }
-async function refreshTextSizes(targets, result2, options, deadline) {
+async function refreshTextSizes(targets, result2, options2, deadline) {
   if (!targets.length || !result2.changedParts.length) return result2;
   const check3 = () => {
     if (Date.now() >= deadline) throw new VisioPackageError("LIMIT_RUNTIME", "Deadline exceeded.");
   };
   const limits = {
     ...DEFAULTS2,
-    ...options.limits,
+    ...options2.limits,
     maxInputBytes: Math.max(DEFAULTS2.maxInputBytes, result2.bytes.length),
     maxRuntimeMs: Math.max(1, deadline - Date.now())
   };
@@ -70169,7 +70438,7 @@ async function refreshTextSizes(targets, result2, options, deadline) {
       }
       const bytes = await writeEditedPackage(
         parts,
-        options.maxOutputBytes ?? limits.maxInputBytes,
+        options2.maxOutputBytes ?? limits.maxInputBytes,
         deadline,
         check3
       );
@@ -70438,14 +70707,14 @@ function cacheRows(path2) {
   }
   return rows.every((row3) => Number.isFinite(row3.x) && Number.isFinite(row3.y)) ? rows : [];
 }
-async function refreshLineJumpCaches(pageIds2, source2, result2, options, deadline) {
+async function refreshLineJumpCaches(pageIds2, source2, result2, options2, deadline) {
   if (!pageIds2.size || !result2.changedParts.length) return result2;
   const check3 = () => {
     if (Date.now() >= deadline) fail2("LIMIT_RUNTIME", "Visio edit deadline exceeded.");
   };
   const limits = {
     ...DEFAULTS2,
-    ...options.limits,
+    ...options2.limits,
     maxRuntimeMs: Math.max(1, deadline - Date.now())
   };
   const { pkg, parts, pages } = await openEditablePackage(result2.bytes, limits, check3);
@@ -70525,7 +70794,7 @@ async function refreshLineJumpCaches(pageIds2, source2, result2, options, deadli
   return {
     bytes: await writeEditedPackage(
       parts,
-      options.maxOutputBytes ?? limits.maxInputBytes,
+      options2.maxOutputBytes ?? limits.maxInputBytes,
       deadline,
       check3
     ),
@@ -74547,9 +74816,9 @@ function snapshotStencilMasterDrop(edit) {
     y: edit.y
   };
 }
-async function editVsdxMasterDrops(source2, commands, options, lone, apply3) {
-  const limits = { ...DEFAULTS2, ...options.limits };
-  const maxOutput = options.maxOutputBytes ?? limits.maxInputBytes;
+async function editVsdxMasterDrops(source2, commands, options2, lone, apply3) {
+  const limits = { ...DEFAULTS2, ...options2.limits };
+  const maxOutput = options2.maxOutputBytes ?? limits.maxInputBytes;
   const deadline = Date.now() + limits.maxRuntimeMs;
   const check3 = () => {
     if (Date.now() >= deadline) fail2("LIMIT_RUNTIME", "Visio edit deadline exceeded.");
@@ -75745,12 +76014,12 @@ function resizeVisioShapeAtAnchor(roots, document, edit, check3, glueShapes = /*
 }
 
 // visio/edit-transform-formula.ts
-function editableTransformCell(roots, edit, node3, check3, options = {}) {
+function editableTransformCell(roots, edit, node3, check3, options2 = {}) {
   const formula = executableCellFormula(attribute3(node3, "F"));
   if (!formula || !analyzeVisioFormula(formula).references.length) return editableCell(node3);
   const evaluate = createVisioCellEvaluator(
-    indexCells2(roots, { ...options, check: check3 }),
-    { ...options, check: check3 },
+    indexCells2(roots, { ...options2, check: check3 }),
+    { ...options2, check: check3 },
     true
   );
   editableCell(
@@ -76219,7 +76488,7 @@ async function assertDuplicateScope(pkg, pagePaths, targetPage, newIds, check3,
 }
 
 // visio/formula-master.ts
-function analyzeVisioMasterFormula(source2, options) {
+function analyzeVisioMasterFormula(source2, options2) {
   const ast = parseVisioFormula(source2);
   const analysis = analyzeVisioFormula(ast);
   const references = /* @__PURE__ */ new Map();
@@ -76240,7 +76509,7 @@ function analyzeVisioMasterFormula(source2, options) {
     if (["TEXTWIDTH", "TEXTHEIGHT", "SHAPETEXT"].includes(node3.name)) {
       const text8 = node3.args[0];
       const count2 = node3.name === "TEXTHEIGHT" ? node3.args.length === 2 : node3.args.length === 1;
-      local = options.textFieldFree && count2 && text8?.kind === "reference" && text8.reference.shapeId === void 0 && text8.reference.cell.toLowerCase() === "thetext";
+      local = options2.textFieldFree && count2 && text8?.kind === "reference" && text8.reference.shapeId === void 0 && text8.reference.cell.toLowerCase() === "thetext";
       readsText = true;
     }
     if (["LUM", "HUE", "SAT"].includes(node3.name)) {
@@ -76875,16 +77144,16 @@ async function recalculatePageFormulas(pkg, pagesPart, pages, paths, dirty, chec
         );
     }
   if (!needed) return;
-  const options = { check: check3, pageContext: after };
+  const options2 = { check: check3, pageContext: after };
   const changed = [];
-  for (const cell of indexCells2(roots, options).values()) {
+  for (const cell of indexCells2(roots, options2).values()) {
     if (!cell.node) continue;
     const functions = pageFunctions(attribute3(cell.node, "F") ?? "");
     const old = before.get(cell.pageId), current = after.get(cell.pageId);
     if (functions.has("PAGENUMBER") && old?.pageNumber !== current.pageNumber || functions.has("PAGECOUNT") && old?.pageCount !== current.pageCount)
       changed.push(cell);
   }
-  for (const id3 of recalculateVisioCells(roots, changed, options)) {
+  for (const id3 of recalculateVisioCells(roots, changed, options2)) {
     const root = roots.get(id3);
     const sheet = sheets.get(id3);
     if (sheet) {
@@ -80207,14 +80476,14 @@ async function editVsdxComments(pkg, parts, pages, edits, limits, maxOutput, dea
 }
 
 // visio/clipboard.ts
-async function captureVisioClipboard(input, pageId2, shapeIds2, options = {}) {
+async function captureVisioClipboard(input, pageId2, shapeIds2, options2 = {}) {
   pageId2 = clipboardId(pageId2);
   if (!Array.isArray(shapeIds2) || !shapeIds2.length || shapeIds2.length > 1e3)
     fail2("INVALID_CLIPBOARD", "Capture requires one to 1000 selected shapes.");
   const selected2 = shapeIds2.map(clipboardId);
   if (new Set(selected2).size !== selected2.length)
     fail2("INVALID_CLIPBOARD", "Capture selection must be unique.");
-  const limits = { ...DEFAULTS2, ...options.limits };
+  const limits = { ...DEFAULTS2, ...options2.limits };
   for (const value3 of Object.values(limits))
     if (!Number.isSafeInteger(value3) || value3 <= 0)
       fail2("INVALID_LIMITS", "Capture limits require positive safe integers.");
@@ -80301,13 +80570,13 @@ async function retarget(clipboard, bytes, pageId2, limits) {
     fail2("UNSUPPORTED_SUBPROCESS", "The new page does not share the source page settings.");
   return { ...clipboard, pageContext: target2.xml };
 }
-async function editVsdxSubprocess(source2, edit, options) {
-  const limits = { ...DEFAULTS2, ...options.limits };
+async function editVsdxSubprocess(source2, edit, options2) {
+  const limits = { ...DEFAULTS2, ...options2.limits };
   const deadline = Date.now() + limits.maxRuntimeMs;
   const remaining = () => {
     const time = deadline - Date.now();
     if (time <= 0) fail2("LIMIT_RUNTIME", "Visio edit deadline exceeded.");
-    return { ...options, limits: { ...options.limits, maxRuntimeMs: time } };
+    return { ...options2, limits: { ...options2.limits, maxRuntimeMs: time } };
   };
   const changed = /* @__PURE__ */ new Set();
   const diagnostics = /* @__PURE__ */ new Map();
@@ -81441,7 +81710,7 @@ function positive4(value3) {
     fail2("INVALID_LIMITS", "Edit limits must be positive safe integers.");
   return value3;
 }
-async function editVsdx(input, edits, options = {}) {
+async function editVsdx(input, edits, options2 = {}) {
   const clock = {
     deadline: 0,
     autoSize: /* @__PURE__ */ new Set(),
@@ -81449,36 +81718,36 @@ async function editVsdx(input, edits, options = {}) {
     jumpPages: /* @__PURE__ */ new Set(),
     jumpSource: void 0
   };
-  const edited = await editVsdxTransaction(input, edits, options, clock);
-  const resized = await refreshTextSizes(clock.textSizes, edited, options, clock.deadline);
+  const edited = await editVsdxTransaction(input, edits, options2, clock);
+  const resized = await refreshTextSizes(clock.textSizes, edited, options2, clock.deadline);
   const result2 = await refreshLineJumpCaches(
     clock.jumpPages,
     clock.jumpSource,
     resized,
-    options,
+    options2,
     clock.deadline
   );
   return growAutoSizePages(
     clock.autoSize,
     result2,
     (bytes, growth) => editVsdxTransaction(bytes, growth, {
-      ...options,
-      limits: { ...options.limits, maxRuntimeMs: Math.max(1, clock.deadline - Date.now()) }
+      ...options2,
+      limits: { ...options2.limits, maxRuntimeMs: Math.max(1, clock.deadline - Date.now()) }
     })
   );
 }
-async function editVsdxTransaction(input, edits, options, clock = {
+async function editVsdxTransaction(input, edits, options2, clock = {
   deadline: 0,
   autoSize: /* @__PURE__ */ new Set(),
   textSizes: [],
   jumpPages: /* @__PURE__ */ new Set(),
   jumpSource: void 0
 }) {
-  const limits = { ...DEFAULTS2, ...options.limits };
+  const limits = { ...DEFAULTS2, ...options2.limits };
   for (const value3 of Object.values(limits)) positive4(value3);
-  const maxEdits = positive4(options.maxEdits ?? 1e3);
-  const maxText = positive4(options.maxTextCharacters ?? 1e6);
-  const maxOutput = positive4(options.maxOutputBytes ?? limits.maxInputBytes);
+  const maxEdits = positive4(options2.maxEdits ?? 1e3);
+  const maxText = positive4(options2.maxTextCharacters ?? 1e6);
+  const maxOutput = positive4(options2.maxOutputBytes ?? limits.maxInputBytes);
   const deadline = Date.now() + limits.maxRuntimeMs;
   clock.deadline = deadline;
   const check3 = () => {
@@ -81497,13 +81766,13 @@ async function editVsdxTransaction(input, edits, options, clock = {
   if (subprocess) {
     if (allCommands.length !== 1)
       fail2("EDIT_MIXED_SUBPROCESS_TRANSACTION", "A subprocess requires its own transaction.");
-    return editVsdxSubprocess(original, subprocess, options);
+    return editVsdxSubprocess(original, subprocess, options2);
   }
   if (allCommands.some(isVisioMasterDrop))
     return editVsdxMasterDrops(
       original,
       allCommands,
-      options,
+      options2,
       async (bytes2, instance, info) => {
         const opened = await openEditablePackage(bytes2, limits, check3);
         return editVsdxMasterInstance(
@@ -81518,7 +81787,7 @@ async function editVsdxTransaction(input, edits, options, clock = {
           info
         );
       },
-      (bytes2, rest) => editVsdx(bytes2, rest, options)
+      (bytes2, rest) => editVsdx(bytes2, rest, options2)
     );
   const { pkg, parts, pages } = await openEditablePackage(original, limits, check3);
   const builtIn = await changeStencilShapeToBuiltIn(
@@ -81527,7 +81796,7 @@ async function editVsdxTransaction(input, edits, options, clock = {
     pages,
     allCommands,
     { limits, maxOutput, deadline, check: check3 },
-    (bytes2, edits2) => editVsdx(bytes2, edits2, options)
+    (bytes2, edits2) => editVsdx(bytes2, edits2, options2)
   );
   if (builtIn) return builtIn;
   if (allCommands.some(isVisioCommentEdit)) {
@@ -81610,8 +81879,8 @@ async function editVsdxTransaction(input, edits, options, clock = {
         check3
       );
       const moved = await editVsdxTransaction(resized.bytes, commands, {
-        ...options,
-        limits: { ...options.limits, maxRuntimeMs: Math.max(1, deadline - Date.now()) }
+        ...options2,
+        limits: { ...options2.limits, maxRuntimeMs: Math.max(1, deadline - Date.now()) }
       });
       return {
         bytes: moved.bytes,