@superdoc-dev/mcp 0.11.0-next.7 → 0.11.0-next.8

package/dist/index.js

@@ -52211,7 +52211,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-7JlFliK8.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DBsJeu9t.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -111839,6 +111839,44 @@ var isRegExp = (value) => {
     ...comment,
     commentParaId: generateDocxRandomId()
   };
+}, getCommentIds = (comment) => {
+  if (!comment)
+    return [];
+  return [
+    comment.commentId,
+    comment.importedId,
+    comment.internalId
+  ].filter((id) => id != null).map((id) => String(id));
+}, buildCommentLookup = (comments = []) => {
+  const byId = /* @__PURE__ */ new Map;
+  for (const comment of comments)
+    getCommentIds(comment).forEach((id) => byId.set(id, comment));
+  return byId;
+}, findCommentById = (comments = [], id) => {
+  if (id == null)
+    return null;
+  return buildCommentLookup(comments).get(String(id)) || null;
+}, isCommentResolvedInThread = (comment, allComments = []) => {
+  const isDone = (c$1) => Boolean(c$1?.resolvedTime || c$1?.isDone);
+  if (isDone(comment))
+    return true;
+  const byId = buildCommentLookup(allComments);
+  const seen = /* @__PURE__ */ new Set;
+  let current = comment;
+  while (current) {
+    const parentId = current.threadingParentCommentId || current.parentCommentId;
+    const parentKey = parentId != null ? String(parentId) : null;
+    if (parentKey == null || seen.has(parentKey))
+      break;
+    seen.add(parentKey);
+    const parent = byId.get(parentKey);
+    if (!parent)
+      break;
+    if (isDone(parent))
+      return true;
+    current = parent;
+  }
+  return false;
 }, getCommentDefinition = (comment, commentId, allComments, editor) => {
   const translatedParagraphs = (Array.isArray(comment.commentJSON) ? comment.commentJSON : comment.commentJSON ? [comment.commentJSON] : []).map((node2) => translator.decode({
     editor,
@@ -111849,7 +111887,7 @@ var isRegExp = (value) => {
     "w:author": comment.creatorName || comment.importedAuthor?.name,
     "w:date": toIsoNoFractional(comment.createdTime),
     "w:initials": getInitials(comment.creatorName),
-    "w:done": comment.resolvedTime ? "1" : "0",
+    "w:done": isCommentResolvedInThread(comment, allComments) ? "1" : "0",
     "w15:paraId": comment.commentParaId,
     "custom:internalId": comment.commentId || comment.internalId,
     "custom:trackedChange": comment.trackedChange,
@@ -111860,7 +111898,7 @@ var isRegExp = (value) => {
     "custom:email": comment.creatorEmail || comment.importedAuthor?.email
   };
   if (comment?.parentCommentId) {
-    const parentComment = allComments.find((c$1) => c$1.commentId === comment.parentCommentId);
+    const parentComment = findCommentById(allComments, comment.parentCommentId);
     if (parentComment && !parentComment.trackedChange)
       attributes["w15:paraIdParent"] = parentComment.commentParaId;
   }
@@ -111936,7 +111974,7 @@ var isRegExp = (value) => {
     return null;
   const xmlCopy = carbonCopy(commentsExtendedXml);
   const commentsEx = comments.map((comment) => {
-    const isResolved = comment.resolvedTime || comment.isDone;
+    const isResolved = isCommentResolvedInThread(comment, comments);
     const attributes = {
       "w15:paraId": comment.commentParaId,
       "w15:done": isResolved ? "1" : "0"
@@ -111944,7 +111982,7 @@ var isRegExp = (value) => {
     const parentId = comment.threadingParentCommentId || comment.parentCommentId;
     const threadingStyle = resolveThreadingStyle(comment, profile);
     if (parentId && (threadingStyle === "commentsExtended" || shouldIncludeForThreads)) {
-      const parentComment = comments.find((c$1) => c$1.commentId === parentId);
+      const parentComment = findCommentById(comments, parentId);
       const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
       if (parentComment && (allowTrackedParent || !parentComment.trackedChange))
         attributes["w15:paraIdParent"] = parentComment.commentParaId;
@@ -115551,7 +115589,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_7JlFliK8_es = __esm(() => {
+var init_SuperConverter_DBsJeu9t_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -154586,7 +154624,7 @@ var init_SuperConverter_7JlFliK8_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-ByZquSqc.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BiY_0zZP.es.js
 function parseSizeUnit(val = "0") {
   const length = val.toString() || "0";
   const value = Number.parseFloat(length);
@@ -164919,8 +164957,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_ByZquSqc_es = __esm(() => {
-  init_SuperConverter_7JlFliK8_es();
+var init_create_headless_toolbar_BiY_0zZP_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
   init_uuid_qzgm05fK_es();
   init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
@@ -219604,7 +219642,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BjC0MGkm.es.js
+// ../../packages/superdoc/dist/chunks/src-DYT7-l3i.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -281524,28 +281562,61 @@ var Node$13 = class Node$14 {
     ranges
   };
 }, resolveCommentById = ({ commentId, importedId, state, tr, dispatch }) => {
+  const converted = resolveCommentsInTr({
+    items: [{
+      commentId,
+      importedId
+    }],
+    state,
+    tr
+  });
+  if (converted)
+    dispatch(tr);
+  return converted;
+}, resolveCommentsInTr = ({ items = [], state, tr }) => {
   const { schema } = state;
   const markType = schema.marks?.[CommentMarkName];
   if (!markType)
     return false;
-  const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
-  if (!segments.length)
-    return false;
-  segments.forEach(({ from: from$1, to, attrs }) => {
-    tr.removeMark(from$1, to, markType.create(attrs));
-  });
   const startType = schema.nodes?.commentRangeStart;
   const endType = schema.nodes?.commentRangeEnd;
-  if (startType && endType)
-    ranges.slice().sort((a2, b$1) => b$1.from - a2.from).forEach(({ from: from$1, to, internal }) => {
-      tr.insert(to, endType.create({ "w:id": commentId }));
-      tr.insert(from$1, startType.create({
+  const insertions = [];
+  const seen = /* @__PURE__ */ new Set;
+  let converted = false;
+  for (const item of items) {
+    if (!item)
+      continue;
+    const { commentId, importedId } = item;
+    if (commentId == null)
+      continue;
+    const key2 = `${commentId}:${importedId ?? ""}`;
+    if (seen.has(key2))
+      continue;
+    seen.add(key2);
+    const { segments, ranges } = getCommentMarkRangesById(commentId, state.doc, importedId);
+    if (!segments.length)
+      continue;
+    converted = true;
+    segments.forEach(({ from: from$1, to, attrs }) => {
+      tr.removeMark(from$1, to, markType.create(attrs));
+    });
+    if (startType && endType && item.preserveAnchor !== false)
+      ranges.forEach(({ from: from$1, to, internal }) => insertions.push({
+        from: from$1,
+        to,
+        internal,
+        commentId
+      }));
+  }
+  if (startType && endType && insertions.length)
+    insertions.sort((a2, b$1) => b$1.from - a2.from || b$1.to - a2.to).forEach(({ from: from$1, to, internal, commentId }) => {
+      tr.insert(tr.mapping.map(to), endType.create({ "w:id": commentId }));
+      tr.insert(tr.mapping.map(from$1), startType.create({
         "w:id": commentId,
         internal
       }));
     });
-  dispatch(tr);
-  return true;
+  return converted;
 }, getCommentRangeAnchorsById = (commentId, doc$12, importedId) => {
   const anchors = [];
   doc$12.descendants((node2, pos) => {
@@ -281840,6 +281911,60 @@ var Node$13 = class Node$14 {
       });
     });
   }
+  const nodeAnchorsById = /* @__PURE__ */ new Map;
+  doc$12.descendants((node2, pos) => {
+    const typeName = node2.type?.name;
+    if (typeName !== "commentRangeStart" && typeName !== "commentRangeEnd")
+      return;
+    const anchorId = node2.attrs?.["w:id"];
+    if (anchorId == null)
+      return;
+    const entry = nodeAnchorsById.get(anchorId) || {};
+    if (typeName === "commentRangeStart")
+      entry.startPos = pos;
+    else
+      entry.endPos = pos;
+    nodeAnchorsById.set(anchorId, entry);
+  });
+  const isRepresented = (c) => seen.has(c.commentId) || c.importedId != null && seen.has(c.importedId) || nodeAnchorsById.has(c.commentId) || c.importedId != null && nodeAnchorsById.has(c.importedId);
+  const findAncestorNodeAnchor = (comment2) => {
+    let current = comment2;
+    const visited = /* @__PURE__ */ new Set;
+    while (current) {
+      const parentId = getThreadingParentId(current);
+      if (parentId == null || visited.has(parentId))
+        return null;
+      visited.add(parentId);
+      const parent = commentMap.get(parentId) || comments.find((c) => c.importedId === parentId || c.commentId === parentId);
+      const anchor = nodeAnchorsById.get(parentId) ?? (parent ? nodeAnchorsById.get(parent.commentId) ?? nodeAnchorsById.get(parent.importedId) : undefined);
+      if (anchor?.startPos != null && anchor?.endPos != null)
+        return anchor;
+      current = parent;
+    }
+    return null;
+  };
+  comments.filter((c) => !c.trackedChange && c.commentId != null && !isRepresented(c)).sort((a2, b$1) => (a2.createdTime || 0) - (b$1.createdTime || 0)).forEach((c) => {
+    const anchor = findAncestorNodeAnchor(c);
+    if (!anchor)
+      return;
+    seen.add(c.commentId);
+    const childAttrs = getPreparedComment({
+      commentId: c.commentId,
+      internal: c.isInternal
+    });
+    startNodes.push({
+      pos: anchor.startPos + 1,
+      node: schema.nodes.commentRangeStart.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+    endNodes.push({
+      pos: anchor.endPos + 1,
+      node: schema.nodes.commentRangeEnd.create(childAttrs),
+      commentId: c.commentId,
+      parentCommentId: getThreadingParentId(c)
+    });
+  });
   startNodes.sort((a2, b$1) => {
     if (a2.pos !== b$1.pos)
       return a2.pos - b$1.pos;
@@ -315653,13 +315778,13 @@ 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, TRACKED_MARK_NAMES;
-var init_src_BjC0MGkm_es = __esm(() => {
+var init_src_DYT7_l3i_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_7JlFliK8_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_ByZquSqc_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
   init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -318740,6 +318865,17 @@ ${err.toString()}`);
             dispatch
           });
         },
+        resolveCommentThread: ({ comments } = {}) => ({ tr, dispatch, state }) => {
+          tr.setMeta(CommentsPluginKey, { event: "update" });
+          const converted = resolveCommentsInTr({
+            items: comments,
+            state,
+            tr
+          });
+          if (converted)
+            dispatch(tr);
+          return converted;
+        },
         reopenComment: ({ commentId, importedId, internal }) => ({ tr, dispatch, state }) => {
           tr.setMeta(CommentsPluginKey, { event: "update" });
           return reopenCommentById({
@@ -342563,7 +342699,8 @@ function print() { __p += __j.call(arguments, '') }
     cambria: "Caladea",
     arial: "Liberation Sans",
     "times new roman": "Liberation Serif",
-    "courier new": "Liberation Mono"
+    "courier new": "Liberation Mono",
+    helvetica: "Liberation Sans"
   });
   defaultResolver = new FontResolver;
   DEFAULT_FONT_MEASURE_CONTEXT = Object.freeze({
@@ -350392,11 +350529,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CYY3yxUs.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-k5vyPmpN.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_CYY3yxUs_es = __esm(() => {
-  init_SuperConverter_7JlFliK8_es();
-  init_create_headless_toolbar_ByZquSqc_es();
+var init_create_super_doc_ui_k5vyPmpN_es = __esm(() => {
+  init_SuperConverter_DBsJeu9t_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -350438,16 +350575,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BjC0MGkm_es();
-  init_SuperConverter_7JlFliK8_es();
+  init_src_DYT7_l3i_es();
+  init_SuperConverter_DBsJeu9t_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_ByZquSqc_es();
+  init_create_headless_toolbar_BiY_0zZP_es();
   init_constants_D9qj59G2_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_Bu2Fhqkw_es();
-  init_create_super_doc_ui_CYY3yxUs_es();
+  init_create_super_doc_ui_k5vyPmpN_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();
@@ -450924,6 +451061,42 @@ var prepareCommentParaIds2 = (comment2) => {
     commentParaId: generateDocxRandomId2()
   };
   return newComment;
+}, getCommentIds2 = (comment2) => {
+  if (!comment2)
+    return [];
+  return [comment2.commentId, comment2.importedId, comment2.internalId].filter((id2) => id2 != null).map((id2) => String(id2));
+}, buildCommentLookup2 = (comments = []) => {
+  const byId = new Map;
+  for (const comment2 of comments) {
+    getCommentIds2(comment2).forEach((id2) => byId.set(id2, comment2));
+  }
+  return byId;
+}, findCommentById2 = (comments = [], id2) => {
+  if (id2 == null)
+    return null;
+  const lookup3 = buildCommentLookup2(comments);
+  return lookup3.get(String(id2)) || null;
+}, isCommentResolvedInThread2 = (comment2, allComments = []) => {
+  const isDone = (c) => Boolean(c?.resolvedTime || c?.isDone);
+  if (isDone(comment2))
+    return true;
+  const byId = buildCommentLookup2(allComments);
+  const seen = new Set;
+  let current = comment2;
+  while (current) {
+    const parentId = current.threadingParentCommentId || current.parentCommentId;
+    const parentKey = parentId != null ? String(parentId) : null;
+    if (parentKey == null || seen.has(parentKey))
+      break;
+    seen.add(parentKey);
+    const parent = byId.get(parentKey);
+    if (!parent)
+      break;
+    if (isDone(parent))
+      return true;
+    current = parent;
+  }
+  return false;
 }, getCommentDefinition2 = (comment2, commentId, allComments, editor) => {
   const nodes = Array.isArray(comment2.commentJSON) ? comment2.commentJSON : comment2.commentJSON ? [comment2.commentJSON] : [];
   const translatedParagraphs = nodes.map((node4) => translator121.decode({ editor, node: node4 })).filter(Boolean);
@@ -450932,7 +451105,7 @@ var prepareCommentParaIds2 = (comment2) => {
     "w:author": comment2.creatorName || comment2.importedAuthor?.name,
     "w:date": toIsoNoFractional2(comment2.createdTime),
     "w:initials": getInitials2(comment2.creatorName),
-    "w:done": comment2.resolvedTime ? "1" : "0",
+    "w:done": isCommentResolvedInThread2(comment2, allComments) ? "1" : "0",
     "w15:paraId": comment2.commentParaId,
     "custom:internalId": comment2.commentId || comment2.internalId,
     "custom:trackedChange": comment2.trackedChange,
@@ -450943,7 +451116,7 @@ var prepareCommentParaIds2 = (comment2) => {
     "custom:email": comment2.creatorEmail || comment2.importedAuthor?.email
   };
   if (comment2?.parentCommentId) {
-    const parentComment = allComments.find((c) => c.commentId === comment2.parentCommentId);
+    const parentComment = findCommentById2(allComments, comment2.parentCommentId);
     if (parentComment && !parentComment.trackedChange) {
       attributes["w15:paraIdParent"] = parentComment.commentParaId;
     }
@@ -451028,7 +451201,7 @@ var prepareCommentParaIds2 = (comment2) => {
   }
   const xmlCopy = carbonCopy2(commentsExtendedXml);
   const commentsEx = comments.map((comment2) => {
-    const isResolved = comment2.resolvedTime || comment2.isDone;
+    const isResolved = isCommentResolvedInThread2(comment2, comments);
     const attributes = {
       "w15:paraId": comment2.commentParaId,
       "w15:done": isResolved ? "1" : "0"
@@ -451036,7 +451209,7 @@ var prepareCommentParaIds2 = (comment2) => {
     const parentId = comment2.threadingParentCommentId || comment2.parentCommentId;
     const threadingStyle = resolveThreadingStyle2(comment2, profile);
     if (parentId && (threadingStyle === "commentsExtended" || shouldIncludeForThreads)) {
-      const parentComment = comments.find((c) => c.commentId === parentId);
+      const parentComment = findCommentById2(comments, parentId);
       const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
       if (parentComment && (allowTrackedParent || !parentComment.trackedChange)) {
         attributes["w15:paraIdParent"] = parentComment.commentParaId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/mcp",
-  "version": "0.11.0-next.7",
+  "version": "0.11.0-next.8",
   "type": "module",
   "engines": {
     "node": ">=20"