@superdoc-dev/cli 0.2.0-next.17 → 0.2.0-next.18

package/dist/index.js

@@ -92869,9 +92869,9 @@ var init_remark_gfm_CQ3Jg4PR_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DBQvqcRZ.es.js
-var exports_src_DBQvqcRZ_es = {};
-__export(exports_src_DBQvqcRZ_es, {
+// ../../packages/superdoc/dist/chunks/src-BFDJrY7q.es.js
+var exports_src_BFDJrY7q_es = {};
+__export(exports_src_BFDJrY7q_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -160047,7 +160047,28 @@ var Node$13 = class Node$14 {
   if (!trackedChangeId)
     return changes;
   return changes.filter((change) => change.id === trackedChangeId);
-}, TrackChanges, getChangesByIdToResolve = (state, id2) => {
+}, TrackChanges, dedupeTrackedChangeRanges = (changes = []) => {
+  const byKey = /* @__PURE__ */ new Map;
+  changes.forEach((change) => {
+    if (!change || typeof change.from !== "number" || typeof change.to !== "number")
+      return;
+    const type = change.mark?.type?.name || "";
+    const id2 = change.mark?.attrs?.id || "";
+    const key$1 = `${change.from}:${change.to}:${type}:${id2}`;
+    if (!byKey.has(key$1))
+      byKey.set(key$1, change);
+  });
+  return Array.from(byKey.values()).sort((left$1, right$1) => {
+    if (left$1.from !== right$1.from)
+      return left$1.from - right$1.from;
+    return left$1.to - right$1.to;
+  });
+}, getTrackedChangesByTouchedIds = (state, trackedChanges = []) => {
+  const touchedIds = new Set(trackedChanges.map(({ mark: mark2 }) => mark2?.attrs?.id).filter(Boolean));
+  if (!touchedIds.size)
+    return trackedChanges;
+  return Array.from(touchedIds).flatMap((id2) => getChangesByIdToResolve(state, id2) || []);
+}, getChangesByIdToResolve = (state, id2) => {
   const trackedChanges = getTrackChanges(state);
   const changeIndex = trackedChanges.findIndex(({ mark: mark2 }) => mark2.attrs.id === id2);
   if (changeIndex === -1)
@@ -162206,7 +162227,7 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$1, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_DBQvqcRZ_es = __esm(() => {
+var init_src_BFDJrY7q_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_D7fmxDmw_es();
   init_jszip_ChlR43oI_es();
@@ -192020,50 +192041,78 @@ function print() { __p += __j.call(arguments, '') }
           return true;
         },
         rejectTrackedChangesBetween: (from$12, to) => ({ state, dispatch, editor }) => {
+          const trackedChangesInSelection = collectTrackedChanges({
+            state,
+            from: from$12,
+            to
+          });
+          const trackedChangesById = getTrackedChangesByTouchedIds(state, trackedChangesInSelection);
+          const trackedChangesWithoutId = trackedChangesInSelection.filter(({ mark: mark2 }) => !mark2?.attrs?.id);
+          const trackedChanges = dedupeTrackedChangeRanges([...trackedChangesById, ...trackedChangesWithoutId]);
           if (!isTrackedChangeActionAllowed({
             editor,
             action: "reject",
-            trackedChanges: collectTrackedChanges({
-              state,
-              from: from$12,
-              to
-            })
+            trackedChanges
           }))
             return false;
           const { tr, doc: doc$2 } = state;
+          const rejectedChangeIds = /* @__PURE__ */ new Set;
           tr.setMeta("inputType", "acceptReject");
           const map$22 = new Mapping;
-          doc$2.nodesBetween(from$12, to, (node3, pos) => {
-            if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackDelete")) {
-              const deletionMark = node3.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName);
-              tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), deletionMark));
-            } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackInsert")) {
-              const deletionStep = new ReplaceStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), Slice.empty);
-              tr.step(deletionStep);
-              map$22.appendMap(deletionStep.getMap());
-            } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackFormat")) {
-              const formatChangeMark = node3.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
-              formatChangeMark.attrs.before.forEach((oldMark) => {
-                tr.step(new AddMarkStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
-              });
-              formatChangeMark.attrs.after.forEach((newMark) => {
-                const mappedFrom = map$22.map(Math.max(pos, from$12));
-                const mappedTo = map$22.map(Math.min(pos + node3.nodeSize, to));
-                const liveMark = findMarkInRangeBySnapshot({
-                  doc: tr.doc,
-                  from: mappedFrom,
-                  to: mappedTo,
-                  snapshot: newMark
+          trackedChanges.forEach(({ from: rangeFrom, to: rangeTo }) => {
+            doc$2.nodesBetween(rangeFrom, rangeTo, (node3, pos) => {
+              if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackDelete")) {
+                const deletionMark = node3.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName);
+                if (deletionMark?.attrs?.id)
+                  rejectedChangeIds.add(deletionMark.attrs.id);
+                tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), deletionMark));
+              } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackInsert")) {
+                const insertionMark = node3.marks.find((mark2) => mark2.type.name === TrackInsertMarkName);
+                if (insertionMark?.attrs?.id)
+                  rejectedChangeIds.add(insertionMark.attrs.id);
+                const deletionStep = new ReplaceStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), Slice.empty);
+                tr.step(deletionStep);
+                map$22.appendMap(deletionStep.getMap());
+              } else if (node3.marks && node3.marks.find((mark2) => mark2.type.name === "trackFormat")) {
+                const formatChangeMark = node3.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+                if (formatChangeMark?.attrs?.id)
+                  rejectedChangeIds.add(formatChangeMark.attrs.id);
+                formatChangeMark.attrs.before.forEach((oldMark) => {
+                  tr.step(new AddMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
                 });
-                if (!liveMark)
-                  return;
-                tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
-              });
-              tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, from$12)), map$22.map(Math.min(pos + node3.nodeSize, to)), formatChangeMark));
-            }
+                formatChangeMark.attrs.after.forEach((newMark) => {
+                  const mappedFrom = map$22.map(Math.max(pos, rangeFrom));
+                  const mappedTo = map$22.map(Math.min(pos + node3.nodeSize, rangeTo));
+                  const liveMark = findMarkInRangeBySnapshot({
+                    doc: tr.doc,
+                    from: mappedFrom,
+                    to: mappedTo,
+                    snapshot: newMark
+                  });
+                  if (!liveMark)
+                    return;
+                  tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
+                });
+                tr.step(new RemoveMarkStep(map$22.map(Math.max(pos, rangeFrom)), map$22.map(Math.min(pos + node3.nodeSize, rangeTo)), formatChangeMark));
+              }
+            });
           });
