@superdoc-dev/cli 0.12.0-next.23 → 0.12.0-next.24

package/dist/index.js

@@ -218163,7 +218163,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DOX3DoA2.es.js
+// ../../packages/superdoc/dist/chunks/src-Tq4gtGIV.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -234382,6 +234382,95 @@ function buildCommentJsonFromText(text5) {
 function isCommentResolved(entry) {
   return Boolean(entry.isDone || entry.resolvedTime);
 }
+function syncCommentEntitiesFromCollaboration(editor, entries2, options = {}) {
+  const store = getCommentEntityStore(editor);
+  const seen = /* @__PURE__ */ new Set;
+  const upstreamIds = /* @__PURE__ */ new Set;
+  const validEntries = [];
+  for (const raw of entries2) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    if (raw.trackedChange === true)
+      continue;
+    const cid = toNonEmptyString$1(raw.commentId);
+    const iid = toNonEmptyString$1(raw.importedId);
+    if (cid)
+      upstreamIds.add(cid);
+    if (iid)
+      upstreamIds.add(iid);
+    validEntries.push(raw);
+  }
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const raw of validEntries) {
+      const parentRef = toNonEmptyString$1(raw.parentCommentId);
+      if (!parentRef)
+        continue;
+      if (upstreamIds.has(parentRef))
+        continue;
+      const cid = toNonEmptyString$1(raw.commentId);
+      const iid = toNonEmptyString$1(raw.importedId);
+      if (cid && upstreamIds.delete(cid))
+        changed = true;
+      if (iid && upstreamIds.delete(iid))
+        changed = true;
+    }
+  }
+  for (const raw of validEntries) {
+    const commentId = toNonEmptyString$1(raw.commentId) ?? toNonEmptyString$1(raw.importedId);
+    if (!commentId)
+      continue;
+    if (!upstreamIds.has(commentId))
+      continue;
+    seen.add(commentId);
+    const patch3 = {};
+    if (typeof raw.importedId === "string")
+      patch3.importedId = raw.importedId;
+    if (typeof raw.parentCommentId === "string")
+      patch3.parentCommentId = raw.parentCommentId;
+    const commentText = typeof raw.commentText === "string" ? raw.commentText : typeof raw.text === "string" ? raw.text : undefined;
+    if (commentText !== undefined)
+      patch3.commentText = commentText;
+    if (raw.commentJSON !== undefined)
+      patch3.commentJSON = raw.commentJSON;
+    if (raw.elements !== undefined)
+      patch3.elements = raw.elements;
+    if (typeof raw.creatorName === "string")
+      patch3.creatorName = raw.creatorName;
+    if (typeof raw.creatorEmail === "string")
+      patch3.creatorEmail = raw.creatorEmail;
+    if (typeof raw.creatorImage === "string")
+      patch3.creatorImage = raw.creatorImage;
+    if (typeof raw.createdTime === "number")
+      patch3.createdTime = raw.createdTime;
+    if (typeof raw.isInternal === "boolean")
+      patch3.isInternal = raw.isInternal;
+    if (typeof raw.isDone === "boolean")
+      patch3.isDone = raw.isDone;
+    if (typeof raw.resolvedTime === "number")
+      patch3.resolvedTime = raw.resolvedTime;
+    if (raw.resolvedTime === null)
+      patch3.resolvedTime = null;
+    if (typeof raw.resolvedByEmail === "string")
+      patch3.resolvedByEmail = raw.resolvedByEmail;
+    if (typeof raw.resolvedByName === "string")
+      patch3.resolvedByName = raw.resolvedByName;
+    upsertCommentEntity(store, commentId, patch3);
+  }
+  if (options.previouslySynced) {
+    for (const priorId of options.previouslySynced)
+      if (!seen.has(priorId))
+        removeCommentEntityTree(store, priorId);
+  }
+  return seen;
+}
+function toNonEmptyString$1(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
 function toCommentInfo(entry, options = {}) {
   const resolvedId = typeof entry.commentId === "string" ? entry.commentId : String(entry.importedId ?? "");
   const status = options.status ?? (isCommentResolved(entry) ? "resolved" : "open");
@@ -234521,6 +234610,15 @@ function listCommentAnchorsSafe(editor) {
     return [];
   }
 }
+function emitCommentLifecycleUpdate(editor, type, comment2) {
+  const emitter = editor.emit;
+  if (typeof emitter !== "function")
+    return;
+  emitter.call(editor, "commentsUpdate", {
+    type,
+    comment: comment2
+  });
+}
 function applyTextSelection(editor, from$1, to) {
   const setTextSelection$1 = editor.commands?.setTextSelection;
   if (typeof setTextSelection$1 === "function") {
@@ -235009,17 +235107,20 @@ function resolveCommentHandler(editor, input2, options) {
         message: "Comment is already resolved."
       }
     };
+  let resolvedTimestamp = null;
   if (executeDomainCommand(editor, () => {
     const didResolve = resolveComment({
       commentId: identity.commentId,
       importedId: identity.importedId
     });
-    if (didResolve)
+    if (didResolve) {
+      resolvedTimestamp = Date.now();
       upsertCommentEntity(store, identity.commentId, {
         importedId: identity.importedId,
         isDone: true,
-        resolvedTime: Date.now()
+        resolvedTime: resolvedTimestamp
       });
+    }
     return Boolean(didResolve);
   }, { expectedRevision: options?.expectedRevision }).steps[0]?.effect !== "changed")
     return {
@@ -235029,6 +235130,12 @@ function resolveCommentHandler(editor, input2, options) {
         message: "Comment resolve produced no change."
       }
     };
+  emitCommentLifecycleUpdate(editor, "resolved", {
+    commentId: identity.commentId,
+    importedId: identity.importedId,
+    isDone: true,
+    resolvedTime: resolvedTimestamp
+  });
   return {
     success: true,
     updated: [toCommentAddress(identity.commentId)]
@@ -235073,6 +235180,12 @@ function reopenCommentHandler(editor, input2, options) {
         message: "Comment reopen produced no change."
       }
     };
+  emitCommentLifecycleUpdate(editor, "update", {
+    commentId: identity.commentId,
+    importedId: identity.importedId,
+    isDone: false,
+    resolvedTime: null
+  });
   return {
     success: true,
     updated: [toCommentAddress(identity.commentId)]
@@ -235107,6 +235220,11 @@ function removeCommentHandler(editor, input2, options) {
   }
   if (!removedIds.size && didRemove)
     removedIds.add(identity.commentId);
+  for (const removedId of removedIds)
+    emitCommentLifecycleUpdate(editor, "deleted", {
+      commentId: removedId,
+      importedId: removedId === identity.commentId ? identity.importedId : undefined
+    });
   return {
     success: true,
     removed: Array.from(removedIds).map((id2) => toCommentAddress(id2))
@@ -306553,7 +306671,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_DOX3DoA2_es = __esm(() => {
+var init_src_Tq4gtGIV_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_BptSHzcb_es();
   init_jszip_C49i9kUs_es();
@@ -344378,7 +344496,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DOX3DoA2_es();
+  init_src_Tq4gtGIV_es();
   init_SuperConverter_BptSHzcb_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -392527,6 +392645,33 @@ function buildHeadlessCommentBridge(ydoc, user) {
       }
     }, { user: userOrigin });
   }
+  let attachedEditor = null;
+  let yArrayObserver = null;
+  let previousSyncedIds = new Set;
+  function syncYArrayToStore() {
+    if (!attachedEditor)
+      return;
+    const entries3 = yArray.toJSON();
+    previousSyncedIds = syncCommentEntitiesFromCollaboration(attachedEditor, entries3, {
+      previouslySynced: previousSyncedIds
+    });
+  }
+  function detachYArrayObserver() {
+    if (yArrayObserver) {
+      yArray.unobserve(yArrayObserver);
+      yArrayObserver = null;
+    }
+  }
+  function attachEditor(editor) {
+    detachYArrayObserver();
+    attachedEditor = editor;
+    previousSyncedIds = new Set;
+    syncYArrayToStore();
+    yArrayObserver = () => {
+      syncYArrayToStore();
+    };
+    yArray.observe(yArrayObserver);
+  }
   return {
     editorOptions: {
       isCommentsEnabled: true,
@@ -392534,13 +392679,18 @@ function buildHeadlessCommentBridge(ydoc, user) {
       onCommentsUpdate: handleCommentsUpdate,
       onCommentsLoaded: handleCommentsLoaded
     },
+    attachEditor,
     dispose() {
+      detachYArrayObserver();
+      attachedEditor = null;
+      previousSyncedIds = new Set;
       registry3.clear();
     }
   };
 }
 var init_headless_comment_bridge = __esm(() => {
   init_yjs();
+  init_super_editor_es();
 });
 
 // src/lib/document.ts
@@ -392655,6 +392805,7 @@ async function openDocument(doc3, io, options2 = {}) {
     });
   }
   initPartsRuntime(editor);
+  commentBridge?.attachEditor(editor);
   if (markdownOverride != null) {
     try {
       const { doc: newDoc } = markdownToPmDoc(markdownOverride, editor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.12.0-next.23",
+  "version": "0.12.0-next.24",
   "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.34.0",
-    "@superdoc/super-editor": "0.0.1"
+    "superdoc": "1.34.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.12.0-next.23",
-    "@superdoc-dev/cli-linux-x64": "0.12.0-next.23",
-    "@superdoc-dev/cli-darwin-x64": "0.12.0-next.23",
-    "@superdoc-dev/cli-linux-arm64": "0.12.0-next.23",
-    "@superdoc-dev/cli-windows-x64": "0.12.0-next.23"
+    "@superdoc-dev/cli-darwin-arm64": "0.12.0-next.24",
+    "@superdoc-dev/cli-darwin-x64": "0.12.0-next.24",
+    "@superdoc-dev/cli-linux-x64": "0.12.0-next.24",
+    "@superdoc-dev/cli-linux-arm64": "0.12.0-next.24",
+    "@superdoc-dev/cli-windows-x64": "0.12.0-next.24"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",