@stll/folio-core 0.60.0 → 0.62.0

package/dist/ai-edits/headless.js

@@ -4,8 +4,11 @@ import { stageSectionBoundaryProperties } from "../compare/section-boundary-prop
 import { importReferencedStyleDefinitions, styleClosureNumberingReferences } from "../compare/style-resources.js";
 import { applyFolioDocumentOperations } from "../document-operations.js";
 import { applyReplyThreadMarkers } from "../docx/commentReplyMarkers.js";
+import { commentTextParagraph } from "../docx/commentTextParagraph.js";
+import { buildSections } from "../docx/documentParser.js";
 import { rebindDrawingImageRelationship } from "../docx/drawingRelationships.js";
 import { isSeparatorEndnote, isSeparatorFootnote } from "../docx/footnoteParser.js";
+import { normalizeListModelRendering } from "../docx/listModelNormalization.js";
 import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap } from "../docx/numberingParser.js";
 import { recreateProseNodeWithParagraphPropertySource, transferProseParagraphPropertySource } from "../docx/paragraphPropertySource.js";
@@ -40,6 +43,7 @@ import { deterministicHexId } from "../utils/hexId.js";
 import { buildAnnotatedBlockTextWithNoteReferences } from "./clean-text.js";
 import { anchoredCommentIdsInBlocks, anchoredCommentIdsInProseDoc, withoutLostCommentThreads } from "./comment-lifecycle.js";
 import { noteReferenceEditsAllowed } from "./note-references.js";
+import { noteStoryInventory } from "./note-story-inventory.js";
 import { FolioPendingSuggestionRegistry, createPendingSuggestionSourceSnapshot, withoutPendingSuggestionCommentMarks } from "./pending-suggestions.js";
 import { getCommentAnchorsFromDoc, getTrackedChangeGroupIdsFromDoc, getTrackedChangeStatsFromDoc, getTrackedChangesFromDoc, getTrackedChangesFromSnapshot } from "./read.js";
 import { classifyResourceReference } from "./referenceClassification.js";
@@ -49,6 +53,7 @@ import { tableTemplateCanCrossPackageLosslessly } from "./table-template.js";
 import { TaggedError, panic } from "better-result";
 import { REVIEW_CARRIERS } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
+import { reconcileDocumentPartRelationships } from "@stll/docx-core/ops";
 import { EditorState } from "prosemirror-state";
 import JSZip from "jszip";
 //#region src/ai-edits/headless.ts
