@superdoc-dev/cli 0.7.0-next.22 → 0.7.0-next.23

package/dist/index.js

@@ -65501,7 +65501,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-DUDABEsC.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-B4pTwmbr.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -95148,7 +95148,8 @@ function translatePassthroughNode(params3) {
   return carbonCopy(original);
 }
 function translateBodyNode(params3) {
-  let sectPr = params3.bodyNode?.elements?.find((n) => n.name === "w:sectPr");
+  const liveSectPr = params3.converter?.bodySectPr;
+  let sectPr = (liveSectPr && typeof liveSectPr === "object" ? carbonCopy(liveSectPr) : null) || params3.bodyNode?.elements?.find((n) => n.name === "w:sectPr");
   if (!sectPr)
     sectPr = {
       type: "element",
@@ -116806,13 +116807,13 @@ var isRegExp = (value) => {
     additions.push(rel);
   });
   return additions.length ? [...existingRelationships, ...additions] : existingRelationships;
-}, RELS_XMLNS$1 = "http://schemas.openxmlformats.org/package/2006/relationships", FOOTNOTES_RELS_PATH = "word/_rels/footnotes.xml.rels", paragraphHasFootnoteRef = (node3) => {
+}, RELS_XMLNS$1 = "http://schemas.openxmlformats.org/package/2006/relationships", FOOTNOTES_RELS_PATH = "word/_rels/footnotes.xml.rels", ENDNOTES_RELS_PATH = "word/_rels/endnotes.xml.rels", FOOTNOTES_CONFIG$1, ENDNOTES_CONFIG$1, paragraphHasFootnoteRef = (node3) => {
   if (!node3)
     return false;
-  if (node3.name === "w:footnoteRef")
+  if (node3.name === "w:footnoteRef" || node3.name === "w:endnoteRef")
     return true;
   return (Array.isArray(node3.elements) ? node3.elements : []).some((child) => paragraphHasFootnoteRef(child));
-}, insertFootnoteRefIntoParagraph = (paragraph2) => {
+}, insertFootnoteRefIntoParagraph = (paragraph2, config$40) => {
   if (!paragraph2 || paragraph2.name !== "w:p")
     return;
   if (!Array.isArray(paragraph2.elements))
@@ -116821,7 +116822,7 @@ var isRegExp = (value) => {
     return;
   const footnoteRef = {
     type: "element",
-    name: "w:footnoteRef",
+    name: config$40.refName,
     elements: []
   };
   const footnoteRefRun = {
@@ -116833,7 +116834,7 @@ var isRegExp = (value) => {
       elements: [{
         type: "element",
         name: "w:rStyle",
-        attributes: { "w:val": "FootnoteReference" }
+        attributes: { "w:val": config$40.refStyle }
       }, {
         type: "element",
         name: "w:vertAlign",
@@ -116844,12 +116845,12 @@ var isRegExp = (value) => {
   const pPrIndex = paragraph2.elements.findIndex((el) => el?.name === "w:pPr");
   const insertAt = pPrIndex >= 0 ? pPrIndex + 1 : 0;
   paragraph2.elements.splice(insertAt, 0, footnoteRefRun);
-}, ensureFootnoteRefMarker = (elements) => {
+}, ensureFootnoteRefMarker = (elements, config$40) => {
   if (!Array.isArray(elements))
     return;
   const firstParagraphIndex = elements.findIndex((el) => el?.name === "w:p");
   if (firstParagraphIndex >= 0) {
-    insertFootnoteRefIntoParagraph(elements[firstParagraphIndex]);
+    insertFootnoteRefIntoParagraph(elements[firstParagraphIndex], config$40);
     return;
   }
   const paragraph2 = {
@@ -116857,7 +116858,7 @@ var isRegExp = (value) => {
     name: "w:p",
     elements: []
   };
-  insertFootnoteRefIntoParagraph(paragraph2);
+  insertFootnoteRefIntoParagraph(paragraph2, config$40);
   elements.unshift(paragraph2);
 }, translateFootnoteContent = (content$2, exportContext) => {
   if (!Array.isArray(content$2) || content$2.length === 0)
@@ -116878,7 +116879,7 @@ var isRegExp = (value) => {
       translated.push(result);
   });
   return translated;
-}, createFootnoteElement = (footnote, exportContext) => {
+}, createFootnoteElement = (footnote, exportContext, config$40 = FOOTNOTES_CONFIG$1) => {
   if (!footnote)
     return null;
   const { id: id2, content: content$2, type, originalXml } = footnote;
@@ -116889,10 +116890,10 @@ var isRegExp = (value) => {
     attributes["w:type"] = type;
   const translatedContent = translateFootnoteContent(content$2, exportContext);
   if (originalXml ? paragraphHasFootnoteRef(originalXml) : true)
-    ensureFootnoteRefMarker(translatedContent);
+    ensureFootnoteRefMarker(translatedContent, config$40);
   const base$1 = originalXml ? carbonCopy(originalXml) : {
     type: "element",
-    name: "w:footnote",
+    name: config$40.noteName,
     attributes: {},
     elements: []
   };
@@ -116939,10 +116940,10 @@ var isRegExp = (value) => {
     ...convertedXml,
     "word/settings.xml": updatedSettings
   };
-}, buildFootnotesRelsXml = (converter, convertedXml, relationships) => {
+}, buildFootnotesRelsXml = (converter, convertedXml, relationships, relsPath = FOOTNOTES_RELS_PATH) => {
   if (!relationships.length)
     return null;
-  const existingRels = convertedXml[FOOTNOTES_RELS_PATH];
+  const existingRels = convertedXml[relsPath];
   const existingRoot = existingRels?.elements?.find((el) => el.name === "Relationships");
   const merged = mergeRelationshipElements(Array.isArray(existingRoot?.elements) ? existingRoot.elements : [], relationships);
   const declaration = existingRels?.declaration ?? converter?.initialJSON?.declaration;
@@ -116954,10 +116955,18 @@ var isRegExp = (value) => {
       elements: merged
     }]
   };
-}, prepareFootnotesXmlForExport = ({ footnotes, editor, converter, convertedXml }) => {
-  let updatedXml = applyFootnotePropertiesToSettings(converter, convertedXml);
-  updatedXml = applyViewSettingToSettings(converter, updatedXml);
-  if (!footnotes || !Array.isArray(footnotes) || footnotes.length === 0)
+}, createNotesXmlDefinition = (config$40) => {
+  const base$1 = carbonCopy(FOOTNOTES_XML_DEF);
+  if (base$1.elements?.[0])
+    base$1.elements[0].name = config$40.rootName;
+  return base$1;
+}, prepareNotesXmlForExport = ({ notes, editor, converter, convertedXml, config: config$40 }) => {
+  let updatedXml = convertedXml;
+  if (config$40.applySettingsSideEffects) {
+    updatedXml = applyFootnotePropertiesToSettings(converter, updatedXml);
+    updatedXml = applyViewSettingToSettings(converter, updatedXml);
+  }
+  if (!notes || !Array.isArray(notes) || notes.length === 0)
     return {
       updatedXml,
       relationships: [],
@@ -116972,45 +116981,58 @@ var isRegExp = (value) => {
     relationships: footnoteRelationships,
     media: footnoteMedia
   };
-  const footnoteElements = footnotes.map((fn) => createFootnoteElement(fn, exportContext)).filter(Boolean);
+  const footnoteElements = notes.map((fn) => createFootnoteElement(fn, exportContext, config$40)).filter(Boolean);
   if (footnoteElements.length === 0)
     return {
       updatedXml,
       relationships: [],
       media: footnoteMedia
     };
-  let footnotesXml = updatedXml["word/footnotes.xml"];
+  let footnotesXml = updatedXml[config$40.notesPath];
   if (!footnotesXml)
-    footnotesXml = carbonCopy(FOOTNOTES_XML_DEF);
+    footnotesXml = createNotesXmlDefinition(config$40);
   else
     footnotesXml = carbonCopy(footnotesXml);
   if (footnotesXml.elements && footnotesXml.elements[0])
     footnotesXml.elements[0].elements = footnoteElements;
   updatedXml = {
     ...updatedXml,
-    "word/footnotes.xml": footnotesXml
+    [config$40.notesPath]: footnotesXml
   };
   if (footnoteRelationships.length > 0) {
-    const footnotesRelsXml = buildFootnotesRelsXml(converter, updatedXml, footnoteRelationships);
+    const footnotesRelsXml = buildFootnotesRelsXml(converter, updatedXml, footnoteRelationships, config$40.relsPath);
     if (footnotesRelsXml)
       updatedXml = {
         ...updatedXml,
-        [FOOTNOTES_RELS_PATH]: footnotesRelsXml
+        [config$40.relsPath]: footnotesRelsXml
       };
   }
+  const relationships = [{
+    type: "element",
+    name: "Relationship",
+    attributes: {
+      Type: config$40.relationshipType,
+      Target: config$40.relationshipTarget
+    }
+  }];
   return {
     updatedXml,
-    relationships: [{
-      type: "element",
-      name: "Relationship",
-      attributes: {
-        Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes",
-        Target: "footnotes.xml"
-      }
-    }],
+    relationships,
     media: footnoteMedia
   };
-}, APP_XML_PATH = "docProps/app.xml", EP_NAMESPACE = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties", BODY_STORY_KEY = "body", DEFAULT_CAPACITY = 10, StoryRuntimeCache = class {
+}, prepareFootnotesXmlForExport = ({ footnotes, editor, converter, convertedXml }) => prepareNotesXmlForExport({
+  notes: footnotes,
+  editor,
+  converter,
+  convertedXml,
+  config: FOOTNOTES_CONFIG$1
+}), prepareEndnotesXmlForExport = ({ endnotes, editor, converter, convertedXml }) => prepareNotesXmlForExport({
+  notes: endnotes,
+  editor,
+  converter,
+  convertedXml,
+  config: ENDNOTES_CONFIG$1
+}), APP_XML_PATH = "docProps/app.xml", EP_NAMESPACE = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties", BODY_STORY_KEY = "body", DEFAULT_CAPACITY = 10, StoryRuntimeCache = class {
   constructor(capacity = DEFAULT_CAPACITY) {
     this.map = /* @__PURE__ */ new Map;
     this.capacity = Math.max(1, capacity);
@@ -117228,7 +117250,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_DUDABEsC_es = __esm(() => {
+var init_SuperConverter_B4pTwmbr_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -153199,6 +153221,28 @@ var init_SuperConverter_DUDABEsC_es = __esm(() => {
   });
   ALL_COMMENT_TARGETS = COMMENT_FILE_BASENAMES;
   REL_ID_NUMERIC_PATTERN = /rId|mi/g;
+  FOOTNOTES_CONFIG$1 = {
+    notesPath: "word/footnotes.xml",
+    relsPath: FOOTNOTES_RELS_PATH,
+    rootName: "w:footnotes",
+    noteName: "w:footnote",
+    refName: "w:footnoteRef",
+    refStyle: "FootnoteReference",
+    relationshipType: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes",
+    relationshipTarget: "footnotes.xml",
+    applySettingsSideEffects: true
+  };
+  ENDNOTES_CONFIG$1 = {
+    notesPath: "word/endnotes.xml",
+    relsPath: ENDNOTES_RELS_PATH,
+    rootName: "w:endnotes",
+    noteName: "w:endnote",
+    refName: "w:endnoteRef",
+    refStyle: "EndnoteReference",
+    relationshipType: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes",
+    relationshipTarget: "endnotes.xml",
+    applySettingsSideEffects: false
+  };
   DocumentApiAdapterError = class DocumentApiAdapterError2 extends Error {
     constructor(code$1, message, details) {
       super(message);
@@ -154147,10 +154191,21 @@ var init_SuperConverter_DUDABEsC_es = __esm(() => {
         ...this.convertedXml,
         ...footnotesUpdatedXml
       };
+      const { updatedXml: endnotesUpdatedXml, relationships: endnotesRels, media: endnotesMedia } = prepareEndnotesXmlForExport({
+        endnotes: this.endnotes,
+        editor,
+        converter: this,
+        convertedXml: this.convertedXml
+      });
+      this.convertedXml = {
+        ...this.convertedXml,
+        ...endnotesUpdatedXml
+      };
       await this.#exportProcessMediaFiles({
         ...documentMedia,
         ...params3.media,
         ...footnotesMedia,
+        ...endnotesMedia,
         ...this.media
       }, editor);
       const { documentXml, relationships: commentsRels, removedTargets } = this.#prepareCommentsXmlFilesForExport({
@@ -154174,6 +154229,7 @@ var init_SuperConverter_DUDABEsC_es = __esm(() => {
         ...params3.relationships,
         ...commentsRels,
         ...footnotesRels,
+        ...endnotesRels,
         ...headFootRels
       ]);
       if (removedTargets?.length)
@@ -154474,7 +154530,7 @@ var init_SuperConverter_DUDABEsC_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-B7F814Ir.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-C636gY8A.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -157066,8 +157122,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_B7F814Ir_es = __esm(() => {
-  init_SuperConverter_DUDABEsC_es();
+var init_create_headless_toolbar_C636gY8A_es = __esm(() => {
+  init_SuperConverter_B4pTwmbr_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -158514,7 +158570,7 @@ var init_decrypt_docx_Bs1PbPQR_es = __esm(() => {
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/DocxZipper-CaIWmehq.es.js
+// ../../packages/superdoc/dist/chunks/DocxZipper-BBjEXAFw.es.js
 function sniffEncoding(u8) {
   if (u8.length >= 2) {
     const b0 = u8[0], b1 = u8[1];
@@ -158959,11 +159015,17 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
         typesString += commentsExtendedDef;
     }
     const hasFootnotes = types3.elements?.some((el) => el.name === "Override" && el.attributes.PartName === "/word/footnotes.xml");
+    const hasEndnotes = types3.elements?.some((el) => el.name === "Override" && el.attributes.PartName === "/word/endnotes.xml");
     if (hasFile("word/footnotes.xml")) {
       const footnotesDef = `<Override PartName="/word/footnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml" />`;
       if (!hasFootnotes)
         typesString += footnotesDef;
     }
+    if (hasFile("word/endnotes.xml")) {
+      const endnotesDef = `<Override PartName="/word/endnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml" />`;
+      if (!hasEndnotes)
+        typesString += endnotesDef;
+    }
     for (const entry of MANAGED_DOCUMENT_PARTS)
       if (hasFile(entry.zipPath) && !hasPartOverride(`/${entry.zipPath}`))
         typesString += `<Override PartName="/${entry.zipPath}" ContentType="${entry.contentType}" />`;
@@ -159159,7 +159221,7 @@ var DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.docum
     return `image/${MIME_TYPE_FOR_EXT[detectedType] || detectedType}`;
   }
 }, DocxZipper_default;
-var init_DocxZipper_CaIWmehq_es = __esm(() => {
+var init_DocxZipper_BBjEXAFw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -205505,7 +205567,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-oqYJU65d.es.js
+// ../../packages/superdoc/dist/chunks/src-BvQy1mGL.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -248746,6 +248808,9 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
   const indentLeft = typeof attrs?.hrIndentLeft === "number" ? attrs.hrIndentLeft : 0;
   const indentRight = typeof attrs?.hrIndentRight === "number" ? attrs.hrIndentRight : 0;
   const maxWidthForBlock = attrs?.isFullWidth === true && maxWidth > 0 ? Math.max(1, maxWidth - indentLeft - indentRight) : maxWidth;
+  const rawWrap = attrs?.wrap;
+  const isInlineShapeGroup = block.drawingKind === "shapeGroup" && rawWrap?.type === "Inline";
+  const inlineParagraphAlignment = attrs?.inlineParagraphAlignment === "center" || attrs?.inlineParagraphAlignment === "right" ? attrs.inlineParagraphAlignment : undefined;
   if (width > maxWidthForBlock && maxWidthForBlock > 0) {
     const scale = maxWidthForBlock / width;
     width = maxWidthForBlock;
@@ -248762,11 +248827,19 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
   if (state.cursorY + requiredHeight > state.contentBottom && state.cursorY > state.topMargin)
     state = advanceColumn(state);
   const pmRange = extractBlockPmRange(block);
+  let x = columnX(state.columnIndex) + marginLeft + indentLeft;
+  if (isInlineShapeGroup && inlineParagraphAlignment) {
+    const pIndentLeft = typeof attrs?.paragraphIndentLeft === "number" ? attrs.paragraphIndentLeft : 0;
+    const pIndentRight = typeof attrs?.paragraphIndentRight === "number" ? attrs.paragraphIndentRight : 0;
+    const alignBox = Math.max(0, maxWidthForBlock - pIndentLeft - pIndentRight);
+    const extra = Math.max(0, alignBox - width);
+    x += pIndentLeft + (inlineParagraphAlignment === "center" ? extra / 2 : extra);
+  }
   const fragment2 = {
     kind: "drawing",
     blockId: block.id,
     drawingKind: block.drawingKind,
-    x: columnX(state.columnIndex) + marginLeft + indentLeft,
+    x,
     y: state.cursorY + marginTop,
     width,
     height,
@@ -257918,6 +257991,26 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
     blockWithAttrs.attrs.anchorParagraphId = anchorParagraphId;
     return blockWithAttrs;
   };
+  const attachInlineShapeGroupAlignment = (block) => {
+    if (block.kind !== "drawing")
+      return block;
+    const drawingBlock = block;
+    const rawWrap = drawingBlock.attrs?.wrap;
+    if (drawingBlock.drawingKind !== "shapeGroup" || rawWrap?.type !== "Inline")
+      return block;
+    const effectiveAlignment = resolvedParagraphProperties.justification === "distribute" ? "center" : paragraphAttrs.alignment;
+    if (effectiveAlignment === "center" || effectiveAlignment === "right") {
+      if (!drawingBlock.attrs)
+        drawingBlock.attrs = {};
+      drawingBlock.attrs.inlineParagraphAlignment = effectiveAlignment;
+      const indent2 = paragraphAttrs.indent;
+      if (typeof indent2?.left === "number")
+        drawingBlock.attrs.paragraphIndentLeft = indent2.left;
+      if (typeof indent2?.right === "number")
+        drawingBlock.attrs.paragraphIndentRight = indent2.right;
+    }
+    return block;
+  };
   const flushParagraph = () => {
     if (currentRuns.length === 0)
       return;
@@ -257999,10 +258092,12 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
             });
             if (block) {
               attachAnchorParagraphId(block, anchorParagraphId);
+              attachInlineShapeGroupAlignment(block);
               blocks2.push(block);
             } else if (newBlocks.length > 0)
               newBlocks.forEach((b$1) => {
                 attachAnchorParagraphId(b$1, anchorParagraphId);
+                attachInlineShapeGroupAlignment(b$1);
                 blocks2.push(b$1);
               });
           } else
@@ -258015,8 +258110,10 @@ function paragraphToFlowBlocks({ para, nextBlockId, positions, trackedChangesCon
       flushParagraph();
       const converter = SHAPE_CONVERTERS_REGISTRY[node3.type];
       const drawingBlock = converter(node3, stableNextBlockId, positions);
-      if (drawingBlock)
+      if (drawingBlock) {
+        attachInlineShapeGroupAlignment(drawingBlock);
         blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
+      }
       return;
     }
   };
@@ -279746,7 +279843,8 @@ var Node$13 = class Node$14 {
               hash$3 = hashString(hash$3, getRunStringProp(run2, "vertAlign"));
               hash$3 = hashNumber(hash$3, getRunNumberProp(run2, "baselineShift"));
             }
-          }
+          } else if (cellBlock?.kind)
+            hash$3 = hashString(hash$3, deriveBlockVersion(cellBlock));
         }
       }
     }
@@ -280612,6 +280710,83 @@ var Node$13 = class Node$14 {
   if (frame.vAnchor !== undefined)
     parts.push(`va:${frame.vAnchor}`);
   return parts.join(",");
+}, getTableCellBlocks = (cell2) => {
+  return cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : []);
+}, readBlockClipPath = (block) => {
+  if (typeof block.clipPath === "string")
+    return block.clipPath;
+  if (typeof block.attrs?.clipPath === "string")
+    return block.attrs.clipPath;
+  return "";
+}, hashDrawingGeometry = (geometry) => {
+  return [
+    geometry.width,
+    geometry.height,
+    geometry.rotation ?? 0,
+    geometry.flipH ? 1 : 0,
+    geometry.flipV ? 1 : 0
+  ].join(":");
+}, hashImageLikeBlock = (block) => {
+  return [
+    block.src.slice(0, 50),
+    block.width ?? "",
+    block.height ?? "",
+    block.alt ?? "",
+    block.title ?? "",
+    block.objectFit ?? "",
+    readBlockClipPath(block),
+    block.rotation ?? "",
+    block.flipH ? 1 : 0,
+    block.flipV ? 1 : 0
+  ].join(":");
+}, hashListBlock = (block) => {
+  return block.items.map((item) => `${item.id}:${item.marker.text}:${hashRuns(item.paragraph)}`).join("|");
+}, hashDrawingBlock = (block) => {
+  if (block.drawingKind === "image")
+    return `drawing:image:${hashImageLikeBlock(block)}`;
+  if (block.drawingKind === "vectorShape")
+    return [
+      "drawing:vector",
+      hashDrawingGeometry(block.geometry),
+      block.shapeKind ?? "",
+      JSON.stringify(block.fillColor ?? null),
+      JSON.stringify(block.strokeColor ?? null),
+      block.strokeWidth ?? "",
+      JSON.stringify(block.customGeometry ?? null),
+      JSON.stringify(block.lineEnds ?? null),
+      JSON.stringify(block.effectExtent ?? null),
+      JSON.stringify(block.textContent ?? null),
+      block.textAlign ?? "",
+      block.textVerticalAlign ?? "",
+      JSON.stringify(block.textInsets ?? null)
+    ].join(":");
+  if (block.drawingKind === "shapeGroup")
+    return [
+      "drawing:shapeGroup",
+      hashDrawingGeometry(block.geometry),
+      JSON.stringify(block.groupTransform ?? null),
+      JSON.stringify(block.shapes),
+      block.size?.width ?? "",
+      block.size?.height ?? ""
+    ].join(":");
+  return [
+    "drawing:chart",
+    hashDrawingGeometry(block.geometry),
+    block.chartData?.chartType ?? "",
+    block.chartData?.subType ?? "",
+    JSON.stringify(block.chartData?.series ?? []),
+    block.chartRelId ?? ""
+  ].join(":");
+}, hashNonParagraphCellBlock = (block) => {
+  if (block.kind === "table")
+    return `table:${hashRuns(block)}`;
+  if (block.kind === "image")
+    return `image:${hashImageLikeBlock(block)}`;
+  if (block.kind === "drawing")
+    return hashDrawingBlock(block);
+  if (block.kind === "list")
+    return `list:${hashListBlock(block)}`;
+  return `${block.kind}:${block.id}`;
 }, hashRuns = (block) => {
   if (block.kind === "table") {
     const tableBlock = block;
@@ -280638,8 +280813,12 @@ var Node$13 = class Node$14 {
           if (cellAttrParts.length > 0)
             cellHashes.push(`ca:${cellAttrParts.join(":")}`);
         }
-        const cellBlocks = cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : []);
+        const cellBlocks = getTableCellBlocks(cell2);
         for (const cellBlock of cellBlocks) {
+          if (cellBlock.kind !== "paragraph") {
+            cellHashes.push(`nb:${hashNonParagraphCellBlock(cellBlock)}`);
+            continue;
+          }
           const paragraphBlock = cellBlock;
           if (!paragraphBlock.runs)
             continue;
@@ -286255,7 +286434,8 @@ var Node$13 = class Node$14 {
       try {
         const sdtBlock = clickDepth === 1 ? this.#findStructuredContentBlockAtPos(doc$12, hit.pos) : null;
         let nextSelection;
-        if (sdtBlock)
+        const insideTableInSdt = !!sdtBlock && this.#isInsideTableWithinStructuredContentBlock(doc$12, hit.pos, sdtBlock.pos);
+        if (sdtBlock && !insideTableInSdt)
           nextSelection = NodeSelection.create(doc$12, sdtBlock.pos);
         else {
           nextSelection = TextSelection.create(doc$12, hit.pos);
@@ -286485,6 +286665,29 @@ var Node$13 = class Node$14 {
     }
     return null;
   }
+  #isInsideTableWithinStructuredContentBlock(doc$12, pos, sdtPos) {
+    if (!Number.isFinite(pos) || !Number.isFinite(sdtPos))
+      return false;
+    try {
+      const $pos = doc$12.resolve(pos);
+      let tableDepth = -1;
+      let blockDepth = -1;
+      for (let depth = $pos.depth;depth > 0; depth--) {
+        const nodeName = $pos.node(depth)?.type?.name;
+        if (tableDepth === -1 && nodeName === "table")
+          tableDepth = depth;
+        if (nodeName === "structuredContentBlock") {
+          if ($pos.before(depth) === sdtPos) {
+            blockDepth = depth;
+            break;
+          }
+        }
+      }
+      return tableDepth !== -1 && blockDepth !== -1 && tableDepth > blockDepth;
+    } catch {
+      return false;
+    }
+  }
   #findStructuredContentBlockById(doc$12, id2) {
     let found2 = null;
     doc$12.descendants((node3, pos) => {
@@ -289319,18 +289522,18 @@ 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_oqYJU65d_es = __esm(() => {
+var init_src_BvQy1mGL_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_DUDABEsC_es();
+  init_SuperConverter_B4pTwmbr_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_B7F814Ir_es();
+  init_create_headless_toolbar_C636gY8A_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_remark_gfm_BhnWr3yf_es();
   init_remark_stringify_6MMJfY0k_es();
-  init_DocxZipper_CaIWmehq_es();
+  init_DocxZipper_BBjEXAFw_es();
   init__plugin_vue_export_helper_HmhZBO0u_es();
   init_eventemitter3_BdNugZrm_es();
   init_errors_CtyzHiH4_es();
@@ -314174,6 +314377,12 @@ function print() { __p += __j.call(arguments, '') }
         const footnotesXml = footnotesData?.elements?.[0] ? this.converter.schemaToXml(footnotesData.elements[0]) : null;
         const footnotesRelsData = this.converter.convertedXml["word/_rels/footnotes.xml.rels"];
         const footnotesRelsXml = footnotesRelsData?.elements?.[0] ? this.converter.schemaToXml(footnotesRelsData.elements[0]) : null;
+        const endnotesData = this.converter.convertedXml["word/endnotes.xml"];
+        const endnotesXml = endnotesData?.elements?.[0] ? this.converter.schemaToXml(endnotesData.elements[0]) : null;
+        const endnotesRelsData = this.converter.convertedXml["word/_rels/endnotes.xml.rels"];
+        const endnotesRelsXml = endnotesRelsData?.elements?.[0] ? this.converter.schemaToXml(endnotesRelsData.elements[0]) : null;
+        const settingsRelsData = this.converter.convertedXml["word/_rels/settings.xml.rels"];
+        const settingsRelsXml = settingsRelsData?.elements?.[0] ? this.converter.schemaToXml(settingsRelsData.elements[0]) : null;
         const media2 = this.converter.addedMedia;
         const updatedHeadersFooters = {};
         Object.entries(this.converter.convertedXml).forEach(([name, json$1]) => {
@@ -314200,12 +314409,22 @@ function print() { __p += __j.call(arguments, '') }
           ...appXml ? { "docProps/app.xml": String(appXml) } : {},
           ...coreXml ? { "docProps/core.xml": String(coreXml) } : {}
         };
-        if (hasCustomSettings)
-          updatedDocs["word/settings.xml"] = String(customSettings);
+        if (hasCustomSettings) {
+          let settingsXml = String(customSettings);
+          if (settingsRelsXml)
+            updatedDocs["word/_rels/settings.xml.rels"] = String(settingsRelsXml);
+          else if (/<\w+:attachedTemplate\b/i.test(settingsXml))
+            settingsXml = settingsXml.replace(/<\w+:attachedTemplate\b[^>]*\/?>/gi, "");
+          updatedDocs["word/settings.xml"] = settingsXml;
+        }
         if (footnotesXml)
           updatedDocs["word/footnotes.xml"] = String(footnotesXml);
         if (footnotesRelsXml)
           updatedDocs["word/_rels/footnotes.xml.rels"] = String(footnotesRelsXml);
+        if (endnotesXml)
+          updatedDocs["word/endnotes.xml"] = String(endnotesXml);
+        if (endnotesRelsXml)
+          updatedDocs["word/_rels/endnotes.xml.rels"] = String(endnotesRelsXml);
         const commentFiles = COMMENT_FILE_BASENAMES.map((name) => `word/${name}`);
         for (const path2 of commentFiles) {
           const data = this.converter.convertedXml[path2];
@@ -314220,6 +314439,17 @@ function print() { __p += __j.call(arguments, '') }
           if (partData?.elements?.[0])
             updatedDocs[path2] = String(this.converter.schemaToXml(partData.elements[0]));
         }
+        for (const path2 of Object.keys(this.converter.convertedXml)) {
+          if (!path2.startsWith("customXml/"))
+            continue;
+          if (!path2.endsWith(".xml") && !path2.endsWith(".rels"))
+            continue;
+          if (Object.prototype.hasOwnProperty.call(updatedDocs, path2))
+            continue;
+          const partData = this.converter.convertedXml[path2];
+          if (partData?.elements?.[0])
+            updatedDocs[path2] = String(this.converter.schemaToXml(partData.elements[0]));
+        }
         const zipper = new DocxZipper_default;
         if (getUpdatedDocs) {
           updatedDocs["[Content_Types].xml"] = await zipper.updateContentTypes({ files: this.options.content }, media2, true, updatedDocs, this.options.fonts);
@@ -324069,15 +324299,15 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_oqYJU65d_es();
-  init_SuperConverter_DUDABEsC_es();
+  init_src_BvQy1mGL_es();
+  init_SuperConverter_B4pTwmbr_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_B7F814Ir_es();
+  init_create_headless_toolbar_C636gY8A_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
-  init_DocxZipper_CaIWmehq_es();
+  init_DocxZipper_BBjEXAFw_es();
   init_eventemitter3_BdNugZrm_es();
   init_errors_CtyzHiH4_es();
   init_zipper_DbkgrypV_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.7.0-next.22",
+  "version": "0.7.0-next.23",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.22",
-    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.22",
-    "@superdoc-dev/cli-linux-x64": "0.7.0-next.22",
-    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.22",
-    "@superdoc-dev/cli-windows-x64": "0.7.0-next.22"
+    "@superdoc-dev/cli-darwin-arm64": "0.7.0-next.23",
+    "@superdoc-dev/cli-darwin-x64": "0.7.0-next.23",
+    "@superdoc-dev/cli-linux-x64": "0.7.0-next.23",
+    "@superdoc-dev/cli-windows-x64": "0.7.0-next.23",
+    "@superdoc-dev/cli-linux-arm64": "0.7.0-next.23"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",