@stll/folio-core 0.33.0 → 0.33.2

package/dist/docx/serializer/commentSerializer.js

@@ -1,5 +1,6 @@
 import { deterministicHexId } from "../../utils/hexId.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializePartElement } from "./partNamespaces.js";
 import { serializeTextFormatting } from "./runSerializer.js";
 import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/commentSerializer.ts
@@ -36,12 +37,29 @@ function serializeComment(comment) {
 	xml += "</w:comment>";
 	return xml;
 }
-const COMMENT_EXTENSION_NAMESPACES = {
-	w14: "http://schemas.microsoft.com/office/word/2010/wordml",
-	wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
-};
-const COMMENTS_HEADER = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:comments xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" ${Object.entries(COMMENT_EXTENSION_NAMESPACES).map(([prefix, namespace]) => `xmlns:${prefix}="${namespace}"`).join(" ")} xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="${Object.keys(COMMENT_EXTENSION_NAMESPACES).join(" ")}">`;
+const COMMENTS_BASELINE_PREFIXES = [
+	"wpc",
+	"mc",
+	"o",
+	"r",
+	"m",
+	"v",
+	"wp",
+	"w10",
+	"w",
+	"w14",
+	"wp14",
+	"wpg",
+	"wpi",
+	"wne",
+	"wps"
+];
+const COMMENTS_EXTENDED_BASELINE_PREFIXES = [
+	"mc",
+	"w",
+	"w15"
+];
+const XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
 /**
 * Serialize comments array to comments.xml content. Returns a valid empty
 * `<w:comments/>` document for an empty array so callers can overwrite an
@@ -49,18 +67,21 @@ const COMMENTS_HEADER = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 * comment — leaving the previous file in place would otherwise re-emit
 * the orphaned comment threads on every save.
 */