@@ -76,18 +81,7 @@ const createReviewerComment = ({ id, text, author, date }) => ({
 	id,
 	author,
 	date: date ?? (/* @__PURE__ */ new Date()).toISOString(),
-	content: [{
-		type: "paragraph",
-		formatting: {},
-		content: [{
-			type: "run",
-			formatting: {},
-			content: [{
-				type: "text",
-				text
-			}]
-		}]
-	}]
+	content: [commentTextParagraph(text)]
 });
 /**
 * Assign a stable `w14:paraId` to every body paragraph that lacks one (or
@@ -1080,42 +1074,28 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* with the sections that show it: `[header first (sections 1, 3)] …`.
 	*/
 	getNotesAsText() {
-		const pkg = this.baseDocument.package;
 		const lines = [];
 		const placements = this.headerFooterPlacements();
-		const pushHeaderFooter = (map, label) => {
-			if (!map) return;
-			for (const [relationshipId, hf] of map) {
-				const handle = {
-					type: label,
-					relationshipId
-				};
-				const text = this.getHeaderFooterStoryText(handle, hf);
-				if (text.length > 0) {
-					const roles = placements.byPart.get(`${label}:${relationshipId}`);
-					lines.push(`[${label} ${roles ? describePlacements(roles, placements.sectionCount) : hf.hdrFtrType}] ${text}`);
+		for (const handle of this.listStoryHandlesInternal()) {
+			if (handle.type === "main") continue;
+			const text = this.getStoryText(handle);
+			if (text.length === 0) continue;
+			switch (handle.type) {
+				case "header":
+				case "footer": {
+					const source = this.getHeaderFooterStory(handle);
+					if (!source) panic("A listed document story no longer exists", { story: handle });
+					const roles = placements.byPart.get(`${handle.type}:${handle.relationshipId}`);
+					const label = roles ? describePlacements(roles, placements.sectionCount) : source.hdrFtrType;
+					lines.push(`[${handle.type} ${label}] ${text}`);
+					break;
 				}
+				case "footnote":
+				case "endnote":
+					lines.push(`[${handle.type} #${handle.noteId}] ${text}`);
+					break;
+				default: return handle;
 			}
-		};
-		pushHeaderFooter(pkg.headers, "header");
-		pushHeaderFooter(pkg.footers, "footer");
-		for (const footnote of pkg.footnotes ?? []) {
-			if (isSeparatorFootnote(footnote)) continue;
-			const handle = {
-				type: "footnote",
-				noteId: footnote.id
-			};
-			const text = this.getNoteStoryText(handle, footnote);
-			if (text.length > 0) lines.push(`[footnote #${footnote.id}] ${text}`);
-		}
-		for (const endnote of pkg.endnotes ?? []) {
-			if (isSeparatorEndnote(endnote)) continue;
-			const handle = {
-				type: "endnote",
-				noteId: endnote.id
-			};
-			const text = this.getNoteStoryText(handle, endnote);
-			if (text.length > 0) lines.push(`[endnote #${endnote.id}] ${text}`);
 		}
 		return lines.join("\n");
 	}
@@ -1138,17 +1118,18 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			type: "footer",
 			relationshipId
 		});
-		for (const footnote of pkg.footnotes ?? []) if (!isSeparatorFootnote(footnote)) handles.push({
+		const notes = noteStoryInventory(pkg, this.removedNoteStories);
+		for (const footnote of notes.footnotes ?? []) if (!isSeparatorFootnote(footnote)) handles.push({
 			type: "footnote",
 			noteId: footnote.id
 		});
-		for (const endnote of pkg.endnotes ?? []) if (!isSeparatorEndnote(endnote)) handles.push({
+		for (const endnote of notes.endnotes ?? []) if (!isSeparatorEndnote(endnote)) handles.push({
 			type: "endnote",
 			noteId: endnote.id
 		});
 		return handles.filter((handle) => {
 			if (handle.type === "header" || handle.type === "footer") return !this.removedHeaderFooterStories.has(headerFooterStoryKey(handle));
-			return handle.type !== "footnote" && handle.type !== "endnote" || !this.removedNoteStories.has(noteStoryKey(handle));
+			return true;
 		});
 	}
 	/** Discover every readable document story through a typed, serializable handle. */
@@ -1676,6 +1657,18 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			})
 		};
 	}
+	/** Resolve ordinary revisions on a detached in-memory document. */
+	toResolvedDocument(decision) {
+		const copy = new FolioDocxReviewer({
+			baseDocument: this.toDocument(),
+			originalBuffer: this.originalBuffer,
+			state: this.state,
+			author: this.author
+		});
+		if (decision === "accept") copy.acceptAll();
+		else copy.rejectAll();
+		return copy.toDocument();
+	}
 	/** The current document model with edits merged back in. */
 	toDocument() {
 		const document = this.documentFromStateSnapshot(this.captureReviewerState());
@@ -1702,10 +1695,20 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			importedFooters: new Map(this.importedFooters),
 			createdComments: [...this.createdComments],
 			resolvedOverrides: new Map(this.resolvedOverrides),
-			resolvedStoryExpectations: [...this.resolvedStoryExpectations.values()]
+			resolvedStoryExpectations: [...this.resolvedStoryExpectations.values()].filter(({ story }) => story.type === "main" || this.secondaryStorySource(story) !== void 0)
 		};
 	}
