@adeu/core 1.17.2 → 1.18.0

package/dist/index.d.cts

@@ -200,6 +200,35 @@ declare class RedlineEngine {
     private _scan_existing_ids;
     private _get_heading_path_and_page;
     accept_all_revisions(): void;
+    /**
+     * Revert every tracked change, returning the document to the state it had
+     * before any revision was proposed. The exact inverse of
+     * accept_all_revisions:
+     *
+     *   - <w:ins>  -> removed together with all of its content (the proposed
+     *                 insertion never existed); an inserted row (<w:ins> in
+     *                 <w:trPr>) drops the whole row.
+     *   - <w:del>  -> unwrapped, restoring the original text (<w:delText> becomes
+     *                 <w:t> again); a row-deletion mark in <w:trPr> is removed so
+     *                 the row survives.
+     *   - paragraph-mark <w:del> in pPr/rPr -> removed, undoing a proposed merge.
+     *
+     * Comments are annotations, not revisions, so standalone comments are left in
+     * place; only anchors stranded inside a rejected insertion are cleaned up.
+     *
+     * Insertions are reverted before deletions are restored so a deletion nested
+     * inside a foreign author's insertion is removed wholesale with the insertion
+     * — the contingent text disappears rather than being promoted to committed
+     * body text.
+     *
+     * Known limitation: tracked paragraph STRUCTURE changes (a split recorded as a
+     * pilcrow <w:ins>, or a merge recorded as a pilcrow <w:del>) are reverted only
+     * to the extent of dropping/keeping the mark; the original paragraph boundary
+     * is not reconstructed, because the merge protocol coalesces paragraphs
+     * destructively at edit time. Reverting run-level insertions/deletions (the
+     * common case) is exact. This limitation is shared with the Python engine.
+     */
+    reject_all_revisions(): void;
     private _getNextId;
     private _create_track_change_tag;
     private _set_text_content;
@@ -286,6 +315,15 @@ declare class RedlineEngine {
     apply_review_actions(actions: any[]): [number, number];
     private _apply_table_edit;
     private _pre_resolve_heuristic_edit;
+    /**
+     * Split a <w:ins> so that everything up to and INCLUDING split_after stays in
+     * a left <w:ins>, new_elem is placed between, and the remainder moves to a
+     * right <w:ins> — all at the grandparent level. Used when revising another
+     * author's pending insertion: the <w:del> stays nested in their <w:ins> while
+     * our replacement <w:ins> lands as a sibling, so we never nest <w:ins> in
+     * <w:ins>.
+     */
+    private _insert_and_split_ins;
     private _apply_single_edit_indexed;
 }
 

package/dist/index.d.ts

@@ -200,6 +200,35 @@ declare class RedlineEngine {
     private _scan_existing_ids;
     private _get_heading_path_and_page;
     accept_all_revisions(): void;
+    /**
+     * Revert every tracked change, returning the document to the state it had
+     * before any revision was proposed. The exact inverse of
+     * accept_all_revisions:
+     *
+     *   - <w:ins>  -> removed together with all of its content (the proposed
+     *                 insertion never existed); an inserted row (<w:ins> in
+     *                 <w:trPr>) drops the whole row.
+     *   - <w:del>  -> unwrapped, restoring the original text (<w:delText> becomes
+     *                 <w:t> again); a row-deletion mark in <w:trPr> is removed so
+     *                 the row survives.
+     *   - paragraph-mark <w:del> in pPr/rPr -> removed, undoing a proposed merge.
+     *
+     * Comments are annotations, not revisions, so standalone comments are left in
+     * place; only anchors stranded inside a rejected insertion are cleaned up.
+     *
+     * Insertions are reverted before deletions are restored so a deletion nested
+     * inside a foreign author's insertion is removed wholesale with the insertion
+     * — the contingent text disappears rather than being promoted to committed
+     * body text.
+     *
+     * Known limitation: tracked paragraph STRUCTURE changes (a split recorded as a
+     * pilcrow <w:ins>, or a merge recorded as a pilcrow <w:del>) are reverted only
+     * to the extent of dropping/keeping the mark; the original paragraph boundary
+     * is not reconstructed, because the merge protocol coalesces paragraphs
+     * destructively at edit time. Reverting run-level insertions/deletions (the
+     * common case) is exact. This limitation is shared with the Python engine.
+     */
+    reject_all_revisions(): void;
     private _getNextId;
     private _create_track_change_tag;
     private _set_text_content;
@@ -286,6 +315,15 @@ declare class RedlineEngine {
     apply_review_actions(actions: any[]): [number, number];
     private _apply_table_edit;
     private _pre_resolve_heuristic_edit;
+    /**
+     * Split a <w:ins> so that everything up to and INCLUDING split_after stays in
+     * a left <w:ins>, new_elem is placed between, and the remainder moves to a
+     * right <w:ins> — all at the grandparent level. Used when revising another
+     * author's pending insertion: the <w:del> stays nested in their <w:ins> while
+     * our replacement <w:ins> lands as a sibling, so we never nest <w:ins> in
+     * <w:ins>.
+     */
+    private _insert_and_split_ins;
     private _apply_single_edit_indexed;
 }
 

package/dist/index.js

@@ -3295,6 +3295,93 @@ var RedlineEngine = class {
       }
     }
   }
