@stll/folio-core 0.43.0 → 0.45.0

package/dist/markdown/renderBlock.js

@@ -1,8 +1,14 @@
 import { cloneParagraphWithoutPropertySource } from "../docx/paragraphPropertySource.js";
 import { renderParagraph } from "./renderParagraph.js";
 import { renderTable } from "./renderTable.js";
+import { panic } from "better-result";
 //#region src/markdown/renderBlock.ts
 /**
+* Block-level dispatcher. Walks `BlockContent[]` and joins the rendered
+* markdown for each block, suppressing redundant blank lines between list items
+* of the same list. Ported from eigenpal/docx-editor PR #595.
+*/
+/**
 * In `trackedChanges: "clean"` mode every change is accepted. A paragraph whose
 * end-of-paragraph mark is a pending deletion (`pPrMark.kind === "del"`) loses
 * its break on accept and merges with the following paragraph. Word's join
@@ -34,30 +40,38 @@ function renderBlocks(ctx, pkg, blocks) {
 	const out = [];
 	let prevWasListItem = false;
 	const ordered = ctx.opts.trackedChanges === "clean" ? mergeAcceptedParagraphBreaks(blocks) : blocks;
-	for (const block of ordered) if (block.type === "paragraph") {
-		const isListItem = !!block.listRendering && !block.listRendering.markerHidden;
-		const md = renderParagraph(ctx, pkg, block);
-		if (!md) {
-			prevWasListItem = false;
-			continue;
+	for (const block of ordered) switch (block.type) {
+		case "paragraph": {
+			const isListItem = !!block.listRendering && !block.listRendering.markerHidden;
+			const md = renderParagraph(ctx, pkg, block);
+			if (!md) {
+				prevWasListItem = false;
+				continue;
+			}
+			if (isListItem && prevWasListItem) out.push(md);
+			else if (out.length) out.push("", md);
+			else out.push(md);
+			prevWasListItem = isListItem;
+			break;
 		}
-		if (isListItem && prevWasListItem) out.push(md);
-		else if (out.length) out.push("", md);
-		else out.push(md);
-		prevWasListItem = isListItem;
-	} else if (block.type === "table") {
-		const md = renderTable(ctx, pkg, block);
-		if (md) {
-			if (out.length) out.push("");
-			out.push(md);
+		case "table": {
+			const md = renderTable(ctx, pkg, block);
+			if (md) {
+				if (out.length) out.push("");
+				out.push(md);
+			}
+			prevWasListItem = false;
+			break;
 		}
-		prevWasListItem = false;
-	} else {
-		const nested = renderBlocks(ctx, pkg, block.content);
-		if (nested) {
-			if (out.length) out.push("");
-			out.push(nested);
+		case "blockSdt": {
+			const nested = renderBlocks(ctx, pkg, block.content);
+			if (nested) {
+				if (out.length) out.push("");
+				out.push(nested);
+			}
+			break;
 		}
+		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
 	}
 	return out.join("\n");
 }

package/dist/markdown/renderParagraph.js

@@ -1,5 +1,5 @@
+import { isQuoteStyle, resolveHeadingLevel } from "../docx/builtInStyles.js";
 import { resolveListTemplate } from "../prosemirror/listMarker.js";
-import { isHeadingStyle, parseHeadingLevel } from "./headings.js";
 import { renderParagraphInline } from "./renderRuns.js";
 //#region src/markdown/renderParagraph.ts
 /**
@@ -8,7 +8,13 @@ import { renderParagraphInline } from "./renderRuns.js";
 * marker preserved); plain prose → escaped inline content. Word's `Quote` /
 * `IntenseQuote` styles become blockquotes. Ported from eigenpal/docx-editor
 * PR #595.
+*
+* Which paragraphs those are is `builtInStyles`' decision, not this file's: the
+* id `Nadpis1` and the id `Heading1` are the same heading, and `ClauseHeading1`
+* is not one at all.
 */
