@stll/folio-core 0.33.1 → 0.33.2

package/dist/docx/rezip.js

@@ -1,4 +1,5 @@
 import { isAllowedExternalWatermarkImageUrl } from "../watermark/index.js";
+import { normalizeAppVersionInExtendedProperties } from "./appVersionNormalization.js";
 import { withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
 import { applyReplyThreadMarkers } from "./commentReplyMarkers.js";
 import { parseEndnotes, parseFootnotes } from "./footnoteParser.js";
@@ -16,6 +17,7 @@ import { serializeFontTableXml } from "./serializer/fontTableSerializer.js";
 import { serializeHeaderFooter } from "./serializer/headerFooterSerializer.js";
 import { serializeEndnotes, serializeFootnotes, serializeNewEndnotesPart, serializeNewFootnotesPart } from "./serializer/noteSerializer.js";
 import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
+import { readRootNamespaceBindings } from "./serializer/partNamespaces.js";
 import { serializeSettingsXml } from "./serializer/settingsSerializer.js";
 import { serializeStyle, serializeStylesXml } from "./serializer/stylesSerializer.js";
 import { serializeThemeXml } from "./serializer/themeSerializer.js";
@@ -122,13 +124,12 @@ function assertDocumentPackageFidelity(originalDocumentXml, serializedDocumentXm
 async function serializeCommentsToZip(doc, zip, compressionLevel) {
 	const comments = doc.package.document.comments ?? [];
 	const sourceCommentsFile = findZipEntryCaseInsensitive(zip, "word/comments.xml");
+	const sourceCommentsXml = sourceCommentsFile ? await sourceCommentsFile.async("text") : void 0;
 	if (comments.length === 0) {
-		if (!sourceCommentsFile) return;
-		const sourceCommentsXml = await sourceCommentsFile.async("text");
-		if (!hasCommentEntries(sourceCommentsXml)) return;
+		if (sourceCommentsXml === void 0 || !hasCommentEntries(sourceCommentsXml)) return;
 	}
 	ensureThreadedCommentParaIds(comments);
-	const commentsXml = serializeComments(comments);
+	const commentsXml = serializeComments(comments, sourceCommentsXml === void 0 ? void 0 : readRootNamespaceBindings(sourceCommentsXml));
 	zip.file(sourceCommentsFile?.name ?? "word/comments.xml", commentsXml, {
 		compression: "DEFLATE",
 		compressionOptions: { level: compressionLevel }
@@ -428,6 +429,30 @@ const normalizePackageIdsInZip = async (zip, compressionLevel) => {
 		compressionOptions: { level: compressionLevel }
 	});
 };
+const EXTENDED_PROPERTIES_PATH = "docProps/app.xml";
+/**
+* Bring the application version the package states about itself into the form
+* the schema gives it. A package that holds no extended properties keeps
+* holding none.
+*/
+const normalizeAppVersionInZip = async (zip, compressionLevel) => {
+	const extendedProperties = zip.file(EXTENDED_PROPERTIES_PATH);
+	if (!extendedProperties) return;
+	const xml = await extendedProperties.async("text");
+	const normalized = normalizeAppVersionInExtendedProperties(xml);
+	if (normalized !== xml) zip.file(EXTENDED_PROPERTIES_PATH, normalized, {
+		compression: "DEFLATE",
+		compressionOptions: { level: compressionLevel }
+	});
+};
+/**
+* Every pass a save owes the package as a whole, in one function so that the
+* full repack and the selective save cannot drift into running different ones.
+*/
+const normalizePackageOnSave = async (zip, compressionLevel) => {
+	await normalizePackageIdsInZip(zip, compressionLevel);
+	await normalizeAppVersionInZip(zip, compressionLevel);
+};
 /**
 * The single exit for a repacked package. Reconciliation runs here rather than
 * at each caller so no save path can emit a package whose relationships or
@@ -435,7 +460,7 @@ const normalizePackageIdsInZip = async (zip, compressionLevel) => {
 */
 const generateDocxZip = async (zip, compressionLevel) => {
 	await reconcilePackageReferences(zip, compressionLevel);
-	await normalizePackageIdsInZip(zip, compressionLevel);
+	await normalizePackageOnSave(zip, compressionLevel);
 	return zip.generateAsync({
 		type: "arraybuffer",
 		compression: "DEFLATE",
@@ -470,14 +495,14 @@ const finishRepack = async ({ document, originalZip, outputZip, originalDocument
 	await processNewHyperlinks(parts, outputZip, compressionLevel);
 	assertValidFolioDocumentModel(document, "Cannot repack invalid DOCX document model");
 	applyReplyThreadMarkers(document);
-	const documentXml = serializeDocument(document);
+	const documentXml = serializeDocument(document, originalDocumentXml === void 0 ? void 0 : readRootNamespaceBindings(originalDocumentXml));
 	if (originalDocumentXml) assertDocumentPackageFidelity(originalDocumentXml, documentXml, document);
 	outputZip.file("word/document.xml", documentXml, {
 		compression: "DEFLATE",
 		compressionOptions: { level: compressionLevel }
 	});
 	await rebindWatermarkRelIds(document, outputZip, compressionLevel);
-	serializeHeadersFootersToZip(document, outputZip, compressionLevel);
+	await serializeHeadersFootersToZip(document, outputZip, compressionLevel);
 	await serializeNotesToZip({
 		doc: document,
 		originalZip,
@@ -559,14 +584,14 @@ async function repackDocxFromRaw(doc, rawContent, options = {}) {
 	await processNewHyperlinks(parts, newZip, compressionLevel);
 	assertValidFolioDocumentModel(exportDocument, "Cannot repack invalid DOCX document model");
 	applyReplyThreadMarkers(exportDocument);
-	const documentXml = serializeDocument(exportDocument);
+	const documentXml = serializeDocument(exportDocument, rawContent.documentXml ? readRootNamespaceBindings(rawContent.documentXml) : void 0);
 	if (rawContent.documentXml) assertDocumentPackageFidelity(rawContent.documentXml, documentXml, exportDocument);
 	newZip.file("word/document.xml", documentXml, {
 		compression: "DEFLATE",
 		compressionOptions: { level: compressionLevel }
 	});
 	await rebindWatermarkRelIds(exportDocument, newZip, compressionLevel);
-	serializeHeadersFootersToZip(exportDocument, newZip, compressionLevel);
+	await serializeHeadersFootersToZip(exportDocument, newZip, compressionLevel);
 	await serializeNotesToZip({
 		doc: exportDocument,
 		originalZip: rawContent.originalZip,
@@ -775,11 +800,11 @@ async function updateMultipleFiles(originalBuffer, updates, options = {}) {
 * Apply file updates to an already-loaded JSZip instance and generate the output.
 * Use this when the zip is already loaded to avoid a redundant decompression pass.
 *
-* This is the selective save's exit, so it owes the package the same id passes
+* This is the selective save's exit, so it owes the package the same passes
 * {@link generateDocxZip} runs: a save that rewrites only the changed
 * paragraphs still has to see the parts it left alone, both to know which
-* revision ids are free and because an out-of-range paragraph id can sit in a
-* part it never touched.
+* revision ids are free and because an out-of-range paragraph id, or a
+* malformed application version, can sit in a part it never touched.
 */
 async function applyUpdatesToZip(zip, updates, options = {}) {
 	const { compressionLevel = 6 } = options;
@@ -787,7 +812,7 @@ async function applyUpdatesToZip(zip, updates, options = {}) {
 		compression: "DEFLATE",
 		compressionOptions: { level: compressionLevel }
 	});
-	await normalizePackageIdsInZip(zip, compressionLevel);
+	await normalizePackageOnSave(zip, compressionLevel);
 	return await zip.generateAsync({
 		type: "arraybuffer",
 		compression: "DEFLATE",
@@ -1090,7 +1115,13 @@ async function rebindWatermarkRelIds(doc, zip, compressionLevel) {
 		});
 	}
 }
-function collectHeaderFooterUpdates(doc) {
+/**
+* Re-serialize every header/footer the model still owns, keyed by part path.
+*
+* `sourceZip` supplies each part as it stands before the save so the rebuilt
+* root can keep any prefix binding only the source document declared.
+*/
+async function collectHeaderFooterUpdates(doc, sourceZip) {
 	const updates = /* @__PURE__ */ new Map();
 	const rels = doc.package.relationships;
 	if (!rels) return updates;
@@ -1107,8 +1138,13 @@ function collectHeaderFooterUpdates(doc) {
 		for (const [rId, headerFooter] of map.entries()) {
 			const rel = rels.get(rId);
 			if (rel && rel.type === type && rel.target) {
-				const filename = resolveRelativePath(documentRelsPath, rel.target);
-				updates.set(filename, serializeHeaderFooter(headerFooter));
+				const path = resolveRelativePath(documentRelsPath, rel.target);
+				const sourceFile = findZipEntryCaseInsensitive(sourceZip, path.toLowerCase());
+				const bindings = sourceFile ? readRootNamespaceBindings(await sourceFile.async("text")) : /* @__PURE__ */ new Map();
+				updates.set(path, serializeHeaderFooter(headerFooter, {
+					path,
+					bindings
+				}));
 			}
 		}
 	}
@@ -1117,9 +1153,9 @@ function collectHeaderFooterUpdates(doc) {
 /**
 * Serialize modified headers and footers into the ZIP
 */
-function serializeHeadersFootersToZip(doc, zip, compressionLevel) {
+async function serializeHeadersFootersToZip(doc, zip, compressionLevel) {
 	const compressionOptions = { level: compressionLevel };
-	for (const [filename, xml] of collectHeaderFooterUpdates(doc)) zip.file(filename, xml, {
+	for (const [filename, xml] of await collectHeaderFooterUpdates(doc, zip)) zip.file(filename, xml, {
 		compression: "DEFLATE",
 		compressionOptions
 	});

package/dist/docx/runParser.js

@@ -7,8 +7,9 @@ import { parseShapeFromDrawing, shouldPreserveRawShapeDrawing } from "./shapePar
 import { isTextBoxDrawing } from "./textBoxParser.js";
 import { requiresXmlSpacePreserve } from "./textWhitespace.js";
 import { resolveThemeFontRef } from "./themeParser.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
 import { parseVmlImageContent } from "./vmlImageParser.js";
-import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
+import { cloneWithXmlnsDeclarations, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { DRAWING_RAW_XML_MODES, normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/runParser.ts
 /**
@@ -489,7 +490,7 @@ function parseDrawingContent(element, rels, media) {
 	if (groupImage) return {
 		type: "drawing",
 		image: groupImage,
-		rawXml: elementToXml(element)
+		rawXml: captureVerbatimXml(element)
 	};
 	if (shouldPreserveRawShapeDrawing(element)) return {
 		type: "drawing",
@@ -502,7 +503,7 @@ function parseDrawingContent(element, rels, media) {
 			},
 			wrap: { type: "inline" }
 		},
-		rawXml: elementToXml(element),
+		rawXml: captureVerbatimXml(element),
 		rawXmlMode: DRAWING_RAW_XML_MODES.PRESERVE_ONLY
 	};
 	const shape = parseShapeFromDrawing(element);
@@ -516,7 +517,7 @@ function parseDrawingContent(element, rels, media) {
 		type: "drawing",
 		image
 	};
-	if (!image.src) drawing.rawXml = elementToXml(element);
+	if (!image.src) drawing.rawXml = captureVerbatimXml(element);
 	return drawing;
 }
 /**
@@ -593,7 +594,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			if (groupedChoiceDrawing) {
 				const groupedDrawing = parseDrawingContent(groupedChoiceDrawing, rels, media);
 				if (groupedDrawing?.type === "drawing" && groupedDrawing.image.src) {
-					groupedDrawing.rawXml = elementToXml(child);
+					groupedDrawing.rawXml = captureVerbatimXml(child);
 					contents.push(groupedDrawing);
 					break;
 				}
@@ -601,7 +602,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			const fallbackPict = fallbackEl ? getChildElements(fallbackEl).find((el) => getLocalName(el.name) === "pict") : void 0;
 			const fallbackVml = fallbackPict && !choiceTextBoxDrawing ? parseVmlImageContent(fallbackPict, rels, media, rootXmlns) : null;
 			if (fallbackVml?.image.src) {
-				fallbackVml.rawXml = elementToXml(cloneWithXmlnsDeclarations(child, rootXmlns));
+				fallbackVml.rawXml = captureVerbatimXml(cloneWithXmlnsDeclarations(child, rootXmlns));
 				contents.push(fallbackVml);
 				break;
 			}
@@ -611,13 +612,13 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 				if (innerName === "drawing") {
 					const innerDrawing = parseDrawingContent(innerChild, rels, media);
 					if (innerDrawing) {
-						if (innerDrawing.type === "drawing" && (innerDrawing.rawXml !== void 0 || !innerDrawing.image.src)) innerDrawing.rawXml = elementToXml(child);
+						if (innerDrawing.type === "drawing" && (innerDrawing.rawXml !== void 0 || !innerDrawing.image.src)) innerDrawing.rawXml = captureVerbatimXml(child);
 						contents.push(innerDrawing);
 					}
 				} else if (innerName === "pict") {
 					const innerVml = parseVmlImageContent(innerChild, rels, media, rootXmlns);
 					if (innerVml) {
-						innerVml.rawXml = elementToXml(cloneWithXmlnsDeclarations(child, rootXmlns));
+						innerVml.rawXml = captureVerbatimXml(cloneWithXmlnsDeclarations(child, rootXmlns));
 						contents.push(innerVml);
 					}
 				}

package/dist/docx/sdtProperties.js

@@ -1,5 +1,6 @@
 import { SdtLockSchema, narrowEnum } from "./parserEnums.js";
-import { elementToXml, findChild, getAttributeAnyPrefix, getLocalName, parseBooleanElement } from "./xmlParser.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { findChild, getAttributeAnyPrefix, getLocalName, parseBooleanElement } from "./xmlParser.js";
 //#region src/docx/sdtProperties.ts
 function parseListItems(el) {
 	const items = [];
@@ -201,7 +202,7 @@ function rewriteOpenTagAttrPrefixes(raw, canonical, local) {
 function parseSdtProperties(sdtPr, sdtEndPr) {
 	const props = { sdtType: "richText" };
 	if (sdtPr) {
-		props.rawPropertiesXml = normalizeWordPrefix(elementToXml(sdtPr), sdtPr);
+		props.rawPropertiesXml = normalizeWordPrefix(captureVerbatimXml(sdtPr), sdtPr);
 		for (const el of sdtPr.elements ?? []) {
 			if (el.type !== "element") continue;
 			const name = el.name ? getLocalName(el.name) : "";
@@ -283,7 +284,7 @@ function parseSdtProperties(sdtPr, sdtEndPr) {
 			}
 		}
 	}
-	if (sdtEndPr) props.rawEndPropertiesXml = normalizeWordPrefix(elementToXml(sdtEndPr), sdtEndPr);
+	if (sdtEndPr) props.rawEndPropertiesXml = normalizeWordPrefix(captureVerbatimXml(sdtEndPr), sdtEndPr);
 	return props;
 }
 //#endregion

package/dist/docx/selectiveSave.js

@@ -13,6 +13,7 @@ import { ensureThreadedCommentParaIds, serializeComments, serializeCommentsExten
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeEndnotes, serializeFootnotes } from "./serializer/noteSerializer.js";
 import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
+import { readRootNamespaceBindings } from "./serializer/partNamespaces.js";
 //#region src/docx/selectiveSave.ts
 /**
 * Check if document content has new images (data: URL without rId) or
@@ -209,7 +210,6 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 	if (!validateFolioDocumentModel(doc).valid) return null;
 	const comments = doc.package.document.comments ?? [];
 	const hasComments = comments.length > 0;
-	const headerFooterUpdates = collectHeaderFooterUpdates(doc);
 	try {
 		const zip = await (await import("jszip")).default.loadAsync(originalBuffer);
 		for (const [path, file] of Object.entries(zip.files)) if (!file.dir && isUnsafePackagePath(path)) return null;
@@ -228,15 +228,16 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 				if (unrouted === null || unrouted.size > 0) return null;
 			}
 			if (bodyChangedIds.size > 0) {
-				const patchedDocXml = buildPatchedDocumentXml(originalDocXml, serializeDocument(doc), bodyChangedIds);
+				const patchedDocXml = buildPatchedDocumentXml(originalDocXml, serializeDocument(doc, readRootNamespaceBindings(originalDocXml)), bodyChangedIds);
 				if (!patchedDocXml) return null;
 				updates.set("word/document.xml", patchedDocXml);
 			}
 		}
-		const hadCommentsFile = zip.file("word/comments.xml") !== null;
-		if (hasComments || hadCommentsFile) {
+		const sourceCommentsFile = zip.file("word/comments.xml");
+		if (hasComments || sourceCommentsFile) {
 			ensureThreadedCommentParaIds(comments);
-			updates.set("word/comments.xml", serializeComments(comments));
+			const sourceBindings = sourceCommentsFile ? readRootNamespaceBindings(await sourceCommentsFile.async("text")) : void 0;
+			updates.set("word/comments.xml", serializeComments(comments, sourceBindings));
 		}
 		if (hasComments) {
 			const ctFile = zip.file("[Content_Types].xml");
@@ -256,7 +257,7 @@ async function attemptSelectiveSave(doc, originalBuffer, options) {
 		}
 		if (!await patchCommentsExtended(zip, comments, updates)) return null;
 		await patchNumberingPart(zip, doc, updates);
-		for (const [path, xml] of headerFooterUpdates) updates.set(path, xml);
+		for (const [path, xml] of await collectHeaderFooterUpdates(doc, zip)) updates.set(path, xml);
 		await queueSettingsUpdates(zip, updates);
 		const corePropsFile = zip.file("docProps/core.xml");
 		if (corePropsFile) {

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

@@ -7,7 +7,7 @@ import { Comment } from "../../types/content.js";
  * comment — leaving the previous file in place would otherwise re-emit
  * the orphaned comment threads on every save.
  */
-declare function serializeComments(comments: Comment[]): string;
+declare function serializeComments(comments: Comment[], sourceBindings?: ReadonlyMap<string, string>): string;
 /**
  * Assign a deterministic `w14:paraId` to the LAST paragraph of every comment
  * that needs a commentsExtended entry (a reply, a reply's parent, or a resolved

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 };