@harbour-enterprises/superdoc 1.4.0-next.3 → 1.4.1-next.1

package/dist/chunks/{SuperConverter-pEsdZ6oR.cjs → SuperConverter-nKpvrgP6.cjs}

@@ -7257,8 +7257,11 @@ const validXmlAttributes$e = [
   createAttributeHandler("w:authorEmail", "authorEmail")
 ];
 const encode$K = (params, encodedAttrs = {}) => {
-  const { nodeListHandler, extraParams = {} } = params;
+  const { nodeListHandler, extraParams = {}, converter } = params;
   const { node } = extraParams;
+  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id)) {
+    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  }
   const subs = nodeListHandler.handler({
     ...params,
     insideTrackChange: true,
@@ -7266,6 +7269,9 @@ const encode$K = (params, encodedAttrs = {}) => {
     path: [...params.path || [], node]
   });
   encodedAttrs.importedAuthor = `${encodedAttrs.author} (imported)`;
+  if (converter?.documentOrigin) {
+    encodedAttrs.origin = converter.documentOrigin;
+  }
   subs.forEach((subElement) => {
     subElement.marks = [];
     if (subElement?.content?.[0]) {
@@ -27325,8 +27331,11 @@ const validXmlAttributes$2 = [
   createAttributeHandler("w:authorEmail", "authorEmail")
 ];
 const encode$2 = (params, encodedAttrs = {}) => {
-  const { nodeListHandler, extraParams = {} } = params;
+  const { nodeListHandler, extraParams = {}, converter } = params;
   const { node } = extraParams;
+  if (encodedAttrs.id && converter?.trackedChangeIdMap?.has(encodedAttrs.id)) {
+    encodedAttrs.id = converter.trackedChangeIdMap.get(encodedAttrs.id);
+  }
   const subs = nodeListHandler.handler({
     ...params,
     insideTrackChange: true,
@@ -27334,6 +27343,9 @@ const encode$2 = (params, encodedAttrs = {}) => {
     path: [...params.path || [], node]
   });
   encodedAttrs.importedAuthor = `${encodedAttrs.author} (imported)`;
+  if (converter?.documentOrigin) {
+    encodedAttrs.origin = converter.documentOrigin;
+  }
   subs.forEach((subElement) => {
     subElement.marks = [];
     if (subElement?.content?.[0]) {
@@ -28053,6 +28065,8 @@ function importCommentData({ docx, editor, converter }) {
     });
     const lastElement = parsedElements[parsedElements.length - 1];
     const paraId = lastElement?.attrs?.["w14:paraId"];
+    const commentsExtended = docx["word/commentsExtended.xml"];
+    const threadingMethod = commentsExtended ? "commentsExtended" : "range-based";
     return {
       commentId: internalId || uuid.v4(),
       importedId,
@@ -28067,19 +28081,31 @@ function importCommentData({ docx, editor, converter }) {
       trackedChangeText,
       trackedChangeType,
       trackedDeletedText,
-      isDone: false
+      isDone: false,
+      origin: converter?.documentOrigin || "word",
+      threadingMethod,
+      originalXmlStructure: {
+        hasCommentsExtended: !!commentsExtended,
+        hasCommentsExtensible: !!docx["word/commentsExtensible.xml"],
+        hasCommentsIds: !!docx["word/commentsIds.xml"]
+      }
     };
   });
-  const extendedComments = generateCommentsWithExtendedData({ docx, comments: extractedComments });
+  const extendedComments = generateCommentsWithExtendedData({ docx, comments: extractedComments, converter });
   return extendedComments;
 }
-const generateCommentsWithExtendedData = ({ docx, comments }) => {
+const generateCommentsWithExtendedData = ({ docx, comments, converter }) => {
   if (!comments?.length) return [];
+  const rangeData = extractCommentRangesFromDocument(docx, converter);
+  const { commentsInTrackedChanges } = rangeData;
+  const trackedChangeParentMap = detectThreadingFromTrackedChanges(comments, commentsInTrackedChanges);
   const commentsExtended = docx["word/commentsExtended.xml"];
   if (!commentsExtended) {
-    const commentRanges = extractCommentRangesFromDocument(docx);
-    const commentsWithThreading = detectThreadingFromRanges(comments, commentRanges);
-    return commentsWithThreading.map((comment) => ({ ...comment, isDone: comment.isDone ?? false }));
+    const commentsWithThreading = detectThreadingFromRanges(comments, rangeData);
+    return commentsWithThreading.map((comment) => ({
+      ...comment,
+      isDone: comment.isDone ?? false
+    }));
   }
   const { elements: initialElements = [] } = commentsExtended;
   if (!initialElements?.length) return comments.map((comment) => ({ ...comment, isDone: comment.isDone ?? false }));
@@ -28087,25 +28113,30 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
   const commentEx = elements.filter((el) => el.name === "w15:commentEx");
   return comments.map((comment) => {
     const extendedDef = commentEx.find((ce2) => {
-      const isIncludedInCommentElements = comment.elements?.some(
-        (el) => el.attrs?.["w14:paraId"] === ce2.attributes["w15:paraId"]
-      );
-      return isIncludedInCommentElements;
+      return comment.elements?.some((el) => el.attrs?.["w14:paraId"] === ce2.attributes["w15:paraId"]);
     });
-    if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
-    const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
-    let parentComment;
-    if (paraIdParent) {
-      parentComment = comments.find(
-        (c) => c.paraId === paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === paraIdParent)
-      );
+    let isDone = comment.isDone ?? false;
+    let parentCommentId = void 0;
+    const trackedChangeParent = trackedChangeParentMap.get(comment.importedId);
+    const isInsideTrackedChange = trackedChangeParent?.isTrackedChangeParent;
+    if (extendedDef) {
+      const details = getExtendedDetails(extendedDef);
+      isDone = details.isDone ?? false;
+      if (!isInsideTrackedChange && details.paraIdParent) {
+        const parentComment = comments.find(
+          (c) => c.paraId === details.paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === details.paraIdParent)
+        );
+        parentCommentId = parentComment?.commentId;
+      }
+    }
+    if (isInsideTrackedChange) {
+      parentCommentId = trackedChangeParent.trackedChangeId;
     }
-    const newComment = {
+    return {
       ...comment,
-      isDone: isDone ?? false,
-      parentCommentId: parentComment?.commentId
+      isDone,
+      parentCommentId
     };
-    return newComment;
   });
 };
 const getExtendedDetails = (commentEx) => {
@@ -28115,34 +28146,117 @@ const getExtendedDetails = (commentEx) => {
   const paraIdParent = attributes["w15:paraIdParent"];
   return { paraId, isDone, paraIdParent };
 };
-const extractCommentRangesFromDocument = (docx) => {
+const extractCommentRangesFromDocument = (docx, converter) => {
   const documentXml = docx["word/document.xml"];
   if (!documentXml) {
-    return [];
-  }
-  const pendingComments = [];
-  const walkElements = (elements) => {
+    return { rangeEvents: [], rangePositions: /* @__PURE__ */ new Map(), commentsInTrackedChanges: /* @__PURE__ */ new Map() };
+  }
+  const rangeEvents = [];
+  const rangePositions = /* @__PURE__ */ new Map();
+  const commentsInTrackedChanges = /* @__PURE__ */ new Map();
+  let positionIndex = 0;
+  let lastElementWasCommentMarker = false;
+  const recentlyClosedComments = /* @__PURE__ */ new Set();
+  let lastTrackedChange = null;
+  const walkElements = (elements, currentTrackedChangeId = null) => {
     if (!elements || !Array.isArray(elements)) return;
     elements.forEach((element) => {
-      if (element.name === "w:commentRangeStart") {
+      const isCommentStart = element.name === "w:commentRangeStart";
+      const isCommentEnd = element.name === "w:commentRangeEnd";
+      const isTrackedChange = element.name === "w:ins" || element.name === "w:del";
+      if (isCommentStart) {
         const commentId = element.attributes?.["w:id"];
         if (commentId !== void 0) {
-          pendingComments.push({
+          const id = String(commentId);
+          rangeEvents.push({
             type: "start",
-            commentId: String(commentId)
+            commentId: id
           });
+          if (!rangePositions.has(id)) {
+            rangePositions.set(id, { startIndex: positionIndex, endIndex: -1 });
+          } else {
+            rangePositions.get(id).startIndex = positionIndex;
+          }
+          if (currentTrackedChangeId !== null) {
+            commentsInTrackedChanges.set(id, currentTrackedChangeId);
+          }
         }
-      } else if (element.name === "w:commentRangeEnd") {
+        lastElementWasCommentMarker = true;
+        recentlyClosedComments.clear();
+      } else if (isCommentEnd) {
         const commentId = element.attributes?.["w:id"];
         if (commentId !== void 0) {
-          pendingComments.push({
+          const id = String(commentId);
+          rangeEvents.push({
             type: "end",
-            commentId: String(commentId)
+            commentId: id
           });
+          if (!rangePositions.has(id)) {
+            rangePositions.set(id, { startIndex: -1, endIndex: positionIndex });
+          } else {
+            rangePositions.get(id).endIndex = positionIndex;
+          }
+          recentlyClosedComments.add(id);
+        }
+        lastElementWasCommentMarker = true;
+      } else if (isTrackedChange) {
+        const trackedChangeId = element.attributes?.["w:id"];
+        const author = element.attributes?.["w:author"];
+        const date = element.attributes?.["w:date"];
+        const elementType = element.name;
+        let mappedId = trackedChangeId;
+        let isReplacement = false;
+        if (trackedChangeId !== void 0 && converter) {
+          if (!converter.trackedChangeIdMap) {
+            converter.trackedChangeIdMap = /* @__PURE__ */ new Map();
+          }
+          if (lastTrackedChange && lastTrackedChange.type !== elementType && lastTrackedChange.author === author && lastTrackedChange.date === date) {
+            mappedId = lastTrackedChange.mappedId;
+            converter.trackedChangeIdMap.set(String(trackedChangeId), mappedId);
+            isReplacement = true;
+          } else {
+            if (!converter.trackedChangeIdMap.has(String(trackedChangeId))) {
+              converter.trackedChangeIdMap.set(String(trackedChangeId), uuid.v4());
+            }
+            mappedId = converter.trackedChangeIdMap.get(String(trackedChangeId));
+          }
+        }
+        if (currentTrackedChangeId === null) {
+          if (isReplacement) {
+            lastTrackedChange = null;
+          } else {
+            lastTrackedChange = {
+              type: elementType,
+              author,
+              date,
+              mappedId,
+              wordId: String(trackedChangeId)
+            };
+          }
+        }
+        if (mappedId && recentlyClosedComments.size > 0) {
+          recentlyClosedComments.forEach((commentId) => {
+            if (!commentsInTrackedChanges.has(commentId)) {
+              commentsInTrackedChanges.set(commentId, String(mappedId));
+            }
+          });
+        }
+        recentlyClosedComments.clear();
+        if (element.elements && Array.isArray(element.elements)) {
+          walkElements(element.elements, mappedId !== void 0 ? String(mappedId) : currentTrackedChangeId);
+        }
+      } else {
+        if (lastElementWasCommentMarker) {
+          positionIndex++;
+          lastElementWasCommentMarker = false;
+        }
+        if (element.name === "w:p") {
+          recentlyClosedComments.clear();
+          lastTrackedChange = null;
+        }
+        if (element.elements && Array.isArray(element.elements)) {
+          walkElements(element.elements, currentTrackedChangeId);
         }
-      }
-      if (element.elements && Array.isArray(element.elements)) {
-        walkElements(element.elements);
       }
     });
   };
@@ -28152,19 +28266,20 @@ const extractCommentRangesFromDocument = (docx) => {
       walkElements(body.elements);
     }
   }
-  return pendingComments;
+  return { rangeEvents, rangePositions, commentsInTrackedChanges };
 };
-const detectThreadingFromRanges = (comments, rangeEvents) => {
-  if (!rangeEvents || rangeEvents.length === 0) {
-    return comments;
-  }
+const detectThreadingFromNestedRanges = (comments, rangeEvents, skipComments = /* @__PURE__ */ new Set()) => {
   const openRanges = [];
   const parentMap = /* @__PURE__ */ new Map();
   rangeEvents.forEach((event) => {
     if (event.type === "start") {
-      if (openRanges.length > 0) {
-        const parentCommentId = openRanges[openRanges.length - 1];
-        parentMap.set(event.commentId, parentCommentId);
+      if (!skipComments.has(event.commentId) && openRanges.length > 0) {
+        for (let i = openRanges.length - 1; i >= 0; i--) {
+          if (!skipComments.has(openRanges[i])) {
+            parentMap.set(event.commentId, openRanges[i]);
+            break;
+          }
+        }
       }
       openRanges.push(event.commentId);
     } else if (event.type === "end") {
@@ -28174,10 +28289,113 @@ const detectThreadingFromRanges = (comments, rangeEvents) => {
       }
     }
   });
+  return parentMap;
+};
+const detectThreadingFromSharedPosition = (comments, rangePositions) => {
+  const parentMap = /* @__PURE__ */ new Map();
+  const commentsByStartPosition = /* @__PURE__ */ new Map();
+  comments.forEach((comment) => {
+    const position = rangePositions.get(comment.importedId);
+    if (position && position.startIndex >= 0) {
+      const startKey = position.startIndex;
+      if (!commentsByStartPosition.has(startKey)) {
+        commentsByStartPosition.set(startKey, []);
+      }
+      commentsByStartPosition.get(startKey).push(comment);
+    }
+  });
+  commentsByStartPosition.forEach((commentsAtPosition) => {
+    if (commentsAtPosition.length <= 1) return;
+    const sorted = [...commentsAtPosition].sort((a, b2) => a.createdTime - b2.createdTime);
+    const parentComment = sorted[0];
+    for (let i = 1; i < sorted.length; i++) {
+      parentMap.set(sorted[i].importedId, parentComment.importedId);
+    }
+  });
+  return parentMap;
+};
+const detectThreadingFromMissingRanges = (comments, rangePositions) => {
+  const parentMap = /* @__PURE__ */ new Map();
+  const commentsWithRanges = [];
+  const commentsWithoutRanges = [];
+  comments.forEach((comment) => {
+    const position = rangePositions.get(comment.importedId);
+    if (position && position.startIndex >= 0) {
+      commentsWithRanges.push(comment);
+    } else {
+      commentsWithoutRanges.push(comment);
+    }
+  });
+  commentsWithoutRanges.forEach((comment) => {
+    const potentialParents = commentsWithRanges.filter((c) => c.createdTime < comment.createdTime).sort((a, b2) => b2.createdTime - a.createdTime);
+    if (potentialParents.length > 0) {
+      parentMap.set(comment.importedId, potentialParents[0].importedId);
+    }
+  });
+  return parentMap;
+};
+const detectThreadingFromTrackedChanges = (comments, commentsInTrackedChanges) => {
+  const parentMap = /* @__PURE__ */ new Map();
+  if (!commentsInTrackedChanges || commentsInTrackedChanges.size === 0) {
+    return parentMap;
+  }
+  comments.forEach((comment) => {
+    const trackedChangeId = commentsInTrackedChanges.get(comment.importedId);
+    if (trackedChangeId !== void 0) {
+      parentMap.set(comment.importedId, { trackedChangeId, isTrackedChangeParent: true });
+    }
+  });
+  return parentMap;
+};
+const detectThreadingFromRanges = (comments, rangeData) => {
+  const { rangeEvents, rangePositions, commentsInTrackedChanges } = Array.isArray(rangeData) ? { rangeEvents: rangeData, rangePositions: /* @__PURE__ */ new Map(), commentsInTrackedChanges: /* @__PURE__ */ new Map() } : rangeData;
+  if (!rangeEvents || rangeEvents.length === 0) {
+    if (comments.length > 1) {
+      const parentMap = detectThreadingFromMissingRanges(comments, rangePositions);
+      return applyParentRelationships(comments, parentMap);
+    }
+    return comments;
+  }
+  const commentsWithSharedPosition = findCommentsWithSharedStartPosition(comments, rangePositions);
+  const nestedParentMap = detectThreadingFromNestedRanges(comments, rangeEvents, commentsWithSharedPosition);
+  const sharedPositionParentMap = detectThreadingFromSharedPosition(comments, rangePositions);
+  const missingRangeParentMap = detectThreadingFromMissingRanges(comments, rangePositions);
+  const trackedChangeParentMap = detectThreadingFromTrackedChanges(comments, commentsInTrackedChanges);
+  const mergedParentMap = new Map([...missingRangeParentMap, ...nestedParentMap, ...sharedPositionParentMap]);
+  return applyParentRelationships(comments, mergedParentMap, trackedChangeParentMap);
+};
+const findCommentsWithSharedStartPosition = (comments, rangePositions) => {
+  const sharedPositionComments = /* @__PURE__ */ new Set();
+  const commentsByStartPosition = /* @__PURE__ */ new Map();
+  comments.forEach((comment) => {
+    const position = rangePositions.get(comment.importedId);
+    if (position && position.startIndex >= 0) {
+      const startKey = position.startIndex;
+      if (!commentsByStartPosition.has(startKey)) {
+        commentsByStartPosition.set(startKey, []);
+      }
+      commentsByStartPosition.get(startKey).push(comment.importedId);
+    }
+  });
+  commentsByStartPosition.forEach((commentIds) => {
+    if (commentIds.length > 1) {
+      commentIds.forEach((id) => sharedPositionComments.add(id));
+    }
+  });
+  return sharedPositionComments;
+};
+const applyParentRelationships = (comments, parentMap, trackedChangeParentMap = /* @__PURE__ */ new Map()) => {
   return comments.map((comment) => {
-    const parentCommentId = parentMap.get(comment.importedId);
-    if (parentCommentId) {
-      const parentComment = comments.find((c) => c.importedId === parentCommentId);
+    const trackedChangeParent = trackedChangeParentMap.get(comment.importedId);
+    if (trackedChangeParent && trackedChangeParent.isTrackedChangeParent) {
+      return {
+        ...comment,
+        parentCommentId: trackedChangeParent.trackedChangeId
+      };
+    }
+    const parentImportedId = parentMap.get(comment.importedId);
+    if (parentImportedId) {
+      const parentComment = comments.find((c) => c.importedId === parentImportedId);
       if (parentComment) {
         return {
           ...comment,
@@ -29053,9 +29271,30 @@ const commentRangeEndHandlerEntity = generateV2HandlerEntity(
 );
 const permStartHandlerEntity = generateV2HandlerEntity("permStartHandler", translator$8);
 const permEndHandlerEntity = generateV2HandlerEntity("permEndHandler", translator$7);
+const detectDocumentOrigin = (docx) => {
+  const commentsExtended = docx["word/commentsExtended.xml"];
+  if (commentsExtended) {
+    const { elements: initialElements = [] } = commentsExtended;
+    if (initialElements?.length > 0) {
+      const { elements = [] } = initialElements[0] ?? {};
+      const commentEx = elements.filter((el) => el.name === "w15:commentEx");
+      if (commentEx.length > 0) {
+        return "word";
+      }
+    }
+  }
+  const comments = docx["word/comments.xml"];
+  if (comments && !commentsExtended) {
+    return "google-docs";
+  }
+  return "unknown";
+};
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
   if (!json) return null;
+  if (converter) {
+    converter.documentOrigin = detectDocumentOrigin(docx);
+  }
   if (converter?.telemetry) {
     const files = Object.keys(docx).map((filePath) => {
       const parts = filePath.split("/");
@@ -30627,7 +30866,9 @@ const getCommentDefinition = (comment, commentId, allComments, editor) => {
   };
   if (comment?.parentCommentId) {
     const parentComment = allComments.find((c) => c.commentId === comment.parentCommentId);
-    attributes["w15:paraIdParent"] = parentComment.commentParaId;
+    if (parentComment && !parentComment.trackedChange) {
+      attributes["w15:paraIdParent"] = parentComment.commentParaId;
+    }
   }
   return {
     type: "element",
@@ -30672,7 +30913,22 @@ const updateCommentsXml = (commentDefs = [], commentsXml) => {
   newCommentsXml.elements[0].elements = commentDefs;
   return newCommentsXml;
 };
-const updateCommentsExtendedXml = (comments = [], commentsExtendedXml) => {
+const determineExportStrategy = (comments) => {
+  if (!comments || comments.length === 0) {
+    return "word";
+  }
+  const origins = new Set(comments.map((c) => c.origin || "word"));
+  if (origins.size === 1) {
+    const origin = origins.values().next().value;
+    return origin === "google-docs" ? "google-docs" : "word";
+  }
+  return "word";
+};
+const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, exportStrategy = "word") => {
+  const shouldGenerateCommentsExtended = exportStrategy === "word" || comments.some((c) => c.originalXmlStructure?.hasCommentsExtended);
+  if (!shouldGenerateCommentsExtended && exportStrategy === "google-docs") {
+    return null;
+  }
   const xmlCopy = carbonCopy(commentsExtendedXml);
   const commentsEx = comments.map((comment) => {
     const isResolved = comment.resolvedTime || comment.isDone;
@@ -30681,9 +30937,11 @@ const updateCommentsExtendedXml = (comments = [], commentsExtendedXml) => {
       "w15:done": isResolved ? "1" : "0"
     };
     const parentId = comment.parentCommentId;
-    if (parentId) {
+    if (parentId && (exportStrategy === "word" || comment.originalXmlStructure?.hasCommentsExtended)) {
       const parentComment = comments.find((c) => c.commentId === parentId);
-      attributes["w15:paraIdParent"] = parentComment.commentParaId;
+      if (parentComment && !parentComment.trackedChange) {
+        attributes["w15:paraIdParent"] = parentComment.commentParaId;
+      }
     }
     return {
       type: "element",
@@ -30753,14 +31011,21 @@ const prepareCommentsXmlFilesForExport = ({ convertedXml, defs, commentsWithPara
     const documentXml = removeCommentsFilesFromConvertedXml(convertedXml);
     return { documentXml, relationships };
   }
+  const exportStrategy = determineExportStrategy(commentsWithParaIds);
   const updatedXml = generateConvertedXmlWithCommentFiles(convertedXml);
   updatedXml["word/comments.xml"] = updateCommentsXml(defs, updatedXml["word/comments.xml"]);
   relationships.push(generateRelationship("comments.xml"));
-  updatedXml["word/commentsExtended.xml"] = updateCommentsExtendedXml(
+  const commentsExtendedXml = updateCommentsExtendedXml(
     commentsWithParaIds,
-    updatedXml["word/commentsExtended.xml"]
+    updatedXml["word/commentsExtended.xml"],
+    exportStrategy
   );
-  relationships.push(generateRelationship("commentsExtended.xml"));
+  if (commentsExtendedXml !== null) {
+    updatedXml["word/commentsExtended.xml"] = commentsExtendedXml;
+    relationships.push(generateRelationship("commentsExtended.xml"));
+  } else {
+    delete updatedXml["word/commentsExtended.xml"];
+  }
   const { documentIdsUpdated, extensibleUpdated } = updateCommentsIdsAndExtensible(
     commentsWithParaIds,
     updatedXml["word/commentsIds.xml"],
@@ -31269,7 +31534,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.4.0-next.3") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.4.1-next.1") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**

package/dist/chunks/{index-DF3OVaQj.es.js → index-BGllXGwn.es.js}

@@ -1,5 +1,5 @@
-import { B as BIT8, M as MAX_SAFE_INTEGER, c as create, a as BITS7, u as utf8TextDecoder, b as create$1, s as setIfUndefined, d as create$2, f as from, e as floor$1, g as equalityDeep, w as writeVarUint, h as writeVarString, t as toUint8Array, i as createEncoder, j as createInjectionKey, k as toString, l as throwError, m as useSsrAdapter, n as configProviderInjectionKey, o as cssrAnchorMetaName, p as globalStyle, q as cB, r as c, v as isMounted, x as commonVariables$2, y as cM, z as cNotM, A as cE, C as derived, D as changeColor, E as insideModal, F as insidePopover, G as resolveWrappedSlot, H as on, I as warnOnce, J as useConfig, K as useMergedState, L as useMemo, N as useTheme, O as useRtl, P as createKey, Q as useThemeClass, R as createId, S as call, T as render, U as messageProviderInjectionKey, V as messageApiInjectionKey, W as fromBase64, X as onChange, Y as varStorage, Z as toBase64, _ as createUint8ArrayFromArrayBuffer, $ as offChange, a0 as writeVarUint8Array, a1 as map, a2 as length, a3 as isNode, a4 as min, a5 as pow, a6 as comments_module_events, a7 as getFileObject, a8 as getTrackChanges, a9 as CommentsPluginKey, aa as TrackChangesBasePluginKey, ab as Editor, ac as getRichTextExtensions, ad as ellipsisVerticalSvg, ae as xmarkIconSvg, af as checkIconSvg, ag as caretDownIconSvg, ah as commentIconSvg, ai as _export_sfc, aj as NDropdown, ak as SuperInput, al as vClickOutside, am as PresentationEditor, an as SuperEditor, ao as AIWriter, ap as NConfigProvider, aq as SuperToolbar } from "./index-B-20lDKU.es.js";
-import "./SuperConverter-MYkKoPrv.es.js";
+import { B as BIT8, M as MAX_SAFE_INTEGER, c as create, a as BITS7, u as utf8TextDecoder, b as create$1, s as setIfUndefined, d as create$2, f as from, e as floor$1, g as equalityDeep, w as writeVarUint, h as writeVarString, t as toUint8Array, i as createEncoder, j as createInjectionKey, k as toString, l as throwError, m as useSsrAdapter, n as configProviderInjectionKey, o as cssrAnchorMetaName, p as globalStyle, q as cB, r as c, v as isMounted, x as commonVariables$2, y as cM, z as cNotM, A as cE, C as derived, D as changeColor, E as insideModal, F as insidePopover, G as resolveWrappedSlot, H as on, I as warnOnce, J as useConfig, K as useMergedState, L as useMemo, N as useTheme, O as useRtl, P as createKey, Q as useThemeClass, R as createId, S as call, T as render, U as messageProviderInjectionKey, V as messageApiInjectionKey, W as fromBase64, X as onChange, Y as varStorage, Z as toBase64, _ as createUint8ArrayFromArrayBuffer, $ as offChange, a0 as writeVarUint8Array, a1 as map, a2 as length, a3 as isNode, a4 as min, a5 as pow, a6 as comments_module_events, a7 as getFileObject, a8 as getTrackChanges, a9 as CommentsPluginKey, aa as TrackChangesBasePluginKey, ab as Editor, ac as getRichTextExtensions, ad as ellipsisVerticalSvg, ae as xmarkIconSvg, af as checkIconSvg, ag as caretDownIconSvg, ah as commentIconSvg, ai as _export_sfc, aj as NDropdown, ak as SuperInput, al as vClickOutside, am as PresentationEditor, an as SuperEditor, ao as AIWriter, ap as NConfigProvider, aq as SuperToolbar } from "./index-DwUAu2hL.es.js";
+import "./SuperConverter-BuK6B5Kx.es.js";
 import { B as BlankDOCX } from "./blank-docx-ABm6XYAA.es.js";
 import { E as EventEmitter } from "./eventemitter3-CwrdEv8r.es.js";
 import { HocuspocusProvider, HocuspocusProviderWebsocket } from "@hocuspocus/provider";
@@ -5113,11 +5113,14 @@ const groupChanges = (changes) => {
     trackFormat: "formatMark"
   };
   const grouped = [];
+  const processed = /* @__PURE__ */ new Set();
   for (let i = 0; i < changes.length; i++) {
+    if (processed.has(i)) continue;
     const c1 = changes[i];
-    const c2 = changes[i + 1];
     const c1Key = markMetaKeys[c1.mark.type.name];
-    if (c1 && c2 && c1.to === c2.from && c1.mark.attrs.id === c2.mark.attrs.id) {
+    const c1Id = c1.mark.attrs.id;
+    const c2 = changes[i + 1];
+    if (c2 && c1.to === c2.from && c1Id === c2.mark.attrs.id) {
       const c2Key = markMetaKeys[c2.mark.type.name];
       grouped.push({
         from: c1.from,
@@ -5125,13 +5128,35 @@ const groupChanges = (changes) => {
         [c1Key]: c1,
         [c2Key]: c2
       });
-      i++;
-    } else {
+      processed.add(i);
+      processed.add(i + 1);
+      continue;
+    }
+    let foundMatch = false;
+    for (let j = i + 1; j < changes.length; j++) {
+      if (processed.has(j)) continue;
+      const c22 = changes[j];
+      if (c1Id === c22.mark.attrs.id && c1.mark.type.name !== c22.mark.type.name) {
+        const c2Key = markMetaKeys[c22.mark.type.name];
+        grouped.push({
+          from: Math.min(c1.from, c22.from),
+          to: Math.max(c1.to, c22.to),
+          [c1Key]: c1,
+          [c2Key]: c22
+        });
+        processed.add(i);
+        processed.add(j);
+        foundMatch = true;
+        break;
+      }
+    }
+    if (!foundMatch) {
       grouped.push({
         from: c1.from,
         to: c1.to,
         [c1Key]: c1
       });
+      processed.add(i);
     }
   }
   return grouped;
@@ -5433,7 +5458,12 @@ const useCommentsStore = /* @__PURE__ */ defineStore("comments", () => {
         trackedChange: comment.trackedChange || false,
         trackedChangeText: comment.trackedChangeText,
         trackedChangeType: comment.trackedChangeType,
-        deletedText: comment.trackedDeletedText
+        deletedText: comment.trackedDeletedText,
+        // Preserve origin metadata for export
+        origin: comment.origin || "word",
+        // Default to 'word' for backward compatibility
+        threadingMethod: comment.threadingMethod,
+        originalXmlStructure: comment.originalXmlStructure
       });
       addComment({ superdoc, comment: newComment });
     });
@@ -6213,7 +6243,11 @@ const _sfc_main$c = {
         const isThreadedComment = c2.parentCommentId === parentComment.commentId;
         const isThisComment = c2.commentId === props.comment.commentId;
         return isThreadedComment || isThisComment;
-      }).sort((a, b) => a.commentId === props.comment.commentId && a.createdTime - b.createdTime);
+      }).sort((a, b) => {
+        if (a.commentId === props.comment.commentId) return -1;
+        if (b.commentId === props.comment.commentId) return 1;
+        return a.createdTime - b.createdTime;
+      });
     });
     const isInternalDropdownDisabled = computed(() => {
       if (props.comment.resolvedTime) return true;
@@ -6472,7 +6506,7 @@ const _sfc_main$c = {
     };
   }
 };
-const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-d50fd675"]]);
+const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-f9956635"]]);
 const _hoisted_1$a = { class: "comments-list" };
 const _hoisted_2$5 = { key: 0 };
 const _hoisted_3$3 = { class: "comment-item" };
@@ -7479,7 +7513,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-D859yVUF.es.js"));
+    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-D_1Yi2Kj.es.js"));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -8433,7 +8467,7 @@ class SuperDoc extends EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "1.4.0-next.3";
+    this.version = "1.4.1-next.1";
     this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || v4();
     this.colors = this.config.colors;