@stll/folio-core 0.55.0 → 0.57.0

package/dist/docx/documentParser.js

@@ -239,58 +239,12 @@ function getNestedTables(table) {
 	return tables;
 }
 /**
-* Get plain text from entire document body
-*/
-function getDocumentText(body) {
-	const lines = [];
-	for (const block of body.content) if (block.type === "paragraph") lines.push(getParagraphText(block));
-	else if (block.type === "table") lines.push(getTableText(block));
-	else if (block.type === "blockSdt" || block.type === "blockCustomXml") lines.push(getTextFromBlocks(block.content));
-	return lines.join("\n");
-}
-const getTextFromBlocks = (blocks) => blocks.flatMap((block) => {
-	if (block.type === "paragraph") return [getParagraphText(block)];
-	if (block.type === "table") return [getTableText(block)];
-	return block.type === "blockSdt" || block.type === "blockCustomXml" ? [getTextFromBlocks(block.content)] : [];
-}).join("\n");
-/**
-* Get plain text from a table
-*/
-function getTableText(table) {
-	const lines = [];
-	for (const row of table.rows) {
-		const rowTexts = [];
-		for (const cell of row.cells) {
-			const cellTexts = [];
-			for (const content of cell.content) if (content.type === "paragraph") cellTexts.push(getParagraphText(content));
-			else if (content.type === "table") cellTexts.push(getTableText(content));
-			else if (content.type === "blockSdt" || content.type === "blockCustomXml") cellTexts.push(getTextFromBlocks(content.content));
-			rowTexts.push(cellTexts.join("\n"));
-		}
-		lines.push(rowTexts.join("	"));
-	}
-	return lines.join("\n");
-}
-/**
 * Count total paragraphs in document
 */
 function getParagraphCount(body) {
 	return getAllParagraphs(body).length;
 }
 /**
-* Count total words in document (approximate)
-*/
-function getWordCount(body) {
-	const words = getDocumentText(body).trim().split(/\s+/u);
-	return words.length > 0 && words[0] !== "" ? words.length : 0;
-}
-/**
-* Count total characters in document
-*/
-function getCharacterCount(body) {
-	return getDocumentText(body).length;
-}
-/**
 * Get section count
 */
 function getSectionCount(body) {
@@ -303,4 +257,4 @@ function hasTemplateVariables(body) {
 	return extractAllTemplateVariables(body.content).length > 0;
 }
 //#endregion
-export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getCharacterCount, getDocumentText, getParagraphCount, getSectionCount, getWordCount, hasTemplateVariables, parseDocumentBody, parseDocumentBodyTree };
+export { extractAllTemplateVariables, extractTemplateVariables, getAllParagraphs, getAllTables, getParagraphCount, getSectionCount, hasTemplateVariables, parseDocumentBody, parseDocumentBodyTree };

package/dist/docx/ensureParaIds.js

@@ -6,6 +6,7 @@ import { scanStreamingXmlElements } from "./streamingXmlParser.js";
 import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, WORDPROCESSINGML_NAMESPACE_URIS, getAttribute, getChildElements, getLocalName, getNamespaceUri, parseXmlDocument, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
+import { writeZipPart } from "@stll/docx-core/zip";
 import JSZip from "jszip";
 //#region src/docx/ensureParaIds.ts
 /**
@@ -386,10 +387,15 @@ const ensureParaIdsInternal = async (docx, options) => {
 	for (const [partPath, content] of updates) {
 		const sourceEntry = zip.file(partPath);
 		if (sourceEntry === null) throw createEnsureParaIdsError(`Package part disappeared during normalization: ${partPath}`);
-		zip.file(partPath, content, {
-			compression: "DEFLATE",
-			compressionOptions: { level: 6 },
-			date: sourceEntry.date
+		writeZipPart({
+			zip,
+			path: partPath,
+			data: content,
+			options: {
+				compression: "DEFLATE",
+				compressionOptions: { level: 6 },
+				date: sourceEntry.date
+			}
 		});
 	}
 	return {

package/dist/docx/fieldParser.js

@@ -231,8 +231,20 @@ function finalizeComplexField(ctx) {
 * @returns The display text
 */
 function getFieldDisplayValue(field) {
-	if (field.type === "simpleField") return field.content.filter((c) => "content" in c).map((run) => getRunText(run)).join("");
-	return field.fieldResult.map((run) => getRunText(run)).join("");
+	const displayText = (content) => content.map((child) => {
+		switch (child.type) {
+			case "run": return getRunText(child);
+			case "hyperlink": return displayText(child.children);
+			case "inlineWrapper":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return displayText(child.content);
+			case "preservedInline": return child.text;
+			default: return "";
+		}
+	}).join("");
+	return displayText(field.type === "simpleField" ? field.content : field.fieldResult);
 }
 /**
 * Helper to get text from a run (simplified)

package/dist/docx/footnoteParser.d.ts

@@ -67,16 +67,6 @@ declare function parseFootnotes(footnotesXml: string | null, styles?: StyleMap |
  * @returns EndnoteMap with all endnotes
  */
 declare function parseEndnotes(endnotesXml: string | null, 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, context?: ParseContext, previews?: PreviewLedger): EndnoteMap;