+  /**
+   * Revert every tracked change, returning the document to the state it had
+   * before any revision was proposed. The exact inverse of
+   * accept_all_revisions:
+   *
+   *   - <w:ins>  -> removed together with all of its content (the proposed
+   *                 insertion never existed); an inserted row (<w:ins> in
+   *                 <w:trPr>) drops the whole row.
+   *   - <w:del>  -> unwrapped, restoring the original text (<w:delText> becomes
+   *                 <w:t> again); a row-deletion mark in <w:trPr> is removed so
+   *                 the row survives.
+   *   - paragraph-mark <w:del> in pPr/rPr -> removed, undoing a proposed merge.
+   *
+   * Comments are annotations, not revisions, so standalone comments are left in
+   * place; only anchors stranded inside a rejected insertion are cleaned up.
+   *
+   * Insertions are reverted before deletions are restored so a deletion nested
+   * inside a foreign author's insertion is removed wholesale with the insertion
+   * — the contingent text disappears rather than being promoted to committed
+   * body text.
+   *
+   * Known limitation: tracked paragraph STRUCTURE changes (a split recorded as a
+   * pilcrow <w:ins>, or a merge recorded as a pilcrow <w:del>) are reverted only
+   * to the extent of dropping/keeping the mark; the original paragraph boundary
+   * is not reconstructed, because the merge protocol coalesces paragraphs
+   * destructively at edit time. Reverting run-level insertions/deletions (the
+   * common case) is exact. This limitation is shared with the Python engine.
+   */
+  reject_all_revisions() {
+    const parts_to_process = [this.doc.element];
+    for (const part of this.doc.pkg.parts) {
+      if (part === this.doc.part) continue;
+      if (part.contentType.includes("wordprocessingml") && part.contentType.endsWith("+xml")) {
+        parts_to_process.push(part._element);
+      }
+    }
+    for (const root_element of parts_to_process) {
+      const insNodes = findAllDescendants(root_element, "w:ins");
+      for (const ins of insNodes) {
+        const parent = ins.parentNode;
+        if (!parent) continue;
+        this._clean_wrapping_comments(ins);
+        this._delete_comments_in_element(ins);
+        if (parent.tagName === "w:trPr") {
+          const row = parent.parentNode;
+          if (row && row.parentNode) {
+            row.parentNode.removeChild(row);
+          }
+        } else {
+          parent.removeChild(ins);
+        }
+      }
+      const pNodes = findAllDescendants(root_element, "w:p");
+      for (const p of pNodes) {
+        const pPr = findChild(p, "w:pPr");
+        if (pPr) {
+          const rPr = findChild(pPr, "w:rPr");
+          const delMark = rPr ? findChild(rPr, "w:del") : null;
+          if (rPr && delMark) {
+            rPr.removeChild(delMark);
+          }
+        }
+      }
+      const delNodes = findAllDescendants(root_element, "w:del");
+      for (const d of delNodes) {
+        const parent = d.parentNode;
+        if (!parent) continue;
+        this._clean_wrapping_comments(d);
+        if (parent.tagName === "w:trPr") {
+          parent.removeChild(d);
+          continue;
+        }
+        const delTexts = Array.from(d.getElementsByTagName("w:delText"));
+        for (const dt of delTexts) {
+          const t = d.ownerDocument.createElement("w:t");
+          t.textContent = dt.textContent;
+          if (dt.hasAttribute("xml:space"))
+            t.setAttribute("xml:space", "preserve");
+          dt.parentNode?.replaceChild(t, dt);
+        }
+        while (d.firstChild) {
+          parent.insertBefore(d.firstChild, d);
+        }
+        parent.removeChild(d);
+      }
+    }
+  }
   _getNextId() {
     this.current_id++;
     return this.current_id.toString();
@@ -3942,29 +4029,36 @@ var RedlineEngine = class {
           (edit.new_text || "").length - sfx
         );
         if (final_target.includes("\n\n")) {
-          if (final_new.includes("\n\n")) {
-            const parts = matched.split("\n\n");
-            if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
-              errors.push(
-                `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
-              );
-            }
-          } else {
-            const parts = final_target.split("\n\n");
-            if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
-              errors.push(
-                `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
-              );
+          const balanced = matched.split("\n\n").length === (edit.new_text || "").split("\n\n").length;
+          if (!balanced) {
+            if (final_new.includes("\n\n")) {
+              const parts = matched.split("\n\n");
+              if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
+                errors.push(
+                  `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
+                );
+              }
+            } else {
+              const parts = final_target.split("\n\n");
+              if (parts.length >= 2 && parts[0].trim() !== "" && parts[parts.length - 1].trim() !== "") {
+                errors.push(
+                  `- Edit ${i + 1 + index_offset} Failed: target_text spans a paragraph boundary with body text on both sides. The paragraph break is a structural element, not literal text, so it cannot be replaced as a single span without corrupting the document. Split this into one edit per paragraph.`
+                );
+              }
             }
           }
         }
       }
       for (const [start, length] of matches) {
-        const spans = this.mapper.spans.filter(
+        const spans = target_mapper.spans.filter(
           (s) => s.end > start && s.start < start + length
         );
-        const nestedAuthors = /* @__PURE__ */ new Set();
+        const insAuthors = /* @__PURE__ */ new Set();
+        const commentAuthors = /* @__PURE__ */ new Set();
+        let hasNonForeignRealText = false;
         for (const s of spans) {
+          if (s.run === null) continue;
+          let isForeignIns = false;
           if (s.ins_id) {
             const insNodes = findAllDescendants(
               this.doc.element,
@@ -3973,24 +4067,32 @@ var RedlineEngine = class {
             if (insNodes.length > 0) {
               const auth = insNodes[0].getAttribute("w:author");
               if (auth && auth !== this.author) {
-                const is_fully_contained_in_ins = start >= s.start && start + length <= s.end;
-                const is_lockout = is_fully_contained_in_ins || match_mode === "all";
-                if (is_lockout) {
-                  nestedAuthors.add(auth);
-                }
+                insAuthors.add(auth);
+                isForeignIns = true;
               }
             }
           }
+          if (!isForeignIns) hasNonForeignRealText = true;
+        }
+        for (const s of spans) {
           if (s.comment_ids) {
             for (const cid of s.comment_ids) {
               const c_data = this.mapper.comments_map[cid];
               if (c_data && c_data.author && c_data.author !== this.author) {
-                nestedAuthors.add(c_data.author);
+                commentAuthors.add(c_data.author);
               }
             }
           }
         }
-        if (nestedAuthors.size > 0) {
+        if (insAuthors.size > 0 || commentAuthors.size > 0) {
+          const fullyWithinForeignIns = insAuthors.size > 0 && !hasNonForeignRealText && commentAuthors.size === 0;
+          if ((match_mode === "strict" || match_mode === "first") && fullyWithinForeignIns) {
+            continue;
+          }
+          const nestedAuthors = /* @__PURE__ */ new Set([
+            ...insAuthors,
+            ...commentAuthors
+          ]);
           errors.push(
             `- Edit ${i + 1 + index_offset} Failed: Modification targets an active insertion from another author (${Array.from(nestedAuthors).join(", ")}). Accept that change first or scope your edit outside of it.`
           );
@@ -4084,59 +4186,6 @@ var RedlineEngine = class {
     const edits = changes.filter(
       (c) => c === null || typeof c !== "object" || !["accept", "reject", "reply"].includes(c.type)
     );
-    let mapper_dirty = false;
-    for (const edit of edits) {
-      if (typeof edit !== "object" || edit === null || !edit.target_text) continue;
-      const is_regex = edit.regex || false;
-      let matches = this.mapper.find_all_match_indices(edit.target_text, is_regex);
-      let target_mapper = this.mapper;
-      if (matches.length === 0) {
-        if (!this.clean_mapper) {
-          this.clean_mapper = new DocumentMapper(this.doc, true);
-        }
-        matches = this.clean_mapper.find_all_match_indices(edit.target_text, is_regex);
-        target_mapper = this.clean_mapper;
-      }
-      for (const [start, length] of matches) {
-        const spans = target_mapper.spans.filter(
-          (s) => s.end > start && s.start < start + length
-        );
-        for (const s of spans) {
-          if (s.ins_id) {
-            const insNodes = findAllDescendants(this.doc.element, "w:ins").filter(
-              (n) => n.getAttribute("w:id") === s.ins_id
-            );
-            if (insNodes.length > 0) {
-              const auth = insNodes[0].getAttribute("w:author");
-              if (auth && auth !== this.author) {
-                const is_fully_contained_in_ins = start >= s.start && start + length <= s.end;
-                const match_mode = edit.match_mode || "strict";
-                if (!is_fully_contained_in_ins && match_mode !== "all") {
-                  const node = insNodes[0];
-                  this._clean_wrapping_comments(node);
-                  const parent = node.parentNode;
-                  if (parent) {
-                    if (parent.tagName === "w:trPr") {
-                      parent.removeChild(node);
-                    } else {
-                      while (node.firstChild) {
-                        parent.insertBefore(node.firstChild, node);
-                      }
-                      parent.removeChild(node);
-                    }
-                  }
-                  mapper_dirty = true;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    if (mapper_dirty) {
-      this.mapper = new DocumentMapper(this.doc);
-      this.clean_mapper = null;
-    }
     if (!dry_run_mode) {
       const action_errors = actions.length > 0 ? this.validate_review_actions(actions) : [];
       const validate_edits_now = edits.length > 0 && action_errors.length > 0;
@@ -4380,6 +4429,7 @@ var RedlineEngine = class {
       (a, b) => (b[0]._resolved_start_idx || 0) - (a[0]._resolved_start_idx || 0)
     );
     const occupied_ranges = [];
+    const counted_split_groups = /* @__PURE__ */ new Set();
     for (const [edit, orig_new] of resolved_edits) {
       const start = edit._resolved_start_idx || 0;
       const end = start + (edit.target_text ? edit.target_text.length : 0);
@@ -4408,13 +4458,20 @@ var RedlineEngine = class {
         success = this._apply_table_edit(edit, false);
       }
       if (success) {
-        applied++;
+        const group_id = edit._split_group_id;
+        const first_in_group = group_id === void 0 || group_id === null || !counted_split_groups.has(group_id);
+        if (first_in_group && group_id !== void 0 && group_id !== null) {
+          counted_split_groups.add(group_id);
+        }
+        if (first_in_group) applied++;
         occupied_ranges.push([start, end]);
         edit._applied_status = true;
         const parent = edit._parent_edit_ref;
         if (parent) {
           parent._applied_status = true;
-          parent._occurrences_modified = (parent._occurrences_modified || 0) + 1;
+          if (first_in_group) {
+            parent._occurrences_modified = (parent._occurrences_modified || 0) + 1;
+          }
           const [path, page] = this._get_heading_path_and_page(
             start,
             this.mapper.full_text,
@@ -4425,7 +4482,9 @@ var RedlineEngine = class {
           parent._pages = pages;
           parent._heading_path = path;
         } else {
-          edit._occurrences_modified = (edit._occurrences_modified || 0) + 1;
+          if (first_in_group) {
+            edit._occurrences_modified = (edit._occurrences_modified || 0) + 1;
+          }
           const [path, page] = this._get_heading_path_and_page(
             start,
             this.mapper.full_text,
@@ -4722,6 +4781,51 @@ var RedlineEngine = class {
         final_target = actual_doc_text.substring(prefix_len, t_end);
         final_new = current_effective_new_text.substring(prefix_len, n_end);
         effective_start_idx = start_idx + prefix_len;
+        const target_segs = actual_doc_text.split("\n\n");
+        const new_segs = current_effective_new_text.split("\n\n");
+        if (actual_doc_text.includes("\n\n") && target_segs.length === new_segs.length) {
+          const split_sub_edits = [];
+          let seg_offset = start_idx;
+          let comment_assigned = false;
+          for (let k = 0; k < target_segs.length; k++) {
+            const t_seg = target_segs[k];
+            const n_seg = new_segs[k];
+            if (t_seg !== n_seg) {
+              const [seg_prefix, seg_suffix] = trim_common_context(t_seg, n_seg);
+              const seg_target = t_seg.substring(
+                seg_prefix,
+                t_seg.length - seg_suffix
+              );
+              const seg_new = n_seg.substring(
+                seg_prefix,
+                n_seg.length - seg_suffix
+              );
+              const seg_start = seg_offset + seg_prefix;
+              let seg_op;
+              if (!seg_target && seg_new) seg_op = "INSERTION";
+              else if (seg_target && !seg_new) seg_op = "DELETION";
+              else if (seg_target && seg_new) seg_op = "MODIFICATION";
+              else seg_op = "COMMENT_ONLY";
+              const seg_comment = edit.comment && !comment_assigned ? edit.comment : null;
+              if (seg_comment) comment_assigned = true;
+              split_sub_edits.push({
+                type: "modify",
+                target_text: seg_target,
+                new_text: seg_new,
+                comment: seg_comment,
+                _match_start_index: seg_start,
+                _internal_op: seg_op,
+                _active_mapper_ref: active_mapper,
+                _split_group_id: start_idx
+              });
+            }
+            seg_offset += t_seg.length + 2;
+          }
+          if (split_sub_edits.length > 0) {
+            for (const sub of split_sub_edits) all_sub_edits.push(sub);
+            continue;
+          }
+        }
         if (!final_target && final_new) effective_op = "INSERTION";
         else if (final_target && !final_new) effective_op = "DELETION";
         else if (final_target && final_new) effective_op = "MODIFICATION";
@@ -4741,6 +4845,35 @@ var RedlineEngine = class {
     if (match_mode === "all" || all_sub_edits.length > 1) return all_sub_edits;
     return all_sub_edits[0];
   }
+  /**
+   * Split a <w:ins> so that everything up to and INCLUDING split_after stays in
+   * a left <w:ins>, new_elem is placed between, and the remainder moves to a
+   * right <w:ins> — all at the grandparent level. Used when revising another
+   * author's pending insertion: the <w:del> stays nested in their <w:ins> while
+   * our replacement <w:ins> lands as a sibling, so we never nest <w:ins> in
+   * <w:ins>.
+   */
+  _insert_and_split_ins(parent_ins, split_after, new_elem) {
+    const grandparent = parent_ins.parentNode;
+    if (!grandparent) return;
+    const left = parent_ins.cloneNode(false);
+    const right = parent_ins.cloneNode(false);
+    let toRight = false;
+    for (const kid of Array.from(parent_ins.childNodes)) {
+      parent_ins.removeChild(kid);
+      if (!toRight) {
+        left.appendChild(kid);
+        if (kid === split_after) toRight = true;
+      } else {
+        right.appendChild(kid);
+      }
+    }
+    if (left.childNodes.length > 0) grandparent.insertBefore(left, parent_ins);
+    grandparent.insertBefore(new_elem, parent_ins);
+    if (right.childNodes.length > 0)
+      grandparent.insertBefore(right, parent_ins);
+    grandparent.removeChild(parent_ins);
+  }
   _apply_single_edit_indexed(edit, orig_new, rebuild_map) {
     let op = edit._internal_op;
     const active_mapper = edit._active_mapper_ref || this.mapper;
@@ -4948,7 +5081,16 @@ var RedlineEngine = class {
       const is_inline_first = result.first_node.tagName === "w:ins";
       if (is_inline_first) {
         if (anchor_run) {
-          insertAfter(result.first_node, anchor_run._element);
+          const anchor_parent = anchor_run._element.parentNode;
+          if (anchor_parent && anchor_parent.tagName === "w:ins") {
+            this._insert_and_split_ins(
+              anchor_parent,
+              anchor_run._element,
+              result.first_node
+            );
+          } else {
+            insertAfter(result.first_node, anchor_run._element);
+          }
         } else if (anchor_para) {
           anchor_para._element.appendChild(result.first_node);
         }
@@ -5058,7 +5200,12 @@ var RedlineEngine = class {
       if (result.first_node) {
         const is_inline_first = result.first_node.tagName === "w:ins";
         if (is_inline_first) {
-          insertAfter(result.first_node, last_del);
+          const del_parent = last_del.parentNode;
+          if (del_parent && del_parent.tagName === "w:ins") {
+            this._insert_and_split_ins(del_parent, last_del, result.first_node);
+          } else {
+            insertAfter(result.first_node, last_del);
+          }
           ins_elem = result.first_node;
         } else {
           ins_elem = result.last_ins;