@superdoc-dev/cli 0.16.0-next.11 → 0.16.0-next.12

package/dist/index.js

@@ -68110,7 +68110,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-D9c2ow57.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-BoqEhvrr.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -104441,6 +104441,17 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
   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;
+  const finalizeParagraphBlocks = (outputBlocks) => {
+    outputBlocks.forEach((block) => {
+      if (block.kind === "paragraph")
+        syncListMarkerFontFromParagraphRuns({
+          block,
+          converterContext,
+          para
+        });
+    });
+    return outputBlocks;
+  };
   if (paragraphAttrs.pageBreakBefore)
     blocks.push({
       kind: "pageBreak",
@@ -104449,7 +104460,7 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
     });
   if (!para.content || para.content.length === 0) {
     if (paragraphProps.runProperties?.vanish)
-      return blocks;
+      return finalizeParagraphBlocks(blocks);
     const paragraphMarkTrackedChange = getParagraphMarkTrackedChange(paragraphProps, storyKey);
     const paraPos = positions.get(para);
     const emptyRun = {
@@ -104477,15 +104488,15 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
       sourceAnchor
     });
     if (!trackedChangesConfig)
-      return blocks;
+      return finalizeParagraphBlocks(blocks);
     const paragraphBlock = blocks[blocks.length - 1];
     if (paragraphBlock?.kind !== "paragraph")
-      return blocks;
+      return finalizeParagraphBlocks(blocks);
     const filteredRuns = applyTrackedChangesModeToRuns(paragraphBlock.runs, trackedChangesConfig, hyperlinkConfig, applyMarksToRun, themeColors, enableComments, storyKey);
     const isGhostTrackedListArtifact = trackedChangesConfig.enabled && isGhostSuppressionMode(trackedChangesConfig.mode) && Boolean(paragraphAttrs.numberingProperties) && Boolean(paragraphMarkTrackedChange) && filteredRuns.length > 0 && filteredRuns.every(isEmptyTextRun);
     if (trackedChangesConfig.enabled && (filteredRuns.length === 0 || isGhostTrackedListArtifact)) {
       blocks.pop();
-      return blocks;
+      return finalizeParagraphBlocks(blocks);
     }
     paragraphBlock.runs = filteredRuns;
     paragraphBlock.attrs = {
@@ -104493,7 +104504,7 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
       trackedChangesMode: trackedChangesConfig.mode,
       trackedChangesEnabled: trackedChangesConfig.enabled
     };
-    return blocks;
+    return finalizeParagraphBlocks(blocks);
   }
   let currentRuns = [];
   let partIndex = 0;
@@ -104669,7 +104680,7 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
       block.runs = expandRunsForInlineNewlines(block.runs);
   });
   if (!trackedChangesConfig)
-    return blocks;
+    return finalizeParagraphBlocks(blocks);
   const processedBlocks = [];
   blocks.forEach((block) => {
     if (block.kind !== "paragraph") {
@@ -104687,7 +104698,7 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, storyKey, tracked
     };
     processedBlocks.push(block);
   });