-/**
- * Get plain text content of a footnote.
- *
- * Uses the accepted tracked-change view and recurses through every note block.
- */
-declare function getFootnoteText(footnote: document_d_exports.Footnote): string;
-/**
- * Get plain text content of an endnote.
- */
-declare function getEndnoteText(endnote: document_d_exports.Endnote): string;
 /**
  * Check if a footnote is a separator (not regular content)
  */
@@ -102,4 +92,4 @@ declare function mergeFootnoteMaps(...maps: FootnoteMap[]): FootnoteMap;
  */
 declare function mergeEndnoteMaps(...maps: EndnoteMap[]): EndnoteMap;
 //#endregion
-export { EndnoteMap, FootnoteMap, createEmptyEndnoteMap, createEmptyFootnoteMap, getEndnoteText, getFootnoteText, isSeparatorEndnote, isSeparatorFootnote, mergeEndnoteMaps, mergeFootnoteMaps, parseEndnoteProperties, parseEndnotes, parseFootnoteProperties, parseFootnotes };
+export { EndnoteMap, FootnoteMap, createEmptyEndnoteMap, createEmptyFootnoteMap, isSeparatorEndnote, isSeparatorFootnote, mergeEndnoteMaps, mergeFootnoteMaps, parseEndnoteProperties, parseEndnotes, parseFootnoteProperties, parseFootnotes };

package/dist/docx/footnoteParser.js

