@stll/folio-core 0.57.0 → 0.58.1

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,6 +1,7 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
+import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
 import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
 import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
@@ -43,7 +44,7 @@ import { expectRangeAnchorAttrs } from "../rangeAnchorAttrs.js";
 import { marksToTextFormatting, sameFormattingValue } from "../runFormattingFromMarks.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { RUN_IDENTITY_MARK_NAME } from "../runIdentity.js";
-import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting } from "../runStyleFormatting.js";
+import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting, resolveParagraphInheritedRunFormatting } from "../runStyleFormatting.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
@@ -52,7 +53,7 @@ import { enclosingInsertionAncestors, inlineWrapperStackOf } from "../trackedRev
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
-import { panic } from "better-result";
+import { TaggedError, panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, relationshipIdOf } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.ts
@@ -270,8 +271,103 @@ const restoreLinkedParagraphPropertySources = (content) => {
 		sources: new Set(targetsBySource.keys())
 	};
 };
+var SaveStylesheetSourceMismatch = class extends TaggedError("SaveStylesheetSourceMismatch") {};
+const parsedPackageStyles = (document, liveStyles) => {
+	const source = getDocumentSourceStyles(document, liveStyles);
+	switch (source.type) {
+		case "captured": {
+			if (source.styles !== void 0 && source.additions.length === 0) return source.styles;
+			const addedIds = /* @__PURE__ */ new Set();
+			for (const addition of source.additions) {
+				if (addedIds.has(addition.styleId)) throw new SaveStylesheetSourceMismatch({
+					message: `Duplicate added style ID: ${addition.styleId}.`,
+					divergences: [{
+						type: "style",
+						styleId: addition.styleId
+					}]
+				});
+				addedIds.add(addition.styleId);
+			}
+			if (source.styles === void 0) return liveStyles === void 0 ? void 0 : structuredClone(liveStyles);
+			return {
+				...source.styles,
+				styles: [...source.styles.styles, ...structuredClone(source.additions)]
+			};
+		}
+		case "missing":
+		case "mismatch": throw new SaveStylesheetSourceMismatch({
+			message: "The parsed package stylesheet source is unavailable.",
+			divergences: [{ type: "sourceUnavailable" }]
+		});
+		default: return panic(`Unexpected stylesheet source capture: ${JSON.stringify(source)}`);
+	}
+};
+const assertSuppliedStylesMatchSource = (styles, baseDocument) => {
+	if (!baseDocument?.originalBuffer) return;
+	const sourceStyles = parsedPackageStyles(baseDocument);
+	if (!sourceStyles) return;
+	const suppliedById = new Map(styles.styles.map((style) => [style.styleId, style]));
+	const sourceById = new Map(sourceStyles.styles.map((style) => [style.styleId, style]));
+	const divergentIds = /* @__PURE__ */ new Set();
+	for (const style of sourceStyles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+	for (const style of styles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+	const persistedStyles = {
+		...sourceStyles,
+		styles: [...sourceStyles.styles, ...styles.styles.filter(({ styleId }) => !sourceById.has(styleId))]
+	};
+	const suppliedResolver = createStyleEngine(styles);
+	const persistedResolver = createStyleEngine(persistedStyles);
+	for (const [supplied, persisted] of [
+		[suppliedResolver.getDefaultParagraphStyle(), persistedResolver.getDefaultParagraphStyle()],
+		[suppliedResolver.getDefaultCharacterStyle(), persistedResolver.getDefaultCharacterStyle()],
+		[suppliedResolver.getDefaultTableStyle(), persistedResolver.getDefaultTableStyle()]
+	]) {
+		if (supplied?.styleId === persisted?.styleId) continue;
+		if (supplied) divergentIds.add(supplied.styleId);
+		if (persisted) divergentIds.add(persisted.styleId);
+	}
+	const divergences = [];
+	for (const styleId of divergentIds) divergences.push({
+		type: "style",
+		styleId
+	});
+	if (canonicalJson(styles.docDefaults) !== canonicalJson(sourceStyles.docDefaults)) divergences.push({ type: "docDefaults" });
+	if (divergences.length === 0) return;
+	throw new SaveStylesheetSourceMismatch({
+		message: `Supplied stylesheet differs from the parsed package: ${[...divergentIds, ...divergences.some(({ type }) => type === "docDefaults") ? ["docDefaults"] : []].join(", ")}.`,
+		divergences
+	});
+};
+const saveStylesheet = (source, baseDocument) => {
+	switch (source.type) {
+		case "package":
+			if (!baseDocument?.originalBuffer) return baseDocument?.package.styles;
+			return parsedPackageStyles(baseDocument, baseDocument.package.styles);
+		case "supplied":
+			assertSuppliedStylesMatchSource(source.styles, baseDocument);
+			return source.styles;
+		default: return panic(`Unexpected stylesheet source: ${JSON.stringify(source)}`);
+	}
+};
+var MissingSaveStylesheet = class extends TaggedError("MissingSaveStylesheet") {};
+const assertSaveStylesheetAvailable = ({ pmDoc, styles, baseDocument, stylesheetSource }) => {
+	if (styles !== void 0) return;
+	if (stylesheetSource.type === "package" && baseDocument !== void 0) return;
+	pmDoc.descendants((node) => {
+		if ((() => {
+			switch (node.type.name) {
+				case "paragraph": {
+					const attrs = expectParagraphAttrs(node);
+					return attrs.styleId ?? attrs._originalFormatting?.runProperties?.styleId;
+				}
+				case "table": return expectTableAttrs(node).styleId;
+				default: return;
+			}
+		})() != null || node.marks.some(({ type }) => type.name === "characterStyle")) throw new MissingSaveStylesheet({ message: "Saving style-dependent content requires its authoritative stylesheet." });
+	});
+};
 /** Convert a ProseMirror document to the document model. */
-function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
+function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" }) {
 	assertNoteReferenceOccurrences(pmDoc);
 	switch (reuse) {
 		case "none": break;
@@ -284,7 +380,14 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	const proseContract = getProseDocumentParagraphPropertySourceContract(pmDoc);
 	if (proseContractAttribute !== null && proseContractAttribute !== void 0 && proseContract === null || (baseContract ?? null) !== proseContract) throw sourceValidationError("contract_mismatch", "The ProseMirror document does not match its paragraph-property source document.");
 	const tokenSources = baseContract && proseContract && baseDocument ? validateParagraphPropertySourceTokens(pmDoc, baseDocument, baseContract) : null;
-	const blocks = extractBlocks(pmDoc, "resolve", baseDocument?.package.styles ? createStyleEngine(baseDocument.package.styles) : null);
+	const styles = saveStylesheet(stylesheetSource, baseDocument);
+	assertSaveStylesheetAvailable({
+		pmDoc,
+		styles,
+		baseDocument,
+		stylesheetSource
+	});
+	const blocks = extractBlocks(pmDoc, "resolve", createStyleEngine(styles));
 	joinCommentRangesAcrossParagraphs(blocks);
 	completeCommentReferences(blocks);
 	const linkedSources = restoreLinkedParagraphPropertySources(blocks);
@@ -302,6 +405,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 			package: {
 				...baseDocument.package,
 				document: documentBody,
+				styles,
 				...numbering ? { numbering } : {}
 			}
 		};
@@ -310,6 +414,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	}
 	return { package: {
 		document: documentBody,
+		...styles ? { styles } : {},
 		...numbering ? { numbering } : {}
 	} };
 }