-  return processedBlocks;
+  return finalizeParagraphBlocks(processedBlocks);
 }
 function getLastParagraphFont(blocks) {
   for (let i$1 = blocks.length - 1;i$1 >= 0; i$1--) {
@@ -104697,6 +104708,8 @@ function getLastParagraphFont(blocks) {
       if (!firstRun)
         continue;
       const run$1 = firstRun;
+      if (typeof run$1.text === "string" && run$1.text.length === 0)
+        continue;
       const fontFamily = typeof run$1.fontFamily === "string" ? run$1.fontFamily.trim() : "";
       const fontSize = typeof run$1.fontSize === "number" && Number.isFinite(run$1.fontSize) ? run$1.fontSize : NaN;
       if (fontFamily.length > 0 && fontSize > 0)
@@ -104730,6 +104743,18 @@ function handleParagraphNode(node3, context) {
     if (cached) {
       const delta = pmStart - cached.pmStart;
       const reusedBlocks = shiftCachedBlocks(cached.blocks, delta);
+      const paragraphProps = node3.attrs?.paragraphProperties;
+      const previousParagraphFont$2 = !hasExplicitParagraphRunProperties(paragraphProps) ? getLastParagraphFont(blocks) : undefined;
+      reusedBlocks.forEach((block) => {
+        if (block.kind === "paragraph")
+          syncListMarkerFontFromParagraphRuns({
+            block,
+            converterContext,
+            para: node3,
+            contentFontSource: "paragraph",
+            previousParagraphFont: previousParagraphFont$2
+          });
+      });
       applyTrackedGhostListAdjustments(node3, reusedBlocks, context);
       reusedBlocks.forEach((block) => {
         blocks.push(block);
@@ -127787,7 +127812,7 @@ var isRegExp = (value) => {
   };
 }, browser2, process3, cachedSetTimeout2, cachedClearTimeout2, queue2, draining2 = false, currentQueue2, queueIndex2 = -1, browserExports2, process$12, TWIPS_PER_INCH$1 = 1440, PX_PER_PT, VALID_TRACKED_MODES, DEFAULT_HYPERLINK_CONFIG, ATOMIC_INLINE_TYPES, TOKEN_INLINE_TYPES, isValidTrackedMode = (value) => {
   return typeof value === "string" && VALID_TRACKED_MODES.includes(value);
-}, isTextRun$1 = (run$1) => {
+}, isTextRun$2 = (run$1) => {
   return "text" in run$1 && run$1.kind !== "tab";
 }, stripTrackedChangeFromRun = (run$1) => {
   if ("trackedChange" in run$1 && run$1.trackedChange)
@@ -127799,7 +127824,7 @@ var isRegExp = (value) => {
     return run$1.trackedChanges;
   return run$1.trackedChange ? [run$1.trackedChange] : [];
 }, isTrackedChangeRun = (run$1) => {
-  return isTextRun$1(run$1) || run$1.kind === "break";
+  return isTextRun$2(run$1) || run$1.kind === "break";
 }, runHasTrackedChangeKind = (run$1, kind) => {
   if (!isTrackedChangeRun(run$1))
     return false;
@@ -127882,14 +127907,14 @@ var isRegExp = (value) => {
       runs.forEach((run$1) => stripTrackedChangeFromRun(run$1));
     else
       runs.forEach((run$1) => {
-        if (isTextRun$1(run$1))
+        if (isTextRun$2(run$1))
           applyFormatChangeMarks(run$1, config$42, hyperlinkConfig, applyMarksToRun$1, themeColors, enableComments, storyKey);
       });
     return runs;
   }
   const filtered = [];
   runs.forEach((run$1) => {
-    if (!isTextRun$1(run$1) && run$1.kind !== "break") {
+    if (!isTextRun$2(run$1) && run$1.kind !== "break") {
       filtered.push(run$1);
       return;
     }
@@ -127907,7 +127932,7 @@ var isRegExp = (value) => {
     filtered.forEach((run$1) => stripTrackedChangeFromRun(run$1));
   else {
     filtered.forEach((run$1) => {
-      if (isTextRun$1(run$1))
+      if (isTextRun$2(run$1))
         applyFormatChangeMarks(run$1, config$42, hyperlinkConfig || DEFAULT_HYPERLINK_CONFIG, applyMarksToRun$1, themeColors, enableComments, storyKey);
     });
     if ((config$42.mode === "original" || config$42.mode === "final") && config$42.enabled)
@@ -128499,6 +128524,11 @@ var isRegExp = (value) => {
     inlineDirection,
     writingMode
   };
+}, numberingDefinesMarkerFontFamily = (numberingProperties, converterContext) => {
+  const numId = numberingProperties?.numId;
+  if (numId == null || numId === 0 || !converterContext)
+    return false;
+  return getNumberingProperties$1("runProperties", converterContext, numberingProperties?.ilvl ?? 0, numId).fontFamily != null;
 }, DEFAULT_DECIMAL_SEPARATOR = ".", DEFAULT_TAB_INTERVAL_TWIPS = 720, normalizeColor$1 = (value) => {
   if (typeof value !== "string")
     return;
@@ -128681,15 +128711,11 @@ var isRegExp = (value) => {
   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;
+    if (!hasExplicitParagraphRunProperties(paragraphProperties) && previousParagraphFont)
       markerFontFallback = {
-        fontFamily: (numId != null && numId !== 0 ? getNumberingProperties$1("runProperties", converterContext, ilvl, numId) : {}).fontFamily != null ? undefined : previousParagraphFont.fontFamily,
+        fontFamily: numberingDefinesMarkerFontFamily(paragraphProperties.numberingProperties, converterContext) ? undefined : previousParagraphFont.fontFamily,
         fontSize: previousParagraphFont.fontSize
       };
-    }
     paragraphAttrs.wordLayout = computeWordParagraphLayout({
       paragraph: paragraphAttrs,
       listRenderingAttrs: normalizedListRendering,
@@ -129431,6 +129457,84 @@ var isRegExp = (value) => {
       merged.script = script;
   }
   return merged;
+}, isTextRun$1 = (run$1) => ("text" in run$1), pickFontPartial = (fontFamily, fontSize) => {
+  const partial = {};
+  if (typeof fontFamily === "string" && fontFamily.trim().length > 0)
+    partial.fontFamily = fontFamily.trim();
+  if (typeof fontSize === "number" && Number.isFinite(fontSize) && fontSize > 0)
+    partial.fontSize = fontSize;
+  return Object.keys(partial).length > 0 ? partial : undefined;
+}, getFontFromRuns = (runs) => {
+  for (const run$1 of runs) {
+    if (!isTextRun$1(run$1))
+      continue;
+    if (typeof run$1.text === "string" && run$1.text.length === 0)
+      continue;
+    const partial = pickFontPartial(run$1.fontFamily, run$1.fontSize);
+    if (partial)
+      return partial;
+  }
+}, getFontFromTextStyleMark = (attrs) => {
+  const probe = {
+    text: "",
+    fontFamily: "",
+    fontSize: 0
+  };
+  applyTextStyleMark(probe, attrs);
+  return pickFontPartial(probe.fontFamily, probe.fontSize);
+}, getFontFromParagraphContent = (node3) => {
+  let found$1;
+  const visit2 = (current) => {
+    if (found$1 || current == null || typeof current !== "object")
+      return;
+    const candidate = current;
+    if ((candidate.isText === true || typeof candidate.text === "string") && candidate.marks?.length)
+      for (const mark of candidate.marks) {
+        if ((typeof mark.type === "string" ? mark.type : mark.type?.name) !== "textStyle")
+          continue;
+        const partial = getFontFromTextStyleMark(mark.attrs ?? {});
+        if (partial) {
+          found$1 = partial;
+          return;
+        }
+      }
+    candidate.content?.forEach?.(visit2);
+  };
+  visit2(node3);
+  return found$1;
+}, resolveContentFont = (block, para, source, previousParagraphFont) => {
+  const fromRuns = getFontFromRuns(block.runs);
+  const fromPara = para ? getFontFromParagraphContent(para) : undefined;
+  if (source === "paragraph") {
+    if (fromPara)
+      return fromPara;
+    return fromRuns ?? previousParagraphFont;
+  }
+  return fromRuns ?? fromPara;
+}, syncListMarkerFontFromParagraphRuns = ({ block, converterContext, para, contentFontSource = "runs", previousParagraphFont }) => {
+  const markerRun = block.attrs?.wordLayout?.marker?.run;
+  if (!markerRun)
+    return;
+  const contentFont = resolveContentFont(block, para, contentFontSource, previousParagraphFont);
+  if (!contentFont)
+    return;
+  const paragraphProperties = para?.attrs?.paragraphProperties != null && typeof para.attrs.paragraphProperties === "object" ? para.attrs.paragraphProperties : undefined;
+  const hasLiveTextStyleFont = para ? getFontFromParagraphContent(para) != null : false;
+  const allowBodyFontSync = !hasExplicitParagraphRunProperties(paragraphProperties) || hasLiveTextStyleFont;
+  if (contentFontSource === "paragraph") {
+    const firstRun = block.runs[0];
+    if (firstRun && isTextRun$1(firstRun) && firstRun.text.length === 0) {
+      if (contentFont.fontFamily)
+        firstRun.fontFamily = contentFont.fontFamily;
+      if (contentFont.fontSize)
+        firstRun.fontSize = contentFont.fontSize;
+    }
+  }
+  const preserveNumberingFontFamily = numberingDefinesMarkerFontFamily(block.attrs?.numberingProperties, converterContext);
+  if (allowBodyFontSync && !preserveNumberingFontFamily && contentFont.fontFamily)
+    markerRun.fontFamily = contentFont.fontFamily;
+  if (allowBodyFontSync && contentFont.fontSize)
+    markerRun.fontSize = contentFont.fontSize;
 }, buildSyntheticTextNode = (displayText, marks) => ({
   type: "text",
   text: displayText,
@@ -130696,7 +130800,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_D9c2ow57_es = __esm(() => {
+var init_SuperConverter_BoqEhvrr_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -169470,7 +169574,7 @@ var init_SuperConverter_D9c2ow57_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-evnTxkbH.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BrbwjtJZ.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -179801,8 +179905,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_evnTxkbH_es = __esm(() => {
-  init_SuperConverter_D9c2ow57_es();
+var init_create_headless_toolbar_BrbwjtJZ_es = __esm(() => {
+  init_SuperConverter_BoqEhvrr_es();
   init_uuid_qzgm05fK_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
@@ -228965,7 +229069,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DWFNPbG8.es.js
+// ../../packages/superdoc/dist/chunks/src-HGVtAenV.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -283300,7 +283404,7 @@ function updateMaxFontInfo(currentMaxSize, currentMaxInfo, newRun) {
     return getFontInfoFromRun(newRun);
   return currentMaxInfo;
 }
-function isTextRun$2(run2) {
+function isTextRun$22(run2) {
   return run2.kind === "text" || run2.kind === undefined;
 }
 function isTabRun(run2) {
@@ -283427,9 +283531,9 @@ async function measureBlock(block, constraints) {
 async function measureParagraphBlock(block, maxWidth) {
   const ctx$1 = getCanvasContext();
   const wordLayout = block.attrs?.wordLayout;
-  const firstTextRunWithSize = block.runs.find((run2) => isTextRun$2(run2) && ("fontSize" in run2) && run2.fontSize != null);
+  const firstTextRunWithSize = block.runs.find((run2) => isTextRun$22(run2) && ("fontSize" in run2) && run2.fontSize != null);
   const fallbackFontSize = normalizeFontSize2(firstTextRunWithSize?.fontSize, DEFAULT_PARAGRAPH_FONT_SIZE);
-  const fallbackFontFamily = block.runs.find((run2) => isTextRun$2(run2) && typeof run2.fontFamily === "string" && run2.fontFamily.trim().length > 0)?.fontFamily ?? DEFAULT_PARAGRAPH_FONT_FAMILY;
+  const fallbackFontFamily = block.runs.find((run2) => isTextRun$22(run2) && typeof run2.fontFamily === "string" && run2.fontFamily.trim().length > 0)?.fontFamily ?? DEFAULT_PARAGRAPH_FONT_FAMILY;
   const normalizedRuns = normalizeRunsForMeasurement(block.runs, fallbackFontSize, fallbackFontFamily);
   const markerInfo = wordLayout?.marker ? (() => {
     const { font: markerFont } = buildFontString({
@@ -283651,10 +283755,10 @@ async function measureParagraphBlock(block, maxWidth) {
       });
     } else
       runsToProcess.push(run2);
-  if (runsToProcess.some((run2) => isTextRun$2(run2) && typeof run2.text === "string" && run2.text.includes("\t"))) {
+  if (runsToProcess.some((run2) => isTextRun$22(run2) && typeof run2.text === "string" && run2.text.includes("\t"))) {
     const expandedRuns = [];
     for (const run2 of runsToProcess) {
-      if (!isTextRun$2(run2) || typeof run2.text !== "string" || !run2.text.includes("\t")) {
+      if (!isTextRun$22(run2) || typeof run2.text !== "string" || !run2.text.includes("\t")) {
         expandedRuns.push(run2);
         continue;
       }
@@ -322089,13 +322193,13 @@ 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, TRACKED_MARK_NAMES;
-var init_src_DWFNPbG8_es = __esm(() => {
+var init_src_HGVtAenV_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_D9c2ow57_es();
+  init_SuperConverter_BoqEhvrr_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_evnTxkbH_es();
+  init_create_headless_toolbar_BrbwjtJZ_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -356437,11 +356541,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-DX0SYUhT.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-SRtgJ7Vz.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_DX0SYUhT_es = __esm(() => {
-  init_SuperConverter_D9c2ow57_es();
-  init_create_headless_toolbar_evnTxkbH_es();
+var init_create_super_doc_ui_SRtgJ7Vz_es = __esm(() => {
+  init_SuperConverter_BoqEhvrr_es();
+  init_create_headless_toolbar_BrbwjtJZ_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -356483,16 +356587,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DWFNPbG8_es();
-  init_SuperConverter_D9c2ow57_es();
+  init_src_HGVtAenV_es();
+  init_SuperConverter_BoqEhvrr_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_evnTxkbH_es();
+  init_create_headless_toolbar_BrbwjtJZ_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_nv_KfOqb_es();
-  init_create_super_doc_ui_DX0SYUhT_es();
+  init_create_super_doc_ui_SRtgJ7Vz_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.16.0-next.11",
+  "version": "0.16.0-next.12",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -33,11 +33,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.11",
-    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.11",
-    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.11",
-    "@superdoc-dev/cli-linux-x64": "0.16.0-next.11",
-    "@superdoc-dev/cli-windows-x64": "0.16.0-next.11"
+    "@superdoc-dev/cli-darwin-arm64": "0.16.0-next.12",
+    "@superdoc-dev/cli-darwin-x64": "0.16.0-next.12",
+    "@superdoc-dev/cli-linux-x64": "0.16.0-next.12",
+    "@superdoc-dev/cli-linux-arm64": "0.16.0-next.12",
+    "@superdoc-dev/cli-windows-x64": "0.16.0-next.12"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",