@stll/folio-core 0.12.0 → 0.13.0

package/dist/fonts/embeddedFonts.js

@@ -1,4 +1,5 @@
 import { parseRelationships, resolveRelativePath } from "../docx/relsParser.js";
+import { generateHexId } from "../utils/hexId.js";
 import { unzipDocx } from "../docx/unzip.js";
 import { deobfuscateFont, isValidFontKey } from "./fontDeobfuscation.js";
 import { parseEmbeddedFontTable } from "./embeddedFontTable.js";
@@ -19,6 +20,16 @@ import { parseEmbeddedFontTable } from "./embeddedFontTable.js";
 *
 * Ported from eigenpal/docx-editor (see NOTICE.md).
 */
+const SCOPED_FAMILY_PREFIX = "folio-embedded";
+/**
+* Build the per-document scoped family name an embedded face registers
+* under. `docNonce` is fresh per document load (see {@link getEmbeddedFontFaces}),
+* so the same original name in two different documents (or two loads of the
+* same document) never collides.
+*/
+function scopeEmbeddedFontFamily(docNonce, originalFamily) {
+	return `${SCOPED_FAMILY_PREFIX}-${docNonce}-${originalFamily}`;
+}
 /** Pairs each embed field with the CSS weight/style it renders as. */
 const EMBED_KINDS = [
 	{
@@ -57,7 +68,7 @@ function lookupFontData(resolvedPath, fonts) {
 	const wanted = normalizePackagePath(resolvedPath);
 	for (const [path, data] of fonts) if (normalizePackagePath(path) === wanted) return data;
 }
-function resolveFace(family, ref, kind, fonts, rels) {
+function resolveFace(originalFamily, ref, kind, fonts, rels, docNonce) {
 	const target = rels.get(ref.relId)?.target;
 	if (!target) return null;
 	const raw = lookupFontData(resolveRelativePath(FONTTABLE_RELS_BASE_PATH, target), fonts);
@@ -65,7 +76,8 @@ function resolveFace(family, ref, kind, fonts, rels) {
 	const bytes = new Uint8Array(raw);
 	const data = ref.fontKey && isValidFontKey(ref.fontKey) ? deobfuscateFont(bytes, ref.fontKey) : bytes;
 	return {
-		family,
+		family: scopeEmbeddedFontFamily(docNonce, originalFamily),
+		originalFamily,
 		style: kind.style,
 		weight: kind.weight,
 		bytes: data,
@@ -76,8 +88,13 @@ function resolveFace(family, ref, kind, fonts, rels) {
 * Resolve and de-obfuscate every embedded font face declared in a font table.
 * Pure and DOM-free. Faces whose relationship or binary is missing are skipped,
 * so the result only contains faces that produced usable bytes.
+*
+* `docNonce` scopes every face's registered family to one document load (see
+* {@link scopeEmbeddedFontFamily}); defaults to a fresh random id so callers
+* that don't care about a specific value still get per-call isolation. Pass
+* an explicit value for deterministic tests.
 */
-function getEmbeddedFontFaces(parts) {
+function getEmbeddedFontFaces(parts, docNonce = generateHexId()) {
 	const entries = parseEmbeddedFontTable(parts.fontTableXml);
 	if (entries.length === 0) return [];
 	if (!parts.fontTableRelsXml || parts.fonts.size === 0) return [];
@@ -86,11 +103,23 @@ function getEmbeddedFontFaces(parts) {
 	for (const entry of entries) for (const kind of EMBED_KINDS) {
 		const ref = entry[kind.ref];
 		if (!ref) continue;
-		const face = resolveFace(entry.name, ref, kind, parts.fonts, rels);
+		const face = resolveFace(entry.name, ref, kind, parts.fonts, rels, docNonce);
 		if (face) faces.push(face);
 	}
 	return faces;
 }
+/**
+* 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
+* runs — which still carry the original name — keep resolving to the scoped
+* face that was actually registered on `document.fonts`.
+*/
+function buildEmbeddedFontFamilyMap(faces) {
+	const map = /* @__PURE__ */ new Map();
+	for (const face of faces) map.set(face.originalFamily, face.family);
+	return map;
+}
 function findFontTableRels(allXml) {
 	for (const [path, xml] of allXml) if (normalizePackagePath(path) === FONTTABLE_RELS_PATH) return xml;
 }
@@ -98,15 +127,15 @@ function findFontTableRels(allXml) {
 * Extract every embedded font face from a raw `.docx` buffer. Unzips the
 * package, then resolves + de-obfuscates the faces via
 * {@link getEmbeddedFontFaces}. Returns an empty list for documents with no
-* embedded fonts.
+* embedded fonts. See {@link getEmbeddedFontFaces} for `docNonce`.
 */
-async function extractEmbeddedFonts(buffer) {
+async function extractEmbeddedFonts(buffer, docNonce = generateHexId()) {
 	const raw = await unzipDocx(buffer);
 	return getEmbeddedFontFaces({
 		fontTableXml: raw.fontTableXml,
 		fontTableRelsXml: findFontTableRels(raw.allXml),
 		fonts: raw.fonts
-	});
+	}, docNonce);
 }
 //#endregion
-export { extractEmbeddedFonts, getEmbeddedFontFaces };
+export { buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily };

package/dist/index.d.ts

@@ -27,9 +27,9 @@ import { AcceptAutocompleteResult, AutocompleteSuggestionPluginOptions, Autocomp
 import { ImageMeta, ImageRef, MarkdownOptions, MarkdownResult } from "./markdown/types.js";
 import { fromMarkdown } from "./markdown/fromMarkdown.js";
 import { toMarkdown, toMarkdownResult } from "./markdown/index.js";
-import { EmbeddedFont, EmbeddedFontParts, extractEmbeddedFonts, getEmbeddedFontFaces } from "./fonts/embeddedFonts.js";
-import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "./utils/fontResolver.js";
+import { EmbeddedFont, EmbeddedFontParts, buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily } from "./fonts/embeddedFonts.js";
+import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled } from "./utils/fontResolver.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 CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, 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, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAISignatureParty, type FolioBlockId, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidFolioDocumentOperationBatchError, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, 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 CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, 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, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAISignatureParty, type FolioBlockId, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidFolioDocumentOperationBatchError, type MarkdownOptions, type MarkdownResult, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/index.js

@@ -1,6 +1,6 @@
+import { getGoogleFontsEnabled, setEmbeddedFontFamilyMap, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 import { deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
 import { createFolioAIEditSnapshot, hashFolioAIBlockText, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
-import { getGoogleFontsEnabled, setGoogleFontsEnabled } from "./utils/fontResolver.js";
 import { diffWordSegments } from "./ai-edits/word-diff.js";
 import { applyFolioAIEditOperations } from "./ai-edits/apply.js";
 import { 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, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
@@ -25,6 +25,6 @@ import { clearTemplateSlashMenu, consumeTemplateSlashQuery, getTemplateSlashMenu
 import { DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, acceptAutocompleteSuggestion, acceptAutocompleteWord, appendAutocompleteToken, autocompleteSuggestionKey, autocompleteSuggestionPlugin, clearAutocompleteSuggestion, finishAutocompleteSuggestion, getAutocompleteSuggestion, shouldTriggerAutocomplete, startAutocompleteSuggestion } from "./prosemirror/plugins/autocompleteSuggestion.js";
 import { fromMarkdown } from "./markdown/fromMarkdown.js";
 import { toMarkdown, toMarkdownResult } from "./markdown/index.js";
-import { extractEmbeddedFonts, getEmbeddedFontFaces } from "./fonts/embeddedFonts.js";
+import { buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily } from "./fonts/embeddedFonts.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
-export { DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, 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, InvalidFolioDocumentOperationBatchError, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, 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, InvalidFolioDocumentOperationBatchError, STELLA_STYLE_SET_NAME, UnsupportedFolioDocumentOperationVersionError, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

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

@@ -333,6 +333,10 @@ function extractRunFormatting(marks, theme) {
 			formatting.changeAuthor = attrs.author;
 			if (attrs.date !== void 0) formatting.changeDate = attrs.date;
 			formatting.changeRevisionId = attrs.revisionId;
+			if (attrs.provenance === "suggested") {
+				formatting.isSuggestion = true;
+				if (attrs.suggestionId) formatting.suggestionId = attrs.suggestionId;
+			}
 			break;
 		}
 		case "deletion": {
@@ -341,6 +345,10 @@ function extractRunFormatting(marks, theme) {
 			formatting.changeAuthor = attrs.author;
 			if (attrs.date !== void 0) formatting.changeDate = attrs.date;
 			formatting.changeRevisionId = attrs.revisionId;
+			if (attrs.provenance === "suggested") {
+				formatting.isSuggestion = true;
+				if (attrs.suggestionId) formatting.suggestionId = attrs.suggestionId;
+			}
 			break;
 		}
 		default: break;
@@ -455,6 +463,9 @@ function buildImageRun(attrs, constrained, pmStart, pmEnd, trackedChange) {
 	if (attrs.cropRight != null) run.cropRight = attrs.cropRight;
 	if (attrs.cropBottom != null) run.cropBottom = attrs.cropBottom;
 	if (attrs.cropLeft != null) run.cropLeft = attrs.cropLeft;
+	if (attrs.borderWidth != null) run.borderWidth = attrs.borderWidth;
+	if (attrs.borderColor) run.borderColor = attrs.borderColor;
+	if (attrs.borderStyle) run.borderStyle = attrs.borderStyle;
 	if (attrs.position !== void 0) run.position = attrs.position;
 	if (attrs.layoutInCell !== void 0) run.layoutInCell = attrs.layoutInCell;
 	if (trackedChange?.isInsertion) run.isInsertion = true;
@@ -858,6 +869,7 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	const dtf = pmAttrs.defaultTextFormatting;
 	if (dtf) {
 		if (dtf.fontSize !== void 0) attrs.defaultFontSize = dtf.fontSize / 2;
+		if (attrs.listMarker !== void 0 && !attrs.listMarkerHidden && dtf.fontSizeCs !== void 0 && (dtf.fontSize === void 0 || dtf.fontSizeCs > dtf.fontSize)) attrs.listParagraphMarkFontSize = dtf.fontSizeCs / 2;
 		if (dtf.fontFamily) {
 			const resolvedFamily = resolveWesternThemeFont(dtf.fontFamily, theme);
 			if (resolvedFamily) attrs.defaultFontFamily = resolvedFamily;
@@ -1214,6 +1226,9 @@ function convertImage(node, startPos, pageContentHeight) {
 	if (attrs.cropRight != null) imgBlock.cropRight = attrs.cropRight;
 	if (attrs.cropBottom != null) imgBlock.cropBottom = attrs.cropBottom;
 	if (attrs.cropLeft != null) imgBlock.cropLeft = attrs.cropLeft;
+	if (attrs.borderWidth != null) imgBlock.borderWidth = attrs.borderWidth;
+	if (attrs.borderColor) imgBlock.borderColor = attrs.borderColor;
+	if (attrs.borderStyle) imgBlock.borderStyle = attrs.borderStyle;
 	return imgBlock;
 }
 /**

package/dist/layout-engine/index.js

@@ -477,6 +477,16 @@ const tableRowStartsWithRenderedPageBreak = (block, rowIndex) => block.rows[rowI
 	const firstBlock = cell.blocks.at(0);
 	return firstBlock?.kind === "paragraph" && firstBlock.attrs?.renderedPageBreakBefore === true;
 }) ?? false;
+const flowBlockHasTrackedChanges = (block) => {
+	if (block.kind === "paragraph") return block.runs.some((run) => {
+		if (run.kind === "lineBreak") return false;
+		return run.isInsertion || run.isDeletion;
+	});
+	if (block.kind === "table") return block.rows.some((row) => row.cells.some((cell) => cell.blocks.some(flowBlockHasTrackedChanges)));
+	if (block.kind === "textBox") return block.content.some(flowBlockHasTrackedChanges);
+	return false;
+};
+const tableRowHasTrackedChanges = (block, rowIndex) => block.rows[rowIndex]?.cells.some((cell) => cell.blocks.some(flowBlockHasTrackedChanges)) ?? false;
 /**
 * Layout a table block onto pages.
 */
@@ -522,7 +532,7 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 		const rowState = paginator.getCurrentState();
 		const rowHeaderOverhead = shouldRepeatHeaderRows(currentRowIndex, 0, rowState) ? headerRowsHeight : 0;
 		const rowAvailableHeight = paginator.getAvailableHeight() - rowHeaderOverhead - rowState.trailingSpacing;
-		if (!(rowState.cursorY === rowState.topMargin && rowState.page.fragments.length === 0) && tableRowStartsWithRenderedPageBreak(block, currentRowIndex) && rows[currentRowIndex].height > rowAvailableHeight) {
+		if (!(rowState.cursorY === rowState.topMargin && rowState.page.fragments.length === 0) && tableRowStartsWithRenderedPageBreak(block, currentRowIndex) && !tableRowHasTrackedChanges(block, currentRowIndex) && rows[currentRowIndex].height > rowAvailableHeight) {
 			paginator.forcePageBreak();
 			continue;
 		}
@@ -657,7 +667,7 @@ function layoutTable(block, measure, paginator, footnoteHeightById) {
 	}
 }
 function collectTableRowFootnoteIds(row, footnoteHeightById) {
-	if (!row || !footnoteHeightById) return [];
+	if (!row || !footnoteHeightById || row.hidden) return [];
 	const ids = [];
 	const walk = (blocks) => {
 		for (const block of blocks) {
@@ -666,7 +676,10 @@ function collectTableRowFootnoteIds(row, footnoteHeightById) {
 				continue;
 			}
 			if (block.kind === "table") {
-				for (const nestedRow of block.rows) for (const cell of nestedRow.cells) walk(cell.blocks);
+				for (const nestedRow of block.rows) {
+					if (nestedRow.hidden) continue;
+					for (const cell of nestedRow.cells) walk(cell.blocks);
+				}
 				continue;
 			}
 			if (block.kind === "textBox") walk(block.content);

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

@@ -1,3 +1,4 @@
+import { clearFontResolvedCache } from "./measureHelpers.js";
 import { getLineBreakProviderGeneration } from "./lineBreakProvider.js";
 import { lineBreakPolicyCacheParts } from "./effectiveLineBreakPolicy.js";
 //#region src/layout-engine/measure/cache.ts
@@ -255,6 +256,7 @@ function clearAllCaches() {
 	clearTextWidthCache();
 	clearFontMetricsCache();
 	clearParagraphMeasureCache();
+	clearFontResolvedCache();
 }
 /**
 * Get total size of all caches

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

@@ -12,8 +12,8 @@ const resolveEffectiveLineBreakPolicy = ({ attrs, run }) => {
 		provider: {
 			...locale ? { locale } : {},
 			...attrs?.kinsoku !== void 0 ? { kinsoku: attrs.kinsoku } : {},
-			...before && languageMatches(before.language, locale) ? { noLineBreaksBefore: before.characters } : {},
-			...after && languageMatches(after.language, locale) ? { noLineBreaksAfter: after.characters } : {},
+			...before && languageMatches(before.language, locale) ? { noLineBreaksBefore: toCodePointSet(before.characters) } : {},
+			...after && languageMatches(after.language, locale) ? { noLineBreaksAfter: toCodePointSet(after.characters) } : {},
 			...rules?.useLegacyEthiopicAmharicRules ? { useLegacyEthiopicAmharicRules: true } : {},
 			...automaticHyphenation?.doNotHyphenateCaps !== void 0 ? { doNotHyphenateCaps: automaticHyphenation.doNotHyphenateCaps } : {},
 			...run.allCaps === true ? { renderedAllCaps: true } : {}
@@ -56,5 +56,11 @@ const languageMatches = (ruleLanguage, locale) => {
 	const active = locale.toLowerCase();
 	return active === rule || active.startsWith(`${rule}-`) || rule.startsWith(`${active}-`);
 };
+/**
+* Split an already length-capped kinsoku character list (settingsParser.ts)
+* into a code-point Set so line-edge membership checks are O(1) instead of
+* an O(n) `String.includes` scan per character measured.
+*/
+const toCodePointSet = (characters) => new Set(Array.from(characters));
 //#endregion
 export { lineBreakPolicyCacheParts, resolveEffectiveLineBreakPolicy };

package/dist/layout-engine/measure/lineBreakProvider.d.ts

@@ -10,8 +10,8 @@
 type LineBreakPolicy = {
   /** BCP-47 language tag resolved from `w:lang` for this run. */locale?: string; /** Apply East Asian first/last-character restrictions (`w:kinsoku`). */
   kinsoku?: boolean; /** Document replacement list: characters that may not begin a line. */
-  noLineBreaksBefore?: string; /** Document replacement list: characters that may not end a line. */
-  noLineBreaksAfter?: string; /** Use the legacy Ethiopic/Amharic compatibility behavior. */
+  noLineBreaksBefore?: ReadonlySet<string>; /** Document replacement list: characters that may not end a line. */
+  noLineBreaksAfter?: ReadonlySet<string>; /** Use the legacy Ethiopic/Amharic compatibility behavior. */
   useLegacyEthiopicAmharicRules?: boolean; /** Keep words made entirely of capital letters unhyphenated. */
   doNotHyphenateCaps?: boolean; /** The run renders with the DOCX all-caps transform. */
   renderedAllCaps?: boolean;

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

@@ -128,9 +128,9 @@ const previousCodePoint = (text, index) => {
 	if (trailing >= 56320 && trailing <= 57343 && index >= 2) return text.slice(index - 2, index);
 	return text[index - 1];
 };
-const isProhibitedLineStart = (character, policy) => character !== void 0 && policy?.kinsoku !== false && (policy?.noLineBreaksBefore !== void 0 ? policy.noLineBreaksBefore.includes(character) : DEFAULT_PROHIBITED_LINE_START.has(character));
-const isProhibitedLineEnd = (character, policy) => character !== void 0 && policy?.kinsoku !== false && (policy?.noLineBreaksAfter !== void 0 ? policy.noLineBreaksAfter.includes(character) : DEFAULT_PROHIBITED_LINE_END.has(character));
-const isCjkLineBreakParticipant = (character, policy) => character !== void 0 && (CJK_SCRIPT.test(character) || DEFAULT_PROHIBITED_LINE_START.has(character) || DEFAULT_PROHIBITED_LINE_END.has(character) || policy?.noLineBreaksBefore?.includes(character) === true || policy?.noLineBreaksAfter?.includes(character) === true);
+const isProhibitedLineStart = (character, policy) => character !== void 0 && policy?.kinsoku !== false && (policy?.noLineBreaksBefore !== void 0 ? policy.noLineBreaksBefore.has(character) : DEFAULT_PROHIBITED_LINE_START.has(character));
+const isProhibitedLineEnd = (character, policy) => character !== void 0 && policy?.kinsoku !== false && (policy?.noLineBreaksAfter !== void 0 ? policy.noLineBreaksAfter.has(character) : DEFAULT_PROHIBITED_LINE_END.has(character));
+const isCjkLineBreakParticipant = (character, policy) => character !== void 0 && (CJK_SCRIPT.test(character) || policy?.kinsoku !== false && (DEFAULT_PROHIBITED_LINE_START.has(character) || DEFAULT_PROHIBITED_LINE_END.has(character) || policy?.noLineBreaksBefore?.has(character) === true || policy?.noLineBreaksAfter?.has(character) === true));
 const isLegacyEthiopicBreakCharacter = (character, policy) => {
 	if (!policy?.useLegacyEthiopicAmharicRules || character === void 0) return false;
 	const codePoint = character.codePointAt(0);

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

@@ -17,6 +17,14 @@ import { buildTableCellGrid, getFirstAvailableColumn, getTableCellVerticalBorder
 */
 const NO_WRAP_MEASURE_WIDTH = 1e6;
 /**
+* Sanity cap on the table column count derived from summed cell colSpans
+* when a table has no `tblGrid`/explicit column widths. Mirrors the
+* `MAX_TABLE_COLUMNS` clamp applied to `w:gridSpan` at parse time
+* (`docx/tableParser.ts`); enforced again here since a hostile colSpan sum
+* would otherwise size the fallback column array and cell grid unbounded.
+*/
+const MAX_TABLE_COLUMNS = 63;
+/**
 * Check if an image run is a *text-wrapping* floating image — it
 * occupies an exclusion zone the body text should flow around.
 *
@@ -59,7 +67,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 	let columnWidths = tableBlock.columnWidths ?? [];
 	const explicitWidthPx = resolveTableWidthPx(tableBlock.width, tableBlock.widthType, contentWidth);
 	if (columnWidths.length === 0 && tableBlock.rows.length > 0) {
-		const colCount = tableBlock.rows[0].cells.reduce((sum, cell) => sum + (cell.colSpan ?? 1), 0);
+		const colCount = Math.min(tableBlock.rows[0].cells.reduce((sum, cell) => sum + (cell.colSpan ?? 1), 0), MAX_TABLE_COLUMNS);
 		const equalWidth = (explicitWidthPx ?? contentWidth) / Math.max(1, colCount);
 		columnWidths = Array.from({ length: colCount }, () => equalWidth);
 	} else if (columnWidths.length > 0 && explicitWidthPx) {

package/dist/layout-engine/measure/measureHelpers.d.ts

@@ -22,6 +22,15 @@ type ResolvedFontCache = {
  * Get the resolved font data for a font family, with caching.
  */
 declare function getResolvedData(fontFamily: string): ResolvedFontCache;
+/**
+ * Clear the resolved-font-family cache. `resolveFontFamily`'s output for a
+ * given key can change even when the raw font names don't — e.g. when the
+ * active document's embedded-font family map changes (see
+ * `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) — so this must be
+ * cleared whenever that happens, not just on font-name changes. Folded into
+ * `clearAllCaches` (`./cache.ts`) so callers get it for free.
+ */
+declare function clearFontResolvedCache(): void;
 /**
  * Build a CSS font string from styling properties
  *
@@ -79,4 +88,4 @@ declare function halfPtToPx(halfPt: number): number;
  */
 declare function pxToHalfPt(px: number): number;
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -62,6 +62,17 @@ function getResolvedFallback(fontFamily) {
 	return getResolvedData(fontFamily).cssFallback;
 }
 /**
+* Clear the resolved-font-family cache. `resolveFontFamily`'s output for a
+* given key can change even when the raw font names don't — e.g. when the
+* active document's embedded-font family map changes (see
+* `utils/fontResolver.ts`'s `setEmbeddedFontFamilyMap`) — so this must be
+* cleared whenever that happens, not just on font-name changes. Folded into
+* `clearAllCaches` (`./cache.ts`) so callers get it for free.
+*/
+function clearFontResolvedCache() {
+	fontResolvedCache.clear();
+}
+/**
 * Build a CSS font string from styling properties
 *
 * Font sizes are in points and need to be converted to pixels for canvas.
@@ -156,4 +167,4 @@ function pxToHalfPt(px) {
 	return pxToPt(px) * 2;
 }
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

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

@@ -515,12 +515,20 @@ function computeProtectedCrossRunGlueWidths(block) {
 	}
 	return widths;
 }
+/**
+* Cap on the number of runs `collectCrossRunWord` traverses per call. A
+* paragraph split into many tiny (including empty) runs would otherwise let
+* the search walk the full run list for every word-start position it is
+* invoked from, without the per-word text-length budget ever kicking in.
+*/
+const MAX_CROSS_RUN_SEGMENTS = 64;
 /** Collect one lexical word continued through adjacent formatting runs. */
 function collectCrossRunWord({ block, startRunIndex, startChar }) {
 	const segments = [];
 	let text = "";
 	let width = 0;
 	for (let runIndex = startRunIndex; runIndex < block.runs.length; runIndex++) {
+		if (runIndex - startRunIndex >= MAX_CROSS_RUN_SEGMENTS) return;
 		const run = block.runs[runIndex];
 		if (!run || !isTextRun(run)) break;
 		const start = runIndex === startRunIndex ? startChar : 0;
@@ -1138,6 +1146,14 @@ function measureParagraph(block, maxWidth, options) {
 			}
 		}
 	}
+	const listParagraphMarkFontSize = attrs?.listParagraphMarkFontSize;
+	if (listParagraphMarkFontSize !== void 0 && listParagraphMarkFontSize > currentLine.maxFontSize) {
+		const fontFamily = currentLine.maxFontMetrics?.fontFamily ?? attrs?.defaultFontFamily;
+		updateMaxFont({
+			fontSize: listParagraphMarkFontSize,
+			...fontFamily === void 0 ? {} : { fontFamily }
+		});
+	}
 	finalizeLine();
 	let totalWithSpacing = lines.reduce((sum, line) => sum + measuredLineAdvance(line), 0);
 	if (spacing?.before) totalWithSpacing += spacing.before;

package/dist/layout-engine/types.d.ts

@@ -87,6 +87,14 @@ type RunFormatting = {
   changeAuthor?: string; /** Date of the tracked change */
   changeDate?: string; /** Revision ID of the tracked change (for sidebar matching) */
   changeRevisionId?: number;
+  /**
+   * Whether this tracked insertion/deletion is an AI-proposed *suggestion*
+   * rather than a user change. Suggestions render with the same grammar but a
+   * dotted stroke and a dedicated hue; they are stripped from serialized DOCX
+   * until accepted.
+   */
+  isSuggestion?: boolean; /** Groups a suggestion's runs for accept/reject and scroll-to. */
+  suggestionId?: string;
 };
 /**
  * Hyperlink information for a run.
@@ -179,7 +187,10 @@ type ImageRun = {
   cropTop?: number;
   cropRight?: number;
   cropBottom?: number;
-  cropLeft?: number; /** Whether this picture is itself a tracked insertion (`<w:ins>`). eigenpal #641. */
+  cropLeft?: number; /** CSS border width in pixels. eigenpal #1096. */
+  borderWidth?: number; /** CSS border color. eigenpal #1096. */
+  borderColor?: string; /** CSS border style. eigenpal #1096. */
+  borderStyle?: string; /** Whether this picture is itself a tracked insertion (`<w:ins>`). eigenpal #641. */
   isInsertion?: boolean; /** Whether this picture is itself a tracked deletion (`<w:del>`). eigenpal #641. */
   isDeletion?: boolean; /** Author of the tracked change wrapping the picture. eigenpal #641. */
   changeAuthor?: string; /** Date of the tracked change wrapping the picture. eigenpal #641. */
@@ -377,6 +388,12 @@ type ParagraphAttrs = {
   listMarkerHidden?: boolean;
   listMarkerFontFamily?: string;
   listMarkerFontSize?: number;
+  /**
+   * Effective paragraph-mark size used only to measure a visible list
+   * paragraph's final line. Word lets the inherited complex-script size raise
+   * that line box without enlarging the marker or Western text glyphs.
+   */
+  listParagraphMarkFontSize?: number;
   listMarkerBold?: boolean; /** Horizontal alignment of the marker around the paragraph's list anchor. */
   listMarkerAlignment?: "left" | "center" | "right";
   /**
@@ -566,7 +583,10 @@ type ImageBlock = {
   cropTop?: number;
   cropRight?: number;
   cropBottom?: number;
-  cropLeft?: number;
+  cropLeft?: number; /** CSS border width in pixels. eigenpal #1096. */
+  borderWidth?: number; /** CSS border color. eigenpal #1096. */
+  borderColor?: string; /** CSS border style. eigenpal #1096. */
+  borderStyle?: string;
   pmStart?: number;
   pmEnd?: number;
 };

package/dist/layout-painter/renderImage.d.ts

@@ -21,6 +21,17 @@ type ImageVisualAttrs = {
   cropBottom?: number;
   cropLeft?: number;
 };
+type ImageBorderAttrs = {
+  borderWidth?: number;
+  borderColor?: string;
+  borderStyle?: string;
+};
+/**
+ * Paint image borders carried through the layout model. Folio's PM schema
+ * uses `borderStyle` (not upstream's `borderKind`); the painter mirrors the
+ * editor DOM serialization while keeping the authored image box size stable.
+ */
+declare function applyImageBorder(element: HTMLElement, border: ImageBorderAttrs): void;
 /**
  * True when any visual attribute is set. Cheap call-site guard so the no-op
  * common case skips the helper call.
@@ -86,4 +97,4 @@ type RenderImageFragmentOptions = {
  */
 declare function renderImageFragment(fragment: ImageFragment, block: ImageBlock, _measure: ImageMeasure, _context: RenderContext, options?: RenderImageFragmentOptions): HTMLElement;
 //#endregion
-export { IMAGE_CLASS_NAMES, ImageVisualAttrs, RenderImageFragmentOptions, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };
+export { IMAGE_CLASS_NAMES, ImageBorderAttrs, ImageVisualAttrs, RenderImageFragmentOptions, applyImageBorder, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };

package/dist/layout-painter/renderImage.js

@@ -1,3 +1,5 @@
+import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
+import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 //#region src/layout-painter/renderImage.ts
 /**
 * CSS class names for image elements
@@ -7,6 +9,18 @@ const IMAGE_CLASS_NAMES = {
 	imageAnchored: "layout-image-anchored"
 };
 /**
+* Paint image borders carried through the layout model. Folio's PM schema
+* uses `borderStyle` (not upstream's `borderKind`); the painter mirrors the
+* editor DOM serialization while keeping the authored image box size stable.
+*/
+function applyImageBorder(element, border) {
+	if (border.borderWidth == null || border.borderWidth <= 0) return;
+	const borderStyle = border.borderStyle || "solid";
+	const borderColor = border.borderColor || "#000000";
+	element.style.border = `${border.borderWidth}px ${borderStyle} ${borderColor}`;
+	element.style.boxSizing = "border-box";
+}
+/**
 * True when any visual attribute is set. Cheap call-site guard so the no-op
 * common case skips the helper call.
 *
@@ -118,7 +132,7 @@ function renderImageFragment(fragment, block, _measure, _context, options = {})
 	if (fragment.pmStart !== void 0) containerEl.dataset["pmStart"] = String(fragment.pmStart);
 	if (fragment.pmEnd !== void 0) containerEl.dataset["pmEnd"] = String(fragment.pmEnd);
 	const imgEl = doc.createElement("img");
-	imgEl.src = block.src;
+	applySanitizedImageSrc(imgEl, block.src);
 	imgEl.alt = block.alt ?? "";
 	imgEl.style.width = "100%";
 	imgEl.style.height = "100%";
@@ -127,9 +141,10 @@ function renderImageFragment(fragment, block, _measure, _context, options = {})
 	if (block.transform) imgEl.style.transform = block.transform;
 	if (hasImageVisualAttrs(block)) applyImageVisualAttrs(imgEl, block);
 	imgEl.draggable = false;
-	if (block.hlinkHref) {
+	const hlinkHref = sanitizeExternalUrl(block.hlinkHref);
+	if (hlinkHref) {
 		const linkEl = doc.createElement("a");
-		linkEl.href = block.hlinkHref;
+		linkEl.href = hlinkHref;
 		linkEl.target = "_blank";
 		linkEl.rel = "noopener noreferrer";
 		linkEl.style.display = "block";
@@ -138,7 +153,9 @@ function renderImageFragment(fragment, block, _measure, _context, options = {})
 		linkEl.append(imgEl);
 		containerEl.append(linkEl);
 	} else containerEl.append(imgEl);
+	if (hasImageCrop(block)) applyImageBorder(containerEl, block);
+	else applyImageBorder(imgEl, block);
 	return containerEl;
 }
 //#endregion
-export { IMAGE_CLASS_NAMES, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };
+export { IMAGE_CLASS_NAMES, applyImageBorder, applyImageVisualAttrs, hasImageCrop, hasImageVisualAttrs, renderImageFragment, wrapImageWithCrop };

package/dist/layout-painter/renderPage.js

@@ -1,6 +1,7 @@
 import { eighthsToPixels, pointsToPixels } from "../utils/units.js";
 import { resolveFontFamily } from "../utils/fontResolver.js";
 import { borderToStyle } from "../utils/formatToStyle.js";
+import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 import { floatingTextBoxReservesBand, floatingTextBoxWrapsText, isFloatingImageRun, isFloatingTextBoxBlock, isTextWrappingFloatingImageRun } from "../layout-engine/types.js";
 import { rectsToFloatingZones } from "../layout-engine/measure/floatingZones.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
@@ -380,7 +381,7 @@ function renderFloatingImagesLayer(floatingImages, doc, layerMode = "front") {
 		if (floatImg.pmStart !== void 0) container.dataset["pmStart"] = String(floatImg.pmStart);
 		if (floatImg.pmEnd !== void 0) container.dataset["pmEnd"] = String(floatImg.pmEnd);
 		const img = doc.createElement("img");
-		img.src = floatImg.src;
+		applySanitizedImageSrc(img, floatImg.src);
 		img.style.width = `${floatImg.width}px`;
 		img.style.height = `${floatImg.height}px`;
 		img.style.display = "block";
@@ -509,7 +510,7 @@ function renderHeaderFooterContent(content, context, options, layout) {
 	}
 	for (const floatImg of floatingImages) {
 		const img = doc.createElement("img");
-		img.src = floatImg.src;
+		applySanitizedImageSrc(img, floatImg.src);
 		img.width = floatImg.width;
 		img.height = floatImg.height;
 		if (floatImg.alt) img.alt = floatImg.alt;