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

package/dist/index.js

@@ -65610,7 +65610,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-D6fPzZYT.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-Dn6cDET4.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -117174,7 +117174,6 @@ var isRegExp = (value) => {
   const attributes = {
     "w:id": String(commentId),
     "w:author": comment.creatorName || comment.importedAuthor?.name,
-    "w:email": comment.creatorEmail || comment.importedAuthor?.email,
     "w:date": toIsoNoFractional(comment.createdTime),
     "w:initials": getInitials(comment.creatorName),
     "w:done": comment.resolvedTime ? "1" : "0",
@@ -117184,7 +117183,8 @@ var isRegExp = (value) => {
     "custom:trackedChangeText": comment.trackedChangeText || null,
     "custom:trackedChangeType": comment.trackedChangeType,
     "custom:trackedChangeDisplayType": comment.trackedChangeDisplayType || null,
-    "custom:trackedDeletedText": comment.deletedText || null
+    "custom:trackedDeletedText": comment.deletedText || null,
+    "custom:email": comment.creatorEmail || comment.importedAuthor?.email
   };
   if (comment?.parentCommentId) {
     const parentComment = allComments.find((c$1) => c$1.commentId === comment.parentCommentId);
@@ -117223,7 +117223,6 @@ var isRegExp = (value) => {
     commentDef.attributes = {
       "w:id": commentDef.attributes["w:id"],
       "w:author": commentDef.attributes["w:author"],
-      "w:email": commentDef.attributes["w:email"],
       "w:date": commentDef.attributes["w:date"],
       "w:initials": commentDef.attributes["w:initials"],
       "custom:internalId": commentDef.attributes["custom:internalId"],
@@ -117232,6 +117231,7 @@ var isRegExp = (value) => {
       "custom:trackedChangeType": commentDef.attributes["custom:trackedChangeType"],
       "custom:trackedChangeDisplayType": commentDef.attributes["custom:trackedChangeDisplayType"],
       "custom:trackedDeletedText": commentDef.attributes["custom:trackedDeletedText"],
+      "custom:email": commentDef.attributes["custom:email"],
       "xmlns:custom": "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     };
   });
@@ -117365,7 +117365,8 @@ var isRegExp = (value) => {
   updatedXml["word/comments.xml"] = updateCommentsXml(defs, updatedXml["word/comments.xml"]);
   relationships.push(generateRelationship("comments.xml"));
   emittedTargets.add("comments.xml");
-  const commentsExtendedXml = updateCommentsExtendedXml(commentsWithParaIds, updatedXml["word/commentsExtended.xml"], threadingProfile || exportStrategy);
+  const effectiveThreadingProfile = threadingProfile?.defaultStyle === "range-based" && threadingProfile?.fileSet?.hasCommentsExtended === false ? "word" : threadingProfile || exportStrategy;
+  const commentsExtendedXml = updateCommentsExtendedXml(commentsWithParaIds, updatedXml["word/commentsExtended.xml"], effectiveThreadingProfile);
   if (commentsExtendedXml !== null) {
     updatedXml["word/commentsExtended.xml"] = commentsExtendedXml;
     relationships.push(generateRelationship("commentsExtended.xml"));
@@ -117855,7 +117856,7 @@ var isRegExp = (value) => {
   if (id2)
     return trackedChanges.filter(({ mark }) => mark.attrs.id === id2);
   return trackedChanges;
-}, DERIVED_ID_LENGTH = 24, groupedCache, SDT_NODE_NAMES, SDT_BLOCK_NAME = "structuredContentBlock", VALID_CONTROL_TYPES, VALID_LOCK_MODES2, VALID_APPEARANCES, FIELD_LIKE_SDT_TYPES, liveDocumentCountsCache, BIBLIOGRAPHY_NAMESPACE_URI = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography", CUSTOM_XML_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml", CUSTOM_XML_PROPS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps", DEFAULT_SELECTED_STYLE = "/APA.XSL", DEFAULT_STYLE_NAME = "APA", DEFAULT_VERSION = "6", API_TO_OOXML_SOURCE_TYPE, OOXML_TO_API_SOURCE_TYPE, SIMPLE_FIELD_TO_XML_TAG, XML_TAG_TO_SIMPLE_FIELD, import_lib2, FONT_FAMILY_FALLBACKS, DEFAULT_GENERIC_FALLBACK = "sans-serif", DEFAULT_FONT_SIZE_PT = 10, CURRENT_APP_VERSION = "1.28.0", collectRunDefaultProperties = (runProps, { allowOverrideTypeface = true, allowOverrideSize = true, themeResolver, state }) => {
+}, DERIVED_ID_LENGTH = 24, groupedCache, SDT_NODE_NAMES, SDT_BLOCK_NAME = "structuredContentBlock", VALID_CONTROL_TYPES, VALID_LOCK_MODES2, VALID_APPEARANCES, FIELD_LIKE_SDT_TYPES, liveDocumentCountsCache, BIBLIOGRAPHY_NAMESPACE_URI = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography", CUSTOM_XML_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml", CUSTOM_XML_PROPS_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps", DEFAULT_SELECTED_STYLE = "/APA.XSL", DEFAULT_STYLE_NAME = "APA", DEFAULT_VERSION = "6", API_TO_OOXML_SOURCE_TYPE, OOXML_TO_API_SOURCE_TYPE, SIMPLE_FIELD_TO_XML_TAG, XML_TAG_TO_SIMPLE_FIELD, import_lib2, FONT_FAMILY_FALLBACKS, DEFAULT_GENERIC_FALLBACK = "sans-serif", DEFAULT_FONT_SIZE_PT = 10, CURRENT_APP_VERSION = "1.29.0", collectRunDefaultProperties = (runProps, { allowOverrideTypeface = true, allowOverrideSize = true, themeResolver, state }) => {
   if (!runProps?.elements?.length || !state)
     return;
   const fontsNode = runProps.elements.find((el) => el.name === "w:rFonts");
@@ -117889,7 +117890,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_D6fPzZYT_es = __esm(() => {
+var init_SuperConverter_Dn6cDET4_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -155318,7 +155319,7 @@ var init_SuperConverter_D6fPzZYT_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-77DlIukc.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-CQu_F9Mr.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -157910,8 +157911,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_77DlIukc_es = __esm(() => {
-  init_SuperConverter_D6fPzZYT_es();
+var init_create_headless_toolbar_CQu_F9Mr_es = __esm(() => {
+  init_SuperConverter_Dn6cDET4_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -206598,7 +206599,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BQyWXTfI.es.js
+// ../../packages/superdoc/dist/chunks/src-CLao-BLx.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -207241,7 +207242,7 @@ function prosemirrorToYXmlFragment(doc$12, xmlFragment) {
 }
 function getSuperdocVersion() {
   try {
-    return "1.28.0";
+    return "1.29.0";
   } catch {
     return "unknown";
   }
@@ -260048,6 +260049,22 @@ function assertRequiredBlockMeasurePair(label, blocks2, measures) {
   if (blocks2.length !== measures.length)
     throw new Error(`${label} blocks and measures must have the same length.`);
 }
+function normalizeOptionalBlockMeasurePair(label, blocks2, measures) {
+  const hasBlocks = blocks2 !== undefined;
+  const hasMeasures = measures !== undefined;
+  if (hasBlocks !== hasMeasures) {
+    if (label === "body")
+      throw new Error("blocks and measures must both be provided or both be omitted.");
+    throw new Error(`${label}Blocks and ${label}Measures must both be provided or both be omitted.`);
+  }
+  if (!hasBlocks || !hasMeasures)
+    return;
+  assertRequiredBlockMeasurePair(label, blocks2, measures);
+  return {
+    blocks: blocks2,
+    measures
+  };
+}
 function createEmptyResolvedLayout(flowMode, pageGap) {
   return {
     version: 1,
@@ -260059,6 +260076,20 @@ function createEmptyResolvedLayout(flowMode, pageGap) {
 function isDomPainterInput(value) {
   return "resolvedLayout" in value && "sourceLayout" in value;
 }
+function normalizeDomPainterInput(input2) {
+  const body = normalizeOptionalBlockMeasurePair("body", input2.blocks, input2.measures);
+  const header = normalizeOptionalBlockMeasurePair("header", input2.headerBlocks, input2.headerMeasures);
+  const footer = normalizeOptionalBlockMeasurePair("footer", input2.footerBlocks, input2.footerMeasures);
+  return {
+    ...input2,
+    blocks: body?.blocks,
+    measures: body?.measures,
+    headerBlocks: header?.blocks,
+    headerMeasures: header?.measures,
+    footerBlocks: footer?.blocks,
+    footerMeasures: footer?.measures
+  };
+}
 function buildLegacyPaintInput(layout, legacyState, flowMode, pageGap) {
   let resolvedLayout;
   if (legacyState.resolvedLayout)
@@ -260074,7 +260105,13 @@ function buildLegacyPaintInput(layout, legacyState, flowMode, pageGap) {
     });
   return {
     resolvedLayout,
-    sourceLayout: layout
+    sourceLayout: layout,
+    blocks: legacyState.blocks,
+    measures: legacyState.measures,
+    headerBlocks: legacyState.headerBlocks,
+    headerMeasures: legacyState.headerMeasures,
+    footerBlocks: legacyState.footerBlocks,
+    footerMeasures: legacyState.footerMeasures
   };
 }
 function appendToArrayMap(map$12, key2, value) {
@@ -278508,7 +278545,7 @@ var Node$13 = class Node$14 {
     domAvailabilityCache = false;
     return false;
   }
-}, summaryVersion = "1.28.0", nodeKeys, markKeys, transformListsInCopiedContent = (html3) => {
+}, summaryVersion = "1.29.0", nodeKeys, markKeys, transformListsInCopiedContent = (html3) => {
   const container = document.createElement("div");
   container.innerHTML = html3;
   const result = [];
@@ -279091,7 +279128,7 @@ var Node$13 = class Node$14 {
         listener(snapshot2);
       } catch {}
   }
-}, EMITTABLE_BLOCK_TYPES, SDT_BLOCK_NODE_NAMES, REQUIRED_COMMANDS, VALID_CAPABILITY_REASON_CODES, REQUIRED_HELPERS, SCHEMA_NODE_GATES, schemaGatedIds, SUPPORTED_NON_UNIFORM_STRATEGIES, SUPPORTED_SET_MARKS, REGEX_MAX_PATTERN_LENGTH = 1024, STYLES_PART = "word/styles.xml", PROPERTIES_KEY_BY_CHANNEL, XML_PATH_BY_CHANNEL2, UNDERLINE_API_TO_STORAGE, UNDERLINE_STORAGE_TO_API, HEX_SUBKEYS_BY_PROPERTY, SUPPORTED_DELETE_NODE_TYPES3, REJECTED_DELETE_NODE_TYPES3, TEXT_PREVIEW_MAX_LENGTH = 80, RANGE_DELETE_SAFE_NODE_TYPES, HEADING_PATTERN, OOXML_DEFAULT_FONT_SIZE_PT = 10, INDENT_PER_LEVEL_TWIPS = 720, HANGING_INDENT_TWIPS = 360, SYMBOL_FONT_NAMES, RFONTS_FAMILY_ATTRS, ORDERED_PRESET_CONFIG, BULLET_PRESET_CONFIG, PRESET_TEMPLATES, LevelFormattingHelpers, PRESET_KIND_MAP, NUMBERING_PART = "word/numbering.xml", DEFAULT_PRESET_FOR_KIND, _setValueDelegate, PREVIEW_TEXT_MAX_LENGTH = 2000, BLOCK_PREVIEW_MAX_LENGTH = 200, EDGE_NODE_TYPES$1, POINTS_TO_PIXELS, POINTS_TO_TWIPS = 20, PIXELS_TO_TWIPS, DEFAULT_TABLE_GRID_WIDTH_TWIPS = 1500, SETTINGS_PART$1 = "word/settings.xml", WORD_DEFAULT_TBL_LOOK, FLAG_TO_OOXML_KEY, INVERTED_FLAGS, XML_KEY_TO_STYLE_OPTION, CLEARED_BORDER_OOXML, TABLE_MARGIN_KEY_GROUPS, TABLE_ADAPTER_DISPATCH, ROW_TARGETED_TABLE_OPS, registered = false, STYLES_PART_ID = "word/styles.xml", stylesPartDescriptor, settingsPartDescriptor, RELS_PART_ID2 = "word/_rels/document.xml.rels", RELS_XMLNS2 = "http://schemas.openxmlformats.org/package/2006/relationships", HEADER_RELATIONSHIP_TYPE$1 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE$1 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", relsPartDescriptor, HISTORY_UNSAFE_OPS, CANONICAL_COMMENT_IGNORED_KEYS, INITIAL_HASH, ROUND_CONSTANTS, V1_COVERAGE, V2_COVERAGE, SNAPSHOT_VERSION_V2 = "sd-diff-snapshot/v2", PAYLOAD_VERSION_V1 = "sd-diff-payload/v1", PAYLOAD_VERSION_V2 = "sd-diff-payload/v2", ENGINE_ID = "super-editor", STAGED_CONVERTER_KEYS, DiffServiceError, DEFAULT_LEVEL = 1, SWITCH_PATTERN, TOC_BOOKMARK_PREFIX = "_Toc", DEFAULT_RIGHT_TAB_POS = 9350, TAB_LEADER_MAP, NO_ENTRIES_PLACEHOLDER, TC_LEVEL_MIN = 1, TC_LEVEL_MAX = 9, ALLOWED_WRAP_ATTRS, WRAP_TYPES_SUPPORTING_SIDE, WRAP_TYPES_SUPPORTING_DISTANCES, RELATIVE_HEIGHT_MIN = 0, RELATIVE_HEIGHT_MAX = 4294967295, FORBIDDEN_RAW_PATCH_NAMES, CONTROL_TYPE_SDT_PR_ELEMENTS, DEFAULT_CHECKBOX_SYMBOL_FONT2 = "MS Gothic", DEFAULT_CHECKBOX_CHECKED_HEX2 = "2612", DEFAULT_CHECKBOX_UNCHECKED_HEX2 = "2610", VARIANT_ORDER, KIND_ORDER, HEADER_RELATIONSHIP_TYPE3 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE3 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", DOCUMENT_RELS_PATH2 = "word/_rels/document.xml.rels", HEADER_FILE_PATTERN2, FOOTER_FILE_PATTERN2, SETTINGS_PART, SPECIAL_NOTE_TYPES, RESTART_POLICY_TO_OOXML, VALID_DISPLAYS, REFERENCE_BLOCK_PREFIX, CAPTION_STYLE_NAMES, CAPTION_PARAGRAPH_STYLE_ID = "Caption", CAPTION_FORMAT_TO_OOXML, DOCUMENT_STAT_FIELD_TYPES, TOA_LEADER_REVERSE_MAP, EDGE_NODE_TYPES, CONTENT_TYPES_PART_ID = "[Content_Types].xml", CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types", contentTypesPartDescriptor, empty_exports, init_empty, CURRENT_APP_VERSION2 = "1.28.0", PIXELS_PER_INCH2 = 96, MAX_HEIGHT_BUFFER_PX = 50, MAX_WIDTH_BUFFER_PX = 20, cloneExtensionInstance = (extension3) => {
+}, EMITTABLE_BLOCK_TYPES, SDT_BLOCK_NODE_NAMES, REQUIRED_COMMANDS, VALID_CAPABILITY_REASON_CODES, REQUIRED_HELPERS, SCHEMA_NODE_GATES, schemaGatedIds, SUPPORTED_NON_UNIFORM_STRATEGIES, SUPPORTED_SET_MARKS, REGEX_MAX_PATTERN_LENGTH = 1024, STYLES_PART = "word/styles.xml", PROPERTIES_KEY_BY_CHANNEL, XML_PATH_BY_CHANNEL2, UNDERLINE_API_TO_STORAGE, UNDERLINE_STORAGE_TO_API, HEX_SUBKEYS_BY_PROPERTY, SUPPORTED_DELETE_NODE_TYPES3, REJECTED_DELETE_NODE_TYPES3, TEXT_PREVIEW_MAX_LENGTH = 80, RANGE_DELETE_SAFE_NODE_TYPES, HEADING_PATTERN, OOXML_DEFAULT_FONT_SIZE_PT = 10, INDENT_PER_LEVEL_TWIPS = 720, HANGING_INDENT_TWIPS = 360, SYMBOL_FONT_NAMES, RFONTS_FAMILY_ATTRS, ORDERED_PRESET_CONFIG, BULLET_PRESET_CONFIG, PRESET_TEMPLATES, LevelFormattingHelpers, PRESET_KIND_MAP, NUMBERING_PART = "word/numbering.xml", DEFAULT_PRESET_FOR_KIND, _setValueDelegate, PREVIEW_TEXT_MAX_LENGTH = 2000, BLOCK_PREVIEW_MAX_LENGTH = 200, EDGE_NODE_TYPES$1, POINTS_TO_PIXELS, POINTS_TO_TWIPS = 20, PIXELS_TO_TWIPS, DEFAULT_TABLE_GRID_WIDTH_TWIPS = 1500, SETTINGS_PART$1 = "word/settings.xml", WORD_DEFAULT_TBL_LOOK, FLAG_TO_OOXML_KEY, INVERTED_FLAGS, XML_KEY_TO_STYLE_OPTION, CLEARED_BORDER_OOXML, TABLE_MARGIN_KEY_GROUPS, TABLE_ADAPTER_DISPATCH, ROW_TARGETED_TABLE_OPS, registered = false, STYLES_PART_ID = "word/styles.xml", stylesPartDescriptor, settingsPartDescriptor, RELS_PART_ID2 = "word/_rels/document.xml.rels", RELS_XMLNS2 = "http://schemas.openxmlformats.org/package/2006/relationships", HEADER_RELATIONSHIP_TYPE$1 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE$1 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", relsPartDescriptor, HISTORY_UNSAFE_OPS, CANONICAL_COMMENT_IGNORED_KEYS, INITIAL_HASH, ROUND_CONSTANTS, V1_COVERAGE, V2_COVERAGE, SNAPSHOT_VERSION_V2 = "sd-diff-snapshot/v2", PAYLOAD_VERSION_V1 = "sd-diff-payload/v1", PAYLOAD_VERSION_V2 = "sd-diff-payload/v2", ENGINE_ID = "super-editor", STAGED_CONVERTER_KEYS, DiffServiceError, DEFAULT_LEVEL = 1, SWITCH_PATTERN, TOC_BOOKMARK_PREFIX = "_Toc", DEFAULT_RIGHT_TAB_POS = 9350, TAB_LEADER_MAP, NO_ENTRIES_PLACEHOLDER, TC_LEVEL_MIN = 1, TC_LEVEL_MAX = 9, ALLOWED_WRAP_ATTRS, WRAP_TYPES_SUPPORTING_SIDE, WRAP_TYPES_SUPPORTING_DISTANCES, RELATIVE_HEIGHT_MIN = 0, RELATIVE_HEIGHT_MAX = 4294967295, FORBIDDEN_RAW_PATCH_NAMES, CONTROL_TYPE_SDT_PR_ELEMENTS, DEFAULT_CHECKBOX_SYMBOL_FONT2 = "MS Gothic", DEFAULT_CHECKBOX_CHECKED_HEX2 = "2612", DEFAULT_CHECKBOX_UNCHECKED_HEX2 = "2610", VARIANT_ORDER, KIND_ORDER, HEADER_RELATIONSHIP_TYPE3 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", FOOTER_RELATIONSHIP_TYPE3 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", DOCUMENT_RELS_PATH2 = "word/_rels/document.xml.rels", HEADER_FILE_PATTERN2, FOOTER_FILE_PATTERN2, SETTINGS_PART, SPECIAL_NOTE_TYPES, RESTART_POLICY_TO_OOXML, VALID_DISPLAYS, REFERENCE_BLOCK_PREFIX, CAPTION_STYLE_NAMES, CAPTION_PARAGRAPH_STYLE_ID = "Caption", CAPTION_FORMAT_TO_OOXML, DOCUMENT_STAT_FIELD_TYPES, TOA_LEADER_REVERSE_MAP, EDGE_NODE_TYPES, CONTENT_TYPES_PART_ID = "[Content_Types].xml", CONTENT_TYPES_NS = "http://schemas.openxmlformats.org/package/2006/content-types", contentTypesPartDescriptor, empty_exports, init_empty, CURRENT_APP_VERSION2 = "1.29.0", PIXELS_PER_INCH2 = 96, MAX_HEIGHT_BUFFER_PX = 50, MAX_WIDTH_BUFFER_PX = 20, cloneExtensionInstance = (extension3) => {
   const extensionLike = extension3;
   const config2 = extensionLike?.config;
   const ExtensionCtor = extensionLike?.constructor;
@@ -288671,37 +288708,91 @@ menclose::after {
 }, createDomPainter = (options) => {
   if ((options.blocks ?? []).length !== (options.measures ?? []).length)
     throw new Error("DomPainter requires the same number of blocks and measures");
+  const legacyState = {
+    blocks: options.blocks ?? [],
+    measures: options.measures ?? [],
+    headerBlocks: undefined,
+    headerMeasures: undefined,
+    footerBlocks: undefined,
+    footerMeasures: undefined,
+    resolvedLayout: null
+  };
+  let currentPaintInput = null;
+  const resolveDecorationItems = (fragments, kind) => {
+    const input2 = currentPaintInput;
+    if (!input2)
+      return;
+    const decorationBlocks = kind === "header" ? input2.headerBlocks : input2.footerBlocks;
+    const decorationMeasures = kind === "header" ? input2.headerMeasures : input2.footerMeasures;
+    const mergedBlocks = [...input2.blocks ?? [], ...decorationBlocks ?? []];
+    const mergedMeasures = [...input2.measures ?? [], ...decorationMeasures ?? []];
+    if (mergedBlocks.length === 0 || mergedBlocks.length !== mergedMeasures.length)
+      return;
+    const fakeLayout = {
+      pageSize: input2.sourceLayout.pageSize,
+      pages: [{
+        number: 1,
+        fragments: [...fragments]
+      }]
+    };
+    try {
+      return resolveLayout({
+        layout: fakeLayout,
+        flowMode: input2.resolvedLayout.flowMode,
+        blocks: mergedBlocks,
+        measures: mergedMeasures
+      }).pages[0]?.items;
+    } catch {
+      return;
+    }
+  };
+  const wrapProvider = (provider, kind) => {
+    if (!provider)
+      return;
+    return (pageNumber, pageMargins, page) => {
+      const payload = provider(pageNumber, pageMargins, page);
+      if (!payload || payload.items)
+        return payload;
+      const items = resolveDecorationItems(payload.fragments, kind);
+      return items ? {
+        ...payload,
+        items
+      } : payload;
+    };
+  };
   const painter = new DomPainter({
     pageStyles: options.pageStyles,
     layoutMode: options.layoutMode,
     flowMode: options.flowMode,
     pageGap: options.pageGap,
-    headerProvider: options.headerProvider,
-    footerProvider: options.footerProvider,
+    headerProvider: wrapProvider(options.headerProvider, "header"),
+    footerProvider: wrapProvider(options.footerProvider, "footer"),
     virtualization: options.virtualization,
     ruler: options.ruler,
     onPaintSnapshot: options.onPaintSnapshot
   });
-  const legacyState = {
-    blocks: options.blocks ?? [],
-    measures: options.measures ?? [],
-    resolvedLayout: null
-  };
   return {
     paint(input2, mount, mapping) {
-      const normalizedInput = isDomPainterInput(input2) ? input2 : buildLegacyPaintInput(input2, legacyState, options.flowMode, options.pageGap);
+      const normalizedInput = isDomPainterInput(input2) ? normalizeDomPainterInput(input2) : buildLegacyPaintInput(input2, legacyState, options.flowMode, options.pageGap);
+      currentPaintInput = normalizedInput;
       painter.paint(normalizedInput, mount, mapping);
     },
-    setData(blocks2, measures) {
+    setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
       assertRequiredBlockMeasurePair("body", blocks2, measures);
+      const normalizedHeader = normalizeOptionalBlockMeasurePair("header", headerBlocks, headerMeasures);
+      const normalizedFooter = normalizeOptionalBlockMeasurePair("footer", footerBlocks, footerMeasures);
       legacyState.blocks = blocks2;
       legacyState.measures = measures;
+      legacyState.headerBlocks = normalizedHeader?.blocks;
+      legacyState.headerMeasures = normalizedHeader?.measures;
+      legacyState.footerBlocks = normalizedFooter?.blocks;
+      legacyState.footerMeasures = normalizedFooter?.measures;
     },
     setResolvedLayout(resolvedLayout) {
       legacyState.resolvedLayout = resolvedLayout;
     },
     setProviders(header, footer) {
-      painter.setProviders(header, footer);
+      painter.setProviders(wrapProvider(header, "header"), wrapProvider(footer, "footer"));
     },
     setVirtualizationPins(pageIndices) {
       painter.setVirtualizationPins(pageIndices);
@@ -293571,6 +293662,18 @@ menclose::after {
     this.#footerDecorationProvider = this.createDecorationProvider("footer", layout);
     this.rebuildRegions(layout);
   }
+  resolveAlignedDecorationItems(fragments, slotPageNumber, result, cachedResolvedLayout, contextLabel) {
+    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;
+    if (freshItems && freshItems.length === fragments.length)
+      return freshItems;
+    if (freshItems)
+      console.warn(`[HeaderFooterSessionManager] Fresh resolved items length (${freshItems.length}) does not match fragments length (${fragments.length}) for ${contextLabel}. Dropping items.`);
+  }
   createDecorationProvider(kind, layout) {
     const results = kind === "header" ? this.#headerLayoutResults : this.#footerLayoutResults;
     const layoutsByRId = kind === "header" ? this.#headerLayoutsByRId : this.#footerLayoutsByRId;
@@ -293623,10 +293726,8 @@ menclose::after {
           const slotPage$1 = this.#findPageForNumber(rIdLayout.layout.pages, pageNumber);
           if (slotPage$1) {
             const fragments$1 = slotPage$1.fragments ?? [];
-            const resolvedItems = resolvedByRId.get(rIdLayoutKey)?.pages.find((p$12) => p$12.number === slotPage$1.number)?.items;
-            if (resolvedItems && resolvedItems.length !== fragments$1.length)
-              console.warn(`[HeaderFooterSessionManager] Resolved items length (${resolvedItems.length}) does not match fragments length (${fragments$1.length}) for rId '${rIdLayoutKey}' page ${pageNumber}. Dropping items.`);
-            const alignedItems = resolvedItems && resolvedItems.length === fragments$1.length ? resolvedItems : undefined;
+            const resolvedLayout = resolvedByRId.get(rIdLayoutKey);
+            const alignedItems = this.resolveAlignedDecorationItems(fragments$1, slotPage$1.number, rIdLayout, resolvedLayout, `rId '${rIdLayoutKey}' page ${pageNumber}`);
             const pageHeight$1 = page?.size?.h ?? layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? defaultPageSize.h;
             const margins$1 = pageMargins ?? layout.pages[0]?.margins ?? layoutOptions.margins ?? defaultMargins;
             const decorationMargins$1 = kind === "footer" ? this.#stripFootnoteReserveFromBottomMargin(margins$1, page ?? null) : margins$1;
@@ -293672,10 +293773,8 @@ menclose::after {
       if (!slotPage)
         return null;
       const fragments = slotPage.fragments ?? [];
-      const resolvedVariantItems = resolvedResults?.[variantIndex]?.pages.find((p$12) => p$12.number === slotPage.number)?.items;
-      if (resolvedVariantItems && resolvedVariantItems.length !== fragments.length)
-        console.warn(`[HeaderFooterSessionManager] Resolved items length (${resolvedVariantItems.length}) does not match fragments length (${fragments.length}) for variant '${headerFooterType}' page ${pageNumber}. Dropping items.`);
-      const alignedVariantItems = resolvedVariantItems && resolvedVariantItems.length === fragments.length ? resolvedVariantItems : undefined;
+      const resolvedVariant = resolvedResults?.[variantIndex];
+      const alignedVariantItems = this.resolveAlignedDecorationItems(fragments, slotPage.number, variant, resolvedVariant, `variant '${headerFooterType}' page ${pageNumber}`);
       const pageHeight = page?.size?.h ?? layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? defaultPageSize.h;
       const margins = pageMargins ?? layout.pages[0]?.margins ?? layoutOptions.margins ?? defaultMargins;
       const decorationMargins = kind === "footer" ? this.#stripFootnoteReserveFromBottomMargin(margins, page ?? null) : margins;
@@ -293955,12 +294054,12 @@ 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_BQyWXTfI_es = __esm(() => {
+var init_src_CLao_BLx_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_D6fPzZYT_es();
+  init_SuperConverter_Dn6cDET4_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_77DlIukc_es();
+  init_create_headless_toolbar_CQu_F9Mr_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -330135,11 +330234,11 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BQyWXTfI_es();
-  init_SuperConverter_D6fPzZYT_es();
+  init_src_CLao_BLx_es();
+  init_SuperConverter_Dn6cDET4_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_77DlIukc_es();
+  init_create_headless_toolbar_CQu_F9Mr_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();

package/package.json

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