@stll/folio-core 0.57.0 → 0.58.0

package/dist/controller/canonicalSession.js

@@ -12,8 +12,8 @@ import { mapTocSelection } from "./canonicalTocSelection.js";
 import { Result, TaggedError, panic } from "better-result";
 import { hasIllegalXmlCharacters } from "@stll/docx-core";
 import { Fragment } from "prosemirror-model";
-import { DOCUMENT_OP_TYPES, OP_STORIES, applyDocumentOps, combineEdits, commentDocumentIssue, compileEditorIntent, createEditorIntentIdAllocator, documentStories, editorParagraphGroups, findStoryBody, normalizeForOps, packageParagraphIds, sameStory, validateOpsDocument } from "@stll/docx-core/ops";
-import { AllSelection, TextSelection } from "prosemirror-state";
+import { DOCUMENT_OP_REFUSAL_REASONS, DOCUMENT_OP_TYPES, OP_STORIES, applyDocumentOps, combineEdits, commentDocumentIssue, compileEditorIntent, createEditorIntentIdAllocator, documentStories, editorParagraphGroups, findStoryBody, normalizeForOps, packageParagraphIds, sameStory, validateOpsDocument } from "@stll/docx-core/ops";
+import { AllSelection, NodeSelection, TextSelection } from "prosemirror-state";
 //#region src/controller/canonicalSession.ts
 var CanonicalSessionError = class extends TaggedError("CanonicalSessionError") {};
 const refuse = (message) => Result.err(new CanonicalSessionError({
@@ -183,12 +183,21 @@ var CanonicalProjection = class {
 		return Result.ok(paragraph.start + gap.position);
 	}
 	selectionAt(state) {
-		if (!(state.selection instanceof TextSelection) && !(state.selection instanceof AllSelection)) return refuse("Canonical input requires a text selection.");
-		const range = canonicalSelectionRange(state);
-		const type = state.selection instanceof AllSelection ? "all" : "text";
-		const anchor = this.addressAt(type === "all" ? range.from : state.selection.anchor);
+		const selection = state.selection;
+		let type;
+		let anchorPosition = selection.anchor;
+		let headPosition = selection.head;
+		if (selection instanceof TextSelection) type = "text";
+		else if (selection instanceof NodeSelection && selection.node.isInline && selection.node.isAtom && selection.node.type.name !== "noteMarker") type = "inlineNode";
+		else if (selection instanceof AllSelection) {
+			type = "all";
+			const range = canonicalSelectionRange(state);
+			anchorPosition = range.from;
+			headPosition = range.to;
+		} else return refuse("Canonical input requires text, an inline atom, or the whole document selection.");
+		const anchor = this.addressAt(anchorPosition);
 		if (anchor.isErr()) return anchor;
-		const head = this.addressAt(type === "all" ? range.to : state.selection.head);
+		const head = this.addressAt(headPosition);
 		if (head.isErr()) return head;
 		return Result.ok({
 			type,
@@ -294,6 +303,7 @@ const project = ({ document, styles, story = OP_STORIES.MAIN }) => {
 	const paragraphs = [];
 	let failure;
 	converted.value.forEach((node, offset, index) => {
+		if (failure !== void 0) return;
 		const source = body.content.at(index);
 		if (source?.type !== "paragraph" || source.paraId === void 0) {
 			failure = new CanonicalSessionError({
@@ -305,7 +315,7 @@ const project = ({ document, styles, story = OP_STORIES.MAIN }) => {
 		}
 		if (node.type.name !== "paragraph" || node.attrs["paraId"] !== source.paraId) {
 			failure = new CanonicalSessionError({
-				gap: CANONICAL_GAP.dispatch,
+				gap: CANONICAL_GAP.storyContentProjection,
 				reason: "refused",
 				message: "The projection changed paragraph structure."
 			});
@@ -595,9 +605,13 @@ var CanonicalSession = class {
 		if (!Number.isFinite(time)) return refuse("The input time is invalid.");
 		if (from > to || hasIllegalXmlCharacters(text) || /[\t\r\n]/u.test(text)) return refuse("Canonical input accepts a well-formed text replacement.");
 		if (from === to && text.length === 0) return noChange("The input makes no text change.");
-		const start = projection.inputAddressAt(from);
+		const replacesAll = state.selection instanceof AllSelection && from === state.selection.from && to === state.selection.to;
+		const range = canonicalSelectionRange(state);
+		const inputFrom = replacesAll ? range.from : from;
+		const inputTo = replacesAll ? range.to : to;
+		const start = projection.inputAddressAt(inputFrom);
 		if (start.isErr()) return start;
-		const end = projection.inputAddressAt(to);
+		const end = projection.inputAddressAt(inputTo);
 		if (end.isErr()) return end;
 		const preSelection = projection.selectionAt(state);
 		if (preSelection.isErr()) return preSelection;
@@ -695,7 +709,14 @@ var CanonicalSession = class {
 				mode: this.intentMode(document, intent),
 				firstBlockId: this.nextBlockId
 			});
-			if (compiled.isErr()) return refuse(compiled.error.message);
+			if (compiled.isErr()) {
+				if (compiled.error.reason === DOCUMENT_OP_REFUSAL_REASONS.UNTRACKABLE && (intent.type === "setHyperlink" || intent.type === "removeHyperlink" || intent.type === "insertHyperlink")) return Result.err(new CanonicalSessionError({
+					gap: CANONICAL_GAP.trackedHyperlinkResolution,
+					reason: "refused",
+					message: compiled.error.message
+				}));
+				return refuse(compiled.error.message);
+			}
 			const applied = applyDocumentOps(document, compiled.value.ops);
 			if (applied.isErr()) return refuse(applied.error.message);
 			document = applied.value.document;
@@ -981,8 +1002,11 @@ var CanonicalSession = class {
 			document: applied.value.document,
 			previous: this.currentDocument
 		});
-		const unsupported = unsupportedSeedReason(applied.value.document, changed);
-		if (unsupported !== null) return refuse(unsupported);
+		if (unsupportedSeedReason(applied.value.document, changed) !== null) return Result.err(new CanonicalSessionError({
+			gap: CANONICAL_GAP.storyContentProjection,
+			reason: "refused",
+			message: "The operations produce unsupported canonical story content."
+		}));
 		preservePropertySources({
 			target: applied.value.document,
 			source: this.currentDocument,
@@ -1037,15 +1061,17 @@ var CanonicalSession = class {
 			transaction.replaceWith(from, to, Fragment.fromArray(replacement));
 		}
 		if (!transaction.doc.eq(projected.value.doc)) transaction.replaceWith(0, transaction.doc.content.size, projected.value.doc.content);
-		if (sameStory(selection.anchor.story, projectedStory) && sameStory(selection.head.story, projectedStory)) restoreCanonicalSelection({
-			transaction,
-			projection: projected.value,
-			selection,
-			unavailable: {
-				type: "near",
-				anchor: state.selection.anchor
-			}
-		});
+		if (sameStory(selection.anchor.story, projectedStory) && sameStory(selection.head.story, projectedStory)) {
+			if (!restoreCanonicalSelection({
+				transaction,
+				projection: projected.value,
+				selection,
+				unavailable: {
+					type: "near",
+					anchor: state.selection.anchor
+				}
+			})) return refuse("Canonical history cannot restore the selected inline atom.");
+		}
 		transaction.setMeta(CANONICAL_PROJECTION_META, {
 			type: "canonical",
 			origin,
@@ -1104,6 +1130,11 @@ var CanonicalSession = class {
 	}
 };
 const createCanonicalSession = (document, styles) => {
+	if (documentStories(document).some((story) => findStoryBody(document, story)?.content.some((block) => block.type === "table"))) return Result.err(new CanonicalSessionError({
+		gap: CANONICAL_GAP.tableActivation,
+		reason: "refused",
+		message: "Canonical sessions cannot activate documents containing tables."
+	}));
 	const unsupported = unsupportedSeedReason(document);
 	if (unsupported !== null) return refuse(unsupported);
 	const owned = cloneDocumentWithParagraphPropertySources(document);
@@ -1192,7 +1223,12 @@ const isCanonicalJoinBoundary = (state, direction) => {
 /** Native character deletion consumes one whole visible grapheme. */
 const deletionRange = (state, direction) => {
 	const { selection } = state;
-	if (!(selection instanceof TextSelection)) return refuse("Canonical deletion requires a text selection.");
+	if (selection instanceof NodeSelection && selection.node.isInline && selection.node.isAtom && selection.node.type.name !== "noteMarker") return Result.ok({
+		from: selection.from,
+		to: selection.to
+	});
+	if (selection instanceof AllSelection) return Result.ok(canonicalSelectionRange(state));
+	if (!(selection instanceof TextSelection)) return refuse("Canonical deletion requires text, an inline atom, or the whole document selection.");
 	if (!selection.empty) return Result.ok({
 		from: selection.from,
 		to: selection.to

package/dist/controller/canonicalStoryEditor.d.ts

@@ -25,7 +25,7 @@ declare const createCanonicalStoryEditor: ({ story, getView, getApi, enabled, on
       beforeinput: (view: EditorView, event: InputEvent) => boolean;
       mousedown: (view: EditorView) => boolean;
       compositionstart: (view: EditorView) => boolean;
-      compositionend: (view: EditorView) => boolean;
+      compositionend: (view: EditorView, event: Event) => boolean;
       input: (view: EditorView) => boolean;
       blur: (view: EditorView) => boolean;
       paste: (view: EditorView, event: ClipboardEvent) => boolean;

package/dist/controller/canonicalStoryEditor.js

@@ -93,7 +93,7 @@ const createCanonicalStoryEditor = ({ story, getView, getApi, enabled, onRefusal
 				beforeinput: (view, event) => enabled() && boundary.handleDOMEvents.beforeinput(view, event),
 				mousedown: (view) => enabled() && boundary.handleDOMEvents.mousedown(view),
 				compositionstart: (view) => enabled() && boundary.handleDOMEvents.compositionstart(view),
-				compositionend: (view) => enabled() && boundary.handleDOMEvents.compositionend(view),
+				compositionend: (view, event) => enabled() && boundary.handleDOMEvents.compositionend(view, event),
 				input: (view) => enabled() && boundary.handleDOMEvents.input(view),
 				blur: (view) => enabled() && boundary.handleDOMEvents.blur(view),
 				paste: (view, event) => enabled() && boundary.handleDOMEvents.paste(view, event),

package/dist/controller/canonicalStructure.js

@@ -15,6 +15,11 @@ const refuse = (message) => Result.err(new CanonicalSessionError({
 	message,
 	reason: "refused"
 }));
+const noChange = (message) => Result.err(new CanonicalSessionError({
+	gap: CANONICAL_GAP.commands,
+	message,
+	reason: "noChange"
+}));
 const selectedParagraphs = (session, state) => {
 	const ids = /* @__PURE__ */ new Set();
 	state.doc.nodesBetween(state.selection.from, state.selection.to, (node) => {
@@ -218,7 +223,7 @@ const prepareCanonicalCommands = (session, state, commands) => {
 					offset: 0
 				};
 				const level = (numPr.ilvl ?? 0) + (command.direction === "increase" ? 1 : -1);
-				if (level > 8) return refuse("The list is already at its deepest level.");
+				if (level > 8) return noChange("The list is already at its deepest level.");
 				intents.push({
 					type: "formatParagraph",
 					at,
@@ -234,7 +239,7 @@ const prepareCanonicalCommands = (session, state, commands) => {
 			const source = paragraphs.at(0);
 			const numPr = source?.formatting?.numPr;
 			const definitions = session.document.package.numbering;
-			if (source === void 0 || numPr?.kind !== "reference" || definitions === void 0) return refuse("Numbering changes require a list paragraph.");
+			if (source === void 0 || numPr?.kind !== "reference" || definitions === void 0) return noChange("Numbering changes require a list paragraph.");
 			const body = session.document.package.document.content;
 			const index = body.findIndex((item) => item === source);
 			const affected = body.slice(index).filter((item) => item.type === "paragraph" && item.formatting?.numPr?.kind === "reference" && item.formatting.numPr.numId === numPr.numId);
@@ -244,7 +249,7 @@ const prepareCanonicalCommands = (session, state, commands) => {
 				const map = getCachedNumberingMap(definitions);
 				const bullet = numberingLevelUsesBulletMarker(map.getLevel(numPr.numId, numPr.ilvl ?? 0));
 				const earlier = body.slice(0, index).findLast((item) => item.type === "paragraph" && item.formatting?.numPr?.kind === "reference" && item.formatting.numPr.numId !== numPr.numId && numberingLevelUsesBulletMarker(map.getLevel(item.formatting.numPr.numId, item.formatting.numPr.ilvl ?? 0)) === bullet);
-				if (earlier?.type !== "paragraph" || earlier.formatting?.numPr?.kind !== "reference") return refuse("There is no preceding compatible list.");
+				if (earlier?.type !== "paragraph" || earlier.formatting?.numPr?.kind !== "reference") return noChange("There is no preceding compatible list.");
 				targetId = earlier.formatting.numPr.numId;
 				target = {
 					type: "existing",

package/dist/controller/hiddenEditorApi.js

@@ -9,7 +9,7 @@ import { redo, undo } from "prosemirror-history";
 */
 const stateToDocument = (state, originalDoc) => {
 	if (!originalDoc) return null;
-	return fromProseDoc(state.doc, originalDoc);
+	return fromProseDoc(state.doc, originalDoc, { stylesheetSource: { type: "package" } });
 };
 const createHiddenEditorApi = (deps) => {
 	const dispatchTr = (view, tr) => {

package/dist/controller/hiddenEditorManager.js

@@ -688,7 +688,7 @@ const createHiddenEditorManager = (deps) => {
 				blur: (pmView) => editorSession.type === "canonical" ? input.handleDOMEvents.blur(pmView) : false,
 				...createHiddenEditorClipboardHandlers(deps),
 				compositionstart: (pmView) => editorSession.type === "canonical" ? input.handleDOMEvents.compositionstart(pmView) : false,
-				compositionend: (pmView) => editorSession.type === "canonical" ? input.handleDOMEvents.compositionend(pmView) : false,
+				compositionend: (pmView, event) => editorSession.type === "canonical" ? input.handleDOMEvents.compositionend(pmView, event) : false,
 				input: (pmView) => editorSession.type === "canonical" ? input.handleDOMEvents.input(pmView) : false,
 				paste: (pmView, event) => {
 					if (editorSession.type === "canonical" && !deps.getReadOnly()) return input.handleDOMEvents.paste(pmView, event);

package/dist/docx/listRendering.d.ts

@@ -0,0 +1,18 @@
+import { document_d_exports } from "../types/document.js";
+import { NumberingMap } from "./numberingParser.js";
+//#region src/docx/listRendering.d.ts
+/** Compare scalar fields directly; only nested records need canonical ordering. */
+declare const listRenderingDefinitionsMatch: (left: document_d_exports.ListRendering, right: document_d_exports.ListRendering) => boolean;
+type ListRenderingDefinition = {
+  rendering: document_d_exports.ListRendering | null;
+  nextSlotOffset: number | undefined;
+};
+/** Resolve numbering facts independently of any paragraph's cached counters. */
+declare const resolveListRenderingDefinition: (numPr: {
+  numId: number;
+  ilvl?: number;
+}, numbering: NumberingMap | undefined) => ListRenderingDefinition;
+/** Keep content-derived counter/folded-field facts only while their definition is current. */
+declare const resolveCachedListRendering: (cached: document_d_exports.ListRendering | undefined, { rendering, nextSlotOffset }: ListRenderingDefinition) => document_d_exports.ListRendering | null;
+//#endregion
+export { ListRenderingDefinition, listRenderingDefinitionsMatch, resolveCachedListRendering, resolveListRenderingDefinition };

package/dist/{prosemirror/conversion/listRenderingDefinition.js → docx/listRendering.js}

@@ -1,5 +1,6 @@
-import { canonicalJson } from "../../utils/canonicalJson.js";
-//#region src/prosemirror/conversion/listRenderingDefinition.ts
+import { canonicalJson } from "../utils/canonicalJson.js";
+import { computeListRendering } from "./numberingParser.js";
+//#region src/docx/listRendering.ts
 const DEFINITION_FIELDS = Object.values({
 	marker: {
 		key: "marker",
@@ -93,5 +94,18 @@ const listRenderingDefinitionsMatch = (left, right) => {
 	}
 	return true;
 };
+/** Resolve numbering facts independently of any paragraph's cached counters. */
+const resolveListRenderingDefinition = (numPr, numbering) => {
+	const nextLevel = numbering?.getLevel(numPr.numId, (numPr.ilvl ?? 0) + 1);
+	return {
+		rendering: numbering === void 0 ? null : computeListRendering(numPr, numbering),
+		nextSlotOffset: nextLevel?.pPr?.hangingIndent === true && nextLevel.pPr.indentFirstLine !== void 0 && nextLevel.pPr.indentFirstLine < 0 ? -nextLevel.pPr.indentFirstLine : void 0
+	};
+};
+/** Keep content-derived counter/folded-field facts only while their definition is current. */
+const resolveCachedListRendering = (cached, { rendering, nextSlotOffset }) => {
+	if (rendering === null) return null;
+	return cached !== void 0 && listRenderingDefinitionsMatch(cached, rendering) && (cached.markerSecondSlotOffsetTwips === void 0 || cached.markerSecondSlotOffsetTwips === nextSlotOffset) ? cached : rendering;
+};
 //#endregion
-export { listRenderingDefinitionsMatch };
+export { listRenderingDefinitionsMatch, resolveCachedListRendering, resolveListRenderingDefinition };

package/dist/docx/server/materializeYjsDocx.js

@@ -82,7 +82,7 @@ const materializeYjsDocx = async ({ sourceDocx, yjsUpdate }) => {
 	const proseMirrorDocument = readProseMirrorDocument(yjsUpdate);
 	const baseDocument = await parseDocx(sourceDocx, { preloadFonts: false });
 	const converted = Result.try({
-		try: () => fromProseDoc(proseMirrorDocument, baseDocument),
+		try: () => fromProseDoc(proseMirrorDocument, baseDocument, { stylesheetSource: { type: "package" } }),
 		catch: (cause) => cause instanceof ParagraphPropertySourceValidationError ? new FolioYjsDocxMaterializationError({
 			code: "source_mismatch",
 			message: "The collaboration snapshot belongs to a different source document.",

package/dist/markdown/internals.js

@@ -1,5 +1,6 @@
 import { createBuiltInStyleIndex } from "../docx/builtInStyles.js";
 import { createListLabelCounter } from "../prosemirror/listLabels.js";
+import { createStyleResolver, resolveStyleParagraphNumbering } from "../prosemirror/styles/styleResolver.js";
 import { createNoteReferenceNumbering, noteReferenceMarker, noteReferenceToken } from "../utils/noteReferenceLabels.js";
 //#region src/markdown/internals.ts
 /**
@@ -18,7 +19,13 @@ import { createNoteReferenceNumbering, noteReferenceMarker, noteReferenceToken }
 * make the render quadratic.
 */
 function newContext(opts = {}, styles) {
+	const resolver = createStyleResolver(styles);
+	const numbering = /* @__PURE__ */ new Map();
 	return {
+		paragraphNumbering: (styleId) => {
+			if (!numbering.has(styleId)) numbering.set(styleId, resolveStyleParagraphNumbering(resolver, styleId));
+			return numbering.get(styleId);
+		},
 		builtInStyles: createBuiltInStyleIndex(styles?.styles ?? [], styles?.docDefaults),
 		opts: {
 			annotations: opts.annotations ?? "html",

package/dist/markdown/renderParagraph.js

@@ -1,4 +1,7 @@
 import { isQuoteStyle, resolveHeadingLevel } from "../docx/builtInStyles.js";
+import { resolveCachedListRendering, resolveListRenderingDefinition } from "../docx/listRendering.js";
+import { getCachedNumberingMap } from "../docx/numberingParser.js";
+import { mergeParagraphNumbering } from "../docx/numberingReference.js";
 import { listLabelAttrsFromRendering } from "../prosemirror/listLabels.js";
 import { inlineBreaksToHtml } from "./escape.js";
 import { renderParagraphInline } from "./renderRuns.js";
@@ -32,7 +35,12 @@ function renderParagraph(ctx, pkg, para) {
 * does not define as prose, as every other reader reads them.
 */
 function renderParagraphBlock(ctx, pkg, para) {
-	const label = ctx.nextListLabel(listLabelAttrs(para));
+	const numPrFromStyle = ctx.paragraphNumbering(para.formatting?.styleId) ?? para.formatting?.numPrFromStyle;
+	const numPr = mergeParagraphNumbering(numPrFromStyle, para.formatting?.numPr);
+	let list = para.listRendering;
+	if (numPr?.kind === "none" || pkg?.numbering !== void 0 && numPr === void 0) list = void 0;
+	else if (pkg?.numbering !== void 0 && numPr?.kind === "reference") list = resolveCachedListRendering(para.listRendering, resolveListRenderingDefinition(numPr, getCachedNumberingMap(pkg.numbering))) ?? void 0;
+	const label = ctx.nextListLabel(list ? listLabelAttrsFromRendering(list, numPrFromStyle) : UNNUMBERED);
 	const inline = renderParagraphInline(ctx, pkg, para.content, para.paraId);
 	const styleId = para.formatting?.styleId;
 	const headingLevel = markdownHeadingLevel(ctx, para);
@@ -49,8 +57,8 @@ function renderParagraphBlock(ctx, pkg, para) {
 			isListItem: false
 		};
 	}
-	if (para.listRendering && label !== void 0) return {
-		markdown: renderListItem(ctx, para.listRendering, label, inline),
+	if (list && label !== void 0) return {
+		markdown: renderListItem(ctx, list, label, inline),
 		isListItem: true
 	};
 	ctx.listIndentWidths = [];
@@ -72,15 +80,6 @@ function markdownHeadingLevel(ctx, para) {
 }
 const UNNUMBERED = Object.freeze({});
 /**
-* The attrs the page's list counter reads, projected from the paragraph the
-* way the editor projects them (`toProseDoc`). A paragraph without a list
-* rendering counts as unnumbered.
-*/
-function listLabelAttrs(para) {
-	const list = para.listRendering;
-	return list ? listLabelAttrsFromRendering(list, para.formatting?.numPrFromStyle) : UNNUMBERED;
-}
-/**
 * A plain paragraph whose visible text begins with markdown block syntax (e.g.
 * `# Not a heading`, `- value`, `1. value`, `> quote`) would be reclassified as
 * a heading/list/blockquote on re-parse, even though Word carries no matching

package/dist/markdown/renderRuns.js

@@ -1,5 +1,5 @@
 import { getHyperlinkRuns } from "../docx/hyperlinkParser.js";
-import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "../docx/relsParser.js";
+import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType, resolveRelativePath } from "../docx/relsParser.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { wrapComment, wrapDeletion, wrapInsertion, wrapMoveFrom, wrapMoveTo } from "./annotations.js";
 import { escapeAltText, escapeInline, escapeLinkUrl } from "./escape.js";
@@ -226,7 +226,7 @@ function renderRunContent(ctx, pkg, content, paraId) {
 		case "noteMarker": break;
 		case "drawing": {
 			const ref = resolveRelationshipIdOfType(pkg?.relationships, item.image.rId, RELATIONSHIP_TYPES.image);
-			const media = ref.status === "resolved" ? pkg?.media?.get(ref.relationship.target) : void 0;
+			const media = ref.status === "resolved" ? pkg?.media?.get(resolveRelativePath("word/document.xml", ref.relationship.target)) : void 0;
 			if (media) {
 				const reg = registerImage(ctx, media, item.image, paraId);
 				const alt = reg.alt ? escapeAltText(reg.alt) : "";

package/dist/markdown/types.d.ts

@@ -1,3 +1,4 @@
+import { document_d_exports } from "../types/document.js";
 import { NoteReferenceKind, NoteReferenceNumbering } from "../utils/noteReferenceLabels.js";
 import { BuiltInStyleIndex } from "../docx/builtInStyles.js";
 import { ListLabelCounter } from "../prosemirror/listLabels.js";
@@ -140,6 +141,8 @@ type RenderContext = {
   nextListLabel: ListLabelCounter;
   /** The document's styles indexed by the built-in they are; classifies headings and quotes. */
   builtInStyles: BuiltInStyleIndex;
+  /** Authoritative paragraph numbering inherited through the style cascade. */
+  paragraphNumbering: (styleId: string | undefined) => document_d_exports.ParagraphFormatting["numPr"];
   /**
    * Active native Markdown ancestor marker widths, indexed by OOXML level.
    * Missing levels contribute no columns. Prose, headings and container

package/dist/prosemirror/attrs/index.js

@@ -8,6 +8,7 @@ import { attrsRecord, attrsResult, expectAttrs, expectCachedNodeAttrs, expectNod
 import { COUNTER_FORMAT_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LINE_SPACING_RULE_VALUES, OUTLINE_STYLE_ATTR_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_DIRECTION_VALUES, TEXT_EFFECT_VALUES, UNDERLINE_STYLE_VALUES } from "../../types/documentEnumValues.js";
 import { canonicalJson } from "../../utils/canonicalJson.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
+import { PICTURE_NAME_DOM_ATTRIBUTES } from "../imagePictureNames.js";
 import { isNoteReferenceOccurrenceId } from "../noteReferenceOccurrenceId.js";
 import { paragraphNumberingFromAttrValue } from "../numberingAttr.js";
 import { outlineLevelFromAttrValue } from "../outlineLevelAttr.js";
@@ -489,6 +490,9 @@ const readImageAttrs = (node) => {
 	expectNodeType(node, "image", issues);
 	requiredString(attrs, "src", "image.attrs.src", issues);
 	optionalString(attrs, "docPrName", "image.attrs.docPrName", issues);
+	optionalNestedRecord(attrs, "pictureNames", "image.attrs.pictureNames", issues, (names, path, nestedIssues) => {
+		for (const key of Object.keys(PICTURE_NAME_DOM_ATTRIBUTES)) optionalString(names, key, `${path}.${key}`, nestedIssues);
+	});
 	optionalString(attrs, "alt", "image.attrs.alt", issues);
 	optionalString(attrs, "title", "image.attrs.title", issues);
 	optionalString(attrs, "rId", "image.attrs.rId", issues);

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

@@ -16,11 +16,18 @@ import { Node } from "prosemirror-model";
 type ProjectionReuse = "none" | "matched";
 /** How the conversion treats records the editor did not change. */
 type FromProseDocOptions = {
+  /** The stylesheet authority used to construct the projection. */
+  stylesheetSource: {
+    type: "package";
+  } | {
+    type: "supplied";
+    styles: document_d_exports.StyleDefinitions;
+  };
   /** Defaults to `"none"`, the only value implemented. */
   reuse?: ProjectionReuse;
 };
 /** Convert a ProseMirror document to the document model. */
-declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Document, { reuse }?: FromProseDocOptions): document_d_exports.Document;
+declare function fromProseDoc(pmDoc: Node, baseDocument: document_d_exports.Document | undefined, { stylesheetSource, reuse }: FromProseDocOptions): document_d_exports.Document;
 declare function tableAttrsToFormatting(attrs: TableAttrs): document_d_exports.TableFormatting | undefined;
 /**
  * Convert ProseMirror table row attrs to TableRowFormatting