@superdoc-dev/cli 0.11.0-next.17 → 0.11.0-next.19

package/dist/index.js

@@ -217927,7 +217927,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CbHUN3NA.es.js
+// ../../packages/superdoc/dist/chunks/src-IynDnUzG.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -249567,6 +249567,8 @@ function metadataGetWrapper(editor, input2) {
   return findEntry(getConvertedXml2(editor), input2.id);
 }
 function metadataResolveWrapper(editor, input2) {
+  if (!hasPayloadEntry(getConvertedXml2(editor), input2.id))
+    return null;
   const target = resolveAnchorTarget(editor, input2.id);
   return target ? {
     id: input2.id,
@@ -256391,6 +256393,17 @@ function compactSnapshotObject(input2) {
   }
   return out;
 }
+function applyLayoutIdentityDataset(element3, identity) {
+  if (!identity) {
+    delete element3.dataset[DATASET_KEYS.LAYOUT_FRAGMENT_ID];
+    delete element3.dataset[DATASET_KEYS.LAYOUT_BLOCK_REF];
+    delete element3.dataset[DATASET_KEYS.LAYOUT_STORY];
+    return;
+  }
+  element3.dataset[DATASET_KEYS.LAYOUT_FRAGMENT_ID] = identity.fragmentId;
+  element3.dataset[DATASET_KEYS.LAYOUT_BLOCK_REF] = identity.blockRef;
+  element3.dataset[DATASET_KEYS.LAYOUT_STORY] = encodeLayoutStoryDataset(identity.story);
+}
 function applySourceAnchorDataset(element3, sourceAnchor) {
   if (!sourceAnchor) {
     delete element3.dataset.sourceAnchor;
@@ -256430,6 +256443,27 @@ function readNearestSourceAnchor(element3) {
     return;
   return readSourceAnchorDataset(element3) ?? readSourceAnchorDataset(element3.closest(`.${CLASS_NAMES$1.fragment}`));
 }
+function readLayoutIdentityDataset(element3) {
+  if (!element3)
+    return;
+  const fragmentId = element3.dataset?.[DATASET_KEYS.LAYOUT_FRAGMENT_ID];
+  const blockRef = element3.dataset?.[DATASET_KEYS.LAYOUT_BLOCK_REF];
+  const story = decodeLayoutStoryDataset(element3.dataset?.[DATASET_KEYS.LAYOUT_STORY]);
+  if (!fragmentId || !blockRef || story.kind === "unknown")
+    return;
+  return compactSnapshotObject({
+    schema: LAYOUT_BOUNDARY_SCHEMA,
+    story,
+    blockRef,
+    fragmentId,
+    sourceAnchor: readNearestSourceAnchor(element3)
+  });
+}
+function readNearestLayoutSourceIdentity(element3) {
+  if (!element3)
+    return;
+  return readLayoutIdentityDataset(element3) ?? readLayoutIdentityDataset(element3.closest(`.${CLASS_NAMES$1.fragment}`));
+}
 function shouldIncludeInlineImageSnapshotElement(element3) {
   if (element3.classList.contains(DOM_CLASS_NAMES.INLINE_IMAGE_CLIP_WRAPPER))
     return true;
@@ -256456,7 +256490,8 @@ function collectPaintSnapshotEntitiesFromDomRoot(rootEl) {
       pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd),
       fieldId: element3.dataset.fieldId || null,
       fieldType: element3.dataset.fieldType || null,
-      type: element3.dataset.type || null
+      type: element3.dataset.type || null,
+      layoutSourceIdentity: readNearestLayoutSourceIdentity(element3)
     }));
   }
   const blockSdtElements = Array.from(rootEl.querySelectorAll(`.${DOM_CLASS_NAMES.BLOCK_SDT}[data-sdt-id]`));
@@ -256470,7 +256505,8 @@ function collectPaintSnapshotEntitiesFromDomRoot(rootEl) {
       pageIndex,
       sdtId,
       pmStart: readSnapshotDatasetNumber(element3.dataset.pmStart),
-      pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd)
+      pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd),
+      layoutSourceIdentity: readNearestLayoutSourceIdentity(element3)
     }));
   }
   const inlineSdtElements = Array.from(rootEl.querySelectorAll(`.${DOM_CLASS_NAMES.INLINE_SDT_WRAPPER}[data-sdt-id]`));
@@ -256484,7 +256520,8 @@ function collectPaintSnapshotEntitiesFromDomRoot(rootEl) {
       pageIndex,
       sdtId,
       pmStart: readSnapshotDatasetNumber(element3.dataset.pmStart),
-      pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd)
+      pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd),
+      layoutSourceIdentity: readNearestLayoutSourceIdentity(element3)
     }));
   }
   const inlineImageElements = Array.from(rootEl.querySelectorAll(`.${DOM_CLASS_NAMES.INLINE_IMAGE_CLIP_WRAPPER}[data-pm-start], .${DOM_CLASS_NAMES.INLINE_IMAGE}[data-pm-start]`));
@@ -256500,7 +256537,8 @@ function collectPaintSnapshotEntitiesFromDomRoot(rootEl) {
       kind: "inline",
       pmStart: readSnapshotDatasetNumber(element3.dataset.pmStart),
       pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd),
-      sourceAnchor: readNearestSourceAnchor(element3)
+      sourceAnchor: readNearestSourceAnchor(element3),
+      layoutSourceIdentity: readNearestLayoutSourceIdentity(element3)
     }));
   }
   const fragmentImageElements = Array.from(rootEl.querySelectorAll(`.${DOM_CLASS_NAMES.IMAGE_FRAGMENT}[data-pm-start]`));