-function serializeComments(comments) {
+function serializeComments(comments, sourceBindings) {
 	const topLevel = [];
 	const replies = [];
 	for (const c of comments) {
 		const { parentId } = c;
 		(parentId === null || parentId === void 0 ? topLevel : replies).push(c);
 	}
-	let xml = COMMENTS_HEADER;
-	for (const comment of topLevel) xml += serializeComment(comment);
-	for (const reply of replies) xml += serializeComment(reply);
-	xml += "</w:comments>";
-	return xml;
+	const body = topLevel.map((comment) => serializeComment(comment)).join("") + replies.map((reply) => serializeComment(reply)).join("");
+	return XML_DECLARATION + serializePartElement({
+		partPath: "word/comments.xml",
+		rootName: "w:comments",
+		baselinePrefixes: COMMENTS_BASELINE_PREFIXES,
+		sourceBindings,
+		body
+	});
 }
 /** The `w14:paraId` Word threads a comment by: its LAST paragraph's paraId. */
 function commentThreadParaId(comment) {
@@ -145,7 +166,6 @@ function buildCommentExtendedEntries(comments) {
 	}
 	return entries.length > 0 ? entries : null;
 }
-const COMMENTS_EXTENDED_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<w15:commentsEx xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" mc:Ignorable=\"w15\">";
 /**
 * Serialize `commentsExtended.xml` (`w15:commentsEx`) for reply threading and
 * resolved state, or `null` when no comment needs an entry (see
@@ -155,13 +175,17 @@ const COMMENTS_EXTENDED_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" stand
 function serializeCommentsExtended(comments) {
 	const entries = buildCommentExtendedEntries(comments);
 	if (!entries) return null;
-	let xml = COMMENTS_EXTENDED_HEADER;
-	for (const entry of entries) {
+	const body = entries.map((entry) => {
 		const parentAttr = entry.paraIdParent !== void 0 ? ` w15:paraIdParent="${escapeXml(entry.paraIdParent)}"` : "";
-		xml += `<w15:commentEx w15:paraId="${escapeXml(entry.paraId)}"${parentAttr} w15:done="${entry.done ? "1" : "0"}"/>`;
-	}
-	xml += "</w15:commentsEx>";
-	return xml;
+		return `<w15:commentEx w15:paraId="${escapeXml(entry.paraId)}"${parentAttr} w15:done="${entry.done ? "1" : "0"}"/>`;
+	}).join("");
+	return XML_DECLARATION + serializePartElement({
+		partPath: "word/commentsExtended.xml",
+		rootName: "w15:commentsEx",
+		baselinePrefixes: COMMENTS_EXTENDED_BASELINE_PREFIXES,
+		sourceBindings: void 0,
+		body
+	});
 }
 //#endregion
 export { ensureThreadedCommentParaIds, serializeComments, serializeCommentsExtended };

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

@@ -11,9 +11,11 @@ declare function serializeDocumentBody(body: document_d_exports.DocumentBody): s
  * Serialize a complete Document to valid document.xml
  *
  * @param doc - The document to serialize
+ * @param sourceBindings - Root `xmlns:*` of the part being replaced, so a
+ *   prefix only the source document bound keeps its URI
  * @returns Complete XML string for document.xml
  */
-declare function serializeDocument(doc: document_d_exports.Document): string;
+declare function serializeDocument(doc: document_d_exports.Document, sourceBindings?: ReadonlyMap<string, string>): string;
 /**
  * Serialize just the document body (useful for partial updates)
  *

package/dist/docx/serializer/documentSerializer.js

@@ -1,78 +1,41 @@
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializePartElement } from "./partNamespaces.js";
 import { resetAutoIdCounter } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
 import { serializeTable } from "./tableSerializer.js";
 //#region src/docx/serializer/documentSerializer.ts
 /**
-* Standard OOXML namespaces for document.xml
-*/
-const NAMESPACES = {
-	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
-	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
-	cx: "http://schemas.microsoft.com/office/drawing/2014/chartex",
-	cx1: "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex",
-	cx2: "http://schemas.microsoft.com/office/drawing/2015/10/21/chartex",
-	cx3: "http://schemas.microsoft.com/office/drawing/2016/5/9/chartex",
-	cx4: "http://schemas.microsoft.com/office/drawing/2016/5/10/chartex",
-	cx5: "http://schemas.microsoft.com/office/drawing/2016/5/11/chartex",
-	cx6: "http://schemas.microsoft.com/office/drawing/2016/5/12/chartex",
-	cx7: "http://schemas.microsoft.com/office/drawing/2016/5/13/chartex",
-	cx8: "http://schemas.microsoft.com/office/drawing/2016/5/14/chartex",
-	mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
-	aink: "http://schemas.microsoft.com/office/drawing/2016/ink",
-	am3d: "http://schemas.microsoft.com/office/drawing/2017/model3d",
-	o: "urn:schemas-microsoft-com:office:office",
-	oel: "http://schemas.microsoft.com/office/2019/extlst",
-	pic: "http://schemas.openxmlformats.org/drawingml/2006/picture",
-	r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-	m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
-	v: "urn:schemas-microsoft-com:vml",
-	wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
-	wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-	w10: "urn:schemas-microsoft-com:office:word",
-	w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-	w14: "http://schemas.microsoft.com/office/word/2010/wordml",
-	w15: "http://schemas.microsoft.com/office/word/2012/wordml",
-	w16cex: "http://schemas.microsoft.com/office/word/2018/wordml/cex",
-	w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid",
-	w16: "http://schemas.microsoft.com/office/word/2018/wordml",
-	w16sdtdh: "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash",
-	w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
-	wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
-	wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
-	wne: "http://schemas.microsoft.com/office/word/2006/wordml",
-	wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
-};
-/**
-* Build namespace declaration string for document element
-*/
-function buildNamespaceDeclarations() {
-	const declared = {
-		a: NAMESPACES.a,
-		wpc: NAMESPACES.wpc,
-		mc: NAMESPACES.mc,
-		o: NAMESPACES.o,
-		pic: NAMESPACES.pic,
-		r: NAMESPACES.r,
-		m: NAMESPACES.m,
-		v: NAMESPACES.v,
-		wp14: NAMESPACES.wp14,
-		wp: NAMESPACES.wp,
-		w10: NAMESPACES.w10,
-		w: NAMESPACES.w,
-		w14: NAMESPACES.w14,
-		w15: NAMESPACES.w15,
-		w16: NAMESPACES.w16,
-		w16cex: NAMESPACES.w16cex,
-		w16cid: NAMESPACES.w16cid,
-		w16sdtdh: NAMESPACES.w16sdtdh,
-		w16se: NAMESPACES.w16se,
-		wpg: NAMESPACES.wpg,
-		wps: NAMESPACES.wps
-	};
-	return Object.entries(declared).map(([prefix, uri]) => `xmlns:${prefix}="${uri}"`).join(" ");
-}
+* Prefixes document.xml declares whether or not the body uses them.
+*
+* A canonical `<w:sdtPr>` legitimately carries `<w16sdtdh:dataHash>` /
+* `<w16cex:*>` / `<w16cid:*>` children the parser stores opaquely, and the
+* drawing prefixes host raw-replayed shapes, so the part keeps the shape Word
+* writes even when this particular save emits none of them.
+*/
+const DOCUMENT_BASELINE_PREFIXES = [
+	"a",
+	"wpc",
+	"mc",
+	"o",
+	"pic",
+	"r",
+	"m",
+	"v",
+	"wp14",
+	"wp",
+	"w10",
+	"w",
+	"w14",
+	"w15",
+	"w16",
+	"w16cex",
+	"w16cid",
+	"w16sdtdh",
+	"w16se",
+	"wpg",
+	"wps"
+];
 /**
 * Serialize a single block content item (paragraph, table, or block-level SDT).
 */
@@ -103,19 +66,20 @@ function serializeDocumentBody(body) {
 * Serialize a complete Document to valid document.xml
 *
 * @param doc - The document to serialize
+* @param sourceBindings - Root `xmlns:*` of the part being replaced, so a
+*   prefix only the source document bound keeps its URI
 * @returns Complete XML string for document.xml
 */
-function serializeDocument(doc) {
+function serializeDocument(doc, sourceBindings) {
 	resetAutoIdCounter();
-	const parts = [];
-	parts.push("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
-	const nsDecl = buildNamespaceDeclarations();
-	parts.push(`<w:document ${nsDecl} mc:Ignorable="w14 w15 wp14">`);
-	parts.push("<w:body>");
-	parts.push(serializeDocumentBody(doc.package.document));
-	parts.push("</w:body>");
-	parts.push("</w:document>");
-	return parts.join("");
+	const body = `<w:body>${serializeDocumentBody(doc.package.document)}</w:body>`;
+	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + serializePartElement({
+		partPath: "word/document.xml",
+		rootName: "w:document",
+		baselinePrefixes: DOCUMENT_BASELINE_PREFIXES,
+		sourceBindings,
+		body
+	});
 }
 /**
 * Serialize just the document body (useful for partial updates)

package/dist/docx/serializer/fontTableSerializer.js

@@ -1,10 +1,13 @@
+import { serializePartElement } from "./partNamespaces.js";
 import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/fontTableSerializer.ts
-const W_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
-const serializeFontTableXml = (fontTable) => {
-	const fonts = fontTable.fonts.map(serializeFont).join("");
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:fonts xmlns:w="${W_NS}">${fonts}</w:fonts>`;
-};
+const serializeFontTableXml = (fontTable) => "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
+	partPath: "word/fontTable.xml",
+	rootName: "w:fonts",
+	baselinePrefixes: ["w"],
+	sourceBindings: void 0,
+	body: fontTable.fonts.map(serializeFont).join("")
+});
 const serializeFont = (font) => {
 	const parts = [];
 	if (font.altName) parts.push(`<w:altName w:val="${escapeXml(font.altName)}"/>`);

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

@@ -1,11 +1,14 @@
 import { document_d_exports } from "../../types/document.js";
+import { SourcePart } from "./partNamespaces.js";
 //#region src/docx/serializer/headerFooterSerializer.d.ts
 /**
  * Serialize a HeaderFooter object to valid OOXML XML
  *
  * @param hf - HeaderFooter object to serialize
+ * @param source - The part being replaced, so a prefix only the source
+ *   document bound keeps its URI
  * @returns Complete XML string for header*.xml or footer*.xml
  */
-declare function serializeHeaderFooter(hf: document_d_exports.HeaderFooter): string;
+declare function serializeHeaderFooter(hf: document_d_exports.HeaderFooter, source?: SourcePart): string;
 //#endregion
 export { serializeHeaderFooter };

package/dist/docx/serializer/headerFooterSerializer.js

@@ -1,35 +1,33 @@
 import { canReplayHeaderFooterVerbatim, getHeaderFooterVerbatimXml } from "../headerFooterVerbatim.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializePartElement } from "./partNamespaces.js";
 import { serializeTable } from "./tableSerializer.js";
 import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/headerFooterSerializer.ts
-const NAMESPACES = {
-	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
-	mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
-	o: "urn:schemas-microsoft-com:office:office",
-	r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-	m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
-	v: "urn:schemas-microsoft-com:vml",
-	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
-	pic: "http://schemas.openxmlformats.org/drawingml/2006/picture",
-	wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
-	wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-	w10: "urn:schemas-microsoft-com:office:word",
-	w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-	w14: "http://schemas.microsoft.com/office/word/2010/wordml",
-	w15: "http://schemas.microsoft.com/office/word/2012/wordml",
-	w16: "http://schemas.microsoft.com/office/word/2018/wordml",
-	w16cex: "http://schemas.microsoft.com/office/word/2018/wordml/cex",
-	w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid",
-	w16sdtdh: "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash",
-	w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
-	wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
-	wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
-};
-function buildNamespaceDeclarations() {
-	return Object.entries(NAMESPACES).map(([prefix, uri]) => `xmlns:${prefix}="${uri}"`).join(" ");
-}
+const HEADER_FOOTER_BASELINE_PREFIXES = [
+	"wpc",
+	"mc",
+	"o",
+	"r",
+	"m",
+	"v",
+	"a",
+	"pic",
+	"wp14",
+	"wp",
+	"w10",
+	"w",
+	"w14",
+	"w15",
+	"w16",
+	"w16cex",
+	"w16cid",
+	"w16sdtdh",
+	"w16se",
+	"wpg",
+	"wps"
+];
 /**
 * Serialize a block content item (paragraph, table, or block-level SDT) for
 * header/footer.
@@ -43,13 +41,14 @@ function serializeBlock(block) {
 * Serialize a HeaderFooter object to valid OOXML XML
 *
 * @param hf - HeaderFooter object to serialize
+* @param source - The part being replaced, so a prefix only the source
+*   document bound keeps its URI
 * @returns Complete XML string for header*.xml or footer*.xml
 */
-function serializeHeaderFooter(hf) {
+function serializeHeaderFooter(hf, source) {
 	const verbatim = getHeaderFooterVerbatimXml(hf);
 	if (verbatim && canReplayHeaderFooterVerbatim(hf)) return verbatim;
 	const rootTag = hf.type === "header" ? "w:hdr" : "w:ftr";
-	const nsDecl = buildNamespaceDeclarations();
 	const watermarkXml = serializeWatermarkParagraph(hf);
 	const watermarkInsertIndex = hf.watermarkBlockIndex !== void 0 ? Math.max(0, Math.min(hf.watermarkBlockIndex, hf.content.length)) : 0;
 	const blocksXml = hf.content.map((block) => serializeBlock(block));
@@ -57,7 +56,13 @@ function serializeHeaderFooter(hf) {
 	if (watermarkXml) contentXml = blocksXml.slice(0, watermarkInsertIndex).join("") + watermarkXml + blocksXml.slice(watermarkInsertIndex).join("");
 	else contentXml = blocksXml.join("");
 	if (!contentXml) contentXml = "<w:p><w:pPr/></w:p>";
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<${rootTag} ${nsDecl}>${contentXml}</${rootTag}>`;
+	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
+		partPath: source?.path ?? `word/${hf.type}.xml`,
+		rootName: rootTag,
+		baselinePrefixes: HEADER_FOOTER_BASELINE_PREFIXES,
+		sourceBindings: source?.bindings,
+		body: contentXml
+	});
 }
 function serializeWatermarkParagraph(hf) {
 	if (hf.rawWatermarkXml) return hf.rawWatermarkXml;

package/dist/docx/serializer/noteSerializer.js

@@ -1,33 +1,38 @@
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializePartElement } from "./partNamespaces.js";
 import { serializeTable } from "./tableSerializer.js";
 //#region src/docx/serializer/noteSerializer.ts
-const NAMESPACES = {
-	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
-	mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
-	o: "urn:schemas-microsoft-com:office:office",
-	r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-	m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
-	v: "urn:schemas-microsoft-com:vml",
-	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
-	pic: "http://schemas.openxmlformats.org/drawingml/2006/picture",
-	wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
-	wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-	w10: "urn:schemas-microsoft-com:office:word",
-	w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-	w14: "http://schemas.microsoft.com/office/word/2010/wordml",
-	w15: "http://schemas.microsoft.com/office/word/2012/wordml",
-	w16: "http://schemas.microsoft.com/office/word/2018/wordml",
-	w16cex: "http://schemas.microsoft.com/office/word/2018/wordml/cex",
-	w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid",
-	w16sdtdh: "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash",
-	w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
-	wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
-	wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
-};
-function buildNamespaceDeclarations() {
-	return Object.entries(NAMESPACES).map(([prefix, uri]) => `xmlns:${prefix}="${uri}"`).join(" ");
-}
+const NOTE_BASELINE_PREFIXES = [
+	"wpc",
+	"mc",
+	"o",
+	"r",
+	"m",
+	"v",
+	"a",
+	"pic",
+	"wp14",
+	"wp",
+	"w10",
+	"w",
+	"w14",
+	"w15",
+	"w16",
+	"w16cex",
+	"w16cid",
+	"w16sdtdh",
+	"w16se",
+	"wpg",
+	"wps"
+];
+const serializeNotePart = (elementName, body) => "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
+	partPath: `word/${elementName}s.xml`,
+	rootName: `w:${elementName}s`,
+	baselinePrefixes: NOTE_BASELINE_PREFIXES,
+	sourceBindings: void 0,
+	body
+});
 /**
 * Serialize a block content item (paragraph, table, or block-level SDT) for a
 * note body.
@@ -63,9 +68,8 @@ function insertNoteReferenceMark(xml, elementName) {
 	return `${xml.slice(0, insertAt)}${referenceRun}${xml.slice(insertAt)}`;
 }
 function serializeNewNotePart(elementName, notes) {
-	const nsDecl = buildNamespaceDeclarations();
 	const serializedNotes = notes.map((note) => insertNoteReferenceMark(serializeNote(elementName, note), elementName)).join("");
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:${elementName}s ${nsDecl} mc:Ignorable="w14 w15 wp14">` + serializeRequiredNoteSeparators(elementName) + serializedNotes + `</w:${elementName}s>`;
+	return serializeNotePart(elementName, serializeRequiredNoteSeparators(elementName) + serializedNotes);
 }
 /**
 * Serialize footnotes to a complete word/footnotes.xml string.
@@ -74,7 +78,7 @@ function serializeNewNotePart(elementName, notes) {
 * @returns Complete footnotes.xml string.
 */
 function serializeFootnotes(footnotes) {
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:footnotes ${buildNamespaceDeclarations()} mc:Ignorable="w14 w15 wp14">${footnotes.map((fn) => serializeNote("footnote", fn)).join("")}</w:footnotes>`;
+	return serializeNotePart("footnote", footnotes.map((fn) => serializeNote("footnote", fn)).join(""));
 }
 /**
 * Serialize endnotes to a complete word/endnotes.xml string.
@@ -83,7 +87,7 @@ function serializeFootnotes(footnotes) {
 * @returns Complete endnotes.xml string.
 */
 function serializeEndnotes(endnotes) {
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:endnotes ${buildNamespaceDeclarations()} mc:Ignorable="w14 w15 wp14">${endnotes.map((en) => serializeNote("endnote", en)).join("")}</w:endnotes>`;
+	return serializeNotePart("endnote", endnotes.map((en) => serializeNote("endnote", en)).join(""));
 }
 /** Serialize a brand-new footnote part, including Word's required separators
 * and the automatic reference mark at the start of every normal note. */

package/dist/docx/serializer/numberingSerializer.js

@@ -1,7 +1,7 @@
+import { serializePartElement } from "./partNamespaces.js";
 import { serializeTextFormatting } from "./runSerializer.js";
 import { escapeXml, intAttr } from "./xmlUtils.js";
 //#region src/docx/serializer/numberingSerializer.ts
-const W_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 /**
 * Serialize a level's paragraph properties — the modeled subset is indentation
 * plus tab stops (see `parseLevelParagraphProps`). Returns "" when neither is
@@ -87,9 +87,13 @@ function serializeNum(instance) {
 * change detection and per-definition splicing, never to overwrite the part.
 */
 function serializeNumberingXml(numbering) {
-	const abstractNums = numbering.abstractNums.map(serializeAbstractNum).join("");
-	const nums = numbering.nums.map(serializeNum).join("");
-	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<w:numbering xmlns:w="${W_NS}">${abstractNums}${nums}</w:numbering>`;
+	return "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + serializePartElement({
+		partPath: "word/numbering.xml",
+		rootName: "w:numbering",
+		baselinePrefixes: ["w"],
+		sourceBindings: void 0,
+		body: `${numbering.abstractNums.map(serializeAbstractNum).join("")}${numbering.nums.map(serializeNum).join("")}`
+	});
 }
 //#endregion
 export { serializeNumberingXml };

package/dist/docx/serializer/paragraphSerializer.js

@@ -150,12 +150,10 @@ function serializeParagraphFormatting(formatting, propertyChanges, pPrMark) {
 		if (formatting.styleId) parts.push(`<w:pStyle w:val="${escapeXml(formatting.styleId)}"/>`);
 		pushToggle("keepNext", formatting.keepNext);
 		pushToggle("keepLines", formatting.keepLines);
-		pushToggle("contextualSpacing", formatting.contextualSpacing);
 		pushToggle("pageBreakBefore", formatting.pageBreakBefore);
 		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);
@@ -168,11 +166,13 @@ function serializeParagraphFormatting(formatting, propertyChanges, pPrMark) {
 		pushToggle("suppressAutoHyphens", formatting.suppressAutoHyphens);
 		pushToggle("kinsoku", formatting.kinsoku);
 		pushToggle("overflowPunct", formatting.overflowPunctuation);
+		pushToggle("bidi", formatting.bidi);
+		pushToggle("snapToGrid", formatting.snapToGrid);
 		const spacingXml = serializeSpacing(formatting);
 		if (spacingXml) parts.push(spacingXml);
 		const indXml = serializeIndentation(formatting);
 		if (indXml) parts.push(indXml);
-		pushToggle("bidi", formatting.bidi);
+		pushToggle("contextualSpacing", formatting.contextualSpacing);
 		if (formatting.alignment) parts.push(`<w:jc w:val="${formatting.alignment}"/>`);
 		if (formatting.outlineLevel !== void 0) parts.push(`<w:outlineLvl w:val="${formatting.outlineLevel}"/>`);
 		if (pPrMark || formatting.runProperties || formatting.runInWithNext) {
@@ -210,10 +210,8 @@ function serializeParagraphPropertyChange(change) {
 	const normalizedPreviousPPr = previousPPrInner.length > 0 ? `<w:pPr>${previousPPrInner}</w:pPr>` : "<w:pPr/>";
 	return `<w:pPrChange ${attrs.join(" ")}>${normalizedPreviousPPr}</w:pPrChange>`;
 }
-/**
-* Serialize a hyperlink (w:hyperlink)
-*/
-function serializeHyperlink(hyperlink) {
+/** The attribute list of a `w:hyperlink`, without its children. */
+function hyperlinkAttributes(hyperlink) {
 	const attrs = [];
 	if (hyperlink.rId) attrs.push(`r:id="${escapeXml(hyperlink.rId)}"`);
 	if (hyperlink.anchor) attrs.push(`w:anchor="${escapeXml(hyperlink.anchor)}"`);
@@ -222,12 +220,19 @@ function serializeHyperlink(hyperlink) {
 	if (hyperlink.history === true) attrs.push("w:history=\"1\"");
 	else if (hyperlink.history === false) attrs.push("w:history=\"0\"");
 	if (hyperlink.docLocation) attrs.push(`w:docLocation="${escapeXml(hyperlink.docLocation)}"`);
-	const childrenXml = hyperlink.children.map((child) => {
-		if (child.type === "run") return serializeRun(child);
-		if (child.type === "bookmarkStart") return serializeBookmarkStart(child);
-		return serializeBookmarkEnd(child);
-	}).join("");
-	return `<w:hyperlink${attrs.length > 0 ? ` ${attrs.join(" ")}` : ""}>${childrenXml}</w:hyperlink>`;
+	return attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
+}
+/** One `w:hyperlink` child, with the caller deciding how a run is written. */
+function serializeHyperlinkChild(child, serializeChildRun) {
+	if (child.type === "run") return serializeChildRun(child);
+	return child.type === "bookmarkStart" ? serializeBookmarkStart(child) : serializeBookmarkEnd(child);
+}
+/**
+* Serialize a hyperlink (w:hyperlink)
+*/
+function serializeHyperlink(hyperlink) {
+	const childrenXml = hyperlink.children.map((child) => serializeHyperlinkChild(child, serializeRun)).join("");
+	return `<w:hyperlink${hyperlinkAttributes(hyperlink)}>${childrenXml}</w:hyperlink>`;
 }
 /**
 * Serialize bookmark start (w:bookmarkStart)
@@ -397,20 +402,39 @@ function serializeTrackedChange(tag, change) {
 			return rewriteRunTextAsDeleted(contentXml);
 		}).join("");
 	};
-	const contentXml = change.content.map((item) => {
-		if (item.type === "run") {
-			if (tag === "del" || tag === "moveFrom") return serializeDeletedRun(item);
-			return serializeRun(item);
-		}
-		if (item.type === "hyperlink") return serializeHyperlink(item);
+	const serializeContentRun = (run) => tag === "del" || tag === "moveFrom" ? serializeDeletedRun(run) : serializeRun(run);
+	const serializeWrappedItem = (item) => {
+		if (item.type === "run") return serializeContentRun(item);
 		if (item.type === "simpleField" || item.type === "complexField") {
 			const xml = item.type === "simpleField" ? serializeSimpleField(item) : serializeComplexField(item);
 			return tag === "del" || tag === "moveFrom" ? rewriteRunTextAsDeleted(xml) : xml;
 		}
 		if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") return serializeTrackedChange(trackedChangeTag(item), item);
 		return item.type === "bookmarkStart" ? serializeBookmarkStart(item) : serializeBookmarkEnd(item);
-	}).join("");
-	return `<w:${tag} ${attrs.join(" ")}>${contentXml}</w:${tag}>`;
+	};
+	const open = `<w:${tag} ${attrs.join(" ")}>`;
+	const close = `</w:${tag}>`;
+	const wrap = (inner) => inner.length === 0 ? "" : `${open}${inner}${close}`;
+	if (change.content.length === 0) return `${open}${close}`;
+	const segments = [];
+	const pending = [];
+	const flushPending = () => {
+		if (pending.length > 0) {
+			segments.push(wrap(pending.join("")));
+			pending.length = 0;
+		}
+	};
+	for (const item of change.content) {
+		if (item.type === "hyperlink") {
+			flushPending();
+			const childrenXml = item.children.map((child) => serializeHyperlinkChild(child, serializeContentRun)).join("");
+			segments.push(`<w:hyperlink${hyperlinkAttributes(item)}>${open}${childrenXml}${close}</w:hyperlink>`);
+			continue;
+		}
+		pending.push(serializeWrappedItem(item));
+	}
+	flushPending();
+	return segments.join("");
 }
 /** Emit the `<w:commentReference>` run Word places after a comment range end. */
 function serializeCommentReferenceRun(id) {