@adeu/core 1.28.0 → 1.29.0

package/dist/index.cjs

@@ -1755,8 +1755,26 @@ ${header}`;
         const cell_start = current;
         current = this._map_blocks(cell, current);
         if (!this.clean_view && !this.original_view) {
-          const firstP = cell._element.getElementsByTagName("w:p")[0];
-          const paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+          let firstP = cell._element.getElementsByTagName("w:p")[0];
+          let paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+          const is_empty = current === cell_start;
+          if (!paraId && is_empty) {
+            if (!firstP) {
+              const xmlDoc = cell._element.ownerDocument;
+              firstP = xmlDoc.createElement("w:p");
+              cell._element.appendChild(firstP);
+            }
+            const allPs = Array.from(cell._element.ownerDocument.getElementsByTagName("w:p"));
+            const index = allPs.indexOf(firstP);
+            let hash = 2166136261;
+            const str = `fallback-paraId-${index}`;
+            for (let i = 0; i < str.length; i++) {
+              hash ^= str.charCodeAt(i);
+              hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+            }
+            paraId = (hash >>> 0).toString(16).toUpperCase().padStart(8, "0");
+            firstP.setAttribute("w14:paraId", paraId);
+          }
           if (paraId && firstP) {
             const cellPara = new Paragraph(firstP, cell);
             this._add_virtual_text("", current, cellPara);
@@ -2929,6 +2947,10 @@ function _split_cross_paragraph_hunks(edits) {
   return out;
 }
 function generate_edits_via_paragraph_alignment(original_text, modified_text) {
+  const orig_stripped = original_text.trimEnd();
+  const orig_ws = original_text.slice(orig_stripped.length);
+  const mod_stripped = modified_text.trimEnd();
+  modified_text = mod_stripped + orig_ws;
   const orig_paragraphs = original_text.split("\n\n");
   const mod_paragraphs = modified_text.split("\n\n");
   const orig_offsets = [];
@@ -4714,10 +4736,21 @@ var RedlineEngine = class _RedlineEngine {
         parts_to_process.push(part._element);
       }
     }
+    let accepted_insertions = 0;
+    let accepted_deletions = 0;
+    let accepted_formatting = 0;
+    for (const root_element of parts_to_process) {
+      accepted_insertions += findAllDescendants(root_element, "w:ins").length;
+      accepted_deletions += findAllDescendants(root_element, "w:del").length;
+      for (const tag of ["w:rPrChange", "w:pPrChange", "w:sectPrChange"]) {
+        accepted_formatting += findAllDescendants(root_element, tag).length;
+      }
+    }
+    let removed_comments = 0;
     for (const root_element of parts_to_process) {
       const insNodes = findAllDescendants(root_element, "w:ins");
       for (const ins of insNodes) {
-        this._clean_wrapping_comments(ins);
+        removed_comments += this._clean_wrapping_comments(ins);
         const parent = ins.parentNode;
         if (!parent) continue;
         if (parent.tagName === "w:trPr") {
@@ -4761,8 +4794,8 @@ var RedlineEngine = class _RedlineEngine {
             if (has_content) {
               rPr.removeChild(delMark);
             } else {
-              this._clean_wrapping_comments(p);
-              this._delete_comments_in_element(p);
+              removed_comments += this._clean_wrapping_comments(p);
+              removed_comments += this._delete_comments_in_element(p);
               if (p.parentNode) {
                 p.parentNode.removeChild(p);
               }
@@ -4772,8 +4805,8 @@ var RedlineEngine = class _RedlineEngine {
       }
       const delNodes = findAllDescendants(root_element, "w:del");
       for (const d of delNodes) {
-        this._clean_wrapping_comments(d);
-        this._delete_comments_in_element(d);
+        removed_comments += this._clean_wrapping_comments(d);
+        removed_comments += this._delete_comments_in_element(d);
         const parent = d.parentNode;
         if (parent) {
           if (parent.tagName === "w:trPr") {
@@ -4868,6 +4901,12 @@ var RedlineEngine = class _RedlineEngine {
         }
       }
     }
+    return {
+      accepted_insertions,
+      accepted_deletions,
+      accepted_formatting,
+      removed_comments
+    };
   }
   /**
    * Revert every tracked change, returning the document to the state it had
@@ -5524,7 +5563,10 @@ var RedlineEngine = class _RedlineEngine {
     }
     return null;
   }
+  /** Returns how many comment BODIES were actually deleted (see below: only
+   *  our own are; foreign ones keep their body and lose only the anchor). */
   _clean_wrapping_comments(element) {
+    let deleted = 0;
     let first_node = element;
     while (true) {
       const prev2 = getPreviousElement(first_node);
@@ -5592,6 +5634,7 @@ var RedlineEngine = class _RedlineEngine {
         const is_own = author !== null && author === this.author;
         if (is_own) {
           this.comments_manager.deleteComment(c_id);
+          deleted++;
         }
         if (s.parentNode) s.parentNode.removeChild(s);
         for (const e of ends_to_remove) {
@@ -5609,13 +5652,17 @@ var RedlineEngine = class _RedlineEngine {
         }
       }
     }
+    return deleted;
   }
+  /** Returns how many comment bodies were deleted. */
   _delete_comments_in_element(element) {
+    let deleted = 0;
     const refs = findAllDescendants(element, "w:commentReference");
     for (const ref of refs) {
       const c_id = ref.getAttribute("w:id");
       if (c_id) {
         this.comments_manager.deleteComment(c_id);
+        deleted++;
         for (const tag of ["w:commentRangeStart", "w:commentRangeEnd"]) {
           const nodes = findAllDescendants(this.doc.element, tag);
           for (const node of nodes) {
@@ -5626,6 +5673,7 @@ var RedlineEngine = class _RedlineEngine {
         }
       }
     }
+    return deleted;
   }
   validate_edits(edits, index_offset = 0) {
     const errors = [];
@@ -6142,6 +6190,7 @@ var RedlineEngine = class _RedlineEngine {
             );
             reports_by_input[i] = {
               status: "failed",
+              type: edit.type || "modify",
               target_text: truncate_middle(edit.target_text || "", REPORT_ECHO_CAP),
               new_text: truncate_middle(_RedlineEngine._report_new_text(edit), REPORT_ECHO_CAP),
               warning,
@@ -6157,6 +6206,7 @@ var RedlineEngine = class _RedlineEngine {
             const previews = this._build_edit_context_previews(edit);
             reports_by_input[i] = {
               status: "applied",
+              type: edit.type || "modify",
               target_text: truncate_middle(edit.target_text || "", REPORT_ECHO_CAP),
               new_text: truncate_middle(_RedlineEngine._report_new_text(edit), REPORT_ECHO_CAP),
               warning: null,
@@ -6178,6 +6228,7 @@ var RedlineEngine = class _RedlineEngine {
             );
             reports_by_input[i] = {
               status: "failed",
+              type: edit.type || "modify",
               target_text: truncate_middle(edit.target_text || "", REPORT_ECHO_CAP),
               new_text: truncate_middle(_RedlineEngine._report_new_text(edit), REPORT_ECHO_CAP),
               warning,
@@ -6196,6 +6247,7 @@ var RedlineEngine = class _RedlineEngine {
             if (report.status === "applied") {
               reports_by_input[i] = {
                 status: "failed",
+                type: report.type || "modify",
                 target_text: report.target_text,
                 new_text: report.new_text,
                 warning: null,
@@ -6266,6 +6318,7 @@ var RedlineEngine = class _RedlineEngine {
           }
           edits_reports.push({
             status: success ? "applied" : "failed",
+            type: edit.type || "modify",
             target_text: truncate_middle(edit.target_text || "", REPORT_ECHO_CAP),
             new_text: truncate_middle(_RedlineEngine._report_new_text(edit), REPORT_ECHO_CAP),
             warning,
@@ -6343,9 +6396,52 @@ var RedlineEngine = class _RedlineEngine {
           resolved_mapper = this.clean_mapper;
         }
         if (matches.length > 0) {
-          edit._resolved_start_idx = matches[0][0];
-          edit._active_mapper_ref = resolved_mapper;
-          resolved_edits.push([edit, null]);
+          const match_mode = edit.match_mode || "strict";
+          const unique_matches = [];
+          const seen_trs = /* @__PURE__ */ new Set();
+          for (const match of matches) {
+            const start_idx = match[0];
+            const [anchor_run, anchor_para] = resolved_mapper.get_insertion_anchor(start_idx, false);
+            let target_element = null;
+            if (anchor_run) target_element = anchor_run._element;
+            else if (anchor_para) target_element = anchor_para._element;
+            let tr = target_element;
+            while (tr && tr.tagName !== "w:tr") tr = tr.parentNode;
+            if (tr) {
+              if (!seen_trs.has(tr)) {
+                seen_trs.add(tr);
+                unique_matches.push(match);
+              }
+            }
+          }
+          if (unique_matches.length > 0) {
+            let matches_to_apply = unique_matches;
+            if (match_mode === "strict" || match_mode === "first") {
+              matches_to_apply = unique_matches.slice(0, 1);
+            }
+            if (match_mode === "all" || matches_to_apply.length > 1) {
+              for (const m of matches_to_apply) {
+                const sub_edit = {
+                  ...edit,
+                  _resolved_start_idx: m[0],
+                  _active_mapper_ref: resolved_mapper,
+                  _parent_edit_ref: edit
+                };
+                resolved_edits.push([sub_edit, null]);
+              }
+            } else {
+              edit._resolved_start_idx = matches_to_apply[0][0];
+              edit._active_mapper_ref = resolved_mapper;
+              resolved_edits.push([edit, null]);
+            }
+          } else {
+            skipped++;
+            edit._applied_status = false;
+            const target_snippet = (edit.target_text || "").trim().substring(0, 40);
+            const msg = `- Failed to locate row target: '${target_snippet}...'`;
+            this.skipped_details.push(msg);
+            edit._error_msg = msg;
+          }
         } else {
           skipped++;
           edit._applied_status = false;
@@ -6651,8 +6747,15 @@ var RedlineEngine = class _RedlineEngine {
     let skipped = 0;
     let already_resolved = 0;
     const resolved_history = /* @__PURE__ */ new Map();
-    for (let pos = 0; pos < actions.length; pos++) {
-      const action = actions[pos];
+    const sortedActions = actions.map((action, pos) => ({ action, pos })).sort((a, b) => {
+      const aPri = a.action.type === "reply" ? 0 : 1;
+      const bPri = b.action.type === "reply" ? 0 : 1;
+      if (aPri !== bPri) {
+        return aPri - bPri;
+      }
+      return a.pos - b.pos;
+    });
+    for (const { action, pos } of sortedActions) {
       const type = action.type;
       if (type === "reply") {
         const cid = action.target_id.replace("Com:", "");
@@ -8800,8 +8903,25 @@ function extract_table(table, comments_map, cleanView, cursor, paragraph_offsets
         paragraph_offsets
       );
       if (!cleanView) {
-        const firstP = cell._element.getElementsByTagName("w:p")[0];
-        const paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+        let firstP = cell._element.getElementsByTagName("w:p")[0];
+        let paraId = firstP ? firstP.getAttribute("w14:paraId") : null;
+        if (!paraId && (!cell_content || cell_content.trim() === "")) {
+          if (!firstP) {
+            const xmlDoc = cell._element.ownerDocument;
+            firstP = xmlDoc.createElement("w:p");
+            cell._element.appendChild(firstP);
+          }
+          const allPs = Array.from(cell._element.ownerDocument.getElementsByTagName("w:p"));
+          const index = allPs.indexOf(firstP);
+          let hash = 2166136261;
+          const str = `fallback-paraId-${index}`;
+          for (let i = 0; i < str.length; i++) {
+            hash ^= str.charCodeAt(i);
+            hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
+          }
+          paraId = (hash >>> 0).toString(16).toUpperCase().padStart(8, "0");
+          firstP.setAttribute("w14:paraId", paraId);
+        }
         if (paraId) {
           const space_pad = cell_content ? " " : "";
           const anchor = `${space_pad}{#cell:${paraId}}`;
@@ -9760,7 +9880,7 @@ async function finalize_document(doc, options) {
     report.tracked_changes_found = total;
     if (total > 0 && !options.accept_all) {
       report.status = "blocked";
-      report.blocked_reason = `Document contains ${total} unresolved tracked changes (${counts[0]} insertions, ${counts[1]} deletions, ${counts[2]} formatting). Review in Word first, or set accept_all=true.`;
+      report.blocked_reason = `Document contains ${total} unresolved tracked changes (${counts[0]} insertions, ${counts[1]} deletions, ${counts[2]} formatting). Review in Word first, set accept_all=true, or set sanitize_mode='keep-markup'.`;
       return { reportText: report.render() };
     }
     if (total > 0) {