-          if (tr.steps.length)
+          if (tr.steps.length) {
             dispatch(tr);
+            if (editor?.emit && rejectedChangeIds.size) {
+              const resolvedByEmail = editor.options?.user?.email;
+              const resolvedByName = editor.options?.user?.name;
+              rejectedChangeIds.forEach((changeId) => {
+                editor.emit("commentsUpdate", {
+                  type: "trackedChange",
+                  event: "resolve",
+                  changeId,
+                  resolvedByEmail,
+                  resolvedByName
+                });
+              });
+            }
+          }
           return true;
         },
         acceptTrackedChange: ({ trackedChange }) => ({ commands: commands$1 }) => {
@@ -195626,8 +195675,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_DBQvqcRZ_es == "object" && exports_src_DBQvqcRZ_es && !exports_src_DBQvqcRZ_es.nodeType && exports_src_DBQvqcRZ_es;
-  freeModule$2 = freeExports$2 && typeof module_src_DBQvqcRZ_es == "object" && module_src_DBQvqcRZ_es && !module_src_DBQvqcRZ_es.nodeType && module_src_DBQvqcRZ_es;
+  freeExports$2 = typeof exports_src_BFDJrY7q_es == "object" && exports_src_BFDJrY7q_es && !exports_src_BFDJrY7q_es.nodeType && exports_src_BFDJrY7q_es;
+  freeModule$2 = freeExports$2 && typeof module_src_BFDJrY7q_es == "object" && module_src_BFDJrY7q_es && !module_src_BFDJrY7q_es.nodeType && module_src_BFDJrY7q_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -195635,8 +195684,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_DBQvqcRZ_es == "object" && exports_src_DBQvqcRZ_es && !exports_src_DBQvqcRZ_es.nodeType && exports_src_DBQvqcRZ_es;
-  freeModule$1 = freeExports$1 && typeof module_src_DBQvqcRZ_es == "object" && module_src_DBQvqcRZ_es && !module_src_DBQvqcRZ_es.nodeType && module_src_DBQvqcRZ_es;
+  freeExports$1 = typeof exports_src_BFDJrY7q_es == "object" && exports_src_BFDJrY7q_es && !exports_src_BFDJrY7q_es.nodeType && exports_src_BFDJrY7q_es;
+  freeModule$1 = freeExports$1 && typeof module_src_BFDJrY7q_es == "object" && module_src_BFDJrY7q_es && !module_src_BFDJrY7q_es.nodeType && module_src_BFDJrY7q_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -195741,8 +195790,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_DBQvqcRZ_es == "object" && exports_src_DBQvqcRZ_es && !exports_src_DBQvqcRZ_es.nodeType && exports_src_DBQvqcRZ_es;
-  freeModule = freeExports && typeof module_src_DBQvqcRZ_es == "object" && module_src_DBQvqcRZ_es && !module_src_DBQvqcRZ_es.nodeType && module_src_DBQvqcRZ_es;
+  freeExports = typeof exports_src_BFDJrY7q_es == "object" && exports_src_BFDJrY7q_es && !exports_src_BFDJrY7q_es.nodeType && exports_src_BFDJrY7q_es;
+  freeModule = freeExports && typeof module_src_BFDJrY7q_es == "object" && module_src_BFDJrY7q_es && !module_src_BFDJrY7q_es.nodeType && module_src_BFDJrY7q_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -203394,7 +203443,7 @@ var init_zipper_Cnk_HjM2_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DBQvqcRZ_es();
+  init_src_BFDJrY7q_es();
   init_SuperConverter_D7fmxDmw_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.17",
+  "version": "0.2.0-next.18",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -19,8 +19,8 @@
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/document-api": "0.0.1",
+    "@superdoc/super-editor": "0.0.1",
     "superdoc": "1.16.0"
   },
   "module": "src/index.ts",
@@ -28,11 +28,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.17",
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.17",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.17",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.17",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.17"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.18",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.18",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.18",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.18",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.18"
   },
   "scripts": {
     "dev": "bun run src/index.ts",