@stll/folio-core 0.60.0 → 0.61.0

package/dist/internal/revisionResolutionInline.js

@@ -6,6 +6,7 @@ import "../prosemirror/extensions/nodes/SdtExtension.js";
 import { canonicalFieldNode } from "../prosemirror/fieldRepresentation.js";
 import { resolvedPreservedXmlAttrs } from "../prosemirror/preservedXmlReview.js";
 import { continuedRunMarks } from "../prosemirror/rejoinRunCarriers.js";
+import { commentPoint } from "../prosemirror/replacedAnnotations.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../prosemirror/runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../prosemirror/runPropertyChangeResolution.js";
 import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
@@ -158,6 +159,25 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 			contentChanged = true;
 			resolvedBoundaries.add(children.length);
 		}
+		if (resolved === null && child.isInline) {
+			const anchors = [];
+			for (const mark of child.marks) {
+				const id = mark.attrs["commentId"];
+				if (mark.type.name !== "comment" || !context.pointComments.delete(id)) continue;
+				anchors.push(commentPoint(child.type.schema, id));
+			}
+			if (anchors.length > 0) {
+				const fragment = Fragment.fromArray(anchors);
+				const range = context.replacementRanges.at(-1);
+				if (!range || range.from !== contentStart + offset) panic("Missing resolved inline range");
+				range.newSize = fragment.size;
+				range.slice = new Slice(fragment, 0, 0);
+				for (const anchor of anchors) {
+					children.push(anchor);
+					positions.push(contentStart + offset);
+				}
+			}
+		}
 		if (resolved) {
 			children.push(resolved);
 			positions.push(contentStart + offset);
@@ -228,8 +248,9 @@ const coalesceReplacementRanges = (replacementRanges) => {
 	}
 	return coalesced;
 };
