@stll/folio-core 0.60.0 → 0.61.0

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 };

package/dist/controller/canonicalListRendering.js

@@ -1,160 +1,6 @@
-import { foldListNumberFields, planParagraphListNumberFold, unfoldedListNumberContent } from "../docx/foldedListNumberFields.js";
-import { computeListMarker } from "../docx/listMarkerComputation.js";
-import { listRenderingDefinitionsMatch } from "../docx/listRendering.js";
-import { computeListRendering, getCachedNumberingMap } from "../docx/numberingParser.js";
-import { assignParagraphIndentationProjection, cloneParagraphWithPropertySource, paragraphFormattingWithAuthoredIndentation, sameParagraphIndentationProjection } from "../docx/paragraphPropertySource.js";
-import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "../prosemirror/numberingAttr.js";
-import { paragraphIndentationFromFormatting } from "../prosemirror/paragraphIndentation.js";
-import { listIndentationProvenancePatch } from "../prosemirror/styles/resolvedStyleAttrs.js";
-import { createStyleResolver } from "../prosemirror/styles/styleResolver.js";
-import { canonicalJson } from "../utils/canonicalJson.js";
-import { panic } from "better-result";
-import { DOCUMENT_OP_TYPES, EMPTY_PROPERTY_SETS, OP_STORIES, registerParagraphPropertySnapshot, withBodyContent } from "@stll/docx-core/ops";
+import { normalizeListModelRendering } from "../docx/listModelNormalization.js";
 //#region src/controller/canonicalListRendering.ts
