@stll/folio-core 0.56.0 → 0.57.0

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/paragraphParser.js

@@ -7,8 +7,9 @@ import { parseFieldType } from "./fieldParser.js";
 import { fieldStateOf, parseFieldState } from "./fieldState.js";
 import { foldListNumberFields, isListNumberField, isListNumberGapMarker, isTabOnlyRun } from "./foldedListNumberFields.js";
 import { HYPERLINK_CHILD_HANDLERS, parseHyperlink as parseHyperlink$1, parseHyperlinkShell } from "./hyperlinkParser.js";
-import { isHyperlinkContent, isInlineSdtContent, isTrackedChangeWrapperChild } from "./inlineWrapperContent.js";
+import { isHyperlinkContent, isInlineSdtContent, isSimpleFieldContent, isTrackedChangeWrapperChild } from "./inlineWrapperContent.js";
 import { inlineWrapperOf } from "./inlineWrapperParser.js";
+import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
 import { parseMarkupRangeMarker, parseMoveBookmarkMarker } from "./markupRangeMarker.js";
 import { counterFormatOf, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot } from "./numberingParser.js";
 import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
@@ -357,15 +358,14 @@ const mathContentOf = (child) => {
 	if (plainText) equation.plainText = plainText;
 	return equation;
 };
-const hoistRevision = (wrapper) => (child, { styles, theme, rels, media, previews, inScopeXmlns, items, linkOver }) => {
-	const wrapped = parseParagraphContents(child, styles, theme, null, rels, media, previews, wrapper === "deletion" || wrapper === "moveFrom" ? "deletion" : "default", inScopeXmlns);
+/** Preserve a link across nested revision owners, rather than dropping its shell. */
+const linkedRevisionContent = (wrapped, linkOver) => {
 	const content = [];
 	let linked = [];
 	const flushLinked = () => {
-		if (linked.length > 0) {
-			content.push(linkOver(linked));
-			linked = [];
-		}
+		if (linked.length === 0) return;
+		content.push(linkOver(linked));
+		linked = [];
 	};
 	for (const item of wrapped) {
 		if (isHyperlinkContent(item)) {
@@ -373,9 +373,28 @@ const hoistRevision = (wrapper) => (child, { styles, theme, rels, media, preview
 			continue;
 		}
 		flushLinked();
-		if (isTrackedChangeWrapperChild(item)) content.push(item);
+		switch (item.type) {
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo":
+				content.push({
+					...item,
+					content: linkedRevisionContent(item.content, linkOver)
+				});
+				break;
+			case "inlineSdt": return panic("An SDT under a hyperlink must retain its opaque source span");
+			default:
+				if (isTrackedChangeWrapperChild(item)) content.push(item);
+				break;
+		}
 	}
 	flushLinked();
+	return content;
+};
+const hoistRevision = (wrapper) => (child, { styles, theme, rels, media, previews, inScopeXmlns, items, linkOver }) => {
+	const wrapped = parseParagraphContents(child, styles, theme, null, rels, media, previews, wrapper === "deletion" || wrapper === "moveFrom" ? "deletion" : "default", inScopeXmlns, "hyperlink");
+	const content = linkedRevisionContent(wrapped, linkOver);
 	items.push({
 		type: "hoistedRevision",
 		wrapper,
@@ -503,6 +522,27 @@ function parseSimpleField(node, styles, theme, rels, media, rootXmlns, previews)
 const fieldInlineWrapper = (element) => (child, context) => {
 	context.push(parseFieldInlineWrapper(element, child, context));
 };
+/** Read a field's revision with the same ownership rules as a paragraph revision. */
+const fieldTrackedChange = (type) => (child, { push, styles, theme, rels, media, previews, inScopeXmlns }) => {
+	const parsedContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, type === "deletion" || type === "moveFrom" ? "deletion" : "default", inScopeXmlns);
+	if (parsedContent.length === 0 || !parsedContent.every(isTrackedChangeWrapperChild)) {
+		push(preserveInlineChild(child));
+		return;
+	}
+	const contents = [];
+	pushTrackedChangeWrapper({
+		contents,
+		type,
+		info: parseTrackedChangeInfo(child),
+		resolutionJoins: parseResolutionJoins(child),
+		content: parsedContent,
+		preserveEmpty: true
+	});
+	for (const content of contents) {
+		if (!isSimpleFieldContent(content)) panic("A parsed field revision must be a field child");
+		push(content);
+	}
+};
 /**
 * What a `w:fldSimple` does with every child its content model declares.
 *
@@ -516,7 +556,10 @@ const SIMPLE_FIELD_CHILD_HANDLERS = {
 		push(parseRun(child, styles, theme, rels, media, inScopeXmlns, previews));
 	},
 	hyperlink: (child, { push, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		push(parseHyperlink(child, rels, styles, theme, media, inScopeXmlns, previews));
+		for (const content of parseHyperlinkParagraphContents(child, rels, styles, theme, media, inScopeXmlns, previews)) {
+			if (!isSimpleFieldContent(content)) panic("A parsed field hyperlink must be a field child");
+			push(content);
+		}
 	},
 	bdo: fieldInlineWrapper("bdo"),
 	dir: fieldInlineWrapper("dir"),
@@ -534,16 +577,16 @@ const SIMPLE_FIELD_CHILD_HANDLERS = {
 	customXmlMoveFromRangeStart: CAPTURE,
 	customXmlMoveToRangeEnd: CAPTURE,
 	customXmlMoveToRangeStart: CAPTURE,
-	del: CAPTURE,
+	del: fieldTrackedChange("deletion"),
 	fldData: CAPTURE,
 	fldSimple: (child, { push }) => {
 		push(preserveInlineChild(child));
 	},
-	ins: CAPTURE,
-	moveFrom: CAPTURE,
+	ins: fieldTrackedChange("insertion"),
+	moveFrom: fieldTrackedChange("moveFrom"),
 	moveFromRangeEnd: CAPTURE,
 	moveFromRangeStart: CAPTURE,
-	moveTo: CAPTURE,
+	moveTo: fieldTrackedChange("moveTo"),
 	moveToRangeEnd: CAPTURE,
 	moveToRangeStart: CAPTURE,
 	permEnd: CAPTURE,
@@ -819,7 +862,7 @@ const assembledFieldBeginsOf = (container) => {
 		if (hasBegin) open.push(child);
 		if (hasEnd && open.length > 0) {
 			const closed = open.pop();
-			if (closed !== void 0 && open.length === 0) assembled.add(closed);
+			if (closed !== void 0 && open.length === 0 && !findWordprocessingChild(beginFieldCharOf(closed), "fldData")) assembled.add(closed);
 		}
 	}
 	return assembled;
@@ -830,17 +873,29 @@ const assembledFieldBeginsOf = (container) => {
 * recursion is this same walk and `inlineWrapperOf` reads what the element
 * adds.
 */
-const paragraphInlineWrapper = (element) => (child, { styles, theme, rels, media, previews, trackedContext, inScopeXmlns, contents }) => {
-	contents.push(inlineWrapperOf(element, child, parseParagraphContents(child, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child))));
+const paragraphInlineWrapper = (element) => (child, { styles, theme, rels, media, previews, trackedContext, inScopeXmlns, inlineScope, contents }) => {
+	contents.push(inlineWrapperOf(element, child, parseParagraphContents(child, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child), inlineScope)));
 };
-const PARAGRAPH_CONTENT_UNDECLARED = { AlternateContent: (child, { contents, styles, theme, rels, media, previews, trackedContext, inScopeXmlns }) => {
+const PARAGRAPH_CONTENT_UNDECLARED = { AlternateContent: (child, { contents, styles, theme, rels, media, previews, trackedContext, inScopeXmlns, inlineScope }) => {
 	const selectedBranch = selectAlternateContentBranch(child);
-	if (selectedBranch) contents.push(...parseParagraphContents(selectedBranch, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child)));
+	if (selectedBranch) contents.push(...parseParagraphContents(selectedBranch, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child), inlineScope));
 } };
 const PARAGRAPH_CONTENT_UNDECLARED_NAMESPACES = { [OMML_NAMESPACE]: (child, { contents }) => {
 	const equation = mathContentOf(child);
 	if (equation !== void 0) contents.push(equation);
 } };
+/** All revision wrappers retain typed review ownership while parsing their children. */
+const trackedParagraphRevision = (type) => (child, { contents, styles, theme, rels, media, previews, inScopeXmlns, inlineScope }) => {
+	const resolutionJoins = parseResolutionJoins(child);
+	const parsedContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, type === "deletion" || type === "moveFrom" ? "deletion" : "default", inScopeXmlns, inlineScope);
+	pushTrackedChangeSegments({
+		contents,
+		type,
+		info: parseTrackedChangeInfo(child),
+		resolutionJoins,
+		parsedContent
+	});
+};
 const PARAGRAPH_CONTENT_HANDLERS = {
 	r: (child, { contents, styles, theme, rels, media, previews, trackedContext, inScopeXmlns, scan }) => {
 		const runElement = trackedContext === "deletion" ? normalizeDeletionContentElement(child) : child;
@@ -977,8 +1032,9 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 			contents.push(kept);
 		}
 	},
-	hyperlink: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		contents.push(...parseHyperlinkParagraphContents(child, rels, styles, theme, media, inScopeXmlns, previews));
+	hyperlink: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns, trackedContext }) => {
+		const linkElement = trackedContext === "deletion" ? normalizeDeletionContentElement(child) : child;
+		contents.push(...parseHyperlinkParagraphContents(linkElement, rels, styles, theme, media, inScopeXmlns, previews));
 	},
 	bookmarkStart: (child, { contents }) => {
 		contents.push(parseBookmarkStart(child));
@@ -1014,12 +1070,16 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 	customXmlMoveToRangeStart: CAPTURE,
 	smartTagPr: SMART_TAG_PROPERTIES_OWNER,
 	customXmlPr: CUSTOM_XML_PROPERTIES_OWNER,
-	sdt: (child, { contents, styles, theme, rels, media, previews, trackedContext, inScopeXmlns }) => {
+	sdt: (child, { contents, styles, theme, rels, media, previews, trackedContext, inScopeXmlns, inlineScope }) => {
+		if (inlineScope === "hyperlink") {
+			contents.push(preserveLinkedSdt(child));
+			return;
+		}
 		const sdtPr = findWordprocessingChild(child, "sdtPr");
 		const sdtEndPr = findWordprocessingChild(child, "sdtEndPr");
 		const sdtContentEl = findWordprocessingChild(child, "sdtContent");
 		if (sdtContentEl) {
-			const sdtParsed = parseParagraphContents(sdtContentEl, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child));
+			const sdtParsed = parseParagraphContents(sdtContentEl, styles, theme, null, rels, media, previews, trackedContext, mergeXmlnsDeclarations(inScopeXmlns, child), inlineScope);
 			const properties = parseSdtProperties(sdtPr, sdtEndPr);
 			const captured = captureSdtSiblingMarkers(child);
 			if (captured.before.length > 0) properties.rawSdtChildrenBeforeContent = captured.before;
@@ -1031,50 +1091,10 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 			});
 		}
 	},
