@superdoc-dev/cli 0.3.0-next.42 → 0.3.0-next.44

package/dist/index.js

@@ -39922,7 +39922,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-oKnAIRIw.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter--IVMRugL.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -48771,18 +48771,17 @@ function handleTableCellNode({ params, node: node3, table, row, tableProperties,
     const rows = table.elements.filter((el) => el.name === "w:tr");
     const currentRowIndex = rows.findIndex((r) => r === row);
     const remainingRows = rows.slice(currentRowIndex + 1);
-    let cellIndex = row.elements.filter((el) => el.name === "w:tc").findIndex((el) => el === node3);
     let rowspan = 1;
+    const startColumn = Number.isFinite(columnIndex) ? columnIndex : 0;
     for (let remainingRow of remainingRows) {
-      const firstCell = remainingRow.elements.findIndex((el) => el.name === "w:tc");
-      const cellAtIndex = remainingRow.elements[firstCell + cellIndex];
-      if (!cellAtIndex)
+      const cellAtColumn = findTableCellAtColumn(remainingRow, startColumn);
+      if (!cellAtColumn)
         break;
-      const vMerge = getTableCellVMerge(cellAtIndex);
+      const vMerge = getTableCellVMerge(cellAtColumn);
       if (!vMerge || vMerge === "restart")
         break;
       rowspan++;
-      remainingRow.elements.splice(firstCell + cellIndex, 1);
+      markTableCellAsVMergeConsumed(cellAtColumn);
     }
     attributes["rowspan"] = rowspan;
   }
@@ -72870,6 +72869,29 @@ var isRegExp = (value) => {
   if (!vMerge)
     return null;
   return vMerge.attributes?.["w:val"] || "continue";
+}, getGridBefore = (row) => {
+  const raw = row.elements?.find((el) => el.name === "w:trPr")?.elements?.find((el) => el.name === "w:gridBefore")?.attributes?.["w:val"];
+  const value = typeof raw === "string" ? parseInt(raw, 10) : raw;
+  return Number.isFinite(value) && value > 0 ? value : 0;
+}, getTableCellGridSpan = (node3) => {
+  if (!node3 || node3.name !== "w:tc")
+    return 1;
+  const raw = node3.elements?.find((el) => el.name === "w:tcPr")?.elements?.find((el) => el.name === "w:gridSpan")?.attributes?.["w:val"];
+  const value = typeof raw === "string" ? parseInt(raw, 10) : raw;
+  return Number.isFinite(value) && value > 0 ? value : 1;
+}, findTableCellAtColumn = (row, targetColumn) => {
+  const cells = row.elements?.filter((el) => el.name === "w:tc") ?? [];
+  let currentColumn = getGridBefore(row);
+  for (const cell of cells) {
+    const colSpan = getTableCellGridSpan(cell);
+    if (targetColumn >= currentColumn && targetColumn < currentColumn + colSpan)
+      return cell._vMergeConsumed ? null : cell;
+    currentColumn += colSpan;
+  }
+  return null;
+}, markTableCellAsVMergeConsumed = (node3) => {
+  if (node3?.name === "w:tc")
+    node3._vMergeConsumed = true;
 }, getTableCellMargins = (inlineMargins, referencedStyles) => {
   const { cellMargins = {} } = referencedStyles;
   return [
@@ -73004,6 +73026,8 @@ var isRegExp = (value) => {
   cellNodes?.forEach((node3) => {
     skipOccupiedColumns();
     const startColumn = currentColumnIndex;
+    if (node3._vMergeConsumed)
+      return;
     const columnWidth = gridColumnWidths?.[startColumn] || null;
     const result = translator$5.encode({
       ...params,
@@ -85997,7 +86021,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_oKnAIRIw_es = __esm(() => {
+var init_SuperConverter_IVMRugL_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
@@ -148813,7 +148837,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CLe3UbDE.es.js
+// ../../packages/superdoc/dist/chunks/src-ofVoy7QC.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -192255,17 +192279,20 @@ function extractDefaultFontProperties(converterContext, paragraphProperties) {
     defaultSize: defaultRunAttrs.fontSize
   };
 }
-function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesConfig, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, converters: converters$1, converterContext, enableComments = true, stableBlockId }) {
+function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesConfig, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, converters: converters$1, converterContext, enableComments = true, stableBlockId, previousParagraphFont }) {
   const baseBlockId = stableBlockId ?? nextBlockId("paragraph");
   let inlineBlockCounter = 0;
   const stableNextBlockId = stableBlockId ? (prefix2) => `${stableBlockId}-${prefix2}-${inlineBlockCounter++}` : nextBlockId;
   const paragraphProps = typeof para.attrs?.paragraphProperties === "object" && para.attrs.paragraphProperties !== null ? para.attrs.paragraphProperties : {};
-  const { paragraphAttrs, resolvedParagraphProperties } = computeParagraphAttrs(para, converterContext);
+  const { paragraphAttrs, resolvedParagraphProperties } = computeParagraphAttrs(para, converterContext, previousParagraphFont);
   const blocks2 = [];
   const paraAttrs = para.attrs ?? {};
   const rawParagraphProps = typeof paraAttrs.paragraphProperties === "object" && paraAttrs.paragraphProperties !== null ? paraAttrs.paragraphProperties : undefined;
   const isSectPrMarker = Boolean(rawParagraphProps?.sectPr) || paraAttrs.pageBreakSource === "sectPr";
-  const { defaultFont, defaultSize } = extractDefaultFontProperties(converterContext, resolvedParagraphProperties);
+  const extracted = extractDefaultFontProperties(converterContext, resolvedParagraphProperties);
+  const usePreviousFont = previousParagraphFont != null && resolvedParagraphProperties.numberingProperties != null && !hasExplicitParagraphRunProperties(paragraphProps);
+  const defaultFont = usePreviousFont && previousParagraphFont.fontFamily ? previousParagraphFont.fontFamily : extracted.defaultFont;
+  const defaultSize = usePreviousFont && previousParagraphFont.fontSize ? previousParagraphFont.fontSize : extracted.defaultSize;
   if (paragraphAttrs.pageBreakBefore)
     blocks2.push({
       kind: "pageBreak",
@@ -192479,6 +192506,24 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
   });
   return processedBlocks;
 }
+function getLastParagraphFont(blocks2) {
+  for (let i4 = blocks2.length - 1;i4 >= 0; i4--) {
+    const block = blocks2[i4];
+    if (block.kind === "paragraph") {
+      const firstRun = block.runs?.[0];
+      if (!firstRun)
+        continue;
+      const run2 = firstRun;
+      const fontFamily = typeof run2.fontFamily === "string" ? run2.fontFamily.trim() : "";
+      const fontSize = typeof run2.fontSize === "number" && Number.isFinite(run2.fontSize) ? run2.fontSize : NaN;
+      if (fontFamily.length > 0 && fontSize > 0)
+        return {
+          fontFamily,
+          fontSize
+        };
+    }
+  }
+}
 function handleParagraphNode2(node3, context) {
   const { blocks: blocks2, recordBlockKind, nextBlockId, blockIdPrefix = "", positions, trackedChangesConfig, bookmarks, hyperlinkConfig, sectionState, converters: converters$1, converterContext, themeColors, flowBlockCache, enableComments } = context;
   const { ranges: sectionRanges, currentSectionIndex, currentParagraphIndex } = sectionState;
@@ -192521,7 +192566,8 @@ function handleParagraphNode2(node3, context) {
       converters: converters$1,
       converterContext,
       enableComments,
-      stableBlockId: prefixedStableId
+      stableBlockId: prefixedStableId,
+      previousParagraphFont: getLastParagraphFont(blocks2)
     });
     applyTrackedGhostListAdjustments(node3, paragraphBlocks$1, context);
     paragraphBlocks$1.forEach((block) => {
@@ -192532,6 +192578,7 @@ function handleParagraphNode2(node3, context) {
     sectionState.currentParagraphIndex++;
     return;
   }
+  const previousParagraphFont = getLastParagraphFont(blocks2);
   const paragraphBlocks = paragraphToFlowBlocks$1({
     para: node3,
     nextBlockId,
@@ -192543,7 +192590,8 @@ function handleParagraphNode2(node3, context) {
     converters: converters$1,
     converterContext,
     enableComments,
-    stableBlockId: prefixedStableId ?? undefined
+    stableBlockId: prefixedStableId ?? undefined,
+    previousParagraphFont
   });
   applyTrackedGhostListAdjustments(node3, paragraphBlocks, context);
   paragraphBlocks.forEach((block) => {
@@ -216381,6 +216429,18 @@ var Node$13 = class Node$14 {
   if (value?.numId === 0)
     return;
   return value;
+}, TRACKED_CHANGE_KEYS, hasExplicitParagraphRunProperties = (paragraphProperties) => {
+  if (paragraphProperties?.runProperties == null)
+    return false;
+  return Object.keys(paragraphProperties.runProperties).some((key$1) => !TRACKED_CHANGE_KEYS.has(key$1));
+}, applyParagraphFontFallback = (runAttrs, previousParagraphFont) => {
+  if (!previousParagraphFont)
+    return runAttrs;
+  return {
+    ...runAttrs,
+    fontFamily: previousParagraphFont.fontFamily ?? runAttrs.fontFamily,
+    fontSize: previousParagraphFont.fontSize ?? runAttrs.fontSize
+  };
 }, normalizeDropCap = (framePr, para, converterContext) => {
   if (!framePr || !framePr.dropCap || framePr.dropCap === "none")
     return;
@@ -216425,7 +216485,7 @@ var Node$13 = class Node$14 {
     color: runAttrs.color,
     position: resolvedRunProperties.position != null ? ptToPx(resolvedRunProperties.position / 2) : undefined
   };
-}, computeParagraphAttrs = (para, converterContext) => {
+}, computeParagraphAttrs = (para, converterContext, previousParagraphFont) => {
   const attrs = para.attrs ?? {};
   const paragraphProperties = attrs.paragraphProperties ?? {};
   let resolvedParagraphProperties;
@@ -216466,12 +216526,24 @@ var Node$13 = class Node$14 {
     pageBreakBefore: resolvedParagraphProperties.pageBreakBefore,
     direction: resolvedParagraphProperties.rightToLeft ? "rtl" : undefined
   };
-  if (normalizedNumberingProperties && normalizedListRendering)
+  if (normalizedNumberingProperties && normalizedListRendering) {
+    const markerRunAttrs = computeRunAttrs(resolveRunProperties(converterContext, resolvedParagraphProperties.runProperties, resolvedParagraphProperties, converterContext.tableInfo, true, Boolean(paragraphProperties.numberingProperties)), converterContext);
+    let markerFontFallback;
+    if (!hasExplicitParagraphRunProperties(paragraphProperties) && previousParagraphFont) {
+      const numProps = paragraphProperties.numberingProperties;
+      const numId = numProps?.numId;
+      const ilvl = numProps?.ilvl ?? 0;
+      markerFontFallback = {
+        fontFamily: (numId != null && numId !== 0 ? getNumberingProperties$1("runProperties", converterContext, ilvl, numId) : {}).fontFamily != null ? undefined : previousParagraphFont.fontFamily,
+        fontSize: previousParagraphFont.fontSize
+      };
+    }
     paragraphAttrs.wordLayout = computeWordParagraphLayout({
       paragraph: paragraphAttrs,
       listRenderingAttrs: normalizedListRendering,
-      markerRun: computeRunAttrs(resolveRunProperties(converterContext, resolvedParagraphProperties.runProperties, resolvedParagraphProperties, converterContext.tableInfo, true, Boolean(paragraphProperties.numberingProperties)), converterContext)
+      markerRun: applyParagraphFontFallback(markerRunAttrs, markerFontFallback)
     });
+  }
   return {
     paragraphAttrs,
     resolvedParagraphProperties
@@ -229021,9 +229093,9 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_CLe3UbDE_es = __esm(() => {
+var init_src_ofVoy7QC_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_oKnAIRIw_es();
+  init_SuperConverter_IVMRugL_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_ep1_Gwqi_es();
@@ -246069,6 +246141,7 @@ function print() { __p += __j.call(arguments, '') }
     "doubleWave"
   ]);
   PIXELS_PER_TWIP = 1 / Math.round(1440 / 96);
+  TRACKED_CHANGE_KEYS = new Set(["trackInsert", "trackDelete"]);
   VALID_LINK_TARGETS = new Set([
     "_blank",
     "_self",
@@ -262356,8 +262429,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CLe3UbDE_es();
-  init_SuperConverter_oKnAIRIw_es();
+  init_src_ofVoy7QC_es();
+  init_SuperConverter_IVMRugL_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();
   init_constants_ep1_Gwqi_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.42",
+  "version": "0.3.0-next.44",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -30,11 +30,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.42",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.42",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.42",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.42",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.42"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.44",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.44",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.44",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.44",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.44"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",