@ansonlai/docx-redline-js 0.5.3 → 0.5.4

package/dist/docx-redline-js.esm.js

@@ -1,4 +1,4 @@
-// @ansonlai/docx-redline-js v0.5.3 — https://github.com/AnsonLai/docx-redline-js
+// @ansonlai/docx-redline-js v0.5.4 — https://github.com/AnsonLai/docx-redline-js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -2634,6 +2634,10 @@ function computeWordDiffs(originalText, newText, options = {}) {
   }
   return decodeBmpDiffs(charDiffs, wordArray);
 }
+function computeCharacterDiffs(originalText, newText, options = {}) {
+  if (originalText === newText) return [[0, originalText]];
+  return createDiffEngine(options).diff_main(originalText, newText);
+}
 function computeInsertionOnlyDiffs(originalText, newText) {
   if (originalText === newText) return [[0, originalText]];
   if (!originalText) return [[1, newText]];
@@ -5713,7 +5717,7 @@ function getParagraphId(paragraph) {
 
 // engine/surgical-spans.js
 function getRunChildText(child) {
-  if (isWordElement(child, "t")) return child.textContent || "";
+  if (isWordElement(child, "t") || isWordElement(child, "delText")) return child.textContent || "";
   if (isWordElement(child, "br") || isWordElement(child, "cr")) return "\n";
   if (isWordElement(child, "tab")) return "	";
   if (isWordElement(child, "noBreakHyphen")) return "\u2011";
@@ -5721,7 +5725,7 @@ function getRunChildText(child) {
   return "";
 }
 function isTextLikeRunChild(child) {
-  return isWordElement(child, "t") || isWordElement(child, "br") || isWordElement(child, "cr") || isWordElement(child, "tab") || isWordElement(child, "noBreakHyphen") || isWordElement(child, "softHyphen");
+  return isWordElement(child, "t") || isWordElement(child, "delText") || isWordElement(child, "br") || isWordElement(child, "cr") || isWordElement(child, "tab") || isWordElement(child, "noBreakHyphen") || isWordElement(child, "softHyphen");
 }
 function buildSurgicalTextSpans(paragraphs) {
   let fullText = "";
@@ -5904,12 +5908,13 @@ function refreshRunPropertyChangeIds(root, allocator = null) {
     } else {
       node.setAttribute("w:id", nextId);
     }
+    resolvedAllocator._receiptCollector?.recordRevision(Number(nextId), "rPrChange");
   }
   return root;
 }
 
 // engine/surgical-run-splitting.js
-var TRACK_CHANGE_CARRIERS = /* @__PURE__ */ new Set(["ins"]);
+var TRACK_CHANGE_CARRIERS = /* @__PURE__ */ new Set(["ins", "del"]);
 function getRunContentPieces(runElement) {
   const pieces = [];
   let offset = 0;
@@ -5961,7 +5966,7 @@ function insertRunPiecesBefore(xmlDoc, parent, referenceNode, pieces, rPr) {
 function splitTrackChangeCarrier(xmlDoc, carrierElement, splitOffset, allocator = null) {
   const carrierName = getLocalName(carrierElement);
   if (!TRACK_CHANGE_CARRIERS.has(carrierName)) {
-    throw new TypeError("splitTrackChangeCarrier requires a w:ins carrier.");
+    throw new TypeError("splitTrackChangeCarrier requires a w:ins or w:del carrier.");
   }
   if (!Number.isInteger(splitOffset) || splitOffset < 0) {
     throw new RangeError("splitOffset must be a non-negative integer.");
@@ -5998,16 +6003,17 @@ function splitTrackChangeCarrier(xmlDoc, carrierElement, splitOffset, allocator
     } else {
       const localOffset = splitOffset - offset;
       const rPr = Array.from(child.childNodes || []).find((node) => isWordElement(node, "rPr")) || null;
-      const leftPieces = sliceRunPieces(xmlDoc, pieces, 0, localOffset, false);
-      const rightPieces = sliceRunPieces(xmlDoc, pieces, localOffset, runLength, false);
+      const asDeletedText = carrierName === "del";
+      const leftPieces = sliceRunPieces(xmlDoc, pieces, 0, localOffset, asDeletedText);
+      const rightPieces = sliceRunPieces(xmlDoc, pieces, localOffset, runLength, asDeletedText);
       leftCarrier.appendChild(createRunFromPieces(xmlDoc, leftPieces, rPr));
       const rightRun = createRunFromPieces(xmlDoc, rightPieces, rPr);
-      refreshRunPropertyChangeIds(rightRun, resolveAllocator(xmlDoc, allocator));
       rightCarrier.appendChild(rightRun);
     }
     offset = runEnd;
   }
   const resolvedAllocator = resolveAllocator(xmlDoc, allocator);
+  refreshRunPropertyChangeIds(rightCarrier, resolvedAllocator);
   const nextId = resolvedAllocator.next();
   setWordAttribute(rightCarrier, "id", String(nextId));
   resolvedAllocator._receiptCollector?.recordRevision(nextId, carrierName);
@@ -6027,7 +6033,7 @@ function getLocalName(element) {
   return String(element?.localName || element?.nodeName || "").replace(/^.*:/, "");
 }
 function cloneRunPiece(xmlDoc, sourceNode, text, asDeletedText) {
-  if (asDeletedText) {
+  if (asDeletedText && (isWordElement(sourceNode, "delText") || isWordElement(sourceNode, "t"))) {
     const delText = createWordElement(xmlDoc, "w:delText");
     delText.setAttribute("xml:space", "preserve");
     delText.textContent = text;
@@ -6050,6 +6056,15 @@ function cloneRunPiece(xmlDoc, sourceNode, text, asDeletedText) {
   if (text === "\u2011" && isWordElement(sourceNode, "noBreakHyphen")) {
     return sourceNode.cloneNode(true);
   }
+  if (text === "\xAD" && isWordElement(sourceNode, "softHyphen")) {
+    return sourceNode.cloneNode(true);
+  }
+  if (asDeletedText) {
+    const delText = createWordElement(xmlDoc, "w:delText");
+    delText.setAttribute("xml:space", "preserve");
+    delText.textContent = text;
+    return delText;
+  }
   const textNode = createWordElement(xmlDoc, "w:t");
   textNode.setAttribute("xml:space", "preserve");
   textNode.textContent = text;
@@ -6584,7 +6599,10 @@ function applySurgicalMode(xmlDoc, originalText, modifiedText, serializer, autho
   const allParagraphs = targetParagraph ? [targetParagraph] : getDocumentParagraphs(xmlDoc);
   const { fullText, textSpans } = buildSurgicalTextSpans(allParagraphs);
   const insertionOnlyDiffs = options.existingRevisions === "slice-cross-author" ? computeInsertionOnlyDiffs(fullText, modifiedText) : null;
-  const diffs = insertionOnlyDiffs || computeWordDiffs(fullText, modifiedText, diffOptions);
+  const diffs = insertionOnlyDiffs || refineSpaceEquivalentReplacements(
+    computeWordDiffs(fullText, modifiedText, diffOptions),
+    diffOptions
+  );
   const spanIndex = buildSpanIndex(textSpans);
   const pairReplacements = options.pairReplacements === true;
   const warnings = [];
@@ -6622,6 +6640,82 @@ function applySurgicalMode(xmlDoc, originalText, modifiedText, serializer, autho
       }
       if (insertResult === true) hasChanges = true;
     }
+  } else if (formatHints.length === 0) {
+    const editOperations = collectTextEditOperations(diffs);
+    for (const operation of editOperations.reverse()) {
+      const liveSpanIndex = buildSpanIndex(buildSurgicalTextSpans(allParagraphs).textSpans);
+      if (operation.type === "insert") {
+        const inserted = processInsert(
+          xmlDoc,
+          liveSpanIndex,
+          operation.start,
+          operation.text.replace(/\n/g, " "),
+          author,
+          formatHints,
+          operation.newPos,
+          generateRedlines,
+          allParagraphs[0] || null,
+          null,
+          options?.insertionAffinity || null,
+          options?.existingRevisions || "merge-same-author"
+        );
+        if (inserted && typeof inserted === "object" && inserted.error) {
+          return withOoxmlSourceType({
+            oxml: serializer.serializeToString(xmlDoc),
+            hasChanges: false,
+            status: "error",
+            error: inserted.error
+          });
+        }
+        if (inserted === true) hasChanges = true;
+        continue;
+      }
+      let delMetadata = null;
+      let insMetadata = null;
+      if (operation.type === "replace" && pairReplacements && generateRedlines && operation.text.replace(/\n/g, " ")) {
+        const checkResult = checkSafeAdjacencyForPairing(
+          liveSpanIndex,
+          operation.start,
+          operation.end,
+          options?.existingRevisions === "slice-cross-author"
+        );
+        if (checkResult.safe) {
+          const event = createReplacementRevisionEvent(author, xmlDoc);
+          delMetadata = { id: event.deletionId, author: event.author, date: event.date };
+          insMetadata = { id: event.insertionId, author: event.author, date: event.date };
+        } else if (checkResult.structuralBoundary) {
+          warnings.push("PAIRING_SKIPPED_STRUCTURAL_BOUNDARY");
+        }
+      }
+      if (processDelete(xmlDoc, liveSpanIndex, operation.start, operation.end, author, generateRedlines, delMetadata)) {
+        hasChanges = true;
+      }
+      if (operation.type === "replace") {
+        const inserted = processInsert(
+          xmlDoc,
+          liveSpanIndex,
+          operation.end,
+          operation.text.replace(/\n/g, " "),
+          author,
+          formatHints,
+          operation.newPos,
+          generateRedlines,
+          allParagraphs[0] || null,
+          insMetadata,
+          options?.insertionAffinity || null,
+          options?.existingRevisions || "merge-same-author"
+        );
+        if (inserted && typeof inserted === "object" && inserted.error) {
+          return withOoxmlSourceType({
+            oxml: serializer.serializeToString(xmlDoc),
+            hasChanges: false,
+            status: "error",
+            error: inserted.error
+          });
+        }
+        if (inserted === true) hasChanges = true;
+      }
+    }
   } else {
     for (let i = 0; i < diffs.length; i++) {
       const [op, text] = diffs[i];
@@ -6725,7 +6819,9 @@ function applySurgicalMode(xmlDoc, originalText, modifiedText, serializer, autho
         message: "Generated OOXML accepted-view text does not match the requested modified text; the mutation was rejected.",
         mismatchOffset,
         expectedExcerpt: excerptAt(expectedText, mismatchOffset),
-        actualExcerpt: excerptAt(actualText, mismatchOffset)
+        actualExcerpt: excerptAt(actualText, mismatchOffset),
+        expectedCodePoint: codePointAtOffset(expectedText, mismatchOffset),
+        actualCodePoint: codePointAtOffset(actualText, mismatchOffset)
       },
       ...warnings.length > 0 ? { warnings: [...new Set(warnings)] } : {}
     });
@@ -6748,6 +6844,59 @@ function excerptAt(text, offset, radius = 40) {
   const end = Math.min(text.length, offset + radius);
   return text.slice(start, end);
 }
+function codePointAtOffset(text, offset) {
+  if (offset >= text.length) return "END";
+  return `U+${text.codePointAt(offset).toString(16).toUpperCase().padStart(4, "0")}`;
+}
+function refineSpaceEquivalentReplacements(diffs, diffOptions) {
+  const refined = [];
+  for (let index = 0; index < diffs.length; index++) {
+    const [op, text] = diffs[index];
+    const next = diffs[index + 1];
+    if (op === -1 && next?.[0] === 1 && text !== next[1] && text.length === next[1].length && text.replace(/\u00a0/g, " ") === next[1].replace(/\u00a0/g, " ")) {
+      refined.push(...computeCharacterDiffs(text, next[1], diffOptions));
+      index++;
+      continue;
+    }
+    refined.push([op, text]);
+  }
+  return refined;
+}
+function collectTextEditOperations(diffs) {
+  const operations = [];
+  let originalPos = 0;
+  let newPos = 0;
+  for (let index = 0; index < diffs.length; index++) {
+    const [op, text] = diffs[index];
+    if (op === 0) {
+      originalPos += text.length;
+      newPos += text.length;
+      continue;
+    }
+    if (op === -1) {
+      const next = diffs[index + 1];
+      if (next?.[0] === 1) {
+        operations.push({
+          type: "replace",
+          start: originalPos,
+          end: originalPos + text.length,
+          newPos,
+          text: next[1]
+        });
+        originalPos += text.length;
+        newPos += next[1].length;
+        index++;
+      } else {
+        operations.push({ type: "delete", start: originalPos, end: originalPos + text.length, newPos, text: "" });
+        originalPos += text.length;
+      }
+      continue;
+    }
+    operations.push({ type: "insert", start: originalPos, end: originalPos, newPos, text });
+    newPos += text.length;
+  }
+  return operations;
+}
 function collectInsertionOperations(diffs) {
   const operations = [];
   let originalPos = 0;
@@ -10140,11 +10289,12 @@ function parseOoxmlForValidation(oxml) {
 function validateRedlineOoxml(oxml) {
   const issues = [];
   const addIssue = (code, severity, message) => issues.push({ code, severity, message });
-  if (typeof oxml !== "string" || oxml.trim() === "") {
-    addIssue("PARSE_ERROR", "error", "Input is not a non-empty OOXML string.");
+  const isDomNode = oxml && typeof oxml === "object" && (oxml.nodeType === 9 || oxml.nodeType === 1);
+  if (!isDomNode && (typeof oxml !== "string" || oxml.trim() === "")) {
+    addIssue("PARSE_ERROR", "error", "Input is not non-empty OOXML or a parsed XML DOM.");
     return { valid: false, issues };
   }
-  const { doc, error: error2 } = parseOoxmlForValidation(oxml);
+  const { doc, error: error2 } = isDomNode ? { doc: oxml.nodeType === 9 ? oxml : oxml.ownerDocument } : parseOoxmlForValidation(oxml);
   if (!doc) {
     addIssue("PARSE_ERROR", "error", `OOXML does not parse as XML: ${error2}`);
     return { valid: false, issues };