@harbour-enterprises/superdoc 1.7.0-next.8 → 1.7.0-next.9

package/dist/chunks/{PdfViewer-CcFA0rJU.cjs → PdfViewer-Vnsmg2cv.cjs}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("./vue-De9wkgLl.cjs");
-const superdoc = require("./index-FiJG3jxE.cjs");
-const index = require("./index-CYnDWjvg.cjs");
+const superdoc = require("./index-CDRAe8oj.cjs");
+const index = require("./index-nEA2vtLH.cjs");
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{PdfViewer-CUMpkySV.es.js → PdfViewer-W0haUdLl.es.js}

@@ -1,6 +1,6 @@
 import { d as defineComponent, h, T as Transition, p as process$1, w as watchEffect, c as computed, r as ref, f as onMounted, X as onUnmounted, E as createElementBlock, G as openBlock, K as createBaseVNode, M as createCommentVNode, I as createVNode, v as unref } from "./vue-BnBKJwCW.es.js";
-import { N as NBaseLoading, u as useSuperdocStore, s as storeToRefs, a as useSelection } from "./index-DGCJio0S.es.js";
-import { C as derived, r as c, q as cB, aF as fadeInTransition, y as cM, I as warnOnce, J as useConfig, N as useTheme, aG as pxfy, P as createKey, Q as useThemeClass, aH as useCompitable, ai as _export_sfc } from "./index-DTJCOo2w.es.js";
+import { N as NBaseLoading, u as useSuperdocStore, s as storeToRefs, a as useSelection } from "./index-Dho4ex7D.es.js";
+import { C as derived, r as c, q as cB, aF as fadeInTransition, y as cM, I as warnOnce, J as useConfig, N as useTheme, aG as pxfy, P as createKey, Q as useThemeClass, aH as useCompitable, ai as _export_sfc } from "./index-C070FBOz.es.js";
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{SuperConverter-D0hhe2nV.es.js → SuperConverter-B0zMkLdc.es.js}

@@ -27557,7 +27557,46 @@ const decode$l = (params) => {
     };
     commentSchema = [commentSchema, commentReference];
   }
