@superdoc-dev/cli 0.5.0-next.33 → 0.5.0-next.35

package/dist/index.js

@@ -172583,7 +172583,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-g1sb-ClT.es.js
+// ../../packages/superdoc/dist/chunks/src-XIzWLug0.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -214530,10 +214530,19 @@ function layoutParagraphBlock(ctx$1, anchors) {
         remeasuredMarkerInfo = newMeasure.marker;
     }
   }
+  const rawBorderExpansion = computeBorderVerticalExpansion(attrs?.borders);
+  const currentBorderHash = hashBorders(attrs?.borders);
+  const inBorderGroup = currentBorderHash != null && currentBorderHash === ensurePage().lastParagraphBorderHash;
+  const borderExpansion = {
+    top: inBorderGroup ? 0 : rawBorderExpansion.top,
+    bottom: rawBorderExpansion.bottom
+  };
   while (fromLine < lines.length) {
     let state = ensurePage();
     if (state.trailingSpacing == null)
       state.trailingSpacing = 0;
+    if (inBorderGroup && fromLine === 0)
+      state.cursorY -= rawBorderExpansion.bottom;
     if (shouldSuppressOwnSpacing(styleId, contextualSpacing, state.lastParagraphStyleId))
       spacingBefore = 0;
     if (shouldSuppressOwnSpacing(state.lastParagraphStyleId, state.lastParagraphContextualSpacing, styleId)) {
@@ -214547,7 +214556,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
       const prevTrailing = state.trailingSpacing ?? 0;
       const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
       const pageContentHeight = state.contentBottom - state.topMargin;
-      const fullHeight = lines.reduce((sum, line) => sum + (line.lineHeight || 0), 0);
+      const fullHeight = lines.reduce((sum, line) => sum + (line.lineHeight || 0), 0) + borderExpansion.top + borderExpansion.bottom;
       const fitsOnBlankPage = fullHeight + baseSpacingBefore <= pageContentHeight;
       const remainingHeightAfterSpacing = state.contentBottom - (state.cursorY + neededSpacingBefore);
       if (fitsOnBlankPage && state.page.fragments.length > 0 && fullHeight > remainingHeightAfterSpacing) {
@@ -214593,7 +214602,9 @@ function layoutParagraphBlock(ctx$1, anchors) {
       effectiveColumnWidth = narrowestWidth;
       offsetX = narrowestOffsetX;
     }
-    const slice2 = sliceLines(lines, fromLine, state.contentBottom - state.cursorY);
+    const borderVertical = borderExpansion.top + borderExpansion.bottom;
+    const availableForSlice = Math.max(0, state.contentBottom - state.cursorY - borderVertical);
+    const slice2 = sliceLines(lines, fromLine, availableForSlice);
     const fragmentHeight = slice2.height;
     const adjustedX = columnX(state.columnIndex) + offsetX + negativeLeftIndent;
     const adjustedWidth = effectiveColumnWidth - negativeLeftIndent - negativeRightIndent;
@@ -214603,7 +214614,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
       fromLine,
       toLine: slice2.toLine,
       x: adjustedX,
-      y: state.cursorY,
+      y: state.cursorY + borderExpansion.top,
       width: adjustedWidth,
       ...computeFragmentPmRange(block, lines, fromLine, slice2.toLine)
     };
@@ -214634,7 +214645,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
         fragment2.x = columnX(state.columnIndex) + offsetX + (effectiveColumnWidth - maxLineWidth) / 2;
     }
     state.page.fragments.push(fragment2);
-    state.cursorY += fragmentHeight;
+    state.cursorY += borderExpansion.top + fragmentHeight + borderExpansion.bottom;
     lastState = state;
     fromLine = slice2.toLine;
   }
