bun-docx 0.14.0 → 0.14.1

package/dist/index.js

@@ -22198,15 +22198,12 @@ class CommentsView {
   }
   paraIdFor(commentId) {
     const numericId = commentId.startsWith("c") ? commentId.slice(1) : commentId;
-    const comment = this.findById(numericId);
-    const paragraph = comment?.findChild("w:p");
-    return paragraph?.getAttribute("w14:paraId");
+    return lastParagraph(this.findById(numericId))?.getAttribute("w14:paraId");
   }
   ensureParaId(commentId) {
     const numericId = commentId.startsWith("c") ? commentId.slice(1) : commentId;
     const root = XmlNode2.findRoot(this.tree, "w:comments");
-    const comment = this.findById(numericId);
-    const paragraph = comment?.findChild("w:p");
+    const paragraph = lastParagraph(this.findById(numericId));
     if (!root || !paragraph)
       return;
     const existing = paragraph.getAttribute("w14:paraId");
@@ -22236,6 +22233,96 @@ class CommentsView {
     }
     return String(highest + 1);
   }
+  threadRootId(commentId) {
+    const root = XmlNode2.findRoot(this.tree, "w:comments");
+    const numericId = commentId.startsWith("c") ? commentId.slice(1) : commentId;
+    if (!root)
+      return numericId;
+    const extended = this.#readExtended();
+    const idByParaId = new Map;
+    for (const child2 of root.children) {
+      if (child2.tag !== "w:comment")
+        continue;
+      const childId = child2.getAttribute("w:id");
+      if (childId == null)
+        continue;
+      const paraId = lastParagraph(child2)?.getAttribute("w14:paraId");
+      if (paraId)
+        idByParaId.set(paraId, childId);
+    }
+    let currentId = numericId;
+    const seen = new Set([currentId]);
+    for (;; ) {
+      const paraId = lastParagraph(this.findById(currentId))?.getAttribute("w14:paraId");
+      const parentParaId = paraId ? extended.get(paraId)?.parentParaId : undefined;
+      const parentId = parentParaId ? idByParaId.get(parentParaId) : undefined;
+      if (!parentId || seen.has(parentId))
+        return currentId;
+      seen.add(parentId);
+      currentId = parentId;
+    }
+  }
+  descendantReplyIds(commentId) {
+    const root = XmlNode2.findRoot(this.tree, "w:comments");
+    if (!root)
+      return [];
+    const numericId = commentId.startsWith("c") ? commentId.slice(1) : commentId;
+    const startParaId = lastParagraph(this.findById(numericId))?.getAttribute("w14:paraId");
+    if (!startParaId)
+      return [];
+    const extended = this.#readExtended();
+    const idByParaId = new Map;
+    const childParaIdsByParent = new Map;
+    for (const child2 of root.children) {
+      if (child2.tag !== "w:comment")
+        continue;
+      const childId = child2.getAttribute("w:id");
+      if (childId == null)
+        continue;
+      const paraId = lastParagraph(child2)?.getAttribute("w14:paraId");
+      if (!paraId)
+        continue;
+      idByParaId.set(paraId, childId);
+      const parentParaId = extended.get(paraId)?.parentParaId;
+      if (!parentParaId)
+        continue;
+      const siblings = childParaIdsByParent.get(parentParaId) ?? [];
+      siblings.push(paraId);
+      childParaIdsByParent.set(parentParaId, siblings);
+    }
+    const descendants = [];
+    const queue = [startParaId];
+    while (queue.length > 0) {
+      const paraId = queue.pop();
+      if (!paraId)
+        break;
+      for (const childParaId of childParaIdsByParent.get(paraId) ?? []) {
+        const childId = idByParaId.get(childParaId);
+        if (childId)
+          descendants.push(childId);
+        queue.push(childParaId);
+      }
+    }
+    return descendants;
+  }
+  insertReplyAfter(parentNumericId, comment) {
+    const root = XmlNode2.findRoot(this.tree, "w:comments");
+    if (!root)
+      throw new Error("expected <w:comments> root");
+    const threadIds = new Set([
+      parentNumericId,
+      ...this.descendantReplyIds(parentNumericId)
+    ]);
+    let insertIndex = root.children.length;
+    for (const [index, child2] of root.children.entries()) {
+      if (child2.tag !== "w:comment")
+        continue;
+      const id = child2.getAttribute("w:id");
+      if (id != null && threadIds.has(id))
+        insertIndex = index + 1;
+    }
+    root.children.splice(insertIndex, 0, comment);
+  }
   toComments(anchors) {
     const root = XmlNode2.findRoot(this.tree, "w:comments");
     if (!root)
@@ -22247,8 +22334,7 @@ class CommentsView {
       const numericId = child2.getAttribute("w:id");
       if (numericId == null)
         continue;
-      const paragraph = child2.findChild("w:p");
-      const paraId = paragraph?.getAttribute("w14:paraId");
+      const paraId = lastParagraph(child2)?.getAttribute("w14:paraId");
       if (paraId)
         commentIdByParaId.set(paraId, `c${numericId}`);
     }
@@ -22271,8 +22357,7 @@ class CommentsView {
         endBlockId: "",
         endOffset: 0
       };
-      const paragraph = child2.findChild("w:p");
-      const paraId = paragraph?.getAttribute("w14:paraId");
+      const paraId = lastParagraph(child2)?.getAttribute("w14:paraId");
       const meta = paraId ? extendedByParaId.get(paraId) ?? {} : {};
       const parentCommentId = meta.parentParaId ? commentIdByParaId.get(meta.parentParaId) : undefined;
       comments.push({
@@ -22331,12 +22416,21 @@ function CommentsRoot() {
     "xmlns:w14": NS_W14
   }, undefined, false, undefined, this);
 }
+function lastParagraph(comment) {
+  return comment?.findChildren("w:p").at(-1);
+}
 function generateParaId() {
+  const seed = Bun.env.DOCX_CLI_PARA_ID_SEED;
+  if (seed) {
+    const minted = (Number.parseInt(seed, 16) + seededParaIds++) % 2147483648;
+    return (minted || 1).toString(16).padStart(8, "0").toUpperCase();
+  }
   const bytes = new Uint8Array(4);
   crypto.getRandomValues(bytes);
-  let hex = "";
-  for (const byte of bytes)
-    hex += byte.toString(16).padStart(2, "0");
+  bytes[0] = (bytes[0] ?? 0) & 127;
+  const hex = [...bytes].map((byte) => byte.toString(16).padStart(2, "0")).join("");
+  if (hex === "00000000")
+    return "00000001";
   return hex.toUpperCase();
 }
 function CommentsExRoot() {
@@ -22346,7 +22440,7 @@ function CommentsExRoot() {
     "mc:Ignorable": "w15"
   }, undefined, false, undefined, this);
 }