-	ins: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		const insInfo = parseTrackedChangeInfo(child);
-		const insContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns);
-		pushTrackedChangeSegments({
-			contents,
-			type: "insertion",
-			info: insInfo,
-			resolutionJoins: parseResolutionJoins(child),
-			parsedContent: insContent
-		});
-	},
-	del: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		const delInfo = parseTrackedChangeInfo(child);
-		const delContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns);
-		pushTrackedChangeSegments({
-			contents,
-			type: "deletion",
-			info: delInfo,
-			resolutionJoins: parseResolutionJoins(child),
-			parsedContent: delContent
-		});
-	},
-	moveFrom: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		const moveFromInfo = parseTrackedChangeInfo(child);
-		const moveFromContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns);
-		pushTrackedChangeSegments({
-			contents,
-			type: "moveFrom",
-			info: moveFromInfo,
-			resolutionJoins: parseResolutionJoins(child),
-			parsedContent: moveFromContent
-		});
-	},
-	moveTo: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
-		const moveToInfo = parseTrackedChangeInfo(child);
-		const moveToContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns);
-		pushTrackedChangeSegments({
-			contents,
-			type: "moveTo",
-			info: moveToInfo,
-			resolutionJoins: parseResolutionJoins(child),
-			parsedContent: moveToContent
-		});
-	},
+	ins: trackedParagraphRevision("insertion"),
+	del: trackedParagraphRevision("deletion"),
+	moveFrom: trackedParagraphRevision("moveFrom"),
+	moveTo: trackedParagraphRevision("moveTo"),
 	smartTag: paragraphInlineWrapper("smartTag"),
 	moveFromRangeStart: (child, { contents }) => {
 		contents.push({
@@ -1120,7 +1140,7 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 *
 * Returns the parsed content and any complex fields that span multiple runs
 */
-function parseParagraphContents(paraElement, styles, theme, _numbering, rels, media, previews, trackedContext = "default", rootXmlns = {}) {
+function parseParagraphContents(paraElement, styles, theme, _numbering, rels, media, previews, trackedContext = "default", rootXmlns = {}, inlineScope = "paragraph") {
 	const contents = [];
 	const inScopeXmlns = mergeXmlnsDeclarations(rootXmlns, paraElement);
 	const scan = {
@@ -1154,6 +1174,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 			media,
 			previews,
 			trackedContext,
+			inlineScope,
 			inScopeXmlns,
 			contents,
 			scan

package/dist/docx/paragraphPropertySource.d.ts

@@ -4,10 +4,27 @@ import { Fragment, Mark, Node, NodeType } from "prosemirror-model";
 import { Transaction } from "prosemirror-state";
 //#region src/docx/paragraphPropertySource.d.ts
 declare const paragraphPropertySourceEmissionFingerprint: unique symbol;
+declare const paragraphPropertySourceIndentationBaseline: unique symbol;
+declare const INDENTATION_FIELDS: readonly ["indentLeft", "indentRight", "indentFirstLine", "hangingIndent"];
 type ParagraphPropertySource = Readonly<{
   xml: string;
   [paragraphPropertySourceEmissionFingerprint]: string;
+  [paragraphPropertySourceIndentationBaseline]: Readonly<Pick<document_d_exports.ParagraphFormatting, (typeof INDENTATION_FIELDS)[number]>>;
 }>;
+type IndentationFormatting = Pick<document_d_exports.ParagraphFormatting, (typeof INDENTATION_FIELDS)[number]>;
+type CopyParagraphIndentationProjectionOptions = {
+  target: document_d_exports.Paragraph;
+  source: document_d_exports.Paragraph;
+};
+/** Retain effective-value provenance without copying a durable source identity. */
+declare const copyParagraphIndentationProjection: ({ target, source }: CopyParagraphIndentationProjectionOptions) => void;
+type AssignParagraphIndentationProjectionOptions = {
+  paragraph: document_d_exports.Paragraph;
+  authored: document_d_exports.ParagraphFormatting | undefined;
+  inherited: IndentationFormatting;
+};
+/** Keep the model's effective indentation without making inherited values authored. */
+declare const assignParagraphIndentationProjection: ({ paragraph, authored, inherited }: AssignParagraphIndentationProjectionOptions) => void;
 declare const PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR = "_docxParagraphSourceToken";
 declare const PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR = "_docxParagraphSourceContract";
 /** Durable identity nested inside opaque collapsed-cell ProseMirror attrs; stripped on restore. */
@@ -30,6 +47,10 @@ declare const paragraphPropertySourceTokenMatchesContract: (token: unknown, cont
 declare const visitDocumentStoryParagraphs: (content: document_d_exports.Document["package"]["document"]["content"], visit: (paragraph: document_d_exports.Paragraph) => void) => void;
 declare const assignParagraphPropertySource: (paragraph: document_d_exports.Paragraph, xml: string) => void;
 declare const getParagraphPropertySource: (paragraph: document_d_exports.Paragraph) => ParagraphPropertySource | undefined;
+/** Read authored indentation while preserving edits to the parsed effective values. */
+declare const paragraphFormattingWithAuthoredIndentation: (paragraph: document_d_exports.Paragraph) => document_d_exports.ParagraphFormatting | undefined;
+/** Equal effective values must not replay a capture that lacks newly authored indentation. */
+declare const paragraphPropertySourceMatchesAuthoredIndentation: (paragraph: document_d_exports.Paragraph) => boolean;
 declare const paragraphPropertySourceMatchesEmission: (source: ParagraphPropertySource, emission: ModeledParagraphFormattingEmission) => boolean;
 /** Copy the captured `w:pPr` without claiming the source paragraph's durable identity. */
 declare const copyParagraphPropertyCapture: (target: document_d_exports.Paragraph, source: document_d_exports.Paragraph) => void;
@@ -150,4 +171,4 @@ declare const linkParagraphPropertySourceCandidate: (target: document_d_exports.
 declare const getParagraphPropertySourceCandidate: (paragraph: document_d_exports.Paragraph) => document_d_exports.Paragraph | undefined;
 declare const getParagraphPropertySourceTransferId: (paragraph: document_d_exports.Paragraph) => string | undefined;
 //#endregion
-export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/docx/paragraphPropertySource.js

@@ -1,12 +1,66 @@
 import { modelParagraphFormattingEmission } from "../internal/paragraphFormattingSerialization.js";
 import { canonicalJson } from "../utils/canonicalJson.js";
 import { copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines } from "./headerFooterVerbatim.js";
+import { parseParagraphProperties } from "./paragraphProperties.js";
 import { visitDocxParagraphs } from "./paragraphTraversal.js";
+import { parseXmlDocument } from "./xmlParser.js";
 import { TaggedError, panic } from "better-result";
 import { PluginKey } from "prosemirror-state";
 //#region src/docx/paragraphPropertySource.ts
 const paragraphPropertySourceEmissionFingerprint = Symbol("paragraphPropertySourceEmissionFingerprint");
+const paragraphPropertySourceIndentationBaseline = Symbol("paragraphPropertySourceIndentationBaseline");
+const INDENTATION_FIELDS = [
+	"indentLeft",
+	"indentRight",
+	"indentFirstLine",
+	"hangingIndent"
+];
 const paragraphPropertyCapture = Symbol("paragraphPropertyCapture");
+const paragraphIndentationProjection = Symbol("paragraphIndentationProjection");
+const indentationProjections = /* @__PURE__ */ new WeakMap();
+const indentationProjectionFor = (paragraph) => {
+	const handle = Object.getOwnPropertyDescriptor(paragraph, paragraphIndentationProjection)?.value;
+	return typeof handle === "object" && handle !== null ? indentationProjections.get(handle) : void 0;
+};
+/** Retain effective-value provenance without copying a durable source identity. */
+const copyParagraphIndentationProjection = ({ target, source }) => {
+	if (Object.hasOwn(target, paragraphIndentationProjection)) return;
+	const descriptor = Object.getOwnPropertyDescriptor(source, paragraphIndentationProjection);
+	if (descriptor && indentationProjectionFor(source)) Object.defineProperty(target, paragraphIndentationProjection, descriptor);
+};
+const indentationFields = (formatting) => ({
+	indentLeft: formatting?.indentLeft,
+	indentRight: formatting?.indentRight,
+	indentFirstLine: formatting?.indentFirstLine,
+	hangingIndent: formatting?.hangingIndent
+});
+/** Keep the model's effective indentation without making inherited values authored. */
+const assignParagraphIndentationProjection = ({ paragraph, authored, inherited }) => {
+	const effective = {
+		...inherited,
+		...indentationFields(authored)
+	};
+	for (const key of INDENTATION_FIELDS) if (authored?.[key] === void 0) {
+		const value = inherited[key];
+		if (value === void 0) Reflect.deleteProperty(effective, key);
+		else Object.assign(effective, { [key]: value });
+	}
+	if (authored?.indentFirstLine !== void 0 && authored.hangingIndent === void 0) Reflect.deleteProperty(effective, "hangingIndent");
+	paragraph.formatting = {
+		...authored,
+		...effective
+	};
+	const handle = Object.freeze({});
+	indentationProjections.set(handle, Object.freeze({
+		effective: Object.freeze(indentationFields(paragraph.formatting)),
+		authored: Object.freeze(indentationFields(authored))
+	}));
+	Object.defineProperty(paragraph, paragraphIndentationProjection, {
+		value: handle,
+		enumerable: true,
+		configurable: true
+	});
+};
 const paragraphPropertyCaptures = /* @__PURE__ */ new WeakMap();
 const paragraphSourceRecordKinds = /* @__PURE__ */ new WeakMap();
 const captureForParagraph = (paragraph) => {
@@ -27,6 +81,12 @@ const paragraphFormattingEmissionFingerprint = (emission) => canonicalJson(emiss
 const ownedParagraphPropertySource = (paragraph, xml) => {
 	return Object.freeze({
 		xml,
+		[paragraphPropertySourceIndentationBaseline]: Object.freeze({
+			indentLeft: paragraph.formatting?.indentLeft,
+			indentRight: paragraph.formatting?.indentRight,
+			indentFirstLine: paragraph.formatting?.indentFirstLine,
+			hangingIndent: paragraph.formatting?.hangingIndent
+		}),
 		[paragraphPropertySourceEmissionFingerprint]: paragraphFormattingEmissionFingerprint(modelParagraphFormattingEmission(paragraph.formatting))
 	});
 };
@@ -113,9 +173,54 @@ const assignParagraphPropertySource = (paragraph, xml) => {
 	});
 };
 const getParagraphPropertySource = (paragraph) => captureForParagraph(paragraph)?.source;
+const directFormattingBySource = /* @__PURE__ */ new WeakMap();
+/** Read authored indentation while preserving edits to the parsed effective values. */
+const paragraphFormattingWithAuthoredIndentation = (paragraph) => {
+	const source = getParagraphPropertySource(paragraph);
+	const projection = indentationProjectionFor(paragraph);
+	if (source === void 0 && projection === void 0) return paragraph.formatting;
+	let direct = source === void 0 ? void 0 : directFormattingBySource.get(source);
+	if (source !== void 0 && direct === void 0) {
+		direct = { formatting: parseParagraphProperties(parseXmlDocument(source.xml), null) };
+		directFormattingBySource.set(source, direct);
+	}
+	const result = { ...paragraph.formatting };
+	const baseline = projection?.effective ?? source?.[paragraphPropertySourceIndentationBaseline];
+	if (baseline === void 0) return paragraph.formatting;
+	const authored = projection?.authored ?? direct?.formatting;
+	const firstLineChanged = paragraph.formatting?.indentFirstLine !== baseline.indentFirstLine || paragraph.formatting?.hangingIndent !== baseline.hangingIndent;
+	for (const key of INDENTATION_FIELDS) {
+		if ((key === "indentFirstLine" || key === "hangingIndent") && firstLineChanged) continue;
+		if (paragraph.formatting?.[key] !== baseline[key]) continue;
+		Reflect.deleteProperty(result, key);
+		const value = authored?.[key];
+		if (value !== void 0) Object.assign(result, { [key]: value });
+	}
+	return Object.keys(result).length === 0 ? void 0 : result;
+};
+/** Equal effective values must not replay a capture that lacks newly authored indentation. */
+const paragraphPropertySourceMatchesAuthoredIndentation = (paragraph) => {
+	const source = getParagraphPropertySource(paragraph);
+	if (source === void 0) return true;
+	const authored = paragraphFormattingWithAuthoredIndentation(paragraph);
+	const original = directFormattingBySource.get(source)?.formatting;
+	const indentationEmission = (formatting) => {
+		const indentation = {};
+		for (const key of INDENTATION_FIELDS) {
+			const value = formatting?.[key];
+			if (value !== void 0) Object.assign(indentation, { [key]: value });
+		}
+		return modelParagraphFormattingEmission(indentation);
+	};
+	return canonicalJson(indentationEmission(authored)) === canonicalJson(indentationEmission(original));
+};
 const paragraphPropertySourceMatchesEmission = (source, emission) => source[paragraphPropertySourceEmissionFingerprint] === paragraphFormattingEmissionFingerprint(emission);
 /** Copy the captured `w:pPr` without claiming the source paragraph's durable identity. */
 const copyParagraphPropertyCapture = (target, source) => {
+	copyParagraphIndentationProjection({
+		target,
+		source
+	});
 	const capture = captureForParagraph(source);
 	if (capture) attachParagraphCapture(target, capture);
 	const kind = paragraphPropertySourceTokens.has(source) || paragraphSourceRecordKinds.get(source) === "durable" ? "durable" : "capture-only";
@@ -215,6 +320,7 @@ const cloneParagraphWithoutPropertySource = (paragraph, overrides) => {
 		...overrides
 	};
 	Reflect.deleteProperty(cloned, paragraphPropertyCapture);
+	Reflect.deleteProperty(cloned, paragraphIndentationProjection);
 	return cloned;
 };
 const paragraphsIn = (document) => {
@@ -766,4 +872,4 @@ const linkParagraphPropertySourceCandidate = (target, source) => {
 const getParagraphPropertySourceCandidate = (paragraph) => paragraphPropertySourceCandidates.get(paragraph);
 const getParagraphPropertySourceTransferId = (paragraph) => paragraphPropertySourceTransferIds.get(paragraph);
 //#endregion
-export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/docx/preservedRunContent.js

@@ -14,7 +14,7 @@ const VISIBLE_TEXT_CHILDREN = /* @__PURE__ */ new Map([["ruby", ["rubyBase"]]]);
 const MAX_PRESERVED_TEXT_LENGTH = 1e5;
 const collectTextContent = (element, into) => {
 	for (const child of getChildElements(element)) {
-		if (getLocalName(child.name) === "t") {
+		if (getLocalName(child.name) === "t" || getLocalName(child.name) === "delText") {
 			into.push(getTextContent(child));
 			continue;
 		}
@@ -67,6 +67,7 @@ const VISIBLE_TEXT_INLINE_CHILDREN = /* @__PURE__ */ new Set([
 	"customXml",
 	"fldSimple",
 	"hyperlink",
+	"sdt",
 	"smartTag"
 ]);
 /**

package/dist/docx/relsParser.js

@@ -1,6 +1,30 @@
 import { getAttribute, getChildElements, parseXmlDocument } from "./xmlParser.js";
+import { COMMENT_PART_RELATIONSHIPS } from "@stll/docx-core/model";
 //#region src/docx/relsParser.ts
 /**
+* Relationship Parser
+*
+* Parses .rels files from DOCX packages to map relationship IDs (rId)
+* to their targets (images, hyperlinks, headers, footers, etc.).
+*
+* .rels files are XML with structure:
+* <Relationships xmlns="...">
+*   <Relationship Id="rId1" Type="..." Target="..." TargetMode="External|Internal"/>
+* </Relationships>
+*
+* Key relationship types:
+* - image: Embedded images (word/media/*)
+* - hyperlink: External URLs (TargetMode="External")
+* - header: Header XML files
+* - footer: Footer XML files
+* - footnotes: Footnotes XML
+* - endnotes: Endnotes XML
+* - styles: styles.xml
+* - numbering: numbering.xml
+* - fontTable: fontTable.xml
+* - theme: theme/theme1.xml
+*/
+/**
 * Relationship type constants for common types
 */
 const RELATIONSHIP_TYPES = {
@@ -24,8 +48,8 @@ const RELATIONSHIP_TYPES = {
 	extendedProperties: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties",
 	customProperties: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties",
 	customXml: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml",
-	comments: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
-	commentsExtended: "http://schemas.microsoft.com/office/2011/relationships/commentsExtended"
+	comments: COMMENT_PART_RELATIONSHIPS.comments.type,
+	commentsExtended: COMMENT_PART_RELATIONSHIPS.commentsExtended.type
 };
 const STRICT_OFFICE_RELATIONSHIP_PREFIX = "http://purl.oclc.org/ooxml/officeDocument/relationships/";
 const TRANSITIONAL_OFFICE_RELATIONSHIP_PREFIX = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/";

package/dist/docx/rezip.js

@@ -25,7 +25,7 @@ import { RELATIONSHIP_TYPES, parseRelationships, resolveRelativePath } from "./r
 import { removeResolvedHeaderFooterParts } from "./removeHeaderFooterParts.js";
 import { normalizeRevisionIdsInXmlParts } from "./revisionIdNormalization.js";
 import { buildPatchedNotePartXml, collectChangedNoteParaIds, collectParaIds, patchNumberingDefinitions, spliceXml } from "./selectiveXmlPatch.js";
-import { planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
+import { hasOwnedCommentsPart, planCommentParts, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeFontTableXml } from "./serializer/fontTableSerializer.js";
 import { serializeHeaderFooter } from "./serializer/headerFooterSerializer.js";
@@ -202,7 +202,8 @@ async function serializeCommentsToZip(doc, zip, compressionLevel) {
 	const sourceCommentsFile = findZipEntryCaseInsensitive(zip, "word/comments.xml");
 	const sourceCommentsXml = sourceCommentsFile ? await sourceCommentsFile.async("text") : void 0;
 	if (comments.length === 0) {
-		if (sourceCommentsXml === void 0 || !hasCommentEntries(sourceCommentsXml)) return;
+		const ownsCommentsPart = hasOwnedCommentsPart(doc);
+		if (sourceCommentsXml === void 0 ? !ownsCommentsPart : !hasCommentEntries(sourceCommentsXml)) return;
 	}
 	const plan = planCommentParts(comments);
 	const commentsXml = serializeComments(plan, sourceCommentsXml === void 0 ? void 0 : readRootNamespaceBindings(sourceCommentsXml));
@@ -1224,8 +1225,9 @@ async function ensureCommentsContentType(zip, compressionLevel) {
 	const ctFile = zip.file("[Content_Types].xml");
 	if (!ctFile) return;
 	let ctXml = await ctFile.async("text");
-	if (ctXml.includes("/word/comments.xml")) return;
-	ctXml = ctXml.replace("</Types>", `<Override PartName="/word/comments.xml" ContentType="${COMMENTS_CONTENT_TYPE}"/></Types>`);
+	if (ctXml.toLowerCase().includes("/word/comments.xml")) return;
+	const commentsPartPath = findZipEntryCaseInsensitive(zip, "word/comments.xml")?.name ?? "word/comments.xml";
+	ctXml = ctXml.replace("</Types>", `<Override PartName="/${commentsPartPath}" ContentType="${COMMENTS_CONTENT_TYPE}"/></Types>`);
 	writeZipPart({
 		zip,
 		path: "[Content_Types].xml",
@@ -1245,9 +1247,10 @@ async function ensureCommentsRelationship(zip, compressionLevel) {
 	const relsFile = zip.file(relsPath);
 	if (!relsFile) return;
 	let relsXml = await relsFile.async("text");
-	if (relsXml.includes("comments.xml")) return;
+	if (relsXml.toLowerCase().includes("comments.xml")) return;
+	const commentsPartPath = findZipEntryCaseInsensitive(zip, "word/comments.xml")?.name ?? "word/comments.xml";
 	const newRId = `rId${findMaxRId(relsXml) + 1}`;
-	relsXml = relsXml.replace("</Relationships>", `<Relationship Id="${newRId}" Type="${RELATIONSHIP_TYPES.comments}" Target="comments.xml"/></Relationships>`);
+	relsXml = relsXml.replace("</Relationships>", `<Relationship Id="${newRId}" Type="${RELATIONSHIP_TYPES.comments}" Target="${commentsPartPath.slice(5)}"/></Relationships>`);
 	writeZipPart({
 		zip,
 		path: relsPath,