ooxml-core 1.18.0 → 1.19.0

package/dist/xlsx/load/index.cjs

@@ -12953,6 +12953,51 @@ function parseChartSpace(source2) {
   );
   return { chartSpace, issues: context.issues };
 }
+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, group, seriesPosition) {
+  if (!["line", "scatter", "radar"].includes(group.kind)) return {};
+  const enabled = group.kind === "line" ? group.marker === true : group.kind === "radar" ? group.radarStyle === "marker" : !["line", "smooth", "none"].includes(group.scatterStyle ?? "marker");
+  const symbol = source2.marker?.symbol;
+  const marker3 = {
+    ...source2.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source2.marker || enabled ? automaticMarkerSymbol(source2.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point of source2.dataPoints) {
+    if (point.index === void 0 || !point.marker) continue;
+    const override = point.marker;
+    pointMarkers[point.index] = {
+      ...marker3,
+      ...override,
+      ...override.symbol === "auto" || !source2.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source2.index ?? seriesPosition) } : {},
+      ...marker3.spPr || override.spPr ? {
+        spPr: {
+          ...marker3.spPr,
+          ...override.spPr,
+          ...marker3.spPr?.line || override.spPr?.line ? { line: { ...marker3.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker: marker3, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
 
 // chart/render/summary-analysis.ts
 function summaryTrendline(source2) {
@@ -13137,7 +13182,10 @@ function extraGroups(chartSpace, firstType) {
     const type = group.kind === "bar" ? "column" : group.kind;
     const entry3 = {
       chartType: type,
-      series: group.series.map((source2) => chartSummarySeries(source2, type, group.dataLabels)),
+      series: group.series.map((source2, index3) => ({
+        ...chartSummarySeries(source2, type, group.dataLabels),
+        ...summaryMarkers(source2, group, index3)
+      })),
       secondary: valueAxisId(chartSpace, group.axisIds) !== primary
     };
     if (group.grouping && GROUPINGS.has(group.grouping))
@@ -13155,13 +13203,16 @@ function chartSummaryFromSpace(chartSpace, extras = {}) {
   const group = chartSpace.plotArea.groups[0];
   let chartType = group ? GROUP_TYPES[group.kind] : "column";
   if (chartType === "bar" && group?.barDirection !== "bar") chartType = "column";
-  const series = (group?.series ?? []).map(
-    (source2) => chartSummarySeries(source2, chartType, group?.dataLabels)
-  );
+  const series = (group?.series ?? []).map((source2, index3) => ({
+    ...chartSummarySeries(source2, chartType, group?.dataLabels),
+    ...group ? summaryMarkers(source2, group, index3) : {}
+  }));
   const summary = {
     chartType,
     series,
-    showLegend: chartSpace.legend !== void 0
+    showLegend: chartSpace.legend !== void 0,
+    axes: chartSpace.plotArea.axes,
+    axisIds: group?.axisIds ?? []
   };
   const combined = extraGroups(chartSpace, chartType);
   if (combined.length) summary.extraGroups = combined;
@@ -13244,6 +13295,8 @@ function parseChart(xml, anchor, partName, name) {
     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;

package/dist/xlsx/load/index.mjs

@@ -12947,6 +12947,51 @@ function parseChartSpace(source2) {
   );
   return { chartSpace, issues: context.issues };
 }
+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, group, seriesPosition) {
+  if (!["line", "scatter", "radar"].includes(group.kind)) return {};
+  const enabled = group.kind === "line" ? group.marker === true : group.kind === "radar" ? group.radarStyle === "marker" : !["line", "smooth", "none"].includes(group.scatterStyle ?? "marker");
+  const symbol = source2.marker?.symbol;
+  const marker3 = {
+    ...source2.marker,
+    symbol: symbol && symbol !== "auto" ? symbol : source2.marker || enabled ? automaticMarkerSymbol(source2.index ?? seriesPosition) : "none"
+  };
+  const pointMarkers = {};
+  for (const point of source2.dataPoints) {
+    if (point.index === void 0 || !point.marker) continue;
+    const override = point.marker;
+    pointMarkers[point.index] = {
+      ...marker3,
+      ...override,
+      ...override.symbol === "auto" || !source2.marker && override.symbol === void 0 ? { symbol: automaticMarkerSymbol(source2.index ?? seriesPosition) } : {},
+      ...marker3.spPr || override.spPr ? {
+        spPr: {
+          ...marker3.spPr,
+          ...override.spPr,
+          ...marker3.spPr?.line || override.spPr?.line ? { line: { ...marker3.spPr?.line, ...override.spPr?.line } } : {}
+        }
+      } : {}
+    };
+  }
+  return { marker: marker3, ...Object.keys(pointMarkers).length ? { pointMarkers } : {} };
+}
 
 // chart/render/summary-analysis.ts
 function summaryTrendline(source2) {
@@ -13131,7 +13176,10 @@ function extraGroups(chartSpace, firstType) {
     const type = group.kind === "bar" ? "column" : group.kind;
     const entry3 = {
       chartType: type,
-      series: group.series.map((source2) => chartSummarySeries(source2, type, group.dataLabels)),
+      series: group.series.map((source2, index3) => ({
+        ...chartSummarySeries(source2, type, group.dataLabels),
+        ...summaryMarkers(source2, group, index3)
+      })),
       secondary: valueAxisId(chartSpace, group.axisIds) !== primary
     };
     if (group.grouping && GROUPINGS.has(group.grouping))
@@ -13149,13 +13197,16 @@ function chartSummaryFromSpace(chartSpace, extras = {}) {
   const group = chartSpace.plotArea.groups[0];
   let chartType = group ? GROUP_TYPES[group.kind] : "column";
   if (chartType === "bar" && group?.barDirection !== "bar") chartType = "column";
-  const series = (group?.series ?? []).map(
-    (source2) => chartSummarySeries(source2, chartType, group?.dataLabels)
-  );
+  const series = (group?.series ?? []).map((source2, index3) => ({
+    ...chartSummarySeries(source2, chartType, group?.dataLabels),
+    ...group ? summaryMarkers(source2, group, index3) : {}
+  }));
   const summary = {
     chartType,
     series,
-    showLegend: chartSpace.legend !== void 0
+    showLegend: chartSpace.legend !== void 0,
+    axes: chartSpace.plotArea.axes,
+    axisIds: group?.axisIds ?? []
   };
   const combined = extraGroups(chartSpace, chartType);
   if (combined.length) summary.extraGroups = combined;
@@ -13238,6 +13289,8 @@ function parseChart(xml, anchor, partName, name) {
     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;

package/dist/xlsx/read/chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../xlsx/read/chart.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAsB,aAAa,EAAE,MAAM,UAAU,CAAC;AAoC/E,2DAA2D;AAC3D,wBAAgB,UAAU,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACX,WAAW,CA4Bb"}
+{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../xlsx/read/chart.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAsB,aAAa,EAAE,MAAM,UAAU,CAAC;AAoC/E,2DAA2D;AAC3D,wBAAgB,UAAU,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACX,WAAW,CA8Bb"}