+/** Markdown has six heading levels; Word has nine. */
+const MAX_MARKDOWN_HEADING_LEVEL = 6;
 /**
 * Render a paragraph and return the block text. No surrounding blank line: the
 * caller joins blocks.
@@ -16,13 +22,16 @@ import { renderParagraphInline } from "./renderRuns.js";
 function renderParagraph(ctx, pkg, para) {
 	const inline = renderParagraphInline(ctx, pkg, para.content, para.paraId);
 	const styleId = para.formatting?.styleId;
-	if (isHeadingStyle(styleId)) {
+	const headingLevel = resolveHeadingLevel({
+		outlineLevel: para.formatting?.outlineLevel,
+		styleId
+	}, ctx.builtInStyles);
+	if (headingLevel !== void 0) {
 		if (!inline) return "";
-		const level = parseHeadingLevel(styleId) ?? 1;
-		return `${"#".repeat(Math.max(1, Math.min(6, level)))} ${inline}`;
+		return `${"#".repeat(Math.min(MAX_MARKDOWN_HEADING_LEVEL, headingLevel + 1))} ${inline}`;
 	}
 	if (para.listRendering && !para.listRendering.markerHidden) return renderListItem(ctx, para.listRendering, inline);
-	if (styleId === "Quote" || styleId === "IntenseQuote") return inline.split("\n").map((line) => `> ${line}`).join("\n");
+	if (isQuoteStyle(styleId, ctx.builtInStyles)) return inline.split("\n").map((line) => `> ${line}`).join("\n");
 	return escapeLeadingBlockMarker(inline);
 }
 /**

package/dist/markdown/renderRuns.js

@@ -1,3 +1,4 @@
+import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } 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";
@@ -88,8 +89,8 @@ function renderRunContent(ctx, pkg, content, paraId) {
 			break;
 		}
 		case "drawing": {
-			const ref = pkg?.relationships?.get(item.image.rId);
-			const media = ref ? pkg?.media?.get(ref.target) : void 0;
+			const ref = resolveRelationshipIdOfType(pkg?.relationships, item.image.rId, RELATIONSHIP_TYPES.image);
+			const media = ref.status === "resolved" ? pkg?.media?.get(ref.relationship.target) : void 0;
 			if (media) {
 				const reg = registerImage(ctx, media, item.image, paraId);
 				const alt = reg.alt ? escapeAltText(reg.alt) : "";
@@ -101,7 +102,7 @@ function renderRunContent(ctx, pkg, content, paraId) {
 				out += `![${escapeAltText(alt)}](${item.image.src})`;
 				break;
 			}
-			pushWarning(ctx, `image rId=${item.image.rId} not resolvable`);
+			pushWarning(ctx, `image rId=${item.image.rId ?? "(absent)"} not resolvable`);
 			break;
 		}
 		case "shape":

package/dist/markdown/renderTable.js

@@ -1,3 +1,4 @@
+import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "../docx/relsParser.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { escapeTableCell } from "./escape.js";
 import { registerImage } from "./images.js";
@@ -185,8 +186,8 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 			break;
 		case "softHyphen": break;
 		case "drawing": {
-			const ref = pkg?.relationships?.get(item.image.rId);
-			const media = ref ? pkg?.media?.get(ref.target) : void 0;
+			const ref = resolveRelationshipIdOfType(pkg?.relationships, item.image.rId, RELATIONSHIP_TYPES.image);
+			const media = ref.status === "resolved" ? pkg?.media?.get(ref.relationship.target) : void 0;
 			if (media) {
 				const reg = registerImage(ctx, media, item.image, paraId);
 				const alt = reg.alt ? escapeHtml(reg.alt) : "";
@@ -198,7 +199,7 @@ function renderHtmlRun(ctx, pkg, run, paraId) {
 				text += `<img src="${escapeHtml(item.image.src)}" alt="${alt}">`;
 				break;
 			}
-			pushWarning(ctx, `image rId=${item.image.rId} not resolvable`);
+			pushWarning(ctx, `image rId=${item.image.rId ?? "(absent)"} not resolvable`);
 			break;
 		}
 		case "footnoteRef":

package/dist/markdown/trailers.js

@@ -1,7 +1,15 @@
 import { escapeLinkUrl } from "./escape.js";
 import { renderBlocks } from "./renderBlock.js";
+import { panic } from "better-result";
 //#region src/markdown/trailers.ts
 /**
+* Trailer sections appended after the document body: footnote definitions, the
+* hyperlink reference list (`hyperlinks: "reference"`), and the comments
+* sidecar (`comments: "sidecar"`). Split out of `internals` so the renderers
+* can import `pushWarning` without pulling in `renderBlock` (which would form an
+* import cycle). Ported from eigenpal/docx-editor PR #595.
+*/
+/**
 * Append footnote definitions, the hyperlink reference list (for
 * `hyperlinks: "reference"`), and the comments sidecar block (for
 * `comments: "sidecar"`). Each section is emitted only when its corresponding
@@ -41,13 +49,39 @@ function runText(run) {
 /** Flatten paragraph inline content to plain text, recursing through wrappers. */
 function inlineText(content) {
 	let out = "";
-	for (const item of content) if (item.type === "run") out += runText(item);
-	else if (item.type === "hyperlink") {
-		for (const child of item.children) if (child.type === "run") out += runText(child);
-	} else if (item.type === "simpleField") out += inlineText(item.content);
-	else if (item.type === "complexField") out += inlineText(item.fieldResult);
-	else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") out += inlineText(item.content);
-	else if (item.type === "inlineSdt") out += inlineText(item.content);
+	for (const item of content) switch (item.type) {
+		case "run":
+			out += runText(item);
+			break;
+		case "hyperlink":
+			for (const child of item.children) if (child.type === "run") out += runText(child);
+			break;
+		case "complexField":
+			out += inlineText(item.fieldResult);
+			break;
+		case "simpleField":
+		case "insertion":
+		case "deletion":
+		case "moveFrom":
+		case "moveTo":
+		case "inlineSdt":
+		case "bidiWrapper":
+			out += inlineText(item.content);
+			break;
+		case "mathEquation":
+			out += item.plainText ?? "";
+			break;
+		case "bookmarkStart":
+		case "bookmarkEnd":
+		case "commentRangeStart":
+		case "commentRangeEnd":
+		case "commentReference":
+		case "moveFromRangeStart":
+		case "moveFromRangeEnd":
+		case "moveToRangeStart":
+		case "moveToRangeEnd": break;
+		default: panic(`Unsupported paragraph content in trailer text: ${JSON.stringify(item)}`);
+	}
 	return out;
 }
 //#endregion

