@stll/folio-core 0.35.0 → 0.36.0

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -1,7 +1,52 @@
+import { expectParagraphAttrs } from "../attrs/index.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 //#region src/prosemirror/commands/propertyChangeScope.ts
 /**
+* Remove selected entries from an oldest-to-newest paragraph-property chain.
+* A retained entry immediately after a removed run inherits that run's
+* earliest previous snapshot. Only a removed trailing run restores the live
+* paragraph properties. This makes repeated scoped rejection independent of
+* the order in which revisions are resolved.
+*/
+const removeParagraphPropertyChanges = (changes, shouldRemove) => {
+	const remaining = [];
+	let removedPrevious;
+	let removedAny = false;
+	let removingRun = false;
+	for (const change of changes) {
+		if (shouldRemove(change)) {
+			if (!removingRun) {
+				removedPrevious = change.previousFormatting;
+				removingRun = true;
+			}
+			removedAny = true;
+			continue;
+		}
+		if (!removingRun) {
+			remaining.push(change);
+			continue;
+		}
+		const rebased = { ...change };
+		if (removedPrevious === void 0) Reflect.deleteProperty(rebased, "previousFormatting");
+		else rebased.previousFormatting = removedPrevious;
+		remaining.push(rebased);
+		removedPrevious = void 0;
+		removingRun = false;
+	}
+	if (!removedAny) return { type: "unchanged" };
+	if (!removingRun) return {
+		type: "keep-live",
+		remaining
+	};
+	return {
+		type: "restore-previous",
+		remaining,
+		previousFormatting: removedPrevious
+	};
+};
+/**
 * Paragraph attrs governed by a `w:pPrChange` — the attrs
 * `paragraphFormattingToAttrs` (conversion/toProseDoc.ts) can produce from a
 * parsed `CT_PPrBase` (ECMA-376 §17.13.5.29). Rejecting a pPrChange restores
@@ -17,7 +62,8 @@ import { directionFromBidi } from "../paragraphDirection.js";
 *   `runInWithNext` (`w:specVanish` lives in that rPr)
 * - load-time style/numbering bookkeeping the command layer cannot recompute
 *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
-*   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
+*   `alignmentFromStyle`, `spacingFromDocDefaults`,
+*   `spacingFromImplicitDefaultStyle`
 */
 const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"styleId",
@@ -47,6 +93,20 @@ const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"_autospacingBase"
 ];
 const PPR_CHANGE_SCOPED_ATTR_KEY_SET = new Set(PPR_CHANGE_SCOPED_ATTR_KEYS);
+/** The in-scope paragraph properties as they stand, for a `w:pPrChange` record. */
+const paragraphPropertiesSnapshot = (node) => {
+	const attrs = expectParagraphAttrs(node);
+	const snapshot = {};
+	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) {
+		if (key === "alignment") continue;
+		const value = attrs[key];
+		if (key === "hangingIndent" && value === false && attrs._originalFormatting?.hangingIndent === void 0) continue;
+		if (value !== null && value !== void 0) snapshot[key] = value;
+	}
+	const directAlignment = directParagraphAlignment(attrs);
+	if (directAlignment !== void 0) snapshot["alignment"] = directAlignment;
+	return snapshot;
+};
 /**
 * Parser-shaped `ParagraphFormatting` keys that must NOT merge through to
 * attrs verbatim: they either normalize to a differently named attr
@@ -108,10 +168,12 @@ const PPR_CHANGE_SCOPED_FORMATTING_KEYS = [
 * the scoped set (editor-created list suggestions snapshot list-rendering
 * bookkeeping attrs) merge through 1:1 so their pre-change values restore too.
 */