@@ -324,12 +429,13 @@ const hasSuggestedInsertion = (marks) => marks.some((mark) => mark.type.name ===
 * Returns the input array unchanged when there is nothing to strip so callers
 * can skip rebuilding the node.
 */
-function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
+function stripSuggestedInlineMarks(marks, readFormattingContext) {
 	const hasSuggestedDeletion = marks.some((mark) => mark.type.name === "deletion" && isSuggestedMark(mark));
 	const suggestedRunPropertyChange = marks.find((mark) => mark.type.name === "runPropertyChange" && isSuggestedMark(mark));
 	if (!hasSuggestedDeletion && !suggestedRunPropertyChange) return marks;
 	let next = marks.filter((mark) => !((mark.type.name === "deletion" || mark.type.name === "runPropertyChange") && isSuggestedMark(mark)));
 	if (suggestedRunPropertyChange) {
+		const { baseParagraphFormatting, inheritedFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver } = readFormattingContext();
 		const previousFormatting = expectRunPropertyChangeMarkAttrs(suggestedRunPropertyChange).changes.at(0)?.previousFormatting;
 		const characterStyleMark = marks.find(({ type }) => type.name === "characterStyle");
 		const characterStyleAttrs = characterStyleMark ? expectCharacterStyleMarkAttrs(characterStyleMark) : void 0;
@@ -435,6 +541,21 @@ function isSuggestedInsertedNode(node) {
 	}
 	return false;
 }
+const savedParagraphRunStyleContext = (paragraph, styleResolver) => {
+	const context = paragraphRunStyleContext(paragraph, styleResolver);
+	if (paragraph.content.size === 0) return context;
+	const attrs = expectParagraphAttrs(paragraph);
+	const source = resolveParagraphInheritedRunFormatting({
+		styleId: attrs.styleId,
+		styleResolver,
+		tableRunFormatting: attrs._tableRunFormatting,
+		paragraphMarkFormatting: attrs.styleId === void 0 ? context.paragraphMarkFormatting : void 0
+	});
+	return {
+		...context,
+		paragraphFormatting: source.inheritedFormatting
+	};
+};
 /**
 * Recursively rewrite a ProseMirror node tree, removing every suggested
 * tracked change. Returns `null` when the node itself must be dropped: a
@@ -442,32 +563,32 @@ function isSuggestedInsertedNode(node) {
 * Surviving block nodes are rebuilt with their suggested delete/merge markers
 * cleared and their children stripped.
 */
-function mapSuggestionStrippedNode(node, formattingContext = {
-	baseParagraphFormatting: void 0,
-	inheritedFormatting: void 0,
-	paragraphMarkFormatting: void 0,
-	paragraphMarkPrecedesStyle: false,
-	styleResolver: null
-}) {
+function mapSuggestionStrippedNode(node, readFormattingContext) {
 	if (node.isInline) {
 		if (hasSuggestedInsertion(node.marks)) return null;
-		const marks = stripSuggestedInlineMarks(node.marks, formattingContext);
+		const marks = stripSuggestedInlineMarks(node.marks, readFormattingContext);
 		return marks === node.marks ? node : node.mark(marks);
 	}
 	if (isSuggestedInsertedNode(node)) return null;
 	const nextAttrs = stripSuggestedNodeAttrs(node);
 	const children = [];
 	let changed = nextAttrs !== null;
-	const paragraphStyleContext = node.type.name === "paragraph" ? paragraphRunStyleContext(node, formattingContext.styleResolver) : void 0;
-	const childFormattingContext = paragraphStyleContext ? {
-		baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
-		inheritedFormatting: paragraphStyleContext.paragraphFormatting,
-		paragraphMarkFormatting: paragraphStyleContext.paragraphMarkFormatting,
-		paragraphMarkPrecedesStyle: paragraphStyleContext.paragraphMarkPrecedesStyle,
-		styleResolver: formattingContext.styleResolver
-	} : formattingContext;
+	let resolvedChildContext;
+	const readChildFormattingContext = node.type.name === "paragraph" ? () => {
+		if (resolvedChildContext) return resolvedChildContext;
+		const { styleResolver } = readFormattingContext();
+		const paragraphStyleContext = savedParagraphRunStyleContext(node, styleResolver);
+		resolvedChildContext = {
+			baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
+			inheritedFormatting: paragraphStyleContext.paragraphFormatting,
+			paragraphMarkFormatting: paragraphStyleContext.paragraphMarkFormatting,
+			paragraphMarkPrecedesStyle: paragraphStyleContext.paragraphMarkPrecedesStyle,
+			styleResolver
+		};
+		return resolvedChildContext;
+	} : readFormattingContext;
 	node.forEach((child) => {
-		const mapped = mapSuggestionStrippedNode(child, childFormattingContext);
+		const mapped = mapSuggestionStrippedNode(child, readChildFormattingContext);
 		if (mapped === null) {
 			changed = true;
 			return;
@@ -488,13 +609,13 @@ function mapSuggestionStrippedNode(node, formattingContext = {
 * {@link extractBlocks} for why this is the sole serialization boundary.
 */
 function stripSuggestedProvenance(doc, styleResolver) {
-	return mapSuggestionStrippedNode(doc, {
+	return mapSuggestionStrippedNode(doc, () => ({
 		baseParagraphFormatting: void 0,
 		inheritedFormatting: void 0,
 		paragraphMarkFormatting: void 0,
 		paragraphMarkPrecedesStyle: false,
 		styleResolver
-	}) ?? doc;
+	})) ?? doc;
 }
 function materializeNumberedRefValues(doc) {
 	const results = resolveNumberedRefFields(doc);
@@ -946,7 +1067,7 @@ function appendPageBreaks(paragraph, count) {
 */
 function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleResolver = null) {
 	const attrs = expectParagraphAttrs(node);
-	const paragraphStyleContext = paragraphRunStyleContext(node, styleResolver);
+	const paragraphStyleContext = savedParagraphRunStyleContext(node, styleResolver);
 	let content = extractParagraphContent(node, documentCounts, attrs._emptyHyperlinks ?? void 0, textBoxAnchorMarkers, attrs.renderedPageBreakBefore === true, {
 		baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
 		inheritedFormatting: paragraphStyleContext.paragraphFormatting,
@@ -1394,7 +1515,7 @@ const nestInlineWrapperGroups = (items, groups, hyperlinkIndices, revisionOuterW
 function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
 	const paragraph = coalesceNoteReferenceOccurrences(originalParagraph);
 	const content = [];
-	const paragraphStyleContext = paragraph.type.name === "paragraph" ? paragraphRunStyleContext(paragraph) : void 0;
+	const paragraphStyleContext = inheritedFormattingOverride === void 0 && paragraph.type.name === "paragraph" ? savedParagraphRunStyleContext(paragraph) : void 0;
 	const formattingContext = inheritedFormattingOverride ?? {
 		baseParagraphFormatting: paragraphStyleContext?.baseParagraphFormatting,
 		inheritedFormatting: paragraphStyleContext?.paragraphFormatting,
@@ -2597,6 +2718,7 @@ function createImageRun(node) {
 		},
 		wrap
 	};
+	if (attrs.pictureNames != null) image.pictureNames = { ...attrs.pictureNames };
 	if (attrs.docPrName != null) image.docPrName = attrs.docPrName;
 	if (attrs.alt != null) image.alt = attrs.alt;
 	if (attrs.title != null) image.title = attrs.title;
@@ -3327,7 +3449,7 @@ function convertPMTextBox(node, styleResolver = null) {
 * Preserves all non-content parts of the original document
 */
 function updateDocumentContent(originalDocument, pmDoc) {
-	return fromProseDoc(pmDoc, originalDocument);
+	return fromProseDoc(pmDoc, originalDocument, { stylesheetSource: { type: "package" } });
 }
 /**
 * Convert a ProseMirror document back to an array of `BlockContent` blocks

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,7 +1,8 @@
 import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.js";
-import { computeListRendering, getCachedNumberingMap } from "../../docx/numberingParser.js";
+import { listRenderingDefinitionsMatch, resolveListRenderingDefinition } from "../../docx/listRendering.js";
+import { getCachedNumberingMap } from "../../docx/numberingParser.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, paragraphFormattingWithAuthoredIndentation, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
@@ -41,7 +42,7 @@ import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
-import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
 import { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
@@ -52,7 +53,6 @@ import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trac
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
 import { HYPHEN_TEXT_CARRIERS } from "./hyphenTextCarriers.js";
-import { listRenderingDefinitionsMatch } from "./listRenderingDefinition.js";
 import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
@@ -407,13 +407,7 @@ const resolveListRendering = (numPr, context) => {
 	const key = `${numPr.numId}:${numPr.ilvl ?? 0}`;
 	const cached = context.listRenderings.get(key);
 	if (cached !== void 0) return cached;
-	const numbering = context.numbering;
-	const rendering = numbering === void 0 ? null : computeListRendering(numPr, numbering);
-	const nextLevel = numbering?.getLevel(numPr.numId, (numPr.ilvl ?? 0) + 1);
-	const resolved = {
-		rendering,
-		nextSlotOffset: nextLevel?.pPr?.hangingIndent === true && nextLevel.pPr.indentFirstLine !== void 0 && nextLevel.pPr.indentFirstLine < 0 ? -nextLevel.pPr.indentFirstLine : void 0
-	};
+	const resolved = resolveListRenderingDefinition(numPr, context.numbering);
 	context.listRenderings.set(key, resolved);
 	return resolved;
 };
@@ -436,7 +430,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	if (directFormatting === void 0) Reflect.deleteProperty(attrs, "_originalFormatting");
 	else attrs._originalFormatting = directFormatting;
 	const numPr = mergeParagraphNumbering(attrs.numPrFromStyle ?? void 0, attrs.numPr ?? void 0);
-	if (numPr?.kind === "none") Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
+	if (numPr?.kind === "none" || paragraph.listRendering !== void 0 && context.numbering !== void 0 && numPr === void 0) Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 	else if (context.numbering !== void 0 && numPr?.kind === "reference") {
 		Object.assign(attrs, listIndentationProvenancePatch({
 			direct: paragraphIndentationFromFormatting(directFormatting),
@@ -480,20 +474,12 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph && paragraph.formatting?.styleId === void 0) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
-	const { baseFormatting: baseRunFormatting, baseToggleCascade: orderedToggleFormatting, defaultFormatting: ordinaryBaseWithDefaultCharacter, defaultToggleCascade: defaultCharacterStyleCascade } = resolveParagraphBodyRunFormatting({
+	const { baseFormatting: baseRunFormatting, baseToggleCascade: orderedToggleFormatting, defaultFormatting: ordinaryBaseWithDefaultCharacter, defaultToggleCascade: defaultCharacterStyleCascade, inheritedFormatting: defaultRunFormatting, inheritedToggleCascade: defaultToggleCascade } = resolveParagraphInheritedRunFormatting({
 		styleId: paragraph.formatting?.styleId,
 		tableRunFormatting: extraRunFormatting,
-		styleResolver
+		styleResolver,
+		paragraphMarkFormatting: inheritableParagraphRunFormatting
 	});
-	const ordinaryDefaultRunFormatting = mergeTextFormatting(ordinaryBaseWithDefaultCharacter, inheritableParagraphRunFormatting);
-	const defaultToggleCascade = cascadeStyleTextFormatting([{
-		cascade: defaultCharacterStyleCascade,
-		type: "carried"
-	}, {
-		formatting: inheritableParagraphRunFormatting,
-		type: "direct"
-	}], { ordinaryFormatting: ordinaryDefaultRunFormatting });
-	const defaultRunFormatting = defaultToggleCascade.formatting;
 	if (extraRunFormatting !== void 0 || paragraph.content.length > 0) {
 		if (extraRunFormatting !== void 0) attrs._tableRunFormatting = extraRunFormatting;
 		if (defaultRunFormatting) attrs.defaultTextFormatting = defaultRunFormatting;
@@ -808,7 +794,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, runS
 	return nodes.map((node) => withTrackedRunMark(node, mark, ancestor));
 }
 function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay) {
-	const formatting = paragraph.formatting;
+	const formatting = paragraphFormattingWithAuthoredIndentation(paragraph);
 	const styleId = formatting?.styleId;
 	const styleName = styleId ? styleResolver?.getStyle(styleId)?.name : void 0;
 	const tableOfContentsLevel = tableOfContentsStyleLevel({
@@ -2241,6 +2227,7 @@ function convertImage({ image, rawXml, rawXmlMode, rawImageFingerprint, runForma
 		src: image.src || "",
 		preview: image.preview,
 		docPrName: image.docPrName,
+		pictureNames: image.pictureNames === void 0 ? void 0 : { ...image.pictureNames },
 		alt: image.alt,
 		title: image.title,
 		width: widthPx,

package/dist/prosemirror/extensions/nodes/ImageExtension.js

@@ -1,5 +1,6 @@
 import { imageLuminanceFilter } from "../../../utils/imageLuminance.js";
 import { expectImageAttrs } from "../../attrs/index.js";
+import { pictureNamesDomAttrs, pictureNamesFromDom } from "../../imagePictureNames.js";
 import { createNodeExtension } from "../create.js";
 //#region src/prosemirror/extensions/nodes/ImageExtension.ts
 /**
@@ -17,6 +18,7 @@ const ImageExtension = createNodeExtension({
 			src: {},
 			preview: { default: null },
 			docPrName: { default: null },
+			pictureNames: { default: null },
 			alt: { default: null },
 			title: { default: null },
 			width: { default: null },
@@ -73,6 +75,7 @@ const ImageExtension = createNodeExtension({
 			tag: "img[src]",
 			getAttrs(dom) {
 				const element = dom;
+				const pictureNames = pictureNamesFromDom(element);
 				const alt = element.getAttribute("alt");
 				const title = element.getAttribute("title");
 				const cssFloat = element.dataset["cssFloat"];
@@ -85,6 +88,8 @@ const ImageExtension = createNodeExtension({
 				const contrast = contrastRaw === void 0 ? NaN : Number(contrastRaw);
 				return {
 					src: element.getAttribute("src") || "",
+					...element.dataset["docPrName"] === void 0 ? {} : { docPrName: element.dataset["docPrName"] },
+					...Object.keys(pictureNames).length > 0 ? { pictureNames } : {},
 					...alt ? { alt } : {},
 					...title ? { title } : {},
 					...element.width ? { width: element.width } : {},
@@ -107,8 +112,10 @@ const ImageExtension = createNodeExtension({
 			const attrs = expectImageAttrs(node);
 			const domAttrs = {
 				src: attrs.src,
-				class: "docx-image"
+				class: "docx-image",
+				...pictureNamesDomAttrs(attrs.pictureNames)
 			};
+			if (attrs.docPrName != null) domAttrs["data-doc-pr-name"] = attrs.docPrName;
 			if (attrs.alt) domAttrs["alt"] = attrs.alt;
 			if (attrs.title) domAttrs["title"] = attrs.title;
 			if (attrs.rId) domAttrs["data-rid"] = attrs.rId;

package/dist/prosemirror/imagePictureNames.d.ts

@@ -0,0 +1,12 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/prosemirror/imagePictureNames.d.ts
+declare const PICTURE_NAME_DOM_ATTRIBUTES: {
+  readonly name: "data-picture-name";
+  readonly alt: "data-picture-alt";
+  readonly title: "data-picture-title";
+};
+/** Keep picture metadata separate from the containing drawing's accessibility strings. */
+declare const pictureNamesFromDom: (element: HTMLElement) => document_d_exports.NonVisualDrawingNames;
+declare const pictureNamesDomAttrs: (names: document_d_exports.NonVisualDrawingNames | undefined) => Record<string, string>;
+//#endregion
+export { PICTURE_NAME_DOM_ATTRIBUTES, pictureNamesDomAttrs, pictureNamesFromDom };

package/dist/prosemirror/imagePictureNames.js

@@ -0,0 +1,20 @@
+//#region src/prosemirror/imagePictureNames.ts
+const PICTURE_NAME_DOM_ATTRIBUTES = {
+	name: "data-picture-name",
+	alt: "data-picture-alt",
+	title: "data-picture-title"
+};
+/** Keep picture metadata separate from the containing drawing's accessibility strings. */
+const pictureNamesFromDom = (element) => Object.fromEntries(Object.entries(PICTURE_NAME_DOM_ATTRIBUTES).flatMap(([key, attribute]) => {
+	const value = element.getAttribute(attribute);
+	return value === null ? [] : [[key, value]];
+}));
+const pictureNamesDomAttrs = (names) => {
+	const values = new Map(Object.entries(names ?? {}));
+	return Object.fromEntries(Object.entries(PICTURE_NAME_DOM_ATTRIBUTES).flatMap(([key, attribute]) => {
+		const value = values.get(key);
+		return value === void 0 ? [] : [[attribute, value]];
+	}));
+};
+//#endregion
+export { PICTURE_NAME_DOM_ATTRIBUTES, pictureNamesDomAttrs, pictureNamesFromDom };

package/dist/prosemirror/paragraphFormattingProvenance.js

@@ -113,6 +113,7 @@ const styleResolvedParagraphFormatting = (resolved) => {
 		Reflect.set(governed, field, value);
 		found = true;
 	}
+	if (resolved.indentFirstLine !== void 0 && resolved.hangingIndent !== void 0) governed.hangingIndent = resolved.hangingIndent;
 	return found ? governed : void 0;
 };
 //#endregion

package/dist/prosemirror/runStyleFormatting.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { StyleEngine } from "../style-engine/styleEngine.js";
 import "../style-engine/index.js";
-import { cascadeStyleTextFormatting } from "./styles/styleToggleCascade.js";
+import { StyleToggleKey, cascadeStyleTextFormatting } from "./styles/styleToggleCascade.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/runStyleFormatting.d.ts
 declare const hasDirectRunFormatting: (formatting: document_d_exports.TextFormatting | undefined) => boolean;
@@ -41,6 +41,76 @@ declare const resolveParagraphBodyRunFormatting: ({ styleId, styleResolver, tabl
   defaultFormatting: document_d_exports.TextFormatting | undefined;
   defaultToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
 };
+type ResolveParagraphInheritedRunFormattingOptions = ResolveParagraphBodyRunFormattingOptions & {
+  paragraphMarkFormatting: document_d_exports.TextFormatting | undefined;
+};
+/** One source cascade for imported body runs and the saver inheritance baseline. */
+declare const resolveParagraphInheritedRunFormatting: (options: ResolveParagraphInheritedRunFormattingOptions) => {
+  inheritedFormatting: {
+    bold?: boolean | undefined;
+    boldCs?: boolean | undefined;
+    italic?: boolean | undefined;
+    italicCs?: boolean | undefined;
+    underline?: {
+      style: import("@stll/docx-core/model").UnderlineStyle;
+      color?: import("@stll/docx-core/model").ColorValue;
+    } | undefined;
+    strike?: boolean | undefined;
+    doubleStrike?: boolean | undefined;
+    vertAlign?: "baseline" | "superscript" | "subscript" | undefined;
+    smallCaps?: boolean | undefined;
+    allCaps?: boolean | undefined;
+    hidden?: boolean | undefined;
+    noProof?: boolean | undefined;
+    color?: import("@stll/docx-core/model").ColorValue | undefined;
+    highlight?: "black" | "blue" | "cyan" | "darkBlue" | "darkCyan" | "darkGray" | "darkGreen" | "darkMagenta" | "darkRed" | "darkYellow" | "green" | "lightGray" | "magenta" | "none" | "red" | "white" | "yellow" | undefined;
+    shading?: import("@stll/docx-core/model").ShadingProperties | undefined;
+    fontSize?: number | undefined;
+    fontSizeCs?: number | undefined;
+    fontFamily?: {
+      ascii?: string;
+      hAnsi?: string;
+      eastAsia?: string;
+      cs?: string;
+      hint?: "default" | "eastAsia" | "cs";
+      asciiTheme?: "majorAscii" | "majorHAnsi" | "majorEastAsia" | "majorBidi" | "minorAscii" | "minorHAnsi" | "minorEastAsia" | "minorBidi";
+      hAnsiTheme?: string;
+      eastAsiaTheme?: string;
+      csTheme?: string;
+    } | undefined;
+    language?: {
+      val?: string;
+      eastAsia?: string;
+      bidi?: string;
+    } | undefined;
+    spacing?: number | undefined;
+    position?: number | undefined;
+    scale?: number | undefined;
+    kerning?: number | undefined;
+    effect?: import("@stll/docx-core/model").TextEffect | undefined;
+    emphasisMark?: import("@stll/docx-core/model").EmphasisMark | undefined;
+    emboss?: boolean | undefined;
+    imprint?: boolean | undefined;
+    outline?: boolean | undefined;
+    shadow?: boolean | undefined;
+    rtl?: boolean | undefined;
+    cs?: boolean | undefined;
+    styleId?: string | undefined;
+    preserved?: import("@stll/docx-core/model").PreservedMarkup | undefined;
+  } | undefined;
+  inheritedToggleCascade: {
+    formatting: document_d_exports.TextFormatting | undefined;
+    toggleStates: ReadonlyMap<StyleToggleKey, {
+      value: boolean;
+      defaultsActive: boolean;
+    }>;
+    type: "styleToggleCascade";
+  };
+  baseFormatting: document_d_exports.TextFormatting | undefined;
+  baseToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
+  defaultFormatting: document_d_exports.TextFormatting | undefined;
+  defaultToggleCascade: ReturnType<typeof cascadeStyleTextFormatting>;
+};
 declare const paragraphRunStyleContext: (paragraph: Node, styleResolver?: RunStyleResolver | null) => ParagraphRunStyleContext;
 type ParagraphFormattingForRunOptions = {
   context: ParagraphRunStyleContext;
@@ -68,4 +138,4 @@ type ResolveEffectiveRunStyleFormattingOptions = {
 /** Resolve the non-direct run cascade from shared document styles and the current paragraph. */
 declare const resolveEffectiveRunStyleFormatting: ({ marks, paragraphFormatting, styleResolver }: ResolveEffectiveRunStyleFormattingOptions) => document_d_exports.TextFormatting | undefined;
 //#endregion
-export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export { ParagraphRunStyleContext, RunStyleResolver, getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };

package/dist/prosemirror/runStyleFormatting.js

@@ -118,6 +118,23 @@ const resolveParagraphBodyRunFormatting = ({ styleId, styleResolver, tableRunFor
 		defaultToggleCascade
 	};
 };
+/** One source cascade for imported body runs and the saver inheritance baseline. */
+const resolveParagraphInheritedRunFormatting = (options) => {
+	const body = resolveParagraphBodyRunFormatting(options);
+	const ordinaryFormatting = mergeTextFormatting(body.defaultFormatting, options.paragraphMarkFormatting);
+	const inheritedToggleCascade = cascadeStyleTextFormatting([{
+		cascade: body.defaultToggleCascade,
+		type: "carried"
+	}, {
+		formatting: options.paragraphMarkFormatting,
+		type: "direct"
+	}], { ordinaryFormatting });
+	return {
+		...body,
+		inheritedFormatting: inheritedToggleCascade.formatting,
+		inheritedToggleCascade
+	};
+};
 const paragraphRunStyleContext = (paragraph, styleResolver) => {
 	const attrs = expectParagraphAttrs(paragraph);
 	const paragraphMarkFormatting = attrs._originalFormatting?.runProperties;
@@ -184,4 +201,4 @@ const resolveEffectiveRunStyleFormatting = ({ marks, paragraphFormatting, styleR
 	});
 };
 //#endregion
-export { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };
+export { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, nearestParagraphRunStyleContext, paragraphFormattingForRun, paragraphRunStyleContext, paragraphRunStyleContextAt, resolveEffectiveRunStyleFormatting, resolveParagraphBodyRunFormatting, resolveParagraphInheritedRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting };

package/dist/prosemirror/schema/nodes.d.ts

@@ -405,6 +405,7 @@ type ImageAttrs = {
    */
   preview?: document_d_exports.PreviewDescriptor;
   docPrName?: string;
+  pictureNames?: document_d_exports.NonVisualDrawingNames;
   alt?: string;
   title?: string;
   /** Width in pixels (already converted from EMU) */

package/dist/prosemirror/styles/styleResolver.d.ts

@@ -81,6 +81,7 @@ declare class StyleResolver {
    * @returns Resolved paragraph and run formatting
    */
   resolveParagraphStyleInTable(styleId: string | undefined | null, tableParagraphOverlay: TableCellParagraphSpacingOverlay | undefined): ResolvedParagraphStyle;
+  private resolveParagraphFormatting;
   private resolveParagraphStyleCascade;
   /**
    * Resolve the style applied to the paragraph that follows one styled with
@@ -138,5 +139,7 @@ declare class StyleResolver {
  * Create a style resolver from document's style definitions
  */
 declare function createStyleResolver(styleDefinitions: document_d_exports.StyleDefinitions | undefined): StyleResolver;
+/** The same ordered paragraph tiers, without unrelated run or paragraph fields. */
+declare const resolveStyleParagraphNumbering: (resolver: StyleResolver, styleId: string | undefined | null) => import("@stll/docx-core/model").ParagraphNumberingOverride | undefined;
 //#endregion
-export { ResolvedParagraphStyle, StyleResolver, TableCellParagraphSpacingOverlay, createStyleResolver };
+export { ResolvedParagraphStyle, StyleResolver, TableCellParagraphSpacingOverlay, createStyleResolver, resolveStyleParagraphNumbering };