package/dist/markdown/types.d.ts

@@ -1,11 +1,5 @@
+import { BuiltInStyleIndex } from "../docx/builtInStyles.js";
 //#region src/markdown/types.d.ts
-/**
- * Types for the DOCX-document → Markdown converter (ported from eigenpal
- * /docx-editor PR #595). This is folio's v1 surface: the synchronous,
- * continuous (non-paged) `toMarkdown(Document)` path. The paged + async +
- * image-handler variants from upstream are not ported (skills bodies have no
- * images today); they can be added later if needed.
- */
 /**
  * Metadata describing a single image registration. Owned by the markdown
  * module so its public surface is independent of the docx model's drawing
@@ -134,6 +128,8 @@ type RenderContext = {
   listCounters: Map<number, number[]>;
   /** `numId:level` pairs already seen, so a start override applies once. */
   listSeenLevels: Set<string>;
+  /** The document's styles indexed by the built-in they are; classifies headings and quotes. */
+  builtInStyles: BuiltInStyleIndex;
 };
 //#endregion
 export { ImageMeta, ImageRef, MarkdownOptions, MarkdownResult, RenderContext, ResolvedOptions };

package/dist/prosemirror/attrs/index.js

@@ -53,6 +53,11 @@ const SHAPE_OUTLINE_CAPS = [
 	"round",
 	"square"
 ];