-/** Canonical edits retain authored fields; list rendering follows the current numbering. */
-const normalizeCanonicalListRendering = (document) => {
-	const inverse = [];
-	const styles = createStyleResolver(document.package.styles);
-	const numbering = document.package.numbering === void 0 ? null : getCachedNumberingMap(document.package.numbering);
-	const normalizeBody = (body, story) => {
-		const counters = {
-			numbering,
-			listCounters: /* @__PURE__ */ new Map(),
-			abstractCounters: /* @__PURE__ */ new Map(),
-			restartedNumIds: /* @__PURE__ */ new Set(),
-			previousList: {
-				abstractNumId: null,
-				fromStyle: false,
-				numId: null
-			}
-		};
-		const content = body.content.map((paragraph) => {
-			if (paragraph.type !== "paragraph") return paragraph;
-			registerParagraphPropertySnapshot({
-				paragraph,
-				snapshot: paragraphFormattingWithAuthoredIndentation(paragraph)
-			});
-			const formatting = paragraph.formatting;
-			const next = cloneParagraphWithPropertySource(paragraph, {});
-			if (formatting?.numPrFromStyle !== void 0 && (formatting.numPr?.kind === "reference" || formatting.numPr?.kind === "none")) {
-				next.formatting = { ...formatting };
-				delete next.formatting.numPrFromStyle;
-				inverse.push({
-					type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
-					story,
-					blockId: paragraph.paraId ?? panic("Canonical numbering normalization requires paragraph identities."),
-					patch: { numPrFromStyle: formatting.numPrFromStyle }
-				});
-			}
-			const numPr = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
-				numPr: next.formatting?.numPr,
-				numPrFromStyle: next.formatting?.numPrFromStyle
-			}));
-			if (paragraph.listRendering === void 0 && formatting?.numPrFromStyle === void 0 && (numPr?.kind !== "reference" || numbering === null)) {
-				computeListMarker(paragraph, counters);
-				return paragraph;
-			}
-			const definition = numPr?.kind === "reference" && numbering !== null ? computeListRendering(numPr, numbering) : null;
-			const cached = paragraph.listRendering;
-			const rendering = definition !== null && cached !== void 0 && listRenderingDefinitionsMatch(cached, definition) ? { ...cached } : definition;
-			const authoredFormatting = paragraphFormattingWithAuthoredIndentation(next);
-			assignParagraphIndentationProjection({
-				paragraph: next,
-				authored: authoredFormatting,
-				inherited: paragraphIndentationFromFormatting(listIndentationProvenancePatch({
-					direct: paragraphIndentationFromFormatting(authoredFormatting),
-					styleFormatting: styles.resolveParagraphStyle(next.formatting?.styleId).paragraphFormatting,
-					numberingSource: next.formatting?.numPr?.kind === "reference" || next.formatting?.numPrFromStyle === void 0 ? "paragraph" : "style",
-					numPr: numPr?.kind === "reference" ? {
-						numId: numPr.numId,
-						ilvl: numPr.ilvl ?? 0
-					} : void 0,
-					numbering
-				})._resolvedFormatting) ?? {}
-			});
-			if (canonicalJson(paragraphIndentationFromFormatting(next.formatting)) !== canonicalJson(paragraphIndentationFromFormatting(formatting))) inverse.unshift({
-				type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
-				story,
-				blockId: paragraph.paraId ?? panic("Canonical numbering normalization requires paragraph identities."),
-				patch: {
-					indentLeft: formatting?.indentLeft ?? null,
-					indentRight: formatting?.indentRight ?? null,
-					indentFirstLine: formatting?.indentFirstLine ?? null,
-					hangingIndent: formatting?.hangingIndent ?? null
-				},
-				whenEmpty: formatting === void 0 ? EMPTY_PROPERTY_SETS.OMIT : EMPTY_PROPERTY_SETS.KEEP
-			});
-			if (rendering === null) delete next.listRendering;
-			else {
-				const fields = foldListNumberFields(paragraph.content.map(unfoldedListNumberContent), () => void 0).fieldCount;
-				if (fields === 0) delete rendering.implicitChildLevelAdvances;
-				else rendering.implicitChildLevelAdvances = fields;
-				const template = rendering.markerTemplate ?? rendering.marker;
-				const fold = planParagraphListNumberFold(paragraph.content, !rendering.isBullet && template !== "" && !template.includes("	"));
-				if (fold.suffix === void 0) delete rendering.foldedMarkerSuffix;
-				else rendering.foldedMarkerSuffix = fold.suffix;
-				const child = numbering?.getLevel(rendering.numId, rendering.level + 1)?.pPr;
-				if (fold.suffix !== void 0 && child?.hangingIndent === true && child.indentFirstLine !== void 0 && child.indentFirstLine < 0) rendering.markerSecondSlotOffsetTwips = -child.indentFirstLine;
-				else delete rendering.markerSecondSlotOffsetTwips;
-				rendering.marker = rendering.foldedMarkerSuffix !== void 0 && !template.includes("	") ? `${template}\t${rendering.foldedMarkerSuffix}` : template;
-				next.listRendering = rendering;
-			}
-			computeListMarker(next, counters);
-			registerParagraphPropertySnapshot({
-				paragraph: next,
-				snapshot: authoredFormatting
-			});
-			if (sameParagraphIndentationProjection({
-				left: next,
-				right: paragraph
-			}) && canonicalJson(next.formatting) === canonicalJson(formatting) && canonicalJson(next.listRendering) === canonicalJson(cached)) return paragraph;
-			return next;
-		});
-		return content.every((paragraph, index) => paragraph === body.content[index]) ? body : {
-			...body,
-			...withBodyContent(body, content)
-		};
-	};
-	const pkg = document.package;
-	const body = normalizeBody(pkg.document, OP_STORIES.MAIN);
-	const normalizeParts = (parts, kind) => {
-		if (parts === void 0) return parts;
-		const normalized = new Map([...parts].map(([id, part]) => [id, normalizeBody(part, {
-			kind,
-			rId: id
-		})]));
-		return [...normalized].every(([id, part]) => part === parts.get(id)) ? parts : normalized;
-	};
-	const normalizeNotes = (notes, kind) => {
-		if (notes === void 0) return notes;
-		const normalized = notes.map((note) => normalizeBody(note, {
-			kind,
-			id: note.id
-		}));
-		return normalized.every((note, index) => note === notes[index]) ? notes : normalized;
-	};
-	const headers = normalizeParts(pkg.headers, "header");
-	const footers = normalizeParts(pkg.footers, "footer");
-	const footnotes = normalizeNotes(pkg.footnotes, "footnote");
-	const endnotes = normalizeNotes(pkg.endnotes, "endnote");
-	if (body === pkg.document && headers === pkg.headers && footers === pkg.footers && footnotes === pkg.footnotes && endnotes === pkg.endnotes) return {
-		document,
-		inverse
-	};
-	return {
-		inverse,
-		document: {
-			...document,
-			package: {
-				...pkg,
-				document: body,
-				...headers === void 0 ? {} : { headers },
-				...footers === void 0 ? {} : { footers },
-				...footnotes === void 0 ? {} : { footnotes },
-				...endnotes === void 0 ? {} : { endnotes }
-			}
-		}
-	};
-};
+/** Canonical edits share list model normalization with the headless projection. */
+const normalizeCanonicalListRendering = normalizeListModelRendering;
 //#endregion
 export { normalizeCanonicalListRendering };

