@superdoc-dev/cli 0.7.0-next.25 → 0.7.0-next.26

package/dist/index.js

@@ -65501,7 +65501,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-B4pTwmbr.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CpoUNyba.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -95578,6 +95578,9 @@ function parseColumnGap(gapTwips) {
   const gap = Number(gapTwips);
   return Number.isFinite(gap) ? gap / TWIPS_PER_INCH : DEFAULT_COLUMN_GAP_INCHES;
 }
+function parseColumnSeparator(rawValue) {
+  return rawValue === "1" || rawValue === "true" || rawValue === "on" || rawValue === 1;
+}
 function extractNormalizedMargins(attrs) {
   const sectionMargins = attrs.sectionMargins;
   return {
@@ -95668,6 +95671,7 @@ function extractColumns(elements) {
   if (!cols?.attributes)
     return;
   const count2 = parseColumnCount(cols.attributes["w:num"]);
+  const withSeparator = parseColumnSeparator(cols.attributes["w:sep"]);
   const equalWidthRaw = cols.attributes["w:equalWidth"];
   const equalWidth = equalWidthRaw === "0" || equalWidthRaw === 0 || equalWidthRaw === false ? false : equalWidthRaw === "1" || equalWidthRaw === 1 || equalWidthRaw === true ? true : undefined;
   const columnChildren = Array.isArray(cols.elements) ? cols.elements.filter((child) => child?.name === "w:col") : [];
@@ -95676,6 +95680,7 @@ function extractColumns(elements) {
   return {
     count: count2,
     gap: gapInches * PX_PER_INCH,
+    withSeparator,
     ...widths.length > 0 ? { widths } : {},
     ...equalWidth !== undefined ? { equalWidth } : {}
   };
@@ -117250,7 +117255,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_B4pTwmbr_es = __esm(() => {
+var init_SuperConverter_CpoUNyba_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -154530,7 +154535,7 @@ var init_SuperConverter_B4pTwmbr_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-C636gY8A.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-Dp1bWeQT.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -157122,8 +157127,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_C636gY8A_es = __esm(() => {
-  init_SuperConverter_B4pTwmbr_es();
+var init_create_headless_toolbar_Dp1bWeQT_es = __esm(() => {
+  init_SuperConverter_CpoUNyba_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -205567,7 +205572,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DmdTSOpy.es.js
+// ../../packages/superdoc/dist/chunks/src-BMZqLwoU.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -205979,7 +205984,8 @@ function cloneColumnLayout(columns) {
     count: columns.count,
     gap: columns.gap,
     ...Array.isArray(columns.widths) ? { widths: [...columns.widths] } : {},
-    ...columns.equalWidth !== undefined ? { equalWidth: columns.equalWidth } : {}
+    ...columns.equalWidth !== undefined ? { equalWidth: columns.equalWidth } : {},
+    ...columns.withSeparator !== undefined ? { withSeparator: columns.withSeparator } : {}
   } : {
     count: 1,
     gap: 0
@@ -206007,13 +206013,15 @@ function normalizeColumnLayout(input2, contentWidth, epsilon = 0.0001) {
     return {
       count: 1,
       gap: 0,
-      width: Math.max(0, contentWidth)
+      width: Math.max(0, contentWidth),
+      ...input2?.withSeparator !== undefined ? { withSeparator: input2.withSeparator } : {}
     };
   return {
     count: count2,
     gap,
     ...widths.length > 0 ? { widths } : {},
     ...input2?.equalWidth !== undefined ? { equalWidth: input2.equalWidth } : {},
+    ...input2?.withSeparator !== undefined ? { withSeparator: input2.withSeparator } : {},
     width
   };
 }
@@ -248115,7 +248123,8 @@ function computeNextSectionPropsAtBreak(blocks2) {
     if (source.columns)
       props.columns = {
         count: source.columns.count,
-        gap: source.columns.gap
+        gap: source.columns.gap,
+        withSeparator: source.columns.withSeparator
       };
     if (source.orientation)
       props.orientation = source.orientation;
@@ -248136,8 +248145,8 @@ function getColumnConfig(blockColumns) {
 }
 function isColumnConfigChanging(blockColumns, activeColumns) {
   if (blockColumns)
-    return blockColumns.count !== activeColumns.count || blockColumns.gap !== activeColumns.gap || blockColumns.equalWidth !== activeColumns.equalWidth || !widthsEqual(blockColumns.widths, activeColumns.widths);
-  return activeColumns.count > 1;
+    return blockColumns.count !== activeColumns.count || blockColumns.gap !== activeColumns.gap || Boolean(blockColumns.withSeparator) !== Boolean(activeColumns.withSeparator) || blockColumns.equalWidth !== activeColumns.equalWidth || !widthsEqual(blockColumns.widths, activeColumns.widths);
+  return activeColumns.count > 1 || Boolean(activeColumns.withSeparator);
 }
 function scheduleSectionBreak(block, state, baseMargins, maxHeaderContentHeight = 0, maxFooterContentHeight = 0) {
   const next2 = { ...state };
@@ -250784,7 +250793,7 @@ function layoutDocument(blocks2, measures, options = {}) {
     if (block.orientation)
       next2.pendingOrientation = block.orientation;
     const sectionType = block.type ?? "continuous";
-    const isColumnsChanging = block.columns && (block.columns.count !== next2.activeColumns.count || block.columns.gap !== next2.activeColumns.gap || block.columns.equalWidth !== next2.activeColumns.equalWidth || !widthsEqual(block.columns.widths, next2.activeColumns.widths)) || !block.columns && next2.activeColumns.count > 1;
+    const isColumnsChanging = block.columns && (block.columns.count !== next2.activeColumns.count || block.columns.gap !== next2.activeColumns.gap || Boolean(block.columns.withSeparator) !== Boolean(next2.activeColumns.withSeparator) || block.columns.equalWidth !== next2.activeColumns.equalWidth || !widthsEqual(block.columns.widths, next2.activeColumns.widths)) || !block.columns && (next2.activeColumns.count > 1 || Boolean(next2.activeColumns.withSeparator));
     const sectionIndexRaw = block.attrs?.sectionIndex;
     const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
     if (Number.isFinite(metadataIndex))
@@ -250873,6 +250882,12 @@ function layoutDocument(blocks2, measures, options = {}) {
       page.size = pageSizeOverride;
     if (activeOrientation)
       page.orientation = activeOrientation;
+    if (activeColumns.count > 1)
+      page.columns = {
+        count: activeColumns.count,
+        gap: activeColumns.gap,
+        withSeparator: activeColumns.withSeparator
+      };
     if (activeVAlign && activeVAlign !== "top") {
       page.vAlign = activeVAlign;
       page.baseMargins = {
@@ -251744,12 +251759,38 @@ function layoutDocument(blocks2, measures, options = {}) {
         }
       }
   }
+  for (const state of states) {
+    const boundaries = state.constraintBoundaries;
+    if (boundaries.length === 0)
+      continue;
+    const regions = [];
+    const firstRegionColumns = state.page.columns ?? {
+      count: 1,
+      gap: 0
+    };
+    regions.push({
+      yStart: state.topMargin,
+      yEnd: boundaries[0].y,
+      columns: firstRegionColumns
+    });
+    for (let i4 = 0;i4 < boundaries.length; i4++) {
+      const start$1 = boundaries[i4];
+      const end$1 = boundaries[i4 + 1];
+      regions.push({
+        yStart: start$1.y,
+        yEnd: end$1 ? end$1.y : state.contentBottom,
+        columns: start$1.columns
+      });
+    }
+    state.page.columnRegions = regions;
+  }
   return {
     pageSize,
     pages,
     columns: activeColumns.count > 1 ? {
       count: activeColumns.count,
-      gap: activeColumns.gap
+      gap: activeColumns.gap,
+      withSeparator: activeColumns.withSeparator
     } : undefined
   };
 }
@@ -253444,10 +253485,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
           const marginLeft = normalizeMargin(page.margins.left, normalizeMargin(options.margins?.left, DEFAULT_MARGINS$1.left));
           const marginRight = normalizeMargin(page.margins.right, normalizeMargin(options.margins?.right, DEFAULT_MARGINS$1.right));
           const pageContentWidth = pageSize.w - (marginLeft + marginRight);
-          const fallbackColumns = normalizeColumnsForFootnotes(options.columns ?? {
-            count: 1,
-            gap: 0
-          }, pageContentWidth);
+          const fallbackColumns = normalizeColumnsForFootnotes(options.columns ?? SINGLE_COLUMN_DEFAULT, pageContentWidth);
           const columns = pageColumns$1.get(pageIndex) ?? {
             ...fallbackColumns,
             left: marginLeft,
@@ -255514,7 +255552,8 @@ function parseColumns(raw) {
     return;
   return {
     count: Math.max(1, Math.floor(rawCount)),
-    gap: inchesToPx(columnSource.space ?? columnSource.gap) ?? 0
+    gap: inchesToPx(columnSource.space ?? columnSource.gap) ?? 0,
+    withSeparator: typeof columnSource.withSeparator === "boolean" ? columnSource.withSeparator : false
   };
 }
 function createLayoutMetrics(perf, startMark, layout, blocks2) {
@@ -281916,10 +281955,7 @@ var Node$13 = class Node$14 {
     const marginRight = normalizeMargin(page.margins?.right, normalizeMargin(options.margins?.right, DEFAULT_MARGINS$1.right));
     const contentWidth = pageSize.w - (marginLeft + marginRight);
     const sectionIndex = page.sectionIndex ?? 0;
-    const normalized = normalizeColumnsForFootnotes(sectionColumns.get(sectionIndex) ?? options.columns ?? {
-      count: 1,
-      gap: 0
-    }, contentWidth);
+    const normalized = normalizeColumnsForFootnotes(sectionColumns.get(sectionIndex) ?? options.columns ?? SINGLE_COLUMN_DEFAULT, contentWidth);
     result.set(pageIndex, {
       ...normalized,
       left: marginLeft,
@@ -289539,12 +289575,12 @@ 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_DmdTSOpy_es = __esm(() => {
+var init_src_BMZqLwoU_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_B4pTwmbr_es();
+  init_SuperConverter_CpoUNyba_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_C636gY8A_es();
+  init_create_headless_toolbar_Dp1bWeQT_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -315994,6 +316030,7 @@ function print() { __p += __j.call(arguments, '') }
         el.appendChild(this.renderFragment(fragment2, contextBase, sdtBoundary, betweenBorderFlags.get(index2), resolvedItem));
       });
       this.renderDecorationsForPage(el, page, pageIndex);
+      this.renderColumnSeparators(el, page, width, height);
       return el;
     }
     renderPageRuler(pageWidthPx, page) {
@@ -316041,6 +316078,47 @@ function print() { __p += __j.call(arguments, '') }
         return null;
       }
     }
+    renderColumnSeparators(pageEl, page, pageWidth, pageHeight) {
+      if (!this.doc)
+        return;
+      if (!page.margins)
+        return;
+      const leftMargin = page.margins.left ?? 0;
+      const rightMargin = page.margins.right ?? 0;
+      const topMargin = page.margins.top ?? 0;
+      const bottomMargin = page.margins.bottom ?? 0;
+      const contentWidth = pageWidth - leftMargin - rightMargin;
+      const regions = page.columnRegions ?? (page.columns ? [{
+        yStart: topMargin,
+        yEnd: pageHeight - bottomMargin,
+        columns: page.columns
+      }] : []);
+      for (const region of regions) {
+        const { columns, yStart, yEnd } = region;
+        if (!columns.withSeparator)
+          continue;
+        if (columns.count <= 1)
+          continue;
+        const columnWidth = (contentWidth - columns.gap * (columns.count - 1)) / columns.count;
+        if (columnWidth <= 1)
+          continue;
+        const regionHeight = yEnd - yStart;
+        if (regionHeight <= 0)
+          continue;
+        for (let i4 = 0;i4 < columns.count - 1; i4++) {
+          const separatorX = leftMargin + (i4 + 1) * columnWidth + i4 * columns.gap + columns.gap / 2;
+          const separatorEl = this.doc.createElement("div");
+          separatorEl.style.position = "absolute";
+          separatorEl.style.left = `${separatorX}px`;
+          separatorEl.style.top = `${yStart}px`;
+          separatorEl.style.height = `${regionHeight}px`;
+          separatorEl.style.width = "1px";
+          separatorEl.style.backgroundColor = "#000000";
+          separatorEl.style.pointerEvents = "none";
+          pageEl.appendChild(separatorEl);
+        }
+      }
+    }
     renderDecorationsForPage(pageEl, page, pageIndex) {
       if (this.isSemanticFlow)
         return;
@@ -316375,6 +316453,7 @@ function print() { __p += __j.call(arguments, '') }
         };
       });
       this.renderDecorationsForPage(el, page, pageIndex);
+      this.renderColumnSeparators(el, page, pageSize.w, pageSize.h);
       return {
         element: el,
         fragments: fragmentStates
@@ -324316,11 +324395,11 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DmdTSOpy_es();
-  init_SuperConverter_B4pTwmbr_es();
+  init_src_BMZqLwoU_es();
+  init_SuperConverter_CpoUNyba_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_C636gY8A_es();
+  init_create_headless_toolbar_Dp1bWeQT_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();

package/package.json

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