@ansonlai/docx-redline-js 0.2.0 → 0.2.1

package/engine/formatting-removal.js

@@ -9,6 +9,12 @@ import { parseOoxml, serializeOoxml } from './oxml-engine.js';
 import { getDefaultAuthor } from '../adapters/config.js';
 import { createRevisionMetadata } from '../core/types.js';
 import { createWordElement } from '../core/word-xml.js';
+
+function removeNode(node) {
+    if (node?.parentNode) {
+        node.parentNode.removeChild(node);
+    }
+}
 
 /**
  * Removes specific formatting properties from a run properties (w:rPr) element.
@@ -31,7 +37,7 @@ export function removeFormattingFromRPr(rPr, formatTypes = ['all']) {
         toRemove.forEach(tag => {
             // Handle both namespaced and non-namespaced versions
             const elements = rPrClone.querySelectorAll(`${tag}, ${tag.replace('w:', '')}`);
-            elements.forEach(el => el.remove());
+            elements.forEach(removeNode);
         });
     } else {
         // Remove specific properties
@@ -55,7 +61,7 @@ export function removeFormattingFromRPr(rPr, formatTypes = ['all']) {
             if (tag) {
                 // Handle both namespaced and non-namespaced versions
                 const elements = rPrClone.querySelectorAll(`${tag}, ${tag.replace('w:', '')}`);
-                elements.forEach(el => el.remove());
+                elements.forEach(removeNode);
             }
         });
     }
@@ -112,7 +118,7 @@ export function applyFormattingRemovalToOoxml(ooxmlString, targetText, formatTyp
                     }
                 } else {
                     // Remove entire rPr if empty
-                    rPr.remove();
+                    removeNode(rPr);
                 }
             }
         }
@@ -179,7 +185,7 @@ export function injectHighlightIntoRPr(doc, rPr, color = 'yellow', options = {})
     // --- APPLY CHANGE ---
     // Remove any existing highlight
     const existingHighlight = rPrElement.getElementsByTagNameNS(NS_W, 'highlight');
-    Array.from(existingHighlight).forEach(el => el.remove());
+    Array.from(existingHighlight).forEach(removeNode);
 
     // Create and add new highlight element
     const highlightEl = createWordElement(doc, 'w:highlight');
@@ -201,7 +207,7 @@ export function injectHighlightIntoRPr(doc, rPr, color = 'yellow', options = {})
 
         // Remove any EXISTING rPrChange to avoid duplicates or nested weirdness
         const existingChange = rPrElement.getElementsByTagNameNS(NS_W, 'rPrChange');
-        Array.from(existingChange).forEach(el => el.remove());
+        Array.from(existingChange).forEach(removeNode);
 
         // Append to rPr
         rPrElement.appendChild(rPrChange);
@@ -274,7 +280,7 @@ export function applyHighlightToOoxml(ooxmlString, targetText, color = 'yellow',
             // Update text content
             const tNodes = prefixRun.getElementsByTagNameNS(NS_W, 't');
             // Simply remove all t nodes and add one with new text to avoid complexity of multiple t nodes
-            Array.from(tNodes).forEach(t => t.remove());
+            Array.from(tNodes).forEach(removeNode);
             const newT = createWordElement(doc, 'w:t');
             // Preserve xml:space="preserve" if it existed, or just add it usually
             newT.setAttribute('xml:space', 'preserve');
@@ -288,7 +294,7 @@ export function applyHighlightToOoxml(ooxmlString, targetText, color = 'yellow',
             const matchRun = run.cloneNode(true);
             // Update text content
             const tNodes = matchRun.getElementsByTagNameNS(NS_W, 't');
-            Array.from(tNodes).forEach(t => t.remove());
+            Array.from(tNodes).forEach(removeNode);
             const newT = createWordElement(doc, 'w:t');
             newT.setAttribute('xml:space', 'preserve');
             newT.textContent = matchText;
@@ -312,7 +318,7 @@ export function applyHighlightToOoxml(ooxmlString, targetText, color = 'yellow',
             const suffixRun = run.cloneNode(true);
             // Update text content
             const tNodes = suffixRun.getElementsByTagNameNS(NS_W, 't');
-            Array.from(tNodes).forEach(t => t.remove());
+            Array.from(tNodes).forEach(removeNode);
             const newT = createWordElement(doc, 'w:t');
             newT.setAttribute('xml:space', 'preserve');
             newT.textContent = suffixText;

package/engine/run-builders.js

@@ -5,7 +5,7 @@
  * and `w:pPrChange` elements used by surgical and reconstruction modes.
  */
 