@@ -1,4 +1,3 @@
-import { blockPlainText } from "./blockPlainText.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
@@ -196,20 +195,6 @@ function createEndnoteMap(byId, endnotes) {
 	};
 }
 /**
-* Get plain text content of a footnote.
-*
-* Uses the accepted tracked-change view and recurses through every note block.
-*/
-function getFootnoteText(footnote) {
-	return blockPlainText(footnote.content);
-}
-/**
-* Get plain text content of an endnote.
-*/
-function getEndnoteText(endnote) {
-	return blockPlainText(endnote.content);
-}
-/**
 * Check if a footnote is a separator (not regular content)
 */
 function isSeparatorFootnote(footnote) {
@@ -258,4 +243,4 @@ function mergeEndnoteMaps(...maps) {
 	return createEndnoteMap(byId, endnotes);
 }
 //#endregion
-export { createEmptyEndnoteMap, createEmptyFootnoteMap, getEndnoteText, getFootnoteText, isSeparatorEndnote, isSeparatorFootnote, mergeEndnoteMaps, mergeFootnoteMaps, parseEndnoteProperties, parseEndnotes, parseFootnoteProperties, parseFootnotes };
+export { createEmptyEndnoteMap, createEmptyFootnoteMap, isSeparatorEndnote, isSeparatorFootnote, mergeEndnoteMaps, mergeFootnoteMaps, parseEndnoteProperties, parseEndnotes, parseFootnoteProperties, parseFootnotes };

package/dist/docx/headerFooterParser.d.ts

@@ -81,14 +81,6 @@ declare function createEmptyHeaderFooterMap(): HeaderFooterMap;
  * @returns HeaderFooterMap with all parsed headers/footers
  */
 declare function buildHeaderFooterMap(references: (document_d_exports.HeaderReference | document_d_exports.FooterReference)[], xmlContents: Map<string, string>, isHeader: boolean, 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): HeaderFooterMap;
-/**
- * Get plain text content of a header/footer.
- *
- * Shares one walk with the note stories: this used to read only text runs, so a
- * header's fields, hyperlinks, tabs and breaks were silently absent from its
- * text while the same paragraph in a footnote read in full.
- */
-declare function getHeaderFooterText(hf: document_d_exports.HeaderFooter): string;
 /**
  * Check if header/footer is empty (no content)
  */
@@ -129,4 +121,4 @@ declare function hasImages(hf: document_d_exports.HeaderFooter): boolean;
  */
 declare function hasTables(hf: document_d_exports.HeaderFooter): boolean;
 //#endregion
-export { HeaderFooterMap, buildHeaderFooterMap, createEmptyHeaderFooterMap, getFooterForPage, getHeaderFooterText, getHeaderForPage, hasImages, hasPageNumberField, hasTables, headerFooterMapToTypeMap, isEmptyHeaderFooter, parseFooter, parseFooterReference, parseFooterReferences, parseHeader, parseHeaderFooter, parseHeaderReference, parseHeaderReferences };
+export { HeaderFooterMap, buildHeaderFooterMap, createEmptyHeaderFooterMap, getFooterForPage, getHeaderForPage, hasImages, hasPageNumberField, hasTables, headerFooterMapToTypeMap, isEmptyHeaderFooter, parseFooter, parseFooterReference, parseFooterReferences, parseHeader, parseHeaderFooter, parseHeaderReference, parseHeaderReferences };

package/dist/docx/headerFooterParser.js

@@ -1,5 +1,4 @@
 import { parseBlockContent } from "./blockContentParser.js";
-import { blockPlainText } from "./blockPlainText.js";
 import { parseFooterReference, parseFooterReferences, parseHeaderReference, parseHeaderReferences } from "./headerFooterRefParser.js";
 import { assignHeaderFooterVerbatimXml } from "./headerFooterVerbatim.js";
 import { cloneParagraphWithPropertySource } from "./paragraphPropertySource.js";
@@ -150,16 +149,6 @@ function buildHeaderFooterMap(references, xmlContents, isHeader, styles = null,
 	return createHeaderFooterMap(byId);
 }
 /**
-* Get plain text content of a header/footer.
-*
-* Shares one walk with the note stories: this used to read only text runs, so a
-* header's fields, hyperlinks, tabs and breaks were silently absent from its
-* text while the same paragraph in a footnote read in full.
-*/
-function getHeaderFooterText(hf) {
-	return blockPlainText(hf.content);
-}
-/**
 * Check if header/footer is empty (no content)
 */
 function isEmptyHeaderFooter(hf) {
@@ -254,4 +243,4 @@ function hasTables(hf) {
 	return false;
 }
 //#endregion
-export { buildHeaderFooterMap, createEmptyHeaderFooterMap, getFooterForPage, getHeaderFooterText, getHeaderForPage, hasImages, hasPageNumberField, hasTables, headerFooterMapToTypeMap, isEmptyHeaderFooter, parseFooter, parseFooterReference, parseFooterReferences, parseHeader, parseHeaderFooter, parseHeaderReference, parseHeaderReferences };
+export { buildHeaderFooterMap, createEmptyHeaderFooterMap, getFooterForPage, getHeaderForPage, hasImages, hasPageNumberField, hasTables, headerFooterMapToTypeMap, isEmptyHeaderFooter, parseFooter, parseFooterReference, parseFooterReferences, parseHeader, parseHeaderFooter, parseHeaderReference, parseHeaderReferences };

package/dist/docx/headerFooterVerbatim.d.ts

@@ -9,6 +9,13 @@ type HeaderFooterSourceBaseline = {
   content: readonly document_d_exports.BlockContent[];
 };
 declare const captureHeaderFooterPackageBaselines: (document: document_d_exports.Document) => void;
+/**
+ * Transfer body, header and footer capture handles across a trusted
+ * document graph clone. `structuredClone` drops symbol-keyed properties, so a
+ * clone would otherwise read an edited part as uncaptured ("missing") rather
+ * than as a mismatch against its source.
+ */
+declare const copyHeaderFooterBaselineHandles: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
 /** Transfer the parsed package registry only across a trusted document graph clone. */
 declare const copyHeaderFooterPackageBaselines: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
 declare const getHeaderFooterSourceBaseline: (hf: document_d_exports.HeaderFooter, originalBuffer?: ArrayBuffer) => HeaderFooterSourceBaseline;
@@ -18,5 +25,23 @@ declare const canReplayHeaderFooterVerbatim: (hf: document_d_exports.HeaderFoote
 declare const assignHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter, xml: string) => void;
 declare const refreshHeaderFooterVerbatimFingerprint: (hf: document_d_exports.HeaderFooter) => void;
 declare const clearHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => void;
+/** Capture the body in the same trusted package registry as secondary stories. */
+declare const captureDocumentSourceBaseline: (document: document_d_exports.Document, xml: string) => void;
+declare const getDocumentSourceBaseline: (document: document_d_exports.Document) => {
+  type: "missing";
+} | {
+  type: "mismatch";
+} | {
+  type: "captured";
+  body: document_d_exports.Document["package"]["document"];
+  xml: string;
+  fingerprint: string;
+  resourceStyles: document_d_exports.Document["package"]["styles"];
+  resourceRelationships: document_d_exports.Document["package"]["relationships"];
+  resourceMedia: ReadonlyMap<string, {
+    data: ArrayBuffer;
+    mimeType: string;
+  }>;
+};
 //#endregion
-export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterPackageBaselines, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };
+export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };

