@superdoc-dev/cli 0.5.0-next.66 → 0.5.0-next.67

package/dist/index.js

@@ -204563,7 +204563,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-iz38HlbL.es.js
+// ../../packages/superdoc/dist/chunks/src-BzK2Ejl0.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -248040,6 +248040,32 @@ function createAnchoredTableFragment(block, measure, x, y$1) {
   applyTableFragmentPmRange(fragment2, block, measure);
   return fragment2;
 }
+function buildParagraphIndexById(blocks2, len3) {
+  const paragraphIndexById = /* @__PURE__ */ new Map;
+  for (let i4 = 0;i4 < len3; i4 += 1) {
+    const block = blocks2[i4];
+    if (block.kind === "paragraph")
+      paragraphIndexById.set(block.id, i4);
+  }
+  return paragraphIndexById;
+}
+function findNearestParagraphIndex(blocks2, len3, fromIndex) {
+  for (let i4 = fromIndex - 1;i4 >= 0; i4 -= 1)
+    if (blocks2[i4].kind === "paragraph")
+      return i4;
+  for (let i4 = fromIndex + 1;i4 < len3; i4 += 1)
+    if (blocks2[i4].kind === "paragraph")
+      return i4;
+  return null;
+}
+function resolveAnchorParagraphIndex(blocks2, len3, paragraphIndexById, fromIndex, anchorParagraphId) {
+  if (typeof anchorParagraphId === "string") {
+    const explicitIndex = paragraphIndexById.get(anchorParagraphId);
+    if (typeof explicitIndex === "number")
+      return explicitIndex;
+  }
+  return findNearestParagraphIndex(blocks2, len3, fromIndex);
+}
 function isPageRelativeAnchor(block) {
   const vRelativeFrom = block.anchor?.vRelativeFrom;
   return vRelativeFrom === "margin" || vRelativeFrom === "page";
@@ -248069,24 +248095,7 @@ function collectPreRegisteredAnchors(blocks2, measures) {
 function collectAnchoredDrawings(blocks2, measures) {
   const map$12 = /* @__PURE__ */ new Map;
   const len3 = Math.min(blocks2.length, measures.length);
-  const paragraphIndexById = /* @__PURE__ */ new Map;
-  for (let i4 = 0;i4 < len3; i4 += 1) {
-    const block = blocks2[i4];
-    if (block.kind === "paragraph")
-      paragraphIndexById.set(block.id, i4);
-  }
-  const nearestPrevParagraph = (fromIndex) => {
-    for (let i4 = fromIndex - 1;i4 >= 0; i4 -= 1)
-      if (blocks2[i4].kind === "paragraph")
-        return i4;
-    return null;
-  };
-  const nearestNextParagraph = (fromIndex) => {
-    for (let i4 = fromIndex + 1;i4 < len3; i4 += 1)
-      if (blocks2[i4].kind === "paragraph")
-        return i4;
-    return null;
-  };
+  const paragraphIndexById = buildParagraphIndexById(blocks2, len3);
   for (let i4 = 0;i4 < len3; i4 += 1) {
     const block = blocks2[i4];
     const measure = measures[i4];
@@ -248101,11 +248110,7 @@ function collectAnchoredDrawings(blocks2, measures) {
     if (isPageRelativeAnchor(drawingBlock))
       continue;
     const anchorParagraphId = typeof drawingBlock.attrs === "object" && drawingBlock.attrs ? drawingBlock.attrs.anchorParagraphId : undefined;
-    let anchorParaIndex = typeof anchorParagraphId === "string" ? paragraphIndexById.get(anchorParagraphId) ?? null : null;
-    if (anchorParaIndex == null)
-      anchorParaIndex = nearestPrevParagraph(i4);
-    if (anchorParaIndex == null)
-      anchorParaIndex = nearestNextParagraph(i4);
+    const anchorParaIndex = resolveAnchorParagraphIndex(blocks2, len3, paragraphIndexById, i4, anchorParagraphId);
     if (anchorParaIndex == null)
       continue;
     const list5 = map$12.get(anchorParaIndex) ?? [];
@@ -248118,26 +248123,11 @@ function collectAnchoredDrawings(blocks2, measures) {
   return map$12;
 }
 function collectAnchoredTables(blocks2, measures) {
-  const map$12 = /* @__PURE__ */ new Map;
-  const paragraphIndexById = /* @__PURE__ */ new Map;
-  for (let i4 = 0;i4 < blocks2.length; i4 += 1) {
-    const block = blocks2[i4];
-    if (block.kind === "paragraph")
-      paragraphIndexById.set(block.id, i4);
-  }
-  const nearestPrevParagraph = (fromIndex) => {
-    for (let i4 = fromIndex - 1;i4 >= 0; i4 -= 1)
-      if (blocks2[i4].kind === "paragraph")
-        return i4;
-    return null;
-  };
-  const nearestNextParagraph = (fromIndex) => {
-    for (let i4 = fromIndex + 1;i4 < blocks2.length; i4 += 1)
-      if (blocks2[i4].kind === "paragraph")
-        return i4;
-    return null;
-  };
-  for (let i4 = 0;i4 < blocks2.length; i4 += 1) {
+  const len3 = Math.min(blocks2.length, measures.length);
+  const byParagraph = /* @__PURE__ */ new Map;
+  const withoutParagraph = [];
+  const paragraphIndexById = buildParagraphIndexById(blocks2, len3);
+  for (let i4 = 0;i4 < len3; i4 += 1) {
     const block = blocks2[i4];
     const measure = measures[i4];
     if (block.kind !== "table" || measure?.kind !== "table")
@@ -248147,21 +248137,25 @@ function collectAnchoredTables(blocks2, measures) {
     if (!tableBlock.anchor?.isAnchored)
       continue;
     const anchorParagraphId = typeof tableBlock.attrs === "object" && tableBlock.attrs ? tableBlock.attrs.anchorParagraphId : undefined;
-    let anchorParaIndex = typeof anchorParagraphId === "string" ? paragraphIndexById.get(anchorParagraphId) ?? null : null;
-    if (anchorParaIndex == null)
-      anchorParaIndex = nearestPrevParagraph(i4);
-    if (anchorParaIndex == null)
-      anchorParaIndex = nearestNextParagraph(i4);
-    if (anchorParaIndex == null)
+    const anchorParaIndex = resolveAnchorParagraphIndex(blocks2, len3, paragraphIndexById, i4, anchorParagraphId);
+    if (anchorParaIndex == null) {
+      withoutParagraph.push({
+        block: tableBlock,
+        measure: tableMeasure
+      });
       continue;
-    const list5 = map$12.get(anchorParaIndex) ?? [];
+    }
+    const list5 = byParagraph.get(anchorParaIndex) ?? [];
     list5.push({
       block: tableBlock,
       measure: tableMeasure
     });
-    map$12.set(anchorParaIndex, list5);
+    byParagraph.set(anchorParaIndex, list5);
   }
-  return map$12;
+  return {
+    byParagraph,
+    withoutParagraph
+  };
 }
 function computePhysicalAnchorY(block, fragmentHeight, pageHeight) {
   const alignV = block.anchor?.alignV ?? "top";
@@ -248203,6 +248197,12 @@ function normalizeFragmentsForRegion(pages, blocks2, _measures, _kind, constrain
 function createPaginator(opts) {
   const states = [];
   const pages = [];
+  const pruneTrailingEmptyPages = () => {
+    while (pages.length > 0 && pages[pages.length - 1].fragments.length === 0) {
+      pages.pop();
+      states.pop();
+    }
+  };
   const getActiveColumnsForState = (state) => {
     if (state.activeConstraintIndex >= 0 && state.constraintBoundaries[state.activeConstraintIndex])
       return state.constraintBoundaries[state.activeConstraintIndex].columns;
@@ -248289,7 +248289,8 @@ function createPaginator(opts) {
     advanceColumn,
     columnX,
     getActiveColumnsForState,
-    getPageByNumber
+    getPageByNumber,
+    pruneTrailingEmptyPages
   };
 }
 function toUpperRoman(num) {
@@ -248832,6 +248833,7 @@ function layoutDocument(blocks2, measures, options = {}) {
   let pendingPageSize = null;
   let activeColumns = cloneColumnLayout(options.columns);
   let pendingColumns = null;
+  const allowParagraphlessAnchoredTableFallback = options.allowParagraphlessAnchoredTableFallback !== false;
   let activeOrientation = null;
   let pendingOrientation = null;
   let activeVAlign = null;
@@ -249295,11 +249297,38 @@ function layoutDocument(blocks2, measures, options = {}) {
     }, activePageSize.w);
   };
   const anchoredByParagraph = collectAnchoredDrawings(blocks2, measures);
-  const anchoredTablesByParagraph = collectAnchoredTables(blocks2, measures);
+  const anchoredTables = collectAnchoredTables(blocks2, measures);
+  const anchoredTablesByParagraph = anchoredTables.byParagraph;
+  const paragraphlessAnchoredTables = anchoredTables.withoutParagraph;
   const placedAnchoredIds = /* @__PURE__ */ new Set;
   const placedAnchoredTableIds = /* @__PURE__ */ new Set;
   const preRegisteredAnchors = collectPreRegisteredAnchors(blocks2, measures);
   const preRegisteredPositions = /* @__PURE__ */ new Map;
+  const resolveParagraphlessAnchoredTableY = (block, measure, state) => {
+    const contentTop = state.topMargin;
+    const contentBottom = state.contentBottom;
+    const contentHeight = Math.max(0, contentBottom - contentTop);
+    const tableHeight = measure.totalHeight ?? 0;
+    const anchor = block.anchor;
+    const offsetV = anchor?.offsetV ?? 0;
+    const vRelativeFrom = anchor?.vRelativeFrom;
+    const alignV = anchor?.alignV;
+    if (vRelativeFrom === "margin") {
+      if (alignV === "bottom")
+        return contentBottom - tableHeight + offsetV;
+      if (alignV === "center")
+        return contentTop + (contentHeight - tableHeight) / 2 + offsetV;
+      return contentTop + offsetV;
+    }
+    if (vRelativeFrom === "page") {
+      if (alignV === "bottom")
+        return contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - tableHeight + offsetV;
+      if (alignV === "center")
+        return (contentBottom + (state.page.margins?.bottom ?? activeBottomMargin) - tableHeight) / 2 + offsetV;
+      return offsetV;
+    }
+    return contentTop + offsetV;
+  };
   for (const entry of preRegisteredAnchors) {
     const state = paginator.ensurePage();
     const vRelativeFrom = entry.block.anchor?.vRelativeFrom ?? "paragraph";
@@ -249783,8 +249812,21 @@ function layoutDocument(blocks2, measures, options = {}) {
     }
     throw new Error(`layoutDocument: unsupported block kind for ${block.id}`);
   }
-  while (pages.length > 0 && pages[pages.length - 1].fragments.length === 0)
-    pages.pop();
+  paginator.pruneTrailingEmptyPages();
+  if (allowParagraphlessAnchoredTableFallback && pages.length === 0 && paragraphlessAnchoredTables.length > 0) {
+    const state = paginator.ensurePage();
+    for (const { block: tableBlock, measure: tableMeasure } of paragraphlessAnchoredTables) {
+      const columnWidthForTable = getCurrentColumnWidth();
+      const totalWidth = tableMeasure.totalWidth ?? 0;
+      if (columnWidthForTable > 0 && totalWidth >= columnWidthForTable * 0.99)
+        continue;
+      const anchorY = resolveParagraphlessAnchoredTableY(tableBlock, tableMeasure, state);
+      const anchorX = tableBlock.anchor?.offsetH ?? columnX(state.columnIndex);
+      floatManager.registerTable(tableBlock, tableMeasure, anchorY, state.columnIndex, state.page.number);
+      state.page.fragments.push(createAnchoredTableFragment(tableBlock, tableMeasure, anchorX, anchorY));
+      placedAnchoredTableIds.add(tableBlock.id);
+    }
+  }
   for (const page of pages) {
     if (!page.vAlign || page.vAlign === "top")
       continue;
@@ -249940,7 +249982,8 @@ function layoutHeaderFooter(blocks2, measures, constraints, kind) {
       right: 0,
       bottom: 0,
       left: 0
-    }
+    },
+    allowParagraphlessAnchoredTableFallback: false
   });
   if (kind === "footer" && constraints.pageHeight != null)
     normalizeFragmentsForRegion(layout.pages, blocks2, measures, kind, constraints);
@@ -250502,6 +250545,8 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
     return result;
   }
   const { totalPages: docTotalPages } = pageResolver(1);
+  if (!Number.isFinite(docTotalPages) || docTotalPages <= 0)
+    return result;
   const useBucketing = FeatureFlags.HF_DIGIT_BUCKETING && docTotalPages >= MIN_PAGES_FOR_BUCKETING;
   for (const [type, blocks2] of Object.entries(sections)) {
     if (!blocks2 || blocks2.length === 0)
@@ -260323,15 +260368,45 @@ function resolveTableMinWidth(spec, contentWidth) {
     return contentWidth * (spec.value / OOXML_PCT_DIVISOR);
   return spec.value;
 }
-function resolveRIdPerSection(sectionMetadata, kind) {
+function getRefsForKind(section, kind) {
+  return kind === "header" ? section.headerRefs : section.footerRefs;
+}
+function buildEffectiveRefsBySection(sectionMetadata, kind) {
   const result = /* @__PURE__ */ new Map;
-  let inherited;
+  let inheritedRefs = {};
   for (const section of sectionMetadata) {
-    const rId = (kind === "header" ? section.headerRefs : section.footerRefs)?.default;
-    if (rId)
-      inherited = rId;
-    if (inherited)
-      result.set(section.sectionIndex, inherited);
+    const explicitRefs = getRefsForKind(section, kind);
+    const effectiveRefs = { ...inheritedRefs };
+    for (const variant of HEADER_FOOTER_VARIANTS4) {
+      const rId = explicitRefs?.[variant];
+      if (rId)
+        effectiveRefs[variant] = rId;
+    }
+    if (Object.keys(effectiveRefs).length > 0)
+      result.set(section.sectionIndex, effectiveRefs);
+    inheritedRefs = effectiveRefs;
+  }
+  return result;
+}
+function collectReferencedRIdsBySection(effectiveRefsBySection) {
+  const result = /* @__PURE__ */ new Set;
+  for (const refs of effectiveRefsBySection.values())
+    for (const variant of HEADER_FOOTER_VARIANTS4) {
+      const rId = refs[variant];
+      if (rId)
+        result.add(rId);
+    }
+  return result;
+}
+function resolveDefaultRIdPerSection(sectionMetadata, kind) {
+  const result = /* @__PURE__ */ new Map;
+  let inheritedDefaultRId;
+  for (const section of sectionMetadata) {
+    const explicitDefaultRId = getRefsForKind(section, kind)?.default;
+    if (explicitDefaultRId)
+      inheritedDefaultRId = explicitDefaultRId;
+    if (inheritedDefaultRId)
+      result.set(section.sectionIndex, inheritedDefaultRId);
   }
   return result;
 }
@@ -260353,14 +260428,18 @@ async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetad
     await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId);
     await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId);
   } else {
-    await layoutBlocksByRId("header", headerBlocksByRId, constraints, pageResolver, deps.headerLayoutsByRId);
-    await layoutBlocksByRId("footer", footerBlocksByRId, constraints, pageResolver, deps.footerLayoutsByRId);
+    const effectiveHeaderRefsBySection = buildEffectiveRefsBySection(sectionMetadata, "header");
+    const effectiveFooterRefsBySection = buildEffectiveRefsBySection(sectionMetadata, "footer");
+    await layoutBlocksByRId("header", headerBlocksByRId, collectReferencedRIdsBySection(effectiveHeaderRefsBySection), constraints, pageResolver, deps.headerLayoutsByRId);
+    await layoutBlocksByRId("footer", footerBlocksByRId, collectReferencedRIdsBySection(effectiveFooterRefsBySection), constraints, pageResolver, deps.footerLayoutsByRId);
   }
 }
-async function layoutBlocksByRId(kind, blocksByRId, constraints, pageResolver, layoutsByRId) {
-  if (!blocksByRId)
+async function layoutBlocksByRId(kind, blocksByRId, referencedRIds, constraints, pageResolver, layoutsByRId) {
+  if (!blocksByRId || referencedRIds.size === 0)
     return;
   for (const [rId, blocks2] of blocksByRId) {
+    if (!referencedRIds.has(rId))
+      continue;
     if (!blocks2 || blocks2.length === 0)
       continue;
     try {
@@ -260413,7 +260492,7 @@ function adjustFramePositionsForContentWidth(layout, blocks2, effectiveWidth, co
 async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId) {
   if (!blocksByRId)
     return;
-  const rIdPerSection = resolveRIdPerSection(sectionMetadata, kind);
+  const defaultRIdPerSection = resolveDefaultRIdPerSection(sectionMetadata, kind);
   const tableWidthSpecByRId = /* @__PURE__ */ new Map;
   for (const [rId, blocks2] of blocksByRId) {
     const spec = getTableWidthSpec(blocks2);
@@ -260422,7 +260501,7 @@ async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadat
   }
   const groups = /* @__PURE__ */ new Map;
   for (const section of sectionMetadata) {
-    const rId = rIdPerSection.get(section.sectionIndex);
+    const rId = defaultRIdPerSection.get(section.sectionIndex);
     if (!rId || !blocksByRId.has(rId))
       continue;
     const contentWidth = buildSectionContentWidth(section, fallbackConstraints);
@@ -285383,7 +285462,7 @@ var Node$13 = class Node$14 {
   exportSubEditorToPart(mainEditor, editor, headerFooterRefId, type);
 }, setEditorToolbar = ({ editor }, mainEditor) => {
   editor.setToolbar(mainEditor.toolbar);
-}, HEADER_FOOTER_VARIANTS4, DEFAULT_HEADER_FOOTER_HEIGHT = 100, EDITOR_READY_TIMEOUT_MS = 5000, MAX_CACHED_EDITORS_LIMIT = 100, HeaderFooterEditorManager, HeaderFooterLayoutAdapter = class {
+}, HEADER_FOOTER_VARIANTS$12, DEFAULT_HEADER_FOOTER_HEIGHT = 100, EDITOR_READY_TIMEOUT_MS = 5000, MAX_CACHED_EDITORS_LIMIT = 100, HeaderFooterEditorManager, HeaderFooterLayoutAdapter = class {
   #manager;
   #mediaFiles;
   #blockCache = /* @__PURE__ */ new Map;
@@ -285844,7 +285923,7 @@ var Node$13 = class Node$14 {
     target: currentX + DEFAULT_TAB_INTERVAL_PX,
     nextIndex: index2
   };
-}, HeaderFooterSessionManager = class {
+}, HEADER_FOOTER_VARIANTS4, HeaderFooterSessionManager = class {
   #options;
   #deps = null;
   #callbacks = {};
@@ -286988,7 +287067,7 @@ var Node$13 = class Node$14 {
     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_iz38HlbL_es = __esm(() => {
+var init_src_BzK2Ejl0_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_tT_4c8Ha_es();
   init_jszip_C49i9kUs_es();
@@ -316933,7 +317012,7 @@ function print() { __p += __j.call(arguments, '') }
     ".tif"
   ]);
   new PluginKey("paginationPlugin");
-  HEADER_FOOTER_VARIANTS4 = [
+  HEADER_FOOTER_VARIANTS$12 = [
     "default",
     "first",
     "even",
@@ -317174,7 +317253,7 @@ function print() { __p += __j.call(arguments, '') }
           variant
         });
       };
-      HEADER_FOOTER_VARIANTS4.forEach((variant) => {
+      HEADER_FOOTER_VARIANTS$12.forEach((variant) => {
         const headerId = collections.headerIds?.[variant];
         const footerId = collections.footerIds?.[variant];
         if (typeof headerId === "string")
@@ -317437,6 +317516,12 @@ function print() { __p += __j.call(arguments, '') }
     "bar",
     "clear"
   ]);
+  HEADER_FOOTER_VARIANTS4 = [
+    "default",
+    "first",
+    "even",
+    "odd"
+  ];
   DEFAULT_SEMANTIC_FOOTNOTE_HEADING_STYLE = {
     fontFamily: "Arial",
     fontSize: 14,
@@ -321502,7 +321587,7 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_iz38HlbL_es();
+  init_src_BzK2Ejl0_es();
   init_SuperConverter_tT_4c8Ha_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.5.0-next.66",
+  "version": "0.5.0-next.67",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -26,19 +26,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "@superdoc/super-editor": "0.0.1",
-    "superdoc": "1.25.0"
+    "superdoc": "1.25.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.66",
-    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.66",
-    "@superdoc-dev/cli-linux-x64": "0.5.0-next.66",
-    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.66",
-    "@superdoc-dev/cli-windows-x64": "0.5.0-next.66"
+    "@superdoc-dev/cli-darwin-arm64": "0.5.0-next.67",
+    "@superdoc-dev/cli-darwin-x64": "0.5.0-next.67",
+    "@superdoc-dev/cli-linux-x64": "0.5.0-next.67",
+    "@superdoc-dev/cli-linux-arm64": "0.5.0-next.67",
+    "@superdoc-dev/cli-windows-x64": "0.5.0-next.67"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",