-function paragraphRejectAttrPatch(previousFormatting) {
+function paragraphRejectAttrPatch(previousFormatting, alignmentFromStyle) {
 	const prev = previousFormatting ?? {};
 	const patch = {};
 	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) patch[key] = Object.hasOwn(prev, key) ? prev[key] ?? null : null;
+	if (!Object.hasOwn(prev, "alignment")) patch["alignment"] = alignmentFromStyle ?? null;
+	patch["alignmentFromStyle"] = alignmentFromStyle;
 	if (!Object.hasOwn(prev, "direction")) patch["direction"] = directionFromBidi(prev.bidi);
 	if (!Object.hasOwn(prev, "_autospacingBase")) patch["_autospacingBase"] = autospacingBaseFromFormatting(prev);
 	for (const [key, value] of Object.entries(prev)) {
@@ -241,4 +303,4 @@ function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
-export { PPR_CHANGE_SCOPED_ATTR_KEYS, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };
+export { PPR_CHANGE_SCOPED_ATTR_KEYS, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -2,9 +2,7 @@ import { document_d_exports } from "../../types/document.js";
 import { TableAttrs, TableCellAttrs, TableRowAttrs } from "../schema/nodes.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.d.ts
-/**
- * Convert a ProseMirror document to our Document type
- */
+/** Convert a ProseMirror document to the document model. */
 declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Document): document_d_exports.Document;
 /**
  * Convert ProseMirror marks to TextFormatting
@@ -32,6 +30,6 @@ declare function updateDocumentContent(originalDocument: document_d_exports.Docu
  * Used for converting edited header/footer PM content back to the document
  * model.
  */
-declare function proseDocToBlocks(pmDoc: Node): document_d_exports.BlockContent[];
+declare function proseDocToBlocks(pmDoc: Node, baseContent?: document_d_exports.BlockContent[]): document_d_exports.BlockContent[];
 //#endregion
 export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, standaloneTableCellFromProseMirror, tableAttrsToFormatting, tableCellAttrsToFormatting, tableRowAttrsToFormatting, updateDocumentContent };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,5 +1,8 @@
 import { numPrEqual } from "../../docx/numberingParser.js";
+import { copyParagraphPropertySource, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceTransferId, linkParagraphPropertySourceCandidate, recreateProseNodeWithParagraphPropertySource } from "../../docx/paragraphPropertySource.js";
+import { visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
+import { DATE_UTC_ATTRIBUTE } from "../../docx/trackedChangeInfo.js";
 import { OUTLINE_STYLE_CSS_ALIASES, normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
@@ -7,8 +10,10 @@ import { pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
 import { expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
+import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges } from "../commands/propertyChangeScope.js";
 import { applyRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
+import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionToBidi } from "../paragraphDirection.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
@@ -76,12 +81,68 @@ function textBoxWrapFromAttrs(attrs) {
 	if (attrs.distRight !== void 0) wrap.distR = pixelsToEmu(attrs.distRight);
 	return wrap;
 }
-/**
-* Convert a ProseMirror document to our Document type
-*/
+const assignUniqueParagraph = (paragraphs, paraId, paragraph) => {
+	const existing = paragraphs.get(paraId);
+	if (!paragraphs.has(paraId) || existing === paragraph) {
+		paragraphs.set(paraId, paragraph);
+		return;
+	}
+	paragraphs.set(paraId, null);
+};
+const uniqueParagraphsById = (content, includeTransferIds = false) => {
+	const paragraphs = /* @__PURE__ */ new Map();
+	visitDocxParagraphs({ documentBody: { content } }, (paragraph) => {
+		const { paraId } = paragraph;
+		if (paraId) assignUniqueParagraph(paragraphs, paraId, paragraph);
+		const transferId = includeTransferIds ? getParagraphPropertySourceTransferId(paragraph) : void 0;
+		if (transferId) assignUniqueParagraph(paragraphs, transferId, paragraph);
+	});
+	return paragraphs;
+};
+const restoreParagraphPropertySources = (content, baseContent, linkedTargets, linkedSources) => {
+	const baseParagraphs = uniqueParagraphsById(baseContent, true);
+	for (const [paraId, paragraph] of uniqueParagraphsById(content)) {
+		const baseParagraph = baseParagraphs.get(paraId);
+		if (!paragraph || !baseParagraph || linkedTargets.has(paragraph) || linkedSources.has(baseParagraph) || !getParagraphPropertySource(baseParagraph)) continue;
+		copyParagraphPropertySource(paragraph, baseParagraph);
+		const baseFormatting = baseParagraph.formatting;
+		if (!baseFormatting?.numPr || !baseFormatting.numPrFromStyle || !numPrEqual(baseFormatting.numPr, baseFormatting.numPrFromStyle)) continue;
+		const { numPr, numPrFromStyle, ...authoredFormatting } = baseFormatting;
+		if (canonicalJson(paragraph.formatting ?? {}) !== canonicalJson(authoredFormatting)) continue;
+		paragraph.formatting = {
+			...paragraph.formatting,
+			numPr,
+			numPrFromStyle
+		};
+	}
+};
+const restoreLinkedParagraphPropertySources = (content) => {
+	const targetsBySource = /* @__PURE__ */ new Map();
+	const linkedTargets = /* @__PURE__ */ new Set();
+	visitDocxParagraphs({ documentBody: { content } }, (paragraph) => {
+		const source = getParagraphPropertySourceCandidate(paragraph);
+		if (!source) return;
+		linkedTargets.add(paragraph);
+		const targets = targetsBySource.get(source);
+		if (targets) targets.push(paragraph);
+		else targetsBySource.set(source, [paragraph]);
+	});
+	for (const [source, targets] of targetsBySource) if (targets.length === 1) {
+		const target = targets.at(0);
+		if (target) copyParagraphPropertySource(target, source);
+	}
+	return {
+		targets: linkedTargets,
+		sources: new Set(targetsBySource.keys())
+	};
+};
+/** Convert a ProseMirror document to the document model. */
 function fromProseDoc(pmDoc, baseDocument) {
 	assertValidProseMirrorDocument(pmDoc, "Cannot convert invalid ProseMirror document to DOCX model");
-	const documentBody = { content: extractBlocks(pmDoc) };
+	const blocks = extractBlocks(pmDoc);
+	const linkedSources = restoreLinkedParagraphPropertySources(blocks);
+	if (baseDocument) restoreParagraphPropertySources(blocks, baseDocument.package.document.content, linkedSources.targets, linkedSources.sources);
+	const documentBody = { content: blocks };
 	if (baseDocument?.package.document.finalSectionProperties) documentBody.finalSectionProperties = baseDocument.package.document.finalSectionProperties;
 	if (baseDocument?.package.document.sections) documentBody.sections = baseDocument.package.document.sections;
 	if (baseDocument?.package.document.comments) documentBody.comments = baseDocument.package.document.comments;
@@ -131,6 +192,22 @@ function stripSuggestedInlineMarks(marks) {
 */
 function stripSuggestedNodeAttrs(node) {
 	const name = node.type.name;
+	if (name === "paragraph") {
+		const propertyChanges = expectParagraphAttrs(node)._propertyChanges;
+		if (!Array.isArray(propertyChanges)) return null;
+		if (!propertyChanges.some(({ info }) => info.provenance === "suggested")) return null;
+		const removal = removeParagraphPropertyChanges(propertyChanges, ({ info }) => info.provenance === "suggested");
+		if (removal.type === "unchanged") return null;
+		const nextAttrs = {
+			...node.attrs,
+			_propertyChanges: removal.remaining.length > 0 ? removal.remaining : null
+		};
+		if (removal.type === "restore-previous") {
+			Object.assign(nextAttrs, paragraphRejectAttrPatch(removal.previousFormatting));
+			nextAttrs["_originalFormatting"] = paragraphRejectOriginalFormatting(removal.previousFormatting, nextAttrs["_originalFormatting"]);
+		}
+		return nextAttrs;
+	}
 	if (name === "tableRow") {
 		const rowAttrs = expectTableRowAttrs(node);
 		if (rowAttrs.trDel?.provenance === "suggested") return {
@@ -192,7 +269,10 @@ function mapSuggestionStrippedNode(node) {
 	});
 	if (!changed) return node;
 	const content = Fragment.fromArray(children);
-	return nextAttrs === null ? node.copy(content) : node.type.create(nextAttrs, content, node.marks);
+	return recreateProseNodeWithParagraphPropertySource(node, {
+		...nextAttrs === null ? {} : { attrs: nextAttrs },
+		content
+	});
 }
 /**
 * Strip suggested (AI-proposed) tracked changes from a document so it
@@ -208,10 +288,10 @@ function materializeNumberedRefValues(doc) {
 	const visit = (node) => {
 		if (node.type.name === "field" || node.type.name === "structuredField") {
 			const displayText = results.get(node);
-			if (displayText !== void 0) return node.type.create({
+			if (displayText !== void 0) return recreateProseNodeWithParagraphPropertySource(node, { attrs: {
 				...node.attrs,
 				displayText
-			}, node.content, node.marks);
+			} });
 			return node;
 		}
 		if (node.childCount === 0) return node;
@@ -222,7 +302,7 @@ function materializeNumberedRefValues(doc) {
 			children.push(mappedChild);
 			changed ||= mappedChild !== child;
 		});
-		return changed ? node.copy(Fragment.fromArray(children)) : node;
+		return changed ? recreateProseNodeWithParagraphPropertySource(node, { content: Fragment.fromArray(children) }) : node;
 	};
 	return visit(doc);
 }
@@ -541,12 +621,20 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers) {
 	else if (attrs.sectionBreakType) paragraph.sectionProperties = { sectionStart: attrs.sectionBreakType };
 	if (attrs._propertyChanges && attrs._propertyChanges.length > 0) paragraph.propertyChanges = attrs._propertyChanges.map(propertyChangeFromAttrs);
 	if (attrs.pPrMark) paragraph.pPrMark = attrs.pPrMark;
+	linkParagraphPropertySourceCandidate(paragraph, node);
 	return paragraph;
 }
 const propertyChangeFromAttrs = (change) => {
-	const { previousFormatting, currentFormatting, ...info } = change;
-	if (previousFormatting === void 0) return currentFormatting === void 0 ? info : {
-		...info,
+	const { previousFormatting, currentFormatting, info, ...changeInfo } = change;
+	const serializedInfo = { ...info };
+	Reflect.deleteProperty(serializedInfo, "provenance");
+	Reflect.deleteProperty(serializedInfo, "suggestionId");
+	const normalizedChangeInfo = {
+		...changeInfo,
+		info: serializedInfo
+	};
+	if (previousFormatting === void 0) return currentFormatting === void 0 ? normalizedChangeInfo : {
+		...normalizedChangeInfo,
 		currentFormatting
 	};
 	const { numPr, ...previousWithoutNumPr } = previousFormatting;
@@ -555,7 +643,7 @@ const propertyChangeFromAttrs = (change) => {
 		numPr
 	};
 	return {
-		...info,
+		...normalizedChangeInfo,
 		previousFormatting: normalizedPrevious,
 		...currentFormatting !== void 0 && { currentFormatting }
 	};
@@ -576,6 +664,7 @@ function assignBooleanToggle(result, attrs, orig, key) {
 	else result[key] = value;
 }
 function paragraphAttrsToFormatting(attrs) {
+	const directAlignment = directParagraphAlignment(attrs);
 	const spaceBefore = Reflect.get(attrs, "spaceBefore");
 	const spaceAfter = Reflect.get(attrs, "spaceAfter");
 	const beforeHasAutospacingBase = hasAutospacingBaseSide(attrs._autospacingBase, "before");
@@ -609,8 +698,8 @@ function paragraphAttrsToFormatting(attrs) {
 			if (attrs.lineSpacingRule) result.lineSpacingRule = attrs.lineSpacingRule;
 			else Reflect.deleteProperty(result, "lineSpacingRule");
 		}
-		if (attrs.alignment !== (orig.alignment ?? void 0)) if (attrs.alignment) result.alignment = attrs.alignment;
-		else delete result.alignment;
+		if (directAlignment === void 0) Reflect.deleteProperty(result, "alignment");
+		else result.alignment = directAlignment;
 		if (isStyleSourcedNumPr(attrs)) {
 			delete result.numPr;
 			delete result.numPrFromStyle;
@@ -636,9 +725,9 @@ function paragraphAttrsToFormatting(attrs) {
 	}
 	const outlineLevel = Reflect.get(attrs, "outlineLevel");
 	const bidi = directionToBidi(attrs.direction);
-	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
+	if (!(directAlignment !== void 0 || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || hasDirectLineSpacing || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
 	const f = {};
-	if (attrs.alignment) f.alignment = attrs.alignment;
+	if (directAlignment !== void 0) f.alignment = directAlignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
 	if (beforeAutospacingEdited) f.beforeAutospacing = false;
 	if (shouldSerializeSpaceAfter) f.spaceAfter = spaceAfter;
@@ -794,6 +883,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				id: changeAttrs.revisionId,
 				author: changeAttrs.author || "Unknown",
 				...changeAttrs.date ? { date: changeAttrs.date } : {},
+				...changeAttrs.utcDate ? { utcDate: {
+					attribute: DATE_UTC_ATTRIBUTE,
+					value: changeAttrs.utcDate
+				} } : {},
 				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
 			};
 			if (insertionMark) content.push({
@@ -819,6 +912,10 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				author: changeAttrs.author || "Unknown"
 			};
 			if (changeAttrs.date) info.date = changeAttrs.date;
+			if (changeAttrs.utcDate) info.utcDate = {
+				attribute: DATE_UTC_ATTRIBUTE,
+				value: changeAttrs.utcDate
+			};
 			if (changeAttrs.initials) info.initials = changeAttrs.initials;
 			let type;
 			if (insertionMark) type = changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion";
@@ -1934,6 +2031,10 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges) {
 			id: attrs.trIns.revisionId,
 			author: attrs.trIns.author,
 			...attrs.trIns.date != null && { date: attrs.trIns.date },
+			...attrs.trIns.utcDate != null && { utcDate: {
+				attribute: "w16du:dateUtc",
+				value: attrs.trIns.utcDate
+			} },
 			...attrs.trIns.initials != null && { initials: attrs.trIns.initials }
 		}
 	};
@@ -1943,6 +2044,10 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges) {
 			id: attrs.trDel.revisionId,
 			author: attrs.trDel.author,
 			...attrs.trDel.date != null && { date: attrs.trDel.date },
+			...attrs.trDel.utcDate != null && { utcDate: {
+				attribute: "w16du:dateUtc",
+				value: attrs.trDel.utcDate
+			} },
 			...attrs.trDel.initials != null && { initials: attrs.trDel.initials }
 		}
 	};
@@ -2025,6 +2130,10 @@ function convertPMTableCell(node, documentCounts) {
 			id: attrs.cellMarker.info.revisionId,
 			author: attrs.cellMarker.info.author,
 			...attrs.cellMarker.info.date != null && { date: attrs.cellMarker.info.date },
+			...attrs.cellMarker.info.utcDate != null && { utcDate: {
+				attribute: "w16du:dateUtc",
+				value: attrs.cellMarker.info.utcDate
+			} },
 			...attrs.cellMarker.info.initials != null && { initials: attrs.cellMarker.info.initials }
 		};
 		if (attrs.cellMarker.kind === "merge") cell.structuralChange = {
@@ -2188,8 +2297,11 @@ function updateDocumentContent(originalDocument, pmDoc) {
 * Used for converting edited header/footer PM content back to the document
 * model.
 */
-function proseDocToBlocks(pmDoc) {
-	return extractBlocks(pmDoc);
+function proseDocToBlocks(pmDoc, baseContent) {
+	const blocks = extractBlocks(pmDoc);
+	const linkedSources = restoreLinkedParagraphPropertySources(blocks);
+	if (baseContent) restoreParagraphPropertySources(blocks, baseContent, linkedSources.targets, linkedSources.sources);
+	return blocks;
 }
 //#endregion
 export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, standaloneTableCellFromProseMirror, tableAttrsToFormatting, tableCellAttrsToFormatting, tableRowAttrsToFormatting, updateDocumentContent };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,4 +1,5 @@
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
+import { linkProseParagraphPropertySource, recreateProseNodeWithParagraphPropertySource } from "../../docx/paragraphPropertySource.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
@@ -119,18 +120,18 @@ function toProseDoc(document, options) {
 			const firstConverted = converted.at(0);
 			if (pbPos === "before" && converted.length === 1 && firstConverted?.type.name === "paragraph" && firstConverted.content.size === 0 && document.package.settings?.splitPageBreakAndParagraphMark !== true) {
 				const paragraph = firstConverted;
-				converted[0] = paragraph.type.create({
+				converted[0] = recreateProseNodeWithParagraphPropertySource(paragraph, { attrs: {
 					...paragraph.attrs,
 					_pageBreakCarrier: true
-				}, paragraph.content, paragraph.marks);
+				} });
 			}
 			if (pbPos === "after") {
 				const paragraphIndex = converted.findIndex((node) => node.type.name === "paragraph");
 				const trailingParagraph = paragraphIndex >= 0 ? converted.at(paragraphIndex) : void 0;
-				if (trailingParagraph) converted[paragraphIndex] = trailingParagraph.type.create({
+				if (trailingParagraph) converted[paragraphIndex] = recreateProseNodeWithParagraphPropertySource(trailingParagraph, { attrs: {
 					...trailingParagraph.attrs,
 					_trailingPageBreak: true
-				}, trailingParagraph.content, trailingParagraph.marks);
+				} });
 			}
 			out.push(...converted);
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
@@ -323,7 +324,9 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 	}
 	if (bookmarksArr) attrs.bookmarks = bookmarksArr;
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
-	return schema.node("paragraph", attrs, inlineNodes);
+	const proseParagraph = schema.node("paragraph", attrs, inlineNodes);
+	linkProseParagraphPropertySource(proseParagraph, paragraph);
+	return proseParagraph;
 }
 const resolveParagraphStyleFontFamily = (styleId, styleResolver) => {
 	let style = styleId ? styleResolver.getStyle(styleId) : styleResolver.getDefaultParagraphStyle();
@@ -402,6 +405,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getI
 		revisionId: change.info.id,
 		author: change.info.author,
 		date: change.info.date ?? null,
+		utcDate: change.info.utcDate?.value ?? null,
 		initials: change.info.initials ?? null,
 		moveKind
 	});
@@ -466,6 +470,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (styleResolver) {
 		stylePpr = styleResolver.resolveParagraphStyleInTable(styleId, tableParagraphOverlay).paragraphFormatting;
 		set("alignment", formatting?.alignment ?? stylePpr?.alignment);
+		set("alignmentFromStyle", stylePpr?.alignment);
 		set("spaceBefore", formatting?.spaceBefore ?? stylePpr?.spaceBefore);
 		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
 		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
@@ -936,7 +941,9 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		trIns: {
 			revisionId: row.structuralChange.info.id,
 			author: row.structuralChange.info.author,
-			date: row.structuralChange.info.date ?? null
+			date: row.structuralChange.info.date ?? null,
+			...row.structuralChange.info.utcDate ? { utcDate: row.structuralChange.info.utcDate.value } : {},
+			...row.structuralChange.info.initials ? { initials: row.structuralChange.info.initials } : {}
 		}
 	};
 	else if (row.structuralChange?.type === "tableRowDeletion") attrs = {
@@ -944,7 +951,9 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 		trDel: {
 			revisionId: row.structuralChange.info.id,
 			author: row.structuralChange.info.author,
-			date: row.structuralChange.info.date ?? null
+			date: row.structuralChange.info.date ?? null,
+			...row.structuralChange.info.utcDate ? { utcDate: row.structuralChange.info.utcDate.value } : {},
+			...row.structuralChange.info.initials ? { initials: row.structuralChange.info.initials } : {}
 		}
 	};
 	const numCells = row.cells.length;
@@ -1084,7 +1093,9 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		info: {
 			revisionId: cell.structuralChange.info.id,
 			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null
+			date: cell.structuralChange.info.date ?? null,
+			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
+			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
 		}
 	};
 	else if (cell.structuralChange?.type === "tableCellDeletion") attrs.cellMarker = {
@@ -1092,7 +1103,9 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		info: {
 			revisionId: cell.structuralChange.info.id,
 			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null
+			date: cell.structuralChange.info.date ?? null,
+			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
+			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
 		}
 	};
 	else if (cell.structuralChange?.type === "tableCellMerge") attrs.cellMarker = {
@@ -1100,7 +1113,9 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		info: {
 			revisionId: cell.structuralChange.info.id,
 			author: cell.structuralChange.info.author,
-			date: cell.structuralChange.info.date ?? null
+			date: cell.structuralChange.info.date ?? null,
+			...cell.structuralChange.info.utcDate ? { utcDate: cell.structuralChange.info.utcDate.value } : {},
+			...cell.structuralChange.info.initials ? { initials: cell.structuralChange.info.initials } : {}
 		},
 		...cell.structuralChange.verticalMerge !== void 0 ? { verticalMerge: cell.structuralChange.verticalMerge } : {},
 		...cell.structuralChange.verticalMergeOriginal !== void 0 ? { verticalMergeOriginal: cell.structuralChange.verticalMergeOriginal } : {}
@@ -1965,10 +1980,10 @@ function headerFooterToProseDoc(content, options) {
 			if (isDetachedWatermarkHost) {
 				const paragraphNodeIndex = paragraphNodes.findIndex(({ type }) => type.name === "paragraph");
 				const paragraphNode = paragraphNodes[paragraphNodeIndex];
-				if (paragraphNode) paragraphNodes[paragraphNodeIndex] = paragraphNode.type.create({
+				if (paragraphNode) paragraphNodes[paragraphNodeIndex] = recreateProseNodeWithParagraphPropertySource(paragraphNode, { attrs: {
 					...paragraphNode.attrs,
 					_detachedWatermarkHost: true
-				}, paragraphNode.content, paragraphNode.marks);
+				} });
 			}
 			out.push(...paragraphNodes);
 		} else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -1,8 +1,10 @@
+import { PARAGRAPH_ALIGNMENT_VALUES } from "../../../types/documentEnumValues.js";
 import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
+import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
@@ -95,6 +97,7 @@ function cssTextAlignToAlignment(value) {
 		default: return;
 	}
 }
+const parseParagraphAlignment = (value) => PARAGRAPH_ALIGNMENT_VALUES.find((alignment) => alignment === value);
 /**
 * Parse CSS line-height to twips.
 * - Unitless multiplier (e.g. "1.5"): 240 twips * multiplier (single=240)
@@ -182,6 +185,7 @@ const paragraphNodeSpec = {
 		paraId: { default: null },
 		textId: { default: null },
 		alignment: { default: null },
+		alignmentFromStyle: { default: void 0 },
 		kinsoku: { default: null },
 		overflowPunctuation: { default: null },
 		suppressAutoHyphens: { default: null },
@@ -249,23 +253,32 @@ const paragraphNodeSpec = {
 			if (!(dom instanceof HTMLElement)) return false;
 			const element = dom;
 			const paraId = element.dataset["paraId"];
-			const alignment = element.dataset["alignment"];
+			const alignment = parseParagraphAlignment(element.dataset["alignment"]);
+			const authoredAlignment = parseParagraphAlignment(element.dataset["directAlignment"]);
+			const alignmentFromStyle = parseParagraphAlignment(element.dataset["alignmentFromStyle"]);
 			const styleId = element.dataset["styleId"];
 			const tableOfContentsLevel = Number(element.dataset["tableOfContentsLevel"]);
 			const sectionBreakType = element.dataset["sectionBreak"];
 			const attrs = {
 				...paraId ? { paraId } : {},
 				...alignment ? { alignment } : {},
+				...alignmentFromStyle ? { alignmentFromStyle } : {},
 				...styleId ? { styleId } : {},
 				...Number.isSafeInteger(tableOfContentsLevel) && tableOfContentsLevel > 0 ? { _tableOfContentsLevel: tableOfContentsLevel } : {},
 				...sectionBreakType ? { sectionBreakType } : {}
 			};
 			const styleAttrs = extractParagraphAttrsFromStyle(element);
 			const mergedAlignment = attrs.alignment || styleAttrs.alignment;
+			const mergedDirectAlignment = authoredAlignment ?? (attrs.alignmentFromStyle === void 0 ? mergedAlignment : void 0);
+			const originalFormatting = {
+				...styleId ? { styleId } : {},
+				...mergedDirectAlignment ? { alignment: mergedDirectAlignment } : {}
+			};
 			return {
 				...styleAttrs,
 				...attrs,
-				...mergedAlignment !== void 0 ? { alignment: mergedAlignment } : {}
+				...mergedAlignment !== void 0 ? { alignment: mergedAlignment } : {},
+				...Object.keys(originalFormatting).length > 0 ? { _originalFormatting: originalFormatting } : {}
 			};
 		}
 	}, ...[
@@ -279,8 +292,10 @@ const paragraphNodeSpec = {
 		tag,
 		getAttrs(dom) {
 			const level = Number.parseInt(tag.charAt(1), 10);
+			const styleAttrs = extractParagraphAttrsFromStyle(dom);
 			return {
-				...extractParagraphAttrsFromStyle(dom),
+				...styleAttrs,
+				...styleAttrs.alignment ? { _originalFormatting: { alignment: styleAttrs.alignment } } : {},
 				styleId: `Heading${level}`,
 				outlineLevel: level - 1
 			};
@@ -295,6 +310,9 @@ const paragraphNodeSpec = {
 		if (listClass) domAttrs["class"] = listClass;
 		if (attrs.paraId) domAttrs["data-para-id"] = attrs.paraId;
 		if (attrs.alignment) domAttrs["data-alignment"] = attrs.alignment;
+		const directAlignment = directParagraphAlignment(attrs);
+		if (directAlignment) domAttrs["data-direct-alignment"] = directAlignment;
+		if (attrs.alignmentFromStyle) domAttrs["data-alignment-from-style"] = attrs.alignmentFromStyle;
 		if (attrs.styleId) domAttrs["data-style-id"] = attrs.styleId;
 		if (typeof attrs._tableOfContentsLevel === "number") domAttrs["data-table-of-contents-level"] = String(attrs._tableOfContentsLevel);
 		if (attrs.listMarker) domAttrs["data-list-marker"] = attrs.listMarker;
@@ -373,7 +391,27 @@ function setParagraphAttrsCmd(attrs) {
 	};
 }
 function makeSetAlignment(alignment) {
-	return (state, dispatch) => setParagraphAttr("alignment", alignment)(state, dispatch);
+	return (state, dispatch) => {
+		const { $from, $to } = state.selection;
+		if (!dispatch) return true;
+		let tr = state.tr;
+		const seen = /* @__PURE__ */ new Set();
+		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+			if (node.type.name !== "paragraph" || seen.has(pos)) return;
+			seen.add(pos);
+			const attrs = expectParagraphAttrs(node);
+			tr = tr.setNodeMarkup(pos, void 0, {
+				...node.attrs,
+				alignment,
+				_originalFormatting: {
+					...attrs._originalFormatting,
+					alignment
+				}
+			});
+		});
+		dispatch(tr.scrollIntoView());
+		return true;
+	};
 }
 function makeSetLineSpacing(value, rule = "auto") {
 	return (state, dispatch) => setParagraphAttrsCmd({
@@ -474,6 +512,12 @@ function makeApplyStyle(schema) {
 						styleId,
 						...resolvedAttrs.styleName ? { styleName: resolvedAttrs.styleName } : {}
 					}));
+					const originalFormatting = expectParagraphAttrs(node)._originalFormatting;
+					if (originalFormatting?.alignment !== void 0) {
+						const formattingWithoutDirectAlignment = { ...originalFormatting };
+						Reflect.deleteProperty(formattingWithoutDirectAlignment, "alignment");
+						newAttrs["_originalFormatting"] = Object.keys(formattingWithoutDirectAlignment).length > 0 ? formattingWithoutDirectAlignment : null;
+					}
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
 				}

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.js

@@ -1,3 +1,4 @@
+import { setProseParagraphMarkupWithPropertySource } from "../../../docx/paragraphPropertySource.js";
 import { getTransactionDirtyRange } from "../../../paged-layout/transactionDirtyRange.js";
 import { detectBaseDirection } from "../../../utils/baseDirection.js";
 import { directionIsAutoManaged } from "../../paragraphDirection.js";
@@ -62,7 +63,12 @@ const collectBidiUpdatesInRange = (doc, range) => {
 };
 const applyBidiUpdates = (state, updates) => {
 	const tr = state.tr;
-	for (const update of updates) tr.setNodeMarkup(update.pos, void 0, update.attrs);
+	for (const update of updates) setProseParagraphMarkupWithPropertySource({
+		attrs: update.attrs,
+		ownership: "preserve",
+		pos: update.pos,
+		transaction: tr
+	});
 	ignoreTrackedChanges(tr);
 	tr.setMeta(autoBidiDetectionKey, "applied");
 	tr.setMeta("addToHistory", false);