@superdoc-dev/cli 0.7.0-next.37 → 0.7.0-next.39

package/dist/index.js

@@ -65501,7 +65501,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-D8HLuwGQ.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-BCKO82IW.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -116403,12 +116403,19 @@ var isRegExp = (value) => {
     ...attributes ? { attributes } : {},
     elements: []
   };
+}, ST_ON_OFF_TRUE_VALUES, isStOnOffEnabled = (element) => {
+  if (!element)
+    return false;
+  const rawValue = element.attributes?.["w:val"];
+  if (rawValue == null)
+    return true;
+  return ST_ON_OFF_TRUE_VALUES.has(String(rawValue).trim().toLowerCase());
 }, isAlternatingHeadersOddEven = (docx) => {
   const settings = docx["word/settings.xml"];
   if (!settings || !settings.elements?.length)
     return false;
   const { elements = [] } = settings.elements[0];
-  return !!elements.find((el) => el.name === "w:evenAndOddHeaders");
+  return isStOnOffEnabled(elements.find((el) => el.name === "w:evenAndOddHeaders"));
 }, FULL_WIDTH_PT = "468pt", FULL_WIDTH_PT_VALUE = 468, PX_PER_PT = 1.33, XML_NODE_NAME = "w:pict", SD_NODE_NAME, validXmlAttributes, config, translator$28, DEFAULT_SECTION_PROPS_TWIPS, ensureSectionLayoutDefaults = (sectPr, converter) => {
   if (!sectPr)
     return {
@@ -117269,7 +117276,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_D8HLuwGQ_es = __esm(() => {
+var init_SuperConverter_BCKO82IW_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -153208,6 +153215,11 @@ var init_SuperConverter_D8HLuwGQ_es = __esm(() => {
       gutter: "0"
     })
   });
+  ST_ON_OFF_TRUE_VALUES = new Set([
+    "1",
+    "true",
+    "on"
+  ]);
   SD_NODE_NAME = [
     "shapeContainer",
     "contentBlock",
@@ -154550,7 +154562,7 @@ var init_SuperConverter_D8HLuwGQ_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-CbE9_87q.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BdA1QhS3.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -157142,8 +157154,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_CbE9_87q_es = __esm(() => {
-  init_SuperConverter_D8HLuwGQ_es();
+var init_create_headless_toolbar_BdA1QhS3_es = __esm(() => {
+  init_SuperConverter_BCKO82IW_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -205830,7 +205842,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-j2qoSUF1.es.js
+// ../../packages/superdoc/dist/chunks/src-DnUVzELl.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -248643,11 +248655,7 @@ function computeNextSectionPropsAtBreak(blocks2) {
         h: source.pageSize.h
       };
     if (source.columns)
-      props.columns = {
-        count: source.columns.count,
-        gap: source.columns.gap,
-        withSeparator: source.columns.withSeparator
-      };
+      props.columns = snapshotColumns(source.columns);
     if (source.orientation)
       props.orientation = source.orientation;
     if (source.vAlign)
@@ -251419,11 +251427,7 @@ function layoutDocument(blocks2, measures, options = {}) {
     if (activeOrientation)
       page.orientation = activeOrientation;
     if (activeColumns.count > 1)
-      page.columns = {
-        count: activeColumns.count,
-        gap: activeColumns.gap,
-        withSeparator: activeColumns.withSeparator
-      };
+      page.columns = cloneColumnLayout(activeColumns);
     if (activeVAlign && activeVAlign !== "top") {
       page.vAlign = activeVAlign;
       page.baseMargins = {
@@ -252332,11 +252336,7 @@ function layoutDocument(blocks2, measures, options = {}) {
   return {
     pageSize,
     pages,
-    columns: activeColumns.count > 1 ? {
-      count: activeColumns.count,
-      gap: activeColumns.gap,
-      withSeparator: activeColumns.withSeparator
-    } : undefined
+    columns: activeColumns.count > 1 ? cloneColumnLayout(activeColumns) : undefined
   };
 }
 function computeFragmentBottom(fragment2, block, measure) {
@@ -268883,20 +268883,39 @@ var Node$13 = class Node$14 {
   if (!insertedMark && !deletionMark && !formatMark)
     return;
   const newTrackedChanges = { ...trackedChanges };
-  let id2 = insertedMark?.attrs?.id || deletionMark?.attrs?.id || formatMark?.attrs?.id;
-  if (!id2)
+  const insertedId = insertedMark?.attrs?.id ?? null;
+  const deletionId = deletionMark?.attrs?.id ?? null;
+  const formatId = formatMark?.attrs?.id ?? null;
+  const primaryId = insertedId || deletionId || formatId;
+  if (!primaryId)
     return trackedChanges;
-  let isNewChange = false;
-  if (!newTrackedChanges[id2]) {
-    newTrackedChanges[id2] = {};
-    isNewChange = true;
-  }
-  if (insertedMark)
-    newTrackedChanges[id2].insertion = id2;
-  if (deletionMark)
-    newTrackedChanges[id2].deletion = deletionMark.attrs?.id;
-  if (formatMark)
-    newTrackedChanges[id2].format = formatMark.attrs?.id;
+  const registerTrackedChangeId = (changeId, patch3) => {
+    if (!changeId)
+      return false;
+    const existing = newTrackedChanges[changeId];
+    if (existing) {
+      Object.assign(existing, patch3);
+      return false;
+    }
+    newTrackedChanges[changeId] = { ...patch3 };
+    return true;
+  };
+  const buildTrackedChangePayload = ({ event, marks, nodes: nodes$1, deletionNodes: deletionNodes$1 = [] }) => {
+    if (!marks.insertedMark && !marks.deletionMark && !marks.formatMark)
+      return null;
+    const trackedMarkId = marks.insertedMark?.attrs?.id ?? marks.deletionMark?.attrs?.id ?? marks.formatMark?.attrs?.id ?? null;
+    if (!trackedMarkId)
+      return null;
+    return createOrUpdateTrackedChangeComment({
+      documentId: editor.options.documentId,
+      event,
+      marks,
+      deletionNodes: deletionNodes$1,
+      nodes: nodes$1,
+      newEditorState,
+      trackedChangesForId: getTrackChanges(newEditorState, trackedMarkId)
+    });
+  };
   const { step: step3 } = trackedChangeMeta;
   let nodes = step3?.slice?.content?.content || [];
   if (!nodes.length)
@@ -268906,8 +268925,42 @@ var Node$13 = class Node$14 {
         return false;
       }
     });
-  const emitParams = nodes.length > 0 || Boolean(deletionNodes?.length) ? createOrUpdateTrackedChangeComment({
-    documentId: editor.options.documentId,
+  const hasCandidateNodes = nodes.length > 0 || Boolean(deletionNodes?.length);
+  if (Boolean(insertedMark && deletionMark) && Boolean(insertedId) && Boolean(deletionId) && insertedId !== deletionId) {
+    const isNewInsertion = registerTrackedChangeId(insertedId, { insertion: insertedId });
+    const isNewDeletion = registerTrackedChangeId(deletionId, { deletion: deletionId });
+    const insertionPayload = hasCandidateNodes ? buildTrackedChangePayload({
+      event: isNewInsertion ? "add" : "update",
+      marks: {
+        insertedMark,
+        deletionMark: null,
+        formatMark: null
+      },
+      deletionNodes: [],
+      nodes
+    }) : null;
+    const deletionPayload = deletionMark && (hasCandidateNodes || getTrackChanges(newEditorState, deletionId).length > 0) ? buildTrackedChangePayload({
+      event: isNewDeletion ? "add" : "update",
+      marks: {
+        insertedMark: null,
+        deletionMark,
+        formatMark: null
+      },
+      deletionNodes,
+      nodes: []
+    }) : null;
+    if (emitCommentEvent && insertionPayload)
+      editor.emit("commentsUpdate", insertionPayload);
+    if (emitCommentEvent && deletionPayload)
+      editor.emit("commentsUpdate", deletionPayload);
+    return newTrackedChanges;
+  }
+  const isNewChange = registerTrackedChangeId(primaryId, {
+    ...insertedMark ? { insertion: primaryId } : {},
+    ...deletionMark ? { deletion: deletionId } : {},
+    ...formatMark ? { format: formatId } : {}
+  });
+  const emitParams = hasCandidateNodes ? buildTrackedChangePayload({
     event: isNewChange ? "add" : "update",
     marks: {
       insertedMark,
@@ -268915,8 +268968,7 @@ var Node$13 = class Node$14 {
       formatMark
     },
     deletionNodes,
-    nodes,
-    newEditorState
+    nodes
   }) : null;
   if (emitParams && emitCommentEvent)
     editor.emit("commentsUpdate", emitParams);
@@ -269014,7 +269066,9 @@ var Node$13 = class Node$14 {
   const { name: trackedChangeType } = type;
   const { author, authorEmail, authorImage, date, importedAuthor } = attrs;
   const id2 = attrs.id;
-  let isReplacement = !!(marks.insertedMark && marks.deletionMark);
+  const insertedMarkId = marks.insertedMark?.attrs?.id ?? null;
+  const deletionMarkId = marks.deletionMark?.attrs?.id ?? null;
+  let isReplacement = Boolean(insertedMarkId && deletionMarkId && insertedMarkId === deletionMarkId);
   if (!isReplacement) {
     const hasInsertMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackInsertMarkName);
     const hasDeleteMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackDeleteMarkName);
@@ -281199,6 +281253,10 @@ menclose::after {
   #applyVirtualizationPins() {
     this.#painter?.setVirtualizationPins(this.#virtualizationPins);
   }
+}, snapshotColumns = (columns) => {
+  if (!columns)
+    return;
+  return cloneColumnLayout(columns);
 }, SINGLE_COLUMN_DEFAULT, isTextRun$5 = (run2) => {
   const runWithKind = run2;
   return !runWithKind.kind || runWithKind.kind === "text";
@@ -290485,12 +290543,12 @@ 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;
-var init_src_j2qoSUF1_es = __esm(() => {
+var init_src_DnUVzELl_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_D8HLuwGQ_es();
+  init_SuperConverter_BCKO82IW_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_CbE9_87q_es();
+  init_create_headless_toolbar_BdA1QhS3_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -317058,14 +317116,13 @@ function print() { __p += __j.call(arguments, '') }
           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 separatorPositions = this.getColumnSeparatorPositions(columns, leftMargin, contentWidth);
+        if (separatorPositions.length === 0)
+          continue;
+        for (const separatorX of separatorPositions) {
           const separatorEl = this.doc.createElement("div");
           separatorEl.style.position = "absolute";
           separatorEl.style.left = `${separatorX}px`;
@@ -317078,6 +317135,31 @@ function print() { __p += __j.call(arguments, '') }
         }
       }
     }
+    getColumnSeparatorPositions(columns, leftMargin, contentWidth) {
+      if (!(Array.isArray(columns.widths) && columns.widths.length > 0)) {
+        const equalWidth = (contentWidth - columns.gap * (columns.count - 1)) / columns.count;
+        if (equalWidth <= 1)
+          return [];
+        const separatorPositions$1 = [];
+        for (let index2 = 0;index2 < columns.count - 1; index2 += 1)
+          separatorPositions$1.push(leftMargin + (index2 + 1) * equalWidth + index2 * columns.gap + columns.gap / 2);
+        return separatorPositions$1;
+      }
+      const normalizedColumns = normalizeColumnLayout(columns, contentWidth);
+      if (normalizedColumns.count <= 1)
+        return [];
+      const columnWidths = normalizedColumns.widths ?? Array.from({ length: normalizedColumns.count }, () => normalizedColumns.width);
+      if (columnWidths.some((columnWidth) => columnWidth <= 1))
+        return [];
+      const separatorPositions = [];
+      let cursorX = leftMargin;
+      for (let index2 = 0;index2 < normalizedColumns.count - 1; index2 += 1) {
+        const currentColumnWidth = columnWidths[index2] ?? normalizedColumns.width;
+        separatorPositions.push(cursorX + currentColumnWidth + normalizedColumns.gap / 2);
+        cursorX += currentColumnWidth + normalizedColumns.gap;
+      }
+      return separatorPositions;
+    }
     renderDecorationsForPage(pageEl, page, pageIndex) {
       if (this.isSemanticFlow)
         return;
@@ -325359,11 +325441,11 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_j2qoSUF1_es();
-  init_SuperConverter_D8HLuwGQ_es();
+  init_src_DnUVzELl_es();
+  init_SuperConverter_BCKO82IW_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_CbE9_87q_es();
+  init_create_headless_toolbar_BdA1QhS3_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.37",
+  "version": "0.7.0-next.39",
   "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/super-editor": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "superdoc": "1.26.0",
-    "@superdoc/pm-adapter": "0.0.0"
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.37",
-    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.37",
-    "@superdoc-dev/cli-linux-x64": "0.7.0-next.37",
-    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.37",
-    "@superdoc-dev/cli-windows-x64": "0.7.0-next.37"
+    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.39",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.39",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.39",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.39",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.39"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",