@stll/folio-core 0.10.0 → 0.12.0

package/dist/docx/paragraphParser.js

@@ -1,8 +1,8 @@
-import { elementToXml, findChild, findChildren, getAttribute, getChildElements, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
-import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
 import { BorderStyleSchema, FrameWrapSchema, FrameXAlignSchema, FrameYAlignSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, TabLeaderSchema, TabStopAlignmentSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { elementToXml, findChild, findChildren, getAttribute, getChildElements, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { parseRun, parseRunProperties } from "./runParser.js";
 import { parseFieldType } from "./fieldParser.js";
+import { parseBookmarkEnd as parseBookmarkEnd$1, parseBookmarkStart as parseBookmarkStart$1 } from "./bookmarkParser.js";
 import { parseHyperlink as parseHyperlink$1 } from "./hyperlinkParser.js";
 import { consolidateParagraphContent } from "./runConsolidator.js";
 import { parseSdtProperties } from "./sdtProperties.js";
@@ -191,6 +191,9 @@ function collectFirstParagraphPropertyChildren(pPr) {
 			case "shd":
 				children.shd ??= child;
 				break;
+			case "snapToGrid":
+				children.snapToGrid ??= child;
+				break;
 			case "spacing":
 				children.spacing ??= child;
 				break;
@@ -243,6 +246,8 @@ function parseParagraphProperties(pPr, theme, styles) {
 	}
 	const bidi = propertyChildren.bidi;
 	if (bidi) formatting.bidi = parseBooleanElement(bidi);
+	const snapToGrid = propertyChildren.snapToGrid;
+	if (snapToGrid) formatting.snapToGrid = parseBooleanElement(snapToGrid);
 	const spacing = propertyChildren.spacing;
 	if (spacing) {
 		const before = parseNumericAttribute(spacing, "w", "before");
@@ -369,64 +374,64 @@ function getLocalName(name) {
 	const colonIndex = name.indexOf(":");
 	return colonIndex !== -1 ? name.slice(colonIndex + 1) : name;
 }
+const RENDERED_BREAK_INLINE_WRAPPERS = /* @__PURE__ */ new Set([
+	"hyperlink",
+	"smartTag",
+	"sdt",
+	"sdtContent",
+	"fldSimple",
+	"customXml",
+	"ins",
+	"del",
+	"moveFrom",
+	"moveTo"
+]);
+const RENDERED_BREAK_NON_CONTENT_MARKERS = /* @__PURE__ */ new Set([
+	"pPr",
+	"proofErr",
+	"bookmarkStart",
+	"bookmarkEnd",
+	"commentRangeStart",
+	"commentRangeEnd",
+	"commentReference",
+	"permStart",
+	"permEnd",
+	"rsidR"
+]);
+const RENDERED_BREAK_VISIBLE_RUN_CONTENT = /* @__PURE__ */ new Set([
+	"t",
+	"tab",
+	"br",
+	"cr",
+	"sym",
+	"drawing",
+	"pict",
+	"object",
+	"softHyphen",
+	"noBreakHyphen",
+	"fldChar",
+	"instrText",
+	"pgNum",
+	"separator",
+	"continuationSeparator",
+	"footnoteRef",
+	"endnoteRef",
+	"footnoteReference",
+	"endnoteReference",
+	"ptab",
+	"monthShort",
+	"monthLong",
+	"yearShort",
+	"yearLong",
+	"dayShort",
+	"dayLong"
+]);
 function paragraphStartsWithRenderedPageBreak(node) {
-	const inlineWrappers = /* @__PURE__ */ new Set([
-		"hyperlink",
-		"smartTag",
-		"sdt",
-		"sdtContent",
-		"fldSimple",
-		"customXml",
-		"ins",
-		"del",
-		"moveFrom",
-		"moveTo"
-	]);
-	const nonContentMarkers = /* @__PURE__ */ new Set([
-		"pPr",
-		"proofErr",
-		"bookmarkStart",
-		"bookmarkEnd",
-		"commentRangeStart",
-		"commentRangeEnd",
-		"commentReference",
-		"permStart",
-		"permEnd",
-		"rsidR"
-	]);
-	const visibleRunContent = /* @__PURE__ */ new Set([
-		"t",
-		"tab",
-		"br",
-		"cr",
-		"sym",
-		"drawing",
-		"pict",
-		"object",
-		"softHyphen",
-		"noBreakHyphen",
-		"fldChar",
-		"instrText",
-		"pgNum",
-		"separator",
-		"continuationSeparator",
-		"footnoteRef",
-		"endnoteRef",
-		"footnoteReference",
-		"endnoteReference",
-		"ptab",
-		"monthShort",
-		"monthLong",
-		"yearShort",
-		"yearLong",
-		"dayShort",
-		"dayLong"
-	]);
 	let sawRenderedPageBreak = false;
 	const visit = (element) => {
 		for (const child of getChildElements(element)) {
 			const childName = getLocalName(child.name);
-			if (nonContentMarkers.has(childName)) continue;
+			if (RENDERED_BREAK_NON_CONTENT_MARKERS.has(childName)) continue;
 			if (childName === "lastRenderedPageBreak") {
 				sawRenderedPageBreak = true;
 				continue;
@@ -440,11 +445,11 @@ function paragraphStartsWithRenderedPageBreak(node) {
 						continue;
 					}
 					if (runChildName === "br" && getAttribute(runChild, "w", "type") === "page") return "forced";
-					if (visibleRunContent.has(runChildName)) return "visible";
+					if (RENDERED_BREAK_VISIBLE_RUN_CONTENT.has(runChildName)) return "visible";
 				}
 				continue;
 			}
-			if (inlineWrappers.has(childName)) {
+			if (RENDERED_BREAK_INLINE_WRAPPERS.has(childName)) {
 				const result = visit(child);
 				if (result !== "continue") return result;
 				continue;
@@ -535,7 +540,7 @@ function isTrackedChangeWrapperChild(content) {
 	return content.type === "run" || content.type === "hyperlink";
 }
 function isInlineSdtContent(content) {
-	return content.type === "run" || content.type === "hyperlink" || content.type === "simpleField" || content.type === "complexField" || content.type === "inlineSdt" || content.type === "insertion" || content.type === "deletion" || content.type === "mathEquation";
+	return content.type === "run" || content.type === "hyperlink" || content.type === "simpleField" || content.type === "complexField" || content.type === "inlineSdt" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo" || content.type === "mathEquation";
 }
 function pushTrackedChangeWrapper({ contents, type, info, content, preserveEmpty = false }) {
 	if (content.length === 0 && !preserveEmpty) return;

package/dist/docx/paragraphTextBoxEnrichment.d.ts

@@ -2,8 +2,9 @@ import { document_d_exports } from "../types/document.js";
 import { NumberingMap } from "./numberingParser.js";
 import { StyleMap } from "./styleParser.js";
 import { XmlElement } from "./xmlParser.js";
+import { TableParserFn } from "./textBoxParser.js";
 
 //#region src/docx/paragraphTextBoxEnrichment.d.ts
-declare const enrichParagraphTextBoxes: (paragraph: document_d_exports.Paragraph, paraXml: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null) => void;
+declare const enrichParagraphTextBoxes: (paragraph: document_d_exports.Paragraph, paraXml: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null, parseTable: TableParserFn) => void;
 //#endregion
 export { enrichParagraphTextBoxes };

package/dist/docx/paragraphTextBoxEnrichment.js

@@ -72,26 +72,80 @@ const vmlWrapType = (positioned, zIndex) => {
 	if (Number.isFinite(zIndex) && zIndex < 0) return "behind";
 	return "inFront";
 };
-const enrichParagraphTextBoxes = (paragraph, paraXml, styles, theme, numbering, rels, media) => {
-	const xmlChildren = getChildElements(paraXml);
+const enrichParagraphTextBoxes = (paragraph, paraXml, styles, theme, numbering, rels, media, parseTable) => {
+	enrichTextBoxRuns({
+		content: paragraph.content,
+		xmlChildren: getChildElements(paraXml),
+		styles,
+		theme,
+		numbering,
+		rels,
+		media,
+		parseTable
+	});
+};
+const trackedChangeTypeFromXml = (localName) => {
+	if (localName === "ins") return "insertion";
+	if (localName === "del") return "deletion";
+	if (localName === "moveFrom" || localName === "moveTo") return localName;
+};
+const enrichTextBoxRuns = ({ content, xmlChildren, styles, theme, numbering, rels, media, parseTable }) => {
 	let parsedIndex = 0;
 	let lastConsumedRun;
 	for (const xmlChild of xmlChildren) {
-		if (getLocalName(xmlChild.name ?? "") !== "r") {
-			if (parsedIndex < paragraph.content.length && paragraph.content[parsedIndex]?.type !== "run") parsedIndex += 1;
+		const localName = getLocalName(xmlChild.name ?? "");
+		if (localName === "pPr") continue;
+		const trackedChangeType = trackedChangeTypeFromXml(localName);
+		const parsedContent = content[parsedIndex];
+		if (trackedChangeType && parsedContent?.type === trackedChangeType) enrichTextBoxRuns({
+			content: parsedContent.content,
+			xmlChildren: getChildElements(xmlChild),
+			styles,
+			theme,
+			numbering,
+			rels,
+			media,
+			parseTable
+		});
+		if (localName === "sdt" && parsedContent?.type === "inlineSdt") {
+			const properties = parsedContent.properties;
+			const nestedContent = [];
+			let lastSegmentIndex = parsedIndex;
+			for (let index = parsedIndex; index < content.length; index += 1) {
+				const candidate = content[index];
+				if (candidate?.type !== "inlineSdt" || candidate.properties !== properties) continue;
+				nestedContent.push(...candidate.content);
+				lastSegmentIndex = index;
+			}
+			const sdtContent = getChildElements(xmlChild).find((child) => getLocalName(child.name ?? "") === "sdtContent");
+			if (sdtContent) enrichTextBoxRuns({
+				content: nestedContent,
+				xmlChildren: getChildElements(sdtContent),
+				styles,
+				theme,
+				numbering,
+				rels,
+				media,
+				parseTable
+			});
+			parsedIndex = lastSegmentIndex + 1;
+			continue;
+		}
+		if (localName !== "r") {
+			if (parsedIndex < content.length && parsedContent?.type !== "run") parsedIndex += 1;
 			continue;
 		}
 		const { textBoxDrawings, vmlTextBoxes, hasNonTextBoxContent } = scanRunForTextBoxDrawings(xmlChild);
-		const parsedContent = paragraph.content[parsedIndex];
 		const parsedRun = parsedContent?.type === "run" ? parsedContent : void 0;
 		const targetRun = parsedRun ?? (hasNonTextBoxContent ? lastConsumedRun : void 0);
+		const targetRunMatchesXml = targetRun !== void 0 && (hasNonTextBoxContent || parsedRun?.content.length === 0);
 		for (const runEl of textBoxDrawings) {
 			const textBox = parseTextBox(runEl);
 			if (!textBox) continue;
 			const wsp = findDeep(runEl, "wps", "wsp");
 			if (wsp) {
 				const txbxContentEl = getTextBoxContentElement(wsp);
-				if (txbxContentEl) textBox.content = parseTextBoxContent(txbxContentEl, parseParagraph, null, styles, theme, numbering, rels ?? void 0, media ?? void 0);
+				if (txbxContentEl) textBox.content = parseTextBoxContent(txbxContentEl, parseParagraph, parseTable, styles, theme, numbering, rels, media);
 			}
 			const shape = {
 				type: "shape",
@@ -112,31 +166,31 @@ const enrichParagraphTextBoxes = (paragraph, paraXml, styles, theme, numbering,
 				type: "shape",
 				shape
 			};
-			if (targetRun && hasNonTextBoxContent) targetRun.content.push(shapeContent);
+			if (targetRunMatchesXml) targetRun.content.push(shapeContent);
 			else {
 				const newRun = {
 					type: "run",
 					content: [shapeContent]
 				};
-				paragraph.content.splice(parsedIndex, 0, newRun);
+				content.splice(parsedIndex, 0, newRun);
 				lastConsumedRun = newRun;
 				parsedIndex += 1;
 			}
 		}
 		for (const pictEl of vmlTextBoxes) {
-			const shape = parseVmlTextBoxShape(pictEl, styles, theme, numbering, rels, media);
+			const shape = parseVmlTextBoxShape(pictEl, styles, theme, numbering, rels, media, parseTable);
 			if (!shape) continue;
 			const shapeContent = {
 				type: "shape",
 				shape
 			};
-			if (targetRun && hasNonTextBoxContent) targetRun.content.push(shapeContent);
+			if (targetRunMatchesXml) targetRun.content.push(shapeContent);
 			else {
 				const newRun = {
 					type: "run",
 					content: [shapeContent]
 				};
-				paragraph.content.splice(parsedIndex, 0, newRun);
+				content.splice(parsedIndex, 0, newRun);
 				lastConsumedRun = newRun;
 				parsedIndex += 1;
 			}
@@ -196,7 +250,7 @@ const scanRunForTextBoxDrawings = (xmlRun) => {
 		hasNonTextBoxContent
 	};
 };
-const parseVmlTextBoxShape = (pictEl, styles, theme, numbering, rels, media) => {
+const parseVmlTextBoxShape = (pictEl, styles, theme, numbering, rels, media, parseTable) => {
 	const shapeEl = findDeep(pictEl, "v", "shape");
 	const textBoxEl = shapeEl ? findDeep(shapeEl, "v", "textbox") : null;
 	const contentEl = textBoxEl ? findDeep(textBoxEl, "w", "txbxContent") : null;
@@ -221,7 +275,7 @@ const parseVmlTextBoxShape = (pictEl, styles, theme, numbering, rels, media) =>
 		...fill === void 0 ? {} : { fill },
 		wrap: { type: vmlWrapType(positioned, zIndex) },
 		textBody: {
-			content: parseTextBoxContent(contentEl, parseParagraph, null, styles, theme, numbering, rels ?? void 0, media ?? void 0),
+			content: parseTextBoxContent(contentEl, parseParagraph, parseTable, styles, theme, numbering, rels, media),
 			...margins === void 0 ? {} : { margins }
 		}
 	};

package/dist/docx/paragraphTraversal.js

@@ -10,7 +10,7 @@ const visitDocxParagraphs = ({ documentBody, headers, footers, footnotes, endnot
 	const visitRun = (run) => {
 		for (const content of run.content) {
 			if (content.type !== "shape" || !content.shape.textBody) continue;
-			for (const paragraph of content.shape.textBody.content) visitParagraph(paragraph);
+			for (const block of content.shape.textBody.content) visitBlock(block);
 		}
 	};
 	const visitHyperlink = (hyperlink) => {

package/dist/docx/parser.js

@@ -1,13 +1,13 @@
+import { parseNumbering } from "./numberingParser.js";
+import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./relsParser.js";
+import { applyThemeFontLang, parseTheme } from "./themeParser.js";
 import { toArrayBuffer } from "../utils/docxInput.js";
 import { loadFontsWithMapping } from "../utils/fontLoader.js";
 import { convertTiffToPngDataUrl, isTiffMimeType } from "../utils/tiffConverter.js";
-import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./relsParser.js";
-import { applyThemeFontLang, parseTheme } from "./themeParser.js";
 import { parseComments } from "./commentParser.js";
 import { normalizeCommentReferences } from "./commentReferenceNormalization.js";
 import { detectDocxConformanceClass } from "./conformance.js";
 import { parseCoreProperties } from "./corePropertiesParser.js";
-import { parseNumbering } from "./numberingParser.js";
 import { extractAllTemplateVariables, parseDocumentBody } from "./documentParser.js";
 import { parseEndnotes, parseFootnotes } from "./footnoteParser.js";
 import { parseFooter, parseHeader } from "./headerFooterParser.js";

package/dist/docx/rezip.js

@@ -1,5 +1,5 @@
-import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./relsParser.js";
 import { parseNumbering } from "./numberingParser.js";
+import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./relsParser.js";
 import { parseEndnotes, parseFootnotes } from "./footnoteParser.js";
 import { assertValidFolioDocumentModel } from "./modelValidation.js";
 import { isPreservableDocxEntry } from "./unzip.js";

package/dist/docx/runParser.js

@@ -1,5 +1,5 @@
-import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { EmphasisMarkSchema, FontThemeSchema, HighlightColorSchema, ShadingPatternSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
+import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { parseImage } from "./imageParser.js";
 import { parseGroupDrawing } from "./groupDrawingParser.js";
 import { parseShapeFromDrawing, shouldPreserveRawShapeDrawing } from "./shapeParser.js";
@@ -551,7 +551,9 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			break;
 		}
 		case "rPr": break;
-		case "lastRenderedPageBreak": break;
+		case "lastRenderedPageBreak":
+			contents.push({ type: "renderedPageBreak" });
+			break;
 		case "cr":
 			contents.push({
 				type: "break",

package/dist/docx/sdtProperties.js

@@ -1,5 +1,5 @@
-import { elementToXml, findChild, getAttributeAnyPrefix, getLocalName, parseBooleanElement } from "./xmlParser.js";
 import { SdtLockSchema, narrowEnum } from "./parserEnums.js";
+import { elementToXml, findChild, getAttributeAnyPrefix, getLocalName, parseBooleanElement } from "./xmlParser.js";
 //#region src/docx/sdtProperties.ts
 function parseListItems(el) {
 	const items = [];

package/dist/docx/sectionParser.js

@@ -1,5 +1,5 @@
-import { findChild, findChildren, getAttribute, getChildElements, getLocalName, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { BorderStyleSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { findChild, findChildren, getAttribute, getChildElements, getLocalName, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { parseFooterReference, parseHeaderReference } from "./headerFooterRefParser.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
 //#region src/docx/sectionParser.ts

package/dist/docx/selectiveSave.js

@@ -1,6 +1,6 @@
+import { parseNumbering } from "./numberingParser.js";
 import { RELATIONSHIP_TYPES } from "./relsParser.js";
 import { parseCommentsExtended } from "./commentParser.js";
-import { parseNumbering } from "./numberingParser.js";
 import { validateFolioDocumentModel } from "./modelValidation.js";
 import { hasUnsynthesizedReplyRanges } from "./commentReplyMarkers.js";
 import { buildPatchedDocumentXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectChangedNumberingDefs, collectParaIds } from "./selectiveXmlPatch.js";

package/dist/docx/serializer/commentSerializer.js

@@ -46,8 +46,7 @@ function serializeParagraphWithAnnotationRef(p) {
 	return xml;
 }
 function serializeComment(comment) {
-	const attrs = [`w:id="${comment.id}"`];
-	if (comment.author) attrs.push(`w:author="${escapeXml(comment.author)}"`);
+	const attrs = [`w:id="${comment.id}"`, `w:author="${escapeXml(comment.author)}"`];
 	if (comment.initials) attrs.push(`w:initials="${escapeXml(comment.initials)}"`);
 	if (comment.date) attrs.push(`w:date="${escapeXml(comment.date)}"`);
 	let xml = `<w:comment ${attrs.join(" ")}>`;

package/dist/docx/serializer/documentSerializer.js

@@ -1,8 +1,8 @@
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
+import { serializeTable } from "./tableSerializer.js";
 import { resetAutoIdCounter } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
-import { serializeTable } from "./tableSerializer.js";
 //#region src/docx/serializer/documentSerializer.ts
 /**
 * Standard OOXML namespaces for document.xml
@@ -74,7 +74,7 @@ function buildNamespaceDeclarations() {
 */
 function serializeBlockContent(block) {
 	if (block.type === "paragraph") return serializeParagraph(block);
-	if (block.type === "table") return serializeTable(block);
+	if (block.type === "table") return serializeTable(block, serializeParagraph);
 	return serializeBlockSdt(block, serializeBlockContent);
 }
 /**

package/dist/docx/serializer/headerFooterSerializer.js

@@ -1,8 +1,8 @@
 import { canReplayHeaderFooterVerbatim, getHeaderFooterVerbatimXml } from "../headerFooterVerbatim.js";
 import { escapeXml } from "./xmlUtils.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
-import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
 //#region src/docx/serializer/headerFooterSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
@@ -36,7 +36,7 @@ function buildNamespaceDeclarations() {
 */
 function serializeBlock(block) {
 	if (block.type === "paragraph") return serializeParagraph(block);
-	if (block.type === "table") return serializeTable(block);
+	if (block.type === "table") return serializeTable(block, serializeParagraph);
 	return serializeBlockSdt(block, serializeBlock);
 }
 /**

package/dist/docx/serializer/noteSerializer.js

@@ -1,6 +1,6 @@
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
-import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
 //#region src/docx/serializer/noteSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
@@ -34,7 +34,7 @@ function buildNamespaceDeclarations() {
 */
 function serializeBlock(block) {
 	if (block.type === "paragraph") return serializeParagraph(block);
-	if (block.type === "table") return serializeTable(block);
+	if (block.type === "table") return serializeTable(block, serializeParagraph);
 	return serializeBlockSdt(block, serializeBlock);
 }
 /**

package/dist/docx/serializer/paragraphSerializer.js

@@ -155,6 +155,7 @@ function serializeParagraphFormatting(formatting, propertyChanges, pPrMark) {
 		const frameXml = serializeFrameProperties(formatting.frame);
 		if (frameXml) parts.push(frameXml);
 		pushToggle("widowControl", formatting.widowControl);
+		pushToggle("snapToGrid", formatting.snapToGrid);
 		const numPrXml = formatting.numPrFromStyle != null && numPrEqual(formatting.numPr, formatting.numPrFromStyle) ? "" : serializeNumbering(formatting.numPr);
 		if (numPrXml) parts.push(numPrXml);
 		const bordersXml = serializeParagraphBorders(formatting.borders);
@@ -354,6 +355,8 @@ function serializeInlineSdt(sdt) {
 			case "inlineSdt": return serializeInlineSdt(item);
 			case "insertion": return serializeTrackedChange("ins", item);
 			case "deletion": return serializeTrackedChange("del", item);
+			case "moveFrom": return serializeTrackedChange("moveFrom", item);
+			case "moveTo": return serializeTrackedChange("moveTo", item);
 			case "mathEquation": return item.ommlXml || "";
 			default: return item;
 		}
@@ -478,7 +481,10 @@ function serializeParagraph(paragraph) {
 }
 function injectRenderedPageBreakIntoFirstRun(xml) {
 	const runOpeningTag = /<w:r(?=[\s>/])[^>]*>/u;
-	if (!runOpeningTag.test(xml)) return null;
+	const openingTag = runOpeningTag.exec(xml);
+	if (!openingTag) return null;
+	const runEnd = xml.indexOf("</w:r>", openingTag.index + openingTag[0].length);
+	if (runEnd !== -1 && xml.slice(openingTag.index + openingTag[0].length, runEnd).includes("<w:lastRenderedPageBreak/>")) return xml;
 	return xml.replace(runOpeningTag, (match) => `${match}<w:lastRenderedPageBreak/>`);
 }
 /**

package/dist/docx/serializer/runSerializer.js

@@ -1,5 +1,6 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../types/documentEnumValues.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
+import { serializeTable } from "./tableSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
 import { panic } from "better-result";
 //#region src/docx/serializer/runSerializer.ts
@@ -418,8 +419,8 @@ function serializeDrawingContent(content) {
 	].join("");
 }
 /** Serialize text body content for shapes/textboxes */
-function serializeShapeTextBody(paragraphs) {
-	return paragraphs.map((p) => serializeParagraph(p)).join("");
+function serializeShapeTextBody(blocks) {
+	return blocks.map((block) => block.type === "paragraph" ? serializeParagraph(block) : serializeTable(block, serializeParagraph)).join("");
 }
 /**
 * Serialize shape content to full DrawingML XML (wps:wsp inside w:drawing)
@@ -534,6 +535,7 @@ function serializeRunContent(content) {
 		case "instrText": return serializeInstrText(content);
 		case "softHyphen": return serializeSoftHyphen(content);
 		case "noBreakHyphen": return serializeNoBreakHyphen(content);
+		case "renderedPageBreak": return "<w:lastRenderedPageBreak/>";
 		case "drawing":
 			if (content.rawXml) return content.rawXml;
 			return serializeDrawingContent(content);

package/dist/docx/serializer/stylesSerializer.js

@@ -1,7 +1,7 @@
 import { escapeXml } from "./xmlUtils.js";
+import { serializeTableCellFormatting, serializeTableFormatting, serializeTableRowFormatting } from "./tableSerializer.js";
 import { serializeTextFormatting } from "./runSerializer.js";
 import { serializeParagraphFormatting } from "./paragraphSerializer.js";
-import { serializeTableCellFormatting, serializeTableFormatting, serializeTableRowFormatting } from "./tableSerializer.js";
 //#region src/docx/serializer/stylesSerializer.ts
 const W_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 const serializeStylesXml = (definitions) => {

package/dist/docx/serializer/tableSerializer.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../../types/document.js";
 
 //#region src/docx/serializer/tableSerializer.d.ts
+type ParagraphSerializer = (paragraph: document_d_exports.Paragraph) => string;
 /**
  * Serialize table formatting properties (w:tblPr)
  */
@@ -16,25 +17,25 @@ declare function serializeTableCellFormatting(formatting: document_d_exports.Tab
 /**
  * Serialize a table cell (w:tc)
  */
-declare function serializeTableCell(cell: document_d_exports.TableCell): string;
+declare function serializeTableCell(cell: document_d_exports.TableCell, serializeParagraph: ParagraphSerializer): string;
 /**
  * Serialize a table row (w:tr)
  */
-declare function serializeTableRow(row: document_d_exports.TableRow): string;
+declare function serializeTableRow(row: document_d_exports.TableRow, serializeParagraph: ParagraphSerializer): string;
 /**
  * Serialize a table to OOXML XML (w:tbl)
  *
  * @param table - The table to serialize
  * @returns XML string for the table
  */
-declare function serializeTable(table: document_d_exports.Table): string;
+declare function serializeTable(table: document_d_exports.Table, serializeParagraph: ParagraphSerializer): string;
 /**
  * Serialize multiple tables to OOXML XML
  *
  * @param tables - The tables to serialize
  * @returns XML string for all tables
  */
-declare function serializeTables(tables: document_d_exports.Table[]): string;
+declare function serializeTables(tables: document_d_exports.Table[], serializeParagraph: ParagraphSerializer): string;
 /**
  * Check if a table has any rows
  */