@stll/folio-core 0.59.0 → 0.61.0

package/dist/docx/server/evaluateDocxXmlPatchProposal.js

@@ -1,3 +1,4 @@
+import { encodeUtf8 } from "../../utils/textEncoding.js";
 import { getDocxXmlSafetyIssue } from "../xmlSafety.js";
 import { DocxArchiveError } from "./boundedArchive.js";
 import { FolioDocxPackageInspectionError, inspectDocxPackage } from "./inspectDocxPackage.js";
@@ -264,7 +265,7 @@ const evaluateDocxXmlPatchProposal = async ({ bytes, proposal: rawProposal, allo
 			});
 		}
 		if (exceedsPartLowerBound || totalLimitReported) continue;
-		const replacementBytes = new TextEncoder().encode(replacement.replacementXml);
+		const replacementBytes = encodeUtf8(replacement.replacementXml);
 		const exceedsEncodedPart = replacementBytes.byteLength > limits.maxPartBytes;
 		const nextEncodedTotalBytes = encodedTotalBytes + replacementBytes.byteLength;
 		if (exceedsEncodedPart) issues.push({

package/dist/docx/server/inspectDocxPackage.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../../utils/textEncoding.js";
 import { getAttributeAnyPrefix, getLocalName, parseXmlDocument } from "../xmlParser.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
 import { Result, TaggedError } from "better-result";
@@ -33,7 +34,10 @@ const decodeXml = (bytes, part) => {
 	if (bytes.length >= 2 && (bytes[0] === 255 && bytes[1] === 254 || bytes[0] === 60 && bytes[1] === 0)) encoding = "utf-16le";
 	else if (bytes.length >= 2 && (bytes[0] === 254 && bytes[1] === 255 || bytes[0] === 0 && bytes[1] === 60)) encoding = "utf-16be";
 	const decoded = Result.try({
-		try: () => new TextDecoder(encoding, { fatal: true }).decode(bytes),
+		try: () => decodeText(bytes, {
+			encoding,
+			fatal: true
+		}),
 		catch: (cause) => new FolioDocxPackageInspectionError({
 			message: `Failed to decode XML package part "${part}"`,
 			code: "xml-decode-failed",

package/dist/docx/server/validateDocxConformance.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../../utils/textEncoding.js";
 import { detectDocxConformanceClass } from "../conformance.js";
 import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "../encryption/containerFormat.js";
 import { DocxModelValidationError, validateFolioDocumentModel } from "../modelValidation.js";
@@ -131,7 +132,7 @@ const readPartForInspection = async (archive, part) => {
 	} catch (error) {
 		if (!(error instanceof XmlResourceLimitError) || error.limit !== "syntax") throw error;
 		const bytes = await archive.readEntryUint8(part);
-		return bytes === null ? null : new TextDecoder("utf-8", { ignoreBOM: true }).decode(bytes);
+		return bytes === null ? null : decodeText(bytes, { ignoreBOM: true });
 	}
 };
 const validateXmlParts = async (archive, report) => {

package/dist/docx/tableParser.js

@@ -11,10 +11,11 @@ import { captureSdtSiblingMarkers, parseSdtProperties } from "./sdtProperties.js
 import { parseShading } from "./shadingParser.js";
 import { findChildAnySpelling } from "./strictNames.js";
 import { TABLE_LOOK_FLAGS } from "./tableLook.js";
+import { isEmptyRowPropertiesAttribute, retainsEmptyRowProperties } from "./tableRowPropertyPresence.js";
 import { parsePropertyChangeInfo, parseTrackedChangeInfo } from "./trackedChangeInfo.js";
 import { percentageSpelling, transitionalSlotEncoding } from "./transitionalSpelling.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
-import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildren, findWordprocessingChild, getAttribute, getAttributeByNamespaceUri, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseOnOffAttribute, parseTableMeasurementValue, selectAlternateContentBranch } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildren, findWordprocessingChild, getAttribute, getAttributeByNamespaceUri, getChildElements, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseOnOffAttribute, parseTableMeasurementValue, selectAlternateContentBranch } from "./xmlParser.js";
 import { PARSE_WARNING_CODES } from "@stll/docx-core/model";
 //#region src/docx/tableParser.ts
 /**
@@ -637,6 +638,8 @@ function parseTableRowProperties(trPrElement) {
 		context: formatting
 	});
 	if (preserved) formatting.preserved = preserved;
+	const children = getChildElements(trPrElement);
+	if (Object.keys(formatting).length === 0 && children.length > 0 && Object.keys(trPrElement.attributes ?? {}).every((name) => name === "xmlns" || name.startsWith("xmlns:")) && children.every((child) => WORDPROCESSINGML_NAMESPACE_URIS.has(child.namespaceUri ?? "") && REVISION_PROPERTY_CHILDREN.has(getLocalName(child.name)))) return void 0;
 	return withSourceXml(formatting, trPrElement);
 }
 /**
@@ -1099,7 +1102,7 @@ function parseTableRow(trElement, styles, theme, numbering, rels, media, options
 	const exceptionChanges = parseTablePropertyExceptionChanges(tblPrExElement, exceptions);
 	if (exceptionChanges !== void 0) row.tablePropertyExceptionChanges = exceptionChanges;
 	const trPrElement = findChild(trElement, "w", "trPr");
-	const formatting = parseTableRowProperties(trPrElement);
+	const formatting = parseTableRowProperties(trPrElement) ?? (trPrElement && retainsEmptyRowProperties(trElement) ? withSourceXml({}, trPrElement) : void 0);
 	if (formatting) row.formatting = formatting;
 	const rowPropChanges = parseTableRowPropertyChanges(trPrElement, formatting);
 	if (rowPropChanges !== void 0) row.propertyChanges = rowPropChanges;
@@ -1126,8 +1129,8 @@ function parseTableRow(trElement, styles, theme, numbering, rels, media, options
 	const remainingAttributes = attributeRemainder({
 		element: trElement,
 		modelled: NO_MODELLED_ATTRIBUTES
-	});
-	if (remainingAttributes) row.preservedAttributes = remainingAttributes;
+	})?.filter((attribute) => !isEmptyRowPropertiesAttribute(attribute));
+	if (remainingAttributes?.length) row.preservedAttributes = remainingAttributes;
 	return row;
 }
 /**

package/dist/docx/tableRowPropertyPresence.d.ts

@@ -0,0 +1,9 @@
+import { document_d_exports } from "../types/document.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/tableRowPropertyPresence.d.ts
+declare const EMPTY_ROW_PROPERTIES_ATTRIBUTE = "emptyRowProperties";
+declare const retainsEmptyRowProperties: (element: XmlElement) => boolean;
+declare const serializeEmptyRowProperties: (row: document_d_exports.TableRow) => string[];
+declare const isEmptyRowPropertiesAttribute: ({ namespace, name }: Pick<document_d_exports.PreservedAttribute, "namespace" | "name">) => boolean;
+//#endregion
+export { EMPTY_ROW_PROPERTIES_ATTRIBUTE, isEmptyRowPropertiesAttribute, retainsEmptyRowProperties, serializeEmptyRowProperties };

package/dist/docx/tableRowPropertyPresence.js

@@ -0,0 +1,15 @@
+import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
+import { getAttributeByNamespaceUri } from "./xmlParser.js";
+import { EMPTY_PROPERTY_SETS } from "@stll/docx-core/ops";
+//#region src/docx/tableRowPropertyPresence.ts
+const EMPTY_ROW_PROPERTIES_ATTRIBUTE = "emptyRowProperties";
+const HISTORY_NAMESPACES = /* @__PURE__ */ new Set([OOXML_NAMESPACES.folio.uri]);
+const retainsEmptyRowProperties = (element) => getAttributeByNamespaceUri(element, HISTORY_NAMESPACES, EMPTY_ROW_PROPERTIES_ATTRIBUTE) === EMPTY_PROPERTY_SETS.KEEP;
+const serializeEmptyRowProperties = (row) => {
+	if (row.formatting === void 0 || row.structuralChange === void 0 && !row.propertyChanges?.length) return [];
+	const { sourceXml: _source, ...properties } = row.formatting;
+	return Object.keys(properties).length === 0 ? [`folio:${EMPTY_ROW_PROPERTIES_ATTRIBUTE}="${EMPTY_PROPERTY_SETS.KEEP}"`] : [];
+};
+const isEmptyRowPropertiesAttribute = ({ namespace, name }) => namespace === OOXML_NAMESPACES.folio.uri && name === "emptyRowProperties";
+//#endregion
+export { EMPTY_ROW_PROPERTIES_ATTRIBUTE, isEmptyRowPropertiesAttribute, retainsEmptyRowProperties, serializeEmptyRowProperties };

package/dist/docx/unzip.js

@@ -1,4 +1,5 @@
 import { bytesToDataUrl } from "../utils/base64.js";
+import { encodeUtf8 } from "../utils/textEncoding.js";
 import { compressionRatioLimitFor, countCentralDirectoryRecords, createInflationBudget, exceedsCompressionRatio, getZipEntrySizes, inflateEntryWithinLimits, isStoredZipEntry } from "./archiveInflation.js";
 import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "./encryption/containerFormat.js";
 import { openDocxBuffer } from "./encryption/openEncryptedDocx.js";
@@ -286,7 +287,7 @@ const replaceRawDocxXmlParts = async (content, parts) => {
 		writeZipPart({
 			zip: content.originalZip,
 			path,
-			data: xmlContent
+			data: encodeUtf8(xmlContent)
 		});
 		identitiesChanged = true;
 	}

package/dist/docx/xmlEncoding.js

@@ -1,12 +1,13 @@
+import { decodeText } from "../utils/textEncoding.js";
 //#region src/docx/xmlEncoding.ts
 /** Decode the UTF-8 and UTF-16 encodings XML processors must recognize. */
 const decodeXmlBytes = (bytes) => {
-	if (bytes[0] === 255 && bytes[1] === 254) return new TextDecoder("utf-16le").decode(bytes.subarray(2));
-	if (bytes[0] === 254 && bytes[1] === 255) return new TextDecoder("utf-16be").decode(bytes.subarray(2));
-	if (bytes[0] === 60 && bytes[1] === 0 && bytes[2] === 63 && bytes[3] === 0) return new TextDecoder("utf-16le").decode(bytes);
-	if (bytes[0] === 0 && bytes[1] === 60 && bytes[2] === 0 && bytes[3] === 63) return new TextDecoder("utf-16be").decode(bytes);
+	if (bytes[0] === 255 && bytes[1] === 254) return decodeText(bytes.subarray(2), { encoding: "utf-16le" });
+	if (bytes[0] === 254 && bytes[1] === 255) return decodeText(bytes.subarray(2), { encoding: "utf-16be" });
+	if (bytes[0] === 60 && bytes[1] === 0 && bytes[2] === 63 && bytes[3] === 0) return decodeText(bytes, { encoding: "utf-16le" });
+	if (bytes[0] === 0 && bytes[1] === 60 && bytes[2] === 0 && bytes[3] === 63) return decodeText(bytes, { encoding: "utf-16be" });
 	const utf8Offset = bytes[0] === 239 && bytes[1] === 187 && bytes[2] === 191 ? 3 : 0;
-	return new TextDecoder("utf-8").decode(bytes.subarray(utf8Offset));
+	return decodeText(bytes.subarray(utf8Offset), { encoding: "utf-8" });
 };
 //#endregion
 export { decodeXmlBytes };

package/dist/fonts/embeddedFontFingerprint.d.ts

@@ -0,0 +1,5 @@
+//#region src/fonts/embeddedFontFingerprint.d.ts
+/** Callers replace owned maps on font changes; mutating a published map is unsupported. */
+declare const embeddedFontFingerprint: (families: ReadonlyMap<string, string>) => string;
+//#endregion
+export { embeddedFontFingerprint };

package/dist/fonts/embeddedFontFingerprint.js

@@ -0,0 +1,18 @@
+//#region src/fonts/embeddedFontFingerprint.ts
+/** Immutable editor-owned lookups share content fingerprints without retaining disposed editors. */
+const fingerprints = /* @__PURE__ */ new WeakMap();
+/** Callers replace owned maps on font changes; mutating a published map is unsupported. */
+const embeddedFontFingerprint = (families) => {
+	const cached = fingerprints.get(families);
+	if (cached !== void 0) return cached;
+	const entries = [...families].sort(([left], [right]) => {
+		if (left < right) return -1;
+		if (left > right) return 1;
+		return 0;
+	});
+	const fingerprint = JSON.stringify(entries);
+	fingerprints.set(families, fingerprint);
+	return fingerprint;
+};
+//#endregion
+export { embeddedFontFingerprint };

package/dist/fonts/embeddedFonts.d.ts

@@ -66,7 +66,7 @@ declare function getEmbeddedFontFaces(parts: EmbeddedFontParts, docNonce?: strin
 /**
  * Build the original DOCX font name → scoped registered family map for a set
  * of resolved embedded faces. Callers thread this into font resolution (see
- * `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) so the document's own
+ * the editor-owned layout session) so the document's own
  * runs — which still carry the original name — keep resolving to the scoped
  * face that was actually registered on `document.fonts`.
  */

package/dist/fonts/embeddedFonts.js

@@ -111,7 +111,7 @@ function getEmbeddedFontFaces(parts, docNonce = generateHexId()) {
 /**
 * Build the original DOCX font name → scoped registered family map for a set
 * of resolved embedded faces. Callers thread this into font resolution (see
-* `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) so the document's own
+* the editor-owned layout session) so the document's own
 * runs — which still carry the original name — keep resolving to the scoped
 * face that was actually registered on `document.fonts`.
 */

package/dist/fonts/fontsourceFaces.js

@@ -1,6 +1,7 @@
 import { bytesToDataUrl } from "../utils/base64.js";
 import { FONT_MAPPING } from "../utils/fontLoader.js";
 import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
+import { decodeText } from "../utils/textEncoding.js";
 //#region src/fonts/fontsourceFaces.ts
 /**
 * The subsets served, in resolution priority: a code point two subsets cover
@@ -78,7 +79,7 @@ const parseRangeToken = (token) => {
 const parseRangeList = (declared) => declared.split(",").flatMap(parseRangeToken);
 const parseDeclaredRanges = (bytes) => {
 	const ranges = /* @__PURE__ */ new Map();
-	const parsed = JSON.parse(new TextDecoder().decode(bytes));
+	const parsed = JSON.parse(decodeText(bytes));
 	if (typeof parsed !== "object" || parsed === null) return ranges;
 	for (const [subset, declared] of Object.entries(parsed)) if (typeof declared === "string") ranges.set(subset, parseRangeList(declared));
 	return ranges;

package/dist/fonts/sfnt/parse.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../../utils/textEncoding.js";
 import { SFNT_TABLE, SFNT_VERSION, fitsInView, readLocaOffsets, readSfntDirectory, readSfntVersion } from "./tables.js";
 import { Result, TaggedError } from "better-result";
 //#region src/fonts/sfnt/parse.ts
@@ -344,17 +345,13 @@ const sanitizePostScriptName = (raw) => {
 	return name.slice(0, MAX_POSTSCRIPT_NAME_LENGTH);
 };
 const decodeUtf16Be = (view, offset, length) => {
-	let text = "";
-	for (let index = 0; index + 1 < length; index += 2) text += String.fromCharCode(view.getUint16(offset + index));
-	return text;
+	return decodeText(new Uint8Array(view.buffer, view.byteOffset + offset, length - length % 2), {
+		encoding: "utf-16be",
+		ignoreBOM: true
+	});
 };
 const decodeMacRomanAscii = (view, offset, length) => {
-	let text = "";
-	for (let index = 0; index < length; index++) {
-		const code = view.getUint8(offset + index);
-		text += code < 128 ? String.fromCharCode(code) : "";
-	}
-	return text;
+	return decodeText(new Uint8Array(view.buffer, view.byteOffset + offset, length).filter((byte) => byte < 128), { encoding: "binary" });
 };
 /**
 * name id 6, preferring the Windows UTF-16BE record over the Macintosh one.

package/dist/fonts/sfnt/subset.js

@@ -1,3 +1,4 @@
+import { encodeBinaryString } from "../../utils/textEncoding.js";
 import { SFNT_TABLE, SFNT_VERSION, fitsInView, readLocaOffsets, readSfntDirectory } from "./tables.js";
 import { Result, TaggedError, panic } from "better-result";
 //#region src/fonts/sfnt/subset.ts
@@ -223,7 +224,7 @@ const assembleSfnt = (tables) => {
 	let dataOffset = 12 + directorySize;
 	let headOffset = -1;
 	for (const table of sorted) {
-		for (let index = 0; index < table.tag.length; index++) view.setUint8(entry + index, table.tag.charCodeAt(index));
+		output.set(encodeBinaryString(table.tag), entry);
 		view.setUint32(entry + 4, checksumOf(table.data));
 		view.setUint32(entry + 8, dataOffset);
 		view.setUint32(entry + 12, table.data.byteLength);

package/dist/fonts/sfnt/tables.js

@@ -1,3 +1,4 @@
+import { decodeText } from "../../utils/textEncoding.js";
 import { Result, TaggedError } from "better-result";
 //#region src/fonts/sfnt/tables.ts
 /**
@@ -65,9 +66,7 @@ const fitsInView = (view, offset, length) => Number.isInteger(offset) && Number.
 /** The four-byte tag at `offset`, or `""` when it does not fit. */
 const readTag = (view, offset) => {
 	if (!fitsInView(view, offset, TAG_LENGTH)) return "";
-	let tag = "";
-	for (let index = 0; index < TAG_LENGTH; index++) tag += String.fromCharCode(view.getUint8(offset + index));
-	return tag;
+	return decodeText(new Uint8Array(view.buffer, view.byteOffset + offset, TAG_LENGTH), { encoding: "binary" });
 };
 /** The leading version word, or `undefined` when the buffer is shorter than it. */
 const readSfntVersion = (bytes) => {

package/dist/fonts/sfnt/woff.js

@@ -1,3 +1,4 @@
+import { encodeBinaryString } from "../../utils/textEncoding.js";
 import { SFNT_VERSION, readSfntVersion, readTag } from "./tables.js";
 import { Result, TaggedError } from "better-result";
 import { inflateSync } from "node:zlib";
@@ -76,7 +77,7 @@ const buildSfnt = (flavor, tables) => {
 	let entry = 12;
 	let dataOffset = 12 + directorySize;
 	for (const table of sorted) {
-		for (let index = 0; index < table.tag.length; index++) view.setUint8(entry + index, table.tag.charCodeAt(index));
+		output.set(encodeBinaryString(table.tag), entry);
 		view.setUint32(entry + 4, table.checksum);
 		view.setUint32(entry + 8, dataOffset);
 		view.setUint32(entry + 12, table.data.byteLength);

package/dist/headless-layout.js

@@ -108,6 +108,7 @@ const buildBlockLookup = (blocks, measures) => new Map(blocks.flatMap((block, in
 	}]];
 }));
 const buildStoryOptions = (flowOptions) => ({
+	...flowOptions.embeddedFontFamilyMap === void 0 ? {} : { embeddedFontFamilyMap: flowOptions.embeddedFontFamilyMap },
 	...flowOptions.defaultSize === void 0 ? {} : { defaultSize: flowOptions.defaultSize },
 	...flowOptions.styles === void 0 ? {} : { styles: flowOptions.styles },
 	...flowOptions.theme === void 0 ? {} : { theme: flowOptions.theme },

package/dist/index.d.ts

@@ -38,9 +38,11 @@ import { ImageMeta, ImageRef, MarkdownOptions, MarkdownResult } from "./markdown
 import { fromMarkdown } from "./markdown/fromMarkdown.js";
 import { toMarkdown, toMarkdownResult } from "./markdown/index.js";
 import { EmbeddedFont, EmbeddedFontParts, buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily } from "./fonts/embeddedFonts.js";
-import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled } from "./utils/fontResolver.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 "@stll/docx-core/model";
 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, setEmbeddedFontFamilyMap, 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/index.js

@@ -31,8 +31,8 @@ import { STELLA_STYLE_SET_NAME, createStellaStyleDocumentPreset, createStellaSty
 import { DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION } from "./style-sets/types.js";
 import { currentFolioBlockId, deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import { createEmptyDocument } from "./utils/createDocument.js";
-import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled } from "./utils/fontResolver.js";
+import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 import { mergeDocumentContent } from "./utils/mergeDocumentContent.js";
 import { DEFAULT_OUTLINE_DEPTH, filterHeadingsByDepth } from "./utils/outlineDepth.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
-export { COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, 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, 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, FolioContentComparisonLimitError, FolioContentInlinePresentationProjectionError, FolioYjsAttrSchemaVersionError, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, 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, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, CompareDocxApplyError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, 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, 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, FolioContentComparisonLimitError, FolioContentInlinePresentationProjectionError, FolioYjsAttrSchemaVersionError, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, 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/internal/revisionResolutionInline.d.ts

@@ -8,13 +8,14 @@ type RevisionRange = {
   to: number;
 };
 type ResolveInlineRevisionsOptions = {
+  pointComments: Set<number>;
   doc: Node;
   mode: RevisionResolutionMode;
   keepType: MarkType | undefined;
   removeType: MarkType | undefined;
   styleResolver: RunStyleResolver | null;
 };
-declare const resolveInlineRevisions: ({ doc, mode, keepType, removeType, styleResolver }: ResolveInlineRevisionsOptions) => {
+declare const resolveInlineRevisions: ({ pointComments, doc, mode, keepType, removeType, styleResolver }: ResolveInlineRevisionsOptions) => {
   resolved: Node;
   positionMap: StepMap;
   ranges: RevisionRange[];

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,10 @@ 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. */
   defaultFont?: string;
   /** Default font size in points. */

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 = {
+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,20 +206,29 @@ 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;
+	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;
-	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
 	};
 }
@@ -392,6 +403,8 @@ function createFootnoteNumberRun(displayNumber, paragraph) {
 		fontSize: firstFormattedRun?.fontSize ?? paragraph.attrs?.defaultFontSize ?? FOOTNOTE_FONT_SIZE,
 		superscript: true
 	};
+	const embeddedFontFamilyMap = firstFormattedRun?.embeddedFontFamilyMap ?? paragraph.attrs?.embeddedFontFamilyMap;
+	if (embeddedFontFamilyMap) numberRun.embeddedFontFamilyMap = embeddedFontFamilyMap;
 	const fontFamily = firstFormattedRun?.fontFamily ?? paragraph.attrs?.defaultFontFamily;
 	if (fontFamily) numberRun.fontFamily = fontFamily;
 	const alternateFontFamily = firstFormattedRun?.fontFamily !== void 0 ? firstFormattedRun.alternateFontFamily : paragraph.attrs?.defaultAlternateFontFamily;

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,11 +41,16 @@ 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;
   defaultSize?: number;
   fontAlternates?: ToFlowBlocksOptions["fontAlternates"];
+  embeddedFontFamilyMap?: ReadonlyMap<string, string>;
   measureBlocks: MeasureBlocksFn;
   /** Document-wide `w:defaultTabStop` in twips — forwarded to toFlowBlocks. */
   defaultTabStopTwips?: number;