@superdoc-dev/cli 0.3.0-next.48 → 0.3.0-next.49

package/dist/index.js

@@ -39922,7 +39922,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter--IVMRugL.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DvkQFRg9.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -65485,6 +65485,7 @@ function importCommentData({ docx, editor, converter }) {
       const trackedChange = attributes["custom:trackedChange"] === "true";
       const trackedChangeType = attributes["custom:trackedChangeType"];
       const trackedChangeText = attributes["custom:trackedChangeText"] !== "null" ? attributes["custom:trackedChangeText"] : null;
+      const trackedChangeDisplayType = attributes["custom:trackedChangeDisplayType"] !== "null" ? attributes["custom:trackedChangeDisplayType"] : null;
       const trackedDeletedText = attributes["custom:trackedDeletedText"] !== "null" ? attributes["custom:trackedDeletedText"] : null;
       const unixTimestampMs = new Date(createdDate).getTime();
       const parsedElements = nodeListHandler.handler({
@@ -65510,6 +65511,7 @@ function importCommentData({ docx, editor, converter }) {
         trackedChange,
         trackedChangeText,
         trackedChangeType,
+        trackedChangeDisplayType,
         trackedDeletedText,
         isDone: false,
         origin: converter?.documentOrigin || "word",
@@ -72182,7 +72184,7 @@ var isRegExp = (value) => {
   return true;
 }, areAttrsEqual = (attrsA = {}, attrsB = {}) => {
   return objectIncludes(attrsA, attrsB);
-}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TABLE_STYLE_ID_TABLE_GRID = "TableGrid", TABLE_FALLBACK_BORDER, TABLE_FALLBACK_BORDERS, TABLE_FALLBACK_CELL_PADDING, DEFAULT_TBL_LOOK, CNF_STYLE_MAP, TABLE_STYLE_PRECEDENCE, getToCssFontFamily = () => {
+}, TrackInsertMarkName = "trackInsert", TrackDeleteMarkName = "trackDelete", TrackFormatMarkName = "trackFormat", TrackedFormatMarkNames, TABLE_STYLE_ID_TABLE_GRID = "TableGrid", TABLE_FALLBACK_BORDER, TABLE_FALLBACK_BORDERS, TABLE_FALLBACK_CELL_PADDING, DEFAULT_TBL_LOOK, CNF_STYLE_MAP, TABLE_STYLE_PRECEDENCE, getToCssFontFamily = () => {
   return SuperConverter.toCssFontFamily;
 }, SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65, getSpacingStyle = (spacing, isListItem$1) => {
   let { before, after, line, lineRule, beforeAutospacing, afterAutospacing } = spacing;
@@ -85455,6 +85457,7 @@ var isRegExp = (value) => {
     "custom:trackedChange": comment.trackedChange,
     "custom:trackedChangeText": comment.trackedChangeText || null,
     "custom:trackedChangeType": comment.trackedChangeType,
+    "custom:trackedChangeDisplayType": comment.trackedChangeDisplayType || null,
     "custom:trackedDeletedText": comment.deletedText || null
   };
   if (comment?.parentCommentId) {
@@ -85501,6 +85504,7 @@ var isRegExp = (value) => {
       "custom:trackedChange": commentDef.attributes["custom:trackedChange"],
       "custom:trackedChangeText": commentDef.attributes["custom:trackedChangeText"],
       "custom:trackedChangeType": commentDef.attributes["custom:trackedChangeType"],
+      "custom:trackedChangeDisplayType": commentDef.attributes["custom:trackedChangeDisplayType"],
       "custom:trackedDeletedText": commentDef.attributes["custom:trackedDeletedText"],
       "xmlns:custom": "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     };
@@ -86021,7 +86025,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_IVMRugL_es = __esm(() => {
+var init_SuperConverter_DvkQFRg9_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -100512,6 +100516,15 @@ var init_SuperConverter_IVMRugL_es = __esm(() => {
     attributes: attributes_default$6
   };
   translator$3 = NodeTranslator.from(config$36);
+  TrackedFormatMarkNames = [
+    "bold",
+    "italic",
+    "strike",
+    "underline",
+    "textStyle",
+    "highlight",
+    "link"
+  ];
   TABLE_FALLBACK_BORDER = {
     val: "single",
     size: 4,
@@ -148837,7 +148850,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-C9IXXt7g.es.js
+// ../../packages/superdoc/dist/chunks/src-BeJRbQ1S.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -207989,6 +208002,102 @@ var Node$13 = class Node$14 {
   if (isActive$1 && activeOverride)
     return activeOverride;
   return applyAlphaToHex(baseColor, clampOpacity(isActive$1 ? highlightOpacity.active : highlightOpacity.inactive) ?? (isActive$1 ? DEFAULT_ACTIVE_ALPHA : DEFAULT_INACTIVE_ALPHA));
+}, HyperlinkAddedDisplayType = "hyperlinkAdded", HyperlinkModifiedDisplayType = "hyperlinkModified", getMarkSnapshots = (attrs = {}) => {
+  return {
+    before: Array.isArray(attrs.before) ? attrs.before : [],
+    after: Array.isArray(attrs.after) ? attrs.after : []
+  };
+}, findSnapshotByType = (snapshots, type) => {
+  return snapshots.find((snapshot2) => snapshot2?.type === type) ?? null;
+}, getNodeText = (nodes = []) => {
+  return nodes.map((node3) => node3?.text || node3?.textContent || "").join("").trim();
+}, getHyperlinkTarget = (linkSnapshot) => {
+  const href = linkSnapshot?.attrs?.href;
+  if (typeof href === "string" && href.trim().length > 0)
+    return href.trim();
+  const anchor = linkSnapshot?.attrs?.anchor;
+  if (typeof anchor === "string" && anchor.trim().length > 0)
+    return `#${anchor.trim()}`;
+  return null;
+}, getLiveLinkMark = (nodes = []) => {
+  for (const node3 of nodes) {
+    const linkMark = node3?.marks?.find((mark2) => mark2?.type?.name === "link");
+    if (linkMark)
+      return linkMark;
+  }
+  return null;
+}, getHyperlinkLabel = ({ linkSnapshot, nodes }) => {
+  return getHyperlinkTarget(linkSnapshot) || (typeof linkSnapshot?.attrs?.text === "string" && linkSnapshot.attrs.text.trim().length > 0 ? linkSnapshot.attrs.text.trim() : null) || getNodeText(nodes);
+}, getAddedMarkTypes = ({ before, after }) => {
+  const beforeTypes = new Set(before.map((snapshot2) => snapshot2?.type).filter(Boolean));
+  return [...new Set(after.map((snapshot2) => snapshot2?.type).filter(Boolean))].filter((type) => !beforeTypes.has(type));
+}, getRemovedMarkTypes = ({ before, after }) => {
+  const beforeTypes = new Set(before.map((snapshot2) => snapshot2?.type).filter(Boolean));
+  const afterTypes = new Set(after.map((snapshot2) => snapshot2?.type).filter(Boolean));
+  return [...beforeTypes].filter((type) => !afterTypes.has(type));
+}, isUnderlineOnlyFormatDelta = ({ before, after }) => {
+  const addedTypes = getAddedMarkTypes({
+    before,
+    after
+  });
+  return getRemovedMarkTypes({
+    before,
+    after
+  }).length === 0 && addedTypes.length === 1 && addedTypes[0] === "underline";
+}, snapshotAttrsEqual = (a2, b$1) => {
+  if (a2 === b$1)
+    return true;
+  if (!a2 || !b$1)
+    return false;
+  const keysA = Object.keys(a2);
+  const keysB = Object.keys(b$1);
+  if (keysA.length !== keysB.length)
+    return false;
+  return keysA.every((key$1) => {
+    const valA = a2[key$1];
+    const valB = b$1[key$1];
+    if (valA == null && valB == null)
+      return true;
+    return valA === valB;
+  });
+}, resolveTrackedFormatDisplay = ({ attrs = {}, nodes = [] }) => {
+  const { before, after } = getMarkSnapshots(attrs);
+  const beforeLink = findSnapshotByType(before, "link");
+  const afterLink = findSnapshotByType(after, "link");
+  const inferredLiveLink = !beforeLink && !afterLink && isUnderlineOnlyFormatDelta({
+    before,
+    after
+  }) ? getLiveLinkMark(nodes) : null;
+  const addedLink = afterLink || inferredLiveLink;
+  if (beforeLink && addedLink) {
+    if (snapshotAttrsEqual(beforeLink.attrs, addedLink.attrs))
+      return {
+        trackedChangeDisplayType: null,
+        trackedChangeText: ""
+      };
+    const trackedChangeText$1 = getHyperlinkLabel({
+      linkSnapshot: addedLink,
+      nodes
+    });
+    if (!trackedChangeText$1)
+      return null;
+    return {
+      trackedChangeDisplayType: HyperlinkModifiedDisplayType,
+      trackedChangeText: trackedChangeText$1
+    };
+  }
+  if (!addedLink)
+    return null;
+  const trackedChangeText = getHyperlinkLabel({
+    linkSnapshot: addedLink,
+    nodes
+  });
+  if (!trackedChangeText)
+    return null;
+  return {
+    trackedChangeDisplayType: HyperlinkAddedDisplayType,
+    trackedChangeText
+  };
 }, normalizeCommentEventPayload = ({ conversation, editorOptions, fallbackCommentId, fallbackInternal }) => {
   const { user, documentId } = editorOptions || {};
   const normalized = {
@@ -208220,6 +208329,7 @@ var Node$13 = class Node$14 {
 }, getTrackedChangeText = ({ nodes, mark: mark2, trackedChangeType, isDeletionInsertion }) => {
   let trackedChangeText = "";
   let deletionText = "";
+  let trackedChangeDisplayType = null;
   if (trackedChangeType === "trackDelete" || isDeletionInsertion)
     deletionText = nodes.reduce((acc, node3) => {
       if (!node3.marks.find((nodeMark) => nodeMark.type.name === "trackDelete"))
@@ -208236,27 +208346,43 @@ var Node$13 = class Node$14 {
       acc += nodeText;
       return acc;
     }, "");
-  if (trackedChangeType === "trackFormat")
-    trackedChangeText = translateFormatChangesToEnglish(normalizeFormatAttrsForCommentText(mark2.attrs, nodes));
+  if (trackedChangeType === "trackFormat") {
+    const normalizedFormatAttrs = normalizeFormatAttrsForCommentText(mark2.attrs, nodes);
+    const trackedFormatDisplay = resolveTrackedFormatDisplay({
+      attrs: normalizedFormatAttrs,
+      nodes
+    });
+    if (trackedFormatDisplay) {
+      trackedChangeText = trackedFormatDisplay.trackedChangeText;
+      trackedChangeDisplayType = trackedFormatDisplay.trackedChangeDisplayType;
+    } else
+      trackedChangeText = translateFormatChangesToEnglish(normalizedFormatAttrs);
+  }
   return {
     deletionText,
-    trackedChangeText
+    trackedChangeText,
+    trackedChangeDisplayType
   };
 }, createOrUpdateTrackedChangeComment = ({ event, marks, deletionNodes, nodes, newEditorState, documentId, trackedChangesForId }) => {
-  const trackedMark = marks.insertedMark || marks.deletionMark || marks.formatMark;
+  const node3 = nodes[0];
+  const fallbackTrackedMark = marks.insertedMark || marks.deletionMark || marks.formatMark;
+  if (!fallbackTrackedMark)
+    return;
+  const fallbackTrackedMarkId = fallbackTrackedMark.attrs?.id;
+  const trackedChangesWithId = trackedChangesForId || getTrackChanges(newEditorState, fallbackTrackedMarkId);
+  const liveFormatMark = trackedChangesWithId.find(({ mark: mark2 }) => mark2.type.name === "trackFormat")?.mark ?? null;
+  const trackedMark = marks.insertedMark || marks.deletionMark || liveFormatMark || marks.formatMark;
   const { type, attrs } = trackedMark;
   const { name: trackedChangeType } = type;
   const { author, authorEmail, authorImage, date, importedAuthor } = attrs;
   const id2 = attrs.id;
-  const node3 = nodes[0];
-  const trackedChangesWithId = trackedChangesForId || getTrackChanges(newEditorState, id2);
   let isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
   if (!isDeletionInsertion) {
     const hasInsertMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackInsertMarkName);
     const hasDeleteMark = trackedChangesWithId.some(({ mark: mark2 }) => mark2.type.name === TrackDeleteMarkName);
     isDeletionInsertion = hasInsertMark && hasDeleteMark;
   }
-  let nodesWithMark = [];
+  const nodesWithMark = [];
   trackedChangesWithId.forEach(({ from: from$1, to }) => {
     newEditorState.doc.nodesBetween(from$1, to, (node$1) => {
       if (node$1.isText) {
@@ -208277,8 +208403,7 @@ var Node$13 = class Node$14 {
     nodesToUse = nodesWithMark.length ? nodesWithMark : node3 ? [node3] : [];
   if (!nodesToUse.length)
     return;
-  const { deletionText, trackedChangeText } = getTrackedChangeText({
-    state: newEditorState,
+  const { deletionText, trackedChangeText, trackedChangeDisplayType } = getTrackedChangeText({
     nodes: nodesToUse,
     mark: trackedMark,
     trackedChangeType,
@@ -208294,6 +208419,7 @@ var Node$13 = class Node$14 {
     changeId: id2,
     trackedChangeType: isDeletionInsertion ? "both" : trackedChangeType,
     trackedChangeText,
+    trackedChangeDisplayType,
     deletedText: marks.deletionMark ? deletionText : null,
     author,
     authorEmail,
@@ -208626,14 +208752,7 @@ var Node$13 = class Node$14 {
     const existingChangeMark = liveMarks.find((mark2) => [TrackDeleteMarkName, TrackFormatMarkName].includes(mark2.type.name));
     const wid = existingChangeMark ? existingChangeMark.attrs.id : sharedWid ?? (sharedWid = v4_default());
     newTr.addMark(Math.max(step3.from, pos), Math.min(step3.to, pos + node3.nodeSize), step3.mark);
-    if ([
-      "bold",
-      "italic",
-      "strike",
-      "underline",
-      "textStyle",
-      "highlight"
-    ].includes(step3.mark.type.name) && !hasMatchingMark(liveMarks, step3.mark)) {
+    if (TrackedFormatMarkNames.includes(step3.mark.type.name) && !hasMatchingMark(liveMarks, step3.mark)) {
       const formatChangeMark = liveMarks.find((mark2) => mark2.type.name === TrackFormatMarkName);
       let after = [];
       let before = [];
@@ -208699,14 +208818,7 @@ var Node$13 = class Node$14 {
       to: rangeTo
     });
     newTr.removeMark(Math.max(step3.from, pos), Math.min(step3.to, pos + node3.nodeSize), step3.mark);
-    if ([
-      "bold",
-      "italic",
-      "strike",
-      "underline",
-      "textStyle",
-      "highlight"
-    ].includes(step3.mark.type.name) && hasMatchingMark(liveMarksBeforeRemove, step3.mark)) {
+    if (TrackedFormatMarkNames.includes(step3.mark.type.name) && hasMatchingMark(liveMarksBeforeRemove, step3.mark)) {
       const formatChangeMark = liveMarksBeforeRemove.find((mark2) => mark2.type.name === TrackFormatMarkName);
       let after = [];
       let before = [];
@@ -229174,9 +229286,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_C9IXXt7g_es = __esm(() => {
+var init_src_BeJRbQ1S_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_IVMRugL_es();
+  init_SuperConverter_DvkQFRg9_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -262537,8 +262649,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_C9IXXt7g_es();
-  init_SuperConverter_IVMRugL_es();
+  init_src_BeJRbQ1S_es();
+  init_SuperConverter_DvkQFRg9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.48",
+  "version": "0.3.0-next.49",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -30,11 +30,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.48",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.48",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.48",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.48",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.48"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.49",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.49",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.49",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.49",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.49"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",