package/dist/controller/headerFooterEditorManager.d.ts

@@ -18,6 +18,7 @@ type HeaderFooterEditorTransaction = {
 type HeaderFooterEditorManagerDeps = {
   createView?: ((mountNode: HTMLElement, props: DirectEditorProps) => EditorView) | undefined;
   getDocument: () => document_d_exports.Document | null;
+  getReadOnly?: (() => boolean) | undefined;
   getCanonicalApi?: (() => HiddenEditorApi | null) | undefined;
   getExperimentalSession?: (() => "canonical" | undefined) | undefined;
   onSessionRefusal?: ((reason: string, gap: CanonicalGap, error?: Error) => void) | undefined;

package/dist/controller/headerFooterEditorManager.js

@@ -91,6 +91,15 @@ const createHeaderFooterEditorManager = (deps) => {
 	const sync = () => {
 		const host = deps.getHost();
 		if (!host) return;
+		const getReadOnly = deps.getReadOnly;
+		if (getReadOnly) {
+			const readOnly = getReadOnly();
+			for (const part of mounted.values()) {
+				const expectedEditable = !readOnly;
+				if (part.view.editable === expectedEditable) continue;
+				part.view.setProps({ editable: () => !getReadOnly() });
+			}
+		}
 		if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting) && !deps.getCanonicalApi?.()?.getCanonicalStoryProjection(OP_STORIES.MAIN)) return;
 		const document = getOwnedDocument();
 		const styles = deps.getStyles();
@@ -179,11 +188,13 @@ const createHeaderFooterEditorManager = (deps) => {
 			}
 			const view = (deps.createView ?? createEditorView)(mountNode, {
 				...canonical.props,
+				editable: () => !(deps.getReadOnly?.() ?? false),
 				state: canonicalProjection ? EditorState.create({
 					doc: canonicalProjection,
 					plugins: [createDocumentStyleContextPlugin(styles), createDocumentNumberingPlugin(numbering)]
 				}) : buildInitialState(headerFooter, styles, theme, numbering, manager),
 				dispatchTransaction(transaction) {
+					if ((deps.getReadOnly?.() ?? false) && transaction.docChanged) return;
 					if (canonical.dispatch(transaction)) return;
 					const nextState = view.state.apply(transaction);
 					const docChanged = !nextState.doc.eq(view.state.doc);

package/dist/controller/hiddenEditorManager.d.ts

@@ -1,10 +1,10 @@
 import { document_d_exports } from "../types/document.js";
 import { CanonicalGap } from "../types/canonicalCapabilities.js";
+import { EditorMode } from "../managers/EditorModeManager.js";
 import { HiddenEditorApi } from "./hiddenEditorApi.js";
 import { HiddenEditorStateReason } from "../layout-engine/layoutInstrumentation.js";
 import { ExtensionManager } from "../prosemirror/extensions/ExtensionManager.js";
 import { RemoteSelection } from "../types/remote-selection.js";
-import { EditorMode } from "../managers/EditorModeManager.js";
 import { EditorState, Plugin, Transaction } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 import * as Yjs from "yjs";

package/dist/controller/hiddenEditorManager.js

@@ -812,7 +812,9 @@ const createHiddenEditorManager = (deps) => {
 	};
 	const syncEditable = () => {
 		if (!view) return;
-		syncHiddenEditorAccessibility(view, deps.getReadOnly());
+		const readOnly = deps.getReadOnly();
+		if (view.editable !== !readOnly) view.setProps({ editable: () => !deps.getReadOnly() });
+		syncHiddenEditorAccessibility(view, readOnly);
 	};
 	const publishStoryCommit = (storyView, commit) => {
 		if (!view || editorSession.type !== "canonical") return false;

package/dist/controller/layoutPipeline.d.ts

@@ -1,8 +1,8 @@
 import { document_d_exports } from "../types/document.js";
 import { TemplatePreviewEntry, TemplatePreviewHiddenRange } from "../prosemirror/plugins/templatePreviewValues.js";
+import { DisplayMode } from "../managers/EditorModeManager.js";
 import { ColumnLayout, FlowBlock, FootnoteContent, HeaderFooterContent, Layout, Measure, PageHeaderFooterRefs, PageMargins } from "../layout-engine/types.js";
 import { LayoutRunOptions } from "./layoutRunOptions.js";
-import { DisplayMode } from "../managers/EditorModeManager.js";
 import { LayoutSession } from "./layoutSession.js";
 import { HyphenationReadiness } from "./hyphenationReadiness.js";
 import { ConvertHeaderFooterOptions, HeaderFooterMetrics } from "../layout-bridge/convert/headerFooterLayout.js";
@@ -79,6 +79,8 @@ type LayoutPipelineDeps<THfPMs> = {
    * authored text with runs hidden afterwards.
    */
   markupView: DisplayMode;
+  /** Independent highlight visibility in All Markup; resolved views always hide comments. */
+  showCommentHighlights?: boolean;
 };
 declare function runLayoutPipeline<THfPMs>(deps: LayoutPipelineDeps<THfPMs>, state: EditorState, options?: LayoutRunOptions): LayoutOutcome;
 //#endregion

package/dist/controller/layoutPipeline.js

@@ -42,7 +42,7 @@ const formatEndnoteTexts = (numbers, formatNumber) => {
 	for (const [id, displayNumber] of numbers) texts.set(id, formatNumber(displayNumber));
 	return texts;
 };
-const sameMeasureInputs = (left, right) => left.embeddedFontFamilyMap === right.embeddedFontFamilyMap && left.styles === right.styles && left.theme === right.theme && left.defaultTabStop === right.defaultTabStop && left.pageContentHeight === right.pageContentHeight && left.fontSet === right.fontSet && left.fontAlternates.size === right.fontAlternates.size && [...left.fontAlternates].every(([name, alternate]) => right.fontAlternates.get(name) === alternate) && left.markupView === right.markupView;
+const sameMeasureInputs = (left, right) => left.embeddedFontFamilyMap === right.embeddedFontFamilyMap && left.styles === right.styles && left.theme === right.theme && left.defaultTabStop === right.defaultTabStop && left.pageContentHeight === right.pageContentHeight && left.fontSet === right.fontSet && left.fontAlternates.size === right.fontAlternates.size && [...left.fontAlternates].every(([name, alternate]) => right.fontAlternates.get(name) === alternate) && left.markupView === right.markupView && left.showCommentHighlights === right.showCommentHighlights;
 /**
 * The range an incremental pass re-measures, or `null` for a full measure: the
 * committed measures must come from the same measure inputs, and the range is
@@ -136,7 +136,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 	return result;
 }
 function runLayoutPipelineMeasured(deps, state, options) {
-	const { contentWidth, columns, pageSize, margins, pageGap, showMarginGuides, marginGuideColor, syncCoordinator, headerContent, footerContent, firstPageHeaderContent, firstPageFooterContent, headerContentRId, footerContentRId, firstPageHeaderContentRId, firstPageFooterContentRId, sectionHeaderFooterRefs, theme: _theme, sectionProperties, document, defaultTabStop, mirrorMargins, styles, layout, hfPMs, painter, pagesContainer, session, renderHfFromContentOrPm, renderHeaderFooterContentByRId, readFontSetSignature, buildFootnoteRenderItems, describeInvalidHighlightMarks, pageRenderer = PAGE_RENDERER.legacy, emptyTemplatePreviewEntries: EMPTY_TEMPLATE_PREVIEW_ENTRIES, emptyTemplatePreviewHidden: EMPTY_TEMPLATE_PREVIEW_HIDDEN, markupView } = deps;
+	const { contentWidth, columns, pageSize, margins, pageGap, showMarginGuides, marginGuideColor, syncCoordinator, headerContent, footerContent, firstPageHeaderContent, firstPageFooterContent, headerContentRId, footerContentRId, firstPageHeaderContentRId, firstPageFooterContentRId, sectionHeaderFooterRefs, theme: _theme, sectionProperties, document, defaultTabStop, mirrorMargins, styles, layout, hfPMs, painter, pagesContainer, session, renderHfFromContentOrPm, renderHeaderFooterContentByRId, readFontSetSignature, buildFootnoteRenderItems, describeInvalidHighlightMarks, pageRenderer = PAGE_RENDERER.legacy, emptyTemplatePreviewEntries: EMPTY_TEMPLATE_PREVIEW_ENTRIES, emptyTemplatePreviewHidden: EMPTY_TEMPLATE_PREVIEW_HIDDEN, markupView, showCommentHighlights = true } = deps;
 	let outcome = {};
 	let pendingArtifacts;
 	let pendingTemplatePreview;
@@ -154,6 +154,7 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		let phaseStartedAt = performance.now();
 		const pageContentHeight = pageSize.h - margins.top - margins.bottom;
 		const fontAlternates = buildFontAlternates(document?.package.fontTable);
+		const displayCommentHighlights = showCommentHighlights && markupView !== "no-markup" && markupView !== "original";
 		const embeddedFontFamilies = session.embeddedFontFamilyMap ? { embeddedFontFamilyMap: session.embeddedFontFamilyMap } : {};
 		const measureInputs = {
 			...embeddedFontFamilies,
@@ -163,9 +164,11 @@ function runLayoutPipelineMeasured(deps, state, options) {
 			pageContentHeight,
 			fontSet,
 			fontAlternates,
-			markupView
+			markupView,
+			showCommentHighlights: displayCommentHighlights
 		};
 		const flowOpts = {
+			showCommentHighlights: displayCommentHighlights,
 			...embeddedFontFamilies,
 			pageContentHeight,
 			fontAlternates,
@@ -246,6 +249,8 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		const buildHfOptions = (pageCount, fieldInputs) => {
 			const hfMeasureBlocks = (hfBlocks, hfWidth) => measureBlocks(hfBlocks, hfWidth, void 0, void 0, buildHeaderFooterFieldValues(hfBlocks, pageCount, hfClock, fieldInputs), { allowEndTabOverflow: true });
 			return {
+				markupView,
+				showCommentHighlights: displayCommentHighlights,
 				...flowOpts.styles ? { styles: flowOpts.styles } : {},
 				...document?.package.numbering === void 0 ? {} : { numbering: document.package.numbering },
 				...flowOpts.defaultSize === void 0 ? {} : { defaultSize: flowOpts.defaultSize },
@@ -378,7 +383,11 @@ function runLayoutPipelineMeasured(deps, state, options) {
 		outcome.measures = newMeasures;
 		recordPhaseDuration("measure-blocks", phaseStartedAt);
 		const buildNoteOptions = () => {
-			const noteOptions = { measureBlocks };
+			const noteOptions = {
+				measureBlocks,
+				showCommentHighlights: displayCommentHighlights,
+				markupView
+			};
 			if (flowOpts.styles) noteOptions.styles = flowOpts.styles;
 			if (flowOpts.defaultSize !== void 0) noteOptions.defaultSize = flowOpts.defaultSize;
 			if (_theme !== void 0) noteOptions.theme = _theme;

package/dist/controller/layoutSession.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { TemplatePreviewEntry, TemplatePreviewHiddenRange, TemplatePreviewValues } from "../prosemirror/plugins/templatePreviewValues.js";
-import { FlowBlock, Measure } from "../layout-engine/types.js";
 import { DisplayMode } from "../managers/EditorModeManager.js";
+import { FlowBlock, Measure } from "../layout-engine/types.js";
 import { FontAlternates } from "../fonts/fontAlternates.js";
 import { EditorState } from "prosemirror-state";
 //#region src/controller/layoutSession.d.ts
@@ -36,6 +36,7 @@ type LayoutMeasureInputs = {
   fontAlternates: FontAlternates;
   /** The review view: each lays out different text, so a measure is reusable only within one. */
   markupView: DisplayMode;
+  showCommentHighlights?: boolean;
 };
 type LayoutSession = {
   embeddedFontFamilyMap?: ReadonlyMap<string, string>;

package/dist/display-list/build/imagePrimitives.js

@@ -1,5 +1,6 @@
 import { parseRotationDegrees } from "../../utils/rotationBoundingBox.js";
 import { sanitizeImageSrc } from "../../utils/sanitizeImageSrc.js";
+import { base64ToBytes } from "../../utils/textEncoding.js";
 import { paintPreview } from "./previewPrimitives.js";
 import { resolveBorderStroke } from "./strokes.js";
 import { UNSUPPORTED_CONSTRUCT } from "./unsupported.js";
@@ -21,12 +22,8 @@ const DATA_URL_PATTERN = /^data:([^;,]*)(;base64)?,(.*)$/su;
 * document the builder reports, not an exception that aborts the build.
 */
 const decodeBase64 = (encoded) => {
-	const decoded = Result.try(() => atob(encoded));
-	if (decoded.isErr()) return;
-	const binary = decoded.value;
-	const bytes = new Uint8Array(binary.length);
-	for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
-	return bytes;
+	const decoded = Result.try(() => base64ToBytes(encoded));
+	return decoded.isOk() ? decoded.value : void 0;
 };
 const readUint32BE = (bytes, offset) => bytes[offset] << 24 | bytes[offset + 1] << 16 | bytes[offset + 2] << 8 | bytes[offset + 3];
 const readUint16BE = (bytes, offset) => bytes[offset] << 8 | bytes[offset + 1];

package/dist/docx/canonicalStoryRepack.js

@@ -1,5 +1,6 @@
 import { withTrackedSectionEndpointRemoval } from "../internal/sectionEndpointResolution.js";
 import { withSectionReferenceResolution } from "../internal/sectionReferenceResolution.js";
+import { decodeText, encodeUtf8 } from "../utils/textEncoding.js";
 import { readDocumentSectionFacts } from "./documentSectionFacts.js";
 import { parseDocx } from "./parser.js";
 import { assertSectionCarriersMatchModel } from "./rezip.js";
@@ -9,7 +10,7 @@ import JSZip from "jszip";
 /** Canonical snapshots own explicit section references; the PM projection does not. */
 const referenceKey = ({ element, type, rId }) => `${element}:${type}:${rId}`;
 const xmlFingerprint = async (xml) => {
-	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(xml));
+	const digest = await crypto.subtle.digest("SHA-256", encodeUtf8(xml));
 	let fingerprint = "";
 	for (const byte of new Uint8Array(digest)) fingerprint += byte.toString(16).padStart(2, "0");
 	return fingerprint;
@@ -18,7 +19,7 @@ const xmlFingerprint = async (xml) => {
 const repackWithCanonicalStoryRemovals = async ({ document, repack }) => {
 	const originalBuffer = document.originalBuffer;
 	if (!originalBuffer) return repack();
-	const xml = await (await JSZip.loadAsync(originalBuffer)).file("word/document.xml")?.async("text");
+	const xml = await (await JSZip.loadAsync(originalBuffer)).file("word/document.xml")?.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }));
 	if (!xml) return repack();
 	const before = readDocumentSectionFacts(xml);
 	const serializedXml = serializeDocument(document);

package/dist/docx/commentTextParagraph.d.ts

@@ -0,0 +1,6 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/docx/commentTextParagraph.d.ts
+/** Plain comment text has no authored paragraph formatting. */
+declare const commentTextParagraph: (text: string) => document_d_exports.Paragraph;
+//#endregion
+export { commentTextParagraph };