-var COMMENTS_PART_NAME = "word/comments.xml", COMMENTS_EXT_PART_NAME = "word/commentsExtended.xml", COMMENTS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", COMMENTS_EXT_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/office/2011/relationships/commentsExtended", COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", COMMENTS_EXT_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml", NS_W2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", NS_W14 = "http://schemas.microsoft.com/office/word/2010/wordml", NS_W15 = "http://schemas.microsoft.com/office/word/2012/wordml";
+var COMMENTS_PART_NAME = "word/comments.xml", COMMENTS_EXT_PART_NAME = "word/commentsExtended.xml", COMMENTS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", COMMENTS_EXT_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/office/2011/relationships/commentsExtended", COMMENTS_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", COMMENTS_EXT_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml", NS_W2 = "http://schemas.openxmlformats.org/wordprocessingml/2006/main", NS_W14 = "http://schemas.microsoft.com/office/word/2010/wordml", NS_W15 = "http://schemas.microsoft.com/office/word/2012/wordml", seededParaIds = 0;
 var init_comments = __esm(() => {
   init_jsx();
   init_parser();
@@ -33826,6 +33920,38 @@ function CommentBody({
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
 }
+function addReplyCommentMarkers(documentTree, threadNumericIds, replyNumericId) {
+  const document2 = XmlNode2.findRoot(documentTree, "w:document");
+  if (!document2)
+    return false;
+  const threadIds = new Set(threadNumericIds);
+  const referenceRun = findLastDescendant(document2, (node) => node.tag === "w:r" && node.children.some((child2) => child2.tag === "w:commentReference" && threadIds.has(child2.getAttribute("w:id") ?? "")));
+  if (!referenceRun)
+    return false;
+  const rangeStart = findLastDescendant(document2, (node) => node.tag === "w:commentRangeStart" && threadIds.has(node.getAttribute("w:id") ?? ""));
+  if (!rangeStart) {
+    spliceAfter(referenceRun, commentReferenceRun(replyNumericId));
+    return true;
+  }
+  spliceAfter(rangeStart, commentRangeStartMarker(replyNumericId));
+  spliceAfter(referenceRun, commentRangeEndMarker(replyNumericId), commentReferenceRun(replyNumericId));
+  return true;
+}
+function findLastDescendant(root, matches) {
+  let last;
+  for (const child2 of root.children) {
+    if (matches(child2))
+      last = { node: child2, siblings: root.children };
+    const found = findLastDescendant(child2, matches);
+    if (found)
+      last = found;
+  }
+  return last;
+}
+function spliceAfter(target, ...nodes) {
+  const index = target.siblings.indexOf(target.node);
+  target.siblings.splice(index + 1, 0, ...nodes);
+}
 function removeCommentMarkers(documentTree, numericId) {
   const document2 = XmlNode2.findRoot(documentTree, "w:document");
   if (!document2)
@@ -33886,7 +34012,7 @@ class Comments {
     return comments;
   }
   add(anchor, options) {
-    const date = options.date ?? new Date().toISOString();
+    const date = options.date ?? resolveDate();
     const numericId = this.document.comments?.nextId() ?? "0";
     const paraId = generateParaId();
     try {
@@ -33913,21 +34039,47 @@ class Comments {
     if (!view?.findById(parentNumericId)) {
       throw new CommentsError("COMMENT_NOT_FOUND", `Parent comment not found: c${parentNumericId}`);
     }
-    const parentParaId = view.ensureParaId(parentNumericId);
-    if (!parentParaId) {
-      throw new CommentsError("COMMENT_NOT_FOUND", `Parent comment c${parentNumericId} could not be assigned a w14:paraId.`);
+    const rootNumericId = view.threadRootId(parentNumericId);
+    const rootParaId = view.ensureParaId(rootNumericId);
+    if (!rootParaId) {
+      throw new CommentsError("COMMENT_NOT_FOUND", `Parent comment c${rootNumericId} could not be assigned a w14:paraId.`);
     }
-    const date = options.date ?? new Date().toISOString();
+    const date = options.date ?? resolveDate();
     const numericId = view.nextId();
     const replyParaId = generateParaId();
-    this.#appendCommentBody(numericId, replyParaId, body, options.author, date);
+    const anchored = addReplyCommentMarkers(this.document.documentTree, [rootNumericId, ...view.descendantReplyIds(rootNumericId)], numericId);
+    if (!anchored) {
+      throw new CommentsError("COMMENT_NOT_FOUND", `Parent comment c${parentNumericId} has no anchor in the document body; cannot anchor a reply to it.`);
+    }
+    this.#appendCommentBody(numericId, replyParaId, body, options.author, date, {
+      threadParentNumericId: rootNumericId
+    });
     const extView = this.document.ensureCommentsExtended();
     const extRoot = extView.extendedTree ? XmlNode2.findRoot(extView.extendedTree, "w15:commentsEx") : undefined;
     if (!extRoot)
       throw new Error("expected <w15:commentsEx> root");
-    extRoot.children.push(new XmlNode2("w15:commentEx", {
+    const threadParaIds = new Set([
+      rootParaId,
+      ...view.descendantReplyIds(rootNumericId).map((replyId) => view.paraIdFor(replyId))
+    ]);
+    const hasRootEntry = extRoot.children.some((child2) => child2.tag === "w15:commentEx" && child2.getAttribute("w15:paraId") === rootParaId);
+    if (!hasRootEntry) {
+      extRoot.children.push(new XmlNode2("w15:commentEx", {
+        "w15:paraId": rootParaId,
+        "w15:done": "0"
+      }));
+    }
+    let insertIndex = extRoot.children.length;
+    for (const [index, child2] of extRoot.children.entries()) {
+      if (child2.tag !== "w15:commentEx")
+        continue;
+      const paraId = child2.getAttribute("w15:paraId");
+      if (paraId && threadParaIds.has(paraId))
+        insertIndex = index + 1;
+    }
+    extRoot.children.splice(insertIndex, 0, new XmlNode2("w15:commentEx", {
       "w15:paraId": replyParaId,
-      "w15:paraIdParent": parentParaId,
+      "w15:paraIdParent": rootParaId,
       "w15:done": "0"
     }));
     return numericId;
@@ -33977,10 +34129,16 @@ class Comments {
     }
     if (!view)
       return;
+    const cascaded = new Set(normalized);
+    for (const commentId of normalized) {
+      for (const replyId of view.descendantReplyIds(commentId)) {
+        cascaded.add(`c${replyId}`);
+      }
+    }
     const root = XmlNode2.findRoot(view.tree, "w:comments");
     if (!root)
       return;
-    for (const commentId of normalized) {
+    for (const commentId of cascaded) {
       const numericId = commentId.slice(1);
       const node = view.findById(numericId);
       if (!node)
@@ -34009,12 +34167,12 @@ class Comments {
     this.#appendCommentBody(numericId, paraId, options.body, options.author, options.date);
     return numericId;
   }
-  #appendCommentBody(numericId, paraId, text2, author, date) {
+  #appendCommentBody(numericId, paraId, text2, author, date, options) {
     const commentsView = this.document.ensureComments();
     const commentsRoot = XmlNode2.findRoot(commentsView.tree, "w:comments");
     if (!commentsRoot)
       throw new Error("expected <w:comments> root");
-    commentsRoot.children.push(/* @__PURE__ */ jsxDEV(CommentBody, {
+    const comment = /* @__PURE__ */ jsxDEV(CommentBody, {
       options: {
         id: numericId,
         author,
@@ -34023,7 +34181,12 @@ class Comments {
         paraId,
         text: text2
       }
-    }, undefined, false, undefined, this));
+    }, undefined, false, undefined, this);
+    if (options?.threadParentNumericId) {
+      commentsView.insertReplyAfter(options.threadParentNumericId, comment);
+      return;
+    }
+    commentsRoot.children.push(comment);
   }
   #resolveBlock(blockId) {
     try {
@@ -34058,6 +34221,7 @@ var init_comments2 = __esm(() => {
   init_parser();
   init_markers();
   init_markers();
+  init_track_changes();
   init_jsx_dev_runtime();
   CommentsError = class CommentsError extends Error {
     code;
@@ -81196,7 +81360,8 @@ Target (one required, mutually exclusive):
   --at cN             Comment id (e.g., c0). Repeat for multiple ids:
                       --at c1 --at c3 --at c5. All ids are validated against
                       the pre-mutation tree, so the batch is atomic. The "c"
-                      prefix is optional.
+                      prefix is optional. Deleting a thread parent also
+                      deletes its replies.
   --batch PATH        JSONL with one {"id": "cN"} per line. Use - for stdin.
 
 Optional:
@@ -81320,7 +81485,7 @@ async function run4(args) {
       dryRun: true,
       path: path2,
       commentId: `c${nextId}`,
-      parentId: `c${parentNumericId}`,
+      parentId: `c${document4.comments.threadRootId(parentNumericId)}`,
       ...outputPath ? { output: outputPath } : {}
     });
     return EXIT2.OK;
@@ -81340,7 +81505,7 @@ async function run4(args) {
     operation: "comments.reply",
     path: outputPath ?? path2,
     commentId: `c${numericId}`,
-    parentId: `c${parentNumericId}`
+    parentId: `c${document4.comments?.threadRootId(parentNumericId) ?? parentNumericId}`
   });
   return EXIT2.OK;
 }
@@ -81351,6 +81516,8 @@ Usage:
 
 Required:
   --at cN           Parent comment id (e.g., c0). The "c" prefix is optional.
+                    Replying to a reply attaches to the thread root (Word
+                    threads are single-level); the ack's parentId reports it.
   --text TEXT       Reply body
 
 Optional:
@@ -92085,7 +92252,7 @@ Examples:
 // package.json
 var package_default = {
   name: "bun-docx",
-  version: "0.14.0",
+  version: "0.14.1",
   description: "CLI for AI agents (Claude, Codex) to read, edit, and comment on .docx files with full format fidelity.",
   keywords: [
     "docx",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bun-docx",
-	"version": "0.14.0",
+	"version": "0.14.1",
 	"description": "CLI for AI agents (Claude, Codex) to read, edit, and comment on .docx files with full format fidelity.",
 	"keywords": [
 		"docx",