-	documentFromStateSnapshot(snapshot) {
+	documentFromStateSnapshot(authored) {
+		const pendingCommentIds = new Set(this.exportPendingSuggestions().flatMap(({ commentId }) => commentId === void 0 ? [] : [commentId]));
+		const snapshot = {
+			...authored,
+			mainState: withoutPendingSuggestionCommentMarks(rejectSuggestions(authored.mainState), pendingCommentIds),
+			secondaryStoryStates: authored.secondaryStoryStates.map((entry) => ({
+				...entry,
+				state: withoutPendingSuggestionCommentMarks(rejectSuggestions(entry.state), pendingCommentIds)
+			})),
+			createdComments: authored.createdComments.filter(({ id }) => !pendingCommentIds.has(id))
+		};
 		const sourceDocument = snapshot.importedStyles === void 0 ? this.baseDocument : {
 			...this.baseDocument,
 			package: {
@@ -1717,7 +1720,10 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			type: "supplied",
 			styles: snapshot.importedStyles
 		} });
-		if (snapshot.finalSectionPropertiesOverride !== void 0) document.package.document.finalSectionProperties = snapshot.finalSectionPropertiesOverride;
+		if (snapshot.finalSectionPropertiesOverride !== void 0) {
+			document.package.document.finalSectionProperties = snapshot.finalSectionPropertiesOverride;
+			if (document.package.document.sections !== void 0) document.package.document.sections = buildSections(document.package.document.content, snapshot.finalSectionPropertiesOverride);
+		}
 		if (snapshot.importedStyles !== void 0) document.package.styles = snapshot.importedStyles;
 		if (snapshot.importedMedia.size > 0) document.package.media = new Map([...document.package.media ?? [], ...snapshot.importedMedia]);
 		if (snapshot.importedHeaders.size > 0) document.package.headers = new Map([...document.package.headers ?? [], ...snapshot.importedHeaders]);
@@ -1734,24 +1740,15 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			const candidates = new Set(snapshot.removedNoteStories.map(noteStoryKey));
 			const referenced = referencedNotes(document, candidates);
 			const removed = new Set([...candidates].filter((key) => !referenced.has(key)));
-			const { footnotes, endnotes } = document.package;
-			if (footnotes) document.package.footnotes = footnotes.filter((note) => !removed.has(noteStoryKey({
-				type: "footnote",
-				noteId: note.id
-			})));
-			if (endnotes) document.package.endnotes = endnotes.filter((note) => !removed.has(noteStoryKey({
-				type: "endnote",
-				noteId: note.id
-			})));
+			Object.assign(document.package, noteStoryInventory(document.package, removed));
 		}
 		const definitions = [...document.package.document.comments ?? [], ...snapshot.createdComments];
 		const kept = this.keptCommentThreads(definitions, snapshot.mainState, snapshot.secondaryStoryStates);
 		if (kept.length !== definitions.length || snapshot.createdComments.length > 0 || snapshot.resolvedOverrides.size > 0) document.package.document.comments = this.withResolvedOverrides(kept, snapshot.resolvedOverrides);