-import { RPR_SCHEMA_ORDER } from './rpr-helpers.js';
+import { extractFormatFromRPr, RPR_SCHEMA_ORDER } from './rpr-helpers.js';
 import { createRevisionMetadata } from '../core/types.js';
 import { getFirstElementByTag } from '../core/xml-query.js';
 import { createWordElement } from '../core/word-xml.js';
@@ -140,8 +140,8 @@ export function createTextRun(xmlDoc, text, rPr, isDelete) {
  * @param {boolean} [generateRedlines] - Whether to create rPrChange
  * @returns {Element[]}
  */
-export function createFormattedRuns(xmlDoc, text, baseRPr, formatHints, baseOffset, author, generateRedlines) {
-    if (!text) return [];
+export function createFormattedRuns(xmlDoc, text, baseRPr, formatHints, baseOffset, author, generateRedlines) {
+    if (!text) return [];
 
     const breaks = new Set([0, text.length]);
     for (const hint of formatHints) {
@@ -167,13 +167,17 @@ export function createFormattedRuns(xmlDoc, text, baseRPr, formatHints, baseOffs
             h.start <= segmentBaseOffset && h.end >= segmentEndOffset
         );
 
-        const combinedFormat = {};
-        applicableHints.forEach(h => {
-            if (h.format) Object.assign(combinedFormat, h.format);
-        });
-
-        const formattedRPr = injectFormattingToRPr(xmlDoc, baseRPr, combinedFormat, author, generateRedlines);
-        runs.push(createTextRunWithRPrElement(xmlDoc, segment, formattedRPr, false));
+        const combinedFormat = { ...extractFormatFromRPr(baseRPr) };
+        applicableHints.forEach(h => {
+            if (h.format) Object.assign(combinedFormat, h.format);
+        });
+
+        // During a text edit, missing Markdown is not an instruction to clear
+        // the source run's formatting. Only synchronize explicitly hinted spans.
+        const formattedRPr = applicableHints.length > 0
+            ? injectFormattingToRPr(xmlDoc, baseRPr, combinedFormat, author, generateRedlines)
+            : baseRPr?.cloneNode(true) || null;
+        runs.push(createTextRunWithRPrElement(xmlDoc, segment, formattedRPr, false));
     }
 
     return runs;

package/engine/surgical-diff-application.js

@@ -1,5 +1,4 @@
 import { getApplicableFormatHints } from '../pipeline/markdown-processor.js';
-import { isWordElement } from '../core/word-xml.js';
 import {
     createTrackChange,
     createTextRun,
@@ -20,30 +19,17 @@ import {
     findLastSpanEndingBeforeOrAt,
     forEachOverlappingSpan
 } from './surgical-spans.js';
+import { extractFormatFromRPr } from './rpr-helpers.js';
 
 export function reconcileFormattingForTextSpan(xmlDoc, span, start, end, applicableHints, author, generateRedlines) {
-    const desiredFormat = {};
-    if (applicableHints.length > 0) {
-        applicableHints.forEach(h => Object.assign(desiredFormat, h.format));
-    }
+    // Plain modified text carries no negative formatting instruction. Preserve
+    // unchanged source formatting unless Markdown explicitly targets this span.
+    if (applicableHints.length === 0) return false;
 
     const rPr = span.rPr;
-    const hasElement = (localName) => {
-        if (!rPr) return false;
-        for (let node = rPr.firstChild; node; node = node.nextSibling) {
-            if (isWordElement(node, localName)) {
-                return true;
-            }
-        }
-        return false;
-    };
-
-    const existingFormat = {
-        bold: hasElement('b'),
-        italic: hasElement('i'),
-        underline: hasElement('u'),
-        strikethrough: hasElement('strike')
-    };
+    const existingFormat = extractFormatFromRPr(rPr);
+    const desiredFormat = { ...existingFormat };
+    applicableHints.forEach(h => Object.assign(desiredFormat, h.format));
 
     const formatsToCheck = ['bold', 'italic', 'underline', 'strikethrough'];
     const changesNeeded = formatsToCheck.some(f => !!desiredFormat[f] !== existingFormat[f]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ansonlai/docx-redline-js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Host-independent OOXML reconciliation engine for .docx manipulation with track changes",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,8 @@
     }
   },
   "devDependencies": {
-    "esbuild": "^0.24.0",
-    "@xmldom/xmldom": "^0.9.0"
+    "@xmldom/xmldom": "^0.9.0",
+    "esbuild": "^0.28.1"
   },
   "scripts": {
     "build": "node scripts/build.mjs",