@superdoc-dev/cli 0.16.0-next.24 → 0.16.0-next.26

package/dist/index.js

@@ -59714,7 +59714,7 @@ var init_uuid_qzgm05fK_es = __esm(() => {
   v5_default = v35("v5", 80, sha1);
 });
 
-// ../../packages/superdoc/dist/chunks/constants-D-X7xF4s.es.js
+// ../../packages/superdoc/dist/chunks/constants-D9qj59G2.es.js
 function toProtocolSet(values) {
   const result = /* @__PURE__ */ new Set;
   if (!values)
@@ -60300,7 +60300,7 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
   return a.length === 1 ? "0" + a : a;
 }, rgbToHex = (rgb) => {
   return "#" + rgb.match(/\d+/g).map(componentToHex).join("");
-}, DEFAULT_SHADING_FOREGROUND_COLOR = "#000000", hexToRgb = (hex) => {
+}, DEFAULT_SHADING_FOREGROUND_COLOR = "#000000", DEFAULT_SHADING_FILL_COLOR = "#FFFFFF", hexToRgb = (hex) => {
   const normalized = normalizeHexColor(hex);
   if (!normalized)
     return null;
@@ -60327,16 +60327,19 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
 }, resolveShadingFillColor = (shading) => {
   if (!shading || typeof shading !== "object")
     return null;
-  const fill = normalizeHexColor(shading.fill);
-  if (!fill)
+  const val = typeof shading.val === "string" ? shading.val.trim().toLowerCase() : "";
+  if (val === "nil" || val === "none")
     return null;
-  const pctMatch = (typeof shading.val === "string" ? shading.val.trim().toLowerCase() : "").match(/^pct(\d{1,3})$/);
-  if (!pctMatch)
-    return fill;
-  const pct = Number.parseInt(pctMatch[1], 10);
+  const fillHex = typeof shading.fill === "string" && shading.fill.trim().toLowerCase() === "auto" ? null : normalizeHexColor(shading.fill);
+  const pctMatch = val.match(/^pct(\d{1,3})$/);
+  if (!(Boolean(pctMatch) || val === "solid"))
+    return fillHex;
+  const baseHex = fillHex ?? DEFAULT_SHADING_FILL_COLOR;
+  const foregroundHex = typeof shading.color !== "string" || shading.color.trim() === "" || shading.color.trim().toLowerCase() === "auto" ? DEFAULT_SHADING_FOREGROUND_COLOR : normalizeHexColor(shading.color) ?? DEFAULT_SHADING_FOREGROUND_COLOR;
+  const pct = pctMatch ? Number.parseInt(pctMatch[1], 10) : 100;
   if (!Number.isFinite(pct) || pct < 0 || pct > 100)
-    return fill;
-  return blendHexColors(fill, normalizeHexColor(shading.color) ?? DEFAULT_SHADING_FOREGROUND_COLOR, pct / 100) ?? fill;
+    return fillHex;
+  return blendHexColors(baseHex, foregroundHex, pct / 100) ?? fillHex;
 }, deobfuscateFont = (arrayBuffer, guidHex) => {
   const dta = new Uint8Array(arrayBuffer);
   const guidStr = guidHex.replace(/[-{}]/g, "");
@@ -60382,7 +60385,7 @@ var DEFAULT_ALLOWED_PROTOCOLS, OPTIONAL_PROTOCOLS, BLOCKED_PROTOCOLS, DEFAULT_MA
     return "webp";
   return null;
 }, COMMENT_FILE_BASENAMES, DEFAULT_XML_DECLARATION, COMMENT_RELATIONSHIP_TYPES;
