docxmlater 10.0.3 → 10.1.0

package/src/tracking/DocumentTrackingContext.ts

@@ -343,16 +343,47 @@ export class DocumentTrackingContext implements TrackingContext {
     }
 
     // Apply tblPrChange to each Table
+    // Per ECMA-376 §17.13.5.36, tblPrChange must contain FULL previous tblPr,
+    // not just the delta of changed properties.
     for (const [table, changes] of tableChanges) {
-      this.applyElementPrChange(changes, (prevProps, getNextId, date) => {
-        const existing = table.getTblPrChange();
-        if (existing) {
-          const merged = { ...(existing.previousProperties || {}), ...prevProps };
-          table.setTblPrChange({ ...existing, previousProperties: merged });
+      // Build full snapshot: start from current formatting, roll back changed properties
+      const currentFormatting = table.getFormatting();
+      const fullPrevProps: Record<string, unknown> = {};
+
+      for (const [key, value] of Object.entries(currentFormatting)) {
+        if (value !== undefined) {
+          fullPrevProps[key] = value;
+        }
+      }
+
+      // Roll back changed properties to their previous values
+      let latestTimestamp = 0;
+      for (const change of changes) {
+        if (change.previousValue !== undefined) {
+          fullPrevProps[change.property] = change.previousValue;
         } else {
-          table.setTblPrChange({ author: this.author, date, id: String(getNextId()), previousProperties: prevProps });
+          delete fullPrevProps[change.property];
         }
-      });
+        if (change.timestamp > latestTimestamp) {
+          latestTimestamp = change.timestamp;
+        }
+      }
+
+      const date = formatDateForXml(new Date(latestTimestamp));
+
+      const existing = table.getTblPrChange();
+      if (existing) {
+        // Merge: existing previous state takes precedence (it's the ORIGINAL baseline)
+        const merged = { ...fullPrevProps, ...(existing.previousProperties || {}) };
+        table.setTblPrChange({ ...existing, previousProperties: merged });
+      } else {
+        table.setTblPrChange({
+          author: this.author,
+          date,
+          id: String(this.revisionManager.consumeNextId()),
+          previousProperties: fullPrevProps,
+        });
+      }
     }
 
     // Apply trPrChange to each TableRow

package/src/utils/InMemoryRevisionAcceptor.ts

@@ -568,6 +568,26 @@ function acceptRevisionsInParagraph(
     }
   }
 
+  // Clear paragraph mark deletion tracking if accepting deletions
+  // This removes the w:del element from w:pPr/w:rPr
+  if (options.acceptDeletions) {
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkDeletion) {
+      paragraph.clearParagraphMarkDeletion();
+      result.deletionsAccepted++;
+    }
+  }
+
+  // Clear paragraph mark insertion tracking if accepting insertions
+  // This removes the w:ins element from w:pPr/w:rPr
+  if (options.acceptInsertions) {
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkInsertion) {
+      paragraph.clearParagraphMarkInsertion();
+      result.insertionsAccepted++;
+    }
+  }
+
   return result;
 }
 
@@ -576,7 +596,15 @@ function acceptRevisionsInParagraph(
  */
 export function paragraphHasRevisions(paragraph: Paragraph): boolean {
   const content = paragraph.getContent();
-  return content.some((item) => item instanceof Revision);
+  if (content.some((item) => item instanceof Revision)) {
+    return true;
+  }
+  // Also check paragraph mark revision markers in w:pPr/w:rPr
+  const formatting = paragraph.getFormatting();
+  if (formatting.paragraphMarkDeletion || formatting.paragraphMarkInsertion) {
+    return true;
+  }
+  return false;
 }
 
 /**

package/src/utils/SelectiveRevisionAcceptor.ts

@@ -238,6 +238,76 @@ export class SelectiveRevisionAcceptor {
 
     // Replace paragraph content with the transformed content
     paragraph.setContent(newContent);
+
+    // Handle paragraph mark revision markers (w:del/w:ins in w:pPr/w:rPr)
+    // Both accept and reject clear the marker — these are metadata-only markers (no content),
+    // so there is no content to add or remove, only the marker itself to clear.
+    const formatting = paragraph.getFormatting();
+    if (formatting.paragraphMarkDeletion) {
+      const del = formatting.paragraphMarkDeletion;
+      if (this.matchesMarkerCriteria(del, criteria)) {
+        paragraph.clearParagraphMarkDeletion();
+        processedIds.push(del.id.toString());
+      } else {
+        remainingIds.push(del.id.toString());
+      }
+    }
+    if (formatting.paragraphMarkInsertion) {
+      const ins = formatting.paragraphMarkInsertion;
+      if (this.matchesMarkerCriteria(ins, criteria)) {
+        paragraph.clearParagraphMarkInsertion();
+        processedIds.push(ins.id.toString());
+      } else {
+        remainingIds.push(ins.id.toString());
+      }
+    }
+  }
+
+  /**
+   * Check if a paragraph mark revision marker matches the given criteria.
+   * Simplified version of matchesCriteria for non-Revision marker objects.
+   */
+  private static matchesMarkerCriteria(
+    marker: { id: number; author: string; date: Date },
+    criteria: SelectionCriteria
+  ): boolean {
+    // If no criteria specified, match nothing
+    if (
+      !criteria.ids &&
+      !criteria.types &&
+      !criteria.authors &&
+      !criteria.dateRange &&
+      !criteria.categories &&
+      !criteria.custom
+    ) {
+      return false;
+    }
+
+    // Filter by IDs
+    if (criteria.ids && !criteria.ids.includes(marker.id)) {
+      return false;
+    }
+
+    // Filter by authors
+    if (criteria.authors && !criteria.authors.includes(marker.author)) {
+      return false;
+    }
+
+    // Filter by date range
+    if (criteria.dateRange) {
+      if (marker.date < criteria.dateRange.start || marker.date > criteria.dateRange.end) {
+        return false;
+      }
+    }
+
+    // types, categories, and custom filters don't apply to paragraph mark markers
+    // (they are not Revision objects with a type/category)
+    // If criteria only specifies types/categories/custom, markers won't match
+    if (criteria.types || criteria.categories || criteria.custom) {
+      return false;
+    }
+
+    return true;
   }
 
   /**