+const SHAPE_OUTLINE_JOINS = [
+	"bevel",
+	"miter",
+	"round"
+];
 const SHAPE_LINE_END_TYPES = [
 	"none",
 	"triangle",
@@ -292,11 +297,7 @@ const readSymbolAttrs = (node) => {
 	expectNodeType(node, "symbol", issues);
 	requiredString(attrs, "font", "symbol.attrs.font", issues);
 	requiredString(attrs, "char", "symbol.attrs.char", issues);
-	if (typeof attrs["font"] === "string" && attrs["font"].trim() === "") issues.push({
-		path: "symbol.attrs.font",
-		message: "Expected a non-empty font name."
-	});
-	if (typeof attrs["char"] === "string" && !isOoxmlSymbolCharacter(attrs["char"])) issues.push({
+	if (typeof attrs["char"] === "string" && attrs["char"] !== "" && !isOoxmlSymbolCharacter(attrs["char"])) issues.push({
 		path: "symbol.attrs.char",
 		message: "Expected exactly four hexadecimal digits."
 	});
@@ -408,7 +409,11 @@ const readImageAttrs = (node) => {
 	optionalNumber(attrs, "paddingLeft", "image.attrs.paddingLeft", issues);
 	optionalImagePosition(attrs, "position", "image.attrs.position", issues);
 	optionalBoolean(attrs, "layoutInCell", "image.attrs.layoutInCell", issues);
+	optionalBoolean(attrs, "decorative", "image.attrs.decorative", issues);
+	optionalBoolean(attrs, "hidden", "image.attrs.hidden", issues);
+	optionalStringArray(attrs, "docPrExtensions", "image.attrs.docPrExtensions", issues);
 	optionalImageFrameLocks(attrs, "frameLocks", "image.attrs.frameLocks", issues);
+	optionalAuthoredEmu(attrs, "_docxAuthoredEmu", "image.attrs._docxAuthoredEmu", issues, IMAGE_AUTHORED_EMU_ATTRS);
 	optionalNumber(attrs, "borderWidth", "image.attrs.borderWidth", issues);
 	optionalString(attrs, "borderColor", "image.attrs.borderColor", issues);
 	optionalString(attrs, "borderStyle", "image.attrs.borderStyle", issues);
@@ -491,8 +496,12 @@ const readShapeAttrs = (node) => {
 	optionalString(attrs, "shapeType", "shape.attrs.shapeType", issues);
 	optionalString(attrs, "geometryAdjustments", "shape.attrs.geometryAdjustments", issues);
 	optionalString(attrs, "shapeId", "shape.attrs.shapeId", issues);
+	optionalString(attrs, "shapeName", "shape.attrs.shapeName", issues);
+	optionalString(attrs, "alt", "shape.attrs.alt", issues);
+	optionalString(attrs, "title", "shape.attrs.title", issues);
 	optionalNumber(attrs, "width", "shape.attrs.width", issues);
 	optionalNumber(attrs, "height", "shape.attrs.height", issues);
+	optionalAuthoredEmu(attrs, "_docxAuthoredEmu", "shape.attrs._docxAuthoredEmu", issues, SHAPE_AUTHORED_EMU_ATTRS);
 	optionalString(attrs, "fillColor", "shape.attrs.fillColor", issues);
 	optionalColorValue(attrs, "fillColorValue", "shape.attrs.fillColorValue", issues);
 	optionalOneOf(attrs, "fillType", "shape.attrs.fillType", issues, SHAPE_FILL_TYPES);
@@ -504,6 +513,7 @@ const readShapeAttrs = (node) => {
 	optionalColorValue(attrs, "outlineColorValue", "shape.attrs.outlineColorValue", issues);
 	optionalOneOf(attrs, "outlineStyle", "shape.attrs.outlineStyle", issues, OUTLINE_STYLE_ATTR_VALUES);
 	optionalOneOf(attrs, "outlineCap", "shape.attrs.outlineCap", issues, SHAPE_OUTLINE_CAPS);
+	optionalOneOf(attrs, "outlineJoin", "shape.attrs.outlineJoin", issues, SHAPE_OUTLINE_JOINS);
 	optionalShapeLineEnd(attrs, "outlineHeadEnd", "shape.attrs.outlineHeadEnd", issues);
 	optionalShapeLineEnd(attrs, "outlineTailEnd", "shape.attrs.outlineTailEnd", issues);
 	optionalString(attrs, "transform", "shape.attrs.transform", issues);
@@ -535,8 +545,12 @@ const readTextBoxAttrs = (node) => {
 	optionalWordArt(attrs, "wordArt", "textBox.attrs.wordArt", issues);
 	optionalOneOf(attrs, "textWrap", "textBox.attrs.textWrap", issues, TEXT_BOX_TEXT_WRAP_VALUES);
 	optionalString(attrs, "textBoxId", "textBox.attrs.textBoxId", issues);
+	optionalString(attrs, "textBoxName", "textBox.attrs.textBoxName", issues);
+	optionalString(attrs, "alt", "textBox.attrs.alt", issues);
+	optionalString(attrs, "title", "textBox.attrs.title", issues);
 	optionalString(attrs, "fillColor", "textBox.attrs.fillColor", issues);
 	optionalNumber(attrs, "outlineWidth", "textBox.attrs.outlineWidth", issues);
+	optionalAuthoredEmu(attrs, "_docxAuthoredEmu", "textBox.attrs._docxAuthoredEmu", issues, TEXT_BOX_AUTHORED_EMU_ATTRS);
 	optionalString(attrs, "outlineColor", "textBox.attrs.outlineColor", issues);
 	optionalOneOf(attrs, "outlineStyle", "textBox.attrs.outlineStyle", issues, OUTLINE_STYLE_ATTR_VALUES);
 	optionalTextBoxTransform(attrs, "transform", "textBox.attrs.transform", issues);
@@ -1645,6 +1659,7 @@ const validateParagraphFormatting = (value, path, issues) => {
 	]) optionalNumber(value, key, `${path}.${key}`, issues);
 	optionalOneOf(value, "lineSpacingRule", `${path}.lineSpacingRule`, issues, LINE_SPACING_RULE_VALUES);
 	optionalString(value, "styleId", `${path}.styleId`, issues);
+	optionalString(value, "numberingChangeXml", `${path}.numberingChangeXml`, issues);
 	optionalOneOf(value, "listNumFmt", `${path}.listNumFmt`, issues, NUMBER_FORMAT_VALUES);
 	optionalString(value, "listMarker", `${path}.listMarker`, issues);
 	optionalString(value, "listMarkerTemplate", `${path}.listMarkerTemplate`, issues);
@@ -1787,6 +1802,57 @@ const validatePropertyChangeInfo = (value, path, issues) => {
 	optionalOneOf(value, "provenance", `${path}.provenance`, issues, TRACKED_CHANGE_PROVENANCE_VALUES);
 	optionalString(value, "suggestionId", `${path}.suggestionId`, issues);
 };
+/**
+* The authored-EMU carrier: a sparse record of finite numbers keyed by the
+* pixel attribute each one was projected into. The keys are the node's own, so
+* they are checked against the list the caller passes rather than a shared one.
+*/
+const optionalAuthoredEmu = (attrs, key, path, issues, allowed) => {
+	const value = attrs[key];
+	if (value === void 0 || value === null) return;
+	if (!isRecord(value)) {
+		issues.push({
+			path,
+			message: "Expected an object."
+		});
+		return;
+	}
+	for (const name of Object.keys(value)) {
+		if (!allowed.includes(name)) {
+			issues.push({
+				path: `${path}.${name}`,
+				message: "Not a pixel attribute of this node."
+			});
+			continue;
+		}
+		optionalNumber(value, name, `${path}.${name}`, issues);
+	}
+};
+const WRAP_DISTANCE_ATTRS = [
+	"distTop",
+	"distBottom",
+	"distLeft",
+	"distRight"
+];
+const TEXT_BOX_MARGIN_ATTRS = [
+	"marginTop",
+	"marginBottom",
+	"marginLeft",
+	"marginRight"
+];
+const IMAGE_AUTHORED_EMU_ATTRS = [
+	"width",
+	"height",
+	"borderWidth",
+	...WRAP_DISTANCE_ATTRS
+];
+const SHAPE_AUTHORED_EMU_ATTRS = [
+	"width",
+	"height",
+	"outlineWidth",
+	...WRAP_DISTANCE_ATTRS
+];
+const TEXT_BOX_AUTHORED_EMU_ATTRS = [...SHAPE_AUTHORED_EMU_ATTRS, ...TEXT_BOX_MARGIN_ATTRS];
 const optionalImageFrameLocks = (attrs, key, path, issues) => {
 	const value = attrs[key];
 	if (value === void 0 || value === null) return;

package/dist/prosemirror/bookmarkBoundaryAttrs.d.ts

@@ -1,8 +1,18 @@
+import { document_d_exports } from "../types/document.js";
 import { BookmarkBoundaryAttrs } from "./schema/nodes.js";
 import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/bookmarkBoundaryAttrs.d.ts
+declare const isDisplacedByCustomXml: (value: unknown) => value is document_d_exports.DisplacedByCustomXml;
+/**
+ * A boundary's `w:displacedByCustomXml`, as a fragment to spread into the model
+ * content it rebuilds. Both a start and an end may carry it, so the callers
+ * that build either one share this rather than each remembering the attribute.
+ */
+declare const bookmarkBoundaryDisplacement: (attrs: BookmarkBoundaryAttrs) => {
+  displacedByCustomXml?: document_d_exports.DisplacedByCustomXml;
+};
 declare const readBookmarkBoundaryAttrs: (node: Node) => ReadProseMirrorAttrsResult<BookmarkBoundaryAttrs>;
 declare const expectBookmarkBoundaryAttrs: (node: Node) => BookmarkBoundaryAttrs;
 //#endregion
-export { expectBookmarkBoundaryAttrs, readBookmarkBoundaryAttrs };
+export { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs, isDisplacedByCustomXml, readBookmarkBoundaryAttrs };

package/dist/prosemirror/bookmarkBoundaryAttrs.js

@@ -1,6 +1,13 @@
 import { panic } from "better-result";
 //#region src/prosemirror/bookmarkBoundaryAttrs.ts
+const isDisplacedByCustomXml = (value) => value === "next" || value === "prev";
 const attrsCache = /* @__PURE__ */ new WeakMap();
+/**
+* A boundary's `w:displacedByCustomXml`, as a fragment to spread into the model
+* content it rebuilds. Both a start and an end may carry it, so the callers
+* that build either one share this rather than each remembering the attribute.
+*/
+const bookmarkBoundaryDisplacement = (attrs) => attrs.displacedByCustomXml === void 0 ? {} : { displacedByCustomXml: attrs.displacedByCustomXml };
 const readBookmarkBoundaryAttrs = (node) => {
 	const issues = [];
 	if (node.type.name !== "bookmarkBoundary") issues.push({
@@ -32,10 +39,16 @@ const readBookmarkBoundaryAttrs = (node) => {
 		path: "bookmarkBoundary.attrs.colLast",
 		message: "Expected a non-negative integer."
 	});
+	const displaced = node.attrs["displacedByCustomXml"];
+	if (displaced !== void 0 && displaced !== null && !isDisplacedByCustomXml(displaced)) issues.push({
+		path: "bookmarkBoundary.attrs.displacedByCustomXml",
+		message: "Expected \"next\" or \"prev\"."
+	});
 	if (issues.length > 0 || typeof id !== "number") return {
 		ok: false,
 		issues
 	};
+	const displacement = isDisplacedByCustomXml(displaced) ? { displacedByCustomXml: displaced } : {};
 	if (type === "start" && typeof name === "string") return {
 		ok: true,
 		value: {
@@ -43,14 +56,16 @@ const readBookmarkBoundaryAttrs = (node) => {
 			id,
 			name,
 			...typeof colFirst === "number" ? { colFirst } : {},
-			...typeof colLast === "number" ? { colLast } : {}
+			...typeof colLast === "number" ? { colLast } : {},
+			...displacement
 		}
 	};
 	return {
 		ok: true,
 		value: {
 			type: "end",
-			id
+			id,
+			...displacement
 		}
 	};
 };
@@ -63,4 +78,4 @@ const expectBookmarkBoundaryAttrs = (node) => {
 	return result.value;
 };
 //#endregion
-export { expectBookmarkBoundaryAttrs, readBookmarkBoundaryAttrs };
+export { bookmarkBoundaryDisplacement, expectBookmarkBoundaryAttrs, isDisplacedByCustomXml, readBookmarkBoundaryAttrs };

package/dist/prosemirror/commands/image.js

@@ -179,6 +179,7 @@ const insertImageFromFile = async (view, file, onInserted) => {
 	if (!imageType) return;
 	const imageNode = imageType.create({
 		src: dataUrl,
+		docPrName: file.name,
 		alt: file.name,
 		width: constrained.width,
 		height: constrained.height,

package/dist/prosemirror/commands/index.d.ts

@@ -1,4 +1,4 @@
-import { ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getStyleId } from "../extensions/core/ParagraphExtension.js";
+import { GenerateTableOfContentsOptions, ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getStyleId } from "../extensions/core/ParagraphExtension.js";
 import { BorderPreset, TableBorderPreset, TableContextInfo, getTableContext, isInTable as isInTableCell } from "../extensions/nodes/TableExtension.js";
 import { AcceptSuggestionOptions, FolioSuggestion, SuggestionAppliedAs, SuggestionKind, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addCommentMark, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark } from "./comments.js";
 import { CapturedTextFormatting, PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
@@ -6,8 +6,8 @@ import { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMark
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "../extensions/marks/HyperlinkExtension.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
-import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
+import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./table.js";
 import { insertPageBreak } from "./pageBreak.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
-export { type AcceptSuggestionOptions, type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, type CapturedTextFormatting, type FolioSuggestion, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type SuggestionAppliedAs, type SuggestionKind, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { type AcceptSuggestionOptions, type BorderPreset, CLIPBOARD_READ_ERROR_EVENT, type CapturedTextFormatting, type FolioSuggestion, type GenerateTableOfContentsOptions, PAINTABLE_MARK_NAMES, type ResolvedStyleAttrs, type SuggestionAppliedAs, type SuggestionKind, type TableBorderPreset, type TableContextInfo, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTableOfContents, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/index.js

@@ -7,7 +7,7 @@ import { acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptCha
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { insertPageBreak } from "./pageBreak.js";
-import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
+import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./table.js";
-export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };
+export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptAllSuggestions, acceptChange, acceptSuggestion, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, findSuggestionRange, generateTableOfContents, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getSuggestions, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectAllSuggestions, rejectChange, rejectSuggestion, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/commands/paragraph.d.ts

@@ -1,5 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
-import { ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId } from "../extensions/core/ParagraphExtension.js";
+import { GenerateTableOfContentsOptions, ResolvedStyleAttrs, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId } from "../extensions/core/ParagraphExtension.js";
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
 import { Command } from "prosemirror-state";
 //#region src/prosemirror/commands/paragraph.d.ts
@@ -33,6 +33,6 @@ declare function removeTabStop(position: number): Command;
 declare const toggleBidi: Command;
 declare const setRtl: Command;
 declare const setLtr: Command;
-declare const generateTOC: Command;
+declare const generateTableOfContents: (options: GenerateTableOfContentsOptions) => Command;
 //#endregion
-export { type ResolvedStyleAttrs, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };
+export { type GenerateTableOfContentsOptions, type ResolvedStyleAttrs, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };

package/dist/prosemirror/commands/paragraph.js

@@ -59,6 +59,6 @@ function removeTabStop(position) {
 const toggleBidi = cmds.requireCommand("toggleBidi")();
 const setRtl = cmds.requireCommand("setRtl")();
 const setLtr = cmds.requireCommand("setLtr")();
-const generateTOC = cmds.requireCommand("generateTOC")();
+const generateTableOfContents = (options) => cmds.requireCommand("generateTOC")(options);
 //#endregion
-export { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };
+export { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTableOfContents, getListInfo, getParagraphAlignment, getParagraphBidi, getParagraphTabs, getStyleId, increaseIndent, increaseListLevel, insertSectionBreak, isInList, oneAndHalfSpacing, removeList, removeSectionBreak, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList };

package/dist/prosemirror/commentIdAllocator.js

@@ -1,4 +1,4 @@
-import { seedRevisionIdsAbove } from "./plugins/revisionIds.js";
+import { maxAnnotationIdInDoc, seedRevisionIdsAbove } from "./plugins/revisionIds.js";
 import { MAX_REVISION_ID } from "@stll/docx-core/model";
 //#region src/prosemirror/commentIdAllocator.ts
 /** Sentinel ID for a comment that hasn't been persisted yet (anchored to selection). */
@@ -32,12 +32,7 @@ function createCommentIdAllocator() {
 function seedCommentAllocator(allocator, comments, view) {
 	let max = 0;
 	for (const comment of comments ?? []) if (Number.isInteger(comment.id) && comment.id > max && comment.id <= MAX_REVISION_ID) max = comment.id;
-	if (view) view.state.doc.descendants((node) => {
-		for (const mark of node.marks) {
-			const revisionId = mark.attrs["revisionId"];
-			if (typeof revisionId === "number" && Number.isInteger(revisionId) && revisionId > max && revisionId <= MAX_REVISION_ID) max = revisionId;
-		}
-	});
+	if (view) max = Math.max(max, maxAnnotationIdInDoc(view.state.doc));
 	allocator.seedAbove(max);
 	seedRevisionIdsAbove(max);
 }