-const resolveInlineRevisions = ({ doc, mode, keepType, removeType, styleResolver }) => {
+const resolveInlineRevisions = ({ pointComments, doc, mode, keepType, removeType, styleResolver }) => {
 	const context = {
+		pointComments,
 		mode,
 		keepType,
 		removeType,

package/dist/internal/wholeStoryRevisionResolution.js

@@ -6,6 +6,7 @@ import { resolveAllTableChanges } from "../prosemirror/commands/resolveAllTableC
 import { resolveAllNodePropertyChangeAttrs } from "../prosemirror/commands/resolveNodePropertyChangeAttrs.js";
 import { resolveParagraphChangeAttrs } from "../prosemirror/commands/resolveParagraphProperties.js";
 import { rebaseParagraphRunContent } from "../prosemirror/rebaseParagraphRuns.js";
+import { createResolvedCommentPointCollector } from "../prosemirror/replacedAnnotations.js";
 import { expandRunFormattingCarrier } from "../prosemirror/runFormattingInlineCarriers.js";
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
 import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
@@ -19,9 +20,14 @@ import { Fragment, Slice } from "prosemirror-model";
 import { Mapping, ReplaceStep, StepMap, Transform } from "prosemirror-transform";
 //#region src/internal/wholeStoryRevisionResolution.ts
 const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changedRanges }) => {
+	const collector = createResolvedCommentPointCollector({
+		removes: (node) => mode === "accept" && doc.type.schema.marks["deletion"]?.isInSet(node.marks) !== void 0,
+		retiresStructure: () => mode === "accept"
+	});
 	let structural = false;
 	let runsIntoTable = false;
-	const walk = (node, position) => {
+	const walk = ({ node, position, eligibleComments = true, previous }) => {
+		const childComments = eligibleComments && collector.visit(node, position, previous);
 		if (node.isText) return node;
 		if (!runsIntoTable && !node.isTextblock) {
 			for (let index = 0; index + 1 < node.childCount; index++) if (runsIntoFollowingTable(node.child(index), node.child(index + 1), mode)) {
@@ -80,9 +86,15 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 		}
 		const children = [];
 		let changed = false;
-		const visitChild = (child, childPosition) => {
+		const visitChild = (child, childPosition, previousChild) => {
 			const replacement = rebased.get(child) ?? child;
-			if (rebased.size === 0) return walk(replacement, childPosition);
+			if (rebased.size === 0) return walk({
+				node: replacement,
+				position: childPosition,
+				eligibleComments: childComments,
+				...previousChild ? { previous: previousChild } : {}
+			});
+			if (childComments) collector.visit(child, childPosition, previousChild);
 			recordNodeResolution({
 				before: child,
 				after: replacement,
@@ -94,17 +106,21 @@ const resolveProperties = ({ doc, mode, styleResolver, numbering, steps, changed
 			replacement.forEach((inner, offset) => nested.push(visitChild(inner, childPosition + 1 + offset)));
 			return recreateProseNodeWithParagraphPropertySource(replacement, { content: nested });
 		};
-		resolved.forEach((child, offset) => {
-			const result = visitChild(child, position + 1 + offset);
+		resolved.forEach((child, offset, index) => {
+			const result = visitChild(child, position + 1 + offset, index > 0 ? node.maybeChild(index - 1) ?? void 0 : void 0);
 			children.push(result);
 			changed ||= result !== child;
 		});
 		return changed ? recreateProseNodeWithParagraphPropertySource(resolved, { content: children }) : resolved;
 	};
 	return {
-		resolved: walk(doc, -1),
+		resolved: walk({
+			node: doc,
+			position: -1
+		}),
 		structural,
-		runsIntoTable
+		runsIntoTable,
+		pointComments: new Set(collector.finish().keys())
 	};
 };
 const structuralReplacementMap = ({ replacements, tables, bookmarkJoins, origin }) => {
@@ -536,6 +552,7 @@ const resolveStoryRevisions = ({ doc, mode, styleResolver, numbering }) => {
 	});
 	const properties = propertyResult.resolved;
 	const inline = resolveInlineRevisions({
+		pointComments: propertyResult.pointComments,
 		doc: properties,
 		mode,
 		styleResolver,

package/dist/layout-bridge/convert/flowConversionShared.d.ts

@@ -9,6 +9,8 @@ import { Node } from "prosemirror-model";
  * Options for the conversion.
  */
 type ToFlowBlocksOptions = {
+  /** Paint comment anchors and highlights; false leaves authored marks intact. */
+  showCommentHighlights?: boolean;
   /** Embedded families owned by this editor, never ambient process state. */
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   /** Default font family. */

package/dist/layout-bridge/convert/footnoteLayout.d.ts

@@ -1,10 +1,14 @@
 import { document_d_exports } from "../../types/document.js";
+import { DisplayMode } from "../../managers/EditorModeManager.js";
 import { FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FlowBlock, FootnoteContent, Measure, Page } from "../../layout-engine/types.js";
 import { ToFlowBlocksOptions } from "./flowConversionShared.js";
 import "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.d.ts
 type MeasureBlocksFn = (blocks: FlowBlock[], contentWidth: number) => Measure[];
 type ConvertFootnoteOptions = Pick<ToFlowBlocksOptions, "embeddedFontFamilyMap"> & {
+  /** Whether comment highlights are painted. Defaults to true. */
+  showCommentHighlights?: boolean;
+  markupView?: DisplayMode;
   styles?: document_d_exports.StyleDefinitions | null;
   numbering?: document_d_exports.NumberingDefinitions;
   theme?: document_d_exports.Theme | null;

package/dist/layout-bridge/convert/footnoteLayout.js

@@ -2,6 +2,8 @@ import { measureParagraph } from "../../layout-engine/measure/measureParagraph.j
 import { layoutTextBoxContent } from "../../layout-engine/measure/textBoxParagraphLayout.js";
 import { DEFAULT_TEXTBOX_MARGINS, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, isFloatingImageRun, resolveTableWidthPx } from "../../layout-engine/types.js";
 import { footnoteToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
+import { projectStoryMarkupView } from "../../prosemirror/markupViewProjection.js";
+import { remapMarkupViewBlocks } from "./markupViewFlow.js";
 import { collectNoteRefs } from "./noteReferences.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/footnoteLayout.ts
@@ -204,7 +206,7 @@ function convertNoteStoryToFlowBlocks(content, options, referenceMarkText) {
 	if (options.theme !== void 0) proseOptions.theme = options.theme;
 	if (options.numbering !== void 0) proseOptions.numbering = options.numbering;
 	const pmDoc = footnoteToProseDoc(content, proseOptions);
-	const flowOptions = {};
+	const flowOptions = { showCommentHighlights: options.showCommentHighlights !== false && options.markupView !== "no-markup" && options.markupView !== "original" };
 	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
 	if (options.styles) flowOptions.styles = options.styles;
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
@@ -215,10 +217,18 @@ function convertNoteStoryToFlowBlocks(content, options, referenceMarkText) {
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
 	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
 	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	const hasReferenceMark = containsNoteReferenceMark(pmDoc);
+	const projection = projectStoryMarkupView({
+		doc: pmDoc,
+		markupView: options.markupView ?? "all-markup",
+		styles: options.styles,
+		numbering: options.numbering
+	});
+	const viewDoc = projection.type === "resolved" ? projection.doc : pmDoc;
+	const hasReferenceMark = containsNoteReferenceMark(viewDoc);
 	if (hasReferenceMark && referenceMarkText !== void 0) flowOptions.noteReferenceMarkText = referenceMarkText;
+	const converted = toFlowBlocks(viewDoc, flowOptions);
 	return {
-		flowBlocks: preserveAuthoredFootnoteTerminalParagraph(toFlowBlocks(pmDoc, flowOptions)),
+		flowBlocks: preserveAuthoredFootnoteTerminalParagraph(projection.type === "resolved" ? remapMarkupViewBlocks(converted, projection) : converted),
 		hasReferenceMark
 	};
 }

package/dist/layout-bridge/convert/headerFooterLayout.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
+import { DisplayMode } from "../../managers/EditorModeManager.js";
 import { FlowBlock, HeaderFooterContent, ImageRun, ImageRunPosition, Measure, PageMargins } from "../../layout-engine/types.js";
 import { ToFlowBlocksOptions } from "./flowConversionShared.js";
 import "./toFlowBlocks.js";
@@ -40,6 +41,10 @@ declare function calculateHeaderFooterMarginPushBounds(blocks: FlowBlock[], meas
  */
 declare function calculateHeaderFooterBodyTopClearance(blocks: FlowBlock[], flowHeight: number, metrics: HeaderFooterMetrics): number | undefined;
 type ConvertHeaderFooterOptions = {
+  /** Review projection applied before header/footer measurement. Defaults to All Markup. */
+  markupView?: DisplayMode;
+  /** Whether comment highlights are painted. Defaults to true. */
+  showCommentHighlights?: boolean;
   styles?: document_d_exports.StyleDefinitions | null;
   numbering?: document_d_exports.NumberingDefinitions;
   theme?: document_d_exports.Theme | null;

package/dist/layout-bridge/convert/headerFooterLayout.js

@@ -1,7 +1,9 @@
 import { cloneParagraphWithPropertySource } from "../../docx/paragraphPropertySource.js";
 import { isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "../../layout-engine/types.js";
 import { headerFooterToProseDoc } from "../../prosemirror/conversion/toProseDoc.js";
+import { projectStoryMarkupView } from "../../prosemirror/markupViewProjection.js";
 import { emuToPixels } from "../../utils/units.js";
+import { remapMarkupViewBlocks } from "./markupViewFlow.js";
 import { toFlowBlocks } from "./toFlowBlocks.js";
 //#region src/layout-bridge/convert/headerFooterLayout.ts
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
@@ -341,19 +343,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 	if (options.styles) proseDocOptions.styles = options.styles;
 	if (options.theme !== void 0) proseDocOptions.theme = options.theme;
 	if (options.numbering !== void 0) proseDocOptions.numbering = options.numbering;
-	const pmDoc = headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions);
-	const flowOptions = {};
-	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
-	if (options.styles) flowOptions.styles = options.styles;
-	if (options.theme !== void 0) flowOptions.theme = options.theme;
-	if (options.embeddedFontFamilyMap !== void 0) flowOptions.embeddedFontFamilyMap = options.embeddedFontFamilyMap;
-	if (options.fontAlternates !== void 0) flowOptions.fontAlternates = options.fontAlternates;
-	if (options.defaultTabStopTwips !== void 0) flowOptions.defaultTabStopTwips = options.defaultTabStopTwips;
-	if (options.lineBreakRules) flowOptions.lineBreakRules = options.lineBreakRules;
-	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
-	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
-	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	return finalizeHeaderFooterContent(toFlowBlocks(pmDoc, flowOptions), contentWidth, metrics, options);
+	return convertHeaderFooterPmDocToContent(headerFooter.watermarkBlockIndex === void 0 ? headerFooterToProseDoc(headerFooter.content, proseDocOptions) : headerFooterToProseDocWithDetachedWatermarkHost(headerFooter, proseDocOptions), contentWidth, metrics, options);
 }
 /**
 * Same as {@link convertHeaderFooterToContent}, but sourced from a live
@@ -368,7 +358,7 @@ function convertHeaderFooterToContent(headerFooter, contentWidth, metrics, optio
 */
 function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options) {
 	if (!pmDoc || pmDoc.content.size === 0) return;
-	const flowOptions = {};
+	const flowOptions = { showCommentHighlights: options.showCommentHighlights !== false && options.markupView !== "no-markup" && options.markupView !== "original" };
 	if (options.defaultSize !== void 0) flowOptions.defaultSize = options.defaultSize;
 	if (options.styles) flowOptions.styles = options.styles;
 	if (options.theme !== void 0) flowOptions.theme = options.theme;
@@ -379,7 +369,14 @@ function convertHeaderFooterPmDocToContent(pmDoc, contentWidth, metrics, options
 	if (options.justificationCompatibility) flowOptions.justificationCompatibility = options.justificationCompatibility;
 	if (options.tableIndentCompatibility) flowOptions.tableIndentCompatibility = options.tableIndentCompatibility;
 	if (options.automaticHyphenation) flowOptions.automaticHyphenation = options.automaticHyphenation;
-	return finalizeHeaderFooterContent(toFlowBlocks(pmDoc, flowOptions), contentWidth, metrics, options);
+	const projection = projectStoryMarkupView({
+		doc: pmDoc,
+		markupView: options.markupView ?? "all-markup",
+		styles: options.styles,
+		numbering: options.numbering
+	});
+	const flowBlocks = toFlowBlocks(projection.type === "resolved" ? projection.doc : pmDoc, flowOptions);
+	return finalizeHeaderFooterContent(projection.type === "resolved" ? remapMarkupViewBlocks(flowBlocks, projection) : flowBlocks, contentWidth, metrics, options);
 }
 function horizontalImageLeft({ run, contentWidth, metrics }) {
 	const horizontal = run.position?.horizontal;

package/dist/layout-bridge/convert/paragraphRuns.js

@@ -58,7 +58,8 @@ function paragraphToRuns(node, startPos, _options, pageBreaks) {
 			});
 			return;
 		}
-		const effectiveMarks = mergeProjectedInlineMarks(inheritedMarks, child.marks);
+		const projectedMarks = mergeProjectedInlineMarks(inheritedMarks, child.marks);
+		const effectiveMarks = _options.showCommentHighlights === false ? projectedMarks.filter((mark) => mark.type.name !== "comment") : projectedMarks;
 		if (child.type.name === "pageBreakRun") {
 			const trackedChange = extractRunFormatting(effectiveMarks, theme, fontAlternates);
 			if (trackedChange.isDeletion) {

package/dist/layout-engine/measure/crossRunWords.js

@@ -1,3 +1,4 @@
+import { sliceText } from "../../utils/sliceText.js";
 import { splitTrailingToken } from "../../utils/trailingText.js";
 import { resolveEffectiveLineBreakPolicy } from "./effectiveLineBreakPolicy.js";
 import "./lineBreakProvider.js";
@@ -47,7 +48,11 @@ function computeFollowingTextLeads(block) {
 		leads[index] = lead;
 		const run = block.runs[index];
 		if (!run || !isTextRun(run)) lead = void 0;
-		else if (run.text) lead = run.text[0];
+		else if (run.text) lead = sliceText({
+			text: run.text,
+			units: "codePoints",
+			end: 1
+		});
 	}
 	return leads;
 }
@@ -101,6 +106,7 @@ function computeProtectedCrossRunGlueWidths(block) {
 * invoked from, without the per-word text-length budget ever kicking in.
 */
 const MAX_CROSS_RUN_SEGMENTS = 64;
+const MAX_SCALAR_CODE_UNITS = 2;
 /** Collect one lexical word continued through adjacent formatting runs. */
 function collectCrossRunWord({ block, startRunIndex, startChar }) {
 	const segments = [];
@@ -115,7 +121,11 @@ function collectCrossRunWord({ block, startRunIndex, startChar }) {
 		if (remainder.length === 0) continue;
 		if (runIndex !== startRunIndex && isSpaceOrTab(remainder[0])) break;
 		const remainingBudget = 256 - text.length;
-		const boundedRemainder = remainder.slice(0, remainingBudget + 1);
+		const boundedRemainder = sliceText({
+			text: remainder,
+			units: "codeUnits",
+			end: remainingBudget + MAX_SCALAR_CODE_UNITS
+		});
 		const firstBreak = findWordBreaks(boundedRemainder, resolveEffectiveLineBreakPolicy({
 			attrs: block.attrs,
 			run

package/dist/managers/AutoSaveManager.js

@@ -1,3 +1,4 @@
+import { encodeUtf8 } from "../utils/textEncoding.js";
 import { Subscribable } from "./Subscribable.js";
 import { decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelopeFromDocument } from "./autoSaveCodec.js";
 //#region src/managers/AutoSaveManager.ts
@@ -228,7 +229,7 @@ function getAutoSaveStorageSize(storageKey = DEFAULT_STORAGE_KEY) {
 	try {
 		const data = localStorage.getItem(storageKey);
 		if (!data) return 0;
-		return new Blob([data]).size;
+		return encodeUtf8(data).byteLength;
 	} catch {
 		return 0;
 	}

package/dist/managers/EditorModeManager.d.ts

@@ -5,6 +5,15 @@ type EditorMode = "editing" | "suggesting" | "viewing";
 /** How tracked changes render. Drives the display mode dropdown. */
 declare const DISPLAY_MODES: readonly ["all-markup", "simple-markup", "no-markup", "original"];
 type DisplayMode = (typeof DISPLAY_MODES)[number];
+/** Why a user action cannot edit the displayed document. */
+type EditorReadOnlyReason = "host-read-only" | "viewing-mode" | "review-display-mode";
+declare const getReviewViewReadOnlyReason: (displayMode: DisplayMode) => EditorReadOnlyReason | null;
+type EditorReadOnlyReasonOptions = {
+  editingMode: EditorMode;
+  readOnlyProp: boolean;
+  displayMode: DisplayMode;
+};
+declare const getEditorReadOnlyReason: ({ editingMode, readOnlyProp, displayMode }: EditorReadOnlyReasonOptions) => EditorReadOnlyReason | null;
 /** EditorModeManager snapshot. */
 type EditorModeSnapshot = {
   /** Uncontrolled internal editing mode (the host's controlled prop wins over this). */
@@ -26,4 +35,4 @@ declare class EditorModeManager extends Subscribable<EditorModeSnapshot> {
   setDisplayMode(mode: DisplayMode): void;
 }
 //#endregion
-export { DISPLAY_MODES, DisplayMode, EditorMode, EditorModeManager, EditorModeSnapshot, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };
+export { DISPLAY_MODES, DisplayMode, EditorMode, EditorModeManager, EditorModeSnapshot, EditorReadOnlyReason, getEditorReadOnlyReason, getReviewViewReadOnlyReason, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };

package/dist/managers/EditorModeManager.js

@@ -18,6 +18,20 @@ const DISPLAY_MODES = [
 	"no-markup",
 	"original"
 ];
+const REVIEW_VIEW_ACCESS = {
+	"all-markup": "editable",
+	"simple-markup": "read-only",
+	"no-markup": "read-only",
+	original: "read-only"
+};
+const getReviewViewReadOnlyReason = (displayMode) => REVIEW_VIEW_ACCESS[displayMode] === "read-only" ? "review-display-mode" : null;
+const getEditorReadOnlyReason = ({ editingMode, readOnlyProp, displayMode }) => {
+	const viewReason = getReviewViewReadOnlyReason(displayMode);
+	if (viewReason) return viewReason;
+	if (readOnlyProp) return "host-read-only";
+	if (editingMode === "viewing") return "viewing-mode";
+	return null;
+};
 /** True when the host opts into read-only OR the mode is `"viewing"`. */
 const isReadOnlyMode = (editingMode, readOnlyProp) => readOnlyProp || editingMode === "viewing";
 /** True when the mode is `"suggesting"`. */
@@ -47,4 +61,4 @@ var EditorModeManager = class extends Subscribable {
 	}
 };
 //#endregion
-export { DISPLAY_MODES, EditorModeManager, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };
+export { DISPLAY_MODES, EditorModeManager, getEditorReadOnlyReason, getReviewViewReadOnlyReason, isReadOnlyMode, isTrackChangesMode, toggledTrackChangesMode };

package/dist/managers/TableSelectionManager.d.ts

@@ -1,6 +1,6 @@
 import { document_d_exports } from "../types/document.js";
-import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { Subscribable } from "./Subscribable.js";
+import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { CellCoordinates } from "./types.js";
 //#region src/managers/TableSelectionManager.d.ts
 /** Data attributes for table elements in the rendered DOM */

package/dist/managers/autoSaveCodec.js

@@ -1,5 +1,6 @@
 import { validateFolioDocumentModel } from "../docx/modelValidation.js";
 import { bytesToBase64 } from "../utils/base64.js";
+import { base64ToBytes } from "../utils/textEncoding.js";
 //#region src/managers/autoSaveCodec.ts
 /**
 * Version 3 renamed the model's `bidiWrapper` to `inlineWrapper` and gave it a
@@ -10,12 +11,7 @@ import { bytesToBase64 } from "../utils/base64.js";
 * re-taken rather than migrated.
 */
 const AUTOSAVE_FORMAT_VERSION = 3;
-const decodeBase64 = (value) => {
-	const binary = atob(value);
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
-	return bytes.buffer;
-};
+const decodeBase64 = (value) => base64ToBytes(value).buffer;
 const encodeValue = (value) => {
 	if (value === void 0) return { type: "undefined" };
 	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;

package/dist/managers/reviewDisplayMode.d.ts

@@ -0,0 +1,8 @@
+import { DisplayMode } from "./EditorModeManager.js";
+//#region src/managers/reviewDisplayMode.d.ts
+/** The host's reading of pending revisions; it never changes the saved document. */
+declare const REVIEW_DISPLAY_MODES: readonly ["all-markup", "final", "original"];
+type ReviewDisplayMode = (typeof REVIEW_DISPLAY_MODES)[number];
+declare const reviewDisplayModeToDisplayMode: (mode: ReviewDisplayMode) => DisplayMode;
+//#endregion
+export { REVIEW_DISPLAY_MODES, ReviewDisplayMode, reviewDisplayModeToDisplayMode };

package/dist/managers/reviewDisplayMode.js

@@ -0,0 +1,15 @@
+//#region src/managers/reviewDisplayMode.ts
+/** The host's reading of pending revisions; it never changes the saved document. */
+const REVIEW_DISPLAY_MODES = [
+	"all-markup",
+	"final",
+	"original"
+];
+const REVIEW_DISPLAY_MODE_VIEWS = {
+	"all-markup": "all-markup",
+	final: "no-markup",
+	original: "original"
+};
+const reviewDisplayModeToDisplayMode = (mode) => REVIEW_DISPLAY_MODE_VIEWS[mode];
+//#endregion
+export { REVIEW_DISPLAY_MODES, reviewDisplayModeToDisplayMode };

package/dist/paged-layout/pageText.d.ts

@@ -1,14 +1,23 @@
 import { Layout } from "../layout-engine/types.js";
 import "../layout-engine/index.js";
+import { MarkupViewProjection } from "../prosemirror/markupViewProjection.js";
 import { Node } from "prosemirror-model";
 //#region src/paged-layout/pageText.d.ts
+type PageTextOptions = {
+  layout: Layout | null;
+  doc: Node;
+  page: number;
+  projection?: MarkupViewProjection;
+};
 /**
  * The plain text of a single rendered page (1-based), read by joining each of
  * the page's layout fragments' `[pmStart, pmEnd)` document text with a
- * newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+ * newline. A review projection maps those authored ranges to the displayed
+ * document, excluding text the view hides. Fragments with no `pmStart`/`pmEnd`
+ * (e.g. a page-shell placeholder)
  * are skipped. Returns `null` when the layout hasn't been computed yet or the
  * page number is out of range.
  */
-declare const getPageTextFromLayout: (layout: Layout | null, doc: Node, page: number) => string | null;
+declare const getPageTextFromLayout: ({ layout, doc, page, projection }: PageTextOptions) => string | null;
 //#endregion
 export { getPageTextFromLayout };

package/dist/paged-layout/pageText.js

@@ -2,18 +2,23 @@
 /**
 * The plain text of a single rendered page (1-based), read by joining each of
 * the page's layout fragments' `[pmStart, pmEnd)` document text with a
-* newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+* newline. A review projection maps those authored ranges to the displayed
+* document, excluding text the view hides. Fragments with no `pmStart`/`pmEnd`
+* (e.g. a page-shell placeholder)
 * are skipped. Returns `null` when the layout hasn't been computed yet or the
 * page number is out of range.
 */
-const getPageTextFromLayout = (layout, doc, page) => {
+const getPageTextFromLayout = ({ layout, doc, page, projection }) => {
 	if (!layout || !Number.isInteger(page) || page < 1) return null;
 	const layoutPage = layout.pages[page - 1];
 	if (!layoutPage) return null;
+	const viewDoc = projection?.type === "resolved" ? projection.doc : doc;
 	const fragmentTexts = [];
 	for (const fragment of layoutPage.fragments) {
 		if (typeof fragment.pmStart !== "number" || typeof fragment.pmEnd !== "number") continue;
-		fragmentTexts.push(doc.textBetween(fragment.pmStart, fragment.pmEnd, "\n"));
+		const from = projection?.type === "resolved" ? projection.toView(fragment.pmStart, 1) : fragment.pmStart;
+		const to = projection?.type === "resolved" ? projection.toView(fragment.pmEnd, -1) : fragment.pmEnd;
+		fragmentTexts.push(viewDoc.textBetween(from, to, "\n"));
 	}
 	return fragmentTexts.join("\n");
 };

package/dist/pdf/fonts.js

@@ -2,6 +2,7 @@ import { parseSfnt } from "../fonts/sfnt/parse.js";
 import { subsetTrueType } from "../fonts/sfnt/subset.js";
 import { toSfntBytes } from "../fonts/sfnt/woff.js";
 import { needsShaping, placeRun } from "../shaping/placeRun.js";
+import { bytesToHex, decodeText, encodeUtf16BE, encodeUtf8 } from "../utils/textEncoding.js";
 import { pdfArray, pdfAsciiString, pdfDict, pdfFlateStream, pdfName, pdfNumber, pdfNumberArray } from "./objects.js";
 import { Result, TaggedError, panic } from "better-result";
 //#region src/pdf/fonts.ts
@@ -46,7 +47,7 @@ const SUBSET_TAG_LENGTH = 6;
 const ALPHABET_LENGTH = 26;
 const UPPERCASE_A = 65;
 const WOFF_SIGNATURES = ["wOFF", "wOF2"];
-const readTag = (bytes) => String.fromCharCode(bytes[0] ?? 0, bytes[1] ?? 0, bytes[2] ?? 0, bytes[3] ?? 0);
+const readTag = (bytes) => decodeText(Uint8Array.of(bytes[0] ?? 0, bytes[1] ?? 0, bytes[2] ?? 0, bytes[3] ?? 0), { encoding: "binary" });
 /**
 * Six uppercase letters derived from the face and the exact glyph set, so the
 * tag is stable across runs and two different subsets of one family do not
@@ -148,18 +149,8 @@ const buildWinAnsiTable = () => {
 	return table;
 };
 const WIN_ANSI_BY_CODE_POINT = buildWinAnsiTable();
-const utf16BeHexOf = (text) => [...text].map((character) => utf16BeHex(character.codePointAt(0) ?? 0)).join("");
-const utf16BeHex = (codePoint) => {
-	const SUPPLEMENTARY_START = 65536;
-	const SURROGATE_HALF_BITS = 10;
-	const LOW_SURROGATE_MASK = 1023;
-	const HIGH_SURROGATE_BASE = 55296;
-	const LOW_SURROGATE_BASE = 56320;
-	const hex = (unit) => unit.toString(16).padStart(4, "0").toUpperCase();
-	if (codePoint < SUPPLEMENTARY_START) return hex(codePoint);
-	const offset = codePoint - SUPPLEMENTARY_START;
-	return hex(HIGH_SURROGATE_BASE + (offset >> SURROGATE_HALF_BITS)) + hex(LOW_SURROGATE_BASE + (offset & LOW_SURROGATE_MASK));
-};
+const utf16BeHexOf = (text) => bytesToHex(encodeUtf16BE(text)).toUpperCase();
+const utf16BeHex = (codePoint) => utf16BeHexOf(String.fromCodePoint(codePoint));
 /** Entries per `beginbfchar` block; the CMap syntax caps this at 100. */
 const BFCHAR_BLOCK_SIZE = 100;
 const toUnicodeCMap = (glyphToText) => {
@@ -290,7 +281,7 @@ const emitFont = (document, plan) => {
 		fontFileKey: font.isCff ? "FontFile3" : "FontFile2",
 		fontFileRef
 	}));
-	const toUnicodeRef = document.add(pdfFlateStream([], new TextEncoder().encode(toUnicodeCMap(plan.glyphToText))));
+	const toUnicodeRef = document.add(pdfFlateStream([], encodeUtf8(toUnicodeCMap(plan.glyphToText))));
 	const descendantRef = document.add(pdfDict([
 		["Type", pdfName("Font")],
 		["Subtype", pdfName(font.isCff ? "CIDFontType0" : "CIDFontType2")],

package/dist/pdf/images.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../utils/textEncoding.js";
 import { pdfArray, pdfHexString, pdfName, pdfNumber } from "./objects.js";
 import { Result, TaggedError } from "better-result";
 import { inflateSync } from "node:zlib";
@@ -63,7 +64,7 @@ const readPngChunks = (bytes) => {
 	const CHUNK_CRC_BYTES = 4;
 	while (cursor + CHUNK_HEADER_BYTES <= bytes.length) {
 		const length = view.getUint32(cursor);
-		const type = String.fromCharCode(bytes[cursor + 4] ?? 0, bytes[cursor + 5] ?? 0, bytes[cursor + 6] ?? 0, bytes[cursor + 7] ?? 0);
+		const type = decodeText(bytes.subarray(cursor + 4, cursor + 8), { encoding: "binary" });
 		const dataStart = cursor + CHUNK_HEADER_BYTES;
 		const dataEnd = dataStart + length;
 		if (dataEnd > bytes.length) return Result.err(new PdfImageError({ message: `PNG chunk ${type} runs past the end` }));
@@ -538,7 +539,7 @@ const decodeJpeg = (bytes) => {
 		const length = view.getUint16(cursor + 2);
 		const segment = cursor + 4;
 		const frame = JPEG_FRAME_MODES[marker];
-		if (marker === APP14 && length >= 12) adobe = String.fromCharCode(...bytes.subarray(segment, segment + 5)) === "Adobe";
+		if (marker === APP14 && length >= 12) adobe = decodeText(bytes.subarray(segment, segment + 5), { encoding: "binary" }) === "Adobe";
 		if (frame !== void 0) {
 			if (!frame.dctDecodable) return Result.err(new PdfImageError({ message: `JPEG ${frame.name} frame (marker 0xff${marker.toString(16)}) has no /DCTDecode equivalent` }));
 			const height = view.getUint16(segment + 1);

package/dist/pdf/objects.d.ts

@@ -1,15 +1,4 @@
 //#region src/pdf/objects.d.ts
-/**
- * The PDF object model: values, serialization, the cross-reference table and
- * the trailer.
- *
- * Everything a backend writes into a PDF file passes through here, which is
- * what makes byte-for-byte determinism enforceable rather than aspirational:
- * numbers go through one formatter, dictionaries carry their entries as an
- * ordered list (never an object or a `Map` whose iteration order depends on
- * how it was built), and object numbers come from one allocator in call
- * order.
- */
 /** The one number formatter. Every number in the file is emitted through it. */
 declare const formatNumber: (value: number) => string;
 type PdfRef = {

package/dist/pdf/objects.js

@@ -1,3 +1,4 @@
+import { bytesToHex, encodeBinaryString, encodeUtf16BE, encodeUtf8 } from "../utils/textEncoding.js";
 import { panic } from "better-result";
 import { deflateSync } from "node:zlib";
 //#region src/pdf/objects.ts
@@ -94,7 +95,10 @@ const pdfFlateStream = (entries, data) => pdfStream(pdfDict([...entries, ["Filte
 const NAME_REGULAR = /^[A-Za-z0-9._\-+]$/u;
 const encodeName = (value) => {
 	let out = "/";
-	for (const char of value) out += NAME_REGULAR.test(char) ? char : `#${char.charCodeAt(0).toString(16).padStart(2, "0").toUpperCase()}`;
+	for (const byte of encodeUtf8(value)) {
+		const char = String.fromCharCode(byte);
+		out += NAME_REGULAR.test(char) ? char : `#${byte.toString(16).padStart(2, "0").toUpperCase()}`;
+	}
 	return out;
 };
 const encodeAsciiString = (value) => {
@@ -108,11 +112,7 @@ const encodeAsciiString = (value) => {
 	}
 	return `${out})`;
 };
-const encodeTextString = (value) => {
-	let hex = "FEFF";
-	for (let index = 0; index < value.length; index += 1) hex += value.charCodeAt(index).toString(16).padStart(4, "0").toUpperCase();
-	return `<${hex}>`;
-};
+const encodeTextString = (value) => `<FEFF${bytesToHex(encodeUtf16BE(value)).toUpperCase()}>`;
 const createByteSink = () => {
 	const chunks = [];
 	let length = 0;
@@ -122,9 +122,7 @@ const createByteSink = () => {
 	};
 	return {
 		writeAscii: (text) => {
-			const bytes = new Uint8Array(text.length);
-			for (let index = 0; index < text.length; index += 1) bytes[index] = text.charCodeAt(index) & 255;
-			writeBytes(bytes);
+			writeBytes(encodeBinaryString(text));
 		},
 		writeBytes,
 		offset: () => length,

package/dist/pdf/writePdf.js

@@ -1,4 +1,5 @@
 import { getShaper } from "../shaping/shaper.js";
+import { encodeUtf8 } from "../utils/textEncoding.js";
 import { collectResources, renderContentStream } from "./contentStream.js";
 import { prepareFonts } from "./fonts.js";
 import { decodeImage } from "./images.js";
@@ -288,7 +289,7 @@ const writePdf = async (list, options) => {
 			fonts: byFontIndex
 		});
 		const resources = collectResources(parts);
-		const contentRef = document.add(pdfFlateStream([], new TextEncoder().encode(renderContentStream(parts, resources))));
+		const contentRef = document.add(pdfFlateStream([], encodeUtf8(renderContentStream(parts, resources))));
 		const annotationRefs = [];
 		for (const link of page.links) {
 			const annotation = buildLinkAnnotation({