package/dist/docx/headerFooterVerbatim.js

@@ -15,7 +15,7 @@ const readFingerprint = (hf) => {
 	});
 	return value;
 };
-const BASELINE_HANDLE = Symbol("header-footer-source-baseline");
+const BASELINE_HANDLE = Symbol("package-source-baseline");
 const contentBaselines = /* @__PURE__ */ new WeakMap();
 const captureContentBaseline = (hf) => {
 	const fingerprint = hf.verbatimFingerprint;
@@ -23,6 +23,7 @@ const captureContentBaseline = (hf) => {
 	const handle = {};
 	const content = structuredClone(hf.content);
 	contentBaselines.set(handle, {
+		type: "headerFooter",
 		fingerprint,
 		xml: hf.verbatimXml,
 		contentFingerprint: canonicalJson(content),
@@ -46,6 +47,33 @@ const captureHeaderFooterPackageBaselines = (document) => {
 	}
 	packageBaselines.set(document.originalBuffer, handles);
 };
+/**
+* Transfer body, header and footer capture handles across a trusted
+* document graph clone. `structuredClone` drops symbol-keyed properties, so a
+* clone would otherwise read an edited part as uncaptured ("missing") rather
+* than as a mismatch against its source.
+*/
+const copyHeaderFooterBaselineHandles = (target, source) => {
+	const sourceBody = source.package.document;
+	if (BASELINE_HANDLE in sourceBody) Object.defineProperty(target.package.document, BASELINE_HANDLE, {
+		value: sourceBody[BASELINE_HANDLE],
+		enumerable: true,
+		configurable: true
+	});
+	for (const kind of ["headers", "footers"]) {
+		const targets = target.package[kind];
+		for (const [rId, sourcePart] of source.package[kind] ?? []) {
+			if (!(BASELINE_HANDLE in sourcePart)) continue;
+			const targetPart = targets?.get(rId);
+			if (!targetPart) continue;
+			Object.defineProperty(targetPart, BASELINE_HANDLE, {
+				value: sourcePart[BASELINE_HANDLE],
+				enumerable: true,
+				configurable: true
+			});
+		}
+	}
+};
 /** Transfer the parsed package registry only across a trusted document graph clone. */
 const copyHeaderFooterPackageBaselines = (target, source) => {
 	if (!target.originalBuffer || !source.originalBuffer) return;
@@ -59,7 +87,7 @@ const getHeaderFooterSourceBaseline = (hf, originalBuffer) => {
 	if (handle === void 0 && !(BASELINE_HANDLE in hf)) return { type: "missing" };
 	if (typeof handle !== "object" || handle === null) return { type: "mismatch" };
 	const baseline = contentBaselines.get(handle);
-	if (!baseline || baseline.fingerprint !== hf.verbatimFingerprint || baseline.xml !== hf.verbatimXml || baseline.contentFingerprint !== canonicalJson(baseline.content)) return { type: "mismatch" };
+	if (!baseline || baseline.type !== "headerFooter" || baseline.fingerprint !== hf.verbatimFingerprint || baseline.xml !== hf.verbatimXml || baseline.contentFingerprint !== canonicalJson(baseline.content)) return { type: "mismatch" };
 	return {
 		type: "captured",
 		content: baseline.content
@@ -119,5 +147,55 @@ const clearHeaderFooterVerbatimXml = (hf) => {
 	delete ext.verbatimFingerprint;
 	Reflect.deleteProperty(hf, BASELINE_HANDLE);
 };
+/** Capture the body in the same trusted package registry as secondary stories. */
+const captureDocumentSourceBaseline = (document, xml) => {
+	const body = structuredClone(document.package.document);
+	const handle = {};
+	contentBaselines.set(handle, {
+		type: "body",
+		fingerprint: { type: "pending" },
+		xml,
+		body,
+		resourceStyles: structuredClone(document.package.styles),
+		resourceRelationships: structuredClone(document.package.relationships),
+		resourceMedia: new Map([...document.package.media ?? []].map(([path, media]) => [path, {
+			data: media.data,
+			mimeType: media.mimeType
+		}]))
+	});
+	Object.defineProperty(document.package.document, BASELINE_HANDLE, {
+		value: handle,
+		enumerable: true,
+		configurable: true
+	});
+	if (document.originalBuffer) {
+		const registry = packageBaselines.get(document.originalBuffer) ?? /* @__PURE__ */ new Map();
+		registry.set("word/document.xml", /* @__PURE__ */ new Map([["body", handle]]));
+		packageBaselines.set(document.originalBuffer, registry);
+	}
+};
+const getDocumentSourceBaseline = (document) => {
+	const body = document.package.document;
+	const handle = BASELINE_HANDLE in body ? body[BASELINE_HANDLE] : document.originalBuffer && packageBaselines.get(document.originalBuffer)?.get("word/document.xml")?.get("body");
+	if (handle === void 0) return { type: "missing" };
+	if (typeof handle !== "object" || handle === null) return { type: "mismatch" };
+	const baseline = contentBaselines.get(handle);
+	if (!baseline || baseline.type !== "body") return { type: "mismatch" };
+	const fingerprint = JSON.stringify(baseline.body);
+	if (baseline.fingerprint.type === "pending") baseline.fingerprint = {
+		type: "captured",
+		value: fingerprint
+	};
+	if (baseline.fingerprint.value !== fingerprint) return { type: "mismatch" };
+	return {
+		type: "captured",
+		body: baseline.body,
+		xml: baseline.xml,
+		fingerprint,
+		resourceStyles: baseline.resourceStyles,
+		resourceRelationships: baseline.resourceRelationships,
+		resourceMedia: baseline.resourceMedia
+	};
+};
 //#endregion
-export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterPackageBaselines, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };
+export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };

package/dist/docx/hyperlinkParser.d.ts

@@ -86,7 +86,7 @@ declare const HYPERLINK_CHILD_HANDLERS: {
   readonly permEnd: "capture";
   readonly permStart: "capture";
   readonly proofErr: "capture";
-  readonly sdt: "capture";
+  readonly sdt: (child: XmlElement, { push }: HyperlinkChildContext) => void;
   readonly subDoc: "capture";
 };
 /**

package/dist/docx/hyperlinkParser.js

@@ -1,6 +1,7 @@
 import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
 import { inlineWrapperOf } from "./inlineWrapperParser.js";
+import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
 import { preserveInlineChild, preservedInlineCapture } from "./preservedRunContent.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "./relsParser.js";
@@ -9,6 +10,22 @@ import { runHoldsPayload } from "./runPayload.js";
 import { getAttribute, mergeXmlnsDeclarations, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
 //#region src/docx/hyperlinkParser.ts
 /**
+* Hyperlink Parser - Parse hyperlinks (w:hyperlink) with URL resolution
+*
+* OOXML Reference:
+* - Hyperlink element: w:hyperlink
+* - Attributes:
+*   - r:id - Relationship ID for external link (resolves via .rels)
+*   - w:anchor - Internal bookmark name
+*   - w:tooltip - Tooltip/title text
+*   - w:tgtFrame - Target frame (_blank, _self, etc.)
+*   - w:history - Whether to add to history
+*   - w:docLocation - Location within a document
+*
+* External links use r:id to reference a relationship in document.xml.rels
+* Internal links use w:anchor to reference a bookmark in the same document
+*/
+/**
 * Parse bookmark start (w:bookmarkStart)
 *
 * Used for internal hyperlink targets within the document.
@@ -169,7 +186,9 @@ const HYPERLINK_CHILD_HANDLERS = {
 	permEnd: CAPTURE,
 	permStart: CAPTURE,
 	proofErr: CAPTURE,
-	sdt: CAPTURE,
+	sdt: (child, { push }) => {
+		push(preserveLinkedSdt(child));
+	},
 	subDoc: CAPTURE
 };
 const LINKED_SMART_TAG_PROPERTIES_OWNER = ownedElsewhere({

package/dist/docx/imageParser.d.ts

@@ -22,6 +22,18 @@ declare function resolveImageData(rId: string | undefined, rels: document_d_expo
   mimeType?: string;
   filename?: string;
 };
+type ImageDerivedFactsOptions = {
+  id: string | undefined;
+  pictureNames: NonNullable<document_d_exports.Image["pictureNames"]>;
+  imageData: ReturnType<typeof resolveImageData>;
+};
+/** Facts the parser obtains from exported drawing markup and image relationships. */
+declare const imageDerivedFactsOf: ({ id, pictureNames, imageData }: ImageDerivedFactsOptions) => {
+  filename?: string;
+  mimeType?: string;
+  pictureNames?: import("@stll/docx-core/model").NonVisualDrawingNames;
+  id?: string;
+};
 /**
  * Parse a w:drawing element
  *
@@ -97,4 +109,4 @@ declare function getWrapDistancesPx(image: document_d_exports.Image): {
  */
 declare function needsTextWrapping(image: document_d_exports.Image): boolean;
 //#endregion
-export { DECORATIVE_EXTENSION_URI, DECORATIVE_NAMESPACE, getImageDimensionsPx, getImageHeightPx, getImageWidthPx, getWrapDistancesPx, hasAltText, isBehindText, isDecorativeImage, isFloatingImage, isInFrontOfText, isInlineImage, needsTextWrapping, parseDrawing, parseImage, resolveImageData };
+export { DECORATIVE_EXTENSION_URI, DECORATIVE_NAMESPACE, getImageDimensionsPx, getImageHeightPx, getImageWidthPx, getWrapDistancesPx, hasAltText, imageDerivedFactsOf, isBehindText, isDecorativeImage, isFloatingImage, isInFrontOfText, isInlineImage, needsTextWrapping, parseDrawing, parseImage, resolveImageData };

package/dist/docx/imageParser.js

@@ -10,7 +10,7 @@ import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "./relsParser.js
 import { isTextBoxDrawing } from "./textBoxParser.js";
 import { percentageSpelling } from "./transitionalSpelling.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
-import { findByFullName, findChildByNamespaceUri, findChildrenByNamespaceUri, getAttribute, getChildElements, getLocalName, getNamespaceUri, parseNumericAttribute, parseOnOffAttribute, parseOnOffValue } from "./xmlParser.js";
+import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, findAttributeByNamespaceUri, findByFullName, findChildByNamespaceUri, findChildrenByNamespaceUri, getAttribute, getChildElements, getLocalName, getNamespaceUri, parseNumericAttribute, parseOnOffAttribute, parseOnOffValue } from "./xmlParser.js";
 import { relationshipIdOf } from "@stll/docx-core/model";
 //#region src/docx/imageParser.ts
 /**
@@ -129,7 +129,7 @@ const parseDocPropsExtensions = (docPr) => {
 const parseDocPrLink = (docPr, localName) => {
 	const element = findChildByNamespaceUri(docPr, DRAWINGML_NAMESPACE_URIS, localName);
 	if (!element) return;
-	const rId = getAttribute(element, "r", "id");
+	const rId = findAttributeByNamespaceUri(element, OFFICE_RELATIONSHIP_NAMESPACE_URIS, "id")?.value;
 	return {
 		xml: captureVerbatimXml(element),
 		...rId == null ? {} : { rId }
@@ -382,6 +382,13 @@ function resolveImageData(rId, rels, media) {
 		...filename !== void 0 ? { filename } : {}
 	};
 }
+/** Facts the parser obtains from exported drawing markup and image relationships. */
+const imageDerivedFactsOf = ({ id, pictureNames, imageData }) => ({
+	...id ? { id } : {},
+	...Object.keys(pictureNames).length > 0 ? { pictureNames } : {},
+	...imageData.mimeType ? { mimeType: imageData.mimeType } : {},
+	...imageData.filename ? { filename: imageData.filename } : {}
+});
 /**
 * Parse a wp:inline element (inline image)
 *
@@ -411,18 +418,19 @@ function parseInline(inlineEl, rels, media) {
 		size,
 		wrap
 	};
-	if (props.id) image.id = props.id;
+	Object.assign(image, imageDerivedFactsOf({
+		id: props.id,
+		pictureNames,
+		imageData
+	}));
 	if (props.name !== void 0) image.docPrName = props.name;
 	if (props.alt !== void 0) image.alt = props.alt;
 	if (props.title !== void 0) image.title = props.title;
-	if (Object.keys(pictureNames).length > 0) image.pictureNames = pictureNames;
 	if (props.decorative !== void 0) image.decorative = props.decorative;
 	if (props.hidden !== void 0) image.hidden = props.hidden;
 	if (props.docPrExtensions !== void 0) image.docPrExtensions = props.docPrExtensions;
 	const safeSrc = sanitizeImageSrc(imageData.src);
 	if (safeSrc) image.src = safeSrc;
-	if (imageData.mimeType) image.mimeType = imageData.mimeType;
-	if (imageData.filename) image.filename = imageData.filename;
 	if (padding) image.padding = padding;
 	if (transform) image.transform = transform;
 	if (crop) image.crop = crop;
@@ -492,18 +500,19 @@ function parseAnchor(anchorEl, rels, media) {
 		size,
 		wrap
 	};
-	if (props.id) image.id = props.id;
+	Object.assign(image, imageDerivedFactsOf({
+		id: props.id,
+		pictureNames,
+		imageData
+	}));
 	if (props.name !== void 0) image.docPrName = props.name;
 	if (props.alt !== void 0) image.alt = props.alt;
 	if (props.title !== void 0) image.title = props.title;
-	if (Object.keys(pictureNames).length > 0) image.pictureNames = pictureNames;
 	if (props.decorative !== void 0) image.decorative = props.decorative;
 	if (props.hidden !== void 0) image.hidden = props.hidden;
 	if (props.docPrExtensions !== void 0) image.docPrExtensions = props.docPrExtensions;
 	const safeSrc = sanitizeImageSrc(imageData.src);
 	if (safeSrc) image.src = safeSrc;
-	if (imageData.mimeType) image.mimeType = imageData.mimeType;
-	if (imageData.filename) image.filename = imageData.filename;
 	if (position) image.position = position;
 	if (padding) image.padding = padding;
 	if (transform) image.transform = transform;
@@ -628,4 +637,4 @@ function needsTextWrapping(image) {
 	].includes(image.wrap.type);
 }
 //#endregion
-export { DECORATIVE_EXTENSION_URI, DECORATIVE_NAMESPACE, getImageDimensionsPx, getImageHeightPx, getImageWidthPx, getWrapDistancesPx, hasAltText, isBehindText, isDecorativeImage, isFloatingImage, isInFrontOfText, isInlineImage, needsTextWrapping, parseDrawing, parseImage, resolveImageData };
+export { DECORATIVE_EXTENSION_URI, DECORATIVE_NAMESPACE, getImageDimensionsPx, getImageHeightPx, getImageWidthPx, getWrapDistancesPx, hasAltText, imageDerivedFactsOf, isBehindText, isDecorativeImage, isFloatingImage, isInFrontOfText, isInlineImage, needsTextWrapping, parseDrawing, parseImage, resolveImageData };

package/dist/docx/inlineWrapperContent.d.ts

@@ -138,14 +138,14 @@ declare const SIMPLE_FIELD_CONTENT: {
   readonly commentRangeStart: false;
   readonly commentReference: false;
   readonly complexField: false;
-  readonly deletion: false;
+  readonly deletion: true;
   readonly inlineSdt: false;
-  readonly insertion: false;
+  readonly insertion: true;
   readonly mathEquation: false;
-  readonly moveFrom: false;
+  readonly moveFrom: true;
   readonly moveFromRangeEnd: false;
   readonly moveFromRangeStart: false;
-  readonly moveTo: false;
+  readonly moveTo: true;
   readonly moveToRangeEnd: false;
   readonly moveToRangeStart: false;
   readonly simpleField: false;

package/dist/docx/inlineWrapperContent.js

@@ -137,14 +137,14 @@ const SIMPLE_FIELD_CONTENT = {
 	commentRangeStart: false,
 	commentReference: false,
 	complexField: false,
-	deletion: false,
+	deletion: true,
 	inlineSdt: false,
-	insertion: false,
+	insertion: true,
 	mathEquation: false,
-	moveFrom: false,
+	moveFrom: true,
 	moveFromRangeEnd: false,
 	moveFromRangeStart: false,
-	moveTo: false,
+	moveTo: true,
 	moveToRangeEnd: false,
 	moveToRangeStart: false,
 	simpleField: false

package/dist/docx/linkedSdtPreservation.d.ts

@@ -0,0 +1,10 @@
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/linkedSdtPreservation.d.ts
+declare const UnrepresentableLinkedSdtRevisionError_base: import("better-result").TaggedErrorClass<"UnrepresentableLinkedSdtRevisionError">;
+declare class UnrepresentableLinkedSdtRevisionError extends UnrepresentableLinkedSdtRevisionError_base<{
+  message: string;
+}> {}
+/** Capture only the unsupported hyperlink child, never its enclosing revision. */
+declare const preserveLinkedSdt: (root: XmlElement) => import("@stll/docx-core/model").PreservedInline;
+//#endregion
+export { UnrepresentableLinkedSdtRevisionError, preserveLinkedSdt };

package/dist/docx/linkedSdtPreservation.js

@@ -0,0 +1,37 @@
+import { preserveInlineChild } from "./preservedRunContent.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, getChildElements, getLocalName } from "./xmlParser.js";
+import { TaggedError } from "better-result";
+//#region src/docx/linkedSdtPreservation.ts
+var UnrepresentableLinkedSdtRevisionError = class extends TaggedError("UnrepresentableLinkedSdtRevisionError") {};
+/** Capture only the unsupported hyperlink child, never its enclosing revision. */
+const preserveLinkedSdt = (root) => {
+	const pending = getChildElements(root);
+	while (pending.length > 0) {
+		const node = pending.pop();
+		if (!node) continue;
+		const wordprocessing = WORDPROCESSINGML_NAMESPACE_URIS.has(node.namespaceUri ?? "");
+		const name = getLocalName(node.name);
+		if (wordprocessing && [
+			"ins",
+			"del",
+			"moveFrom",
+			"moveTo",
+			"rPrChange",
+			"pPrChange",
+			"sectPrChange",
+			"tblPrChange",
+			"tblGridChange",
+			"trPrChange",
+			"tblPrExChange",
+			"tcPrChange",
+			"cellIns",
+			"cellDel",
+			"cellMerge",
+			"numberingChange"
+		].includes(name)) throw new UnrepresentableLinkedSdtRevisionError({ message: "A content control under a hyperlink cannot preserve nested revisions as opaque XML." });
+		pending.push(...getChildElements(node));
+	}
+	return preserveInlineChild(root);
+};
+//#endregion
+export { UnrepresentableLinkedSdtRevisionError, preserveLinkedSdt };

package/dist/docx/metadataPrivacy.js

@@ -1,6 +1,7 @@
 import { countCentralDirectoryRecords, createInflationBudget, inflateEntryWithinLimits } from "./archiveInflation.js";
 import { elementToXml, getLocalName, parseXmlDocument } from "./xmlParser.js";
 import { TaggedError } from "better-result";
+import { writeZipPart } from "@stll/docx-core/zip";
 import JSZip from "jszip";
 //#region src/docx/metadataPrivacy.ts
 const FOLIO_DOCUMENT_METADATA_PROPERTIES = Object.freeze([
@@ -152,7 +153,11 @@ const rewriteDocxMetadataPrivacy = async (buffer, { transforms }) => {
 			removedMetadataProperties: []
 		}
 	};
-	zip.file(coreProperties.name, rewritten.xml);
+	writeZipPart({
+		zip,
+		path: coreProperties.name,
+		data: rewritten.xml
+	});
 	return {
 		buffer: await zip.generateAsync({
 			type: "arraybuffer",