@superdoc/mcp 1.7.0-next.12 → 1.7.0-next.13

package/dist/index.js

@@ -31600,7 +31600,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.20.0-next.12";
+var SDK_VERSION = "2.20.0-next.13";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -312476,6 +312476,7 @@ function convertHtmlToFragment(html, options = {}) {
       range: { startOffset: 0, endOffset: html.length }
     }), limits.maxDiagnostics);
   }
+  attachSiblingListsToPreviousItems(tree);
   const treeViolation = inspectTreeLimits(tree, limits);
   if (treeViolation) {
     appendBoundedConversionDiagnostic(diagnostics, htmlDiagnostic({
@@ -312537,6 +312538,34 @@ function convertHtmlToFragment(html, options = {}) {
     diagnostics
   };
 }
+function attachSiblingListsToPreviousItems(parent) {
+  const pending = [parent];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    if ("tagName" in current && (current.tagName === "ul" || current.tagName === "ol")) {
+      let previousItem = null;
+      const retained = [];
+      for (const child of current.childNodes) {
+        if (isElement(child) && child.tagName === "li") {
+          previousItem = child;
+          retained.push(child);
+        } else if (previousItem && isElement(child) && (child.tagName === "ul" || child.tagName === "ol")) {
+          previousItem.childNodes.push(child);
+          child.parentNode = previousItem;
+        } else {
+          if (!isText(child) || child.value.trim() !== "")
+            previousItem = null;
+          retained.push(child);
+        }
+      }
+      current.childNodes = retained;
+    }
+    for (const child of current.childNodes) {
+      if (isElement(child))
+        pending.push(child);
+    }
+  }
+}
 function parseErrorDiagnostic(error48) {
   return htmlDiagnostic({
     code: "conversion-malformed-input",
@@ -312914,9 +312943,9 @@ function convertSemanticList(root, context, inherited, path6) {
         level,
         path: canonicalPath,
         ...itemValue !== undefined && itemValue !== null ? { marker: `${itemValue}${definition.text?.endsWith(")") ? ")" : "."}` } : {},
-        content: content.length > 0 ? content : [
+        content: applyListItemParagraphMarkRunProps(content.length > 0 ? content : [
           paragraph2(context, [], undefined, itemPath, context.droppedContentCount === droppedContentStart)
-        ]
+        ], itemContext.runProps)
       });
       for (let nestedIndex = 0;nestedIndex < child.childNodes.length; nestedIndex += 1) {
         const nested = child.childNodes[nestedIndex];
@@ -312984,7 +313013,7 @@ function convertSemanticList(root, context, inherited, path6) {
         level,
         path: canonicalPath,
         ...itemValue !== undefined && itemValue !== null ? { marker: `${itemValue}${definition.text?.endsWith(")") ? ")" : "."}` } : {},
-        content: nestedContent
+        content: applyListItemParagraphMarkRunProps(nestedContent, itemContext.runProps)
       });
     }
     if (nestedItems.length === 0)
@@ -313098,7 +313127,7 @@ function convertWordListGroup(group, context, inherited) {
       level: descriptor.level,
       path: canonicalPath,
       ...exceptionalMarker ? { marker: exceptionalMarker } : {},
-      content: applyWordListParagraphMarkRunProps(itemContent, itemContext.runProps)
+      content: applyListItemParagraphMarkRunProps(itemContent, itemContext.runProps)
     });
     previousLevel = descriptor.level;
   }
@@ -313110,7 +313139,7 @@ function convertWordListGroup(group, context, inherited) {
     list: { levels: [...levels.values()].sort((a, b) => a.level - b.level), items }
   };
 }