@@ -214652,6 +214663,7 @@ function layoutParagraphBlock(ctx$1, anchors) {
       lastState.trailingSpacing = 0;
     lastState.lastParagraphStyleId = styleId;
     lastState.lastParagraphContextualSpacing = contextualSpacing;
+    lastState.lastParagraphBorderHash = currentBorderHash;
   }
 }
 function layoutImageBlock({ block, measure, columns, ensurePage, advanceColumn, columnX }) {
@@ -240470,7 +240482,7 @@ var Node$13 = class Node$14 {
     if (frag.continuesOnNext)
       continue;
     const borders = getFragmentParagraphBorders(frag, blockLookup);
-    if (!borders?.between)
+    if (!borders)
       continue;
     const next2 = fragments[i4 + 1];
     if (next2.kind !== "para" && next2.kind !== "list-item")
@@ -240482,7 +240494,7 @@ var Node$13 = class Node$14 {
     if (next2.blockId === frag.blockId && next2.kind === "list-item" && frag.kind === "list-item" && next2.itemId === frag.itemId)
       continue;
     const nextBorders = getFragmentParagraphBorders(next2, blockLookup);
-    if (!nextBorders?.between)
+    if (!nextBorders)
       continue;
     if (hashParagraphBorders$1(borders) !== hashParagraphBorders$1(nextBorders))
       continue;
@@ -240523,7 +240535,7 @@ var Node$13 = class Node$14 {
       result.get(i4 + 1).suppressTopBorder = true;
   }
   return result;
-}, PX_PER_PT$12, getParagraphBorderBox = (fragmentWidth, indent2) => {
+}, PX_PER_PT$2, getParagraphBorderBox = (fragmentWidth, indent2) => {
   const indentLeft = Number.isFinite(indent2?.left) ? indent2.left : 0;
   const indentRight = Number.isFinite(indent2?.right) ? indent2.right : 0;
   const firstLineOffset = (Number.isFinite(indent2?.firstLine) ? indent2.firstLine : 0) - (Number.isFinite(indent2?.hanging) ? indent2.hanging : 0);
@@ -240546,17 +240558,17 @@ var Node$13 = class Node$14 {
   const suppressBottom = betweenInfo?.suppressBottomBorder ?? false;
   const showBetween = betweenInfo?.showBetweenBorder ?? false;
   return {
-    top: suppressTop ? borders.between?.space ? borders.between.space * PX_PER_PT$12 : 0 : borders.top?.space ? borders.top.space * PX_PER_PT$12 : 0,
-    bottom: !suppressBottom && !showBetween && borders.bottom?.space ? borders.bottom.space * PX_PER_PT$12 : 0,
-    left: borders.left?.space ? borders.left.space * PX_PER_PT$12 : 0,
-    right: borders.right?.space ? borders.right.space * PX_PER_PT$12 : 0
+    top: suppressTop ? borders.between?.space ? borders.between.space * PX_PER_PT$2 : 0 : borders.top?.space ? borders.top.space * PX_PER_PT$2 : 0,
+    bottom: !suppressBottom && !showBetween && borders.bottom?.space ? borders.bottom.space * PX_PER_PT$2 : 0,
+    left: borders.left?.space ? borders.left.space * PX_PER_PT$2 : 0,
+    right: borders.right?.space ? borders.right.space * PX_PER_PT$2 : 0
   };
 }, createParagraphDecorationLayers = (doc$12, fragmentWidth, attrs, betweenInfo) => {
   if (!attrs?.borders && !attrs?.shading)
     return {};
   const borderBox = getParagraphBorderBox(fragmentWidth, attrs.indent);
   const space = computeBorderSpaceExpansion(attrs.borders, betweenInfo);
-  const betweenSpaceBelow = betweenInfo?.showBetweenBorder && attrs.borders?.between?.space ? attrs.borders.between.space * PX_PER_PT$12 : 0;
+  const betweenSpaceBelow = betweenInfo?.showBetweenBorder && attrs.borders?.between?.space ? attrs.borders.between.space * PX_PER_PT$2 : 0;
   const rawGap = betweenInfo?.showBetweenBorder || betweenInfo?.suppressBottomBorder ? betweenInfo.gapBelow : 0;
   const gapExtension = Math.max(0, rawGap - betweenSpaceBelow);
   const bw = computeRenderedBorderWidths(attrs.borders, betweenInfo);
@@ -241879,7 +241891,7 @@ var Node$13 = class Node$14 {
   }
   element3.style.textAlign = resolveTextAlign(attrs?.alignment, rtl);
   return rtl;
-}, shouldUseSegmentPositioning = (hasExplicitPositioning, hasSegments, isRtl) => hasExplicitPositioning && hasSegments && !isRtl, MATHML_NS$2 = "http://www.w3.org/1998/Math/MathML", OPERATOR_CHARS, convertMathRun = (node3, doc$12) => {
+}, shouldUseSegmentPositioning = (hasExplicitPositioning, hasSegments, isRtl) => hasExplicitPositioning && hasSegments && !isRtl, MATHML_NS$3 = "http://www.w3.org/1998/Math/MathML", OPERATOR_CHARS, convertMathRun = (node3, doc$12) => {
   const elements = node3.elements ?? [];
   let text5 = "";
   for (const child of elements)
@@ -241893,19 +241905,33 @@ var Node$13 = class Node$14 {
     return null;
   const isNormalText = elements.find((el$1) => el$1.name === "m:rPr")?.elements?.some((el$1) => el$1.name === "m:nor") ?? false;
   const tag = classifyMathText(text5);
-  const el = doc$12.createElementNS(MATHML_NS$2, tag);
+  const el = doc$12.createElementNS(MATHML_NS$3, tag);
   el.textContent = text5;
   if (tag === "mi" && isNormalText)
     el.setAttribute("mathvariant", "normal");
   return el;
-}, MATHML_NS$1 = "http://www.w3.org/1998/Math/MathML", convertFraction = (node3, doc$12, convertChildren) => {
+}, MATHML_NS$2 = "http://www.w3.org/1998/Math/MathML", convertFraction = (node3, doc$12, convertChildren) => {
   const elements = node3.elements ?? [];
   const num = elements.find((e) => e.name === "m:num");
   const den = elements.find((e) => e.name === "m:den");
-  const frac = doc$12.createElementNS(MATHML_NS$1, "mfrac");
+  const frac = doc$12.createElementNS(MATHML_NS$2, "mfrac");
   frac.appendChild(convertChildren(num?.elements ?? []));
   frac.appendChild(convertChildren(den?.elements ?? []));
   return frac;
+}, MATHML_NS$1 = "http://www.w3.org/1998/Math/MathML", convertBar = (node3, doc$12, convertChildren) => {
+  const elements = node3.elements ?? [];
+  const isUnder = elements.find((e) => e.name === "m:barPr")?.elements?.find((e) => e.name === "m:pos")?.attributes?.["m:val"] !== "top";
+  const base5 = elements.find((e) => e.name === "m:e");
+  const wrapper = doc$12.createElementNS(MATHML_NS$1, isUnder ? "munder" : "mover");
+  const baseContent = convertChildren(base5?.elements ?? []);
+  const mrow = doc$12.createElementNS(MATHML_NS$1, "mrow");
+  mrow.appendChild(baseContent);
+  wrapper.appendChild(mrow);
+  const accent = doc$12.createElementNS(MATHML_NS$1, "mo");
+  accent.setAttribute("stretchy", "true");
+  accent.textContent = isUnder ? "̲" : "‾";
+  wrapper.appendChild(accent);
+  return wrapper;
 }, MATHML_NS = "http://www.w3.org/1998/Math/MathML", MATH_OBJECT_REGISTRY, ARGUMENT_ELEMENTS, cssToken = (varName, fallback) => ({
   css: `var(${varName}, ${fallback})`,
   fallback
@@ -246346,7 +246372,7 @@ var Node$13 = class Node$14 {
     pmStart: start$1,
     pmEnd: (typeof attrs.pmEnd === "number" ? attrs.pmEnd : undefined) ?? (start$1 != null ? start$1 + 1 : undefined)
   };
-}, getParagraphAttrs = (block) => {
+}, PX_PER_PT$12, getParagraphAttrs = (block) => {
   if (!block.attrs || typeof block.attrs !== "object")
     return;
   return block.attrs;
@@ -246366,6 +246392,21 @@ var Node$13 = class Node$14 {
   if (!Number.isFinite(value) || value < 0)
     return 0;
   return value;
+}, hashBorders = (borders) => {
+  if (!borders)
+    return;
+  const side = (b$1) => b$1 ? `${b$1.style ?? ""},${b$1.width ?? 0},${b$1.color ?? ""},${b$1.space ?? 0}` : "";
+  return `${side(borders.top)}|${side(borders.right)}|${side(borders.bottom)}|${side(borders.left)}|${side(borders.between)}`;
+}, computeBorderVerticalExpansion = (borders) => {
+  if (!borders)
+    return {
+      top: 0,
+      bottom: 0
+    };
+  return {
+    top: (borders.top?.space ?? 0) * PX_PER_PT$12 + (borders.top?.width ?? 0),
+    bottom: (borders.bottom?.space ?? 0) * PX_PER_PT$12 + (borders.bottom?.width ?? 0)
+  };
 }, COLUMN_MIN_WIDTH_PX = 25, COLUMN_MAX_WIDTH_PX = 200, ROW_MIN_HEIGHT_PX = 10, MIN_PARTIAL_ROW_HEIGHT = 20, ROW_HEIGHT_EPSILON = 0.1, DEFAULT_BALANCING_CONFIG, getColumnWidthAt = (columns, columnIndex) => {
   if (Array.isArray(columns.widths) && columns.widths.length > 0)
     return columns.widths[Math.max(0, Math.min(columnIndex, columns.widths.length - 1))] ?? columns.width;
@@ -255285,7 +255326,7 @@ var Node$13 = class Node$14 {
     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;
-var init_src_g1sb_ClT_es = __esm(() => {
+var init_src_XIzWLug0_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_B9oNf3OB_es();
   init_jszip_ChlR43oI_es();
@@ -273568,7 +273609,7 @@ function print() { __p += __j.call(arguments, '') }
   outline-offset: 2px;
 }
 `;
-  PX_PER_PT$12 = 96 / 72;
+  PX_PER_PT$2 = 96 / 72;
   BORDER_SIDES3 = [
     "top",
     "right",
@@ -273653,8 +273694,8 @@ function print() { __p += __j.call(arguments, '') }
   ]);
   MATH_OBJECT_REGISTRY = {
     "m:r": convertMathRun,
+    "m:bar": convertBar,
     "m:acc": null,
-    "m:bar": null,
     "m:borderBox": null,
     "m:box": null,
     "m:d": null,
@@ -284735,6 +284776,7 @@ function print() { __p += __j.call(arguments, '') }
     count: 1,
     gap: 0
   };
+  PX_PER_PT$12 = 96 / 72;
   DEFAULT_BALANCING_CONFIG = {
     enabled: true,
     tolerance: 5,
@@ -289772,7 +289814,7 @@ var init_zipper_YmNpPIyc_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_g1sb_ClT_es();
+  init_src_XIzWLug0_es();
   init_SuperConverter_B9oNf3OB_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_40FWvL78_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.5.0-next.33",
+  "version": "0.5.0-next.35",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,20 +25,20 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.23.0"
+    "superdoc": "1.23.0",
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.33",
-    "@superdoc-dev/cli-linux-x64": "0.5.0-next.33",
-    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.33",
-    "@superdoc-dev/cli-windows-x64": "0.5.0-next.33",
-    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.33"
+    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.35",
+    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.35",
+    "@superdoc-dev/cli-linux-x64": "0.5.0-next.35",
+    "@superdoc-dev/cli-windows-x64": "0.5.0-next.35",
+    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.35"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",