@superdoc-dev/cli 0.4.0-next.2 → 0.4.0-next.4

package/dist/index.js

@@ -41059,7 +41059,7 @@ var init_remark_gfm_z_sDF4ss_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-V-8WDjnK.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-BMUaGImr.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -50688,6 +50688,18 @@ function buildPath(existingPath = [], node3, branch) {
     path2.push(branch);
   return path2;
 }
+function isInlineNode(node3, schema) {
+  if (!node3 || typeof node3 !== "object" || typeof node3.type !== "string")
+    return false;
+  const nodeType = schema?.nodes?.[node3.type];
+  if (nodeType) {
+    if (typeof nodeType.isInline === "boolean")
+      return nodeType.isInline;
+    if (nodeType.spec?.group && typeof nodeType.spec.group === "string")
+      return nodeType.spec.group.split(" ").includes("inline");
+  }
+  return INLINE_FALLBACK_TYPES.has(node3.type);
+}
 function getTableStyleId(path2) {
   const tbl = path2.find((ancestor) => ancestor.name === "w:tbl");
   if (!tbl)
@@ -50700,6 +50712,76 @@ function getTableStyleId(path2) {
     return;
   return tblStyle.attributes?.["w:val"];
 }
+function cloneParagraphAttrsForFragment(attrs, { keepSectPr = false } = {}) {
+  if (!attrs)
+    return {};
+  const nextAttrs = { ...attrs };
+  if (attrs.paragraphProperties && typeof attrs.paragraphProperties === "object") {
+    nextAttrs.paragraphProperties = { ...attrs.paragraphProperties };
+    if (!keepSectPr)
+      delete nextAttrs.paragraphProperties.sectPr;
+  }
+  if (!keepSectPr)
+    delete nextAttrs.pageBreakSource;
+  return nextAttrs;
+}
+function hasSectionBreakAttrs(attrs) {
+  return Boolean(attrs?.paragraphProperties?.sectPr);
+}
+function cloneWrapperParagraphAttrs(attrs) {
+  return cloneParagraphAttrsForFragment(attrs, { keepSectPr: true });
+}
+function normalizeParagraphChildren(children, schema, textblockAttrs) {
+  const normalized = [];
+  let pendingInline = [];
+  const flushInline = () => {
+    if (!pendingInline.length)
+      return;
+    normalized.push({
+      type: "paragraph",
+      attrs: null,
+      content: pendingInline,
+      marks: []
+    });
+    pendingInline = [];
+  };
+  for (const child of children || []) {
+    if (isInlineNode(child, schema)) {
+      pendingInline.push(child);
+      continue;
+    }
+    flushInline();
+    if (child != null)
+      normalized.push(child);
+  }
+  flushInline();
+  const lastNodeIndex = normalized.length - 1;
+  const isSingleBlockResult = normalized.length === 1 && normalized[0] != null && normalized[0]?.type !== "paragraph";
+  const paragraphIndexes = normalized.reduce((indexes, node3, index2) => {
+    if (node3?.type === "paragraph")
+      indexes.push(index2);
+    return indexes;
+  }, []);
+  const lastParagraphIndex = paragraphIndexes.length ? paragraphIndexes[paragraphIndexes.length - 1] : -1;
+  const shouldAttachWrapperParagraph = isSingleBlockResult || hasSectionBreakAttrs(textblockAttrs) && lastNodeIndex !== lastParagraphIndex;
+  paragraphIndexes.forEach((index2) => {
+    normalized[index2] = {
+      ...normalized[index2],
+      attrs: cloneParagraphAttrsForFragment(textblockAttrs, { keepSectPr: !shouldAttachWrapperParagraph && index2 === lastParagraphIndex })
+    };
+  });
+  if (shouldAttachWrapperParagraph) {
+    const lastNode = normalized[lastNodeIndex];
+    normalized[lastNodeIndex] = {
+      ...lastNode,
+      attrs: {
+        ...lastNode?.attrs || {},
+        wrapperParagraph: cloneWrapperParagraphAttrs(textblockAttrs)
+      }
+    };
+  }
+  return normalized;
+}
 function generateParagraphProperties(params) {
   const { node: node3 } = params;
   const { attrs = {} } = node3;
@@ -50784,6 +50866,21 @@ function translateParagraphNode(params) {
     attributes
   };
 }
+function partitionEncodedParagraphAttrs(encodedAttrs = {}) {
+  const identityAttrs = {};
+  const shareableAttrs = {};
+  Object.entries(encodedAttrs).forEach(([key, value]) => {
+    if (IDENTITY_ATTR_NAMES.has(key)) {
+      identityAttrs[key] = value;
+      return;
+    }
+    shareableAttrs[key] = value;
+  });
+  return {
+    identityAttrs,
+    shareableAttrs
+  };
+}
 function generateDocxRandomId(length = 8) {
   return Math.floor(Math.random() * 2147483648).toString(16).toUpperCase().padStart(length, "0").slice(0, length);
 }
@@ -50934,7 +51031,6 @@ function normalizeTableCellContent(content$2, editor) {
     return content$2;
   const normalized = [];
   const pendingForNextBlock = [];
-  const schema = editor?.schema;
   const cloneBlock = (node3) => {
     if (!node3)
       return node3;
@@ -50949,28 +51045,12 @@ function normalizeTableCellContent(content$2, editor) {
       node3.content = [];
     return node3.content;
   };
-  const isInlineNode = (node3) => {
-    if (!node3 || typeof node3.type !== "string")
-      return false;
-    if (node3.type === "text")
-      return true;
-    if (node3.type === "bookmarkStart" || node3.type === "bookmarkEnd")
-      return true;
-    const nodeType = schema?.nodes?.[node3.type];
-    if (nodeType) {
-      if (typeof nodeType.isInline === "boolean")
-        return nodeType.isInline;
-      if (nodeType.spec?.group && typeof nodeType.spec.group === "string")
-        return nodeType.spec.group.split(" ").includes("inline");
-    }
-    return false;
-  };
   for (const node3 of content$2) {
     if (!node3 || typeof node3.type !== "string") {
       normalized.push(node3);
       continue;
     }
-    if (!isInlineNode(node3)) {
+    if (!isInlineNode(node3, editor?.schema)) {
       const blockNode = cloneBlock(node3);
       if (pendingForNextBlock.length) {
         const blockContent = ensureArray(blockNode);
@@ -50984,7 +51064,7 @@ function normalizeTableCellContent(content$2, editor) {
       pendingForNextBlock.push(node3);
     else {
       const lastNode = normalized[normalized.length - 1];
-      if (!lastNode || typeof lastNode.type !== "string" || isInlineNode(lastNode)) {
+      if (!lastNode || typeof lastNode.type !== "string" || isInlineNode(lastNode, editor?.schema)) {
         pendingForNextBlock.push(node3);
         continue;
       }
@@ -50997,7 +51077,7 @@ function normalizeTableCellContent(content$2, editor) {
   if (pendingForNextBlock.length) {
     if (normalized.length) {
       const lastNode = normalized[normalized.length - 1];
-      if (lastNode && typeof lastNode.type === "string" && !isInlineNode(lastNode)) {
+      if (lastNode && typeof lastNode.type === "string" && !isInlineNode(lastNode, editor?.schema)) {
         ensureArray(lastNode).push(...pendingForNextBlock);
         pendingForNextBlock.length = 0;
       }
@@ -66848,13 +66928,38 @@ function translateDocumentPartObj(params) {
     ...params,
     nodes: node3.content
   });
-  return {
+  const result = {
     name: "w:sdt",
     elements: [generateSdtPrForDocPartObj(attrs), {
       name: "w:sdtContent",
       elements: childContent
     }]
   };
+  if (!attrs.wrapperParagraph)
+    return result;
+  return wrapDocumentPartInParagraph(result, attrs.wrapperParagraph);
+}
+function wrapDocumentPartInParagraph(sdtNode, wrapperParagraphAttrs) {
+  const elements = [];
+  const pPr = generateParagraphProperties({ node: {
+    type: "paragraph",
+    attrs: wrapperParagraphAttrs
+  } });
+  if (pPr)
+    elements.push(pPr);
+  elements.push(sdtNode);
+  const attributes = {
+    ...extractRawParagraphXmlAttributes(wrapperParagraphAttrs),
+    ...translator.decodeAttributes({ node: { attrs: wrapperParagraphAttrs } })
+  };
+  return {
+    name: "w:p",
+    elements,
+    ...Object.keys(attributes).length ? { attributes } : {}
+  };
+}
+function extractRawParagraphXmlAttributes(attrs = {}) {
+  return Object.fromEntries(Object.entries(attrs).filter(([key]) => key.includes(":")));
 }
 function sanitizeId(id) {
   if (typeof id === "string" && id.trim() !== "")
@@ -77195,8 +77300,8 @@ var isRegExp = (value) => {
     }
   }
   return css;
-}, SUPPORTED_ALTERNATE_CONTENT_REQUIRES, XML_NODE_NAME$36 = "mc:AlternateContent", SD_NODE_NAME$32, validXmlAttributes$12, config$35, translator$31, translator$37, translator$39, translator$40, translator$208, translator$51, translator$54, translator$57, translator$65, translator$80, translator$85, translator$86, translator$87, translator$89, translator$102, translator$78, translator$111, propertyTranslators$16, translator$113, translator$118, translator$119, translator$45, translator$209, translator$48, translator$201, translator$103, translator$203, translator$133, translator$204, translator$169, translator$206, propertyTranslators$15, translator$121, translator$127, translator$120, translator$144, translator$145, translator$146, translator$147, propertyTranslators$14, translator$151, translator$190, translator$183, translator$191, translator$192, translator$195, translator$196, propertyTranslators$13, translator$126, handleParagraphNode$1 = (params) => {
-  const { nodes, nodeListHandler, filename } = params;
+}, SUPPORTED_ALTERNATE_CONTENT_REQUIRES, XML_NODE_NAME$36 = "mc:AlternateContent", SD_NODE_NAME$32, validXmlAttributes$12, config$35, translator$31, translator$37, translator$39, translator$40, translator$208, translator$51, translator$54, translator$57, translator$65, translator$80, translator$85, translator$86, translator$87, translator$89, translator$102, translator$78, translator$111, propertyTranslators$16, translator$113, translator$118, translator$119, translator$45, translator$209, translator$48, translator$201, translator$103, translator$203, translator$133, translator$204, translator$169, translator$206, propertyTranslators$15, translator$121, translator$127, translator$120, translator$144, translator$145, translator$146, translator$147, propertyTranslators$14, translator$151, translator$190, translator$183, translator$191, translator$192, translator$195, translator$196, propertyTranslators$13, translator$126, INLINE_FALLBACK_TYPES, handleParagraphNode$1 = (params) => {
+  const { nodes, nodeListHandler, filename, editor } = params;
   const node3 = carbonCopy(nodes[0]);
   let schemaNode;
   const pPr = node3.elements?.find((el) => el.name === "w:pPr");
@@ -77240,17 +77345,27 @@ var isRegExp = (value) => {
   schemaNode.attrs.paragraphProperties = inlineParagraphProperties;
   schemaNode.attrs.rsidRDefault = node3.attributes?.["w:rsidRDefault"];
   schemaNode.attrs.filename = filename;
-  if (schemaNode && schemaNode.content)
-    schemaNode = {
-      ...schemaNode,
-      content: mergeTextNodes(schemaNode.content)
-    };
   const sectPr = pPr?.elements?.find((el) => el.name === "w:sectPr");
   if (sectPr) {
     schemaNode.attrs.paragraphProperties.sectPr = sectPr;
     schemaNode.attrs.pageBreakSource = "sectPr";
   }
-  return schemaNode;
+  const normalizedNodes = normalizeParagraphChildren(schemaNode.content, editor?.schema, schemaNode.attrs).map((node$1) => {
+    if (node$1?.type !== "paragraph" || !Array.isArray(node$1.content))
+      return node$1;
+    return {
+      ...node$1,
+      content: mergeTextNodes(node$1.content)
+    };
+  });
+  if (!normalizedNodes.length)
+    return {
+      ...schemaNode,
+      content: mergeTextNodes(schemaNode.content || [])
+    };
+  if (normalizedNodes.length === 1 && normalizedNodes[0]?.type === "paragraph")
+    return normalizedNodes[0];
+  return normalizedNodes;
 }, encode$62 = (attributes) => {
   return attributes["w:rsidDel"];
 }, decode$64 = (attrs) => {
@@ -77279,15 +77394,36 @@ var isRegExp = (value) => {
   return attributes["w14:textId"];
 }, decode$58 = (attrs) => {
   return attrs.textId;
-}, attributes_default$5, XML_NODE_NAME$35 = "w:p", SD_NODE_NAME$31 = "paragraph", encode$55 = (params, encodedAttrs = {}) => {
+}, attributes_default$5, XML_NODE_NAME$35 = "w:p", SD_NODE_NAME$31 = "paragraph", IDENTITY_ATTR_NAMES, encode$55 = (params, encodedAttrs = {}) => {
   const node3 = handleParagraphNode$1(params);
   if (!node3)
     return;
-  if (encodedAttrs && Object.keys(encodedAttrs).length)
+  if (encodedAttrs && Object.keys(encodedAttrs).length) {
+    if (Array.isArray(node3)) {
+      const { identityAttrs, shareableAttrs } = partitionEncodedParagraphAttrs(encodedAttrs);
+      let appliedIdentityAttrs = false;
+      return node3.map((child) => {
+        if (child?.type !== "paragraph")
+          return child;
+        const attrs = {
+          ...child.attrs || {},
+          ...shareableAttrs
+        };
+        if (!appliedIdentityAttrs) {
+          Object.assign(attrs, identityAttrs);
+          appliedIdentityAttrs = true;
+        }
+        return {
+          ...child,
+          attrs
+        };
+      });
+    }
     node3.attrs = {
       ...node3.attrs,
       ...encodedAttrs
     };
+  }
   return node3;
 }, decode$57 = (params, decodedAttrs = {}) => {
   const translated = translateParagraphNode(params);
@@ -88989,7 +89125,7 @@ var isRegExp = (value) => {
     };
   const schemaNode = translator.encode(params);
   return {
-    nodes: schemaNode ? [schemaNode] : [],
+    nodes: Array.isArray(schemaNode) ? schemaNode : schemaNode ? [schemaNode] : [],
     consumed: 1
   };
 }, paragraphNodeHandlerEntity, handleSdtNode = (params) => {
@@ -91154,7 +91290,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_V_8WDjnK_es = __esm(() => {
+var init_SuperConverter_BMUaGImr_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -106225,6 +106361,34 @@ var init_SuperConverter_V_8WDjnK_es = __esm(() => {
     translator$129
   ];
   translator$126 = NodeTranslator.from(createNestedPropertiesTranslator("w:pPr", "paragraphProperties", propertyTranslators$13));
+  INLINE_FALLBACK_TYPES = new Set([
+    "text",
+    "run",
+    "bookmarkStart",
+    "bookmarkEnd",
+    "tab",
+    "lineBreak",
+    "hardBreak",
+    "commentRangeStart",
+    "commentRangeEnd",
+    "commentReference",
+    "permStart",
+    "permEnd",
+    "footnoteReference",
+    "endnoteReference",
+    "fieldAnnotation",
+    "structuredContent",
+    "passthroughInline",
+    "page-number",
+    "total-page-number",
+    "pageReference",
+    "crossReference",
+    "citation",
+    "authorityEntry",
+    "sequenceField",
+    "indexEntry",
+    "tableOfContentsEntry"
+  ]);
   attrConfig$22 = Object.freeze({
     xmlName: "w:rsidDel",
     sdName: "rsidDel",
@@ -106275,6 +106439,7 @@ var init_SuperConverter_V_8WDjnK_es = __esm(() => {
     attrConfig$25,
     attrConfig$22
   ];
+  IDENTITY_ATTR_NAMES = new Set(["paraId", "textId"]);
   config$34 = {
     xmlName: XML_NODE_NAME$35,
     sdNodeOrKeyName: SD_NODE_NAME$31,
@@ -154303,7 +154468,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-D3H7T1qq.es.js
+// ../../packages/superdoc/dist/chunks/src-BGYOfW0n.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -233872,9 +234037,9 @@ var Node$13 = class Node$14 {
     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_D3H7T1qq_es = __esm(() => {
+var init_src_BGYOfW0n_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_V_8WDjnK_es();
+  init_SuperConverter_BMUaGImr_es();
   init_jszip_ChlR43oI_es();
   init_uuid_qzgm05fK_es();
   init_constants_CMPtQbp7_es();
@@ -236368,7 +236533,8 @@ ${err.toString()}`);
         },
         id: {},
         docPartGallery: {},
-        docPartUnique: { default: true }
+        docPartUnique: { default: false },
+        wrapperParagraph: { default: null }
       };
     }
   });
@@ -267194,8 +267360,8 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_D3H7T1qq_es();
-  init_SuperConverter_V_8WDjnK_es();
+  init_src_BGYOfW0n_es();
+  init_SuperConverter_BMUaGImr_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_CMPtQbp7_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.4.0-next.2",
+  "version": "0.4.0-next.4",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -22,19 +22,19 @@
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
     "@superdoc/super-editor": "0.0.1",
-    "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.21.0"
+    "superdoc": "1.21.0",
+    "@superdoc/pm-adapter": "0.0.0"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.4.0-next.2",
-    "@superdoc-dev/cli-linux-x64": "0.4.0-next.2",
-    "@superdoc-dev/cli-linux-arm64": "0.4.0-next.2",
-    "@superdoc-dev/cli-darwin-x64": "0.4.0-next.2",
-    "@superdoc-dev/cli-windows-x64": "0.4.0-next.2"
+    "@superdoc-dev/cli-darwin-x64": "0.4.0-next.4",
+    "@superdoc-dev/cli-darwin-arm64": "0.4.0-next.4",
+    "@superdoc-dev/cli-linux-x64": "0.4.0-next.4",
+    "@superdoc-dev/cli-linux-arm64": "0.4.0-next.4",
+    "@superdoc-dev/cli-windows-x64": "0.4.0-next.4"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",