-var init_constants_D_X7xF4s_es = __esm(() => {
+var init_constants_D9qj59G2_es = __esm(() => {
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_dist4();
@@ -68342,7 +68345,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-BSMYiYJm.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DBsJeu9t.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -127970,6 +127973,44 @@ var isRegExp = (value) => {
     ...comment,
     commentParaId: generateDocxRandomId()
   };
+}, getCommentIds = (comment) => {
+  if (!comment)
+    return [];
+  return [
+    comment.commentId,
+    comment.importedId,
+    comment.internalId
+  ].filter((id2) => id2 != null).map((id2) => String(id2));
+}, buildCommentLookup = (comments = []) => {
+  const byId = /* @__PURE__ */ new Map;
+  for (const comment of comments)
+    getCommentIds(comment).forEach((id2) => byId.set(id2, comment));
+  return byId;
+}, findCommentById = (comments = [], id2) => {
+  if (id2 == null)
+    return null;
+  return buildCommentLookup(comments).get(String(id2)) || null;
+}, isCommentResolvedInThread = (comment, allComments = []) => {
+  const isDone = (c$1) => Boolean(c$1?.resolvedTime || c$1?.isDone);
+  if (isDone(comment))
+    return true;
+  const byId = buildCommentLookup(allComments);
+  const seen = /* @__PURE__ */ new Set;
+  let current = comment;
+  while (current) {
+    const parentId = current.threadingParentCommentId || current.parentCommentId;
+    const parentKey = parentId != null ? String(parentId) : null;
+    if (parentKey == null || seen.has(parentKey))
+      break;
+    seen.add(parentKey);
+    const parent = byId.get(parentKey);
+    if (!parent)
+      break;
+    if (isDone(parent))
+      return true;
+    current = parent;
+  }
+  return false;
 }, getCommentDefinition = (comment, commentId, allComments, editor) => {
   const translatedParagraphs = (Array.isArray(comment.commentJSON) ? comment.commentJSON : comment.commentJSON ? [comment.commentJSON] : []).map((node3) => translator.decode({
     editor,
@@ -127980,7 +128021,7 @@ var isRegExp = (value) => {
     "w:author": comment.creatorName || comment.importedAuthor?.name,
     "w:date": toIsoNoFractional(comment.createdTime),
     "w:initials": getInitials(comment.creatorName),
-    "w:done": comment.resolvedTime ? "1" : "0",
+    "w:done": isCommentResolvedInThread(comment, allComments) ? "1" : "0",
     "w15:paraId": comment.commentParaId,
     "custom:internalId": comment.commentId || comment.internalId,
     "custom:trackedChange": comment.trackedChange,
@@ -127991,7 +128032,7 @@ var isRegExp = (value) => {
     "custom:email": comment.creatorEmail || comment.importedAuthor?.email
   };
   if (comment?.parentCommentId) {
-    const parentComment = allComments.find((c$1) => c$1.commentId === comment.parentCommentId);
+    const parentComment = findCommentById(allComments, comment.parentCommentId);
     if (parentComment && !parentComment.trackedChange)
       attributes["w15:paraIdParent"] = parentComment.commentParaId;
   }
@@ -128067,7 +128108,7 @@ var isRegExp = (value) => {
     return null;
   const xmlCopy = carbonCopy(commentsExtendedXml);
   const commentsEx = comments.map((comment) => {
-    const isResolved = comment.resolvedTime || comment.isDone;
+    const isResolved = isCommentResolvedInThread(comment, comments);
     const attributes = {
       "w15:paraId": comment.commentParaId,
       "w15:done": isResolved ? "1" : "0"
@@ -128075,7 +128116,7 @@ var isRegExp = (value) => {
     const parentId = comment.threadingParentCommentId || comment.parentCommentId;
     const threadingStyle = resolveThreadingStyle(comment, profile);
     if (parentId && (threadingStyle === "commentsExtended" || shouldIncludeForThreads)) {
-      const parentComment = comments.find((c$1) => c$1.commentId === parentId);
+      const parentComment = findCommentById(comments, parentId);
       const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
       if (parentComment && (allowTrackedParent || !parentComment.trackedChange))
         attributes["w15:paraIdParent"] = parentComment.commentParaId;
@@ -131096,15 +131137,17 @@ var isRegExp = (value) => {
     }
   }
   if (!cellBackgroundColor && resolvedTcProps?.shading) {
-    const { fill, themeFill, themeFillTint, themeFillShade } = resolvedTcProps.shading;
-    const normalizedFill = normalizeShadingColor(fill);
-    if (normalizedFill)
-      cellBackgroundColor = normalizedFill;
-    else if (themeFill && context.themeColors) {
-      const normalizedTheme = normalizeShadingColor(resolveThemeColorValue(themeFill, themeFillTint, themeFillShade, context.themeColors));
-      if (normalizedTheme)
-        cellBackgroundColor = normalizedTheme;
-    }
+    const { fill, color: color2, val, themeFill, themeFillTint, themeFillShade } = resolvedTcProps.shading;
+    let fillBase = normalizeShadingColor(fill);
+    if (!fillBase && themeFill && context.themeColors)
+      fillBase = normalizeShadingColor(resolveThemeColorValue(themeFill, themeFillTint, themeFillShade, context.themeColors));
+    const resolved = resolveShadingFillColor({
+      val,
+      color: color2,
+      fill: fillBase ?? fill
+    });
+    if (resolved)
+      cellBackgroundColor = resolved.startsWith("#") ? resolved : `#${resolved}`;
   }
   const cellConverterContext = tableInfo || cellBackgroundColor ? {
     ...context.converterContext,
@@ -131358,9 +131401,12 @@ var isRegExp = (value) => {
     return null;
   const rowProps = rowNode.attrs?.tableRowProperties;
   const rowHeight = normalizeRowHeight(rowProps);
+  const tblPrExBordersRaw = rowProps?.tblPrExBorders;
+  const rowBorders = tblPrExBordersRaw && typeof tblPrExBordersRaw === "object" ? extractTableBorders(tblPrExBordersRaw, { unit: "eighthPoints" }) : undefined;
   const attrs = rowProps && typeof rowProps === "object" ? {
     tableRowProperties: rowProps,
-    ...rowHeight ? { rowHeight } : {}
+    ...rowHeight ? { rowHeight } : {},
+    ...rowBorders ? { borders: rowBorders } : {}
   } : rowHeight ? { rowHeight } : undefined;
   return {
     id: context.nextBlockId(`row-${rowIndex}`),
@@ -131677,12 +131723,12 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_BSMYiYJm_es = __esm(() => {
+var init_SuperConverter_DBsJeu9t_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_lib_CYqLdG4z_es();
@@ -170712,7 +170758,7 @@ var init_SuperConverter_BSMYiYJm_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DeKyOdIi.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BiY_0zZP.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -181045,10 +181091,10 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_DeKyOdIi_es = __esm(() => {
-  init_SuperConverter_BSMYiYJm_es();
+var init_create_headless_toolbar_BiY_0zZP_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
   init_uuid_qzgm05fK_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
   DOM_SIZE_UNITS = [
@@ -182945,7 +182991,7 @@ var init_decrypt_docx_G2a7hkiV_es = __esm(() => {
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/DocxZipper-VodIk8WL.es.js
+// ../../packages/superdoc/dist/chunks/DocxZipper-Bu2Fhqkw.es.js
 function sniffEncoding(u8) {
   if (u8.length >= 2) {
     const b0 = u8[0], b1 = u8[1];
@@ -183618,11 +183664,11 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
     return `image/${MIME_TYPE_FOR_EXT[detectedType] || detectedType}`;
   }
 }, DocxZipper_default;
-var init_DocxZipper_VodIk8WL_es = __esm(() => {
+var init_DocxZipper_Bu2Fhqkw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_constants_D_X7xF4s_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   MANAGED_PACKAGE_PARTS = [
     {
@@ -230209,7 +230255,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-plIVvSkL.es.js
+// ../../packages/superdoc/dist/chunks/src-DYT7-l3i.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -275289,8 +275335,15 @@ function calculateChainHeight(chain, blocks2, measures, state) {
         const firstLineHeight = anchorMeasure.lines[0]?.lineHeight;
         const anchorHeight = typeof firstLineHeight === "number" && Number.isFinite(firstLineHeight) && firstLineHeight > 0 ? firstLineHeight : getMeasureHeight(anchorBlock, anchorMeasure);
         totalHeight += interParagraphSpacing + anchorHeight;
-      } else if (!(anchorBlock.kind === "table" && anchorBlock.anchor?.isAnchored === true))
-        totalHeight += prevSpacingAfter + getMeasureHeight(anchorBlock, anchorMeasure);
+      } else if (!(anchorBlock.kind === "table" && anchorBlock.anchor?.isAnchored === true)) {
+        let anchorHeight = getMeasureHeight(anchorBlock, anchorMeasure);
+        if (anchorBlock.kind === "table" && anchorMeasure.kind === "table" && anchorMeasure.rows.length > 0) {
+          const firstRowHeight = anchorMeasure.rows[0]?.height;
+          if (typeof firstRowHeight === "number" && Number.isFinite(firstRowHeight) && firstRowHeight > 0)
+            anchorHeight = firstRowHeight;
+        }
+        totalHeight += prevSpacingAfter + anchorHeight;
+      }
     }
   }
   return totalHeight;
@@ -292255,28 +292308,61 @@ var Node$13 = class Node$14 {
     ranges
   };
 }, resolveCommentById = ({ commentId, importedId, state, tr, dispatch }) => {
+  const converted = resolveCommentsInTr({
+    items: [{
+      commentId,
+      importedId
+    }],
+    state,
+    tr
+  });
+  if (converted)
+    dispatch(tr);
+  return converted;
+}, resolveCommentsInTr = ({ items = [], state, tr }) => {
   const { schema } = state;
   const markType = schema.marks?.[CommentMarkName];
   if (!markType)
     return false;
-  const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
-  if (!segments.length)
-    return false;
-  segments.forEach(({ from: from$1, to, attrs }) => {
-    tr.removeMark(from$1, to, markType.create(attrs));
-  });
   const startType = schema.nodes?.commentRangeStart;
   const endType = schema.nodes?.commentRangeEnd;
-  if (startType && endType)
-    ranges.slice().sort((a2, b$1) => b$1.from - a2.from).forEach(({ from: from$1, to, internal }) => {
-      tr.insert(to, endType.create({ "w:id": commentId }));
-      tr.insert(from$1, startType.create({
+  const insertions = [];
+  const seen = /* @__PURE__ */ new Set;
+  let converted = false;
+  for (const item of items) {
+    if (!item)
+      continue;
+    const { commentId, importedId } = item;
+    if (commentId == null)
+      continue;
+    const key2 = `${commentId}:${importedId ?? ""}`;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
+    if (!segments.length)
+      continue;
+    converted = true;
+    segments.forEach(({ from: from$1, to, attrs }) => {
+      tr.removeMark(from$1, to, markType.create(attrs));
+    });
+    if (startType && endType && item.preserveAnchor !== false)
+      ranges.forEach(({ from: from$1, to, internal }) => insertions.push({
+        from: from$1,
+        to,
+        internal,
+        commentId
+      }));
+  }
+  if (startType && endType && insertions.length)
+    insertions.sort((a2, b$1) => b$1.from - a2.from || b$1.to - a2.to).forEach(({ from: from$1, to, internal, commentId }) => {
+      tr.insert(tr.mapping.map(to), endType.create({ "w:id": commentId }));
+      tr.insert(tr.mapping.map(from$1), startType.create({
         "w:id": commentId,
         internal
       }));
     });
-  dispatch(tr);
-  return true;
+  return converted;
 }, getCommentRangeAnchorsById = (commentId, doc$12, importedId) => {
   const anchors = [];
   doc$12.descendants((node3, pos) => {
@@ -292571,6 +292657,60 @@ var Node$13 = class Node$14 {
       });
     });
   }
+  const nodeAnchorsById = /* @__PURE__ */ new Map;
+  doc$12.descendants((node3, pos) => {
+    const typeName = node3.type?.name;
+    if (typeName !== "commentRangeStart" && typeName !== "commentRangeEnd")
+      return;
+    const anchorId = node3.attrs?.["w:id"];
+    if (anchorId == null)
+      return;
+    const entry = nodeAnchorsById.get(anchorId) || {};
+    if (typeName === "commentRangeStart")
+      entry.startPos = pos;
+    else
+      entry.endPos = pos;
+    nodeAnchorsById.set(anchorId, entry);
+  });
+  const isRepresented = (c) => seen.has(c.commentId) || c.importedId != null && seen.has(c.importedId) || nodeAnchorsById.has(c.commentId) || c.importedId != null && nodeAnchorsById.has(c.importedId);
+  const findAncestorNodeAnchor = (comment2) => {
+    let current = comment2;
+    const visited = /* @__PURE__ */ new Set;
+    while (current) {
+      const parentId = getThreadingParentId(current);
+      if (parentId == null || visited.has(parentId))
+        return null;
+      visited.add(parentId);
+      const parent = commentMap.get(parentId) || comments.find((c) => c.importedId === parentId || c.commentId === parentId);
+      const anchor = nodeAnchorsById.get(parentId) ?? (parent ? nodeAnchorsById.get(parent.commentId) ?? nodeAnchorsById.get(parent.importedId) : undefined);
+      if (anchor?.startPos != null && anchor?.endPos != null)
+        return anchor;
+      current = parent;
+    }
+    return null;
+  };
+  comments.filter((c) => !c.trackedChange && c.commentId != null && !isRepresented(c)).sort((a2, b$1) => (a2.createdTime || 0) - (b$1.createdTime || 0)).forEach((c) => {
+    const anchor = findAncestorNodeAnchor(c);
+    if (!anchor)
+      return;
+    seen.add(c.commentId);
+    const childAttrs = getPreparedComment({
+      commentId: c.commentId,
+      internal: c.isInternal
+    });
+    startNodes.push({
+      pos: anchor.startPos + 1,
+      node: schema.nodes.commentRangeStart.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+    endNodes.push({
+      pos: anchor.endPos + 1,
+      node: schema.nodes.commentRangeEnd.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+  });
   startNodes.sort((a2, b$1) => {
     if (a2.pos !== b$1.pos)
       return a2.pos - b$1.pos;
@@ -310127,6 +310267,45 @@ menclose::after {
   if (explicitSpec)
     return explicitSpec;
   return borderValueToSpec(fallback);
+}, BORDER_STYLE_NUMBER, BORDER_STYLE_LINES, isPresentBorder = (b$1) => !!b$1 && b$1.style !== undefined && b$1.style !== "none" && (b$1.width === undefined || b$1.width > 0), isExplicitNoneBorder = (b$1) => {
+  if (!b$1 || typeof b$1 !== "object")
+    return false;
+  const r$1 = b$1;
+  return r$1.style === "none" || r$1.none === true;
+}, borderWeight = (b$1) => (BORDER_STYLE_LINES[b$1.style] ?? 1) * (BORDER_STYLE_NUMBER[b$1.style] ?? 1), colorBrightness = (color2, formula) => {
+  const hex = (color2 ?? "#000000").replace("#", "");
+  if (hex.length < 6)
+    return 0;
+  return formula(parseInt(hex.slice(0, 2), 16), parseInt(hex.slice(2, 4), 16), parseInt(hex.slice(4, 6), 16));
+}, resolveBorderConflict = (a2, b$1) => {
+  const pa = isPresentBorder(a2);
+  const pb = isPresentBorder(b$1);
+  if (!pa && !pb)
+    return;
+  if (!pa)
+    return b$1;
+  if (!pb)
+    return a2;
+  const wa = borderWeight(a2);
+  const wb = borderWeight(b$1);
+  if (wa !== wb)
+    return wa > wb ? a2 : b$1;
+  const na = BORDER_STYLE_NUMBER[a2.style] ?? 99;
+  const nb = BORDER_STYLE_NUMBER[b$1.style] ?? 99;
+  if (na !== nb)
+    return na < nb ? a2 : b$1;
+  const formulas = [
+    (r$1, g$1, bl) => r$1 + bl + 2 * g$1,
+    (_r, g$1, bl) => bl + 2 * g$1,
+    (_r, g$1) => g$1
+  ];
+  for (const f2 of formulas) {
+    const ba = colorBrightness(a2.color, f2);
+    const bb = colorBrightness(b$1.color, f2);
+    if (ba !== bb)
+      return ba < bb ? a2 : b$1;
+  }
+  return a2;
 }, hasExplicitCellBorders = (cellBorders) => Boolean(cellBorders && (cellBorders.top !== undefined || cellBorders.right !== undefined || cellBorders.bottom !== undefined || cellBorders.left !== undefined)), resolveTableCellBorders = (tableBorders, cellPosition) => {
   const cellBounds = getTableCellGridBounds(cellPosition);
   return {
@@ -311966,8 +312145,21 @@ menclose::after {
       }
   }
   return { cellElement: cellEl };
-}, hasAnyResolvedBorder = (borders) => Boolean(borders.top || borders.right || borders.bottom || borders.left), resolveRenderedCellBorders = ({ cellBorders, hasBordersAttribute, tableBorders, cellPosition, cellSpacingPx, continuesFromPrev, continuesOnNext }) => {
+}, hasAnyResolvedBorder = (borders) => Boolean(borders.top || borders.right || borders.bottom || borders.left), resolveRenderedCellBorders = ({ cellBorders, hasBordersAttribute, tableBorders, cellPosition, cellSpacingPx, continuesFromPrev, continuesOnNext, aboveCellBorders, leftCellBorders, rightCellBorders, nextRowLeavesRightGap, deferTopToAboveCell, nextRowSuppressesSharedTop }) => {
   const hasExplicitBorders = hasExplicitCellBorders(cellBorders);
+  const cellBounds = getTableCellGridBounds(cellPosition);
+  const touchesTopBoundary = cellBounds.touchesTopEdge || continuesFromPrev;
+  const touchesBottomBoundary = cellBounds.touchesBottomEdge || continuesOnNext || nextRowLeavesRightGap === true;
+  const hasInteriorNeighborBorder = !touchesTopBoundary && !deferTopToAboveCell && isPresentBorder(aboveCellBorders?.bottom) || !cellBounds.touchesLeftEdge && isPresentBorder(leftCellBorders?.right);
+  if (cellSpacingPx === 0 && (hasExplicitBorders || hasInteriorNeighborBorder)) {
+    const cb = cellBorders ?? {};
+    return {
+      top: touchesTopBoundary ? resolveTableBorderValue(cb.top, tableBorders?.top) : deferTopToAboveCell ? undefined : resolveBorderConflict(cb.top, aboveCellBorders?.bottom) ?? (isExplicitNoneBorder(cb.top) && isExplicitNoneBorder(aboveCellBorders?.bottom) ? undefined : borderValueToSpec(tableBorders?.insideH)),
+      left: cellBounds.touchesLeftEdge ? resolveTableBorderValue(cb.left, tableBorders?.left) : isPresentBorder(cb.left) ? resolveBorderConflict(cb.left, leftCellBorders?.right) ?? borderValueToSpec(tableBorders?.insideV) : isPresentBorder(leftCellBorders?.right) ? undefined : isExplicitNoneBorder(cb.left) && isExplicitNoneBorder(leftCellBorders?.right) ? undefined : borderValueToSpec(tableBorders?.insideV),
+      right: cellBounds.touchesRightEdge ? resolveTableBorderValue(cb.right, tableBorders?.right) : isPresentBorder(cb.right) && !isPresentBorder(rightCellBorders?.left) ? cb.right : undefined,
+      bottom: touchesBottomBoundary ? resolveTableBorderValue(cb.bottom, tableBorders?.bottom) : undefined
+    };
+  }
   if (hasBordersAttribute && !hasExplicitBorders)
     return;
   if (!tableBorders)
@@ -311977,24 +312169,13 @@ menclose::after {
       bottom: cellBorders.bottom,
       left: cellBorders.left
     } : undefined;
-  const cellBounds = getTableCellGridBounds(cellPosition);
-  const touchesTopBoundary = cellBounds.touchesTopEdge || continuesFromPrev;
-  const touchesBottomBoundary = cellBounds.touchesBottomEdge || continuesOnNext;
-  if (hasExplicitBorders) {
-    if (cellSpacingPx === 0)
-      return {
-        top: resolveTableBorderValue(cellBorders.top, touchesTopBoundary ? tableBorders.top : tableBorders.insideH),
-        right: cellBounds.touchesRightEdge ? resolveTableBorderValue(cellBorders.right, tableBorders.right) : undefined,
-        bottom: touchesBottomBoundary ? resolveTableBorderValue(cellBorders.bottom, tableBorders.bottom) : undefined,
-        left: resolveTableBorderValue(cellBorders.left, cellBounds.touchesLeftEdge ? tableBorders.left : tableBorders.insideV)
-      };
+  if (hasExplicitBorders)
     return {
       top: resolveTableBorderValue(cellBorders.top, touchesTopBoundary ? tableBorders.top : tableBorders.insideH),
       right: resolveTableBorderValue(cellBorders.right, cellBounds.touchesRightEdge ? tableBorders.right : undefined),
       bottom: resolveTableBorderValue(cellBorders.bottom, touchesBottomBoundary ? tableBorders.bottom : undefined),
       left: resolveTableBorderValue(cellBorders.left, cellBounds.touchesLeftEdge ? tableBorders.left : tableBorders.insideV)
     };
-  }
   if (cellSpacingPx > 0) {
     const interiorBorders = {
       top: touchesTopBoundary ? undefined : borderValueToSpec(tableBorders.insideH),
@@ -312005,15 +312186,29 @@ menclose::after {
     return hasAnyResolvedBorder(interiorBorders) ? interiorBorders : undefined;
   }
   const baseBorders = resolveTableCellBorders(tableBorders, cellPosition);
+  const insideHSpec = borderValueToSpec(tableBorders.insideH);
+  const interiorBottom = nextRowSuppressesSharedTop && isPresentBorder(insideHSpec) ? insideHSpec : baseBorders.bottom;
   return {
     top: touchesTopBoundary ? borderValueToSpec(tableBorders.top) : baseBorders.top,
     right: baseBorders.right,
-    bottom: touchesBottomBoundary ? borderValueToSpec(tableBorders.bottom) : baseBorders.bottom,
+    bottom: touchesBottomBoundary ? borderValueToSpec(tableBorders.bottom) : interiorBottom,
     left: baseBorders.left
   };
 }, renderTableRow = (deps) => {
-  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2, resolvePhysical } = deps;
+  const { doc: doc$12, container, rowIndex, y: y$1, rowMeasure, row: row2, prevRow, prevRowMeasure, nextRow, nextRowMeasure, rowOccupiedRightCol, nextRowOccupiedRightCol, totalRows, tableBorders, columnWidths, allRowHeights, tableIndent, isRtl, context, renderLine: renderLine$1, captureLineSnapshot, renderDrawingContent, applySdtDataset: applySdtDataset$1, ancestorContainerKey, ancestorContainerSdt, ancestorContainerKeys, ancestorContainerSdts, onSdtContainerChrome, continuesFromPrev, continuesOnNext, partialRow, cellSpacingPx = 0, chrome: chrome2, resolvePhysical } = deps;
   const totalCols = columnWidths.length;
+  const rowRightEdgeCol = rowOccupiedRightCol != null && rowOccupiedRightCol > 0 ? Math.min(totalCols, rowOccupiedRightCol) : rowMeasure.cells.length ? Math.min(totalCols, Math.max(...rowMeasure.cells.map((c) => (c.gridColumnStart ?? 0) + (c.colSpan ?? 1)))) : totalCols;
+  const rowBorderOverride = row2?.attrs?.borders;
+  const effectiveTableBorders = rowBorderOverride ? {
+    ...tableBorders ?? {},
+    ...rowBorderOverride
+  } : tableBorders;
+  const nextRowBorderOverride = nextRow?.attrs?.borders;
+  const nextRowEffectiveInsideH = nextRowBorderOverride ? {
+    ...tableBorders ?? {},
+    ...nextRowBorderOverride
+  }.insideH : undefined;
+  const nextRowSuppressesSharedTop = nextRowBorderOverride !== undefined && !isPresentBorder(borderValueToSpec(nextRowEffectiveInsideH));
   const calculateXPosition = (gridColumnStart) => {
     let x = cellSpacingPx;
     for (let i4 = 0;i4 < gridColumnStart && i4 < columnWidths.length; i4++)
@@ -312038,6 +312233,27 @@ menclose::after {
       width += columnWidths[i4];
     return width;
   };
+  const findCellBordersAtColumn = (cells, measureCells, gridCol) => {
+    if (!cells || !measureCells)
+      return;
+    for (let i4 = 0;i4 < measureCells.length; i4++) {
+      const start$1 = measureCells[i4].gridColumnStart ?? i4;
+      const span = measureCells[i4].colSpan ?? 1;
+      if (gridCol >= start$1 && gridCol < start$1 + span)
+        return cells[i4]?.attrs?.borders;
+    }
+  };
+  const findCellRightEdgeAtColumn = (measureCells, gridCol) => {
+    if (!measureCells)
+      return;
+    for (let i4 = 0;i4 < measureCells.length; i4++) {
+      const start$1 = measureCells[i4].gridColumnStart ?? i4;
+      const span = measureCells[i4].colSpan ?? 1;
+      if (gridCol >= start$1 && gridCol < start$1 + span)
+        return start$1 + span;
+    }
+  };
+  const nextRowMaxCol = nextRowOccupiedRightCol != null && nextRowOccupiedRightCol > 0 ? nextRowOccupiedRightCol : nextRowMeasure?.cells?.length ? Math.max(...nextRowMeasure.cells.map((c) => (c.gridColumnStart ?? 0) + (c.colSpan ?? 1))) : Infinity;
   for (let cellIndex = 0;cellIndex < rowMeasure.cells.length; cellIndex += 1) {
     const cellMeasure = rowMeasure.cells[cellIndex];
     const cell2 = row2?.cells?.[cellIndex];
@@ -312046,21 +312262,34 @@ menclose::after {
     const colSpan = cellMeasure.colSpan ?? 1;
     let x = calculateXPosition(gridColumnStart);
     const cellBordersAttr = cell2?.attrs?.borders;
+    const hasBordersAttribute = cellBordersAttr !== undefined;
+    const cellPosition = {
+      rowIndex,
+      rowSpan,
+      gridColumnStart,
+      colSpan,
+      totalRows,
+      totalCols: rowRightEdgeCol
+    };
+    const aboveCellBorders = findCellBordersAtColumn(prevRow?.cells, prevRowMeasure?.cells, gridColumnStart);
+    const leftCellBorders = gridColumnStart > 0 ? findCellBordersAtColumn(row2?.cells, rowMeasure.cells, gridColumnStart - 1) : undefined;
+    const rightCellBorders = findCellBordersAtColumn(row2?.cells, rowMeasure.cells, gridColumnStart + colSpan);
+    const nextRowLeavesRightGap = gridColumnStart + colSpan > nextRowMaxCol;
+    const aboveCellRightEdge = findCellRightEdgeAtColumn(prevRowMeasure?.cells, gridColumnStart);
     const resolvedBorders = resolveRenderedCellBorders({
       cellBorders: cellBordersAttr,
-      hasBordersAttribute: cellBordersAttr !== undefined,
-      tableBorders,
-      cellPosition: {
-        rowIndex,
-        rowSpan,
-        gridColumnStart,
-        colSpan,
-        totalRows,
-        totalCols
-      },
+      hasBordersAttribute,
+      tableBorders: effectiveTableBorders,
+      cellPosition,
       cellSpacingPx,
       continuesFromPrev: continuesFromPrev === true,
-      continuesOnNext: continuesOnNext === true
+      continuesOnNext: continuesOnNext === true,
+      aboveCellBorders,
+      leftCellBorders,
+      rightCellBorders,
+      nextRowLeavesRightGap,
+      deferTopToAboveCell: aboveCellRightEdge !== undefined && aboveCellRightEdge > rowRightEdgeCol,
+      nextRowSuppressesSharedTop
     });
     const finalBorders = isRtl && resolvedBorders ? swapCellBordersLR(resolvedBorders) : resolvedBorders;
     let cellHeight;
@@ -312193,12 +312422,22 @@ menclose::after {
       if (!rowMeasure)
         continue;
       const boundariesInRow = /* @__PURE__ */ new Set;
+      const occupiedCols = /* @__PURE__ */ new Set;
+      for (const cellMeasure of rowMeasure.cells) {
+        const s2 = cellMeasure.gridColumnStart ?? 0;
+        const sp = cellMeasure.colSpan ?? 1;
+        for (let c = s2;c < s2 + sp; c++)
+          occupiedCols.add(c);
+      }
+      const lastColIndex = columnCount - 1;
+      const lastColMeta = fragment2.metadata.columnBoundaries[lastColIndex];
+      const skipTrailingSpacerBoundary = lastColIndex > 0 && !occupiedCols.has(lastColIndex) && !!lastColMeta && typeof lastColMeta.width === "number" && typeof lastColMeta.minWidth === "number" && lastColMeta.width < lastColMeta.minWidth;
       for (const cellMeasure of rowMeasure.cells) {
         const startCol = cellMeasure.gridColumnStart ?? 0;
         const endCol = startCol + (cellMeasure.colSpan ?? 1);
         if (startCol > 0)
           boundariesInRow.add(startCol);
-        if (endCol < columnCount)
+        if (endCol < columnCount && !(skipTrailingSpacerBoundary && endCol === lastColIndex))
           boundariesInRow.add(endCol);
       }
       for (const boundaryCol of boundariesInRow) {
@@ -312255,6 +312494,16 @@ menclose::after {
       return fragment2.partialRow.partialHeight;
     return r$1?.height ?? 0;
   });
+  const rowOccupiedRightCols = new Array(measure.rows.length).fill(0);
+  measure.rows.forEach((rowM, r$1) => {
+    for (const c of rowM?.cells ?? []) {
+      const right$1 = (c.gridColumnStart ?? 0) + (c.colSpan ?? 1);
+      const lastRow = Math.min(measure.rows.length - 1, r$1 + (c.rowSpan ?? 1) - 1);
+      for (let rr = r$1;rr <= lastRow; rr += 1)
+        if (right$1 > rowOccupiedRightCols[rr])
+          rowOccupiedRightCols[rr] = right$1;
+    }
+  });
   let y$1 = cellSpacingPx;
   if (fragment2.repeatHeaderCount && fragment2.repeatHeaderCount > 0)
     for (let r$1 = 0;r$1 < fragment2.repeatHeaderCount; r$1 += 1) {
@@ -312268,6 +312517,12 @@ menclose::after {
         y: y$1,
         rowMeasure,
         row: block.rows[r$1],
+        prevRow: r$1 > 0 ? block.rows[r$1 - 1] : undefined,
+        prevRowMeasure: r$1 > 0 ? measure.rows[r$1 - 1] : undefined,
+        nextRow: r$1 < block.rows.length - 1 ? block.rows[r$1 + 1] : undefined,
+        nextRowMeasure: r$1 < block.rows.length - 1 ? measure.rows[r$1 + 1] : undefined,
+        rowOccupiedRightCol: rowOccupiedRightCols[r$1],
+        nextRowOccupiedRightCol: rowOccupiedRightCols[r$1 + 1],
         totalRows: block.rows.length,
         tableBorders,
         columnWidths: effectiveColumnWidths,
@@ -312386,6 +312641,12 @@ menclose::after {
       y: y$1,
       rowMeasure,
       row: block.rows[r$1],
+      prevRow: r$1 > 0 ? block.rows[r$1 - 1] : undefined,
+      prevRowMeasure: r$1 > 0 ? measure.rows[r$1 - 1] : undefined,
+      nextRow: r$1 < block.rows.length - 1 ? block.rows[r$1 + 1] : undefined,
+      nextRowMeasure: r$1 < block.rows.length - 1 ? measure.rows[r$1 + 1] : undefined,
+      rowOccupiedRightCol: rowOccupiedRightCols[r$1],
+      nextRowOccupiedRightCol: rowOccupiedRightCols[r$1 + 1],
       totalRows: block.rows.length,
       tableBorders,
       columnWidths: effectiveColumnWidths,
@@ -326263,19 +326524,19 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_plIVvSkL_es = __esm(() => {
+var init_src_DYT7_l3i_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_BSMYiYJm_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_DeKyOdIi_es();
-  init_constants_D_X7xF4s_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_remark_gfm_BhnWr3yf_es();
   init_remark_stringify_6MMJfY0k_es();
-  init_DocxZipper_VodIk8WL_es();
+  init_DocxZipper_Bu2Fhqkw_es();
   init__plugin_vue_export_helper_5t5P5NuM_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();
@@ -329350,6 +329611,17 @@ ${err.toString()}`);
             dispatch
           });
         },
+        resolveCommentThread: ({ comments } = {}) => ({ tr, dispatch, state }) => {
+          tr.setMeta(CommentsPluginKey, { event: "update" });
+          const converted = resolveCommentsInTr({
+            items: comments,
+            state,
+            tr
+          });
+          if (converted)
+            dispatch(tr);
+          return converted;
+        },
         reopenComment: ({ commentId, importedId, internal }) => ({ tr, dispatch, state }) => {
           tr.setMeta(CommentsPluginKey, { event: "update" });
           return reopenCommentById({
@@ -353138,6 +353410,30 @@ function print() { __p += __j.call(arguments, '') }
     "wave",
     "doubleWave"
   ]);
+  BORDER_STYLE_NUMBER = {
+    single: 1,
+    thick: 2,
+    double: 3,
+    dotted: 4,
+    dashed: 5,
+    dotDash: 6,
+    dotDotDash: 7,
+    triple: 8,
+    wave: 18,
+    doubleWave: 19
+  };
+  BORDER_STYLE_LINES = {
+    single: 1,
+    thick: 1,
+    double: 2,
+    dotted: 1,
+    dashed: 1,
+    dotDash: 1,
+    dotDotDash: 1,
+    triple: 3,
+    wave: 1,
+    doubleWave: 2
+  };
   SETTLED_STATUSES = [
     "loaded",
     "failed",
@@ -353149,7 +353445,8 @@ function print() { __p += __j.call(arguments, '') }
     cambria: "Caladea",
     arial: "Liberation Sans",
     "times new roman": "Liberation Serif",
-    "courier new": "Liberation Mono"
+    "courier new": "Liberation Mono",
+    helvetica: "Liberation Sans"
   });
   defaultResolver = new FontResolver;
   DEFAULT_FONT_MEASURE_CONTEXT = Object.freeze({
@@ -360978,11 +361275,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CJMIa98h.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-k5vyPmpN.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_CJMIa98h_es = __esm(() => {
-  init_SuperConverter_BSMYiYJm_es();
-  init_create_headless_toolbar_DeKyOdIi_es();
+var init_create_super_doc_ui_k5vyPmpN_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -361024,16 +361321,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_plIVvSkL_es();
-  init_SuperConverter_BSMYiYJm_es();
+  init_src_DYT7_l3i_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_DeKyOdIi_es();
-  init_constants_D_X7xF4s_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
+  init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
-  init_DocxZipper_VodIk8WL_es();
-  init_create_super_doc_ui_CJMIa98h_es();
+  init_DocxZipper_Bu2Fhqkw_es();
+  init_create_super_doc_ui_k5vyPmpN_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.16.0-next.24",
+  "version": "0.16.0-next.26",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -33,11 +33,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.24",
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.24",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.24",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.24",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.24"
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.26",
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.26",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.26",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.26",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.26"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",