@@ -256515,7 +256553,8 @@ function collectPaintSnapshotEntitiesFromDomRoot(rootEl) {
       pmStart: readSnapshotDatasetNumber(element3.dataset.pmStart),
       pmEnd: readSnapshotDatasetNumber(element3.dataset.pmEnd),
       blockId: element3.getAttribute("data-sd-block-id"),
-      sourceAnchor: readNearestSourceAnchor(element3)
+      sourceAnchor: readNearestSourceAnchor(element3),
+      layoutSourceIdentity: readNearestLayoutSourceIdentity(element3)
     }));
   }
   return entities;
@@ -257064,9 +257103,10 @@ function applyPaintVersions(item, visualVersion) {
   } else
     item.paintCacheVersion = visualVersion;
 }
-function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache) {
+function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, blockVersionCache, story) {
   const sdtContainerKey = resolveFragmentSdtContainerKey(fragment2, blockMap);
   const version$1 = fragmentSignature(fragment2, computeBlockVersion(fragment2.blockId, blockMap, blockVersionCache));
+  const layoutSourceIdentity = resolveFragmentLayoutIdentity(fragment2, story);
   switch (fragment2.kind) {
     case "table": {
       const item = resolveTableItem(fragment2, fragmentIndex, pageIndex, blockMap);
@@ -257074,6 +257114,7 @@ function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, bloc
         item.sdtContainerKey = sdtContainerKey;
       if (fragment2.sourceAnchor != null)
         item.sourceAnchor = fragment2.sourceAnchor;
+      item.layoutSourceIdentity = layoutSourceIdentity;
       applyPaintVersions(item, version$1);
       return item;
     }
@@ -257083,6 +257124,7 @@ function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, bloc
         item.sdtContainerKey = sdtContainerKey;
       if (fragment2.sourceAnchor != null)
         item.sourceAnchor = fragment2.sourceAnchor;
+      item.layoutSourceIdentity = layoutSourceIdentity;
       applyPaintVersions(item, version$1);
       return item;
     }
@@ -257092,6 +257134,7 @@ function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, bloc
         item.sdtContainerKey = sdtContainerKey;
       if (fragment2.sourceAnchor != null)
         item.sourceAnchor = fragment2.sourceAnchor;
+      item.layoutSourceIdentity = layoutSourceIdentity;
       applyPaintVersions(item, version$1);
       return item;
     }
@@ -257109,7 +257152,8 @@ function resolveFragmentItem(fragment2, fragmentIndex, pageIndex, blockMap, bloc
         fragment: fragment2,
         blockId: fragment2.blockId,
         fragmentIndex,
-        content: resolveParagraphContentIfApplicable(fragment2, blockMap)
+        content: resolveParagraphContentIfApplicable(fragment2, blockMap),
+        layoutSourceIdentity
       };
       if (sdtContainerKey != null)
         item.sdtContainerKey = sdtContainerKey;
@@ -257196,14 +257240,14 @@ function resolveLayout(input2) {
     resolved.layoutEpoch = layout.layoutEpoch;
   return resolved;
 }
-function resolveHeaderFooterLayout(layout, blocks2, measures) {
+function resolveHeaderFooterLayout(layout, blocks2, measures, story) {
   const pages = layout.pages.map((page) => {
     const blockMap = buildBlockMap(page.blocks ?? blocks2, page.measures ?? measures);
     const blockVersionCache = /* @__PURE__ */ new Map;
     return {
       number: page.number,
       numberText: page.numberText,
-      items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, page.number - 1, blockMap, blockVersionCache))
+      items: page.fragments.map((fragment2, fragmentIndex) => resolveFragmentItem(fragment2, fragmentIndex, page.number - 1, blockMap, blockVersionCache, story))
     };
   });
   return {
@@ -261755,6 +261799,13 @@ function layoutHeaderFooter(blocks2, measures, constraints, kind) {
   });
   if (kind === "footer" && constraints.pageHeight != null)
     normalizeFragmentsForRegion(layout.pages, blocks2, measures, kind, constraints);
+  const story = kind ? { kind } : undefined;
+  if (story)
+    for (const page of layout.pages)
+      page.fragments = page.fragments.map((fragment2) => ({
+        ...fragment2,
+        layoutSourceIdentity: buildLayoutSourceIdentityForFragment(fragment2, story)
+      }));
   const idToIndex = /* @__PURE__ */ new Map;
   for (let i4 = 0;i4 < blocks2.length; i4 += 1)
     idToIndex.set(blocks2[i4].id, i4);
@@ -275432,8 +275483,16 @@ function setSurfaceRangeEnd(range, entry, pos) {
   range.setEndAfter(entry.el);
   return true;
 }
