@json-to-office/core-docx 0.37.0 → 0.38.0

package/dist/plugin/example/index.js

@@ -2104,8 +2104,7 @@ import {
   PageNumber as PageNumber2,
   ColumnBreak,
   TableLayoutType,
-  VerticalAlign,
-  Bookmark
+  VerticalAlign
 } from "docx";
 
 // src/utils/imageUtils.ts
@@ -3700,6 +3699,11 @@ function getStyleIdForLevel(level) {
 
 // src/utils/bookmarkRegistry.ts
 import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
+import { BookmarkStart, BookmarkEnd } from "docx";
+var CONTENT_LINK_ID_BASE = 2e6;
+function createState() {
+  return { bookmarks: /* @__PURE__ */ new Map(), nextLinkId: CONTENT_LINK_ID_BASE + 1 };
+}
 function slugifyBookmarkText(text) {
   return text.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").substring(0, 40);
 }
@@ -3712,14 +3716,14 @@ function dedupeBookmarkId(base, taken) {
   return id;
 }
 var BookmarkRegistry = class {
-  fallback = { bookmarks: /* @__PURE__ */ new Map() };
+  fallback = createState();
   scopes = new AsyncLocalStorage3();
   get state() {
     return this.scopes.getStore() ?? this.fallback;
   }
   /** Run work with an isolated registry that follows its async call chain. */
   runScoped(callback) {
-    return this.scopes.run({ bookmarks: /* @__PURE__ */ new Map() }, callback);
+    return this.scopes.run(createState(), callback);
   }
   /**
    * Register a bookmark
@@ -3732,6 +3736,19 @@ var BookmarkRegistry = class {
     }
     this.state.bookmarks.set(id, { id, title, type });
   }
+  /**
+   * A `w:id` no other bookmark in this document will use.
+   *
+   * docx's own `Bookmark` cannot supply one: its constructor builds a fresh
+   * id generator per instance (`bookmarkUniqueNumericIdGen()`), so every
+   * bookmark it emits carries `w:id="1"`. Reported upstream as dolanmiu/docx
+   * #3478, still unreleased as of 9.7.1. Duplicated ids leave the start/end
+   * pairing ambiguous, which is why a `REF` field could not read a target's
+   * text even though navigating to it by name worked.
+   */
+  allocateLinkId() {
+    return this.state.nextLinkId++;
+  }
   /**
    * Generate a unique bookmark ID from text
    * Converts text to a URL-friendly format
@@ -3781,6 +3798,14 @@ var BookmarkRegistry = class {
   }
 };
 var globalBookmarkRegistry = new BookmarkRegistry();
+function createBookmarkedContent(name, children) {
+  const linkId = globalBookmarkRegistry.allocateLinkId();
+  return [
+    new BookmarkStart(name, linkId),
+    ...children,
+    new BookmarkEnd(linkId)
+  ];
+}
 
 // src/utils/revisionUtils.ts
 import { TextRun as TextRun3, InsertedTextRun, DeletedTextRun } from "docx";
@@ -3949,7 +3974,7 @@ import { Paragraph, TextRun as TextRun4 } from "docx";
 import { AsyncLocalStorage as AsyncLocalStorage5 } from "async_hooks";
 var DEFAULT_COMMENT_AUTHOR = "json-to-office";
 var DEFAULT_COMMENT_DATE = "1970-01-01T00:00:00Z";
-function createState() {
+function createState2() {
   return { counter: 0, comments: [], hasResolved: false };
 }
 function deriveInitials(author) {
@@ -3960,14 +3985,14 @@ function bodyParagraphs(text) {
   return normalizeUnicodeText(text).split("\n").map((line) => new Paragraph({ children: [new TextRun4({ text: line })] }));
 }
 var CommentRegistry = class {
-  fallback = createState();
+  fallback = createState2();
   scopes = new AsyncLocalStorage5();
   get state() {
     return this.scopes.getStore() ?? this.fallback;
   }
   /** Run work with an isolated registry that follows its async call chain. */
   runScoped(callback) {
-    return this.scopes.run(createState(), callback);
+    return this.scopes.run(createState2(), callback);
   }
   /**
    * Register a comment thread and return every id its anchors must carry — the
@@ -4035,7 +4060,7 @@ var CommentRegistry = class {
       state.comments.length = 0;
       state.hasResolved = false;
     } else {
-      this.fallback = createState();
+      this.fallback = createState2();
     }
   }
 };
@@ -4057,7 +4082,7 @@ function closeCommentRange(ids) {
 // src/utils/noteRegistry.ts
 import { Paragraph as Paragraph2, TextRun as TextRun6 } from "docx";
 import { AsyncLocalStorage as AsyncLocalStorage6 } from "async_hooks";
-function createState2() {
+function createState3() {
   return {
     footnoteCounter: 0,
     endnoteCounter: 0,
@@ -4074,14 +4099,14 @@ function bodyParagraphs2(text, style) {
   );
 }
 var NoteRegistry = class {
-  fallback = createState2();
+  fallback = createState3();
   scopes = new AsyncLocalStorage6();
   get state() {
     return this.scopes.getStore() ?? this.fallback;
   }
   /** Run work with an isolated registry that follows its async call chain. */
   runScoped(callback) {
-    return this.scopes.run(createState2(), callback);
+    return this.scopes.run(createState3(), callback);
   }
   /**
    * Register a footnote body and return the id its reference must use. Ids are
@@ -4125,7 +4150,7 @@ var NoteRegistry = class {
         delete state.endnotes[key];
       }
     } else {
-      this.fallback = createState2();
+      this.fallback = createState3();
     }
   }
 };
@@ -4291,10 +4316,7 @@ function createText(content, theme, themeName, options = {}) {
         "paragraph"
       );
       children.push(
-        new Bookmark({
-          id: options.bookmarkId,
-          children: revisionRuns
-        })
+        ...createBookmarkedContent(options.bookmarkId, revisionRuns)
       );
     } else {
       children.push(...revisionRuns);
@@ -4317,12 +4339,7 @@ function createText(content, theme, themeName, options = {}) {
         normalizedContent,
         "paragraph"
       );
-      children.push(
-        new Bookmark({
-          id: options.bookmarkId,
-          children: textRuns
-        })
-      );
+      children.push(...createBookmarkedContent(options.bookmarkId, textRuns));
     } else {
       children.push(...textRuns);
     }
@@ -4483,10 +4500,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
         "heading"
       );
       children.push(
-        new Bookmark({
-          id: options.bookmarkId,
-          children: revisionRuns
-        })
+        ...createBookmarkedContent(options.bookmarkId, revisionRuns)
       );
     } else {
       children.push(...revisionRuns);
@@ -4509,10 +4523,7 @@ function createHeading(text, level, theme, _themeName, options = {}) {
       headingTextChildren.push(...makeHeadingRuns(normalizedText));
     }
     children.push(
-      new Bookmark({
-        id: options.bookmarkId,
-        children: headingTextChildren
-      })
+      ...createBookmarkedContent(options.bookmarkId, headingTextChildren)
     );
   } else {
     if (hasInlineSyntax) {
@@ -4704,9 +4715,7 @@ function createList(items, _theme, _themeName, options = {}) {
     let itemContent = textRuns;
     if (itemId) {
       globalBookmarkRegistry.register(itemId, itemText, "list-item");
-      itemContent = [
-        new Bookmark({ id: itemId, children: textRuns })
-      ];
+      itemContent = createBookmarkedContent(itemId, textRuns);
     }
     const paragraphChildren = [
       ...commentAnchor && index === firstRendered ? commentAnchor.start : [],
@@ -6701,8 +6710,8 @@ import {
   Paragraph as Paragraph9,
   TextRun as TextRun9,
   AlignmentType as AlignmentType5,
-  BookmarkStart as BookmarkStart2,
-  BookmarkEnd as BookmarkEnd2
+  BookmarkStart as BookmarkStart3,
+  BookmarkEnd as BookmarkEnd3
 } from "docx";
 init_defaults();
 init_styleHelpers();
@@ -7911,23 +7920,23 @@ async function renderTableComponent(component, theme, themeName) {
 }
 
 // src/components/section.ts
-import { Paragraph as Paragraph6, BookmarkStart, BookmarkEnd } from "docx";
+import { Paragraph as Paragraph6, BookmarkStart as BookmarkStart2, BookmarkEnd as BookmarkEnd2 } from "docx";
 
 // src/core/sectionBookmarks.ts
 import { AsyncLocalStorage as AsyncLocalStorage8 } from "async_hooks";
 var NESTED_LINK_ID_BASE = 1e6;
-function createState3() {
+function createState4() {
   return { nextNested: 1, resolved: /* @__PURE__ */ new WeakMap() };
 }
 var SectionBookmarkRegistry = class {
-  fallback = createState3();
+  fallback = createState4();
   scopes = new AsyncLocalStorage8();
   get state() {
     return this.scopes.getStore() ?? this.fallback;
   }
   /** Run work with an isolated registry that follows its async call chain. */
   runScoped(callback) {
-    return this.scopes.run(createState3(), callback);
+    return this.scopes.run(createState4(), callback);
   }
   /**
    * The bookmark for a layout section, derived from its ordinal.
@@ -7958,7 +7967,7 @@ var SectionBookmarkRegistry = class {
   /** Test-only: reset the unscoped fallback counters. */
   clear() {
     if (!this.scopes.getStore()) {
-      this.fallback = createState3();
+      this.fallback = createState4();
     }
   }
 };
