@superdoc-dev/cli 0.8.0-next.85 → 0.8.0-next.86

package/dist/index.js

@@ -66095,7 +66095,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-C9I74vtg.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CjDkqrj8.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -77013,6 +77013,18 @@ function handleDocPartObj(params3) {
   const sdtPr = node3.elements.find((el) => el.name === "w:sdtPr");
   const docPartGalleryType = sdtPr?.elements.find((el) => el.name === "w:docPartObj")?.elements.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"] ?? null;
   const content$2 = node3?.elements.find((el) => el.name === "w:sdtContent");
+  const isInsideParagraph = (params3.path || []).some((p) => p?.name === "w:p");
+  const hasBlockChild = !!content$2?.elements?.some((el) => el?.name === "w:p" || el?.name === "w:tbl");
+  if (isInsideParagraph && !hasBlockChild)
+    return inlineDocPartHandler({
+      ...params3,
+      nodes: [content$2],
+      extraParams: {
+        ...params3.extraParams || {},
+        sdtPr,
+        docPartGalleryType
+      }
+    });
   return (validGalleryTypeMap[docPartGalleryType] || genericDocPartHandler)({
     ...params3,
     nodes: [content$2],
@@ -105810,6 +105822,27 @@ var isRegExp = (value) => {
     attrs,
     marks
   };
+}, inlineDocPartHandler = (params3) => {
+  const node3 = params3.nodes[0];
+  const translatedContent = params3.nodeListHandler.handler({
+    ...params3,
+    nodes: node3?.elements || [],
+    path: [...params3.path || [], node3]
+  });
+  const sdtPr = params3.extraParams.sdtPr;
+  const docPartGalleryType = params3.extraParams.docPartGalleryType;
+  const id2 = sdtPr?.elements?.find((el) => el.name === "w:id")?.attributes?.["w:val"] || null;
+  const docPartObj = sdtPr?.elements.find((el) => el.name === "w:docPartObj");
+  return {
+    type: "structuredContent",
+    content: translatedContent,
+    attrs: {
+      id: id2,
+      docPartGallery: docPartGalleryType ?? docPartObj?.elements?.find((el) => el.name === "w:docPartGallery")?.attributes?.["w:val"] ?? null,
+      docPartUnique: docPartObj?.elements?.some((el) => el.name === "w:docPartUnique") ?? false,
+      sdtPr
+    }
+  };
 }, tableOfContentsHandler = (params3) => {
   const node3 = params3.nodes[0];
   const normalizedContent = normalizeDocPartContent(translateTocSdtContent(node3, params3));
@@ -119097,7 +119130,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_C9I74vtg_es = __esm(() => {
+var init_SuperConverter_CjDkqrj8_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -156957,7 +156990,7 @@ var init_SuperConverter_C9I74vtg_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-B7nufamW.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-pGestihw.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -159624,8 +159657,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_B7nufamW_es = __esm(() => {
-  init_SuperConverter_C9I74vtg_es();
+var init_create_headless_toolbar_pGestihw_es = __esm(() => {
+  init_SuperConverter_CjDkqrj8_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -208322,7 +208355,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BE-DiVIy.es.js
+// ../../packages/superdoc/dist/chunks/src-tOywM1hR.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -255983,26 +256016,26 @@ function resolvePageNumberTokens(layout, blocks2, measures, numberingCtx) {
       continue;
     }
     const displayPageText = displayPageInfo.displayText;
-    for (const fragment2 of page.fragments) {
-      if (fragment2.kind !== "para")
-        continue;
-      const blockId = fragment2.blockId;
-      if (processedBlocks.has(blockId))
-        continue;
-      if (blockHasTokensFlags.get(blockId) === false)
-        continue;
-      const block = blockMap.get(blockId);
-      if (!block || block.kind !== "paragraph")
-        continue;
-      if (!hasPageTokens$1(block)) {
+    for (const fragment2 of page.fragments)
+      if (fragment2.kind === "para") {
+        const blockId = fragment2.blockId;
+        if (processedBlocks.has(blockId))
+          continue;
+        if (blockHasTokensFlags.get(blockId) === false)
+          continue;
+        const block = blockMap.get(blockId);
+        if (!block || block.kind !== "paragraph")
+          continue;
+        if (!hasPageTokens$1(block)) {
+          processedBlocks.add(blockId);
+          continue;
+        }
+        const clonedBlock = cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr);
+        updatedBlocks.set(blockId, clonedBlock);
+        affectedBlockIds.add(blockId);
         processedBlocks.add(blockId);
         continue;
       }
-      const clonedBlock = cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr);
-      updatedBlocks.set(blockId, clonedBlock);
-      affectedBlockIds.add(blockId);
-      processedBlocks.add(blockId);
-    }
   }
   return {
     affectedBlockIds,
@@ -258099,6 +258132,20 @@ function isBorderSpec(value) {
 function hasComments$1(run2) {
   return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
 }
+function forEachParagraphBlock(blocks2, visit2) {
+  for (const block of blocks2)
+    if (block.kind === "paragraph")
+      visit2(block);
+    else if (block.kind === "table") {
+      const table2 = block;
+      for (const row2 of table2.rows ?? [])
+        for (const cell2 of row2.cells ?? [])
+          if (cell2.blocks && cell2.blocks.length > 0)
+            forEachParagraphBlock(cell2.blocks, visit2);
+          else if (cell2.paragraph)
+            forEachParagraphBlock([cell2.paragraph], visit2);
+    }
+}
 function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberText) {
   if (!blocks2 || blocks2.length === 0)
     return;
@@ -258112,10 +258159,7 @@ function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberTe
   }
   const pageNumberStr = pageNumberText ?? String(pageNumber);
   const totalPagesStr = String(totalPages);
-  for (const block of blocks2) {
-    if (block.kind !== "paragraph")
-      continue;
-    const paraBlock = block;
+  forEachParagraphBlock(blocks2, (paraBlock) => {
     for (const run2 of paraBlock.runs)
       if ("token" in run2 && run2.token) {
         if (run2.token === "pageNumber")
@@ -258123,22 +258167,37 @@ function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberTe
         else if (run2.token === "totalPageCount")
           run2.text = totalPagesStr;
       }
-  }
+  });
 }
 function cloneHeaderFooterBlocks(blocks2) {
   if (!blocks2 || blocks2.length === 0)
     return [];
-  return blocks2.map((block) => {
-    if (block.kind === "paragraph") {
-      const paraBlock = block;
-      return {
-        ...paraBlock,
-        runs: paraBlock.runs.map((run2) => ({ ...run2 })),
-        attrs: paraBlock.attrs ? { ...paraBlock.attrs } : undefined
-      };
-    }
-    return { ...block };
-  });
+  return blocks2.map(cloneHeaderFooterBlock);
+}
+function cloneHeaderFooterBlock(block) {
+  if (block.kind === "paragraph") {
+    const paraBlock = block;
+    return {
+      ...paraBlock,
+      runs: paraBlock.runs.map((run2) => ({ ...run2 })),
+      attrs: paraBlock.attrs ? { ...paraBlock.attrs } : undefined
+    };
+  }
+  if (block.kind === "table") {
+    const table2 = block;
+    return {
+      ...table2,
+      rows: (table2.rows ?? []).map((row2) => ({
+        ...row2,
+        cells: (row2.cells ?? []).map((cell2) => ({
+          ...cell2,
+          paragraph: cell2.paragraph ? cloneHeaderFooterBlock(cell2.paragraph) : cell2.paragraph,
+          blocks: cell2.blocks ? cell2.blocks.map(cloneHeaderFooterBlock) : cell2.blocks
+        }))
+      }))
+    };
+  }
+  return { ...block };
 }
 function isEnabled(envVar, defaultValue) {
   if (typeof process$1 === "undefined" || typeof process$1.env === "undefined")
@@ -258171,14 +258230,24 @@ function getBucketRepresentative(bucket) {
       return 5000;
   }
 }
+function paragraphHasPageToken(para) {
+  for (const run2 of para.runs)
+    if ("token" in run2 && (run2.token === "pageNumber" || run2.token === "totalPageCount"))
+      return true;
+  return false;
+}
 function hasPageTokens(blocks2) {
-  for (const block of blocks2) {
-    if (block.kind !== "paragraph")
-      continue;
-    for (const run2 of block.runs)
-      if ("token" in run2 && (run2.token === "pageNumber" || run2.token === "totalPageCount"))
+  for (const block of blocks2)
+    if (block.kind === "paragraph") {
+      if (paragraphHasPageToken(block))
         return true;
-  }
+    } else if (block.kind === "table") {
+      const table2 = block;
+      for (const row2 of table2.rows ?? [])
+        for (const cell2 of row2.cells ?? [])
+          if (hasPageTokens(cell2.blocks ? cell2.blocks : cell2.paragraph ? [cell2.paragraph] : []))
+            return true;
+    }
   return false;
 }
 async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1, cache$2 = sharedHeaderFooterCache, totalPages, pageResolver, kind) {
@@ -263256,7 +263325,7 @@ function handleStructuredContentBlockNode(node3, context) {
   const { blocks: blocks2, recordBlockKind, nextBlockId, positions, trackedChangesConfig, bookmarks, hyperlinkConfig, converters: converters$1, converterContext, enableComments, themeColors } = context;
   const structuredContentMetadata = resolveNodeSdtMetadata(node3, "structuredContentBlock");
   const paragraphToFlowBlocks$1 = converters$1.paragraphToFlowBlocks;
-  node3.content.forEach((child) => {
+  const visitChild = (child) => {
     if (child.type === "paragraph") {
       const paragraphBlocks = paragraphToFlowBlocks$1({
         para: child,
@@ -263275,7 +263344,9 @@ function handleStructuredContentBlockNode(node3, context) {
         blocks2.push(block);
         recordBlockKind?.(block.kind);
       });
-    } else if (child.type === "table") {
+      return;
+    }
+    if (child.type === "table") {
       const tableNodeToBlock$1 = converters$1?.tableNodeToBlock;
       if (tableNodeToBlock$1) {
         const tableBlock = tableNodeToBlock$1(child, {
@@ -263295,8 +263366,12 @@ function handleStructuredContentBlockNode(node3, context) {
           recordBlockKind?.(tableBlock.kind);
         }
       }
+      return;
     }
-  });
+    if (child.type === "documentPartObject" && Array.isArray(child.content))
+      child.content.forEach(visitChild);
+  };
+  node3.content.forEach(visitChild);
 }
 function processParagraphChild(child, sectionMetadata, context, output, converters$1) {
   const paragraphBlocks = converters$1.paragraphToFlowBlocks({
@@ -296061,6 +296136,58 @@ menclose::after {
         blocks2.push(block);
     });
   };
+  const flattenSdtWrappersIntoCell = (wrapperNode, inheritedSdtMetadata) => {
+    if (!Array.isArray(wrapperNode.content))
+      return;
+    for (const nestedNode of wrapperNode.content) {
+      if (nestedNode.type === "paragraph") {
+        if (!paragraphToFlowBlocks$1)
+          continue;
+        appendParagraphBlocks(paragraphToFlowBlocks$1({
+          para: nestedNode,
+          nextBlockId: context.nextBlockId,
+          positions: context.positions,
+          storyKey: context.storyKey,
+          trackedChangesConfig: context.trackedChangesConfig,
+          bookmarks: context.bookmarks,
+          hyperlinkConfig: context.hyperlinkConfig,
+          themeColors: context.themeColors,
+          converterContext: cellConverterContext,
+          converters: context.converters,
+          enableComments: context.enableComments
+        }), inheritedSdtMetadata);
+        continue;
+      }
+      if (nestedNode.type === "table" && tableNodeToBlock$1) {
+        const tableBlock = tableNodeToBlock$1(nestedNode, {
+          nextBlockId: context.nextBlockId,
+          positions: context.positions,
+          storyKey: context.storyKey,
+          trackedChangesConfig: context.trackedChangesConfig,
+          bookmarks: context.bookmarks,
+          hyperlinkConfig: context.hyperlinkConfig,
+          themeColors: context.themeColors,
+          converterContext: context.converterContext,
+          converters: context.converters,
+          enableComments: context.enableComments
+        });
+        if (tableBlock && tableBlock.kind === "table") {
+          if (inheritedSdtMetadata)
+            applySdtMetadataToTableBlock(tableBlock, inheritedSdtMetadata);
+          blocks2.push(tableBlock);
+        }
+        continue;
+      }
+      if (nestedNode.type === "documentPartObject") {
+        flattenSdtWrappersIntoCell(nestedNode, inheritedSdtMetadata);
+        continue;
+      }
+      if (nestedNode.type === "structuredContentBlock") {
+        flattenSdtWrappersIntoCell(nestedNode, inheritedSdtMetadata ?? resolveNodeSdtMetadata(nestedNode, "structuredContentBlock"));
+        continue;
+      }
+    }
+  };
   for (const childNode of cellNode.content) {
     if (childNode.type === "paragraph") {
       if (!paragraphToFlowBlocks$1)
@@ -296081,46 +296208,7 @@ menclose::after {
       continue;
     }
     if (childNode.type === "structuredContentBlock" && Array.isArray(childNode.content)) {
-      const structuredContentMetadata = resolveNodeSdtMetadata(childNode, "structuredContentBlock");
-      for (const nestedNode of childNode.content) {
-        if (nestedNode.type === "paragraph") {
-          if (!paragraphToFlowBlocks$1)
-            continue;
-          appendParagraphBlocks(paragraphToFlowBlocks$1({
-            para: nestedNode,
-            nextBlockId: context.nextBlockId,
-            positions: context.positions,
-            storyKey: context.storyKey,
-            trackedChangesConfig: context.trackedChangesConfig,
-            bookmarks: context.bookmarks,
-            hyperlinkConfig: context.hyperlinkConfig,
-            themeColors: context.themeColors,
-            converterContext: cellConverterContext,
-            converters: context.converters,
-            enableComments: context.enableComments
-          }), structuredContentMetadata);
-          continue;
-        }
-        if (nestedNode.type === "table" && tableNodeToBlock$1) {
-          const tableBlock = tableNodeToBlock$1(nestedNode, {
-            nextBlockId: context.nextBlockId,
-            positions: context.positions,
-            storyKey: context.storyKey,
-            trackedChangesConfig: context.trackedChangesConfig,
-            bookmarks: context.bookmarks,
-            hyperlinkConfig: context.hyperlinkConfig,
-            themeColors: context.themeColors,
-            converterContext: context.converterContext,
-            converters: context.converters,
-            enableComments: context.enableComments
-          });
-          if (tableBlock && tableBlock.kind === "table") {
-            applySdtMetadataToTableBlock(tableBlock, structuredContentMetadata);
-            blocks2.push(tableBlock);
-          }
-          continue;
-        }
-      }
+      flattenSdtWrappersIntoCell(childNode, resolveNodeSdtMetadata(childNode, "structuredContentBlock"));
       continue;
     }
     if (childNode.type === "table" && tableNodeToBlock$1) {
@@ -296140,6 +296228,10 @@ menclose::after {
         blocks2.push(tableBlock);
       continue;
     }
+    if (childNode.type === "documentPartObject" && Array.isArray(childNode.content)) {
+      flattenSdtWrappersIntoCell(childNode, undefined);
+      continue;
+    }
     if (childNode.type === "image" && context.converters?.imageNodeToBlock) {
       const mergedMarks = [...childNode.marks ?? []];
       const trackedMeta = context.trackedChangesConfig ? collectTrackedChangeFromMarks(mergedMarks, context.storyKey) : undefined;
@@ -301355,12 +301447,12 @@ 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;
-var init_src_BE_DiVIy_es = __esm(() => {
+var init_src_tOywM1hR_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_C9I74vtg_es();
+  init_SuperConverter_CjDkqrj8_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_B7nufamW_es();
+  init_create_headless_toolbar_pGestihw_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -339104,11 +339196,11 @@ function print() { __p += __j.call(arguments, '') }
   ];
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CmG_8rWP.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-Cj3mqS9_.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_CmG_8rWP_es = __esm(() => {
-  init_SuperConverter_C9I74vtg_es();
-  init_create_headless_toolbar_B7nufamW_es();
+var init_create_super_doc_ui_Cj3mqS9__es = __esm(() => {
+  init_SuperConverter_CjDkqrj8_es();
+  init_create_headless_toolbar_pGestihw_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -339150,16 +339242,16 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BE_DiVIy_es();
-  init_SuperConverter_C9I74vtg_es();
+  init_src_tOywM1hR_es();
+  init_SuperConverter_CjDkqrj8_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_B7nufamW_es();
+  init_create_headless_toolbar_pGestihw_es();
   init_constants_DrU4EASo_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_Dh4RtvcE_es();
-  init_create_super_doc_ui_CmG_8rWP_es();
+  init_create_super_doc_ui_Cj3mqS9__es();
   init_ui_CGB3qmy3_es();
   init_eventemitter3_UwU_CLPU_es();
   init_errors_C_DoKMoN_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.8.0-next.85",
+  "version": "0.8.0-next.86",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -24,9 +24,9 @@
     "@types/node": "22.19.2",
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
-    "@superdoc/document-api": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
     "@superdoc/super-editor": "0.0.1",
+    "@superdoc/document-api": "0.0.1",
     "superdoc": "1.31.0"
   },
   "module": "src/index.ts",
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.8.0-next.85",
-    "@superdoc-dev/cli-darwin-x64": "0.8.0-next.85",
-    "@superdoc-dev/cli-linux-x64": "0.8.0-next.85",
-    "@superdoc-dev/cli-linux-arm64": "0.8.0-next.85",
-    "@superdoc-dev/cli-windows-x64": "0.8.0-next.85"
+    "@superdoc-dev/cli-darwin-arm64": "0.8.0-next.86",
+    "@superdoc-dev/cli-darwin-x64": "0.8.0-next.86",
+    "@superdoc-dev/cli-windows-x64": "0.8.0-next.86",
+    "@superdoc-dev/cli-linux-x64": "0.8.0-next.86",
+    "@superdoc-dev/cli-linux-arm64": "0.8.0-next.86"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",