-  return commentSchema;
+  const usesRangeThreading = originalComment.threadingStyleOverride === "range-based" || originalComment.threadingMethod === "range-based" || originalComment.originalXmlStructure?.hasCommentsExtended === false;
+  if (!usesRangeThreading) {
+    return commentSchema;
+  }
+  const trackedMark = node.marks?.find((mark) => mark.type === "trackInsert" || mark.type === "trackDelete");
+  if (trackedMark) {
+    const wrapperName2 = trackedMark.type === "trackDelete" ? "w:del" : "w:ins";
+    const markAttrs = trackedMark.attrs || {};
+    const date2 = markAttrs.date || new Date(Date.now()).toISOString().replace(/\.\d{3}Z$/, "Z");
+    const wrapperAttributes2 = {
+      ...markAttrs.id ? { "w:id": String(markAttrs.id) } : {},
+      ...markAttrs.author ? { "w:author": markAttrs.author } : {},
+      ...markAttrs.authorEmail ? { "w:authorEmail": markAttrs.authorEmail } : {},
+      "w:date": date2
+    };
+    return {
+      name: wrapperName2,
+      attributes: wrapperAttributes2,
+      elements: Array.isArray(commentSchema) ? commentSchema : [commentSchema]
+    };
+  }
+  if (!parentComment?.trackedChange) {
+    return commentSchema;
+  }
+  const trackedChangeType = parentComment.trackedChangeType;
+  const isReplace = trackedChangeType === "both";
+  const wrapperName = type === "commentRangeStart" ? "w:ins" : isReplace ? "w:del" : trackedChangeType === "trackDelete" ? "w:del" : "w:ins";
+  const createdTime = parentComment.createdTime || Date.now();
+  const date = new Date(createdTime).toISOString().replace(/\.\d{3}Z$/, "Z");
+  const wrapperAttributes = {
+    "w:id": String(parentComment.commentId),
+    ...parentComment.creatorName ? { "w:author": parentComment.creatorName } : {},
+    ...parentComment.creatorEmail ? { "w:authorEmail": parentComment.creatorEmail } : {},
+    "w:date": date
+  };
+  return {
+    name: wrapperName,
+    attributes: wrapperAttributes,
+    elements: Array.isArray(commentSchema) ? commentSchema : [commentSchema]
+  };
 };
 const getCommentSchema = (type, commentIndex) => {
   return {
@@ -29160,6 +29199,15 @@ function importCommentData({ docx, editor, converter }) {
   const nodeListHandler = defaultNodeListHandler();
   const comments = docx["word/comments.xml"];
   if (!comments) return;
+  const commentThreadingProfile = converter?.commentThreadingProfile || {
+    defaultStyle: docx["word/commentsExtended.xml"] ? "commentsExtended" : "range-based",
+    mixed: false,
+    fileSet: {
+      hasCommentsExtended: !!docx["word/commentsExtended.xml"],
+      hasCommentsExtensible: !!docx["word/commentsExtensible.xml"],
+      hasCommentsIds: !!docx["word/commentsIds.xml"]
+    }
+  };
   const { elements } = comments;
   if (!elements || !elements.length) return;
   const { elements: allComments = [] } = elements[0];
@@ -29187,8 +29235,7 @@ 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";
+    const threadingMethod = commentThreadingProfile.defaultStyle;
     return {
       commentId: internalId || v4(),
       importedId,
@@ -29206,21 +29253,45 @@ function importCommentData({ docx, editor, converter }) {
       isDone: false,
       origin: converter?.documentOrigin || "word",
       threadingMethod,
+      threadingStyleOverride: void 0,
       originalXmlStructure: {
-        hasCommentsExtended: !!commentsExtended,
-        hasCommentsExtensible: !!docx["word/commentsExtensible.xml"],
-        hasCommentsIds: !!docx["word/commentsIds.xml"]
+        ...commentThreadingProfile.fileSet
       }
     };
   });
-  const extendedComments = generateCommentsWithExtendedData({ docx, comments: extractedComments, converter });
+  const extendedComments = generateCommentsWithExtendedData({
+    docx,
+    comments: extractedComments,
+    converter,
+    threadingProfile: commentThreadingProfile
+  });
+  if (converter) {
+    const hasOverride = extendedComments.some(
+      (comment) => comment.threadingStyleOverride && comment.threadingStyleOverride !== commentThreadingProfile.defaultStyle
+    );
+    converter.commentThreadingProfile = {
+      ...commentThreadingProfile,
+      mixed: hasOverride || commentThreadingProfile.mixed
+    };
+  }
   return extendedComments;
 }
-const generateCommentsWithExtendedData = ({ docx, comments, converter }) => {
+const generateCommentsWithExtendedData = ({ docx, comments, converter, threadingProfile }) => {
   if (!comments?.length) return [];
   const rangeData = extractCommentRangesFromDocument(docx, converter);
   const { commentsInTrackedChanges } = rangeData;
   const trackedChangeParentMap = detectThreadingFromTrackedChanges(comments, commentsInTrackedChanges);
+  const rangeThreadedComments = detectThreadingFromRanges(comments, {
+    ...rangeData,
+    commentsInTrackedChanges: /* @__PURE__ */ new Map()
+  });
+  const commentIdSet = new Set(comments.map((comment) => comment.commentId));
+  const rangeParentMap = /* @__PURE__ */ new Map();
+  rangeThreadedComments.forEach((comment) => {
+    if (comment.parentCommentId && commentIdSet.has(comment.parentCommentId)) {
+      rangeParentMap.set(comment.commentId, comment.parentCommentId);
+    }
+  });
   const commentsExtended = docx["word/commentsExtended.xml"];
   if (!commentsExtended) {
     const commentsWithThreading = detectThreadingFromRanges(comments, rangeData);
@@ -29239,25 +29310,43 @@ const generateCommentsWithExtendedData = ({ docx, comments, converter }) => {
     });
     let isDone = comment.isDone ?? false;
     let parentCommentId = void 0;
+    let threadingParentCommentId = void 0;
+    let threadingStyleOverride = 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) {
+      if (details.paraIdParent) {
         const parentComment = comments.find(
           (c) => c.paraId === details.paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === details.paraIdParent)
         );
-        parentCommentId = parentComment?.commentId;
+        const rangeParent = rangeParentMap.get(comment.commentId);
+        if (parentComment?.trackedChange && rangeParent) {
+          threadingParentCommentId = rangeParent;
+        } else {
+          threadingParentCommentId = parentComment?.commentId;
+        }
+        if (!isInsideTrackedChange) {
+          parentCommentId = threadingParentCommentId;
+        }
       }
     }
     if (isInsideTrackedChange) {
       parentCommentId = trackedChangeParent.trackedChangeId;
     }
+    if (!parentCommentId && rangeParentMap.has(comment.commentId)) {
+      parentCommentId = rangeParentMap.get(comment.commentId);
+      if (threadingProfile?.defaultStyle === "commentsExtended") {
+        threadingStyleOverride = "range-based";
+      }
+    }
     return {
       ...comment,
       isDone,
-      parentCommentId
+      parentCommentId,
+      threadingStyleOverride,
+      threadingParentCommentId
     };
   });
 };