-function resolveResult(result) {
-  return resolveHeaderFooterLayout(result.layout, result.blocks, result.measures);
+function buildHeaderFooterStory(kind, id2) {
+  const normalizedId = typeof id2 === "string" && id2.length > 0 ? id2 : undefined;
+  return normalizedId ? namedStoryLocator(kind, normalizedId) : { kind };
+}
+function storyIdFromHeaderFooterLayoutKey(key2) {
+  return key2.replace(/::s\d+$/, "");
+}
+function resolveResult(result, storyId) {
+  const story = buildHeaderFooterStory(result.kind, storyId ?? String(result.type));
+  return resolveHeaderFooterLayout(result.layout, result.blocks, result.measures, story);
 }
 function shiftResolvedPaintItemY(item, yOffset) {
   if (item.kind === "group")
@@ -275946,6 +276005,55 @@ var Node$13 = class Node$14 {
     return;
   const candidate = run2.pmEnd;
   return typeof candidate === "number" ? candidate : undefined;
+}, LAYOUT_BOUNDARY_SCHEMA = "layout-identity/1", bodyStoryLocator = () => ({ kind: "body" }), namedStoryLocator = (kind, id2) => id2 ? {
+  kind,
+  id: id2
+} : { kind: "unknown" }, computeLayoutFragmentId = (input2) => {
+  const story = input2.story ?? bodyStoryLocator();
+  const storySegment = story.kind === "body" ? "body" : `${story.kind}:${story.id ?? ""}`;
+  let variant;
+  if (input2.kind === "para")
+    variant = `para:${input2.fromLine ?? 0}:${input2.toLine ?? ""}`;
+  else if (input2.kind === "list-item")
+    variant = `list-item:${input2.itemId ?? ""}:${input2.fromLine ?? 0}:${input2.toLine ?? ""}`;
+  else if (input2.kind === "table") {
+    const partialKey = input2.partialRow ? `:${input2.partialRow.rowIndex ?? ""}:${input2.partialRow.fromLineByCell?.join(",") ?? ""}-${input2.partialRow.toLineByCell?.join(",") ?? ""}` : "";
+    variant = `table:${input2.fromRow ?? 0}:${input2.toRow ?? ""}${partialKey}`;
+  } else if (input2.kind === "image" || input2.kind === "drawing")
+    variant = `${input2.kind}:${input2.x ?? ""}:${input2.y ?? ""}`;
+  else
+    variant = input2.kind;
+  return `${storySegment}|${input2.blockId}|${variant}`;
+}, buildLayoutSourceIdentity = (input2) => ({
+  schema: LAYOUT_BOUNDARY_SCHEMA,
+  story: input2.story ?? bodyStoryLocator(),
+  blockRef: input2.blockId,
+  fragmentId: computeLayoutFragmentId(input2),
+  sourceAnchor: input2.sourceAnchor
+}), sameStoryLocator = (left$1, right$1) => left$1.kind === right$1.kind && (left$1.id ?? "") === (right$1.id ?? ""), shouldKeepExistingIdentity = (existing, story) => {
+  if (!story)
+    return true;
+  if (sameStoryLocator(existing.story, story))
+    return true;
+  return story.kind === "body" && existing.story.kind !== "body";
+}, buildLayoutSourceIdentityForFragment = (fragment2, story) => {
+  const existing = fragment2.layoutSourceIdentity;
+  if (existing && shouldKeepExistingIdentity(existing, story))
+    return existing;
+  return buildLayoutSourceIdentity({
+    blockId: fragment2.blockId,
+    story: story ?? existing?.story,
+    kind: fragment2.kind,
+    fromLine: fragment2.kind === "para" || fragment2.kind === "list-item" ? fragment2.fromLine : undefined,
+    toLine: fragment2.kind === "para" || fragment2.kind === "list-item" ? fragment2.toLine : undefined,
+    fromRow: fragment2.kind === "table" ? fragment2.fromRow : undefined,
+    toRow: fragment2.kind === "table" ? fragment2.toRow : undefined,
+    itemId: fragment2.kind === "list-item" ? fragment2.itemId : undefined,
+    x: fragment2.kind === "image" || fragment2.kind === "drawing" ? fragment2.x : undefined,
+    y: fragment2.kind === "image" || fragment2.kind === "drawing" ? fragment2.y : undefined,
+    partialRow: fragment2.kind === "table" ? fragment2.partialRow : undefined,
+    sourceAnchor: fragment2.sourceAnchor ?? existing?.sourceAnchor
+  });
 }, engines_exports, floor4, abs2, min$1 = (a2, b$1) => a2 < b$1 ? a2 : b$1, max$1 = (a2, b$1) => a2 > b$1 ? a2 : b$1, isNegativeZero2 = (n) => n !== 0 ? n < 0 : 1 / n < 0, BIT182, BIT192, BIT202, BIT212, BIT222, BIT232, BIT242, BIT252, BIT262, BIT272, BIT282, BIT292, BIT302, BIT312, MAX_SAFE_INTEGER4, MIN_SAFE_INTEGER2, isInteger4, create$23 = () => /* @__PURE__ */ new Set, every$1 = (arr, f2) => {
   for (let i4 = 0;i4 < arr.length; i4++)
     if (!f2(arr[i4], i4, arr))
@@ -286536,7 +286644,28 @@ var Node$13 = class Node$14 {
   if (!allowedRanges?.length)
     return false;
   return allowedRanges.some((allowed) => range.from >= allowed.from && range.to <= allowed.to);
-}, PermissionRanges, Protection, DOM_CLASS_NAMES, DATA_ATTRS, DATASET_KEYS, DRAGGABLE_SELECTOR, VerticalNavigationPluginKey, createDefaultState = () => ({ goalX: null }), VerticalNavigation, STRONG_RTL_CHAR_RE$1, STRONG_LTR_CHAR_RE, isStrongRtl = (char) => STRONG_RTL_CHAR_RE$1.test(char), isStrongLtr = (char) => STRONG_LTR_CHAR_RE.test(char), hasMixedDirectionBoundary = (leftChar, rightChar) => isStrongRtl(leftChar) && isStrongLtr(rightChar) || isStrongLtr(leftChar) && isStrongRtl(rightChar), resolveCaretPoint = (doc$12, range) => {
+}, PermissionRanges, Protection, DOM_CLASS_NAMES, DATA_ATTRS, DATASET_KEYS, encodeLayoutStoryDataset = (story) => story.kind === "body" ? "body" : story.id ? `${story.kind}:${story.id}` : story.kind, decodeLayoutStoryDataset = (raw) => {
+  if (!raw)
+    return { kind: "unknown" };
+  if (raw === "body")
+    return { kind: "body" };
+  const idx = raw.indexOf(":");
+  const kind = idx === -1 ? raw : raw.slice(0, idx);
+  const id2 = idx === -1 ? undefined : raw.slice(idx + 1);
+  switch (kind) {
+    case "body":
+    case "header":
+    case "footer":
+    case "footnote":
+    case "endnote":
+      return id2 ? {
+        kind,
+        id: id2
+      } : { kind };
+    default:
+      return { kind: "unknown" };
+  }
+}, DRAGGABLE_SELECTOR, VerticalNavigationPluginKey, createDefaultState = () => ({ goalX: null }), VerticalNavigation, STRONG_RTL_CHAR_RE$1, STRONG_LTR_CHAR_RE, isStrongRtl = (char) => STRONG_RTL_CHAR_RE$1.test(char), isStrongLtr = (char) => STRONG_LTR_CHAR_RE.test(char), hasMixedDirectionBoundary = (leftChar, rightChar) => isStrongRtl(leftChar) && isStrongLtr(rightChar) || isStrongLtr(leftChar) && isStrongRtl(rightChar), resolveCaretPoint = (doc$12, range) => {
   const rect = range.getBoundingClientRect();
   if (rect && Number.isFinite(rect.left) && Number.isFinite(rect.top)) {
     if (rect.width === 0 && rect.height === 0)
@@ -294468,7 +294597,21 @@ menclose::after {
   menclose.setAttribute("notation", notations.join(" "));
   menclose.appendChild(innerMrow);
   return menclose;
-}, MATHML_NS = "http://www.w3.org/1998/Math/MathML", MATH_OBJECT_REGISTRY, ARGUMENT_ELEMENTS, LIST_MARKER_GAP$1 = 8, DEFAULT_PAGE_HEIGHT_PX = 1056, DEFAULT_VIRTUALIZED_PAGE_GAP = 72, LINK_DATASET_KEYS, MAX_HREF_LENGTH = 2048, SAFE_ANCHOR_PATTERN, MAX_DATA_URL_LENGTH, VALID_IMAGE_DATA_URL, SVG_NS = "http://www.w3.org/2000/svg", WORDART_LINE_FILL_RATIO = 0.9, MAX_RESIZE_MULTIPLIER = 3, FALLBACK_MAX_DIMENSION = 1000, MIN_IMAGE_DIMENSION = 20, AMBIGUOUS_LINK_PATTERNS, linkMetrics, TRACK_CHANGE_BASE_CLASS, TRACK_CHANGE_MODIFIER_CLASS, LINK_TARGET_SET, normalizeAnchor$1 = (value) => {
+}, MATHML_NS = "http://www.w3.org/1998/Math/MathML", MATH_OBJECT_REGISTRY, ARGUMENT_ELEMENTS, resolveOrBuildFragmentIdentity = (fragment2, story, existing) => buildLayoutSourceIdentityForFragment(existing ? {
+  ...fragment2,
+  layoutSourceIdentity: existing,
+  sourceAnchor: fragment2.sourceAnchor ?? existing.sourceAnchor
+} : fragment2, story), resolveSectionStory = (section) => {
+  if (!section || section === "body")
+    return;
+  return { kind: section };
+}, resolveDecorationStory = (kind, data) => {
+  const id2 = data.headerFooterRefId ?? data.sectionType;
+  return typeof id2 === "string" && id2.length > 0 ? {
+    kind,
+    id: id2
+  } : { kind };
+}, LIST_MARKER_GAP$1 = 8, DEFAULT_PAGE_HEIGHT_PX = 1056, DEFAULT_VIRTUALIZED_PAGE_GAP = 72, LINK_DATASET_KEYS, MAX_HREF_LENGTH = 2048, SAFE_ANCHOR_PATTERN, MAX_DATA_URL_LENGTH, VALID_IMAGE_DATA_URL, SVG_NS = "http://www.w3.org/2000/svg", WORDART_LINE_FILL_RATIO = 0.9, MAX_RESIZE_MULTIPLIER = 3, FALLBACK_MAX_DIMENSION = 1000, MIN_IMAGE_DIMENSION = 20, AMBIGUOUS_LINK_PATTERNS, linkMetrics, TRACK_CHANGE_BASE_CLASS, TRACK_CHANGE_MODIFIER_CLASS, LINK_TARGET_SET, normalizeAnchor$1 = (value) => {
   if (typeof value !== "string")
     return null;
   const trimmed = value.trim();
@@ -295212,7 +295355,9 @@ menclose::after {
     return `{${Object.keys(record).sort().filter((key2) => record[key2] !== undefined).map((key2) => `${JSON.stringify(key2)}:${stableSerializeEvidenceValue(record[key2])}`).join(",")}}`;
   }
   return JSON.stringify(String(value));
-}, sourceAnchorSignature = (sourceAnchor) => sourceAnchor ? stableSerializeEvidenceValue(sourceAnchor) : "", deriveBlockVersion = (block) => {
+}, sourceAnchorSignature = (sourceAnchor) => sourceAnchor ? stableSerializeEvidenceValue(sourceAnchor) : "", resolveFragmentLayoutIdentity = (fragment2, story) => {
+  return buildLayoutSourceIdentityForFragment(fragment2, story);
+}, deriveBlockVersion = (block) => {
   if (block.kind === "paragraph") {
     const markerVersion = hasListMarkerProperties(block.attrs) ? `marker:${block.attrs.numberingProperties.numId ?? ""}:${block.attrs.numberingProperties.ilvl ?? 0}:${block.attrs.wordLayout?.marker?.markerText ?? ""}` : "";
     const runsVersion = block.runs.map((run2) => {
@@ -304579,14 +304724,14 @@ menclose::after {
   }
   set headerLayoutResults(results) {
     this.#headerLayoutResults = results;
-    this.#resolvedHeaderLayouts = results ? results.map(resolveResult) : null;
+    this.#resolvedHeaderLayouts = results ? results.map((result) => resolveResult(result)) : null;
   }
   get footerLayoutResults() {
     return this.#footerLayoutResults;
   }
   set footerLayoutResults(results) {
     this.#footerLayoutResults = results;
-    this.#resolvedFooterLayouts = results ? results.map(resolveResult) : null;
+    this.#resolvedFooterLayouts = results ? results.map((result) => resolveResult(result)) : null;
   }
   get headerLayoutsByRId() {
     return this.#headerLayoutsByRId;
@@ -304641,8 +304786,8 @@ menclose::after {
   setLayoutResults(headerResults, footerResults) {
     this.#headerLayoutResults = headerResults;
     this.#footerLayoutResults = footerResults;
-    this.#resolvedHeaderLayouts = headerResults ? headerResults.map(resolveResult) : null;
-    this.#resolvedFooterLayouts = footerResults ? footerResults.map(resolveResult) : null;
+    this.#resolvedHeaderLayouts = headerResults ? headerResults.map((result) => resolveResult(result)) : null;
+    this.#resolvedFooterLayouts = footerResults ? footerResults.map((result) => resolveResult(result)) : null;
   }
   initialize() {
     if (!this.#options.editor)
@@ -305337,10 +305482,10 @@ menclose::after {
     });
     this.#resolvedHeaderByRId.clear();
     for (const [key2, result] of this.#headerLayoutsByRId)
-      this.#resolvedHeaderByRId.set(key2, resolveResult(result));
+      this.#resolvedHeaderByRId.set(key2, resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
     this.#resolvedFooterByRId.clear();
     for (const [key2, result] of this.#footerLayoutsByRId)
-      this.#resolvedFooterByRId.set(key2, resolveResult(result));
+      this.#resolvedFooterByRId.set(key2, resolveResult(result, storyIdFromHeaderFooterLayoutKey(key2)));
   }
   #computeMetrics(kind, layoutHeight, box, pageHeight, footerMargin) {
     const validatedLayoutHeight = Number.isFinite(layoutHeight) && layoutHeight >= 0 ? layoutHeight : 0;
@@ -305738,13 +305883,13 @@ menclose::after {
     this.#footerDecorationProvider = this.createDecorationProvider("footer", resolvedLayout);
     this.rebuildRegions(resolvedLayout);
   }
-  resolveAlignedDecorationItems(fragments, slotPageNumber, result, cachedResolvedLayout, contextLabel) {
+  resolveAlignedDecorationItems(fragments, slotPageNumber, result, cachedResolvedLayout, contextLabel, storyId) {
     const cachedItems = cachedResolvedLayout?.pages.find((page) => page.number === slotPageNumber)?.items;
     if (cachedItems && cachedItems.length === fragments.length)
       return cachedItems;
     if (cachedItems)
       console.warn(`[HeaderFooterSessionManager] Resolved items length (${cachedItems.length}) does not match fragments length (${fragments.length}) for ${contextLabel}. Recomputing items.`);
-    const freshItems = resolveHeaderFooterLayout(result.layout, result.blocks, result.measures).pages.find((page) => page.number === slotPageNumber)?.items;
+    const freshItems = resolveResult(result, storyId).pages.find((page) => page.number === slotPageNumber)?.items;
     if (freshItems && freshItems.length === fragments.length)
       return freshItems;
     if (freshItems)
@@ -305805,7 +305950,7 @@ menclose::after {
           if (slotPage$1) {
             const fragments$1 = slotPage$1.fragments ?? [];
             const rIdResolvedLayout = resolvedByRId.get(rIdLayoutKey);
-            const alignedItems = this.resolveAlignedDecorationItems(fragments$1, slotPage$1.number, rIdLayout, rIdResolvedLayout, `rId '${rIdLayoutKey}' page ${pageNumber}`);
+            const alignedItems = this.resolveAlignedDecorationItems(fragments$1, slotPage$1.number, rIdLayout, rIdResolvedLayout, `rId '${rIdLayoutKey}' page ${pageNumber}`, sectionRId);
             if (!alignedItems)
               return null;
             const pageHeight$1 = page?.height ?? resolvedLayout.pages[0]?.height ?? layoutOptions.pageSize?.h ?? defaultPageSize.h;
@@ -305853,8 +305998,10 @@ menclose::after {
       if (!slotPage)
         return null;
       const fragments = slotPage.fragments ?? [];
+      const fallbackId = this.#headerFooterManager?.getVariantId(kind, headerFooterType);
+      const finalHeaderId = sectionRId ?? fallbackId ?? undefined;
       const resolvedVariant = resolvedResults?.[variantIndex];
-      const alignedVariantItems = this.resolveAlignedDecorationItems(fragments, slotPage.number, variant, resolvedVariant, `variant '${headerFooterType}' page ${pageNumber}`);
+      const alignedVariantItems = this.resolveAlignedDecorationItems(fragments, slotPage.number, variant, resolvedVariant, `variant '${headerFooterType}' page ${pageNumber}`, finalHeaderId ?? headerFooterType);
       if (!alignedVariantItems)
         return null;
       const pageHeight = page?.height ?? resolvedLayout.pages[0]?.height ?? layoutOptions.pageSize?.h ?? defaultPageSize.h;
@@ -305863,8 +306010,6 @@ menclose::after {
       const box = this.#computeDecorationBox(kind, decorationMargins, pageHeight);
       const rawLayoutHeight = variant.layout.height ?? 0;
       const metrics = this.#computeMetrics(kind, rawLayoutHeight, box, pageHeight, margins?.footer ?? 0);
-      const fallbackId = this.#headerFooterManager?.getVariantId(kind, headerFooterType);
-      const finalHeaderId = sectionRId ?? fallbackId ?? undefined;
       const layoutMinY = variant.layout.minY ?? 0;
       return {
         fragments: normalizeDecorationFragments(fragments, layoutMinY),
@@ -306166,7 +306311,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_CbHUN3NA_es = __esm(() => {
+var init_src_IynDnUzG_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_CzwJ7ds9_es();
   init_jszip_C49i9kUs_es();
@@ -324582,7 +324727,11 @@ function print() { __p += __j.call(arguments, '') }
     DRAGGABLE: "data-draggable",
     DISPLAY_LABEL: "data-display-label",
     VARIANT: "data-variant",
-    TYPE: "data-type"
+    TYPE: "data-type",
+    LAYOUT_BOUNDARY_SCHEMA: "data-layout-boundary-schema",
+    LAYOUT_FRAGMENT_ID: "data-layout-fragment-id",
+    LAYOUT_STORY: "data-layout-story",
+    LAYOUT_BLOCK_REF: "data-layout-block-ref"
   };
   DATASET_KEYS = {
     PM_START: "pmStart",
@@ -324596,7 +324745,11 @@ function print() { __p += __j.call(arguments, '') }
     DRAGGABLE: "draggable",
     DISPLAY_LABEL: "displayLabel",
     VARIANT: "variant",
-    TYPE: "type"
+    TYPE: "type",
+    LAYOUT_BOUNDARY_SCHEMA: "layoutBoundarySchema",
+    LAYOUT_FRAGMENT_ID: "layoutFragmentId",
+    LAYOUT_STORY: "layoutStory",
+    LAYOUT_BLOCK_REF: "layoutBlockRef"
   };
   `${DOM_CLASS_NAMES.BLOCK_SDT}${DATA_ATTRS.SDT_ID}`;
   DRAGGABLE_SELECTOR = `[${DATA_ATTRS.DRAGGABLE}="true"]`;
@@ -332773,7 +332926,8 @@ function print() { __p += __j.call(arguments, '') }
         style: style2,
         markers,
         tabs,
-        sourceAnchor: readNearestSourceAnchor(lineEl) ?? readNearestSourceAnchor(options.wrapperEl) ?? options.sourceAnchor
+        sourceAnchor: readNearestSourceAnchor(lineEl) ?? readNearestSourceAnchor(options.wrapperEl) ?? options.sourceAnchor,
+        layoutSourceIdentity: readNearestLayoutSourceIdentity(lineEl) ?? readNearestLayoutSourceIdentity(options.wrapperEl)
       }));
       page.lineCount += 1;
       builder.lineCount += 1;
@@ -332811,7 +332965,8 @@ function print() { __p += __j.call(arguments, '') }
             style: snapshotLineStyleFromElement(lineEl),
             markers,
             tabs,
-            sourceAnchor: readNearestSourceAnchor(lineEl)
+            sourceAnchor: readNearestSourceAnchor(lineEl),
+            layoutSourceIdentity: readNearestLayoutSourceIdentity(lineEl)
           }));
         }
         const pageNumberRaw = pageEl.dataset?.pageNumber;
@@ -333234,6 +333389,7 @@ function print() { __p += __j.call(arguments, '') }
       el.dataset.layoutEpoch = String(this.layoutEpoch);
       el.dataset.pageNumber = String(page.number);
       el.dataset.pageIndex = String(pageIndex);
+      el.dataset[DATASET_KEYS.LAYOUT_BOUNDARY_SCHEMA] = LAYOUT_BOUNDARY_SCHEMA;
       if (!this.isSemanticFlow && this.options.ruler?.enabled) {
         const rulerEl = this.renderPageRuler(width, page);
         if (rulerEl)
@@ -333456,6 +333612,7 @@ function print() { __p += __j.call(arguments, '') }
         pageNumber: page.number,
         totalPages: this.totalPages,
         section: kind,
+        story: resolveDecorationStory(kind, data),
         pageNumberText: page.numberText,
         pageIndex
       };
@@ -333694,6 +333851,7 @@ function print() { __p += __j.call(arguments, '') }
       applyStyles(el, pageStyles(page.width, page.height, this.getEffectivePageStyles()));
       this.applySemanticPageOverrides(el);
       el.dataset.layoutEpoch = String(this.layoutEpoch);
+      el.dataset[DATASET_KEYS.LAYOUT_BOUNDARY_SCHEMA] = LAYOUT_BOUNDARY_SCHEMA;
       const contextBase = {
         pageNumber: page.number,
         totalPages: this.totalPages,
@@ -333793,9 +333951,9 @@ function print() { __p += __j.call(arguments, '') }
           overflow: "visible"
         } : fragmentStyles);
         if (resolvedItem)
-          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section);
+          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section, context.story);
         else
-          this.applyFragmentFrame(fragmentEl, fragment2, context.section);
+          this.applyFragmentFrame(fragmentEl, fragment2, context.section, context.story);
         if (isTocEntry)
           fragmentEl.classList.add("superdoc-toc-entry");
         if (paraContinuesFromPrev)
@@ -333923,6 +334081,7 @@ function print() { __p += __j.call(arguments, '') }
             this.capturePaintSnapshotLine(lineEl, context, {
               inTableFragment: false,
               inTableParagraph: false,
+              wrapperEl: fragmentEl,
               sourceAnchor: resolvedItem?.sourceAnchor
             });
             fragmentEl.appendChild(lineEl);
@@ -334062,6 +334221,7 @@ function print() { __p += __j.call(arguments, '') }
             this.capturePaintSnapshotLine(lineEl, context, {
               inTableFragment: false,
               inTableParagraph: false,
+              wrapperEl: fragmentEl,
               sourceAnchor: resolvedItem?.sourceAnchor
             });
             fragmentEl.appendChild(lineEl);
@@ -334144,13 +334304,14 @@ function print() { __p += __j.call(arguments, '') }
         fragmentEl.classList.add(CLASS_NAMES$1.fragment, `${CLASS_NAMES$1.fragment}-list-item`);
         applyStyles(fragmentEl, fragmentStyles);
         if (resolvedItem)
-          this.applyResolvedListItemWrapperFrame(fragmentEl, fragment2, resolvedItem, context.section);
+          this.applyResolvedListItemWrapperFrame(fragmentEl, fragment2, resolvedItem, context.section, context.story);
         else {
           fragmentEl.style.left = `${fragment2.x - fragment2.markerWidth}px`;
           fragmentEl.style.top = `${fragment2.y}px`;
           fragmentEl.style.width = `${fragment2.markerWidth + fragment2.width}px`;
           fragmentEl.dataset.blockId = fragment2.blockId;
           applySourceAnchorDataset(fragmentEl, fragment2.sourceAnchor);
+          applyLayoutIdentityDataset(fragmentEl, resolveOrBuildFragmentIdentity(fragment2, context.story));
         }
         fragmentEl.dataset.itemId = fragment2.itemId;
         const paragraphMetadata = item.paragraph.attrs?.sdt;
@@ -334219,6 +334380,7 @@ function print() { __p += __j.call(arguments, '') }
           this.capturePaintSnapshotLine(lineEl, context, {
             inTableFragment: false,
             inTableParagraph: false,
+            wrapperEl: fragmentEl,
             sourceAnchor: resolvedItem?.sourceAnchor
           });
           contentEl.appendChild(lineEl);
@@ -334244,9 +334406,9 @@ function print() { __p += __j.call(arguments, '') }
         fragmentEl.classList.add(CLASS_NAMES$1.fragment, DOM_CLASS_NAMES.IMAGE_FRAGMENT);
         applyStyles(fragmentEl, fragmentStyles);
         if (resolvedItem)
-          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section);
+          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section, context.story);
         else {
-          this.applyFragmentFrame(fragmentEl, fragment2, context.section);
+          this.applyFragmentFrame(fragmentEl, fragment2, context.section, context.story);
           fragmentEl.style.height = `${fragment2.height}px`;
           this.applyFragmentWrapperZIndex(fragmentEl, fragment2);
         }
@@ -334361,9 +334523,9 @@ function print() { __p += __j.call(arguments, '') }
         fragmentEl.classList.add(CLASS_NAMES$1.fragment, "superdoc-drawing-fragment");
         applyStyles(fragmentEl, fragmentStyles);
         if (resolvedItem)
-          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section);
+          this.applyResolvedFragmentFrame(fragmentEl, resolvedItem, fragment2, context.section, context.story);
         else {
-          this.applyFragmentFrame(fragmentEl, fragment2, context.section);
+          this.applyFragmentFrame(fragmentEl, fragment2, context.section, context.story);
           fragmentEl.style.height = `${fragment2.height}px`;
           this.applyFragmentWrapperZIndex(fragmentEl, fragment2);
         }
@@ -335042,7 +335204,7 @@ function print() { __p += __j.call(arguments, '') }
         if (!this.doc)
           throw new Error("DomPainter: document is not available");
         const applyFragmentFrameWithSection = (el$1, frag) => {
-          this.applyFragmentFrame(el$1, frag, context.section);
+          this.applyFragmentFrame(el$1, frag, context.section, context.story);
         };
         const tableCellExpandedRunsCache = /* @__PURE__ */ new WeakMap;
         const renderLineForTableCell = (block, line, ctx$1, lineIndex, isLastLine, resolvedListTextStartPx) => {
@@ -335091,7 +335253,7 @@ function print() { __p += __j.call(arguments, '') }
           applyStyles
         });
         if (resolvedItem) {
-          this.applyResolvedFragmentFrame(el, resolvedItem, fragment2, context.section);
+          this.applyResolvedFragmentFrame(el, resolvedItem, fragment2, context.section, context.story);
           if (sdtBoundary?.widthOverride != null)
             el.style.width = `${sdtBoundary.widthOverride}px`;
         }
@@ -336260,27 +336422,29 @@ function print() { __p += __j.call(arguments, '') }
     }
     updateFragmentElement(el, fragment2, section, resolvedItem) {
       const fragmentItem = resolvedItem?.kind === "fragment" ? resolvedItem : undefined;
+      const story = resolveSectionStory(section);
       if (fragment2.kind === "list-item" && fragmentItem) {
-        this.applyResolvedListItemWrapperFrame(el, fragment2, fragmentItem, section);
+        this.applyResolvedListItemWrapperFrame(el, fragment2, fragmentItem, section, story);
         return;
       }
       if (fragmentItem)
-        this.applyResolvedFragmentFrame(el, fragmentItem, fragment2, section);
+        this.applyResolvedFragmentFrame(el, fragmentItem, fragment2, section, story);
       else {
-        this.applyFragmentFrame(el, fragment2, section);
+        this.applyFragmentFrame(el, fragment2, section, story);
         if (fragment2.kind === "image" || fragment2.kind === "drawing") {
           el.style.height = `${fragment2.height}px`;
           this.applyFragmentWrapperZIndex(el, fragment2);
         }
       }
     }
-    applyFragmentFrame(el, fragment2, section) {
+    applyFragmentFrame(el, fragment2, section, story) {
       el.style.left = `${fragment2.x}px`;
       el.style.top = `${fragment2.y}px`;
       el.style.width = `${fragment2.width}px`;
       el.dataset.blockId = fragment2.blockId;
       el.dataset.layoutEpoch = String(this.layoutEpoch);
       applySourceAnchorDataset(el, fragment2.sourceAnchor);
+      applyLayoutIdentityDataset(el, resolveOrBuildFragmentIdentity(fragment2, story ?? resolveSectionStory(section)));
       if (typeof fragment2.blockId === "string" && fragment2.blockId.startsWith("footnote-"))
         el.setAttribute("contenteditable", "false");
       if (fragment2.kind === "para") {
@@ -336355,20 +336519,24 @@ function print() { __p += __j.call(arguments, '') }
     applyFragmentWrapperZIndex(el, fragment2, resolvedZIndex) {
       el.style.zIndex = this.resolveFragmentWrapperZIndex(fragment2, resolvedZIndex);
     }
-    applyResolvedFragmentFrame(el, item, fragment2, section) {
+    applyResolvedFragmentFrame(el, item, fragment2, section, story) {
       el.style.left = `${item.x}px`;
       el.style.top = `${item.y}px`;
       el.style.width = `${item.width}px`;
       el.dataset.blockId = item.blockId;
       el.dataset.layoutEpoch = String(this.layoutEpoch);
       applySourceAnchorDataset(el, item.sourceAnchor);
+      applyLayoutIdentityDataset(el, resolveOrBuildFragmentIdentity(fragment2, story ?? resolveSectionStory(section), item.layoutSourceIdentity ? {
+        ...item.layoutSourceIdentity,
+        sourceAnchor: item.sourceAnchor ?? item.layoutSourceIdentity.sourceAnchor
+      } : undefined));
       this.applyFragmentWrapperZIndex(el, fragment2, item.zIndex);
       if (item.fragmentKind === "image" || item.fragmentKind === "drawing" || item.fragmentKind === "table")
         el.style.height = `${item.height}px`;
       this.applyFragmentPmAttributes(el, fragment2, section, item);
     }
-    applyResolvedListItemWrapperFrame(el, fragment2, item, section) {
-      this.applyResolvedFragmentFrame(el, item, fragment2, section);
+    applyResolvedListItemWrapperFrame(el, fragment2, item, section, story) {
+      this.applyResolvedFragmentFrame(el, item, fragment2, section, story);
       const mw = item.markerWidth ?? 0;
       el.style.left = `${item.x - mw}px`;
       el.style.width = `${item.width + mw}px`;
@@ -343865,9 +344033,9 @@ function print() { __p += __j.call(arguments, '') }
   ];
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-BNIXtF7U.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-naojUqQe.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_BNIXtF7U_es = __esm(() => {
+var init_create_super_doc_ui_naojUqQe_es = __esm(() => {
   init_SuperConverter_CzwJ7ds9_es();
   init_create_headless_toolbar_BQTnHkb4_es();
   MOD_ALIASES = new Set([
@@ -343911,7 +344079,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CbHUN3NA_es();
+  init_src_IynDnUzG_es();
   init_SuperConverter_CzwJ7ds9_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -343920,7 +344088,7 @@ var init_super_editor_es = __esm(() => {
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_CZMPWpOp_es();
-  init_create_super_doc_ui_BNIXtF7U_es();
+  init_create_super_doc_ui_naojUqQe_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.11.0-next.17",
+  "version": "0.11.0-next.19",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -24,9 +24,9 @@
     "@types/node": "22.19.2",
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
-    "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/super-editor": "0.0.1",
+    "@superdoc/pm-adapter": "0.0.0",
     "superdoc": "1.33.1"
   },
   "module": "src/index.ts",
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.11.0-next.17",
-    "@superdoc-dev/cli-darwin-x64": "0.11.0-next.17",
-    "@superdoc-dev/cli-linux-x64": "0.11.0-next.17",
-    "@superdoc-dev/cli-windows-x64": "0.11.0-next.17",
-    "@superdoc-dev/cli-linux-arm64": "0.11.0-next.17"
+    "@superdoc-dev/cli-darwin-arm64": "0.11.0-next.19",
+    "@superdoc-dev/cli-linux-x64": "0.11.0-next.19",
+    "@superdoc-dev/cli-windows-x64": "0.11.0-next.19",
+    "@superdoc-dev/cli-darwin-x64": "0.11.0-next.19",
+    "@superdoc-dev/cli-linux-arm64": "0.11.0-next.19"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",