@@ -7971,7 +7980,7 @@ async function renderSectionComponent(component, theme, themeName, context) {
   const { id: sectionBookmarkId, linkId: bookmarkLinkId } = globalSectionBookmarkRegistry.forSectionComponent(component);
   elements.push(
     new Paragraph6({
-      children: [new BookmarkStart(sectionBookmarkId, bookmarkLinkId)],
+      children: [new BookmarkStart2(sectionBookmarkId, bookmarkLinkId)],
       spacing: {
         before: 0,
         after: 0,
@@ -7999,7 +8008,7 @@ async function renderSectionComponent(component, theme, themeName, context) {
   }
   elements.push(
     new Paragraph6({
-      children: [new BookmarkEnd(bookmarkLinkId)],
+      children: [new BookmarkEnd2(bookmarkLinkId)],
       spacing: {
         before: 0,
         after: 0,
@@ -9036,7 +9045,7 @@ async function renderSection(section, theme, themeName, context, sectionOrdinal,
   if (sectionBookmarkId && isFirstLayoutOfUserSection && sharedLinkId !== void 0) {
     elements.push(
       new Paragraph9({
-        children: [new BookmarkStart2(sectionBookmarkId, sharedLinkId)],
+        children: [new BookmarkStart3(sectionBookmarkId, sharedLinkId)],
         spacing: {
           before: 0,
           after: 0,
@@ -9061,7 +9070,7 @@ async function renderSection(section, theme, themeName, context, sectionOrdinal,
   if (closeBookmark && sharedLinkId !== void 0) {
     elements.push(
       new Paragraph9({
-        children: [new BookmarkEnd2(sharedLinkId)]
+        children: [new BookmarkEnd3(sharedLinkId)]
       })
     );
   }