@@ -30133,12 +30222,27 @@ const detectDocumentOrigin = (docx) => {
   }
   return "unknown";
 };
+const detectCommentThreadingProfile = (docx) => {
+  const hasCommentsExtended = !!docx["word/commentsExtended.xml"];
+  const hasCommentsExtensible = !!docx["word/commentsExtensible.xml"];
+  const hasCommentsIds = !!docx["word/commentsIds.xml"];
+  return {
+    defaultStyle: hasCommentsExtended ? "commentsExtended" : "range-based",
+    mixed: false,
+    fileSet: {
+      hasCommentsExtended,
+      hasCommentsExtensible,
+      hasCommentsIds
+    }
+  };
+};
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
   if (!json) return null;
   if (converter) {
     importFootnotePropertiesFromSettings(docx, converter);
     converter.documentOrigin = detectDocumentOrigin(docx);
+    converter.commentThreadingProfile = detectCommentThreadingProfile(docx);
   }
   if (converter?.telemetry) {
     const files = Object.keys(docx).map((filePath) => {
@@ -32296,8 +32400,18 @@ const determineExportStrategy = (comments) => {
   }
   return "word";
 };
-const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, exportStrategy = "word") => {
-  const shouldGenerateCommentsExtended = exportStrategy === "word" || comments.some((c) => c.originalXmlStructure?.hasCommentsExtended);
+const resolveThreadingStyle = (comment, threadingProfile) => {
+  if (comment?.threadingStyleOverride) return comment.threadingStyleOverride;
+  if (threadingProfile?.defaultStyle) return threadingProfile.defaultStyle;
+  return comment?.originalXmlStructure?.hasCommentsExtended ? "commentsExtended" : "range-based";
+};
+const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, threadingProfile = null) => {
+  if (!commentsExtendedXml) {
+    return null;
+  }
+  const exportStrategy = typeof threadingProfile === "string" ? threadingProfile : "word";
+  const profile = typeof threadingProfile === "string" ? null : threadingProfile;
+  const shouldGenerateCommentsExtended = profile ? profile.defaultStyle === "commentsExtended" || profile.mixed || comments.some((comment) => resolveThreadingStyle(comment, profile) === "commentsExtended") : exportStrategy === "word" || comments.some((c) => c.originalXmlStructure?.hasCommentsExtended);
   if (!shouldGenerateCommentsExtended && exportStrategy === "google-docs") {
     return null;
   }
@@ -32308,10 +32422,12 @@ const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, exportStr
       "w15:paraId": comment.commentParaId,
       "w15:done": isResolved ? "1" : "0"
     };
-    const parentId = comment.parentCommentId;
-    if (parentId && (exportStrategy === "word" || comment.originalXmlStructure?.hasCommentsExtended)) {
+    const parentId = comment.threadingParentCommentId || comment.parentCommentId;
+    const threadingStyle = resolveThreadingStyle(comment, profile);
+    if (parentId && threadingStyle === "commentsExtended") {
       const parentComment = comments.find((c) => c.commentId === parentId);
-      if (parentComment && !parentComment.trackedChange) {
+      const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
+      if (parentComment && (allowTrackedParent || !parentComment.trackedChange)) {
         attributes["w15:paraIdParent"] = parentComment.commentParaId;
       }
     }
@@ -32355,12 +32471,15 @@ const updateCommentsIdsAndExtensible = (comments = [], commentsIds, extensible)
     extensibleUpdated
   };
 };
-const generateConvertedXmlWithCommentFiles = (convertedXml) => {
+const generateConvertedXmlWithCommentFiles = (convertedXml, fileSet = null) => {
   const newXml = carbonCopy(convertedXml);
   newXml["word/comments.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_XML_DEF;
-  newXml["word/commentsExtended.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENDED_XML_DEF;
-  newXml["word/commentsExtensible.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENSIBLE_XML_DEF;
-  newXml["word/commentsIds.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_IDS_XML_DEF;
+  const includeExtended = fileSet ? fileSet.hasCommentsExtended : true;
+  const includeExtensible = fileSet ? fileSet.hasCommentsExtensible : true;
+  const includeIds = fileSet ? fileSet.hasCommentsIds : true;
+  if (includeExtended) newXml["word/commentsExtended.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENDED_XML_DEF;
+  if (includeExtensible) newXml["word/commentsExtensible.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENSIBLE_XML_DEF;
+  if (includeIds) newXml["word/commentsIds.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_IDS_XML_DEF;
   newXml["[Content_Types].xml"] = COMMENTS_XML_DEFINITIONS.CONTENT_TYPES;
   return newXml;
 };
@@ -32377,20 +32496,26 @@ const generateRelationship = (target) => {
   const rel = relsDefault.find((rel2) => rel2.attributes.Target === target);
   return { ...rel };
 };
-const prepareCommentsXmlFilesForExport = ({ convertedXml, defs, commentsWithParaIds, exportType }) => {
+const prepareCommentsXmlFilesForExport = ({
+  convertedXml,
+  defs,
+  commentsWithParaIds,
+  exportType,
+  threadingProfile
+}) => {
   const relationships = [];
   if (exportType === "clean") {
     const documentXml = removeCommentsFilesFromConvertedXml(convertedXml);
     return { documentXml, relationships };
   }
   const exportStrategy = determineExportStrategy(commentsWithParaIds);
-  const updatedXml = generateConvertedXmlWithCommentFiles(convertedXml);
+  const updatedXml = generateConvertedXmlWithCommentFiles(convertedXml, threadingProfile?.fileSet);
   updatedXml["word/comments.xml"] = updateCommentsXml(defs, updatedXml["word/comments.xml"]);
   relationships.push(generateRelationship("comments.xml"));
   const commentsExtendedXml = updateCommentsExtendedXml(
     commentsWithParaIds,
     updatedXml["word/commentsExtended.xml"],
-    exportStrategy
+    threadingProfile || exportStrategy
   );
   if (commentsExtendedXml !== null) {
     updatedXml["word/commentsExtended.xml"] = commentsExtendedXml;
@@ -32398,15 +32523,17 @@ const prepareCommentsXmlFilesForExport = ({ convertedXml, defs, commentsWithPara
   } else {
     delete updatedXml["word/commentsExtended.xml"];
   }
-  const { documentIdsUpdated, extensibleUpdated } = updateCommentsIdsAndExtensible(
-    commentsWithParaIds,
-    updatedXml["word/commentsIds.xml"],
-    updatedXml["word/commentsExtensible.xml"]
-  );
-  updatedXml["word/commentsIds.xml"] = documentIdsUpdated;
-  updatedXml["word/commentsExtensible.xml"] = extensibleUpdated;
-  relationships.push(generateRelationship("commentsIds.xml"));
-  relationships.push(generateRelationship("commentsExtensible.xml"));
+  if (updatedXml["word/commentsIds.xml"] && updatedXml["word/commentsExtensible.xml"]) {
+    const { documentIdsUpdated, extensibleUpdated } = updateCommentsIdsAndExtensible(
+      commentsWithParaIds,
+      updatedXml["word/commentsIds.xml"],
+      updatedXml["word/commentsExtensible.xml"]
+    );
+    updatedXml["word/commentsIds.xml"] = documentIdsUpdated;
+    updatedXml["word/commentsExtensible.xml"] = extensibleUpdated;
+    relationships.push(generateRelationship("commentsIds.xml"));
+    relationships.push(generateRelationship("commentsExtensible.xml"));
+  }
   return {
     relationships,
     documentXml: updatedXml
@@ -32757,6 +32884,7 @@ class SuperConverter {
     this.footnotes = [];
     this.footnoteProperties = null;
     this.inlineDocumentFonts = [];
+    this.commentThreadingProfile = null;
     this.docHiglightColors = /* @__PURE__ */ new Set([]);
     this.xml = params?.xml;
     this.declaration = null;
@@ -33071,7 +33199,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.7.0-next.8") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.7.0-next.9") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**
@@ -33471,7 +33599,8 @@ class SuperConverter {
       exportType,
       convertedXml: this.convertedXml,
       defs,
-      commentsWithParaIds
+      commentsWithParaIds,
+      threadingProfile: this.commentThreadingProfile
     });
     return { documentXml, relationships };
   }