-		return document;
+		return normalizeListModelRendering(reconcileDocumentPartRelationships(document)).document;
 	}
 	captureSaveSnapshot() {
 		const snapshot = this.captureReviewerState();
-		const pendingCommentIds = new Set(this.exportPendingSuggestions().flatMap(({ commentId }) => commentId === void 0 ? [] : [commentId]));
 		const changedParaIds = new Set(getChangedParagraphIds(snapshot.mainState));
 		let structuralChange = hasStructuralChanges(snapshot.mainState) || snapshot.finalSectionPropertiesOverride !== void 0 || snapshot.importedStyles !== void 0 || snapshot.importedHeaders.size > 0 || snapshot.importedFooters.size > 0 || snapshot.removedNoteStories.length > 0;
 		let untrackedChanges = hasUntrackedChanges(snapshot.mainState);
@@ -1778,15 +1775,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			reason: "untrackedChange"
 		};
 		return {
-			document: this.documentFromStateSnapshot({
-				...snapshot,
-				mainState: withoutPendingSuggestionCommentMarks(rejectSuggestions(snapshot.mainState), pendingCommentIds),
-				secondaryStoryStates: snapshot.secondaryStoryStates.map((entry) => ({
-					...entry,
-					state: withoutPendingSuggestionCommentMarks(rejectSuggestions(entry.state), pendingCommentIds)
-				})),
-				createdComments: snapshot.createdComments.filter(({ id }) => !pendingCommentIds.has(id))
-			}),
+			document: this.documentFromStateSnapshot(snapshot),
 			path,
 			changedNoteParaIds,
 			sectionReferenceRemovals: snapshot.sectionReferenceRemovals,
@@ -1895,6 +1884,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	}
 	getEditableStoryState(story) {
 		if (story.type === "main") return this.state;
+		if (!this.secondaryStorySource(story)) return null;
 		const key = secondaryStoryKey(story);
 		const existing = this.secondaryStoryStates.get(key);
 		if (existing) return existing.state;
@@ -1919,10 +1909,14 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* state for a story nothing edits.
 	*/
 	readSecondaryStoryDoc(story) {
+		if (!this.secondaryStorySource(story)) return null;
 		return this.secondaryStoryStates.get(secondaryStoryKey(story))?.state.doc ?? this.secondaryStoryDoc(story);
 	}
+	secondaryStorySource(story) {
+		return story.type === "header" || story.type === "footer" ? this.getHeaderFooterStory(story) : this.getNoteStory(story);
+	}
 	secondaryStoryDoc(story) {
-		const source = story.type === "header" || story.type === "footer" ? this.getHeaderFooterStory(story) : this.getNoteStory(story);
+		const source = this.secondaryStorySource(story);
 		if (!source) return null;
 		const conversionOptions = {
 			...this.baseDocument.package.numbering !== void 0 && { numbering: this.baseDocument.package.numbering },
@@ -2041,8 +2035,9 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		return snapshot !== null && detachFolioAIEditSnapshotExternalHyperlinks(snapshot) !== null;
 	}
 	getNoteStory(story) {
-		if (story.type === "footnote") return this.baseDocument.package.footnotes?.find((note) => note.id === story.noteId && !isSeparatorFootnote(note));
-		return this.baseDocument.package.endnotes?.find((note) => note.id === story.noteId && !isSeparatorEndnote(note));
+		const notes = noteStoryInventory(this.baseDocument.package, this.removedNoteStories);
+		if (story.type === "footnote") return notes.footnotes?.find((note) => note.id === story.noteId && !isSeparatorFootnote(note));
+		return notes.endnotes?.find((note) => note.id === story.noteId && !isSeparatorEndnote(note));
 	}
 	/**
 	* A loaded story's blocks, so its text comes from the same walk an unloaded
@@ -2056,7 +2051,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	* same states, so the text now describes exactly what a save would write.
 	*/
 	storyBlocks(state, source) {
-		return state ? proseDocToBlocks(state.doc, source.content, this.baseDocument.package.styles) : source.content;
+		return state ? proseDocToBlocks(rejectSuggestions(state).doc, source.content, this.baseDocument.package.styles) : source.content;
 	}
 	getHeaderFooterStoryText(story, source) {
 		const state = this.secondaryStoryStates.get(headerFooterStoryKey(story))?.state;
@@ -2178,7 +2173,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		}
 		for (const handle of this.removedNoteStories.values()) {
 			const entry = loaded.get(secondaryStoryKey(handle));
-			addAll(anchoredBefore, entry ? anchoredCommentIdsInProseDoc(entry.initialState.doc) : anchoredCommentIdsInBlocks(this.getNoteStory(handle)?.content ?? []));
+			addAll(anchoredBefore, entry ? anchoredCommentIdsInProseDoc(entry.initialState.doc) : anchoredCommentIdsInBlocks((handle.type === "footnote" ? this.baseDocument.package.footnotes : this.baseDocument.package.endnotes)?.find((note) => note.id === handle.noteId)?.content ?? []));
 		}
 		return withoutLostCommentThreads(comments, {
 			anchoredBefore,

package/dist/ai-edits/note-story-inventory.d.ts

@@ -0,0 +1,7 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/ai-edits/note-story-inventory.d.ts
+type NoteStories = Pick<document_d_exports.Document["package"], "footnotes" | "endnotes">;
+/** The note collections visible to a reviewer or its captured save state. */
+declare const noteStoryInventory: (source: NoteStories, removed: Pick<ReadonlySet<string>, "has" | "size">) => NoteStories;
+//#endregion
+export { noteStoryInventory };

package/dist/ai-edits/note-story-inventory.js

@@ -0,0 +1,11 @@
+//#region src/ai-edits/note-story-inventory.ts
+/** The note collections visible to a reviewer or its captured save state. */
+const noteStoryInventory = (source, removed) => {
+	if (removed.size === 0) return source;
+	return {
+		...source.footnotes && { footnotes: source.footnotes.filter((note) => !removed.has(`footnote:${note.id}`)) },
+		...source.endnotes && { endnotes: source.endnotes.filter((note) => !removed.has(`endnote:${note.id}`)) }
+	};
+};
+//#endregion
+export { noteStoryInventory };

package/dist/ai-edits/read.js

@@ -245,10 +245,13 @@ const getTrackedChangeGroupsFromProjectedDoc = (doc, blockStarts) => {
 			const key = previousKey !== void 0 && previousRange && transparentGap(previousRange.end, pos) ? previousKey : `${path}:${pos}`;
 			lastInlineGroupByPath.set(path, key);
 			const hyperlink = node.marks.find((candidate) => candidate.type.name === "hyperlink");
-			const commentId = node.marks.find((candidate) => candidate.type.name === "comment")?.attrs["commentId"];
+			const commentIds = node.marks.flatMap((candidate) => {
+				const commentId = candidate.attrs["commentId"];
+				return candidate.type.name === "comment" && typeof commentId === "number" ? [commentId] : [];
+			});
 			const boundary = {
 				hyperlink: hyperlink ? String(hyperlink.attrs["href"] ?? "") : null,
-				comment: typeof commentId === "number" ? commentId : null,
+				comments: commentIds.toSorted((left, right) => left - right).join(","),
 				revisionParents: JSON.stringify(pathLayers.slice(0, layerIndex))
 			};
 			const range = inlineRanges.get(key);
@@ -275,23 +278,27 @@ const getTrackedChangeGroupsFromProjectedDoc = (doc, blockStarts) => {
 		}
 	});
 	const groups = [];
-	let previousKey = null;
+	let previousInline = null;
 	for (const [key, change] of grouped) {
 		const range = inlineRanges.get(key);
-		const previous = groups.at(-1);
-		const previousRange = previousKey === null ? void 0 : inlineRanges.get(previousKey);
-		if (previous && range && previousRange && previousRange.end <= range.start && transparentGap(previousRange.end, range.start) && previousRange.lastBoundary.revisionParents === range.firstBoundary.revisionParents && (previousRange.lastBoundary.hyperlink !== range.firstBoundary.hyperlink || previousRange.lastBoundary.comment !== range.firstBoundary.comment || previousRange.end !== range.start) && (change.type === "insertion" || change.type === "deletion") && previous.change.type === change.type && previous.change.author === change.author && previous.change.date === change.date && previous.change.blockId === change.blockId) {
+		const previous = previousInline?.group;
+		const previousRange = previousInline === null ? void 0 : inlineRanges.get(previousInline.key);
+		if (previous && range && previousRange && previousRange.end <= range.start && transparentGap(previousRange.end, range.start) && previousRange.lastBoundary.revisionParents === range.firstBoundary.revisionParents && (previousRange.lastBoundary.hyperlink !== range.firstBoundary.hyperlink || previousRange.lastBoundary.comments !== range.firstBoundary.comments || previousRange.end !== range.start) && (change.type === "insertion" || change.type === "deletion") && previous.change.type === change.type && previous.change.author === change.author && previous.change.date === change.date && previous.change.blockId === change.blockId) {
 			previous.change.text += change.text;
 			previous.ids.push(change.id);
 			previousRange.end = range.end;
 			previousRange.lastBoundary = range.lastBoundary;
 			continue;
 		}
-		groups.push({
+		const group = {
 			change: { ...change },
 			ids: [change.id]
-		});
-		previousKey = key;
+		};
+		groups.push(group);
+		if (range) previousInline = {
+			key,
+			group
+		};
 	}
 	return groups;
 };

package/dist/ai-edits/revisionStretches.js

@@ -1,16 +1,47 @@
-import { expectTrackedChangeMarkAttrs } from "../prosemirror/attrs/index.js";
+import { expectRunPropertyChangeMarkAttrs, expectTrackedChangeMarkAttrs } from "../prosemirror/attrs/index.js";
+import { applyMarksToRunFormattingRepresentation, expandRunFormattingCarrier } from "../prosemirror/runFormattingInlineCarriers.js";
+import { panic } from "better-result";
 //#region src/ai-edits/revisionStretches.ts
 const INLINE_REVISION_MARKS = /* @__PURE__ */ new Set(["insertion", "deletion"]);
 const separateRevisionStretches = ({ tr, revisionSeed }) => {
 	let nextRevisionId = revisionSeed;
 	const minted = [];
 	const retargets = [];
+	const formattingRetargets = [];
+	const formattingIds = /* @__PURE__ */ new Set();
+	const formattingRepresentations = /* @__PURE__ */ new Set();
 	let stretches = /* @__PURE__ */ new Map();
 	tr.doc.descendants((node, pos) => {
 		if (node.isTextblock) {
 			stretches = /* @__PURE__ */ new Map();
 			return true;
 		}
+		const carrier = node.marks.some(({ type }) => type.name === "runPropertyChange") ? expandRunFormattingCarrier(node, pos) : null;
+		for (const representation of carrier?.representations ?? []) {
+			if (carrier?.disposition === "structured-field" && representation.role === "owner") continue;
+			const mark = representation.node.marks.find(({ type }) => type.name === "runPropertyChange");
+			if (!mark) continue;
+			if (formattingRepresentations.has(representation.position)) continue;
+			formattingRepresentations.add(representation.position);
+			const ids = /* @__PURE__ */ new Map();
+			for (const { info } of expectRunPropertyChangeMarkAttrs(mark).changes) {
+				if (!formattingIds.has(info.id)) {
+					formattingIds.add(info.id);
+					continue;
+				}
+				const fresh = nextRevisionId++;
+				minted.push({
+					revisionId: fresh,
+					from: info.id
+				});
+				ids.set(info.id, fresh);
+			}
+			if (ids.size > 0) formattingRetargets.push({
+				representation,
+				mark,
+				ids
+			});
+		}
 		if (!node.isInline || !(node.isLeaf || node.isText)) return true;
 		const layersOf = (mark) => {
 			const attrs = expectTrackedChangeMarkAttrs(mark);
@@ -71,6 +102,26 @@ const separateRevisionStretches = ({ tr, revisionSeed }) => {
 			...ancestors && { _docxRevisionAncestors: ancestors.map((ancestor) => Object.assign(structuredClone(ancestor), { revisionId: ids.get(ancestor.revisionId) ?? ancestor.revisionId })) }
 		}));
 	}
+	for (const { representation, mark, ids } of formattingRetargets) {
+		const live = tr.doc.nodeAt(representation.position);
+		if (!live) panic("A formatting revision carrier vanished during normalization");
+		const changes = expectRunPropertyChangeMarkAttrs(mark).changes.map((change) => Object.assign({}, change, { info: Object.assign({}, change.info, { id: ids.get(change.info.id) ?? change.info.id }) }));
+		const replacement = mark.type.create({
+			...mark.attrs,
+			changes
+		});
+		applyMarksToRunFormattingRepresentation({
+			tr,
+			representation: {
+				node: live,
+				position: representation.position,
+				role: representation.role,
+				from: representation.position,
+				to: representation.position + representation.node.nodeSize
+			},
+			marks: replacement.addToSet(live.marks)
+		});
+	}
 	return {
 		nextRevisionId,
 		minted

package/dist/ai-edits/table-row-column-mutations.js

@@ -1,6 +1,7 @@
 import { addTrackedDeletionMark } from "../prosemirror/addTrackedDeletionMark.js";
 import { markStructuralChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
 import { markRowsEmptiedInBatch, reconcileTableGridAfterColumnInsertion, reconcileTableGridAfterColumnRemoval, removeRowsWithoutCells, removeTableRow } from "../prosemirror/tableGridMutation.js";
+import { sliceText } from "../utils/sliceText.js";
 import { stripBlockIdentityAttrs } from "./block-identity.js";
 import { findEnclosingTableCell, findEnclosingTableRow } from "./table-targets.js";
 import { tableRowFromTemplate } from "./table-template.js";
@@ -16,7 +17,11 @@ const cellRevision = (revision, index) => ({
 	revisionId: revision.revisionId + index
 });
 const UNPLACED_TEXT_PREVIEW_LENGTH = 40;
-const previewCellText = (text) => JSON.stringify(text.length > UNPLACED_TEXT_PREVIEW_LENGTH ? `${text.slice(0, UNPLACED_TEXT_PREVIEW_LENGTH)}…` : text);
+const previewCellText = (text) => JSON.stringify(text.length > UNPLACED_TEXT_PREVIEW_LENGTH ? `${sliceText({
+	text,
+	units: "codeUnits",
+	end: UNPLACED_TEXT_PREVIEW_LENGTH
+})}…` : text);
 /**
 * Name the `cellTexts` a new row or column has no cell for, or `null` when
 * every one of them has a place.

package/dist/compare/reproducible-package.js

@@ -1,3 +1,4 @@
+import { decodeText, encodeUtf8 } from "../utils/textEncoding.js";
 import { writeZipPart } from "@stll/docx-core/zip";
 import JSZip from "jszip";
 //#region src/compare/reproducible-package.ts
@@ -22,7 +23,7 @@ const withFixedPackageDates = async (buffer, date) => {
 	if (coreProps) writeZipPart({
 		zip,
 		path: CORE_PROPERTIES_PATH,
-		data: withFixedModifiedDate(await coreProps.async("text"), date),
+		data: encodeUtf8(withFixedModifiedDate(await coreProps.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true })), date)),
 		options: {
 			compression: "DEFLATE",
 			compressionOptions: { level: DOCX_COMPRESSION_LEVEL }

package/dist/compare/verification.js

@@ -307,6 +307,7 @@ const revisedFinalParagraphMarks = (packageModel, { since = 0 } = {}) => {
 		if (!isRecord(value) || value instanceof Date || ArrayBuffer.isView(value)) return;
 		const inADeletedRow = insideADeletedRow || isADeletedTableRow(value);
 		for (const [key, item] of Object.entries(value)) {
+			if (key === "sections" && Array.isArray(value["content"])) continue;
 			trail.push(key);
 			visit(item, inADeletedRow);
 			trail.pop();

package/dist/compat/eigenpal.d.ts

@@ -39,7 +39,9 @@ import { toMarkdown, toMarkdownResult } from "../markdown/index.js";
 import { EmbeddedFont, EmbeddedFontParts, buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily } from "../fonts/embeddedFonts.js";
 import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "../utils/fontResolver.js";
 import { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError } from "../prosemirror/yjsDocumentMetadata.js";
+import { EditorReadOnlyReason } from "../managers/EditorModeManager.js";
+import { ReviewDisplayMode } from "../managers/reviewDisplayMode.js";
 import { DOCX_CONFORMANCE_CLASSES } from "../index.js";
 type Document = document_d_exports.Document;
 type DocxConformanceClass = document_d_exports.DocxConformanceClass;
-export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyFolioDocumentOperationsOptions, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type BlockRect, COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, type CompareCompatibility, type CompareContentOptions, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFolioRequirement, type CompareResult, type CompareRevisionFormat, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DEFAULT_OUTLINE_DEPTH, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, DRAWING_SAFETY_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentPropertiesOptions, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type DocxDrawingClassification, type DrawingSafetyClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, FOLIO_CONTENT_COMPARISON_LIMITS, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_YJS_ATTR_SCHEMA_VERSION, type FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIDiagnosticBlock, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphBlock, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioBlockId, type FolioContentBlock, type FolioContentBlockProperty, type FolioContentComparison, type FolioContentComparisonError, type FolioContentComparisonEvent, type FolioContentComparisonLimit, FolioContentComparisonLimitError, type FolioContentContainerPathEntry, type FolioContentFormatRange, type FolioContentFormattingChange, type FolioContentIdStability, type FolioContentInlineBooleanProperty, type FolioContentInlineComparisonResult, type FolioContentInlineFormatting, type FolioContentInlineFormattingPatch, FolioContentInlinePresentationProjectionError, type FolioContentLineSpacingRule, type FolioContentParagraphAlignment, type FolioContentParagraphFormattingPatch, type FolioContentParagraphKind, type FolioContentParagraphSpacing, type FolioContentRun, type FolioContentSnapshot, type FolioContentStatedNumbering, type FolioContentStructuralChange, type FolioContentTableLocation, type FolioContentTextSegment, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioUndefinedReferencePolicy, type FolioWordDiffOptions, type FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type OutlineDepth, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewHiddenRange, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareContent, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, filterHeadingsByDepth, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyFolioDocumentOperationsOptions, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type BlockRect, COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, type CompareCompatibility, type CompareContentOptions, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFolioRequirement, type CompareResult, type CompareRevisionFormat, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DEFAULT_OUTLINE_DEPTH, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, DRAWING_SAFETY_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentPropertiesOptions, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type DocxDrawingClassification, type DrawingSafetyClass, type EditorReadOnlyReason, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, FOLIO_CONTENT_COMPARISON_LIMITS, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_YJS_ATTR_SCHEMA_VERSION, type FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIDiagnosticBlock, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphBlock, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioBlockId, type FolioContentBlock, type FolioContentBlockProperty, type FolioContentComparison, type FolioContentComparisonError, type FolioContentComparisonEvent, type FolioContentComparisonLimit, FolioContentComparisonLimitError, type FolioContentContainerPathEntry, type FolioContentFormatRange, type FolioContentFormattingChange, type FolioContentIdStability, type FolioContentInlineBooleanProperty, type FolioContentInlineComparisonResult, type FolioContentInlineFormatting, type FolioContentInlineFormattingPatch, FolioContentInlinePresentationProjectionError, type FolioContentLineSpacingRule, type FolioContentParagraphAlignment, type FolioContentParagraphFormattingPatch, type FolioContentParagraphKind, type FolioContentParagraphSpacing, type FolioContentRun, type FolioContentSnapshot, type FolioContentStatedNumbering, type FolioContentStructuralChange, type FolioContentTableLocation, type FolioContentTextSegment, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioUndefinedReferencePolicy, type FolioWordDiffOptions, type FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type OutlineDepth, type PositionalText, type ResolvedAnchor, type ReviewDisplayMode, STELLA_STYLE_SET_NAME, type TemplatePreviewHiddenRange, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareContent, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, filterHeadingsByDepth, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/controller/canonicalClipboard.js

@@ -9,6 +9,7 @@ import { completeNumberingForDoc } from "../prosemirror/listInstanceReferences.j
 import { marksToTextFormatting } from "../prosemirror/runFormattingFromMarks.js";
 import { CANONICAL_GAP } from "../types/canonicalCapabilities.js";
 import { bytesToDataUrl } from "../utils/base64.js";
+import { base64ToBytes } from "../utils/textEncoding.js";
 import { flattenClipboardStyleReferences, importClipboardStyles } from "./canonicalClipboardResources.js";
 import { CanonicalSessionError } from "./canonicalSession.js";
 import { Result } from "better-result";
@@ -407,7 +408,7 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 					if (mimeType === void 0 || payload === void 0) return refuse("The clipboard image data is malformed.");
 					if (payload.length > Math.ceil(MAX_CLIPBOARD_IMAGE_BYTES * 4 / 3)) return refuse("The clipboard image exceeds the import size limit.");
 					const decoded = Result.try({
-						try: () => Uint8Array.from(atob(payload), (char) => char.charCodeAt(0)),
+						try: () => base64ToBytes(payload),
 						catch: () => new CanonicalSessionError({
 							gap: CANONICAL_GAP.dispatch,
 							message: "The clipboard image data is malformed.",

package/dist/controller/canonicalListRendering.d.ts

@@ -1,10 +1,8 @@
-import { document_d_exports } from "../types/document.js";
-import { DocumentOp } from "@stll/docx-core/ops";
 //#region src/controller/canonicalListRendering.d.ts
-type CanonicalListNormalization = {
-  document: document_d_exports.Document;
-  inverse: DocumentOp[];
+/** Canonical edits share list model normalization with the headless projection. */
+declare const normalizeCanonicalListRendering: (document: import("@stll/docx-core").Document) => {
+  document: import("@stll/docx-core").Document;
+  inverse: import("@stll/docx-core/ops").DocumentOp[];
 };
-declare const normalizeCanonicalListRendering: (document: document_d_exports.Document) => CanonicalListNormalization;
 //#endregion
 export { normalizeCanonicalListRendering };