ooxml-core 1.19.1 → 1.19.2

package/dist/automation/index.cjs

@@ -3528,7 +3528,10 @@ function writeTable(doc, table4, node3, base2, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table4.rows[0]?.length ?? 0;
-  if (!width || table4.rows.some((row3) => row3.length !== width || row3.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base2;
+  if (!width || table4.rows.some(
+    (row3) => reshaped && row3.length !== width || row3.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node3).map((entry3) => entry3.element);
   const sourceById = /* @__PURE__ */ new Map();
@@ -19360,13 +19363,13 @@ function rejectUnsafeRunSegmentation(paragraph2, base2, oldRuns) {
     `Cannot edit paragraph ${paragraph2.id}: changing run boundaries could drop unsupported run properties. The original DOCX package remains unchanged.`
   );
 }
-function writeParagraphImpl(doc, paragraph2, node3, base2, allocator, spans2) {
-  const continuation = spans2?.next.get(paragraph2.id);
-  const ranges = spans2 && {
+function writeParagraphImpl(doc, paragraph2, node3, base2, allocator, spans3) {
+  const continuation = spans3?.next.get(paragraph2.id);
+  const ranges = spans3 && {
     ...continuation ?? { before: /* @__PURE__ */ new Set(), after: /* @__PURE__ */ new Set() },
-    rangeIds: spans2.rangeIds
+    rangeIds: spans3.rangeIds
   };
-  const sameRanges = continuationKey(continuation) === continuationKey(spans2?.original.get(paragraph2.id));
+  const sameRanges = continuationKey(continuation) === continuationKey(spans3?.original.get(paragraph2.id));
   if (base2 && sameRanges && JSON.stringify(paragraph2) === JSON.stringify(base2)) return node3;
   const slots = collectInlineSlots(node3);
   if (!slots)
@@ -19427,7 +19430,7 @@ function writeParagraphImpl(doc, paragraph2, node3, base2, allocator, spans2) {
     children2(node3, "bookmarkEnd"),
     paragraph2.bookmarks ?? [],
     base2?.bookmarks ?? [],
-    () => spans2?.nextId() ?? "0"
+    () => spans3?.nextId() ?? "0"
   );
   for (const bookmark of [...children2(node3, "bookmarkStart"), ...children2(node3, "bookmarkEnd")])
     node3.removeChild(bookmark);
@@ -19449,9 +19452,9 @@ function writeParagraphImpl(doc, paragraph2, node3, base2, allocator, spans2) {
   if (!pPr.childNodes.length) node3.removeChild(pPr);
   return node3;
 }
-function createParagraph(doc, paragraph2, allocator, spans2) {
+function createParagraph(doc, paragraph2, allocator, spans3) {
   const node3 = makeW(doc, "p");
-  return writeParagraphImpl(doc, paragraph2, node3, void 0, allocator, spans2);
+  return writeParagraphImpl(doc, paragraph2, node3, void 0, allocator, spans3);
 }
 
 // docx/docpr-ids.ts
@@ -19540,7 +19543,7 @@ var RelationshipAllocator = class {
 
 // docx/write.ts
 var twips2 = (pixels) => String(Math.round(pixels * 15));
-function createTable(doc, table4, allocator, contentWidthTwips, spans2) {
+function createTable(doc, table4, allocator, contentWidthTwips, spans3) {
   const node3 = makeW(doc, "tbl");
   const { tblPr, tblGrid } = buildNewTableProperties(doc, table4, contentWidthTwips);
   node3.appendChild(tblPr);
@@ -19556,7 +19559,7 @@ function createTable(doc, table4, allocator, contentWidthTwips, spans2) {
       const tcPr = buildCellProperties(doc, cell);
       if (tcPr) tc.appendChild(tcPr);
       for (const paragraph2 of cell.paragraphs)
-        tc.appendChild(createParagraph(doc, paragraph2, allocator, spans2));
+        tc.appendChild(createParagraph(doc, paragraph2, allocator, spans3));
       if (!cell.paragraphs.length) tc.appendChild(makeW(doc, "p"));
       tr.appendChild(tc);
     }
@@ -19584,13 +19587,13 @@ function baseMap(blocks) {
 }
 function applyBlocks(doc, container, blocks, original, allocator, contentWidthTwips, anchor = null) {
   const nextId3 = annotationIdAllocator(doc, blocks);
-  const spans2 = {
+  const spans3 = {
     next: commentContinuations(blocks),
     original: commentContinuations(original),
     rangeIds: newMoveRangeIds(blocks, nextId3),
     nextId: nextId3
   };
-  const boundWriteParagraph = (writeDoc, paragraph2, node3, base2) => writeParagraphImpl(writeDoc, paragraph2, node3, base2, allocator, spans2);
+  const boundWriteParagraph = (writeDoc, paragraph2, node3, base2) => writeParagraphImpl(writeDoc, paragraph2, node3, base2, allocator, spans3);
   const flat = flatBlocks(container);
   const oldNodes = flat.map((entry3) => entry3.element);
   const oldById = /* @__PURE__ */ new Map();
@@ -19604,7 +19607,7 @@ function applyBlocks(doc, container, blocks, original, allocator, contentWidthTw
     const base2 = bases.get(block.id);
     if (block.type === "paragraph")
       output.push(
-        old ? boundWriteParagraph(doc, block, old, base2?.type === "paragraph" ? base2 : void 0) : createParagraph(doc, block, allocator, spans2)
+        old ? boundWriteParagraph(doc, block, old, base2?.type === "paragraph" ? base2 : void 0) : createParagraph(doc, block, allocator, spans3)
       );
     else
       output.push(
@@ -19615,7 +19618,7 @@ function applyBlocks(doc, container, blocks, original, allocator, contentWidthTw
           base2?.type === "table" ? base2 : void 0,
           boundWriteParagraph,
           replaceSlots
-        ) : createTable(doc, block, allocator, contentWidthTwips, spans2)
+        ) : createTable(doc, block, allocator, contentWidthTwips, spans3)
       );
   }
   const nested = flat.some((entry3) => entry3.sdt) || blocks.some((block) => block.contentControl);
@@ -48160,9 +48163,9 @@ function toHtml(cells3, theme3) {
     for (let r = link.range.start.row; r <= link.range.end.row; r++)
       for (let c2 = link.range.start.col; c2 <= link.range.end.col; c2++) links.set(`${r},${c2}`, link);
   const covered = /* @__PURE__ */ new Set();
-  const spans2 = /* @__PURE__ */ new Map();
+  const spans3 = /* @__PURE__ */ new Map();
   for (const m of cells3.merges) {
-    spans2.set(`${m.start.row},${m.start.col}`, m);
+    spans3.set(`${m.start.row},${m.start.col}`, m);
     for (let r = m.start.row; r <= m.end.row; r++)
       for (let c2 = m.start.col; c2 <= m.end.col; c2++)
         if (r !== m.start.row || c2 !== m.start.col) covered.add(`${r},${c2}`);
@@ -48174,7 +48177,7 @@ function toHtml(cells3, theme3) {
       if (covered.has(`${r},${c2}`)) continue;
       const cell = cells3.data[r]?.[c2] ?? null;
       const attrs3 = [];
-      const span3 = spans2.get(`${r},${c2}`);
+      const span3 = spans3.get(`${r},${c2}`);
       if (span3 && span3.end.row > span3.start.row)
         attrs3.push(`rowspan="${span3.end.row - span3.start.row + 1}"`);
       if (span3 && span3.end.col > span3.start.col)
@@ -50537,16 +50540,27 @@ function columnOverrides(sheet, mdw, defaultPx) {
   }
   return out;
 }
-function createGridMetrics(sheet, options2 = {}) {
-  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+function pixelScale(zoom) {
   const factor = zoom / 100;
-  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
-  const scale2 = (px2) => px2 > 0 ? Math.max(1, Math.round(px2 * factor)) : 0;
+  return (px2) => px2 > 0 ? Math.max(1, Math.round(px2 * factor)) : 0;
+}
+function columnAxis(sheet, mdw, scale2) {
   const defaultColPx = defaultColumnPixels(sheet.defaultColWidth, mdw);
   const colOverrides = [...columnOverrides(sheet, mdw, defaultColPx)].map(
     ([c2, px2]) => [c2, scale2(px2)]
   );
-  const cols = new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+  return new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+}
+function createColumnWidths(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const cols = columnAxis(sheet, options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH, pixelScale(zoom));
+  return (c2) => cols.size(c2);
+}
+function createGridMetrics(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
+  const scale2 = pixelScale(zoom);
+  const cols = columnAxis(sheet, mdw, scale2);
   const defaultRowPx = pointsToPixels(sheet.defaultRowHeight);
   const rowOverrides = [];
   for (const [r, info] of sheet.rowInfo) {
@@ -54846,6 +54860,87 @@ function cellView(workbook, sheetIndex2, row3, col, cf, options2 = {}) {
   return view;
 }
 
+// xlsx/layout/merge-sweep.ts
+var NONE = { merged: false, spanned: false };
+var SINGLE3 = { merged: true, spanned: false };
+var SPANNED = { merged: true, spanned: true };
+var spans2 = (merge2) => merge2.start.row !== merge2.end.row || merge2.start.col !== merge2.end.col;
+function firstRightOf(merges, col) {
+  let lo = 0;
+  let hi = merges.length;
+  while (lo < hi) {
+    const mid = lo + hi >> 1;
+    if ((merges[mid]?.start.col ?? 0) <= col) lo = mid + 1;
+    else hi = mid;
+  }
+  return lo;
+}
+var MergeSweep = class {
+  /** The merges by first row; `next` is the first one the sweep has not reached. */
+  byRow;
+  next = 0;
+  row = Number.NEGATIVE_INFINITY;
+  /** The merges covering the current row, by first column. */
+  active = [];
+  /** The last row of the earliest-ending active merge. */
+  firstEnd = Number.POSITIVE_INFINITY;
+  overlapping = false;
+  constructor(merges) {
+    this.byRow = [...merges].sort((a2, b) => a2.start.row - b.start.row);
+  }
+  /** How many merges cover the current row, which is everything the sweep holds. */
+  get size() {
+    return this.active.length;
+  }
+  /** Moves to `row`, which must not be above the previous one. */
+  moveTo(row3) {
+    if (row3 < this.row) throw new RangeError(`Rows must not go up: ${row3} after ${this.row}`);
+    this.row = row3;
+    if (row3 > this.firstEnd) this.dropEnded(row3);
+    for (; this.next < this.byRow.length; this.next++) {
+      const merge2 = this.byRow[this.next];
+      if (!merge2 || merge2.start.row > row3) break;
+      if (merge2.end.row >= row3) this.add(merge2);
+    }
+  }
+  /** How the merges cover column `col` of the current row. */
+  at(col) {
+    if (this.overlapping) {
+      let merged = false;
+      for (const merge3 of this.active) {
+        if (col < merge3.start.col || col > merge3.end.col) continue;
+        if (spans2(merge3)) return SPANNED;
+        merged = true;
+      }
+      return merged ? SINGLE3 : NONE;
+    }
+    const merge2 = this.active[firstRightOf(this.active, col) - 1];
+    if (!merge2 || col > merge2.end.col) return NONE;
+    return spans2(merge2) ? SPANNED : SINGLE3;
+  }
+  add(merge2) {
+    const at2 = firstRightOf(this.active, merge2.start.col);
+    const before = this.active[at2 - 1];
+    const after = this.active[at2];
+    if (before && before.end.col >= merge2.start.col || after && merge2.end.col >= after.start.col)
+      this.overlapping = true;
+    this.active.splice(at2, 0, merge2);
+    this.firstEnd = Math.min(this.firstEnd, merge2.end.row);
+  }
+  dropEnded(row3) {
+    let kept = 0;
+    let firstEnd = Number.POSITIVE_INFINITY;
+    for (const merge2 of this.active) {
+      if (merge2.end.row < row3) continue;
+      this.active[kept++] = merge2;
+      firstEnd = Math.min(firstEnd, merge2.end.row);
+    }
+    this.active.length = kept;
+    this.firstEnd = firstEnd;
+    if (!kept) this.overlapping = false;
+  }
+};
+
 // xlsx/layout/row-autofit.ts
 var LINE_HEIGHTS = [
   [6, 8.25],
@@ -54905,30 +55000,39 @@ function wrappedLineCount(text8, width, measure2) {
   }
   return lines2;
 }
-function autoFitRowHeight(workbook, sheetIndex2, row3, measure2) {
+function fitRowHeights(workbook, sheetIndex2, rows, measure2) {
+  const heights = /* @__PURE__ */ new Map();
   const sheet = workbook.sheets[sheetIndex2];
-  if (!sheet) return 15;
-  const cells3 = sheet.rows.get(row3);
-  if (!cells3?.size) return sheet.defaultRowHeight;
-  const metrics = createGridMetrics(sheet, { zoom: 100 });
-  let tallest = 0;
-  for (const col of cells3.keys()) {
-    const merged = sheet.merges.some(
-      (m) => row3 >= m.start.row && row3 <= m.end.row && col >= m.start.col && col <= m.end.col && (m.start.row !== m.end.row || m.start.col !== m.end.col)
-    );
-    if (merged) continue;
-    const view = cellView(workbook, sheetIndex2, row3, col);
-    if (!view.text) continue;
-    const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
-    const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
-    let lines2 = 1;
-    if (view.wrap) {
-      const width = metrics.colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
-      lines2 = wrappedLineCount(view.text, width, (text8) => measure2(text8, view.font));
+  if (!sheet) return heights;
+  const filled = [];
+  for (const row3 of new Set(rows)) {
+    if (sheet.rows.get(row3)?.size) filled.push(row3);
+    else heights.set(row3, sheet.defaultRowHeight);
+  }
+  filled.sort((a2, b) => a2 - b);
+  const merges = new MergeSweep(sheet.merges);
+  let colWidth;
+  for (const row3 of filled) {
+    merges.moveTo(row3);
+    let tallest = 0;
+    for (const col of sheet.rows.get(row3)?.keys() ?? []) {
+      const cover = merges.at(col);
+      if (cover.spanned) continue;
+      const view = cellView(workbook, sheetIndex2, row3, col, void 0, { merged: cover.merged });
+      if (!view.text) continue;
+      const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
+      const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
+      let lines2 = 1;
+      if (view.wrap) {
+        colWidth ??= createColumnWidths(sheet, { zoom: 100 });
+        const width = colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
+        lines2 = wrappedLineCount(view.text, width, (text8) => measure2(text8, view.font));
+      }
+      tallest = Math.max(tallest, lines2 * lineHeightPoints(sizePt));
     }
-    tallest = Math.max(tallest, lines2 * lineHeightPoints(sizePt));
+    heights.set(row3, tallest > 0 ? tallest : sheet.defaultRowHeight);
   }
-  return tallest > 0 ? tallest : sheet.defaultRowHeight;
+  return heights;
 }
 var approximateMeasure = (text8, font) => text8.length * font.sizePx * (font.bold ? 0.58 : 0.53);
 
@@ -54936,13 +55040,16 @@ var approximateMeasure = (text8, font) => text8.length * font.sizePx * (font.bol
 var MAX_HEIGHT2 = 409;
 function autoGrowRows(ctx, s, rows, measure2 = approximateMeasure) {
   const sheet = sheetAt(ctx.workbook, s);
-  const updates = [];
-  for (const row3 of new Set(rows)) {
+  const candidates = [...new Set(rows)].filter((row3) => {
     const info = sheet.rowInfo.get(row3);
-    if (info?.customHeight || info?.hidden) continue;
-    const fit3 = Math.min(MAX_HEIGHT2, autoFitRowHeight(ctx.workbook, s, row3, measure2));
+    return !info?.customHeight && !info?.hidden;
+  });
+  const fits = fitRowHeights(ctx.workbook, s, candidates, measure2);
+  const updates = [];
+  for (const row3 of candidates) {
+    const fit3 = Math.min(MAX_HEIGHT2, fits.get(row3) ?? sheet.defaultRowHeight);
     const next = Math.abs(fit3 - sheet.defaultRowHeight) < 1e-9 ? void 0 : fit3;
-    const current = info?.height;
+    const current = sheet.rowInfo.get(row3)?.height;
     if (current === next) continue;
     if (current !== void 0 && next !== void 0 && Math.abs(current - next) < 1e-9) continue;
     updates.push([row3, next]);
@@ -55884,7 +55991,7 @@ function inspectZip(bytes, limits, check3) {
   if (count2 > limits.maxEntries) fail2("LIMIT_ENTRIES", "Too many ZIP entries");
   if (centralStart + centralSize !== end) fail2("INVALID_ZIP", "Invalid central directory bounds");
   const entries = /* @__PURE__ */ new Map(), canonical2 = /* @__PURE__ */ new Set();
-  const spans2 = [];
+  const spans3 = [];
   let offset2 = centralStart, total2 = 0;
   const extras = (start, length, name3) => {
     const stop = start + length;
@@ -55954,14 +56061,14 @@ function inspectZip(bytes, limits, check3) {
       dataEnd += 12;
     }
     if (dataEnd > centralStart) fail2("ZIP_MISMATCH", "ZIP entry overlaps the central directory");
-    spans2.push({ start: local, end: dataEnd });
+    spans3.push({ start: local, end: dataEnd });
     entries.set(name3, { name: name3, compressed, size: size3, crc, directory });
     offset2 += 46 + nameLength + extraLength + commentLength;
   }
   if (offset2 !== end) fail2("INVALID_ZIP", "Central directory length or count mismatch");
-  spans2.sort((a2, b) => a2.start - b.start);
+  spans3.sort((a2, b) => a2.start - b.start);
   let previousEnd = 0;
-  for (const span3 of spans2) {
+  for (const span3 of spans3) {
     if (span3.start !== previousEnd)
       fail2("ZIP_MISMATCH", "Overlapping, prefixed, or unindexed ZIP records");
     previousEnd = span3.end;
@@ -68691,13 +68798,13 @@ function flattenCornerCurve(points) {
   return flattened ? [points[0], ...flattened] : void 0;
 }
 function connectorCurveMiddle(points) {
-  const spans2 = connectorCurveSpans(points);
+  const spans3 = connectorCurveSpans(points);
   if (points.length === 5) {
     const flattened = flattenCornerCurve(points);
     if (flattened) return connectorPolylineMiddle(flattened);
     return mix(points[0], points.at(-1), 0.5);
   }
-  const row3 = [...spans2[0]];
+  const row3 = [...spans3[0]];
   for (let count2 = row3.length - 1; count2 > 0; count2--)
     for (let i2 = 0; i2 < count2; i2++) row3[i2] = mix(row3[i2], row3[i2 + 1], 0.5);
   return row3[0];
@@ -79753,7 +79860,7 @@ function assertParentIndependent(facts, from, ids) {
 
 // visio/edit-group.ts
 var clean5 = (value3) => Math.abs(value3) < 1e-12 ? 0 : value3;
-var NONE = /* @__PURE__ */ new Map();
+var NONE2 = /* @__PURE__ */ new Map();
 function topLevel2(root) {
   const containers = children3(root, "Shapes");
   if (containers.length !== 1)
@@ -79768,7 +79875,7 @@ function assertGroupable(shape2, document) {
   assertShapeLocks(shape2, document, ["LockGroup"]);
   assertUnlayeredShape(shape2, document);
 }
-var transformOf = (shape2, instances = NONE) => {
+var transformOf = (shape2, instances = NONE2) => {
   const local = cells(instances.get(shape2)?.view ?? shape2);
   const width = numeric4(local.get("Width")), height = numeric4(local.get("Height"));
   return {
@@ -79790,7 +79897,7 @@ var transformOf = (shape2, instances = NONE) => {
     )
   };
 };
-function visioShapeBounds(shapes, instances = NONE) {
+function visioShapeBounds(shapes, instances = NONE2) {
   let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
   for (const shape2 of shapes) {
     const box5 = transformOf(shape2, instances);
@@ -79810,7 +79917,7 @@ function visioShapeBounds(shapes, instances = NONE) {
   }
   return { minX, minY, maxX, maxY };
 }
-function groupVisioShapes(root, document, edit, check3, instances = NONE) {
+function groupVisioShapes(root, document, edit, check3, instances = NONE2) {
   check3();
   const siblings = topLevel2(root);
   for (const node3 of Array.from(root.getElementsByTagName("*")))
@@ -79883,7 +79990,7 @@ function groupVisioShapes(root, document, edit, check3, instances = NONE) {
   }
   return true;
 }
-function ungroupVisioShape(root, document, edit, check3, instances = NONE) {
+function ungroupVisioShape(root, document, edit, check3, instances = NONE2) {
   check3();
   const candidates = topLevel2(root).filter((shape2) => attribute3(shape2, "ID") === edit.shapeId);
   if (candidates.length !== 1 || attribute3(candidates[0], "Type") !== "Group")