@ansonlai/docx-redline-js 0.5.0 → 0.5.2

package/services/document-operation-mutations.js

@@ -860,11 +860,11 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
         && existingPolicy !== 'accept-all-first'
         && existingPolicy !== 'accept-all-first-keep-normalized'
     ) {
-        if (existingPolicy === 'merge-same-author') {
+        if (existingPolicy === 'merge-same-author' || existingPolicy === 'slice-cross-author') {
             const authors = getTrackedChangeAuthors(targetParagraph);
             const opAuthor = String(author || '').trim().toLowerCase();
             const allSame = authors.length > 0 && authors.every(a => a.trim().toLowerCase() === opAuthor);
-            if (!allSame) {
+            if (!allSame && existingPolicy === 'merge-same-author') {
                 return {
                     documentXml,
                     hasChanges: false,
@@ -876,7 +876,7 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
                     }
                 };
             }
-            const mergeCommentIds = getCommentIdsInElement(targetParagraph);
+            const mergeCommentIds = allSame ? getCommentIdsInElement(targetParagraph) : [];
             if (mergeCommentIds.length > 0) {
                 const comments = commentDetailsForIds(mergeCommentIds, options._existingCommentDetails);
                 return {
@@ -892,6 +892,22 @@ export async function applyToParagraphByExactText(documentXml, targetText, modif
                     }
                 };
             }
+            if (!allSame) {
+                const hasMove = targetParagraph.getElementsByTagNameNS(NS_W, 'moveFrom').length > 0
+                    || targetParagraph.getElementsByTagNameNS(NS_W, 'moveTo').length > 0;
+                if (hasMove) {
+                    return {
+                        documentXml,
+                        hasChanges: false,
+                        numberingXml: null,
+                        status: 'error',
+                        error: {
+                            code: 'UNSAFE_REVISION_NESTING',
+                            message: 'Cross-author slicing does not support pending move revisions.'
+                        }
+                    };
+                }
+            }
         } else {
             const hasDel = targetParagraph.getElementsByTagNameNS(NS_W, 'del').length > 0;
             const hasMove = targetParagraph.getElementsByTagNameNS(NS_W, 'moveFrom').length > 0

package/services/operation-preflight.js

@@ -18,8 +18,9 @@ import {
     validateParagraphBoundaryMutation
 } from '../core/paragraph-targeting.js';
 import { createParagraphTextIndex, resolveTextInParagraphIndex } from './comment-locator.js';
-import {
-    normalizeDocumentOperation,
+import {
+    isExistingRevisionsPolicy,
+    normalizeDocumentOperation,
     resolveDocumentOperationAuthor,
     validateDocumentOperation
 } from './document-operation-contract.js';
@@ -79,8 +80,22 @@ function getCommentIdsInParagraph(paragraph) {
     return Array.from(ids).sort((a, b) => Number(a) - Number(b) || a.localeCompare(b));
 }
 
-export function preflightOperations(documentXml, operations, author, options = {}) {
-    const parsed = parseOoxmlSafe(documentXml, 'application/xml');
+export function preflightOperations(documentXml, operations, author, options = {}) {
+    if (options.existingRevisions != null && !isExistingRevisionsPolicy(options.existingRevisions)) {
+        return {
+            valid: false,
+            status: 'error',
+            error: {
+                code: 'INVALID_OPERATION',
+                message: `Unsupported existingRevisions policy: "${String(options.existingRevisions)}".`
+            },
+            results: [],
+            conflicts: [],
+            authorsUsed: [],
+            requiredArtifacts: { comments: false, numbering: false }
+        };
+    }
+    const parsed = parseOoxmlSafe(documentXml, 'application/xml');
     if (parsed.error || !parsed.doc) {
         return {
             valid: false,
@@ -228,16 +243,16 @@ export function preflightOperations(documentXml, operations, author, options = {
                 && existingPolicy !== 'accept-all-first'
                 && existingPolicy !== 'accept-all-first-keep-normalized'
             ) {
-                if (existingPolicy === 'merge-same-author') {
+                if (existingPolicy === 'merge-same-author' || existingPolicy === 'slice-cross-author') {
                     const authors = getTrackedChangeAuthors(paragraph);
                     const opAuthor = String(authorUsed || '').trim().toLowerCase();
                     const allSame = authors.length > 0 && authors.every(a => a.trim().toLowerCase() === opAuthor);
-                    if (!allSame) {
-                        error = {
+                    if (!allSame && existingPolicy === 'merge-same-author') {
+                        error = {
                             code: 'EXISTING_REVISIONS',
                             message: `Target paragraph contains tracked changes from another author (${authors.length ? authors.join(', ') : 'unattributed'}). Pass existingRevisions: "accept-all-first" or resolve revisions first.`
                         };
-                    } else {
+                    } else if (allSame) {
                         const mergeCommentIds = getCommentIdsInParagraph(paragraph);
                         if (mergeCommentIds.length > 0) {
                             const comments = mergeCommentIds
@@ -250,6 +265,15 @@ export function preflightOperations(documentXml, operations, author, options = {
                                 ...(comments.length > 0 ? { comments } : {})
                             };
                         }
+                    } else {
+                        const hasMove = paragraph.getElementsByTagNameNS(NS_W, 'moveFrom').length > 0
+                            || paragraph.getElementsByTagNameNS(NS_W, 'moveTo').length > 0;
+                        if (hasMove) {
+                            error = {
+                                code: 'UNSAFE_REVISION_NESTING',
+                                message: 'Cross-author slicing does not support pending move revisions.'
+                            };
+                        }
                     }
                 } else {
                     const hasDel = paragraph.getElementsByTagNameNS(NS_W, 'del').length > 0;

package/services/revision-comment-management.js

@@ -113,6 +113,44 @@ function unwrapNode(node) {
     return true;
 }
 
+function nextElementSibling(node) {
+    let sibling = node?.nextSibling || null;
+    while (sibling && sibling.nodeType !== 1) sibling = sibling.nextSibling;
+    return sibling;
+}
+
+function revisionMetadataWithoutId(node) {
+    return Array.from(node?.attributes || [])
+        .filter(attribute => String(attribute.localName || attribute.name || '').toLowerCase() !== 'id')
+        .map(attribute => `${attribute.namespaceURI || ''}|${attribute.localName || attribute.name}=${attribute.value}`)
+        .sort()
+        .join('\n');
+}
+
+function coalesceAdjacentCompatibleInsertions(xmlDoc) {
+    let coalesced = 0;
+    const insertions = getWordElementsByLocalName(xmlDoc, 'ins');
+
+    for (const insertion of insertions) {
+        if (!insertion.parentNode || isParagraphMarkRevisionMarker(insertion)) continue;
+        let sibling = nextElementSibling(insertion);
+        while (
+            isWordElement(sibling, 'ins')
+            && normalizeAuthor(getAttributeByLocalName(sibling, 'author'))
+                === normalizeAuthor(getAttributeByLocalName(insertion, 'author'))
+            && revisionMetadataWithoutId(sibling) === revisionMetadataWithoutId(insertion)
+        ) {
+            const next = nextElementSibling(sibling);
+            while (sibling.firstChild) insertion.appendChild(sibling.firstChild);
+            sibling.parentNode?.removeChild(sibling);
+            coalesced += 1;
+            sibling = next;
+        }
+    }
+
+    return coalesced;
+}
+
 function isTableRowRevisionMarker(node) {
     const parent = node?.parentNode;
     return isWordElement(parent, 'trPr') && isWordElement(parent?.parentNode, 'tr');
@@ -423,6 +461,8 @@ export function rejectTrackedChangesInOoxml(oxml, options = {}) {
         }
     }
 
+    coalesceAdjacentCompatibleInsertions(xmlDoc);
+
     const serializedOxml = parseResult.isFragmentWrapped
         ? Array.from(xmlDoc.documentElement.childNodes).map(n => serializer.serializeToString(n)).join('')
         : serializer.serializeToString(xmlDoc);