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

package/dist/index.js

@@ -205830,7 +205830,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-_aJt3Hgw.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -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);
@@ -290485,7 +290539,7 @@ 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__aJt3Hgw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
@@ -325359,7 +325413,7 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_j2qoSUF1_es();
+  init_src__aJt3Hgw_es();
   init_SuperConverter_D8HLuwGQ_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.7.0-next.37",
+  "version": "0.7.0-next.38",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -26,19 +26,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.26.0",
-    "@superdoc/pm-adapter": "0.0.0"
+    "@superdoc/pm-adapter": "0.0.0",
+    "superdoc": "1.26.0"
   },
   "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.38",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.38",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.38"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",