@adeu/core 1.18.1 → 1.18.4

package/dist/index.d.cts

@@ -315,6 +315,15 @@ declare class RedlineEngine {
      */
     private _set_paragraph_style;
     private _anchor_reply_comment;
+    /**
+     * Read a comment's author directly from the comments part. Used by
+     * _clean_wrapping_comments to decide whether a wrapping comment belongs to
+     * another author (and must be preserved when its anchored change is
+     * accepted/rejected) or to us (safe to delete). Reads the part rather than
+     * the mapper because the mapper's comments_map is not rebuilt between review
+     * actions, so it can be stale mid-batch. Returns null if not found.
+     */
+    private _get_comment_author;
     private _clean_wrapping_comments;
     private _delete_comments_in_element;
     validate_edits(edits: any[], index_offset?: number): string[];

package/dist/index.d.ts

@@ -315,6 +315,15 @@ declare class RedlineEngine {
      */
     private _set_paragraph_style;
     private _anchor_reply_comment;
+    /**
+     * Read a comment's author directly from the comments part. Used by
+     * _clean_wrapping_comments to decide whether a wrapping comment belongs to
+     * another author (and must be preserved when its anchored change is
+     * accepted/rejected) or to us (safe to delete). Reads the part rather than
+     * the mapper because the mapper's comments_map is not rebuilt between review
+     * actions, so it can be stale mid-batch. Returns null if not found.
+     */
+    private _get_comment_author;
     private _clean_wrapping_comments;
     private _delete_comments_in_element;
     validate_edits(edits: any[], index_offset?: number): string[];

package/dist/index.js

@@ -3822,6 +3822,27 @@ var RedlineEngine = class {
     ref_run.appendChild(ref);
     insertAfter(ref_run, new_end);
   }
+  /**
+   * Read a comment's author directly from the comments part. Used by
+   * _clean_wrapping_comments to decide whether a wrapping comment belongs to
+   * another author (and must be preserved when its anchored change is
+   * accepted/rejected) or to us (safe to delete). Reads the part rather than
+   * the mapper because the mapper's comments_map is not rebuilt between review
+   * actions, so it can be stale mid-batch. Returns null if not found.
+   */
+  _get_comment_author(c_id) {
+    const part = this.doc.pkg.parts.find(
+      (p) => p.contentType === "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"
+    );
+    if (!part) return null;
+    const comments = findAllDescendants(part._element, "w:comment");
+    for (const c of comments) {
+      if (c.getAttribute("w:id") === c_id) {
+        return c.getAttribute("w:author");
+      }
+    }
+    return null;
+  }
   _clean_wrapping_comments(element) {
     let first_node = element;
     while (true) {
@@ -3886,7 +3907,11 @@ var RedlineEngine = class {
     for (const s of starts_to_remove) {
       const c_id = s.getAttribute("w:id");
       if (c_id && end_ids.has(c_id)) {
-        this.comments_manager.deleteComment(c_id);
+        const author = this._get_comment_author(c_id);
+        const is_own = author !== null && author === this.author;
+        if (is_own) {
+          this.comments_manager.deleteComment(c_id);
+        }
         if (s.parentNode) s.parentNode.removeChild(s);
         for (const e of ends_to_remove) {
           let e_id = null;
@@ -4015,10 +4040,9 @@ var RedlineEngine = class {
         if (edit.target_text.includes("|")) {
           matches = matches.slice(0, 1);
         } else {
-          const positions = matches.map(([start, length]) => [
-            start,
-            start + length
-          ]);
+          const positions = matches.map(
+            ([start, length]) => [start, start + length]
+          );
           errors.push(
             format_ambiguity_error(
               i + 1 + index_offset,
@@ -4095,17 +4119,18 @@ var RedlineEngine = class {
             }
           }
         }
-        if (insAuthors.size > 0 || commentAuthors.size > 0) {
-          const fullyWithinForeignIns = insAuthors.size > 0 && !hasNonForeignRealText && commentAuthors.size === 0;
-          if ((match_mode === "strict" || match_mode === "first") && fullyWithinForeignIns) {
+        if (insAuthors.size > 0) {
+          const fullyWithinForeignIns = !hasNonForeignRealText;
+          if (!((match_mode === "strict" || match_mode === "first") && fullyWithinForeignIns)) {
+            errors.push(
+              `- Edit ${i + 1 + index_offset} Failed: Modification targets an active insertion from another author (${Array.from(insAuthors).join(", ")}). Accept that change first or scope your edit outside of it.`
+            );
             continue;
           }
-          const nestedAuthors = /* @__PURE__ */ new Set([
-            ...insAuthors,
-            ...commentAuthors
-          ]);
+        }
+        if (commentAuthors.size > 0 && match_mode === "all") {
           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.`
+            `- Edit ${i + 1 + index_offset} Failed: match_mode="all" would sweep through a comment range from another author (${Array.from(commentAuthors).join(", ")}). Target the commented text deliberately with match_mode "strict" or "first", or scope your edit outside of it.`
           );
         }
       }
@@ -4185,7 +4210,10 @@ var RedlineEngine = class {
   _process_batch_internal(changes, dry_run_mode = false) {
     for (const c of changes) {
       if (c && typeof c === "object" && c.type === "modify" && c.target_text && c.new_text) {
-        const [strippedTarget, strippedNew] = stripMatchingHeadingHashes(c.target_text, c.new_text);
+        const [strippedTarget, strippedNew] = stripMatchingHeadingHashes(
+          c.target_text,
+          c.new_text
+        );
         c.target_text = strippedTarget;
         c.new_text = strippedNew;
       }
@@ -4201,10 +4229,7 @@ var RedlineEngine = class {
       const action_errors = actions.length > 0 ? this.validate_review_actions(actions) : [];
       const validate_edits_now = edits.length > 0 && action_errors.length > 0;
       const edit_errors = validate_edits_now ? this.validate_edits(edits) : [];
-      const all_errors = [
-        ...action_errors,
-        ...edit_errors
-      ];
+      const all_errors = [...action_errors, ...edit_errors];
       if (all_errors.length > 0) {
         throw new BatchValidationError(all_errors);
       }
@@ -4320,9 +4345,7 @@ var RedlineEngine = class {
           this.clean_mapper = null;
           throw err;
         }
-        applied_edits = edits.filter(
-          (e) => e._applied_status
-        ).length;
+        applied_edits = edits.filter((e) => e._applied_status).length;
         skipped_edits = edits.length - applied_edits;
         for (const edit of edits) {
           const success = edit._applied_status || false;
@@ -4363,7 +4386,7 @@ var RedlineEngine = class {
       skipped_details: this.skipped_details,
       edits: edits_reports,
       engine: "node",
-      version: "1.10.0"
+      version: "1.18.2"
     };
   }
   apply_edits(edits, page_offsets = []) {
@@ -4807,7 +4830,10 @@ var RedlineEngine = class {
             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_prefix, seg_suffix] = trim_common_context(
+                t_seg,
+                n_seg
+              );
               const seg_target = t_seg.substring(
                 seg_prefix,
                 t_seg.length - seg_suffix
@@ -5218,7 +5244,11 @@ var RedlineEngine = class {
         if (is_inline_first) {
           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);
+            this._insert_and_split_ins(
+              del_parent,
+              last_del,
+              result.first_node
+            );
           } else {
             insertAfter(result.first_node, last_del);
           }