@superdoc/mcp 1.9.0-next.8 → 1.9.0-next.9

package/dist/index.js

@@ -31620,7 +31620,7 @@ var init_host = __esm(() => {
 });
 
 // ../../packages/sdk/langs/node/src/runtime/sdk-version.generated.ts
-var SDK_VERSION = "2.22.0-next.8";
+var SDK_VERSION = "2.22.0-next.9";
 
 // ../../packages/sdk/langs/node/src/runtime/embedded-platform.ts
 import { accessSync, chmodSync, constants, existsSync, statSync } from "node:fs";
@@ -328259,6 +328259,7 @@ function convertHtmlToFragment(html, options = {}) {
   }
   const context = {
     source: html,
+    tableSpanPolicy: options.tableSpanPolicy ?? "html",
     limits,
     sheet,
     diagnostics,
@@ -328949,6 +328950,8 @@ function usesDefaultWordOrderedLevelShape(descriptor) {
 function convertTable(table, context, inherited, path6) {
   let structurallyRejected = false;
   const rows = collectTableRows(table, path6);
+  if (context.tableSpanPolicy === "strict" && !validateTableSpans(rows, context))
+    return null;
   for (const { row, path: rowPath } of rows) {
     let rowGridColumns = 0;
     for (let cellIndex = 0;cellIndex < row.childNodes.length; cellIndex += 1) {
@@ -329464,6 +329467,72 @@ function orderedListItemValue(item, definition, context, path6) {
   });
   return null;
 }
+function validateTableSpans(rows, context) {
+  const occupiedUntil = Array.from({ length: MAX_WORD_TABLE_GRID_COLUMNS }, () => 0);
+  let valid = true;
+  const reject2 = (cell, path6, attribute2, message) => {
+    valid = false;
+    addDiagnostic(context, {
+      code: "conversion-malformed-input",
+      severity: "error",
+      message,
+      construct: attribute2 === "rowspan" ? "rowSpan" : "colSpan",
+      disposition: "rejected",
+      lossy: true,
+      path: [...path6, `@${attribute2}`],
+      range: sourceRangeForAttribute(cell, attribute2) ?? sourceRangeForNode(cell)
+    });
+  };
+  const span = (cell, path6, attribute2) => {
+    const raw = attributeValue2(cell, attribute2);
+    if (raw === undefined)
+      return 1;
+    const trimmed = raw.replace(/^[\t\n\f\r ]+|[\t\n\f\r ]+$/g, "");
+    const value2 = Number(trimmed);
+    if (/^\d+$/.test(trimmed) && Number.isSafeInteger(value2) && value2 >= (attribute2 === "rowspan" ? 0 : 1))
+      return value2;
+    reject2(cell, path6, attribute2, `Table cell ${attribute2} must be a valid ${attribute2 === "rowspan" ? "non-negative" : "positive"} integer.`);
+    return;
+  };
+  for (let rowIndex = 0;rowIndex < rows.length; rowIndex += 1) {
+    const { row, path: path6, remainingGroupRows } = rows[rowIndex];
+    let column = 0;
+    for (let cellIndex = 0;cellIndex < row.childNodes.length; cellIndex += 1) {
+      const cell = row.childNodes[cellIndex];
+      if (!isElement(cell) || cell.tagName !== "td" && cell.tagName !== "th")
+        continue;
+      const cellPath = [...path6, cellIndex];
+      const authoredRowSpan = span(cell, cellPath, "rowspan");
+      const rowSpan = authoredRowSpan === 0 ? remainingGroupRows : authoredRowSpan;
+      const colSpan = span(cell, cellPath, "colspan");
+      if (rowSpan === undefined || colSpan === undefined)
+        continue;
+      if (rowSpan > remainingGroupRows) {
+        reject2(cell, cellPath, "rowspan", "Table cell rowspan extends beyond its HTML row group.");
+        continue;
+      }
+      while (column < MAX_WORD_TABLE_GRID_COLUMNS && occupiedUntil[column] > rowIndex)
+        column += 1;
+      if (column + colSpan > MAX_WORD_TABLE_GRID_COLUMNS) {
+        reject2(cell, cellPath, "colspan", `Table rows cannot exceed ${MAX_WORD_TABLE_GRID_COLUMNS} grid columns, including vertical continuations.`);
+        break;
+      }
+      let overlaps2 = false;
+      for (let slot = column;slot < column + colSpan; slot += 1) {
+        if (occupiedUntil[slot] > rowIndex)
+          overlaps2 = true;
+      }
+      if (overlaps2) {
+        reject2(cell, cellPath, "colspan", "Table cell colspan overlaps an active rowspan.");
+      } else {
+        for (let slot = column;slot < column + colSpan; slot += 1)
+          occupiedUntil[slot] = rowIndex + rowSpan;
+      }
+      column += colSpan;
+    }
+  }
+  return valid;
+}
 function positiveIntegerAttribute(element, attribute2, context, path6, construct) {
   const raw = attributeValue2(element, attribute2);
   if (raw === undefined)
@@ -341225,7 +341294,7 @@ var init_markdown = __esm(() => {
 
 // ../../../v2/document-api-v2-adapter/dist/conversion/convert-to-fragment.js
 function convertContentToFragment(request) {
-  return request.format === "html" ? convertHtmlToFragment(request.source, request.options) : convertMarkdownToFragment(request.source, request.options);
+  return request.format === "html" ? convertHtmlToFragment(request.source, { tableSpanPolicy: "strict", ...request.options }) : convertMarkdownToFragment(request.source, request.options);
 }
 var init_convert_to_fragment = __esm(() => {
   init_html2();
@@ -341774,6 +341843,9 @@ function lowerTable(node4, path7, images) {
       if (col + gridSpan > MAX_WORD_TABLE_GRID_COLUMNS3) {
         invalid3([...rowPath, "cells"], `Table rows cannot exceed ${MAX_WORD_TABLE_GRID_COLUMNS3} grid columns.`);
       }
+      if (activeSpans.some((span) => span.remaining > 0 && span.col > col && span.col < col + gridSpan)) {
+        invalid3([...cellPath, "colSpan"], "Table cell colspan overlaps an active rowspan.");
+      }
       if (cell.content.length === 0)
         invalid3([...cellPath, "content"], "Table cells must contain a paragraph.");
       const blocks = cell.content.flatMap((content3, contentIndex) => {
@@ -344478,7 +344550,7 @@ function planFromHtml(payload, html, options, rejectUnsafeContent = false) {
   const converted = convertContentToFragment({
     format: "html",
     source: rewritten,
-    options: { limits: {
+    options: { tableSpanPolicy: "html", limits: {
       maxSourceCodeUnits: DEFAULT_HTML_CONVERSION_LIMITS.maxSourceCodeUnits + allowance,
       maxOutputCodeUnits: DEFAULT_HTML_CONVERSION_LIMITS.maxOutputCodeUnits + allowance,
       ...allowance > 0 ? { maxNestingDepth: MAX_WORD_VML_RECOVERY_NESTING_DEPTH } : {}
@@ -469362,7 +469434,7 @@ function mirrorStorySurfaceFromSession(input) {
         const actorType = readActorAttributionFromPrepared(input.prepared);
         tx.meta.set(ACTOR_ATTRIBUTION_META_KEY, actorType);
         scope.meta.set(STORY_META_KEY.lastEditActorType, actorType);
-        const groups = extension2.contentControlRewrite || hasContentControlGroups(scope) ? prepareStoryContentControlGroups(input.session, storyId, doc2) : null;
+        const groups = extension2.contentControlRewrite || extension2.family === "storyPaste" || hasContentControlGroups(scope) ? prepareStoryContentControlGroups(input.session, storyId, doc2) : null;
         mirrorFamilyIntoStory({
           session: input.session,
           prepared: input.prepared,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc/mcp",
-  "version": "1.9.0-next.8",
+  "version": "1.9.0-next.9",
   "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.22.0-next.8",
+    "@superdoc/sdk": "2.22.0-next.9",
     "debug": "^4.4.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "superdoc": "2.25.0-next.8",
-    "@superdoc/docx-engine": "0.24.0-next.8",
+    "superdoc": "2.25.0-next.9",
+    "@superdoc/docx-engine": "0.24.0-next.9",
     "@superdoc/document-api": "0.1.0-alpha.0",
     "@types/bun": "^1.3.8",
     "@types/node": "22.19.2",