-function applyWordListParagraphMarkRunProps(content, runProps) {
+function applyListItemParagraphMarkRunProps(content, runProps) {
   if (Object.keys(runProps).length === 0)
     return content;
   let applied = false;
@@ -326322,22 +326351,50 @@ function comparablePlainTokenVariants(plan, plain) {
   return variants;
 }
 function normalizeRepresentedListMarkers(plan, lines) {
-  const listTexts = plan.blocks.flatMap((block) => block.kind === "paragraph" && block.listIntent ? [comparableText(blockText(block))] : []);
-  if (listTexts.length === 0)
+  const representedTokens = [];
+  const listStarts = new Set;
+  for (const block of plan.blocks) {
+    const tokens = comparableTokens(blockText(block));
+    if (tokens.length > 0 && block.kind === "paragraph" && block.listIntent) {
+      listStarts.add(representedTokens.length);
+    }
+    for (const token of tokens)
+      representedTokens.push(token);
+  }
+  if (listStarts.size === 0)
     return null;
-  let listIndex = 0;
+  let tokenIndex = 0;
+  const matchesNext = (tokens) => tokens.length > 0 && tokens.every((token, index2) => token === representedTokens[tokenIndex + index2]);
   let changed = false;
   const normalized = lines.map((line) => {
-    if (!hasPlainListMarker(line) || listIndex >= listTexts.length)
+    const tokens = comparableTokens(line);
+    if (matchesNext(tokens)) {
+      tokenIndex += tokens.length;
+      return line;
+    }
+    if (!listStarts.has(tokenIndex))
       return line;
-    const withoutMarker = stripPlainListMarker(line);
-    if (comparableText(withoutMarker) !== listTexts[listIndex])
+    const withoutMarker = stripRepresentedListMarker(line);
+    if (withoutMarker === null)
       return line;
-    listIndex += 1;
+    const withoutMarkerTokens = comparableTokens(withoutMarker);
+    if (!matchesNext(withoutMarkerTokens))
+      return line;
+    tokenIndex += withoutMarkerTokens.length;
     changed = true;
     return withoutMarker;
   });
-  return changed && listIndex === listTexts.length ? normalized : null;
+  return changed && tokenIndex === representedTokens.length ? normalized : null;
+}
+function stripRepresentedListMarker(line) {
+  if (hasPlainListMarker(line))
+    return stripPlainListMarker(line);
+  const separator = line.indexOf("\t");
+  if (separator < 1)
+    return null;
+  if (!/^(?:o|[\uE000-\uF8FF])$/u.test(line.slice(0, separator).trim()))
+    return null;
+  return line.slice(separator).replace(/^\t+/u, "");
 }
 function hasPlainListMarker(value2) {
   return PLAIN_LIST_MARKER_PATTERN.test(value2);
@@ -326373,7 +326430,7 @@ function isSubsequence(needles, haystack) {
 var PLAIN_LIST_MARKER_PATTERN;
 var init_html_plain_reconciliation = __esm(() => {
   init_contracts();
-  PLAIN_LIST_MARKER_PATTERN = /^(?:[•◦▪‣⁃●○■*+-]|\d{1,9}[.)]|[A-Za-z][.)]|[ivxlcdmIVXLCDM]{1,8}[.)])(?:[\t ]+)/u;
+  PLAIN_LIST_MARKER_PATTERN = /^(?:[•◦▪‣⁃●○■□▫◻◽*+-]|\d{1,9}[.)]|[A-Za-z][.)]|[ivxlcdmIVXLCDM]{1,8}[.)])(?:[\t ]+)/u;
 });
 
 // ../../../v2/document-api-v2-adapter/dist/clipboard/parse-v1-slice.js
@@ -328508,15 +328565,14 @@ function* serializeSelectionRangeSteps(context, target, includeHtml, options) {
     let numbering = properties.numbering;
     const listState = readListStateForSession(context.session, resolved.storyId, entry.blockId);
     let listKind = listState?.isListItem ? listState.numFmt === "bullet" ? "bullet" : listState.numFmt ? "ordered" : undefined : undefined;
+    const marker = fullyCovered || listKind ? resolveNumberingLevelForMarker({
+      resolverParams: styleModel.resolverParams,
+      numId: listState?.isListItem && listState.numId != null ? Number(listState.numId) : properties.numbering ? Number(properties.numbering.numId) : undefined,
+      ilvl: listState?.isListItem ? listState.ilvl : properties.numbering ? Number(properties.numbering.ilvl) : undefined,
+      paragraphStyleId: properties.styleRef
+    }) : null;
     if (fullyCovered) {
-      const model = copyStyleModel ?? (copyStyleModel = compileCopyStyleModel(context));
-      const marker = resolveNumberingLevelForMarker({
-        resolverParams: model.resolverParams,
-        numId: properties.numbering ? Number(properties.numbering.numId) : undefined,
-        ilvl: properties.numbering ? Number(properties.numbering.ilvl) : undefined,
-        paragraphStyleId: properties.styleRef
-      });
-      if (marker.definition && !marker.definition.suppressed) {
+      if (marker?.definition && !marker.definition.suppressed) {
         numbering = {
           numId: String(marker.definition.numId),
           ilvl: String(marker.definition.ilvl)
@@ -328564,7 +328620,8 @@ function* serializeSelectionRangeSteps(context, target, includeHtml, options) {
           ...cellFormatting
         }
       } : {},
-      ...listKind ? { listKind } : {},
+      ...listKind ? { listKind, listLevel: listState?.isListItem ? listState.ilvl : listLevel ?? 0 } : {},
+      ...listKind && marker?.definition ? { listMarkerStyle: portableListMarkerStyle(marker.definition, styleModel, paragraphXml) } : {},
       ...semanticHeadingLevel != null && semanticHeadingLevel >= 1 && semanticHeadingLevel <= 6 ? { headingLevel: semanticHeadingLevel } : {},
       parts
     });
@@ -329774,14 +329831,14 @@ function paragraphPaintedLength(xml) {
   const map3 = parseParagraphInlineMap(xml);
   return map3.visibleLength + map3.leaves().filter(isVisibleZeroWidthObjectPiece).length;
 }
-function blockInlineHtml(block, assets) {
-  return block.parts.map((part) => renderHtmlPart(part, assets)).join("");
+function blockInlineHtml(block, assets, defaultTextColor) {
+  return block.parts.map((part) => renderHtmlPart(part, assets, defaultTextColor)).join("");
 }
-function renderHtmlPart(part, assets) {
+function renderHtmlPart(part, assets, defaultTextColor) {
   if (part.kind === "break")
     return "<br/>";
   if (part.kind === "run")
-    return renderHtmlRun(part.run);
+    return renderHtmlRun(part.run, defaultTextColor);
   if (part.kind === "image") {
     const asset = assets.get(part.image.assetId);
     if (!asset)
@@ -329790,18 +329847,17 @@ function renderHtmlPart(part, assets) {
     return `<img src="data:${asset.mimeType};base64,${asset.data}" width="${widthPx}" height="${heightPx}"` + (alt ? ` alt="${escapeHtmlAttribute(alt)}"` : "") + (title2 ? ` title="${escapeHtmlAttribute(title2)}"` : "") + "/>";
   }
   if (part.kind === "sdt")
-    return part.parts.map((child) => renderHtmlPart(child, assets)).join("");
+    return part.parts.map((child) => renderHtmlPart(child, assets, defaultTextColor)).join("");
   const href = part.target.kind === "external" ? part.target.url : `#${part.target.anchor}`;
   const title = part.tooltip ? ` title="${escapeHtmlAttribute(part.tooltip)}"` : "";
-  return `<a href="${escapeHtmlAttribute(href)}"${title}>${part.parts.map((child) => renderHtmlPart(child, assets)).join("")}</a>`;
+  return `<a href="${escapeHtmlAttribute(href)}"${title}>${part.parts.map((child) => renderHtmlPart(child, assets, defaultTextColor)).join("")}</a>`;
 }
 function buildHtmlFlavor(grouped, assets) {
   const out = [];
-  let openList = null;
+  const openLists = [];
   const closeList = () => {
-    if (openList) {
-      out.push(`</${openList}>`);
-      openList = null;
+    while (openLists.length > 0) {
+      out.push(`</li></${openLists.pop().tag}>`);
     }
   };
   for (const entry of grouped) {
@@ -329811,15 +329867,41 @@ function buildHtmlFlavor(grouped, assets) {
       continue;
     }
     const block = entry.block;
-    const inline = blockInlineHtml(block, assets);
+    const inline = blockInlineHtml(block, assets, block.listMarkerStyle?.color && block.listMarkerStyle.color !== "000000" ? "000000" : undefined);
     if (block.listKind) {
       const tag = block.listKind === "bullet" ? "ul" : "ol";
-      if (openList !== tag) {
-        closeList();
-        out.push(`<${tag}>`);
-        openList = tag;
-      }
-      out.push(`<li>${inline}</li>`);
+      const styleType = block.listMarkerStyle?.type;
+      const level = block.listLevel ?? 0;
+      if (openLists.length > 0)
+        openLists[0].sourceLevel = Math.min(openLists[0].sourceLevel, level);
+      while (openLists.length > 1 && openLists[openLists.length - 1].sourceLevel > level) {
+        out.push(`</li></${openLists.pop().tag}>`);
+      }
+      const depth = openLists.length === 0 ? 0 : level > openLists[openLists.length - 1].sourceLevel ? openLists.length : openLists.length - 1;
+      if (openLists.length === depth + 1) {
+        out.push("</li>");
+        if (openLists[depth].tag !== tag || openLists[depth].styleType !== styleType) {
+          out.push(`</${openLists.pop().tag}>`);
+        }
+      }
+      if (openLists.length === depth) {
+        const listStyles = [
+          ...styleType ? [`list-style-type: ${styleType}`] : [],
+          ...openLists[depth - 1]?.currentItemHasMarkerColor ? ["color: #000000"] : []
+        ];
+        const orderedType = tag === "ol" ? orderedListTypeAttribute(styleType) : undefined;
+        out.push(`<${tag}${orderedType ? ` type="${orderedType}"` : ""}` + `${listStyles.length > 0 ? ` style="${listStyles.join("; ")}"` : ""}>`);
+        openLists.push({ tag, sourceLevel: level, ...styleType ? { styleType } : {}, currentItemHasMarkerColor: false });
+      }
+      const markerColor = block.listMarkerStyle?.color;
+      const previousItemHadColoredMarker = openLists[openLists.length - 1].currentItemHasMarkerColor;
+      const itemColor = markerColor && markerColor !== "000000" ? markerColor : previousItemHadColoredMarker ? "000000" : undefined;
+      const itemStyles = [
+        ...styleType ? [`list-style-type: ${styleType}`] : [],
+        ...itemColor ? [`color: #${itemColor}`] : []
+      ];
+      out.push(`<li${itemStyles.length > 0 ? ` style="${itemStyles.join("; ")}"` : ""}>${inline}`);
+      openLists[openLists.length - 1].currentItemHasMarkerColor = Boolean(markerColor && markerColor !== "000000");
       continue;
     }
     closeList();
@@ -329831,6 +329913,63 @@ function buildHtmlFlavor(grouped, assets) {
   closeList();
   return out.join("");
 }
+function portableListMarkerStyle(definition2, model, paragraphXml) {
+  const glyph = definition2.lvlText?.trim();
+  const type = definition2.numFmt === "bullet" ? glyph === "•" || glyph === "●" || glyph === "" ? "disc" : glyph === "◦" || glyph === "○" ? "circle" : glyph === "▪" || glyph === "■" || glyph === "◼" ? "square" : undefined : portableOrderedListStyleType(definition2.numFmt);
+  const runContext = {
+    themeColors: model.themeColors,
+    themeFontScheme: model.themeFontScheme
+  };
+  const directParagraphProperties = parseWordParagraphPropertiesXml(paragraphXml);
+  const resolvedParagraphProperties = model.resolveParagraph({ inlineProps: directParagraphProperties });
+  const markerRun = model.resolveRun({
+    inlineRpr: parseWordRunPropertiesXml(extractParagraphMarkRPrXml(paragraphXml)),
+    resolvedParagraphProperties,
+    isListNumber: true,
+    numberingDefinedInline: directParagraphProperties.numberingProperties != null
+  });
+  const markerColor = normalizeRunAttrsFromOoxml(markerRun, runContext).color;
+  const color2 = markerColor && /^#[0-9a-f]{6}$/i.test(markerColor) ? markerColor.slice(1).toUpperCase() : undefined;
+  return {
+    ...type ? { type } : {},
+    ...color2 ? { color: color2 } : {}
+  };
+}
+function portableOrderedListStyleType(numFmt) {
+  switch (numFmt) {
+    case "decimal":
+      return "decimal";
+    case "decimalZero":
+      return "decimal-leading-zero";
+    case "lowerLetter":
+      return "lower-alpha";
+    case "upperLetter":
+      return "upper-alpha";
+    case "lowerRoman":
+      return "lower-roman";
+    case "upperRoman":
+      return "upper-roman";
+    default:
+      return;
+  }
+}
+function orderedListTypeAttribute(styleType) {
+  switch (styleType) {
+    case "decimal":
+    case "decimal-leading-zero":
+      return "1";
+    case "lower-alpha":
+      return "a";
+    case "upper-alpha":
+      return "A";
+    case "lower-roman":
+      return "i";
+    case "upper-roman":
+      return "I";
+    default:
+      return;
+  }
+}
 function tableCellHtmlStyle(cell) {
   const styles = [];
   if (cell.shadingColor)
@@ -329861,14 +330000,15 @@ function tableCellHtmlStyle(cell) {
   }
   return styles.length > 0 ? ` style="${styles.join("; ")}"` : "";
 }
-function renderHtmlRun(run) {
+function renderHtmlRun(run, defaultTextColor) {
   let html = escapeHtmlText(run.text);
-  const marks = run.marks;
-  if (!marks)
+  if (!run.marks && !defaultTextColor)
     return html;
+  const marks = run.marks ?? {};
   const styles = [];
-  if (marks.color)
-    styles.push(`color: #${marks.color}`);
+  const color2 = marks.color ?? defaultTextColor;
+  if (color2)
+    styles.push(`color: #${color2}`);
   if (marks.fontSizePt)
     styles.push(`font-size: ${marks.fontSizePt}pt`);
   if (marks.fontFamily)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.7.0-next.12",
+  "version": "1.7.0-next.13",
   "description": "Model Context Protocol server for SuperDoc, giving an AI agent tools to read and edit .docx files.",
   "type": "module",
   "license": "AGPL-3.0",
@@ -24,13 +24,13 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@superdoc/sdk": "2.20.0-next.12",
+    "@superdoc/sdk": "2.20.0-next.13",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.23.0-next.12",
-    "@superdoc/docx-engine": "0.22.0-next.12",
+    "superdoc": "2.23.0-next.13",
+    "@superdoc/docx-engine": "0.22.0-next.13",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",